1 Commits

Author SHA1 Message Date
Gašper Dobrovoljc
8251a3608c Changed addition operators to right associative 2025-06-03 18:41:44 +02:00
4 changed files with 12 additions and 16 deletions

View File

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

View File

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

View File

@@ -246,14 +246,8 @@ 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 multexpr restadd // restadd -> ADD addexpr
check(Token.Symbol.ADD); check(Token.Symbol.ADD);
AST.Expr right = parseMultiplicationExpression(); AST.Expr right = parseAdditionExpression();
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 parseRestAdditionExpressions(binExpr); return binExpr;
} }
case SUB: { case SUB: {
// restadd -> SUB multexpr restadd // restadd -> ADD addexpr
check(Token.Symbol.SUB); check(Token.Symbol.SUB);
AST.Expr right = parseMultiplicationExpression(); AST.Expr right = parseAdditionExpression();
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 parseRestAdditionExpressions(binExpr); return binExpr;
} }
default: default: