[js] Turn the nqp::iterator op into an $$iterator method call instead of having an if chain.

Author: pmurias

src/vm/js/Operations.nqp

@@ -874,7 +874,7 @@ class QAST::OperationsJS {
     add_simple_op('setelems', $T_OBJ, [$T_OBJ, $T_INT], :sideffects);
 
 
-    add_simple_op('iterator', $T_OBJ, [$T_OBJ], :sideffects);
+    add_simple_op('iterator', $T_OBJ, [$T_OBJ], sub ($over) {"$over.\$\$iterator()"}, :sideffects);
 
     add_simple_op('iterval', $T_OBJ, [$T_OBJ], sub ($iter) {"$iter.iterval()"});
     add_simple_op('iterkey_s', $T_STR, [$T_OBJ], sub ($iter) {"$iter.iterkey_s()"});

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

@@ -1,5 +1,6 @@
 'use strict';
 var NQPException = require('./nqp-exception.js');
+var Iter = require('./iter.js');
 
 function NQPArray(array) {
   this.array = array;
@@ -130,6 +131,10 @@ NQPArray.prototype.$$atposnd = function(idx) {
   return this.array[index < 0 ? this.array.length + index : index];
 };
 
+NQPArray.prototype.$$iterator = function() {
+  return new Iter(this.array);
+};
+
 NQPArray.prototype.$$atposnd_i = NQPArray.prototype.$$atposnd;
 NQPArray.prototype.$$atposnd_n = NQPArray.prototype.$$atposnd;
 NQPArray.prototype.$$atposnd_s = NQPArray.prototype.$$atposnd;

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

@@ -81,69 +81,8 @@ op.setdebugtypename = function(type, debugName) {
   return type;
 };
 
-function Iter(array) {
-  this.array = array;
-  this.target = array.length;
-  this.idx = 0;
-}
-
-Iter.prototype.$$shift = function() {
-  return this.array[this.idx++];
-};
-
-Iter.prototype.$$toBool = function(ctx) {
-  return this.idx < this.target;
-};
-
-function HashIter(hash) {
-  this.hash = hash.content;
-  this.keys = Object.keys(hash.$$toObject());
-  this.target = this.keys.length;
-  this.idx = 0;
-}
-
-HashIter.prototype.$$shift = function() {
-  return new IterPair(this.hash, this.keys[this.idx++]);
-};
-
-HashIter.prototype.$$toBool = function(ctx) {
-  return this.idx < this.target;
-};
-
-function IterPair(hash, key) {
-  this._key = key;
-  this._hash = hash;
-}
-
-IterPair.prototype.iterval = function() {
-  return this._hash.get(this._key);
-};
-IterPair.prototype.iterkey_s = function() {
-  return this._key;
-};
-
-IterPair.prototype.Str = function(ctx, _NAMED, self) {
-  return this._key;
-};
-
-IterPair.prototype.key = function(ctx, _NAMED, self) {
-  return this._key;
-};
-IterPair.prototype.value = function(ctx, _NAMED, self) {
-  return this._hash.get(this._key);
-};
-
-
 op.iterator = function(obj) {
-  if (obj instanceof NQPArray) {
-    return new Iter(obj.array);
-  } else if (obj instanceof Hash) {
-    return new HashIter(obj);
-  } else if (obj instanceof Ctx) {
-    return new Iter(Object.keys(obj).filter(key => key.substr(0, 2) != '$$'));
-  } else {
-    throw 'unsupported thing to iterate over';
-  }
+  return obj.$$iterator();
 };
 
 

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

@@ -1,6 +1,7 @@
 'use strict';
 var CodeRef = require('./code-ref.js');
 var NQPException = require('./nqp-exception.js');
+var Iter = require('./iter.js');
 
 class Ctx {
   constructor(callerCtx, outerCtx, callThis, codeRefAttr) {
@@ -142,6 +143,10 @@ class Ctx {
     }
     throw "Can't bind dynamic: " + name;
   }
+
+  $$iterator() {
+    return new Iter(Object.keys(this).filter(key => key.substr(0, 2) != '$$'));
+  }
 };
 
 module.exports = Ctx;

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

@@ -1,3 +1,41 @@
+function HashIter(hash) {
+  this.hash = hash.content;
+  this.keys = Object.keys(hash.$$toObject());
+  this.target = this.keys.length;
+  this.idx = 0;
+}
+
+HashIter.prototype.$$shift = function() {
+  return new IterPair(this.hash, this.keys[this.idx++]);
+};
+
+HashIter.prototype.$$toBool = function(ctx) {
+  return this.idx < this.target;
+};
+
+function IterPair(hash, key) {
+  this._key = key;
+  this._hash = hash;
+}
+
+IterPair.prototype.iterval = function() {
+  return this._hash.get(this._key);
+};
+IterPair.prototype.iterkey_s = function() {
+  return this._key;
+};
+
+IterPair.prototype.Str = function(ctx, _NAMED, self) {
+  return this._key;
+};
+
+IterPair.prototype.key = function(ctx, _NAMED, self) {
+  return this._key;
+};
+IterPair.prototype.value = function(ctx, _NAMED, self) {
+  return this._hash.get(this._key);
+};
+
 function Hash() {
   this.content = new Map();
 }
@@ -48,4 +86,8 @@ Hash.prototype.$$toBool = function() {
   return this.content.size == 0 ? 0 : 1;
 };
 
+Hash.prototype.$$iterator = function() {
+  return new HashIter(this);
+};
+
 module.exports = Hash;

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

@@ -0,0 +1,15 @@
+function Iter(array) {
+  this.array = array;
+  this.target = array.length;
+  this.idx = 0;
+}
+
+Iter.prototype.$$shift = function() {
+  return this.array[this.idx++];
+};
+
+Iter.prototype.$$toBool = function(ctx) {
+  return this.idx < this.target;
+};
+
+module.exports = Iter;