fri/pns
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Skip right expression evaluation in OR if left returns true

Browse Source
This commit is contained in:
Gašper Dobrovoljc 2025-06-03 18:26:19 +02:00
parent 1b45d6a0f9
commit 73e1113764
No known key found for this signature in database
GPG Key ID: 0E7E037018CFA5A5
3 changed files with 41 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -3,4 +3,3 @@ out/
*.zip
prg/**/*.ast
prg/**/*.out
prg/**/*.pins25

12
prg/test.pins25 Normal file
View File

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

34
src/pins25/phase/CodeGen.java
View File

@ -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;
};
code.add(new PDM.OPER(oper, loc));
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;