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

Refactoring: made code in 'processDeclaredBoundConstraints' more kotlin

Browse Source
This commit is contained in:
Svetlana Isakova
2014-12-02 15:05:49 +03:00
parent 1fb713342b
commit b098220d03
1 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintSystemImpl.kt
+15 -17
View File
@@ -45,6 +45,7 @@ import org.jetbrains.jet.lang.types.CustomTypeVariable
import org.jetbrains.jet.lang.types.getCustomTypeVariable import org.jetbrains.jet.lang.types.getCustomTypeVariable
import org.jetbrains.jet.lang.types.isFlexible import org.jetbrains.jet.lang.types.isFlexible
import org.jetbrains.jet.lang.types.checker.JetTypeChecker import org.jetbrains.jet.lang.types.checker.JetTypeChecker
import org.jetbrains.jet.lang.resolve.calls.inference.TypeBounds.Bound
public class ConstraintSystemImpl : ConstraintSystem { public class ConstraintSystemImpl : ConstraintSystem {
@@ -389,25 +390,22 @@ public class ConstraintSystemImpl : ConstraintSystem {
public fun processDeclaredBoundConstraints() { public fun processDeclaredBoundConstraints() {
for ((typeParameterDescriptor, typeBounds) in typeParameterBounds) { for ((typeParameterDescriptor, typeBounds) in typeParameterBounds) {
fun compoundPosition(bound: Bound) = CompoundConstraintPosition(
TYPE_BOUND_POSITION.position(typeParameterDescriptor.getIndex()), bound.position)
// todo order matters here
// it's important to create a separate variable here,
// because the following code may add new elements to typeBounds.bounds collection
val bounds = ArrayList(typeBounds.bounds)
for (declaredUpperBound in typeParameterDescriptor.getUpperBounds()) { for (declaredUpperBound in typeParameterDescriptor.getUpperBounds()) {
//todo order matters here bounds.filter { it.kind != UPPER_BOUND }.forEach {
val bounds = ArrayList(typeBounds.bounds) lowerOrExactBound ->
for (bound in bounds) { addSubtypeConstraint(lowerOrExactBound.constrainingType, declaredUpperBound, compoundPosition(lowerOrExactBound))
if (bound.kind == LOWER_BOUND || bound.kind == EXACT_BOUND) {
val position = CompoundConstraintPosition(
TYPE_BOUND_POSITION.position(typeParameterDescriptor.getIndex()), bound.position)
addSubtypeConstraint(bound.constrainingType, declaredUpperBound, position)
}
} }
if (isMyTypeVariable(declaredUpperBound)) { if (!isMyTypeVariable(declaredUpperBound)) continue
val typeBoundsForUpperBound = getTypeBounds(declaredUpperBound) getTypeBounds(declaredUpperBound).bounds.filter { it.kind != LOWER_BOUND }.forEach {
for (bound in typeBoundsForUpperBound.bounds) { upperOrExactBound ->
if (bound.kind == UPPER_BOUND || bound.kind == EXACT_BOUND) { typeBounds.addBound(UPPER_BOUND, upperOrExactBound.constrainingType, compoundPosition(upperOrExactBound))
val position = CompoundConstraintPosition(
TYPE_BOUND_POSITION.position(typeParameterDescriptor.getIndex()), bound.position)
typeBounds.addBound(UPPER_BOUND, bound.constrainingType, position)
}
}
} }
} }
} }