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

The case of Integer.getInteger("1", 2) fixed (was: OVERLOAD_RESOLUTION_AMBIGUITY)

Browse Source
This commit is contained in:
Andrey Breslav
2014-09-09 21:31:59 +04:00
parent 837353d9fd
commit 0b6a4df4f4
3 changed files with 53 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/results/OverloadingConflictResolver.java
+18 -1
View File
@@ -28,6 +28,7 @@ import org.jetbrains.jet.lang.resolve.calls.model.VariableAsFunctionResolvedCall
import org.jetbrains.jet.lang.types.BoundsSubstitutor;
import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.lang.types.TypeUtils;
import org.jetbrains.jet.lang.types.TypesPackage;
import org.jetbrains.jet.lang.types.checker.JetTypeChecker;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
@@ -239,8 +240,24 @@ public class OverloadingConflictResolver {
}
private boolean typeMoreSpecific(@NotNull JetType specific, @NotNull JetType general) {
return JetTypeChecker.DEFAULT.isSubtypeOf(specific, general) ||
boolean isSubtype = JetTypeChecker.DEFAULT.isSubtypeOf(specific, general) ||
numericTypeMoreSpecific(specific, general);
if (!isSubtype) return false;
boolean specificIsFlexible = TypesPackage.isFlexible(specific);
boolean generalIsFlexible = TypesPackage.isFlexible(general);
if (specificIsFlexible && !generalIsFlexible) {
// Int! lessSpecific Int
// Int! >< Int?
return false;
}
else if (!specificIsFlexible && generalIsFlexible) {
// Int? >< Int!
if (specific.isNullable()) return false;
}
return true;
}
private boolean numericTypeMoreSpecific(@NotNull JetType specific, @NotNull JetType general) {