Added Test cases for sequence operations and added select_suffix to p…

…rimary expression
kcl-lang · Jul 13, 2024 · 18583ab · 18583ab
1 parent 87f1074
commit 18583ab
Show file tree

Hide file tree

Showing 5 changed files with 84,540 additions and 81,303 deletions.
diff --git a/grammar.js b/grammar.js
@@ -567,6 +567,7 @@ module.exports = grammar({
       $.unary_operator,
       $.attribute,
       $.subscript,
+      $.select_suffix,
       $.call,
       $.list,
       $.list_comprehension,
@@ -724,13 +725,13 @@ module.exports = grammar({
       field('argument', $.primary_expression),
     )),
 
-    sequence_operation: $ => seq(choice(
+    sequence_operation: $ => prec(23, seq(choice(
       $.in_operation,
       $.not_in_operation,
       $.concatenation,
       $.subscript,
       $.call,
-    )),
+    ))),
 
     in_operation: $ => prec.left(3, seq(choice($.list_comprehension, $.dictionary_comprehension, $.list, $.dictionary), 'in', choice($.list_comprehension, $.dictionary_comprehension, $.list, $.dictionary))),
     not_in_operation: $ => prec.left(11, seq(choice($.list_comprehension, $.dictionary_comprehension, $.list, $.dictionary), 'not', 'in', $.expression)),

diff --git a/src/grammar.json b/src/grammar.json
@@ -1614,6 +1614,10 @@
             "type": "SYMBOL",
             "name": "subscript"
           },
+          {
+            "type": "SYMBOL",
+            "name": "select_suffix"
+          },
           {
             "type": "SYMBOL",
             "name": "call"
@@ -2129,7 +2133,7 @@
         },
         {
           "type": "SYMBOL",
-          "name": "expression"
+          "name": "test"
         }
       ]
     },
@@ -2594,34 +2598,38 @@
       }
     },
     "sequence_operation": {
-      "type": "SEQ",
-      "members": [
-        {
-          "type": "CHOICE",
-          "members": [
-            {
-              "type": "SYMBOL",
-              "name": "in_operation"
-            },
-            {
-              "type": "SYMBOL",
-              "name": "not_in_operation"
-            },
-            {
-              "type": "SYMBOL",
-              "name": "concatenation"
-            },
-            {
-              "type": "SYMBOL",
-              "name": "subscript"
-            },
-            {
-              "type": "SYMBOL",
-              "name": "call"
-            }
-          ]
-        }
-      ]
+      "type": "PREC",
+      "value": 23,
+      "content": {
+        "type": "SEQ",
+        "members": [
+          {
+            "type": "CHOICE",
+            "members": [
+              {
+                "type": "SYMBOL",
+                "name": "in_operation"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "not_in_operation"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "concatenation"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "subscript"
+              },
+              {
+                "type": "SYMBOL",
+                "name": "call"
+              }
+            ]
+          }
+        ]
+      }
     },
     "in_operation": {
       "type": "PREC_LEFT",

diff --git a/src/node-types.json b/src/node-types.json
@@ -223,6 +223,10 @@
         "type": "schema_expr",
         "named": true
       },
+      {
+        "type": "select_suffix",
+        "named": true
+      },
       {
         "type": "string",
         "named": true