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

K2: use MutableOrEmptyList for context receivers on declaration site

Browse Source
This commit is contained in:
Mikhail Glukhikh
2022-12-15 12:07:10 +01:00
committed by Space Team
parent d20d63786b
commit e9fbeb9be2
34 changed files with 52 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAnonymousFunctionBuilder.kt
+1 -1
View File
@@ -82,7 +82,7 @@ class FirAnonymousFunctionBuilder : FirFunctionBuilder, FirAnnotationContainerBu
deprecationsProvider,
containerSource,
dispatchReceiverType,
contextReceivers,
contextReceivers.toMutableOrEmpty(),
controlFlowGraphReference,
valueParameters,
body,
compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirBackingFieldBuilder.kt
+1 -1
View File
@@ -81,7 +81,7 @@ class FirBackingFieldBuilder : FirAnnotationContainerBuilder {
deprecationsProvider,
containerSource,
dispatchReceiverType,
contextReceivers,
contextReceivers.toMutableOrEmpty(),
name,
delegate,
isVar,
compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirConstructorBuilder.kt
+1 -1
View File
@@ -76,7 +76,7 @@ open class FirConstructorBuilder : FirAbstractConstructorBuilder, FirAnnotationC
deprecationsProvider,
containerSource,
dispatchReceiverType,
contextReceivers,
contextReceivers.toMutableOrEmpty(),
valueParameters,
annotations.toMutableOrEmpty(),
symbol,
compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirDefaultSetterValueParameterBuilder.kt
+1 -1
View File
@@ -83,7 +83,7 @@ class FirDefaultSetterValueParameterBuilder : FirAnnotationContainerBuilder {
deprecationsProvider,
containerSource,
dispatchReceiverType,
contextReceivers,
contextReceivers.toMutableOrEmpty(),
initializer,
delegate,
isVar,
compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirEnumEntryBuilder.kt
+1 -1
View File
@@ -73,7 +73,7 @@ class FirEnumEntryBuilder : FirAnnotationContainerBuilder {
deprecationsProvider,
containerSource,
dispatchReceiverType,
contextReceivers,
contextReceivers.toMutableOrEmpty(),
name,
initializer,
backingField,
compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirErrorFunctionBuilder.kt
+1 -1
View File
@@ -69,7 +69,7 @@ class FirErrorFunctionBuilder : FirAnnotationContainerBuilder {
deprecationsProvider,
containerSource,
dispatchReceiverType,
contextReceivers,
contextReceivers.toMutableOrEmpty(),
valueParameters,
diagnostic,
symbol,
compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirErrorPropertyBuilder.kt
+1 -1
View File
@@ -70,7 +70,7 @@ class FirErrorPropertyBuilder : FirAnnotationContainerBuilder {
deprecationsProvider,
containerSource,
dispatchReceiverType,
contextReceivers,
contextReceivers.toMutableOrEmpty(),
name,
backingField,
annotations.toMutableOrEmpty(),
compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirFieldBuilder.kt
+1 -1
View File
@@ -78,7 +78,7 @@ open class FirFieldBuilder : FirDeclarationBuilder, FirAnnotationContainerBuilde
deprecationsProvider,
containerSource,
dispatchReceiverType,
contextReceivers,
contextReceivers.toMutableOrEmpty(),
name,
initializer,
isVar,
compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPrimaryConstructorBuilder.kt
+1 -1
View File
@@ -78,7 +78,7 @@ class FirPrimaryConstructorBuilder : FirAbstractConstructorBuilder, FirAnnotatio
deprecationsProvider,
containerSource,
dispatchReceiverType,
contextReceivers,
contextReceivers.toMutableOrEmpty(),
valueParameters,
annotations.toMutableOrEmpty(),
symbol,
compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPropertyAccessorBuilder.kt
+1 -1
View File
@@ -80,7 +80,7 @@ class FirPropertyAccessorBuilder : FirFunctionBuilder, FirAnnotationContainerBui
deprecationsProvider,
containerSource,
dispatchReceiverType,
contextReceivers,
contextReceivers.toMutableOrEmpty(),
valueParameters,
body,
contractDescription,
compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPropertyBuilder.kt
+1 -1
View File
@@ -95,7 +95,7 @@ class FirPropertyBuilder : FirDeclarationBuilder, FirTypeParametersOwnerBuilder,
setter,
backingField,
annotations.toMutableOrEmpty(),
contextReceivers,
contextReceivers.toMutableOrEmpty(),
symbol,
delegateFieldSymbol,
isLocal,
compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirRegularClassBuilder.kt
+1 -1
View File
@@ -78,7 +78,7 @@ open class FirRegularClassBuilder : FirClassBuilder, FirTypeParameterRefsOwnerBu
symbol,
companionObjectSymbol,
superTypeRefs,
contextReceivers,
contextReceivers.toMutableOrEmpty(),
)
}
compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirScriptBuilder.kt
+1 -1
View File
@@ -54,7 +54,7 @@ class FirScriptBuilder : FirAnnotationContainerBuilder {
name,
statements,
symbol,
contextReceivers,
contextReceivers.toMutableOrEmpty(),
)
}
compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirSimpleFunctionBuilder.kt
+1 -1
View File
@@ -79,7 +79,7 @@ open class FirSimpleFunctionBuilder : FirFunctionBuilder, FirTypeParametersOwner
deprecationsProvider,
containerSource,
dispatchReceiverType,
contextReceivers,
contextReceivers.toMutableOrEmpty(),
valueParameters,
body,
contractDescription,
compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirValueParameterBuilder.kt
+1 -1
View File
@@ -76,7 +76,7 @@ open class FirValueParameterBuilder : FirAnnotationContainerBuilder {
deprecationsProvider,
containerSource,
dispatchReceiverType,
contextReceivers,
contextReceivers.toMutableOrEmpty(),
name,
backingField,
annotations.toMutableOrEmpty(),
compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousFunctionImpl.kt
+2 -3
View File
@@ -50,7 +50,7 @@ internal class FirAnonymousFunctionImpl(
override var deprecationsProvider: DeprecationsProvider,
override val containerSource: DeserializedContainerSource?,
override val dispatchReceiverType: ConeSimpleKotlinType?,
override val contextReceivers: MutableList<FirContextReceiver>,
override var contextReceivers: MutableOrEmptyList<FirContextReceiver>,
override var controlFlowGraphReference: FirControlFlowGraphReference?,
override val valueParameters: MutableList<FirValueParameter>,
override var body: FirBlock?,
@@ -156,8 +156,7 @@ internal class FirAnonymousFunctionImpl(
}
override fun replaceContextReceivers(newContextReceivers: List<FirContextReceiver>) {
contextReceivers.clear()
contextReceivers.addAll(newContextReceivers)
contextReceivers = newContextReceivers.toMutableOrEmpty()
}
override fun replaceControlFlowGraphReference(newControlFlowGraphReference: FirControlFlowGraphReference?) {
compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirBackingFieldImpl.kt
+2 -3
View File
@@ -49,7 +49,7 @@ open class FirBackingFieldImpl @FirImplementationDetail constructor(
override var deprecationsProvider: DeprecationsProvider,
override val containerSource: DeserializedContainerSource?,
override val dispatchReceiverType: ConeSimpleKotlinType?,
override val contextReceivers: MutableList<FirContextReceiver>,
override var contextReceivers: MutableOrEmptyList<FirContextReceiver>,
override val name: Name,
override var delegate: FirExpression?,
override val isVar: Boolean,
@@ -169,8 +169,7 @@ open class FirBackingFieldImpl @FirImplementationDetail constructor(
}
override fun replaceContextReceivers(newContextReceivers: List<FirContextReceiver>) {
contextReceivers.clear()
contextReceivers.addAll(newContextReceivers)
contextReceivers = newContextReceivers.toMutableOrEmpty()
}
override fun replaceGetter(newGetter: FirPropertyAccessor?) {
compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirConstructorImpl.kt
+2 -3
View File
@@ -50,7 +50,7 @@ internal class FirConstructorImpl(
override var deprecationsProvider: DeprecationsProvider,
override val containerSource: DeserializedContainerSource?,
override val dispatchReceiverType: ConeSimpleKotlinType?,
override val contextReceivers: MutableList<FirContextReceiver>,
override var contextReceivers: MutableOrEmptyList<FirContextReceiver>,
override val valueParameters: MutableList<FirValueParameter>,
override var annotations: MutableOrEmptyList<FirAnnotation>,
override val symbol: FirConstructorSymbol,
@@ -148,8 +148,7 @@ internal class FirConstructorImpl(
}
override fun replaceContextReceivers(newContextReceivers: List<FirContextReceiver>) {
contextReceivers.clear()
contextReceivers.addAll(newContextReceivers)
contextReceivers = newContextReceivers.toMutableOrEmpty()
}
override fun replaceControlFlowGraphReference(newControlFlowGraphReference: FirControlFlowGraphReference?) {
compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultSetterValueParameter.kt
+2 -3
View File
@@ -51,7 +51,7 @@ internal class FirDefaultSetterValueParameter(
override var deprecationsProvider: DeprecationsProvider,
override val containerSource: DeserializedContainerSource?,
override val dispatchReceiverType: ConeSimpleKotlinType?,
override val contextReceivers: MutableList<FirContextReceiver>,
override var contextReceivers: MutableOrEmptyList<FirContextReceiver>,
override var initializer: FirExpression?,
override var delegate: FirExpression?,
override val isVar: Boolean,
@@ -178,8 +178,7 @@ internal class FirDefaultSetterValueParameter(
}
override fun replaceContextReceivers(newContextReceivers: List<FirContextReceiver>) {
contextReceivers.clear()
contextReceivers.addAll(newContextReceivers)
contextReceivers = newContextReceivers.toMutableOrEmpty()
}
override fun replaceInitializer(newInitializer: FirExpression?) {
compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirEnumEntryImpl.kt
+2 -3
View File
@@ -49,7 +49,7 @@ internal class FirEnumEntryImpl(
override var deprecationsProvider: DeprecationsProvider,
override val containerSource: DeserializedContainerSource?,
override val dispatchReceiverType: ConeSimpleKotlinType?,
override val contextReceivers: MutableList<FirContextReceiver>,
override var contextReceivers: MutableOrEmptyList<FirContextReceiver>,
override val name: Name,
override var initializer: FirExpression?,
override var backingField: FirBackingField?,
@@ -154,8 +154,7 @@ internal class FirEnumEntryImpl(
}
override fun replaceContextReceivers(newContextReceivers: List<FirContextReceiver>) {
contextReceivers.clear()
contextReceivers.addAll(newContextReceivers)
contextReceivers = newContextReceivers.toMutableOrEmpty()
}
override fun replaceInitializer(newInitializer: FirExpression?) {
compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirErrorFunctionImpl.kt
+2 -3
View File
@@ -49,7 +49,7 @@ internal class FirErrorFunctionImpl(
override var deprecationsProvider: DeprecationsProvider,
override val containerSource: DeserializedContainerSource?,
override val dispatchReceiverType: ConeSimpleKotlinType?,
override val contextReceivers: MutableList<FirContextReceiver>,
override var contextReceivers: MutableOrEmptyList<FirContextReceiver>,
override val valueParameters: MutableList<FirValueParameter>,
override val diagnostic: ConeDiagnostic,
override val symbol: FirErrorFunctionSymbol,
@@ -135,8 +135,7 @@ internal class FirErrorFunctionImpl(
}
override fun replaceContextReceivers(newContextReceivers: List<FirContextReceiver>) {
contextReceivers.clear()
contextReceivers.addAll(newContextReceivers)
contextReceivers = newContextReceivers.toMutableOrEmpty()
}
override fun replaceControlFlowGraphReference(newControlFlowGraphReference: FirControlFlowGraphReference?) {
compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirErrorPropertyImpl.kt
+2 -3
View File
@@ -49,7 +49,7 @@ internal class FirErrorPropertyImpl(
override var deprecationsProvider: DeprecationsProvider,
override val containerSource: DeserializedContainerSource?,
override val dispatchReceiverType: ConeSimpleKotlinType?,
override val contextReceivers: MutableList<FirContextReceiver>,
override var contextReceivers: MutableOrEmptyList<FirContextReceiver>,
override val name: Name,
override var backingField: FirBackingField?,
override var annotations: MutableOrEmptyList<FirAnnotation>,
@@ -152,8 +152,7 @@ internal class FirErrorPropertyImpl(
}
override fun replaceContextReceivers(newContextReceivers: List<FirContextReceiver>) {
contextReceivers.clear()
contextReceivers.addAll(newContextReceivers)
contextReceivers = newContextReceivers.toMutableOrEmpty()
}
override fun replaceInitializer(newInitializer: FirExpression?) {}
compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirFieldImpl.kt
+2 -3
View File
@@ -51,7 +51,7 @@ class FirFieldImpl @FirImplementationDetail constructor(
override var deprecationsProvider: DeprecationsProvider,
override val containerSource: DeserializedContainerSource?,
override val dispatchReceiverType: ConeSimpleKotlinType?,
override val contextReceivers: MutableList<FirContextReceiver>,
override var contextReceivers: MutableOrEmptyList<FirContextReceiver>,
override val name: Name,
override var initializer: FirExpression?,
override val isVar: Boolean,
@@ -159,8 +159,7 @@ class FirFieldImpl @FirImplementationDetail constructor(
}
override fun replaceContextReceivers(newContextReceivers: List<FirContextReceiver>) {
contextReceivers.clear()
contextReceivers.addAll(newContextReceivers)
contextReceivers = newContextReceivers.toMutableOrEmpty()
}
override fun replaceInitializer(newInitializer: FirExpression?) {
compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPrimaryConstructor.kt
+2 -3
View File
@@ -51,7 +51,7 @@ class FirPrimaryConstructor @FirImplementationDetail constructor(
override var deprecationsProvider: DeprecationsProvider,
override val containerSource: DeserializedContainerSource?,
override val dispatchReceiverType: ConeSimpleKotlinType?,
override val contextReceivers: MutableList<FirContextReceiver>,
override var contextReceivers: MutableOrEmptyList<FirContextReceiver>,
override val valueParameters: MutableList<FirValueParameter>,
override var annotations: MutableOrEmptyList<FirAnnotation>,
override val symbol: FirConstructorSymbol,
@@ -149,8 +149,7 @@ class FirPrimaryConstructor @FirImplementationDetail constructor(
}
override fun replaceContextReceivers(newContextReceivers: List<FirContextReceiver>) {
contextReceivers.clear()
contextReceivers.addAll(newContextReceivers)
contextReceivers = newContextReceivers.toMutableOrEmpty()
}
override fun replaceControlFlowGraphReference(newControlFlowGraphReference: FirControlFlowGraphReference?) {
compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPropertyAccessorImpl.kt
+2 -3
View File
@@ -51,7 +51,7 @@ open class FirPropertyAccessorImpl @FirImplementationDetail constructor(
override var deprecationsProvider: DeprecationsProvider,
override val containerSource: DeserializedContainerSource?,
override val dispatchReceiverType: ConeSimpleKotlinType?,
override val contextReceivers: MutableList<FirContextReceiver>,
override var contextReceivers: MutableOrEmptyList<FirContextReceiver>,
override val valueParameters: MutableList<FirValueParameter>,
override var body: FirBlock?,
override var contractDescription: FirContractDescription,
@@ -148,8 +148,7 @@ open class FirPropertyAccessorImpl @FirImplementationDetail constructor(
}
override fun replaceContextReceivers(newContextReceivers: List<FirContextReceiver>) {
contextReceivers.clear()
contextReceivers.addAll(newContextReceivers)
contextReceivers = newContextReceivers.toMutableOrEmpty()
}
override fun replaceControlFlowGraphReference(newControlFlowGraphReference: FirControlFlowGraphReference?) {
compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPropertyImpl.kt
+2 -3
View File
@@ -61,7 +61,7 @@ internal class FirPropertyImpl(
override var setter: FirPropertyAccessor?,
override var backingField: FirBackingField?,
override var annotations: MutableOrEmptyList<FirAnnotation>,
override val contextReceivers: MutableList<FirContextReceiver>,
override var contextReceivers: MutableOrEmptyList<FirContextReceiver>,
override val symbol: FirPropertySymbol,
override val delegateFieldSymbol: FirDelegateFieldSymbol?,
override val isLocal: Boolean,
@@ -204,8 +204,7 @@ internal class FirPropertyImpl(
}
override fun replaceContextReceivers(newContextReceivers: List<FirContextReceiver>) {
contextReceivers.clear()
contextReceivers.addAll(newContextReceivers)
contextReceivers = newContextReceivers.toMutableOrEmpty()
}
override fun replaceBodyResolveState(newBodyResolveState: FirPropertyBodyResolveState) {
compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirRegularClassImpl.kt
+1 -1
View File
@@ -52,7 +52,7 @@ internal class FirRegularClassImpl(
override val symbol: FirRegularClassSymbol,
override var companionObjectSymbol: FirRegularClassSymbol?,
override val superTypeRefs: MutableList<FirTypeRef>,
override val contextReceivers: MutableList<FirContextReceiver>,
override var contextReceivers: MutableOrEmptyList<FirContextReceiver>,
) : FirRegularClass() {
override var controlFlowGraphReference: FirControlFlowGraphReference? = null
override val hasLazyNestedClassifiers: Boolean get() = false
compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirScriptImpl.kt
+1 -1
View File
@@ -38,7 +38,7 @@ internal class FirScriptImpl(
override val name: Name,
override val statements: MutableList<FirStatement>,
override val symbol: FirScriptSymbol,
override val contextReceivers: MutableList<FirContextReceiver>,
override var contextReceivers: MutableOrEmptyList<FirContextReceiver>,
) : FirScript() {
init {
symbol.bind(this)
compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirSimpleFunctionImpl.kt
+2 -3
View File
@@ -50,7 +50,7 @@ internal class FirSimpleFunctionImpl(
override var deprecationsProvider: DeprecationsProvider,
override val containerSource: DeserializedContainerSource?,
override val dispatchReceiverType: ConeSimpleKotlinType?,
override val contextReceivers: MutableList<FirContextReceiver>,
override var contextReceivers: MutableOrEmptyList<FirContextReceiver>,
override val valueParameters: MutableList<FirValueParameter>,
override var body: FirBlock?,
override var contractDescription: FirContractDescription,
@@ -149,8 +149,7 @@ internal class FirSimpleFunctionImpl(
}
override fun replaceContextReceivers(newContextReceivers: List<FirContextReceiver>) {
contextReceivers.clear()
contextReceivers.addAll(newContextReceivers)
contextReceivers = newContextReceivers.toMutableOrEmpty()
}
override fun replaceControlFlowGraphReference(newControlFlowGraphReference: FirControlFlowGraphReference?) {
compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirValueParameterImpl.kt
+2 -3
View File
@@ -50,7 +50,7 @@ internal class FirValueParameterImpl(
override var deprecationsProvider: DeprecationsProvider,
override val containerSource: DeserializedContainerSource?,
override val dispatchReceiverType: ConeSimpleKotlinType?,
override val contextReceivers: MutableList<FirContextReceiver>,
override var contextReceivers: MutableOrEmptyList<FirContextReceiver>,
override val name: Name,
override var backingField: FirBackingField?,
override var annotations: MutableOrEmptyList<FirAnnotation>,
@@ -161,8 +161,7 @@ internal class FirValueParameterImpl(
}
override fun replaceContextReceivers(newContextReceivers: List<FirContextReceiver>) {
contextReceivers.clear()
contextReceivers.addAll(newContextReceivers)
contextReceivers = newContextReceivers.toMutableOrEmpty()
}
override fun replaceInitializer(newInitializer: FirExpression?) {}
compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultPropertyAccessor.kt
+1 -1
View File
@@ -54,7 +54,7 @@ abstract class FirDefaultPropertyAccessor(
deprecationsProvider = UnresolvedDeprecationProvider,
containerSource = null,
dispatchReceiverType = null,
contextReceivers = mutableListOf(),
contextReceivers = MutableOrEmptyList.empty(),
valueParameters,
body = null,
contractDescription = FirEmptyContractDescription,
compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultPropertyBackingField.kt
+2 -1
View File
@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.fir.declarations.impl
import org.jetbrains.kotlin.builtins.StandardNames.BACKING_FIELD
import org.jetbrains.kotlin.fir.FirImplementationDetail
import org.jetbrains.kotlin.fir.FirModuleData
import org.jetbrains.kotlin.fir.MutableOrEmptyList
import org.jetbrains.kotlin.fir.builder.toMutableOrEmpty
import org.jetbrains.kotlin.fir.declarations.*
import org.jetbrains.kotlin.fir.expressions.FirAnnotation
@@ -48,6 +49,6 @@ class FirDefaultPropertyBackingField(
annotations = annotations.toMutableOrEmpty(),
typeParameters = mutableListOf(),
status = status,
contextReceivers = mutableListOf(),
contextReceivers = MutableOrEmptyList.empty(),
)
compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/NodeConfigurator.kt
+4 -4
View File
@@ -103,7 +103,7 @@ object NodeConfigurator : AbstractFieldConfigurator<FirTreeBuilder>(FirTreeBuild
+field("containerSource", type(DeserializedContainerSource::class), nullable = true)
+field("dispatchReceiverType", coneSimpleKotlinTypeType, nullable = true)
+fieldList(contextReceiver, withReplace = true)
+fieldList(contextReceiver, useMutableOrEmpty = true, withReplace = true)
}
function.configure {
@@ -284,7 +284,7 @@ object NodeConfigurator : AbstractFieldConfigurator<FirTreeBuilder>(FirTreeBuild
+booleanField("hasLazyNestedClassifiers")
+field("companionObjectSymbol", regularClassSymbolType, nullable = true, withReplace = true)
+superTypeRefs(withReplace = true)
+fieldList(contextReceiver)
+fieldList(contextReceiver, useMutableOrEmpty = true)
}
anonymousObject.configure {
@@ -346,7 +346,7 @@ object NodeConfigurator : AbstractFieldConfigurator<FirTreeBuilder>(FirTreeBuild
}
property.configure {
+fieldList(contextReceiver, withReplace = true).withTransform()
+fieldList(contextReceiver, useMutableOrEmpty = true, withReplace = true).withTransform()
+symbol("FirPropertySymbol")
+field("delegateFieldSymbol", delegateFieldSymbolType, nullable = true)
+booleanField("isLocal")
@@ -471,7 +471,7 @@ object NodeConfigurator : AbstractFieldConfigurator<FirTreeBuilder>(FirTreeBuild
+name
+fieldList(statement).withTransform()
+symbol("FirScriptSymbol")
+fieldList(contextReceiver)
+fieldList(contextReceiver, useMutableOrEmpty = true)
}
packageDirective.configure {
compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/model/ElementUtils.kt
+2 -2
View File
@@ -66,8 +66,8 @@ fun fieldList(name: String, type: Importable, withReplace: Boolean = false, useM
return FieldList(name, type, withReplace, useMutableOrEmpty)
}
fun fieldList(element: AbstractElement, withReplace: Boolean = false): Field {
return FieldList(element.name.replaceFirstChar(Char::lowercaseChar) + "s", element, withReplace)
fun fieldList(element: AbstractElement, withReplace: Boolean = false, useMutableOrEmpty: Boolean = false): Field {
return FieldList(element.name.replaceFirstChar(Char::lowercaseChar) + "s", element, withReplace, useMutableOrEmpty)
}
// ----------- Field set -----------