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

Merge branch 'refs/heads/testsuites'

Browse Source 
# Conflicts:
#	src/main/java/de/maishai/StatementGenerator.java
This commit is contained in:
JonathanFleischmann 2024-06-30 22:50:17 +02:00
commit 7dce97a534
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -105,7 +105,6 @@ 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);
} }
if (recipient == null) { if (recipient == null) {
return new FieldVarAccess(isField, null, fieldIdContext.id().IDENTIFIER().getText()); return new FieldVarAccess(isField, null, fieldIdContext.id().IDENTIFIER().getText());

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;