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

closure as callable method

Browse Source
This commit is contained in:
Dmitry Jemerov
2011-07-06 12:15:05 +02:00
parent 5eb2f913b3
commit 8317fbc290
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/codegen/ClosureCodegen.java
+6
View File
@@ -211,4 +211,10 @@ public class ClosureCodegen {
signatureWriter.visitClassType(rawRetType.getInternalName());
signatureWriter.visitEnd();
}
public static CallableMethod asCallableMethod(FunctionDescriptor fd) {
Method descriptor = erasedInvokeSignature(fd);
String owner = getInternalClassName(fd);
return new CallableMethod(owner, descriptor, Opcodes.INVOKEVIRTUAL, Arrays.asList(descriptor.getArgumentTypes()));
}
}
idea/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
+6 -5
View File
@@ -780,6 +780,8 @@ public class ExpressionCodegen extends JetVisitor {
if (declarationPsiElement == null) {
throw new UnsupportedOperationException("couldn't find declaration for " + funDescriptor);
}
Method methodDescriptor;
if (declarationPsiElement instanceof PsiMethod) {
final PsiMethod psiMethod = (PsiMethod) declarationPsiElement;
@@ -814,15 +816,14 @@ public class ExpressionCodegen extends JetVisitor {
gen(callee, Type.getObjectType(ClosureCodegen.getInternalClassName(fd)));
boolean isExtensionFunction = fd.getReceiverType() != null;
int paramCount = fd.getValueParameters().size();
if (isExtensionFunction) {
ensureReceiverOnStack(expression, null);
paramCount++;
}
methodDescriptor = ClosureCodegen.erasedInvokeSignature(fd);
pushMethodArguments(expression, methodDescriptor);
v.invokevirtual(ClosureCodegen.getInternalClassName(fd), "invoke", methodDescriptor.getDescriptor());
CallableMethod callableMethod = ClosureCodegen.asCallableMethod(fd);
pushMethodArguments(expression, callableMethod.getValueParameterTypes());
callableMethod.invoke(v);
methodDescriptor = callableMethod.getSignature();
}
if (methodDescriptor.getReturnType() != Type.VOID_TYPE) {