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

Minor: inject builtIns to CallCompleter

Browse Source
This commit is contained in:
Pavel V. Talanov
2015-06-29 20:33:20 +03:00
parent 44dffa7bbc
commit 7fef1c4613
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallCompleter.kt
+3 -2
View File
@@ -45,7 +45,8 @@ import java.util.ArrayList
public class CallCompleter( public class CallCompleter(
val argumentTypeResolver: ArgumentTypeResolver, val argumentTypeResolver: ArgumentTypeResolver,
val candidateResolver: CandidateResolver val candidateResolver: CandidateResolver,
val builtIns: KotlinBuiltIns
) { ) {
fun <D : CallableDescriptor> completeCall( fun <D : CallableDescriptor> completeCall(
context: BasicCallResolutionContext, context: BasicCallResolutionContext,
@@ -154,7 +155,7 @@ public class CallCompleter(
if (returnType != null && expectedType === TypeUtils.UNIT_EXPECTED_TYPE) { if (returnType != null && expectedType === TypeUtils.UNIT_EXPECTED_TYPE) {
updateSystemIfSuccessful { updateSystemIfSuccessful {
system -> system ->
system.addSupertypeConstraint(KotlinBuiltIns.getInstance().getUnitType(), returnType, EXPECTED_TYPE_POSITION.position()) system.addSupertypeConstraint(builtIns.getUnitType(), returnType, EXPECTED_TYPE_POSITION.position())
system.getStatus().isSuccessful() system.getStatus().isSuccessful()
} }
} }