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

Implement inference context and simple components

Browse Source
This commit is contained in:
Simon Ogorodnik
2019-03-19 18:41:30 +03:00
parent 04324b6723
commit 9a1678728d
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/inference/components/ConstraintIncorporator.kt
+1 -1
View File
@@ -16,7 +16,7 @@ import java.util.*
// todo problem: intersection types in constrains: A <: Number, B <: Inv<A & Any> =>? B <: Inv<out Number & Any> // todo problem: intersection types in constrains: A <: Number, B <: Inv<A & Any> =>? B <: Inv<out Number & Any>
class ConstraintIncorporator( class ConstraintIncorporator(
val typeApproximator: TypeApproximator, val typeApproximator: AbstractTypeApproximator,
val trivialConstraintTypeInferenceOracle: TrivialConstraintTypeInferenceOracle val trivialConstraintTypeInferenceOracle: TrivialConstraintTypeInferenceOracle
) { ) {
compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/inference/components/ConstraintInjector.kt
+1 -1
View File
@@ -27,7 +27,7 @@ import org.jetbrains.kotlin.types.model.*
import java.util.* import java.util.*
import kotlin.math.max import kotlin.math.max
class ConstraintInjector(val constraintIncorporator: ConstraintIncorporator, val typeApproximator: TypeApproximator) { class ConstraintInjector(val constraintIncorporator: ConstraintIncorporator, val typeApproximator: AbstractTypeApproximator) {
private val ALLOWED_DEPTH_DELTA_FOR_INCORPORATION = 1 private val ALLOWED_DEPTH_DELTA_FOR_INCORPORATION = 1
interface Context : TypeSystemInferenceExtensionContext { interface Context : TypeSystemInferenceExtensionContext {