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

Change signature of AbstractDescriptorFinder#getPackage method

Browse Source
This commit is contained in:
Pavel V. Talanov
2013-07-01 21:41:48 +04:00
committed by Alexander Udalov
parent c08f067df2
commit d6d83e9bc2
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/AbstractDescriptorFinder.java
+2 -1
View File
@@ -23,6 +23,7 @@ import org.jetbrains.jet.descriptors.serialization.descriptors.AnnotationDeseria
import org.jetbrains.jet.descriptors.serialization.descriptors.DeserializedClassDescriptor; import org.jetbrains.jet.descriptors.serialization.descriptors.DeserializedClassDescriptor;
import org.jetbrains.jet.lang.descriptors.ClassDescriptor; import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; 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.MemoizedFunctionToNullable;
import org.jetbrains.jet.lang.resolve.lazy.storage.StorageManager; import org.jetbrains.jet.lang.resolve.lazy.storage.StorageManager;
import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.FqName;
@@ -74,7 +75,7 @@ public abstract class AbstractDescriptorFinder implements DescriptorFinder {
protected abstract ClassData getClassData(@NotNull ClassId classId); protected abstract ClassData getClassData(@NotNull ClassId classId);
@NotNull @NotNull
protected abstract DeclarationDescriptor getPackage(@NotNull FqName fqName); protected abstract NamespaceDescriptor getPackage(@NotNull FqName fqName);
protected abstract void classDescriptorCreated(@NotNull ClassDescriptor classDescriptor); protected abstract void classDescriptorCreated(@NotNull ClassDescriptor classDescriptor);
} }
compiler/frontend/src/org/jetbrains/jet/lang/types/lang/BuiltinsNamespaceDescriptorImpl.java
+1 -2
View File
@@ -7,7 +7,6 @@ import org.jetbrains.jet.descriptors.serialization.*;
import org.jetbrains.jet.descriptors.serialization.descriptors.AnnotationDeserializer; import org.jetbrains.jet.descriptors.serialization.descriptors.AnnotationDeserializer;
import org.jetbrains.jet.descriptors.serialization.descriptors.DeserializedPackageMemberScope; import org.jetbrains.jet.descriptors.serialization.descriptors.DeserializedPackageMemberScope;
import org.jetbrains.jet.lang.descriptors.ClassDescriptor; 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.descriptors.NamespaceDescriptor;
import org.jetbrains.jet.lang.descriptors.ReceiverParameterDescriptor; import org.jetbrains.jet.lang.descriptors.ReceiverParameterDescriptor;
import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor; import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor;
@@ -69,7 +68,7 @@ class BuiltinsNamespaceDescriptorImpl extends AbstractNamespaceDescriptorImpl {
@NotNull @NotNull
@Override @Override
protected DeclarationDescriptor getPackage(@NotNull FqName fqName) { protected NamespaceDescriptor getPackage(@NotNull FqName fqName) {
assert fqName.equals(KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME) : "Wrong package: " + fqName; assert fqName.equals(KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME) : "Wrong package: " + fqName;
return BuiltinsNamespaceDescriptorImpl.this; return BuiltinsNamespaceDescriptorImpl.this;
} }
compiler/tests/org/jetbrains/jet/descriptors/serialization/BuiltinsDeserializationTest.java
+3 -2
View File
@@ -80,11 +80,12 @@ public class BuiltinsDeserializationTest extends KotlinTestWithEnvironment {
final NameResolver nameResolver = NameSerializationUtil.createNameResolver(serializer.getNameTable()); final NameResolver nameResolver = NameSerializationUtil.createNameResolver(serializer.getNameTable());
DescriptorFinder descriptorFinder = new AbstractDescriptorFinder(new LockBasedStorageManager(), AnnotationDeserializer.UNSUPPORTED) { DescriptorFinder descriptorFinder = new AbstractDescriptorFinder(new LockBasedStorageManager(),
AnnotationDeserializer.UNSUPPORTED) {
@NotNull @NotNull
@Override @Override
protected DeclarationDescriptor getPackage(@NotNull FqName fqName) { protected NamespaceDescriptor getPackage(@NotNull FqName fqName) {
assert fqName.equals(KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME) : "Unsupported package: " + fqName; assert fqName.equals(KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME) : "Unsupported package: " + fqName;
return actualNamespace; return actualNamespace;
} }
compiler/tests/org/jetbrains/jet/descriptors/serialization/WriteSerializedInfoTest.java
+2 -2
View File
@@ -24,7 +24,7 @@ import org.jetbrains.jet.JetTestUtils;
import org.jetbrains.jet.codegen.CodegenTestCase; import org.jetbrains.jet.codegen.CodegenTestCase;
import org.jetbrains.jet.descriptors.serialization.descriptors.AnnotationDeserializer; import org.jetbrains.jet.descriptors.serialization.descriptors.AnnotationDeserializer;
import org.jetbrains.jet.lang.descriptors.ClassDescriptor; 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.descriptors.impl.NamespaceDescriptorImpl; import org.jetbrains.jet.lang.descriptors.impl.NamespaceDescriptorImpl;
import org.jetbrains.jet.lang.resolve.lazy.storage.LockBasedStorageManager; import org.jetbrains.jet.lang.resolve.lazy.storage.LockBasedStorageManager;
import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.FqName;
@@ -82,7 +82,7 @@ public class WriteSerializedInfoTest extends CodegenTestCase {
@NotNull @NotNull
@Override @Override
protected DeclarationDescriptor getPackage(@NotNull FqName fqName) { protected NamespaceDescriptor getPackage(@NotNull FqName fqName) {
assert fqName.equals(NAMESPACE_NAME) : "Unsupported namespace: " + fqName; assert fqName.equals(NAMESPACE_NAME) : "Unsupported namespace: " + fqName;
return namespace; return namespace;
} }