Merge pull request #244 from tid-kijyun/fix/improved_css_conversion_p…

…erformance Improved css conversion performance
tid-kijyun · Nov 10, 2020 · 9760f64 · 9760f64
2 parents 4a80ebe + ab934e8
commit 9760f64
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/Sources/Kanna/CSS.swift b/Sources/Kanna/CSS.swift
@@ -103,10 +103,14 @@ public enum CSS {
     }
 }
 
+private var regexDict: [String: AKRegularExpression] = [:]
 private func firstMatch(_ pattern: String) -> (String) -> AKTextCheckingResult? {
     return { str in
         let length = str.utf16.count
-        guard let regex = try? AKRegularExpression(pattern: pattern, options: .caseInsensitive) else {
+        if regexDict[pattern] == nil {
+            regexDict[pattern] = try? AKRegularExpression(pattern: pattern, options: .caseInsensitive)
+        }
+        guard let regex = regexDict[pattern] else {
             return nil
         }
         if let result = regex.firstMatch(in: str, options: .reportProgress, range: NSRange(location: 0, length: length)) {

diff --git a/Tests/KannaTests/KannaCSSTests.swift b/Tests/KannaTests/KannaCSSTests.swift
@@ -93,12 +93,16 @@ class KannaCSSTests: XCTestCase {
     ]
 
     func testCSStoXPath() {
-        for testCase in css2xpath {
-            do {
-                let xpath = try CSS.toXPath(testCase.css)
-                XCTAssert(xpath == testCase.xpath, "Create XPath = [\(xpath)] != [\(testCase.xpath)]")
-            } catch {
-                XCTAssert(false, error.localizedDescription)
+        self.measure {
+            (0..<100).forEach { _ in
+            for testCase in css2xpath {
+                do {
+                    let xpath = try CSS.toXPath(testCase.css)
+                    XCTAssert(xpath == testCase.xpath, "Create XPath = [\(xpath)] != [\(testCase.xpath)]")
+                } catch {
+                    XCTAssert(false, error.localizedDescription)
+                }
+            }
             }
         }