minor: rename FirScript.statements do declarations...

to simplify the following commit that actually convert the types
and wrap statements into blocks.
This commit is contained in:
Ilya Chernikov
2023-12-08 10:13:59 +01:00
committed by Space Team
parent a29a7e6307
commit c9aee5bf09
26 changed files with 52 additions and 53 deletions
@@ -30,7 +30,7 @@ abstract class FirScript : FirDeclaration(), FirControlFlowGraphOwner {
abstract override val attributes: FirDeclarationAttributes
abstract override val controlFlowGraphReference: FirControlFlowGraphReference?
abstract val name: Name
abstract val statements: List<FirStatement>
abstract val declarations: List<FirStatement>
abstract override val symbol: FirScriptSymbol
abstract val parameters: List<FirVariable>
abstract val contextReceivers: List<FirContextReceiver>
@@ -47,9 +47,9 @@ abstract class FirScript : FirDeclaration(), FirControlFlowGraphOwner {
abstract override fun replaceControlFlowGraphReference(newControlFlowGraphReference: FirControlFlowGraphReference?)
abstract fun replaceStatements(newStatements: List<FirStatement>)
abstract fun replaceDeclarations(newDeclarations: List<FirStatement>)
abstract override fun <D> transformAnnotations(transformer: FirTransformer<D>, data: D): FirScript
abstract fun <D> transformStatements(transformer: FirTransformer<D>, data: D): FirScript
abstract fun <D> transformDeclarations(transformer: FirTransformer<D>, data: D): FirScript
}
@@ -32,7 +32,7 @@ class FirScriptBuilder : FirAnnotationContainerBuilder {
lateinit var origin: FirDeclarationOrigin
var attributes: FirDeclarationAttributes = FirDeclarationAttributes()
lateinit var name: Name
val statements: MutableList<FirStatement> = mutableListOf()
val declarations: MutableList<FirStatement> = mutableListOf()
lateinit var symbol: FirScriptSymbol
val parameters: MutableList<FirVariable> = mutableListOf()
val contextReceivers: MutableList<FirContextReceiver> = mutableListOf()
@@ -47,7 +47,7 @@ class FirScriptBuilder : FirAnnotationContainerBuilder {
origin,
attributes,
name,
statements.toMutableOrEmpty(),
declarations.toMutableOrEmpty(),
symbol,
parameters,
contextReceivers.toMutableOrEmpty(),
@@ -78,7 +78,7 @@ inline fun buildScriptCopy(original: FirScript, init: FirScriptBuilder.() -> Uni
copyBuilder.origin = original.origin
copyBuilder.attributes = original.attributes.copy()
copyBuilder.name = original.name
copyBuilder.statements.addAll(original.statements)
copyBuilder.declarations.addAll(original.declarations)
copyBuilder.symbol = original.symbol
copyBuilder.parameters.addAll(original.parameters)
copyBuilder.contextReceivers.addAll(original.contextReceivers)
@@ -33,7 +33,7 @@ internal class FirScriptImpl(
override val origin: FirDeclarationOrigin,
override val attributes: FirDeclarationAttributes,
override val name: Name,
override var statements: MutableOrEmptyList<FirStatement>,
override var declarations: MutableOrEmptyList<FirStatement>,
override val symbol: FirScriptSymbol,
override val parameters: MutableList<FirVariable>,
override var contextReceivers: MutableOrEmptyList<FirContextReceiver>,
@@ -49,7 +49,7 @@ internal class FirScriptImpl(
override fun <R, D> acceptChildren(visitor: FirVisitor<R, D>, data: D) {
annotations.forEach { it.accept(visitor, data) }
controlFlowGraphReference?.accept(visitor, data)
statements.forEach { it.accept(visitor, data) }
declarations.forEach { it.accept(visitor, data) }
parameters.forEach { it.accept(visitor, data) }
contextReceivers.forEach { it.accept(visitor, data) }
}
@@ -57,7 +57,7 @@ internal class FirScriptImpl(
override fun <D> transformChildren(transformer: FirTransformer<D>, data: D): FirScriptImpl {
transformAnnotations(transformer, data)
controlFlowGraphReference = controlFlowGraphReference?.transform(transformer, data)
transformStatements(transformer, data)
transformDeclarations(transformer, data)
parameters.transformInplace(transformer, data)
contextReceivers.transformInplace(transformer, data)
return this
@@ -68,8 +68,8 @@ internal class FirScriptImpl(
return this
}
override fun <D> transformStatements(transformer: FirTransformer<D>, data: D): FirScriptImpl {
statements.transformInplace(transformer, data)
override fun <D> transformDeclarations(transformer: FirTransformer<D>, data: D): FirScriptImpl {
declarations.transformInplace(transformer, data)
return this
}
@@ -81,7 +81,7 @@ internal class FirScriptImpl(
controlFlowGraphReference = newControlFlowGraphReference
}
override fun replaceStatements(newStatements: List<FirStatement>) {
statements = newStatements.toMutableOrEmpty()
override fun replaceDeclarations(newDeclarations: List<FirStatement>) {
declarations = newDeclarations.toMutableOrEmpty()
}
}