i21017/JavaCompilerCore
1
0
Fork 0
forked from JavaTX/JavaCompilerCore
Code Pull Requests Activity

modified: src/main/java/de/dhbwstuttgart/bytecode/insertGenerics/FamilyOfGeneratedGenerics.java

Browse Source
This commit is contained in:
AluAli 2021-03-05 21:47:22 +01:00
parent f208432c54
commit af9943be28
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/de/dhbwstuttgart/bytecode/insertGenerics/FamilyOfGeneratedGenerics.java
View File

@ -505,9 +505,9 @@ public class FamilyOfGeneratedGenerics {
MethodAndTPH methAndTphs = methodAndTPH; MethodAndTPH methAndTphs = methodAndTPH;
List<Set<Constraint<Pair>>> orCons = methAndTphs.constraints.getOderConstraints(); List<Set<Constraint<Pair>>> orCons = methAndTphs.constraints.getOderConstraints();
List<List<Constraint<Pair>>> orConsList = new ArrayList<>(); List<List<Constraint<Pair>>> orConsList = new ArrayList<>();
List<List<List<TPHConstraint>>> orConsListConverted = new ArrayList<>(); List<HashMap<Relation, List<TPHConstraint>>> orConsListConverted = new ArrayList<>();
for(int i=0; i<orCons.size(); i++) { for(int i=0; i<orCons.size(); i++) {
List<List<TPHConstraint>> orConsInternal = new ArrayList<>(); HashMap<Relation, List<TPHConstraint>> orConsInternal = new HashMap<>();
List<TPHConstraint> orConsWithEQUAL = new ArrayList(); List<TPHConstraint> orConsWithEQUAL = new ArrayList();
List<TPHConstraint> orConsWithEXTENDS = new ArrayList(); List<TPHConstraint> orConsWithEXTENDS = new ArrayList();
for(Constraint con: orCons.get(i)) { for(Constraint con: orCons.get(i)) {
@ -524,8 +524,8 @@ public class FamilyOfGeneratedGenerics {
} }
} }
} }
orConsInternal.add(orConsWithEXTENDS); orConsInternal.put(Relation.EXTENDS, orConsWithEXTENDS);
orConsInternal.add(orConsWithEQUAL); orConsInternal.put(Relation.EQUAL, orConsWithEQUAL);
orConsListConverted.add(orConsInternal); orConsListConverted.add(orConsInternal);
} }
@ -542,9 +542,22 @@ public class FamilyOfGeneratedGenerics {
} }
List<TPHConstraint> tcOfoldCons = buildTransitiveClosure(oldConsListConverted); List<TPHConstraint> tcOfoldCons = buildTransitiveClosure(oldConsListConverted);
for(int i=0; i<orConsListConverted.size(); i++) {
List<TPHConstraint> extendsList = orConsListConverted.get(i).get(Relation.EXTENDS);
List<TPHConstraint> equalList = orConsListConverted.get(i).get(Relation.EQUAL);
for(TPHConstraint ex: extendsList) {
for(TPHConstraint eq: equalList) {
MethodConstraint mc = new MethodConstraint(ex.getRight(), eq.getLeft(), Relation.EXTENDS);
for(TPHConstraint tc: tcOfoldCons) {
if(tc.getLeft()==mc.getLeft() && tc.getRight()==mc.getRight() && tc.getRel()==mc.getRel()) {
if(!checkForDuplicates(mc, tempMC)) {
tempMC.add(mc);
}
}
}
}
}
}
return tempMC; return tempMC;
} }