[js] Make hll.slurpyArray take and array as second argument instead o…

…f having a weird hll.slurpyArray3 variant.
Raku · Nov 27, 2016 · 38c8d8e · 38c8d8e
1 parent 3126d69
commit 38c8d8e
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 22 deletions.
diff --git a/src/vm/js/nqp-runtime/bignum.js b/src/vm/js/nqp-runtime/bignum.js
@@ -224,12 +224,12 @@ op.bool_I = function(n) {
 op.radix_I = function(hllName, radix, str, zpos, flags, type) {
   var extracted = core.radixHelper(radix, str, zpos, flags);
   if (extracted == null) {
-    return hll.slurpyArray3(hllName, makeBI(type, bignum(0)), makeBI(type, bignum(1)), -1);
+    return hll.slurpyArray(hllName, [makeBI(type, bignum(0)), makeBI(type, bignum(1)), -1]);
   }
 
   if (radix == 10 || radix == 16) {
     var pow = bignum(radix).pow(extracted.power);
-    return hll.slurpyArray3(hllName, makeBI(type, bignum(extracted.number, radix)), makeBI(type, pow), extracted.offset);
+    return hll.slurpyArray(hllName, [makeBI(type, bignum(extracted.number, radix)), makeBI(type, pow), extracted.offset]);
   } else {
     var n = extracted.number;
     var base = bignum(1);
@@ -249,6 +249,6 @@ op.radix_I = function(hllName, radix, str, zpos, flags, type) {
 
     if (n[0] == '-') result = result.neg();
 
-    return hll.slurpyArray3(hllName, makeBI(type, result), makeBI(type, base), extracted.offset);
+    return hll.slurpyArray(hllName, [makeBI(type, result), makeBI(type, base), extracted.offset]);
   }
 };
diff --git a/src/vm/js/nqp-runtime/core.js b/src/vm/js/nqp-runtime/core.js
@@ -74,10 +74,10 @@ exports.radixHelper = radixHelper;
 op.radix = function(hllName, radix, str, zpos, flags) {
   var extracted = radixHelper(radix, str, zpos, flags);
   if (extracted == null) {
-    return hll.slurpyArray3(hllName, 0, 1, -1);
+    return hll.slurpyArray(hllName, [0, 1, -1]);
   }
   var pow = Math.pow(radix, extracted.power);
-  return hll.slurpyArray3(hllName, parseInt(extracted.number, radix), pow, extracted.offset);
+  return hll.slurpyArray(hllName, [parseInt(extracted.number, radix), pow, extracted.offset]);
 };
 
 op.setdebugtypename = function(type, debugName) {
@@ -1085,12 +1085,5 @@ op.islist = function(list) {
 };
 
 op.split = function(hllName, separator, string) {
-  var array = hll.slurpyArray(hllName);
-  if (string !== '') {
-    var parts = string.split(separator);
-    for (var i = 0; i < parts.length; i++) {
-      array.$$push(parts[i]);
-    }
-  }
-  return array;
+  return hll.slurpyArray(hllName, string !== '' ? string.split(separator) : []);
 };
diff --git a/src/vm/js/nqp-runtime/hll.js b/src/vm/js/nqp-runtime/hll.js
@@ -115,15 +115,8 @@ op.settypehllrole = function(type, role) {
   return type;
 };
 
-exports.slurpyArray = function(hllName) {
+exports.slurpyArray = function(hllName, array) {
   var slurpyArray = hllConfigs[hllName].get('slurpy_array');
-  return slurpyArray._STable.REPR.allocate(slurpyArray._STable);
+  return slurpyArray._STable.REPR.allocateFromArray(slurpyArray._STable, array);
 };
 
-exports.slurpyArray3 = function(hllName, a, b, c) {
-  var array = exports.slurpyArray(hllName);
-  array.$$push(a);
-  array.$$push(b);
-  array.$$push(c);
-  return array;
-};
diff --git a/src/vm/js/nqp-runtime/reprs.js b/src/vm/js/nqp-runtime/reprs.js
@@ -746,6 +746,12 @@ class VMArray extends REPR {
     return obj;
   }
 
+  allocateFromArray(STable, array) {
+    var obj = new STable.objConstructor();
+    obj.array = array;
+    return obj;
+  }
+
   setupSTable(STable) {
     STable.addInternalMethod('$$push', function(value) {
       this.array.push(value);