From 1f990f40303814a56f8db4d83881d4b8a7e9b60f Mon Sep 17 00:00:00 2001
From: Sebastian McKenzie <sebmck@gmail.com>
Date: Tue, 16 Dec 2014 08:06:25 +1100
Subject: [PATCH] fFix module formatter parsing bug where literals were being
 converted to identifiers

---
 lib/6to5/transformation/modules/_default.js | 2 +-
 lib/6to5/transformation/modules/common.js   | 8 +++-----
 lib/6to5/util.js                            | 7 +------
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/lib/6to5/transformation/modules/_default.js b/lib/6to5/transformation/modules/_default.js
index 2a2d3bbe02..924ab1cb15 100644
--- a/lib/6to5/transformation/modules/_default.js
+++ b/lib/6to5/transformation/modules/_default.js
@@ -104,7 +104,7 @@ DefaultFormatter.prototype._exportSpecifier = function (getRef, specifier, node,
     } else {
       // export { foo } from "test";
       nodes.push(util.template("exports-assign-key", {
-        VARIABLE_NAME: variableName.name,
+        VARIABLE_NAME: variableName,
         OBJECT:        getRef(),
         KEY:           specifier.id
       }, true));
diff --git a/lib/6to5/transformation/modules/common.js b/lib/6to5/transformation/modules/common.js
index 2490c7df13..fa2c7263fb 100644
--- a/lib/6to5/transformation/modules/common.js
+++ b/lib/6to5/transformation/modules/common.js
@@ -25,7 +25,7 @@ CommonJSFormatter.prototype.importSpecifier = function (specifier, node, nodes)
     nodes.push(t.variableDeclaration("var", [
       t.variableDeclarator(variableName,
         t.callExpression(this.file.addDeclaration("interop-require"), [util.template("require", {
-          MODULE_NAME: node.source.raw
+          MODULE_NAME: node.source
         })])
       )
     ]));
@@ -42,7 +42,7 @@ CommonJSFormatter.prototype.importSpecifier = function (specifier, node, nodes)
 
     nodes.push(util.template(templateName, {
       VARIABLE_NAME: variableName,
-      MODULE_NAME:   node.source.raw,
+      MODULE_NAME:   node.source,
       KEY:           specifier.id
     }));
   }
@@ -51,9 +51,7 @@ CommonJSFormatter.prototype.importSpecifier = function (specifier, node, nodes)
 CommonJSFormatter.prototype.importDeclaration = function (node, nodes) {
   // import "foo";
   nodes.push(util.template("require", {
-    //inherits: node,
-
-    MODULE_NAME: node.source.raw
+    MODULE_NAME: node.source
   }, true));
 };
 
diff --git a/lib/6to5/util.js b/lib/6to5/util.js
index ab43d7a30e..f6fa5fe0f2 100644
--- a/lib/6to5/util.js
+++ b/lib/6to5/util.js
@@ -152,12 +152,7 @@ exports.template = function (name, nodes, keepExpression) {
   if (!_.isEmpty(nodes)) {
     traverse(template, function (node) {
       if (t.isIdentifier(node) && _.has(nodes, node.name)) {
-        var newNode = nodes[node.name];
-        if (_.isString(newNode)) {
-          node.name = newNode;
-        } else {
-          return newNode;
-        }
+        return nodes[node.name];
       }
     });
   }