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

FIR: Switch to | in fir resolved type renderer

Browse Source 
Otherwise it clashed with qualified names
This commit is contained in:
Simon Ogorodnik
2018-03-23 19:08:54 +03:00
committed by Mikhail Glukhikh
parent 4fb321fa00
commit 6cfe935c2a
22 changed files with 68 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt
+2 -2
View File
@@ -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)
}
compiler/testData/fir/rawBuilder/declarations/simpleClass.txt
Vendored
+1 -1
View File
@@ -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|
}
compiler/testData/fir/resolve/F.txt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
FILE: F.kt
public? open class A() {
}
public? final class B() : R/A/ {
public? final class B() : R|A| {
}
compiler/testData/fir/resolve/NestedOfAliasedType.txt
Vendored
+3 -3
View File
@@ -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| {
}
}
compiler/testData/fir/resolve/NestedSuperType.txt
Vendored
+4 -4
View File
@@ -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| {
}
}
compiler/testData/fir/resolve/TwoDeclarationsInSameFile.txt
Vendored
+1 -1
View File
@@ -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| {
}
compiler/testData/fir/resolve/builtins/lists.txt
Vendored
+4 -4
View File
@@ -1,11 +1,11 @@
FILE: lists.kt
public? abstract class MyStringList() : R/kotlin/collections/List<kotlin/String>/ {
public? abstract class MyStringList() : R|kotlin/collections/List<kotlin/String>| {
}
public? abstract class MyMutableStringList() : R/kotlin/collections/MutableList<kotlin/String>/ {
public? abstract class MyMutableStringList() : R|kotlin/collections/MutableList<kotlin/String>| {
}
public? final? function convert R/kotlin/collections/List<kotlin/String>/.(): R/MyStringList/ {
public? final? function convert R|kotlin/collections/List<kotlin/String>|.(): R|MyStringList| {
STUB
}
public? final? function ret(l: R/kotlin/collections/MutableList<kotlin/String>/): R/MyMutableStringList/ {
public? final? function ret(l: R|kotlin/collections/MutableList<kotlin/String>|): R|MyMutableStringList| {
STUB
}
compiler/testData/fir/resolve/enum.txt
Vendored
+8 -8
View File
@@ -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|
}
compiler/testData/fir/resolve/functionTypes.txt
Vendored
+3 -3
View File
@@ -1,9 +1,9 @@
FILE: functionTypes.kt
<T> public? final? function simpleRun(f: ( (R/T/) -> R/kotlin/Unit/ )): R/kotlin/Unit/ {
<T> public? final? function simpleRun(f: R|(T) -> kotlin/Unit|): R|kotlin/Unit| {
STUB
}
<T, R> public? final? function simpleMap R/kotlin/collections/List<T>/.(f: ( (R/T/) -> R/R/ )): R/R/ {
<T, R> public? final? function simpleMap R|kotlin/collections/List<T>|.(f: R|(T) -> R|): R|R| {
}
<T> public? final? function simpleWith(t: R/T/, f: ( R/T/.() -> R/kotlin/Unit/ )): R/kotlin/Unit/ {
<T> public? final? function simpleWith(t: R|T|, f: R|T.() -> kotlin/Unit|): R|kotlin/Unit| {
STUB
}
compiler/testData/fir/resolve/genericFunctions.txt
Vendored
+2 -2
View File
@@ -1,10 +1,10 @@
FILE: genericFunctions.kt
public? abstract interface Any() {
}
<reified T : Any> public? final? inline function safeAs R/Any/.(): R/T/ {
<reified T : Any> public? final? inline function safeAs R|Any|.(): R|T| {
STUB
}
public? abstract class Summator() {
<T> public? abstract function plus(first: R/T/, second: R/T/): R/T/
<T> public? abstract function plus(first: R|T|, second: R|T|): R|T|
}
compiler/testData/fir/resolve/multifile/NestedSuperType.txt
Vendored
+3 -3
View File
@@ -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| {
}
}
compiler/testData/fir/resolve/multifile/TypeAliasExpansion.txt
Vendored
+1 -1
View File
@@ -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| {
}
compiler/testData/fir/resolve/multifile/sealedStarImport.txt
Vendored
+3 -3
View File
@@ -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|
}
compiler/testData/fir/resolve/multifile/simpleAliasedImport.txt
Vendored
+1 -1
View File
@@ -1,3 +1,3 @@
FILE: simpleAliasedImport.kt
public? final class YourClass() : R/b/MyClass/ {
public? final class YourClass() : R|b/MyClass| {
}
compiler/testData/fir/resolve/multifile/simpleImport.txt
Vendored
+1 -1
View File
@@ -1,3 +1,3 @@
FILE: simpleImport.kt
public? final class YourClass() : R/b/MyClass/ {
public? final class YourClass() : R|b/MyClass| {
}
compiler/testData/fir/resolve/multifile/simpleImportNested.txt
Vendored
+1 -1
View File
@@ -1,3 +1,3 @@
FILE: simpleImportNested.kt
public? final class YourClass() : R/a/MyClass.MyNested/ {
public? final class YourClass() : R|a/MyClass.MyNested| {
}
compiler/testData/fir/resolve/multifile/simpleImportOuter.txt
Vendored
+1 -1
View File
@@ -1,3 +1,3 @@
FILE: simpleImportOuter.kt
public? final class My() : R/a/Outer.Nested/ {
public? final class My() : R|a/Outer.Nested| {
}
compiler/testData/fir/resolve/multifile/simpleStarImport.txt
Vendored
+1 -1
View File
@@ -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|
compiler/testData/fir/resolve/simpleClass.txt
Vendored
+13 -13
View File
@@ -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|
}
compiler/testData/fir/resolve/simpleTypeAlias.txt
Vendored
+2 -2
View File
@@ -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| {
}
compiler/testData/fir/resolve/typeAliasWithGeneric.txt
Vendored
+3 -3
View File
@@ -1,8 +1,8 @@
FILE: typeAliasWithGeneric.kt
public? open class A() {
}
<S, T : R/A/> public? abstract interface B() {
<S, T : R|A|> public? abstract interface B() {
}
public? final class D() : R/C<A> = B<T, A>/ {
public? final class D() : R|C<A> = B<T, A>| {
}
<T> public? final typealias C = R/B<T, A>/
<T> public? final typealias C = R|B<T, A>|
compiler/testData/fir/resolve/typeParameterVsNested.txt
Vendored
+9 -9
View File
@@ -1,22 +1,22 @@
FILE: typeParameterVsNested.kt
public? abstract interface Some() {
}
<T : R/test/Some/> public? abstract class My() {
<T : R|test/Some|> 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| {
}
}