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

Compare commits

base: fri:2025-predrok/02-no-mod
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. "2025-predrok/02-no-mod" and "master" have entirely different histories.
2025-predr ... master

4 changed files with 20 additions and 96 deletions
Show Stats Expand all files Collapse all files

1
.gitignore vendored
View File

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

26
grammar.txt
View File

@ -69,28 +69,4 @@ restinits -> COMMA initializer restinits | .
initializer -> INTCONST intconstmult | CHARCONST | STRINGCONST .
intconstmult -> MUL const | .
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 | .
const -> INTCONST | CHARCONST | STRINGCONST .

13
prg/test.pins25
View File

@ -1,13 +0,0 @@
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,60 +231,26 @@ public class CodeGen {
List<PDM.CodeInstr> code = new ArrayList<>();
if (binExpr.oper == AST.BinExpr.Oper.MOD) {
// a - a / b * b
code.addAll(binExpr.fstExpr.accept(this, frame));
code.addAll(binExpr.sndExpr.accept(this, frame));
String tmpLabel = "$tmp@" + loc.location().begLine() + ":" + loc.location().begColumn();
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.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));
}
code.add(new PDM.OPER(oper, loc));
attrAST.attrCode.put(binExpr, code);
return code;
@ -717,12 +683,6 @@ public class CodeGen {
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;
}
}
}