[js] Implement method_not_found_error

Author: pmurias

src/vm/js/Compiler.nqp

@@ -998,7 +998,7 @@ class QAST::CompilerJS does DWIMYNameMangling does SerializeOnce {
         Chunk.void(|@capture_inners);
     }
 
-    method compile_block(QAST::Block $node, $outer, $outer_loop, :$want, :@extra_args=[]) {
+    method compile_block(QAST::Block $node, $outer, $outer_loop, :$want, :@extra_args=[], :$hll) {
 
         my str $outer_ctx := try $*CTX // "null";
 
@@ -1033,7 +1033,8 @@ class QAST::CompilerJS does DWIMYNameMangling does SerializeOnce {
 
 
             my $outer_ctx := $has_closure_template ?? "this.outerCtx" !! ($*BLOCK.outer ?? $*BLOCK.outer.ctx !! 'null');
-            my str $create_ctx :=  "var $*CTX = new nqp.Ctx(caller_ctx, $outer_ctx, this);\n";
+            my str $create_ctx :=  "var $*CTX = new nqp.Ctx(caller_ctx, $outer_ctx, this);\n"
+                ~ ($hll ?? "$*CTX.\$\$hll = nqp.getHLL({quote_string($hll)});\n" !! '');
 
             %*USED_CTXS{$*CTX} := 0;
 
@@ -1311,7 +1312,7 @@ class QAST::CompilerJS does DWIMYNameMangling does SerializeOnce {
             "var sh = nqp.createArray([{nqp::join(',',@sh)}]);\n"
             ~ "var sc = nqp.op.createsc({quote_string(nqp::scgethandle($sc))});\n"
             ~ self.emit_code_refs_list($ast)
-            , "nqp.op.deserialize($quoted_data,sc,sh,code_refs,null,cuids,function() \{{self.setup_wvals}\});\n"
+            , "nqp.op.deserialize({quote_string($*HLL)}, $quoted_data,sc,sh,code_refs,null,cuids,function() \{{self.setup_wvals}\});\n"
             ~ "nqp.op.scsetdesc(sc,{quote_string(nqp::scgetdesc($sc))});\n");
     }
 
@@ -1439,7 +1440,7 @@ class QAST::CompilerJS does DWIMYNameMangling does SerializeOnce {
         self.mark_serializable($node[0]);
 
         # Compile the block.
-        my $block_js := self.as_js($node[0], :want(($instant && nqp::defined($node.main)) ?? $T_VOID !! $T_OBJ));
+        my $block_js := self.compile_block($node[0], $*BLOCK, $*LOOP, :hll($node.hll), :want(($instant && nqp::defined($node.main)) ?? $T_VOID !! $T_OBJ));
 
         my @post;
         for $node.post_deserialize -> $node {
@@ -1950,6 +1951,8 @@ class QAST::CompilerJS does DWIMYNameMangling does SerializeOnce {
 
         my $*COMPUNIT;
 
+        my $*LOOP;
+
         my $compile_block := -> {self.as_js($ast, :want($instant ?? $T_VOID !! $T_OBJ))};
 
         my $chunk := nqp::istype($ast, QAST::CompUnit) ?? 

src/vm/js/Operations.nqp

@@ -648,7 +648,7 @@ class QAST::OperationsJS {
     add_simple_op('serialize', $T_STR, [$T_OBJ, $T_OBJ], :side_effects);
     add_simple_op('scobjcount', $T_INT, [$T_OBJ]);
     add_simple_op('createsc', $T_OBJ, [$T_STR], :side_effects);
-    add_simple_op('deserialize', $T_OBJ, [$T_STR, $T_OBJ, $T_OBJ, $T_OBJ, $T_OBJ], :side_effects);
+    add_simple_op('deserialize', $T_OBJ, [$T_STR, $T_OBJ, $T_OBJ, $T_OBJ, $T_OBJ], :side_effects, :hll);
     add_simple_op('scsetobj', $T_OBJ, [$T_OBJ, $T_INT, $T_OBJ], :side_effects);
     add_simple_op('scgetobj', $T_OBJ, [$T_OBJ, $T_INT], :side_effects);
     add_simple_op('scsetcode', $T_OBJ, [$T_OBJ, $T_INT, $T_OBJ], :side_effects);

src/vm/js/nqp-runtime/ctx.js

@@ -297,6 +297,16 @@ class Ctx extends NQPObject {
     return this.$$outer.lookup(name);
   }
 
+  $$getHLL() {
+    var ctx = this;
+    while (ctx) {
+      if (ctx.$$hll) {
+        return ctx.$$hll;
+      }
+      ctx = ctx.$$outer;
+    }
+  }
+
   $$atkey(key) {
     return this.lookup(key);
   }

src/vm/js/nqp-runtime/deserialization.js

@@ -43,7 +43,7 @@ module.exports.wval = function(handle, idx) {
   return serializationContexts[handle].rootObjects[idx];
 };
 
-op.deserialize = function(blob, sc, sh, codeRefs, conflict, cuids, setupWVals) {
+op.deserialize = function(hllName, blob, sc, sh, codeRefs, conflict, cuids, setupWVals) {
   var buffer = new Buffer(blob, 'base64');
   sc.codeRefs = codeRefs.array;
 
@@ -56,7 +56,7 @@ op.deserialize = function(blob, sc, sh, codeRefs, conflict, cuids, setupWVals) {
   sh = sh.array;
   var cursor = new BinaryCursor(buffer, 0, sh, sc);
 
-  cursor.deserialize(sc, cuids, setupWVals);
+  cursor.deserialize(sc, cuids, setupWVals, hll.getHLL(hllName));
 };
 
 op.createsc = function(handle) {
@@ -512,7 +512,7 @@ class BinaryCursor {
     Resolve the static variables in all CodeRefs contained in cuids
    */
 
-  deserialize(sc, cuids, setupWVals) {
+  deserialize(sc, cuids, setupWVals, currentHLL) {
     var version = this.I32();
 
     this.sc = sc;
@@ -643,7 +643,7 @@ class BinaryCursor {
 
     for (var i = 0; i < contexts.length; i++) {
       if (contexts[i].outer == 0) {
-        this.deserializeCtx(contexts[i], null);
+        this.deserializeCtx(contexts[i], null, currentHLL);
       }
     }
 
@@ -754,7 +754,7 @@ class BinaryCursor {
     }
   }
 
-  deserializeCtx(context, outerCtx) {
+  deserializeCtx(context, outerCtx, currentHLL) {
     var callerCtx = null;
 
     // TODO - think if we should set codeObj
@@ -771,7 +771,7 @@ class BinaryCursor {
     }
 
     for (var inner of context.inner) {
-      this.deserializeCtx(inner, ctx);
+      this.deserializeCtx(inner, ctx, currentHLL);
     }
 
     for (var closure of context.closures) {

src/vm/js/nqp-runtime/reprs.js

@@ -38,6 +38,16 @@ function noopCompose(obj, reprInfo) {
 }
 
 
+
+function methodNotFoundError(ctx, obj, name) {
+  let handler = ctx ? ctx.$$getHLL().get('method_not_found_error') : undefined;
+  if (handler === undefined) {
+    throw new NQPException("Cannot find method '" + name + "' on object of type " + obj._STable.debugName);
+  } else {
+    handler.$$call(ctx, null, obj, name);
+  }
+}
+
 function basicConstructor(STable) {
   var objConstructor = function() {};
   var handler = {};
@@ -50,20 +60,27 @@ function basicConstructor(STable) {
       }
     }
 
-    if (STable.modeFlags & constants.METHOD_CACHE_AUTHORITATIVE) {
-      return undefined;
-    }
-
     /* are we trying to access an internal property? */
     if (name.substr(0, 2) === '$$') {
       return undefined;
     }
 
+    if (STable.modeFlags & constants.METHOD_CACHE_AUTHORITATIVE) {
+      return function(ctx, _NAMED, obj) {
+        methodNotFoundError(ctx, obj, name);
+      };
+    }
+
+
     return function() {
       let how = this._STable.HOW;
 
       var method = how.find_method(null, null, how, this, name);
 
+      if (method === Null) {
+        methodNotFoundError(arguments[0], arguments[2], name);
+      }
+
       var args = [];
       for (var i = 0; i < arguments.length; i++) {
         args.push(arguments[i]);

src/vm/js/nqp-runtime/runtime.js

@@ -437,3 +437,5 @@ exports.paramcheckfailed = function(hllName, args) {
 };
 
 exports.NativeRef = require('./reprs.js').NativeRef;
+
+exports.getHLL = hll.getHLL;

src/vm/js/nqp-runtime/sixmodel.js

@@ -23,7 +23,7 @@ function findMethod(ctx, obj, name) {
     }
   }
 
-  if (obj._STable.HOW.find_method) {
+  if (obj._STable.HOW.$$can(ctx, 'find_method')) {
     return obj._STable.HOW.find_method(ctx, null, obj._STable.HOW, obj, name);
   } else {
     return Null;
@@ -93,7 +93,7 @@ class STable {
 
         var HOW = this._STable.HOW;
         /* This "hack" is stolen from the JVM */
-        if (!HOW.type_check) {
+        if (!HOW.$$can(ctx, 'type_check')) {
           return 0;
         }