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

KProperty and ReadOnlyProperty type parameter names #KT-16529

Browse Source
This commit is contained in:
Abduqodiri Qurbonzoda
2020-02-17 15:40:57 +03:00
parent 5ed28b38be
commit fe50bb4b93
13 changed files with 127 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/reflection.jvm/src/kotlin/reflect/jvm/internal/KProperty0Impl.kt
+7 -7
View File
@@ -21,7 +21,7 @@ import kotlin.LazyThreadSafetyMode.PUBLICATION
import kotlin.reflect.KMutableProperty0
import kotlin.reflect.KProperty0
internal open class KProperty0Impl<out R> : KProperty0<R>, KPropertyImpl<R> {
internal open class KProperty0Impl<out V> : KProperty0<V>, KPropertyImpl<V> {
constructor(container: KDeclarationContainerImpl, descriptor: PropertyDescriptor) : super(container, descriptor)
constructor(container: KDeclarationContainerImpl, name: String, signature: String, boundReceiver: Any?) : super(
@@ -30,22 +30,22 @@ internal open class KProperty0Impl<out R> : KProperty0<R>, KPropertyImpl<R> {
private val _getter = ReflectProperties.lazy { Getter(this) }
override val getter: Getter<R> get() = _getter()
override val getter: Getter<V> get() = _getter()
override fun get(): R = getter.call()
override fun get(): V = getter.call()
private val delegateFieldValue = lazy(PUBLICATION) { getDelegate(computeDelegateField(), boundReceiver) }
override fun getDelegate(): Any? = delegateFieldValue.value
override fun invoke(): R = get()
override fun invoke(): V = get()
class Getter<out R>(override val property: KProperty0Impl<R>) : KPropertyImpl.Getter<R>(), KProperty0.Getter<R> {
override fun invoke(): R = property.get()
}
}
internal class KMutableProperty0Impl<R> : KProperty0Impl<R>, KMutableProperty0<R> {
internal class KMutableProperty0Impl<V> : KProperty0Impl<V>, KMutableProperty0<V> {
constructor(container: KDeclarationContainerImpl, descriptor: PropertyDescriptor) : super(container, descriptor)
constructor(container: KDeclarationContainerImpl, name: String, signature: String, boundReceiver: Any?) : super(
@@ -54,9 +54,9 @@ internal class KMutableProperty0Impl<R> : KProperty0Impl<R>, KMutableProperty0<R
private val _setter = ReflectProperties.lazy { Setter(this) }
override val setter: Setter<R> get() = _setter()
override val setter: Setter<V> get() = _setter()
override fun set(value: R) = setter.call(value)
override fun set(value: V) = setter.call(value)
class Setter<R>(override val property: KMutableProperty0Impl<R>) : KPropertyImpl.Setter<R>(), KMutableProperty0.Setter<R> {
override fun invoke(value: R): Unit = property.set(value)
core/reflection.jvm/src/kotlin/reflect/jvm/internal/KProperty1Impl.kt
+11 -11
View File
@@ -21,7 +21,7 @@ import kotlin.LazyThreadSafetyMode.PUBLICATION
import kotlin.reflect.KMutableProperty1
import kotlin.reflect.KProperty1
internal open class KProperty1Impl<T, out R> : KProperty1<T, R>, KPropertyImpl<R> {
internal open class KProperty1Impl<T, out V> : KProperty1<T, V>, KPropertyImpl<V> {
constructor(container: KDeclarationContainerImpl, name: String, signature: String, boundReceiver: Any?) : super(
container, name, signature, boundReceiver
)
@@ -30,22 +30,22 @@ internal open class KProperty1Impl<T, out R> : KProperty1<T, R>, KPropertyImpl<R
private val _getter = ReflectProperties.lazy { Getter(this) }
override val getter: Getter<T, R> get() = _getter()
override val getter: Getter<T, V> get() = _getter()
override fun get(receiver: T): R = getter.call(receiver)
override fun get(receiver: T): V = getter.call(receiver)
private val delegateField = lazy(PUBLICATION) { computeDelegateField() }
override fun getDelegate(receiver: T): Any? = getDelegate(delegateField.value, receiver)
override fun invoke(receiver: T): R = get(receiver)
override fun invoke(receiver: T): V = get(receiver)
class Getter<T, out R>(override val property: KProperty1Impl<T, R>) : KPropertyImpl.Getter<R>(), KProperty1.Getter<T, R> {
override fun invoke(receiver: T): R = property.get(receiver)
class Getter<T, out V>(override val property: KProperty1Impl<T, V>) : KPropertyImpl.Getter<V>(), KProperty1.Getter<T, V> {
override fun invoke(receiver: T): V = property.get(receiver)
}
}
internal class KMutableProperty1Impl<T, R> : KProperty1Impl<T, R>, KMutableProperty1<T, R> {
internal class KMutableProperty1Impl<T, V> : KProperty1Impl<T, V>, KMutableProperty1<T, V> {
constructor(container: KDeclarationContainerImpl, name: String, signature: String, boundReceiver: Any?) : super(
container, name, signature, boundReceiver
)
@@ -54,11 +54,11 @@ internal class KMutableProperty1Impl<T, R> : KProperty1Impl<T, R>, KMutablePrope
private val _setter = ReflectProperties.lazy { Setter(this) }
override val setter: Setter<T, R> get() = _setter()
override val setter: Setter<T, V> get() = _setter()
override fun set(receiver: T, value: R) = setter.call(receiver, value)
override fun set(receiver: T, value: V) = setter.call(receiver, value)
class Setter<T, R>(override val property: KMutableProperty1Impl<T, R>) : KPropertyImpl.Setter<R>(), KMutableProperty1.Setter<T, R> {
override fun invoke(receiver: T, value: R): Unit = property.set(receiver, value)
class Setter<T, V>(override val property: KMutableProperty1Impl<T, V>) : KPropertyImpl.Setter<V>(), KMutableProperty1.Setter<T, V> {
override fun invoke(receiver: T, value: V): Unit = property.set(receiver, value)
}
}
core/reflection.jvm/src/kotlin/reflect/jvm/internal/KProperty2Impl.kt
+12 -12
View File
@@ -22,7 +22,7 @@ import kotlin.jvm.internal.CallableReference
import kotlin.reflect.KMutableProperty2
import kotlin.reflect.KProperty2
internal open class KProperty2Impl<D, E, out R> : KProperty2<D, E, R>, KPropertyImpl<R> {
internal open class KProperty2Impl<D, E, out V> : KProperty2<D, E, V>, KPropertyImpl<V> {
constructor(container: KDeclarationContainerImpl, name: String, signature: String) : super(
container, name, signature, CallableReference.NO_RECEIVER
)
@@ -31,34 +31,34 @@ internal open class KProperty2Impl<D, E, out R> : KProperty2<D, E, R>, KProperty
private val _getter = ReflectProperties.lazy { Getter(this) }
override val getter: Getter<D, E, R> get() = _getter()
override val getter: Getter<D, E, V> get() = _getter()
override fun get(receiver1: D, receiver2: E): R = getter.call(receiver1, receiver2)
override fun get(receiver1: D, receiver2: E): V = getter.call(receiver1, receiver2)
private val delegateField = lazy(PUBLICATION) { computeDelegateField() }
override fun getDelegate(receiver1: D, receiver2: E): Any? = getDelegate(delegateField.value, receiver1)
override fun invoke(receiver1: D, receiver2: E): R = get(receiver1, receiver2)
override fun invoke(receiver1: D, receiver2: E): V = get(receiver1, receiver2)
class Getter<D, E, out R>(override val property: KProperty2Impl<D, E, R>) : KPropertyImpl.Getter<R>(), KProperty2.Getter<D, E, R> {
override fun invoke(receiver1: D, receiver2: E): R = property.get(receiver1, receiver2)
class Getter<D, E, out V>(override val property: KProperty2Impl<D, E, V>) : KPropertyImpl.Getter<V>(), KProperty2.Getter<D, E, V> {
override fun invoke(receiver1: D, receiver2: E): V = property.get(receiver1, receiver2)
}
}
internal class KMutableProperty2Impl<D, E, R> : KProperty2Impl<D, E, R>, KMutableProperty2<D, E, R> {
internal class KMutableProperty2Impl<D, E, V> : KProperty2Impl<D, E, V>, KMutableProperty2<D, E, V> {
constructor(container: KDeclarationContainerImpl, name: String, signature: String) : super(container, name, signature)
constructor(container: KDeclarationContainerImpl, descriptor: PropertyDescriptor) : super(container, descriptor)
private val _setter = ReflectProperties.lazy { Setter(this) }
override val setter: Setter<D, E, R> get() = _setter()
override val setter: Setter<D, E, V> get() = _setter()
override fun set(receiver1: D, receiver2: E, value: R) = setter.call(receiver1, receiver2, value)
override fun set(receiver1: D, receiver2: E, value: V) = setter.call(receiver1, receiver2, value)
class Setter<D, E, R>(override val property: KMutableProperty2Impl<D, E, R>) : KPropertyImpl.Setter<R>(),
KMutableProperty2.Setter<D, E, R> {
override fun invoke(receiver1: D, receiver2: E, value: R): Unit = property.set(receiver1, receiver2, value)
class Setter<D, E, V>(override val property: KMutableProperty2Impl<D, E, V>) : KPropertyImpl.Setter<V>(),
KMutableProperty2.Setter<D, E, V> {
override fun invoke(receiver1: D, receiver2: E, value: V): Unit = property.set(receiver1, receiver2, value)
}
}
core/reflection.jvm/src/kotlin/reflect/jvm/internal/KPropertyImpl.kt
+5 -5
View File
@@ -24,13 +24,13 @@ import kotlin.reflect.full.IllegalPropertyDelegateAccessException
import kotlin.reflect.jvm.internal.JvmPropertySignature.*
import kotlin.reflect.jvm.internal.calls.*
internal abstract class KPropertyImpl<out R> private constructor(
internal abstract class KPropertyImpl<out V> private constructor(
override val container: KDeclarationContainerImpl,
override val name: String,
val signature: String,
descriptorInitialValue: PropertyDescriptor?,
private val rawBoundReceiver: Any?
) : KCallableImpl<R>(), KProperty<R> {
) : KCallableImpl<V>(), KProperty<V> {
constructor(container: KDeclarationContainerImpl, name: String, signature: String, boundReceiver: Any?) : this(
container, name, signature, null, boundReceiver
)
@@ -96,7 +96,7 @@ internal abstract class KPropertyImpl<out R> private constructor(
throw IllegalPropertyDelegateAccessException(e)
}
abstract override val getter: Getter<R>
abstract override val getter: Getter<V>
private val _descriptor = ReflectProperties.lazySoft(descriptorInitialValue) {
container.findPropertyDescriptor(name, signature)
@@ -144,7 +144,7 @@ internal abstract class KPropertyImpl<out R> private constructor(
override val isSuspend: Boolean get() = descriptor.isSuspend
}
abstract class Getter<out R> : Accessor<R, R>(), KProperty.Getter<R> {
abstract class Getter<out V> : Accessor<V, V>(), KProperty.Getter<V> {
override val name: String get() = "<get-${property.name}>"
override val descriptor: PropertyGetterDescriptor by ReflectProperties.lazySoft {
@@ -157,7 +157,7 @@ internal abstract class KPropertyImpl<out R> private constructor(
}
}
abstract class Setter<R> : Accessor<R, Unit>(), KMutableProperty.Setter<R> {
abstract class Setter<V> : Accessor<V, Unit>(), KMutableProperty.Setter<V> {
override val name: String get() = "<set-${property.name}>"
override val descriptor: PropertySetterDescriptor by ReflectProperties.lazySoft {