Predrok 2025 - Naloga 1

grammar.txt

@@ -69,4 +69,28 @@ restinits -> COMMA initializer restinits | .
 initializer -> INTCONST intconstmult | CHARCONST | STRINGCONST .
 intconstmult -> MUL const | .
 
-const -> INTCONST | CHARCONST | STRINGCONST .
+const -> INTCONST | CHARCONST | STRINGCONST .
+
+
+--------------------------------------------------------------------
+
+//LEFT ASOC.
+exp0 = exp0 op other | other
+
+    |
+    v
+
+exp0  = other exp0'
+exp0' = op other exp0' | .
+
+
+
+
+//RIGHT ASOC.
+exp0 = other op exp0 | other
+
+    |
+    v
+
+exp0  = other exp0'
+exp0' =  op exp0 | .

prg/test.pins25

@@ -1,12 +1,5 @@
-fun putstr(s)
+// line1 --
+line2 -----x
+line3
 
-fun f1() =
+fun main() = 0
-	putstr("funkcija 1\n\00"),
-	0
-
-fun f2() =
-	putstr("funkcija 2\n\00"),
-	0
-
-fun main() =
-	f1() || f2()

src/pins25/phase/CodeGen.java

@@ -227,10 +227,13 @@ public class CodeGen {
 
             @Override
             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<>();
 
+                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;
@@ -247,35 +250,8 @@ public class CodeGen {
                     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);
                 return code;
             }

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();
                 }