[js] More uint64 and int64 tweaks

Author: pmurias

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

@@ -250,7 +250,7 @@ class NativeRef {
       });
     } else if (primitiveType == 4) { // int64
       this.STable.addInternalMethods(class {
-        $$iscont_s() {
+        $$iscont_i() {
           return 1;
         }
 

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

@@ -39,6 +39,18 @@ function attrRef_s(currentHLL, get, set) {
   return ref;
 }
 
+function attrRef_i64(currentHLL, get, set) {
+  const refType = currentHLL.get('int64_attr_ref');
+  if (refType === undefined) {
+    throw 'No int64 attribute reference type registered for current HLL';
+  }
+  const STable = refType._STable;
+  const ref = STable.REPR.allocate(STable);
+  ref.get = get;
+  ref.set = set;
+  return ref;
+}
+
 op.getattrref_i = function(currentHLL, obj, classHandle, attrName) {
   return attrRef_i(currentHLL,
       () => obj.$$getattr_i(classHandle, attrName),
@@ -184,3 +196,6 @@ op.atposref_s = function(currentHLL, obj, index) {
 helpers.attrRef_i = attrRef_i;
 helpers.attrRef_n = attrRef_n;
 helpers.attrRef_s = attrRef_s;
+
+helpers.attrRef_i64 = attrRef_i64;
+helpers.attrRef_u64 = attrRef_i64; // TODO - think if that's good

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

@@ -522,7 +522,7 @@ class P6opaque extends REPRWithAttributes {
       return 'return this.$$bindattr$' + slot + '(value)';
     }, ', value', false, 'bind a value');
 
-    const suffixes = ['_s', '_i', '_n'];
+    const suffixes = ['_s', '_i', '_n', '_i64', '_u64'];
     for (const suffix of suffixes) {
       /* TODO only check attributes of proper type */
       this.generateUniversalAccessor(STable, '$$getattr' + suffix, function(slot) {
@@ -790,11 +790,23 @@ class P6int extends REPR {
 
   generateFlattenedAccessors(ownerSTable, attrContentSTable, slot) {
     const attr = slotToAttr(slot);
-    ownerSTable.addInternalMethod('$$getattr$' + slot, function() {
-      const obj = attrContentSTable.REPR.allocate(attrContentSTable);
-      obj.$$setInt(this[attr]);
-      return obj;
-    });
+    if (this.bits == 64) {
+      /* HACK - int64 and uint64 attributes are for now set in this werid way */
+      ownerSTable.addInternalMethod('$$getattr$' + slot, function() {
+        const objectWithAttr = this;
+        return new (class {
+          $$assign(ctx, value) {
+            objectWithAttr[attr] = value.$$getInt64();
+          }
+        });
+      });
+    } else {
+      ownerSTable.addInternalMethod('$$getattr$' + slot, function() {
+        const obj = attrContentSTable.REPR.allocate(attrContentSTable);
+        obj.$$setInt(this[attr]);
+        return obj;
+      });
+    }
   }
 
   generateRefAccessors(ownerSTable, attrContentSTable, slot) {
@@ -1240,7 +1252,7 @@ class VMArray extends REPR {
           return value;
         }
       });
-    } else if (this.primType === 1) {
+    } else if (this.primType === 1 || this.primType === 4 || this.primType == 5) {
       let mangle;
       if (this.type !== Null) {
         const repr = this.type._STable.REPR;