Merge branch 'master' into code-generator

2014-10-31 21:39:47 +11:00
parent 0fbf0e2a77 115dca56b6
commit bbffde374e
3 changed files with 19 additions and 2 deletions
--- a/lib/6to5/transformers/destructuring.js
+++ b/lib/6to5/transformers/destructuring.js
@@ -147,5 +147,22 @@ exports.VariableDeclaration = function (node, parent, file) {
    }
  });

+  if (parent.type !== "Program" && parent.type !== "BlockStatement") {
+    var declar;
+
+    _.each(nodes, function (node) {
+      declar = declar || b.variableDeclaration(node.kind, []);
+
+      if (node.type !== "VariableDeclaration" && declar.kind !== node.kind) {
+        throw util.errorWithNode(node, "Cannot use this node within the current parent");
+      }
+
+      declar.declarations = declar.declarations.concat(node.declarations);
+    });
+
+    return declar;
+  }
+
  return nodes;
 };
+