From 6cfe935c2a76fdce5e4cc9b7126e0060795069d3 Mon Sep 17 00:00:00 2001 From: Simon Ogorodnik Date: Fri, 23 Mar 2018 19:08:54 +0300 Subject: [PATCH] FIR: Switch to | in fir resolved type renderer Otherwise it clashed with qualified names --- .../org/jetbrains/kotlin/fir/FirRenderer.kt | 4 +-- .../rawBuilder/declarations/simpleClass.txt | 2 +- compiler/testData/fir/resolve/F.txt | 2 +- .../fir/resolve/NestedOfAliasedType.txt | 6 ++--- .../testData/fir/resolve/NestedSuperType.txt | 8 +++--- .../fir/resolve/TwoDeclarationsInSameFile.txt | 2 +- .../testData/fir/resolve/builtins/lists.txt | 8 +++--- compiler/testData/fir/resolve/enum.txt | 16 ++++++------ .../testData/fir/resolve/functionTypes.txt | 6 ++--- .../testData/fir/resolve/genericFunctions.txt | 4 +-- .../fir/resolve/multifile/NestedSuperType.txt | 6 ++--- .../resolve/multifile/TypeAliasExpansion.txt | 2 +- .../resolve/multifile/sealedStarImport.txt | 6 ++--- .../resolve/multifile/simpleAliasedImport.txt | 2 +- .../fir/resolve/multifile/simpleImport.txt | 2 +- .../resolve/multifile/simpleImportNested.txt | 2 +- .../resolve/multifile/simpleImportOuter.txt | 2 +- .../resolve/multifile/simpleStarImport.txt | 2 +- compiler/testData/fir/resolve/simpleClass.txt | 26 +++++++++---------- .../testData/fir/resolve/simpleTypeAlias.txt | 4 +-- .../fir/resolve/typeAliasWithGeneric.txt | 6 ++--- .../fir/resolve/typeParameterVsNested.txt | 18 ++++++------- 22 files changed, 68 insertions(+), 68 deletions(-) diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt index e7fce5cb781..a0f9df417c8 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt @@ -458,10 +458,10 @@ class FirRenderer(builder: StringBuilder) : FirVisitorVoid() { override fun visitResolvedType(resolvedType: FirResolvedType) { resolvedType.annotations.renderAnnotations() - print("R/") + print("R|") val coneType = resolvedType.type print(coneType.asString()) - print("/") + print("|") visitTypeWithNullability(resolvedType) } diff --git a/compiler/testData/fir/rawBuilder/declarations/simpleClass.txt b/compiler/testData/fir/rawBuilder/declarations/simpleClass.txt index 46e9951f49e..5fa37fb89d0 100644 --- a/compiler/testData/fir/rawBuilder/declarations/simpleClass.txt +++ b/compiler/testData/fir/rawBuilder/declarations/simpleClass.txt @@ -22,6 +22,6 @@ FILE: simpleClass.kt public? final? property fau(var): Double public? get(): Double - public? set(value: Double): R/kotlin/Unit/ + public? set(value: Double): R|kotlin/Unit| } diff --git a/compiler/testData/fir/resolve/F.txt b/compiler/testData/fir/resolve/F.txt index 41fe1474ba5..98574c233cf 100644 --- a/compiler/testData/fir/resolve/F.txt +++ b/compiler/testData/fir/resolve/F.txt @@ -1,5 +1,5 @@ FILE: F.kt public? open class A() { } - public? final class B() : R/A/ { + public? final class B() : R|A| { } diff --git a/compiler/testData/fir/resolve/NestedOfAliasedType.txt b/compiler/testData/fir/resolve/NestedOfAliasedType.txt index 33517da711b..904247287c1 100644 --- a/compiler/testData/fir/resolve/NestedOfAliasedType.txt +++ b/compiler/testData/fir/resolve/NestedOfAliasedType.txt @@ -4,9 +4,9 @@ FILE: NestedOfAliasedType.kt } } - public? final typealias TA = R/A/ - public? final class B() : R/TA = A/ { - public? final class NestedInB() : R/A.Nested/ { + public? final typealias TA = R|A| + public? final class B() : R|TA = A| { + public? final class NestedInB() : R|A.Nested| { } } diff --git a/compiler/testData/fir/resolve/NestedSuperType.txt b/compiler/testData/fir/resolve/NestedSuperType.txt index 7adf7f6ab1d..5a240087415 100644 --- a/compiler/testData/fir/resolve/NestedSuperType.txt +++ b/compiler/testData/fir/resolve/NestedSuperType.txt @@ -1,14 +1,14 @@ FILE: NestedSuperType.kt public? abstract class My() { - public? abstract class NestedOne() : R/p/My/ { - public? abstract class NestedTwo() : R/p/My.NestedOne/ { + public? abstract class NestedOne() : R|p/My| { + public? abstract class NestedTwo() : R|p/My.NestedOne| { } } } - public? final class Your() : R/p/My/ { - public? final class NestedThree() : R/p/My.NestedOne/ { + public? final class Your() : R|p/My| { + public? final class NestedThree() : R|p/My.NestedOne| { } } diff --git a/compiler/testData/fir/resolve/TwoDeclarationsInSameFile.txt b/compiler/testData/fir/resolve/TwoDeclarationsInSameFile.txt index dc3c57fdc16..7f9d78b9f4a 100644 --- a/compiler/testData/fir/resolve/TwoDeclarationsInSameFile.txt +++ b/compiler/testData/fir/resolve/TwoDeclarationsInSameFile.txt @@ -1,5 +1,5 @@ FILE: TwoDeclarationsInSameFile.kt public? open class A() { } - public? final class B() : R/p/A/ { + public? final class B() : R|p/A| { } diff --git a/compiler/testData/fir/resolve/builtins/lists.txt b/compiler/testData/fir/resolve/builtins/lists.txt index c48ff8b19ab..fa21dac7d19 100644 --- a/compiler/testData/fir/resolve/builtins/lists.txt +++ b/compiler/testData/fir/resolve/builtins/lists.txt @@ -1,11 +1,11 @@ FILE: lists.kt - public? abstract class MyStringList() : R/kotlin/collections/List/ { + public? abstract class MyStringList() : R|kotlin/collections/List| { } - public? abstract class MyMutableStringList() : R/kotlin/collections/MutableList/ { + public? abstract class MyMutableStringList() : R|kotlin/collections/MutableList| { } - public? final? function convert R/kotlin/collections/List/.(): R/MyStringList/ { + public? final? function convert R|kotlin/collections/List|.(): R|MyStringList| { STUB } - public? final? function ret(l: R/kotlin/collections/MutableList/): R/MyMutableStringList/ { + public? final? function ret(l: R|kotlin/collections/MutableList|): R|MyMutableStringList| { STUB } diff --git a/compiler/testData/fir/resolve/enum.txt b/compiler/testData/fir/resolve/enum.txt index 7e16808cb6d..1ad16f80366 100644 --- a/compiler/testData/fir/resolve/enum.txt +++ b/compiler/testData/fir/resolve/enum.txt @@ -1,27 +1,27 @@ FILE: enum.kt public? abstract interface Some() { } - public? final object O1() : R/Some/ { + public? final object O1() : R|Some| { } - public? final object O2() : R/Some/ { + public? final object O2() : R|Some| { } public? final enum class SomeEnum() { - public? constructor(x: R/Some/) + public? constructor(x: R|Some|) - public? final enum entry FIRST() : R/SomeEnum/ { - public? open? override function check(y: R/Some/): R/kotlin/Boolean/ { + public? final enum entry FIRST() : R|SomeEnum| { + public? open? override function check(y: R|Some|): R|kotlin/Boolean| { STUB } } - public? final enum entry SECOND() : R/SomeEnum/ { - public? open? override function check(y: R/Some/): R/kotlin/Boolean/ { + public? final enum entry SECOND() : R|SomeEnum| { + public? open? override function check(y: R|Some|): R|kotlin/Boolean| { STUB } } - public? abstract function check(y: R/Some/): R/kotlin/Boolean/ + public? abstract function check(y: R|Some|): R|kotlin/Boolean| } diff --git a/compiler/testData/fir/resolve/functionTypes.txt b/compiler/testData/fir/resolve/functionTypes.txt index 1ac576d76a2..99f05b4cd66 100644 --- a/compiler/testData/fir/resolve/functionTypes.txt +++ b/compiler/testData/fir/resolve/functionTypes.txt @@ -1,9 +1,9 @@ FILE: functionTypes.kt - public? final? function simpleRun(f: ( (R/T/) -> R/kotlin/Unit/ )): R/kotlin/Unit/ { + public? final? function simpleRun(f: R|(T) -> kotlin/Unit|): R|kotlin/Unit| { STUB } - public? final? function simpleMap R/kotlin/collections/List/.(f: ( (R/T/) -> R/R/ )): R/R/ { + public? final? function simpleMap R|kotlin/collections/List|.(f: R|(T) -> R|): R|R| { } - public? final? function simpleWith(t: R/T/, f: ( R/T/.() -> R/kotlin/Unit/ )): R/kotlin/Unit/ { + public? final? function simpleWith(t: R|T|, f: R|T.() -> kotlin/Unit|): R|kotlin/Unit| { STUB } diff --git a/compiler/testData/fir/resolve/genericFunctions.txt b/compiler/testData/fir/resolve/genericFunctions.txt index 7af9e5a6694..494187e2478 100644 --- a/compiler/testData/fir/resolve/genericFunctions.txt +++ b/compiler/testData/fir/resolve/genericFunctions.txt @@ -1,10 +1,10 @@ FILE: genericFunctions.kt public? abstract interface Any() { } - public? final? inline function safeAs R/Any/.(): R/T/ { + public? final? inline function safeAs R|Any|.(): R|T| { STUB } public? abstract class Summator() { - public? abstract function plus(first: R/T/, second: R/T/): R/T/ + public? abstract function plus(first: R|T|, second: R|T|): R|T| } diff --git a/compiler/testData/fir/resolve/multifile/NestedSuperType.txt b/compiler/testData/fir/resolve/multifile/NestedSuperType.txt index cfe37d579b6..524e0c1d60a 100644 --- a/compiler/testData/fir/resolve/multifile/NestedSuperType.txt +++ b/compiler/testData/fir/resolve/multifile/NestedSuperType.txt @@ -1,9 +1,9 @@ FILE: NestedSuperType.kt - public? final class A() : R/b/B/ { - public? final class NestedInA1() : R/b/B.NestedInB/ { + public? final class A() : R|b/B| { + public? final class NestedInA1() : R|b/B.NestedInB| { } - public? final class NestedInA2() : R/c/C.NestedInC/ { + public? final class NestedInA2() : R|c/C.NestedInC| { } } diff --git a/compiler/testData/fir/resolve/multifile/TypeAliasExpansion.txt b/compiler/testData/fir/resolve/multifile/TypeAliasExpansion.txt index 00092bc97f5..0c7b6ac28aa 100644 --- a/compiler/testData/fir/resolve/multifile/TypeAliasExpansion.txt +++ b/compiler/testData/fir/resolve/multifile/TypeAliasExpansion.txt @@ -1,3 +1,3 @@ FILE: TypeAliasExpansion.kt - public? final class MyClass() : R/b/TA = b/A/ { + public? final class MyClass() : R|b/TA = b/A| { } diff --git a/compiler/testData/fir/resolve/multifile/sealedStarImport.txt b/compiler/testData/fir/resolve/multifile/sealedStarImport.txt index 24b7995c1e5..584ce37799b 100644 --- a/compiler/testData/fir/resolve/multifile/sealedStarImport.txt +++ b/compiler/testData/fir/resolve/multifile/sealedStarImport.txt @@ -1,9 +1,9 @@ FILE: sealedStarImport.kt public? abstract class Factory() { - public? abstract function createTest(): R/error: Symbol not found/ + public? abstract function createTest(): R|error: Symbol not found| - public? abstract function createObj(): R/test/Test.O/ + public? abstract function createObj(): R|test/Test.O| - public? abstract function createExtra(): R/test/Test.Extra/ + public? abstract function createExtra(): R|test/Test.Extra| } diff --git a/compiler/testData/fir/resolve/multifile/simpleAliasedImport.txt b/compiler/testData/fir/resolve/multifile/simpleAliasedImport.txt index 3c2e7d86429..d6a4e468705 100644 --- a/compiler/testData/fir/resolve/multifile/simpleAliasedImport.txt +++ b/compiler/testData/fir/resolve/multifile/simpleAliasedImport.txt @@ -1,3 +1,3 @@ FILE: simpleAliasedImport.kt - public? final class YourClass() : R/b/MyClass/ { + public? final class YourClass() : R|b/MyClass| { } diff --git a/compiler/testData/fir/resolve/multifile/simpleImport.txt b/compiler/testData/fir/resolve/multifile/simpleImport.txt index 7d8f50e25a4..611c14d27c0 100644 --- a/compiler/testData/fir/resolve/multifile/simpleImport.txt +++ b/compiler/testData/fir/resolve/multifile/simpleImport.txt @@ -1,3 +1,3 @@ FILE: simpleImport.kt - public? final class YourClass() : R/b/MyClass/ { + public? final class YourClass() : R|b/MyClass| { } diff --git a/compiler/testData/fir/resolve/multifile/simpleImportNested.txt b/compiler/testData/fir/resolve/multifile/simpleImportNested.txt index 3a3eba52ac6..9f7e7abfc6a 100644 --- a/compiler/testData/fir/resolve/multifile/simpleImportNested.txt +++ b/compiler/testData/fir/resolve/multifile/simpleImportNested.txt @@ -1,3 +1,3 @@ FILE: simpleImportNested.kt - public? final class YourClass() : R/a/MyClass.MyNested/ { + public? final class YourClass() : R|a/MyClass.MyNested| { } diff --git a/compiler/testData/fir/resolve/multifile/simpleImportOuter.txt b/compiler/testData/fir/resolve/multifile/simpleImportOuter.txt index e473601c3bc..8e83a0f3859 100644 --- a/compiler/testData/fir/resolve/multifile/simpleImportOuter.txt +++ b/compiler/testData/fir/resolve/multifile/simpleImportOuter.txt @@ -1,3 +1,3 @@ FILE: simpleImportOuter.kt - public? final class My() : R/a/Outer.Nested/ { + public? final class My() : R|a/Outer.Nested| { } diff --git a/compiler/testData/fir/resolve/multifile/simpleStarImport.txt b/compiler/testData/fir/resolve/multifile/simpleStarImport.txt index fbf5fc47b56..95f5f7a7210 100644 --- a/compiler/testData/fir/resolve/multifile/simpleStarImport.txt +++ b/compiler/testData/fir/resolve/multifile/simpleStarImport.txt @@ -1,2 +1,2 @@ FILE: simpleStarImport.kt - public? final? function foo(arg: R/b/d/Other/): R/b/d/Another/ + public? final? function foo(arg: R|b/d/Other|): R|b/d/Another| diff --git a/compiler/testData/fir/resolve/simpleClass.txt b/compiler/testData/fir/resolve/simpleClass.txt index ebc9cb4cc78..1bfbd48dd5a 100644 --- a/compiler/testData/fir/resolve/simpleClass.txt +++ b/compiler/testData/fir/resolve/simpleClass.txt @@ -1,27 +1,27 @@ FILE: simpleClass.kt public? abstract interface SomeInterface() { - public? final? function foo(x: R/kotlin/Int/, y: R/kotlin/String/): R/kotlin/String/ + public? final? function foo(x: R|kotlin/Int|, y: R|kotlin/String|): R|kotlin/String| - public? final? property bar(val): R/kotlin/Boolean/ - public? get(): R/kotlin/Boolean/ + public? final? property bar(val): R|kotlin/Boolean| + public? get(): R|kotlin/Boolean| } - public? final class SomeClass() : R/SomeInterface/ { - private final? property baz(val): R/error: Not supported: FirImplicitTypeImpl/ = STUB - public? get(): R/error: Not supported: FirImplicitTypeImpl/ + public? final class SomeClass() : R|SomeInterface| { + private final? property baz(val): R|error: Not supported: FirImplicitTypeImpl| = STUB + public? get(): R|error: Not supported: FirImplicitTypeImpl| - public? open? override function foo(x: R/kotlin/Int/, y: R/kotlin/String/): R/kotlin/String/ { + public? open? override function foo(x: R|kotlin/Int|, y: R|kotlin/String|): R|kotlin/String| { } - public? open? override property bar(var): R/kotlin/Boolean/ - public? get(): R/error: Not supported: FirImplicitTypeImpl/ { + public? open? override property bar(var): R|kotlin/Boolean| + public? get(): R|error: Not supported: FirImplicitTypeImpl| { STUB } - public? set(value: R/kotlin/Boolean/): R/error: Not supported: FirImplicitTypeImpl/ { + public? set(value: R|kotlin/Boolean|): R|error: Not supported: FirImplicitTypeImpl| { } - public? final? property fau(var): R/kotlin/Double/ - public? get(): R/kotlin/Double/ - public? set(value: R/kotlin/Double/): R/kotlin/Unit/ + public? final? property fau(var): R|kotlin/Double| + public? get(): R|kotlin/Double| + public? set(value: R|kotlin/Double|): R|kotlin/Unit| } diff --git a/compiler/testData/fir/resolve/simpleTypeAlias.txt b/compiler/testData/fir/resolve/simpleTypeAlias.txt index 25480a8e789..6caf1021613 100644 --- a/compiler/testData/fir/resolve/simpleTypeAlias.txt +++ b/compiler/testData/fir/resolve/simpleTypeAlias.txt @@ -1,6 +1,6 @@ FILE: simpleTypeAlias.kt public? abstract interface B() { } - public? final typealias C = R/B/ - public? final class D() : R/C = B/ { + public? final typealias C = R|B| + public? final class D() : R|C = B| { } diff --git a/compiler/testData/fir/resolve/typeAliasWithGeneric.txt b/compiler/testData/fir/resolve/typeAliasWithGeneric.txt index 74624461b65..f70d1846bc9 100644 --- a/compiler/testData/fir/resolve/typeAliasWithGeneric.txt +++ b/compiler/testData/fir/resolve/typeAliasWithGeneric.txt @@ -1,8 +1,8 @@ FILE: typeAliasWithGeneric.kt public? open class A() { } - public? abstract interface B() { + public? abstract interface B() { } - public? final class D() : R/C = B/ { + public? final class D() : R|C = B| { } - public? final typealias C = R/B/ + public? final typealias C = R|B| diff --git a/compiler/testData/fir/resolve/typeParameterVsNested.txt b/compiler/testData/fir/resolve/typeParameterVsNested.txt index 376c8e16cd1..4868beb82c6 100644 --- a/compiler/testData/fir/resolve/typeParameterVsNested.txt +++ b/compiler/testData/fir/resolve/typeParameterVsNested.txt @@ -1,22 +1,22 @@ FILE: typeParameterVsNested.kt public? abstract interface Some() { } - public? abstract class My() { + public? abstract class My() { public? final class T(inner) { } - public? abstract property x(val): R/T/ - public? get(): R/T/ + public? abstract property x(val): R|T| + public? get(): R|T| - public? abstract function foo(arg: R/T/): R/error: Not supported: FirImplicitTypeImpl/ + public? abstract function foo(arg: R|T|): R|error: Not supported: FirImplicitTypeImpl| - public? abstract property y(val): R/test/My.T/ - public? get(): R/test/My.T/ + public? abstract property y(val): R|test/My.T| + public? get(): R|test/My.T| - public? abstract property z(val): R/test/My.T/ - public? get(): R/test/My.T/ + public? abstract property z(val): R|test/My.T| + public? get(): R|test/My.T| - public? final class Some() : R/test/My.T/ { + public? final class Some() : R|test/My.T| { } }