From 70f8c26635c21f06f1cc29833d850b77cd24e807 Mon Sep 17 00:00:00 2001
From: b-fuse <b-fuze.root@live.com>
Date: Sat, 31 Mar 2018 01:07:00 -0400
Subject: [PATCH] refactor

---
 bin/uglifyjs | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/bin/uglifyjs b/bin/uglifyjs
index c27dde27..7617d781 100755
--- a/bin/uglifyjs
+++ b/bin/uglifyjs
@@ -46,7 +46,7 @@ program.option("--name-cache <file>", "File to hold mangled name mappings.");
 program.option("--rename", "Force symbol expansion.");
 program.option("--no-rename", "Disable symbol expansion.");
 program.option("--self", "Build UglifyJS as a library (implies --wrap UglifyJS)");
-program.option("--source-map [options]", "Enable source map/specify source map options.", parse_source_map());
+program.option("--source-map [options]", "Enable source map/specify source map options.", parse_js());
 program.option("--timings", "Display operations run time on STDERR.")
 program.option("--toplevel", "Compress and/or mangle variables in toplevel scope.");
 program.option("--verbose", "Print diagnostic messages.");
@@ -173,13 +173,14 @@ function convert_ast(fn) {
 }
 
 function run() {
-    if (program.sourceMap && program.sourceMap.content) {
-        program.sourceMap.content = read_file(program.sourceMap.content, program.sourceMap.content);
-    }
-    
     UglifyJS.AST_Node.warn_function = function(msg) {
         print_error("WARN: " + msg);
     };
+    var content = program.sourceMap && program.sourceMap.content;
+    if (content && content != "inline") {
+        print_error("INFO: Using input source map: " + content);
+        options.sourceMap.content = read_file(content, content);
+    }
     if (program.timings) options.timings = true;
     try {
         if (program.parse) {
@@ -381,18 +382,6 @@ function parse_js(flag) {
     }
 }
 
-function parse_source_map() {
-    var parse = parse_js();
-    return function(value, options) {
-        var hasContent = options && "content" in options;
-        var settings = parse(value, options);
-        if (!hasContent && settings.content && settings.content != "inline") {
-            print_error("INFO: Using input source map: " + settings.content);
-        }
-        return settings;
-    }
-}
-
 function skip_key(key) {
     return skip_keys.indexOf(key) >= 0;
 }