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

Actually replace instead of removing pairs

Browse Source
This commit is contained in:
Victorious3 2022-07-03 15:25:35 +02:00
parent 560f0c5a6f
commit ef06a8de38
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/de/dhbwstuttgart/target/generate/ASTToTargetAST.java
View File

@ -303,11 +303,24 @@ public class ASTToTargetAST {
foundInfima = true; foundInfima = true;
var newTph = TypePlaceholder.fresh(new NullToken()); var newTph = TypePlaceholder.fresh(new NullToken());
input.add(new PairTPHsmallerTPH(left, newTph)); input.add(new PairTPHsmallerTPH(left, newTph));
input.add(new PairTPHequalRefTypeOrWildcardType(newTph, OBJECT));
input.removeAll(infima); input.removeAll(infima);
for (var infimum : infima) { for (var infimum : infima) {
equality.put(infimum.right, newTph); equality.put(infimum.right, newTph);
input.removeIf(pair -> pair.getLeft().equals(infimum.right)); new HashSet<>(input).stream().forEach(pair -> {
if (pair.getLeft().equals(infimum.right)) {
input.remove(pair);
if (pair instanceof PairTPHsmallerTPH stph) {
input.add(new PairTPHsmallerTPH(newTph, stph.right));
} else if (pair instanceof PairTPHequalRefTypeOrWildcardType rtph) {
input.add(new PairTPHequalRefTypeOrWildcardType(newTph, rtph.getRight()));
}
} else if (pair.getRight().equals(infimum.right)) {
input.remove(pair);
if (pair instanceof PairTPHsmallerTPH stph) {
input.add(new PairTPHsmallerTPH(stph.left, newTph));
}
}
});
} }
} }
} }