Compare commits
1 Commits
or-skip-ri
...
comment-le
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b325647ad9 |
@@ -1,12 +1,2 @@
|
|||||||
fun putstr(s)
|
//1234567890
|
||||||
|
//12345678901
|
||||||
fun f1() =
|
|
||||||
putstr("funkcija 1\n\00"),
|
|
||||||
0
|
|
||||||
|
|
||||||
fun f2() =
|
|
||||||
putstr("funkcija 2\n\00"),
|
|
||||||
0
|
|
||||||
|
|
||||||
fun main() =
|
|
||||||
f1() || f2()
|
|
||||||
@@ -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,35 +250,8 @@ 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;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -246,8 +246,14 @@ public class LexAn implements AutoCloseable {
|
|||||||
buffToken = new Token(start, Token.Symbol.DIV, "/");
|
buffToken = new Token(start, Token.Symbol.DIV, "/");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
nextChar();
|
||||||
|
|
||||||
|
int length = 0;
|
||||||
while (buffChar != '\n' && buffChar != -1) {
|
while (buffChar != '\n' && buffChar != -1) {
|
||||||
|
length++;
|
||||||
|
if (length > 10) {
|
||||||
|
throw new Report.Error(currentLocation(), "Comments can only be 10 characters long");
|
||||||
|
}
|
||||||
nextChar();
|
nextChar();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user