[IR] Unbind construction methods of IrTypeParameterImpl from symbol.descriptor
This commit is contained in:
+11
-17
@@ -34,33 +34,27 @@ class IrTypeParameterImpl(
|
||||
endOffset: Int,
|
||||
origin: IrDeclarationOrigin,
|
||||
override val symbol: IrTypeParameterSymbol,
|
||||
override val name: Name = symbol.descriptor.name,
|
||||
override val index: Int = symbol.descriptor.index,
|
||||
override val isReified: Boolean = symbol.descriptor.isReified,
|
||||
override val variance: Variance = symbol.descriptor.variance
|
||||
override val name: Name,
|
||||
override val index: Int,
|
||||
override val isReified: Boolean,
|
||||
override val variance: Variance
|
||||
) :
|
||||
IrDeclarationBase<TypeParameterCarrier>(startOffset, endOffset, origin),
|
||||
IrTypeParameter,
|
||||
TypeParameterCarrier {
|
||||
|
||||
constructor(
|
||||
startOffset: Int,
|
||||
endOffset: Int,
|
||||
origin: IrDeclarationOrigin,
|
||||
symbol: IrTypeParameterSymbol,
|
||||
name: Name,
|
||||
index: Int,
|
||||
variance: Variance
|
||||
) : this(startOffset, endOffset, origin, symbol, name, index, symbol.descriptor.isReified, variance)
|
||||
|
||||
@Deprecated("Use constructor which takes symbol instead of descriptor")
|
||||
constructor(
|
||||
startOffset: Int,
|
||||
endOffset: Int,
|
||||
origin: IrDeclarationOrigin,
|
||||
descriptor: TypeParameterDescriptor
|
||||
) :
|
||||
this(startOffset, endOffset, origin, IrTypeParameterSymbolImpl(descriptor))
|
||||
descriptor: TypeParameterDescriptor,
|
||||
name: Name = descriptor.name,
|
||||
symbol: IrTypeParameterSymbol = IrTypeParameterSymbolImpl(descriptor)
|
||||
) : this(
|
||||
startOffset, endOffset, origin, symbol, name,
|
||||
index = descriptor.index, isReified = descriptor.isReified, variance = descriptor.variance
|
||||
)
|
||||
|
||||
init {
|
||||
symbol.bind(this)
|
||||
|
||||
@@ -747,7 +747,7 @@ open class SymbolTable(
|
||||
origin: IrDeclarationOrigin,
|
||||
descriptor: TypeParameterDescriptor,
|
||||
typeParameterFactory: (IrTypeParameterSymbol) -> IrTypeParameter = {
|
||||
IrTypeParameterImpl(startOffset, endOffset, origin, it, nameProvider.nameForDeclaration(descriptor))
|
||||
IrTypeParameterImpl(startOffset, endOffset, origin, descriptor, nameProvider.nameForDeclaration(descriptor), it)
|
||||
}
|
||||
): IrTypeParameter =
|
||||
globalTypeParameterSymbolTable.declare(
|
||||
@@ -771,7 +771,7 @@ open class SymbolTable(
|
||||
origin: IrDeclarationOrigin,
|
||||
descriptor: TypeParameterDescriptor,
|
||||
typeParameterFactory: (IrTypeParameterSymbol) -> IrTypeParameter = {
|
||||
IrTypeParameterImpl(startOffset, endOffset, origin, it, nameProvider.nameForDeclaration(descriptor))
|
||||
IrTypeParameterImpl(startOffset, endOffset, origin, descriptor, nameProvider.nameForDeclaration(descriptor), it)
|
||||
}
|
||||
): IrTypeParameter =
|
||||
scopedTypeParameterSymbolTable.declare(
|
||||
|
||||
Reference in New Issue
Block a user