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

Remove extra method toFirExpression

Browse Source
This commit is contained in:
Ivan Cilcic
2019-07-31 00:12:13 +03:00
committed by Mikhail Glukhikh
parent f3299c4636
commit 2e05fe9976
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/lightTree/src/org/jetbrains/kotlin/fir/lightTree/converter/ExpressionsConverter.kt
+3 -7
View File
@@ -45,10 +45,6 @@ class ExpressionsConverter(
context: Context = Context() context: Context = Context()
) : BaseConverter(session, tree, context) { ) : BaseConverter(session, tree, context) {
inline fun <reified R : FirElement> LighterASTNode?.toFirExpression(errorReason: String = ""): R {
return this?.let { convertExpression(it, errorReason) } as? R ?: (FirErrorExpressionImpl(session, null, errorReason) as R)
}
inline fun <reified R : FirElement> getAsFirExpression(expression: LighterASTNode?, errorReason: String = ""): R { inline fun <reified R : FirElement> getAsFirExpression(expression: LighterASTNode?, errorReason: String = ""): R {
return expression?.let { convertExpression(it, errorReason) } as? R ?: (FirErrorExpressionImpl(session, null, errorReason) as R) return expression?.let { convertExpression(it, errorReason) } as? R ?: (FirErrorExpressionImpl(session, null, errorReason) as R)
} }
@@ -213,7 +209,7 @@ class ExpressionsConverter(
} else { } else {
val firOperation = operationToken.toFirOperation() val firOperation = operationToken.toFirOperation()
if (firOperation in FirOperation.ASSIGNMENTS) { if (firOperation in FirOperation.ASSIGNMENTS) {
return leftArgNode.generateAssignment(null, rightArgAsFir, firOperation) { toFirExpression() } return leftArgNode.generateAssignment(null, rightArgAsFir, firOperation) { getAsFirExpression(this) }
} else { } else {
FirOperatorCallImpl(session, null, firOperation).apply { FirOperatorCallImpl(session, null, firOperation).apply {
arguments += getAsFirExpression<FirExpression>(leftArgNode, "No left operand") arguments += getAsFirExpression<FirExpression>(leftArgNode, "No left operand")
@@ -306,7 +302,7 @@ class ExpressionsConverter(
val operationToken = operationTokenName.getOperationSymbol() val operationToken = operationTokenName.getOperationSymbol()
if (operationToken == EXCLEXCL) { if (operationToken == EXCLEXCL) {
return argument.bangBangToWhen(null) { toFirExpression(it) } return argument.bangBangToWhen(null) { getAsFirExpression(this, it) }
} }
val conventionCallName = operationToken.toUnaryName() val conventionCallName = operationToken.toUnaryName()
@@ -317,7 +313,7 @@ class ExpressionsConverter(
argument, argument,
callName = conventionCallName, callName = conventionCallName,
prefix = unaryExpression.tokenType == PREFIX_EXPRESSION prefix = unaryExpression.tokenType == PREFIX_EXPRESSION
) { toFirExpression() } ) { getAsFirExpression(this) }
} }
FirFunctionCallImpl(session, null).apply { FirFunctionCallImpl(session, null).apply {
calleeReference = FirSimpleNamedReference(this@ExpressionsConverter.session, null, conventionCallName) calleeReference = FirSimpleNamedReference(this@ExpressionsConverter.session, null, conventionCallName)