implement for-in with ES6 for-of loop

alongubkin · Nov 26, 2014 · a21a5ba · a21a5ba
1 parent 5b88b1b
commit a21a5ba
Show file tree

Hide file tree

Showing 9 changed files with 154 additions and 143 deletions.
diff --git a/lib/ast/expressions/ForInExpression.js b/lib/ast/expressions/ForInExpression.js
diff --git a/lib/ast/statements/BreakStatement.js b/lib/ast/statements/BreakStatement.js
diff --git a/lib/ast/statements/ForInStatement.js b/lib/ast/statements/ForInStatement.js
diff --git a/lib/ast/statements/ReturnStatement.js b/lib/ast/statements/ReturnStatement.js
diff --git a/src/ast/expressions/ForInExpression.spider b/src/ast/expressions/ForInExpression.spider
@@ -79,40 +79,40 @@ ForInExpression.prototype.codegen = () -> {
 
   var forInStatement = new ForInStatement(this.item, this.index, this.array, 
     new BlockStatement([pushStatement]));
-
-  forInStatement.parent = this;
+
+  var fnBlock = new BlockStatement([
+    {
+      "type": "VariableDeclaration",
+      "declarations": [
+        {
+          "type": "VariableDeclarator",
+          "id": id,
+          "init": {
+            "type": "ArrayExpression",
+            "elements": []
+          }
+        }
+      ],
+      "kind": "let",
+      "codeGenerated": true
+    },
+    forInStatement,
+    {
+      "type": "ReturnStatement",
+      "codeGenerated": true,
+      "argument": id
+    }        
+  ]);
+
+  forInStatement.parent = fnBlock;
 
   this.type = "CallExpression";
   this.callee = {
     "type": "FunctionExpression",
     "id": null,
     "params": [],
     "defaults": [],
-    "body": {
-      "type": "BlockStatement",
-      "body": [
-        {
-          "type": "VariableDeclaration",
-          "declarations": [
-            {
-              "type": "VariableDeclarator",
-              "id": id,
-              "init": {
-                "type": "ArrayExpression",
-                "elements": []
-              }
-            }
-          ],
-          "kind": "let",
-          "codeGenerated": true
-        },
-        forInStatement.codegen(false),
-        {
-          "type": "ReturnStatement",
-          "argument": id
-        }        
-      ]
-    }
+    "body": fnBlock.codegen()
   };
 
   ::Object.defineProperty(this, 'arguments', { 

diff --git a/src/ast/statements/BreakStatement.spider b/src/ast/statements/BreakStatement.spider
@@ -14,7 +14,7 @@ BreakStatement.prototype.codegen = () -> {
   }
 
   var parent = this.parent;
-  while parent? and parent.type != "ForInStatement" and parent.type != "ForOfStatement" {
+  while parent? and parent.type != "ForOfStatement" {
     parent = parent.parent;
   }
 

diff --git a/src/ast/statements/ForInStatement.spider b/src/ast/statements/ForInStatement.spider
@@ -22,62 +22,68 @@ func ForInStatement(item, index, array, body)
   this.body.parent = this;
 }
 
-ForInStatement.prototype.codegen = (every = true) -> {
+ForInStatement.prototype.codegen = () -> {
   if !super.codegen() {
     return;
   }
 
   this.item = this.item.codegen(false);
 
-  var params = [this.item];
-  this.defineIdentifier(this.item);
-
   if this.index? {
+    var context = this.getContext();
     this.index = this.index.codegen(false);
-    params.push(this.index);
 
-    this.defineIdentifier(this.index);
+    context.node.body.splice(context.position, 0, {
+      "type": "VariableDeclaration",
+      "declarations": [{
+        "type": "VariableDeclarator",
+        "id": this.index,
+        "init": {
+          "type": "Literal",
+          "value": 0
+        }
+      }],
+      "kind": "let"
+    });
   }
 
   this.array = this.array.codegen();
-  this.body = this.body.blockWrap().codegen();
-
-  if every and (this.body.body.length == 0 or
-     this.body.body[this.body.body.length - 1].type != "ReturnStatement") {
+
+  this.body = this.body.blockWrap();
+  this.body.defineIdentifier(this.item);
+
+  if this.index? {
+    this.body.defineIdentifier(this.index);
+  }
+
+  this.body = this.body.codegen();
+
+  if this.index? {
     this.body.body.push({
-      "type": "ReturnStatement",
+      "type": "ExpressionStatement",
       "codeGenerated": true,
-      "argument": {
-        "type": "Literal",
-        "value": true
+      "expression": {
+        "type": "UpdateExpression",
+        "operator": "++",
+        "argument": this.index,
+        "prefix": false
       }
     });
   }
-
-  this.type = "ExpressionStatement";
-  this.expression = {
-    "type": "CallExpression",
-    "callee": {
-      "type": "MemberExpression",
-      "computed": false,
-      "object": this.array,
-      "property": {
-        "type": "Identifier",
-        "name": "every" if every else "forEach"
-      }
-    },
-    "arguments": [{
-      "type": "FunctionExpression",
-      "id": null,
-      "params": params,
-      "defaults": [],
-      "body": this.body,
-      "rest": null,
-      "generator": false,
-      "expression": false
-    }, { "type": "ThisExpression" }]
-  };
 
+  this.type = "ForOfStatement";
+  this.right = this.array;
+  this.left = {
+    "type": "VariableDeclaration",
+    "declarations": [{
+      "type": "VariableDeclarator",
+      "id": this.item,
+      "init": null
+    }],
+    "kind": "let"
+  };
+  this.each = false;
+
   return this;
 };
 

diff --git a/src/ast/statements/ReturnStatement.spider b/src/ast/statements/ReturnStatement.spider
@@ -23,7 +23,7 @@ ReturnStatement.prototype.codegen = () -> {
   }
 
   var parent = this.parent;
-  while parent? and parent.type != "ForInStatement" and parent.type != "ForOfStatement" {
+  while parent? and parent.type != "ForOfStatement" {
     parent = parent.parent;
   }