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

Minor, rename PlatformStatic* -> JvmStatic* in reflection

Browse Source
This commit is contained in:
Alexander Udalov
2015-08-29 18:42:09 +03:00
parent 408a86c761
commit fb09c91714
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/reflection.jvm/src/kotlin/reflect/jvm/internal/FunctionCaller.kt
+3 -3
View File
@@ -99,7 +99,7 @@ internal abstract class FunctionCaller<out M : Member>(
} }
} }
class PlatformStaticInObject(method: ReflectMethod) : Method(method, requiresInstance = true) { class JvmStaticInObject(method: ReflectMethod) : Method(method, requiresInstance = true) {
override fun call(args: Array<*>): Any? { override fun call(args: Array<*>): Any? {
checkArguments(args) checkArguments(args)
checkObjectInstance(args.firstOrNull()) checkObjectInstance(args.firstOrNull())
@@ -151,7 +151,7 @@ internal abstract class FunctionCaller<out M : Member>(
class InstanceFieldGetter(field: ReflectField) : FieldGetter(field) class InstanceFieldGetter(field: ReflectField) : FieldGetter(field)
class PlatformStaticInObjectFieldGetter(field: ReflectField) : FieldGetter(field, requiresInstance = true) { class JvmStaticInObjectFieldGetter(field: ReflectField) : FieldGetter(field, requiresInstance = true) {
override fun checkArguments(args: Array<*>) { override fun checkArguments(args: Array<*>) {
super.checkArguments(args) super.checkArguments(args)
checkObjectInstance(args.firstOrNull()) checkObjectInstance(args.firstOrNull())
@@ -162,7 +162,7 @@ internal abstract class FunctionCaller<out M : Member>(
class InstanceFieldSetter(field: ReflectField, notNull: Boolean) : FieldSetter(field, notNull) class InstanceFieldSetter(field: ReflectField, notNull: Boolean) : FieldSetter(field, notNull)
class PlatformStaticInObjectFieldSetter(field: ReflectField, notNull: Boolean) : FieldSetter(field, notNull, requiresInstance = true) { class JvmStaticInObjectFieldSetter(field: ReflectField, notNull: Boolean) : FieldSetter(field, notNull, requiresInstance = true) {
override fun checkArguments(args: Array<*>) { override fun checkArguments(args: Array<*>) {
super.checkArguments(args) super.checkArguments(args)
checkObjectInstance(args.firstOrNull()) checkObjectInstance(args.firstOrNull())
core/reflection.jvm/src/kotlin/reflect/jvm/internal/KFunctionImpl.kt
+2 -2
View File
@@ -69,7 +69,7 @@ open class KFunctionImpl protected constructor(
descriptor.annotations.findAnnotation(PLATFORM_STATIC) != null, descriptor.annotations.findAnnotation(PLATFORM_STATIC) != null,
descriptor.annotations.findAnnotation(JVM_STATIC) != null -> descriptor.annotations.findAnnotation(JVM_STATIC) != null ->
FunctionCaller.PlatformStaticInObject(member) FunctionCaller.JvmStaticInObject(member)
else -> FunctionCaller.StaticMethod(member) else -> FunctionCaller.StaticMethod(member)
} }
@@ -100,7 +100,7 @@ open class KFunctionImpl protected constructor(
is Method -> when { is Method -> when {
descriptor.annotations.findAnnotation(PLATFORM_STATIC) != null, descriptor.annotations.findAnnotation(PLATFORM_STATIC) != null,
descriptor.annotations.findAnnotation(JVM_STATIC) != null -> descriptor.annotations.findAnnotation(JVM_STATIC) != null ->
FunctionCaller.PlatformStaticInObject(member) FunctionCaller.JvmStaticInObject(member)
else -> FunctionCaller.StaticMethod(member) else -> FunctionCaller.StaticMethod(member)
} }
core/reflection.jvm/src/kotlin/reflect/jvm/internal/KPropertyImpl.kt
+5 -5
View File
@@ -85,7 +85,7 @@ interface KMutablePropertyImpl<R> : KMutableProperty<R>, KPropertyImpl<R> {
private fun KPropertyImpl.Accessor<*>.computeCallerForAccessor(isGetter: Boolean): FunctionCaller<*> { private fun KPropertyImpl.Accessor<*>.computeCallerForAccessor(isGetter: Boolean): FunctionCaller<*> {
fun isPlatformStaticProperty() = fun isJvmStaticProperty() =
property.descriptor.annotations.findAnnotation(PLATFORM_STATIC) != null || property.descriptor.annotations.findAnnotation(PLATFORM_STATIC) != null ||
property.descriptor.annotations.findAnnotation(JVM_STATIC) != null property.descriptor.annotations.findAnnotation(JVM_STATIC) != null
@@ -96,9 +96,9 @@ private fun KPropertyImpl.Accessor<*>.computeCallerForAccessor(isGetter: Boolean
!Modifier.isStatic(field.modifiers) -> !Modifier.isStatic(field.modifiers) ->
if (isGetter) FunctionCaller.InstanceFieldGetter(field) if (isGetter) FunctionCaller.InstanceFieldGetter(field)
else FunctionCaller.InstanceFieldSetter(field, isNotNullProperty()) else FunctionCaller.InstanceFieldSetter(field, isNotNullProperty())
isPlatformStaticProperty() -> isJvmStaticProperty() ->
if (isGetter) FunctionCaller.PlatformStaticInObjectFieldGetter(field) if (isGetter) FunctionCaller.JvmStaticInObjectFieldGetter(field)
else FunctionCaller.PlatformStaticInObjectFieldSetter(field, isNotNullProperty()) else FunctionCaller.JvmStaticInObjectFieldSetter(field, isNotNullProperty())
else -> else ->
if (isGetter) FunctionCaller.StaticFieldGetter(field) if (isGetter) FunctionCaller.StaticFieldGetter(field)
else FunctionCaller.StaticFieldSetter(field, isNotNullProperty()) else FunctionCaller.StaticFieldSetter(field, isNotNullProperty())
@@ -123,7 +123,7 @@ private fun KPropertyImpl.Accessor<*>.computeCallerForAccessor(isGetter: Boolean
when { when {
accessor == null -> computeFieldCaller(property.javaField!!) accessor == null -> computeFieldCaller(property.javaField!!)
!Modifier.isStatic(accessor.modifiers) -> FunctionCaller.InstanceMethod(accessor) !Modifier.isStatic(accessor.modifiers) -> FunctionCaller.InstanceMethod(accessor)
isPlatformStaticProperty() -> FunctionCaller.PlatformStaticInObject(accessor) isJvmStaticProperty() -> FunctionCaller.JvmStaticInObject(accessor)
else -> FunctionCaller.StaticMethod(accessor) else -> FunctionCaller.StaticMethod(accessor)
} }
} }