Add parsing of def-parameter default values

LhKipp · Jul 10, 2022 · 695e3ec · 695e3ec
1 parent db4e990
commit 695e3ec
Show file tree

Hide file tree

Showing 6 changed files with 10,656 additions and 7,505 deletions.
diff --git a/grammar.js b/grammar.js
@@ -43,7 +43,7 @@ const OPERATOR_PREC = [
 
 
 const SPECIAL_CHARACTERS = [
-    "'", '"', '`',
+    "'", '"', '`', '@',
     '{', '}',
     '\\[', '\\]',
     '(', ')',
@@ -148,13 +148,15 @@ module.exports = grammar({
             $.identifier,
             optional(seq(':', $.type)),
             optional('?'),
+            optional($.default_parameter_assignment),
         ),
         flag: $ => seq(
             $.flag_name,
             optional(
                 seq('(', $.flag_shorthand_name, ')')
             ),
             optional(seq(':', $.type)),
+            optional($.default_parameter_assignment),
         ),
         flag_name: $ => /--[a-zA-Z_]+[a-zA-Z_0-9]*/,
         flag_shorthand_name: $ => /-[a-zA-Z0-9]/,
@@ -177,6 +179,11 @@ module.exports = grammar({
             "error",
             "binary",
         ),
+        default_parameter_assignment: $ => seq(
+            choice(
+                seq("=", $._cmd_expr),
+                seq("@", $.identifier))
+        ),
 
         variable_declaration: $ => seq(
             'let',
@@ -187,10 +194,11 @@ module.exports = grammar({
 
         command: $ => seq(
             field('cmd_name', seq($.identifier, optional('?'))),
-            repeat(field('arg', $._cmd_expr)), // ITS OVER 9000
+            repeat(field('arg', $._cmd_expr)), 
             choice($._cmd_newline, $._terminator)
             // prec(9002,$._terminator)
-            // repeat(field('arg', $._cmd_expr)) // ITS OVER 9000
+            // ITS OVER 9000 
+            // ^- Thanks to my previous me for the meme. Had a good laugh for this random comment :)
         ),
 
         _expression: $ => choice(

diff --git a/src/grammar.json b/src/grammar.json
@@ -373,6 +373,18 @@
               "type": "BLANK"
             }
           ]
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SYMBOL",
+              "name": "defaultParameterAssignment"
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
         }
       ]
     },
@@ -428,6 +440,18 @@
               "type": "BLANK"
             }
           ]
+        },
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SYMBOL",
+              "name": "defaultParameterAssignment"
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
         }
       ]
     },
@@ -526,6 +550,42 @@
         }
       ]
     },
+    "defaultParameterAssignment": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SEQ",
+              "members": [
+                {
+                  "type": "STRING",
+                  "value": "="
+                },
+                {
+                  "type": "SYMBOL",
+                  "name": "_cmd_expr"
+                }
+              ]
+            },
+            {
+              "type": "SEQ",
+              "members": [
+                {
+                  "type": "STRING",
+                  "value": "@"
+                },
+                {
+                  "type": "SYMBOL",
+                  "name": "identifier"
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    },
     "variable_declaration": {
       "type": "SEQ",
       "members": [
@@ -748,7 +808,7 @@
             "members": [
               {
                 "type": "PATTERN",
-                "value": "[^'\"`{}\\[\\]()\\\\\\s$;.|#\\-]"
+                "value": "[^'\"`@{}\\[\\]()\\\\\\s$;.|#\\-]"
               },
               {
                 "type": "SEQ",

diff --git a/src/node-types.json b/src/node-types.json
@@ -640,6 +640,69 @@
       }
     }
   },
+  {
+    "type": "defaultParameterAssignment",
+    "named": true,
+    "fields": {},
+    "children": {
+      "multiple": false,
+      "required": true,
+      "types": [
+        {
+          "type": "array",
+          "named": true
+        },
+        {
+          "type": "binary_expression",
+          "named": true
+        },
+        {
+          "type": "cmd_invocation",
+          "named": true
+        },
+        {
+          "type": "file_path",
+          "named": true
+        },
+        {
+          "type": "flag_arg",
+          "named": true
+        },
+        {
+          "type": "identifier",
+          "named": true
+        },
+        {
+          "type": "number_literal",
+          "named": true
+        },
+        {
+          "type": "range",
+          "named": true
+        },
+        {
+          "type": "record_or_block",
+          "named": true
+        },
+        {
+          "type": "string",
+          "named": true
+        },
+        {
+          "type": "table",
+          "named": true
+        },
+        {
+          "type": "value_path",
+          "named": true
+        },
+        {
+          "type": "word",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "env_export",
     "named": true,
@@ -720,6 +783,10 @@
       "multiple": true,
       "required": true,
       "types": [
+        {
+          "type": "defaultParameterAssignment",
+          "named": true
+        },
         {
           "type": "flag_name",
           "named": true
@@ -844,6 +911,10 @@
       "multiple": true,
       "required": true,
       "types": [
+        {
+          "type": "defaultParameterAssignment",
+          "named": true
+        },
         {
           "type": "identifier",
           "named": true
@@ -1423,6 +1494,10 @@
     "type": "?",
     "named": false
   },
+  {
+    "type": "@",
+    "named": false
+  },
   {
     "type": "[",
     "named": false