Option #1: use expression

DerekStride · Mar 13, 2023 · e9cf694 · e9cf694
1 parent 2fb8be4
commit e9cf694
Show file tree

Hide file tree

Showing 5 changed files with 162,656 additions and 149,996 deletions.
diff --git a/grammar.js b/grammar.js
@@ -20,10 +20,9 @@ module.exports = grammar({
       'binary_relation',
       'binary_concat',
       'pattern_matching',
+      'between',
       'clause_connective',
       'clause_disjunctive',
-      'between',
-      'not_between',
     ],
   ],
 
@@ -1799,10 +1798,10 @@ module.exports = grammar({
     between_expression: $ => choice(
       ...[
             [$.keyword_between, 'between'],
-            [seq($.keyword_not, $.keyword_between), 'not_between'],
+            [seq($.keyword_not, $.keyword_between), 'between'],
         ].map(([operator, precedence]) =>
                 prec.left(precedence, seq(
-                field('left', $.identifier),
+                field('left', $._expression),
                 field('operator', operator),
                 field('low', $._expression),
                 $.keyword_and,

diff --git a/src/grammar.json b/src/grammar.json