From 1a84ade2325014deec7d2a3b9ef091cd1fd68666 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Thu, 20 Nov 2014 17:44:17 +0300 Subject: [PATCH] Minor, rename field deserializer -> memberDeserializer --- .../jet/descriptors/serialization/MemberDeserializer.java | 8 ++++---- .../jet/descriptors/serialization/context/context.kt | 4 ++-- .../descriptors/DeserializedClassDescriptor.kt | 2 +- .../serialization/descriptors/DeserializedMemberScope.kt | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/MemberDeserializer.java b/core/serialization/src/org/jetbrains/jet/descriptors/serialization/MemberDeserializer.java index 8cd82db1fd2..9a24c7a24c1 100644 --- a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/MemberDeserializer.java +++ b/core/serialization/src/org/jetbrains/jet/descriptors/serialization/MemberDeserializer.java @@ -123,8 +123,8 @@ public class MemberDeserializer { !isNotDefault, property.getKind(), null, SourceElement.NO_SOURCE); DeserializationContextWithTypes setterLocal = local.childContext(setter, Collections.emptyList()); - List valueParameters - = setterLocal.getDeserializer().valueParameters(proto, AnnotatedCallableKind.PROPERTY_SETTER); + List valueParameters = + setterLocal.getMemberDeserializer().valueParameters(proto, AnnotatedCallableKind.PROPERTY_SETTER); assert valueParameters.size() == 1 : "Property setter should have a single value parameter: " + setter; setter.initialize(valueParameters.get(0)); } @@ -166,7 +166,7 @@ public class MemberDeserializer { local.getTypeDeserializer().typeOrNull(proto.hasReceiverType() ? proto.getReceiverType() : null), getDispatchReceiverParameter(), local.getTypeDeserializer().getOwnTypeParameters(), - local.getDeserializer().valueParameters(proto, AnnotatedCallableKind.FUNCTION), + local.getMemberDeserializer().valueParameters(proto, AnnotatedCallableKind.FUNCTION), local.getTypeDeserializer().type(proto.getReturnType()), modality(Flags.MODALITY.get(flags)), visibility(Flags.VISIBILITY.get(flags)) @@ -192,7 +192,7 @@ public class MemberDeserializer { DeserializationContextWithTypes local = context.childContext(descriptor, Collections.emptyList()); descriptor.initialize( classDescriptor.getTypeConstructor().getParameters(), - local.getDeserializer().valueParameters(proto, AnnotatedCallableKind.FUNCTION), + local.getMemberDeserializer().valueParameters(proto, AnnotatedCallableKind.FUNCTION), visibility(Flags.VISIBILITY.get(proto.getFlags())) ); descriptor.setReturnType(local.getTypeDeserializer().type(proto.getReturnType())); diff --git a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/context/context.kt b/core/serialization/src/org/jetbrains/jet/descriptors/serialization/context/context.kt index ec33334f2cc..42a0912e934 100644 --- a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/context/context.kt +++ b/core/serialization/src/org/jetbrains/jet/descriptors/serialization/context/context.kt @@ -85,13 +85,13 @@ class DeserializationContextWithTypes( val containingDeclaration: DeclarationDescriptor, val typeDeserializer: TypeDeserializer ) : DeserializationContext(components, classDeserializer, nameResolver) { - val deserializer: MemberDeserializer = MemberDeserializer(this) + val memberDeserializer: MemberDeserializer = MemberDeserializer(this) fun childContext(descriptor: DeclarationDescriptor, typeParameterProtos: List): DeserializationContextWithTypes { val childTypeDeserializer = TypeDeserializer(this, typeDeserializer, "Child deserializer for ${descriptor.getName()}") val childContext = withTypes(descriptor, childTypeDeserializer) - for (typeParameter in childContext.deserializer.typeParameters(typeParameterProtos, childTypeDeserializer)) { + for (typeParameter in childContext.memberDeserializer.typeParameters(typeParameterProtos, childTypeDeserializer)) { childTypeDeserializer.addTypeParameter(typeParameter) } 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 9ce2a4481e7..653ac5067d7 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 @@ -112,7 +112,7 @@ public class DeserializedClassDescriptor( return descriptor } - return context.deserializer.loadCallable(constructorProto.getData()) as ConstructorDescriptor + return context.memberDeserializer.loadCallable(constructorProto.getData()) as ConstructorDescriptor } override fun getUnsubstitutedPrimaryConstructor(): ConstructorDescriptor? = primaryConstructor() diff --git a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedMemberScope.kt b/core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedMemberScope.kt index 155f842ffa5..c1983bbaa72 100644 --- a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedMemberScope.kt +++ b/core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedMemberScope.kt @@ -78,7 +78,7 @@ public abstract class DeserializedMemberScope protected( [suppress("UNCHECKED_CAST")] return memberProtos.mapTo(LinkedHashSet()) { memberProto -> - context.deserializer.loadCallable(memberProto) as D + context.memberDeserializer.loadCallable(memberProto) as D } }