1 Commits

Author SHA1 Message Date
Gašper Dobrovoljc
018a80b0f7 Added until statement 2025-06-03 22:39:32 +02:00
4 changed files with 30 additions and 8 deletions

View File

@@ -1,2 +1,10 @@
//1234567890
//12345678901
var i = 0
fun main() =
until i >= 10 do
putint(i),
i = i + 1
end,
0
fun putint(n)

View File

@@ -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}.
*/

View File

@@ -246,14 +246,8 @@ public class LexAn implements AutoCloseable {
buffToken = new Token(start, Token.Symbol.DIV, "/");
return;
}
nextChar();
int length = 0;
while (buffChar != '\n' && buffChar != -1) {
length++;
if (length > 10) {
throw new Report.Error(currentLocation(), "Comments can only be 10 characters long");
}
nextChar();
}
@@ -321,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;

View File

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