Compare commits
1 Commits
until
...
times-init
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d64e597414 |
1
.gitignore
vendored
1
.gitignore
vendored
@@ -3,3 +3,4 @@ out/
|
||||
*.zip
|
||||
prg/**/*.ast
|
||||
prg/**/*.out
|
||||
prg/**/*.pins25
|
||||
@@ -1,10 +0,0 @@
|
||||
var i = 0
|
||||
|
||||
fun main() =
|
||||
until i >= 10 do
|
||||
putint(i),
|
||||
i = i + 1
|
||||
end,
|
||||
0
|
||||
|
||||
fun putint(n)
|
||||
@@ -57,10 +57,6 @@ 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}.
|
||||
*/
|
||||
@@ -73,6 +69,10 @@ public record Token(Report.Location location, Symbol symbol, String lexeme) impl
|
||||
* Kljucna beseda {@code in}.
|
||||
*/
|
||||
IN,
|
||||
/**
|
||||
* Kljucna beseda {@code times}.
|
||||
*/
|
||||
TIMES,
|
||||
/**
|
||||
* Kljucna beseda {@code end}.
|
||||
*/
|
||||
|
||||
@@ -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 "times" -> Token.Symbol.TIMES;
|
||||
default -> null;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -227,21 +227,6 @@ 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);
|
||||
@@ -375,9 +360,9 @@ public class SynAn implements AutoCloseable {
|
||||
|
||||
private AST.AtomExpr parseIntegerConstantMultiplier() {
|
||||
Token token = lexAn.peekToken();
|
||||
if (token.symbol() == Token.Symbol.MUL) {
|
||||
// intconstmult -> MUL const
|
||||
check(Token.Symbol.MUL);
|
||||
if (token.symbol() == Token.Symbol.TIMES) {
|
||||
// intconstmult -> TIMES const
|
||||
check(Token.Symbol.TIMES);
|
||||
return parseConstant();
|
||||
}
|
||||
// intconstmult -> ε
|
||||
|
||||
Reference in New Issue
Block a user