diff --git a/src/main/java/de/dhbwstuttgart/parser/SyntaxTreeGenerator/StatementGenerator.java b/src/main/java/de/dhbwstuttgart/parser/SyntaxTreeGenerator/StatementGenerator.java index f4b818b2..5517988d 100644 --- a/src/main/java/de/dhbwstuttgart/parser/SyntaxTreeGenerator/StatementGenerator.java +++ b/src/main/java/de/dhbwstuttgart/parser/SyntaxTreeGenerator/StatementGenerator.java @@ -468,7 +468,7 @@ public class StatementGenerator { case PrimaryexpressionContext primary: return convert(primary.primary()); case DottedexpressionContext dotted: - return convert((DottedexpressionContext) expression, expression.getStart()); + return convert(dotted, expression.getStart()); case MethodcallexpressionContext methodcall: return convert(methodcall.methodCall(), methodcall.getStart()); case NewinstanceexpressionContext newinstance: @@ -518,10 +518,6 @@ public class StatementGenerator { private Expression convert(DottedexpressionContext expr, Token offset) { if (!Objects.isNull(expr.methodCall())) { return convert(expr.methodCall(), expr.expression(), offset); - } else if (!Objects.isNull(expr.THIS())) { - return new This(offset); - } else if (!Objects.isNull(expr.NEW()) && Objects.isNull(expr.nonWildcardTypeArguments())) { - return convert(expr.innerCreator()); } else if (!Objects.isNull(expr.identifier())) { return generateLocalOrFieldVarOrClassName(expr.getText(), offset); } else { @@ -567,7 +563,7 @@ public class StatementGenerator { } public Receiver getReceiver(ExpressionContext expr) { - Expression expression = generateLocalOrFieldVarOrClassName(expr.getText(), expr.getStart()); + Expression expression = convert(expr); /* * if (expr instanceof PrimaryexpressionContext pc) { expression = convert(pc.primary()); } else { expression = generateLocalOrFieldVarOrClassName(expr.getText(), expr.getStart()); } */