From 2c6bf6171fc49a5b9c5d7e7c3efae6e6af321303 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Thu, 21 Nov 2013 16:43:37 +0400 Subject: [PATCH] Rename ClassKind.isObject -> isSingleton "isObject" gives a false impression that this is a check if the kind is OBJECT --- .../src/org/jetbrains/jet/codegen/CodegenUtil.java | 2 +- .../descriptors/DeserializedPackageMemberScope.java | 6 +++--- .../src/org/jetbrains/jet/lang/resolve/Importer.java | 2 +- .../jet/lang/resolve/QualifiedExpressionResolver.java | 4 ++-- .../jet/lang/resolve/calls/CandidateResolver.java | 2 +- .../resolve/lazy/descriptors/LazyClassDescriptor.java | 2 +- .../resolve/lazy/descriptors/LazyClassMemberScope.java | 2 +- .../AbstractDescriptorSerializationTest.java | 4 ++-- .../jetbrains/jet/test/util/DescriptorValidator.java | 2 +- .../jet/lang/resolve/java/scope/JavaBaseScope.java | 2 +- .../lang/resolve/java/scope/JavaClassMembersScope.java | 4 ++-- .../jet/lang/resolve/java/scope/JavaPackageScope.java | 4 ++-- .../org/jetbrains/jet/lang/descriptors/ClassKind.java | 2 +- .../descriptors/impl/MutableClassDescriptorLite.java | 2 +- .../jetbrains/jet/lang/resolve/DescriptorUtils.java | 10 +++++----- .../lang/resolve/scopes/InnerClassesScopeWrapper.java | 2 +- .../jet/lang/resolve/scopes/WritableScopeImpl.java | 4 ++-- .../lang/resolve/scopes/WritableScopeWithImports.java | 2 +- .../jetbrains/jet/renderer/DescriptorRendererImpl.java | 4 ++-- .../plugin/references/BuiltInsReferenceResolver.java | 2 +- .../k2js/translate/declaration/ClassTranslator.java | 5 +++-- 21 files changed, 35 insertions(+), 34 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/CodegenUtil.java b/compiler/backend/src/org/jetbrains/jet/codegen/CodegenUtil.java index 3c20f02426d..ee07d646877 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/CodegenUtil.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/CodegenUtil.java @@ -292,7 +292,7 @@ public class CodegenUtil { ReceiverParameterDescriptor expectedThisObject = descriptor.getExpectedThisObject(); if (expectedThisObject != null) { ClassDescriptor expectedThisClass = (ClassDescriptor) expectedThisObject.getContainingDeclaration(); - if (!expectedThisClass.getKind().isObject()) { + if (!expectedThisClass.getKind().isSingleton()) { return expectedThisClass; } } 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 d839415b19c..66583a92ecb 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 @@ -5,10 +5,10 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.descriptors.serialization.*; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.resolve.DescriptorUtils; -import org.jetbrains.jet.storage.StorageManager; import org.jetbrains.jet.lang.resolve.name.FqName; 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; @@ -62,7 +62,7 @@ public class DeserializedPackageMemberScope extends DeserializedMemberScope { if (classDescriptor == null) { return null; } - return classDescriptor.getKind().isObject() == object ? classDescriptor : null; + return classDescriptor.getKind().isSingleton() == object ? classDescriptor : null; } @Override @@ -81,7 +81,7 @@ public class DeserializedPackageMemberScope extends DeserializedMemberScope { ClassDescriptor classDescriptor = findClassDescriptor(className, object); if (classDescriptor != null) { - assert classDescriptor.getKind().isObject() == object; + assert classDescriptor.getKind().isSingleton() == object; result.add(classDescriptor); } } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/Importer.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/Importer.java index ef4faaf1f69..74a0d1cb06a 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/Importer.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/Importer.java @@ -148,7 +148,7 @@ public interface Importer { @Override public void addAliasImport(@NotNull DeclarationDescriptor descriptor, @NotNull Name aliasName) { - assert !DescriptorUtils.isObject(descriptor) : "Never import objects: " + descriptor; + assert !DescriptorUtils.isSingleton(descriptor) : "Never import objects: " + descriptor; imports.add(new AliasImportEntry(descriptor, aliasName)); } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/QualifiedExpressionResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/QualifiedExpressionResolver.java index f742b9ba29f..af046e11fce 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/QualifiedExpressionResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/QualifiedExpressionResolver.java @@ -104,7 +104,7 @@ public class QualifiedExpressionResolver { } for (DeclarationDescriptor descriptor : descriptors) { - if (!DescriptorUtils.isObject(descriptor)) { + if (!DescriptorUtils.isSingleton(descriptor)) { importer.addAliasImport(descriptor, aliasName); } } @@ -142,7 +142,7 @@ public class QualifiedExpressionResolver { if (descriptor instanceof NamespaceDescriptor) { return true; } - if (descriptor instanceof ClassDescriptor && !((ClassDescriptor)descriptor).getKind().isObject()) { + if (descriptor instanceof ClassDescriptor && !((ClassDescriptor)descriptor).getKind().isSingleton()) { return true; } trace.report(CANNOT_IMPORT_FROM_ELEMENT.on(reference, descriptor)); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CandidateResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CandidateResolver.java index 3fb00295eca..aa7325a237a 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CandidateResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CandidateResolver.java @@ -183,7 +183,7 @@ public class CandidateResolver { if (context.call.getExplicitReceiver().exists() || context.call.getThisObject().exists()) return true; ClassDescriptor candidateThis = getDeclaringClass(context.candidateCall.getCandidateDescriptor()); - if (candidateThis == null || candidateThis.getKind().isObject()) return true; + if (candidateThis == null || candidateThis.getKind().isSingleton()) return true; return DescriptorResolver.checkHasOuterClassInstance(context.scope, context.trace, context.call.getCallElement(), candidateThis); } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassDescriptor.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassDescriptor.java index 49e11d1de3c..6d9e2f143b4 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassDescriptor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassDescriptor.java @@ -115,7 +115,7 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements LazyDesc this.kind = classLikeInfo.getClassKind(); JetModifierList modifierList = classLikeInfo.getModifierList(); - if (kind.isObject()) { + if (kind.isSingleton()) { this.modality = Modality.FINAL; } else { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassMemberScope.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassMemberScope.java index f06da3d6ba0..9b870ba4435 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassMemberScope.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassMemberScope.java @@ -356,7 +356,7 @@ public class LazyClassMemberScope extends AbstractLazyMemberScope filterObjects(@NotNull Collection classes, boolean objects) { List result = new ArrayList(); for (ClassDescriptor descriptor : classes) { - if (descriptor.getKind().isObject() == objects) { + if (descriptor.getKind().isSingleton() == objects) { result.add(descriptor); } } diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaClassMembersScope.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaClassMembersScope.java index 20bfb9b1fbe..a3006eec599 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaClassMembersScope.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaClassMembersScope.java @@ -67,7 +67,7 @@ public abstract class JavaClassMembersScope extends JavaBaseScope { @Override public ClassDescriptor getObjectDescriptor(@NotNull Name name) { ClassDescriptor innerClass = getInnerClassesMap().get(name); - if (innerClass != null && innerClass.getKind().isObject()) { + if (innerClass != null && innerClass.getKind().isSingleton()) { return innerClass; } return null; @@ -76,7 +76,7 @@ public abstract class JavaClassMembersScope extends JavaBaseScope { @Override public ClassifierDescriptor getClassifier(@NotNull Name name) { ClassDescriptor innerClass = getInnerClassesMap().get(name); - if (innerClass == null || innerClass.getKind().isObject()) { + if (innerClass == null || innerClass.getKind().isSingleton()) { return null; } return innerClass; diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaPackageScope.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaPackageScope.java index 690687e4744..39d7fbaecc7 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaPackageScope.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaPackageScope.java @@ -56,7 +56,7 @@ public final class JavaPackageScope extends JavaBaseScope { @Override public ClassifierDescriptor getClassifier(@NotNull Name name) { ClassDescriptor classDescriptor = memberResolver.resolveClass(packageFQN.child(name), IGNORE_KOTLIN_SOURCES); - if (classDescriptor == null || classDescriptor.getKind().isObject()) { + if (classDescriptor == null || classDescriptor.getKind().isSingleton()) { return null; } return classDescriptor; @@ -65,7 +65,7 @@ public final class JavaPackageScope extends JavaBaseScope { @Override public ClassDescriptor getObjectDescriptor(@NotNull Name name) { ClassDescriptor classDescriptor = memberResolver.resolveClass(packageFQN.child(name), IGNORE_KOTLIN_SOURCES); - if (classDescriptor != null && classDescriptor.getKind().isObject()) { + if (classDescriptor != null && classDescriptor.getKind().isSingleton()) { return classDescriptor; } return null; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ClassKind.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ClassKind.java index 1d252f69be2..25cdb7a9363 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ClassKind.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ClassKind.java @@ -25,7 +25,7 @@ public enum ClassKind { OBJECT, CLASS_OBJECT; - public boolean isObject() { + public boolean isSingleton() { return this == OBJECT || this == CLASS_OBJECT || this == ENUM_ENTRY; } } diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/MutableClassDescriptorLite.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/MutableClassDescriptorLite.java index b4ee9862834..dccd4b2e861 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/MutableClassDescriptorLite.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/MutableClassDescriptorLite.java @@ -252,7 +252,7 @@ public abstract class MutableClassDescriptorLite extends ClassDescriptorBase { @Override public ClassObjectStatus setClassObjectDescriptor(@NotNull MutableClassDescriptorLite classObjectDescriptor) { - if (getKind().isObject() || isInner()) { + if (getKind().isSingleton() || isInner()) { return ClassObjectStatus.NOT_ALLOWED; } diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java index 4dcea843391..6e9ff6a2b87 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java @@ -238,10 +238,10 @@ public class DescriptorUtils { return isKindOf(descriptor, ClassKind.ENUM_ENTRY); } - public static boolean isObject(@NotNull DeclarationDescriptor classifier) { + public static boolean isSingleton(@NotNull DeclarationDescriptor classifier) { if (classifier instanceof ClassDescriptor) { ClassDescriptor clazz = (ClassDescriptor) classifier; - return clazz.getKind().isObject(); + return clazz.getKind().isSingleton(); } return false; } @@ -304,7 +304,7 @@ public class DescriptorUtils { if (containingDeclaration instanceof ClassDescriptor) { ClassDescriptor classDescriptor = (ClassDescriptor) containingDeclaration; - if (classDescriptor.getKind().isObject()) { + if (classDescriptor.getKind().isSingleton()) { return inStaticContext(classDescriptor.getContainingDeclaration()); } @@ -328,7 +328,7 @@ public class DescriptorUtils { if (classKind == ClassKind.ENUM_CLASS) { return Visibilities.PRIVATE; } - if (classKind.isObject()) { + if (classKind.isSingleton()) { return Visibilities.PRIVATE; } assert classKind == ClassKind.CLASS || classKind == ClassKind.TRAIT || classKind == ClassKind.ANNOTATION_CLASS; @@ -421,7 +421,7 @@ public class DescriptorUtils { return descriptor instanceof ClassDescriptor && containing instanceof ClassDescriptor && !((ClassDescriptor) descriptor).isInner() && - !((ClassDescriptor) containing).getKind().isObject(); + !((ClassDescriptor) containing).getKind().isSingleton(); } @Nullable diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/InnerClassesScopeWrapper.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/InnerClassesScopeWrapper.java index 070d260898f..34e76937d33 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/InnerClassesScopeWrapper.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/InnerClassesScopeWrapper.java @@ -87,6 +87,6 @@ public class InnerClassesScopeWrapper extends AbstractScopeAdapter { } private static boolean isClass(DeclarationDescriptor descriptor) { - return descriptor instanceof ClassDescriptor && !((ClassDescriptor) descriptor).getKind().isObject(); + return descriptor instanceof ClassDescriptor && !((ClassDescriptor) descriptor).getKind().isSingleton(); } } 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 d5caa387c15..f3baed3ab58 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 @@ -310,7 +310,7 @@ public class WritableScopeImpl extends WritableScopeWithImports { public void addClassifierDescriptor(@NotNull ClassifierDescriptor classDescriptor) { checkMayWrite(); - if (DescriptorUtils.isObject(classDescriptor)) { + if (DescriptorUtils.isSingleton(classDescriptor)) { throw new IllegalStateException("must not be object: " + classDescriptor); } @@ -321,7 +321,7 @@ public class WritableScopeImpl extends WritableScopeWithImports { public void addObjectDescriptor(@NotNull ClassDescriptor objectDescriptor) { checkMayWrite(); - if (!objectDescriptor.getKind().isObject()) { + if (!objectDescriptor.getKind().isSingleton()) { throw new IllegalStateException("must be object: " + objectDescriptor); } diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeWithImports.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeWithImports.java index 4ed33fa8e54..7c0458138d7 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeWithImports.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeWithImports.java @@ -216,7 +216,7 @@ public abstract class WritableScopeWithImports extends JetScopeAdapter implement public void importClassifierAlias(@NotNull Name importedClassifierName, @NotNull ClassifierDescriptor classifierDescriptor) { checkMayWrite(); - if (DescriptorUtils.isObject(classifierDescriptor)) { + if (DescriptorUtils.isSingleton(classifierDescriptor)) { throw new IllegalStateException("must not be object: " + classifierDescriptor); } diff --git a/core/descriptors/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java b/core/descriptors/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java index 81f4c53e6ee..81b9a494060 100644 --- a/core/descriptors/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java +++ b/core/descriptors/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java @@ -612,7 +612,7 @@ public class DescriptorRendererImpl implements DescriptorRenderer { renderAnnotations(klass, builder); renderVisibility(klass.getVisibility(), builder); if (!(klass.getKind() == ClassKind.TRAIT && klass.getModality() == Modality.ABSTRACT - || klass.getKind().isObject() && klass.getModality() == Modality.FINAL)) { + || klass.getKind().isSingleton() && klass.getModality() == Modality.FINAL)) { renderModality(klass.getModality(), builder); } renderInner(klass.isInner(), builder); @@ -627,7 +627,7 @@ public class DescriptorRendererImpl implements DescriptorRenderer { List typeParameters = klass.getTypeConstructor().getParameters(); renderTypeParameters(typeParameters, builder, false); - if (!klass.getKind().isObject() && classWithPrimaryConstructor) { + if (!klass.getKind().isSingleton() && classWithPrimaryConstructor) { ConstructorDescriptor primaryConstructor = klass.getUnsubstitutedPrimaryConstructor(); if (primaryConstructor != null) { renderValueParameters(primaryConstructor, builder); diff --git a/idea/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java b/idea/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java index b62dad83d01..22a93f670d4 100644 --- a/idea/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java +++ b/idea/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java @@ -136,7 +136,7 @@ public class BuiltInsReferenceResolver extends AbstractProjectComponent { @Nullable private DeclarationDescriptor findCurrentDescriptorForClass(@NotNull ClassDescriptor originalDescriptor) { - if (originalDescriptor.getKind().isObject()) { + if (originalDescriptor.getKind().isSingleton()) { DeclarationDescriptor currentParent = findCurrentDescriptor(originalDescriptor.getContainingDeclaration()); if (currentParent == null) return null; return ((ClassDescriptor) currentParent).getClassObjectDescriptor(); diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/declaration/ClassTranslator.java b/js/js.translator/src/org/jetbrains/k2js/translate/declaration/ClassTranslator.java index a52f33c5a45..2228a7ec93c 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/declaration/ClassTranslator.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/declaration/ClassTranslator.java @@ -37,7 +37,8 @@ import org.jetbrains.k2js.translate.utils.JsAstUtils; import java.util.*; -import static org.jetbrains.jet.lang.resolve.DescriptorUtils.*; +import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getClassDescriptorForType; +import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getClassDescriptorForTypeConstructor; import static org.jetbrains.jet.lang.types.TypeUtils.topologicallySortSuperclassesAndRecordAllInstances; import static org.jetbrains.k2js.translate.expression.LiteralFunctionTranslator.createPlace; import static org.jetbrains.k2js.translate.initializer.InitializerUtils.createClassObjectInitializer; @@ -137,7 +138,7 @@ public final class ClassTranslator extends AbstractTranslator { if (!isTopLevelDeclaration) { qualifiedReference = null; } - else if (descriptor.getKind().isObject()) { + else if (descriptor.getKind().isSingleton()) { qualifiedReference = null; declarationContext.literalFunctionTranslator().setDefinitionPlace( new NotNullLazyValue, LabelGenerator, JsExpression>>() {