FIR: implement named arguments #KT-24081 Fixed

This commit is contained in:
Mikhail Glukhikh
2019-03-14 17:21:34 +03:00
parent d65b30dd82
commit 909a5fd32d
12 changed files with 105 additions and 5 deletions
@@ -551,6 +551,12 @@ class FirRenderer(builder: StringBuilder) : FirVisitorVoid() {
print("${constExpression.kind}(${constExpression.value})")
}
override fun visitNamedArgumentExpression(namedArgumentExpression: FirNamedArgumentExpression) {
print(namedArgumentExpression.name)
print(" = ")
namedArgumentExpression.expression.accept(this)
}
override fun visitCall(call: FirCall) {
print("(")
call.arguments.renderSeparated()
@@ -0,0 +1,23 @@
/*
* Copyright 2010-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
* that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.fir.expressions
import org.jetbrains.kotlin.fir.visitors.FirVisitor
import org.jetbrains.kotlin.name.Name
interface FirNamedArgumentExpression : FirExpression {
val name: Name
val expression: FirExpression
override fun <R, D> accept(visitor: FirVisitor<R, D>, data: D): R =
visitor.visitNamedArgumentExpression(this, data)
override fun <R, D> acceptChildren(visitor: FirVisitor<R, D>, data: D) {
expression.accept(visitor, data)
super.acceptChildren(visitor, data)
}
}
@@ -0,0 +1,27 @@
/*
* Copyright 2010-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
* that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.fir.expressions.impl
import com.intellij.psi.PsiElement
import org.jetbrains.kotlin.fir.FirElement
import org.jetbrains.kotlin.fir.FirSession
import org.jetbrains.kotlin.fir.expressions.FirExpression
import org.jetbrains.kotlin.fir.expressions.FirNamedArgumentExpression
import org.jetbrains.kotlin.fir.transformSingle
import org.jetbrains.kotlin.fir.visitors.FirTransformer
import org.jetbrains.kotlin.name.Name
class FirNamedArgumentExpressionImpl(
session: FirSession,
psi: PsiElement?,
override val name: Name,
override var expression: FirExpression
) : FirNamedArgumentExpression, FirAbstractExpression(session, psi) {
override fun <D> transformChildren(transformer: FirTransformer<D>, data: D): FirElement {
expression = expression.transformSingle(transformer, data)
return super<FirAbstractExpression>.transformChildren(transformer, data)
}
}
@@ -256,6 +256,10 @@ abstract class FirTransformer<in D> : FirVisitor<CompositeTransformResult<FirEle
return transformJump(returnExpression, data)
}
open fun transformNamedArgumentExpression(namedArgumentExpression: FirNamedArgumentExpression, data: D): CompositeTransformResult<FirStatement> {
return transformExpression(namedArgumentExpression, data)
}
open fun transformThrowExpression(throwExpression: FirThrowExpression, data: D): CompositeTransformResult<FirStatement> {
return transformExpression(throwExpression, data)
}
@@ -564,6 +568,10 @@ abstract class FirTransformer<in D> : FirVisitor<CompositeTransformResult<FirEle
return transformModifiableQualifiedAccess(modifiableQualifiedAccess, data)
}
final override fun visitNamedArgumentExpression(namedArgumentExpression: FirNamedArgumentExpression, data: D): CompositeTransformResult<FirElement> {
return transformNamedArgumentExpression(namedArgumentExpression, data)
}
final override fun visitNamedDeclaration(namedDeclaration: FirNamedDeclaration, data: D): CompositeTransformResult<FirElement> {
return transformNamedDeclaration(namedDeclaration, data)
}
@@ -256,6 +256,10 @@ abstract class FirVisitor<out R, in D> {
return visitJump(returnExpression, data)
}
open fun visitNamedArgumentExpression(namedArgumentExpression: FirNamedArgumentExpression, data: D): R {
return visitExpression(namedArgumentExpression, data)
}
open fun visitThrowExpression(throwExpression: FirThrowExpression, data: D): R {
return visitExpression(throwExpression, data)
}
@@ -256,6 +256,10 @@ abstract class FirVisitorVoid : FirVisitor<Unit, Nothing?>() {
visitJump(returnExpression, null)
}
open fun visitNamedArgumentExpression(namedArgumentExpression: FirNamedArgumentExpression) {
visitExpression(namedArgumentExpression, null)
}
open fun visitThrowExpression(throwExpression: FirThrowExpression) {
visitExpression(throwExpression, null)
}
@@ -564,6 +568,10 @@ abstract class FirVisitorVoid : FirVisitor<Unit, Nothing?>() {
visitModifiableQualifiedAccess(modifiableQualifiedAccess)
}
final override fun visitNamedArgumentExpression(namedArgumentExpression: FirNamedArgumentExpression, data: Nothing?) {
visitNamedArgumentExpression(namedArgumentExpression)
}
final override fun visitNamedDeclaration(namedDeclaration: FirNamedDeclaration, data: Nothing?) {
visitNamedDeclaration(namedDeclaration)
}