Make things more sane by having an $apply method on CodeRefs instead …

…of a Function.apply like apply.
pmurias · Jan 24, 2015 · c49abdf · c49abdf
1 parent 378fdc9
commit c49abdf
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/vm/js/QAST/Compiler.nqp b/src/vm/js/QAST/Compiler.nqp
@@ -546,7 +546,7 @@ class QAST::OperationsJS {
         my $call;
         if nqp::islist($compiled_args) {
             $compiled_args := merge_arg_groups($compiled_args);
-            $call := '.apply(undefined,';
+            $call := '.$apply(';
         } else {
             $call := '.$call(';
         }
@@ -971,7 +971,7 @@ class QAST::OperationsJS {
     add_simple_op('captureposelems', $T_INT, [$T_OBJ]);
     add_simple_op('captureposarg', $T_OBJ, [$T_OBJ, $T_INT]);
     add_simple_op('invokewithcapture', $T_OBJ, [$T_OBJ, $T_OBJ], sub ($invokee, $capture) {
-        "$invokee.apply(undefined,[{$*BLOCK.ctx}].concat($capture.named, $capture.pos))"
+        "$invokee.\$apply([{$*BLOCK.ctx}].concat($capture.named, $capture.pos))"
     }, :sideffects);
 
 

diff --git a/src/vm/js/nqp-runtime/code-ref.js b/src/vm/js/nqp-runtime/code-ref.js
@@ -6,8 +6,8 @@ CodeRef.prototype.block = function(func) {
   func.codeRef = this;
 };
 
-CodeRef.prototype.apply = function(thisArg, argsArray) {
-  return this.$call.apply(thisArg, argsArray);
+CodeRef.prototype.$apply = function(argsArray) {
+  return this.$call.apply(this, argsArray);
 };
 
 CodeRef.prototype.takeclosure = function() {

diff --git a/src/vm/js/nqp-runtime/sixmodel.js b/src/vm/js/nqp-runtime/sixmodel.js
@@ -15,8 +15,8 @@ STable.prototype.setinvokespec = function(classHandle, attrName, invocationHandl
   this.obj_constructor.prototype.$call = function() {
     return this[attrName].$call.apply(this, arguments);
   };
-  this.obj_constructor.prototype.apply = function() {
-    return this[attrName].apply.apply(this, arguments);
+  this.obj_constructor.prototype.$apply = function(args) {
+    return this[attrName].$apply(args);
   };
 };