From 216dbf9637e71d7570eacb6e6207c4422e81d9a5 Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Thu, 24 May 2018 15:37:41 +0300 Subject: [PATCH] Drop IrDeclarationKind --- .../ir/declarations/IrAnonymousInitializer.kt | 3 --- .../kotlin/ir/declarations/IrClass.kt | 3 --- .../kotlin/ir/declarations/IrConstructor.kt | 3 --- .../kotlin/ir/declarations/IrDeclaration.kt | 22 ------------------- .../kotlin/ir/declarations/IrEnumEntry.kt | 2 -- .../kotlin/ir/declarations/IrField.kt | 3 --- .../declarations/IrLocalDelegatedProperty.kt | 3 --- .../kotlin/ir/declarations/IrProperty.kt | 3 --- .../ir/declarations/IrSimpleFunction.kt | 3 --- .../kotlin/ir/declarations/IrTypeAlias.kt | 3 --- .../kotlin/ir/declarations/IrTypeParameter.kt | 3 --- .../ir/declarations/IrValueParameter.kt | 3 --- .../kotlin/ir/declarations/IrVariable.kt | 3 --- .../impl/IrErrorDeclarationImpl.kt | 2 -- 14 files changed, 59 deletions(-) diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrAnonymousInitializer.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrAnonymousInitializer.kt index 514428513e0..ee74cd2209d 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrAnonymousInitializer.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrAnonymousInitializer.kt @@ -23,9 +23,6 @@ import org.jetbrains.kotlin.ir.symbols.IrAnonymousInitializerSymbol interface IrAnonymousInitializer : IrSymbolDeclaration { override val descriptor: ClassDescriptor // TODO special descriptor for anonymous initializer blocks - override val declarationKind: IrDeclarationKind - get() = IrDeclarationKind.ANONYMOUS_INITIALIZER - var body: IrBlockBody } diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrClass.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrClass.kt index 840c8690162..756201f8c0e 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrClass.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrClass.kt @@ -24,9 +24,6 @@ import org.jetbrains.kotlin.ir.symbols.IrClassSymbol import org.jetbrains.kotlin.name.Name interface IrClass : IrSymbolDeclaration, IrDeclarationContainer, IrTypeParametersContainer { - override val declarationKind: IrDeclarationKind - get() = IrDeclarationKind.CLASS - override val descriptor: ClassDescriptor val name: Name diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrConstructor.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrConstructor.kt index b3f5fd30e2a..52e57ac9b3d 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrConstructor.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrConstructor.kt @@ -21,9 +21,6 @@ import org.jetbrains.kotlin.ir.symbols.IrConstructorSymbol interface IrConstructor : IrFunction, IrSymbolDeclaration { - override val declarationKind: IrDeclarationKind - get() = IrDeclarationKind.CONSTRUCTOR - override val descriptor: ClassConstructorDescriptor val isPrimary: Boolean diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrDeclaration.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrDeclaration.kt index 1cca5faecc0..c9e7ef1cefe 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrDeclaration.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrDeclaration.kt @@ -28,7 +28,6 @@ interface IrSymbolOwner : IrElement { interface IrDeclaration : IrStatement, IrAnnotationContainer { val descriptor: DeclarationDescriptor - val declarationKind: IrDeclarationKind val origin: IrDeclarationOrigin var parent: IrDeclarationParent @@ -40,24 +39,3 @@ interface IrDeclaration : IrStatement, IrAnnotationContainer { interface IrSymbolDeclaration : IrDeclaration, IrSymbolOwner { override val symbol: S } - -enum class IrDeclarationKind { - MODULE, - FILE, - CLASS, - ENUM_ENTRY, - FUNCTION, - CONSTRUCTOR, - PROPERTY, - FIELD, - PROPERTY_ACCESSOR, - VARIABLE, - LOCAL_PROPERTY, - LOCAL_PROPERTY_ACCESSOR, - TYPEALIAS, - ANONYMOUS_INITIALIZER, - TYPE_PARAMETER, - VALUE_PARAMETER, - ERROR; -} - diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrEnumEntry.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrEnumEntry.kt index e190c477d98..160c0eceddf 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrEnumEntry.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrEnumEntry.kt @@ -22,8 +22,6 @@ import org.jetbrains.kotlin.ir.symbols.IrEnumEntrySymbol import org.jetbrains.kotlin.name.Name interface IrEnumEntry : IrSymbolDeclaration { - override val declarationKind: IrDeclarationKind get() = IrDeclarationKind.ENUM_ENTRY - override val descriptor: ClassDescriptor val name: Name diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrField.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrField.kt index 4ef2d569676..df352158c96 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrField.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrField.kt @@ -15,9 +15,6 @@ import org.jetbrains.kotlin.types.KotlinType interface IrField : IrSymbolDeclaration { override val descriptor: PropertyDescriptor - override val declarationKind: IrDeclarationKind - get() = IrDeclarationKind.FIELD - val name: Name val type: KotlinType val visibility: Visibility diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrLocalDelegatedProperty.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrLocalDelegatedProperty.kt index e9cacc4dae3..e25ae2d5c44 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrLocalDelegatedProperty.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrLocalDelegatedProperty.kt @@ -30,7 +30,4 @@ interface IrLocalDelegatedProperty : IrDeclaration { var delegate: IrVariable var getter: IrFunction var setter: IrFunction? - - override val declarationKind: IrDeclarationKind - get() = IrDeclarationKind.LOCAL_PROPERTY } diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrProperty.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrProperty.kt index aba31db3dfc..2a4a30547d4 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrProperty.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrProperty.kt @@ -40,7 +40,4 @@ interface IrProperty : IrDeclaration { var backingField: IrField? var getter: IrFunction? var setter: IrFunction? - - override val declarationKind: IrDeclarationKind - get() = IrDeclarationKind.PROPERTY } \ No newline at end of file diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrSimpleFunction.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrSimpleFunction.kt index 94f21224236..730f60fdf7b 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrSimpleFunction.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrSimpleFunction.kt @@ -26,7 +26,4 @@ interface IrSimpleFunction : IrFunction, IrSymbolDeclaration - - override val declarationKind: IrDeclarationKind - get() = IrDeclarationKind.FUNCTION } \ No newline at end of file diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrTypeAlias.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrTypeAlias.kt index fb4ba11ca14..95211809f51 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrTypeAlias.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrTypeAlias.kt @@ -20,8 +20,5 @@ import org.jetbrains.kotlin.descriptors.TypeAliasDescriptor interface IrTypeAlias : IrDeclaration { override val descriptor: TypeAliasDescriptor - - override val declarationKind: IrDeclarationKind - get() = IrDeclarationKind.TYPEALIAS } diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrTypeParameter.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrTypeParameter.kt index a5d4db12cfa..a973b6a42f0 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrTypeParameter.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrTypeParameter.kt @@ -25,9 +25,6 @@ import org.jetbrains.kotlin.types.KotlinType import org.jetbrains.kotlin.types.Variance interface IrTypeParameter : IrSymbolDeclaration { - override val declarationKind: IrDeclarationKind - get() = IrDeclarationKind.TYPE_PARAMETER - override val descriptor: TypeParameterDescriptor val name: Name diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrValueParameter.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrValueParameter.kt index 22e8ee0b76a..679bab860b2 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrValueParameter.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrValueParameter.kt @@ -23,9 +23,6 @@ import org.jetbrains.kotlin.ir.visitors.IrElementTransformer import org.jetbrains.kotlin.types.KotlinType interface IrValueParameter : IrValueDeclaration, IrSymbolDeclaration { - override val declarationKind: IrDeclarationKind - get() = IrDeclarationKind.VALUE_PARAMETER - override val descriptor: ParameterDescriptor val index: Int diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrVariable.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrVariable.kt index e8cb1a1ad4e..332f0d024fd 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrVariable.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/IrVariable.kt @@ -27,9 +27,6 @@ interface IrVariable : IrValueDeclaration, IrSymbolDeclaration val isConst: Boolean val isLateinit: Boolean - override val declarationKind: IrDeclarationKind - get() = IrDeclarationKind.VARIABLE - var initializer: IrExpression? } diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrErrorDeclarationImpl.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrErrorDeclarationImpl.kt index 7adb08cb34a..ccf2edc32a5 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrErrorDeclarationImpl.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrErrorDeclarationImpl.kt @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.ir.declarations.impl import org.jetbrains.kotlin.descriptors.DeclarationDescriptor -import org.jetbrains.kotlin.ir.declarations.IrDeclarationKind import org.jetbrains.kotlin.ir.declarations.IrDeclarationOrigin import org.jetbrains.kotlin.ir.declarations.IrErrorDeclaration import org.jetbrains.kotlin.ir.visitors.IrElementTransformer @@ -28,7 +27,6 @@ class IrErrorDeclarationImpl( endOffset: Int, override val descriptor: DeclarationDescriptor ) : IrDeclarationBase(startOffset, endOffset, IrDeclarationOrigin.DEFINED), IrErrorDeclaration { - override val declarationKind: IrDeclarationKind get() = IrDeclarationKind.ERROR override fun accept(visitor: IrElementVisitor, data: D): R { return visitor.visitErrorDeclaration(this, data)