This commit is contained in:
Victorious3 2023-01-24 12:16:34 +01:00
parent dc4b1c7b4f
commit a26f466471
2 changed files with 5 additions and 3 deletions

View File

@ -194,7 +194,7 @@ public class ASTToTargetAST {
superType = methodCall.receiverType; superType = methodCall.receiverType;
methodCall.receiver.accept(this); methodCall.receiver.accept(this);
for(int i = 0;i<methodCall.arglist.getArguments().size();i++){ for(int i = 0;i<methodCall.arglist.getArguments().size();i++){
superType = methodCall.argTypes.get(i); superType = methodCall.signature.get(i);
methodCall.arglist.getArguments().get(i).accept(this); methodCall.arglist.getArguments().get(i).accept(this);
} }
@ -643,7 +643,7 @@ public class ASTToTargetAST {
} }
void eliminateCyclesAndInfima(Set<ResultPair<?, ?>> input) { void eliminateCyclesAndInfima(Set<ResultPair<?, ?>> input) {
eliminateCycles(input); //eliminateCycles(input);
eliminateInfima(input); eliminateInfima(input);
} }

View File

@ -306,9 +306,11 @@ public class StatementToTargetExpression implements StatementVisitor {
public void visit(SuperCall superCall) { public void visit(SuperCall superCall) {
var aSuper = converter.convert(converter.currentClass.getSuperClass()); var aSuper = converter.convert(converter.currentClass.getSuperClass());
var type = converter.convert(superCall.getType()); var type = converter.convert(superCall.getType());
var parameters = superCall.signature.stream().map(converter::convert).toList();
parameters = parameters.subList(0, parameters.size() - 1);
result = new TargetMethodCall( result = new TargetMethodCall(
type, type, type, type,
superCall.argTypes == null ? List.of() : superCall.argTypes.stream().map(converter::convert).toList(), parameters,
new TargetSuper(aSuper), new TargetSuper(aSuper),
superCall.getArgumentList().getArguments().stream().map(converter::convert).toList(), superCall.getArgumentList().getArguments().stream().map(converter::convert).toList(),
aSuper, aSuper,