psi2ir: support dynamic infix calls ('foo bar 42' is 'foo.bar(42)')

This commit is contained in:
Dmitry Petrov
2019-02-13 16:08:03 +03:00
parent 740d5ec468
commit 6aff53204f
6 changed files with 36 additions and 8 deletions
@@ -13,7 +13,7 @@ import org.jetbrains.kotlin.util.OperatorNameConventions
internal fun ResolvedCall<*>.isImplicitInvoke(): Boolean {
if (resultingDescriptor.name != OperatorNameConventions.INVOKE) return false
val callExpression = call.callElement as? KtCallExpression ?: return true
val callExpression = call.callElement as? KtCallExpression ?: return false
val calleeExpression = callExpression.calleeExpression as? KtSimpleNameExpression ?: return true
return calleeExpression.getReferencedName() != OperatorNameConventions.INVOKE.asString()
}
@@ -177,14 +177,17 @@ class OperatorExpressionGenerator(statementGenerator: StatementGenerator) : Stat
val kotlinType = context.bindingContext.getType(ktExpression) ?: throw AssertionError("No type for ${ktExpression.text}")
val startOffset = ktExpression.startOffsetSkippingComments
val endOffset = ktExpression.endOffset
val irType = kotlinType.toIrType()
if (ktExpression.operationToken == KtTokens.IDENTIFIER) {
return generateCall(getResolvedCall(ktExpression)!!, ktExpression, null)
}
val operator = ktExpression.getDynamicOperator()
return IrDynamicOperatorExpressionImpl(
ktExpression.startOffsetSkippingComments,
ktExpression.endOffset,
kotlinType.toIrType(),
operator
).apply {
return IrDynamicOperatorExpressionImpl(startOffset, endOffset, irType, operator).apply {
left = ktLeft.genExpr()
right = ktRight.genExpr()
}
@@ -1,4 +1,4 @@
// IGNORE_BACKEND: JVM_IR
// IGNORE_BACKEND: JVM_IR, JS_IR
// NO_CHECK_LAMBDA_INLINING
// FILE: 1.kt
@@ -0,0 +1,3 @@
fun test1(d: dynamic) = d foo 123
fun test2(d: dynamic) = d invoke 123
@@ -0,0 +1,17 @@
FILE fqName:<root> fileName:/dynamicInfixCall.kt
FUN name:test1 visibility:public modality:FINAL <> (d:dynamic) returnType:dynamic flags:
VALUE_PARAMETER name:d index:0 type:dynamic flags:
BLOCK_BODY
RETURN type=kotlin.Nothing from='test1(dynamic): dynamic'
DYN_OP operator=INVOKE type=dynamic
receiver: DYN_MEMBER memberName='foo' type=dynamic
GET_VAR 'value-parameter d: dynamic' type=dynamic origin=null
0: CONST Int type=kotlin.Int value=123
FUN name:test2 visibility:public modality:FINAL <> (d:dynamic) returnType:dynamic flags:
VALUE_PARAMETER name:d index:0 type:dynamic flags:
BLOCK_BODY
RETURN type=kotlin.Nothing from='test2(dynamic): dynamic'
DYN_OP operator=INVOKE type=dynamic
receiver: DYN_MEMBER memberName='invoke' type=dynamic
GET_VAR 'value-parameter d: dynamic' type=dynamic origin=null
0: CONST Int type=kotlin.Int value=123
@@ -101,6 +101,11 @@ public class IrJsTextTestCaseGenerated extends AbstractIrJsTextTestCase {
runTest("compiler/testData/ir/irJsText/dynamic/dynamicExclExclOperator.kt");
}
@TestMetadata("dynamicInfixCall.kt")
public void testDynamicInfixCall() throws Exception {
runTest("compiler/testData/ir/irJsText/dynamic/dynamicInfixCall.kt");
}
@TestMetadata("dynamicMemberAccess.kt")
public void testDynamicMemberAccess() throws Exception {
runTest("compiler/testData/ir/irJsText/dynamic/dynamicMemberAccess.kt");