Merge pull request #127 from stadelmanma/data-statement-fix

Fix `data` statement clash with array subscripting
stadelmanma · Jan 22, 2025 · a86dce3 · a86dce3
2 parents a8ccbe4 + 4df3a8e
commit a86dce3
Show file tree

Hide file tree

Showing 4 changed files with 90,970 additions and 90,939 deletions.
diff --git a/grammar.js b/grammar.js
@@ -80,6 +80,7 @@ module.exports = grammar({
     [$._argument_list, $.parenthesized_expression],
     [$.case_statement],
     [$.data_set, $._expression],
+    [$.data_statement, $.identifier],
     [$.data_value, $._expression],
     [$.else_clause],
     [$.elseif_clause, $.identifier],
@@ -1081,10 +1082,10 @@ module.exports = grammar({
       field("path", alias($.string_literal, $.filename))
     ),
 
-    data_statement: $ => prec(1, seq(
+    data_statement: $ => seq(
       caseInsensitive('data'),
       commaSep1($.data_set)
-    )),
+    ),
     data_set: $ => prec(1, seq(
       commaSep1(
         choice(

diff --git a/src/grammar.json b/src/grammar.json
@@ -13168,47 +13168,43 @@
       ]
     },
     "data_statement": {
-      "type": "PREC",
-      "value": 1,
-      "content": {
-        "type": "SEQ",
-        "members": [
-          {
-            "type": "ALIAS",
-            "content": {
-              "type": "PATTERN",
-              "value": "[dD][aA][tT][aA]"
-            },
-            "named": false,
-            "value": "data"
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "ALIAS",
+          "content": {
+            "type": "PATTERN",
+            "value": "[dD][aA][tT][aA]"
           },
-          {
-            "type": "SEQ",
-            "members": [
-              {
-                "type": "SYMBOL",
-                "name": "data_set"
-              },
-              {
-                "type": "REPEAT",
-                "content": {
-                  "type": "SEQ",
-                  "members": [
-                    {
-                      "type": "STRING",
-                      "value": ","
-                    },
-                    {
-                      "type": "SYMBOL",
-                      "name": "data_set"
-                    }
-                  ]
-                }
+          "named": false,
+          "value": "data"
+        },
+        {
+          "type": "SEQ",
+          "members": [
+            {
+              "type": "SYMBOL",
+              "name": "data_set"
+            },
+            {
+              "type": "REPEAT",
+              "content": {
+                "type": "SEQ",
+                "members": [
+                  {
+                    "type": "STRING",
+                    "value": ","
+                  },
+                  {
+                    "type": "SYMBOL",
+                    "name": "data_set"
+                  }
+                ]
               }
-            ]
-          }
-        ]
-      }
+            }
+          ]
+        }
+      ]
     },
     "data_set": {
       "type": "PREC",
@@ -20036,6 +20032,10 @@
       "data_set",
       "_expression"
     ],
+    [
+      "data_statement",
+      "identifier"
+    ],
     [
       "data_value",
       "_expression"