fix operations precendence

src/grammar/grammar.ohm

@@ -126,35 +126,50 @@ Tact {
 
     // Expressions
     Expression = ExpressionConditional
+
     ExpressionConditional = ExpressionOr "?" ExpressionOr ":" ExpressionConditional --ternary
                           | ExpressionOr
+
     ExpressionOr = ExpressionOr "||" ExpressionAnd --or
                  | ExpressionAnd
-    ExpressionAnd = ExpressionAnd "&&" ExpressionCompare --and
-                  | ExpressionCompare
-    ExpressionCompare = ExpressionCompare "!=" ExpressionBinary --not
-                      | ExpressionCompare "==" ExpressionBinary --eq
-                      | ExpressionCompare ">" ExpressionBinary --gt
-                      | ExpressionCompare ">=" ExpressionBinary --gte
-                      | ExpressionCompare "<" ExpressionBinary --lt
-                      | ExpressionCompare "<=" ExpressionBinary --lte
-                      | ExpressionBinary
-    ExpressionBinary = ExpressionBinary ">>" ExpressionAdd --shr
-                    | ExpressionBinary "<<" ExpressionAdd --shl
-                    | ExpressionBinary "&" ExpressionAdd --bin_and
-                    | ExpressionBinary "|" ExpressionAdd --bin_or
-                    | ExpressionAdd
+
+    ExpressionAnd = ExpressionAnd "&&" ExpressionBinaryOr --and
+                  | ExpressionBinaryOr
+
+    ExpressionBinaryOr = ExpressionBinaryOr "|" ExpressionBinaryAnd --bin_or
+                       | ExpressionBinaryAnd
+
+    ExpressionBinaryAnd = ExpressionBinaryAnd "&" ExpressionEquality --bin_and
+                        | ExpressionEquality
+
+    ExpressionEquality = ExpressionEquality "!=" ExpressionCompare --not
+                       | ExpressionEquality "==" ExpressionCompare --eq
+                       | ExpressionCompare
+
+    ExpressionCompare = ExpressionCompare ">" ExpressionBinaryShift --gt
+                      | ExpressionCompare ">=" ExpressionBinaryShift --gte
+                      | ExpressionCompare "<" ExpressionBinaryShift --lt
+                      | ExpressionCompare "<=" ExpressionBinaryShift --lte
+                      | ExpressionBinaryShift
+
+    ExpressionBinaryShift = ExpressionBinaryShift "<<" ExpressionAdd --shl
+                          | ExpressionBinaryShift ">>" ExpressionAdd --shr
+                          | ExpressionAdd
+
     ExpressionAdd = ExpressionAdd "+" ~"+" ExpressionMul --add
                   | ExpressionAdd "-" ~"-" ExpressionMul --sub
                   | ExpressionMul
+
     ExpressionMul = ExpressionMul "*" ExpressionUnary --mul
                   | ExpressionMul "/" ExpressionUnary --div
                   | ExpressionMul "%" ExpressionUnary --rem
                   | ExpressionUnary
+
     ExpressionUnary = "-" ExpressionValue --neg
                     | "+" ExpressionValue --add
                     | "!" ExpressionValue --not
                     | ExpressionValue
+
     ExpressionBracket = "(" Expression ")"
 
     // Order is important

src/grammar/grammar.ts

@@ -973,7 +973,7 @@ semantics.addOperation<ASTNode>("resolve_expression", {
             ref: createRef(this),
         });
     },
-    ExpressionCompare_eq(arg0, _arg1, arg2) {
+    ExpressionEquality_eq(arg0, _arg1, arg2) {
         return createNode({
             kind: "op_binary",
             op: "==",
@@ -982,7 +982,7 @@ semantics.addOperation<ASTNode>("resolve_expression", {
             ref: createRef(this),
         });
     },
-    ExpressionCompare_not(arg0, _arg1, arg2) {
+    ExpressionEquality_not(arg0, _arg1, arg2) {
         return createNode({
             kind: "op_binary",
             op: "!=",
@@ -1045,7 +1045,7 @@ semantics.addOperation<ASTNode>("resolve_expression", {
             ref: createRef(this),
         });
     },
-    ExpressionBinary_shr(arg0, _arg1, arg2) {
+    ExpressionBinaryShift_shr(arg0, _arg1, arg2) {
         return createNode({
             kind: "op_binary",
             op: ">>",
@@ -1054,7 +1054,7 @@ semantics.addOperation<ASTNode>("resolve_expression", {
             ref: createRef(this),
         });
     },
-    ExpressionBinary_shl(arg0, _arg1, arg2) {
+    ExpressionBinaryShift_shl(arg0, _arg1, arg2) {
         return createNode({
             kind: "op_binary",
             op: "<<",
@@ -1063,7 +1063,7 @@ semantics.addOperation<ASTNode>("resolve_expression", {
             ref: createRef(this),
         });
     },
-    ExpressionBinary_bin_and(arg0, _arg1, arg2) {
+    ExpressionBinaryAnd_bin_and(arg0, _arg1, arg2) {
         return createNode({
             kind: "op_binary",
             op: "&",
@@ -1072,7 +1072,7 @@ semantics.addOperation<ASTNode>("resolve_expression", {
             ref: createRef(this),
         });
     },
-    ExpressionBinary_bin_or(arg0, _arg1, arg2) {
+    ExpressionBinaryOr_bin_or(arg0, _arg1, arg2) {
         return createNode({
             kind: "op_binary",
             op: "|",

src/test/feature-precendence.spec.ts

@@ -0,0 +1,28 @@
+import { toNano } from "@ton/core";
+import { ContractSystem } from "@tact-lang/emulator";
+import { __DANGER_resetNodeId } from "../grammar/ast";
+import { PrecendenceTester } from "./features/output/precendence_PrecendenceTester";
+
+describe("feature-precendence", () => {
+    beforeEach(() => {
+        __DANGER_resetNodeId();
+    });
+    it("should implement precendence of operations correctly", async () => {
+        // Init
+        const system = await ContractSystem.create();
+        const treasure = system.treasure("treasure");
+        const contract = system.open(await PrecendenceTester.fromInit());
+        await contract.send(
+            treasure,
+            { value: toNano("10") },
+            { $$type: "Deploy", queryId: 0n },
+        );
+        await system.run();
+
+        // Check methods
+        expect(await contract.getTest1()).toEqual(12n);
+        expect(await contract.getTest2()).toEqual(4n);
+        expect(await contract.getTest3()).toEqual(12n);
+        expect(await contract.getTest4()).toEqual(12n);
+    });
+});

src/test/features/precendence.tact

@@ -0,0 +1,23 @@
+import "@stdlib/deploy";
+
+contract PrecendenceTester with Deployable {
+    init() {
+
+    }
+
+    get fun test1(): Int {
+        return 5 & 6 | 1 << 5 + 11 * 3 % 12 >> 11;
+    }
+
+    get fun test2(): Int {
+        return 5 & 6 | 1 << (5 + 11) * 3 % 12 >> 11;
+    }
+
+    get fun test3(): Int {
+        return 5 & 6 | 1 << 5 + 11 * (3 % 12) >> 35;
+    }
+
+    get fun test4(): Int {
+        return 5 & 6 | 1 << 5 + (11 * 3) % 12 >> 11;
+    }
+}

tact.config.json

@@ -238,6 +238,14 @@
         "debug": true
       }
     },
+    {
+      "name": "precendence",
+      "path": "./src/test/features/precendence.tact",
+      "output": "./src/test/features/output",
+      "options": {
+        "debug": true
+      }
+    },
     {
       "name": "ternary",
       "path": "./src/test/features/ternary.tact",