From d75160250df359d95b36f71f63e44334531a2114 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Mon, 19 Dec 2022 13:26:36 +0200 Subject: [PATCH] [FIR] Drop `transformExtensionReceiver` and `transformDispatchReceiver` from FirQualifiedAccess After removal of `StoreReceiver` transformers those methods are not used anymore, so it's ok to remove them at all --- .../expressions/FirCallableReferenceAccess.kt | 4 --- .../fir/expressions/FirComponentCall.kt | 4 --- .../kotlin/fir/expressions/FirFunctionCall.kt | 4 --- .../fir/expressions/FirImplicitInvokeCall.kt | 4 --- .../FirIntegerLiteralOperatorCall.kt | 20 ++++++------- .../FirPropertyAccessExpression.kt | 4 --- .../fir/expressions/FirQualifiedAccess.kt | 4 --- .../FirQualifiedAccessExpression.kt | 4 --- .../expressions/FirThisReceiverExpression.kt | 4 --- .../fir/expressions/FirVariableAssignment.kt | 4 --- .../FirIntegerLiteralOperatorCallBuilder.kt | 8 ++--- .../impl/FirCallableReferenceAccessImpl.kt | 10 ------- .../expressions/impl/FirComponentCallImpl.kt | 10 ------- .../expressions/impl/FirFunctionCallImpl.kt | 10 ------- .../impl/FirImplicitInvokeCallImpl.kt | 10 ------- .../impl/FirIntegerLiteralOperatorCallImpl.kt | 30 +++++++++---------- .../impl/FirPropertyAccessExpressionImpl.kt | 10 ------- .../impl/FirThisReceiverExpressionImpl.kt | 10 ------- .../impl/FirVariableAssignmentImpl.kt | 10 ------- .../kotlin/fir/tree/generator/FieldSets.kt | 4 +-- .../fir/tree/generator/NodeConfigurator.kt | 6 ++++ 21 files changed, 37 insertions(+), 137 deletions(-) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCallableReferenceAccess.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCallableReferenceAccess.kt index fb4ee1ebfb4..455ea9b2ad8 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCallableReferenceAccess.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCallableReferenceAccess.kt @@ -64,9 +64,5 @@ abstract class FirCallableReferenceAccess : FirQualifiedAccessExpression() { abstract override fun transformExplicitReceiver(transformer: FirTransformer, data: D): FirCallableReferenceAccess - abstract override fun transformDispatchReceiver(transformer: FirTransformer, data: D): FirCallableReferenceAccess - - abstract override fun transformExtensionReceiver(transformer: FirTransformer, data: D): FirCallableReferenceAccess - abstract override fun transformCalleeReference(transformer: FirTransformer, data: D): FirCallableReferenceAccess } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirComponentCall.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirComponentCall.kt index 57b5514ddad..e397ad481db 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirComponentCall.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirComponentCall.kt @@ -64,10 +64,6 @@ abstract class FirComponentCall : FirFunctionCall() { abstract override fun transformTypeArguments(transformer: FirTransformer, data: D): FirComponentCall - abstract override fun transformDispatchReceiver(transformer: FirTransformer, data: D): FirComponentCall - - abstract override fun transformExtensionReceiver(transformer: FirTransformer, data: D): FirComponentCall - abstract override fun transformCalleeReference(transformer: FirTransformer, data: D): FirComponentCall abstract override fun transformExplicitReceiver(transformer: FirTransformer, data: D): FirComponentCall diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirFunctionCall.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirFunctionCall.kt index 8d55503c140..cff229f21a6 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirFunctionCall.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirFunctionCall.kt @@ -65,9 +65,5 @@ abstract class FirFunctionCall : FirQualifiedAccessExpression(), FirCall { abstract override fun transformExplicitReceiver(transformer: FirTransformer, data: D): FirFunctionCall - abstract override fun transformDispatchReceiver(transformer: FirTransformer, data: D): FirFunctionCall - - abstract override fun transformExtensionReceiver(transformer: FirTransformer, data: D): FirFunctionCall - abstract override fun transformCalleeReference(transformer: FirTransformer, data: D): FirFunctionCall } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirImplicitInvokeCall.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirImplicitInvokeCall.kt index a4979264a8c..f3285f26efc 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirImplicitInvokeCall.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirImplicitInvokeCall.kt @@ -65,9 +65,5 @@ abstract class FirImplicitInvokeCall : FirFunctionCall() { abstract override fun transformExplicitReceiver(transformer: FirTransformer, data: D): FirImplicitInvokeCall - abstract override fun transformDispatchReceiver(transformer: FirTransformer, data: D): FirImplicitInvokeCall - - abstract override fun transformExtensionReceiver(transformer: FirTransformer, data: D): FirImplicitInvokeCall - abstract override fun transformCalleeReference(transformer: FirTransformer, data: D): FirImplicitInvokeCall } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirIntegerLiteralOperatorCall.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirIntegerLiteralOperatorCall.kt index 0db33696a17..99d01bc914e 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirIntegerLiteralOperatorCall.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirIntegerLiteralOperatorCall.kt @@ -26,11 +26,11 @@ abstract class FirIntegerLiteralOperatorCall : FirFunctionCall() { abstract override val contextReceiverArguments: List abstract override val typeArguments: List abstract override val explicitReceiver: FirExpression? - abstract override val dispatchReceiver: FirExpression - abstract override val extensionReceiver: FirExpression abstract override val argumentList: FirArgumentList abstract override val calleeReference: FirNamedReference abstract override val origin: FirFunctionCallOrigin + abstract override val dispatchReceiver: FirExpression + abstract override val extensionReceiver: FirExpression override fun accept(visitor: FirVisitor, data: D): R = visitor.visitIntegerLiteralOperatorCall(this, data) @@ -49,25 +49,25 @@ abstract class FirIntegerLiteralOperatorCall : FirFunctionCall() { abstract override fun replaceExplicitReceiver(newExplicitReceiver: FirExpression?) - abstract override fun replaceDispatchReceiver(newDispatchReceiver: FirExpression) - - abstract override fun replaceExtensionReceiver(newExtensionReceiver: FirExpression) - abstract override fun replaceArgumentList(newArgumentList: FirArgumentList) abstract override fun replaceCalleeReference(newCalleeReference: FirNamedReference) abstract override fun replaceCalleeReference(newCalleeReference: FirReference) + abstract override fun replaceDispatchReceiver(newDispatchReceiver: FirExpression) + + abstract override fun replaceExtensionReceiver(newExtensionReceiver: FirExpression) + abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirIntegerLiteralOperatorCall abstract override fun transformTypeArguments(transformer: FirTransformer, data: D): FirIntegerLiteralOperatorCall abstract override fun transformExplicitReceiver(transformer: FirTransformer, data: D): FirIntegerLiteralOperatorCall - abstract override fun transformDispatchReceiver(transformer: FirTransformer, data: D): FirIntegerLiteralOperatorCall - - abstract override fun transformExtensionReceiver(transformer: FirTransformer, data: D): FirIntegerLiteralOperatorCall - abstract override fun transformCalleeReference(transformer: FirTransformer, data: D): FirIntegerLiteralOperatorCall + + abstract fun transformDispatchReceiver(transformer: FirTransformer, data: D): FirIntegerLiteralOperatorCall + + abstract fun transformExtensionReceiver(transformer: FirTransformer, data: D): FirIntegerLiteralOperatorCall } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirPropertyAccessExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirPropertyAccessExpression.kt index b8106b3e49d..47ace346d83 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirPropertyAccessExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirPropertyAccessExpression.kt @@ -61,8 +61,4 @@ abstract class FirPropertyAccessExpression : FirQualifiedAccessExpression() { abstract override fun transformTypeArguments(transformer: FirTransformer, data: D): FirPropertyAccessExpression abstract override fun transformExplicitReceiver(transformer: FirTransformer, data: D): FirPropertyAccessExpression - - abstract override fun transformDispatchReceiver(transformer: FirTransformer, data: D): FirPropertyAccessExpression - - abstract override fun transformExtensionReceiver(transformer: FirTransformer, data: D): FirPropertyAccessExpression } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirQualifiedAccess.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirQualifiedAccess.kt index 8e10e3fa1bf..6213457e225 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirQualifiedAccess.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirQualifiedAccess.kt @@ -55,8 +55,4 @@ interface FirQualifiedAccess : FirResolvable, FirStatement, FirContextReceiverAr fun transformTypeArguments(transformer: FirTransformer, data: D): FirQualifiedAccess fun transformExplicitReceiver(transformer: FirTransformer, data: D): FirQualifiedAccess - - fun transformDispatchReceiver(transformer: FirTransformer, data: D): FirQualifiedAccess - - fun transformExtensionReceiver(transformer: FirTransformer, data: D): FirQualifiedAccess } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirQualifiedAccessExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirQualifiedAccessExpression.kt index 69a4b6d34cb..ec2fc8b2567 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirQualifiedAccessExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirQualifiedAccessExpression.kt @@ -59,8 +59,4 @@ abstract class FirQualifiedAccessExpression : FirExpression(), FirQualifiedAcces abstract override fun transformTypeArguments(transformer: FirTransformer, data: D): FirQualifiedAccessExpression abstract override fun transformExplicitReceiver(transformer: FirTransformer, data: D): FirQualifiedAccessExpression - - abstract override fun transformDispatchReceiver(transformer: FirTransformer, data: D): FirQualifiedAccessExpression - - abstract override fun transformExtensionReceiver(transformer: FirTransformer, data: D): FirQualifiedAccessExpression } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirThisReceiverExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirThisReceiverExpression.kt index eaf05f37656..426359ccdba 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirThisReceiverExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirThisReceiverExpression.kt @@ -62,9 +62,5 @@ abstract class FirThisReceiverExpression : FirQualifiedAccessExpression() { abstract override fun transformExplicitReceiver(transformer: FirTransformer, data: D): FirThisReceiverExpression - abstract override fun transformDispatchReceiver(transformer: FirTransformer, data: D): FirThisReceiverExpression - - abstract override fun transformExtensionReceiver(transformer: FirTransformer, data: D): FirThisReceiverExpression - abstract override fun transformCalleeReference(transformer: FirTransformer, data: D): FirThisReceiverExpression } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirVariableAssignment.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirVariableAssignment.kt index 98fe7cf4857..5dfeb4f3a92 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirVariableAssignment.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirVariableAssignment.kt @@ -63,9 +63,5 @@ abstract class FirVariableAssignment : FirPureAbstractElement(), FirQualifiedAcc abstract override fun transformExplicitReceiver(transformer: FirTransformer, data: D): FirVariableAssignment - abstract override fun transformDispatchReceiver(transformer: FirTransformer, data: D): FirVariableAssignment - - abstract override fun transformExtensionReceiver(transformer: FirTransformer, data: D): FirVariableAssignment - abstract fun transformRValue(transformer: FirTransformer, data: D): FirVariableAssignment } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirIntegerLiteralOperatorCallBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirIntegerLiteralOperatorCallBuilder.kt index d48e53ecbed..5cefbe48bb8 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirIntegerLiteralOperatorCallBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirIntegerLiteralOperatorCallBuilder.kt @@ -41,11 +41,11 @@ open class FirIntegerLiteralOperatorCallBuilder : FirAbstractFunctionCallBuilder override val contextReceiverArguments: MutableList = mutableListOf() override val typeArguments: MutableList = mutableListOf() override var explicitReceiver: FirExpression? = null - override var dispatchReceiver: FirExpression = FirNoReceiverExpression - override var extensionReceiver: FirExpression = FirNoReceiverExpression override var argumentList: FirArgumentList = FirEmptyArgumentList override lateinit var calleeReference: FirNamedReference override lateinit var origin: FirFunctionCallOrigin + override var dispatchReceiver: FirExpression = FirNoReceiverExpression + override var extensionReceiver: FirExpression = FirNoReceiverExpression override fun build(): FirIntegerLiteralOperatorCall { return FirIntegerLiteralOperatorCallImpl( @@ -55,11 +55,11 @@ open class FirIntegerLiteralOperatorCallBuilder : FirAbstractFunctionCallBuilder contextReceiverArguments, typeArguments, explicitReceiver, - dispatchReceiver, - extensionReceiver, argumentList, calleeReference, origin, + dispatchReceiver, + extensionReceiver, ) } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirCallableReferenceAccessImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirCallableReferenceAccessImpl.kt index 477dbfae056..51d837d40b0 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirCallableReferenceAccessImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirCallableReferenceAccessImpl.kt @@ -81,16 +81,6 @@ internal class FirCallableReferenceAccessImpl( return this } - override fun transformDispatchReceiver(transformer: FirTransformer, data: D): FirCallableReferenceAccessImpl { - dispatchReceiver = dispatchReceiver.transform(transformer, data) - return this - } - - override fun transformExtensionReceiver(transformer: FirTransformer, data: D): FirCallableReferenceAccessImpl { - extensionReceiver = extensionReceiver.transform(transformer, data) - return this - } - override fun transformCalleeReference(transformer: FirTransformer, data: D): FirCallableReferenceAccessImpl { calleeReference = calleeReference.transform(transformer, data) return this diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirComponentCallImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirComponentCallImpl.kt index c5ccb0dfe3a..7edeeeda94e 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirComponentCallImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirComponentCallImpl.kt @@ -87,16 +87,6 @@ internal class FirComponentCallImpl( return this } - override fun transformDispatchReceiver(transformer: FirTransformer, data: D): FirComponentCallImpl { - dispatchReceiver = dispatchReceiver.transform(transformer, data) - return this - } - - override fun transformExtensionReceiver(transformer: FirTransformer, data: D): FirComponentCallImpl { - extensionReceiver = extensionReceiver.transform(transformer, data) - return this - } - override fun transformCalleeReference(transformer: FirTransformer, data: D): FirComponentCallImpl { calleeReference = calleeReference.transform(transformer, data) return this diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirFunctionCallImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirFunctionCallImpl.kt index 6b4411006f6..e29bc9a6efe 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirFunctionCallImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirFunctionCallImpl.kt @@ -86,16 +86,6 @@ open class FirFunctionCallImpl @FirImplementationDetail constructor( return this } - override fun transformDispatchReceiver(transformer: FirTransformer, data: D): FirFunctionCallImpl { - dispatchReceiver = dispatchReceiver.transform(transformer, data) - return this - } - - override fun transformExtensionReceiver(transformer: FirTransformer, data: D): FirFunctionCallImpl { - extensionReceiver = extensionReceiver.transform(transformer, data) - return this - } - override fun transformCalleeReference(transformer: FirTransformer, data: D): FirFunctionCallImpl { calleeReference = calleeReference.transform(transformer, data) return this diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirImplicitInvokeCallImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirImplicitInvokeCallImpl.kt index 2943be7205b..b86ac737a87 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirImplicitInvokeCallImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirImplicitInvokeCallImpl.kt @@ -88,16 +88,6 @@ internal class FirImplicitInvokeCallImpl( return this } - override fun transformDispatchReceiver(transformer: FirTransformer, data: D): FirImplicitInvokeCallImpl { - dispatchReceiver = dispatchReceiver.transform(transformer, data) - return this - } - - override fun transformExtensionReceiver(transformer: FirTransformer, data: D): FirImplicitInvokeCallImpl { - extensionReceiver = extensionReceiver.transform(transformer, data) - return this - } - override fun transformCalleeReference(transformer: FirTransformer, data: D): FirImplicitInvokeCallImpl { calleeReference = calleeReference.transform(transformer, data) return this diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirIntegerLiteralOperatorCallImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirIntegerLiteralOperatorCallImpl.kt index e901d03c016..e6b9880334b 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirIntegerLiteralOperatorCallImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirIntegerLiteralOperatorCallImpl.kt @@ -32,11 +32,11 @@ internal class FirIntegerLiteralOperatorCallImpl( override val contextReceiverArguments: MutableList, override val typeArguments: MutableList, override var explicitReceiver: FirExpression?, - override var dispatchReceiver: FirExpression, - override var extensionReceiver: FirExpression, override var argumentList: FirArgumentList, override var calleeReference: FirNamedReference, override val origin: FirFunctionCallOrigin, + override var dispatchReceiver: FirExpression, + override var extensionReceiver: FirExpression, ) : FirIntegerLiteralOperatorCall() { override fun acceptChildren(visitor: FirVisitor, data: D) { typeRef.accept(visitor, data) @@ -86,6 +86,11 @@ internal class FirIntegerLiteralOperatorCallImpl( return this } + override fun transformCalleeReference(transformer: FirTransformer, data: D): FirIntegerLiteralOperatorCallImpl { + calleeReference = calleeReference.transform(transformer, data) + return this + } + override fun transformDispatchReceiver(transformer: FirTransformer, data: D): FirIntegerLiteralOperatorCallImpl { dispatchReceiver = dispatchReceiver.transform(transformer, data) return this @@ -96,11 +101,6 @@ internal class FirIntegerLiteralOperatorCallImpl( return this } - override fun transformCalleeReference(transformer: FirTransformer, data: D): FirIntegerLiteralOperatorCallImpl { - calleeReference = calleeReference.transform(transformer, data) - return this - } - @FirImplementationDetail override fun replaceSource(newSource: KtSourceElement?) { source = newSource @@ -124,14 +124,6 @@ internal class FirIntegerLiteralOperatorCallImpl( explicitReceiver = newExplicitReceiver } - override fun replaceDispatchReceiver(newDispatchReceiver: FirExpression) { - dispatchReceiver = newDispatchReceiver - } - - override fun replaceExtensionReceiver(newExtensionReceiver: FirExpression) { - extensionReceiver = newExtensionReceiver - } - override fun replaceArgumentList(newArgumentList: FirArgumentList) { argumentList = newArgumentList } @@ -144,4 +136,12 @@ internal class FirIntegerLiteralOperatorCallImpl( require(newCalleeReference is FirNamedReference) replaceCalleeReference(newCalleeReference) } + + override fun replaceDispatchReceiver(newDispatchReceiver: FirExpression) { + dispatchReceiver = newDispatchReceiver + } + + override fun replaceExtensionReceiver(newExtensionReceiver: FirExpression) { + extensionReceiver = newExtensionReceiver + } } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirPropertyAccessExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirPropertyAccessExpressionImpl.kt index 9c0da5fb9b1..5d0950df516 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirPropertyAccessExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirPropertyAccessExpressionImpl.kt @@ -86,16 +86,6 @@ class FirPropertyAccessExpressionImpl @FirImplementationDetail constructor( return this } - override fun transformDispatchReceiver(transformer: FirTransformer, data: D): FirPropertyAccessExpressionImpl { - dispatchReceiver = dispatchReceiver.transform(transformer, data) - return this - } - - override fun transformExtensionReceiver(transformer: FirTransformer, data: D): FirPropertyAccessExpressionImpl { - extensionReceiver = extensionReceiver.transform(transformer, data) - return this - } - @FirImplementationDetail override fun replaceSource(newSource: KtSourceElement?) { source = newSource diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirThisReceiverExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirThisReceiverExpressionImpl.kt index 60d4f46b5ee..58eb2b1a508 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirThisReceiverExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirThisReceiverExpressionImpl.kt @@ -83,16 +83,6 @@ internal class FirThisReceiverExpressionImpl( return this } - override fun transformDispatchReceiver(transformer: FirTransformer, data: D): FirThisReceiverExpressionImpl { - dispatchReceiver = dispatchReceiver.transform(transformer, data) - return this - } - - override fun transformExtensionReceiver(transformer: FirTransformer, data: D): FirThisReceiverExpressionImpl { - extensionReceiver = extensionReceiver.transform(transformer, data) - return this - } - override fun transformCalleeReference(transformer: FirTransformer, data: D): FirThisReceiverExpressionImpl { calleeReference = calleeReference.transform(transformer, data) return this diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirVariableAssignmentImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirVariableAssignmentImpl.kt index 221fc0f1a04..d5a95263d4f 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirVariableAssignmentImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirVariableAssignmentImpl.kt @@ -94,16 +94,6 @@ internal class FirVariableAssignmentImpl( return this } - override fun transformDispatchReceiver(transformer: FirTransformer, data: D): FirVariableAssignmentImpl { - dispatchReceiver = dispatchReceiver.transform(transformer, data) - return this - } - - override fun transformExtensionReceiver(transformer: FirTransformer, data: D): FirVariableAssignmentImpl { - extensionReceiver = extensionReceiver.transform(transformer, data) - return this - } - override fun transformRValue(transformer: FirTransformer, data: D): FirVariableAssignmentImpl { rValue = rValue.transform(transformer, data) return this diff --git a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/FieldSets.kt b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/FieldSets.kt index f8a4b03bbc5..474b5af5d8e 100644 --- a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/FieldSets.kt +++ b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/FieldSets.kt @@ -26,8 +26,8 @@ object FieldSets { val receivers by lazy { fieldSet( field("explicitReceiver", expression, nullable = true, withReplace = true).withTransform(), - field("dispatchReceiver", expression, withReplace = true).withTransform(), - field("extensionReceiver", expression, withReplace = true).withTransform() + field("dispatchReceiver", expression, withReplace = true), + field("extensionReceiver", expression, withReplace = true) ) } diff --git a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/NodeConfigurator.kt b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/NodeConfigurator.kt index 76cae31081a..f6d408b10b0 100644 --- a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/NodeConfigurator.kt +++ b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/NodeConfigurator.kt @@ -232,6 +232,12 @@ object NodeConfigurator : AbstractFieldConfigurator(FirTreeBuild +field("origin", functionCallOrigin) } + integerLiteralOperatorCall.configure { + // we need methods for transformation of receivers + +field("dispatchReceiver", expression, withReplace = true).withTransform() + +field("extensionReceiver", expression, withReplace = true).withTransform() + } + comparisonExpression.configure { +field("operation", operationType) +field("compareToCall", functionCall)