From 69ed375ce103e85db212838c600a055f0a3e59cc Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Fri, 25 Oct 2013 20:51:45 +0400 Subject: [PATCH] Extract SpecialNames utility class --- .../jetbrains/jet/codegen/MemberCodegen.java | 3 +- .../codegen/intrinsics/IntrinsicMethods.java | 3 +- .../DeserializedClassDescriptor.java | 2 +- .../jet/lang/psi/JetNamespaceHeader.java | 4 +-- .../jetbrains/jet/lang/psi/JetPsiUtil.java | 6 ++-- .../jet/lang/resolve/JetModuleUtil.java | 3 +- .../lang/resolve/TypeHierarchyResolver.java | 2 +- .../jet/lang/resolve/lazy/ResolveSession.java | 4 +-- .../lazy/descriptors/LazyClassDescriptor.java | 2 +- .../tests/org/jetbrains/jet/JetTestUtils.java | 3 +- .../JavaEnumClassObjectDescriptor.java | 2 +- .../java/resolver/JavaClassResolver.java | 4 +-- .../jet/lang/resolve/DescriptorUtils.java | 8 +---- .../jet/lang/resolve/name/SpecialNames.java | 31 +++++++++++++++++++ .../jet/lang/types/lang/KotlinBuiltIns.java | 5 +-- 15 files changed, 55 insertions(+), 27 deletions(-) create mode 100644 core/descriptors/src/org/jetbrains/jet/lang/resolve/name/SpecialNames.java diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/MemberCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/MemberCodegen.java index 1dbbe0ddae6..31591be2742 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/MemberCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/MemberCodegen.java @@ -26,6 +26,7 @@ import org.jetbrains.jet.codegen.state.GenerationState; import org.jetbrains.jet.lang.descriptors.ClassDescriptor; import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; +import org.jetbrains.jet.lang.resolve.name.SpecialNames; import org.jetbrains.jet.lang.types.ErrorUtils; @@ -77,7 +78,7 @@ public class MemberCodegen extends ParentCodegenAwareImpl { public void genClassOrObject(CodegenContext parentContext, JetClassOrObject aClass) { ClassDescriptor descriptor = state.getBindingContext().get(BindingContext.CLASS, aClass); - if (descriptor == null || ErrorUtils.isError(descriptor) || descriptor.getName().equals(JetPsiUtil.NO_NAME_PROVIDED)) { + if (descriptor == null || ErrorUtils.isError(descriptor) || descriptor.getName().equals(SpecialNames.NO_NAME_PROVIDED)) { if (state.getClassBuilderMode() != ClassBuilderMode.LIGHT_CLASSES) { throw new IllegalStateException( "Generating bad descriptor in ClassBuilderMode = " + state.getClassBuilderMode() + ": " + descriptor); diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/IntrinsicMethods.java b/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/IntrinsicMethods.java index afcc7b05757..74a7135fd4e 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/IntrinsicMethods.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/IntrinsicMethods.java @@ -28,6 +28,7 @@ import org.jetbrains.jet.lang.resolve.java.JvmPrimitiveType; 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.lang.resolve.name.SpecialNames; import org.jetbrains.jet.lang.types.expressions.OperatorConventions; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; import org.jetbrains.jet.lang.types.lang.PrimitiveType; @@ -170,7 +171,7 @@ public class IntrinsicMethods { } private void registerStaticField(@NotNull FqName classFqName, @NotNull Name propertyName) { - FqNameUnsafe classObjectFqName = classFqName.toUnsafe().child(getClassObjectName(classFqName.shortName())); + FqNameUnsafe classObjectFqName = classFqName.toUnsafe().child(SpecialNames.getClassObjectName(classFqName.shortName())); intrinsicsMap.registerIntrinsic(classObjectFqName, propertyName, -1, new StaticField(classFqName, propertyName)); } diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedClassDescriptor.java b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedClassDescriptor.java index e559c9d68d8..611ed37b8fd 100644 --- a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedClassDescriptor.java +++ b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedClassDescriptor.java @@ -44,7 +44,7 @@ import java.util.*; import static org.jetbrains.jet.descriptors.serialization.TypeDeserializer.TypeParameterResolver.NONE; import static org.jetbrains.jet.lang.descriptors.ReceiverParameterDescriptor.NO_RECEIVER_PARAMETER; -import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getClassObjectName; +import static org.jetbrains.jet.lang.resolve.name.SpecialNames.getClassObjectName; public class DeserializedClassDescriptor extends AbstractClassDescriptor implements ClassDescriptor { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamespaceHeader.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamespaceHeader.java index b106a5f0018..383fdb96977 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamespaceHeader.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamespaceHeader.java @@ -21,9 +21,9 @@ import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.JetNodeTypes; -import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.jet.lang.resolve.name.SpecialNames; import java.util.List; @@ -67,7 +67,7 @@ public class JetNamespaceHeader extends JetReferenceExpression { @NotNull public Name getNameAsName() { PsiElement nameIdentifier = getNameIdentifier(); - return nameIdentifier == null ? DescriptorUtils.ROOT_NAMESPACE_NAME : Name.identifier(nameIdentifier.getText()); + return nameIdentifier == null ? SpecialNames.ROOT_NAMESPACE : Name.identifier(nameIdentifier.getText()); } public boolean isRoot() { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java index 417897b1ee2..fc7774462e2 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java @@ -36,6 +36,7 @@ import org.jetbrains.jet.lang.parsing.JetExpressionParsing; import org.jetbrains.jet.lang.resolve.ImportPath; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.jet.lang.resolve.name.SpecialNames; import org.jetbrains.jet.lang.types.expressions.OperatorConventions; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; import org.jetbrains.jet.lexer.JetToken; @@ -47,9 +48,6 @@ import java.util.List; import java.util.Set; public class JetPsiUtil { - - public static final Name NO_NAME_PROVIDED = Name.special(""); - private JetPsiUtil() { } @@ -131,7 +129,7 @@ public class JetPsiUtil { @NotNull public static Name safeName(@Nullable String name) { - return name == null ? NO_NAME_PROVIDED : Name.identifier(name); + return name == null ? SpecialNames.NO_NAME_PROVIDED : Name.identifier(name); } @NotNull diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/JetModuleUtil.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/JetModuleUtil.java index 6422bf6b470..246083acff6 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/JetModuleUtil.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/JetModuleUtil.java @@ -17,12 +17,13 @@ package org.jetbrains.jet.lang.resolve; import org.jetbrains.jet.lang.psi.JetElement; +import org.jetbrains.jet.lang.resolve.name.SpecialNames; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.types.NamespaceType; public class JetModuleUtil { public static NamespaceType getRootNamespaceType(JetElement expression) { // TODO: this is a stub: at least the modules' root namespaces must be indexed here - return new NamespaceType(DescriptorUtils.ROOT_NAMESPACE_NAME, JetScope.EMPTY); + return new NamespaceType(SpecialNames.ROOT_NAMESPACE, JetScope.EMPTY); } } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeHierarchyResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeHierarchyResolver.java index a38d0c36dc3..2349b1c78bc 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeHierarchyResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeHierarchyResolver.java @@ -45,9 +45,9 @@ import java.util.*; import static org.jetbrains.jet.lang.diagnostics.Errors.*; import static org.jetbrains.jet.lang.resolve.BindingContext.FQNAME_TO_CLASS_DESCRIPTOR; import static org.jetbrains.jet.lang.resolve.BindingContext.TYPE; -import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getClassObjectName; import static org.jetbrains.jet.lang.resolve.ModifiersChecker.getDefaultClassVisibility; import static org.jetbrains.jet.lang.resolve.ModifiersChecker.resolveVisibilityFromModifiers; +import static org.jetbrains.jet.lang.resolve.name.SpecialNames.getClassObjectName; public class TypeHierarchyResolver { @NotNull diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSession.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSession.java index f25d8cf04cd..2108c93655f 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSession.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSession.java @@ -32,7 +32,6 @@ import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.BindingTraceContext; -import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.lazy.data.JetClassLikeInfo; import org.jetbrains.jet.lang.resolve.lazy.declarations.DeclarationProviderFactory; import org.jetbrains.jet.lang.resolve.lazy.declarations.PackageMemberDeclarationProvider; @@ -42,6 +41,7 @@ import org.jetbrains.jet.lang.resolve.lazy.storage.LazyResolveStorageManager; 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.lang.resolve.name.SpecialNames; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import java.util.List; @@ -215,7 +215,7 @@ public class ResolveSession implements KotlinCodeAnalyzer { // build descriptors for such class objects. final JetClassLikeInfo classObjectInfo = parentClassDescriptor.getClassObjectInfo(classObject); if (classObjectInfo != null) { - final Name name = DescriptorUtils.getClassObjectName(parentClassDescriptor.getName()); + final Name name = SpecialNames.getClassObjectName(parentClassDescriptor.getName()); return storageManager.compute(new Function0() { @Override public LazyClassDescriptor invoke() { 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 90cc13974bc..f9fbd084670 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 @@ -53,8 +53,8 @@ import org.jetbrains.jet.storage.StorageManager; import java.util.*; -import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getClassObjectName; import static org.jetbrains.jet.lang.resolve.ModifiersChecker.*; +import static org.jetbrains.jet.lang.resolve.name.SpecialNames.getClassObjectName; public class LazyClassDescriptor extends ClassDescriptorBase implements LazyDescriptor, ClassDescriptor { diff --git a/compiler/tests/org/jetbrains/jet/JetTestUtils.java b/compiler/tests/org/jetbrains/jet/JetTestUtils.java index be0f22513b2..8c660e2577d 100644 --- a/compiler/tests/org/jetbrains/jet/JetTestUtils.java +++ b/compiler/tests/org/jetbrains/jet/JetTestUtils.java @@ -58,6 +58,7 @@ import org.jetbrains.jet.lang.resolve.*; import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM; import org.jetbrains.jet.lang.resolve.lazy.LazyResolveTestUtil; import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.jet.lang.resolve.name.SpecialNames; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.resolve.scopes.RedeclarationHandler; import org.jetbrains.jet.lang.resolve.scopes.WritableScopeImpl; @@ -663,7 +664,7 @@ public class JetTestUtils { public static NamespaceDescriptorImpl createTestNamespace(@NotNull Name testPackageName) { ModuleDescriptorImpl module = AnalyzerFacadeForJVM.createJavaModule(""); NamespaceDescriptorImpl rootNamespace = - new NamespaceDescriptorImpl(module, Collections.emptyList(), DescriptorUtils.ROOT_NAMESPACE_NAME); + new NamespaceDescriptorImpl(module, Collections.emptyList(), SpecialNames.ROOT_NAMESPACE); module.setRootNamespace(rootNamespace); NamespaceDescriptorImpl test = new NamespaceDescriptorImpl(rootNamespace, Collections.emptyList(), testPackageName); test.initialize(new WritableScopeImpl(JetScope.EMPTY, test, RedeclarationHandler.DO_NOTHING, "members of test namespace")); diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaEnumClassObjectDescriptor.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaEnumClassObjectDescriptor.java index 405988bde39..61cc3fecd1a 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaEnumClassObjectDescriptor.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaEnumClassObjectDescriptor.java @@ -28,7 +28,7 @@ import org.jetbrains.jet.lang.resolve.DescriptorFactory; import java.util.Collection; import java.util.Collections; -import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getClassObjectName; +import static org.jetbrains.jet.lang.resolve.name.SpecialNames.getClassObjectName; public class JavaEnumClassObjectDescriptor extends MutableClassDescriptorLite { private ConstructorDescriptor constructor; diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java index 62bd08a59ba..82e01dd0343 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java @@ -50,8 +50,8 @@ import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; import javax.inject.Inject; import java.util.*; -import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getClassObjectName; import static org.jetbrains.jet.lang.resolve.java.DescriptorSearchRule.INCLUDE_KOTLIN_SOURCES; +import static org.jetbrains.jet.lang.resolve.name.SpecialNames.getClassObjectName; public final class JavaClassResolver { @NotNull @@ -401,7 +401,7 @@ public final class JavaClassResolver { if (JvmAbi.CLASS_OBJECT_CLASS_NAME.equals(segment.asString())) { assert !correctedSegments.isEmpty(); Name previous = correctedSegments.get(correctedSegments.size() - 1); - correctedSegments.add(DescriptorUtils.getClassObjectName(previous)); + correctedSegments.add(getClassObjectName(previous)); } else { correctedSegments.add(segment); 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 540f5ff77e0..5a52fc435f6 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java @@ -28,6 +28,7 @@ import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; 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.lang.resolve.name.SpecialNames; import org.jetbrains.jet.lang.resolve.scopes.FilteringScope; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.types.*; @@ -40,8 +41,6 @@ import java.util.*; import static org.jetbrains.jet.lang.descriptors.ReceiverParameterDescriptor.NO_RECEIVER_PARAMETER; public class DescriptorUtils { - public static final Name ROOT_NAMESPACE_NAME = Name.special(""); - private DescriptorUtils() { } @@ -306,11 +305,6 @@ public class DescriptorUtils { return false; } - @NotNull - public static Name getClassObjectName(@NotNull Name className) { - return Name.special(""); - } - public static boolean isEnumClassObject(@NotNull DeclarationDescriptor descriptor) { if (descriptor instanceof ClassDescriptor && ((ClassDescriptor) descriptor).getKind() == ClassKind.CLASS_OBJECT) { DeclarationDescriptor containing = descriptor.getContainingDeclaration(); diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/name/SpecialNames.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/name/SpecialNames.java new file mode 100644 index 00000000000..964e378faf6 --- /dev/null +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/name/SpecialNames.java @@ -0,0 +1,31 @@ +/* + * 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.lang.resolve.name; + +import org.jetbrains.annotations.NotNull; + +public class SpecialNames { + public static final Name NO_NAME_PROVIDED = Name.special(""); + public static final Name ROOT_NAMESPACE = Name.special(""); + + private SpecialNames() {} + + @NotNull + public static Name getClassObjectName(@NotNull Name className) { + return Name.special(""); + } +} diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java b/core/descriptors/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java index 180e7e1ac3a..2cf84b7efb5 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java @@ -28,14 +28,15 @@ import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor; import org.jetbrains.jet.lang.descriptors.impl.NamespaceDescriptorImpl; import org.jetbrains.jet.lang.descriptors.impl.ValueParameterDescriptorImpl; import org.jetbrains.jet.lang.resolve.DescriptorUtils; -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.name.SpecialNames; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.resolve.scopes.RedeclarationHandler; import org.jetbrains.jet.lang.resolve.scopes.WritableScope; import org.jetbrains.jet.lang.resolve.scopes.WritableScopeImpl; import org.jetbrains.jet.lang.types.*; +import org.jetbrains.jet.storage.LockBasedStorageManager; import java.io.IOException; import java.util.*; @@ -163,7 +164,7 @@ public class KotlinBuiltIns { private static void loadBuiltIns(@NotNull ModuleDescriptorImpl module) throws IOException { NamespaceDescriptorImpl rootNamespace = - new NamespaceDescriptorImpl(module, Collections.emptyList(), DescriptorUtils.ROOT_NAMESPACE_NAME); + new NamespaceDescriptorImpl(module, Collections.emptyList(), SpecialNames.ROOT_NAMESPACE); rootNamespace.initialize( new WritableScopeImpl(JetScope.EMPTY, rootNamespace, RedeclarationHandler.DO_NOTHING, "members of root namespace"));