i22006/Compilerbau2024AbsolutNichtHaskell
i22006/Compilerbau2024AbsolutNichtHaskell
2
0
Fork 0
mirror of https://github.com/JonathanFleischmann/CompilerULTIMATE.git synced 2024-12-28 16:48:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

solved synthetic shugar of += in parser

Browse Source
This commit is contained in:
laurenz 2024-05-08 10:52:05 +02:00
parent 6f6edbd4b3
commit ea05590c5a
9 changed files with 21 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/de/maishai/StatementGenerator.java
View File

@ -2,7 +2,7 @@ package de.maishai;
import de.maishai.antlr.DecafBaseVisitor; import de.maishai.antlr.DecafBaseVisitor;
import de.maishai.antlr.DecafParser; import de.maishai.antlr.DecafParser;
import de.maishai.ast.AssignSign; import de.maishai.ast.Operator;
import de.maishai.ast.records.Expression; import de.maishai.ast.records.Expression;
import de.maishai.ast.records.Statement; import de.maishai.ast.records.Statement;
import de.maishai.ast.Type; import de.maishai.ast.Type;
@ -68,9 +68,8 @@ public class StatementGenerator extends DecafBaseVisitor<Statement> {
private Assignment generateAssign(DecafParser.AssignContext ctx) { private Assignment generateAssign(DecafParser.AssignContext ctx) {
Id id = new Id(ctx.id().getText()); Id id = new Id(ctx.id().getText());
AssignSign sign = getAssignSign(ctx.assignSign()); Expression expr = resolveFancyAssign(ctx.assignSign(), id, new ExpressionGenerator().visit(ctx.expr()););
Expression expr = new ExpressionGenerator().visit(ctx.expr()); return new Assignment(id, expr);
return new Assignment(id, sign, expr);
} }
//StatementExpression //StatementExpression
@ -102,15 +101,15 @@ public class StatementGenerator extends DecafBaseVisitor<Statement> {
return new New(type, args); return new New(type, args);
} }
public static AssignSign getAssignSign(DecafParser.AssignSignContext ctx) { public static Expression resolveFancyAssign(DecafParser.AssignSignContext ctx, Id id, Expression expression) {
if (ctx.ASSIGN() != null) if (ctx.ASSIGN() != null)
return AssignSign.ASSIGN; return expression;
if (ctx.ADD_ASSIGN() != null) if (ctx.ADD_ASSIGN() != null)
return AssignSign.ADD_ASSIGN; return new Binary(id, Operator.ADD, expression);
if (ctx.SUB_ASSIGN() != null) if (ctx.SUB_ASSIGN() != null)
return AssignSign.SUB_ASSIGN; return new Binary(id, Operator.SUB, expression);
if (ctx.MUL_ASSIGN() != null) if (ctx.MUL_ASSIGN() != null)
return AssignSign.MUL_ASSIGN; return new Binary(id, Operator.MUL, expression);
throw new RuntimeException(); throw new RuntimeException();
} }
} }

2
src/main/java/de/maishai/ast/Type.java
View File

@ -22,4 +22,6 @@ public enum Type {
this.objectType = objectType; this.objectType = objectType;
} }
} }
} }

3
src/main/java/de/maishai/ast/records/Assignment.java
View File

@ -1,7 +1,6 @@
package de.maishai.ast.records; package de.maishai.ast.records;
import de.maishai.ast.AssignSign;
public record Assignment(Id loc, AssignSign assignment, Expression value) implements Statement { public record Assignment(Id loc, Expression value) implements Statement {
} }

13
src/main/java/de/maishai/typedast/typedclass/TypedAssignment.java
View File

