Merge remote-tracking branch 'origin/master'

This commit is contained in:
Krauß, Josefine 2024-07-03 12:32:38 +02:00
commit f6358867f0

View File

@ -132,7 +132,9 @@ public class MethodCallStatementExpression extends AbstractType implements IExpr
throw new ExecutionControl.NotImplementedException("Receiver type not supported."); throw new ExecutionControl.NotImplementedException("Receiver type not supported.");
} }
} else { } else {
throw new ExecutionControl.NotImplementedException("Receiver is null."); mv.visitVarInsn(Opcodes.ALOAD, 0);
owner = thisClass;
} }
String returnOfPreviousMethod = null; String returnOfPreviousMethod = null;
// Invoke the method for each receiving method in the chain // Invoke the method for each receiving method in the chain
@ -196,12 +198,17 @@ public class MethodCallStatementExpression extends AbstractType implements IExpr
} }
descriptor.append(")"); descriptor.append(")");
String classToSearchMethodIn;
//Return Type //Return Type
String classToSearchMethodIn = localVars.get(receiver.identifier); if (receiver != null) {
if (classToSearchMethodIn == null) { classToSearchMethodIn = localVars.get(receiver.identifier);
classToSearchMethodIn = returnOfPreviousMethod; if (classToSearchMethodIn == null) {
} classToSearchMethodIn = returnOfPreviousMethod;
if (classToSearchMethodIn == null) { }
if (classToSearchMethodIn == null) {
classToSearchMethodIn = thisClass;
}
} else {
classToSearchMethodIn = thisClass; classToSearchMethodIn = thisClass;
} }