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

Rename: DescriptorDeserializer -> MemberDeserializer

Browse Source
This commit is contained in:
Pavel V. Talanov
2014-06-16 15:00:57 +04:00
parent f8e5fa1b2f
commit 00bd8cee82
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/serialization/src/org/jetbrains/jet/descriptors/serialization/DescriptorDeserializer.java → core/serialization/src/org/jetbrains/jet/descriptors/serialization/MemberDeserializer.java
+2 -2
View File
@@ -39,11 +39,11 @@ import static org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable;
import static org.jetbrains.jet.descriptors.serialization.ProtoBuf.TypeParameter; import static org.jetbrains.jet.descriptors.serialization.ProtoBuf.TypeParameter;
import static org.jetbrains.jet.descriptors.serialization.SerializationPackage.*; import static org.jetbrains.jet.descriptors.serialization.SerializationPackage.*;
public class DescriptorDeserializer { public class MemberDeserializer {
private final DeserializationContextWithTypes context; private final DeserializationContextWithTypes context;
public DescriptorDeserializer(@NotNull DeserializationContextWithTypes context) { public MemberDeserializer(@NotNull DeserializationContextWithTypes context) {
this.context = context; this.context = context;
} }
core/serialization/src/org/jetbrains/jet/descriptors/serialization/context/context.kt
+2 -2
View File
@@ -24,7 +24,7 @@ import org.jetbrains.jet.descriptors.serialization.NameResolver
import org.jetbrains.jet.descriptors.serialization.descriptors.MemberFilter import org.jetbrains.jet.descriptors.serialization.descriptors.MemberFilter
import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor
import org.jetbrains.jet.descriptors.serialization.TypeDeserializer import org.jetbrains.jet.descriptors.serialization.TypeDeserializer
import org.jetbrains.jet.descriptors.serialization.DescriptorDeserializer import org.jetbrains.jet.descriptors.serialization.MemberDeserializer
import org.jetbrains.jet.descriptors.serialization.ProtoBuf.TypeParameter import org.jetbrains.jet.descriptors.serialization.ProtoBuf.TypeParameter
import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor
import org.jetbrains.jet.descriptors.serialization.descriptors.DeserializedTypeParameterDescriptor import org.jetbrains.jet.descriptors.serialization.descriptors.DeserializedTypeParameterDescriptor
@@ -83,7 +83,7 @@ class DeserializationContextWithTypes(
val typeDeserializer: TypeDeserializer val typeDeserializer: TypeDeserializer
) : DeserializationContext(storageManager, descriptorFinder, annotationLoader, ) : DeserializationContext(storageManager, descriptorFinder, annotationLoader,
constantLoader, packageFragmentProvider, memberFilter, nameResolver) { constantLoader, packageFragmentProvider, memberFilter, nameResolver) {
val deserializer: DescriptorDeserializer = DescriptorDeserializer(this) val deserializer: MemberDeserializer = MemberDeserializer(this)
public fun childContext( public fun childContext(
descriptor: DeclarationDescriptor, descriptor: DeclarationDescriptor,
core/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedSimpleFunctionDescriptor.java
+4 -4
View File
@@ -87,10 +87,10 @@ public class DeserializedSimpleFunctionDescriptor extends SimpleFunctionDescript
@NotNull AnnotationLoader annotationLoader, @NotNull AnnotationLoader annotationLoader,
@NotNull NameResolver nameResolver @NotNull NameResolver nameResolver
) { ) {
Annotations annotations = DescriptorDeserializer.getAnnotations(containingDeclaration, proto, proto.getFlags(), Annotations annotations = MemberDeserializer.getAnnotations(containingDeclaration, proto, proto.getFlags(),
AnnotatedCallableKind.FUNCTION, AnnotatedCallableKind.FUNCTION,
annotationLoader, annotationLoader,
nameResolver); nameResolver);
return new DeserializedSimpleFunctionDescriptor( return new DeserializedSimpleFunctionDescriptor(
containingDeclaration, containingDeclaration,
null, null,