Drop IrDeclarationKind
This commit is contained in:
@@ -23,9 +23,6 @@ import org.jetbrains.kotlin.ir.symbols.IrAnonymousInitializerSymbol
|
|||||||
interface IrAnonymousInitializer : IrSymbolDeclaration<IrAnonymousInitializerSymbol> {
|
interface IrAnonymousInitializer : IrSymbolDeclaration<IrAnonymousInitializerSymbol> {
|
||||||
override val descriptor: ClassDescriptor // TODO special descriptor for anonymous initializer blocks
|
override val descriptor: ClassDescriptor // TODO special descriptor for anonymous initializer blocks
|
||||||
|
|
||||||
override val declarationKind: IrDeclarationKind
|
|
||||||
get() = IrDeclarationKind.ANONYMOUS_INITIALIZER
|
|
||||||
|
|
||||||
var body: IrBlockBody
|
var body: IrBlockBody
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -24,9 +24,6 @@ import org.jetbrains.kotlin.ir.symbols.IrClassSymbol
|
|||||||
import org.jetbrains.kotlin.name.Name
|
import org.jetbrains.kotlin.name.Name
|
||||||
|
|
||||||
interface IrClass : IrSymbolDeclaration<IrClassSymbol>, IrDeclarationContainer, IrTypeParametersContainer {
|
interface IrClass : IrSymbolDeclaration<IrClassSymbol>, IrDeclarationContainer, IrTypeParametersContainer {
|
||||||
override val declarationKind: IrDeclarationKind
|
|
||||||
get() = IrDeclarationKind.CLASS
|
|
||||||
|
|
||||||
override val descriptor: ClassDescriptor
|
override val descriptor: ClassDescriptor
|
||||||
|
|
||||||
val name: Name
|
val name: Name
|
||||||
|
|||||||
@@ -21,9 +21,6 @@ import org.jetbrains.kotlin.ir.symbols.IrConstructorSymbol
|
|||||||
|
|
||||||
|
|
||||||
interface IrConstructor : IrFunction, IrSymbolDeclaration<IrConstructorSymbol> {
|
interface IrConstructor : IrFunction, IrSymbolDeclaration<IrConstructorSymbol> {
|
||||||
override val declarationKind: IrDeclarationKind
|
|
||||||
get() = IrDeclarationKind.CONSTRUCTOR
|
|
||||||
|
|
||||||
override val descriptor: ClassConstructorDescriptor
|
override val descriptor: ClassConstructorDescriptor
|
||||||
|
|
||||||
val isPrimary: Boolean
|
val isPrimary: Boolean
|
||||||
|
|||||||
@@ -28,7 +28,6 @@ interface IrSymbolOwner : IrElement {
|
|||||||
|
|
||||||
interface IrDeclaration : IrStatement, IrAnnotationContainer {
|
interface IrDeclaration : IrStatement, IrAnnotationContainer {
|
||||||
val descriptor: DeclarationDescriptor
|
val descriptor: DeclarationDescriptor
|
||||||
val declarationKind: IrDeclarationKind
|
|
||||||
val origin: IrDeclarationOrigin
|
val origin: IrDeclarationOrigin
|
||||||
|
|
||||||
var parent: IrDeclarationParent
|
var parent: IrDeclarationParent
|
||||||
@@ -40,24 +39,3 @@ interface IrDeclaration : IrStatement, IrAnnotationContainer {
|
|||||||
interface IrSymbolDeclaration<out S : IrSymbol> : IrDeclaration, IrSymbolOwner {
|
interface IrSymbolDeclaration<out S : IrSymbol> : IrDeclaration, IrSymbolOwner {
|
||||||
override val symbol: S
|
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;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|||||||
@@ -22,8 +22,6 @@ import org.jetbrains.kotlin.ir.symbols.IrEnumEntrySymbol
|
|||||||
import org.jetbrains.kotlin.name.Name
|
import org.jetbrains.kotlin.name.Name
|
||||||
|
|
||||||
interface IrEnumEntry : IrSymbolDeclaration<IrEnumEntrySymbol> {
|
interface IrEnumEntry : IrSymbolDeclaration<IrEnumEntrySymbol> {
|
||||||
override val declarationKind: IrDeclarationKind get() = IrDeclarationKind.ENUM_ENTRY
|
|
||||||
|
|
||||||
override val descriptor: ClassDescriptor
|
override val descriptor: ClassDescriptor
|
||||||
|
|
||||||
val name: Name
|
val name: Name
|
||||||
|
|||||||
@@ -15,9 +15,6 @@ import org.jetbrains.kotlin.types.KotlinType
|
|||||||
interface IrField : IrSymbolDeclaration<IrFieldSymbol> {
|
interface IrField : IrSymbolDeclaration<IrFieldSymbol> {
|
||||||
override val descriptor: PropertyDescriptor
|
override val descriptor: PropertyDescriptor
|
||||||
|
|
||||||
override val declarationKind: IrDeclarationKind
|
|
||||||
get() = IrDeclarationKind.FIELD
|
|
||||||
|
|
||||||
val name: Name
|
val name: Name
|
||||||
val type: KotlinType
|
val type: KotlinType
|
||||||
val visibility: Visibility
|
val visibility: Visibility
|
||||||
|
|||||||
-3
@@ -30,7 +30,4 @@ interface IrLocalDelegatedProperty : IrDeclaration {
|
|||||||
var delegate: IrVariable
|
var delegate: IrVariable
|
||||||
var getter: IrFunction
|
var getter: IrFunction
|
||||||
var setter: IrFunction?
|
var setter: IrFunction?
|
||||||
|
|
||||||
override val declarationKind: IrDeclarationKind
|
|
||||||
get() = IrDeclarationKind.LOCAL_PROPERTY
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -40,7 +40,4 @@ interface IrProperty : IrDeclaration {
|
|||||||
var backingField: IrField?
|
var backingField: IrField?
|
||||||
var getter: IrFunction?
|
var getter: IrFunction?
|
||||||
var setter: IrFunction?
|
var setter: IrFunction?
|
||||||
|
|
||||||
override val declarationKind: IrDeclarationKind
|
|
||||||
get() = IrDeclarationKind.PROPERTY
|
|
||||||
}
|
}
|
||||||
@@ -26,7 +26,4 @@ interface IrSimpleFunction : IrFunction, IrSymbolDeclaration<IrSimpleFunctionSym
|
|||||||
val isSuspend: Boolean
|
val isSuspend: Boolean
|
||||||
|
|
||||||
val overriddenSymbols: MutableList<IrSimpleFunctionSymbol>
|
val overriddenSymbols: MutableList<IrSimpleFunctionSymbol>
|
||||||
|
|
||||||
override val declarationKind: IrDeclarationKind
|
|
||||||
get() = IrDeclarationKind.FUNCTION
|
|
||||||
}
|
}
|
||||||
@@ -20,8 +20,5 @@ import org.jetbrains.kotlin.descriptors.TypeAliasDescriptor
|
|||||||
|
|
||||||
interface IrTypeAlias : IrDeclaration {
|
interface IrTypeAlias : IrDeclaration {
|
||||||
override val descriptor: TypeAliasDescriptor
|
override val descriptor: TypeAliasDescriptor
|
||||||
|
|
||||||
override val declarationKind: IrDeclarationKind
|
|
||||||
get() = IrDeclarationKind.TYPEALIAS
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -25,9 +25,6 @@ import org.jetbrains.kotlin.types.KotlinType
|
|||||||
import org.jetbrains.kotlin.types.Variance
|
import org.jetbrains.kotlin.types.Variance
|
||||||
|
|
||||||
interface IrTypeParameter : IrSymbolDeclaration<IrTypeParameterSymbol> {
|
interface IrTypeParameter : IrSymbolDeclaration<IrTypeParameterSymbol> {
|
||||||
override val declarationKind: IrDeclarationKind
|
|
||||||
get() = IrDeclarationKind.TYPE_PARAMETER
|
|
||||||
|
|
||||||
override val descriptor: TypeParameterDescriptor
|
override val descriptor: TypeParameterDescriptor
|
||||||
|
|
||||||
val name: Name
|
val name: Name
|
||||||
|
|||||||
@@ -23,9 +23,6 @@ import org.jetbrains.kotlin.ir.visitors.IrElementTransformer
|
|||||||
import org.jetbrains.kotlin.types.KotlinType
|
import org.jetbrains.kotlin.types.KotlinType
|
||||||
|
|
||||||
interface IrValueParameter : IrValueDeclaration, IrSymbolDeclaration<IrValueParameterSymbol> {
|
interface IrValueParameter : IrValueDeclaration, IrSymbolDeclaration<IrValueParameterSymbol> {
|
||||||
override val declarationKind: IrDeclarationKind
|
|
||||||
get() = IrDeclarationKind.VALUE_PARAMETER
|
|
||||||
|
|
||||||
override val descriptor: ParameterDescriptor
|
override val descriptor: ParameterDescriptor
|
||||||
|
|
||||||
val index: Int
|
val index: Int
|
||||||
|
|||||||
@@ -27,9 +27,6 @@ interface IrVariable : IrValueDeclaration, IrSymbolDeclaration<IrVariableSymbol>
|
|||||||
val isConst: Boolean
|
val isConst: Boolean
|
||||||
val isLateinit: Boolean
|
val isLateinit: Boolean
|
||||||
|
|
||||||
override val declarationKind: IrDeclarationKind
|
|
||||||
get() = IrDeclarationKind.VARIABLE
|
|
||||||
|
|
||||||
var initializer: IrExpression?
|
var initializer: IrExpression?
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
-2
@@ -17,7 +17,6 @@
|
|||||||
package org.jetbrains.kotlin.ir.declarations.impl
|
package org.jetbrains.kotlin.ir.declarations.impl
|
||||||
|
|
||||||
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
|
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.IrDeclarationOrigin
|
||||||
import org.jetbrains.kotlin.ir.declarations.IrErrorDeclaration
|
import org.jetbrains.kotlin.ir.declarations.IrErrorDeclaration
|
||||||
import org.jetbrains.kotlin.ir.visitors.IrElementTransformer
|
import org.jetbrains.kotlin.ir.visitors.IrElementTransformer
|
||||||
@@ -28,7 +27,6 @@ class IrErrorDeclarationImpl(
|
|||||||
endOffset: Int,
|
endOffset: Int,
|
||||||
override val descriptor: DeclarationDescriptor
|
override val descriptor: DeclarationDescriptor
|
||||||
) : IrDeclarationBase(startOffset, endOffset, IrDeclarationOrigin.DEFINED), IrErrorDeclaration {
|
) : IrDeclarationBase(startOffset, endOffset, IrDeclarationOrigin.DEFINED), IrErrorDeclaration {
|
||||||
override val declarationKind: IrDeclarationKind get() = IrDeclarationKind.ERROR
|
|
||||||
|
|
||||||
override fun <R, D> accept(visitor: IrElementVisitor<R, D>, data: D): R {
|
override fun <R, D> accept(visitor: IrElementVisitor<R, D>, data: D): R {
|
||||||
return visitor.visitErrorDeclaration(this, data)
|
return visitor.visitErrorDeclaration(this, data)
|
||||||
|
|||||||
Reference in New Issue
Block a user