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

Minor: Inject builtins into OverloadingConflictResolver

Browse Source
This commit is contained in:
Pavel V. Talanov
2015-07-23 18:26:52 +03:00
parent 4599c962f0
commit 0bed8bb7d4
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/results/OverloadingConflictResolver.java
+5 -2
View File
@@ -34,7 +34,11 @@ import java.util.Set;
public class OverloadingConflictResolver { public class OverloadingConflictResolver {
public OverloadingConflictResolver() {} private final KotlinBuiltIns builtIns;
public OverloadingConflictResolver(@NotNull KotlinBuiltIns builtIns) {
this.builtIns = builtIns;
}
@Nullable @Nullable
public <D extends CallableDescriptor> MutableResolvedCall<D> findMaximallySpecific( public <D extends CallableDescriptor> MutableResolvedCall<D> findMaximallySpecific(
@@ -250,7 +254,6 @@ public class OverloadingConflictResolver {
} }
private boolean numericTypeMoreSpecific(@NotNull JetType specific, @NotNull JetType general) { private boolean numericTypeMoreSpecific(@NotNull JetType specific, @NotNull JetType general) {
KotlinBuiltIns builtIns = KotlinBuiltIns.getInstance();
JetType _double = builtIns.getDoubleType(); JetType _double = builtIns.getDoubleType();
JetType _float = builtIns.getFloatType(); JetType _float = builtIns.getFloatType();
JetType _long = builtIns.getLongType(); JetType _long = builtIns.getLongType();