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

Rename: DescriptorDeserializersStorage -> DescriptorLoadersStorage

Browse Source
This commit is contained in:
Pavel V. Talanov
2014-06-20 17:42:50 +04:00
parent b08cda8dd6
commit b2c3a7d501
9 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaDescriptorResolver.java
+7 -7
View File
@@ -36,7 +36,7 @@ import org.jetbrains.jet.lang.resolve.kotlin.DeserializedDescriptorResolver;
import org.jetbrains.jet.lang.resolve.kotlin.DeserializationGlobalContextForJava; import org.jetbrains.jet.lang.resolve.kotlin.DeserializationGlobalContextForJava;
import org.jetbrains.jet.lang.resolve.kotlin.JavaClassDataFinder; import org.jetbrains.jet.lang.resolve.kotlin.JavaClassDataFinder;
import org.jetbrains.jet.lang.resolve.kotlin.AnnotationDescriptorLoader; import org.jetbrains.jet.lang.resolve.kotlin.AnnotationDescriptorLoader;
import org.jetbrains.jet.lang.resolve.kotlin.DescriptorDeserializersStorage; import org.jetbrains.jet.lang.resolve.kotlin.DescriptorLoadersStorage;
import org.jetbrains.jet.lang.resolve.kotlin.ConstantDescriptorLoader; import org.jetbrains.jet.lang.resolve.kotlin.ConstantDescriptorLoader;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import javax.annotation.PreDestroy; import javax.annotation.PreDestroy;
@@ -65,7 +65,7 @@ public class InjectorForJavaDescriptorResolver {
private final DeserializationGlobalContextForJava deserializationGlobalContextForJava; private final DeserializationGlobalContextForJava deserializationGlobalContextForJava;
private final JavaClassDataFinder javaClassDataFinder; private final JavaClassDataFinder javaClassDataFinder;
private final AnnotationDescriptorLoader annotationDescriptorLoader; private final AnnotationDescriptorLoader annotationDescriptorLoader;
private final DescriptorDeserializersStorage descriptorDeserializersStorage; private final DescriptorLoadersStorage descriptorLoadersStorage;
private final ConstantDescriptorLoader constantDescriptorLoader; private final ConstantDescriptorLoader constantDescriptorLoader;
public InjectorForJavaDescriptorResolver( public InjectorForJavaDescriptorResolver(
@@ -93,7 +93,7 @@ public class InjectorForJavaDescriptorResolver {
this.annotationDescriptorLoader = new AnnotationDescriptorLoader(); this.annotationDescriptorLoader = new AnnotationDescriptorLoader();
this.constantDescriptorLoader = new ConstantDescriptorLoader(); this.constantDescriptorLoader = new ConstantDescriptorLoader();
this.deserializationGlobalContextForJava = new DeserializationGlobalContextForJava(lockBasedStorageManager, getModule(), javaClassDataFinder, annotationDescriptorLoader, constantDescriptorLoader, lazyJavaPackageFragmentProvider); this.deserializationGlobalContextForJava = new DeserializationGlobalContextForJava(lockBasedStorageManager, getModule(), javaClassDataFinder, annotationDescriptorLoader, constantDescriptorLoader, lazyJavaPackageFragmentProvider);
this.descriptorDeserializersStorage = new DescriptorDeserializersStorage(lockBasedStorageManager); this.descriptorLoadersStorage = new DescriptorLoadersStorage(lockBasedStorageManager);
this.javaClassFinder.setProject(project); this.javaClassFinder.setProject(project);
@@ -114,14 +114,14 @@ public class InjectorForJavaDescriptorResolver {
annotationDescriptorLoader.setErrorReporter(traceBasedErrorReporter); annotationDescriptorLoader.setErrorReporter(traceBasedErrorReporter);
annotationDescriptorLoader.setKotlinClassFinder(virtualFileFinder); annotationDescriptorLoader.setKotlinClassFinder(virtualFileFinder);
annotationDescriptorLoader.setModule(module); annotationDescriptorLoader.setModule(module);
annotationDescriptorLoader.setStorage(descriptorDeserializersStorage); annotationDescriptorLoader.setStorage(descriptorLoadersStorage);
descriptorDeserializersStorage.setErrorReporter(traceBasedErrorReporter); descriptorLoadersStorage.setErrorReporter(traceBasedErrorReporter);
descriptorDeserializersStorage.setModule(module); descriptorLoadersStorage.setModule(module);
constantDescriptorLoader.setErrorReporter(traceBasedErrorReporter); constantDescriptorLoader.setErrorReporter(traceBasedErrorReporter);
constantDescriptorLoader.setKotlinClassFinder(virtualFileFinder); constantDescriptorLoader.setKotlinClassFinder(virtualFileFinder);
constantDescriptorLoader.setStorage(descriptorDeserializersStorage); constantDescriptorLoader.setStorage(descriptorLoadersStorage);
javaClassFinder.initialize(); javaClassFinder.initialize();
compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForLazyResolveWithJava.java
+7 -7
View File
@@ -58,7 +58,7 @@ import org.jetbrains.jet.lang.resolve.kotlin.DeserializedDescriptorResolver;
import org.jetbrains.jet.lang.resolve.kotlin.DeserializationGlobalContextForJava; import org.jetbrains.jet.lang.resolve.kotlin.DeserializationGlobalContextForJava;
import org.jetbrains.jet.lang.resolve.kotlin.JavaClassDataFinder; import org.jetbrains.jet.lang.resolve.kotlin.JavaClassDataFinder;
import org.jetbrains.jet.lang.resolve.kotlin.AnnotationDescriptorLoader; import org.jetbrains.jet.lang.resolve.kotlin.AnnotationDescriptorLoader;
import org.jetbrains.jet.lang.resolve.kotlin.DescriptorDeserializersStorage; import org.jetbrains.jet.lang.resolve.kotlin.DescriptorLoadersStorage;
import org.jetbrains.jet.lang.resolve.kotlin.ConstantDescriptorLoader; import org.jetbrains.jet.lang.resolve.kotlin.ConstantDescriptorLoader;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import javax.annotation.PreDestroy; import javax.annotation.PreDestroy;
@@ -109,7 +109,7 @@ public class InjectorForLazyResolveWithJava {
private final DeserializationGlobalContextForJava deserializationGlobalContextForJava; private final DeserializationGlobalContextForJava deserializationGlobalContextForJava;
private final JavaClassDataFinder javaClassDataFinder; private final JavaClassDataFinder javaClassDataFinder;
private final AnnotationDescriptorLoader annotationDescriptorLoader; private final AnnotationDescriptorLoader annotationDescriptorLoader;
private final DescriptorDeserializersStorage descriptorDeserializersStorage; private final DescriptorLoadersStorage descriptorLoadersStorage;
private final ConstantDescriptorLoader constantDescriptorLoader; private final ConstantDescriptorLoader constantDescriptorLoader;
public InjectorForLazyResolveWithJava( public InjectorForLazyResolveWithJava(
@@ -161,7 +161,7 @@ public class InjectorForLazyResolveWithJava {
this.annotationDescriptorLoader = new AnnotationDescriptorLoader(); this.annotationDescriptorLoader = new AnnotationDescriptorLoader();
this.constantDescriptorLoader = new ConstantDescriptorLoader(); this.constantDescriptorLoader = new ConstantDescriptorLoader();
this.deserializationGlobalContextForJava = new DeserializationGlobalContextForJava(lockBasedStorageManager, getModule(), javaClassDataFinder, annotationDescriptorLoader, constantDescriptorLoader, lazyJavaPackageFragmentProvider); this.deserializationGlobalContextForJava = new DeserializationGlobalContextForJava(lockBasedStorageManager, getModule(), javaClassDataFinder, annotationDescriptorLoader, constantDescriptorLoader, lazyJavaPackageFragmentProvider);
this.descriptorDeserializersStorage = new DescriptorDeserializersStorage(lockBasedStorageManager); this.descriptorLoadersStorage = new DescriptorLoadersStorage(lockBasedStorageManager);
this.resolveSession.setAnnotationResolve(annotationResolver); this.resolveSession.setAnnotationResolve(annotationResolver);
this.resolveSession.setDescriptorResolver(descriptorResolver); this.resolveSession.setDescriptorResolver(descriptorResolver);
@@ -244,14 +244,14 @@ public class InjectorForLazyResolveWithJava {
annotationDescriptorLoader.setErrorReporter(traceBasedErrorReporter); annotationDescriptorLoader.setErrorReporter(traceBasedErrorReporter);
annotationDescriptorLoader.setKotlinClassFinder(virtualFileFinder); annotationDescriptorLoader.setKotlinClassFinder(virtualFileFinder);
annotationDescriptorLoader.setModule(module); annotationDescriptorLoader.setModule(module);
annotationDescriptorLoader.setStorage(descriptorDeserializersStorage); annotationDescriptorLoader.setStorage(descriptorLoadersStorage);
descriptorDeserializersStorage.setErrorReporter(traceBasedErrorReporter); descriptorLoadersStorage.setErrorReporter(traceBasedErrorReporter);
descriptorDeserializersStorage.setModule(module); descriptorLoadersStorage.setModule(module);
constantDescriptorLoader.setErrorReporter(traceBasedErrorReporter); constantDescriptorLoader.setErrorReporter(traceBasedErrorReporter);
constantDescriptorLoader.setKotlinClassFinder(virtualFileFinder); constantDescriptorLoader.setKotlinClassFinder(virtualFileFinder);
constantDescriptorLoader.setStorage(descriptorDeserializersStorage); constantDescriptorLoader.setStorage(descriptorLoadersStorage);
javaClassFinder.initialize(); javaClassFinder.initialize();
compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java
+7 -7
View File
@@ -68,7 +68,7 @@ import org.jetbrains.jet.lang.resolve.java.lazy.GlobalJavaResolverContext;
import org.jetbrains.jet.lang.resolve.kotlin.DeserializedDescriptorResolver; import org.jetbrains.jet.lang.resolve.kotlin.DeserializedDescriptorResolver;
import org.jetbrains.jet.lang.resolve.kotlin.JavaClassDataFinder; import org.jetbrains.jet.lang.resolve.kotlin.JavaClassDataFinder;
import org.jetbrains.jet.lang.resolve.kotlin.AnnotationDescriptorLoader; import org.jetbrains.jet.lang.resolve.kotlin.AnnotationDescriptorLoader;
import org.jetbrains.jet.lang.resolve.kotlin.DescriptorDeserializersStorage; import org.jetbrains.jet.lang.resolve.kotlin.DescriptorLoadersStorage;
import org.jetbrains.jet.lang.resolve.kotlin.ConstantDescriptorLoader; import org.jetbrains.jet.lang.resolve.kotlin.ConstantDescriptorLoader;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import javax.annotation.PreDestroy; import javax.annotation.PreDestroy;
@@ -129,7 +129,7 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly
private final DeserializedDescriptorResolver deserializedDescriptorResolver; private final DeserializedDescriptorResolver deserializedDescriptorResolver;
private final JavaClassDataFinder javaClassDataFinder; private final JavaClassDataFinder javaClassDataFinder;
private final AnnotationDescriptorLoader annotationDescriptorLoader; private final AnnotationDescriptorLoader annotationDescriptorLoader;
private final DescriptorDeserializersStorage descriptorDeserializersStorage; private final DescriptorLoadersStorage descriptorLoadersStorage;
private final ConstantDescriptorLoader constantDescriptorLoader; private final ConstantDescriptorLoader constantDescriptorLoader;
public InjectorForTopDownAnalyzerForJvm( public InjectorForTopDownAnalyzerForJvm(
@@ -191,7 +191,7 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly
this.overrideResolver = new OverrideResolver(); this.overrideResolver = new OverrideResolver();
this.typeHierarchyResolver = new TypeHierarchyResolver(); this.typeHierarchyResolver = new TypeHierarchyResolver();
this.scriptHeaderResolver = new ScriptHeaderResolver(); this.scriptHeaderResolver = new ScriptHeaderResolver();
this.descriptorDeserializersStorage = new DescriptorDeserializersStorage(storageManager); this.descriptorLoadersStorage = new DescriptorLoadersStorage(storageManager);
this.topDownAnalyzer.setBodyResolver(bodyResolver); this.topDownAnalyzer.setBodyResolver(bodyResolver);
this.topDownAnalyzer.setDeclarationResolver(declarationResolver); this.topDownAnalyzer.setDeclarationResolver(declarationResolver);
@@ -324,14 +324,14 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly
annotationDescriptorLoader.setErrorReporter(traceBasedErrorReporter); annotationDescriptorLoader.setErrorReporter(traceBasedErrorReporter);
annotationDescriptorLoader.setKotlinClassFinder(virtualFileFinder); annotationDescriptorLoader.setKotlinClassFinder(virtualFileFinder);
annotationDescriptorLoader.setModule(moduleDescriptor); annotationDescriptorLoader.setModule(moduleDescriptor);
annotationDescriptorLoader.setStorage(descriptorDeserializersStorage); annotationDescriptorLoader.setStorage(descriptorLoadersStorage);
descriptorDeserializersStorage.setErrorReporter(traceBasedErrorReporter); descriptorLoadersStorage.setErrorReporter(traceBasedErrorReporter);
descriptorDeserializersStorage.setModule(moduleDescriptor); descriptorLoadersStorage.setModule(moduleDescriptor);
constantDescriptorLoader.setErrorReporter(traceBasedErrorReporter); constantDescriptorLoader.setErrorReporter(traceBasedErrorReporter);
constantDescriptorLoader.setKotlinClassFinder(virtualFileFinder); constantDescriptorLoader.setKotlinClassFinder(virtualFileFinder);
constantDescriptorLoader.setStorage(descriptorDeserializersStorage); constantDescriptorLoader.setStorage(descriptorLoadersStorage);
javaClassFinder.initialize(); javaClassFinder.initialize();
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/AnnotationDescriptorLoader.java
+2 -2
View File
@@ -46,7 +46,7 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import static org.jetbrains.jet.lang.resolve.kotlin.DescriptorDeserializersStorage.MemberSignature; import static org.jetbrains.jet.lang.resolve.kotlin.DescriptorLoadersStorage.MemberSignature;
import static org.jetbrains.jet.lang.resolve.kotlin.DeserializedResolverUtils.javaFqNameToKotlinFqName; import static org.jetbrains.jet.lang.resolve.kotlin.DeserializedResolverUtils.javaFqNameToKotlinFqName;
public class AnnotationDescriptorLoader extends BaseDescriptorLoader implements AnnotationLoader { public class AnnotationDescriptorLoader extends BaseDescriptorLoader implements AnnotationLoader {
@@ -60,7 +60,7 @@ public class AnnotationDescriptorLoader extends BaseDescriptorLoader implements
@Inject @Inject
@Override @Override
public void setStorage(@NotNull DescriptorDeserializersStorage storage) { public void setStorage(@NotNull DescriptorLoadersStorage storage) {
this.storage = storage; this.storage = storage;
} }
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/BaseDescriptorLoader.java
+3 -3
View File
@@ -33,7 +33,7 @@ import org.jetbrains.jet.lang.resolve.name.Name;
import static org.jetbrains.jet.lang.resolve.DescriptorUtils.isClassObject; import static org.jetbrains.jet.lang.resolve.DescriptorUtils.isClassObject;
import static org.jetbrains.jet.lang.resolve.DescriptorUtils.isTrait; import static org.jetbrains.jet.lang.resolve.DescriptorUtils.isTrait;
import static org.jetbrains.jet.lang.resolve.kotlin.DescriptorDeserializersStorage.MemberSignature; import static org.jetbrains.jet.lang.resolve.kotlin.DescriptorLoadersStorage.MemberSignature;
import static org.jetbrains.jet.lang.resolve.kotlin.DeserializedResolverUtils.kotlinFqNameToJavaFqName; import static org.jetbrains.jet.lang.resolve.kotlin.DeserializedResolverUtils.kotlinFqNameToJavaFqName;
import static org.jetbrains.jet.lang.resolve.kotlin.DeserializedResolverUtils.naiveKotlinFqName; import static org.jetbrains.jet.lang.resolve.kotlin.DeserializedResolverUtils.naiveKotlinFqName;
@@ -41,13 +41,13 @@ public abstract class BaseDescriptorLoader {
protected KotlinClassFinder kotlinClassFinder; protected KotlinClassFinder kotlinClassFinder;
protected ErrorReporter errorReporter; protected ErrorReporter errorReporter;
protected DescriptorDeserializersStorage storage; protected DescriptorLoadersStorage storage;
public abstract void setKotlinClassFinder(@NotNull KotlinClassFinder kotlinClassFinder); public abstract void setKotlinClassFinder(@NotNull KotlinClassFinder kotlinClassFinder);
public abstract void setErrorReporter(@NotNull ErrorReporter errorReporter); public abstract void setErrorReporter(@NotNull ErrorReporter errorReporter);
public abstract void setStorage(@NotNull DescriptorDeserializersStorage storage); public abstract void setStorage(@NotNull DescriptorLoadersStorage storage);
@Nullable @Nullable
protected static MemberSignature getCallableSignature( protected static MemberSignature getCallableSignature(
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/ConstantDescriptorLoader.java
+2 -2
View File
@@ -28,12 +28,12 @@ import org.jetbrains.jet.lang.resolve.java.resolver.ErrorReporter;
import javax.inject.Inject; import javax.inject.Inject;
import static org.jetbrains.jet.lang.resolve.kotlin.DescriptorDeserializersStorage.MemberSignature; import static org.jetbrains.jet.lang.resolve.kotlin.DescriptorLoadersStorage.MemberSignature;
public class ConstantDescriptorLoader extends BaseDescriptorLoader implements ConstantLoader { public class ConstantDescriptorLoader extends BaseDescriptorLoader implements ConstantLoader {
@Inject @Inject
@Override @Override
public void setStorage(@NotNull DescriptorDeserializersStorage storage) { public void setStorage(@NotNull DescriptorLoadersStorage storage) {
this.storage = storage; this.storage = storage;
} }
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DescriptorDeserializersStorage.java → core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DescriptorLoadersStorage.java
+2 -2
View File
@@ -33,13 +33,13 @@ import javax.inject.Inject;
import java.io.IOException; import java.io.IOException;
import java.util.*; import java.util.*;
public class DescriptorDeserializersStorage { public class DescriptorLoadersStorage {
private ErrorReporter errorReporter; private ErrorReporter errorReporter;
private ModuleDescriptor module; private ModuleDescriptor module;
private final MemoizedFunctionToNotNull<KotlinJvmBinaryClass, Storage> storage; private final MemoizedFunctionToNotNull<KotlinJvmBinaryClass, Storage> storage;
public DescriptorDeserializersStorage(@NotNull StorageManager storageManager) { public DescriptorLoadersStorage(@NotNull StorageManager storageManager) {
this.storage = storageManager.createMemoizedFunction( this.storage = storageManager.createMemoizedFunction(
new Function1<KotlinJvmBinaryClass, Storage>() { new Function1<KotlinJvmBinaryClass, Storage>() {
@NotNull @NotNull
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/SignatureDeserializer.java
+2 -2
View File
@@ -48,8 +48,8 @@ public class SignatureDeserializer {
} }
@NotNull @NotNull
public DescriptorDeserializersStorage.MemberSignature methodSignature(@NotNull JavaProtoBuf.JavaMethodSignature signature) { public DescriptorLoadersStorage.MemberSignature methodSignature(@NotNull JavaProtoBuf.JavaMethodSignature signature) {
return DescriptorDeserializersStorage.MemberSignature.fromMethodNameAndDesc(methodSignatureString(signature)); return DescriptorLoadersStorage.MemberSignature.fromMethodNameAndDesc(methodSignatureString(signature));
} }
@NotNull @NotNull
idea/src/org/jetbrains/jet/plugin/libraries/DeserializerForDecompiler.kt
+6 -6
View File
@@ -36,7 +36,7 @@ import org.jetbrains.jet.lang.resolve.java.PackageClassUtils
import com.intellij.openapi.diagnostic.Logger import com.intellij.openapi.diagnostic.Logger
import org.jetbrains.jet.lang.resolve.kotlin.KotlinClassFinder import org.jetbrains.jet.lang.resolve.kotlin.KotlinClassFinder
import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe
import org.jetbrains.jet.lang.resolve.kotlin.DescriptorDeserializersStorage import org.jetbrains.jet.lang.resolve.kotlin.DescriptorLoadersStorage
import org.jetbrains.jet.lang.resolve.kotlin.ConstantDescriptorLoader import org.jetbrains.jet.lang.resolve.kotlin.ConstantDescriptorLoader
import org.jetbrains.jet.lang.resolve.java.structure.JavaClass import org.jetbrains.jet.lang.resolve.java.structure.JavaClass
import org.jetbrains.jet.descriptors.serialization.context.DeserializationGlobalContext import org.jetbrains.jet.descriptors.serialization.context.DeserializationGlobalContext
@@ -95,10 +95,10 @@ public class DeserializerForDecompiler(val packageDirectory: VirtualFile, val di
} }
private val storageManager = LockBasedStorageManager.NO_LOCKS private val storageManager = LockBasedStorageManager.NO_LOCKS
private val deserializerStorage = DescriptorDeserializersStorage(storageManager); private val loadersStorage = DescriptorLoadersStorage(storageManager);
{ {
deserializerStorage.setModule(moduleDescriptor) loadersStorage.setModule(moduleDescriptor)
deserializerStorage.setErrorReporter(LOGGING_REPORTER) loadersStorage.setErrorReporter(LOGGING_REPORTER)
} }
private val annotationLoader = AnnotationDescriptorLoader(); private val annotationLoader = AnnotationDescriptorLoader();
@@ -106,14 +106,14 @@ public class DeserializerForDecompiler(val packageDirectory: VirtualFile, val di
annotationLoader.setModule(moduleDescriptor) annotationLoader.setModule(moduleDescriptor)
annotationLoader.setKotlinClassFinder(localClassFinder) annotationLoader.setKotlinClassFinder(localClassFinder)
annotationLoader.setErrorReporter(LOGGING_REPORTER) annotationLoader.setErrorReporter(LOGGING_REPORTER)
annotationLoader.setStorage(deserializerStorage) annotationLoader.setStorage(loadersStorage)
} }
private val constantLoader = ConstantDescriptorLoader(); private val constantLoader = ConstantDescriptorLoader();
{ {
constantLoader.setKotlinClassFinder(localClassFinder) constantLoader.setKotlinClassFinder(localClassFinder)
constantLoader.setErrorReporter(LOGGING_REPORTER) constantLoader.setErrorReporter(LOGGING_REPORTER)
constantLoader.setStorage(deserializerStorage) constantLoader.setStorage(loadersStorage)
} }
private val classDataFinder = object : ClassDataFinder { private val classDataFinder = object : ClassDataFinder {