feat: add connection identifiers

ravsii · Jul 27, 2023 · bf331ef · bf331ef
1 parent 5acc0a2
commit bf331ef
Show file tree

Hide file tree

Showing 5 changed files with 866 additions and 327 deletions.
diff --git a/grammar.js b/grammar.js
@@ -21,14 +21,22 @@ module.exports = grammar({
     )),
 
     expression: $ => prec.right(seq(
+      optional("("),
       repeat1(choice(
         $.identifier,
         $.connection,
       )),
+      optional(")"),
+      optional(seq(
+        $.connection_identifier,
+        $.sub_identifier
+      )),
       optional($.label),
       optional(choice(/\n+/, ";")),
     )),
 
+
+
     label: _ => seq(":", choice(
       // seq("|", /.+/, "|"),
       /.+/,
@@ -79,6 +87,8 @@ module.exports = grammar({
       seq(/<-+/, /\\\n+\s+/, /-+>/),
     ),
 
+    connection_identifier: _ => /\[\d+\]/,
+
     // param_value: _ => /[\w\-_]+/i,
 
     // const-like rules

diff --git a/src/grammar.json b/src/grammar.json
@@ -70,6 +70,18 @@
       "content": {
         "type": "SEQ",
         "members": [
+          {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "STRING",
+                "value": "("
+              },
+              {
+                "type": "BLANK"
+              }
+            ]
+          },
           {
             "type": "REPEAT1",
             "content": {
@@ -86,6 +98,39 @@
               ]
             }
           },
+          {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "STRING",
+                "value": ")"
+              },
+              {
+                "type": "BLANK"
+              }
+            ]
+          },
+          {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SEQ",
+                "members": [
+                  {
+                    "type": "SYMBOL",
+                    "name": "connection_identifier"
+                  },
+                  {
+                    "type": "SYMBOL",
+                    "name": "sub_identifier"
+                  }
+                ]
+              },
+              {
+                "type": "BLANK"
+              }
+            ]
+          },
           {
             "type": "CHOICE",
             "members": [
@@ -266,6 +311,10 @@
         }
       ]
     },
+    "connection_identifier": {
+      "type": "PATTERN",
+      "value": "\\[\\d+\\]"
+    },
     "_ident_regex": {
       "type": "PATTERN",
       "value": "[\\p{L}0-9_\"' ]+"

diff --git a/src/node-types.json b/src/node-types.json
@@ -16,13 +16,21 @@
           "type": "connection",
           "named": true
         },
+        {
+          "type": "connection_identifier",
+          "named": true
+        },
         {
           "type": "identifier",
           "named": true
         },
         {
           "type": "label",
           "named": true
+        },
+        {
+          "type": "sub_identifier",
+          "named": true
         }
       ]
     }
@@ -77,6 +85,14 @@
       ]
     }
   },
+  {
+    "type": "(",
+    "named": false
+  },
+  {
+    "type": ")",
+    "named": false
+  },
   {
     "type": "-",
     "named": false
@@ -93,6 +109,10 @@
     "type": ";",
     "named": false
   },
+  {
+    "type": "connection_identifier",
+    "named": true
+  },
   {
     "type": "direction",
     "named": false