Rename platform to header.

This commit is contained in:
Stanislav Erokhin
2016-12-13 17:59:59 +03:00
parent facee84020
commit 59efedf610
134 changed files with 500 additions and 499 deletions
@@ -46,7 +46,7 @@ public class JavaPropertyDescriptor extends PropertyDescriptorImpl implements Ja
boolean isStaticFinal
) {
super(containingDeclaration, original, annotations, modality, visibility, isVar, name, kind, source,
/* lateInit = */ false, /* isConst = */ false, /* isPlatform = */ false, /* isImpl = */ false, /* isExternal = */ false);
/* lateInit = */ false, /* isConst = */ false, /* isHeader = */ false, /* isImpl = */ false, /* isExternal = */ false);
this.isStaticFinal = isStaticFinal;
}
@@ -100,7 +100,7 @@ class LazyJavaClassDescriptor(
override fun isInner() = isInner
override fun isData() = false
override fun isCompanionObject() = false
override fun isPlatform() = false
override fun isHeader() = false
override fun isImpl() = false
private val typeConstructor = c.storageManager.createLazyValue { LazyJavaClassTypeConstructor() }
@@ -102,7 +102,7 @@ class FunctionClassDescriptor(
override fun isCompanionObject() = false
override fun isInner() = false
override fun isData() = false
override fun isPlatform() = false
override fun isHeader() = false
override fun isImpl() = false
override fun isExternal() = false
override val annotations: Annotations get() = Annotations.EMPTY
@@ -26,7 +26,7 @@ public interface MemberDescriptor extends DeclarationDescriptorNonRoot, Declarat
@NotNull
Visibility getVisibility();
boolean isPlatform();
boolean isHeader();
boolean isImpl();
@@ -65,7 +65,7 @@ abstract class AbstractTypeAliasDescriptor(
override fun getVisibility() = visibilityImpl
override fun isPlatform(): Boolean = false
override fun isHeader(): Boolean = false
override fun isImpl(): Boolean = false
@@ -115,7 +115,7 @@ public class ClassDescriptorImpl extends ClassDescriptorBase {
}
@Override
public boolean isPlatform() {
public boolean isHeader() {
return false;
}
@@ -155,7 +155,7 @@ public class EnumEntrySyntheticClassDescriptor extends ClassDescriptorBase {
}
@Override
public boolean isPlatform() {
public boolean isHeader() {
return false;
}
@@ -43,7 +43,7 @@ public abstract class FunctionDescriptorImpl extends DeclarationDescriptorNonRoo
private boolean isExternal = false;
private boolean isInline = false;
private boolean isTailrec = false;
private boolean isPlatform = false;
private boolean isHeader = false;
private boolean isImpl = false;
// Difference between these hidden kinds:
// 1. isHiddenToOvercomeSignatureClash prohibit calling such functions even in super-call context
@@ -136,8 +136,8 @@ public abstract class FunctionDescriptorImpl extends DeclarationDescriptorNonRoo
this.isTailrec = isTailrec;
}
public void setPlatform(boolean isPlatform) {
this.isPlatform = isPlatform;
public void setHeader(boolean isHeader) {
this.isHeader = isHeader;
}
public void setImpl(boolean isImpl) {
@@ -258,8 +258,8 @@ public abstract class FunctionDescriptorImpl extends DeclarationDescriptorNonRoo
}
@Override
public boolean isPlatform() {
return isPlatform;
public boolean isHeader() {
return isHeader;
}
@Override
@@ -651,7 +651,7 @@ public abstract class FunctionDescriptorImpl extends DeclarationDescriptorNonRoo
substitutedDescriptor.setInline(isInline);
substitutedDescriptor.setTailrec(isTailrec);
substitutedDescriptor.setSuspend(isSuspend);
substitutedDescriptor.setPlatform(isPlatform);
substitutedDescriptor.setHeader(isHeader);
substitutedDescriptor.setImpl(isImpl);
substitutedDescriptor.setHasStableParameterNames(hasStableParameterNames);
substitutedDescriptor.setHiddenToOvercomeSignatureClash(configuration.isHiddenToOvercomeSignatureClash);
@@ -227,8 +227,8 @@ public class LazySubstitutingClassDescriptor implements ClassDescriptor {
}
@Override
public boolean isPlatform() {
return original.isPlatform();
public boolean isHeader() {
return original.isHeader();
}
@Override
@@ -103,7 +103,7 @@ public abstract class PropertyAccessorDescriptorImpl extends DeclarationDescript
}
@Override
public boolean isPlatform() {
public boolean isHeader() {
return false;
}
@@ -44,7 +44,7 @@ public class PropertyDescriptorImpl extends VariableDescriptorWithInitializerImp
private final Kind kind;
private final boolean lateInit;
private final boolean isConst;
private final boolean isPlatform;
private final boolean isHeader;
private final boolean isImpl;
private final boolean isExternal;
@@ -67,7 +67,7 @@ public class PropertyDescriptorImpl extends VariableDescriptorWithInitializerImp
@NotNull SourceElement source,
boolean lateInit,
boolean isConst,
boolean isPlatform,
boolean isHeader,
boolean isImpl,
boolean isExternal
) {
@@ -78,7 +78,7 @@ public class PropertyDescriptorImpl extends VariableDescriptorWithInitializerImp
this.kind = kind;
this.lateInit = lateInit;
this.isConst = isConst;
this.isPlatform = isPlatform;
this.isHeader = isHeader;
this.isImpl = isImpl;
this.isExternal = isExternal;
}
@@ -95,13 +95,13 @@ public class PropertyDescriptorImpl extends VariableDescriptorWithInitializerImp
@NotNull SourceElement source,
boolean lateInit,
boolean isConst,
boolean isPlatform,
boolean isHeader,
boolean isImpl,
boolean isExternal
) {
return new PropertyDescriptorImpl(containingDeclaration, null, annotations,
modality, visibility, isVar, name, kind, source, lateInit, isConst,
isPlatform, isImpl, isExternal);
isHeader, isImpl, isExternal);
}
public void setType(
@@ -352,7 +352,7 @@ public class PropertyDescriptorImpl extends VariableDescriptorWithInitializerImp
) {
return new PropertyDescriptorImpl(
newOwner, original, getAnnotations(), newModality, newVisibility, isVar(), getName(), kind, SourceElement.NO_SOURCE,
isLateInit(), isConst(), isPlatform(), isImpl(), isExternal()
isLateInit(), isConst(), isHeader(), isImpl(), isExternal()
);
}
@@ -374,8 +374,8 @@ public class PropertyDescriptorImpl extends VariableDescriptorWithInitializerImp
}
@Override
public boolean isPlatform() {
return isPlatform;
public boolean isHeader() {
return isHeader;
}
@Override
@@ -265,7 +265,7 @@ enum class DescriptorRendererModifier(val includeByDefault: Boolean) {
INNER(true),
MEMBER_KIND(true),
DATA(true),
PLATFORM(true),
HEADER(true),
IMPL(true),
;
@@ -461,10 +461,10 @@ internal class DescriptorRendererImpl(
builder.append(renderKeyword(keyword)).append(" ")
}
private fun renderPlatform(isPlatform: Boolean, builder: StringBuilder) {
if (DescriptorRendererModifier.PLATFORM !in modifiers) return
if (isPlatform) {
builder.append(renderKeyword("platform")).append(" ")
private fun renderHeader(isHeader: Boolean, builder: StringBuilder) {
if (DescriptorRendererModifier.HEADER !in modifiers) return
if (isHeader) {
builder.append(renderKeyword("header")).append(" ")
}
}
@@ -544,8 +544,8 @@ internal class DescriptorRendererImpl(
if (functionDescriptor.isSuspend) {
builder.append("suspend ")
}
if (functionDescriptor.isPlatform) {
builder.append("platform ")
if (functionDescriptor.isHeader) {
builder.append("header ")
}
if (functionDescriptor.isImpl) {
builder.append("impl ")
@@ -910,7 +910,7 @@ internal class DescriptorRendererImpl(
klass.kind.isSingleton && klass.modality == Modality.FINAL)) {
renderModality(klass.modality, builder)
}
renderPlatform(klass.isPlatform, builder)
renderHeader(klass.isHeader, builder)
renderImpl(klass.isImpl, builder)
renderInner(klass.isInner, builder)
renderData(klass.isData, builder)
@@ -368,7 +368,7 @@ public class ErrorUtils {
SourceElement.NO_SOURCE,
/* lateInit = */ false,
/* isConst = */ false,
/* isPlatform = */ false,
/* isHeader = */ false,
/* isImpl = */ false,
/* isExternal = */ false
);
@@ -100,7 +100,7 @@ class NotFoundClasses(private val storageManager: StorageManager, private val mo
override fun isCompanionObject() = false
override fun isData() = false
override fun isPlatform() = false
override fun isHeader() = false
override fun isImpl() = false
override fun isExternal() = false
override val annotations: Annotations get() = Annotations.EMPTY
@@ -95,7 +95,7 @@ class DeserializedClassDescriptor(
override fun isData() = Flags.IS_DATA.get(classProto.flags)
override fun isPlatform() = false
override fun isHeader() = false
override fun isImpl() = false