moved split_lines into the library code and exported it

neonux · Jan 18, 2011 · cc8bdc3 · cc8bdc3
1 parent 7248295
commit cc8bdc3
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 48 deletions.
diff --git a/bin/uglifyjs b/bin/uglifyjs
@@ -185,7 +185,7 @@ function squeeze_it(code) {
                         return sys.inspect(ast, null, null);
                 result += time_it("generate", function(){ return pro.gen_code(ast, options.beautify && options.beautify_options) });
                 if (!options.beautify && options.max_line_length) {
-                        result = time_it("split", function(){ return split_lines(result) });
+                        result = time_it("split", function(){ return pro.split_lines(result, options.max_line_length) });
                 }
                 return result;
         } catch(ex) {
@@ -202,50 +202,3 @@ function time_it(name, cont) {
         try { return cont(); }
         finally { sys.debug("// " + name + ": " + ((new Date().getTime() - t1) / 1000).toFixed(3) + " sec."); }
 };
-
-function split_lines(code) {
-        var next_token = jsp.tokenizer(code, false);
-        var last_split = 0;
-        var this_token;
-        var prev_token;
-        var was_split;
-        var splits = [ 0 ];
-        function current_length() {
-                return this_token.pos - last_split;
-        };
-        function split_here() {
-                was_split = true;
-                last_split = this_token.pos;
-                splits.push(last_split);
-        };
-        while (true) {
-                prev_token = this_token;
-                this_token = next_token();
-                if (this_token.type == "eof") break;
-                // don't split if the previos token was a keyword.
-                // this should shield us from the "no newline allowed after return" etc.
-                was_split = false;
-                if (prev_token) {
-                        if (prev_token.type == "keyword") {
-                                continue;
-                        }
-                        if (prev_token.type == "comment1") {
-                                last_split = this_token.pos;
-                                continue;
-                        }
-                }
-                if (current_length() > options.max_line_length) {
-                        switch (this_token.type) {
-                            case "keyword":
-                            case "atom":
-                            case "name":
-                            case "punc":
-                                split_here();
-                                break;
-                        }
-                }
-        }
-        return splits.map(function(pos, i){
-                return code.substring(pos, splits[i + 1] || code.length);
-        }).join("\n");
-};
diff --git a/lib/process.js b/lib/process.js
@@ -1501,6 +1501,53 @@ function gen_code(ast, beautify) {
         return make(ast);
 };
 
+function split_lines(code, max_line_length) {
+        var next_token = jsp.tokenizer(code, false);
+        var last_split = 0;
+        var this_token;
+        var prev_token;
+        var was_split;
+        var splits = [ 0 ];
+        function current_length() {
+                return this_token.pos - last_split;
+        };
+        function split_here() {
+                was_split = true;
+                last_split = this_token.pos;
+                splits.push(last_split);
+        };
+        while (true) {
+                prev_token = this_token;
+                this_token = next_token();
+                if (this_token.type == "eof") break;
+                // don't split if the previos token was a keyword.
+                // this should shield us from the "no newline allowed after return" etc.
+                was_split = false;
+                if (prev_token) {
+                        if (prev_token.type == "keyword") {
+                                continue;
+                        }
+                        if (prev_token.type == "comment1") {
+                                last_split = this_token.pos;
+                                continue;
+                        }
+                }
+                if (current_length() > max_line_length) {
+                        switch (this_token.type) {
+                            case "keyword":
+                            case "atom":
+                            case "name":
+                            case "punc":
+                                split_here();
+                                break;
+                        }
+                }
+        }
+        return splits.map(function(pos, i){
+                return code.substring(pos, splits[i + 1] || code.length);
+        }).join("\n");
+};
+
 /* -----[ Utilities ]----- */
 
 function repeat_string(str, i) {
@@ -1562,3 +1609,4 @@ exports.ast_add_scope = ast_add_scope;
 exports.ast_squeeze_more = require("./squeeze-more").ast_squeeze_more;
 exports.set_logger = function(logger) { warn = logger };
 exports.make_string = make_string;
+exports.split_lines = split_lines;