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

Optimization: make FirFunctionCall an abstract class

Browse Source
This commit is contained in:
Mikhail Glukhikh
2019-06-10 20:02:28 +03:00
parent d85ad650d5
commit f6f879302f
4 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirComponentCall.kt
+8 -3
View File
@@ -5,13 +5,18 @@
package org.jetbrains.kotlin.fir.expressions
import com.intellij.psi.PsiElement
import org.jetbrains.kotlin.fir.FirSession
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
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 =
visitor.visitComponentCall(this, data)
compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirFunctionCall.kt
+8 -2
View File
@@ -5,13 +5,19 @@
package org.jetbrains.kotlin.fir.expressions
import com.intellij.psi.PsiElement
import org.jetbrains.kotlin.fir.FirNamedReference
import org.jetbrains.kotlin.fir.FirSession
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.visitors.FirVisitor
interface FirFunctionCall : @VisitedSupertype FirCall, FirQualifiedAccess, FirTypeProjectionContainer {
override val calleeReference: FirNamedReference
abstract class FirFunctionCall(
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 =
visitor.visitFunctionCall(this, data)
compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirComponentCallImpl.kt
+2 -2
View File
@@ -23,7 +23,7 @@ class FirComponentCallImpl(
psi: PsiElement?,
override val componentIndex: Int,
override var explicitReceiver: FirExpression
) : FirAbstractCall(session, psi), FirComponentCall {
) : FirComponentCall(session, psi) {
override fun <D> transformExplicitReceiver(transformer: FirTransformer<D>, data: D): FirQualifiedAccess {
explicitReceiver = explicitReceiver.transformSingle(transformer, data)
return this
@@ -43,6 +43,6 @@ class FirComponentCallImpl(
override fun <D> transformChildren(transformer: FirTransformer<D>, data: D): FirElement {
calleeReference = calleeReference.transformSingle(transformer, data)
explicitReceiver = explicitReceiver.transformSingle(transformer, data)
return super<FirAbstractCall>.transformChildren(transformer, data)
return super.transformChildren(transformer, data)
}
}
compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirFunctionCallImpl.kt
+2 -2
View File
@@ -18,7 +18,7 @@ class FirFunctionCallImpl(
session: FirSession,
psi: PsiElement?,
override var safe: Boolean = false
) : FirAbstractCall(session, psi), FirFunctionCall, FirModifiableQualifiedAccess {
) : FirFunctionCall(session, psi), FirModifiableQualifiedAccess {
override val typeArguments = mutableListOf<FirTypeProjection>()
override lateinit var calleeReference: FirNamedReference
@@ -29,7 +29,7 @@ class FirFunctionCallImpl(
typeArguments.transformInplace(transformer, data)
calleeReference = calleeReference.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 {