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

Delete WritableScopeImpl.addObjectDescriptor()

Browse Source
This commit is contained in:
Alexander Udalov
2013-11-15 22:07:11 +04:00
parent c2c4123f64
commit 9e6cc829fb
5 changed files with 4 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/descriptors/serialization/AbstractDescriptorSerializationTest.java
+1 -6
View File
@@ -98,12 +98,7 @@ public abstract class AbstractDescriptorSerializationTest extends KotlinTestWith
ClassId classId = getClassId(classDescriptor);
ClassDescriptor descriptor = descriptorFinder.findClass(classId);
assert descriptor != null : "Class not loaded: " + classId;
if (descriptor.getKind().isSingleton()) {
namespace.getMemberScope().addObjectDescriptor(descriptor);
}
else {
namespace.getMemberScope().addClassifierDescriptor(descriptor);
}
namespace.getMemberScope().addClassifierDescriptor(descriptor);
}
PackageData data = PackageData.read(serializedPackage, JavaProtoBufUtil.getExtensionRegistry());
compiler/tests/org/jetbrains/jet/descriptors/serialization/BuiltinsDeserializationTest.java
+3 -5
View File
@@ -30,13 +30,13 @@ import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.descriptors.impl.NamespaceDescriptorImpl;
import org.jetbrains.jet.lang.resolve.DescriptorUtils;
import org.jetbrains.jet.lang.resolve.lazy.KotlinTestWithEnvironment;
import org.jetbrains.jet.storage.LockBasedStorageManager;
import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.lang.resolve.name.Name;
import org.jetbrains.jet.lang.resolve.scopes.WritableScope;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import org.jetbrains.jet.renderer.DescriptorRenderer;
import org.jetbrains.jet.renderer.DescriptorRendererBuilder;
import org.jetbrains.jet.storage.LockBasedStorageManager;
import org.jetbrains.jet.test.util.NamespaceComparator;
import java.util.Arrays;
@@ -108,15 +108,13 @@ public class BuiltinsDeserializationTest extends KotlinTestWithEnvironment {
case TRAIT:
case ENUM_CLASS:
case ANNOTATION_CLASS:
actualNamespace.getMemberScope().addClassifierDescriptor(classDescriptor);
break;
case OBJECT:
actualNamespace.getMemberScope().addObjectDescriptor(classDescriptor);
actualNamespace.getMemberScope().addClassifierDescriptor(classDescriptor);
break;
case ENUM_ENTRY:
assert false : "Enum entry appears to be a top-level declaration: " + classDescriptor;
case CLASS_OBJECT:
assert false : "Call object appears to be a top-level declaration: " + classDescriptor;
assert false : "Class object appears to be a top-level declaration: " + classDescriptor;
}
}
};