azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

do not use bounds containing error types to derive result

Browse Source
This commit is contained in:
Svetlana Isakova
2013-02-07 20:49:26 +04:00
parent d09c5c5e5e
commit 0d0441ebd8
1 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintsUtil.java
+19 -4
View File
@@ -16,6 +16,8 @@
package org.jetbrains.jet.lang.resolve.calls.inference; package org.jetbrains.jet.lang.resolve.calls.inference;
import com.google.common.base.Predicate;
import com.google.common.collect.Collections2;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
@@ -40,8 +42,9 @@ public class ConstraintsUtil {
} }
} }
values.addAll(typeConstraints.getExactBounds()); values.addAll(typeConstraints.getExactBounds());
if (!typeConstraints.getLowerBounds().isEmpty()) { Collection<JetType> lowerBounds = filterNotContainingErrorType(typeConstraints.getLowerBounds());
JetType superTypeOfLowerBounds = CommonSupertypes.commonSupertype(typeConstraints.getLowerBounds()); if (!lowerBounds.isEmpty()) {
JetType superTypeOfLowerBounds = CommonSupertypes.commonSupertype(lowerBounds);
for (JetType value : values) { for (JetType value : values) {
if (!JetTypeChecker.INSTANCE.isSubtypeOf(superTypeOfLowerBounds, value)) { if (!JetTypeChecker.INSTANCE.isSubtypeOf(superTypeOfLowerBounds, value)) {
values.add(superTypeOfLowerBounds); values.add(superTypeOfLowerBounds);
@@ -52,9 +55,10 @@ public class ConstraintsUtil {
values.add(superTypeOfLowerBounds); values.add(superTypeOfLowerBounds);
} }
} }
if (!typeConstraints.getUpperBounds().isEmpty()) { Collection<JetType> upperBounds = filterNotContainingErrorType(typeConstraints.getUpperBounds());
if (!upperBounds.isEmpty()) {
//todo subTypeOfUpperBounds //todo subTypeOfUpperBounds
JetType subTypeOfUpperBounds = typeConstraints.getUpperBounds().iterator().next(); //todo JetType subTypeOfUpperBounds = upperBounds.iterator().next(); //todo
for (JetType value : values) { for (JetType value : values) {
if (!JetTypeChecker.INSTANCE.isSubtypeOf(value, subTypeOfUpperBounds)) { if (!JetTypeChecker.INSTANCE.isSubtypeOf(value, subTypeOfUpperBounds)) {
values.add(subTypeOfUpperBounds); values.add(subTypeOfUpperBounds);
@@ -84,6 +88,17 @@ public class ConstraintsUtil {
return true; return true;
} }
@NotNull
private static Collection<JetType> filterNotContainingErrorType(@NotNull Collection<JetType> types) {
return Collections2.filter(types, new Predicate<JetType>() {
@Override
public boolean apply(@Nullable JetType type) {
if (ErrorUtils.containsErrorType(type)) return false;
return true;
}
});
}
@Nullable @Nullable
public static JetType getValue(@Nullable TypeConstraints typeConstraints) { public static JetType getValue(@Nullable TypeConstraints typeConstraints) {
//todo all checks //todo all checks