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

Refactor. Remove ConstraintPosition data duplication

Browse Source
This commit is contained in:
Simon Ogorodnik
2021-10-28 13:12:42 +03:00
committed by teamcity
parent 4d9e919f7e
commit 91b629d16a
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/resolution.common/src/org/jetbrains/kotlin/resolve/calls/inference/components/ConstraintInjector.kt
+2 -2
View File
@@ -43,7 +43,7 @@ class ConstraintInjector(
fun addInitialSubtypeConstraint(c: Context, lowerType: KotlinTypeMarker, upperType: KotlinTypeMarker, position: ConstraintPosition) { fun addInitialSubtypeConstraint(c: Context, lowerType: KotlinTypeMarker, upperType: KotlinTypeMarker, position: ConstraintPosition) {
val initialConstraint = InitialConstraint(lowerType, upperType, UPPER, position).also { c.addInitialConstraint(it) } val initialConstraint = InitialConstraint(lowerType, upperType, UPPER, position).also { c.addInitialConstraint(it) }
val typeCheckerState = TypeCheckerStateForConstraintInjector(c, IncorporationConstraintPosition(position, initialConstraint)) val typeCheckerState = TypeCheckerStateForConstraintInjector(c, IncorporationConstraintPosition(initialConstraint))
updateAllowedTypeDepth(c, lowerType) updateAllowedTypeDepth(c, lowerType)
updateAllowedTypeDepth(c, upperType) updateAllowedTypeDepth(c, upperType)
@@ -69,7 +69,7 @@ class ConstraintInjector(
else -> return else -> return
} }
val initialConstraint = InitialConstraint(typeVariable, equalType, EQUALITY, position).also { c.addInitialConstraint(it) } val initialConstraint = InitialConstraint(typeVariable, equalType, EQUALITY, position).also { c.addInitialConstraint(it) }
val typeCheckerState = TypeCheckerStateForConstraintInjector(c, IncorporationConstraintPosition(position, initialConstraint)) val typeCheckerState = TypeCheckerStateForConstraintInjector(c, IncorporationConstraintPosition(initialConstraint))
// We add constraints like `T? == Foo!` in the old way // We add constraints like `T? == Foo!` in the old way
if (!typeVariable.isSimpleType() || typeVariable.isMarkedNullable()) { if (!typeVariable.isSimpleType() || typeVariable.isMarkedNullable()) {
compiler/resolution.common/src/org/jetbrains/kotlin/resolve/calls/inference/model/ConstraintPositionAndErrors.kt
+2 -1
View File
@@ -77,10 +77,11 @@ open class DelegatedPropertyConstraintPosition<T>(val topLevelCall: T) : Constra
} }
data class IncorporationConstraintPosition( data class IncorporationConstraintPosition(
val from: ConstraintPosition,
val initialConstraint: InitialConstraint, val initialConstraint: InitialConstraint,
var isFromDeclaredUpperBound: Boolean = false var isFromDeclaredUpperBound: Boolean = false
) : ConstraintPosition() { ) : ConstraintPosition() {
val from: ConstraintPosition get() = initialConstraint.position
override fun toString(): String = "Incorporate $initialConstraint from position $from" override fun toString(): String = "Incorporate $initialConstraint from position $from"
} }