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

Correct gernation of oder constraints

Browse Source
This commit is contained in:
Till Schnell 2021-04-27 17:54:31 +02:00
parent ba9335e2f6
commit c5c8ffeed1
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/de/dhbwstuttgart/inferWildcards/ConstraintsGenerationUtils.java
View File

@ -78,23 +78,28 @@ public final class ConstraintsGenerationUtils
Set<Constraint<Pair>> oderConstraints = new HashSet<>(); Set<Constraint<Pair>> oderConstraints = new HashSet<>();
constraintSet.addOderConstraint(oderConstraints); constraintSet.addOderConstraint(oderConstraints);
Constraint<Pair> c = new Constraint<>();
oderConstraints.add(c);
// single type // single type
ConstraintsGenerationUtils.addToConstraint(c, tph, refType); ConstraintsGenerationUtils.addToOderConstraint(oderConstraints, tph, refType);
// extends type // extends type
ExtendsWildcardType extendsWildcardType = new ExtendsWildcardType(refType, new NullToken()); ExtendsWildcardType extendsWildcardType = new ExtendsWildcardType(refType, new NullToken());
ConstraintsGenerationUtils.addToConstraint(c, tph, extendsWildcardType); ConstraintsGenerationUtils.addToOderConstraint(oderConstraints, tph, extendsWildcardType);
// super type // super type
SuperWildcardType superWildcardType = new SuperWildcardType(refType, new NullToken()); SuperWildcardType superWildcardType = new SuperWildcardType(refType, new NullToken());
ConstraintsGenerationUtils.addToConstraint(c, tph, superWildcardType); ConstraintsGenerationUtils.addToOderConstraint(oderConstraints, tph, superWildcardType);
return constraintSet; return constraintSet;
} }
private static void addToOderConstraint (Set<Constraint<Pair>> oderConstraints, TypePlaceholder tph,
RefTypeOrTPHOrWildcardOrGeneric refType) {
Constraint<Pair> c = new Constraint<>();
oderConstraints.add(c);
ConstraintsGenerationUtils.addToConstraint(c, tph, refType);
}
/** /**
* Generate a pair and adds it to a constraint. * Generate a pair and adds it to a constraint.
* *