Skip right expression evaluation in OR if left returns true

grammar.txt

@@ -39,9 +39,8 @@ restcmp -> EQU addexpr
 		 | .
 
 addexpr -> multexpr restadd .
-restadd -> ADD addexpr
+restadd -> ADD multexpr restadd
-		 | SUB addexpr
+		 | SUB multexpr restadd | .
-		 | .
 
 multexpr -> prefixexpr restmult .
 restmult -> MUL prefixexpr restmult

prg/test.pins25

@@ -1,3 +1,12 @@
+fun putstr(s)
+
+fun f1() =
+	putstr("funkcija 1\n\00"),
+	0
+
+fun f2() =
+	putstr("funkcija 2\n\00"),
+	0
 
 fun main() =
-	3 - 2 - 1
+	f1() || f2()

src/pins25/phase/CodeGen.java

@@ -227,13 +227,10 @@ public class CodeGen {
 
             @Override
             public List<PDM.CodeInstr> visit(AST.BinExpr binExpr, Mem.Frame frame) {
-                Report.Locatable loc = attrAST.attrLoc.get(binExpr);
+                Report.Location loc = attrAST.attrLoc.get(binExpr).location();
 
                 List<PDM.CodeInstr> code = new ArrayList<>();
 
-                code.addAll(binExpr.fstExpr.accept(this, frame));
-                code.addAll(binExpr.sndExpr.accept(this, frame));
-
                 PDM.OPER.Oper oper = switch (binExpr.oper) {
                     case OR -> PDM.OPER.Oper.OR;
                     case AND -> PDM.OPER.Oper.AND;
@@ -250,7 +247,34 @@ public class CodeGen {
                     case MOD -> PDM.OPER.Oper.MOD;
                 };
 
+                if (oper == PDM.OPER.Oper.OR) {
+                    String locStr = loc.begLine() + ":" + loc.begColumn();
+                    String rightLabel = "$or:right" + locStr;
+                    String skipLabel = "$or:skip@" + locStr;
+                    String endLabel = "$or:end@" + locStr;
+
+                    code.addAll(binExpr.fstExpr.accept(this, frame));
+                    code.add(new PDM.NAME(skipLabel, loc));
+                    code.add(new PDM.NAME(rightLabel, loc));
+                    code.add(new PDM.CJMP(loc));
+
+                    code.add(new PDM.LABEL(rightLabel, loc));
+                    code.add(new PDM.PUSH(0, loc));
+                    code.addAll(binExpr.sndExpr.accept(this, frame));
                     code.add(new PDM.OPER(oper, loc));
+                    code.add(new PDM.NAME(endLabel, loc));
+                    code.add(new PDM.UJMP(loc));
+
+                    code.add(new PDM.LABEL(skipLabel, loc));
+                    code.add(new PDM.PUSH(1, loc));
+
+                    code.add(new PDM.LABEL(endLabel, loc));
+                } else {
+                    code.addAll(binExpr.fstExpr.accept(this, frame));
+                    code.addAll(binExpr.sndExpr.accept(this, frame));
+
+                    code.add(new PDM.OPER(oper, loc));
+                }
                 
                 attrAST.attrCode.put(binExpr, code);
                 return code;

src/pins25/phase/SynAn.java

@@ -540,20 +540,20 @@ public class SynAn implements AutoCloseable {
         Token token = lexAn.peekToken();
         switch (token.symbol()) {
             case ADD: {
-                // restadd -> ADD addexpr
+                // restadd -> ADD multexpr restadd
                 check(Token.Symbol.ADD);
-                AST.Expr right = parseAdditionExpression();
+                AST.Expr right = parseMultiplicationExpression();
                 AST.Expr binExpr = new AST.BinExpr(AST.BinExpr.Oper.ADD, left, right);
                 attrLoc.put(binExpr, new Report.Location(attrLoc.get(left), attrLoc.get(right)));
-                return binExpr;
+                return parseRestAdditionExpressions(binExpr);
             }
             case SUB: {
-                // restadd -> ADD addexpr
+                // restadd -> SUB multexpr restadd
                 check(Token.Symbol.SUB);
-                AST.Expr right = parseAdditionExpression();
+                AST.Expr right = parseMultiplicationExpression();
                 AST.Expr binExpr = new AST.BinExpr(AST.BinExpr.Oper.SUB, left, right);
                 attrLoc.put(binExpr, new Report.Location(attrLoc.get(left), attrLoc.get(right)));
-                return binExpr;
+                return parseRestAdditionExpressions(binExpr);
             }
 
             default: