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

Minor. Rename: typeParameterBounds -> localTypeParameterBounds

Browse Source
This commit is contained in:
Svetlana Isakova
2015-07-07 21:33:19 +03:00
parent 4701310852
commit 425a9516db
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors/src/org/jetbrains/kotlin/resolve/calls/inference/ConstraintSystemImpl.kt
+3 -3
View File
@@ -56,7 +56,7 @@ public class ConstraintSystemImpl : ConstraintSystem {
private val allTypeParameterBounds = LinkedHashMap<TypeParameterDescriptor, TypeBoundsImpl>()
private val externalTypeParameters = HashSet<TypeParameterDescriptor>()
private val typeParameterBounds: Map<TypeParameterDescriptor, TypeBoundsImpl>
private val localTypeParameterBounds: Map<TypeParameterDescriptor, TypeBoundsImpl>
get() = if (externalTypeParameters.isEmpty()) allTypeParameterBounds
else allTypeParameterBounds.filter { !externalTypeParameters.contains(it.key) }
@@ -86,9 +86,9 @@ public class ConstraintSystemImpl : ConstraintSystem {
override fun hasViolatedUpperBound() = !isSuccessful() && filterConstraintsOut(TYPE_BOUND_POSITION).getStatus().isSuccessful()
override fun hasConflictingConstraints() = typeParameterBounds.values().any { it.values.size() > 1 }
override fun hasConflictingConstraints() = localTypeParameterBounds.values().any { it.values.size() > 1 }
override fun hasUnknownParameters() = typeParameterBounds.values().any { it.values.isEmpty() }
override fun hasUnknownParameters() = localTypeParameterBounds.values().any { it.values.isEmpty() }
override fun hasTypeConstructorMismatch() = errors.any { it is TypeConstructorMismatch }