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

Prepared code for supporting SAM conversions.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2013-03-22 19:27:40 +04:00
parent b891d6d87f
commit d5031e60ad
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
+14 -3
View File
@@ -1891,10 +1891,21 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
BindingContext.SAM_CONSTRUCTOR_TO_TRAIT, ((SimpleFunctionDescriptor) funDescriptor).getOriginal()); BindingContext.SAM_CONSTRUCTOR_TO_TRAIT, ((SimpleFunctionDescriptor) funDescriptor).getOriginal());
if (samTrait != null) { if (samTrait != null) {
JetFunctionLiteralExpression argumentExpression = (JetFunctionLiteralExpression) ((ExpressionValueArgument) resolvedCall.getValueArgumentsByIndex().get(0)).getValueArgument() ResolvedValueArgument argument = resolvedCall.getValueArgumentsByIndex().get(0);
.getArgumentExpression(); // TODO this will fail for Runnable(f) expression if (!(argument instanceof ExpressionValueArgument)) {
throw new IllegalStateException(
"argument of SAM constructor is " + argument.getClass().getName() + " " + expression.getText());
}
ValueArgument valueArgument = ((ExpressionValueArgument) argument).getValueArgument();
assert valueArgument != null : "getValueArgument() is null for " + expression.getText();
JetExpression argumentExpression = valueArgument.getArgumentExpression();
return genClosure(argumentExpression.getFunctionLiteral(), samTrait); if (argumentExpression instanceof JetFunctionLiteralExpression) {
return genClosure(((JetFunctionLiteralExpression) argumentExpression).getFunctionLiteral(), samTrait);
}
else {
throw new UnsupportedOperationException(); // TODO
}
} }
} }
return invokeFunction(call, receiver, resolvedCall); return invokeFunction(call, receiver, resolvedCall);