Move infix_operations to simple_expression

Author: OceanOak

backend/tests/Tests/TreeSitter.Tests.fs

@@ -19,7 +19,7 @@ let toStringTest =
 
     Expect.equal
       (tree.Root.ToString())
-      "(source_file (fn_decl keyword_let: (keyword) name: (fn_identifier) params: (fn_decl_params (fn_decl_param symbol_left_paren: (symbol) identifier: (variable_identifier) symbol_colon: (symbol) typ: (type_reference (builtin_type)) symbol_right_paren: (symbol))) symbol_colon: (symbol) return_type: (type_reference (builtin_type)) symbol_equals: (symbol) body: (expression (infix_operation left: (expression (simple_expression (variable_identifier))) operator: (operator) right: (expression (simple_expression (int64_literal digits: (digits (positive_digits)) suffix: (symbol))))))))"
+      "(source_file (fn_decl keyword_let: (keyword) name: (fn_identifier) params: (fn_decl_params (fn_decl_param symbol_left_paren: (symbol) identifier: (variable_identifier) symbol_colon: (symbol) typ: (type_reference (builtin_type)) symbol_right_paren: (symbol))) symbol_colon: (symbol) return_type: (type_reference (builtin_type)) symbol_equals: (symbol) body: (expression (simple_expression (infix_operation left: (simple_expression (variable_identifier)) operator: (operator) right: (simple_expression (int64_literal digits: (digits (positive_digits)) suffix: (symbol))))))))"
       ""
 
 let tests = testList "TreeSitter" [ toStringTest ]

tree-sitter-darklang/grammar.js

@@ -407,6 +407,7 @@ module.exports = grammar({
         $.record_update,
         $.qualified_const_or_fn_name,
         $.dbReference,
+        $.infix_operation,
       ),
 
     expression: $ =>
@@ -419,7 +420,6 @@ module.exports = grammar({
 
         $.match_expression,
 
-        $.infix_operation,
         $.apply,
 
         $.lambda_expression,
@@ -709,67 +709,67 @@ module.exports = grammar({
         prec.right(
           PREC.EXPONENT,
           seq(
-            field("left", $.expression),
+            field("left", choice($.simple_expression, $.paren_expression)),
             field("operator", alias(exponentOperator, $.operator)),
-            field("right", $.expression),
+            field("right", choice($.simple_expression, $.paren_expression)),
           ),
         ),
 
         // multiplication, division, modulo
         prec.left(
           PREC.PRODUCT,
           seq(
-            field("left", $.expression),
+            field("left", choice($.simple_expression, $.paren_expression)),
             field("operator", alias(multiplicativeOperators, $.operator)),
-            field("right", $.expression),
+            field("right", choice($.simple_expression, $.paren_expression)),
           ),
         ),
 
         // addition, subtraction
         prec.left(
           PREC.SUM,
           seq(
-            field("left", $.expression),
+            field("left", choice($.simple_expression, $.paren_expression)),
             field("operator", alias(additiveOperators, $.operator)),
-            field("right", $.expression),
+            field("right", choice($.simple_expression, $.paren_expression)),
           ),
         ),
 
         // Comparison
         prec.left(
           PREC.COMPARISON,
           seq(
-            field("left", $.expression),
+            field("left", choice($.simple_expression, $.paren_expression)),
             field("operator", alias(comparisonOperators, $.operator)),
-            field("right", $.expression),
+            field("right", choice($.simple_expression, $.paren_expression)),
           ),
         ),
 
         // Logical operations
         prec.left(
           PREC.LOGICAL_AND,
           seq(
-            field("left", $.expression),
+            field("left", choice($.simple_expression, $.paren_expression)),
             field("operator", alias(logicalOperators, $.operator)),
-            field("right", $.expression),
+            field("right", choice($.simple_expression, $.paren_expression)),
           ),
         ),
         prec.left(
           PREC.LOGICAL_OR,
           seq(
-            field("left", $.expression),
+            field("left", choice($.simple_expression, $.paren_expression)),
             field("operator", alias(logicalOperators, $.operator)),
-            field("right", $.expression),
+            field("right", choice($.simple_expression, $.paren_expression)),
           ),
         ),
 
         // String concatenation
         prec.left(
           PREC.SUM,
           seq(
-            field("left", $.expression),
+            field("left", choice($.simple_expression, $.paren_expression)),
             field("operator", alias(stringConcatOperator, $.operator)),
-            field("right", $.expression),
+            field("right", choice($.simple_expression, $.paren_expression)),
           ),
         ),
       ),