azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minor: rename FirScript.statements do declarations...

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirTopLevelPropertiesChecker.kt
+1 -1
View File
@@ -41,7 +41,7 @@ object FirTopLevelPropertiesChecker : FirFileChecker() {
object FirScriptPropertiesChecker : FirScriptChecker() {
override fun check(declaration: FirScript, context: CheckerContext, reporter: DiagnosticReporter) {
val topLevelProperties = declaration.statements.filterIsInstance<FirProperty>()
val topLevelProperties = declaration.declarations.filterIsInstance<FirProperty>()
checkFileLikeDeclaration(declaration, topLevelProperties, context, reporter)
}
}
compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrConverter.kt
+2 -2
View File
@@ -518,7 +518,7 @@ class Fir2IrConverter(
addDeclarationToParentIfNeeded(irScript)
declarationStorage.withScope(irScript.symbol) {
irScript.parent = parent
for (scriptStatement in declaration.statements) {
for (scriptStatement in declaration.declarations) {
when (scriptStatement) {
is FirRegularClass -> {
registerClassAndNestedClasses(scriptStatement, irScript)
@@ -528,7 +528,7 @@ class Fir2IrConverter(
else -> {}
}
}
for (scriptStatement in declaration.statements) {
for (scriptStatement in declaration.declarations) {
if (scriptStatement is FirDeclaration) {
processMemberDeclaration(scriptStatement, containingClass = null, irScript, delegateFieldToPropertyMap = null)
}
compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrVisitor.kt
+1 -1
View File
@@ -254,7 +254,7 @@ class Fir2IrVisitor(
conversionScope.withParent(irScript) {
val destructComposites = mutableMapOf<FirVariableSymbol<*>, IrComposite>()
for (statement in script.statements) {
for (statement in script.declarations) {
val irStatement = if (statement is FirDeclaration) {
when {
statement is FirProperty && statement.name == SpecialNames.UNDERSCORE_FOR_UNUSED_VAR -> {
compiler/fir/providers/src/org/jetbrains/kotlin/fir/scopes/impl/FirScriptDeclarationsScope.kt
+2 -2
View File
@@ -22,7 +22,7 @@ class FirScriptDeclarationsScope(
private val callablesIndex: Map<Name, List<FirCallableSymbol<*>>> = run {
val result = mutableMapOf<Name, MutableList<FirCallableSymbol<*>>>()
loop@ for (statement in script.statements) {
loop@ for (statement in script.declarations) {
if (statement is FirCallableDeclaration) {
val name = when (statement) {
is FirVariable -> if (statement.isSynthetic) continue@loop else statement.name
@@ -38,7 +38,7 @@ class FirScriptDeclarationsScope(
private val classIndex: Map<Name, FirRegularClassSymbol> = run {
val result = mutableMapOf<Name, FirRegularClassSymbol>()
for (declaration in script.statements) {
for (declaration in script.declarations) {
if (declaration is FirRegularClass) {
result[declaration.name] = declaration.symbol
}
compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/PsiRawFirBuilder.kt
+4 -4
View File
@@ -1286,7 +1286,7 @@ open class PsiRawFirBuilder(
for (declaration in script.declarations) {
when (declaration) {
is KtScriptInitializer -> {
declaration.body?.let { statements.add(it.toFirStatement()) }
declaration.body?.let { declarations.add(it.toFirStatement()) }
}
is KtDestructuringDeclaration -> {
val destructuringContainerVar = generateTemporaryVariable(
@@ -1299,9 +1299,9 @@ open class PsiRawFirBuilder(
).apply {
isDestructuringDeclarationContainerVariable = true
}
statements.add(destructuringContainerVar)
declarations.add(destructuringContainerVar)
statements.addDestructuringVariables(
declarations.addDestructuringVariables(
moduleData,
declaration,
destructuringContainerVar,
@@ -1312,7 +1312,7 @@ open class PsiRawFirBuilder(
}
}
else -> {
statements.add(declaration.toFirStatement())
declarations.add(declaration.toFirStatement())
}
}
}
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/plugin/AbstractFirSpecificAnnotationResolveTransformer.kt
+1 -1
View File
@@ -403,7 +403,7 @@ abstract class AbstractFirSpecificAnnotationResolveTransformer(
computationSession.recordThatAnnotationsAreResolved(script)
transformDeclaration(script, null).also {
transformChildren(script) {
script.transformStatements(this, data)
script.transformDeclarations(this, data)
}
}
}
compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirScript.kt
+3 -3
View File
@@ -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
}
compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirScriptBuilder.kt
+3 -3
View File
@@ -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)
compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirScriptImpl.kt
+7 -7
View File
@@ -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()
}
}
compiler/fir/tree/src/org/jetbrains/kotlin/fir/renderer/FirRenderer.kt
+1 -1
View File
@@ -223,7 +223,7 @@ class FirRenderer(
printer.newLine()
script.statements.forEach {
script.declarations.forEach {
it.accept(this)
printer.newLine()
}
compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/NodeConfigurator.kt
+1 -1
View File
@@ -494,7 +494,7 @@ object NodeConfigurator : AbstractFieldConfigurator<FirTreeBuilder>(FirTreeBuild
script.configure {
+name
+fieldList(statement, withReplace = true, useMutableOrEmpty = true).withTransform()
+FieldList("declarations", statement, withReplace = true, useMutableOrEmpty = true).withTransform()
+symbol("FirScriptSymbol")
+fieldList("parameters", variable, withReplace = false)
+fieldList(contextReceiver, useMutableOrEmpty = true)