[js] settypecheckmode with nqp::const::TYPE_CHECK_NEEDS_ACCEPTS.

Raku · Nov 16, 2016 · 6dadbe3 · 6dadbe3
1 parent 798eeb3
commit 6dadbe3
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/src/vm/js/nqp-runtime/core.js b/src/vm/js/nqp-runtime/core.js
@@ -244,7 +244,6 @@ op.istype = function(ctx, obj, type) {
     }
   }
 
-  // TODO cases where the typeCheckCache isn't authoritative
   var cache = obj._STable.typeCheckCache;
   if (cache) {
     for (var i = 0; i < cache.length; i++) {
@@ -262,9 +261,15 @@ op.istype = function(ctx, obj, type) {
       return 0;
     }
 
+    if (HOW.type_check(ctx, null, HOW, obj, type).$$toBool(ctx)) {
+      return 1;
+    }
+  }
 
-    return HOW.type_check(ctx, null, HOW, obj, type).$$toBool(ctx);
+  if (type._STable.typeCheckNeedsAccepts) {
+    return type._STable.HOW.accepts_type(ctx, null, type._STable.HOW, type, obj).$$toBool(ctx);
   }
+
   return 0;
 };
 
@@ -274,7 +279,9 @@ op.settypecache = function(obj, cache) {
 };
 
 op.settypecheckmode = function(obj, mode) {
-  console.log('NYI settypecheckmode');
+  if (mode & 2) {
+    obj._STable.typeCheckNeedsAccepts = true;
+  }
   return obj;
 };