Drop IrProperty.typeParameters
This commit is contained in:
@@ -19,7 +19,6 @@ package org.jetbrains.kotlin.ir.declarations
|
|||||||
import org.jetbrains.kotlin.descriptors.Modality
|
import org.jetbrains.kotlin.descriptors.Modality
|
||||||
import org.jetbrains.kotlin.descriptors.PropertyDescriptor
|
import org.jetbrains.kotlin.descriptors.PropertyDescriptor
|
||||||
import org.jetbrains.kotlin.descriptors.Visibility
|
import org.jetbrains.kotlin.descriptors.Visibility
|
||||||
import org.jetbrains.kotlin.ir.types.IrType
|
|
||||||
import org.jetbrains.kotlin.name.Name
|
import org.jetbrains.kotlin.name.Name
|
||||||
|
|
||||||
interface IrProperty : IrDeclaration {
|
interface IrProperty : IrDeclaration {
|
||||||
@@ -34,8 +33,6 @@ interface IrProperty : IrDeclaration {
|
|||||||
val isDelegated: Boolean
|
val isDelegated: Boolean
|
||||||
val isExternal: Boolean
|
val isExternal: Boolean
|
||||||
|
|
||||||
val typeParameters: MutableList<IrTypeParameter>
|
|
||||||
|
|
||||||
var backingField: IrField?
|
var backingField: IrField?
|
||||||
var getter: IrSimpleFunction?
|
var getter: IrSimpleFunction?
|
||||||
var setter: IrSimpleFunction?
|
var setter: IrSimpleFunction?
|
||||||
|
|||||||
@@ -19,13 +19,14 @@ package org.jetbrains.kotlin.ir.declarations.impl
|
|||||||
import org.jetbrains.kotlin.descriptors.Modality
|
import org.jetbrains.kotlin.descriptors.Modality
|
||||||
import org.jetbrains.kotlin.descriptors.PropertyDescriptor
|
import org.jetbrains.kotlin.descriptors.PropertyDescriptor
|
||||||
import org.jetbrains.kotlin.descriptors.Visibility
|
import org.jetbrains.kotlin.descriptors.Visibility
|
||||||
import org.jetbrains.kotlin.ir.declarations.*
|
import org.jetbrains.kotlin.ir.declarations.IrDeclarationOrigin
|
||||||
import org.jetbrains.kotlin.ir.util.transform
|
import org.jetbrains.kotlin.ir.declarations.IrField
|
||||||
|
import org.jetbrains.kotlin.ir.declarations.IrProperty
|
||||||
|
import org.jetbrains.kotlin.ir.declarations.IrSimpleFunction
|
||||||
import org.jetbrains.kotlin.ir.visitors.IrElementTransformer
|
import org.jetbrains.kotlin.ir.visitors.IrElementTransformer
|
||||||
import org.jetbrains.kotlin.ir.visitors.IrElementVisitor
|
import org.jetbrains.kotlin.ir.visitors.IrElementVisitor
|
||||||
import org.jetbrains.kotlin.name.Name
|
import org.jetbrains.kotlin.name.Name
|
||||||
import org.jetbrains.kotlin.resolve.descriptorUtil.isEffectivelyExternal
|
import org.jetbrains.kotlin.resolve.descriptorUtil.isEffectivelyExternal
|
||||||
import org.jetbrains.kotlin.utils.SmartList
|
|
||||||
|
|
||||||
class IrPropertyImpl(
|
class IrPropertyImpl(
|
||||||
startOffset: Int,
|
startOffset: Int,
|
||||||
@@ -91,7 +92,6 @@ class IrPropertyImpl(
|
|||||||
this.setter = setter
|
this.setter = setter
|
||||||
}
|
}
|
||||||
|
|
||||||
override val typeParameters: MutableList<IrTypeParameter> = SmartList()
|
|
||||||
override var backingField: IrField? = null
|
override var backingField: IrField? = null
|
||||||
override var getter: IrSimpleFunction? = null
|
override var getter: IrSimpleFunction? = null
|
||||||
override var setter: IrSimpleFunction? = null
|
override var setter: IrSimpleFunction? = null
|
||||||
@@ -101,14 +101,12 @@ class IrPropertyImpl(
|
|||||||
}
|
}
|
||||||
|
|
||||||
override fun <D> acceptChildren(visitor: IrElementVisitor<Unit, D>, data: D) {
|
override fun <D> acceptChildren(visitor: IrElementVisitor<Unit, D>, data: D) {
|
||||||
typeParameters.forEach { it.accept(visitor, data) }
|
|
||||||
backingField?.accept(visitor, data)
|
backingField?.accept(visitor, data)
|
||||||
getter?.accept(visitor, data)
|
getter?.accept(visitor, data)
|
||||||
setter?.accept(visitor, data)
|
setter?.accept(visitor, data)
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun <D> transformChildren(transformer: IrElementTransformer<D>, data: D) {
|
override fun <D> transformChildren(transformer: IrElementTransformer<D>, data: D) {
|
||||||
typeParameters.transform { it.transform(transformer, data) }
|
|
||||||
backingField = backingField?.transform(transformer, data) as? IrField
|
backingField = backingField?.transform(transformer, data) as? IrField
|
||||||
getter = getter?.run { transform(transformer, data) as IrSimpleFunction }
|
getter = getter?.run { transform(transformer, data) as IrSimpleFunction }
|
||||||
setter = setter?.run { transform(transformer, data) as IrSimpleFunction }
|
setter = setter?.run { transform(transformer, data) as IrSimpleFunction }
|
||||||
|
|||||||
@@ -22,7 +22,6 @@ import org.jetbrains.kotlin.ir.SourceManager
|
|||||||
import org.jetbrains.kotlin.ir.declarations.*
|
import org.jetbrains.kotlin.ir.declarations.*
|
||||||
import org.jetbrains.kotlin.ir.expressions.*
|
import org.jetbrains.kotlin.ir.expressions.*
|
||||||
import org.jetbrains.kotlin.ir.symbols.IrSymbol
|
import org.jetbrains.kotlin.ir.symbols.IrSymbol
|
||||||
import org.jetbrains.kotlin.ir.types.IrType
|
|
||||||
import org.jetbrains.kotlin.ir.visitors.IrElementVisitor
|
import org.jetbrains.kotlin.ir.visitors.IrElementVisitor
|
||||||
import org.jetbrains.kotlin.ir.visitors.IrElementVisitorVoid
|
import org.jetbrains.kotlin.ir.visitors.IrElementVisitorVoid
|
||||||
import org.jetbrains.kotlin.ir.visitors.acceptChildrenVoid
|
import org.jetbrains.kotlin.ir.visitors.acceptChildrenVoid
|
||||||
@@ -140,7 +139,6 @@ class DumpIrTreeVisitor(out: Appendable) : IrElementVisitor<Unit, String> {
|
|||||||
override fun visitProperty(declaration: IrProperty, data: String) {
|
override fun visitProperty(declaration: IrProperty, data: String) {
|
||||||
declaration.dumpLabeledElementWith(data) {
|
declaration.dumpLabeledElementWith(data) {
|
||||||
dumpAnnotations(declaration)
|
dumpAnnotations(declaration)
|
||||||
declaration.typeParameters.dumpElements()
|
|
||||||
declaration.backingField?.accept(this, "")
|
declaration.backingField?.accept(this, "")
|
||||||
declaration.getter?.accept(this, "")
|
declaration.getter?.accept(this, "")
|
||||||
declaration.setter?.accept(this, "")
|
declaration.setter?.accept(this, "")
|
||||||
|
|||||||
Reference in New Issue
Block a user