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

Compare commits

base: fri:add-bind-stronger
Branches Tags
fri:master
fri:2025-predrok/02-no-mod
fri:2025-predrok/01-multiline-comments
fri:until
fri:comment-length-limit
fri:add-right-assoc
fri:or-skip-right
fri:line-symbol
fri:multiline-comments
fri:add-bind-stronger
fri:times-init
..
compare: fri:master
Branches Tags
fri:2025-predrok/02-no-mod
fri:2025-predrok/01-multiline-comments
fri:until
fri:comment-length-limit
fri:add-right-assoc
fri:or-skip-right
fri:line-symbol
fri:multiline-comments
fri:add-bind-stronger
fri:times-init
fri:master

No commits in common. "add-bind-stronger" and "master" have entirely different histories.
add-bind-s ... master

1 changed files with 38 additions and 50 deletions
Show Stats Expand all files Collapse all files

78
src/pins25/phase/SynAn.java
View File

@ -5,7 +5,6 @@ import pins25.common.*;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Objects;
/** /**
* Sintaksni analizator. * Sintaksni analizator.
@ -467,7 +466,7 @@ public class SynAn implements AutoCloseable {
checkExpression(); checkExpression();
// cmpexpr -> addexpr restcmp // cmpexpr -> addexpr restcmp
AST.Expr left = parseSubstractionExpression(); AST.Expr left = parseAdditionExpression();
return parseRestComparisons(left); return parseRestComparisons(left);
} }
@ -477,7 +476,7 @@ public class SynAn implements AutoCloseable {
case EQU: { case EQU: {
// restcmp -> EQU addexpr // restcmp -> EQU addexpr
check(Token.Symbol.EQU); check(Token.Symbol.EQU);
AST.Expr right = parseSubstractionExpression(); AST.Expr right = parseAdditionExpression();
AST.BinExpr binExpr = new AST.BinExpr(AST.BinExpr.Oper.EQU, left, right); AST.BinExpr binExpr = new AST.BinExpr(AST.BinExpr.Oper.EQU, 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 binExpr;
@ -485,7 +484,7 @@ public class SynAn implements AutoCloseable {
case NEQ: { case NEQ: {
// restcmp -> NEQ addexpr // restcmp -> NEQ addexpr
check(Token.Symbol.NEQ); check(Token.Symbol.NEQ);
AST.Expr right = parseSubstractionExpression(); AST.Expr right = parseAdditionExpression();
AST.BinExpr binExpr = new AST.BinExpr(AST.BinExpr.Oper.NEQ, left, right); AST.BinExpr binExpr = new AST.BinExpr(AST.BinExpr.Oper.NEQ, 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 binExpr;
@ -493,7 +492,7 @@ public class SynAn implements AutoCloseable {
case LTH: { case LTH: {
// restcmp -> LTH addexpr // restcmp -> LTH addexpr
check(Token.Symbol.LTH); check(Token.Symbol.LTH);
AST.Expr right = parseSubstractionExpression(); AST.Expr right = parseAdditionExpression();
AST.BinExpr binExpr = new AST.BinExpr(AST.BinExpr.Oper.LTH, left, right); AST.BinExpr binExpr = new AST.BinExpr(AST.BinExpr.Oper.LTH, 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 binExpr;
@ -501,7 +500,7 @@ public class SynAn implements AutoCloseable {
case GTH: { case GTH: {
// restcmp -> GTH addexpr // restcmp -> GTH addexpr
check(Token.Symbol.GTH); check(Token.Symbol.GTH);
AST.Expr right = parseSubstractionExpression(); AST.Expr right = parseAdditionExpression();
AST.BinExpr binExpr = new AST.BinExpr(AST.BinExpr.Oper.GTH, left, right); AST.BinExpr binExpr = new AST.BinExpr(AST.BinExpr.Oper.GTH, 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 binExpr;
@ -509,7 +508,7 @@ public class SynAn implements AutoCloseable {
case LEQ: { case LEQ: {
// restcmp -> LEQ addexpr // restcmp -> LEQ addexpr
check(Token.Symbol.LEQ); check(Token.Symbol.LEQ);
AST.Expr right = parseSubstractionExpression(); AST.Expr right = parseAdditionExpression();
AST.BinExpr binExpr = new AST.BinExpr(AST.BinExpr.Oper.LEQ, left, right); AST.BinExpr binExpr = new AST.BinExpr(AST.BinExpr.Oper.LEQ, 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 binExpr;
@ -517,7 +516,7 @@ public class SynAn implements AutoCloseable {
case GEQ: { case GEQ: {
// restcmp -> GEQ addexpr // restcmp -> GEQ addexpr
check(Token.Symbol.GEQ); check(Token.Symbol.GEQ);
AST.Expr right = parseSubstractionExpression(); AST.Expr right = parseAdditionExpression();
AST.BinExpr binExpr = new AST.BinExpr(AST.BinExpr.Oper.GEQ, left, right); AST.BinExpr binExpr = new AST.BinExpr(AST.BinExpr.Oper.GEQ, 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 binExpr;
@ -529,28 +528,39 @@ public class SynAn implements AutoCloseable {
} }
} }
private AST.Expr parseAdditionExpression() {
private AST.Expr parseSubstractionExpression() {
checkExpression(); checkExpression();
// subexpr -> multexpr restsub // addexpr -> multexpr restadd
AST.Expr left = parseMultiplicationExpression(); AST.Expr left = parseMultiplicationExpression();
return parseRestSubtractionExpressions(left); return parseRestAdditionExpressions(left);
} }
private AST.Expr parseRestSubtractionExpressions(AST.Expr left) { private AST.Expr parseRestAdditionExpressions(AST.Expr left) {
Token token = lexAn.peekToken(); Token token = lexAn.peekToken();
if (Objects.requireNonNull(token.symbol()) == Token.Symbol.SUB) { switch (token.symbol()) {
// restsub -> SUB multexpr restsub case ADD: {
// restadd -> ADD multexpr restadd
check(Token.Symbol.ADD);
AST.Expr right = parseMultiplicationExpression();
AST.Expr binExpr = new AST.BinExpr(AST.BinExpr.Oper.ADD, left, right);
attrLoc.put(binExpr, new Report.Location(attrLoc.get(left), attrLoc.get(right)));
return parseRestAdditionExpressions(binExpr);
}
case SUB: {
// restadd -> SUB multexpr restadd
check(Token.Symbol.SUB); check(Token.Symbol.SUB);
AST.Expr right = parseMultiplicationExpression(); 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 parseRestSubtractionExpressions(binExpr); return parseRestAdditionExpressions(binExpr);
} }
// restsub -> ε
default:
// restadd -> ε
return left; return left;
} }
}
private AST.Expr parseMultiplicationExpression() { private AST.Expr parseMultiplicationExpression() {
checkExpression(); checkExpression();
@ -564,25 +574,25 @@ public class SynAn implements AutoCloseable {
Token token = lexAn.peekToken(); Token token = lexAn.peekToken();
switch (token.symbol()) { switch (token.symbol()) {
case MUL: { case MUL: {
// restmult -> MUL addexpr restmult // restmult -> MUL prefixexpr restmult
check(Token.Symbol.MUL); check(Token.Symbol.MUL);
AST.Expr right = parseAdditionExpression(); AST.Expr right = parsePrefixExpression();
AST.Expr binExpr = new AST.BinExpr(AST.BinExpr.Oper.MUL, left, right); AST.Expr binExpr = new AST.BinExpr(AST.BinExpr.Oper.MUL, 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 parseRestMultiplicationExpressions(binExpr); return parseRestMultiplicationExpressions(binExpr);
} }
case DIV: { case DIV: {
// restmult -> DIV addexpr restmult // restmult -> DIV prefixexpr restmult
check(Token.Symbol.DIV); check(Token.Symbol.DIV);
AST.Expr right = parseAdditionExpression(); AST.Expr right = parsePrefixExpression();
AST.Expr binExpr = new AST.BinExpr(AST.BinExpr.Oper.DIV, left, right); AST.Expr binExpr = new AST.BinExpr(AST.BinExpr.Oper.DIV, 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 parseRestMultiplicationExpressions(binExpr); return parseRestMultiplicationExpressions(binExpr);
} }
case MOD: { case MOD: {
// restmult -> MOD addexpr restmult // restmult -> MOD prefixexpr restmult
check(Token.Symbol.MOD); check(Token.Symbol.MOD);
AST.Expr right = parseAdditionExpression(); AST.Expr right = parsePrefixExpression();
AST.Expr binExpr = new AST.BinExpr(AST.BinExpr.Oper.MOD, left, right); AST.Expr binExpr = new AST.BinExpr(AST.BinExpr.Oper.MOD, 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 parseRestMultiplicationExpressions(binExpr); return parseRestMultiplicationExpressions(binExpr);
@ -594,28 +604,6 @@ public class SynAn implements AutoCloseable {
} }
} }
private AST.Expr parseAdditionExpression() {
checkExpression();
// addexpr -> prefexpr restadd
AST.Expr left = parsePrefixExpression();
return parseRestAdditionExpressions(left);
}
private AST.Expr parseRestAdditionExpressions(AST.Expr left) {
Token token = lexAn.peekToken();
if (Objects.requireNonNull(token.symbol()) == Token.Symbol.ADD) {
// restadd -> ADD multexpr restadd
check(Token.Symbol.ADD);
AST.Expr right = parsePrefixExpression();
AST.Expr binExpr = new AST.BinExpr(AST.BinExpr.Oper.ADD, left, right);
attrLoc.put(binExpr, new Report.Location(attrLoc.get(left), attrLoc.get(right)));
return parseRestAdditionExpressions(binExpr);
}
// restadd -> ε
return left;
}
private AST.Expr parsePrefixExpression() { private AST.Expr parsePrefixExpression() {
checkExpression(); checkExpression();