Minor, deserialized package scope is now not abstract

This commit is contained in:
Alexander Udalov
2013-07-15 23:00:29 +04:00
parent b602db03f2
commit 2e3005e431
2 changed files with 9 additions and 19 deletions
@@ -15,8 +15,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
public abstract class DeserializedPackageMemberScope extends DeserializedMemberScope {
public class DeserializedPackageMemberScope extends DeserializedMemberScope {
@NotNull
public static DeserializedPackageMemberScope createScopeFromPackageData(
@NotNull NamespaceDescriptor packageDescriptor,
@@ -28,13 +27,7 @@ public abstract class DeserializedPackageMemberScope extends DeserializedMemberS
DescriptorDeserializer descriptorDeserializer = DescriptorDeserializer
.create(storageManager, packageDescriptor, packageData.getNameResolver(), descriptorFinder, deserializer);
List<ProtoBuf.Callable> memberList = packageData.getPackageProto().getMemberList();
return new DeserializedPackageMemberScope(storageManager, packageDescriptor, descriptorDeserializer, memberList, descriptorFinder) {
@Nullable
@Override
protected ReceiverParameterDescriptor getImplicitReceiver() {
return ReceiverParameterDescriptor.NO_RECEIVER_PARAMETER;
}
};
return new DeserializedPackageMemberScope(storageManager, packageDescriptor, descriptorDeserializer, memberList, descriptorFinder);
}
private final DescriptorFinder descriptorFinder;
@@ -107,4 +100,10 @@ public abstract class DeserializedPackageMemberScope extends DeserializedMemberS
public NamespaceDescriptor getNamespace(@NotNull Name name) {
return descriptorFinder.findPackage(packageFqName.child(name));
}
@Nullable
@Override
protected ReceiverParameterDescriptor getImplicitReceiver() {
return null;
}
}
@@ -115,20 +115,11 @@ class BuiltinsNamespaceDescriptorImpl extends AbstractNamespaceDescriptorImpl {
this,
DescriptorDeserializer.create(storageManager, this, nameResolver, descriptorFinder, AnnotationDeserializer.UNSUPPORTED),
loadCallables(), descriptorFinder
) {
@Nullable
@Override
protected ReceiverParameterDescriptor getImplicitReceiver() {
return null;
}
};
);
}
catch (IOException e) {
throw new IllegalStateException(e);
}
}
private List<ProtoBuf.Callable> loadCallables() throws IOException {