azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename isImpl to isActual in descriptors

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/cfg/ControlFlowInformationProvider.kt
+1 -1
View File
@@ -665,7 +665,7 @@ class ControlFlowInformationProvider private constructor(
if (isMain
|| functionDescriptor.isOverridableOrOverrides
|| owner.hasModifier(KtTokens.OVERRIDE_KEYWORD)
|| functionDescriptor.isExpect || functionDescriptor.isImpl
|| functionDescriptor.isExpect || functionDescriptor.isActual
|| functionDescriptor.isEffectivelyExternal()
|| OperatorNameConventions.GET_VALUE == functionName
|| OperatorNameConventions.SET_VALUE == functionName
compiler/frontend/src/org/jetbrains/kotlin/psi/synthetics/SyntheticClassOrObjectDescriptor.kt
+1 -1
View File
@@ -75,7 +75,7 @@ class SyntheticClassOrObjectDescriptor(
override fun isInner() = false
override fun isData() = false
override fun isExpect() = false
override fun isImpl() = false
override fun isActual() = false
override fun getCompanionObjectDescriptor() = null
override fun getTypeConstructor(): TypeConstructor = typeConstructor
compiler/frontend/src/org/jetbrains/kotlin/resolve/FunctionDescriptorResolver.kt
+3 -3
View File
@@ -186,7 +186,7 @@ class FunctionDescriptorResolver(
functionDescriptor.isSuspend = function.hasModifier(KtTokens.SUSPEND_KEYWORD)
functionDescriptor.isExpect = container is PackageFragmentDescriptor && function.hasExpectModifier() ||
container is ClassDescriptor && container.isExpect
functionDescriptor.isImpl = function.hasActualModifier()
functionDescriptor.isActual = function.hasActualModifier()
receiverType?.let { ForceResolveUtil.forceResolveAllContents(it.annotations) }
for (valueParameterDescriptor in valueParameterDescriptors) {
@@ -299,8 +299,8 @@ class FunctionDescriptorResolver(
if (classDescriptor.isExpect) {
constructorDescriptor.isExpect = true
}
if (classDescriptor.isImpl) {
constructorDescriptor.isImpl = true
if (classDescriptor.isActual) {
constructorDescriptor.isActual = true
}
if (declarationToTrace is PsiElement)
trace.record(BindingContext.CONSTRUCTOR, declarationToTrace, constructorDescriptor)
compiler/frontend/src/org/jetbrains/kotlin/resolve/LocalVariableResolver.kt
+1 -1
View File
@@ -154,7 +154,7 @@ class LocalVariableResolver(
/* lateInit = */ false,
/* isConst = */ false,
/* isExpect = */ false,
/* isImpl = */ false,
/* isActual = */ false,
/* isExternal = */ false,
variable is KtProperty && variable.hasDelegate()
)
compiler/frontend/src/org/jetbrains/kotlin/resolve/OverloadResolver.kt
+1 -1
View File
@@ -290,7 +290,7 @@ class OverloadResolver(
private fun isDefinitionsForDifferentPlatforms(member1: DeclarationDescriptorNonRoot, member2: DeclarationDescriptorNonRoot): Boolean {
if (member1 !is MemberDescriptor || member2 !is MemberDescriptor) return false
return member1.isImpl && member2.isImpl &&
return member1.isActual && member2.isActual &&
member1.getMultiTargetPlatform() != member2.getMultiTargetPlatform()
}
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/dynamicCalls.kt
+1 -1
View File
@@ -99,7 +99,7 @@ class DynamicCallableDescriptors(storageManager: StorageManager, builtIns: Kotli
/* lateInit = */ false,
/* isConst = */ false,
/* isExpect = */ false,
/* isImpl = */ false,
/* isActual = */ false,
/* isExternal = */ false,
/* isDelegated = */ false
)
compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/HeaderImplDeclarationChecker.kt
+1 -1
View File
@@ -127,7 +127,7 @@ object HeaderImplDeclarationChecker : DeclarationChecker {
// TODO: use common module here
val compatibility = findHeaderForImpl(descriptor, descriptor.module) ?: return
val hasImplModifier = descriptor.isImpl && reportOn.hasActualModifier()
val hasImplModifier = descriptor.isActual && reportOn.hasActualModifier()
if (!hasImplModifier) {
if (Compatible !in compatibility) return
compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassDescriptor.java
+5 -5
View File
@@ -92,7 +92,7 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes
private final boolean isInner;
private final boolean isData;
private final boolean isExpect;
private final boolean isImpl;
private final boolean isActual;
private final Annotations annotations;
private final Annotations danglingAnnotations;
@@ -166,7 +166,7 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes
this.isInner = modifierList != null && modifierList.hasModifier(INNER_KEYWORD) && !isIllegalInner(this);
this.isData = modifierList != null && modifierList.hasModifier(KtTokens.DATA_KEYWORD);
this.isImpl = modifierList != null && PsiUtilsKt.hasActualModifier(modifierList);
this.isActual = modifierList != null && PsiUtilsKt.hasActualModifier(modifierList);
this.isExpect = modifierList != null && PsiUtilsKt.hasExpectModifier(modifierList) ||
containingDeclaration instanceof ClassDescriptor && ((ClassDescriptor) containingDeclaration).isExpect();
@@ -503,8 +503,8 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes
}
@Override
public boolean isImpl() {
return isImpl;
public boolean isActual() {
return isActual;
}
@NotNull
@@ -527,7 +527,7 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes
@Override
public String toString() {
// not using DescriptorRenderer to preserve laziness
return (isExpect ? "header " : isImpl ? "impl " : "") + "class " + getName().toString();
return (isExpect ? "header " : isActual ? "impl " : "") + "class " + getName().toString();
}
@Override
compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyTypeAliasDescriptor.kt
+2 -2
View File
@@ -49,14 +49,14 @@ class LazyTypeAliasDescriptor(
private lateinit var expandedTypeImpl: NotNullLazyValue<SimpleType>
private lateinit var defaultTypeImpl: NotNullLazyValue<SimpleType>
private lateinit var classDescriptorImpl: NullableLazyValue<ClassDescriptor>
private val isImpl = (source.getPsi() as? KtTypeAlias)?.hasActualModifier() == true
private val isActual = (source.getPsi() as? KtTypeAlias)?.hasActualModifier() == true
override val underlyingType: SimpleType get() = underlyingTypeImpl()
override val expandedType: SimpleType get() = expandedTypeImpl()
override val classDescriptor: ClassDescriptor? get() = classDescriptorImpl()
override fun getDefaultType(): SimpleType = defaultTypeImpl()
override fun isImpl(): Boolean = isImpl
override fun isActual(): Boolean = isActual
fun initialize(
declaredTypeParameters: List<TypeParameterDescriptor>,