From 070dd16999e9027375b37da5bbb6eff44ec31b2e Mon Sep 17 00:00:00 2001 From: "pl@gohorb.ba-horb.de" Date: Tue, 21 Mar 2023 10:30:13 +0100 Subject: [PATCH] modified: src/main/java/de/dhbwstuttgart/typeinference/typeAlgo/TYPEStmt.java --- .../typeinference/typeAlgo/TYPEStmt.java | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/src/main/java/de/dhbwstuttgart/typeinference/typeAlgo/TYPEStmt.java b/src/main/java/de/dhbwstuttgart/typeinference/typeAlgo/TYPEStmt.java index b9c1658b..198b0f4c 100644 --- a/src/main/java/de/dhbwstuttgart/typeinference/typeAlgo/TYPEStmt.java +++ b/src/main/java/de/dhbwstuttgart/typeinference/typeAlgo/TYPEStmt.java @@ -199,8 +199,7 @@ public class TYPEStmt implements StatementVisitor{ public void visit(NewClass methodCall) { //Overloading: Set methodConstraints = new HashSet<>(); - for(MethodAssumption m : - this.getConstructors(info, (RefType) methodCall.getType(), methodCall.getArgumentList())){ + for(MethodAssumption m : this.getConstructors(info, (RefType) methodCall.getType(), methodCall.getArgumentList())){ methodConstraints.add(generateConstructorConstraint(methodCall, m, info, getResolverInstance())); } if(methodConstraints.size()<1){ @@ -640,12 +639,7 @@ public class TYPEStmt implements StatementVisitor{ RefTypeOrTPHOrWildcardOrGeneric argType = foMethod.arglist.getArguments().get(i).getType(); RefTypeOrTPHOrWildcardOrGeneric assType = assumption.getArgTypes(resolver).get(i); -<<<<<<< Updated upstream -======= - //Zuordnung von MethoCall.signature (Argumenttypen) zu der Argumenttypen der ausgewaehlten Methode (assumption.params) - //ret.add(new Pair(foMethod.signature.get(i), assumption.getArgTypes().get(i), PairOperator.EQUALSDOT)); ->>>>>>> Stashed changes ret.add(new Pair(argType, assType, PairOperator.SMALLERDOT)); @@ -653,14 +647,6 @@ public class TYPEStmt implements StatementVisitor{ // ret.add(new Pair(foMethod.argTypes.get(i), assType, PairOperator.EQUALSDOT)); //Fuer Bytecodegenerierung PL 2020-03-09 wird derzeit nicht benutzt ENDE } -<<<<<<< Updated upstream -======= - - //Zuordnung von MethodCall.signature(ReturnType) zu dem ReturnType der ausgewaehlten Methode (assumption.returnType) - System.out.println(foMethod.name); - //ret.add(new Pair(foMethod.signature.get(foMethod.signature.size()-1), assumption.getReturnType(), PairOperator.EQUALSDOT)); - ->>>>>>> Stashed changes return ret; }