Optimization: make FirFunctionCall an abstract class
This commit is contained in:
@@ -5,13 +5,18 @@
|
|||||||
|
|
||||||
package org.jetbrains.kotlin.fir.expressions
|
package org.jetbrains.kotlin.fir.expressions
|
||||||
|
|
||||||
|
import com.intellij.psi.PsiElement
|
||||||
|
import org.jetbrains.kotlin.fir.FirSession
|
||||||
import org.jetbrains.kotlin.fir.visitors.FirVisitor
|
import org.jetbrains.kotlin.fir.visitors.FirVisitor
|
||||||
|
|
||||||
interface FirComponentCall : FirFunctionCall {
|
abstract class FirComponentCall(
|
||||||
|
session: FirSession,
|
||||||
|
psi: PsiElement?
|
||||||
|
) : FirFunctionCall(session, psi) {
|
||||||
// Starting from 1, not from 0
|
// Starting from 1, not from 0
|
||||||
val componentIndex: Int
|
abstract val componentIndex: Int
|
||||||
|
|
||||||
override val explicitReceiver: FirExpression
|
abstract override val explicitReceiver: FirExpression
|
||||||
|
|
||||||
override fun <R, D> accept(visitor: FirVisitor<R, D>, data: D): R =
|
override fun <R, D> accept(visitor: FirVisitor<R, D>, data: D): R =
|
||||||
visitor.visitComponentCall(this, data)
|
visitor.visitComponentCall(this, data)
|
||||||
|
|||||||
@@ -5,13 +5,19 @@
|
|||||||
|
|
||||||
package org.jetbrains.kotlin.fir.expressions
|
package org.jetbrains.kotlin.fir.expressions
|
||||||
|
|
||||||
|
import com.intellij.psi.PsiElement
|
||||||
import org.jetbrains.kotlin.fir.FirNamedReference
|
import org.jetbrains.kotlin.fir.FirNamedReference
|
||||||
|
import org.jetbrains.kotlin.fir.FirSession
|
||||||
import org.jetbrains.kotlin.fir.VisitedSupertype
|
import org.jetbrains.kotlin.fir.VisitedSupertype
|
||||||
|
import org.jetbrains.kotlin.fir.expressions.impl.FirAbstractCall
|
||||||
import org.jetbrains.kotlin.fir.types.FirTypeProjectionContainer
|
import org.jetbrains.kotlin.fir.types.FirTypeProjectionContainer
|
||||||
import org.jetbrains.kotlin.fir.visitors.FirVisitor
|
import org.jetbrains.kotlin.fir.visitors.FirVisitor
|
||||||
|
|
||||||
interface FirFunctionCall : @VisitedSupertype FirCall, FirQualifiedAccess, FirTypeProjectionContainer {
|
abstract class FirFunctionCall(
|
||||||
override val calleeReference: FirNamedReference
|
session: FirSession,
|
||||||
|
psi: PsiElement?
|
||||||
|
) : FirAbstractCall(session, psi), @VisitedSupertype FirCall, FirQualifiedAccess, FirTypeProjectionContainer {
|
||||||
|
abstract override val calleeReference: FirNamedReference
|
||||||
|
|
||||||
override fun <R, D> accept(visitor: FirVisitor<R, D>, data: D): R =
|
override fun <R, D> accept(visitor: FirVisitor<R, D>, data: D): R =
|
||||||
visitor.visitFunctionCall(this, data)
|
visitor.visitFunctionCall(this, data)
|
||||||
|
|||||||
+2
-2
@@ -23,7 +23,7 @@ class FirComponentCallImpl(
|
|||||||
psi: PsiElement?,
|
psi: PsiElement?,
|
||||||
override val componentIndex: Int,
|
override val componentIndex: Int,
|
||||||
override var explicitReceiver: FirExpression
|
override var explicitReceiver: FirExpression
|
||||||
) : FirAbstractCall(session, psi), FirComponentCall {
|
) : FirComponentCall(session, psi) {
|
||||||
override fun <D> transformExplicitReceiver(transformer: FirTransformer<D>, data: D): FirQualifiedAccess {
|
override fun <D> transformExplicitReceiver(transformer: FirTransformer<D>, data: D): FirQualifiedAccess {
|
||||||
explicitReceiver = explicitReceiver.transformSingle(transformer, data)
|
explicitReceiver = explicitReceiver.transformSingle(transformer, data)
|
||||||
return this
|
return this
|
||||||
@@ -43,6 +43,6 @@ class FirComponentCallImpl(
|
|||||||
override fun <D> transformChildren(transformer: FirTransformer<D>, data: D): FirElement {
|
override fun <D> transformChildren(transformer: FirTransformer<D>, data: D): FirElement {
|
||||||
calleeReference = calleeReference.transformSingle(transformer, data)
|
calleeReference = calleeReference.transformSingle(transformer, data)
|
||||||
explicitReceiver = explicitReceiver.transformSingle(transformer, data)
|
explicitReceiver = explicitReceiver.transformSingle(transformer, data)
|
||||||
return super<FirAbstractCall>.transformChildren(transformer, data)
|
return super.transformChildren(transformer, data)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+2
-2
@@ -18,7 +18,7 @@ class FirFunctionCallImpl(
|
|||||||
session: FirSession,
|
session: FirSession,
|
||||||
psi: PsiElement?,
|
psi: PsiElement?,
|
||||||
override var safe: Boolean = false
|
override var safe: Boolean = false
|
||||||
) : FirAbstractCall(session, psi), FirFunctionCall, FirModifiableQualifiedAccess {
|
) : FirFunctionCall(session, psi), FirModifiableQualifiedAccess {
|
||||||
override val typeArguments = mutableListOf<FirTypeProjection>()
|
override val typeArguments = mutableListOf<FirTypeProjection>()
|
||||||
|
|
||||||
override lateinit var calleeReference: FirNamedReference
|
override lateinit var calleeReference: FirNamedReference
|
||||||
@@ -29,7 +29,7 @@ class FirFunctionCallImpl(
|
|||||||
typeArguments.transformInplace(transformer, data)
|
typeArguments.transformInplace(transformer, data)
|
||||||
calleeReference = calleeReference.transformSingle(transformer, data)
|
calleeReference = calleeReference.transformSingle(transformer, data)
|
||||||
explicitReceiver = explicitReceiver?.transformSingle(transformer, data)
|
explicitReceiver = explicitReceiver?.transformSingle(transformer, data)
|
||||||
return super<FirAbstractCall>.transformChildren(transformer, data)
|
return super<FirFunctionCall>.transformChildren(transformer, data)
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun <D> transformCalleeReference(transformer: FirTransformer<D>, data: D): FirQualifiedAccess {
|
override fun <D> transformCalleeReference(transformer: FirTransformer<D>, data: D): FirQualifiedAccess {
|
||||||
|
|||||||
Reference in New Issue
Block a user