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:until
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

1 Commits
add-bind-s ... until

Author SHA1 Message Date
Gašper Dobrovoljc
018a80b0f7 Added until statement 2025-06-03 22:39:32 +02:00
5 changed files with 68 additions and 51 deletions
Expand all files Collapse all files

1
.gitignore vendored
View File

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

10
prg/test.pins25 Normal file
View File

@@ -0,0 +1,10 @@
var i = 0
fun main() =
until i >= 10 do
putint(i),
i = i + 1
end,
0
fun putint(n)

4
src/pins25/common/Token.java
View File

@@ -57,6 +57,10 @@ 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}.
*/

1
src/pins25/phase/LexAn.java
View File

@@ -315,6 +315,7 @@ 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;

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

@@ -5,7 +5,6 @@ import pins25.common.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Objects;
/**
* Sintaksni analizator.
@@ -228,6 +227,21 @@ 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);
@@ -467,7 +481,7 @@ public class SynAn implements AutoCloseable {
checkExpression();
// cmpexpr -> addexpr restcmp
AST.Expr left = parseSubstractionExpression();
AST.Expr left = parseAdditionExpression();
return parseRestComparisons(left);
}
@@ -477,7 +491,7 @@ public class SynAn implements AutoCloseable {
case EQU: {
// restcmp -> EQU addexpr
check(Token.Symbol.EQU);
AST.Expr right = parseSubstractionExpression();
AST.Expr right = parseAdditionExpression();
AST.BinExpr binExpr = new AST.BinExpr(AST.BinExpr.Oper.EQU, left, right);
attrLoc.put(binExpr, new Report.Location(attrLoc.get(left), attrLoc.get(right)));
return binExpr;
@@ -485,7 +499,7 @@ public class SynAn implements AutoCloseable {
case NEQ: {
// restcmp -> NEQ addexpr
check(Token.Symbol.NEQ);
AST.Expr right = parseSubstractionExpression();
AST.Expr right = parseAdditionExpression();
AST.BinExpr binExpr = new AST.BinExpr(AST.BinExpr.Oper.NEQ, left, right);
attrLoc.put(binExpr, new Report.Location(attrLoc.get(left), attrLoc.get(right)));
return binExpr;
@@ -493,7 +507,7 @@ public class SynAn implements AutoCloseable {
case LTH: {
// restcmp -> LTH addexpr
check(Token.Symbol.LTH);
AST.Expr right = parseSubstractionExpression();
AST.Expr right = parseAdditionExpression();
AST.BinExpr binExpr = new AST.BinExpr(AST.BinExpr.Oper.LTH, left, right);
attrLoc.put(binExpr, new Report.Location(attrLoc.get(left), attrLoc.get(right)));
return binExpr;
@@ -501,7 +515,7 @@ public class SynAn implements AutoCloseable {
case GTH: {
// restcmp -> GTH addexpr
check(Token.Symbol.GTH);
AST.Expr right = parseSubstractionExpression();
AST.Expr right = parseAdditionExpression();
AST.BinExpr binExpr = new AST.BinExpr(AST.BinExpr.Oper.GTH, left, right);
attrLoc.put(binExpr, new Report.Location(attrLoc.get(left), attrLoc.get(right)));
return binExpr;
@@ -509,7 +523,7 @@ public class SynAn implements AutoCloseable {
case LEQ: {
// restcmp -> LEQ addexpr
check(Token.Symbol.LEQ);
AST.Expr right = parseSubstractionExpression();
AST.Expr right = parseAdditionExpression();
AST.BinExpr binExpr = new AST.BinExpr(AST.BinExpr.Oper.LEQ, left, right);
attrLoc.put(binExpr, new Report.Location(attrLoc.get(left), attrLoc.get(right)));
return binExpr;
@@ -517,7 +531,7 @@ public class SynAn implements AutoCloseable {
case GEQ: {
// restcmp -> GEQ addexpr
check(Token.Symbol.GEQ);
AST.Expr right = parseSubstractionExpression();
AST.Expr right = parseAdditionExpression();
AST.BinExpr binExpr = new AST.BinExpr(AST.BinExpr.Oper.GEQ, left, right);
attrLoc.put(binExpr, new Report.Location(attrLoc.get(left), attrLoc.get(right)));
return binExpr;
@@ -529,27 +543,38 @@ public class SynAn implements AutoCloseable {
}
}
private AST.Expr parseSubstractionExpression() {
private AST.Expr parseAdditionExpression() {
checkExpression();
// subexpr -> multexpr restsub
// addexpr -> multexpr restadd
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();
if (Objects.requireNonNull(token.symbol()) == Token.Symbol.SUB) {
// restsub -> SUB multexpr restsub
check(Token.Symbol.SUB);
AST.Expr right = parseMultiplicationExpression();
AST.Expr binExpr = new AST.BinExpr(AST.BinExpr.Oper.SUB, left, right);
attrLoc.put(binExpr, new Report.Location(attrLoc.get(left), attrLoc.get(right)));
return parseRestSubtractionExpressions(binExpr);
switch (token.symbol()) {
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);
AST.Expr right = parseMultiplicationExpression();
AST.Expr binExpr = new AST.BinExpr(AST.BinExpr.Oper.SUB, left, right);
attrLoc.put(binExpr, new Report.Location(attrLoc.get(left), attrLoc.get(right)));
return parseRestAdditionExpressions(binExpr);
}
default:
// restadd -> ε
return left;
}
// restsub -> ε
return left;
}
private AST.Expr parseMultiplicationExpression() {
@@ -564,25 +589,25 @@ public class SynAn implements AutoCloseable {
Token token = lexAn.peekToken();
switch (token.symbol()) {
case MUL: {
// restmult -> MUL addexpr restmult
// restmult -> MUL prefixexpr restmult
check(Token.Symbol.MUL);
AST.Expr right = parseAdditionExpression();
AST.Expr right = parsePrefixExpression();
AST.Expr binExpr = new AST.BinExpr(AST.BinExpr.Oper.MUL, left, right);
attrLoc.put(binExpr, new Report.Location(attrLoc.get(left), attrLoc.get(right)));
return parseRestMultiplicationExpressions(binExpr);
}
case DIV: {
// restmult -> DIV addexpr restmult
// restmult -> DIV prefixexpr restmult
check(Token.Symbol.DIV);
AST.Expr right = parseAdditionExpression();
AST.Expr right = parsePrefixExpression();
AST.Expr binExpr = new AST.BinExpr(AST.BinExpr.Oper.DIV, left, right);
attrLoc.put(binExpr, new Report.Location(attrLoc.get(left), attrLoc.get(right)));
return parseRestMultiplicationExpressions(binExpr);
}
case MOD: {
// restmult -> MOD addexpr restmult
// restmult -> MOD prefixexpr restmult
check(Token.Symbol.MOD);
AST.Expr right = parseAdditionExpression();
AST.Expr right = parsePrefixExpression();
AST.Expr binExpr = new AST.BinExpr(AST.BinExpr.Oper.MOD, left, right);
attrLoc.put(binExpr, new Report.Location(attrLoc.get(left), attrLoc.get(right)));
return parseRestMultiplicationExpressions(binExpr);
@@ -594,28 +619,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() {
checkExpression();