IR: make subtypes of IrDeclaration classes

This commit is contained in:
Alexander Udalov
2020-07-22 14:09:30 +02:00
parent 3cecf81176
commit 771e7574f4
54 changed files with 152 additions and 157 deletions
@@ -34,8 +34,8 @@ internal class PersistentIrAnonymousInitializer(
origin: IrDeclarationOrigin,
override val symbol: IrAnonymousInitializerSymbol,
override val isStatic: Boolean = false
) : PersistentIrDeclarationBase<AnonymousInitializerCarrier>,
IrAnonymousInitializer,
) : IrAnonymousInitializer(),
PersistentIrDeclarationBase<AnonymousInitializerCarrier>,
AnonymousInitializerCarrier {
init {
@@ -44,9 +44,8 @@ internal class PersistentIrClass(
override val isExpect: Boolean = false,
override val isFun: Boolean = false,
override val source: SourceElement = SourceElement.NO_SOURCE
) :
) : IrClass(),
PersistentIrDeclarationBase<ClassCarrier>,
IrClass,
ClassCarrier {
init {
@@ -40,9 +40,8 @@ internal class PersistentIrConstructor(
override val isExternal: Boolean,
override val isPrimary: Boolean,
override val isExpect: Boolean
) :
) : IrConstructor(),
PersistentIrDeclarationBase<ConstructorCarrier>,
IrConstructor,
ConstructorCarrier {
init {
@@ -32,8 +32,8 @@ internal class PersistentIrEnumEntry(
origin: IrDeclarationOrigin,
override val symbol: IrEnumEntrySymbol,
override val name: Name
) : PersistentIrDeclarationBase<EnumEntryCarrier>,
IrEnumEntry,
) : IrEnumEntry(),
PersistentIrDeclarationBase<EnumEntryCarrier>,
EnumEntryCarrier {
init {
@@ -31,7 +31,7 @@ internal class PersistentIrErrorDeclaration(
override val startOffset: Int,
override val endOffset: Int,
override val descriptor: DeclarationDescriptor
) : PersistentIrDeclarationBase<ErrorCarrier>, IrErrorDeclaration, ErrorCarrier {
) : PersistentIrDeclarationBase<ErrorCarrier>, IrErrorDeclaration(), ErrorCarrier {
override var lastModified: Int = stageController.currentStage
override var loweredUpTo: Int = stageController.currentStage
override var values: Array<Carrier>? = null
@@ -40,8 +40,8 @@ internal class PersistentIrField(
override val isFinal: Boolean,
override val isExternal: Boolean,
override val isStatic: Boolean
) : PersistentIrDeclarationBase<FieldCarrier>,
IrField,
) : IrField(),
PersistentIrDeclarationBase<FieldCarrier>,
FieldCarrier {
init {
@@ -34,9 +34,8 @@ internal abstract class PersistentIrFunctionCommon(
override val isOperator: Boolean,
override val isInfix: Boolean,
override val isExpect: Boolean,
) :
) : IrSimpleFunction(),
PersistentIrDeclarationBase<FunctionCarrier>,
IrSimpleFunction,
FunctionCarrier {
override var lastModified: Int = stageController.currentStage
@@ -37,7 +37,7 @@ internal class PersistentIrLocalDelegatedProperty(
override val isVar: Boolean
) :
PersistentIrDeclarationBase<LocalDelegatedPropertyCarrier>,
IrLocalDelegatedProperty,
IrLocalDelegatedProperty(),
LocalDelegatedPropertyCarrier {
init {
@@ -40,8 +40,8 @@ internal abstract class PersistentIrPropertyCommon(
override val isDelegated: Boolean,
override val isExternal: Boolean,
override val isExpect: Boolean,
) : PersistentIrDeclarationBase<PropertyCarrier>,
IrProperty,
) : IrProperty(),
PersistentIrDeclarationBase<PropertyCarrier>,
PropertyCarrier {
override var lastModified: Int = stageController.currentStage
@@ -25,9 +25,8 @@ internal class PersistentIrTypeAlias(
override val expandedType: IrType,
override val isActual: Boolean,
origin: IrDeclarationOrigin
) :
) : IrTypeAlias(),
PersistentIrDeclarationBase<TypeAliasCarrier>,
IrTypeAlias,
TypeAliasCarrier {
init {
@@ -40,9 +40,8 @@ internal class PersistentIrTypeParameter(
override val index: Int,
override val isReified: Boolean,
override val variance: Variance
) :
) : IrTypeParameter(),
PersistentIrDeclarationBase<TypeParameterCarrier>,
IrTypeParameter,
TypeParameterCarrier {
init {
@@ -41,9 +41,8 @@ internal class PersistentIrValueParameter(
override val varargElementType: IrType?,
override val isCrossinline: Boolean,
override val isNoinline: Boolean
) :
) : IrValueParameter(),
PersistentIrDeclarationBase<ValueParameterCarrier>,
IrValueParameter,
ValueParameterCarrier {
@ObsoleteDescriptorBasedAPI