combine regexes into passes

Fogapod · Feb 16, 2024 · 7555c23 · 7555c23
1 parent 485205f
commit 7555c23
Show file tree

Hide file tree

Showing 29 changed files with 2,792 additions and 2,428 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,4 +3,5 @@ Cargo.lock
 
 # flamegraph script
 perf.data
+perf.data.old
 flamegraph.svg
diff --git a/Cargo.toml b/Cargo.toml
@@ -23,7 +23,8 @@ include = [
 rand = "0.8"
 
 # pattern definition
-regex = { version ="1.10", features = ["perf-dfa-full"] }
+# excluded a couple unicode features
+regex-automata = { version = "0.4", default-features = false, features = ["std", "perf", "meta", "nfa", "dfa", "hybrid", "unicode-case", "unicode-perl", "unicode-word-boundary"] }
 
 # logging
 log = "0.4"

diff --git a/benches/any.ron b/benches/any.ron
@@ -1,77 +1,82 @@
 (
-    patterns: {
-        // highly nested
-        "a": {"Any": [
-            {"Any": [
-            {"Any": [
-            {"Any": [
-            {"Any": [
-            {"Any": [
-            {"Any": [
-            {"Any": [
-            {"Any": [
-                {"Original": ()},
-            ]},
-            ]},
-            ]},
-            ]},
-            ]},
-            ]},
-            ]},
-            ]},
-        ]},
-        // many items
-        "o": {"Any": [
-            {"Original": ()},
-            {"Original": ()},
-            {"Original": ()},
-            {"Original": ()},
-            {"Original": ()},
-            {"Original": ()},
-            {"Original": ()},
-            {"Original": ()},
-            {"Original": ()},
-            {"Original": ()},
-            {"Original": ()},
-            {"Original": ()},
-            {"Original": ()},
-            {"Original": ()},
-            {"Original": ()},
-            {"Original": ()},
-            {"Original": ()},
-            {"Original": ()},
-            {"Original": ()},
-            {"Original": ()},
-            {"Original": ()},
-            {"Original": ()},
-            {"Original": ()},
-            {"Original": ()},
-            {"Original": ()},
-            {"Original": ()},
-            {"Original": ()},
-            {"Original": ()},
-            {"Original": ()},
-            {"Original": ()},
-            {"Original": ()},
-            {"Original": ()},
-            {"Original": ()},
-            {"Original": ()},
-            {"Original": ()},
-            {"Original": ()},
-            {"Original": ()},
-            {"Original": ()},
-            {"Original": ()},
-            {"Original": ()},
-            {"Original": ()},
-            {"Original": ()},
-            {"Original": ()},
-            {"Original": ()},
-            {"Original": ()},
-            {"Original": ()},
-            {"Original": ()},
-            {"Original": ()},
-            {"Original": ()},
-            {"Original": ()},
-        ]},
-    },
+    accent: [
+        (
+            name: "",
+            rules: {
+                // highly nested
+                "a": {"Any": [
+                    {"Any": [
+                    {"Any": [
+                    {"Any": [
+                    {"Any": [
+                    {"Any": [
+                    {"Any": [
+                    {"Any": [
+                    {"Any": [
+                        {"Original": ()},
+                    ]},
+                    ]},
+                    ]},
+                    ]},
+                    ]},
+                    ]},
+                    ]},
+                    ]},
+                ]},
+                // many items
+                "o": {"Any": [
+                    {"Original": ()},
+                    {"Original": ()},
+                    {"Original": ()},
+                    {"Original": ()},
+                    {"Original": ()},
+                    {"Original": ()},
+                    {"Original": ()},
+                    {"Original": ()},
+                    {"Original": ()},
+                    {"Original": ()},
+                    {"Original": ()},
+                    {"Original": ()},
+                    {"Original": ()},
+                    {"Original": ()},
+                    {"Original": ()},
+                    {"Original": ()},
+                    {"Original": ()},
+                    {"Original": ()},
+                    {"Original": ()},
+                    {"Original": ()},
+                    {"Original": ()},
+                    {"Original": ()},
+                    {"Original": ()},
+                    {"Original": ()},
+                    {"Original": ()},
+                    {"Original": ()},
+                    {"Original": ()},
+                    {"Original": ()},
+                    {"Original": ()},
+                    {"Original": ()},
+                    {"Original": ()},
+                    {"Original": ()},
+                    {"Original": ()},
+                    {"Original": ()},
+                    {"Original": ()},
+                    {"Original": ()},
+                    {"Original": ()},
+                    {"Original": ()},
+                    {"Original": ()},
+                    {"Original": ()},
+                    {"Original": ()},
+                    {"Original": ()},
+                    {"Original": ()},
+                    {"Original": ()},
+                    {"Original": ()},
+                    {"Original": ()},
+                    {"Original": ()},
+                    {"Original": ()},
+                    {"Original": ()},
+                    {"Original": ()},
+                ]},
+            },
+        ),
+    ],
 )
diff --git a/benches/concat.ron b/benches/concat.ron
@@ -1,13 +1,18 @@
 (
-    patterns: {
-        // use \w+ and \W+ to vary string lengths
-        r"\w+": {"Concat": (
-            {"Original": ()},
-            {"Original": ()},
-        )},
-        r"\W+": {"Concat": (
-            {"Original": ()},
-            {"Original": ()},
-        )},
-    },
+    accent: [
+        (
+            name: "",
+            rules: {
+                // use \w+ and \W+ to vary string lengths
+                r"\w+": {"Concat": (
+                    {"Original": ()},
+                    {"Original": ()},
+                )},
+                r"\W+": {"Concat": (
+                    {"Original": ()},
+                    {"Original": ()},
+                )},
+            },
+        ),
+    ]
 )
diff --git a/benches/literal.ron b/benches/literal.ron
@@ -1,7 +1,12 @@
 (
-    patterns: {
-        "a": {"Literal": "A"},
-        "o": {"Literal": "short"},
-        r"\d+": {"Literal": "veryLongStringaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1234123412344rhrkghsghkgshal;ghaslfnkhsgkshgshgsjdgjkdngkjgh"},
-    },
+    accent: [
+        (
+            name: "",
+            rules: {
+                "a": {"Literal": "A"},
+                "o": {"Literal": "short"},
+                r"\d+": {"Literal": "veryLongStringaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1234123412344rhrkghsghkgshal;ghaslfnkhsgkshgshgsjdgjkdngkjgh"},
+            },
+        ),
+    ]
 )
diff --git a/benches/lower.ron b/benches/lower.ron
@@ -1,5 +1,10 @@
 (
-    patterns: {
-        r"\w+": {"Lower": {"Lower": {"Lower": {"Lower": {"Lower": {"Original": ()}}}}}},
-    },
+    accent: [
+        (
+            name: "",
+            rules: {
+                r"\w+": {"Lower": {"Lower": {"Lower": {"Lower": {"Lower": {"Original": ()}}}}}},
+            },
+        ),
+    ]
 )
diff --git a/benches/original.ron b/benches/original.ron
@@ -1,7 +1,12 @@
 (
-    patterns: {
-        // varying string lenghts
-        r"\w+": {"Original": ()},
-        r"\W+": {"Original": ()},
-    },
+    accent: [
+        (
+            name: "",
+            rules: {
+                // varying string lenghts
+                r"\w+": {"Original": ()},
+                r"\W+": {"Original": ()},
+            },
+        ),
+    ]
 )
diff --git a/benches/upper.ron b/benches/upper.ron
@@ -1,5 +1,10 @@
 (
-    patterns: {
-        r"\w+": {"Upper": {"Upper": {"Upper": {"Upper": {"Upper": {"Original": ()}}}}}},
-    },
+    accent: [
+        (
+            name: "",
+            rules: {
+                r"\w+": {"Upper": {"Upper": {"Upper": {"Upper": {"Upper": {"Original": ()}}}}}},
+            },
+        ),
+    ]
 )
diff --git a/benches/weights.ron b/benches/weights.ron
@@ -1,28 +1,33 @@
 (
-    patterns: {
-        "a": {"Weights": {1: {"Literal": "single"}}},
-        "o": {"Weights": {
-            0: {"Weights": {1: {"Literal": "many variants"}}},
-            1: {"Weights": {1: {"Literal": "1"}}},
-            2: {"Weights": {1: {"Literal": "2"}}},
-            3: {"Weights": {1: {"Literal": "3"}}},
-            4: {"Weights": {1: {"Literal": "4"}}},
-            5: {"Weights": {1: {"Literal": "5"}}},
-            6: {"Weights": {1: {"Literal": "6"}}},
-            7: {"Weights": {1: {"Literal": "7"}}},
-            8: {"Weights": {1: {"Literal": "8"}}},
-            9: {"Weights": {1: {"Literal": "9"}}},
-            10: {"Weights": {1: {"Literal": "10"}}},
-            11: {"Weights": {1: {"Literal": "11"}}},
-            12: {"Weights": {1: {"Literal": "12"}}},
-            13: {"Weights": {1: {"Literal": "13"}}},
-            14: {"Weights": {1: {"Literal": "14"}}},
-            15: {"Weights": {1: {"Literal": "15"}}},
-            16: {"Weights": {1: {"Literal": "16"}}},
-            17: {"Weights": {1: {"Literal": "17"}}},
-            18: {"Weights": {1: {"Literal": "18"}}},
-            19: {"Weights": {1: {"Literal": "19"}}},
-            20: {"Weights": {1: {"Literal": "20"}}},
-        }},
-    },
+    accent: [
+        (
+            name: "",
+            rules: {
+                "a": {"Weights": {1: {"Literal": "single"}}},
+                "o": {"Weights": {
+                    0: {"Weights": {1: {"Literal": "many variants"}}},
+                    1: {"Weights": {1: {"Literal": "1"}}},
+                    2: {"Weights": {1: {"Literal": "2"}}},
+                    3: {"Weights": {1: {"Literal": "3"}}},
+                    4: {"Weights": {1: {"Literal": "4"}}},
+                    5: {"Weights": {1: {"Literal": "5"}}},
+                    6: {"Weights": {1: {"Literal": "6"}}},
+                    7: {"Weights": {1: {"Literal": "7"}}},
+                    8: {"Weights": {1: {"Literal": "8"}}},
+                    9: {"Weights": {1: {"Literal": "9"}}},
+                    10: {"Weights": {1: {"Literal": "10"}}},
+                    11: {"Weights": {1: {"Literal": "11"}}},
+                    12: {"Weights": {1: {"Literal": "12"}}},
+                    13: {"Weights": {1: {"Literal": "13"}}},
+                    14: {"Weights": {1: {"Literal": "14"}}},
+                    15: {"Weights": {1: {"Literal": "15"}}},
+                    16: {"Weights": {1: {"Literal": "16"}}},
+                    17: {"Weights": {1: {"Literal": "17"}}},
+                    18: {"Weights": {1: {"Literal": "18"}}},
+                    19: {"Weights": {1: {"Literal": "19"}}},
+                    20: {"Weights": {1: {"Literal": "20"}}},
+                }},
+            },
+        ),
+    ]
 )