[js] Tweak multi caches to cache rw containers separately

Author: pmurias

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

@@ -19,7 +19,28 @@ function posTypes(ctx, capture) {
     var obj = capture.pos[i];
     if (obj._STable) {
       let deconted = obj.$$decont(ctx);
-      types[i] = deconted.typeObject_ ? deconted : deconted._STable;
+      if (!obj.$$isrwcont) {
+        console.log("attempting to cache");
+        require('nqp-runtime').dumpObj(obj);
+      }
+
+      /* TODO - think if having flags wouldn't be faster/cleaner then weird objects */
+      if (obj.$$isrwcont()) {
+        if (deconted.typeObject_) {
+          if (deconted._STable.typeObjectCachedAsRW === undefined) {
+            deconted._STable.typeObjectCachedAsRW = {};
+          }
+          types[i] = deconted._STable.typeObjectCachedAsRW;
+        } else {
+          if (deconted._STable.cachedAsRW === undefined) {
+            deconted._STable.cachedAsRW = {};
+          }
+          types[i] = deconted._STable.cachedAsRW;
+        }
+
+      } else {
+        types[i] = deconted.typeObject_ ? deconted : deconted._STable;
+      }
     } else if (obj instanceof NQPInt) {
       types[i] = 1;
     } else if (typeof obj == 'number') {

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

@@ -19,6 +19,10 @@ class NQPException extends Error {
   $$istype(ctx, type) {
     return 0;
   }
+
+  $$isrwcont() {
+    return 0;
+  }
 };
 
 NQPException.prototype._STable = {

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

@@ -4,6 +4,10 @@ class NQPObject {
   $$decont(ctx) {
     return this;
   }
+
+  $$isrwcont() {
+    return 0;
+  }
 };
 
 module.exports = NQPObject;

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

@@ -1,10 +1,7 @@
 'use strict';
+let NQPObject = require('./nqp-object.js');
 let singleton;
-class Null {
-  $$decont(ctx) {
-    return this;
-  }
-
+class Null extends NQPObject {
   $$toBool(ctx) {
     return 0;
   }

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

@@ -1,14 +1,11 @@
 'use strict';
-class NullS {
+let NQPObject = require('./nqp-object.js');
+class NullS extends NQPObject {
   toString() {
     console.trace('here');
     throw 'doing string stuff on a null_s';
   }
 
-  $$decont(ctx) {
-    return this;
-  }
-
   $$istype(ctx, type) {
     return 0;
   }

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

@@ -396,6 +396,10 @@ Number.prototype.$$can = function(ctx, name) {
   return 0;
 };
 
+Number.prototype.$$isrwcont = function(ctx) {
+  return 0;
+};
+
 String.prototype.$$decont = function(ctx) {
   return this;
 };
@@ -412,6 +416,10 @@ String.prototype.$$istype = function(ctx, type) {
   return 0;
 };
 
+String.prototype.$$isrwcont = function(ctx) {
+  return 0;
+};
+
 // needed for continuations
 Function.prototype.$$toBool = function(ctx) {
   return 1;

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

@@ -63,6 +63,10 @@ class STable {
       return this;
     };
 
+    this.objConstructor.prototype.$$isrwcont = function() {
+      return 0;
+    };
+
     this.objConstructor.prototype.typeObject_ = 0;
 
     this.objConstructor.prototype.$$call = undefined;