context precedence, more tests

uben0 · Apr 9, 2024 · 13863dd · 13863dd
1 parent 1ad9724
commit 13863dd
Show file tree

Hide file tree

Showing 4 changed files with 14,350 additions and 14,260 deletions.
diff --git a/grammar.js b/grammar.js
@@ -400,9 +400,9 @@ module.exports = grammar({
       optional(seq($.unit, $._immediate))
     )),
     string: $ => seq('"', repeat(choice($._token_string_blob, $.escape)), '"', $._immediate),
-    context:$ => prec.left(  0, seq("context", $._expr)),
     tagged: $ => prec.left(  1, seq(field('field', $._expr), ':', $._expr)),
-    elude:  $ => prec.left(  2, seq('..', optional($._expr))),
+    context:$ => prec.left(  2, seq("context", $._expr)),
+    elude:  $ => prec.left(  3, seq('..', optional($._expr))),
     assign: $ => prec.right( 4, seq(field('pattern', $._expr), alias(token(choice('=', '+=', '-=', '*=', '/=')), "assign"), field('value', $._expr))),
     lambda: $ => prec.right( 5, seq(field('pattern', $._expr), '=>', field('value', $._expr))),
     or:     $ => prec.left(  6, seq($._expr, 'or', $._expr)),

diff --git a/src/grammar.json b/src/grammar.json
@@ -2184,15 +2184,23 @@
         }
       ]
     },
-    "context": {
+    "tagged": {
       "type": "PREC_LEFT",
-      "value": 0,
+      "value": 1,
       "content": {
         "type": "SEQ",
         "members": [
+          {
+            "type": "FIELD",
+            "name": "field",
+            "content": {
+              "type": "SYMBOL",
+              "name": "_expr"
+            }
+          },
           {
             "type": "STRING",
-            "value": "context"
+            "value": ":"
           },
           {
             "type": "SYMBOL",
@@ -2201,23 +2209,15 @@
         ]
       }
     },
-    "tagged": {
+    "context": {
       "type": "PREC_LEFT",
-      "value": 1,
+      "value": 2,
       "content": {
         "type": "SEQ",
         "members": [
-          {
-            "type": "FIELD",
-            "name": "field",
-            "content": {
-              "type": "SYMBOL",
-              "name": "_expr"
-            }
-          },
           {
             "type": "STRING",
-            "value": ":"
+            "value": "context"
           },
           {
             "type": "SYMBOL",
@@ -2228,7 +2228,7 @@
     },
     "elude": {
       "type": "PREC_LEFT",
-      "value": 2,
+      "value": 3,
       "content": {
         "type": "SEQ",
         "members": [