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/ir/backend.common/src/org/jetbrains/kotlin/backend/common/DeepCopyIrTreeWithDescriptoros.kt
+1 -1
View File
@@ -278,7 +278,7 @@ class DeepCopyIrTreeWithDescriptors(val targetDescriptor: FunctionDescriptor,
/* lateInit = */ oldDescriptor.isLateInit,
/* isConst = */ oldDescriptor.isConst,
/* isExpect = */ oldDescriptor.isExpect,
/* isImpl = */ oldDescriptor.isImpl,
/* isActual = */ oldDescriptor.isActual,
/* isExternal = */ oldDescriptor.isExternal,
/* isDelegated = */ oldDescriptor.isDelegated
).apply {
compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/IrBuildUtils.kt
+1 -1
View File
@@ -179,7 +179,7 @@ fun BackendContext.createPropertyWithBackingFieldBuilder(startOffset: Int, endOf
/* lateInit = */ false,
/* isConst = */ false,
/* isExpect = */ false,
/* isImpl = */ false,
/* isActual = */ false,
/* isExternal = */ false,
/* isDelegated = */ false
)
compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/LocalDeclarationsLowering.kt
+1 -1
View File
@@ -598,7 +598,7 @@ class LocalDeclarationsLowering(val context: BackendContext) : DeclarationContai
/* lateInit = */ false,
/* isConst = */ false,
/* isExpect = */ false,
/* isImpl = */ false,
/* isActual = */ false,
/* isExternal = */ false,
/* isDelegated = */ false)
compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/descriptors/JvmDescriptorWithExtraFlags.kt
+3 -3
View File
@@ -41,10 +41,10 @@ class JvmPropertyDescriptorImpl private constructor(
isLateInit: Boolean,
isConst: Boolean,
isExpect: Boolean,
isImpl: Boolean
isActual: Boolean
) : JvmDescriptorWithExtraFlags, PropertyDescriptorImpl(
containingDeclaration, original, annotations, modality, visibility, isVar,
name, kind, source, isLateInit, isConst, isExpect, isImpl, /* isExternal = */ false, false
name, kind, source, isLateInit, isConst, isExpect, isActual, /* isExternal = */ false, false
) {
override fun createSubstitutedCopy(
newOwner: DeclarationDescriptor,
@@ -56,7 +56,7 @@ class JvmPropertyDescriptorImpl private constructor(
): PropertyDescriptorImpl =
JvmPropertyDescriptorImpl(
newOwner, original, annotations, newModality, newVisibility, extraFlags, isVar, newName, kind,
SourceElement.NO_SOURCE, isLateInit, isConst, isExpect, isImpl
SourceElement.NO_SOURCE, isLateInit, isConst, isExpect, isActual
)
companion object {
compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/descriptors/KnownDescriptors.kt
+1 -1
View File
@@ -144,7 +144,7 @@ open class KnownClassDescriptor(
override fun isData(): Boolean = false
override fun isInner(): Boolean = false
override fun isExpect(): Boolean = false
override fun isImpl(): Boolean = false
override fun isActual(): Boolean = false
override fun isExternal(): Boolean = false
override fun <R : Any?, D : Any?> accept(visitor: DeclarationDescriptorVisitor<R, D>, data: D): R {
compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/descriptors/SharedVariablesManager.kt
+2 -2
View File
@@ -53,7 +53,7 @@ class JvmSharedVariablesManager(val builtIns: KotlinBuiltIns) : SharedVariablesM
PropertyDescriptorImpl.create(
refClass, Annotations.EMPTY, Modality.FINAL, Visibilities.PUBLIC, true,
Name.identifier("element"), CallableMemberDescriptor.Kind.DECLARATION, SourceElement.NO_SOURCE,
/* lateInit = */ false, /* isConst = */ false, /* isExpect = */ false, /* isImpl = */ false,
/* lateInit = */ false, /* isConst = */ false, /* isExpect = */ false, /* isActual = */ false,
/* isExternal = */ false, /* isDelegated = */ false
).initialize(type, dispatchReceiverParameter = refClass.thisAsReceiverParameter)
}
@@ -94,7 +94,7 @@ class JvmSharedVariablesManager(val builtIns: KotlinBuiltIns) : SharedVariablesM
PropertyDescriptorImpl.create(
genericRefClass, Annotations.EMPTY, Modality.FINAL, Visibilities.PUBLIC, true,
Name.identifier("element"), CallableMemberDescriptor.Kind.DECLARATION, SourceElement.NO_SOURCE,
/* lateInit = */ false, /* isConst = */ false, /* isExpect = */ false, /* isImpl = */ false,
/* lateInit = */ false, /* isConst = */ false, /* isExpect = */ false, /* isActual = */ false,
/* isExternal = */ false, /* isDelegated = */ false
).initialize(
type = builtIns.anyType,
compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/descriptors/SpecialDescriptorsFactory.kt
+1 -1
View File
@@ -130,7 +130,7 @@ class SpecialDescriptorsFactory(
Annotations.EMPTY, Modality.FINAL, Visibilities.PUBLIC, false,
Name.identifier("INSTANCE"),
CallableMemberDescriptor.Kind.SYNTHESIZED, SourceElement.NO_SOURCE, /* lateInit = */ false, /* isConst = */ false,
/* isExpect = */ false, /* isImpl = */ false, /* isExternal = */ false, /* isDelegated = */ false
/* isExpect = */ false, /* isActual = */ false, /* isExternal = */ false, /* isDelegated = */ false
).initialize(objectDescriptor.defaultType)
}
}
compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/IrBuiltinFunctionDescriptor.kt
+1 -1
View File
@@ -55,7 +55,7 @@ abstract class IrBuiltinOperatorDescriptorBase(containingDeclaration: Declaratio
override fun isSuspend(): Boolean = false
override fun isTailrec(): Boolean = false
override fun isExpect(): Boolean = false
override fun isImpl(): Boolean = false
override fun isActual(): Boolean = false
override fun hasStableParameterNames(): Boolean = true
override fun hasSynthesizedParameterNames(): Boolean = false
compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/IrDelegateDescriptor.kt
+1 -1
View File
@@ -61,7 +61,7 @@ abstract class IrDelegateDescriptorBase(
/* lateInit = */ false,
/* isConst = */ false,
/* isExpect = */ false,
/* isImpl = */ false,
/* isActual = */ false,
/* isExternal = */ false,
/* isDelegated = */ true
) {