Predrok 2025 - Naloga 1

prg/test.pins25

@@ -1,13 +1,5 @@
-fun putstr(n)
-fun putint(b)
+// line1 --
+line2 -----x
+line3
 
-fun a() = putstr("a called\n\00"), 40
-fun b() = putstr("b called\n\00"), 7
-
-fun main() =
-	putint(10 % 7),
-	putstr("\n\00"),
-	putint(30 % 25),
-	putstr("\n\00"),
-	putint(a() % b()),
-	putstr("\n\00")
+fun main() = 0

src/pins25/phase/CodeGen.java

@@ -231,60 +231,26 @@ public class CodeGen {
 
                 List<PDM.CodeInstr> code = new ArrayList<>();
 
-                if (binExpr.oper == AST.BinExpr.Oper.MOD) {
-                    // a - a / b * b
+                code.addAll(binExpr.fstExpr.accept(this, frame));
+                code.addAll(binExpr.sndExpr.accept(this, frame));
 
-                    String tmpLabel = "$tmp@" + loc.location().begLine() + ":" + loc.location().begColumn();
+                PDM.OPER.Oper oper = switch (binExpr.oper) {
+                    case OR -> PDM.OPER.Oper.OR;
+                    case AND -> PDM.OPER.Oper.AND;
+                    case EQU -> PDM.OPER.Oper.EQU;
+                    case NEQ -> PDM.OPER.Oper.NEQ;
+                    case GTH -> PDM.OPER.Oper.GTH;
+                    case LTH -> PDM.OPER.Oper.LTH;
+                    case GEQ -> PDM.OPER.Oper.GEQ;
+                    case LEQ -> PDM.OPER.Oper.LEQ;
+                    case ADD -> PDM.OPER.Oper.ADD;
+                    case SUB -> PDM.OPER.Oper.SUB;
+                    case MUL -> PDM.OPER.Oper.MUL;
+                    case DIV -> PDM.OPER.Oper.DIV;
+                    case MOD -> PDM.OPER.Oper.MOD;
+                };
 
-                    code.addAll(binExpr.fstExpr.accept(this, frame));
-                    // dup a
-                    code.add(new PDM.REGN(PDM.REGN.Reg.SP, loc));
-                    code.add(new PDM.LOAD(loc));
-
-                    code.addAll(binExpr.sndExpr.accept(this, frame));
-                    // dup b
-                    code.add(new PDM.REGN(PDM.REGN.Reg.SP, loc));
-                    code.add(new PDM.LOAD(loc));
-                    // save b
-                    code.add(new PDM.NAME(tmpLabel, loc));
-                    code.add(new PDM.SAVE(loc));
-
-                    code.add(new PDM.OPER(PDM.OPER.Oper.DIV, loc));
-
-                    // load second b
-                    code.add(new PDM.NAME(tmpLabel, loc));
-                    code.add(new PDM.LOAD(loc));
-
-                    code.add(new PDM.OPER(PDM.OPER.Oper.MUL, loc));
-
-                    code.add(new PDM.OPER(PDM.OPER.Oper.SUB, loc));
-
-                    List<PDM.DataInstr> data = new ArrayList<>();
-                    data.add(new PDM.LABEL(tmpLabel, loc));
-                    data.add(new PDM.DATA(0, loc));
-                    attrAST.attrData.put(binExpr, data);
-                } else {
-                    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;
-                        case EQU -> PDM.OPER.Oper.EQU;
-                        case NEQ -> PDM.OPER.Oper.NEQ;
-                        case GTH -> PDM.OPER.Oper.GTH;
-                        case LTH -> PDM.OPER.Oper.LTH;
-                        case GEQ -> PDM.OPER.Oper.GEQ;
-                        case LEQ -> PDM.OPER.Oper.LEQ;
-                        case ADD -> PDM.OPER.Oper.ADD;
-                        case SUB -> PDM.OPER.Oper.SUB;
-                        case MUL -> PDM.OPER.Oper.MUL;
-                        case DIV -> PDM.OPER.Oper.DIV;
-                        case MOD -> PDM.OPER.Oper.MOD;
-                    };
-
-                    code.add(new PDM.OPER(oper, loc));
-                }
+                code.add(new PDM.OPER(oper, loc));
 
                 attrAST.attrCode.put(binExpr, code);
                 return code;
@@ -717,12 +683,6 @@ public class CodeGen {
                 return null;
             }
 
-            @Override
-            public Object visit(AST.BinExpr binExpr, Object arg) {
-                List<PDM.DataInstr> data = attrAST.attrData.get(binExpr);
-                if (data != null) dataSegment.addAll(data);
-                return null;
-            }
         }
 
     }

src/pins25/phase/LexAn.java

@@ -247,7 +247,13 @@ public class LexAn implements AutoCloseable {
                     return;
                 }
 
-                while (buffChar != '\n' && buffChar != -1) {
+                StringBuilder builder = new StringBuilder();
+                
+                while (buffChar != -1) {
+                    if (buffChar == '\n' && !builder.toString().endsWith("--")) {
+                        break;
+                    }
+                    builder.append((char) buffChar);
                     nextChar();
                 }