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

Continue with eliminating inner type variables

Browse Source
This commit is contained in:
Victorious3 2023-01-31 15:39:12 +01:00
parent 5243b160f5
commit 64ec7989b4
1 changed files with 17 additions and 0 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

@ -568,6 +568,8 @@ public class ASTToTargetAST {
} }
void eliminateInnerTypeVariables(Set<TypePlaceholder> referenced, Set<ResultPair<?, ?>> input) { void eliminateInnerTypeVariables(Set<TypePlaceholder> referenced, Set<ResultPair<?, ?>> input) {
// Remove type variables that are part of a relation A < B < C where B is not in referenced
// Add new pair A < C
var oldInput = new HashSet<>(input); var oldInput = new HashSet<>(input);
for (var pair : oldInput) { for (var pair : oldInput) {
if (pair instanceof PairTPHsmallerTPH ptph && !referenced.contains(ptph.left)) { if (pair instanceof PairTPHsmallerTPH ptph && !referenced.contains(ptph.left)) {
@ -581,6 +583,21 @@ public class ASTToTargetAST {
} }
} }
} }
// Remove lone type variables, A = RefType where A is in no relation X < A or A < X and A is not in referenced
oldInput = new HashSet<>(input);
outer:
for (var pair : oldInput) {
if (pair instanceof PairTPHequalRefTypeOrWildcardType ptph) {
if (!referenced.contains(ptph.left)) {
for (var pair2 : oldInput) {
if (pair != pair2 && (pair2.getLeft().equals(ptph.left) || pair2.getRight().equals(ptph.left)))
continue outer;
}
input.remove(pair);
}
}
}
} }
void eliminateCycles(Set<ResultPair<?, ?>> input) { void eliminateCycles(Set<ResultPair<?, ?>> input) {