fri/pns
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed addition operators to right associative

Browse Source
This commit is contained in:
Gašper Dobrovoljc 2025-06-03 18:41:44 +02:00
parent 1b45d6a0f9
commit 8251a3608c
No known key found for this signature in database
GPG Key ID: 0E7E037018CFA5A5
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -3,4 +3,3 @@ out/
*.zip *.zip
prg/**/*.ast prg/**/*.ast
prg/**/*.out prg/**/*.out
prg/**/*.pins25

5
grammar.txt
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

3
prg/test.pins25 Normal file
View File

@ -0,0 +1,3 @@
fun main() =
3 - 2 - 1

12
src/pins25/phase/SynAn.java
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: