Added until statement

grammar.txt

@@ -70,27 +70,3 @@ initializer -> INTCONST intconstmult | CHARCONST | STRINGCONST .
 intconstmult -> MUL const | .
 
 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,13 +1,10 @@
-fun putstr(n)
+var i = 0
-fun putint(b)
-
-fun a() = putstr("a called\n\00"), 40
-fun b() = putstr("b called\n\00"), 7
 
 fun main() =
-	putint(10 % 7),
+	until i >= 10 do
-	putstr("\n\00"),
+		putint(i),
-	putint(30 % 25),
+		i = i + 1
-	putstr("\n\00"),
+	end,
-	putint(a() % b()),
+	0
-	putstr("\n\00")
+
+fun putint(n)

src/pins25/common/Token.java

@@ -57,6 +57,10 @@ public record Token(Report.Location location, Symbol symbol, String lexeme) impl
          * Kljucna beseda {@code while}.
          */
         WHILE,
+        /**
+         * Kljucna beseda {@code until}.
+         */
+        UNTIL,
         /**
          * Kljucna beseda {@code do}.
          */

src/pins25/phase/CodeGen.java

@@ -231,39 +231,6 @@ 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));
 
@@ -284,7 +251,6 @@ public class CodeGen {
                 };
 
                 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

@@ -315,6 +315,7 @@ public class LexAn implements AutoCloseable {
             case "then" -> Token.Symbol.THEN;
             case "else" -> Token.Symbol.ELSE;
             case "while" -> Token.Symbol.WHILE;
+            case "until" -> Token.Symbol.UNTIL;
             case "do" -> Token.Symbol.DO;
             case "let" -> Token.Symbol.LET;
             case "in" -> Token.Symbol.IN;

src/pins25/phase/SynAn.java

@@ -227,6 +227,21 @@ public class SynAn implements AutoCloseable {
                 return whileStmt;
             }
 
+            case UNTIL: {
+                // statement -> until expression do statements end
+                Token untilT = check(Token.Symbol.UNTIL);
+                AST.Expr cond = parseExpression();
+                check(Token.Symbol.DO);
+                List<AST.Stmt> stmts = parseStatements();
+                Token end = check(Token.Symbol.END);
+
+                AST.Expr negCond = new AST.UnExpr(AST.UnExpr.Oper.NOT, cond);
+                
+                AST.WhileStmt whileStmt = new AST.WhileStmt(negCond, stmts);
+                attrLoc.put(whileStmt, new Report.Location(untilT, end));
+                return whileStmt;
+            }
+
             case LET: {
                 // statement -> let definition reststmtdefs in statements end
                 Token let = check(Token.Symbol.LET);