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

Support KClass.isInstance/cast/safeCast in stdlib-only reflection implementation

Browse Source 
#KT-14720 Fixed
This commit is contained in:
Alexander Udalov
2019-10-24 19:37:29 +02:00
parent 5c89f2fa54
commit 896512f7cd
10 changed files with 80 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/reflection.jvm/src/kotlin/reflect/full/KClasses.kt
+6 -8
View File
@@ -24,11 +24,8 @@ import org.jetbrains.kotlin.types.TypeSubstitutor
import org.jetbrains.kotlin.types.Variance
import org.jetbrains.kotlin.utils.DFS
import kotlin.reflect.*
import kotlin.reflect.jvm.internal.KCallableImpl
import kotlin.reflect.jvm.internal.KClassImpl
import kotlin.reflect.jvm.internal.KFunctionImpl
import kotlin.reflect.jvm.internal.KTypeImpl
import kotlin.reflect.jvm.internal.KotlinReflectionInternalError
import kotlin.reflect.jvm.internal.*
import kotlin.reflect.safeCast as commonSafeCast
/**
* Returns the primary constructor of this class, or `null` if this class has no primary constructor.
@@ -253,6 +250,7 @@ fun KClass<*>.isSuperclassOf(derived: KClass<*>): Boolean =
*/
@SinceKotlin("1.1")
fun <T : Any> KClass<T>.cast(value: Any?): T {
// Note: can't use kotlin.reflect.cast because it throws ClassCastException.
if (!isInstance(value)) throw TypeCastException("Value cannot be cast to $qualifiedName")
return value as T
}
@@ -265,9 +263,9 @@ fun <T : Any> KClass<T>.cast(value: Any?): T {
* @see [KClass.cast]
*/
@SinceKotlin("1.1")
fun <T : Any> KClass<T>.safeCast(value: Any?): T? {
return if (isInstance(value)) value as T else null
}
fun <T : Any> KClass<T>.safeCast(value: Any?): T? =
@UseExperimental(ExperimentalStdlibApi::class)
commonSafeCast(value)
/**
core/reflection.jvm/src/kotlin/reflect/jvm/internal/KClassImpl.kt
+1 -10
View File
@@ -20,8 +20,6 @@ import org.jetbrains.kotlin.builtins.CompanionObjectMapping
import org.jetbrains.kotlin.builtins.KotlinBuiltIns
import org.jetbrains.kotlin.descriptors.*
import org.jetbrains.kotlin.descriptors.runtime.components.ReflectKotlinClass
import org.jetbrains.kotlin.descriptors.runtime.structure.functionClassArity
import org.jetbrains.kotlin.descriptors.runtime.structure.wrapperByPrimitive
import org.jetbrains.kotlin.incremental.components.NoLookupLocation
import org.jetbrains.kotlin.load.java.JvmAbi
import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader
@@ -36,7 +34,6 @@ import org.jetbrains.kotlin.serialization.deserialization.MemberDeserializer
import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedClassDescriptor
import org.jetbrains.kotlin.utils.compact
import kotlin.jvm.internal.ClassReference
import kotlin.jvm.internal.TypeIntrinsics
import kotlin.reflect.*
import kotlin.reflect.jvm.internal.KDeclarationContainerImpl.MemberBelonginess.DECLARED
import kotlin.reflect.jvm.internal.KDeclarationContainerImpl.MemberBelonginess.INHERITED
@@ -218,13 +215,7 @@ internal class KClassImpl<T : Any>(override val jClass: Class<T>) : KDeclaration
override val objectInstance: T? get() = data().objectInstance
override fun isInstance(value: Any?): Boolean {
// TODO: use Kotlin semantics for mutable/read-only collections once KT-11754 is supported (see TypeIntrinsics)
jClass.functionClassArity?.let { arity ->
return TypeIntrinsics.isFunctionOfArity(value, arity)
}
return (jClass.wrapperByPrimitive ?: jClass).isInstance(value)
}
override fun isInstance(value: Any?): Boolean = ClassReference.isInstance(value, jClass)
override val typeParameters: List<KTypeParameter> get() = data().typeParameters