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

[FIR] Change rendering for captured types and stub types

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2020-02-18 11:21:38 +03:00
parent c83244c8b5
commit 89e377763a
5 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/cones/src/org/jetbrains/kotlin/fir/types/TypeRenderer.kt
+2 -2
View File
@@ -15,7 +15,7 @@ fun ConeKotlinType.render(): String {
is ConeTypeVariableType -> "TypeVariable(${this.lookupTag.name})" is ConeTypeVariableType -> "TypeVariable(${this.lookupTag.name})"
is ConeDefinitelyNotNullType -> "${original.render()}!!" is ConeDefinitelyNotNullType -> "${original.render()}!!"
is ConeClassErrorType -> "ERROR CLASS: $reason" is ConeClassErrorType -> "ERROR CLASS: $reason"
is ConeCapturedType -> "captured type: lowerType = ${lowerType?.render()}" is ConeCapturedType -> "CapturedType(${constructor.projection.render()})"
is ConeClassLikeType -> { is ConeClassLikeType -> {
buildString { buildString {
append(lookupTag.classId.asString()) append(lookupTag.classId.asString())
@@ -45,7 +45,7 @@ fun ConeKotlinType.render(): String {
postfix = ")" postfix = ")"
) )
} }
is ConeStubType -> "stub type: $variable" is ConeStubType -> "Stub: $variable"
is ConeIntegerLiteralType -> "ILT: $value" is ConeIntegerLiteralType -> "ILT: $value"
} + nullabilitySuffix } + nullabilitySuffix
} }
compiler/fir/resolve/testData/resolve/inference/capturedTypeForJavaTypeParameter.txt
Vendored
+1 -1
View File
@@ -4,5 +4,5 @@ FILE: main.kt
public final fun <D : R|A|> foo(b: R|B<D>|): R|kotlin/Unit| { public final fun <D : R|A|> foo(b: R|B<D>|): R|kotlin/Unit| {
} }
public final fun main(b: R|B<*>|): R|kotlin/Unit| { public final fun main(b: R|B<*>|): R|kotlin/Unit| {
R|/foo|<R|captured type: lowerType = null|>(R|<local>/b|) R|/foo|<R|CapturedType(*)|>(R|<local>/b|)
} }
compiler/fir/resolve/testData/resolve/inference/receiverWithCapturedType.txt
Vendored
+3 -3
View File
@@ -15,10 +15,10 @@ FILE: receiverWithCapturedType.kt
^updateD R|<local>/d| ^updateD R|<local>/d|
} }
public final fun test_1_1(resolvedCall: R|ResolvedCall<out CallableDescriptor>|): R|kotlin/Unit| { public final fun test_1_1(resolvedCall: R|ResolvedCall<out CallableDescriptor>|): R|kotlin/Unit| {
R|<local>/resolvedCall|.R|/getParameterForArgument|<R|captured type: lowerType = null|>() R|<local>/resolvedCall|.R|/getParameterForArgument|<R|CapturedType(out CallableDescriptor)|>()
} }
public final fun test_1_2(resolvedCall: R|ResolvedCall<in CallableDescriptor>|): R|kotlin/Unit| { public final fun test_1_2(resolvedCall: R|ResolvedCall<in CallableDescriptor>|): R|kotlin/Unit| {
R|<local>/resolvedCall|.R|/getParameterForArgument|<R|captured type: lowerType = CallableDescriptor|>() R|<local>/resolvedCall|.R|/getParameterForArgument|<R|CapturedType(in CallableDescriptor)|>()
} }
public final fun test_1_3(resolvedCall: R|ResolvedCall<CallableDescriptor>|): R|kotlin/Unit| { public final fun test_1_3(resolvedCall: R|ResolvedCall<CallableDescriptor>|): R|kotlin/Unit| {
R|<local>/resolvedCall|.R|/getParameterForArgument|<R|CallableDescriptor|>() R|<local>/resolvedCall|.R|/getParameterForArgument|<R|CallableDescriptor|>()
@@ -27,7 +27,7 @@ FILE: receiverWithCapturedType.kt
lval x: <ERROR TYPE REF: Inapplicable(INAPPLICABLE): [/updateD]> = R|<local>/resolvedCall|.<Inapplicable(INAPPLICABLE): [/updateD]>#(R|<local>/d|) lval x: <ERROR TYPE REF: Inapplicable(INAPPLICABLE): [/updateD]> = R|<local>/resolvedCall|.<Inapplicable(INAPPLICABLE): [/updateD]>#(R|<local>/d|)
} }
public final fun test_2_2(resolvedCall: R|ResolvedCall<in CallableDescriptor>|, d: R|CallableDescriptor|): R|kotlin/Unit| { public final fun test_2_2(resolvedCall: R|ResolvedCall<in CallableDescriptor>|, d: R|CallableDescriptor|): R|kotlin/Unit| {
lval x: R|CallableDescriptor| = R|<local>/resolvedCall|.R|/updateD|<R|captured type: lowerType = CallableDescriptor|>(R|<local>/d|) lval x: R|CallableDescriptor| = R|<local>/resolvedCall|.R|/updateD|<R|CapturedType(in CallableDescriptor)|>(R|<local>/d|)
} }
public final fun test_2_3(resolvedCall: R|ResolvedCall<CallableDescriptor>|, d: R|CallableDescriptor|): R|kotlin/Unit| { public final fun test_2_3(resolvedCall: R|ResolvedCall<CallableDescriptor>|, d: R|CallableDescriptor|): R|kotlin/Unit| {
lval x: R|CallableDescriptor| = R|<local>/resolvedCall|.R|/updateD|<R|CallableDescriptor|>(R|<local>/d|) lval x: R|CallableDescriptor| = R|<local>/resolvedCall|.R|/updateD|<R|CallableDescriptor|>(R|<local>/d|)
compiler/fir/resolve/testData/resolve/inference/simpleCapturedTypes.txt
Vendored
+4 -4
View File
@@ -19,10 +19,10 @@ FILE: simpleCapturedTypes.kt
^ this@R|/idP| ^ this@R|/idP|
} }
private final fun getSetterInfos(kc: R|KC<out Ann>|): R|kotlin/Unit| { private final fun getSetterInfos(kc: R|KC<out Ann>|): R|kotlin/Unit| {
R|/id|<R|captured type: lowerType = null|>(R|<local>/kc|).R|FakeOverride</KC.x: R|Ann|>|.R|/Ann.foo|() R|/id|<R|CapturedType(out Ann)|>(R|<local>/kc|).R|FakeOverride</KC.x: R|Ann|>|.R|/Ann.foo|()
R|<local>/kc|.R|/idR|<R|captured type: lowerType = null|>().R|FakeOverride</KC.x: R|Ann|>|.R|/Ann.foo|() R|<local>/kc|.R|/idR|<R|CapturedType(out Ann)|>().R|FakeOverride</KC.x: R|Ann|>|.R|/Ann.foo|()
R|<local>/kc|.R|/idP|.R|FakeOverride</KC.x: R|Ann|>|.R|/Ann.foo|() R|<local>/kc|.R|/idP|.R|FakeOverride</KC.x: R|Ann|>|.R|/Ann.foo|()
lval x1: R|KC<out Ann>| = R|/id|<R|captured type: lowerType = null|>(R|<local>/kc|) lval x1: R|KC<out Ann>| = R|/id|<R|CapturedType(out Ann)|>(R|<local>/kc|)
lval x2: R|KC<out Ann>| = R|<local>/kc|.R|/idR|<R|captured type: lowerType = null|>() lval x2: R|KC<out Ann>| = R|<local>/kc|.R|/idR|<R|CapturedType(out Ann)|>()
lval x3: R|KC<out Ann>| = R|<local>/kc|.R|/idP| lval x3: R|KC<out Ann>| = R|<local>/kc|.R|/idP|
} }
compiler/fir/resolve/testData/resolveWithStdlib/j+k/capturedFlexible.txt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
FILE: capturedFlexible.kt FILE: capturedFlexible.kt
public final fun foo(z: R|java/util/zip/ZipFile|): R|kotlin/Unit| { public final fun foo(z: R|java/util/zip/ZipFile|): R|kotlin/Unit| {
R|<local>/z|.R|java/util/zip/ZipFile.entries|().R|kotlin/sequences/asSequence|<R|captured type: lowerType = null|>() R|<local>/z|.R|java/util/zip/ZipFile.entries|().R|kotlin/sequences/asSequence|<R|CapturedType(out java/util/zip/ZipEntry)|>()
} }