Add rellitvec

potassco · Jun 24, 2024 · c2aeaad · c2aeaad
1 parent 09d5da3
commit c2aeaad
Show file tree

Hide file tree

Showing 5 changed files with 11,467 additions and 11,281 deletions.
diff --git a/grammar.js b/grammar.js
@@ -257,6 +257,11 @@ module.exports = grammar({
       seq($.SUB, $._widentifier, $.argvec, $.RPAREN),
     ),
 
+    rellitvec: $ => choice(
+      seq($.cmp , $.term),
+      seq($.rellitvec, $.cmp, $.term)
+    ),
+
     literal: $ => choice(
       $.TRUE,
       seq($.NOT, $.TRUE),
@@ -267,9 +272,9 @@ module.exports = grammar({
       $.atom,
       seq($.NOT, $.atom),
       seq($.NOT, $.NOT, $.atom),
-      seq($.term, $.cmp, $.term),
-      seq($.NOT, $.term, $.cmp, $.term),
-      seq($.NOT, $.NOT, $.term, $.cmp, $.term),
+      seq($.term, $.rellitvec),
+      seq($.NOT, $.term, $.rellitvec),
+      seq($.NOT, $.NOT, $.term, $.rellitvec),
       $.csp_literal
     ),
 

diff --git a/src/grammar.json b/src/grammar.json
@@ -1779,6 +1779,41 @@
         }
       ]
     },
+    "rellitvec": {
+      "type": "CHOICE",
+      "members": [
+        {
+          "type": "SEQ",
+          "members": [
+            {
+              "type": "SYMBOL",
+              "name": "cmp"
+            },
+            {
+              "type": "SYMBOL",
+              "name": "term"
+            }
+          ]
+        },
+        {
+          "type": "SEQ",
+          "members": [
+            {
+              "type": "SYMBOL",
+              "name": "rellitvec"
+            },
+            {
+              "type": "SYMBOL",
+              "name": "cmp"
+            },
+            {
+              "type": "SYMBOL",
+              "name": "term"
+            }
+          ]
+        }
+      ]
+    },
     "literal": {
       "type": "CHOICE",
       "members": [
@@ -1893,11 +1928,7 @@
             },
             {
               "type": "SYMBOL",
-              "name": "cmp"
-            },
-            {
-              "type": "SYMBOL",
-              "name": "term"
+              "name": "rellitvec"
             }
           ]
         },
@@ -1914,11 +1945,7 @@
             },
             {
               "type": "SYMBOL",
-              "name": "cmp"
-            },
-            {
-              "type": "SYMBOL",
-              "name": "term"
+              "name": "rellitvec"
             }
           ]
         },
@@ -1939,11 +1966,7 @@
             },
             {
               "type": "SYMBOL",
-              "name": "cmp"
-            },
-            {
-              "type": "SYMBOL",
-              "name": "term"
+              "name": "rellitvec"
             }
           ]
         },

diff --git a/src/node-types.json b/src/node-types.json
@@ -1036,11 +1036,11 @@
           "named": true
         },
         {
-          "type": "cmp",
+          "type": "csp_literal",
           "named": true
         },
         {
-          "type": "csp_literal",
+          "type": "rellitvec",
           "named": true
         },
         {
@@ -1296,6 +1296,29 @@
       ]
     }
   },
+  {
+    "type": "rellitvec",
+    "named": true,
+    "fields": {},
+    "children": {
+      "multiple": true,
+      "required": true,
+      "types": [
+        {
+          "type": "cmp",
+          "named": true
+        },
+        {
+          "type": "rellitvec",
+          "named": true
+        },
+        {
+          "type": "term",
+          "named": true
+        }
+      ]
+    }
+  },
   {
     "type": "source_file",
     "named": true,