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

Drop ClassKind.CLASS_OBJECT

Browse Source 
Default and non-default objects now have ClassKind.OBJECT
This commit is contained in:
Pavel V. Talanov
2015-03-04 17:05:28 +03:00
parent f72f548a93
commit ed4c265564
17 changed files with 44 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/MutableClassDescriptor.java
+4 -1
View File
@@ -70,6 +70,8 @@ public class MutableClassDescriptor extends ClassDescriptorBase implements Class
@NotNull SourceElement source
) {
super(LockBasedStorageManager.NO_LOCKS, containingDeclaration, name, source);
assert kind != ClassKind.OBJECT : "Fix isDefaultObject()";
this.kind = kind;
this.isInner = isInner;
@@ -145,7 +147,8 @@ public class MutableClassDescriptor extends ClassDescriptorBase implements Class
@Override
public boolean isDefaultObject() {
return getKind() == ClassKind.CLASS_OBJECT;
//TODO:
return false;
}
@NotNull
compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/JetObjectInfo.java
+5 -3
View File
@@ -32,9 +32,7 @@ public class JetObjectInfo extends JetClassOrObjectInfo<JetObjectDeclaration> {
protected JetObjectInfo(@NotNull JetObjectDeclaration element) {
super(element);
this.kind = element.isObjectLiteral()
? ClassKind.CLASS
: (element.isDefault() ? ClassKind.CLASS_OBJECT : ClassKind.OBJECT);
this.kind = element.isObjectLiteral() ? ClassKind.CLASS : ClassKind.OBJECT;
}
@Override
@@ -59,4 +57,8 @@ public class JetObjectInfo extends JetClassOrObjectInfo<JetObjectDeclaration> {
public ClassKind getClassKind() {
return kind;
}
public boolean isDefaultObject() {
return element.isDefault();
}
}
compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassDescriptor.java
+4 -1
View File
@@ -42,6 +42,7 @@ import org.jetbrains.kotlin.resolve.lazy.LazyEntity;
import org.jetbrains.kotlin.resolve.lazy.data.JetClassInfoUtil;
import org.jetbrains.kotlin.resolve.lazy.data.JetClassLikeInfo;
import org.jetbrains.kotlin.resolve.lazy.data.JetClassOrObjectInfo;
import org.jetbrains.kotlin.resolve.lazy.data.JetObjectInfo;
import org.jetbrains.kotlin.resolve.lazy.declarations.ClassMemberDeclarationProvider;
import org.jetbrains.kotlin.resolve.scopes.*;
import org.jetbrains.kotlin.storage.MemoizedFunctionToNotNull;
@@ -92,6 +93,7 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes
private final NotNullLazyValue<JetScope> scopeForPropertyInitializerResolution;
private final NullableLazyValue<Void> forceResolveAllContents;
private final boolean isDefaultObject;
public LazyClassDescriptor(
@NotNull LazyClassContext c,
@@ -118,6 +120,7 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes
this.typeConstructor = new LazyClassTypeConstructor();
this.kind = classLikeInfo.getClassKind();
this.isDefaultObject = classLikeInfo instanceof JetObjectInfo && ((JetObjectInfo) classLikeInfo).isDefaultObject();
JetModifierList modifierList = classLikeInfo.getModifierList();
if (kind.isSingleton()) {
@@ -441,7 +444,7 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes
@Override
public boolean isDefaultObject() {
return getKind() == ClassKind.CLASS_OBJECT;
return isDefaultObject;
}
@NotNull
compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassMemberScope.kt
+1 -2
View File
@@ -303,8 +303,7 @@ public open class LazyClassMemberScope(
ClassKind.ANNOTATION_CLASS,
ClassKind.OBJECT,
ClassKind.ENUM_CLASS,
ClassKind.ENUM_ENTRY,
ClassKind.CLASS_OBJECT)
ClassKind.ENUM_ENTRY)
private val EXTRACT_FUNCTIONS: MemberExtractor<FunctionDescriptor> = object : MemberExtractor<FunctionDescriptor> {
override fun extract(extractFrom: JetType, name: Name): Collection<FunctionDescriptor> {
compiler/tests/org/jetbrains/kotlin/test/util/DescriptorValidator.java
+2 -2
View File
@@ -264,8 +264,8 @@ public class DescriptorValidator {
}
ClassDescriptor defaultObjectDescriptor = descriptor.getDefaultObjectDescriptor();
if (defaultObjectDescriptor != null && defaultObjectDescriptor.getKind() != ClassKind.CLASS_OBJECT) {
report(collector, defaultObjectDescriptor, "Default object should be of kind " + ClassKind.CLASS_OBJECT);
if (defaultObjectDescriptor != null && !defaultObjectDescriptor.isDefaultObject()) {
report(collector, defaultObjectDescriptor, "Default object should be marked as such");
}
return true;
core/descriptors/src/org/jetbrains/kotlin/descriptors/ClassKind.java
+2 -3
View File
@@ -22,10 +22,9 @@ public enum ClassKind {
ENUM_CLASS,
ENUM_ENTRY,
ANNOTATION_CLASS,
OBJECT,
CLASS_OBJECT;
OBJECT;
public boolean isSingleton() {
return this == OBJECT || this == CLASS_OBJECT || this == ENUM_ENTRY;
return this == OBJECT || this == ENUM_ENTRY;
}
}
core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.java
+3 -2
View File
@@ -1001,6 +1001,9 @@ public class DescriptorRendererImpl implements DescriptorRenderer {
@NotNull
public static String getClassKindPrefix(@NotNull ClassDescriptor klass) {
if (klass.isDefaultObject()) {
return "class object";
}
switch (klass.getKind()) {
case CLASS:
return "class";
@@ -1012,8 +1015,6 @@ public class DescriptorRendererImpl implements DescriptorRenderer {
return "object";
case ANNOTATION_CLASS:
return "annotation class";
case CLASS_OBJECT:
return "class object";
case ENUM_ENTRY:
return "enum entry";
default:
core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.java
+4 -4
View File
@@ -241,7 +241,7 @@ public class DescriptorUtils {
}
public static boolean isDefaultObject(@Nullable DeclarationDescriptor descriptor) {
return isKindOf(descriptor, ClassKind.CLASS_OBJECT);
return isKindOf(descriptor, ClassKind.OBJECT) && ((ClassDescriptor) descriptor).isDefaultObject();
}
public static boolean isAnonymousObject(@NotNull DeclarationDescriptor descriptor) {
@@ -249,11 +249,11 @@ public class DescriptorUtils {
}
public static boolean isNonDefaultObject(@NotNull DeclarationDescriptor descriptor) {
return isKindOf(descriptor, ClassKind.OBJECT);
return isKindOf(descriptor, ClassKind.OBJECT) && !((ClassDescriptor) descriptor).isDefaultObject();
}
public static boolean isObject(@NotNull DeclarationDescriptor descriptor) {
return isDefaultObject(descriptor) || isNonDefaultObject(descriptor);
return isKindOf(descriptor, ClassKind.OBJECT);
}
public static boolean isEnumEntry(@NotNull DeclarationDescriptor descriptor) {
@@ -284,7 +284,7 @@ public class DescriptorUtils {
return isKindOf(descriptor, ClassKind.CLASS);
}
public static boolean isKindOf(@Nullable DeclarationDescriptor descriptor, @NotNull ClassKind classKind) {
private static boolean isKindOf(@Nullable DeclarationDescriptor descriptor, @NotNull ClassKind classKind) {
return descriptor instanceof ClassDescriptor && ((ClassDescriptor) descriptor).getKind() == classKind;
}
core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.kt
+1 -1
View File
@@ -60,7 +60,7 @@ public val ClassDescriptor.classId: ClassId
public val ClassDescriptor.classObjectDescriptor: ClassDescriptor?
get() {
return when (this.getKind()) {
CLASS_OBJECT, OBJECT -> this
OBJECT -> this
ENUM_ENTRY -> {
val container = this.getContainingDeclaration()
assert(container is ClassDescriptor && container.getKind() == ENUM_CLASS)
core/descriptors/src/org/jetbrains/kotlin/resolve/MemberComparator.java
+4
View File
@@ -143,6 +143,10 @@ public class MemberComparator implements Comparator<DeclarationDescriptor> {
if (class1.getKind().ordinal() != class2.getKind().ordinal()) {
return class1.getKind().ordinal() - class2.getKind().ordinal();
}
if (class1.isDefaultObject() != class2.isDefaultObject()) {
return class1.isDefaultObject() ? 1 : -1;
}
}
else {
throw new AssertionError(String.format(
core/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java
+2 -2
View File
@@ -81,8 +81,8 @@ public class DescriptorSerializer {
public ProtoBuf.Class.Builder classProto(@NotNull ClassDescriptor classDescriptor) {
ProtoBuf.Class.Builder builder = ProtoBuf.Class.newBuilder();
int flags = Flags.getClassFlags(hasAnnotations(classDescriptor), classDescriptor.getVisibility(),
classDescriptor.getModality(), classDescriptor.getKind(), classDescriptor.isInner());
int flags = Flags.getClassFlags(hasAnnotations(classDescriptor), classDescriptor.getVisibility(), classDescriptor.getModality(),
classDescriptor.getKind(), classDescriptor.isInner(), classDescriptor.isDefaultObject());
builder.setFlags(flags);
builder.setFqName(getClassId(classDescriptor));
core/serialization/src/org/jetbrains/kotlin/serialization/Flags.java
+6 -5
View File
@@ -73,17 +73,20 @@ public class Flags {
Visibility visibility,
Modality modality,
ClassKind kind,
boolean inner
boolean inner,
boolean isDefaultObject
) {
return HAS_ANNOTATIONS.toFlags(hasAnnotations)
| MODALITY.toFlags(modality(modality))
| VISIBILITY.toFlags(visibility(visibility))
| CLASS_KIND.toFlags(classKind(kind))
| CLASS_KIND.toFlags(classKind(kind, isDefaultObject))
| INNER.toFlags(inner)
;
}
private static ProtoBuf.Class.Kind classKind(ClassKind kind) {
private static ProtoBuf.Class.Kind classKind(ClassKind kind, boolean isDefaultObject) {
if (isDefaultObject) return ProtoBuf.Class.Kind.CLASS_OBJECT;
switch (kind) {
case CLASS:
return ProtoBuf.Class.Kind.CLASS;
@@ -97,8 +100,6 @@ public class Flags {
return ProtoBuf.Class.Kind.ANNOTATION_CLASS;
case OBJECT:
return ProtoBuf.Class.Kind.OBJECT;
case CLASS_OBJECT:
return ProtoBuf.Class.Kind.CLASS_OBJECT;
}
throw new IllegalArgumentException("Unknown class kind: " + kind);
}
core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt
+4 -2
View File
@@ -45,7 +45,9 @@ public class DeserializedClassDescriptor(
) {
private val modality = deserialization.modality(Flags.MODALITY.get(classProto.getFlags()))
private val visibility = deserialization.visibility(Flags.VISIBILITY.get(classProto.getFlags()))
private val kind = deserialization.classKind(Flags.CLASS_KIND.get(classProto.getFlags()))
private val kindFromProto = Flags.CLASS_KIND.get(classProto.getFlags())
private val kind = deserialization.classKind(kindFromProto)
private val isDefault = kindFromProto == ProtoBuf.Class.Kind.CLASS_OBJECT
private val isInner = Flags.INNER.get(classProto.getFlags())
val c = outerContext.childContext(this, classProto.getTypeParameterList(), nameResolver)
@@ -88,7 +90,7 @@ public class DeserializedClassDescriptor(
override fun getStaticScope() = staticScope
override fun isDefaultObject(): Boolean = getKind() == ClassKind.CLASS_OBJECT
override fun isDefaultObject(): Boolean = isDefault
private fun computePrimaryConstructor(): ConstructorDescriptor? {
if (!classProto.hasPrimaryConstructor()) return null
core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/protoEnumMapping.kt
+1 -2
View File
@@ -52,8 +52,7 @@ public fun classKind(kind: ProtoBuf.Class.Kind): ClassKind = when (kind) {
ProtoBuf.Class.Kind.ENUM_CLASS -> ClassKind.ENUM_CLASS
ProtoBuf.Class.Kind.ENUM_ENTRY -> ClassKind.ENUM_ENTRY
ProtoBuf.Class.Kind.ANNOTATION_CLASS -> ClassKind.ANNOTATION_CLASS
ProtoBuf.Class.Kind.OBJECT -> ClassKind.OBJECT
ProtoBuf.Class.Kind.CLASS_OBJECT -> ClassKind.CLASS_OBJECT
ProtoBuf.Class.Kind.OBJECT, ProtoBuf.Class.Kind.CLASS_OBJECT -> ClassKind.OBJECT
}
fun variance(variance: TypeParameter.Variance) = when (variance) {
idea/idea-analysis/src/org/jetbrains/kotlin/idea/JetDescriptorIconProvider.java
-2
View File
@@ -111,8 +111,6 @@ public final class JetDescriptorIconProvider {
return PlatformIcons.ANNOTATION_TYPE_ICON;
case OBJECT:
return JetIcons.OBJECT;
case CLASS_OBJECT:
return JetIcons.OBJECT;
case CLASS:
return JetIcons.CLASS;
default:
idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractableAnalysisUtil.kt
+1 -1
View File
@@ -599,7 +599,7 @@ private fun ExtractionData.inferParametersInfo(
when (it) {
is ClassDescriptor ->
when(it.getKind()) {
ClassKind.CLASS_OBJECT, ClassKind.OBJECT, ClassKind.ENUM_CLASS -> it : ClassDescriptor
ClassKind.OBJECT, ClassKind.ENUM_CLASS -> it : ClassDescriptor
ClassKind.ENUM_ENTRY -> it.getContainingDeclaration() as? ClassDescriptor
else -> if (ref.getNonStrictParentOfType<JetTypeReference>() != null) it : ClassDescriptor else null
}
js/js.translator/src/org/jetbrains/kotlin/js/translate/context/Namer.java
-1
View File
@@ -364,7 +364,6 @@ public final class Namer {
return enumClassCreationMethodReference();
case ENUM_ENTRY:
case OBJECT:
case CLASS_OBJECT:
return objectCreationMethodReference();
case ANNOTATION_CLASS:
case CLASS: