Revert "regenerate the parser"

This reverts commit 88937a3.
maxxnino · Apr 24, 2023 · da20ce4 · da20ce4
1 parent 88937a3
commit da20ce4
Show file tree

Hide file tree

Showing 4 changed files with 106,236 additions and 93,047 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -40,13 +40,13 @@ jobs:
         run: |
           git add .
           if output="$(git status --porcelain=v2)"; then
+            files_changed_msg="$output"
+
             diff="$(git diff --cached --color=never)"
             echo "${diff::1000}"
             if [ ${#diff} -gt 1000 ]; then
               echo "-- TRUNCATED --"$'\n'
             fi
-
-            files_changed_msg="$output"
           else
             fail_code=$?
           fi

diff --git a/src/grammar.json b/src/grammar.json
@@ -1912,13 +1912,43 @@
                 "type": "SYMBOL",
                 "name": "_PrimaryTypeExpr"
               },
+              {
+                "type": "SEQ",
+                "members": [
+                  {
+                    "type": "SYMBOL",
+                    "name": "_PrimaryTypeExpr"
+                  },
+                  {
+                    "type": "SYMBOL",
+                    "name": "FnCallArguments"
+                  }
+                ]
+              },
               {
                 "type": "FIELD",
                 "name": "variable_type_function",
                 "content": {
                   "type": "SYMBOL",
                   "name": "IDENTIFIER"
                 }
+              },
+              {
+                "type": "SEQ",
+                "members": [
+                  {
+                    "type": "FIELD",
+                    "name": "function_call",
+                    "content": {
+                      "type": "SYMBOL",
+                      "name": "IDENTIFIER"
+                    }
+                  },
+                  {
+                    "type": "SYMBOL",
+                    "name": "FnCallArguments"
+                  }
+                ]
               }
             ]
           },
@@ -1932,12 +1962,21 @@
                   "name": "SuffixOp"
                 },
                 {
-                  "type": "SYMBOL",
-                  "name": "FieldOrFnCall"
+                  "type": "SEQ",
+                  "members": [
+                    {
+                      "type": "SYMBOL",
+                      "name": "SuffixOp"
+                    },
+                    {
+                      "type": "SYMBOL",
+                      "name": "FnCallArguments"
+                    }
+                  ]
                 },
                 {
                   "type": "SYMBOL",
-                  "name": "FnCallArguments"
+                  "name": "FieldOrFnCall"
                 }
               ]
             }
@@ -4102,58 +4141,6 @@
         }
       ]
     },
-    "_SentinelTerminatedExpr": {
-      "type": "CHOICE",
-      "members": [
-        {
-          "type": "SEQ",
-          "members": [
-            {
-              "type": "SYMBOL",
-              "name": "IDENTIFIER"
-            },
-            {
-              "type": "STRING",
-              "value": ":"
-            },
-            {
-              "type": "SYMBOL",
-              "name": "_Expr"
-            }
-          ]
-        },
-        {
-          "type": "SEQ",
-          "members": [
-            {
-              "type": "SYMBOL",
-              "name": "_Expr"
-            },
-            {
-              "type": "CHOICE",
-              "members": [
-                {
-                  "type": "SEQ",
-                  "members": [
-                    {
-                      "type": "STRING",
-                      "value": ":"
-                    },
-                    {
-                      "type": "SYMBOL",
-                      "name": "_Expr"
-                    }
-                  ]
-                },
-                {
-                  "type": "BLANK"
-                }
-              ]
-            }
-          ]
-        }
-      ]
-    },
     "SuffixOp": {
       "type": "CHOICE",
       "members": [
@@ -4183,7 +4170,28 @@
                       "members": [
                         {
                           "type": "SYMBOL",
-                          "name": "_SentinelTerminatedExpr"
+                          "name": "_Expr"
+                        },
+                        {
+                          "type": "BLANK"
+                        }
+                      ]
+                    },
+                    {
+                      "type": "CHOICE",
+                      "members": [
+                        {
+                          "type": "SEQ",
+                          "members": [
+                            {
+                              "type": "STRING",
+                              "value": ":"
+                            },
+                            {
+                              "type": "SYMBOL",
+                              "name": "_Expr"
+                            }
+                          ]
                         },
                         {
                           "type": "BLANK"
@@ -5483,15 +5491,17 @@
               {
                 "type": "IMMEDIATE_TOKEN",
                 "content": {
-                  "type": "STRING",
-                  "value": "{"
-                }
-              },
-              {
-                "type": "IMMEDIATE_TOKEN",
-                "content": {
-                  "type": "STRING",
-                  "value": "}"
+                  "type": "CHOICE",
+                  "members": [
+                    {
+                      "type": "STRING",
+                      "value": "{"
+                    },
+                    {
+                      "type": "STRING",
+                      "value": "}"
+                    }
+                  ]
                 }
               }
             ]

diff --git a/src/node-types.json b/src/node-types.json
@@ -2456,6 +2456,16 @@
           }
         ]
       },
+      "function_call": {
+        "multiple": false,
+        "required": false,
+        "types": [
+          {
+            "type": "IDENTIFIER",
+            "named": true
+          }
+        ]
+      },
       "variable_type_function": {
         "multiple": false,
         "required": false,
@@ -2586,10 +2596,6 @@
           "type": "ErrorUnionExpr",
           "named": true
         },
-        {
-          "type": "IDENTIFIER",
-          "named": true
-        },
         {
           "type": "IfExpr",
           "named": true