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

Implement getNamespace() for deserialized scope

Browse Source 
DescriptorFinder now can find packages, pull the method up from
AbstractDescriptorFinder class
This commit is contained in:
Alexander Udalov
2013-07-09 16:00:07 +04:00
parent d90b764534
commit b44bc620e0
8 changed files with 44 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DeserializedDescriptorResolver.java
+6
View File
@@ -66,6 +66,12 @@ public final class DeserializedDescriptorResolver {
public ClassDescriptor findClass(@NotNull ClassId classId) {
return javaClassResolver.resolveClass(kotlinFqNameToJavaFqName(classId.asSingleFqName()));
}
@Nullable
@Override
public NamespaceDescriptor findPackage(@NotNull FqName name) {
return javaNamespaceResolver.resolveNamespace(name);
}
};
@Inject
compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/AbstractDescriptorFinder.java
+1 -6
View File
@@ -23,10 +23,8 @@ import org.jetbrains.jet.descriptors.serialization.descriptors.AnnotationDeseria
import org.jetbrains.jet.descriptors.serialization.descriptors.DeserializedClassDescriptor;
import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor;
import org.jetbrains.jet.lang.resolve.lazy.storage.MemoizedFunctionToNullable;
import org.jetbrains.jet.lang.resolve.lazy.storage.StorageManager;
import org.jetbrains.jet.lang.resolve.name.FqName;
import static org.jetbrains.jet.lang.resolve.lazy.storage.StorageManager.ReferenceKind.STRONG;
@@ -52,7 +50,7 @@ public abstract class AbstractDescriptorFinder implements DescriptorFinder {
ProtoBuf.Class classProto = classData.getClassProto();
DeclarationDescriptor owner =
classId.isTopLevelClass() ? getPackage(classId.getPackageFqName()) : findClass(classId.getOuterClassId());
classId.isTopLevelClass() ? findPackage(classId.getPackageFqName()) : findClass(classId.getOuterClassId());
assert owner != null : "No owner found for " + classId;
AbstractDescriptorFinder _this = AbstractDescriptorFinder.this;
@@ -74,8 +72,5 @@ public abstract class AbstractDescriptorFinder implements DescriptorFinder {
@Nullable
protected abstract ClassData getClassData(@NotNull ClassId classId);
@NotNull
protected abstract NamespaceDescriptor getPackage(@NotNull FqName fqName);
protected abstract void classDescriptorCreated(@NotNull ClassDescriptor classDescriptor);
}
compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/DescriptorFinder.java
+11 -1
View File
@@ -19,17 +19,27 @@ package org.jetbrains.jet.descriptors.serialization;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor;
import org.jetbrains.jet.lang.resolve.name.FqName;
public interface DescriptorFinder {
DescriptorFinder EMPTY = new DescriptorFinder() {
@Nullable
@Override
public ClassDescriptor findClass(@NotNull ClassId classId) {
return null;
}
@Nullable
@Override
public NamespaceDescriptor findPackage(@NotNull FqName name) {
return null;
}
};
@Nullable
ClassDescriptor findClass(@NotNull ClassId classId);
@Nullable
NamespaceDescriptor findPackage(@NotNull FqName name);
}
compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedPackageMemberScope.java
+6
View File
@@ -116,4 +116,10 @@ public abstract class DeserializedPackageMemberScope extends DeserializedMemberS
protected void addNonDeclaredDescriptors(@NotNull Collection<DeclarationDescriptor> result) {
// Do nothing
}
@Nullable
@Override
public NamespaceDescriptor getNamespace(@NotNull Name name) {
return descriptorFinder.findPackage(packageFqName.child(name));
}
}
compiler/frontend/src/org/jetbrains/jet/lang/types/lang/BuiltinsNamespaceDescriptorImpl.java
+4 -6
View File
@@ -35,8 +35,7 @@ class BuiltinsNamespaceDescriptorImpl extends AbstractNamespaceDescriptorImpl {
super(containingDeclaration, Collections.<AnnotationDescriptor>emptyList(), KotlinBuiltIns.BUILT_INS_PACKAGE_NAME);
try {
nameResolver =
NameSerializationUtil.deserializeNameResolver(getStream(BuiltInsSerializationUtil.getNameTableFilePath(this)));
nameResolver = NameSerializationUtil.deserializeNameResolver(getStream(BuiltInsSerializationUtil.getNameTableFilePath(this)));
DescriptorFinder descriptorFinder = new AbstractDescriptorFinder(storageManager, AnnotationDeserializer.UNSUPPORTED) {
@@ -66,11 +65,10 @@ class BuiltinsNamespaceDescriptorImpl extends AbstractNamespaceDescriptorImpl {
}
}
@NotNull
@Nullable
@Override
protected NamespaceDescriptor getPackage(@NotNull FqName fqName) {
assert fqName.equals(KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME) : "Wrong package: " + fqName;
return BuiltinsNamespaceDescriptorImpl.this;
public NamespaceDescriptor findPackage(@NotNull FqName fqName) {
return fqName.equals(KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME) ? BuiltinsNamespaceDescriptorImpl.this : null;
}
@Override
compiler/tests/org/jetbrains/jet/descriptors/serialization/AbstractDescriptorSerializationTest.java
+10 -3
View File
@@ -327,6 +327,12 @@ public abstract class AbstractDescriptorSerializationTest extends KotlinTestWith
public ClassDescriptor findClass(@NotNull ClassId classId) {
return classes.fun(classId);
}
@Nullable
@Override
public NamespaceDescriptor findPackage(@NotNull FqName name) {
return null;
}
}
private static class JavaDescriptorFinder implements DescriptorFinder {
@@ -345,7 +351,7 @@ public abstract class AbstractDescriptorSerializationTest extends KotlinTestWith
if (javaClassDescriptor != null) {
return javaClassDescriptor;
}
NamespaceDescriptor packageDescriptor = getNamespace(classId.getPackageFqName());
NamespaceDescriptor packageDescriptor = findPackage(classId.getPackageFqName());
if (packageDescriptor == null) {
throw new IllegalStateException("Java package not found: " + classId.getPackageFqName() + " for " + classId);
}
@@ -368,8 +374,9 @@ public abstract class AbstractDescriptorSerializationTest extends KotlinTestWith
}
@Nullable
private NamespaceDescriptor getNamespace(@NotNull FqName fqName) {
return javaDescriptorResolver.resolveNamespace(fqName);
@Override
public NamespaceDescriptor findPackage(@NotNull FqName name) {
return javaDescriptorResolver.resolveNamespace(name);
}
}
}
compiler/tests/org/jetbrains/jet/descriptors/serialization/BuiltinsDeserializationTest.java
+5 -8
View File
@@ -80,12 +80,10 @@ public class BuiltinsDeserializationTest extends KotlinTestWithEnvironment {
final NameResolver nameResolver = NameSerializationUtil.createNameResolver(serializer.getNameTable());
DescriptorFinder descriptorFinder = new AbstractDescriptorFinder(new LockBasedStorageManager(),
AnnotationDeserializer.UNSUPPORTED) {
DescriptorFinder finder = new AbstractDescriptorFinder(new LockBasedStorageManager(), AnnotationDeserializer.UNSUPPORTED) {
@NotNull
@Override
protected NamespaceDescriptor getPackage(@NotNull FqName fqName) {
public NamespaceDescriptor findPackage(@NotNull FqName fqName) {
assert fqName.equals(KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME) : "Unsupported package: " + fqName;
return actualNamespace;
}
@@ -121,10 +119,10 @@ public class BuiltinsDeserializationTest extends KotlinTestWithEnvironment {
// Make the lazy loader create classes
for (ClassId classId : classProtos.keySet()) {
descriptorFinder.findClass(classId);
finder.findClass(classId);
}
deserializeCallables(callableProtos, actualNamespace, nameResolver, descriptorFinder);
deserializeCallables(callableProtos, actualNamespace, nameResolver, finder);
actualNamespace.getMemberScope().changeLockLevel(WritableScope.LockLevel.READING);
return actualNamespace;
@@ -166,8 +164,7 @@ public class BuiltinsDeserializationTest extends KotlinTestWithEnvironment {
NameResolver nameResolver,
DescriptorFinder descriptorFinder
) {
DescriptorDeserializer descriptorDeserializer;
descriptorDeserializer =
DescriptorDeserializer descriptorDeserializer =
DescriptorDeserializer.create(new LockBasedStorageManager(), actualNamespace, nameResolver, descriptorFinder, AnnotationDeserializer.UNSUPPORTED);
for (ProtoBuf.Callable callableProto : callableProtos) {
CallableMemberDescriptor callableMemberDescriptor = descriptorDeserializer.loadCallable(callableProto);
compiler/tests/org/jetbrains/jet/descriptors/serialization/KotlinInfoForClassTest.java
+1 -1
View File
@@ -82,7 +82,7 @@ public class KotlinInfoForClassTest extends CodegenTestCase {
@NotNull
@Override
protected NamespaceDescriptor getPackage(@NotNull FqName fqName) {
public NamespaceDescriptor findPackage(@NotNull FqName fqName) {
assert fqName.equals(NAMESPACE_NAME) : "Unsupported namespace: " + fqName;
return namespace;
}