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

FIR: introduce status & status transformer (no override resolve)

Browse Source 
So #KT-24021 Fixed
This commit is contained in:
Mikhail Glukhikh
2018-04-25 21:03:11 +03:00
parent 65d89a61bf
commit 914620fd1f
86 changed files with 1080 additions and 346 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/fir/rawBuilder/declarations/F.txt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@ FILE: F.kt
public? constructor(): super<kotlin.Any>()
}
public? final class B : A {
public? final? class B : A {
public? constructor(): super<kotlin.Any>()
}
compiler/testData/fir/rawBuilder/declarations/NestedOfAliasedType.txt
Vendored
+2 -2
View File
@@ -9,10 +9,10 @@ FILE: NestedOfAliasedType.kt
}
public? final typealias TA = A
public? final class B : TA {
public? final? class B : TA {
public? constructor(): super<TA>()
public? final class NestedInB : Nested {
public? final? class NestedInB : Nested {
public? constructor(): super<Nested>()
}
compiler/testData/fir/rawBuilder/declarations/NestedSuperType.txt
Vendored
+2 -2
View File
@@ -13,10 +13,10 @@ FILE: NestedSuperType.kt
}
}
public? final class Your : My {
public? final? class Your : My {
public? constructor(): super<My>()
public? final class NestedThree : NestedOne {
public? final? class NestedThree : NestedOne {
public? constructor(): super<NestedOne>()
}
compiler/testData/fir/rawBuilder/declarations/complexTypes.txt
Vendored
+3 -3
View File
@@ -1,14 +1,14 @@
FILE: complexTypes.kt
<T, out S> public? final class C {
<T, out S> public? final? class C {
public? constructor(): super<kotlin.Any>()
<R, in P> public? final inner class D {
<R, in P> public? final? inner class D {
public? constructor(): super<kotlin.Any>()
}
}
public? abstract interface Test {
public? final? interface Test {
public? final? property x(val): a.b.C<out CharSequence, *>.D<in List<*>, *>
public? get(): a.b.C<out CharSequence, *>.D<in List<*>, *>
compiler/testData/fir/rawBuilder/declarations/derivedClass.txt
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ FILE: derivedClass.kt
public? get(): T
}
<T : Any> public? final class Derived : Base<T> {
<T : Any> public? final? class Derived : Base<T> {
public? constructor(x: T): super<Base<T>>()
}
compiler/testData/fir/rawBuilder/declarations/enums.txt
Vendored
+4 -4
View File
@@ -1,5 +1,5 @@
FILE: enums.kt
public? final enum class Order {
public? final? enum class Order {
public? constructor(): super<kotlin.Enum>()
public? final enum entry FIRST {
@@ -18,14 +18,14 @@ FILE: enums.kt
}
}
public? final enum class Planet {
public? final? enum class Planet {
public? constructor(m: Double, r: Double): super<kotlin.Enum>()
public? final? property m(val): Double
public? get(): Double
internal final? property r(val): Double
public? get(): Double
internal get(): Double
public? final enum entry MERCURY : Planet {
public? constructor(): super<Planet>()
@@ -56,7 +56,7 @@ FILE: enums.kt
public? abstract function sayHello(): kotlin.Unit
public? final companion object Companion {
public? final? companion object Companion {
public? constructor(): super<kotlin.Any>()
public? final? const property G(val): <implicit> = STUB
compiler/testData/fir/rawBuilder/declarations/enums2.txt
Vendored
+4 -4
View File
@@ -1,15 +1,15 @@
FILE: enums2.kt
public? abstract interface Some {
public? final? interface Some {
}
public? final object O1 : Some {
public? final? object O1 : Some {
public? constructor(): super<kotlin.Any>()
}
public? final object O2 : Some {
public? final? object O2 : Some {
public? constructor(): super<kotlin.Any>()
}
public? final enum class SomeEnum {
public? final? enum class SomeEnum {
public? constructor(x: Some): super<kotlin.Enum>()
public? final? property x(val): Some
compiler/testData/fir/rawBuilder/declarations/expectActual.txt
Vendored
+2 -2
View File
@@ -1,12 +1,12 @@
FILE: expectActual.kt
public? final expect class MyClass {
public? final? expect class MyClass {
public? constructor(): super<kotlin.Any>()
}
public? final? expect function foo(): String
public? final? expect property x(val): Int
public? get(): Int
public? final actual class MyClass {
public? final? actual class MyClass {
public? constructor(): super<kotlin.Any>()
}
compiler/testData/fir/rawBuilder/declarations/genericFunctions.txt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
FILE: genericFunctions.kt
public? abstract interface Any {
public? final? interface Any {
}
<reified T : Any> public? final? inline function safeAs Any.(): T? {
STUB
compiler/testData/fir/rawBuilder/declarations/nestedClass.txt
Vendored
+3 -3
View File
@@ -6,15 +6,15 @@ FILE: nestedClass.kt
public? get(): String
}
public? final class Outer {
public? final? class Outer {
public? constructor(): super<kotlin.Any>()
public? final class Derived : Base {
public? final? class Derived : Base {
public? constructor(s: String): super<Base>()
}
public? final object Obj : Base {
public? final? object Obj : Base {
public? constructor(): super<Base>()
}
compiler/testData/fir/rawBuilder/declarations/noPrimaryConstructor.txt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
FILE: noPrimaryConstructor.kt
public? final class NoPrimary {
public? final? class NoPrimary {
public? final? property x(val): String
public? get(): String
compiler/testData/fir/rawBuilder/declarations/simpleClass.txt
Vendored
+4 -4
View File
@@ -1,16 +1,16 @@
FILE: simpleClass.kt
public? abstract interface SomeInterface {
public? final? interface SomeInterface {
public? final? function foo(x: Int, y: String): String
public? final? property bar(val): Boolean
public? get(): Boolean
}
public? final class SomeClass : SomeInterface {
public? final? class SomeClass : SomeInterface {
public? constructor(): super<kotlin.Any>()
private final? property baz(val): <implicit> = STUB
public? get(): <implicit>
private get(): <implicit>
public? open? override function foo(x: Int, y: String): String {
}
@@ -27,7 +27,7 @@ FILE: simpleClass.kt
public? set(value: Double): kotlin.Unit
}
public? final inline class InlineClass {
public? final? inline class InlineClass {
public? constructor(): super<kotlin.Any>()
}
compiler/testData/fir/rawBuilder/declarations/simpleTypeAlias.txt
Vendored
+2 -2
View File
@@ -1,8 +1,8 @@
FILE: simpleTypeAlias.kt
public? abstract interface B {
public? final? interface B {
}
public? final typealias C = B
public? final class D : C {
public? final? class D : C {
public? constructor(): super<kotlin.Any>()
}
compiler/testData/fir/rawBuilder/declarations/typeAliasWithGeneric.txt
Vendored
+2 -2
View File
@@ -3,10 +3,10 @@ FILE: typeAliasWithGeneric.kt
public? constructor(): super<kotlin.Any>()
}
<S, T : A> public? abstract interface B {
<S, T : A> public? final? interface B {
}
<T> public? final typealias C = B<T, A>
public? final class D : C<A> {
public? final? class D : C<A> {
public? constructor(): super<kotlin.Any>()
}
compiler/testData/fir/rawBuilder/declarations/typeParameterVsNested.txt
Vendored
+3 -3
View File
@@ -1,10 +1,10 @@
FILE: typeParameterVsNested.kt
public? abstract interface Some {
public? final? interface Some {
}
<T : Some> public? abstract class My {
public? constructor(): super<kotlin.Any>()
public? final inner class T {
public? final? inner class T {
public? constructor(): super<kotlin.Any>()
}
@@ -20,7 +20,7 @@ FILE: typeParameterVsNested.kt
public? abstract property z(val): test.My.T
public? get(): test.My.T
public? final class Some : T {
public? final? class Some : T {
public? constructor(): super<T>()
}
compiler/testData/fir/rawBuilder/declarations/typeParameters.txt
Vendored
+2 -2
View File
@@ -1,5 +1,5 @@
FILE: typeParameters.kt
<out T : Any> public? abstract interface List {
<out T : Any> public? final? interface List {
public? final? operator function get(index: Int): T
public? final? infix function concat(other: List<T>): List<T>
@@ -11,7 +11,7 @@ FILE: typeParameters.kt
public? constructor(): super<kotlin.Any>()
}
public? final class SomeList : AbstractList<Int> {
public? final? class SomeList : AbstractList<Int> {
public? constructor(): super<AbstractList<Int>>()
public? open? override function get(index: Int): Int {
compiler/testData/fir/resolve/F.txt
Vendored
+4 -4
View File
@@ -1,9 +1,9 @@
FILE: F.kt
public? open class A {
public? constructor(): super<R|kotlin/Any|>()
public open class A {
public constructor(): super<R|kotlin/Any|>()
}
public? final class B : R|A| {
public? constructor(): super<R|A|>()
public final class B : R|A| {
public constructor(): super<R|A|>()
}
compiler/testData/fir/resolve/NestedOfAliasedType.txt
Vendored
+9 -9
View File
@@ -1,19 +1,19 @@
FILE: NestedOfAliasedType.kt
public? abstract class A {
public? constructor(): super<R|kotlin/Any|>()
public abstract class A {
public constructor(): super<R|kotlin/Any|>()
public? abstract class Nested {
public? constructor(): super<R|kotlin/Any|>()
public abstract class Nested {
public constructor(): super<R|kotlin/Any|>()
}
}
public? final typealias TA = R|A|
public? final class B : R|TA = A| {
public? constructor(): super<R|TA = A|>()
public final typealias TA = R|A|
public final class B : R|TA = A| {
public constructor(): super<R|TA = A|>()
public? final class NestedInB : R|A.Nested| {
public? constructor(): super<R|A.Nested|>()
public final class NestedInB : R|A.Nested| {
public constructor(): super<R|A.Nested|>()
}
compiler/testData/fir/resolve/NestedSuperType.txt
Vendored
+10 -10
View File
@@ -1,23 +1,23 @@
FILE: NestedSuperType.kt
public? abstract class My {
public? constructor(): super<R|kotlin/Any|>()
public abstract class My {
public constructor(): super<R|kotlin/Any|>()
public? abstract class NestedOne : R|p/My| {
public? constructor(): super<R|p/My|>()
public abstract class NestedOne : R|p/My| {
public constructor(): super<R|p/My|>()
public? abstract class NestedTwo : R|p/My.NestedOne| {
public? constructor(): super<R|p/My.NestedOne|>()
public abstract class NestedTwo : R|p/My.NestedOne| {
public constructor(): super<R|p/My.NestedOne|>()
}
}
}
public? final class Your : R|p/My| {
public? constructor(): super<R|p/My|>()
public final class Your : R|p/My| {
public constructor(): super<R|p/My|>()
public? final class NestedThree : R|p/My.NestedOne| {
public? constructor(): super<R|p/My.NestedOne|>()
public final class NestedThree : R|p/My.NestedOne| {
public constructor(): super<R|p/My.NestedOne|>()
}
compiler/testData/fir/resolve/TwoDeclarationsInSameFile.txt
Vendored
+4 -4
View File
@@ -1,9 +1,9 @@
FILE: TwoDeclarationsInSameFile.kt
public? open class A {
public? constructor(): super<R|kotlin/Any|>()
public open class A {
public constructor(): super<R|kotlin/Any|>()
}
public? final class B : R|p/A| {
public? constructor(): super<R|p/A|>()
public final class B : R|p/A| {
public constructor(): super<R|p/A|>()
}
compiler/testData/fir/resolve/builtins/lists.txt
Vendored
+6 -6
View File
@@ -1,15 +1,15 @@
FILE: lists.kt
public? abstract class MyStringList : R|kotlin/collections/List<kotlin/String>| {
public? constructor(): super<R|kotlin/Any|>()
public abstract class MyStringList : R|kotlin/collections/List<kotlin/String>| {
public constructor(): super<R|kotlin/Any|>()
}
public? abstract class MyMutableStringList : R|kotlin/collections/MutableList<kotlin/String>| {
public? constructor(): super<R|kotlin/Any|>()
public abstract class MyMutableStringList : R|kotlin/collections/MutableList<kotlin/String>| {
public constructor(): super<R|kotlin/Any|>()
}
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/companion.txt
Vendored
+16 -16
View File
@@ -1,35 +1,35 @@
FILE: companion.kt
public? abstract class Some {
public? constructor(): super<R|kotlin/Any|>()
public abstract class Some {
public constructor(): super<R|kotlin/Any|>()
public? final companion object Companion {
public? constructor(): super<R|kotlin/Any|>()
public final companion object Companion {
public constructor(): super<R|kotlin/Any|>()
public? final class InCompanion {
public? constructor(): super<R|kotlin/Any|>()
public final class InCompanion {
public constructor(): super<R|kotlin/Any|>()
}
}
public? abstract property x(val): R|test/Some.Companion.InCompanion|
public? get(): R|test/Some.Companion.InCompanion|
public abstract property x(val): R|test/Some.Companion.InCompanion|
public get(): R|test/Some.Companion.InCompanion|
}
public? abstract class Another {
public? constructor(): super<R|kotlin/Any|>()
public abstract class Another {
public constructor(): super<R|kotlin/Any|>()
public? final companion object NamedCompanion {
public? constructor(): super<R|kotlin/Any|>()
public final companion object NamedCompanion {
public constructor(): super<R|kotlin/Any|>()
public? final class InCompanion {
public? constructor(): super<R|kotlin/Any|>()
public final class InCompanion {
public constructor(): super<R|kotlin/Any|>()
}
}
public? abstract property x(val): R|test/Another.NamedCompanion.InCompanion|
public? get(): R|test/Another.NamedCompanion.InCompanion|
public abstract property x(val): R|test/Another.NamedCompanion.InCompanion|
public get(): R|test/Another.NamedCompanion.InCompanion|
}
compiler/testData/fir/resolve/derivedClass.txt
Vendored
+7 -7
View File
@@ -1,15 +1,15 @@
FILE: derivedClass.kt
<T> public? open class Base {
public? constructor(x: R|T|): super<R|kotlin/Any|>()
<T> public open class Base {
public constructor(x: R|T|): super<R|kotlin/Any|>()
public? final? property x(val): R|T|
public? get(): R|T|
public final property x(val): R|T|
public get(): R|T|
}
<T : R|kotlin/Any|> public? final class Derived : R|Base<T>| {
public? constructor(x: R|T|): super<R|Base<T>|>()
<T : R|kotlin/Any|> public final class Derived : R|Base<T>| {
public constructor(x: R|T|): super<R|Base<T>|>()
}
<T : R|kotlin/Any|> public? final? function create(x: R|T|): R|Derived<T>| {
<T : R|kotlin/Any|> public final function create(x: R|T|): R|Derived<T>| {
STUB
}
compiler/testData/fir/resolve/enum.txt
Vendored
+16 -16
View File
@@ -1,38 +1,38 @@
FILE: enum.kt
public? abstract interface Some {
public abstract interface Some {
}
public? final object O1 : R|Some| {
public? constructor(): super<R|kotlin/Any|>()
public final object O1 : R|Some| {
public constructor(): super<R|kotlin/Any|>()
}
public? final object O2 : R|Some| {
public? constructor(): super<R|kotlin/Any|>()
public final object O2 : R|Some| {
public constructor(): super<R|kotlin/Any|>()
}
public? final enum class SomeEnum {
public? constructor(x: R|Some|): super<R|kotlin/Enum|>()
public final enum class SomeEnum {
private constructor(x: R|Some|): super<R|kotlin/Enum|>()
public? final? property x(val): R|Some|
public? get(): R|Some|
public final property x(val): R|Some|
public get(): R|Some|
public? final enum entry FIRST : R|SomeEnum| {
public? constructor(): super<R|SomeEnum|>()
public final enum entry FIRST : R|SomeEnum| {
public constructor(): super<R|SomeEnum|>()
public? open? override function check(y: R|Some|): R|kotlin/Boolean| {
public final override function check(y: R|Some|): R|kotlin/Boolean| {
STUB
}
}
public? final enum entry SECOND : R|SomeEnum| {
public? constructor(): super<R|SomeEnum|>()
public final enum entry SECOND : R|SomeEnum| {
public constructor(): super<R|SomeEnum|>()
public? open? override function check(y: R|Some|): R|kotlin/Boolean| {
public final 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/fromBuilder/complexTypes.kt
Vendored
+11
View File
@@ -0,0 +1,11 @@
package a.b
class C<T, out S> {
inner class D<R, in P> {
}
}
interface Test {
val x: a.b.C<out CharSequence, *>.D<in List<*>, *>
}
compiler/testData/fir/resolve/fromBuilder/complexTypes.txt
Vendored
+15
View File
@@ -0,0 +1,15 @@
FILE: complexTypes.kt
<T, out S> public final class C {
public constructor(): super<R|kotlin/Any|>()
<R, in P> public final inner class D {
public constructor(): super<R|kotlin/Any|>()
}
}
public abstract interface Test {
public abstract property x(val): R|a/b/C.D<out kotlin/CharSequence, *, in kotlin/collections/List<*>, *>|
public get(): R|a/b/C.D<out kotlin/CharSequence, *, in kotlin/collections/List<*>, *>|
}
compiler/testData/fir/resolve/fromBuilder/enums.kt
Vendored
+33
View File
@@ -0,0 +1,33 @@
import my.println
enum class Order {
FIRST,
SECOND,
THIRD
}
enum class Planet(val m: Double, internal val r: Double) {
MERCURY(1.0, 2.0) {
override fun sayHello() {
println("Hello!!!")
}
},
VENERA(3.0, 4.0) {
override fun sayHello() {
println("Ola!!!")
}
},
EARTH(5.0, 6.0) {
override fun sayHello() {
println("Privet!!!")
}
};
val g: Double = G * m / (r * r)
abstract fun sayHello()
companion object {
const val G = 6.67e-11
}
}
compiler/testData/fir/resolve/fromBuilder/enums.txt
Vendored
+67
View File
@@ -0,0 +1,67 @@
FILE: enums.kt
public final enum class Order {
private constructor(): super<R|kotlin/Enum|>()
public final enum entry FIRST {
public constructor(): super<R|kotlin/Any|>()
}
public final enum entry SECOND {
public constructor(): super<R|kotlin/Any|>()
}
public final enum entry THIRD {
public constructor(): super<R|kotlin/Any|>()
}
}
public final enum class Planet {
private constructor(m: R|kotlin/Double|, r: R|kotlin/Double|): super<R|kotlin/Enum|>()
public final property m(val): R|kotlin/Double|
public get(): R|kotlin/Double|
internal final property r(val): R|kotlin/Double|
internal get(): R|kotlin/Double|
public final enum entry MERCURY : R|Planet| {
public constructor(): super<R|Planet|>()
public final override function sayHello(): R|kotlin/Unit| {
}
}
public final enum entry VENERA : R|Planet| {
public constructor(): super<R|Planet|>()
public final override function sayHello(): R|kotlin/Unit| {
}
}
public final enum entry EARTH : R|Planet| {
public constructor(): super<R|Planet|>()
public final override function sayHello(): R|kotlin/Unit| {
}
}
public final property g(val): R|kotlin/Double| = STUB
public get(): R|kotlin/Double|
public abstract function sayHello(): R|kotlin/Unit|
public final companion object Companion {
public constructor(): super<R|kotlin/Any|>()
public final const property G(val): R|error: Not supported: FirImplicitTypeImpl| = STUB
public get(): R|error: Not supported: FirImplicitTypeImpl|
}
}
compiler/testData/fir/resolve/fromBuilder/noPrimaryConstructor.kt
Vendored
+9
View File
@@ -0,0 +1,9 @@
class NoPrimary {
val x: String
constructor(x: String) {
this.x = x
}
constructor(): this("")
}
compiler/testData/fir/resolve/fromBuilder/noPrimaryConstructor.txt
Vendored
+11
View File
@@ -0,0 +1,11 @@
FILE: noPrimaryConstructor.kt
public final class NoPrimary {
public final property x(val): R|kotlin/String|
public get(): R|kotlin/String|
public constructor(x: R|kotlin/String|): super<R|kotlin/Any|>() {
}
public constructor(): this<R|NoPrimary|>()
}
compiler/testData/fir/resolve/fromBuilder/simpleClass.kt
Vendored
+21
View File
@@ -0,0 +1,21 @@
interface SomeInterface {
fun foo(x: Int, y: String): String
val bar: Boolean
}
class SomeClass : SomeInterface {
private val baz = 42
override fun foo(x: Int, y: String): String {
return y + x + baz
}
override var bar: Boolean
get() = true
set(value) {}
lateinit var fau: Double
}
inline class InlineClass
compiler/testData/fir/resolve/fromBuilder/simpleClass.txt
Vendored
+33
View File
@@ -0,0 +1,33 @@
FILE: simpleClass.kt
public abstract interface SomeInterface {
public abstract function foo(x: R|kotlin/Int|, y: R|kotlin/String|): R|kotlin/String|
public abstract property bar(val): R|kotlin/Boolean|
public get(): R|kotlin/Boolean|
}
public final class SomeClass : R|SomeInterface| {
public constructor(): super<R|kotlin/Any|>()
private final property baz(val): R|error: Not supported: FirImplicitTypeImpl| = STUB
private get(): R|error: Not supported: FirImplicitTypeImpl|
public final override function foo(x: R|kotlin/Int|, y: R|kotlin/String|): R|kotlin/String| {
}
public final override property bar(var): R|kotlin/Boolean|
public get(): R|kotlin/Boolean| {
STUB
}
public set(value: R|kotlin/Boolean|): R|kotlin/Unit| {
}
public final lateinit property fau(var): R|kotlin/Double|
public get(): R|kotlin/Double|
public set(value: R|kotlin/Double|): R|kotlin/Unit|
}
public final inline class InlineClass {
public constructor(): super<R|kotlin/Any|>()
}
compiler/testData/fir/resolve/fromBuilder/typeParameters.kt
Vendored
+16
View File
@@ -0,0 +1,16 @@
interface List<out T : Any> {
operator fun get(index: Int): T
infix fun concat(other: List<T>): List<T>
}
typealias StringList = List<out String>
typealias AnyList = List<*>
abstract class AbstractList<out T : Any> : List<T>
class SomeList : AbstractList<Int>() {
override fun get(index: Int): Int = 42
override fun concat(other: List<Int>): List<Int> = this
}
compiler/testData/fir/resolve/fromBuilder/typeParameters.txt
Vendored
+25
View File
@@ -0,0 +1,25 @@
FILE: typeParameters.kt
<out T : R|kotlin/Any|> public abstract interface List {
public abstract operator function get(index: R|kotlin/Int|): R|T|
public abstract infix function concat(other: R|List<T>|): R|List<T>|
}
public final typealias StringList = R|List<out kotlin/String>|
public final typealias AnyList = R|List<*>|
<out T : R|kotlin/Any|> public abstract class AbstractList : R|List<T>| {
public constructor(): super<R|kotlin/Any|>()
}
public final class SomeList : R|AbstractList<kotlin/Int>| {
public constructor(): super<R|AbstractList<kotlin/Int>|>()
public final override function get(index: R|kotlin/Int|): R|kotlin/Int| {
STUB
}
public final override function concat(other: R|List<kotlin/Int>|): R|List<kotlin/Int>| {
STUB
}
}
compiler/testData/fir/resolve/ft.txt
Vendored
+2 -2
View File
@@ -1,5 +1,5 @@
FILE: ft.kt
<T> public? abstract interface KMutableProperty1 : R|KProperty1<T>| {
<T> public abstract interface KMutableProperty1 : R|KProperty1<T>| {
}
<T> public? abstract interface KProperty1 : R|(T) -> kotlin/Int| {
<T> public abstract interface KProperty1 : R|(T) -> kotlin/Int| {
}
compiler/testData/fir/resolve/functionTypes.txt
Vendored
+7 -7
View File
@@ -1,17 +1,17 @@
FILE: functionTypes.kt
<T> public? final? function simpleRun(f: R|(T) -> 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| {
<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.() -> kotlin/Unit|): R|kotlin/Unit| {
<T> public final function simpleWith(t: R|T|, f: R|T.() -> kotlin/Unit|): R|kotlin/Unit| {
STUB
}
<T, R> public? abstract interface KMutableProperty1 : R|KProperty1<T, R>|, R|KMutableProperty<R>| {
<T, R> public abstract interface KMutableProperty1 : R|KProperty1<T, R>|, R|KMutableProperty<R>| {
}
<T, out R> public? abstract interface KProperty1 : R|KProperty<R>|, R|(T) -> R| {
<T, out R> public abstract interface KProperty1 : R|KProperty<R>|, R|(T) -> R| {
}
<out R> public? abstract interface KProperty {
<out R> public abstract interface KProperty {
}
<R> public? abstract interface KMutableProperty {
<R> public abstract interface KMutableProperty {
}
compiler/testData/fir/resolve/genericFunctions.txt
Vendored
+5 -5
View File
@@ -1,12 +1,12 @@
FILE: genericFunctions.kt
public? abstract interface Any {
public abstract interface Any {
}
<reified T : R|Any|> public? final? inline function safeAs R|Any|.(): R|T| {
<reified T : R|Any|> public final inline function safeAs R|Any|.(): R|T| {
STUB
}
public? abstract class Summator {
public? constructor(): super<R|Any|>()
public abstract class Summator {
public constructor(): super<R|Any|>()
<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/Annotations.txt
Vendored
+14 -14
View File
@@ -1,29 +1,29 @@
FILE: Annotations.kt
@FILE:R|annotations/Simple|()
@R|annotations/WithInt|(STUB) public? abstract class First {
public? constructor(): super<R|kotlin/Any|>()
@R|annotations/WithInt|(STUB) public abstract class First {
public constructor(): super<R|kotlin/Any|>()
@R|annotations/Simple|() public? abstract function foo(@R|annotations/WithString|(STUB) arg: @R|annotations/Simple|() R|kotlin/Double|): R|kotlin/Unit|
@R|annotations/Simple|() public abstract function foo(@R|annotations/WithString|(STUB) arg: @R|annotations/Simple|() R|kotlin/Double|): R|kotlin/Unit|
@R|annotations/Complex|(STUB, STUB) public? abstract property v(val): R|kotlin/String|
public? get(): R|kotlin/String|
@R|annotations/Complex|(STUB, STUB) public abstract property v(val): R|kotlin/String|
public get(): R|kotlin/String|
}
@R|annotations/WithString|(STUB) public? final class Second : @R|annotations/WithInt|(STUB) R|test/First| {
public? constructor(y: R|kotlin/Char|): super<@R|annotations/WithInt|(STUB) R|test/First|>()
@R|annotations/WithString|(STUB) public final class Second : @R|annotations/WithInt|(STUB) R|test/First| {
public constructor(y: R|kotlin/Char|): super<@R|annotations/WithInt|(STUB) R|test/First|>()
public? final? property y(val): R|kotlin/Char|
public? get(): R|kotlin/Char|
public final property y(val): R|kotlin/Char|
public get(): R|kotlin/Char|
public? open? override function foo(arg: R|kotlin/Double|): R|kotlin/Unit| {
public final override function foo(arg: R|kotlin/Double|): R|kotlin/Unit| {
}
public? open? override property v(val): R|kotlin/String|
@R|annotations/Simple|() public? get(): R|kotlin/String| {
public final override property v(val): R|kotlin/String|
@R|annotations/Simple|() public get(): R|kotlin/String| {
STUB
}
@R|annotations/WithString|(STUB) public? constructor(): this<R|test/Second|>()
@R|annotations/WithString|(STUB) public constructor(): this<R|test/Second|>()
}
@R|annotations/WithInt|(STUB) @R|annotations/WithInt|(STUB) public? final typealias Third = @R|annotations/Simple|() R|test/Second|
@R|annotations/WithInt|(STUB) @R|annotations/WithInt|(STUB) public final typealias Third = @R|annotations/Simple|() R|test/Second|
compiler/testData/fir/resolve/multifile/NestedSuperType.txt
Vendored
+6 -6
View File
@@ -1,14 +1,14 @@
FILE: NestedSuperType.kt
public? final class A : R|b/B| {
public? constructor(): super<R|b/B|>()
public final class A : R|b/B| {
public constructor(): super<R|b/B|>()
public? final class NestedInA1 : R|b/B.NestedInB| {
public? constructor(): super<R|b/B.NestedInB|>()
public final class NestedInA1 : R|b/B.NestedInB| {
public constructor(): super<R|b/B.NestedInB|>()
}
public? final class NestedInA2 : R|c/C.NestedInC| {
public? constructor(): super<R|c/C.NestedInC|>()
public final class NestedInA2 : R|c/C.NestedInC| {
public constructor(): super<R|c/C.NestedInC|>()
}
compiler/testData/fir/resolve/multifile/TypeAliasExpansion.txt
Vendored
+2 -2
View File
@@ -1,5 +1,5 @@
FILE: TypeAliasExpansion.kt
public? final class MyClass : R|b/TA = b/A| {
public? constructor(): super<R|b/TA = b/A|>()
public final class MyClass : R|b/TA = b/A| {
public constructor(): super<R|b/TA = b/A|>()
}
compiler/testData/fir/resolve/multifile/sealedStarImport.txt
Vendored
+5 -5
View File
@@ -1,11 +1,11 @@
FILE: sealedStarImport.kt
public? abstract class Factory {
public? constructor(): super<R|kotlin/Any|>()
public abstract class Factory {
public constructor(): super<R|kotlin/Any|>()
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
+2 -2
View File
@@ -1,5 +1,5 @@
FILE: simpleAliasedImport.kt
public? final class YourClass : R|b/MyClass| {
public? constructor(): super<R|b/MyClass|>()
public final class YourClass : R|b/MyClass| {
public constructor(): super<R|b/MyClass|>()
}
compiler/testData/fir/resolve/multifile/simpleImport.txt
Vendored
+2 -2
View File
@@ -1,5 +1,5 @@
FILE: simpleImport.kt
public? final class YourClass : R|b/MyClass| {
public? constructor(): super<R|b/MyClass|>()
public final class YourClass : R|b/MyClass| {
public constructor(): super<R|b/MyClass|>()
}
compiler/testData/fir/resolve/multifile/simpleImportNested.txt
Vendored
+2 -2
View File
@@ -1,5 +1,5 @@
FILE: simpleImportNested.kt
public? final class YourClass : R|a/MyClass.MyNested| {
public? constructor(): super<R|a/MyClass.MyNested|>()
public final class YourClass : R|a/MyClass.MyNested| {
public constructor(): super<R|a/MyClass.MyNested|>()
}
compiler/testData/fir/resolve/multifile/simpleImportOuter.txt
Vendored
+2 -2
View File
@@ -1,5 +1,5 @@
FILE: simpleImportOuter.kt
public? final class My : R|a/Outer.Nested| {
public? constructor(): super<R|a/Outer.Nested|>()
public final class My : R|a/Outer.Nested| {
public constructor(): super<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/nestedClass.txt
Vendored
+10 -10
View File
@@ -1,21 +1,21 @@
FILE: nestedClass.kt
public? abstract class Base {
public? constructor(s: R|kotlin/String|): super<R|kotlin/Any|>()
public abstract class Base {
public constructor(s: R|kotlin/String|): super<R|kotlin/Any|>()
public? final? property s(val): R|kotlin/String|
public? get(): R|kotlin/String|
public final property s(val): R|kotlin/String|
public get(): R|kotlin/String|
}
public? final class Outer {
public? constructor(): super<R|kotlin/Any|>()
public final class Outer {
public constructor(): super<R|kotlin/Any|>()
public? final class Derived : R|Base| {
public? constructor(s: R|kotlin/String|): super<R|Base|>()
public final class Derived : R|Base| {
public constructor(s: R|kotlin/String|): super<R|Base|>()
}
public? final object Obj : R|Base| {
public? constructor(): super<R|Base|>()
public final object Obj : R|Base| {
public constructor(): super<R|Base|>()
}
compiler/testData/fir/resolve/simpleClass.txt
Vendored
+15 -15
View File
@@ -1,29 +1,29 @@
FILE: simpleClass.kt
public? abstract interface SomeInterface {
public? final? function foo(x: R|kotlin/Int|, y: R|kotlin/String|): R|kotlin/String|
public abstract interface SomeInterface {
public abstract 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 abstract property bar(val): R|kotlin/Boolean|
public get(): R|kotlin/Boolean|
}
public? final class SomeClass : R|SomeInterface| {
public? constructor(): super<R|kotlin/Any|>()
public final class SomeClass : R|SomeInterface| {
public constructor(): super<R|kotlin/Any|>()
private final? property baz(val): R|error: Not supported: FirImplicitTypeImpl| = STUB
public? get(): R|error: Not supported: FirImplicitTypeImpl|
private final property baz(val): R|error: Not supported: FirImplicitTypeImpl| = STUB
private get(): R|error: Not supported: FirImplicitTypeImpl|
public? open? override function foo(x: R|kotlin/Int|, y: R|kotlin/String|): R|kotlin/String| {
public final 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|kotlin/Boolean| {
public final override property bar(var): R|kotlin/Boolean|
public get(): R|kotlin/Boolean| {
STUB
}
public? set(value: R|kotlin/Boolean|): R|kotlin/Unit| {
public set(value: R|kotlin/Boolean|): 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|
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
+4 -4
View File
@@ -1,8 +1,8 @@
FILE: simpleTypeAlias.kt
public? abstract interface B {
public abstract interface B {
}
public? final typealias C = R|B|
public? final class D : R|C = B| {
public? constructor(): super<R|kotlin/Any|>()
public final typealias C = R|B|
public final class D : R|C = B| {
public constructor(): super<R|kotlin/Any|>()
}
compiler/testData/fir/resolve/stdlib/concurrent.txt
Vendored
+4 -4
View File
@@ -1,6 +1,6 @@
FILE: concurrent.kt
@R|kotlin/jvm/Volatile|() public? final? property xx(var): R|kotlin/Int| = STUB
public? get(): R|kotlin/Int|
public? set(value: R|kotlin/Int|): R|kotlin/Unit|
@R|kotlin/jvm/Synchronized|() public? final? function foo(): R|kotlin/Unit| {
@R|kotlin/jvm/Volatile|() public final property xx(var): R|kotlin/Int| = STUB
public get(): R|kotlin/Int|
public set(value: R|kotlin/Int|): R|kotlin/Unit|
@R|kotlin/jvm/Synchronized|() public final function foo(): R|kotlin/Unit| {
}
compiler/testData/fir/resolve/stdlib/functionX.txt
Vendored
+7 -7
View File
@@ -1,12 +1,12 @@
FILE: functionX.kt
public? final? property x(val): R|kotlin/jvm/functions/Function0<kotlin/Int>| = STUB
public? get(): R|kotlin/jvm/functions/Function0<kotlin/Int>|
public? final? property y(val): R|kotlin/Function1<kotlin/String, kotlin/String>| = STUB
public? get(): R|kotlin/Function1<kotlin/String, kotlin/String>|
public? final class MyFunction : R|kotlin/Function2<kotlin/Int, kotlin/String, kotlin/Unit>| {
public? constructor(): super<R|kotlin/Any|>()
public final property x(val): R|kotlin/jvm/functions/Function0<kotlin/Int>| = STUB
public get(): R|kotlin/jvm/functions/Function0<kotlin/Int>|
public final property y(val): R|kotlin/Function1<kotlin/String, kotlin/String>| = STUB
public get(): R|kotlin/Function1<kotlin/String, kotlin/String>|
public final class MyFunction : R|kotlin/Function2<kotlin/Int, kotlin/String, kotlin/Unit>| {
public constructor(): super<R|kotlin/Any|>()
public? open? override function invoke(p1: R|kotlin/Int|, p2: R|kotlin/String|): R|kotlin/Unit| {
public final override function invoke(p1: R|kotlin/Int|, p2: R|kotlin/String|): R|kotlin/Unit| {
}
}
compiler/testData/fir/resolve/stdlib/reflectionClass.txt
Vendored
+4 -4
View File
@@ -1,5 +1,5 @@
FILE: reflectionClass.kt
public? final? property javaClass(val): R|java/lang/Class<kotlin/String>| = STUB
public? get(): R|java/lang/Class<kotlin/String>|
public? final? property kotlinClass(val): R|kotlin/reflect/KClass<kotlin/String>| = STUB
public? get(): R|kotlin/reflect/KClass<kotlin/String>|
public final property javaClass(val): R|java/lang/Class<kotlin/String>| = STUB
public get(): R|java/lang/Class<kotlin/String>|
public final property kotlinClass(val): R|kotlin/reflect/KClass<kotlin/String>| = STUB
public get(): R|kotlin/reflect/KClass<kotlin/String>|
compiler/testData/fir/resolve/treeSet.txt
Vendored
+2 -2
View File
@@ -1,3 +1,3 @@
FILE: treeSet.kt
public? final? property x(val): R|java/util/SortedSet<kotlin/Int>| = STUB
public? get(): R|java/util/SortedSet<kotlin/Int>|
public final property x(val): R|java/util/SortedSet<kotlin/Int>| = STUB
public get(): R|java/util/SortedSet<kotlin/Int>|
compiler/testData/fir/resolve/typeAliasWithGeneric.txt
Vendored
+6 -6
View File
@@ -1,12 +1,12 @@
FILE: typeAliasWithGeneric.kt
public? open class A {
public? constructor(): super<R|kotlin/Any|>()
public open class A {
public constructor(): super<R|kotlin/Any|>()
}
<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? constructor(): super<R|kotlin/Any|>()
public final class D : R|C<A> = B<T, A>| {
public constructor(): super<R|kotlin/Any|>()
}
<T> public? final typealias C = R|B<T, A>|
<T> public final typealias C = R|B<T, A>|
compiler/testData/fir/resolve/typeParameterInPropertyReceiver.txt
Vendored
+2 -2
View File
@@ -1,5 +1,5 @@
FILE: typeParameterInPropertyReceiver.kt
<T : R|kotlin/Any|> public? final? property self R|T|.(val): R|T|
public? get(): R|T| {
<T : R|kotlin/Any|> public final property self R|T|.(val): R|T|
public get(): R|T| {
STUB
}
compiler/testData/fir/resolve/typeParameterVsNested.txt
Vendored
+14 -14
View File
@@ -1,27 +1,27 @@
FILE: typeParameterVsNested.kt
public? abstract interface Some {
public abstract interface Some {
}
<T : R|test/Some|> public? abstract class My {
public? constructor(): super<R|kotlin/Any|>()
<T : R|test/Some|> public abstract class My {
public constructor(): super<R|kotlin/Any|>()
public? final inner class T {
public? constructor(): super<R|kotlin/Any|>()
public final inner class T {
public constructor(): super<R|kotlin/Any|>()
}
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|kotlin/Unit|
public abstract function foo(arg: R|T|): R|kotlin/Unit|
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? constructor(): super<R|T|>()
public final class Some : R|test/My.T| {
public constructor(): super<R|T|>()
}