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:2025-predrok/02-no-mod
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 ... 2025-predr

Author SHA1 Message Date
Gašper Dobrovoljc
6a7ac2a6f8 Predrok 2025 - Naloga 2 2025-06-04 14:19:59 +02:00
5 changed files with 134 additions and 70 deletions
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

26
grammar.txt
View File

@@ -69,4 +69,28 @@ restinits -> COMMA initializer restinits | .
initializer -> INTCONST intconstmult | CHARCONST | STRINGCONST . initializer -> INTCONST intconstmult | CHARCONST | STRINGCONST .
intconstmult -> MUL const | . intconstmult -> MUL const | .
const -> INTCONST | CHARCONST | STRINGCONST . const -> INTCONST | CHARCONST | STRINGCONST .
--------------------------------------------------------------------
//LEFT ASOC.
exp0 = exp0 op other | other
|
v
exp0 = other exp0'
exp0' = op other exp0' | .
//RIGHT ASOC.
exp0 = other op exp0 | other
|
v
exp0 = other exp0'
exp0' = op exp0 | .

13
prg/test.pins25 Normal file
View File

@@ -0,0 +1,13 @@
fun putstr(n)
fun putint(b)
fun a() = putstr("a called\n\00"), 40
fun b() = putstr("b called\n\00"), 7
fun main() =
putint(10 % 7),
putstr("\n\00"),
putint(30 % 25),
putstr("\n\00"),
putint(a() % b()),
putstr("\n\00")

76
src/pins25/phase/CodeGen.java
View File

@@ -231,26 +231,60 @@ public class CodeGen {
List<PDM.CodeInstr> code = new ArrayList<>(); List<PDM.CodeInstr> code = new ArrayList<>();
code.addAll(binExpr.fstExpr.accept(this, frame)); if (binExpr.oper == AST.BinExpr.Oper.MOD) {
code.addAll(binExpr.sndExpr.accept(this, frame)); // a - a / b * b
PDM.OPER.Oper oper = switch (binExpr.oper) { String tmpLabel = "$tmp@" + loc.location().begLine() + ":" + loc.location().begColumn();
case OR -> PDM.OPER.Oper.OR;
case AND -> PDM.OPER.Oper.AND;
case EQU -> PDM.OPER.Oper.EQU;
case NEQ -> PDM.OPER.Oper.NEQ;
case GTH -> PDM.OPER.Oper.GTH;
case LTH -> PDM.OPER.Oper.LTH;
case GEQ -> PDM.OPER.Oper.GEQ;
case LEQ -> PDM.OPER.Oper.LEQ;
case ADD -> PDM.OPER.Oper.ADD;
case SUB -> PDM.OPER.Oper.SUB;
case MUL -> PDM.OPER.Oper.MUL;
case DIV -> PDM.OPER.Oper.DIV;
case MOD -> PDM.OPER.Oper.MOD;
};
code.add(new PDM.OPER(oper, loc)); code.addAll(binExpr.fstExpr.accept(this, frame));
// dup a
code.add(new PDM.REGN(PDM.REGN.Reg.SP, loc));
code.add(new PDM.LOAD(loc));
code.addAll(binExpr.sndExpr.accept(this, frame));
// dup b
code.add(new PDM.REGN(PDM.REGN.Reg.SP, loc));
code.add(new PDM.LOAD(loc));
// save b
code.add(new PDM.NAME(tmpLabel, loc));
code.add(new PDM.SAVE(loc));
code.add(new PDM.OPER(PDM.OPER.Oper.DIV, loc));
// load second b
code.add(new PDM.NAME(tmpLabel, loc));
code.add(new PDM.LOAD(loc));
code.add(new PDM.OPER(PDM.OPER.Oper.MUL, loc));
code.add(new PDM.OPER(PDM.OPER.Oper.SUB, loc));
List<PDM.DataInstr> data = new ArrayList<>();
data.add(new PDM.LABEL(tmpLabel, loc));
data.add(new PDM.DATA(0, loc));
attrAST.attrData.put(binExpr, data);
} else {
code.addAll(binExpr.fstExpr.accept(this, frame));
code.addAll(binExpr.sndExpr.accept(this, frame));
PDM.OPER.Oper oper = switch (binExpr.oper) {
case OR -> PDM.OPER.Oper.OR;
case AND -> PDM.OPER.Oper.AND;
case EQU -> PDM.OPER.Oper.EQU;
case NEQ -> PDM.OPER.Oper.NEQ;
case GTH -> PDM.OPER.Oper.GTH;
case LTH -> PDM.OPER.Oper.LTH;
case GEQ -> PDM.OPER.Oper.GEQ;
case LEQ -> PDM.OPER.Oper.LEQ;
case ADD -> PDM.OPER.Oper.ADD;
case SUB -> PDM.OPER.Oper.SUB;
case MUL -> PDM.OPER.Oper.MUL;
case DIV -> PDM.OPER.Oper.DIV;
case MOD -> PDM.OPER.Oper.MOD;
};
code.add(new PDM.OPER(oper, loc));
}
attrAST.attrCode.put(binExpr, code); attrAST.attrCode.put(binExpr, code);
return code; return code;
@@ -683,6 +717,12 @@ public class CodeGen {
return null; return null;
} }
@Override
public Object visit(AST.BinExpr binExpr, Object arg) {
List<PDM.DataInstr> data = attrAST.attrData.get(binExpr);
if (data != null) dataSegment.addAll(data);
return null;
}
} }
} }

88
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,27 +528,38 @@ 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: {
check(Token.Symbol.SUB); // restadd -> ADD multexpr restadd
AST.Expr right = parseMultiplicationExpression(); check(Token.Symbol.ADD);
AST.Expr binExpr = new AST.BinExpr(AST.BinExpr.Oper.SUB, left, right); AST.Expr right = parseMultiplicationExpression();
attrLoc.put(binExpr, new Report.Location(attrLoc.get(left), attrLoc.get(right))); AST.Expr binExpr = new AST.BinExpr(AST.BinExpr.Oper.ADD, left, right);
return parseRestSubtractionExpressions(binExpr); 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() { private AST.Expr parseMultiplicationExpression() {
@@ -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();