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

Add 'val KClass.declaredProperties', make getProperties a property

Browse Source
This commit is contained in:
Alexander Udalov
2015-03-16 16:14:32 +03:00
parent 4a61f2751c
commit d3abd54b06
14 changed files with 107 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/boxWithJava/reflection/kotlinPropertyInheritedInJava/K.kt
+6 -5
View File
@@ -22,16 +22,17 @@ fun box(): String {
val klass = javaClass<J>().kotlin
val prop2 = klass.getProperties().firstOrNull { it.name == "prop" }
?: "Fail: no 'prop' property in getProperties()"
if (prop != prop2) return "Fail: property references from :: and from getProperties() differ"
if (klass.declaredProperties.isNotEmpty()) return "Fail: declaredProperties should be empty"
if (klass.declaredExtensionProperties.isNotEmpty()) return "Fail: declaredExtensionProperties should be empty"
val prop2 = klass.properties.firstOrNull { it.name == "prop" } ?: "Fail: no 'prop' property in properties"
if (prop != prop2) return "Fail: property references from :: and from properties differ: $prop != $prop2"
if (prop2 !is KMutableMemberProperty<*, *>) return "Fail instanceof 2"
(prop2 as KMutableMemberProperty<J, String>).set(j, "::)")
if (prop.get(j) != "::)") return "Fail get after 2: ${prop[j]}"
val ext = klass.getExtensionProperties().firstOrNull { it.name == "ext" }
?: "Fail: no 'ext' property in getProperties()"
val ext = klass.extensionProperties.firstOrNull { it.name == "ext" } ?: "Fail: no 'ext' property in extensionProperties"
ext as KMemberExtensionProperty<J, Int, Int>
val fortyTwo = ext.get(j, 42)
if (fortyTwo != 42) return "Fail ext get: $fortyTwo"
compiler/testData/codegen/boxWithStdlib/reflection/methodsFromAny/memberExtensionToString.kt
+1 -1
View File
@@ -7,6 +7,6 @@ class A {
}
fun box(): String {
val p = javaClass<A>().kotlin.getExtensionProperties().single()
val p = javaClass<A>().kotlin.extensionProperties.single()
return if ("$p" == "var A.(kotlin.String.)id") "OK" else "Fail $p"
}
compiler/testData/codegen/boxWithStdlib/reflection/properties/allVsDeclared.kt
+23
View File
@@ -0,0 +1,23 @@
import kotlin.reflect.*
import kotlin.test.*
open class Super {
val a: Int = 1
val String.b: String get() = this
}
class Sub : Super() {
val c: Double = 1.0
val Char.d: Char get() = this
}
fun box(): String {
val sub = Sub::class
assertEquals(listOf("a", "c"), sub.properties.map { it.name }.sort())
assertEquals(listOf("b", "d"), sub.extensionProperties.map { it.name }.sort())
assertEquals(listOf("c"), sub.declaredProperties.map { it.name })
assertEquals(listOf("d"), sub.declaredExtensionProperties.map { it.name })
return "OK"
}
compiler/testData/codegen/boxWithStdlib/reflection/properties/callPrivatePropertyFromGetProperties.kt
+1 -1
View File
@@ -4,7 +4,7 @@ import kotlin.reflect.jvm.*
class K(private val value: String)
fun box(): String {
val p = javaClass<K>().kotlin.getProperties().single() as KMemberProperty<K, String>
val p = javaClass<K>().kotlin.properties.single() as KMemberProperty<K, String>
try {
return p.get(K("Fail: private property should not be accessible by default"))
compiler/testData/codegen/boxWithStdlib/reflection/properties/fakeOverridesInSubclass.kt
+7 -3
View File
@@ -1,4 +1,5 @@
import kotlin.reflect.jvm.*
import kotlin.reflect.*
import kotlin.test.*
open class Super(val r: String)
@@ -6,7 +7,10 @@ open class Super(val r: String)
class Sub(r: String) : Super(r)
fun box(): String {
val props = javaClass<Sub>().kotlin.getProperties()
assertEquals(listOf("r"), props.map { it.name })
return props.single().get(Sub("OK")).toString()
val props = javaClass<Sub>().kotlin.declaredProperties
if (!props.isEmpty()) return "Fail $props"
val allProps = javaClass<Sub>().kotlin.properties
assertEquals(listOf("r"), allProps.map { it.name })
return allProps.single().get(Sub("OK")) as String
}
compiler/testData/codegen/boxWithStdlib/reflection/properties/genericClassLiteralPropertyReceiverIsStar.kt
+1 -1
View File
@@ -5,7 +5,7 @@ class A<T> {
}
fun box(): String {
val k = A::class.getProperties().single()
val k = A::class.properties.single()
k : KMemberProperty<A<*>, *>
return k.get(A<String>()) as String
}
compiler/testData/codegen/boxWithStdlib/reflection/properties/getExtensionPropertiesMutableVsReadonly.kt
+1 -1
View File
@@ -13,7 +13,7 @@ class A {
}
fun box(): String {
val props = javaClass<A>().kotlin.getExtensionProperties()
val props = javaClass<A>().kotlin.extensionProperties
val readonly = props.single { it.name == "readonly" }
assert(readonly !is KMutableMemberExtensionProperty<A, *, *>) { "Fail 1: $readonly" }
val mutable = props.single { it.name == "mutable" }
compiler/testData/codegen/boxWithStdlib/reflection/properties/getPropertiesMutableVsReadonly.kt
+1 -1
View File
@@ -6,7 +6,7 @@ class A(val readonly: String) {
}
fun box(): String {
val props = javaClass<A>().kotlin.getProperties()
val props = javaClass<A>().kotlin.properties
val readonly = props.single { it.name == "readonly" }
assert(readonly !is KMutableMemberProperty<A, *>) { "Fail 1: $readonly" }
val mutable = props.single { it.name == "mutable" }
compiler/testData/codegen/boxWithStdlib/reflection/properties/memberAndMemberExtensionWithSameName.kt
+2 -2
View File
@@ -9,13 +9,13 @@ class A {
fun box(): String {
run {
val foo: KMemberProperty<A, *> = javaClass<A>().kotlin.getProperties().single()
val foo: KMemberProperty<A, *> = javaClass<A>().kotlin.properties.single()
assert(foo.name == "foo") { "Fail name: $foo (${foo.name})" }
assert(foo.get(A()) == "member") { "Fail value: ${foo[A()]}" }
}
run {
val foo: KMemberExtensionProperty<A, *, *> = javaClass<A>().kotlin.getExtensionProperties().single()
val foo: KMemberExtensionProperty<A, *, *> = javaClass<A>().kotlin.extensionProperties.single()
assert(foo.name == "foo") { "Fail name: $foo (${foo.name})" }
foo as KMemberExtensionProperty<A, Unit, *>
assert(foo.get(A(), Unit) == "extension") { "Fail value: ${foo[A(), Unit]}" }
compiler/testData/codegen/boxWithStdlib/reflection/properties/simpleGetProperties.kt
+1 -1
View File
@@ -13,7 +13,7 @@ class A(param: String) {
fun box(): String {
val klass = javaClass<A>().kotlin
val props = klass.getProperties()
val props = klass.properties
val names = props.map { it.name }.toSortedList()
assert(names == listOf("anyVar", "int", "string")) { "Fail names: $props" }
compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java
+6
View File
@@ -2848,6 +2848,12 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/reflection/properties"), Pattern.compile("^(.+)\\.kt$"), true);
}
@TestMetadata("allVsDeclared.kt")
public void testAllVsDeclared() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/properties/allVsDeclared.kt");
doTestWithStdlib(fileName);
}
@TestMetadata("callPrivatePropertyFromGetProperties.kt")
public void testCallPrivatePropertyFromGetProperties() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/properties/callPrivatePropertyFromGetProperties.kt");
core/builtins/src/kotlin/reflect/KClass.kt
+2 -2
View File
@@ -19,7 +19,7 @@ package kotlin.reflect
public trait KClass<T> {
public val simpleName: String?
public fun getProperties(): Collection<KMemberProperty<T, *>>
public val properties: Collection<KMemberProperty<T, *>>
public fun getExtensionProperties(): Collection<KMemberExtensionProperty<T, *, *>>
public val extensionProperties: Collection<KMemberExtensionProperty<T, *, *>>
}
core/reflection.jvm/src/kotlin/reflect/KClassExtensions.kt
+25
View File
@@ -0,0 +1,25 @@
/*
* Copyright 2010-2015 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package kotlin.reflect
import kotlin.reflect.jvm.internal.KClassImpl
public val <T> KClass<T>.declaredProperties: Collection<KMemberProperty<T, *>>
get() = (this as KClassImpl<T>).getProperties(declared = true)
public val <T> KClass<T>.declaredExtensionProperties: Collection<KMemberExtensionProperty<T, *, *>>
get() = (this as KClassImpl<T>).getExtensionProperties(declared = true)
core/reflection.jvm/src/kotlin/reflect/jvm/internal/KClassImpl.kt
+30 -30
View File
@@ -43,39 +43,39 @@ class KClassImpl<T>(override val jClass: Class<T>) : KCallableContainerImpl(), K
return if (name.isSpecial()) null else name.asString()
}
override fun getProperties(): Collection<KMemberProperty<T, *>> {
return scope.getAllDescriptors().stream()
.filterIsInstance<PropertyDescriptor>()
.filter { descriptor ->
descriptor.getExtensionReceiverParameter() == null
}
.map { descriptor ->
if (descriptor.isVar()) KMutableMemberPropertyImpl<T, Any?>(this) { descriptor }
else KMemberPropertyImpl<T, Any?>(this) { descriptor }
}
.toList()
}
override val properties: Collection<KMemberProperty<T, *>>
get() = getProperties(declared = false)
override fun getExtensionProperties(): Collection<KMemberExtensionProperty<T, *, *>> {
return scope.getAllDescriptors().stream()
.filterIsInstance<PropertyDescriptor>()
.filter { descriptor ->
descriptor.getExtensionReceiverParameter() != null
}
.map { descriptor ->
if (descriptor.isVar()) KMutableMemberExtensionPropertyImpl<T, Any?, Any?>(this) { descriptor }
else KMemberExtensionPropertyImpl<T, Any?, Any?>(this) { descriptor }
}
.toList()
}
override val extensionProperties: Collection<KMemberExtensionProperty<T, *, *>>
get() = getExtensionProperties(declared = false)
fun memberProperty(name: String): KMemberProperty<T, *> {
return KMemberPropertyImpl<T, Any>(this, findPropertyDescriptor(name))
}
fun getProperties(declared: Boolean): Collection<KMemberProperty<T, *>> =
getProperties(extension = false, declared = declared) { descriptor ->
if (descriptor.isVar()) KMutableMemberPropertyImpl<T, Any?>(this) { descriptor }
else KMemberPropertyImpl<T, Any?>(this) { descriptor }
}
fun mutableMemberProperty(name: String): KMutableMemberProperty<T, *> {
return KMutableMemberPropertyImpl<T, Any>(this, findPropertyDescriptor(name))
}
fun getExtensionProperties(declared: Boolean): Collection<KMemberExtensionProperty<T, *, *>> =
getProperties(extension = true, declared = declared) { descriptor ->
if (descriptor.isVar()) KMutableMemberExtensionPropertyImpl<T, Any?, Any?>(this) { descriptor }
else KMemberExtensionPropertyImpl<T, Any?, Any?>(this) { descriptor }
}
private fun <P : KProperty<*>> getProperties(extension: Boolean, declared: Boolean, create: (PropertyDescriptor) -> P): Collection<P> =
scope.getAllDescriptors().sequence()
.filterIsInstance<PropertyDescriptor>()
.filter { descriptor ->
(descriptor.getExtensionReceiverParameter() != null) == extension &&
(descriptor.getKind().isReal() || !declared)
}
.map(create)
.toList()
fun memberProperty(name: String): KMemberProperty<T, *> =
KMemberPropertyImpl<T, Any>(this, findPropertyDescriptor(name))
fun mutableMemberProperty(name: String): KMutableMemberProperty<T, *> =
KMutableMemberPropertyImpl<T, Any>(this, findPropertyDescriptor(name))
override fun equals(other: Any?): Boolean =
other is KClassImpl<*> && jClass == other.jClass