Merge pull request #171 from DerekStride/ds/json

alternative implementation using binary_expression
DerekStride · Jun 29, 2023 · e238bc9 · e238bc9
2 parents 16b2631 + c0e3be8
commit e238bc9
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 43 deletions.
diff --git a/grammar.js b/grammar.js
@@ -2318,22 +2318,10 @@ module.exports = grammar({
         $.array,
         $.interval,
         $.between_expression,
-        $.json_traversal,
         seq("(", $._expression, ")"),
       )
     ),
 
-    json_traversal: $ => seq(
-      $._expression,
-      choice(
-        '->',
-        '->>',
-        '#>',
-        '#>>',
-      ),
-      $._literal_string,
-    ),
-
     binary_expression: $ => choice(
       ...[
         ['+', 'binary_plus'],
@@ -2350,6 +2338,10 @@ module.exports = grammar({
         ['>=', 'binary_relation'],
         ['>', 'binary_relation'],
         ['<>', 'binary_relation'],
+        ['->', 'binary_relation'],
+        ['->>', 'binary_relation'],
+        ['#>', 'binary_relation'],
+        ['#>>', 'binary_relation'],
         [$.keyword_is, 'binary_is'],
         [$.is_not, 'binary_is'],
         [$.keyword_like, 'pattern_matching'],

diff --git a/test/corpus/json.txt b/test/corpus/json.txt
@@ -13,35 +13,42 @@ FROM users;
 --------------------------------------------------------------------------------
 
 (program
- (statement
-  (select
-   (keyword_select)
-   (select_expression
-    (term
-     (json_traversal
-      (literal))
-     (keyword_as)
-     (identifier))
-    (term
-     (json_traversal
-      (json_traversal
-       (literal))))
-    (term
-     (json_traversal
-      (json_traversal
-       (literal)))
-     (keyword_as)
-     (identifier))
-    (term
-     (json_traversal
-      (literal)))
-    (term
-     (json_traversal
-      (literal))
-      (keyword_as)
-      (identifier))))
+  (statement
+    (select
+      (keyword_select)
+      (select_expression
+        (term
+          value: (binary_expression
+            left: (literal)
+            right: (literal))
+          (keyword_as)
+          alias: (identifier))
+        (term
+          value: (binary_expression
+            left: (binary_expression
+              left: (literal)
+              right: (literal))
+            right: (literal)))
+        (term
+          value: (binary_expression
+            left: (binary_expression
+              left: (literal)
+              right: (literal))
+            right: (literal))
+          (keyword_as)
+          alias: (identifier))
+        (term
+          value: (binary_expression
+            left: (literal)
+            right: (literal)))
+        (term
+          value: (binary_expression
+            left: (literal)
+            right: (literal))
+          (keyword_as)
+          alias: (identifier))))
     (from
-     (keyword_from)
-     (relation
-      (object_reference
-       (identifier))))))
+      (keyword_from)
+      (relation
+        (object_reference
+          name: (identifier))))))