JavaTX/JavaCompilerCore
2
0
Fork 3
Code Issues 99 Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
AluAli 2021-03-13 14:52:38 +01:00
parent 54de28c3f0
commit 55e44d62de
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -496,9 +496,10 @@ public class FamilyOfGeneratedGenerics {
r = Relation.EQUAL; r = Relation.EQUAL;
} }
MethodConstraint mc = new MethodConstraint(ta1, ta2, r); MethodConstraint mc = new MethodConstraint(ta1, ta2, r);
System.out.println(mc); if(!checkForDuplicates(mc, tempMC)) {
tempMC.add(mc); tempMC.add(mc);
} }
}
return tempMC; return tempMC;
} }
@ -522,9 +523,14 @@ public class FamilyOfGeneratedGenerics {
if(p.GetOperator() == PairOperator.SMALLERDOT) { if(p.GetOperator() == PairOperator.SMALLERDOT) {
r = Relation.EXTENDS; r = Relation.EXTENDS;
orConsWithEXTENDS.add(new TPHConstraint(((TypePlaceholder) p.TA1).getName(), ((TypePlaceholder) p.TA2).getName(), r)); orConsWithEXTENDS.add(new TPHConstraint(((TypePlaceholder) p.TA1).getName(), ((TypePlaceholder) p.TA2).getName(), r));
tempMC.add(new MethodConstraint(((TypePlaceholder) (resSet.resolveType(((TypePlaceholder) p.TA1)).resolvedType)).getName(), ((TypePlaceholder) (resSet.resolveType(((TypePlaceholder) p.TA2)).resolvedType)).getName(), r));
} else if(p.GetOperator() == PairOperator.EQUALSDOT) { } else if(p.GetOperator() == PairOperator.EQUALSDOT) {
r = Relation.EQUAL; r = Relation.EQUAL;
orConsWithEQUAL.add(new TPHConstraint(((TypePlaceholder) p.TA1).getName(), ((TypePlaceholder) p.TA2).getName(), r)); orConsWithEQUAL.add(new TPHConstraint(((TypePlaceholder) p.TA1).getName(), ((TypePlaceholder) p.TA2).getName(), r));
MethodConstraint mc = new MethodConstraint(((TypePlaceholder) (resSet.resolveType(((TypePlaceholder) p.TA1)).resolvedType)).getName(), ((TypePlaceholder) (resSet.resolveType(((TypePlaceholder) p.TA2)).resolvedType)).getName(), r);
if(!checkForDuplicates(mc, tempMC)) {
tempMC.add(mc);
}
} }
} }
} }
@ -602,9 +608,10 @@ public class FamilyOfGeneratedGenerics {
r = Relation.EQUAL; r = Relation.EQUAL;
} }
MethodConstraint mc = new MethodConstraint(ta1, ta2, r); MethodConstraint mc = new MethodConstraint(ta1, ta2, r);
System.out.println(mc); if(!checkForDuplicates(mc, tempMC)) {
tempMC.add(mc); tempMC.add(mc);
} }
}
return tempMC; return tempMC;
} }