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

Minor, deserialized package scope is now not abstract

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedPackageMemberScope.java
+8 -9
View File
@@ -15,8 +15,7 @@ import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
public abstract class DeserializedPackageMemberScope extends DeserializedMemberScope { public class DeserializedPackageMemberScope extends DeserializedMemberScope {
@NotNull @NotNull
public static DeserializedPackageMemberScope createScopeFromPackageData( public static DeserializedPackageMemberScope createScopeFromPackageData(
@NotNull NamespaceDescriptor packageDescriptor, @NotNull NamespaceDescriptor packageDescriptor,
@@ -28,13 +27,7 @@ public abstract class DeserializedPackageMemberScope extends DeserializedMemberS
DescriptorDeserializer descriptorDeserializer = DescriptorDeserializer DescriptorDeserializer descriptorDeserializer = DescriptorDeserializer
.create(storageManager, packageDescriptor, packageData.getNameResolver(), descriptorFinder, deserializer); .create(storageManager, packageDescriptor, packageData.getNameResolver(), descriptorFinder, deserializer);
List<ProtoBuf.Callable> memberList = packageData.getPackageProto().getMemberList(); List<ProtoBuf.Callable> memberList = packageData.getPackageProto().getMemberList();
return new DeserializedPackageMemberScope(storageManager, packageDescriptor, descriptorDeserializer, memberList, descriptorFinder) { return new DeserializedPackageMemberScope(storageManager, packageDescriptor, descriptorDeserializer, memberList, descriptorFinder);
@Nullable
@Override
protected ReceiverParameterDescriptor getImplicitReceiver() {
return ReceiverParameterDescriptor.NO_RECEIVER_PARAMETER;
}
};
} }
private final DescriptorFinder descriptorFinder; private final DescriptorFinder descriptorFinder;
@@ -107,4 +100,10 @@ public abstract class DeserializedPackageMemberScope extends DeserializedMemberS
public NamespaceDescriptor getNamespace(@NotNull Name name) { public NamespaceDescriptor getNamespace(@NotNull Name name) {
return descriptorFinder.findPackage(packageFqName.child(name)); return descriptorFinder.findPackage(packageFqName.child(name));
} }
@Nullable
@Override
protected ReceiverParameterDescriptor getImplicitReceiver() {
return null;
}
} }
compiler/frontend/src/org/jetbrains/jet/lang/types/lang/BuiltinsNamespaceDescriptorImpl.java
+1 -10
View File
@@ -115,20 +115,11 @@ class BuiltinsNamespaceDescriptorImpl extends AbstractNamespaceDescriptorImpl {
this, this,
DescriptorDeserializer.create(storageManager, this, nameResolver, descriptorFinder, AnnotationDeserializer.UNSUPPORTED), DescriptorDeserializer.create(storageManager, this, nameResolver, descriptorFinder, AnnotationDeserializer.UNSUPPORTED),
loadCallables(), descriptorFinder loadCallables(), descriptorFinder
) { );
@Nullable
@Override
protected ReceiverParameterDescriptor getImplicitReceiver() {
return null;
}
};
} }
catch (IOException e) { catch (IOException e) {
throw new IllegalStateException(e); throw new IllegalStateException(e);
} }
} }
private List<ProtoBuf.Callable> loadCallables() throws IOException { private List<ProtoBuf.Callable> loadCallables() throws IOException {