simplified function_declaration rule

The repeat around the expression inside the function declaration doesn't seem to be needed by any known example code. It can be added back again later if a test case is found.
bollian · Feb 3, 2024 · d29af8b · d29af8b
1 parent d1684bf
commit d29af8b
Show file tree

Hide file tree

Showing 4 changed files with 4,660 additions and 7,732 deletions.
diff --git a/grammar.js b/grammar.js
@@ -169,12 +169,12 @@ module.exports = grammar({
 
     // function declarations are slightly different from $.function, which is for
     // function literals
-    function_declaration: $ => prec.right(seq(
+    function_declaration: $ => seq(
       'function',
       field('name', $.identifier),
       field('parameters', $.parameters_declaration),
-      '=', repeat1($.expression),
-    )),
+      '=', $.expression,
+    ),
 
     // statements are language constructs that can create objects
     _statement: $ => choice(

diff --git a/src/grammar.json b/src/grammar.json
@@ -163,44 +163,37 @@
       ]
     },
     "function_declaration": {
-      "type": "PREC_RIGHT",
-      "value": 0,
-      "content": {
-        "type": "SEQ",
-        "members": [
-          {
-            "type": "STRING",
-            "value": "function"
-          },
-          {
-            "type": "FIELD",
-            "name": "name",
-            "content": {
-              "type": "SYMBOL",
-              "name": "identifier"
-            }
-          },
-          {
-            "type": "FIELD",
-            "name": "parameters",
-            "content": {
-              "type": "SYMBOL",
-              "name": "parameters_declaration"
-            }
-          },
-          {
-            "type": "STRING",
-            "value": "="
-          },
-          {
-            "type": "REPEAT1",
-            "content": {
-              "type": "SYMBOL",
-              "name": "expression"
-            }
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "function"
+        },
+        {
+          "type": "FIELD",
+          "name": "name",
+          "content": {
+            "type": "SYMBOL",
+            "name": "identifier"
           }
-        ]
-      }
+        },
+        {
+          "type": "FIELD",
+          "name": "parameters",
+          "content": {
+            "type": "SYMBOL",
+            "name": "parameters_declaration"
+          }
+        },
+        {
+          "type": "STRING",
+          "value": "="
+        },
+        {
+          "type": "SYMBOL",
+          "name": "expression"
+        }
+      ]
     },
     "_statement": {
       "type": "CHOICE",

diff --git a/src/node-types.json b/src/node-types.json
@@ -647,7 +647,7 @@
       }
     },
     "children": {
-      "multiple": true,
+      "multiple": false,
       "required": true,
       "types": [
         {