From: Richard van Velzen <rvanvelzen@experty.com>
Date: Mon, 8 Feb 2016 09:36:28 +0000 (+0100)
Subject: Allow cli options to be specified in separate definitions
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=d5c651a5e5667e64f4fe76f4d3669ba5bd375b6d;p=UglifyJS.git

Allow cli options to be specified in separate definitions

Fix for #963. This allows stuff like `--define a=1 --define b=1` besides only `--define a=1,b=1`
---

diff --git a/bin/uglifyjs b/bin/uglifyjs
index f7f22215..1f449aa9 100755
--- a/bin/uglifyjs
+++ b/bin/uglifyjs
@@ -499,17 +499,19 @@ function normalize(o) {
     }
 }
 
-function getOptions(x, constants) {
-    x = ARGS[x];
+function getOptions(flag, constants) {
+    var x = ARGS[flag];
     if (x == null) return null;
     var ret = {};
     if (x !== "") {
+        if (Array.isArray(x)) x = x.map(function (v) { return "(" + v + ")"; }).join(", ");
+
         var ast;
         try {
             ast = UglifyJS.parse(x, { expression: true });
         } catch(ex) {
             if (ex instanceof UglifyJS.JS_Parse_Error) {
-                print_error("Error parsing arguments in: " + x);
+                print_error("Error parsing arguments for flag `" + flag + "': " + x);
                 process.exit(1);
             }
         }
@@ -529,7 +531,7 @@ function getOptions(x, constants) {
                 return true;    // no descend
             }
             print_error(node.TYPE)
-            print_error("Error parsing arguments in: " + x);
+            print_error("Error parsing arguments for flag `" + flag + "': " + x);
             process.exit(1);
         }));
     }