From 8bc182fdb5a38cf8702a06cb06cbfa533e35da34 Mon Sep 17 00:00:00 2001
From: Sebastian McKenzie <sebmck@gmail.com>
Date: Mon, 13 Oct 2014 14:25:00 +1100
Subject: [PATCH] use ast-types instead of using a template

---
 lib/6to5/transformers/computed-property-names.js | 14 +++++++++-----
 lib/6to5/transformers/destructuring.js           | 11 +++++------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/lib/6to5/transformers/computed-property-names.js b/lib/6to5/transformers/computed-property-names.js
index e296488a6d..f72d0d8537 100644
--- a/lib/6to5/transformers/computed-property-names.js
+++ b/lib/6to5/transformers/computed-property-names.js
@@ -47,11 +47,15 @@ exports.ObjectExpression = function (node, parent, file) {
   containerCallee._aliasFunction = "arrows";
 
   _.each(computed, function (prop) {
-    containerBody.unshift(util.template("obj-key-set", {
-      OBJECT_KEY: objId,
-      KEY: prop.key,
-      VALUE: prop.value
-    }, true));
+    containerBody.unshift(
+      b.expressionStatement(
+        b.assignmentExpression(
+          "=",
+          b.memberExpression(objId, prop.key, true),
+          prop.value
+        )
+      )
+    );
   });
 
   return container;
diff --git a/lib/6to5/transformers/destructuring.js b/lib/6to5/transformers/destructuring.js
index b16e09ad6c..e434bddbd6 100644
--- a/lib/6to5/transformers/destructuring.js
+++ b/lib/6to5/transformers/destructuring.js
@@ -49,14 +49,13 @@ var pushArrayPattern = function (kind, nodes, pattern, parentId) {
 
 var pushPattern = function (kind, nodes, pattern, parentId, file) {
   if (parentId.type !== "MemberExpression" && parentId.type !== "Identifier") {
-    var key = file.generateUid("ref");
+    var key = b.identifier(file.generateUid("ref"));
 
-    nodes.push(util.template("variable-assign", {
-      KEY: key,
-      VALUE: parentId
-    }, true));
+    nodes.push(b.variableDeclaration("var", [
+      b.variableDeclarator(key, parentId)
+    ]));
 
-    parentId = b.identifier(key);
+    parentId = key;
   }
 
   push(kind, nodes, pattern, parentId);