@ -13,23 +13,11 @@ import java.util.Map;
@Data @Data
public class TypedAssignment implements TypedStatement { public class TypedAssignment implements TypedStatement {
private TypedId loc; private TypedId loc;
private AssignSign assignSign;
private TypedExpression value; private TypedExpression value;
@Override @Override
public Type typeCheck(Map<String, Type> localVar, Map<String, TypedClass> classes) { public Type typeCheck(Map<String, Type> localVar, Map<String, TypedClass> classes) {
if (!localVar.containsKey(loc.getName())) {
throw new RuntimeException("Variable not declared");
}
//ASSIGN : '=';ADD_ASSIGN : '+='; SUB_ASSIGN : '-='; MUL_ASSIGN : '*=';
if (assignSign == AssignSign.ASSIGN || assignSign == AssignSign.ADD_ASSIGN ||
assignSign == AssignSign.SUB_ASSIGN || assignSign == AssignSign.MUL_ASSIGN) {
if (localVar.get(loc.getName()) != Type.INT || value.typeCheck(localVar, classes) != Type.INT) {
throw new RuntimeException("Type mismatch");
}
}
return localVar.get(loc.getName());
} }
@Override @Override
@ -37,7 +25,6 @@ public class TypedAssignment implements TypedStatement {
Assignment untyped = (Assignment) unTypedAST; Assignment untyped = (Assignment) unTypedAST;
TypedAssignment typedAssignment = new TypedAssignment(); TypedAssignment typedAssignment = new TypedAssignment();
typedAssignment.setLoc((TypedId) loc.convertToTypedAST(localVar, classes, untyped.loc())); typedAssignment.setLoc((TypedId) loc.convertToTypedAST(localVar, classes, untyped.loc()));
typedAssignment.setAssignSign(untyped.assignment());
typedAssignment.setValue((TypedExpression) value.convertToTypedAST(localVar, classes, untyped.value())); typedAssignment.setValue((TypedExpression) value.convertToTypedAST(localVar, classes, untyped.value()));
return typedAssignment; return typedAssignment;
} }

6
src/main/resources/AbstractSyntax/AbstractSyntax_ClassWithConstructor.java
View File

@ -54,13 +54,11 @@ public class AbstractSyntax_ClassWithConstructor {
List<Statement> statementList = List.of( List<Statement> statementList = List.of(
new Assignment( new Assignment(
new Id("x"), new Id("x"),
AssignSign.ASSIGN,
new IntLiteral(10) new IntLiteral(10)
), ),
new For( new For(
new Assignment( new Assignment(
new Id("i"), new Id("i"),
AssignSign.ASSIGN,
new IntLiteral(0) new IntLiteral(0)
), ),
new Binary( new Binary(
@ -70,7 +68,6 @@ public class AbstractSyntax_ClassWithConstructor {
), ),
new Assignment( new Assignment(
new Id("i"), new Id("i"),
AssignSign.ASSIGN,
new Binary( new Binary(
new Id("i"), new Id("i"),
Operator.ADD, Operator.ADD,
@ -88,7 +85,6 @@ public class AbstractSyntax_ClassWithConstructor {
new For( new For(
new Assignment( new Assignment(
new Id("j"), new Id("j"),
AssignSign.ASSIGN,
new IntLiteral(0) new IntLiteral(0)
), ),
new Binary( new Binary(
@ -98,7 +94,6 @@ public class AbstractSyntax_ClassWithConstructor {
), ),
new Assignment( new Assignment(
new Id("j"), new Id("j"),
AssignSign.ADD_ASSIGN,
new IntLiteral(1) new IntLiteral(1)
), ),
new Block( new Block(
@ -106,7 +101,6 @@ public class AbstractSyntax_ClassWithConstructor {
List.of( List.of(
new Assignment( new Assignment(
new Id("x"), new Id("x"),
AssignSign.ASSIGN,
new Binary( new Binary(
new Id("x"), new Id("x"),
Operator.MUL, Operator.MUL,

3
src/main/resources/AbstractSyntax/AbstractSyntax_ClassWithConstructorAndMethodCall.java
View File

@ -18,7 +18,6 @@
//} //}
import de.maishai.ast.AssignSign;
import de.maishai.ast.Operator; import de.maishai.ast.Operator;
import de.maishai.ast.ReturnType; import de.maishai.ast.ReturnType;
import de.maishai.ast.Type; import de.maishai.ast.Type;
@ -57,7 +56,6 @@ public class AbstractSyntax_ClassWithConstructorAndMethodCall {
List.of( List.of(
new Assignment( new Assignment(
new Id("x"), new Id("x"),
AssignSign.ASSIGN,
new IntLiteral(10) new IntLiteral(10)
), ),
new While( new While(
@ -72,7 +70,6 @@ public class AbstractSyntax_ClassWithConstructorAndMethodCall {
List.of( List.of(
new Assignment( new Assignment(
new Id("x"), new Id("x"),
AssignSign.ASSIGN,
new Binary( new Binary(
new Id("x"), new Id("x"),
Operator.MUL, Operator.MUL,

12
src/main/resources/AbstractSyntax/AbstractSyntax_ClassWithConstructorWithParameters.java
View File

@ -13,7 +13,6 @@
// } // }
// } // }
//} //}
import de.maishai.ast.AssignSign;
import de.maishai.ast.Operator; import de.maishai.ast.Operator;
import de.maishai.ast.records.*; import de.maishai.ast.records.*;
import de.maishai.ast.Type; import de.maishai.ast.Type;
@ -60,7 +59,6 @@ public class AbstractSyntax_ClassWithConstructorWithParameters {
List.of( List.of(
new Assignment( new Assignment(
new Id("x"), new Id("x"),
AssignSign.ASSIGN,
new Id("startValue") new Id("startValue")
), ),
new While( new While(
@ -79,7 +77,6 @@ public class AbstractSyntax_ClassWithConstructorWithParameters {
List.of( List.of(
new Assignment( new Assignment(
new Id("innerRepetitions"), new Id("innerRepetitions"),
AssignSign.ASSIGN,
new Id("x") new Id("x")
), ),
new While( new While(
@ -93,7 +90,6 @@ public class AbstractSyntax_ClassWithConstructorWithParameters {
List.of( List.of(
new Assignment( new Assignment(
new Id("x"), new Id("x"),
AssignSign.ASSIGN,
new Binary( new Binary(
new Id("x"), new Id("x"),
Operator.MUL, Operator.MUL,
@ -103,14 +99,18 @@ public class AbstractSyntax_ClassWithConstructorWithParameters {
new Assignment( new Assignment(
new Id("innerRepetitions"), new Id("innerRepetitions"),
AssignSign.SUB_ASSIGN, AssignSign.SUB_ASSIGN,
new IntLiteral(1) new Binary(new Id("innerRepetitions"),
Operator.SUB,
new IntLiteral(1))
) )
) )
) )
), ),
new Assignment( new Assignment(
new Id("repetitions"), new Id("repetitions"),
AssignSign.SUB_ASSIGN, new Binary(new Id("repetitions"),
new Op)
new IntLiteral(1) new IntLiteral(1)
) )

1
src/main/resources/AbstractSyntax/AbstractSyntax_ClassWithMethodAndField.java
View File

@ -55,7 +55,6 @@ class AbstractSyntax_ClassWithMethodAndField {
List.of( List.of(
new Assignment( new Assignment(
new Id("c"), new Id("c"),
AssignSign.ASSIGN,
new Id("character") new Id("character")
) )
) )

10
src/main/resources/AbstractSyntax/AbstractSyntax_ClassWithMoreComplexMethodAndMain.java
View File

@ -65,12 +65,10 @@ public class AbstractSyntax_ClassWithMoreComplexMethodAndMain {
List.of( List.of(
new Assignment( new Assignment(
new Id("i"), new Id("i"),
AssignSign.ASSIGN,
new IntLiteral(11) new IntLiteral(11)
), ),
new Assignment( new Assignment(
new Id("returnValue"), new Id("returnValue"),
AssignSign.ASSIGN,
new BoolLiteral(false) new BoolLiteral(false)
), ),
new While( new While(
@ -84,12 +82,13 @@ public class AbstractSyntax_ClassWithMoreComplexMethodAndMain {
List.of( List.of(
new Assignment( new Assignment(
new Id("i"), new Id("i"),
AssignSign.SUB_ASSIGN, new Binary(new Id("i"),
new IntLiteral(1) Operator.SUB,
new IntLiteral(1))
), ),
new Assignment( new Assignment(
new Id("returnValue"), new Id("returnValue"),
AssignSign.ASSIGN,
new Unary( new Unary(
UnaryOperator.NOT, UnaryOperator.NOT,
new Id("returnValue") new Id("returnValue")
@ -119,7 +118,6 @@ public class AbstractSyntax_ClassWithMoreComplexMethodAndMain {
List<Statement> statementList = List.of( List<Statement> statementList = List.of(
new Assignment( new Assignment(
new Id("instance"), new Id("instance"),
AssignSign.ASSIGN,
new New( new New(
TypeClassWithMoreComplexMethodAndMain, TypeClassWithMoreComplexMethodAndMain,
List.of() List.of()