From 550df37056c2313dded435b848e982d597a875e5 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Fri, 15 Nov 2013 20:51:43 +0400 Subject: [PATCH] Delete JetScope.getObjectDescriptors() --- .../serialization/DescriptorSerializer.java | 5 -- .../descriptors/DeserializedMemberScope.java | 6 --- .../DeserializedPackageMemberScope.java | 52 +++++++++++-------- .../lang/resolve/lazy/LazyImportScope.java | 6 --- .../descriptors/AbstractLazyMemberScope.java | 6 --- .../resolve/scopes/JetScopeSelectorUtil.java | 9 ---- .../resolve/scopes/WriteThroughScope.java | 12 ----- .../AbstractDescriptorSerializationTest.java | 3 -- .../serialization/ClassSerializationUtil.java | 2 - .../jet/test/util/NamespaceComparator.java | 1 - .../util/RecursiveDescriptorProcessor.java | 1 - .../resolve/java/scope/JavaBaseScope.java | 6 --- .../resolve/scopes/AbstractScopeAdapter.java | 6 --- .../jet/lang/resolve/scopes/ChainedScope.java | 10 ---- .../lang/resolve/scopes/FilteringScope.java | 6 --- .../jet/lang/resolve/scopes/JetScope.java | 4 -- .../jet/lang/resolve/scopes/JetScopeImpl.java | 9 +--- .../resolve/scopes/SubstitutingScope.java | 6 --- .../resolve/scopes/WritableScopeImpl.java | 13 ----- .../jetbrains/jet/lang/types/ErrorUtils.java | 12 ----- 20 files changed, 30 insertions(+), 145 deletions(-) diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/DescriptorSerializer.java b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/DescriptorSerializer.java index fe4397b0527..799e2bd6198 100644 --- a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/DescriptorSerializer.java +++ b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/DescriptorSerializer.java @@ -126,11 +126,6 @@ public class DescriptorSerializer { } } - for (ClassDescriptor descriptor : sort(classDescriptor.getUnsubstitutedInnerClassesScope().getObjectDescriptors())) { - int nameIndex = nameTable.getSimpleNameIndex(descriptor.getName()); - builder.addNestedObjectName(nameIndex); - } - ClassDescriptor classObject = classDescriptor.getClassObjectDescriptor(); if (classObject != null) { builder.setClassObject(classObjectProto(classObject)); diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedMemberScope.java b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedMemberScope.java index 252b2decc5e..e894b658b1f 100644 --- a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedMemberScope.java +++ b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedMemberScope.java @@ -179,12 +179,6 @@ public abstract class DeserializedMemberScope implements JetScope { @NotNull protected abstract Collection computeAllObjectDescriptors(); - @NotNull - @Override - public Collection getObjectDescriptors() { - return objectDescriptors.invoke(); - } - @Nullable @Override public NamespaceDescriptor getNamespace(@NotNull Name name) { diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedPackageMemberScope.java b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedPackageMemberScope.java index 66583a92ecb..64f45229e65 100644 --- a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedPackageMemberScope.java +++ b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedPackageMemberScope.java @@ -1,3 +1,19 @@ +/* + * Copyright 2010-2013 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.jetbrains.jet.descriptors.serialization.descriptors; import org.jetbrains.annotations.NotNull; @@ -10,8 +26,8 @@ import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.storage.StorageManager; -import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; public class DeserializedPackageMemberScope extends DeserializedMemberScope { private final DescriptorFinder descriptorFinder; @@ -47,45 +63,35 @@ public class DeserializedPackageMemberScope extends DeserializedMemberScope { @Nullable @Override protected ClassifierDescriptor getClassDescriptor(@NotNull Name name) { - return findClassDescriptor(name, false); + return findClassDescriptor(name); } @Nullable @Override public ClassDescriptor getObjectDescriptor(@NotNull Name name) { - return findClassDescriptor(name, true); + return null; } @Nullable - private ClassDescriptor findClassDescriptor(Name name, boolean object) { - ClassDescriptor classDescriptor = descriptorFinder.findClass(new ClassId(packageFqName, FqNameUnsafe.topLevel(name))); - if (classDescriptor == null) { - return null; - } - return classDescriptor.getKind().isSingleton() == object ? classDescriptor : null; + private ClassDescriptor findClassDescriptor(Name name) { + return descriptorFinder.findClass(new ClassId(packageFqName, FqNameUnsafe.topLevel(name))); } @Override protected void addAllClassDescriptors(@NotNull Collection result) { - findClassifiers(result, false); + for (Name className : descriptorFinder.getClassNames(packageFqName)) { + ClassDescriptor classDescriptor = findClassDescriptor(className); + + if (classDescriptor != null) { + result.add(classDescriptor); + } + } } @NotNull @Override protected Collection computeAllObjectDescriptors() { - return findClassifiers(new ArrayList(), true); - } - - private > T findClassifiers(T result, boolean object) { - for (Name className : descriptorFinder.getClassNames(packageFqName)) { - ClassDescriptor classDescriptor = findClassDescriptor(className, object); - - if (classDescriptor != null) { - assert classDescriptor.getKind().isSingleton() == object; - result.add(classDescriptor); - } - } - return result; + return Collections.emptySet(); } @Override diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyImportScope.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyImportScope.java index e4f9c8cf1d2..a1d1c7ba9e2 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyImportScope.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyImportScope.java @@ -250,12 +250,6 @@ public class LazyImportScope implements JetScope { return selectFirstFromImports(name, LookupMode.ONLY_CLASSES, JetScopeSelectorUtil.NAMED_OBJECT_SCOPE_SELECTOR); } - @NotNull - @Override - public Collection getObjectDescriptors() { - return collectFromImports(LookupMode.ONLY_CLASSES, JetScopeSelectorUtil.OBJECTS_SCOPE_SELECTOR); - } - @Nullable @Override public NamespaceDescriptor getNamespace(@NotNull Name name) { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/AbstractLazyMemberScope.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/AbstractLazyMemberScope.java index 14f7cfe34e8..1264ba358df 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/AbstractLazyMemberScope.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/AbstractLazyMemberScope.java @@ -183,12 +183,6 @@ public abstract class AbstractLazyMemberScope result); - @NotNull - @Override - public Collection getObjectDescriptors() { - return Collections.emptySet(); - } - @Override public VariableDescriptor getLocalVariable(@NotNull Name name) { return null; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/JetScopeSelectorUtil.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/JetScopeSelectorUtil.java index 309034be3e0..1c6254248fe 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/JetScopeSelectorUtil.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/JetScopeSelectorUtil.java @@ -111,15 +111,6 @@ public class JetScopeSelectorUtil { } }; - public static final ScopeDescriptorSelector OBJECTS_SCOPE_SELECTOR = - new ScopeDescriptorSelector() { - @NotNull - @Override - public Collection get(@NotNull JetScope scope) { - return scope.getObjectDescriptors(); - } - }; - public static final ScopeDescriptorSelector ALL_DESCRIPTORS_SCOPE_SELECTOR = new ScopeDescriptorSelector() { @NotNull diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WriteThroughScope.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WriteThroughScope.java index 8d81bd59438..d72da1e56e9 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WriteThroughScope.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WriteThroughScope.java @@ -139,18 +139,6 @@ public class WriteThroughScope extends WritableScopeWithImports { return super.getObjectDescriptor(name); // Imports } - @NotNull - @Override - public Set getObjectDescriptors() { - checkMayRead(); - Set objectDescriptors = Sets.newHashSet(); - - objectDescriptors.addAll(super.getObjectDescriptors()); - objectDescriptors.addAll(getWorkerScope().getObjectDescriptors()); - objectDescriptors.addAll(writableWorker.getObjectDescriptors()); - return objectDescriptors; - } - @Override public void addLabeledDeclaration(@NotNull DeclarationDescriptor descriptor) { checkMayWrite(); diff --git a/compiler/tests/org/jetbrains/jet/descriptors/serialization/AbstractDescriptorSerializationTest.java b/compiler/tests/org/jetbrains/jet/descriptors/serialization/AbstractDescriptorSerializationTest.java index 2c8a3664d33..9cb4ada9191 100644 --- a/compiler/tests/org/jetbrains/jet/descriptors/serialization/AbstractDescriptorSerializationTest.java +++ b/compiler/tests/org/jetbrains/jet/descriptors/serialization/AbstractDescriptorSerializationTest.java @@ -130,9 +130,6 @@ public abstract class AbstractDescriptorSerializationTest extends KotlinTestWith classes.add((ClassDescriptor) descriptor); } } - for (ClassDescriptor descriptor : scope.getObjectDescriptors()) { - classes.add(descriptor); - } return classes; } diff --git a/compiler/tests/org/jetbrains/jet/descriptors/serialization/ClassSerializationUtil.java b/compiler/tests/org/jetbrains/jet/descriptors/serialization/ClassSerializationUtil.java index 25b8aa32bb5..9d6651d9d9f 100644 --- a/compiler/tests/org/jetbrains/jet/descriptors/serialization/ClassSerializationUtil.java +++ b/compiler/tests/org/jetbrains/jet/descriptors/serialization/ClassSerializationUtil.java @@ -42,8 +42,6 @@ public class ClassSerializationUtil { serializeClasses(classDescriptor.getUnsubstitutedInnerClassesScope().getAllDescriptors(), serializer, sink); - serializeClasses(classDescriptor.getUnsubstitutedInnerClassesScope().getObjectDescriptors(), serializer, sink); - ClassDescriptor classObjectDescriptor = classDescriptor.getClassObjectDescriptor(); if (classObjectDescriptor != null) { serializeClass(classObjectDescriptor, serializer, sink); diff --git a/compiler/tests/org/jetbrains/jet/test/util/NamespaceComparator.java b/compiler/tests/org/jetbrains/jet/test/util/NamespaceComparator.java index bc6b525b26b..e8e0094b41a 100644 --- a/compiler/tests/org/jetbrains/jet/test/util/NamespaceComparator.java +++ b/compiler/tests/org/jetbrains/jet/test/util/NamespaceComparator.java @@ -153,7 +153,6 @@ public class NamespaceComparator { List subDescriptors = Lists.newArrayList(); subDescriptors.addAll(memberScope.getAllDescriptors()); - subDescriptors.addAll(memberScope.getObjectDescriptors()); subDescriptors.addAll(extraSubDescriptors); Collections.sort(subDescriptors, MemberComparator.INSTANCE); diff --git a/compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorProcessor.java b/compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorProcessor.java index db5c5ab5132..dc99a9b3128 100644 --- a/compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorProcessor.java +++ b/compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorProcessor.java @@ -100,7 +100,6 @@ public class RecursiveDescriptorProcessor { && visitChildren(descriptor.getConstructors(), data) && visitChildren(descriptor.getTypeConstructor().getParameters(), data) && visitChildren(descriptor.getClassObjectDescriptor(), data) - && visitChildren(descriptor.getDefaultType().getMemberScope().getObjectDescriptors(), data) && visitChildren(descriptor.getDefaultType().getMemberScope().getAllDescriptors(), data); } diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaBaseScope.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaBaseScope.java index 4e3cf6975bf..65ec908f794 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaBaseScope.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaBaseScope.java @@ -127,12 +127,6 @@ public abstract class JavaBaseScope extends JetScopeImpl { return result; } - @NotNull - @Override - public Set getObjectDescriptors() { - return Collections.emptySet(); - } - @NotNull protected abstract Collection computeInnerClasses(); diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/AbstractScopeAdapter.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/AbstractScopeAdapter.java index 73a1f3b9608..f04ac0e1018 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/AbstractScopeAdapter.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/AbstractScopeAdapter.java @@ -60,12 +60,6 @@ public abstract class AbstractScopeAdapter implements JetScope { return getWorkerScope().getObjectDescriptor(name); } - @NotNull - @Override - public Collection getObjectDescriptors() { - return getWorkerScope().getObjectDescriptors(); - } - @NotNull @Override public Collection getProperties(@NotNull Name name) { diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/ChainedScope.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/ChainedScope.java index dc614db7f0b..b89a3a71d5e 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/ChainedScope.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/ChainedScope.java @@ -66,16 +66,6 @@ public class ChainedScope implements JetScope { return null; } - @NotNull - @Override - public Set getObjectDescriptors() { - Set objectDescriptors = Sets.newHashSet(); - for (JetScope scope : scopeChain) { - objectDescriptors.addAll(scope.getObjectDescriptors()); - } - return objectDescriptors; - } - @Override public NamespaceDescriptor getNamespace(@NotNull Name name) { for (JetScope jetScope : scopeChain) { diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/FilteringScope.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/FilteringScope.java index a786f4ca47a..7c9ced6414b 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/FilteringScope.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/FilteringScope.java @@ -70,12 +70,6 @@ public class FilteringScope implements JetScope { return filterDescriptor(workerScope.getObjectDescriptor(name)); } - @NotNull - @Override - public Collection getObjectDescriptors() { - return Collections2.filter(workerScope.getObjectDescriptors(), predicate); - } - @NotNull @Override public Collection getProperties(@NotNull Name name) { diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/JetScope.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/JetScope.java index 3b33d1b659b..02c11eacd76 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/JetScope.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/JetScope.java @@ -56,10 +56,6 @@ public interface JetScope { @Nullable ClassDescriptor getObjectDescriptor(@NotNull Name name); - @NotNull - @ReadOnly - Collection getObjectDescriptors(); - @Nullable NamespaceDescriptor getNamespace(@NotNull Name name); diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/JetScopeImpl.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/JetScopeImpl.java index ddf02ebea76..589f65d10e1 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/JetScopeImpl.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/JetScopeImpl.java @@ -26,7 +26,6 @@ import org.jetbrains.jet.utils.Printer; import java.util.Collection; import java.util.Collections; import java.util.List; -import java.util.Set; public abstract class JetScopeImpl implements JetScope { @Override @@ -39,12 +38,6 @@ public abstract class JetScopeImpl implements JetScope { return null; } - @NotNull - @Override - public Set getObjectDescriptors() { - return Collections.emptySet(); - } - @NotNull @Override public Collection getProperties(@NotNull Name name) { @@ -95,4 +88,4 @@ public abstract class JetScopeImpl implements JetScope { @TestOnly @Override public abstract void printScopeStructure(@NotNull Printer p); -} \ No newline at end of file +} diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/SubstitutingScope.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/SubstitutingScope.java index 6781cd46ed0..0fba3041b66 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/SubstitutingScope.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/SubstitutingScope.java @@ -103,12 +103,6 @@ public class SubstitutingScope implements JetScope { return substitute(workerScope.getObjectDescriptor(name)); } - @NotNull - @Override - public Collection getObjectDescriptors() { - return substitute(workerScope.getObjectDescriptors()); - } - @NotNull @Override public Collection getFunctions(@NotNull Name name) { diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeImpl.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeImpl.java index 23e1f39bb97..f31c8371b1a 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeImpl.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeImpl.java @@ -395,19 +395,6 @@ public class WritableScopeImpl extends WritableScopeWithImports { return super.getObjectDescriptor(name); } - @NotNull - @Override - public Set getObjectDescriptors() { - if (allObjectDescriptors == null) { - allObjectDescriptors = Sets.newHashSet(getObjectDescriptorsMap().values()); - allObjectDescriptors.addAll(getWorkerScope().getObjectDescriptors()); - for (JetScope imported : getImports()) { - allObjectDescriptors.addAll(imported.getObjectDescriptors()); - } - } - return allObjectDescriptors; - } - @Override public void addNamespace(@NotNull NamespaceDescriptor namespaceDescriptor) { checkMayWrite(); diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/ErrorUtils.java b/core/descriptors/src/org/jetbrains/jet/lang/types/ErrorUtils.java index 5675be78067..f118529911b 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/ErrorUtils.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/types/ErrorUtils.java @@ -93,12 +93,6 @@ public class ErrorUtils { return ERROR_CLASS; } - @NotNull - @Override - public Set getObjectDescriptors() { - return Collections.emptySet(); - } - @NotNull @Override public Set getProperties(@NotNull Name name) { @@ -181,12 +175,6 @@ public class ErrorUtils { throw new IllegalStateException(); } - @NotNull - @Override - public Collection getObjectDescriptors() { - throw new IllegalStateException(); - } - @Nullable @Override public NamespaceDescriptor getNamespace(@NotNull Name name) {