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

removed ResolutionStatus.TYPE_INFERENCE_ERROR constant

Browse Source
This commit is contained in:
Svetlana Isakova
2012-11-02 18:25:28 +04:00
parent b5a3486131
commit a6f437d363
2 changed files with 2 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/CandidateResolver.java
+2 -2
View File
@@ -246,7 +246,7 @@ public class CandidateResolver {
.create(descriptor, constraintSystem, argumentTypes, receiverType, .create(descriptor, constraintSystem, argumentTypes, receiverType,
context.expectedType), context.expectedType),
constraintSystemWithoutExpectedTypeConstraint); constraintSystemWithoutExpectedTypeConstraint);
resolvedCall.addStatus(ResolutionStatus.TYPE_INFERENCE_ERROR); resolvedCall.addStatus(ResolutionStatus.OTHER_ERROR);
failed.add(resolvedCall); failed.add(resolvedCall);
return; return;
} }
@@ -351,7 +351,7 @@ public class CandidateResolver {
else { else {
context.tracing.upperBoundViolated(candidateCall.getTrace(), inferenceErrorData); context.tracing.upperBoundViolated(candidateCall.getTrace(), inferenceErrorData);
} }
return TYPE_INFERENCE_ERROR.combine(argumentsStatus); return OTHER_ERROR.combine(argumentsStatus);
} }
private void addConstraintForValueArgument( private void addConstraintForValueArgument(
compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/results/ResolutionStatus.java
-2
View File
@@ -26,13 +26,11 @@ public enum ResolutionStatus {
UNSAFE_CALL_ERROR, UNSAFE_CALL_ERROR,
OTHER_ERROR, OTHER_ERROR,
STRONG_ERROR, STRONG_ERROR,
TYPE_INFERENCE_ERROR, //todo remove
SUCCESS(true); SUCCESS(true);
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public static final EnumSet<ResolutionStatus>[] SEVERITY_LEVELS = new EnumSet[] { public static final EnumSet<ResolutionStatus>[] SEVERITY_LEVELS = new EnumSet[] {
EnumSet.of(UNSAFE_CALL_ERROR), // weakest EnumSet.of(UNSAFE_CALL_ERROR), // weakest
EnumSet.of(TYPE_INFERENCE_ERROR),
EnumSet.of(OTHER_ERROR), EnumSet.of(OTHER_ERROR),
EnumSet.of(STRONG_ERROR), // most severe EnumSet.of(STRONG_ERROR), // most severe
}; };