Add attribute support

tgross35 · Jan 3, 2024 · 3e4df75 · 3e4df75
1 parent 0f49fe4
commit 3e4df75
Show file tree

Hide file tree

Showing 7 changed files with 2,905 additions and 2,475 deletions.
diff --git a/GRAMMAR.md b/GRAMMAR.md
@@ -94,7 +94,9 @@ string        : STRING
 sequence      : expression ',' sequence
               | expression ','?
 
-recipe        : '@'? NAME parameter* variadic? ':' dependency* body?
+recipe        : attribute? '@'? NAME parameter* variadic? ':' dependency* body?
+
+attribute     : '[' NAME ']' eol
 
 parameter     : '$'? NAME
               | '$'? NAME '=' value

diff --git a/grammar.js b/grammar.js
@@ -151,8 +151,11 @@ module.exports = grammar({
         seq($.expression, optional(",")),
       ),
 
-    // recipe        : '@'? NAME parameter* variadic_parameters? ':' dependency* body?
-    recipe: ($) => seq($.recipeheader, $.NEWLINE, optional($.body)),
+    attribute: ($) => seq("[", $.NAME, "]", $.eol),
+
+    // recipe        : attribute? '@'? NAME parameter* variadic_parameters? ':' dependency* body?
+    recipe: ($) =>
+      seq(optional($.attribute), $.recipeheader, $.NEWLINE, optional($.body)),
 
     recipeheader: ($) =>
       seq(
@@ -173,6 +176,7 @@ module.exports = grammar({
       choice(
         seq(optional("$"), $.NAME),
         seq(optional("$"), $.NAME, "=", $.value),
+        $.eol,
       ),
 
     // variadic_parameters      : '*' parameter

diff --git a/src/grammar.json b/src/grammar.json
@@ -655,9 +655,42 @@
         }
       ]
     },
+    "attribute": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "["
+        },
+        {
+          "type": "SYMBOL",
+          "name": "NAME"
+        },
+        {
+          "type": "STRING",
+          "value": "]"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "eol"
+        }
+      ]
+    },
     "recipe": {
       "type": "SEQ",
       "members": [
+        {
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "SYMBOL",
+              "name": "attribute"
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
+        },
         {
           "type": "SYMBOL",
           "name": "recipeheader"
@@ -817,6 +850,10 @@
               "name": "value"
             }
           ]
+        },
+        {
+          "type": "SYMBOL",
+          "name": "eol"
         }
       ]
     },

diff --git a/src/node-types.json b/src/node-types.json
@@ -48,6 +48,25 @@
       ]
     }
   },
+  {
+    "type": "attribute",
+    "named": true,
+    "fields": {},
+    "children": {
+      "multiple": true,
+      "required": true,
+      "types": [
+        {
+          "type": "NAME",
+          "named": true
+        },
+        {
+          "type": "eol",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "body",
     "named": true,
@@ -402,6 +421,10 @@
           "type": "NAME",
           "named": true
         },
+        {
+          "type": "eol",
+          "named": true
+        },
         {
           "type": "value",
           "named": true
@@ -440,6 +463,10 @@
           "type": "NEWLINE",
           "named": true
         },
+        {
+          "type": "attribute",
+          "named": true
+        },
         {
           "type": "body",
           "named": true