From 7fb023c2b0d0212e6fc24ed18bd7b22265a82e91 Mon Sep 17 00:00:00 2001
From: Sebastian McKenzie <sebmck@gmail.com>
Date: Tue, 14 Oct 2014 11:46:24 +1100
Subject: [PATCH] move util.generate to File::generate

---
 lib/6to5/file.js | 10 ++++++++--
 lib/6to5/util.js |  9 ---------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/lib/6to5/file.js b/lib/6to5/file.js
index b1fc6733c5..04c0b2ab56 100644
--- a/lib/6to5/file.js
+++ b/lib/6to5/file.js
@@ -3,6 +3,7 @@ module.exports = File;
 var SHEBANG_REGEX = /^\#\!.*/;
 
 var transform = require("./transform");
+var recast    = require("recast");
 var util      = require("./util");
 var b         = require("recast").types.builders;
 var _         = require("lodash");
@@ -94,7 +95,12 @@ File.prototype.generate = function () {
   var opts = this.opts;
   var ast  = this.ast;
 
-  var result = util.generate(ast, opts);
+  var printOpts = {};
+  if (opts.sourceMap) {
+    printOpts.sourceMapName = opts.sourceMapName;
+  }
+
+  var result = recast.print(ast, printOpts);
   var code   = result.code;
 
   if (this.shebang) {
@@ -103,7 +109,7 @@ File.prototype.generate = function () {
   }
 
   if (opts.sourceMap === "inline") {
-    code += "\n" + util.sourceMapToComment(map);
+    code += "\n" + util.sourceMapToComment(result.map);
   }
 
   return {
diff --git a/lib/6to5/util.js b/lib/6to5/util.js
index f0fb649bb4..96e10accae 100644
--- a/lib/6to5/util.js
+++ b/lib/6to5/util.js
@@ -222,15 +222,6 @@ exports.repeat = function (width, cha) {
   return new Array(width + 1).join(cha);
 };
 
-exports.generate = function (ast, opts) {
-  var printOpts = {};
-  if (opts.sourceMap) {
-    printOpts.sourceMapName = opts.sourceMapName;
-  }
-
-  return recast.print(ast, printOpts);
-};
-
 exports.parse = function (opts, code, callback) {
   try {
     var recastOpts = {};