updates to kleenes

tgross35 · Jan 4, 2024 · 308e4cc · 308e4cc
1 parent 2f5bb0c
commit 308e4cc
Show file tree

Hide file tree

Showing 6 changed files with 2,922 additions and 2,889 deletions.
diff --git a/grammar.js b/grammar.js
@@ -27,7 +27,7 @@ module.exports = grammar({
   inline: (
     $,
   ) => [
-    $._dependency_call,
+    $._dependency_with_args,
     $._expression_braced,
     $._expression_recurse,
   ],
@@ -204,6 +204,7 @@ module.exports = grammar({
     attribute: ($) =>
       seq("[", field("contents", comma_sep1($.identifier)), "]", $.eol),
 
+    // A complete recipe
     // recipe        : attribute? '@'? NAME parameter* variadic_parameters? ':' dependency* body?
     recipe: ($) =>
       seq(
@@ -223,7 +224,7 @@ module.exports = grammar({
       ),
 
     parameters: ($) =>
-      seq(repeat1($.parameter), optional($.variadic_parameter)),
+      seq(repeat($.parameter), choice($.parameter, $.variadic_parameter)),
 
     // parameter     : '$'? NAME
     //               | '$'? NAME '=' value
@@ -237,7 +238,7 @@ module.exports = grammar({
     // variadic_parameters      : '*' parameter
     //               | '+' parameter
     variadic_parameter: ($) =>
-      seq(field("kleen", choice("*", "+")), $.parameter),
+      seq(field("kleene", choice("*", "+")), $.parameter),
 
     dependencies: ($) => repeat1($.dependency),
 
@@ -246,10 +247,11 @@ module.exports = grammar({
     dependency: ($) =>
       choice(
         field("recipe", $.identifier),
-        field("call", seq("(", $._dependency_call, ")")),
+        field("call", seq("(", $._dependency_with_args, ")")),
       ),
 
-    _dependency_call: ($) =>
+    // contents of `(recipe expression)`
+    _dependency_with_args: ($) =>
       seq(
         field("recipe", $.identifier),
         repeat(field("expression", $.expression)),
@@ -272,20 +274,9 @@ module.exports = grammar({
 
     recipe_line_prefix: (_) => choice("@-", "-@", "@", "-"),
 
-    // recipe_line_inl: ($) =>
-    //   seq(
-    //     $.notcomment,
-    //     // repeat(choice($.interpolation, $.notinterpolation)),
-    //     repeat(choice($.interpolation, $.text)),
-    //     $._newline,
-    //   ),
-    shebang: ($) =>
-      seq(
-        /\s*#!.*/,
-        $._newline,
-      ),
-    // notcomment: ($) => /[^#\s{]\S*/,
-    // notcomment: (_) => /[^#\s]\S*/,
+    shebang: ($) => seq(/\s*#!.*/, $._newline),
+
+    // `# ...` comment
     comment: ($) => seq(/#.*/, $._newline),
 
     // notinterpolation: ($) => /[^{][^{]\S*/,
@@ -301,28 +292,10 @@ module.exports = grammar({
     raw_string: (_) => /'[^']*'/,
     raw_string_indented: (_) => seq("'''", repeat(/./), "'''"),
     basic_string: ($) =>
-      seq(
-        '"',
-        repeat(
-          choice(
-            $.string_escape,
-            /[^\\"]+/,
-          ),
-        ),
-        '"',
-      ),
+      seq('"', repeat(choice($.string_escape, /[^\\"]+/)), '"'),
     // string_basic: (_) => /".*"/m, // # also processes \n \r \t \" \\ escapes
     basic_string_indented: ($) =>
-      seq(
-        '"""',
-        repeat(
-          choice(
-            $.string_escape,
-            /[^\\"]+/,
-          ),
-        ),
-        '"""',
-      ),
+      seq('"""', repeat(choice($.string_escape, /[^\\"]+/)), '"""'),
     string_escape: (_) => /\\[nrt"\\]/,
     text: (_) => /.+/, //recipe TEXT, only matches in a recipe body
     // text: (_) => /\S+/, //recipe TEXT, only matches in a recipe body

diff --git a/src/grammar.json b/src/grammar.json
@@ -971,7 +971,7 @@
       "type": "SEQ",
       "members": [
         {
-          "type": "REPEAT1",
+          "type": "REPEAT",
           "content": {
             "type": "SYMBOL",
             "name": "parameter"
@@ -982,10 +982,11 @@
           "members": [
             {
               "type": "SYMBOL",
-              "name": "variadic_parameter"
+              "name": "parameter"
             },
             {
-              "type": "BLANK"
+              "type": "SYMBOL",
+              "name": "variadic_parameter"
             }
           ]
         }
@@ -1046,7 +1047,7 @@
       "members": [
         {
           "type": "FIELD",
-          "name": "kleen",
+          "name": "kleene",
           "content": {
             "type": "CHOICE",
             "members": [
@@ -1097,7 +1098,7 @@
               },
               {
                 "type": "SYMBOL",
-                "name": "_dependency_call"
+                "name": "_dependency_with_args"
               },
               {
                 "type": "STRING",
@@ -1108,7 +1109,7 @@
         }
       ]
     },
-    "_dependency_call": {
+    "_dependency_with_args": {
       "type": "SEQ",
       "members": [
         {
@@ -1436,7 +1437,7 @@
     }
   ],
   "inline": [
-    "_dependency_call",
+    "_dependency_with_args",
     "ReferenceError",
     "_expression_recurse"
   ],

diff --git a/src/node-types.json b/src/node-types.json
@@ -743,7 +743,7 @@
     "type": "variadic_parameter",
     "named": true,
     "fields": {
-      "kleen": {
+      "kleene": {
         "multiple": false,
         "required": true,
         "types": [