1 Commits

Author SHA1 Message Date
Gašper Dobrovoljc
b325647ad9 Limited comment length to 10 characters 2025-06-03 22:20:10 +02:00
4 changed files with 16 additions and 12 deletions

View File

@@ -39,9 +39,8 @@ restcmp -> EQU addexpr
| . | .
addexpr -> multexpr restadd . addexpr -> multexpr restadd .
restadd -> ADD addexpr restadd -> ADD multexpr restadd
| SUB addexpr | SUB multexpr restadd | .
| .
multexpr -> prefixexpr restmult . multexpr -> prefixexpr restmult .
restmult -> MUL prefixexpr restmult restmult -> MUL prefixexpr restmult

View File

@@ -1,3 +1,2 @@
//1234567890
fun main() = //12345678901
3 - 2 - 1

View File

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

View File

@@ -540,20 +540,20 @@ public class SynAn implements AutoCloseable {
Token token = lexAn.peekToken(); Token token = lexAn.peekToken();
switch (token.symbol()) { switch (token.symbol()) {
case ADD: { case ADD: {
// restadd -> ADD addexpr // restadd -> ADD multexpr restadd
check(Token.Symbol.ADD); check(Token.Symbol.ADD);
AST.Expr right = parseAdditionExpression(); AST.Expr right = parseMultiplicationExpression();
AST.Expr binExpr = new AST.BinExpr(AST.BinExpr.Oper.ADD, left, right); AST.Expr binExpr = new AST.BinExpr(AST.BinExpr.Oper.ADD, left, right);
attrLoc.put(binExpr, new Report.Location(attrLoc.get(left), attrLoc.get(right))); attrLoc.put(binExpr, new Report.Location(attrLoc.get(left), attrLoc.get(right)));
return binExpr; return parseRestAdditionExpressions(binExpr);
} }
case SUB: { case SUB: {
// restadd -> ADD addexpr // restadd -> SUB multexpr restadd
check(Token.Symbol.SUB); check(Token.Symbol.SUB);
AST.Expr right = parseAdditionExpression(); AST.Expr right = parseMultiplicationExpression();
AST.Expr binExpr = new AST.BinExpr(AST.BinExpr.Oper.SUB, left, right); AST.Expr binExpr = new AST.BinExpr(AST.BinExpr.Oper.SUB, left, right);
attrLoc.put(binExpr, new Report.Location(attrLoc.get(left), attrLoc.get(right))); attrLoc.put(binExpr, new Report.Location(attrLoc.get(left), attrLoc.get(right)));
return binExpr; return parseRestAdditionExpressions(binExpr);
} }
default: default: