Predrok 2025 - Naloga 2

prg/test.pins25

@@ -1,5 +1,13 @@
-// line1 --
-line2 -----x
-line3
+fun putstr(n)
+fun putint(b)
 
-fun main() = 0
+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")

src/pins25/phase/CodeGen.java

@@ -231,6 +231,39 @@ public class CodeGen {
 
                 List<PDM.CodeInstr> code = new ArrayList<>();
 
+                if (binExpr.oper == AST.BinExpr.Oper.MOD) {
+                    // a - a / b * b
+
+                    String tmpLabel = "$tmp@" + loc.location().begLine() + ":" + loc.location().begColumn();
+
+                    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));
 
@@ -251,6 +284,7 @@ public class CodeGen {
                     };
 
                     code.add(new PDM.OPER(oper, loc));
+                }
 
                 attrAST.attrCode.put(binExpr, code);
                 return code;
@@ -683,6 +717,12 @@ 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,13 +247,7 @@ public class LexAn implements AutoCloseable {
                     return;
                 }
 
-                StringBuilder builder = new StringBuilder();
-                
-                while (buffChar != -1) {
-                    if (buffChar == '\n' && !builder.toString().endsWith("--")) {
-                        break;
-                    }
-                    builder.append((char) buffChar);
+                while (buffChar != '\n' && buffChar != -1) {
                     nextChar();
                 }