Added until statement

prg/test.pins25

@@ -1,4 +1,10 @@
-fun putint(n)
+var i = 0
 
 fun main() =
-	putint(__LINE__)
+	until i >= 10 do
+		putint(i),
+		i = i + 1
+	end,
+	0
+
+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}.
          */
@@ -148,11 +152,7 @@ public record Token(Report.Location location, Symbol symbol, String lexeme) impl
         /**
          * Simbol {@code )}.
          */
-        RPAREN,
+        RPAREN;
-        /**
-         * Simbol {@code __LINE__}.
-         */
-        LINE
     }
 
     @Override

src/pins25/phase/LexAn.java

@@ -315,11 +315,11 @@ 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;
             case "end" -> Token.Symbol.END;
-            case "__LINE__" -> Token.Symbol.LINE;
             default -> null;
         };
     }
@@ -452,15 +452,6 @@ public class LexAn implements AutoCloseable {
             symbol = Token.Symbol.IDENTIFIER;
         }
 
-        if (symbol == Token.Symbol.LINE) {
-            buffToken = new Token(
-                    new Report.Location(startLocation, endLocation),
-                    Token.Symbol.INTCONST,
-                    Integer.toString(startLocation.begLine())
-            );
-            return;
-        }
-
         buffToken = new Token(
                 new Report.Location(startLocation, endLocation),
                 symbol,

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