support arbitrary patterns for ForIn value patterns

michaelficarra · Jun 1, 2015 · d47df16 · d47df16
1 parent 69966f0
commit d47df16
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/lib/compiler.js b/lib/compiler.js
diff --git a/src/compiler.coffee b/src/compiler.coffee
@@ -708,11 +708,11 @@ class exports.Compiler
         else if (step instanceof JS.Literal) and step.value == 1
           target
 
-        if es6Target
-          if valAssignee and keyAssignee
-            return new JS.ForOfStatement(new JS.VariableDeclaration('var', [new JS.VariableDeclarator new JS.ArrayPattern([keyAssignee, valAssignee])]), new JS.CallExpression((memberAccess es6Target, 'entries'), []), forceBlock body)
-          else if valAssignee
-            return new JS.ForOfStatement(new JS.VariableDeclaration('var', [new JS.VariableDeclarator valAssignee]), es6Target, forceBlock body)
+        if es6Target and valAssignee and (valPattern = es6AssignmentPattern(valAssignee))
+          if keyAssignee
+            return new JS.ForOfStatement(new JS.VariableDeclaration('var', [new JS.VariableDeclarator new JS.ArrayPattern([keyAssignee, valPattern])]), new JS.CallExpression((memberAccess es6Target, 'entries'), []), forceBlock body)
+          else
+            return new JS.ForOfStatement(new JS.VariableDeclaration('var', [new JS.VariableDeclarator valPattern]), es6Target, forceBlock body)
 
 
       i = genSym 'i'