perf: improve gen time + parse state

tree-sitter · Jul 8, 2024 · 88e38e0 · 88e38e0
1 parent 9f804be
commit 88e38e0
Show file tree

Hide file tree

Showing 5 changed files with 315,566 additions and 367,010 deletions.
diff --git a/common/define-grammar.js b/common/define-grammar.js
@@ -137,12 +137,13 @@ module.exports = function defineGrammar(dialect) {
           seq('declare', optional($.accessibility_modifier)),
           seq($.accessibility_modifier, optional('declare')),
         )),
-        choice(
-          seq(optional('static'), optional($.override_modifier), optional('readonly')),
-          seq(optional('abstract'), optional('readonly')),
-          seq(optional('readonly'), optional('abstract')),
-        ),
-        optional('accessor'),
+        repeat(prec.right(choice(
+          'readonly',
+          'abstract',
+          'accessor',
+          'static',
+          $.override_modifier,
+        ))),
         field('name', $._property_name),
         optional(choice('?', '!')),
         field('type', optional($.type_annotation)),

diff --git a/tsx/src/grammar.json b/tsx/src/grammar.json
@@ -7279,120 +7279,36 @@
           ]
         },
         {
-          "type": "CHOICE",
-          "members": [
-            {
-              "type": "SEQ",
+          "type": "REPEAT",
+          "content": {
+            "type": "PREC_RIGHT",
+            "value": 0,
+            "content": {
+              "type": "CHOICE",
               "members": [
                 {
-                  "type": "CHOICE",
-                  "members": [
-                    {
-                      "type": "STRING",
-                      "value": "static"
-                    },
-                    {
-                      "type": "BLANK"
-                    }
-                  ]
+                  "type": "STRING",
+                  "value": "readonly"
                 },
                 {
-                  "type": "CHOICE",
-                  "members": [
-                    {
-                      "type": "SYMBOL",
-                      "name": "override_modifier"
-                    },
-                    {
-                      "type": "BLANK"
-                    }
-                  ]
+                  "type": "STRING",
+                  "value": "abstract"
                 },
                 {
-                  "type": "CHOICE",
-                  "members": [
-                    {
-                      "type": "STRING",
-                      "value": "readonly"
-                    },
-                    {
-                      "type": "BLANK"
-                    }
-                  ]
-                }
-              ]
-            },
-            {
-              "type": "SEQ",
-              "members": [
-                {
-                  "type": "CHOICE",
-                  "members": [
-                    {
-                      "type": "STRING",
-                      "value": "abstract"
-                    },
-                    {
-                      "type": "BLANK"
-                    }
-                  ]
+                  "type": "STRING",
+                  "value": "accessor"
                 },
                 {
-                  "type": "CHOICE",
-                  "members": [
-                    {
-                      "type": "STRING",
-                      "value": "readonly"
-                    },
-                    {
-                      "type": "BLANK"
-                    }
-                  ]
-                }
-              ]
-            },
-            {
-              "type": "SEQ",
-              "members": [
-                {
-                  "type": "CHOICE",
-                  "members": [
-                    {
-                      "type": "STRING",
-                      "value": "readonly"
-                    },
-                    {
-                      "type": "BLANK"
-                    }
-                  ]
+                  "type": "STRING",
+                  "value": "static"
                 },
                 {
-                  "type": "CHOICE",
-                  "members": [
-                    {
-                      "type": "STRING",
-                      "value": "abstract"
-                    },
-                    {
-                      "type": "BLANK"
-                    }
-                  ]
+                  "type": "SYMBOL",
+                  "name": "override_modifier"
                 }
               ]
             }
-          ]
-        },
-        {
-          "type": "CHOICE",
-          "members": [
-            {
-              "type": "STRING",
-              "value": "accessor"
-            },
-            {
-              "type": "BLANK"
-            }
-          ]
+          }
         },
         {
           "type": "FIELD",