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

Deprecate PropertyMetadata, use KProperty<*> for delegated properties instead

Browse Source
This commit is contained in:
Alexander Udalov
2015-10-12 21:42:18 +03:00
parent 3c74f48f91
commit ec1b4776fe
145 changed files with 536 additions and 379 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/variance/ValProperty.kt
Vendored
+5 -3
View File
@@ -1,10 +1,12 @@
import kotlin.reflect.KProperty
interface In<in T>
interface Out<out T>
interface Inv<T>
class Delegate<T> {
operator fun getValue(t: Any, p: PropertyMetadata): T = null!!
operator fun setValue(t: Any, p: PropertyMetadata, value: T) {}
operator fun getValue(t: Any, p: KProperty<*>): T = null!!
operator fun setValue(t: Any, p: KProperty<*>, value: T) {}
}
fun <T> getT(): T = null!!
@@ -45,4 +47,4 @@ abstract class Test<in I, out O, P> {
val <X> X.typeParameter8: Int where X : P get() = 0
val <X> X.typeParameter9: Int where X : In<<!TYPE_VARIANCE_CONFLICT(I; in; out; In<I>)!>I<!>> get() = 0
val <X> X.typeParameter0: Int where X : In<O> get() = 0
}
}
compiler/testData/diagnostics/tests/variance/ValProperty.txt
Vendored
+2 -2
View File
@@ -5,9 +5,9 @@ public fun </*0*/ T> getT(): T
public final class Delegate</*0*/ T> {
public constructor Delegate</*0*/ T>()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final operator fun getValue(/*0*/ t: kotlin.Any, /*1*/ p: kotlin.PropertyMetadata): T
public final operator fun getValue(/*0*/ t: kotlin.Any, /*1*/ p: kotlin.reflect.KProperty<*>): T
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public final operator fun setValue(/*0*/ t: kotlin.Any, /*1*/ p: kotlin.PropertyMetadata, /*2*/ value: T): kotlin.Unit
public final operator fun setValue(/*0*/ t: kotlin.Any, /*1*/ p: kotlin.reflect.KProperty<*>, /*2*/ value: T): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
compiler/testData/diagnostics/tests/variance/VarProperty.kt
Vendored
+5 -3
View File
@@ -1,10 +1,12 @@
import kotlin.reflect.KProperty
interface In<in T>
interface Out<out T>
interface Inv<T>
class Delegate<T> {
operator fun getValue(t: Any, p: PropertyMetadata): T = null!!
operator fun setValue(t: Any, p: PropertyMetadata, varue: T) {}
operator fun getValue(t: Any, p: KProperty<*>): T = null!!
operator fun setValue(t: Any, p: KProperty<*>, varue: T) {}
}
fun <T> getT(): T = null!!
@@ -45,4 +47,4 @@ abstract class Test<in I, out O, P> {
var <X> X.typeParameter8: Int where X : P get() = 0; set(i) {}
var <X> X.typeParameter9: Int where X : In<<!TYPE_VARIANCE_CONFLICT(I; in; out; In<I>)!>I<!>> get() = 0; set(i) {}
var <X> X.typeParameter0: Int where X : In<O> get() = 0; set(i) {}
}
}
compiler/testData/diagnostics/tests/variance/VarProperty.txt
Vendored
+2 -2
View File
@@ -5,9 +5,9 @@ public fun </*0*/ T> getT(): T
public final class Delegate</*0*/ T> {
public constructor Delegate</*0*/ T>()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final operator fun getValue(/*0*/ t: kotlin.Any, /*1*/ p: kotlin.PropertyMetadata): T
public final operator fun getValue(/*0*/ t: kotlin.Any, /*1*/ p: kotlin.reflect.KProperty<*>): T
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public final operator fun setValue(/*0*/ t: kotlin.Any, /*1*/ p: kotlin.PropertyMetadata, /*2*/ varue: T): kotlin.Unit
public final operator fun setValue(/*0*/ t: kotlin.Any, /*1*/ p: kotlin.reflect.KProperty<*>, /*2*/ varue: T): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}