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

Delete JetScope.getObjectDescriptors()

Browse Source
This commit is contained in:
Alexander Udalov
2013-11-15 20:51:43 +04:00
parent 31c84951dc
commit 550df37056
20 changed files with 30 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/descriptors/serialization/AbstractDescriptorSerializationTest.java
-3
View File
@@ -130,9 +130,6 @@ public abstract class AbstractDescriptorSerializationTest extends KotlinTestWith
classes.add((ClassDescriptor) descriptor);
}
}
for (ClassDescriptor descriptor : scope.getObjectDescriptors()) {
classes.add(descriptor);
}
return classes;
}
compiler/tests/org/jetbrains/jet/descriptors/serialization/ClassSerializationUtil.java
-2
View File
@@ -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);
compiler/tests/org/jetbrains/jet/test/util/NamespaceComparator.java
-1
View File
@@ -153,7 +153,6 @@ public class NamespaceComparator {
List<DeclarationDescriptor> subDescriptors = Lists.newArrayList();
subDescriptors.addAll(memberScope.getAllDescriptors());
subDescriptors.addAll(memberScope.getObjectDescriptors());
subDescriptors.addAll(extraSubDescriptors);
Collections.sort(subDescriptors, MemberComparator.INSTANCE);
compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorProcessor.java
-1
View File
@@ -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);
}