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/inference/substitutions/delegationAndInference.kt
Vendored
+5 -3
View File
@@ -1,12 +1,14 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER
import kotlin.reflect.KProperty
class A(val map: MutableMap<String, CharSequence>) {
var a: String by map.withDefault1 { "foo" }
}
operator fun <G> MutableMap<in String, in G>.getValue(thisRef: Any?, property: PropertyMetadata): G = throw Exception()
operator fun <G> MutableMap<in String, in G>.getValue(thisRef: Any?, property: KProperty<*>): G = throw Exception()
operator fun <S> MutableMap<in String, in S>.setValue(thisRef: Any?, property: PropertyMetadata, value: S) {}
operator fun <S> MutableMap<in String, in S>.setValue(thisRef: Any?, property: KProperty<*>, value: S) {}
fun <K, V> MutableMap<K, V>.withDefault1(default: (key: K) -> V): MutableMap<K, V> = this
fun <K, V> MutableMap<K, V>.withDefault1(default: (key: K) -> V): MutableMap<K, V> = this
compiler/testData/diagnostics/tests/inference/substitutions/delegationAndInference.txt
Vendored
+2 -2
View File
@@ -1,7 +1,7 @@
package
public operator fun </*0*/ G> kotlin.MutableMap<in kotlin.String, in G>.getValue(/*0*/ thisRef: kotlin.Any?, /*1*/ property: kotlin.PropertyMetadata): G
public operator fun </*0*/ S> kotlin.MutableMap<in kotlin.String, in S>.setValue(/*0*/ thisRef: kotlin.Any?, /*1*/ property: kotlin.PropertyMetadata, /*2*/ value: S): kotlin.Unit
public operator fun </*0*/ G> kotlin.MutableMap<in kotlin.String, in G>.getValue(/*0*/ thisRef: kotlin.Any?, /*1*/ property: kotlin.reflect.KProperty<*>): G
public operator fun </*0*/ S> kotlin.MutableMap<in kotlin.String, in S>.setValue(/*0*/ thisRef: kotlin.Any?, /*1*/ property: kotlin.reflect.KProperty<*>, /*2*/ value: S): kotlin.Unit
public fun </*0*/ K, /*1*/ V> kotlin.MutableMap<K, V>.withDefault1(/*0*/ default: (K) -> V): kotlin.MutableMap<K, V>
public final class A {