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

[NI] Minor cleanup in FixationOrderCalculator

Browse Source
This commit is contained in:
Dmitry Petrov
2017-06-26 11:13:35 +03:00
committed by Mikhail Zarechenskiy
parent ab2f99542a
commit 258a5aea28
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/inference/components/FixationOrderCalculator.kt
+7 -4
View File
@@ -19,6 +19,7 @@ package org.jetbrains.kotlin.resolve.calls.inference.components
import org.jetbrains.kotlin.resolve.calls.inference.model.Constraint import org.jetbrains.kotlin.resolve.calls.inference.model.Constraint
import org.jetbrains.kotlin.resolve.calls.inference.model.ConstraintKind import org.jetbrains.kotlin.resolve.calls.inference.model.ConstraintKind
import org.jetbrains.kotlin.resolve.calls.inference.model.VariableWithConstraints import org.jetbrains.kotlin.resolve.calls.inference.model.VariableWithConstraints
import org.jetbrains.kotlin.resolve.calls.model.PostponedKotlinCallArgument
import org.jetbrains.kotlin.resolve.calls.model.PostponedLambdaArgument import org.jetbrains.kotlin.resolve.calls.model.PostponedLambdaArgument
import org.jetbrains.kotlin.types.* import org.jetbrains.kotlin.types.*
import org.jetbrains.kotlin.types.checker.NewKotlinTypeChecker import org.jetbrains.kotlin.types.checker.NewKotlinTypeChecker
@@ -43,6 +44,7 @@ class FixationOrderCalculator {
interface Context { interface Context {
val notFixedTypeVariables: Map<TypeConstructor, VariableWithConstraints> val notFixedTypeVariables: Map<TypeConstructor, VariableWithConstraints>
val lambdaArguments: List<PostponedLambdaArgument> val lambdaArguments: List<PostponedLambdaArgument>
val postponedArguments: List<PostponedKotlinCallArgument>
} }
fun computeCompletionOrder( fun computeCompletionOrder(
@@ -104,10 +106,11 @@ class FixationOrderCalculator {
} }
} }
private fun UnwrappedType.findTypeVariables(to: MutableCollection<Variable>) = contains { private fun UnwrappedType.findTypeVariables(to: MutableCollection<Variable>) =
c.notFixedTypeVariables[it.constructor]?.let { variable -> to.add(variable) } contains {
false c.notFixedTypeVariables[it.constructor]?.let { variable -> to.add(variable) }
} false
}
private fun topologicalOrderWith0Priority(): List<Variable> { private fun topologicalOrderWith0Priority(): List<Variable> {
val handler = object : DFS.CollectingNodeHandler<Variable, Variable, LinkedHashSet<Variable>>(LinkedHashSet()) { val handler = object : DFS.CollectingNodeHandler<Variable, Variable, LinkedHashSet<Variable>>(LinkedHashSet()) {