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

Rename ClassResolver -> DescriptorFinder

Browse Source 
Avoid clash with JavaDescriptorResolver naming conventions
This commit is contained in:
Pavel V. Talanov
2013-07-01 20:14:20 +04:00
committed by Alexander Udalov
parent c3a44e37ba
commit c3b1716e29
11 changed files with 56 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/descriptors/serialization/AbstractDescriptorSerializationTest.java
+12 -12
View File
@@ -134,10 +134,10 @@ public abstract class AbstractDescriptorSerializationTest extends KotlinTestWith
}
NamespaceDescriptorImpl namespace = createTestNamespace();
ClassResolver javaClassResolver = new JavaClassResolver(javaDescriptorResolver);
DescriptorFinder javaDescriptorFinder = new JavaDescriptorFinder(javaDescriptorResolver);
ClassResolverImpl classResolver = new ClassResolverImpl(
javaClassResolver, namespace,
DescriptorFinderImpl descriptorFinder = new DescriptorFinderImpl(
javaDescriptorFinder, namespace,
new NullableFunction<String, ClassMetadata>() {
@Nullable
@Override
@@ -150,7 +150,7 @@ public abstract class AbstractDescriptorSerializationTest extends KotlinTestWith
for (ClassDescriptor classDescriptor : classes) {
ClassId classId = new ClassId(DescriptorUtils.getFQName(classDescriptor.getContainingDeclaration()).toSafe(),
FqNameUnsafe.topLevel(classDescriptor.getName()));
ClassDescriptor descriptor = classResolver.findClass(classId);
ClassDescriptor descriptor = descriptorFinder.findClass(classId);
assert descriptor != null : "Class not loaded: " + classId;
if (descriptor.getKind().isObject()) {
namespace.getMemberScope().addObjectDescriptor(descriptor);
@@ -172,7 +172,7 @@ public abstract class AbstractDescriptorSerializationTest extends KotlinTestWith
DescriptorDeserializer deserializer =
DescriptorDeserializer.create(new LockBasedStorageManager(), namespace, new NameResolver(simpleNames, qualifiedNames),
classResolver, UNSUPPORTED);
descriptorFinder, UNSUPPORTED);
for (ProtoBuf.Callable proto : callableProtos) {
CallableMemberDescriptor descriptor = deserializer.loadCallable(proto);
if (descriptor instanceof FunctionDescriptor) {
@@ -282,16 +282,16 @@ public abstract class AbstractDescriptorSerializationTest extends KotlinTestWith
}
}
private static class ClassResolverImpl implements ClassResolver {
private final ClassResolver parentResolver;
private static class DescriptorFinderImpl implements DescriptorFinder {
private final DescriptorFinder parentResolver;
private final DeclarationDescriptor parentForClasses;
private final NullableFunction<String, ClassMetadata> classMetadata;
private final MemoizedFunctionToNullable<ClassId, ClassDescriptor> classes;
public ClassResolverImpl(
@NotNull ClassResolver parentResolver,
public DescriptorFinderImpl(
@NotNull DescriptorFinder parentResolver,
@NotNull DeclarationDescriptor parentForClasses,
@NotNull NullableFunction<String, ClassMetadata> classMetadata
) {
@@ -306,7 +306,7 @@ public abstract class AbstractDescriptorSerializationTest extends KotlinTestWith
@Override
protected ClassDescriptor doCompute(@NotNull ClassId classId) {
DeclarationDescriptor containingDeclaration =
classId.isTopLevelClass() ? ClassResolverImpl.this.parentForClasses : findClass(classId.getOuterClassId());
classId.isTopLevelClass() ? DescriptorFinderImpl.this.parentForClasses : findClass(classId.getOuterClassId());
assert containingDeclaration != null : "Containing declaration not found: " + classId.getOuterClassId();
return resolveClass(containingDeclaration, classId);
}
@@ -338,10 +338,10 @@ public abstract class AbstractDescriptorSerializationTest extends KotlinTestWith
}
}
private static class JavaClassResolver implements ClassResolver {
private static class JavaDescriptorFinder implements DescriptorFinder {
private final JavaDescriptorResolver javaDescriptorResolver;
public JavaClassResolver(JavaDescriptorResolver javaDescriptorResolver) {
public JavaDescriptorFinder(JavaDescriptorResolver javaDescriptorResolver) {
this.javaDescriptorResolver = javaDescriptorResolver;
}
compiler/tests/org/jetbrains/jet/descriptors/serialization/BuiltinsDeserializationTest.java
+5 -5
View File
@@ -80,7 +80,7 @@ public class BuiltinsDeserializationTest extends KotlinTestWithEnvironment {
final NameResolver nameResolver = NameSerializationUtil.createNameResolver(serializer.getNameTable());
ClassResolver classResolver = new AbstractClassResolver(new LockBasedStorageManager(), AnnotationDeserializer.UNSUPPORTED) {
DescriptorFinder descriptorFinder = new AbstractDescriptorFinder(new LockBasedStorageManager(), AnnotationDeserializer.UNSUPPORTED) {
@NotNull
@Override
@@ -120,10 +120,10 @@ public class BuiltinsDeserializationTest extends KotlinTestWithEnvironment {
// Make the lazy loader create classes
for (ClassId classId : classProtos.keySet()) {
classResolver.findClass(classId);
descriptorFinder.findClass(classId);
}
deserializeCallables(callableProtos, actualNamespace, nameResolver, classResolver);
deserializeCallables(callableProtos, actualNamespace, nameResolver, descriptorFinder);
actualNamespace.getMemberScope().changeLockLevel(WritableScope.LockLevel.READING);
return actualNamespace;
@@ -163,11 +163,11 @@ public class BuiltinsDeserializationTest extends KotlinTestWithEnvironment {
List<ProtoBuf.Callable> callableProtos,
NamespaceDescriptorImpl actualNamespace,
NameResolver nameResolver,
ClassResolver classResolver
DescriptorFinder descriptorFinder
) {
DescriptorDeserializer descriptorDeserializer;
descriptorDeserializer =
DescriptorDeserializer.create(new LockBasedStorageManager(), actualNamespace, nameResolver, classResolver, AnnotationDeserializer.UNSUPPORTED);
DescriptorDeserializer.create(new LockBasedStorageManager(), actualNamespace, nameResolver, descriptorFinder, AnnotationDeserializer.UNSUPPORTED);
for (ProtoBuf.Callable callableProto : callableProtos) {
CallableMemberDescriptor callableMemberDescriptor = descriptorDeserializer.loadCallable(callableProto);
if (callableMemberDescriptor instanceof PropertyDescriptor) {
compiler/tests/org/jetbrains/jet/descriptors/serialization/WriteSerializedInfoTest.java
+4 -4
View File
@@ -54,18 +54,18 @@ public class WriteSerializedInfoTest extends CodegenTestCase {
assertTrue(aClass.isAnnotationPresent(KotlinInfo.class));
KotlinInfo kotlinInfo = (KotlinInfo) aClass.getAnnotation(KotlinInfo.class);
AbstractClassResolver classResolver = new KotlinInfoBasedClassResolver(kotlinInfo);
AbstractDescriptorFinder descriptorFinder = new KotlinInfoBasedDescriptorFinder(kotlinInfo);
ClassDescriptor descriptor = classResolver.findClass(new ClassId(NAMESPACE_NAME, CLASS_NAME));
ClassDescriptor descriptor = descriptorFinder.findClass(new ClassId(NAMESPACE_NAME, CLASS_NAME));
assertNotNull(descriptor);
assertEquals(CLASS_NAME.asString(), descriptor.getName().asString());
}
private static class KotlinInfoBasedClassResolver extends AbstractClassResolver {
private static class KotlinInfoBasedDescriptorFinder extends AbstractDescriptorFinder {
private final ClassData classData;
private final NamespaceDescriptorImpl namespace;
public KotlinInfoBasedClassResolver(@NotNull KotlinInfo kotlinInfo) throws IOException {
public KotlinInfoBasedDescriptorFinder(@NotNull KotlinInfo kotlinInfo) throws IOException {
super(new LockBasedStorageManager(), AnnotationDeserializer.UNSUPPORTED);
this.classData = ClassSerializationUtil.readClassDataFrom(kotlinInfo.data());