Extract "..." into a named node called variadic_parameter. Fixes #73

Wilfred · Sep 18, 2021 · f71e80b · f71e80b
1 parent 9bee345
commit f71e80b
Show file tree

Hide file tree

Showing 5 changed files with 19,825 additions and 19,784 deletions.
diff --git a/grammar.js b/grammar.js
@@ -576,9 +576,13 @@ module.exports = grammar({
       optional(seq('=', field('value', $._expression)))
     ),
 
+    variadic_parameter: $ => seq(
+        '...',
+    ),
+
     parameter_list: $ => seq(
       '(',
-      commaSep(choice($.parameter_declaration, '...')),
+      commaSep(choice($.parameter_declaration, $.variadic_parameter)),
       ')'
     ),
 

diff --git a/src/grammar.json b/src/grammar.json
@@ -3672,6 +3672,15 @@
         }
       ]
     },
+    "variadic_parameter": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "..."
+        }
+      ]
+    },
     "parameter_list": {
       "type": "SEQ",
       "members": [
@@ -3693,8 +3702,8 @@
                       "name": "parameter_declaration"
                     },
                     {
-                      "type": "STRING",
-                      "value": "..."
+                      "type": "SYMBOL",
+                      "name": "variadic_parameter"
                     }
                   ]
                 },
@@ -3715,8 +3724,8 @@
                             "name": "parameter_declaration"
                           },
                           {
-                            "type": "STRING",
-                            "value": "..."
+                            "type": "SYMBOL",
+                            "name": "variadic_parameter"
                           }
                         ]
                       }

diff --git a/src/node-types.json b/src/node-types.json
@@ -2035,6 +2035,10 @@
         {
           "type": "parameter_declaration",
           "named": true
+        },
+        {
+          "type": "variadic_parameter",
+          "named": true
         }
       ]
     }
@@ -3138,6 +3142,11 @@
       }
     }
   },
+  {
+    "type": "variadic_parameter",
+    "named": true,
+    "fields": {}
+  },
   {
     "type": "while_statement",
     "named": true,