Make nqp::isinvokable respect nqp::setinvokespec.

Raku · Feb 14, 2015 · d2e9220 · d2e9220
1 parent dd4e123
commit d2e9220
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/src/vm/js/nqp-runtime/core.js b/src/vm/js/nqp-runtime/core.js
@@ -29,7 +29,7 @@ op.getcomp = function(lang) {
 };
 
 op.isinvokable = function(obj) {
-  return (obj instanceof CodeRef ? 1 : 0);
+  return (obj instanceof CodeRef || (obj._STable && obj._STable.invocationSpec) ? 1 : 0);
 };
 
 op.escape = function(str) {

diff --git a/src/vm/js/nqp-runtime/sixmodel.js b/src/vm/js/nqp-runtime/sixmodel.js
@@ -46,6 +46,7 @@ STable.prototype.setinvokespec = function(classHandle, attrName, invocationHandl
   this.obj_constructor.prototype.$apply = function _(args) {
     return this[attrName].$apply(args);
   };
+  this.invocationSpec = {classHandle: classHandle, attrName: attrName, invocationHandler: invocationHandler};
 };
 
 function injectMethod(proto, name, method) {

diff --git a/t/nqp/70-invokespec.t b/t/nqp/70-invokespec.t
@@ -25,3 +25,8 @@ $bar.set_code_ref(sub () {1001});
 $bar.set_code_ref_differently(sub () {1002});
 ok($bar() == 1002,"setinvokespec with a attribute in a subclass");
 
+class Baz {
+}
+
+ok(nqp::isinvokable(Foo) == 1, "nqp::isinvokable works on objects that have a set invokespec");
+ok(nqp::isinvokable(Baz) == 0, "nqp::isinvokable works on objects that don't have a set invokespec");