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

Minor. Renamed annotationDeserializer → deserializers.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2014-03-31 22:38:09 +04:00
parent dadc8351b6
commit 04a6b10f7a
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaDescriptorResolver.java
+1 -1
View File
@@ -104,7 +104,7 @@ public class InjectorForJavaDescriptorResolver {
psiBasedMethodSignatureChecker.setExternalAnnotationResolver(psiBasedExternalAnnotationResolver); psiBasedMethodSignatureChecker.setExternalAnnotationResolver(psiBasedExternalAnnotationResolver);
psiBasedMethodSignatureChecker.setExternalSignatureResolver(traceBasedExternalSignatureResolver); psiBasedMethodSignatureChecker.setExternalSignatureResolver(traceBasedExternalSignatureResolver);
deserializedDescriptorResolver.setAnnotationDeserializer(descriptorDeserializers); deserializedDescriptorResolver.setDeserializers(descriptorDeserializers);
deserializedDescriptorResolver.setErrorReporter(traceBasedErrorReporter); deserializedDescriptorResolver.setErrorReporter(traceBasedErrorReporter);
deserializedDescriptorResolver.setJavaDescriptorResolver(javaDescriptorResolver); deserializedDescriptorResolver.setJavaDescriptorResolver(javaDescriptorResolver);
deserializedDescriptorResolver.setJavaPackageFragmentProvider(lazyJavaPackageFragmentProvider); deserializedDescriptorResolver.setJavaPackageFragmentProvider(lazyJavaPackageFragmentProvider);
compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForLazyResolveWithJava.java
+1 -1
View File
@@ -224,7 +224,7 @@ public class InjectorForLazyResolveWithJava {
jetImportsFactory.setProject(project); jetImportsFactory.setProject(project);
deserializedDescriptorResolver.setAnnotationDeserializer(descriptorDeserializers); deserializedDescriptorResolver.setDeserializers(descriptorDeserializers);
deserializedDescriptorResolver.setErrorReporter(traceBasedErrorReporter); deserializedDescriptorResolver.setErrorReporter(traceBasedErrorReporter);
deserializedDescriptorResolver.setJavaDescriptorResolver(javaDescriptorResolver); deserializedDescriptorResolver.setJavaDescriptorResolver(javaDescriptorResolver);
deserializedDescriptorResolver.setJavaPackageFragmentProvider(lazyJavaPackageFragmentProvider); deserializedDescriptorResolver.setJavaPackageFragmentProvider(lazyJavaPackageFragmentProvider);
compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java
+1 -1
View File
@@ -304,7 +304,7 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly
typeHierarchyResolver.setScriptHeaderResolver(scriptHeaderResolver); typeHierarchyResolver.setScriptHeaderResolver(scriptHeaderResolver);
typeHierarchyResolver.setTrace(bindingTrace); typeHierarchyResolver.setTrace(bindingTrace);
deserializedDescriptorResolver.setAnnotationDeserializer(descriptorDeserializers); deserializedDescriptorResolver.setDeserializers(descriptorDeserializers);
deserializedDescriptorResolver.setErrorReporter(traceBasedErrorReporter); deserializedDescriptorResolver.setErrorReporter(traceBasedErrorReporter);
deserializedDescriptorResolver.setJavaDescriptorResolver(javaDescriptorResolver); deserializedDescriptorResolver.setJavaDescriptorResolver(javaDescriptorResolver);
deserializedDescriptorResolver.setJavaPackageFragmentProvider(lazyJavaPackageFragmentProvider); deserializedDescriptorResolver.setJavaPackageFragmentProvider(lazyJavaPackageFragmentProvider);
compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/DescriptorDeserializer.java
+4 -4
View File
@@ -46,12 +46,12 @@ public class DescriptorDeserializer {
@NotNull DeclarationDescriptor containingDeclaration, @NotNull DeclarationDescriptor containingDeclaration,
@NotNull NameResolver nameResolver, @NotNull NameResolver nameResolver,
@NotNull DescriptorFinder descriptorFinder, @NotNull DescriptorFinder descriptorFinder,
@NotNull Deserializers annotationDeserializer @NotNull Deserializers deserializers
) { ) {
return new DescriptorDeserializer(storageManager, return new DescriptorDeserializer(storageManager,
new TypeDeserializer(storageManager, null, nameResolver, descriptorFinder, new TypeDeserializer(storageManager, null, nameResolver, descriptorFinder,
"Deserializer for " + containingDeclaration.getName(), NONE), "Deserializer for " + containingDeclaration.getName(), NONE),
containingDeclaration, nameResolver, annotationDeserializer); containingDeclaration, nameResolver, deserializers);
} }
@NotNull @NotNull
@@ -60,9 +60,9 @@ public class DescriptorDeserializer {
@NotNull TypeDeserializer typeDeserializer, @NotNull TypeDeserializer typeDeserializer,
@NotNull DeclarationDescriptor containingDeclaration, @NotNull DeclarationDescriptor containingDeclaration,
@NotNull NameResolver nameResolver, @NotNull NameResolver nameResolver,
@NotNull Deserializers annotationDeserializer @NotNull Deserializers deserializers
) { ) {
return new DescriptorDeserializer(storageManager, typeDeserializer, containingDeclaration, nameResolver, annotationDeserializer); return new DescriptorDeserializer(storageManager, typeDeserializer, containingDeclaration, nameResolver, deserializers);
} }
private final DeclarationDescriptor containingDeclaration; private final DeclarationDescriptor containingDeclaration;
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DeserializedDescriptorResolver.java
+5 -5
View File
@@ -44,7 +44,7 @@ import static org.jetbrains.jet.lang.resolve.kotlin.header.KotlinClassHeader.Kin
import static org.jetbrains.jet.lang.resolve.kotlin.header.KotlinClassHeader.Kind.PACKAGE_FACADE; import static org.jetbrains.jet.lang.resolve.kotlin.header.KotlinClassHeader.Kind.PACKAGE_FACADE;
public final class DeserializedDescriptorResolver { public final class DeserializedDescriptorResolver {
private DescriptorDeserializers annotationDeserializer; private DescriptorDeserializers deserializers;
private MemberFilter memberFilter; private MemberFilter memberFilter;
@@ -72,8 +72,8 @@ public final class DeserializedDescriptorResolver {
}; };
@Inject @Inject
public void setAnnotationDeserializer(DescriptorDeserializers annotationDeserializer) { public void setDeserializers(DescriptorDeserializers deserializers) {
this.annotationDeserializer = annotationDeserializer; this.deserializers = deserializers;
} }
@Inject @Inject
@@ -106,7 +106,7 @@ public final class DeserializedDescriptorResolver {
String[] data = readData(kotlinClass, CLASS); String[] data = readData(kotlinClass, CLASS);
if (data != null) { if (data != null) {
ClassData classData = JavaProtoBufUtil.readClassDataFrom(data); ClassData classData = JavaProtoBufUtil.readClassDataFrom(data);
return new DeserializedClassDescriptor(storageManager, annotationDeserializer, javaDescriptorFinder, return new DeserializedClassDescriptor(storageManager, deserializers, javaDescriptorFinder,
javaPackageFragmentProvider, classData.getNameResolver(), classData.getClassProto()); javaPackageFragmentProvider, classData.getNameResolver(), classData.getClassProto());
} }
return null; return null;
@@ -116,7 +116,7 @@ public final class DeserializedDescriptorResolver {
public JetScope createKotlinPackageScope(@NotNull PackageFragmentDescriptor descriptor, @NotNull KotlinJvmBinaryClass kotlinClass) { public JetScope createKotlinPackageScope(@NotNull PackageFragmentDescriptor descriptor, @NotNull KotlinJvmBinaryClass kotlinClass) {
String[] data = readData(kotlinClass, PACKAGE_FACADE); String[] data = readData(kotlinClass, PACKAGE_FACADE);
if (data != null) { if (data != null) {
return new DeserializedPackageMemberScope(storageManager, descriptor, annotationDeserializer, return new DeserializedPackageMemberScope(storageManager, descriptor, deserializers,
memberFilter, javaDescriptorFinder, JavaProtoBufUtil.readPackageDataFrom(data)); memberFilter, javaDescriptorFinder, JavaProtoBufUtil.readPackageDataFrom(data));
} }
return null; return null;