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

removed stored systemWithoutExpectedTypeConstraint

Browse Source 
now we can filter out constraints of special type if necessary
This commit is contained in:
Svetlana Isakova
2013-09-27 17:39:15 +04:00
parent a19acc43e0
commit af930012d5
2 changed files with 48 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintSystemImpl.java
+17 -14
View File
@@ -39,6 +39,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import static org.jetbrains.jet.lang.resolve.calls.inference.ConstraintPosition.EXPECTED_TYPE_POSITION;
import static org.jetbrains.jet.lang.resolve.calls.inference.ConstraintSystemImpl.ConstraintKind.EQUAL;
import static org.jetbrains.jet.lang.resolve.calls.inference.ConstraintSystemImpl.ConstraintKind.SUB_TYPE;
import static org.jetbrains.jet.lang.resolve.calls.inference.TypeBoundsImpl.BoundKind.*;
@@ -58,9 +59,6 @@ public class ConstraintSystemImpl implements ConstraintSystem {
private final TypeSubstitutor currentSubstitutor;
private boolean hasErrorInConstrainingTypes;
@Nullable
private ConstraintSystem systemWithoutExpectedTypeConstraint;
private final ConstraintSystemStatus constraintSystemStatus = new ConstraintSystemStatus() {
@Override
public boolean isSuccessful() {
@@ -109,14 +107,12 @@ public class ConstraintSystemImpl implements ConstraintSystem {
@Override
public boolean hasOnlyExpectedTypeMismatch() {
if (systemWithoutExpectedTypeConstraint == null) {
// the expected type constraint isn't added, there can't be an error with it
return false;
}
if (!isSuccessful() && systemWithoutExpectedTypeConstraint.getStatus().isSuccessful()) {
if (isSuccessful()) return false;
ConstraintSystem systemWithoutExpectedTypeConstraint = filterConstraintsOut(EXPECTED_TYPE_POSITION);
if (systemWithoutExpectedTypeConstraint.getStatus().isSuccessful()) {
return true;
}
if (errorConstraintPositions.size() == 1 && errorConstraintPositions.contains(ConstraintPosition.EXPECTED_TYPE_POSITION)) {
if (errorConstraintPositions.size() == 1 && errorConstraintPositions.contains(EXPECTED_TYPE_POSITION)) {
// if systemWithoutExpectedTypeConstraint has unknown type parameters, it's not successful,
// but there can be expected type mismatch after expected type is added
return true;
@@ -215,6 +211,17 @@ public class ConstraintSystemImpl implements ConstraintSystem {
Conditions.<ConstraintPosition>alwaysTrue());
}
@NotNull
public ConstraintSystem filterConstraintsOut(@NotNull ConstraintPosition... excludePositions) {
final Set<ConstraintPosition> positions = Sets.newHashSet(excludePositions);
return filterConstraints(new Condition<ConstraintPosition>() {
@Override
public boolean value(ConstraintPosition constraintPosition) {
return !positions.contains(constraintPosition);
}
});
}
@NotNull
public ConstraintSystem filterConstraints(@NotNull final Condition<ConstraintPosition> condition) {
return replaceTypeVariables(Functions.<TypeParameterDescriptor>identity(),
@@ -273,9 +280,6 @@ public class ConstraintSystemImpl implements ConstraintSystem {
) {
if (constrainingType != null && TypeUtils.noExpectedType(constrainingType)) return;
if (constraintPosition == ConstraintPosition.EXPECTED_TYPE_POSITION) {
systemWithoutExpectedTypeConstraint = copy();
}
addConstraint(SUB_TYPE, subjectType, constrainingType, constraintPosition);
}
@@ -483,8 +487,7 @@ public class ConstraintSystemImpl implements ConstraintSystem {
@Override
public TypeSubstitutor getResultingSubstitutor() {
if (getStatus().hasOnlyExpectedTypeMismatch()) {
assert systemWithoutExpectedTypeConstraint != null;
return systemWithoutExpectedTypeConstraint.getResultingSubstitutor();
return filterConstraintsOut(EXPECTED_TYPE_POSITION).getResultingSubstitutor();
}
return resultingSubstitutor;
}