forked from JavaTX/JavaCompilerCore
modified: ../src/main/java/de/dhbwstuttgart/typeinference/unify/TypeUnifyTask.java
This commit is contained in:
parent
ba750187ba
commit
71c801c19c
@ -2040,6 +2040,8 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>> {
|
|||||||
oderConstraintsOutput.remove(ret);
|
oderConstraintsOutput.remove(ret);
|
||||||
//Set<UnifyPair> retFlat = new HashSet<>();
|
//Set<UnifyPair> retFlat = new HashSet<>();
|
||||||
//ret.stream().forEach(x -> retFlat.addAll(x));
|
//ret.stream().forEach(x -> retFlat.addAll(x));
|
||||||
|
|
||||||
|
//Alle wildcard Faelle rausfiltern bei not wildable
|
||||||
ret = ret.stream().filter(x -> { Optional<UnifyPair> optElem;
|
ret = ret.stream().filter(x -> { Optional<UnifyPair> optElem;
|
||||||
return !((optElem=x.stream().filter(y -> (y.getLhsType()) instanceof PlaceholderType
|
return !((optElem=x.stream().filter(y -> (y.getLhsType()) instanceof PlaceholderType
|
||||||
&& !((PlaceholderType)y.getLhsType()).isWildcardable()
|
&& !((PlaceholderType)y.getLhsType()).isWildcardable()
|
||||||
@ -2076,6 +2078,8 @@ public class TypeUnifyTask extends RecursiveTask<Set<Set<UnifyPair>>> {
|
|||||||
// System.out.println("M");
|
// System.out.println("M");
|
||||||
//Set<UnifyPair> retFlat = new HashSet<>();
|
//Set<UnifyPair> retFlat = new HashSet<>();
|
||||||
//ret.stream().forEach(x -> retFlat.addAll(x));
|
//ret.stream().forEach(x -> retFlat.addAll(x));
|
||||||
|
|
||||||
|
//Alle wildcard Faelle rausfiltern bei not wildable
|
||||||
ret = ret.stream().filter(x -> { Optional<UnifyPair> optElem;
|
ret = ret.stream().filter(x -> { Optional<UnifyPair> optElem;
|
||||||
return !((optElem=x.stream().filter(y -> (y.getLhsType()) instanceof PlaceholderType
|
return !((optElem=x.stream().filter(y -> (y.getLhsType()) instanceof PlaceholderType
|
||||||
&& !((PlaceholderType)y.getLhsType()).isWildcardable()
|
&& !((PlaceholderType)y.getLhsType()).isWildcardable()
|
||||||
|
Loading…
Reference in New Issue
Block a user