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

Use descriptors for reflection on extension properties

Browse Source
This commit is contained in:
Alexander Udalov
2015-02-20 18:04:30 +03:00
parent 1a618deeab
commit ff0044f66a
10 changed files with 199 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/boxWithStdlib/reflection/methodsFromAny/extensionPropertyReceiverToString.kt
+22 -5
View File
@@ -3,10 +3,13 @@ import kotlin.test.assertEquals
fun check(expected: String, p: KExtensionProperty<*, *>) {
var s = p.toString()
// Strip "val" or "var"
assert(s.startsWith("val ") || s.startsWith("var ")) { "Fail val/var: $s" }
s = s.substring(4)
// Strip property name, leave only receiver class
s = s.substring(0, s.lastIndexOf('.'))
s = s.substringBeforeLast('.')
assertEquals(expected, s)
}
@@ -34,7 +37,14 @@ val Array<Any>.a2: Any get() = this
val Array<Array<String>>.a3: Any get() = this
val Array<BooleanArray>.a4: Any get() = this
val Any?.n1: Any get() = Any()
val Int?.n2: Any get() = Any()
val Array<Any>?.n3: Any get() = Any()
val Array<Any?>.n4: Any get() = Any()
val Array<Any?>?.n5: Any get() = Any()
val Map<String, Runnable>.m: Any get() = this
val List<MutableSet<Array<CharSequence>>>.l: Any get() = this
fun box(): String {
check("kotlin.Boolean", Boolean::x)
@@ -55,12 +65,19 @@ fun box(): String {
check("kotlin.LongArray", LongArray::x)
check("kotlin.DoubleArray", DoubleArray::x)
check("kotlin.Array<java.lang.Integer>", Array<Int>::a1)
check("kotlin.Array<java.lang.Object>", Array<Any>::a2)
check("kotlin.Array<kotlin.Array<java.lang.String>>", Array<Array<String>>::a3)
check("kotlin.Any?", Any?::n1)
check("kotlin.Int?", Int?::n2)
check("kotlin.Array<kotlin.Any>?", Array<Any>?::n3)
check("kotlin.Array<kotlin.Any?>", Array<Any?>::n4)
check("kotlin.Array<kotlin.Any?>?", Array<Any?>?::n5)
check("kotlin.Array<kotlin.Int>", Array<Int>::a1)
check("kotlin.Array<kotlin.Any>", Array<Any>::a2)
check("kotlin.Array<kotlin.Array<kotlin.String>>", Array<Array<String>>::a3)
check("kotlin.Array<kotlin.BooleanArray>", Array<BooleanArray>::a4)
check("java.util.Map", Map<String, Runnable>::m)
check("kotlin.Map<kotlin.String, java.lang.Runnable>", Map<String, Runnable>::m)
check("kotlin.List<kotlin.MutableSet<kotlin.Array<kotlin.CharSequence>>>", List<MutableSet<Array<CharSequence>>>::l)
return "OK"
}
compiler/testData/codegen/boxWithStdlib/reflection/methodsFromAny/propertyToString.kt
+2 -2
View File
@@ -18,8 +18,8 @@ fun assertToString(s: String, x: Any) {
fun box(): String {
assertToString("val top", ::top)
assertToString("var top2", ::top2)
assertToString("val java.lang.String.ext", String::ext)
assertToString("var kotlin.IntRange.ext2", IntRange::ext2)
assertToString("val kotlin.String.ext", String::ext)
assertToString("var kotlin.IntRange?.ext2", IntRange::ext2)
assertToString("val test.A.mem", A::mem)
assertToString("var test.B.mem", B::mem)
return "OK"