add nested syntax support

ravsii · Sep 17, 2023 · 904701e · 904701e
1 parent c8c9afc
commit 904701e
Show file tree

Hide file tree

Showing 7 changed files with 1,624 additions and 572 deletions.
diff --git a/grammar.js b/grammar.js
@@ -31,35 +31,18 @@ module.exports = grammar({
         $.connection_identifier,
         $.sub_identifier
       )),
-      optional($.label),
-      optional(choice(/\n+/, ";")),
+      optional($.label_block),
+      optional(choice(/\n+\s*/, ";")),
     )),
 
+    label_block: $ => choice(
+      seq(":", $.label),
+      seq(":", $.container),
+    ),
 
+    container: $ => seq("{", repeat($.expression), "}"),
 
-    label: _ => seq(":", choice(
-      // seq("|", /.+/, "|"),
-      /.+/,
-    )),
-
-    // shape_body: $ => prec.right(seq(
-    //   "{",
-    //   /\s*/,
-    //   repeat(seq(/\s*/, $.shape_param)),
-    //   /\s*/,
-    //   "}"
-    // )),
-
-    // shape_param: $ => seq(
-    //   $.identifier,
-    //   /\s*/,
-    //   ":",
-    //   optional(/\s+/),
-    //   $.param_value,
-    //   optional($.param_body),
-    // ),
-
-    // param_body: $ => seq("{", /.+/, "}"),
+    label: _ => /.+/,
 
     // building blocks
 

diff --git a/src/grammar.json b/src/grammar.json
@@ -136,7 +136,7 @@
             "members": [
               {
                 "type": "SYMBOL",
-                "name": "label"
+                "name": "label_block"
               },
               {
                 "type": "BLANK"
@@ -151,7 +151,7 @@
                 "members": [
                   {
                     "type": "PATTERN",
-                    "value": "\\n+"
+                    "value": "\\n+\\s*"
                   },
                   {
                     "type": "STRING",
@@ -167,24 +167,61 @@
         ]
       }
     },
-    "label": {
-      "type": "SEQ",
+    "label_block": {
+      "type": "CHOICE",
       "members": [
         {
-          "type": "STRING",
-          "value": ":"
+          "type": "SEQ",
+          "members": [
+            {
+              "type": "STRING",
+              "value": ":"
+            },
+            {
+              "type": "SYMBOL",
+              "name": "label"
+            }
+          ]
         },
         {
-          "type": "CHOICE",
+          "type": "SEQ",
           "members": [
             {
-              "type": "PATTERN",
-              "value": ".+"
+              "type": "STRING",
+              "value": ":"
+            },
+            {
+              "type": "SYMBOL",
+              "name": "container"
             }
           ]
         }
       ]
     },
+    "container": {
+      "type": "SEQ",
+      "members": [
+        {
+          "type": "STRING",
+          "value": "{"
+        },
+        {
+          "type": "REPEAT",
+          "content": {
+            "type": "SYMBOL",
+            "name": "expression"
+          }
+        },
+        {
+          "type": "STRING",
+          "value": "}"
+        }
+      ]
+    },
+    "label": {
+      "type": "PATTERN",
+      "value": ".+"
+    },
     "identifier": {
       "type": "PREC_RIGHT",
       "value": 0,

diff --git a/src/node-types.json b/src/node-types.json
@@ -4,6 +4,21 @@
     "named": true,
     "fields": {}
   },
+  {
+    "type": "container",
+    "named": true,
+    "fields": {},
+    "children": {
+      "multiple": true,
+      "required": false,
+      "types": [
+        {
+          "type": "expression",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "expression",
     "named": true,
@@ -25,7 +40,7 @@
           "named": true
         },
         {
-          "type": "label",
+          "type": "label_block",
           "named": true
         },
         {
@@ -51,9 +66,23 @@
     }
   },
   {
-    "type": "label",
+    "type": "label_block",
     "named": true,
-    "fields": {}
+    "fields": {},
+    "children": {
+      "multiple": false,
+      "required": true,
+      "types": [
+        {
+          "type": "container",
+          "named": true
+        },
+        {
+          "type": "label",
+          "named": true
+        }
+      ]
+    }
   },
   {
     "type": "source_file",
@@ -121,6 +150,10 @@
     "type": "down",
     "named": false
   },
+  {
+    "type": "label",
+    "named": true
+  },
   {
     "type": "left",
     "named": false
@@ -132,5 +165,13 @@
   {
     "type": "up",
     "named": false
+  },
+  {
+    "type": "{",
+    "named": false
+  },
+  {
+    "type": "}",
+    "named": false
   }
 ]