From c35ddc3616c5ae20fb736f911f9c0dd15cd33f17 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Tue, 25 Nov 2014 18:18:41 +0300 Subject: [PATCH] Minor, make ownTypeParameters a property in TypeDeserializer --- .../jet/descriptors/serialization/MemberDeserializer.kt | 4 ++-- .../jet/descriptors/serialization/TypeDeserializer.kt | 3 ++- .../serialization/descriptors/DeserializedClassDescriptor.kt | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/MemberDeserializer.kt b/core/serialization/src/org/jetbrains/jet/descriptors/serialization/MemberDeserializer.kt index 42da5560a3d..05dacefd855 100644 --- a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/MemberDeserializer.kt +++ b/core/serialization/src/org/jetbrains/jet/descriptors/serialization/MemberDeserializer.kt @@ -55,7 +55,7 @@ public class MemberDeserializer(private val c: DeserializationContext) { val local = c.childContext(property, proto.getTypeParameterList()) property.setType( local.typeDeserializer.type(proto.getReturnType()), - local.typeDeserializer.getOwnTypeParameters(), + local.typeDeserializer.ownTypeParameters, getDispatchReceiverParameter(), if (proto.hasReceiverType()) local.typeDeserializer.type(proto.getReceiverType()) else null ) @@ -131,7 +131,7 @@ public class MemberDeserializer(private val c: DeserializationContext) { function.initialize( if (proto.hasReceiverType()) local.typeDeserializer.type(proto.getReceiverType()) else null, getDispatchReceiverParameter(), - local.typeDeserializer.getOwnTypeParameters(), + local.typeDeserializer.ownTypeParameters, local.memberDeserializer.valueParameters(proto, AnnotatedCallableKind.FUNCTION), local.typeDeserializer.type(proto.getReturnType()), modality(Flags.MODALITY.get(proto.getFlags())), diff --git a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/TypeDeserializer.kt b/core/serialization/src/org/jetbrains/jet/descriptors/serialization/TypeDeserializer.kt index d352b499cac..af38c810d08 100644 --- a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/TypeDeserializer.kt +++ b/core/serialization/src/org/jetbrains/jet/descriptors/serialization/TypeDeserializer.kt @@ -48,7 +48,8 @@ public class TypeDeserializer( } } - fun getOwnTypeParameters(): List = typeParameterDescriptors().values().toReadOnlyList() + val ownTypeParameters: List + get() = typeParameterDescriptors().values().toReadOnlyList() fun type(proto: ProtoBuf.Type): JetType { if (proto.hasFlexibleTypeCapabilitiesId()) { diff --git a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedClassDescriptor.kt b/core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedClassDescriptor.kt index bcf188a4b0c..5852a6a09a5 100644 --- a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedClassDescriptor.kt +++ b/core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedClassDescriptor.kt @@ -144,7 +144,7 @@ public class DeserializedClassDescriptor( private inner class DeserializedClassTypeConstructor : AbstractClassTypeConstructor() { private val supertypes = computeSuperTypes() - override fun getParameters() = c.typeDeserializer.getOwnTypeParameters() + override fun getParameters() = c.typeDeserializer.ownTypeParameters override fun getSupertypes(): Collection { // We cannot have error supertypes because subclasses inherit error functions from them