Rename isImpl to isActual in descriptors

This commit is contained in:
Stanislav Erokhin
2017-09-14 20:54:56 +03:00
committed by Mikhail Glukhikh
parent c8ee424f67
commit e86d2f00ff
38 changed files with 63 additions and 63 deletions
@@ -103,7 +103,7 @@ class LazyJavaClassDescriptor(
override fun isData() = false
override fun isCompanionObject() = false
override fun isExpect() = false
override fun isImpl() = false
override fun isActual() = false
private val typeConstructor = LazyJavaClassTypeConstructor()
override fun getTypeConstructor(): TypeConstructor = typeConstructor
@@ -101,7 +101,7 @@ class FunctionClassDescriptor(
override fun isInner() = false
override fun isData() = false
override fun isExpect() = false
override fun isImpl() = false
override fun isActual() = false
override fun isExternal() = false
override val annotations: Annotations get() = Annotations.EMPTY
override fun getSource(): SourceElement = SourceElement.NO_SOURCE
@@ -28,7 +28,7 @@ public interface MemberDescriptor extends DeclarationDescriptorNonRoot, Declarat
boolean isExpect();
boolean isImpl();
boolean isActual();
boolean isExternal();
}
@@ -79,7 +79,7 @@ class NotFoundClasses(private val storageManager: StorageManager, private val mo
override fun isCompanionObject() = false
override fun isData() = false
override fun isExpect() = false
override fun isImpl() = false
override fun isActual() = false
override fun isExternal() = false
override val annotations: Annotations get() = Annotations.EMPTY
@@ -76,7 +76,7 @@ abstract class AbstractTypeAliasDescriptor(
override fun isExpect(): Boolean = false
override fun isImpl(): Boolean = false
override fun isActual(): Boolean = false
override fun isExternal() = false
@@ -121,7 +121,7 @@ public class ClassDescriptorImpl extends ClassDescriptorBase {
}
@Override
public boolean isImpl() {
public boolean isActual() {
return false;
}
@@ -160,7 +160,7 @@ public class EnumEntrySyntheticClassDescriptor extends ClassDescriptorBase {
}
@Override
public boolean isImpl() {
public boolean isActual() {
return false;
}
@@ -44,7 +44,7 @@ public abstract class FunctionDescriptorImpl extends DeclarationDescriptorNonRoo
private boolean isInline = false;
private boolean isTailrec = false;
private boolean isExpect = false;
private boolean isImpl = false;
private boolean isActual = false;
// Difference between these hidden kinds:
// 1. isHiddenToOvercomeSignatureClash prohibit calling such functions even in super-call context
// 2. isHiddenForResolutionEverywhereBesideSupercalls propagates to it's overrides descriptors while isHiddenToOvercomeSignatureClash does not
@@ -140,8 +140,8 @@ public abstract class FunctionDescriptorImpl extends DeclarationDescriptorNonRoo
this.isExpect = isExpect;
}
public void setImpl(boolean isImpl) {
this.isImpl = isImpl;
public void setActual(boolean isActual) {
this.isActual = isActual;
}
private void setHiddenToOvercomeSignatureClash(boolean hiddenToOvercomeSignatureClash) {
@@ -263,8 +263,8 @@ public abstract class FunctionDescriptorImpl extends DeclarationDescriptorNonRoo
}
@Override
public boolean isImpl() {
return isImpl;
public boolean isActual() {
return isActual;
}
@Override
@@ -665,7 +665,7 @@ public abstract class FunctionDescriptorImpl extends DeclarationDescriptorNonRoo
substitutedDescriptor.setTailrec(isTailrec);
substitutedDescriptor.setSuspend(isSuspend);
substitutedDescriptor.setExpect(isExpect);
substitutedDescriptor.setImpl(isImpl);
substitutedDescriptor.setActual(isActual);
substitutedDescriptor.setHasStableParameterNames(hasStableParameterNames);
substitutedDescriptor.setHiddenToOvercomeSignatureClash(configuration.isHiddenToOvercomeSignatureClash);
substitutedDescriptor.setHiddenForResolutionEverywhereBesideSupercalls(configuration.isHiddenForResolutionEverywhereBesideSupercalls);
@@ -232,8 +232,8 @@ public class LazySubstitutingClassDescriptor implements ClassDescriptor {
}
@Override
public boolean isImpl() {
return original.isImpl();
public boolean isActual() {
return original.isActual();
}
@Override
@@ -112,7 +112,7 @@ public class MutableClassDescriptor extends ClassDescriptorBase {
}
@Override
public boolean isImpl() {
public boolean isActual() {
return false;
}
@@ -108,7 +108,7 @@ public abstract class PropertyAccessorDescriptorImpl extends DeclarationDescript
}
@Override
public boolean isImpl() {
public boolean isActual() {
return false;
}
@@ -43,7 +43,7 @@ public class PropertyDescriptorImpl extends VariableDescriptorWithInitializerImp
private final boolean lateInit;
private final boolean isConst;
private final boolean isExpect;
private final boolean isImpl;
private final boolean isActual;
private final boolean isExternal;
private final boolean isDelegated;
@@ -67,7 +67,7 @@ public class PropertyDescriptorImpl extends VariableDescriptorWithInitializerImp
boolean lateInit,
boolean isConst,
boolean isExpect,
boolean isImpl,
boolean isActual,
boolean isExternal,
boolean isDelegated
) {
@@ -79,7 +79,7 @@ public class PropertyDescriptorImpl extends VariableDescriptorWithInitializerImp
this.lateInit = lateInit;
this.isConst = isConst;
this.isExpect = isExpect;
this.isImpl = isImpl;
this.isActual = isActual;
this.isExternal = isExternal;
this.isDelegated = isDelegated;
}
@@ -97,13 +97,13 @@ public class PropertyDescriptorImpl extends VariableDescriptorWithInitializerImp
boolean lateInit,
boolean isConst,
boolean isExpect,
boolean isImpl,
boolean isActual,
boolean isExternal,
boolean isDelegated
) {
return new PropertyDescriptorImpl(containingDeclaration, null, annotations,
modality, visibility, isVar, name, kind, source, lateInit, isConst,
isExpect, isImpl, isExternal, isDelegated);
isExpect, isActual, isExternal, isDelegated);
}
public void setType(
@@ -458,7 +458,7 @@ public class PropertyDescriptorImpl extends VariableDescriptorWithInitializerImp
) {
return new PropertyDescriptorImpl(
newOwner, original, getAnnotations(), newModality, newVisibility, isVar(), newName, kind, SourceElement.NO_SOURCE,
isLateInit(), isConst(), isExpect(), isImpl(), isExternal(), isDelegated()
isLateInit(), isConst(), isExpect(), isActual(), isExternal(), isDelegated()
);
}
@@ -485,8 +485,8 @@ public class PropertyDescriptorImpl extends VariableDescriptorWithInitializerImp
}
@Override
public boolean isImpl() {
return isImpl;
public boolean isActual() {
return isActual;
}
@Override
@@ -510,7 +510,7 @@ internal class DescriptorRendererImpl(
private fun renderMemberModifiers(descriptor: MemberDescriptor, builder: StringBuilder) {
renderModifier(builder, descriptor.isExternal, "external")
renderModifier(builder, DescriptorRendererModifier.HEADER in modifiers && descriptor.isExpect, "header")
renderModifier(builder, DescriptorRendererModifier.IMPL in modifiers && descriptor.isImpl, "impl")
renderModifier(builder, DescriptorRendererModifier.IMPL in modifiers && descriptor.isActual, "impl")
}
private fun renderAdditionalModifiers(functionDescriptor: FunctionDescriptor, builder: StringBuilder) {
@@ -100,7 +100,7 @@ class DeserializedClassDescriptor(
override fun isExpect() = Flags.IS_HEADER_CLASS.get(classProto.flags)
override fun isImpl() = false
override fun isActual() = false
override fun isExternal() = Flags.IS_EXTERNAL_CLASS.get(classProto.flags)