Make invoke handling the invocation protocol.

jnthn · Feb 1, 2013 · cf03bd9 · cf03bd9
1 parent 78376f6
commit cf03bd9
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/src/org/perl6/nqp/runtime/Ops.java b/src/org/perl6/nqp/runtime/Ops.java
@@ -897,9 +897,19 @@ public static void invoke(ThreadContext tc, SixModelObject invokee, int callsite
     	}
 
     	// Otherwise, get the code ref.
-    	if (!(invokee instanceof CodeRef))
-            throw new Exception("Can only invoke direct CodeRefs so far");
-        CodeRef cr = (CodeRef)invokee;
+    	CodeRef cr;
+    	if (invokee instanceof CodeRef) {
+    		cr = (CodeRef)invokee;
+    	}
+    	else {
+    		InvocationSpec is = invokee.st.InvocationSpec;
+    		if (is == null)
+    			throw new Exception("Can not invoke this object");
+    		if (is.ClassHandle != null)
+    			cr = (CodeRef)invokee.get_attribute_boxed(tc, is.ClassHandle, is.AttrName, is.Hint);
+    		else
+    			cr = (CodeRef)is.InvocationHandler;
+    	}
         StaticCodeInfo sci = cr.staticInfo;
 
         // Create a new call frame and set caller and callsite.