From b2d4bdc8027d7c7c7ce38b8c5d900b94a55ab180 Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Thu, 24 Sep 2015 18:51:58 +0300 Subject: [PATCH] Minor. Rename isTrait -> isInterface --- .../src/org/jetbrains/kotlin/backend/common/bridges/impl.kt | 4 ++-- .../backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java | 2 +- .../src/org/jetbrains/kotlin/codegen/ClassBodyCodegen.java | 2 +- .../src/org/jetbrains/kotlin/codegen/ClosureCodegen.java | 2 +- .../src/org/jetbrains/kotlin/codegen/FunctionCodegen.java | 6 +++--- .../jetbrains/kotlin/codegen/ImplementationBodyCodegen.java | 6 +++--- .../src/org/jetbrains/kotlin/codegen/PropertyCodegen.java | 4 ++-- .../org/jetbrains/kotlin/codegen/inline/InlineCodegen.java | 2 +- .../jetbrains/kotlin/codegen/inline/InlineCodegenUtil.java | 4 ++-- .../src/org/jetbrains/kotlin/load/kotlin/native.kt | 2 +- .../jvm/calls/checkers/TraitDefaultMethodCallChecker.kt | 4 ++-- .../org/jetbrains/kotlin/resolve/DeclarationsChecker.java | 6 +++--- .../src/org/jetbrains/kotlin/resolve/ModifiersChecker.java | 3 +-- .../kotlin/resolve/lazy/descriptors/LazyClassMemberScope.kt | 2 +- .../types/expressions/BasicExpressionTypingVisitor.java | 2 +- .../src/org/jetbrains/kotlin/resolve/DescriptorUtils.java | 4 ++-- 16 files changed, 27 insertions(+), 28 deletions(-) diff --git a/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/bridges/impl.kt b/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/bridges/impl.kt index 06b84441db6..3d77fe243d3 100644 --- a/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/bridges/impl.kt +++ b/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/bridges/impl.kt @@ -56,7 +56,7 @@ private data class DescriptorBasedFunctionHandle(val descriptor: FunctionDescrip override val isAbstract: Boolean = descriptor.getModality() == Modality.ABSTRACT || - DescriptorUtils.isTrait(descriptor.getContainingDeclaration()) + DescriptorUtils.isInterface(descriptor.getContainingDeclaration()) override fun getOverridden() = overridden } @@ -74,7 +74,7 @@ public fun findTraitImplementation(descriptor: CallableMemberDescriptor): Callab val implementation = findImplementationFromInterface(descriptor) ?: return null val immediateConcreteSuper = firstSuperMethodFromKotlin(descriptor, implementation) ?: return null - if (!DescriptorUtils.isTrait(immediateConcreteSuper.getContainingDeclaration())) { + if (!DescriptorUtils.isInterface(immediateConcreteSuper.getContainingDeclaration())) { // If this implementation is already generated into the superclass, we need not generate it again, it'll be inherited return null } diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java index d44a02dfedc..3113ef5a0b7 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java @@ -778,7 +778,7 @@ public class AsmUtil { DeclarationDescriptor propertyContainer = propertyDescriptor.getContainingDeclaration(); return !propertyDescriptor.isVar() && !isExtensionProperty - && isCompanionObject(propertyContainer) && isTrait(propertyContainer.getContainingDeclaration()) + && isCompanionObject(propertyContainer) && isInterface(propertyContainer.getContainingDeclaration()) && areBothAccessorDefault(propertyDescriptor) && getVisibilityForSpecialPropertyBackingField(propertyDescriptor, false) == ACC_PUBLIC; } diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBodyCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBodyCodegen.java index 89c6c38e0f7..e7d0a1ebe97 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBodyCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBodyCodegen.java @@ -66,7 +66,7 @@ public abstract class ClassBodyCodegen extends MemberCodegen { } } - if (!DescriptorUtils.isTrait(descriptor)) { + if (!DescriptorUtils.isInterface(descriptor)) { for (DeclarationDescriptor memberDescriptor : descriptor.getDefaultType().getMemberScope().getAllDescriptors()) { if (memberDescriptor instanceof FunctionDescriptor) { FunctionDescriptor member = (FunctionDescriptor) memberDescriptor; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java index 8036c736a9a..1e03b39e9ae 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java @@ -109,7 +109,7 @@ public class ClosureCodegen extends MemberCodegen { JetType superClassType = null; for (JetType supertype : classDescriptor.getTypeConstructor().getSupertypes()) { ClassifierDescriptor classifier = supertype.getConstructor().getDeclarationDescriptor(); - if (DescriptorUtils.isTrait(classifier)) { + if (DescriptorUtils.isInterface(classifier)) { superInterfaceTypes.add(supertype); } else { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java index 2595993a26e..e28af2172c7 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java @@ -142,7 +142,7 @@ public class FunctionCodegen { @NotNull FunctionGenerationStrategy strategy ) { OwnerKind contextKind = methodContext.getContextKind(); - if (isTrait(functionDescriptor.getContainingDeclaration()) && + if (isInterface(functionDescriptor.getContainingDeclaration()) && functionDescriptor.getVisibility() == Visibilities.PRIVATE && contextKind != OwnerKind.DEFAULT_IMPLS) { return; @@ -505,7 +505,7 @@ public class FunctionCodegen { public void generateBridges(@NotNull FunctionDescriptor descriptor) { if (descriptor instanceof ConstructorDescriptor) return; if (owner.getContextKind() == OwnerKind.DEFAULT_IMPLS) return; - if (isTrait(descriptor.getContainingDeclaration())) return; + if (isInterface(descriptor.getContainingDeclaration())) return; // equals(Any?), hashCode(), toString() never need bridges if (isMethodOfAny(descriptor)) return; @@ -585,7 +585,7 @@ public class FunctionCodegen { ) { DeclarationDescriptor contextClass = owner.getContextDescriptor().getContainingDeclaration(); - if (kind != OwnerKind.DEFAULT_IMPLS && isTrait(contextClass)) { + if (kind != OwnerKind.DEFAULT_IMPLS && isInterface(contextClass)) { return; } diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java index 0b64d0a000c..a4c247257c5 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java @@ -1035,7 +1035,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { } private void generatePrimaryConstructor(final DelegationFieldsInfo delegationFieldsInfo) { - if (isTrait(descriptor) || isAnnotationClass(descriptor)) return; + if (isInterface(descriptor) || isAnnotationClass(descriptor)) return; ConstructorDescriptor constructorDescriptor = descriptor.getUnsubstitutedPrimaryConstructor(); if (constructorDescriptor == null) return; @@ -1393,7 +1393,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { } private void generateTraitMethods() { - if (isTrait(descriptor)) return; + if (isInterface(descriptor)) return; for (Map.Entry entry : CodegenUtil.getTraitMethods(descriptor).entrySet()) { FunctionDescriptor traitFun = entry.getKey(); @@ -1412,7 +1412,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { @Override public void doGenerateBody(@NotNull ExpressionCodegen codegen, @NotNull JvmMethodSignature signature) { DeclarationDescriptor containingDeclaration = traitFun.getContainingDeclaration(); - if (!DescriptorUtils.isTrait(containingDeclaration)) return; + if (!DescriptorUtils.isInterface(containingDeclaration)) return; DeclarationDescriptor declarationInheritedFun = inheritedFun.getContainingDeclaration(); PsiElement classForInheritedFun = descriptorToDeclaration(declarationInheritedFun); diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java index 1fb410b57fc..4a0ba3dc85c 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java @@ -57,7 +57,7 @@ import static org.jetbrains.kotlin.codegen.AsmUtil.*; import static org.jetbrains.kotlin.codegen.JvmCodegenUtil.isJvmInterface; import static org.jetbrains.kotlin.codegen.serialization.JvmSerializationBindings.*; import static org.jetbrains.kotlin.resolve.DescriptorUtils.isCompanionObject; -import static org.jetbrains.kotlin.resolve.DescriptorUtils.isTrait; +import static org.jetbrains.kotlin.resolve.DescriptorUtils.isInterface; import static org.jetbrains.kotlin.resolve.jvm.AsmTypes.PROPERTY_METADATA_TYPE; import static org.jetbrains.kotlin.resolve.jvm.diagnostics.DiagnosticsPackage.OtherOrigin; import static org.jetbrains.org.objectweb.asm.Opcodes.*; @@ -250,7 +250,7 @@ public class PropertyCodegen { String name = JvmAbi.getSyntheticMethodNameForAnnotatedProperty(descriptor.getName()); String desc = receiver == null ? "()V" : "(" + typeMapper.mapType(receiver.getType()) + ")V"; - if (!isTrait(context.getContextDescriptor()) || kind == OwnerKind.DEFAULT_IMPLS) { + if (!isInterface(context.getContextDescriptor()) || kind == OwnerKind.DEFAULT_IMPLS) { int flags = ACC_DEPRECATED | ACC_FINAL | ACC_PRIVATE | ACC_STATIC | ACC_SYNTHETIC; MethodVisitor mv = v.newMethod(OtherOrigin(descriptor), flags, name, desc, null, null); AnnotationCodegen.forMethod(mv, typeMapper) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java index ecd6ed41408..8f850e8aee0 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java @@ -595,7 +595,7 @@ public class InlineCodegen extends CallGenerator { CodegenContext parent = getContext(descriptor.getContainingDeclaration(), state); if (descriptor instanceof ClassDescriptor) { - OwnerKind kind = DescriptorUtils.isTrait(descriptor) ? OwnerKind.DEFAULT_IMPLS : OwnerKind.IMPLEMENTATION; + OwnerKind kind = DescriptorUtils.isInterface(descriptor) ? OwnerKind.DEFAULT_IMPLS : OwnerKind.IMPLEMENTATION; return parent.intoClass((ClassDescriptor) descriptor, kind, state); } else if (descriptor instanceof ScriptDescriptor) { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegenUtil.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegenUtil.java index fcdc0ecae2a..83c64cc1c82 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegenUtil.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegenUtil.java @@ -61,7 +61,7 @@ import java.util.ListIterator; import static kotlin.KotlinPackage.substringAfterLast; import static org.jetbrains.kotlin.resolve.DescriptorUtils.getFqName; -import static org.jetbrains.kotlin.resolve.DescriptorUtils.isTrait; +import static org.jetbrains.kotlin.resolve.DescriptorUtils.isInterface; public class InlineCodegenUtil { public static final boolean GENERATE_SMAP = true; @@ -193,7 +193,7 @@ public class InlineCodegenUtil { } if (containerDescriptor instanceof ClassDescriptor) { ClassId classId = DescriptorUtilPackage.getClassId((ClassDescriptor) containerDescriptor); - if (isTrait(containerDescriptor)) { + if (isInterface(containerDescriptor)) { FqName relativeClassName = classId.getRelativeClassName(); //TODO test nested trait fun inlining classId = new ClassId(classId.getPackageFqName(), Name.identifier(relativeClassName.shortName().asString() + JvmAbi.DEFAULT_IMPLS_SUFFIX)); diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/native.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/native.kt index aa6f3adf05c..37c7e9d9f52 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/native.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/native.kt @@ -54,7 +54,7 @@ public class NativeFunChecker : DeclarationChecker { ) { if (!descriptor.hasNativeAnnotation()) return - if (DescriptorUtils.isTrait(descriptor.getContainingDeclaration())) { + if (DescriptorUtils.isInterface(descriptor.getContainingDeclaration())) { diagnosticHolder.report(ErrorsJvm.EXTERNAL_DECLARATION_IN_TRAIT.on(declaration)) } else if (descriptor is CallableMemberDescriptor && diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/calls/checkers/TraitDefaultMethodCallChecker.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/calls/checkers/TraitDefaultMethodCallChecker.kt index 5abdfca3455..58e89f3b6bc 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/calls/checkers/TraitDefaultMethodCallChecker.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/calls/checkers/TraitDefaultMethodCallChecker.kt @@ -36,11 +36,11 @@ public class TraitDefaultMethodCallChecker : CallChecker { val targetDescriptor = resolvedCall.getResultingDescriptor().getOriginal() val containerDescriptor = targetDescriptor.getContainingDeclaration() - if (containerDescriptor is JavaClassDescriptor && DescriptorUtils.isTrait(containerDescriptor)) { + if (containerDescriptor is JavaClassDescriptor && DescriptorUtils.isInterface(containerDescriptor)) { //is java interface default method called from trait val classifier = DescriptorUtils.getParentOfType(context.scope.ownerDescriptor, javaClass()) - if (classifier != null && DescriptorUtils.isTrait(classifier)) { + if (classifier != null && DescriptorUtils.isInterface(classifier)) { context.trace.report( ErrorsJvm.TRAIT_CANT_CALL_DEFAULT_METHOD_VIA_SUPER.on( PsiTreeUtil.getParentOfType(resolvedCall.getCall().getCallElement(), javaClass()) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DeclarationsChecker.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DeclarationsChecker.java index ebbd3053ff8..5809fea4ee0 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DeclarationsChecker.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DeclarationsChecker.java @@ -550,9 +550,9 @@ public class DeclarationsChecker { } } else { - assert DescriptorUtils.isTrait(declaration) : "Enum entry should be declared in enum class: " + - classDescriptor + " " + - classDescriptor.getKind(); + assert DescriptorUtils.isInterface(declaration) : "Enum entry should be declared in enum class: " + + classDescriptor + " " + + classDescriptor.getKind(); } } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.java index ed0a1bb7bcf..ba563129b3a 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.java @@ -16,7 +16,6 @@ package org.jetbrains.kotlin.resolve; -import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; import com.intellij.psi.PsiElement; @@ -78,7 +77,7 @@ public class ModifiersChecker { DeclarationDescriptor containingDeclaration = classDescriptor.getContainingDeclaration(); if (!(containingDeclaration instanceof ClassDescriptor)) return InnerModifierCheckResult.ILLEGAL_POSITION; - if (DescriptorUtils.isTrait(containingDeclaration)) { + if (DescriptorUtils.isInterface(containingDeclaration)) { return InnerModifierCheckResult.IN_TRAIT; } else if (DescriptorUtils.isObject(containingDeclaration)) { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassMemberScope.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassMemberScope.kt index 5df16fbe36b..788173ea0a5 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassMemberScope.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassMemberScope.kt @@ -279,7 +279,7 @@ public open class LazyClassMemberScope( val classOrObject = ownerInfo.getCorrespondingClassOrObject() ?: return null val hasPrimaryConstructor = classOrObject.hasExplicitPrimaryConstructor() - if (DescriptorUtils.isTrait(thisDescriptor) && !hasPrimaryConstructor) return null + if (DescriptorUtils.isInterface(thisDescriptor) && !hasPrimaryConstructor) return null if (DescriptorUtils.canHaveDeclaredConstructors(thisDescriptor) || hasPrimaryConstructor) { val constructor = c.functionDescriptorResolver.resolvePrimaryConstructorDescriptor( diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/BasicExpressionTypingVisitor.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/BasicExpressionTypingVisitor.java index 360b6e24133..0d826b31e27 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/BasicExpressionTypingVisitor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/BasicExpressionTypingVisitor.java @@ -421,7 +421,7 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor { } } if (result != null) { - if (DescriptorUtils.isTrait(thisType.getConstructor().getDeclarationDescriptor())) { + if (DescriptorUtils.isInterface(thisType.getConstructor().getDeclarationDescriptor())) { if (DescriptorUtils.isClass(result.getConstructor().getDeclarationDescriptor())) { context.trace.report(SUPERCLASS_NOT_ACCESSIBLE_FROM_TRAIT.on(expression)); } diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.java b/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.java index bc191c82ffb..09d650b2d48 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.java +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.java @@ -329,7 +329,7 @@ public class DescriptorUtils { return isKindOf(descriptor, ClassKind.ANNOTATION_CLASS); } - public static boolean isTrait(@Nullable DeclarationDescriptor descriptor) { + public static boolean isInterface(@Nullable DeclarationDescriptor descriptor) { return isKindOf(descriptor, ClassKind.INTERFACE); } @@ -538,7 +538,7 @@ public class DescriptorUtils { } public static boolean canHaveDeclaredConstructors(@NotNull ClassDescriptor classDescriptor) { - return !isSingletonOrAnonymousObject(classDescriptor) && !isTrait(classDescriptor); + return !isSingletonOrAnonymousObject(classDescriptor) && !isInterface(classDescriptor); } public static boolean hasDefaultConstructor(@NotNull ClassDescriptor classDescriptor) {