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

rolled back wrong changes

Browse Source
This commit is contained in:
JonathanFleischmann 2024-06-30 22:14:50 +02:00
parent 0abcebb329
commit 6afc588d2a
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/de/maishai/ExpressionGenerator.java
View File

@ -47,9 +47,11 @@ public class ExpressionGenerator extends DecafBaseVisitor<Expression> {
if (ctx.fieldVarAccess().recipient() != null) { if (ctx.fieldVarAccess().recipient() != null) {
List<DecafParser.RecipientContext> recipientList = ctx.fieldVarAccess().recipient(); List<DecafParser.RecipientContext> recipientList = ctx.fieldVarAccess().recipient();
recipient = ExpressionGenerator.generateRecursiveOwnerChain(recipientList, ctx.fieldVarAccess().newCall() != null ? StatementGenerator.generateNew(ctx.fieldVarAccess().newCall()) : null, isField); recipient = ExpressionGenerator.generateRecursiveOwnerChain(recipientList, ctx.fieldVarAccess().newCall() != null ? StatementGenerator.generateNew(ctx.fieldVarAccess().newCall()) : null, isField);
return new FieldVarAccess(true, recipient, ctx.fieldVarAccess().id().IDENTIFIER().getText());
} }
return new FieldVarAccess(isField, recipient, ctx.fieldVarAccess().id().IDENTIFIER().getText()); if (recipient == null) {
return new FieldVarAccess(isField, null, ctx.fieldVarAccess().id().IDENTIFIER().getText());
}
return new FieldVarAccess(true, recipient, ctx.fieldVarAccess().id().IDENTIFIER().getText());
} }
public static Expression generateConstant(DecafParser.LiteralContext ctx) { public static Expression generateConstant(DecafParser.LiteralContext ctx) {

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

@ -105,9 +105,11 @@ public class StatementGenerator extends DecafBaseVisitor<List<Statement>> {
Expression recipient = null; Expression recipient = null;
if (fieldIdContext.recipient() != null) { if (fieldIdContext.recipient() != null) {
recipient = ExpressionGenerator.generateRecursiveOwnerChain(fieldIdContext.recipient(), null, isField); recipient = ExpressionGenerator.generateRecursiveOwnerChain(fieldIdContext.recipient(), null, isField);
return new FieldVarAccess(true, recipient, fieldIdContext.id().IDENTIFIER().getText());
} }
return new FieldVarAccess(isField, recipient, fieldIdContext.id().IDENTIFIER().getText()); if (recipient == null) {
return new FieldVarAccess(isField, null, fieldIdContext.id().IDENTIFIER().getText());
}
return new FieldVarAccess(true, recipient, fieldIdContext.id().IDENTIFIER().getText());
} }
@Override @Override
@ -130,9 +132,11 @@ public class StatementGenerator extends DecafBaseVisitor<List<Statement>> {
if (ctx.methCall().recipient() != null) { if (ctx.methCall().recipient() != null) {
List<DecafParser.RecipientContext> recipientList = ctx.methCall().recipient(); List<DecafParser.RecipientContext> recipientList = ctx.methCall().recipient();
recursiveOwnerChain = ExpressionGenerator.generateRecursiveOwnerChain(recipientList, ctx.methCall().newCall() != null ? generateNew(ctx.methCall().newCall()) : null, isField); recursiveOwnerChain = ExpressionGenerator.generateRecursiveOwnerChain(recipientList, ctx.methCall().newCall() != null ? generateNew(ctx.methCall().newCall()) : null, isField);
return List.of(new MethodCall(new FieldVarAccess(true, recursiveOwnerChain, ctx.methCall().methName().id().IDENTIFIER().getText()), args));
} }
return List.of(new MethodCall(new FieldVarAccess(isField, recursiveOwnerChain, ctx.methCall().methName().id().IDENTIFIER().getText()), args)); if (recursiveOwnerChain == null) {
return List.of(new MethodCall(new FieldVarAccess(isField, null, ctx.methCall().methName().id().IDENTIFIER().getText()), args));
}
return List.of(new MethodCall(new FieldVarAccess(true, recursiveOwnerChain, ctx.methCall().methName().id().IDENTIFIER().getText()), args));
} }
@Override @Override

2
src/main/java/de/maishai/typedast/typedclass/TypedFieldVarAccess.java
View File

@ -51,7 +51,7 @@ public class TypedFieldVarAccess implements TypedExpression {
TypedClass currentClass = typedProgram.getCurrentClass(); TypedClass currentClass = typedProgram.getCurrentClass();
if (currentClass.isThereField(name)) { if (currentClass.isThereField(name)) {
throw new RuntimeException("Field Variable " + name + " should be used with `this´"); return checkTypeField(typedProgram);
} else if (currentClass.isMethodOfCurrentClass(name)) { } else if (currentClass.isMethodOfCurrentClass(name)) {
type = currentClass.getMethodType(name); type = currentClass.getMethodType(name);
return type; return type;