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

Compare commits

base: fri:or-skip-right
Branches Tags
fri:master
fri:2025-predrok/02-no-mod
fri:2025-predrok/01-multiline-comments
fri:until
fri:comment-length-limit
fri:add-right-assoc
fri:or-skip-right
fri:line-symbol
fri:multiline-comments
fri:add-bind-stronger
fri:times-init
..
compare: fri:master
Branches Tags
fri:2025-predrok/02-no-mod
fri:2025-predrok/01-multiline-comments
fri:until
fri:comment-length-limit
fri:add-right-assoc
fri:or-skip-right
fri:line-symbol
fri:multiline-comments
fri:add-bind-stronger
fri:times-init
fri:master

No commits in common. "or-skip-right" and "master" have entirely different histories.
or-skip-ri ... master

3 changed files with 6 additions and 41 deletions
Show Stats Expand all files Collapse all files

1
.gitignore vendored
View File

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

12
prg/test.pins25
View File

@ -1,12 +0,0 @@
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,10 +227,13 @@ public class CodeGen {
@Override @Override
public List<PDM.CodeInstr> visit(AST.BinExpr binExpr, Mem.Frame frame) { public List<PDM.CodeInstr> visit(AST.BinExpr binExpr, Mem.Frame frame) {
Report.Location loc = attrAST.attrLoc.get(binExpr).location(); Report.Locatable loc = attrAST.attrLoc.get(binExpr);
List<PDM.CodeInstr> code = new ArrayList<>(); 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) { PDM.OPER.Oper oper = switch (binExpr.oper) {
case OR -> PDM.OPER.Oper.OR; case OR -> PDM.OPER.Oper.OR;
case AND -> PDM.OPER.Oper.AND; case AND -> PDM.OPER.Oper.AND;
@ -247,34 +250,7 @@ public class CodeGen {
case MOD -> PDM.OPER.Oper.MOD; case MOD -> PDM.OPER.Oper.MOD;
}; };
if (oper == PDM.OPER.Oper.OR) { code.add(new PDM.OPER(oper, loc));
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); attrAST.attrCode.put(binExpr, code);
return code; return code;