v3.4.4

fixes #3206

.travis.yml

@@ -1,14 +1,34 @@
-language: node_js
+addons:
-node_js:
+  apt:
-    - "0.10"
+    sources:
-    - "0.12"
+      - ubuntu-toolchain-r-test
-    - "4"
+    packages:
-    - "6"
+      - libstdc++-4.9-dev
-    - "8"
+cache:
-env:
+  directories: tmp
-    - UGLIFYJS_TEST_ALL=1
+language: generic
 matrix:
   fast_finish: true
 sudo: false
-cache:
+env:
-  directories: tmp
+  global:
+    - UGLIFYJS_TEST_ALL=1
+  matrix:
+    - NODEJS_VER=node/0.10
+    - NODEJS_VER=node/0.12
+    - NODEJS_VER=node/4
+    - NODEJS_VER=node/6
+    - NODEJS_VER=node/8
+    - NODEJS_VER=node/latest
+before_install:
+  - git clone --branch v1.4.2 --depth 1 https://github.com/jasongin/nvs.git ~/.nvs
+  - . ~/.nvs/nvs.sh
+  - nvs --version
+install:
+  - nvs add $NODEJS_VER
+  - nvs use $NODEJS_VER
+  - node --version
+  - npm --version --no-update-notifier
+  - npm install --no-optional --no-save --no-update-notifier
+script:
+  - npm test --no-update-notifier

README.md

@@ -104,6 +104,8 @@ a double dash to prevent input files being used as option arguments:
                                 sequences.
     --config-file <file>        Read `minify()` options from JSON file.
     -d, --define <expr>[=value] Global definitions.
+    -e, --enclose [arg[:value]] Embed everything in a big function, with configurable
+                                argument(s) & value(s).
     --ie8                       Support non-standard Internet Explorer 8.
                                 Equivalent to setting `ie8: true` in `minify()`
                                 for `compress`, `mangle` and `output` options.
@@ -118,7 +120,8 @@ a double dash to prevent input files being used as option arguments:
                                            JS that was generated from some other original
                                            code. Specify "inline" if the source map is
                                            included within the sources.
-                                `filename`  Name and/or location of the output source.
+                                `filename`  Filename and/or location of the output source
+                                            (sets `file` attribute in source map).
                                 `includeSources`  Pass this flag if you want to include
                                                   the content of source files in the
                                                   source map as sourcesContent property.
@@ -149,7 +152,9 @@ debugging your compressed JavaScript.  To get a source map, pass
 
 Additional options:
 
-- `--source-map "filename='<NAME>'"` to specify the name of the source map.
+- `--source-map "filename='<NAME>'"` to specify the name of the source map. The value of
+  `filename` is only used to set `file` attribute (see [the spec][sm-spec])
+  in source map file.
 
 - `--source-map "root='<URL>'"` to pass the URL where the original files can be found.
 
@@ -615,6 +620,8 @@ If you're using the `X-SourceMap` header instead, you can just omit `sourceMap.u
 
 - `dead_code` (default: `true`) -- remove unreachable code
 
+- `directives` (default: `true`) -- remove redundant or non-standard directives
+
 - `drop_console` (default: `false`) -- Pass `true` to discard calls to
   `console.*` functions. If you wish to drop a specific function call
   such as `console.info` and/or retain side effects from function arguments

appveyor.yml

@@ -1,20 +1,25 @@
 environment:
+  UGLIFYJS_TEST_ALL: 1
   matrix:
-    - nodejs_version: "0.10"
+    - NODEJS_VER: node/0.10
-    - nodejs_version: "0.12"
+    - NODEJS_VER: node/0.12
-    - nodejs_version: "4"
+    - NODEJS_VER: node/4
-    - nodejs_version: "6"
+    - NODEJS_VER: node/6
-    - nodejs_version: "8"
+    - NODEJS_VER: node/8
+    - NODEJS_VER: node/latest
 install:
-  - ps: Install-Product node $env:nodejs_version
+  - git clone --branch v1.4.2 --depth 1 https://github.com/jasongin/nvs.git %LOCALAPPDATA%\nvs
-  - set UGLIFYJS_TEST_ALL=1
+  - set PATH=%LOCALAPPDATA%\nvs;%PATH%
-  - npm install
+  - nvs --version
+  - nvs add %NODEJS_VER%
+  - nvs use %NODEJS_VER%
+  - node --version
+  - npm --version --no-update-notifier
+  - npm install --no-optional --no-save --no-update-notifier
 build: off
 cache:
   - tmp
 matrix:
   fast_finish: true
 test_script:
-  - node --version
+  - npm test --no-update-notifier
-  - npm --version
-  - npm test

bin/uglifyjs

@@ -40,6 +40,7 @@ program.option("-o, --output <file>", "Output file (default STDOUT).");
 program.option("--comments [filter]", "Preserve copyright comments in the output.");
 program.option("--config-file <file>", "Read minify() options from JSON file.");
 program.option("-d, --define <expr>[=value]", "Global definitions.", parse_js("define"));
+program.option("-e, --enclose [arg[,...][:value[,...]]]", "Embed everything in a big function, with configurable argument(s) & value(s).");
 program.option("--ie8", "Support non-standard Internet Explorer 8.");
 program.option("--keep-fnames", "Do not mangle/drop function names. Useful for code relying on Function.prototype.name.");
 program.option("--name-cache <file>", "File to hold mangled name mappings.");
@@ -47,7 +48,7 @@ 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_js());
-program.option("--timings", "Display operations run time on STDERR.")
+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.");
 program.option("--warn", "Print warning messages.");
@@ -61,6 +62,7 @@ if (!program.output && program.sourceMap && program.sourceMap.url != "inline") {
 }
 [
     "compress",
+    "enclose",
     "ie8",
     "mangle",
     "sourceMap",

lib/ast.js

@@ -44,21 +44,21 @@
 "use strict";
 
 function DEFNODE(type, props, methods, base) {
-    if (arguments.length < 4) base = AST_Node;
+    if (typeof base === "undefined") base = AST_Node;
-    if (!props) props = [];
+    props = props ? props.split(/\s+/) : [];
-    else props = props.split(/\s+/);
     var self_props = props;
-    if (base && base.PROPS)
+    if (base && base.PROPS) props = props.concat(base.PROPS);
-        props = props.concat(base.PROPS);
+    var code = [
-    var code = "return function AST_" + type + "(props){ if (props) { ";
+        "return function AST_", type, "(props){",
-    for (var i = props.length; --i >= 0;) {
+        "if(props){",
-        code += "this." + props[i] + " = props." + props[i] + ";";
+    ];
-    }
+    props.forEach(function(prop) {
+        code.push("this.", prop, "=props.", prop, ";");
+    });
     var proto = base && new base;
-    if (proto && proto.initialize || (methods && methods.initialize))
+    if (proto && proto.initialize || methods && methods.initialize) code.push("this.initialize();");
-        code += "this.initialize();";
+    code.push("}}");
-    code += "}}";
+    var ctor = new Function(code.join(""))();
-    var ctor = new Function(code)();
     if (proto) {
         ctor.prototype = proto;
         ctor.BASE = base;
@@ -71,11 +71,11 @@ function DEFNODE(type, props, methods, base) {
     if (type) {
         ctor.prototype.TYPE = ctor.TYPE = type;
     }
-    if (methods) for (i in methods) if (HOP(methods, i)) {
+    if (methods) for (var name in methods) if (HOP(methods, name)) {
-        if (/^\$/.test(i)) {
+        if (/^\$/.test(name)) {
-            ctor[i.substr(1)] = methods[i];
+            ctor[name.substr(1)] = methods[name];
         } else {
-            ctor.prototype[i] = methods[i];
+            ctor.prototype[name] = methods[name];
         }
     }
     ctor.DEFMETHOD = function(name, method) {
@@ -85,7 +85,7 @@ function DEFNODE(type, props, methods, base) {
         exports["AST_" + type] = ctor;
     }
     return ctor;
-};
+}
 
 var AST_Token = DEFNODE("Token", "type value line col pos endline endcol endpos nlb comments_before comments_after file raw", {
 }, null);
@@ -158,11 +158,10 @@ function walk_body(node, visitor) {
     var body = node.body;
     if (body instanceof AST_Statement) {
         body._walk(visitor);
+    } else body.forEach(function(node) {
+        node._walk(visitor);
+    });
 }
-    else for (var i = 0, len = body.length; i < len; i++) {
-        body[i]._walk(visitor);
-    }
-};
 
 var AST_Block = DEFNODE("Block", "body", {
     $documentation: "A body of statements (usually braced)",
@@ -314,6 +313,9 @@ var AST_Scope = DEFNODE("Scope", "variables functions uses_with uses_eval parent
         if (this.functions) node.functions = this.functions.clone();
         if (this.enclosed) node.enclosed = this.enclosed.slice();
         return node;
+    },
+    pinned: function() {
+        return this.uses_eval || this.uses_with;
     }
 }, AST_Block);
 
@@ -326,12 +328,29 @@ var AST_Toplevel = DEFNODE("Toplevel", "globals", {
         var body = this.body;
         var wrapped_tl = "(function(exports){'$ORIG';})(typeof " + name + "=='undefined'?(" + name + "={}):" + name + ");";
         wrapped_tl = parse(wrapped_tl);
-        wrapped_tl = wrapped_tl.transform(new TreeTransformer(function before(node){
+        wrapped_tl = wrapped_tl.transform(new TreeTransformer(function(node) {
             if (node instanceof AST_Directive && node.value == "$ORIG") {
                 return MAP.splice(body);
             }
         }));
         return wrapped_tl;
+    },
+    wrap_enclose: function(args_values) {
+        if (typeof args_values != "string") args_values = "";
+        var index = args_values.indexOf(":");
+        if (index < 0) index = args_values.length;
+        var body = this.body;
+        return parse([
+            "(function(",
+            args_values.slice(0, index),
+            '){"$ORIG"})(',
+            args_values.slice(index + 1),
+            ")"
+        ].join("")).transform(new TreeTransformer(function(node) {
+            if (node instanceof AST_Directive && node.value == "$ORIG") {
+                return MAP.splice(body);
+            }
+        }));
     }
 }, AST_Scope);
 
@@ -345,10 +364,9 @@ var AST_Lambda = DEFNODE("Lambda", "name argnames uses_arguments", {
     _walk: function(visitor) {
         return visitor._visit(this, function() {
             if (this.name) this.name._walk(visitor);
-            var argnames = this.argnames;
+            this.argnames.forEach(function(argname) {
-            for (var i = 0, len = argnames.length; i < len; i++) {
+                argname._walk(visitor);
-                argnames[i]._walk(visitor);
+            });
-            }
             walk_body(this, visitor);
         });
     }
@@ -508,10 +526,9 @@ var AST_Definitions = DEFNODE("Definitions", "definitions", {
     },
     _walk: function(visitor) {
         return visitor._visit(this, function() {
-            var definitions = this.definitions;
+            this.definitions.forEach(function(defn) {
-            for (var i = 0, len = definitions.length; i < len; i++) {
+                defn._walk(visitor);
-                definitions[i]._walk(visitor);
+            });
-            }
         });
     }
 }, AST_Statement);
@@ -544,11 +561,10 @@ var AST_Call = DEFNODE("Call", "expression args", {
     },
     _walk: function(visitor) {
         return visitor._visit(this, function() {
-            var args = this.args;
-            for (var i = 0, len = args.length; i < len; i++) {
-                args[i]._walk(visitor);
-            }
             this.expression._walk(visitor);
+            this.args.forEach(function(node) {
+                node._walk(visitor);
+            });
         });
     }
 });
@@ -663,10 +679,9 @@ var AST_Array = DEFNODE("Array", "elements", {
     },
     _walk: function(visitor) {
         return visitor._visit(this, function() {
-            var elements = this.elements;
+            this.elements.forEach(function(element) {
-            for (var i = 0, len = elements.length; i < len; i++) {
+                element._walk(visitor);
-                elements[i]._walk(visitor);
+            });
-            }
         });
     }
 });
@@ -678,10 +693,9 @@ var AST_Object = DEFNODE("Object", "properties", {
     },
     _walk: function(visitor) {
         return visitor._visit(this, function() {
-            var properties = this.properties;
+            this.properties.forEach(function(prop) {
-            for (var i = 0, len = properties.length; i < len; i++) {
+                prop._walk(visitor);
-                properties[i]._walk(visitor);
+            });
-            }
         });
     }
 });
@@ -820,12 +834,12 @@ var AST_NaN = DEFNODE("NaN", null, {
 
 var AST_Undefined = DEFNODE("Undefined", null, {
     $documentation: "The `undefined` value",
-    value: (function(){}())
+    value: function(){}()
 }, AST_Atom);
 
 var AST_Hole = DEFNODE("Hole", null, {
     $documentation: "A hole in an array",
-    value: (function(){}())
+    value: function(){}()
 }, AST_Atom);
 
 var AST_Infinity = DEFNODE("Infinity", null, {
@@ -853,7 +867,7 @@ function TreeWalker(callback) {
     this.visit = callback;
     this.stack = [];
     this.directives = Object.create(null);
-};
+}
 TreeWalker.prototype = {
     _visit: function(node, descend) {
         this.push(node);

lib/minify.js

@@ -55,6 +55,7 @@ function minify(files, options) {
     try {
         options = defaults(options, {
             compress: {},
+            enclose: false,
             ie8: false,
             keep_fnames: false,
             mangle: {},
@@ -157,6 +158,9 @@ function minify(files, options) {
         if (options.wrap) {
             toplevel = toplevel.wrap_commonjs(options.wrap);
         }
+        if (options.enclose) {
+            toplevel = toplevel.wrap_enclose(options.enclose);
+        }
         if (timings) timings.rename = Date.now();
         if (options.rename) {
             toplevel.figure_out_scope(options.mangle);

lib/mozilla-ast.js

@@ -44,10 +44,8 @@
 "use strict";
 
 (function() {
-
+    function normalize_directives(body) {
-    var normalize_directives = function(body) {
         var in_directive = true;
-
         for (var i = 0; i < body.length; i++) {
             if (in_directive && body[i] instanceof AST_Statement && body[i].body instanceof AST_String) {
                 body[i] = new AST_Directive({
@@ -59,9 +57,8 @@
                 in_directive = false;
             }
         }
-
         return body;
-    };
+    }
 
     var MOZ_TO_ME = {
         Program: function(M) {
@@ -480,7 +477,7 @@
             endpos  : range ? range[0] : moznode.start,
             raw     : raw_token(moznode),
         });
-    };
+    }
 
     function my_end_token(moznode) {
         var loc = moznode.loc, end = loc && loc.end;
@@ -495,7 +492,7 @@
             endpos  : range ? range[1] : moznode.end,
             raw     : raw_token(moznode),
         });
-    };
+    }
 
     function map(moztype, mytype, propmap) {
         var moz_to_me = "function From_Moz_" + moztype + "(M){\n";
@@ -550,7 +547,7 @@
         );
         MOZ_TO_ME[moztype] = moz_to_me;
         def_to_moz(mytype, me_to_moz);
-    };
+    }
 
     var FROM_MOZ_STACK = null;
 
@@ -559,7 +556,7 @@
         var ret = node != null ? MOZ_TO_ME[node.type](node) : null;
         FROM_MOZ_STACK.pop();
         return ret;
-    };
+    }
 
     AST_Node.from_mozilla_ast = function(node) {
         var save_stack = FROM_MOZ_STACK;
@@ -600,24 +597,24 @@
             }
         }
         return moznode;
-    };
+    }
 
     function def_to_moz(mytype, handler) {
         mytype.DEFMETHOD("to_mozilla_ast", function() {
             return set_moz_loc(this, handler(this));
         });
-    };
+    }
 
     function to_moz(node) {
         return node != null ? node.to_mozilla_ast() : null;
-    };
+    }
 
     function to_moz_block(node) {
         return {
             type: "BlockStatement",
             body: node.body.map(to_moz)
         };
-    };
+    }
 
     function to_moz_scope(type, node) {
         var body = node.body.map(to_moz);
@@ -628,5 +625,5 @@
             type: type,
             body: body
         };
-    };
+    }
 })();

lib/output.js

@@ -1011,36 +1011,27 @@ function OutputStream(options) {
         self._do_print(output);
     });
 
-    /* -----[ exits ]----- */
+    /* -----[ jumps ]----- */
-    AST_Exit.DEFMETHOD("_do_print", function(output, kind){
+    function print_jump(output, kind, target) {
         output.print(kind);
-        if (this.value) {
+        if (target) {
             output.space();
-            this.value.print(output);
+            target.print(output);
         }
         output.semicolon();
-    });
+    }
+
     DEFPRINT(AST_Return, function(self, output) {
-        self._do_print(output, "return");
+        print_jump(output, "return", self.value);
     });
     DEFPRINT(AST_Throw, function(self, output) {
-        self._do_print(output, "throw");
+        print_jump(output, "throw", self.value);
-    });
-
-    /* -----[ loop control ]----- */
-    AST_LoopControl.DEFMETHOD("_do_print", function(output, kind){
-        output.print(kind);
-        if (this.label) {
-            output.space();
-            this.label.print(output);
-        }
-        output.semicolon();
     });
     DEFPRINT(AST_Break, function(self, output) {
-        self._do_print(output, "break");
+        print_jump(output, "break", self.label);
     });
     DEFPRINT(AST_Continue, function(self, output) {
-        self._do_print(output, "continue");
+        print_jump(output, "continue", self.label);
     });
 
     /* -----[ if ]----- */
@@ -1161,22 +1152,15 @@ function OutputStream(options) {
         print_braced(self, output);
     });
 
-    /* -----[ var/const ]----- */
+    DEFPRINT(AST_Var, function(self, output) {
-    AST_Definitions.DEFMETHOD("_do_print", function(output, kind){
+        output.print("var");
-        output.print(kind);
         output.space();
-        this.definitions.forEach(function(def, i){
+        self.definitions.forEach(function(def, i) {
             if (i) output.comma();
             def.print(output);
         });
         var p = output.parent();
-        var in_for = p instanceof AST_For || p instanceof AST_ForIn;
+        if (p.init !== self || !(p instanceof AST_For || p instanceof AST_ForIn)) output.semicolon();
-        var avoid_semicolon = in_for && p.init === this;
-        if (!avoid_semicolon)
-            output.semicolon();
-    });
-    DEFPRINT(AST_Var, function(self, output){
-        self._do_print(output, "var");
     });
 
     function parenthesize_for_noin(node, output, noin) {
@@ -1225,9 +1209,8 @@ function OutputStream(options) {
         output.space();
         AST_Call.prototype._codegen(self, output);
     });
-
+    DEFPRINT(AST_Sequence, function(self, output) {
-    AST_Sequence.DEFMETHOD("_do_print", function(output){
+        self.expressions.forEach(function(node, index) {
-        this.expressions.forEach(function(node, index) {
             if (index > 0) {
                 output.comma();
                 if (output.should_break()) {
@@ -1238,17 +1221,6 @@ function OutputStream(options) {
             node.print(output);
         });
     });
-    DEFPRINT(AST_Sequence, function(self, output){
-        self._do_print(output);
-        // var p = output.parent();
-        // if (p instanceof AST_Statement) {
-        //     output.with_indent(output.next_indent(), function(){
-        //         self._do_print(output);
-        //     });
-        // } else {
-        //     self._do_print(output);
-        // }
-    });
     DEFPRINT(AST_Dot, function(self, output) {
         var expr = self.expression;
         expr.print(output);

lib/parse.js

@@ -130,7 +130,7 @@ function is_letter(code) {
     return (code >= 97 && code <= 122)
         || (code >= 65 && code <= 90)
         || (code >= 0xaa && UNICODE.letter.test(String.fromCharCode(code)));
-};
+}
 
 function is_surrogate_pair_head(code) {
     if (typeof code == "string")
@@ -146,11 +146,11 @@ function is_surrogate_pair_tail(code) {
 
 function is_digit(code) {
     return code >= 48 && code <= 57;
-};
+}
 
 function is_alphanumeric_char(code) {
     return is_digit(code) || is_letter(code);
-};
+}
 
 function is_unicode_digit(code) {
     return UNICODE.digit.test(String.fromCharCode(code));
@@ -158,19 +158,19 @@ function is_unicode_digit(code) {
 
 function is_unicode_combining_mark(ch) {
     return UNICODE.non_spacing_mark.test(ch) || UNICODE.space_combining_mark.test(ch);
-};
+}
 
 function is_unicode_connector_punctuation(ch) {
     return UNICODE.connector_punctuation.test(ch);
-};
+}
 
 function is_identifier(name) {
     return !RESERVED_WORDS[name] && /^[a-z_$][a-z0-9_$]*$/i.test(name);
-};
+}
 
 function is_identifier_start(code) {
     return code == 36 || code == 95 || is_letter(code);
-};
+}
 
 function is_identifier_char(ch) {
     var code = ch.charCodeAt(0);
@@ -182,11 +182,11 @@ function is_identifier_char(ch) {
         || is_unicode_connector_punctuation(ch)
         || is_unicode_digit(code)
     ;
-};
+}
 
 function is_identifier_string(str) {
     return /^[a-z_$][a-z0-9_$]*$/i.test(str);
-};
+}
 
 function parse_js_number(num) {
     if (RE_HEX_NUMBER.test(num)) {
@@ -197,7 +197,7 @@ function parse_js_number(num) {
         var val = parseFloat(num);
         if (val == num) return val;
     }
-};
+}
 
 function JS_Parse_Error(message, filename, line, col, pos) {
     this.message = message;
@@ -205,7 +205,7 @@ function JS_Parse_Error(message, filename, line, col, pos) {
     this.line = line;
     this.col = col;
     this.pos = pos;
-};
+}
 JS_Parse_Error.prototype = Object.create(Error.prototype);
 JS_Parse_Error.prototype.constructor = JS_Parse_Error;
 JS_Parse_Error.prototype.name = "SyntaxError";
@@ -213,11 +213,11 @@ configure_error_stack(JS_Parse_Error);
 
 function js_error(message, filename, line, col, pos) {
     throw new JS_Parse_Error(message, filename, line, col, pos);
-};
+}
 
 function is_token(token, type, val) {
     return token.type == type && (val == null || token.value == val);
-};
+}
 
 var EX_EOF = {};
 
@@ -239,7 +239,9 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
         directive_stack : []
     };
 
-    function peek() { return S.text.charAt(S.pos); };
+    function peek() {
+        return S.text.charAt(S.pos);
+    }
 
     function next(signal_eof, in_string) {
         var ch = S.text.charAt(S.pos++);
@@ -258,15 +260,15 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
             ++S.col;
         }
         return ch;
-    };
+    }
 
     function forward(i) {
         while (i-- > 0) next();
-    };
+    }
 
     function looking_at(str) {
         return S.text.substr(S.pos, str.length) == str;
-    };
+    }
 
     function find_eol() {
         var text = S.text;
@@ -276,19 +278,19 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
                 return i;
         }
         return -1;
-    };
+    }
 
     function find(what, signal_eof) {
         var pos = S.text.indexOf(what, S.pos);
         if (signal_eof && pos == -1) throw EX_EOF;
         return pos;
-    };
+    }
 
     function start_token() {
         S.tokline = S.line;
         S.tokcol = S.col;
         S.tokpos = S.pos;
-    };
+    }
 
     var prev_was_dot = false;
     function token(type, value, is_comment) {
@@ -321,23 +323,23 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
         }
         S.newline_before = false;
         return new AST_Token(ret);
-    };
+    }
 
     function skip_whitespace() {
         while (WHITESPACE_CHARS[peek()])
             next();
-    };
+    }
 
     function read_while(pred) {
         var ret = "", ch, i = 0;
         while ((ch = peek()) && pred(ch, i++))
             ret += next();
         return ret;
-    };
+    }
 
     function parse_error(err) {
         js_error(err, filename, S.tokline, S.tokcol, S.tokpos);
-    };
+    }
 
     function read_num(prefix) {
         var has_e = false, after_e = false, has_x = false, has_dot = prefix == ".";
@@ -367,7 +369,7 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
         } else {
             parse_error("Invalid syntax: " + num);
         }
-    };
+    }
 
     function read_escaped_char(in_string) {
         var ch = next(true, in_string);
@@ -390,7 +392,7 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
         if (ch >= "0" && ch <= "7")
             return read_octal_escape_sequence(ch);
         return ch;
-    };
+    }
 
     function read_octal_escape_sequence(ch) {
         // Read
@@ -417,7 +419,7 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
             num = (num << 4) | digit;
         }
         return num;
-    };
+    }
 
     var read_string = with_eof_error("Unterminated string constant", function(quote_char) {
         var quote = next(), ret = "";
@@ -447,7 +449,7 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
         S.comments_before.push(token(type, ret, true));
         S.regex_allowed = regex_allowed;
         return next_token;
-    };
+    }
 
     var skip_multiline_comment = with_eof_error("Unterminated multiline comment", function() {
         var regex_allowed = S.regex_allowed;
@@ -481,7 +483,7 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
             name = "\\u" + "0000".substr(hex.length) + hex + name.slice(1);
         }
         return name;
-    };
+    }
 
     var read_regexp = with_eof_error("Unterminated regular expression", function(source) {
         var prev_backslash = false, ch, in_class = false;
@@ -523,9 +525,9 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
             } else {
                 return op;
             }
-        };
+        }
         return token("operator", grow(prefix || next()));
-    };
+    }
 
     function handle_slash() {
         next();
@@ -538,14 +540,14 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
             return skip_multiline_comment();
         }
         return S.regex_allowed ? read_regexp("") : read_operator("/");
-    };
+    }
 
     function handle_dot() {
         next();
         return is_digit(peek().charCodeAt(0))
             ? read_num(".")
             : token("punc", ".");
-    };
+    }
 
     function read_word() {
         var word = read_name();
@@ -554,7 +556,7 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
             : !KEYWORDS[word] ? token("name", word)
             : OPERATORS[word] ? token("operator", word)
             : token("keyword", word);
-    };
+    }
 
     function with_eof_error(eof_error, cont) {
         return function(x) {
@@ -565,7 +567,7 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
                 else throw ex;
             }
         };
-    };
+    }
 
     function next_token(force_regexp) {
         if (force_regexp != null)
@@ -609,7 +611,7 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
             break;
         }
         parse_error("Unexpected character '" + ch + "'");
-    };
+    }
 
     next_token.context = function(nc) {
         if (nc) S = nc;
@@ -645,8 +647,7 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
     }
 
     return next_token;
-
+}
-};
 
 /* -----[ Parser (constants) ]----- */
 
@@ -666,7 +667,7 @@ var UNARY_POSTFIX = makePredicate([ "--", "++" ]);
 
 var ASSIGNMENT = makePredicate([ "=", "+=", "-=", "/=", "*=", "%=", ">>=", "<<=", ">>>=", "|=", "^=", "&=" ]);
 
-var PRECEDENCE = (function(a, ret){
+var PRECEDENCE = function(a, ret) {
     for (var i = 0; i < a.length; ++i) {
         var b = a[i];
         for (var j = 0; j < b.length; ++j) {
@@ -674,8 +675,7 @@ var PRECEDENCE = (function(a, ret){
         }
     }
     return ret;
-})(
+}([
-    [
     ["||"],
     ["&&"],
     ["|"],
@@ -686,16 +686,13 @@ var PRECEDENCE = (function(a, ret){
     [">>", "<<", ">>>"],
     ["+", "-"],
     ["*", "/", "%"]
-    ],
+], {});
-    {}
-);
 
 var ATOMIC_START_TOKEN = makePredicate([ "atom", "num", "string", "regexp", "name" ]);
 
 /* -----[ Parser ]----- */
 
 function parse($TEXT, options) {
-
     options = defaults(options, {
         bare_returns   : false,
         expression     : false,
@@ -724,9 +721,11 @@ function parse($TEXT, options) {
 
     function is(type, value) {
         return is_token(S.token, type, value);
-    };
+    }
 
-    function peek() { return S.peeked || (S.peeked = S.input()); };
+    function peek() {
+        return S.peeked || (S.peeked = S.input());
+    }
 
     function next() {
         S.prev = S.token;
@@ -740,11 +739,11 @@ function parse($TEXT, options) {
             S.token.type == "string" || is("punc", ";")
         );
         return S.token;
-    };
+    }
 
     function prev() {
         return S.prev;
-    };
+    }
 
     function croak(msg, line, col, pos) {
         var ctx = S.input.context();
@@ -753,26 +752,28 @@ function parse($TEXT, options) {
                  line != null ? line : ctx.tokline,
                  col != null ? col : ctx.tokcol,
                  pos != null ? pos : ctx.tokpos);
-    };
+    }
 
     function token_error(token, msg) {
         croak(msg, token.line, token.col);
-    };
+    }
 
     function unexpected(token) {
         if (token == null)
             token = S.token;
         token_error(token, "Unexpected token: " + token.type + " (" + token.value + ")");
-    };
+    }
 
     function expect_token(type, val) {
         if (is(type, val)) {
             return next();
         }
         token_error(S.token, "Unexpected token " + S.token.type + " «" + S.token.value + "»" + ", expected " + type + " «" + val + "»");
-    };
+    }
 
-    function expect(punc) { return expect_token("punc", punc); };
+    function expect(punc) {
+        return expect_token("punc", punc);
+    }
 
     function has_newline_before(token) {
         return token.nlb || !all(token.comments_before, function(comment) {
@@ -783,19 +784,19 @@ function parse($TEXT, options) {
     function can_insert_semicolon() {
         return !options.strict
             && (is("eof") || is("punc", "}") || has_newline_before(S.token));
-    };
+    }
 
     function semicolon(optional) {
         if (is("punc", ";")) next();
         else if (!optional && !can_insert_semicolon()) unexpected();
-    };
+    }
 
     function parenthesised() {
         expect("(");
         var exp = expression(true);
         expect(")");
         return exp;
-    };
+    }
 
     function embed_tokens(parser) {
         return function() {
@@ -806,14 +807,14 @@ function parse($TEXT, options) {
             expr.end = end;
             return expr;
         };
-    };
+    }
 
     function handle_regexp() {
         if (is("operator", "/") || is("operator", "/=")) {
             S.peeked = null;
             S.token = S.input(S.token.value.substr(1)); // force regexp
         }
-    };
+    }
 
     var statement = embed_tokens(function(strict_defun) {
         handle_regexp();
@@ -995,11 +996,11 @@ function parse($TEXT, options) {
             });
         }
         return new AST_LabeledStatement({ body: stat, label: label });
-    };
+    }
 
     function simple_statement(tmp) {
         return new AST_SimpleStatement({ body: (tmp = expression(true), semicolon(), tmp) });
-    };
+    }
 
     function break_cont(type) {
         var label = null, ldef;
@@ -1007,18 +1008,17 @@ function parse($TEXT, options) {
             label = as_symbol(AST_LabelRef, true);
         }
         if (label != null) {
-            ldef = find_if(function(l){ return l.name == label.name }, S.labels);
+            ldef = find_if(function(l) {
-            if (!ldef)
+                return l.name == label.name;
-                croak("Undefined label " + label.name);
+            }, S.labels);
+            if (!ldef) croak("Undefined label " + label.name);
             label.thedef = ldef;
-        }
+        } else if (S.in_loop == 0) croak(type.TYPE + " not inside a loop or switch");
-        else if (S.in_loop == 0)
-            croak(type.TYPE + " not inside a loop or switch");
         semicolon();
         var stat = new type({ label: label });
         if (ldef) ldef.references.push(stat);
         return stat;
-    };
+    }
 
     function for_() {
         expect("(");
@@ -1039,7 +1039,7 @@ function parse($TEXT, options) {
             }
         }
         return regular_for(init);
-    };
+    }
 
     function regular_for(init) {
         expect(";");
@@ -1053,7 +1053,7 @@ function parse($TEXT, options) {
             step      : step,
             body      : in_loop(statement)
         });
-    };
+    }
 
     function for_in(init) {
         var obj = expression(true);
@@ -1063,7 +1063,7 @@ function parse($TEXT, options) {
             object : obj,
             body   : in_loop(statement)
         });
-    };
+    }
 
     var function_ = function(ctor) {
         var in_statement = ctor === AST_Defun;
@@ -1113,7 +1113,7 @@ function parse($TEXT, options) {
             body        : body,
             alternative : belse
         });
-    };
+    }
 
     function block_(strict_defun) {
         expect("{");
@@ -1124,7 +1124,7 @@ function parse($TEXT, options) {
         }
         next();
         return a;
-    };
+    }
 
     function switch_body_() {
         expect("{");
@@ -1159,7 +1159,7 @@ function parse($TEXT, options) {
         if (branch) branch.end = prev();
         next();
         return a;
-    };
+    }
 
     function try_() {
         var body = block_(), bcatch = null, bfinally = null;
@@ -1192,7 +1192,7 @@ function parse($TEXT, options) {
             bcatch   : bcatch,
             bfinally : bfinally
         });
-    };
+    }
 
     function vardefs(no_in) {
         var a = [];
@@ -1208,7 +1208,7 @@ function parse($TEXT, options) {
             next();
         }
         return a;
-    };
+    }
 
     var var_ = function(no_in) {
         return new AST_Var({
@@ -1274,7 +1274,7 @@ function parse($TEXT, options) {
         }
         next();
         return ret;
-    };
+    }
 
     var expr_atom = function(allow_calls) {
         if (is("operator", "new")) {
@@ -1340,7 +1340,7 @@ function parse($TEXT, options) {
         }
         next();
         return a;
-    };
+    }
 
     var array_ = embed_tokens(function() {
         expect("[");
@@ -1417,14 +1417,14 @@ function parse($TEXT, options) {
           default:
             unexpected();
         }
-    };
+    }
 
     function as_name() {
         var tmp = S.token;
         if (tmp.type != "name") unexpected();
         next();
         return tmp.value;
-    };
+    }
 
     function _make_symbol(type) {
         var name = S.token.value;
@@ -1433,7 +1433,7 @@ function parse($TEXT, options) {
             start : S.token,
             end   : S.token
         });
-    };
+    }
 
     function strict_verify_symbol(sym) {
         if (sym.name == "arguments" || sym.name == "eval")
@@ -1451,7 +1451,7 @@ function parse($TEXT, options) {
         }
         next();
         return sym;
-    };
+    }
 
     function mark_pure(call) {
         var start = call.start;
@@ -1536,7 +1536,7 @@ function parse($TEXT, options) {
             break;
         }
         return new ctor({ operator: op, expression: expr });
-    };
+    }
 
     var expr_op = function(left, min_prec, no_in) {
         var op = is("operator") ? S.token.value : null;
@@ -1558,7 +1558,7 @@ function parse($TEXT, options) {
 
     function expr_ops(no_in) {
         return expr_op(maybe_unary(true), 0, no_in);
-    };
+    }
 
     var maybe_conditional = function(no_in) {
         var start = S.token;
@@ -1580,7 +1580,7 @@ function parse($TEXT, options) {
 
     function is_assignable(expr) {
         return expr instanceof AST_PropAccess || expr instanceof AST_SymbolRef;
-    };
+    }
 
     var maybe_assign = function(no_in) {
         var start = S.token;
@@ -1622,13 +1622,13 @@ function parse($TEXT, options) {
         var ret = cont();
         --S.in_loop;
         return ret;
-    };
+    }
 
     if (options.expression) {
         return expression(true);
     }
 
-    return (function(){
+    return function() {
         var start = S.token;
         var body = [];
         S.input.push_directives_stack();
@@ -1644,6 +1644,5 @@ function parse($TEXT, options) {
             toplevel = new AST_Toplevel({ start: start, body: body, end: end });
         }
         return toplevel;
-    })();
+    }();
-
+}
-};

lib/scope.js

@@ -63,12 +63,12 @@ SymbolDef.prototype = {
     unmangleable: function(options) {
         if (!options) options = {};
 
-        return (this.global && !options.toplevel)
+        return this.global && !options.toplevel
             || this.undeclared
-            || (!options.eval && (this.scope.uses_eval || this.scope.uses_with))
+            || !options.eval && this.scope.pinned()
-            || (options.keep_fnames
+            || options.keep_fnames
                 && (this.orig[0] instanceof AST_SymbolLambda
-                    || this.orig[0] instanceof AST_SymbolDefun));
+                    || this.orig[0] instanceof AST_SymbolDefun);
     },
     mangle: function(options) {
         var cache = options.cache && options.cache.props;
@@ -132,10 +132,7 @@ AST_Toplevel.DEFMETHOD("figure_out_scope", function(options){
             node.thedef = node;
             node.references = [];
         }
-        if (node instanceof AST_SymbolLambda) {
+        if (node instanceof AST_SymbolDefun || options.ie8 && node instanceof AST_SymbolLambda) {
-            defun.def_function(node, node.name == "arguments" ? undefined : defun);
-        }
-        else if (node instanceof AST_SymbolDefun) {
             // Careful here, the scope where this should be defined is
             // the parent scope.  The reason is that we enter a new
             // scope when we encounter the AST_Defun node (which is
@@ -143,6 +140,9 @@ AST_Toplevel.DEFMETHOD("figure_out_scope", function(options){
             // later.
             (node.scope = defun.parent_scope).def_function(node, defun);
         }
+        else if (node instanceof AST_SymbolLambda) {
+            defun.def_function(node, node.name == "arguments" ? undefined : defun);
+        }
         else if (node instanceof AST_SymbolVar) {
             defun.def_variable(node, node.TYPE == "SymbolVar" ? null : undefined);
             if (defun !== scope) {
@@ -349,9 +349,6 @@ function next_mangled_name(scope, options, def) {
         holes.push(scope.cname);
     }
     scope.names_in_use[name] = true;
-    if (options.ie8 && def.orig[0] instanceof AST_SymbolLambda) {
-        names_in_use(scope.parent_scope, options)[name] = true;
-    }
     return name;
 }
 
@@ -364,8 +361,7 @@ AST_Symbol.DEFMETHOD("unmangleable", function(options){
 AST_Label.DEFMETHOD("unmangleable", return_false);
 
 AST_Symbol.DEFMETHOD("unreferenced", function() {
-    return this.definition().references.length == 0
+    return !this.definition().references.length && !this.scope.pinned();
-        && !(this.scope.uses_eval || this.scope.uses_with);
 });
 
 AST_Symbol.DEFMETHOD("definition", function() {

lib/sourcemap.js

@@ -49,10 +49,9 @@ function SourceMap(options) {
         file: null,
         root: null,
         orig: null,
-
         orig_line_diff: 0,
         dest_line_diff: 0,
-    });
+    }, true);
     var generator = new MOZ_SourceMap.SourceMapGenerator({
         file: options.file,
         sourceRoot: options.root
@@ -68,8 +67,8 @@ function SourceMap(options) {
         }
         maps[source] = map;
     }
-
+    return {
-    function add(source, gen_line, gen_col, orig_line, orig_col, name) {
+        add: function(source, gen_line, gen_col, orig_line, orig_col, name) {
             var map = maps && maps[source];
             if (map) {
                 var info = map.originalPositionFor({
@@ -83,15 +82,23 @@ function SourceMap(options) {
                 name = info.name || name;
             }
             generator.addMapping({
-            generated : { line: gen_line + options.dest_line_diff, column: gen_col },
+                name: name,
-            original  : { line: orig_line + options.orig_line_diff, column: orig_col },
                 source: source,
-            name      : name
+                generated: {
+                    line: gen_line + options.dest_line_diff,
+                    column: gen_col
+                },
+                original: {
+                    line: orig_line + options.orig_line_diff,
+                    column: orig_col
+                }
             });
+        },
+        get: function() {
+            return generator;
+        },
+        toString: function() {
+            return JSON.stringify(generator.toJSON());
+        }
     };
-    return {
+}
-        add        : add,
-        get        : function() { return generator },
-        toString   : function() { return JSON.stringify(generator.toJSON()); }
-    };
-};

lib/transform.js

@@ -43,8 +43,6 @@
 
 "use strict";
 
-// Tree transformer helpers.
-
 function TreeTransformer(before, after) {
     TreeWalker.call(this);
     this.before = before;
@@ -52,168 +50,136 @@ function TreeTransformer(before, after) {
 }
 TreeTransformer.prototype = new TreeWalker;
 
-(function(undefined){
+(function(DEF) {
-
-    function _(node, descend) {
-        node.DEFMETHOD("transform", function(tw, in_list){
-            var x, y;
-            tw.push(this);
-            if (tw.before) x = tw.before(this, descend, in_list);
-            if (x === undefined) {
-                x = this;
-                descend(x, tw);
-                if (tw.after) {
-                    y = tw.after(x, in_list);
-                    if (y !== undefined) x = y;
-                }
-            }
-            tw.pop();
-            return x;
-        });
-    };
-
     function do_list(list, tw) {
         return MAP(list, function(node) {
             return node.transform(tw, true);
         });
-    };
+    }
 
-    _(AST_Node, noop);
+    DEF(AST_Node, noop);
-
+    DEF(AST_LabeledStatement, function(self, tw) {
-    _(AST_LabeledStatement, function(self, tw){
         self.label = self.label.transform(tw);
         self.body = self.body.transform(tw);
     });
-
+    DEF(AST_SimpleStatement, function(self, tw) {
-    _(AST_SimpleStatement, function(self, tw){
         self.body = self.body.transform(tw);
     });
-
+    DEF(AST_Block, function(self, tw) {
-    _(AST_Block, function(self, tw){
         self.body = do_list(self.body, tw);
     });
-
+    DEF(AST_Do, function(self, tw) {
-    _(AST_Do, function(self, tw){
         self.body = self.body.transform(tw);
         self.condition = self.condition.transform(tw);
     });
-
+    DEF(AST_While, function(self, tw) {
-    _(AST_While, function(self, tw){
         self.condition = self.condition.transform(tw);
         self.body = self.body.transform(tw);
     });
-
+    DEF(AST_For, function(self, tw) {
-    _(AST_For, function(self, tw){
         if (self.init) self.init = self.init.transform(tw);
         if (self.condition) self.condition = self.condition.transform(tw);
         if (self.step) self.step = self.step.transform(tw);
         self.body = self.body.transform(tw);
     });
-
+    DEF(AST_ForIn, function(self, tw) {
-    _(AST_ForIn, function(self, tw){
         self.init = self.init.transform(tw);
         self.object = self.object.transform(tw);
         self.body = self.body.transform(tw);
     });
-
+    DEF(AST_With, function(self, tw) {
-    _(AST_With, function(self, tw){
         self.expression = self.expression.transform(tw);
         self.body = self.body.transform(tw);
     });
-
+    DEF(AST_Exit, function(self, tw) {
-    _(AST_Exit, function(self, tw){
         if (self.value) self.value = self.value.transform(tw);
     });
-
+    DEF(AST_LoopControl, function(self, tw) {
-    _(AST_LoopControl, function(self, tw){
         if (self.label) self.label = self.label.transform(tw);
     });
-
+    DEF(AST_If, function(self, tw) {
-    _(AST_If, function(self, tw){
         self.condition = self.condition.transform(tw);
         self.body = self.body.transform(tw);
         if (self.alternative) self.alternative = self.alternative.transform(tw);
     });
-
+    DEF(AST_Switch, function(self, tw) {
-    _(AST_Switch, function(self, tw){
         self.expression = self.expression.transform(tw);
         self.body = do_list(self.body, tw);
     });
-
+    DEF(AST_Case, function(self, tw) {
-    _(AST_Case, function(self, tw){
         self.expression = self.expression.transform(tw);
         self.body = do_list(self.body, tw);
     });
-
+    DEF(AST_Try, function(self, tw) {
-    _(AST_Try, function(self, tw){
         self.body = do_list(self.body, tw);
         if (self.bcatch) self.bcatch = self.bcatch.transform(tw);
         if (self.bfinally) self.bfinally = self.bfinally.transform(tw);
     });
-
+    DEF(AST_Catch, function(self, tw) {
-    _(AST_Catch, function(self, tw){
         self.argname = self.argname.transform(tw);
         self.body = do_list(self.body, tw);
     });
-
+    DEF(AST_Definitions, function(self, tw) {
-    _(AST_Definitions, function(self, tw){
         self.definitions = do_list(self.definitions, tw);
     });
-
+    DEF(AST_VarDef, function(self, tw) {
-    _(AST_VarDef, function(self, tw){
         self.name = self.name.transform(tw);
         if (self.value) self.value = self.value.transform(tw);
     });
-
+    DEF(AST_Lambda, function(self, tw) {
-    _(AST_Lambda, function(self, tw){
         if (self.name) self.name = self.name.transform(tw);
         self.argnames = do_list(self.argnames, tw);
         self.body = do_list(self.body, tw);
     });
-
+    DEF(AST_Call, function(self, tw) {
-    _(AST_Call, function(self, tw){
         self.expression = self.expression.transform(tw);
         self.args = do_list(self.args, tw);
     });
-
+    DEF(AST_Sequence, function(self, tw) {
-    _(AST_Sequence, function(self, tw){
         self.expressions = do_list(self.expressions, tw);
     });
-
+    DEF(AST_Dot, function(self, tw) {
-    _(AST_Dot, function(self, tw){
         self.expression = self.expression.transform(tw);
     });
-
+    DEF(AST_Sub, function(self, tw) {
-    _(AST_Sub, function(self, tw){
         self.expression = self.expression.transform(tw);
         self.property = self.property.transform(tw);
     });
-
+    DEF(AST_Unary, function(self, tw) {
-    _(AST_Unary, function(self, tw){
         self.expression = self.expression.transform(tw);
     });
-
+    DEF(AST_Binary, function(self, tw) {
-    _(AST_Binary, function(self, tw){
         self.left = self.left.transform(tw);
         self.right = self.right.transform(tw);
     });
-
+    DEF(AST_Conditional, function(self, tw) {
-    _(AST_Conditional, function(self, tw){
         self.condition = self.condition.transform(tw);
         self.consequent = self.consequent.transform(tw);
         self.alternative = self.alternative.transform(tw);
     });
-
+    DEF(AST_Array, function(self, tw) {
-    _(AST_Array, function(self, tw){
         self.elements = do_list(self.elements, tw);
     });
-
+    DEF(AST_Object, function(self, tw) {
-    _(AST_Object, function(self, tw){
         self.properties = do_list(self.properties, tw);
     });
-
+    DEF(AST_ObjectProperty, function(self, tw) {
-    _(AST_ObjectProperty, function(self, tw){
         self.value = self.value.transform(tw);
     });
-
+})(function(node, descend) {
-})();
+    node.DEFMETHOD("transform", function(tw, in_list) {
+        var x, y;
+        tw.push(this);
+        if (tw.before) x = tw.before(this, descend, in_list);
+        if (typeof x === "undefined") {
+            x = this;
+            descend(x, tw);
+            if (tw.after) {
+                y = tw.after(x, in_list);
+                if (typeof y !== "undefined") x = y;
+            }
+        }
+        tw.pop();
+        return x;
+    });
+});

lib/utils.js

@@ -52,9 +52,7 @@ function member(name, array) {
 }
 
 function find_if(func, array) {
-    for (var i = 0, n = array.length; i < n; ++i) {
+    for (var i = array.length; --i >= 0;) if (func(array[i])) return array[i];
-        if (func(array[i])) return array[i];
-    }
 }
 
 function repeat_string(str, i) {
@@ -138,7 +136,7 @@ var MAP = (function(){
                 }
             }
             return is_last;
-        };
+        }
         if (Array.isArray(a)) {
             if (backwards) {
                 for (i = a.length; --i >= 0;) if (doit()) break;
@@ -152,14 +150,14 @@ var MAP = (function(){
             for (i in a) if (HOP(a, i)) if (doit()) break;
         }
         return top.concat(ret);
-    };
+    }
     MAP.at_top = function(val) { return new AtTop(val) };
     MAP.splice = function(val) { return new Splice(val) };
     MAP.last = function(val) { return new Last(val) };
     var skip = MAP.skip = {};
-    function AtTop(val) { this.v = val };
+    function AtTop(val) { this.v = val }
-    function Splice(val) { this.v = val };
+    function Splice(val) { this.v = val }
-    function Last(val) { this.v = val };
+    function Last(val) { this.v = val }
     return MAP;
 })();
 

package.json

@@ -3,7 +3,7 @@
   "description": "JavaScript parser, mangler/compressor and beautifier toolkit",
   "author": "Mihai Bazon <mihai.bazon@gmail.com> (http://lisperator.net/)",
   "license": "BSD-2-Clause",
-  "version": "3.3.23",
+  "version": "3.4.4",
   "engines": {
     "node": ">=0.8.0"
   },
@@ -23,12 +23,11 @@
     "LICENSE"
   ],
   "dependencies": {
-    "commander": "~2.15.0",
+    "commander": "~2.16.0",
     "source-map": "~0.6.1"
   },
   "devDependencies": {
-    "acorn": "~5.5.3",
+    "acorn": "~5.7.1",
-    "mocha": "~3.5.1",
     "semver": "~5.5.0"
   },
   "scripts": {

test/compress/arguments.js

@@ -5,7 +5,8 @@ replace_index: {
         properties: true,
     }
     input: {
-        console.log(arguments && arguments[0]);
+        var arguments = [];
+        console.log(arguments[0]);
         (function() {
             console.log(arguments[1], arguments["1"], arguments["foo"]);
         })("bar", 42);
@@ -21,7 +22,8 @@ replace_index: {
         })("bar", 42);
     }
     expect: {
-        console.log(arguments && arguments[0]);
+        var arguments = [];
+        console.log(arguments[0]);
         (function() {
             console.log(arguments[1], arguments[1], arguments.foo);
         })("bar", 42);
@@ -45,6 +47,37 @@ replace_index: {
     ]
 }
 
+replace_index_strict: {
+    options = {
+        arguments: true,
+        evaluate: true,
+        properties: true,
+        reduce_vars: true,
+    }
+    input: {
+        "use strict";
+        (function() {
+            console.log(arguments[1], arguments["1"], arguments["foo"]);
+        })("bar", 42);
+        (function(a, b) {
+            console.log(arguments[1], arguments["1"], arguments["foo"]);
+        })("bar", 42);
+    }
+    expect: {
+        "use strict";
+        (function() {
+            console.log(arguments[1], arguments[1], arguments.foo);
+        })("bar", 42);
+        (function(a, b) {
+            console.log(b, b, arguments.foo);
+        })("bar", 42);
+    }
+    expect_stdout: [
+        "42 42 undefined",
+        "42 42 undefined",
+    ]
+}
+
 replace_index_keep_fargs: {
     options = {
         arguments: true,
@@ -53,7 +86,8 @@ replace_index_keep_fargs: {
         properties: true,
     }
     input: {
-        console.log(arguments && arguments[0]);
+        var arguments = [];
+        console.log(arguments[0]);
         (function() {
             console.log(arguments[1], arguments["1"], arguments["foo"]);
         })("bar", 42);
@@ -69,7 +103,8 @@ replace_index_keep_fargs: {
         })("bar", 42);
     }
     expect: {
-        console.log(arguments && arguments[0]);
+        var arguments = [];
+        console.log(arguments[0]);
         (function(argument_0, argument_1) {
             console.log(argument_1, argument_1, arguments.foo);
         })("bar", 42);
@@ -93,6 +128,38 @@ replace_index_keep_fargs: {
     ]
 }
 
+replace_index_keep_fargs_strict: {
+    options = {
+        arguments: true,
+        evaluate: true,
+        keep_fargs: false,
+        properties: true,
+        reduce_vars: true,
+    }
+    input: {
+        "use strict";
+        (function() {
+            console.log(arguments[1], arguments["1"], arguments["foo"]);
+        })("bar", 42);
+        (function(a, b) {
+            console.log(arguments[1], arguments["1"], arguments["foo"]);
+        })("bar", 42);
+    }
+    expect: {
+        "use strict";
+        (function(argument_0, argument_1) {
+            console.log(argument_1, argument_1, arguments.foo);
+        })("bar", 42);
+        (function(a, b) {
+            console.log(b, b, arguments.foo);
+        })("bar", 42);
+    }
+    expect_stdout: [
+        "42 42 undefined",
+        "42 42 undefined",
+    ]
+}
+
 modified: {
     options = {
         arguments: true,
@@ -101,8 +168,10 @@ modified: {
         (function(a, b) {
             var c = arguments[0];
             var d = arguments[1];
-            a = "foo";
+            var a = "foo";
             b++;
+            arguments[0] = "moo";
+            arguments[1] *= 2;
             console.log(a, b, c, d, arguments[0], arguments[1]);
         })("bar", 42);
     }
@@ -110,10 +179,61 @@ modified: {
         (function(a, b) {
             var c = a;
             var d = b;
-            a = "foo";
+            var a = "foo";
             b++;
+            a = "moo";
+            b *= 2;
             console.log(a, b, c, d, a, b);
         })("bar", 42);
     }
-    expect_stdout: "foo 43 bar 42 foo 43"
+    expect_stdout: "moo 86 bar 42 moo 86"
+}
+
+modified_strict: {
+    options = {
+        arguments: true,
+        reduce_vars: true,
+    }
+    input: {
+        "use strict";
+        (function(a, b) {
+            var c = arguments[0];
+            var d = arguments[1];
+            var a = "foo";
+            b++;
+            arguments[0] = "moo";
+            arguments[1] *= 2;
+            console.log(a, b, c, d, arguments[0], arguments[1]);
+        })("bar", 42);
+    }
+    expect: {
+        "use strict";
+        (function(a, b) {
+            var c = arguments[0];
+            var d = arguments[1];
+            var a = "foo";
+            b++;
+            arguments[0] = "moo";
+            arguments[1] *= 2;
+            console.log(a, b, c, d, arguments[0], arguments[1]);
+        })("bar", 42);
+    }
+    expect_stdout: "foo 43 bar 42 moo 84"
+}
+
+duplicate_argname: {
+    options = {
+        arguments: true,
+    }
+    input: {
+        (function(a, b, a) {
+            console.log(a, b, arguments[0], arguments[1], arguments[2]);
+        })("foo", 42, "bar");
+    }
+    expect: {
+        (function(a, b, a) {
+            console.log(a, b, arguments[0], b, a);
+        })("foo", 42, "bar");
+    }
+    expect_stdout: "bar 42 foo 42 bar"
 }

test/compress/arrays.js

@@ -15,9 +15,9 @@ holes_and_undefined: {
 
 constant_join: {
     options = {
+        evaluate: true,
         unsafe: true,
-        evaluate : true
+    }
-    };
     input: {
         var a = [ "foo", "bar", "baz" ].join("");
         var a1 = [ "foo", "bar", "baz" ].join();
@@ -64,9 +64,9 @@ constant_join: {
 
 constant_join_2: {
     options = {
+        evaluate: true,
         unsafe: true,
-        evaluate : true
+    }
-    };
     input: {
         var a = [ "foo", "bar", boo(), "baz", "x", "y" ].join("");
         var b = [ "foo", "bar", boo(), "baz", "x", "y" ].join("-");
@@ -93,9 +93,9 @@ constant_join_2: {
 
 constant_join_3: {
     options = {
-        unsafe: true,
         evaluate: true,
-    };
+        unsafe: true,
+    }
     input: {
         var a = [ null ].join();
         var b = [ , ].join();
@@ -133,7 +133,7 @@ for_loop: {
         reduce_vars: true,
         unsafe: true,
         unused: true,
-    };
+    }
     input: {
         function f0() {
             var a = [1, 2, 3];

test/compress/asm.js

@@ -1,24 +1,24 @@
 asm_mixed: {
     options = {
-        sequences     : true,
+        booleans: true,
-        properties    : true,
+        comparisons: true,
+        conditionals: true,
         dead_code: true,
         drop_debugger: true,
-        conditionals  : true,
-        comparisons   : true,
         evaluate: true,
-        booleans      : true,
-        loops         : true,
-        unused        : true,
         hoist_funs: true,
-        keep_fargs    : true,
-        keep_fnames   : false,
         hoist_vars: true,
         if_return: true,
         join_vars: true,
+        keep_fargs: true,
+        keep_fnames: false,
+        loops: true,
+        negate_iife: true,
+        properties: true,
+        sequences: true,
         side_effects: true,
-        negate_iife   : true
+        unused: true,
-    };
+    }
     input: {
         // adapted from http://asmjs.org/spec/latest/
         function asm_GeometricMean(stdlib, foreign, buffer) {

test/compress/collapse_vars.js

@@ -1,9 +1,22 @@
 collapse_vars_side_effects_1: {
     options = {
-        collapse_vars:true, sequences:true, properties:true, dead_code:true, conditionals:true,
+        booleans: true,
-        comparisons:true, evaluate:true, booleans:true, loops:true, unused:true, hoist_funs:true,
+        collapse_vars: true,
-        keep_fargs:true, if_return:true, join_vars:true, side_effects:true,
+        comparisons: true,
-        reduce_funcs: true, reduce_vars:true
+        conditionals: true,
+        dead_code: true,
+        evaluate: true,
+        hoist_funs: true,
+        if_return: true,
+        join_vars: true,
+        keep_fargs: true,
+        loops: true,
+        properties: true,
+        reduce_funcs: true,
+        reduce_vars: true,
+        sequences: true,
+        side_effects: true,
+        unused: true,
     }
     input: {
         function f1() {
@@ -76,9 +89,21 @@ collapse_vars_side_effects_1: {
 
 collapse_vars_side_effects_2: {
     options = {
-        collapse_vars:true, sequences:true, properties:true, dead_code:true, conditionals:true,
+        booleans: true,
-        comparisons:true, evaluate:true, booleans:true, loops:true, unused:true, hoist_funs:true,
+        collapse_vars: true,
-        keep_fargs:true, if_return:true, join_vars:true, side_effects:true
+        comparisons: true,
+        conditionals: true,
+        dead_code: true,
+        evaluate: true,
+        hoist_funs: true,
+        if_return: true,
+        join_vars: true,
+        keep_fargs: true,
+        loops: true,
+        properties: true,
+        sequences: true,
+        side_effects: true,
+        unused: true,
     }
     input: {
         function fn(x) { return console.log(x), x; }
@@ -144,10 +169,24 @@ collapse_vars_side_effects_2: {
 
 collapse_vars_issue_721: {
     options = {
-        collapse_vars:true, sequences:true, properties:true, dead_code:true, conditionals:true,
+        booleans: true,
-        comparisons:true, evaluate:true, booleans:true, loops:true, unused:true, hoist_funs:true,
+        collapse_vars: true,
-        keep_fargs:true, if_return:true, join_vars:true, side_effects:true,
+        comparisons: true,
-        reduce_funcs: true, reduce_vars:true, passes:2
+        conditionals: true,
+        dead_code: true,
+        evaluate: true,
+        hoist_funs: true,
+        if_return: true,
+        join_vars: true,
+        keep_fargs: true,
+        loops: true,
+        passes: 2,
+        properties: true,
+        reduce_funcs: true,
+        reduce_vars: true,
+        sequences: true,
+        side_effects: true,
+        unused: true,
     }
     input: {
         define(["require", "exports", 'handlebars'], function(require, exports, hb) {
@@ -211,10 +250,23 @@ collapse_vars_issue_721: {
 
 collapse_vars_properties: {
     options = {
-        collapse_vars:true, sequences:true, properties:true, dead_code:true, conditionals:true,
+        booleans: true,
-        comparisons:true, evaluate:true, booleans:true, loops:true, unused:true, hoist_funs:true,
+        collapse_vars: true,
-        keep_fargs:true, if_return:true, join_vars:true, side_effects:true,
+        comparisons: true,
-        reduce_funcs: true, reduce_vars:true
+        conditionals: true,
+        dead_code: true,
+        evaluate: true,
+        hoist_funs: true,
+        if_return: true,
+        join_vars: true,
+        keep_fargs: true,
+        loops: true,
+        properties: true,
+        reduce_funcs: true,
+        reduce_vars: true,
+        sequences: true,
+        side_effects: true,
+        unused: true,
     }
     input: {
         function f1(obj) {
@@ -239,10 +291,23 @@ collapse_vars_properties: {
 
 collapse_vars_if: {
     options = {
-        collapse_vars:true, sequences:true, properties:true, dead_code:true, conditionals:true,
+        booleans: true,
-        comparisons:true, evaluate:true, booleans:true, loops:true, unused:true, hoist_funs:true,
+        collapse_vars: true,
-        keep_fargs:true, if_return:true, join_vars:true, side_effects:true,
+        comparisons: true,
-        reduce_funcs: true, reduce_vars:true
+        conditionals: true,
+        dead_code: true,
+        evaluate: true,
+        hoist_funs: true,
+        if_return: true,
+        join_vars: true,
+        keep_fargs: true,
+        loops: true,
+        properties: true,
+        reduce_funcs: true,
+        reduce_vars: true,
+        sequences: true,
+        side_effects: true,
+        unused: true,
     }
     input: {
         function f1() {
@@ -290,10 +355,23 @@ collapse_vars_if: {
 
 collapse_vars_while: {
     options = {
-        collapse_vars:true, sequences:true, properties:true, dead_code:true, conditionals:true,
+        booleans: true,
-        comparisons:true, evaluate:true, booleans:true, loops:false, unused:true, hoist_funs:true,
+        collapse_vars: true,
-        keep_fargs:true, if_return:true, join_vars:true, side_effects:true,
+        comparisons: true,
-        reduce_funcs: true, reduce_vars:true
+        conditionals: true,
+        dead_code: true,
+        evaluate: true,
+        hoist_funs: true,
+        if_return: true,
+        join_vars: true,
+        keep_fargs: true,
+        loops: false,
+        properties: true,
+        reduce_funcs: true,
+        reduce_vars: true,
+        sequences: true,
+        side_effects: true,
+        unused: true,
     }
     input: {
         function f1(y) {
@@ -339,10 +417,21 @@ collapse_vars_while: {
 
 collapse_vars_do_while: {
     options = {
-        collapse_vars:true, sequences:true, properties:true, dead_code:true, conditionals:true,
+        booleans: false,
-        comparisons:true, evaluate:true, booleans:false, loops:false, unused:"keep_assign",
+        collapse_vars: true,
-        hoist_funs:true, keep_fargs:true, if_return:true, join_vars:true,
+        comparisons: true,
-        side_effects:true
+        conditionals: true,
+        dead_code: true,
+        evaluate: true,
+        hoist_funs: true,
+        if_return: true,
+        join_vars: true,
+        keep_fargs: true,
+        loops: false,
+        properties: true,
+        sequences: true,
+        side_effects: true,
+        unused: "keep_assign",
     }
     input: {
         function f1(y) {
@@ -415,9 +504,21 @@ collapse_vars_do_while: {
 
 collapse_vars_do_while_drop_assign: {
     options = {
-        collapse_vars:true, sequences:true, properties:true, dead_code:true, conditionals:true,
+        booleans: false,
-        comparisons:true, evaluate:true, booleans:false, loops:false, unused:true, hoist_funs:true,
+        collapse_vars: true,
-        keep_fargs:true, if_return:true, join_vars:true, side_effects:true
+        comparisons: true,
+        conditionals: true,
+        dead_code: true,
+        evaluate: true,
+        hoist_funs: true,
+        if_return: true,
+        join_vars: true,
+        keep_fargs: true,
+        loops: false,
+        properties: true,
+        sequences: true,
+        side_effects: true,
+        unused: true,
     }
     input: {
         function f1(y) {
@@ -490,9 +591,21 @@ collapse_vars_do_while_drop_assign: {
 
 collapse_vars_seq: {
     options = {
-        collapse_vars:true, sequences:true, properties:true, dead_code:true, conditionals:true,
+        booleans: true,
-        comparisons:true, evaluate:true, booleans:true, loops:true, unused:true, hoist_funs:true,
+        collapse_vars: true,
-        keep_fargs:true, if_return:true, join_vars:true, side_effects:true
+        comparisons: true,
+        conditionals: true,
+        dead_code: true,
+        evaluate: true,
+        hoist_funs: true,
+        if_return: true,
+        join_vars: true,
+        keep_fargs: true,
+        loops: true,
+        properties: true,
+        sequences: true,
+        side_effects: true,
+        unused: true,
     }
     input: {
         var f1 = function(x, y) {
@@ -514,9 +627,21 @@ collapse_vars_seq: {
 
 collapse_vars_throw: {
     options = {
-        collapse_vars:true, sequences:true, properties:true, dead_code:true, conditionals:true,
+        booleans: true,
-        comparisons:true, evaluate:true, booleans:true, loops:true, unused:true, hoist_funs:true,
+        collapse_vars: true,
-        keep_fargs:true, if_return:true, join_vars:true, side_effects:true
+        comparisons: true,
+        conditionals: true,
+        dead_code: true,
+        evaluate: true,
+        hoist_funs: true,
+        if_return: true,
+        join_vars: true,
+        keep_fargs: true,
+        loops: true,
+        properties: true,
+        sequences: true,
+        side_effects: true,
+        unused: true,
     }
     input: {
         var f1 = function(x, y) {
@@ -546,9 +671,21 @@ collapse_vars_throw: {
 
 collapse_vars_switch: {
     options = {
-        collapse_vars:true, sequences:true, properties:true, dead_code:true, conditionals:true,
+        booleans: true,
-        comparisons:true, evaluate:true, booleans:true, loops:true, unused:true, hoist_funs:true,
+        collapse_vars: true,
-        keep_fargs:true, if_return:true, join_vars:true, side_effects:true
+        comparisons: true,
+        conditionals: true,
+        dead_code: true,
+        evaluate: true,
+        hoist_funs: true,
+        if_return: true,
+        join_vars: true,
+        keep_fargs: true,
+        loops: true,
+        properties: true,
+        sequences: true,
+        side_effects: true,
+        unused: true,
     }
     input: {
         function f1() {
@@ -586,9 +723,20 @@ collapse_vars_switch: {
 
 collapse_vars_assignment: {
     options = {
-        collapse_vars:true, sequences:true, properties:true, conditionals:true,
+        booleans: true,
-        comparisons:true, evaluate:true, booleans:true, loops:true, unused:true, hoist_funs:true,
+        collapse_vars: true,
-        keep_fargs:true, if_return:true, join_vars:true, side_effects:true
+        comparisons: true,
+        conditionals: true,
+        evaluate: true,
+        hoist_funs: true,
+        if_return: true,
+        join_vars: true,
+        keep_fargs: true,
+        loops: true,
+        properties: true,
+        sequences: true,
+        side_effects: true,
+        unused: true,
     }
     input: {
         function log(x) { return console.log(x), x; }
@@ -659,10 +807,20 @@ collapse_vars_assignment: {
 
 collapse_vars_lvalues: {
     options = {
-        collapse_vars:true, sequences:true, properties:true, conditionals:true,
+        booleans: true,
-        comparisons:true, evaluate:true, booleans:true, loops:true, unused:"keep_assign",
+        collapse_vars: true,
-        hoist_funs:true, keep_fargs:true, if_return:true, join_vars:true,
+        comparisons: true,
-        side_effects:true
+        conditionals: true,
+        evaluate: true,
+        hoist_funs: true,
+        if_return: true,
+        join_vars: true,
+        keep_fargs: true,
+        loops: true,
+        properties: true,
+        sequences: true,
+        side_effects: true,
+        unused: "keep_assign",
     }
     input: {
         function f0(x) { var i = ++x; return x += i; }
@@ -692,9 +850,21 @@ collapse_vars_lvalues: {
 
 collapse_vars_lvalues_drop_assign: {
     options = {
-        collapse_vars:true, sequences:true, properties:true, conditionals:true,
+        booleans: true,
-        comparisons:true, evaluate:true, booleans:true, loops:true, unused:true, hoist_funs:true,
+        collapse_vars: true,
-        keep_fargs:true, if_return:true, join_vars:true, side_effects:true, passes:3
+        comparisons: true,
+        conditionals: true,
+        evaluate: true,
+        hoist_funs: true,
+        if_return: true,
+        join_vars: true,
+        keep_fargs: true,
+        loops: true,
+        passes: 3,
+        properties: true,
+        sequences: true,
+        side_effects: true,
+        unused: true,
     }
     input: {
         function f0(x) { var i = ++x; return x += i; }
@@ -724,10 +894,22 @@ collapse_vars_lvalues_drop_assign: {
 
 collapse_vars_misc1: {
     options = {
-        collapse_vars:true, sequences:true, properties:true, conditionals:true,
+        booleans: true,
-        comparisons:true, evaluate:true, booleans:true, loops:true, unused:true, hoist_funs:true,
+        collapse_vars: true,
-        keep_fargs:true, if_return:true, join_vars:true, side_effects:true,
+        comparisons: true,
-        reduce_funcs: true, reduce_vars:true
+        conditionals: true,
+        evaluate: true,
+        hoist_funs: true,
+        if_return: true,
+        join_vars: true,
+        keep_fargs: true,
+        loops: true,
+        properties: true,
+        reduce_funcs: true,
+        reduce_vars: true,
+        sequences: true,
+        side_effects: true,
+        unused: true,
     }
     input: {
         function f0(o, a, h) {
@@ -771,10 +953,21 @@ collapse_vars_misc1: {
 
 collapse_vars_self_reference: {
     options = {
-        collapse_vars:true, unused:false,
+        booleans: true,
-        sequences:true, properties:true, dead_code:true, conditionals:true,
+        collapse_vars: true,
-        comparisons:true, evaluate:true, booleans:true, loops:true, hoist_funs:true,
+        comparisons: true,
-        keep_fargs:true, if_return:true, join_vars:true, side_effects:true
+        conditionals: true,
+        dead_code: true,
+        evaluate: true,
+        hoist_funs: true,
+        if_return: true,
+        join_vars: true,
+        keep_fargs: true,
+        loops: true,
+        properties: true,
+        sequences: true,
+        side_effects: true,
+        unused: false,
     }
     input: {
         // avoid bug in self-referential declaration.
@@ -802,10 +995,23 @@ collapse_vars_self_reference: {
 
 collapse_vars_repeated: {
     options = {
-        collapse_vars:true, sequences:true, properties:true, dead_code:true, conditionals:true,
+        booleans: true,
-        comparisons:true, evaluate:true, booleans:true, loops:true, unused:true, hoist_funs:true,
+        collapse_vars: true,
-        keep_fargs:true, if_return:true, join_vars:true, side_effects:true,
+        comparisons: true,
-        reduce_funcs: true, reduce_vars:true
+        conditionals: true,
+        dead_code: true,
+        evaluate: true,
+        hoist_funs: true,
+        if_return: true,
+        join_vars: true,
+        keep_fargs: true,
+        loops: true,
+        properties: true,
+        reduce_funcs: true,
+        reduce_vars: true,
+        sequences: true,
+        side_effects: true,
+        unused: true,
     }
     input: {
         function f1() {
@@ -845,10 +1051,23 @@ collapse_vars_repeated: {
 
 collapse_vars_closures: {
     options = {
-        collapse_vars:true, sequences:true, properties:true, dead_code:true, conditionals:true,
+        booleans: true,
-        comparisons:true, evaluate:true, booleans:true, loops:true, unused:true, hoist_funs:true,
+        collapse_vars: true,
-        keep_fargs:true, if_return:true, join_vars:true, side_effects:true,
+        comparisons: true,
-        reduce_funcs: true, reduce_vars:true
+        conditionals: true,
+        dead_code: true,
+        evaluate: true,
+        hoist_funs: true,
+        if_return: true,
+        join_vars: true,
+        keep_fargs: true,
+        loops: true,
+        properties: true,
+        reduce_funcs: true,
+        reduce_vars: true,
+        sequences: true,
+        side_effects: true,
+        unused: true,
     }
     input: {
         function constant_vars_can_be_replaced_in_any_scope() {
@@ -873,9 +1092,21 @@ collapse_vars_closures: {
 
 collapse_vars_unary: {
     options = {
-        collapse_vars:true, sequences:true, properties:true, dead_code:true, conditionals:true,
+        booleans: true,
-        comparisons:true, evaluate:true, booleans:true, loops:true, unused:true, hoist_funs:true,
+        collapse_vars: true,
-        keep_fargs:true, if_return:true, join_vars:true, side_effects:true
+        comparisons: true,
+        conditionals: true,
+        dead_code: true,
+        evaluate: true,
+        hoist_funs: true,
+        if_return: true,
+        join_vars: true,
+        keep_fargs: true,
+        loops: true,
+        properties: true,
+        sequences: true,
+        side_effects: true,
+        unused: true,
     }
     input: {
         function f0(o, p) {
@@ -936,10 +1167,23 @@ collapse_vars_unary: {
 
 collapse_vars_try: {
     options = {
-        collapse_vars:true, sequences:true, properties:true, dead_code:true, conditionals:true,
+        booleans: true,
-        comparisons:true, evaluate:true, booleans:true, loops:true, unused:true, hoist_funs:true,
+        collapse_vars: true,
-        keep_fargs:true, if_return:true, join_vars:true, side_effects:true,
+        comparisons: true,
-        reduce_funcs: true, reduce_vars:true
+        conditionals: true,
+        dead_code: true,
+        evaluate: true,
+        hoist_funs: true,
+        if_return: true,
+        join_vars: true,
+        keep_fargs: true,
+        loops: true,
+        properties: true,
+        reduce_funcs: true,
+        reduce_vars: true,
+        sequences: true,
+        side_effects: true,
+        unused: true,
     }
     input: {
         function f1() {
@@ -992,9 +1236,21 @@ collapse_vars_try: {
 
 collapse_vars_array: {
     options = {
-        collapse_vars:true, sequences:true, properties:true, dead_code:true, conditionals:true,
+        booleans: true,
-        comparisons:true, evaluate:true, booleans:true, loops:true, unused:true, hoist_funs:true,
+        collapse_vars: true,
-        keep_fargs:true, if_return:true, join_vars:true, side_effects:true
+        comparisons: true,
+        conditionals: true,
+        dead_code: true,
+        evaluate: true,
+        hoist_funs: true,
+        if_return: true,
+        join_vars: true,
+        keep_fargs: true,
+        loops: true,
+        properties: true,
+        sequences: true,
+        side_effects: true,
+        unused: true,
     }
     input: {
         function f1(x, y) {
@@ -1026,9 +1282,21 @@ collapse_vars_array: {
 
 collapse_vars_object: {
     options = {
-        collapse_vars:true, sequences:true, properties:true, dead_code:true, conditionals:true,
+        booleans: true,
-        comparisons:true, evaluate:true, booleans:true, loops:true, unused:true, hoist_funs:true,
+        collapse_vars: true,
-        keep_fargs:true, if_return:true, join_vars:true, side_effects:true
+        comparisons: true,
+        conditionals: true,
+        dead_code: true,
+        evaluate: true,
+        hoist_funs: true,
+        if_return: true,
+        join_vars: true,
+        keep_fargs: true,
+        loops: true,
+        properties: true,
+        sequences: true,
+        side_effects: true,
+        unused: true,
     }
     input: {
         function f0(x, y) {
@@ -1094,9 +1362,21 @@ collapse_vars_object: {
 
 collapse_vars_eval_and_with: {
     options = {
-        collapse_vars:true, sequences:false, properties:true, dead_code:true, conditionals:true,
+        booleans: true,
-        comparisons:true, evaluate:true, booleans:true, loops:true, unused:true, hoist_funs:true,
+        collapse_vars: true,
-        keep_fargs:true, if_return:true, join_vars:true, side_effects:true
+        comparisons: true,
+        conditionals: true,
+        dead_code: true,
+        evaluate: true,
+        hoist_funs: true,
+        if_return: true,
+        join_vars: true,
+        keep_fargs: true,
+        loops: true,
+        properties: true,
+        sequences: false,
+        side_effects: true,
+        unused: true,
     }
     input: {
         // Don't attempt to collapse vars in presence of eval() or with statement.
@@ -1134,10 +1414,23 @@ collapse_vars_eval_and_with: {
 
 collapse_vars_constants: {
     options = {
-        collapse_vars:true, sequences:true, properties:true, dead_code:true, conditionals:true,
+        booleans: true,
-        comparisons:true, evaluate:true, booleans:true, loops:true, unused:true, hoist_funs:true,
+        collapse_vars: true,
-        keep_fargs:true, if_return:true, join_vars:true, side_effects:true,
+        comparisons: true,
-        reduce_funcs: true, reduce_vars:true
+        conditionals: true,
+        dead_code: true,
+        evaluate: true,
+        hoist_funs: true,
+        if_return: true,
+        join_vars: true,
+        keep_fargs: true,
+        loops: true,
+        properties: true,
+        reduce_funcs: true,
+        reduce_vars: true,
+        sequences: true,
+        side_effects: true,
+        unused: true,
     }
     input: {
         function f1(x) {
@@ -1172,10 +1465,24 @@ collapse_vars_constants: {
 
 collapse_vars_arguments: {
     options = {
-        collapse_vars:true, sequences:true, properties:true, dead_code:true, conditionals:true,
+        booleans: true,
-        comparisons:true, evaluate:true, booleans:true, loops:true, unused:true, hoist_funs:true,
+        collapse_vars: true,
-        keep_fargs:true, if_return:true, join_vars:true, side_effects:true,
+        comparisons: true,
-        toplevel:true, reduce_funcs: true, reduce_vars:true
+        conditionals: true,
+        dead_code: true,
+        evaluate: true,
+        hoist_funs: true,
+        if_return: true,
+        join_vars: true,
+        keep_fargs: true,
+        loops: true,
+        properties: true,
+        reduce_funcs: true,
+        reduce_vars: true,
+        sequences: true,
+        side_effects: true,
+        toplevel: true,
+        unused: true,
     }
     input: {
         var outer = function() {
@@ -1195,9 +1502,21 @@ collapse_vars_arguments: {
 
 collapse_vars_short_circuit: {
     options = {
-        collapse_vars:true, sequences:true, properties:true, dead_code:true, conditionals:true,
+        booleans: true,
-        comparisons:true, evaluate:true, booleans:true, loops:true, unused:true, hoist_funs:true,
+        collapse_vars: true,
-        keep_fargs:true, if_return:true, join_vars:true, side_effects:true
+        comparisons: true,
+        conditionals: true,
+        dead_code: true,
+        evaluate: true,
+        hoist_funs: true,
+        if_return: true,
+        join_vars: true,
+        keep_fargs: true,
+        loops: true,
+        properties: true,
+        sequences: true,
+        side_effects: true,
+        unused: true,
     }
     input: {
         function f0(x) { var a = foo(), b = bar(); return b || x; }
@@ -1237,20 +1556,20 @@ collapse_vars_short_circuit: {
 
 collapse_vars_short_circuited_conditions: {
     options = {
-        collapse_vars: true,
-        sequences:     false,
-        dead_code:     true,
-        conditionals:  false,
-        comparisons:   false,
-        evaluate:      true,
         booleans: true,
-        loops:         true,
+        collapse_vars: true,
-        unused:        true,
+        comparisons: false,
+        conditionals: false,
+        dead_code: true,
+        evaluate: true,
         hoist_funs: true,
-        keep_fargs:    true,
         if_return: false,
         join_vars: true,
+        keep_fargs: true,
+        loops: true,
+        sequences: false,
         side_effects: true,
+        unused: true,
     }
     input: {
         function c1(x) { var a = foo(), b = bar(), c = baz(); return a ? b : c; }
@@ -1292,9 +1611,9 @@ collapse_vars_regexp: {
         conditionals: true,
         dead_code: true,
         evaluate: true,
+        hoist_funs: true,
         if_return: true,
         join_vars: true,
-        hoist_funs:    true,
         keep_fargs: true,
         loops: false,
         reduce_funcs: true,
@@ -1692,9 +2011,21 @@ iife_2: {
 
 var_defs: {
     options = {
-        collapse_vars:true, sequences:true, properties:true, dead_code:true, conditionals:true,
+        booleans: true,
-        comparisons:true, evaluate:true, booleans:true, loops:true, unused:true, hoist_funs:true,
+        collapse_vars: true,
-        keep_fargs:true, if_return:true, join_vars:true, side_effects:true
+        comparisons: true,
+        conditionals: true,
+        dead_code: true,
+        evaluate: true,
+        hoist_funs: true,
+        if_return: true,
+        join_vars: true,
+        keep_fargs: true,
+        loops: true,
+        properties: true,
+        sequences: true,
+        side_effects: true,
+        unused: true,
     }
     input: {
         var f1 = function(x, y) {
@@ -2825,8 +3156,8 @@ issue_2364_5: {
     options = {
         collapse_vars: true,
         evaluate: true,
-        pure_getters: true,
         properties: true,
+        pure_getters: true,
         reduce_funcs: true,
         reduce_vars: true,
         unused: true,
@@ -3133,8 +3464,8 @@ issue_2437_1: {
         passes: 2,
         reduce_funcs: true,
         reduce_vars: true,
-        side_effects: true,
         sequences: true,
+        side_effects: true,
         toplevel: true,
         unused: true,
     }
@@ -3183,8 +3514,8 @@ issue_2437_2: {
         passes: 2,
         reduce_funcs: true,
         reduce_vars: true,
-        side_effects: true,
         sequences: true,
+        side_effects: true,
         toplevel: true,
         unused: true,
     }
@@ -3417,8 +3748,8 @@ issue_2436_6: {
         pure_getters: "strict",
         reduce_vars: true,
         toplevel: true,
-        unused: true,
         unsafe: true,
+        unused: true,
     }
     input: {
         var o = {
@@ -4056,6 +4387,36 @@ replace_all_var: {
     expect_stdout: "PASS"
 }
 
+replace_all_var_scope: {
+    rename = true;
+    options = {
+        collapse_vars: true,
+        unused: true,
+    }
+    mangle = {}
+    input: {
+        var a = 100, b = 10;
+        (function(r, a) {
+            switch (~a) {
+            case (b += a):
+            case a++:
+            }
+        })(--b, a);
+        console.log(a, b);
+    }
+    expect: {
+        var a = 100, b = 10;
+        (function(c, o) {
+            switch (~a) {
+            case (b += a):
+            case o++:
+            }
+        })(--b, a);
+        console.log(a, b);
+    }
+    expect_stdout: "100 109"
+}
+
 cascade_statement: {
     options = {
         collapse_vars: true,
@@ -4901,6 +5262,27 @@ collapse_rhs_lhs_2: {
     expect_stdout: "PASS"
 }
 
+collapse_rhs_loop: {
+    options = {
+        collapse_vars: true,
+    }
+    input: {
+        var s;
+        s = "<tpl>PASS</tpl>";
+        for (var m, r = /<tpl>(.*)<\/tpl>/; m = s.match(r);)
+            s = s.replace(m[0], m[1]);
+        console.log(s);
+    }
+    expect: {
+        var s;
+        s = "<tpl>PASS</tpl>";
+        for (var m, r = /<tpl>(.*)<\/tpl>/; m = s.match(r);)
+            s = s.replace(m[0], m[1]);
+        console.log(s);
+    }
+    expect_stdout: "PASS"
+}
+
 collapse_rhs_side_effects: {
     options = {
         collapse_vars: true,

test/compress/comparing.js

@@ -295,3 +295,31 @@ issue_2857_6: {
     }
     expect_stdout: "true"
 }
+
+is_boolean_unsafe: {
+    options = {
+        comparisons: true,
+        unsafe: true,
+    }
+    input: {
+        console.log(/foo/.test("bar") === [].isPrototypeOf({}));
+    }
+    expect: {
+        console.log(/foo/.test("bar") == [].isPrototypeOf({}));
+    }
+    expect_stdout: "true"
+}
+
+is_number_unsafe: {
+    options = {
+        comparisons: true,
+        unsafe: true,
+    }
+    input: {
+        console.log(Math.acos(42) !== "foo".charCodeAt(4));
+    }
+    expect: {
+        console.log(Math.acos(42) != "foo".charCodeAt(4));
+    }
+    expect_stdout: "true"
+}

test/compress/concat-strings.js

@@ -1,7 +1,7 @@
 concat_1: {
     options = {
-        evaluate: true
+        evaluate: true,
-    };
+    }
     input: {
         var a = "foo" + "bar" + x() + "moo" + "foo" + y() + "x" + "y" + "z" + q();
         var b = "foo" + 1 + x() + 2 + "boo";
@@ -26,7 +26,7 @@ concat_1: {
 }
 
 concat_2: {
-    options = {};
+    options = {}
     input: {
         console.log(
             1 + (2 + 3),
@@ -55,7 +55,7 @@ concat_2: {
 }
 
 concat_3: {
-    options = {};
+    options = {}
     input: {
         console.log(
             1 + 2 + (3 + 4 + 5),
@@ -84,7 +84,7 @@ concat_3: {
 }
 
 concat_4: {
-    options = {};
+    options = {}
     input: {
         console.log(
             1 + "2" + (3 + 4 + 5),
@@ -113,7 +113,7 @@ concat_4: {
 }
 
 concat_5: {
-    options = {};
+    options = {}
     input: {
         console.log(
             "1" + 2 + (3 + 4 + 5),
@@ -142,7 +142,7 @@ concat_5: {
 }
 
 concat_6: {
-    options = {};
+    options = {}
     input: {
         console.log(
             "1" + "2" + (3 + 4 + 5),

test/compress/conditionals.js

@@ -1,7 +1,7 @@
 ifs_1: {
     options = {
-        conditionals: true
+        conditionals: true,
-    };
+    }
     input: {
         if (foo) bar();
         if (!foo); else bar();
@@ -18,8 +18,8 @@ ifs_1: {
 
 ifs_2: {
     options = {
-        conditionals: true
+        conditionals: true,
-    };
+    }
     input: {
         if (foo) {
             x();
@@ -47,12 +47,12 @@ ifs_2: {
 
 ifs_3_should_warn: {
     options = {
+        booleans: true,
         conditionals: true,
         dead_code: true,
         evaluate: true,
-        booleans     : true,
         side_effects: true,
-    };
+    }
     input: {
         var x, y;
         if (x && !(x + "1") && y) { // 1
@@ -78,8 +78,8 @@ ifs_3_should_warn: {
 
 ifs_4: {
     options = {
-        conditionals: true
+        conditionals: true,
-    };
+    }
     input: {
         if (foo && bar) {
             x(foo)[10].bar.baz = something();
@@ -95,10 +95,10 @@ ifs_4: {
 
 ifs_5: {
     options = {
-        if_return: true,
-        conditionals: true,
         comparisons: true,
-    };
+        conditionals: true,
+        if_return: true,
+    }
     input: {
         function f() {
             if (foo) return;
@@ -132,9 +132,9 @@ ifs_5: {
 
 ifs_6: {
     options = {
+        comparisons: true,
         conditionals: true,
-        comparisons: true
+    }
-    };
     input: {
         var x, y;
         if (!foo && !bar && !baz && !boo) {
@@ -163,8 +163,8 @@ ifs_6: {
 
 cond_1: {
     options = {
-        conditionals: true
+        conditionals: true,
-    };
+    }
     input: {
         function foo(do_something, some_condition) {
             if (some_condition) {
@@ -189,8 +189,8 @@ cond_1: {
 
 cond_2: {
     options = {
-        conditionals: true
+        conditionals: true,
-    };
+    }
     input: {
         function foo(x, FooBar, some_condition) {
             if (some_condition) {
@@ -209,8 +209,8 @@ cond_2: {
 
 cond_3: {
     options = {
-        conditionals: true
+        conditionals: true,
-    };
+    }
     input: {
         var FooBar;
         if (some_condition()) {
@@ -227,8 +227,8 @@ cond_3: {
 
 cond_4: {
     options = {
-        conditionals: true
+        conditionals: true,
-    };
+    }
     input: {
         var do_something;
         if (some_condition()) {
@@ -251,8 +251,8 @@ cond_4: {
 
 cond_5: {
     options = {
-        conditionals: true
+        conditionals: true,
-    };
+    }
     input: {
         if (some_condition()) {
             if (some_other_condition()) {
@@ -281,7 +281,7 @@ cond_7: {
         conditionals: true,
         evaluate: true,
         side_effects: true,
-    };
+    }
     input: {
         var x, y, z, a, b;
         // compress these
@@ -342,8 +342,8 @@ cond_7: {
 cond_7_1: {
     options = {
         conditionals: true,
-        evaluate    : true
+        evaluate: true,
-    };
+    }
     input: {
         var x;
         // access to global should be assumed to have side effects
@@ -361,10 +361,10 @@ cond_7_1: {
 
 cond_8: {
     options = {
+        booleans: false,
         conditionals: true,
         evaluate: true,
-        booleans    : false
+    }
-    };
     input: {
         var a;
         // compress these
@@ -445,10 +445,10 @@ cond_8: {
 
 cond_8b: {
     options = {
+        booleans: true,
         conditionals: true,
         evaluate: true,
-        booleans    : true
+    }
-    };
     input: {
         var a;
         // compress these
@@ -528,10 +528,10 @@ cond_8b: {
 
 cond_8c: {
     options = {
+        booleans: false,
         conditionals: true,
         evaluate: false,
-        booleans    : false
+    }
-    };
     input: {
         var a;
         // compress these
@@ -647,9 +647,21 @@ cond_9: {
 
 ternary_boolean_consequent: {
     options = {
-        collapse_vars:true, sequences:true, properties:true, dead_code:true, conditionals:true,
+        booleans: true,
-        comparisons:true, evaluate:true, booleans:true, loops:true, unused:true, hoist_funs:true,
+        collapse_vars: true,
-        keep_fargs:true, if_return:true, join_vars:true, side_effects:true
+        comparisons: true,
+        conditionals: true,
+        dead_code: true,
+        evaluate: true,
+        hoist_funs: true,
+        if_return: true,
+        join_vars: true,
+        keep_fargs: true,
+        loops: true,
+        properties: true,
+        sequences: true,
+        side_effects: true,
+        unused: true,
     }
     input: {
         function f1() { return a == b ? true : x; }
@@ -675,9 +687,21 @@ ternary_boolean_consequent: {
 
 ternary_boolean_alternative: {
     options = {
-        collapse_vars:true, sequences:true, properties:true, dead_code:true, conditionals:true,
+        booleans: true,
-        comparisons:true, evaluate:true, booleans:true, loops:true, unused:true, hoist_funs:true,
+        collapse_vars: true,
-        keep_fargs:true, if_return:true, join_vars:true, side_effects:true
+        comparisons: true,
+        conditionals: true,
+        dead_code: true,
+        evaluate: true,
+        hoist_funs: true,
+        if_return: true,
+        join_vars: true,
+        keep_fargs: true,
+        loops: true,
+        properties: true,
+        sequences: true,
+        side_effects: true,
+        unused: true,
     }
     input: {
         function f1() { return a == b ? x : true; }
@@ -778,11 +802,11 @@ trivial_boolean_ternary_expressions : {
 
 issue_1154: {
     options = {
+        booleans: true,
         conditionals: true,
         evaluate: true,
-        booleans    : true,
         side_effects: true,
-    };
+    }
     input: {
         function f1(x) { return x ? -1 : -1; }
         function f2(x) { return x ? +2 : +2; }

test/compress/dead-code.js

@@ -1,7 +1,7 @@
 dead_code_1: {
     options = {
-        dead_code: true
+        dead_code: true,
-    };
+    }
     input: {
         function f() {
             a();
@@ -25,8 +25,8 @@ dead_code_1: {
 
 dead_code_2_should_warn: {
     options = {
-        dead_code: true
+        dead_code: true,
-    };
+    }
     input: {
         function f() {
             g();
@@ -64,13 +64,13 @@ dead_code_2_should_warn: {
 
 dead_code_constant_boolean_should_warn_more: {
     options = {
-        dead_code    : true,
-        loops        : true,
         booleans: true,
         conditionals: true,
+        dead_code: true,
         evaluate: true,
+        loops: true,
         side_effects: true,
-    };
+    }
     input: {
         while (!((foo && bar) || (x + "0"))) {
             console.log("unreachable");

test/compress/debugger.js

@@ -1,7 +1,7 @@
 keep_debugger: {
     options = {
-        drop_debugger: false
+        drop_debugger: false,
-    };
+    }
     input: {
         debugger;
     }
@@ -12,8 +12,8 @@ keep_debugger: {
 
 drop_debugger: {
     options = {
-        drop_debugger: true
+        drop_debugger: true,
-    };
+    }
     input: {
         debugger;
         if (foo) debugger;

test/compress/drop-console.js

@@ -1,5 +1,5 @@
 drop_console_1: {
-    options = {};
+    options = {}
     input: {
         console.log('foo');
         console.log.apply(console, arguments);
@@ -11,7 +11,9 @@ drop_console_1: {
 }
 
 drop_console_2: {
-    options = { drop_console: true };
+    options = {
+        drop_console: true,
+    }
     input: {
         console.log('foo');
         console.log.apply(console, arguments);

test/compress/drop-unused.js

@@ -1,5 +1,8 @@
 unused_funarg_1: {
-    options = { unused: true, keep_fargs: false };
+    options = {
+        keep_fargs: false,
+        unused: true,
+    }
     input: {
         function f(a, b, c, d, e) {
             return a + b;
@@ -13,7 +16,10 @@ unused_funarg_1: {
 }
 
 unused_funarg_2: {
-    options = { unused: true, keep_fargs: false };
+    options = {
+        keep_fargs: false,
+        unused: true,
+    }
     input: {
         function f(a, b, c, d, e) {
             return a + c;
@@ -27,7 +33,9 @@ unused_funarg_2: {
 }
 
 unused_nested_function: {
-    options = { unused: true };
+    options = {
+        unused: true,
+    }
     input: {
         function f(x, y) {
             function g() {
@@ -44,7 +52,9 @@ unused_nested_function: {
 }
 
 unused_circular_references_1: {
-    options = { unused: true };
+    options = {
+        unused: true,
+    }
     input: {
         function f(x, y) {
             // circular reference
@@ -65,7 +75,9 @@ unused_circular_references_1: {
 }
 
 unused_circular_references_2: {
-    options = { unused: true };
+    options = {
+        unused: true,
+    }
     input: {
         function f(x, y) {
             var foo = 1, bar = baz, baz = foo + bar, qwe = moo();
@@ -81,7 +93,9 @@ unused_circular_references_2: {
 }
 
 unused_circular_references_3: {
-    options = { unused: true };
+    options = {
+        unused: true,
+    }
     input: {
         function f(x, y) {
             var g = function() { return h() };
@@ -97,7 +111,9 @@ unused_circular_references_3: {
 }
 
 unused_keep_setter_arg: {
-    options = { unused: true };
+    options = {
+        unused: true,
+    }
     input: {
         var x = {
             _foo: null,
@@ -121,7 +137,9 @@ unused_keep_setter_arg: {
 }
 
 unused_var_in_catch: {
-    options = { unused: true };
+    options = {
+        unused: true,
+    }
     input: {
         function foo() {
             try {
@@ -141,7 +159,9 @@ unused_var_in_catch: {
 }
 
 used_var_in_catch: {
-    options = { unused: true };
+    options = {
+        unused: true,
+    }
     input: {
         function foo() {
             try {
@@ -165,7 +185,11 @@ used_var_in_catch: {
 }
 
 keep_fnames: {
-    options = { unused: true, keep_fnames: true, unsafe: true };
+    options = {
+        keep_fnames: true,
+        unsafe: true,
+        unused: true,
+    }
     input: {
         function foo() {
             return function bar(baz) {};
@@ -367,7 +391,7 @@ drop_toplevel_vars_fargs: {
 drop_toplevel_all: {
     options = {
         toplevel: true,
-        unused: true
+        unused: true,
     }
     input: {
         var a, b = 1, c = g;
@@ -418,7 +442,11 @@ drop_toplevel_retain: {
 
 drop_toplevel_retain_array: {
     options = {
-        top_retain: [ "f", "a", "o" ],
+        top_retain: [
+            "f",
+            "a",
+            "o"
+        ],
         unused: true,
     }
     input: {
@@ -476,8 +504,8 @@ drop_toplevel_retain_regex: {
 
 drop_toplevel_all_retain: {
     options = {
-        toplevel: true,
         top_retain: "f,a,o",
+        toplevel: true,
         unused: true,
     }
     input: {
@@ -506,8 +534,8 @@ drop_toplevel_all_retain: {
 
 drop_toplevel_funcs_retain: {
     options = {
-        toplevel: "funcs",
         top_retain: "f,a,o",
+        toplevel: "funcs",
         unused: true,
     }
     input: {
@@ -537,8 +565,8 @@ drop_toplevel_funcs_retain: {
 
 drop_toplevel_vars_retain: {
     options = {
-        toplevel: "vars",
         top_retain: "f,a,o",
+        toplevel: "vars",
         unused: true,
     }
     input: {
@@ -1377,9 +1405,9 @@ issue_2516_1: {
 issue_2516_2: {
     options = {
         collapse_vars: true,
+        passes: 2,
         reduce_funcs: true,
         reduce_vars: true,
-        passes: 2,
         unused: true,
     }
     input: {
@@ -1814,3 +1842,143 @@ issue_2995: {
     }
     expect_stdout: "PASS"
 }
+
+issue_3146_1: {
+    options = {
+        collapse_vars: true,
+        unused: true,
+    }
+    input: {
+        (function(f) {
+            f("g()");
+        })(function(a) {
+            eval(a);
+            function g(b) {
+                if (!b) b = "PASS";
+                console.log(b);
+            }
+        });
+    }
+    expect: {
+        (function(f) {
+            f("g()");
+        })(function(a) {
+            eval(a);
+            function g(b) {
+                if (!b) b = "PASS";
+                console.log(b);
+            }
+        });
+    }
+    expect_stdout: "PASS"
+}
+
+issue_3146_2: {
+    options = {
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        (function(f) {
+            f("g()");
+        })(function(a) {
+            eval(a);
+            function g(b) {
+                if (!b) b = "PASS";
+                console.log(b);
+            }
+        });
+    }
+    expect: {
+        (function(f) {
+            f("g()");
+        })(function(a) {
+            eval(a);
+            function g(b) {
+                if (!b) b = "PASS";
+                console.log(b);
+            }
+        });
+    }
+    expect_stdout: "PASS"
+}
+
+issue_3146_3: {
+    options = {
+        collapse_vars: true,
+        unused: true,
+    }
+    input: {
+        var g = "PASS";
+        (function(f) {
+            var g = "FAIL";
+            f("console.log(g)", g[g]);
+        })(function(a) {
+            eval(a);
+        });
+    }
+    expect: {
+        var g = "PASS";
+        (function(f) {
+            var g = "FAIL";
+            f("console.log(g)", g[g]);
+        })(function(a) {
+            eval(a);
+        });
+    }
+    expect_stdout: "PASS"
+}
+
+issue_3146_4: {
+    options = {
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        var g = "PASS";
+        (function(f) {
+            var g = "FAIL";
+            f("console.log(g)", g[g]);
+        })(function(a) {
+            eval(a);
+        });
+    }
+    expect: {
+        var g = "PASS";
+        (function(f) {
+            var g = "FAIL";
+            f("console.log(g)", g[g]);
+        })(function(a) {
+            eval(a);
+        });
+    }
+    expect_stdout: "PASS"
+}
+
+issue_3192: {
+    options = {
+        unused: true,
+    }
+    input: {
+        (function(a) {
+            console.log(a = "foo", arguments[0]);
+        })("bar");
+        (function(a) {
+            "use strict";
+            console.log(a = "foo", arguments[0]);
+        })("bar");
+    }
+    expect: {
+        (function(a) {
+            console.log(a = "foo", arguments[0]);
+        })("bar");
+        (function(a) {
+            "use strict";
+            console.log("foo", arguments[0]);
+        })("bar");
+    }
+    expect_stdout: [
+        "foo foo",
+        "foo bar",
+    ]
+}

test/compress/evaluate.js

@@ -186,7 +186,9 @@ unary_prefix: {
 }
 
 negative_zero: {
-    options = { evaluate: true }
+    options = {
+        evaluate: true,
+    }
     input: {
         console.log(
             -"",
@@ -207,7 +209,9 @@ negative_zero: {
 }
 
 positive_zero: {
-    options = { evaluate: true }
+    options = {
+        evaluate: true,
+    }
     input: {
         console.log(
             +"",
@@ -230,7 +234,7 @@ positive_zero: {
 unsafe_constant: {
     options = {
         evaluate: true,
-        unsafe    : true
+        unsafe: true,
     }
     input: {
         console.log(
@@ -422,7 +426,7 @@ prop_function: {
 unsafe_integer_key: {
     options = {
         evaluate: true,
-        unsafe    : true
+        unsafe: true,
     }
     input: {
         console.log(
@@ -450,7 +454,7 @@ unsafe_integer_key: {
 unsafe_integer_key_complex: {
     options = {
         evaluate: true,
-        unsafe    : true
+        unsafe: true,
     }
     input: {
         console.log(
@@ -478,7 +482,7 @@ unsafe_integer_key_complex: {
 unsafe_float_key: {
     options = {
         evaluate: true,
-        unsafe    : true
+        unsafe: true,
     }
     input: {
         console.log(
@@ -506,7 +510,7 @@ unsafe_float_key: {
 unsafe_float_key_complex: {
     options = {
         evaluate: true,
-        unsafe    : true
+        unsafe: true,
     }
     input: {
         console.log(
@@ -534,7 +538,7 @@ unsafe_float_key_complex: {
 unsafe_array: {
     options = {
         evaluate: true,
-        unsafe    : true
+        unsafe: true,
     }
     input: {
         console.log(
@@ -570,7 +574,7 @@ unsafe_array: {
 unsafe_string: {
     options = {
         evaluate: true,
-        unsafe    : true
+        unsafe: true,
     }
     input: {
         console.log(
@@ -598,7 +602,7 @@ unsafe_string: {
 unsafe_array_bad_index: {
     options = {
         evaluate: true,
-        unsafe    : true
+        unsafe: true,
     }
     input: {
         console.log(
@@ -620,7 +624,7 @@ unsafe_array_bad_index: {
 unsafe_string_bad_index: {
     options = {
         evaluate: true,
-        unsafe    : true
+        unsafe: true,
     }
     input: {
         console.log(
@@ -755,7 +759,7 @@ in_boolean_context: {
 unsafe_charAt: {
     options = {
         evaluate: true,
-        unsafe    : true
+        unsafe: true,
     }
     input: {
         console.log(
@@ -783,7 +787,7 @@ unsafe_charAt: {
 unsafe_charAt_bad_index: {
     options = {
         evaluate: true,
-        unsafe    : true
+        unsafe: true,
     }
     input: {
         console.log(
@@ -805,7 +809,7 @@ unsafe_charAt_bad_index: {
 unsafe_charAt_noop: {
     options = {
         evaluate: true,
-        unsafe    : true
+        unsafe: true,
     }
     input: {
         console.log(
@@ -1195,7 +1199,7 @@ issue_2231_1: {
     }
     expect_stdout: true
     expect_warnings: [
-        "WARN: Error evaluating Object.keys(void 0) [test/compress/evaluate.js:1191,20]",
+        "WARN: Error evaluating Object.keys(void 0) [test/compress/evaluate.js:1195,20]",
     ]
 }
 
@@ -1212,7 +1216,7 @@ issue_2231_2: {
     }
     expect_stdout: true
     expect_warnings: [
-        "WARN: Error evaluating Object.getOwnPropertyNames(null) [test/compress/evaluate.js:1208,20]",
+        "WARN: Error evaluating Object.getOwnPropertyNames(null) [test/compress/evaluate.js:1212,20]",
     ]
 }
 
@@ -1350,14 +1354,14 @@ issue_2535_3: {
     }
     expect_stdout: true
     expect_warnings: [
-        "WARN: Dropping side-effect-free && [test/compress/evaluate.js:1336,20]",
+        "WARN: Dropping side-effect-free && [test/compress/evaluate.js:1340,20]",
-        "WARN: Dropping side-effect-free && [test/compress/evaluate.js:1337,20]",
+        "WARN: Dropping side-effect-free && [test/compress/evaluate.js:1341,20]",
-        "WARN: Dropping side-effect-free && [test/compress/evaluate.js:1338,20]",
+        "WARN: Dropping side-effect-free && [test/compress/evaluate.js:1342,20]",
-        "WARN: Condition left of && always false [test/compress/evaluate.js:1338,20]",
+        "WARN: Condition left of && always false [test/compress/evaluate.js:1342,20]",
-        "WARN: Dropping side-effect-free || [test/compress/evaluate.js:1339,20]",
+        "WARN: Dropping side-effect-free || [test/compress/evaluate.js:1343,20]",
-        "WARN: Dropping side-effect-free || [test/compress/evaluate.js:1340,20]",
+        "WARN: Dropping side-effect-free || [test/compress/evaluate.js:1344,20]",
-        "WARN: Dropping side-effect-free || [test/compress/evaluate.js:1341,20]",
+        "WARN: Dropping side-effect-free || [test/compress/evaluate.js:1345,20]",
-        "WARN: Condition left of || always true [test/compress/evaluate.js:1341,20]",
+        "WARN: Condition left of || always true [test/compress/evaluate.js:1345,20]",
     ]
 }
 

test/compress/functions.js

@@ -9,20 +9,20 @@ non_ascii_function_identifier_name: {
 
 iifes_returning_constants_keep_fargs_true: {
     options = {
-        keep_fargs    : true,
-        side_effects  : true,
-        evaluate      : true,
-        unused        : true,
-        dead_code     : true,
-        conditionals  : true,
-        comparisons   : true,
         booleans: true,
+        collapse_vars: true,
+        comparisons: true,
+        conditionals: true,
+        dead_code: true,
+        evaluate: true,
         if_return: true,
+        inline: true,
         join_vars: true,
+        keep_fargs: true,
         reduce_funcs: true,
         reduce_vars: true,
-        collapse_vars : true,
+        side_effects: true,
-        inline        : true,
+        unused: true,
     }
     input: {
         (function(){ return -1.23; }());
@@ -46,20 +46,20 @@ iifes_returning_constants_keep_fargs_true: {
 
 iifes_returning_constants_keep_fargs_false: {
     options = {
-        keep_fargs    : false,
-        side_effects  : true,
-        evaluate      : true,
-        unused        : true,
-        dead_code     : true,
-        conditionals  : true,
-        comparisons   : true,
         booleans: true,
+        collapse_vars: true,
+        comparisons: true,
+        conditionals: true,
+        dead_code: true,
+        evaluate: true,
         if_return: true,
+        inline: true,
         join_vars: true,
+        keep_fargs: false,
         reduce_funcs: true,
         reduce_vars: true,
-        collapse_vars : true,
+        side_effects: true,
-        inline        : true,
+        unused: true,
     }
     input: {
         (function(){ return -1.23; }());
@@ -1175,8 +1175,8 @@ issue_2620_3: {
 issue_2620_4: {
     rename = true,
     options = {
-        evaluate: true,
         dead_code: true,
+        evaluate: true,
         inline: true,
         passes: 2,
         reduce_vars: true,
@@ -2025,6 +2025,7 @@ deduplicate_parenthesis: {
 
 drop_lone_use_strict: {
     options = {
+        directives: true,
         side_effects: true,
     }
     input: {
@@ -2052,6 +2053,27 @@ drop_lone_use_strict: {
     }
 }
 
+issue_3166: {
+    options = {
+        directives: true,
+    }
+    input: {
+        "foo";
+        "use strict";
+        function f() {
+            "use strict";
+            "bar";
+            "use asm";
+        }
+    }
+    expect: {
+        "use strict";
+        function f() {
+            "use asm";
+        }
+    }
+}
+
 issue_3016_1: {
     options = {
         inline: true,
@@ -2303,3 +2325,19 @@ issue_3076: {
     }
     expect_stdout: "PASS"
 }
+
+issue_3125: {
+    options = {
+        inline: true,
+        unsafe: true,
+    }
+    input: {
+        console.log(function() {
+            return "PASS";
+        }.call());
+    }
+    expect: {
+        console.log("PASS");
+    }
+    expect_stdout: "PASS"
+}

test/compress/global_defs.js

@@ -2,7 +2,7 @@ must_replace: {
     options = {
         global_defs: {
             D: "foo bar",
-        }
+        },
     }
     input: {
         console.log(D);
@@ -141,9 +141,9 @@ mixed: {
         console.log(CONFIG);
     }
     expect_warnings: [
-        'WARN: global_defs CONFIG.VALUE redefined [test/compress/global_defs.js:127,22]',
+        "WARN: global_defs CONFIG.VALUE redefined [test/compress/global_defs.js:127,22]",
-        'WARN: global_defs CONFIG.VALUE redefined [test/compress/global_defs.js:128,22]',
+        "WARN: global_defs CONFIG.VALUE redefined [test/compress/global_defs.js:128,22]",
-        'WARN: global_defs CONFIG.VALUE redefined [test/compress/global_defs.js:130,8]',
+        "WARN: global_defs CONFIG.VALUE redefined [test/compress/global_defs.js:130,8]",
     ]
 }
 

test/compress/hoist_props.js

@@ -1,8 +1,8 @@
 issue_2377_1: {
     options = {
         evaluate: true,
-        inline: true,
         hoist_props: true,
+        inline: true,
         reduce_funcs: true,
         reduce_vars: true,
         toplevel: true,
@@ -33,8 +33,8 @@ issue_2377_1: {
 issue_2377_2: {
     options = {
         evaluate: true,
-        inline: true,
         hoist_props: true,
+        inline: true,
         passes: 2,
         reduce_funcs: true,
         reduce_vars: true,
@@ -64,8 +64,8 @@ issue_2377_2: {
 issue_2377_3: {
     options = {
         evaluate: true,
-        inline: true,
         hoist_props: true,
+        inline: true,
         passes: 4,
         reduce_funcs: true,
         reduce_vars: true,
@@ -416,7 +416,10 @@ issue_2473_1: {
     options = {
         hoist_props: false,
         reduce_vars: true,
-        top_retain: [ "x", "y" ],
+        top_retain: [
+            "x",
+            "y"
+        ],
         toplevel: true,
         unused: true,
     }
@@ -435,7 +438,10 @@ issue_2473_2: {
     options = {
         hoist_props: true,
         reduce_vars: true,
-        top_retain: [ "x", "y" ],
+        top_retain: [
+            "x",
+            "y"
+        ],
         toplevel: true,
         unused: true,
     }
@@ -746,9 +752,9 @@ issue_3046: {
 issue_3071_1: {
     options = {
         evaluate: true,
+        hoist_props: true,
         inline: true,
         join_vars: true,
-        hoist_props: true,
         passes: 3,
         reduce_vars: true,
         sequences: true,
@@ -773,9 +779,9 @@ issue_3071_1: {
 issue_3071_2: {
     options = {
         evaluate: true,
+        hoist_props: true,
         inline: true,
         join_vars: true,
-        hoist_props: true,
         passes: 3,
         reduce_vars: true,
         sequences: true,
@@ -800,9 +806,9 @@ issue_3071_2: {
 issue_3071_2_toplevel: {
     options = {
         evaluate: true,
+        hoist_props: true,
         inline: true,
         join_vars: true,
-        hoist_props: true,
         passes: 3,
         reduce_vars: true,
         sequences: true,

test/compress/ie8.js

@@ -187,9 +187,9 @@ dont_screw_try_catch_undefined: {
 reduce_vars: {
     options = {
         evaluate: true,
+        ie8: true,
         reduce_funcs: true,
         reduce_vars: true,
-        ie8: true,
         unused: true,
     }
     mangle = {
@@ -420,8 +420,8 @@ issue_24_2: {
         })();
     }
     expect: {
-        (function(n) {
+        (function(o) {
-            console.log(typeof function o(){} === typeof n ? "FAIL" : "PASS");
+            console.log(typeof function n(){} === typeof o ? "FAIL" : "PASS");
         })();
     }
     expect_stdout: "PASS"
@@ -457,9 +457,29 @@ issue_2976_2: {
         }());
     }
     expect: {
-        console.log(function n() {
+        console.log(function f() {
-            var o;
+            var n;
-            return o === n ? "FAIL" : "PASS";
+            return n === f ? "FAIL" : "PASS";
+        }());
+    }
+    expect_stdout: "PASS"
+}
+
+issue_2976_3: {
+    mangle = {
+        ie8: true,
+        toplevel: true,
+    }
+    input: {
+        console.log(function f() {
+            var a;
+            return a === f ? "FAIL" : "PASS";
+        }());
+    }
+    expect: {
+        console.log(function o() {
+            var n;
+            return n === o ? "FAIL" : "PASS";
         }());
     }
     expect_stdout: "PASS"
@@ -538,3 +558,156 @@ issue_3035_ie8: {
     }
     expect_stdout: "PASS"
 }
+
+issue_3197_1: {
+    options = {
+        ie8: false,
+        inline: true,
+        reduce_vars: true,
+        side_effects: true,
+        unused: true,
+    }
+    mangle = {
+        ie8: false,
+    }
+    input: {
+        var window = {};
+        !function() {
+            function Foo() {
+                console.log(this instanceof Foo);
+            }
+            window.Foo = Foo;
+        }();
+        new window.Foo();
+    }
+    expect: {
+        var window = {};
+        window.Foo = function o() {
+            console.log(this instanceof o);
+        };
+        new window.Foo();
+    }
+    expect_stdout: "true"
+}
+
+issue_3197_1_ie8: {
+    options = {
+        ie8: true,
+        inline: true,
+        reduce_vars: true,
+        side_effects: true,
+        unused: true,
+    }
+    mangle = {
+        ie8: true,
+    }
+    input: {
+        var window = {};
+        !function() {
+            function Foo() {
+                console.log(this instanceof Foo);
+            }
+            window.Foo = Foo;
+        }();
+        new window.Foo();
+    }
+    expect: {
+        var window = {};
+        window.Foo = function Foo() {
+            console.log(this instanceof Foo);
+        };
+        new window.Foo();
+    }
+    expect_stdout: "true"
+}
+
+issue_3197_2: {
+    mangle = {
+        ie8: false,
+    }
+    input: {
+        (function(a) {
+            var f = function f() {
+                console.log(this instanceof f);
+            };
+            new f(a);
+        })();
+    }
+    expect: {
+        (function(n) {
+            var o = function n() {
+                console.log(this instanceof n);
+            };
+            new o(n);
+        })();
+    }
+    expect_stdout: "true"
+}
+
+issue_3197_2_ie8: {
+    mangle = {
+        ie8: true,
+    }
+    input: {
+        (function(a) {
+            var f = function f() {
+                console.log(this instanceof f);
+            };
+            new f(a);
+        })();
+    }
+    expect: {
+        (function(n) {
+            var o = function o() {
+                console.log(this instanceof o);
+            };
+            new o(n);
+        })();
+    }
+    expect_stdout: "true"
+}
+
+issue_3206_1: {
+    options = {
+        evaluate: true,
+        ie8: false,
+        reduce_vars: true,
+        typeofs: true,
+        unused: true,
+    }
+    input: {
+        console.log(function() {
+            var foo = function bar() {};
+            return "function" == typeof bar;
+        }());
+    }
+    expect: {
+        console.log(function() {
+            return "function" == typeof bar;
+        }());
+    }
+    expect_stdout: "false"
+}
+
+issue_3206_2: {
+    options = {
+        evaluate: true,
+        ie8: true,
+        reduce_vars: true,
+        typeofs: true,
+        unused: true,
+    }
+    input: {
+        console.log(function() {
+            var foo = function bar() {};
+            return "function" == typeof bar;
+        }());
+    }
+    expect: {
+        console.log(function() {
+            (function bar() {});
+            return "function" == typeof bar;
+        }());
+    }
+    expect_stdout: "false"
+}

test/compress/if_return.js

@@ -1,14 +1,14 @@
 if_return_1: {
     options = {
+        booleans: true,
+        comparisons: true,
+        conditionals: true,
+        dead_code: true,
+        evaluate: true,
         if_return: true,
         sequences: true,
-        conditionals : true,
-        comparisons  : true,
-        evaluate     : true,
-        booleans     : true,
-        unused       : true,
         side_effects: true,
-        dead_code    : true,
+        unused: true,
     }
     input: {
         function f(x) {
@@ -24,15 +24,15 @@ if_return_1: {
 
 if_return_2: {
     options = {
+        booleans: true,
+        comparisons: true,
+        conditionals: true,
+        dead_code: true,
+        evaluate: true,
         if_return: true,
         sequences: true,
-        conditionals : true,
-        comparisons  : true,
-        evaluate     : true,
-        booleans     : true,
-        unused       : true,
         side_effects: true,
-        dead_code    : true,
+        unused: true,
     }
     input: {
         function f(x, y) {
@@ -49,15 +49,15 @@ if_return_2: {
 
 if_return_3: {
     options = {
+        booleans: true,
+        comparisons: true,
+        conditionals: true,
+        dead_code: true,
+        evaluate: true,
         if_return: true,
         sequences: true,
-        conditionals : true,
-        comparisons  : true,
-        evaluate     : true,
-        booleans     : true,
-        unused       : true,
         side_effects: true,
-        dead_code    : true,
+        unused: true,
     }
     input: {
         function f(x) {
@@ -75,15 +75,15 @@ if_return_3: {
 
 if_return_4: {
     options = {
+        booleans: true,
+        comparisons: true,
+        conditionals: true,
+        dead_code: true,
+        evaluate: true,
         if_return: true,
         sequences: true,
-        conditionals : true,
-        comparisons  : true,
-        evaluate     : true,
-        booleans     : true,
-        unused       : true,
         side_effects: true,
-        dead_code    : true,
+        unused: true,
     }
     input: {
         function f(x, y) {
@@ -100,15 +100,15 @@ if_return_4: {
 
 if_return_5: {
     options = {
+        booleans: true,
+        comparisons: true,
+        conditionals: true,
+        dead_code: true,
+        evaluate: true,
         if_return: true,
         sequences: true,
-        conditionals : true,
-        comparisons  : true,
-        evaluate     : true,
-        booleans     : true,
-        unused       : true,
         side_effects: true,
-        dead_code    : true,
+        unused: true,
     }
     input: {
         function f() {
@@ -126,15 +126,15 @@ if_return_5: {
 
 if_return_6: {
     options = {
+        booleans: true,
+        comparisons: true,
+        conditionals: true,
+        dead_code: true,
+        evaluate: true,
         if_return: true,
         sequences: true,
-        conditionals : true,
-        comparisons  : true,
-        evaluate     : true,
-        booleans     : true,
-        unused       : true,
         side_effects: true,
-        dead_code    : true,
+        unused: true,
     }
     input: {
         function f(x) {
@@ -150,15 +150,15 @@ if_return_6: {
 
 if_return_7: {
     options = {
+        booleans: true,
+        comparisons: true,
+        conditionals: true,
+        dead_code: true,
+        evaluate: true,
         if_return: true,
         sequences: true,
-        conditionals : true,
-        comparisons  : true,
-        evaluate     : true,
-        booleans     : true,
-        unused       : true,
         side_effects: true,
-        dead_code    : true,
+        unused: true,
     }
     input: {
         function f(x) {
@@ -176,9 +176,9 @@ if_return_7: {
 
 if_return_8: {
     options = {
+        conditionals: true,
         if_return: true,
         sequences: true,
-        conditionals:  true,
         side_effects: true,
     }
     input: {
@@ -220,15 +220,15 @@ if_return_8: {
 
 issue_1089: {
     options = {
+        booleans: true,
+        comparisons: true,
+        conditionals: true,
+        dead_code: true,
+        evaluate: true,
         if_return: true,
         sequences: true,
-        conditionals : true,
-        comparisons  : true,
-        evaluate     : true,
-        booleans     : true,
-        unused       : true,
         side_effects: true,
-        dead_code    : true,
+        unused: true,
     }
     input: {
         function x() {
@@ -251,9 +251,9 @@ issue_1089: {
 
 issue_1437: {
     options = {
+        conditionals: false,
         if_return: true,
         sequences: true,
-        conditionals : false
     }
     input: {
         function x() {
@@ -283,7 +283,7 @@ issue_1437_conditionals: {
     options = {
         conditionals: true,
         if_return: true,
-        sequences    : true
+        sequences: true,
     }
     input: {
         function x() {

test/compress/issue-1034.js

@@ -1,8 +1,17 @@
 non_hoisted_function_after_return: {
     options = {
-        hoist_funs: false, dead_code: true, conditionals: true, comparisons: true,
+        booleans: true,
-        evaluate: true, booleans: true, loops: true, unused: true, keep_fargs: true,
+        comparisons: true,
-        if_return: true, join_vars: true, side_effects: true
+        conditionals: true,
+        dead_code: true,
+        evaluate: true,
+        hoist_funs: false,
+        if_return: true,
+        join_vars: true,
+        keep_fargs: true,
+        loops: true,
+        side_effects: true,
+        unused: true,
     }
     input: {
         function foo(x) {
@@ -27,19 +36,30 @@ non_hoisted_function_after_return: {
         }
     }
     expect_warnings: [
-        'WARN: Dropping unreachable code [test/compress/issue-1034.js:11,16]',
+        "WARN: Dropping unreachable code [test/compress/issue-1034.js:20,16]",
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:14,16]",
+        "WARN: Dropping unreachable code [test/compress/issue-1034.js:23,16]",
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:17,12]",
+        "WARN: Dropping unreachable code [test/compress/issue-1034.js:26,12]",
-        "WARN: Dropping unused function UnusedFunction [test/compress/issue-1034.js:18,21]"
+        "WARN: Dropping unused function UnusedFunction [test/compress/issue-1034.js:27,21]"
     ]
 }
 
 non_hoisted_function_after_return_2a: {
     options = {
-        hoist_funs: false, dead_code: true, conditionals: true, comparisons: true,
+        booleans: true,
-        evaluate: true, booleans: true, loops: true, unused: true, keep_fargs: true,
+        collapse_vars: false,
-        if_return: true, join_vars: true, side_effects: true,
+        comparisons: true,
-        collapse_vars: false, passes: 2, warnings: "verbose"
+        conditionals: true,
+        dead_code: true,
+        evaluate: true,
+        hoist_funs: false,
+        if_return: true,
+        join_vars: true,
+        keep_fargs: true,
+        loops: true,
+        passes: 2,
+        side_effects: true,
+        unused: true,
+        warnings: "verbose",
     }
     input: {
         function foo(x) {
@@ -65,28 +85,37 @@ non_hoisted_function_after_return_2a: {
         }
     }
     expect_warnings: [
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:48,16]",
+        "WARN: Dropping unreachable code [test/compress/issue-1034.js:68,16]",
-        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:48,16]",
+        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:68,16]",
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:51,16]",
+        "WARN: Dropping unreachable code [test/compress/issue-1034.js:71,16]",
-        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:51,16]",
+        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:71,16]",
-        "WARN: Dropping unused variable a [test/compress/issue-1034.js:48,20]",
+        "WARN: Dropping unused variable a [test/compress/issue-1034.js:68,20]",
-        "WARN: Dropping unused function nope [test/compress/issue-1034.js:55,21]",
+        "WARN: Dropping unused function nope [test/compress/issue-1034.js:75,21]",
         "WARN: pass 0: last_count: Infinity, count: 37",
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:53,12]",
+        "WARN: Dropping unreachable code [test/compress/issue-1034.js:73,12]",
-        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:53,12]",
+        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:73,12]",
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:56,12]",
+        "WARN: Dropping unreachable code [test/compress/issue-1034.js:76,12]",
-        "WARN: Dropping unused variable b [test/compress/issue-1034.js:51,20]",
+        "WARN: Dropping unused variable b [test/compress/issue-1034.js:71,20]",
-        "WARN: Dropping unused variable c [test/compress/issue-1034.js:53,16]",
+        "WARN: Dropping unused variable c [test/compress/issue-1034.js:73,16]",
         "WARN: pass 1: last_count: 37, count: 18",
     ]
 }
 
 non_hoisted_function_after_return_2b: {
     options = {
-        hoist_funs: false, dead_code: true, conditionals: true, comparisons: true,
+        booleans: true,
-        evaluate: true, booleans: true, loops: true, unused: true, keep_fargs: true,
+        collapse_vars: false,
-        if_return: true, join_vars: true, side_effects: true,
+        comparisons: true,
-        collapse_vars: false
+        conditionals: true,
+        dead_code: true,
+        evaluate: true,
+        hoist_funs: false,
+        if_return: true,
+        join_vars: true,
+        keep_fargs: true,
+        loops: true,
+        side_effects: true,
+        unused: true,
     }
     input: {
         function foo(x) {
@@ -111,19 +140,28 @@ non_hoisted_function_after_return_2b: {
     }
     expect_warnings: [
         // duplicate warnings no longer emitted
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:97,16]",
+        "WARN: Dropping unreachable code [test/compress/issue-1034.js:126,16]",
-        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:97,16]",
+        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:126,16]",
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:99,12]",
+        "WARN: Dropping unreachable code [test/compress/issue-1034.js:128,12]",
-        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:99,12]",
+        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:128,12]",
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:103,12]",
+        "WARN: Dropping unreachable code [test/compress/issue-1034.js:132,12]",
     ]
 }
 
 non_hoisted_function_after_return_strict: {
     options = {
-        hoist_funs: false, dead_code: true, conditionals: true, comparisons: true,
+        booleans: true,
-        evaluate: true, booleans: true, loops: true, unused: true, keep_fargs: true,
+        comparisons: true,
-        if_return: true, join_vars: true, side_effects: true
+        conditionals: true,
+        dead_code: true,
+        evaluate: true,
+        hoist_funs: false,
+        if_return: true,
+        join_vars: true,
+        keep_fargs: true,
+        loops: true,
+        side_effects: true,
+        unused: true,
     }
     input: {
         "use strict";
@@ -153,19 +191,30 @@ non_hoisted_function_after_return_strict: {
     }
     expect_stdout: "8 7"
     expect_warnings: [
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:133,16]",
+        "WARN: Dropping unreachable code [test/compress/issue-1034.js:171,16]",
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:136,16]",
+        "WARN: Dropping unreachable code [test/compress/issue-1034.js:174,16]",
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:139,12]",
+        "WARN: Dropping unreachable code [test/compress/issue-1034.js:177,12]",
-        "WARN: Dropping unused function UnusedFunction [test/compress/issue-1034.js:140,21]",
+        "WARN: Dropping unused function UnusedFunction [test/compress/issue-1034.js:178,21]",
     ]
 }
 
 non_hoisted_function_after_return_2a_strict: {
     options = {
-        hoist_funs: false, dead_code: true, conditionals: true, comparisons: true,
+        booleans: true,
-        evaluate: true, booleans: true, loops: true, unused: true, keep_fargs: true,
+        collapse_vars: false,
-        if_return: true, join_vars: true, side_effects: true,
+        comparisons: true,
-        collapse_vars: false, passes: 2, warnings: "verbose"
+        conditionals: true,
+        dead_code: true,
+        evaluate: true,
+        hoist_funs: false,
+        if_return: true,
+        join_vars: true,
+        keep_fargs: true,
+        loops: true,
+        passes: 2,
+        side_effects: true,
+        unused: true,
+        warnings: "verbose",
     }
     input: {
         "use strict";
@@ -196,28 +245,37 @@ non_hoisted_function_after_return_2a_strict: {
     }
     expect_stdout: "5 6"
     expect_warnings: [
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:175,16]",
+        "WARN: Dropping unreachable code [test/compress/issue-1034.js:224,16]",
-        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:175,16]",
+        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:224,16]",
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:178,16]",
+        "WARN: Dropping unreachable code [test/compress/issue-1034.js:227,16]",
-        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:178,16]",
+        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:227,16]",
-        "WARN: Dropping unused variable a [test/compress/issue-1034.js:175,20]",
+        "WARN: Dropping unused variable a [test/compress/issue-1034.js:224,20]",
-        "WARN: Dropping unused function nope [test/compress/issue-1034.js:182,21]",
+        "WARN: Dropping unused function nope [test/compress/issue-1034.js:231,21]",
         "WARN: pass 0: last_count: Infinity, count: 48",
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:180,12]",
+        "WARN: Dropping unreachable code [test/compress/issue-1034.js:229,12]",
-        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:180,12]",
+        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:229,12]",
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:183,12]",
+        "WARN: Dropping unreachable code [test/compress/issue-1034.js:232,12]",
-        "WARN: Dropping unused variable b [test/compress/issue-1034.js:178,20]",
+        "WARN: Dropping unused variable b [test/compress/issue-1034.js:227,20]",
-        "WARN: Dropping unused variable c [test/compress/issue-1034.js:180,16]",
+        "WARN: Dropping unused variable c [test/compress/issue-1034.js:229,16]",
         "WARN: pass 1: last_count: 48, count: 29",
     ]
 }
 
 non_hoisted_function_after_return_2b_strict: {
     options = {
-        hoist_funs: false, dead_code: true, conditionals: true, comparisons: true,
+        booleans: true,
-        evaluate: true, booleans: true, loops: true, unused: true, keep_fargs: true,
+        collapse_vars: false,
-        if_return: true, join_vars: true, side_effects: true,
+        comparisons: true,
-        collapse_vars: false
+        conditionals: true,
+        dead_code: true,
+        evaluate: true,
+        hoist_funs: false,
+        if_return: true,
+        join_vars: true,
+        keep_fargs: true,
+        loops: true,
+        side_effects: true,
+        unused: true,
     }
     input: {
         "use strict";
@@ -247,10 +305,10 @@ non_hoisted_function_after_return_2b_strict: {
     expect_stdout: "5 6"
     expect_warnings: [
         // duplicate warnings no longer emitted
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:229,16]",
+        "WARN: Dropping unreachable code [test/compress/issue-1034.js:287,16]",
-        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:229,16]",
+        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:287,16]",
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:231,12]",
+        "WARN: Dropping unreachable code [test/compress/issue-1034.js:289,12]",
-        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:231,12]",
+        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:289,12]",
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:235,12]",
+        "WARN: Dropping unreachable code [test/compress/issue-1034.js:293,12]",
     ]
 }

test/compress/issue-1041.js

@@ -3,7 +3,7 @@ const_pragma: {
         evaluate: true,
         reduce_funcs: true,
         reduce_vars: true,
-    };
+    }
 
     input: {
         /** @const */ var goog = goog || {};
@@ -19,7 +19,7 @@ not_const: {
         evaluate: true,
         reduce_funcs: true,
         reduce_vars: true,
-    };
+    }
 
     input: {
         var goog = goog || {};

test/compress/issue-1105.js

@@ -1,6 +1,6 @@
 with_in_global_scope: {
     options = {
-        unused: true
+        unused: true,
     }
     input: {
         var o = 42;
@@ -18,7 +18,7 @@ with_in_global_scope: {
 }
 with_in_function_scope: {
     options = {
-        unused: true
+        unused: true,
     }
     input: {
         function foo() {
@@ -40,7 +40,7 @@ with_in_function_scope: {
 }
 compress_with_with_in_other_scope: {
     options = {
-        unused: true
+        unused: true,
     }
     input: {
         function foo() {
@@ -69,7 +69,7 @@ compress_with_with_in_other_scope: {
 }
 with_using_existing_variable_outside_scope: {
     options = {
-        unused: true
+        unused: true,
     }
     input: {
         function f() {
@@ -99,7 +99,7 @@ with_using_existing_variable_outside_scope: {
 }
 check_drop_unused_in_peer_function: {
     options = {
-        unused: true
+        unused: true,
     }
     input: {
         function outer() {
@@ -148,7 +148,7 @@ check_drop_unused_in_peer_function: {
 
 Infinity_not_in_with_scope: {
     options = {
-        unused: true
+        unused: true,
     }
     input: {
         var o = { Infinity: 'oInfinity' };
@@ -164,7 +164,7 @@ Infinity_not_in_with_scope: {
 
 Infinity_in_with_scope: {
     options = {
-        unused: true
+        unused: true,
     }
     input: {
         var o = { Infinity: 'oInfinity' };
@@ -180,19 +180,19 @@ Infinity_in_with_scope: {
 
 assorted_Infinity_NaN_undefined_in_with_scope: {
     options = {
-        unused:        true,
-        evaluate:      true,
-        dead_code:     true,
-        conditionals:  true,
-        comparisons:   true,
         booleans: true,
+        comparisons: true,
+        conditionals: true,
+        dead_code: true,
+        evaluate: true,
         hoist_funs: true,
-        keep_fargs:    true,
         if_return: true,
         join_vars: true,
-        side_effects:  true,
+        keep_fargs: true,
-        sequences:     false,
         keep_infinity: false,
+        sequences: false,
+        side_effects: true,
+        unused: true,
     }
     input: {
         var f = console.log;
@@ -242,19 +242,19 @@ assorted_Infinity_NaN_undefined_in_with_scope: {
 
 assorted_Infinity_NaN_undefined_in_with_scope_keep_infinity: {
     options = {
-        unused:        true,
-        evaluate:      true,
-        dead_code:     true,
-        conditionals:  true,
-        comparisons:   true,
         booleans: true,
+        comparisons: true,
+        conditionals: true,
+        dead_code: true,
+        evaluate: true,
         hoist_funs: true,
-        keep_fargs:    true,
         if_return: true,
         join_vars: true,
-        side_effects:  true,
+        keep_fargs: true,
-        sequences:     false,
         keep_infinity: true,
+        sequences: false,
+        side_effects: true,
+        unused: true,
     }
     input: {
         var f = console.log;

test/compress/issue-12.js

@@ -1,11 +1,15 @@
 keep_name_of_getter: {
-    options = { unused: true };
+    options = {
+        unused: true,
+    }
     input: { a = { get foo () {} } }
     expect: { a = { get foo () {} } }
 }
 
 keep_name_of_setter: {
-    options = { unused: true };
+    options = {
+        unused: true,
+    }
     input: { a = { set foo () {} } }
     expect: { a = { set foo () {} } }
 }

test/compress/issue-1202.js

@@ -1,7 +1,7 @@
 mangle_keep_fnames_false: {
     options = {
-        keep_fnames : true,
         keep_fargs: true,
+        keep_fnames: true,
     }
     mangle = {
         keep_fnames : false,
@@ -26,8 +26,8 @@ mangle_keep_fnames_false: {
 
 mangle_keep_fnames_true: {
     options = {
-        keep_fnames : true,
         keep_fargs: true,
+        keep_fnames: true,
     }
     mangle = {
         keep_fnames : true,

test/compress/issue-1261.js

@@ -1,14 +1,14 @@
 pure_function_calls: {
     options = {
-        evaluate     : true,
-        conditionals : true,
-        comparisons  : true,
-        side_effects : true,
         booleans: true,
-        unused       : true,
+        comparisons: true,
+        conditionals: true,
+        evaluate: true,
         if_return: true,
         join_vars: true,
         negate_iife: true,
+        side_effects: true,
+        unused: true,
     }
     input: {
         // pure top-level IIFE will be dropped
@@ -60,16 +60,16 @@ pure_function_calls: {
 
 pure_function_calls_toplevel: {
     options = {
-        evaluate     : true,
-        conditionals : true,
-        comparisons  : true,
-        side_effects : true,
         booleans: true,
-        unused       : true,
+        comparisons: true,
+        conditionals: true,
+        evaluate: true,
         if_return: true,
         join_vars: true,
         negate_iife: true,
+        side_effects: true,
         toplevel: true,
+        unused: true,
     }
     input: {
         // pure top-level IIFE will be dropped

test/compress/issue-1275.js

@@ -1,16 +1,16 @@
 string_plus_optimization: {
     options = {
-        side_effects  : true,
-        evaluate      : true,
-        conditionals  : true,
-        comparisons   : true,
-        dead_code     : true,
         booleans: true,
-        unused        : true,
+        comparisons: true,
+        conditionals: true,
+        dead_code: true,
+        evaluate: true,
+        hoist_funs: true,
         if_return: true,
         join_vars: true,
-        hoist_funs    : true,
+        side_effects: true,
-    };
+        unused: true,
+    }
     input: {
         function foo(anything) {
             function throwing_function() {

test/compress/issue-143.js

@@ -15,7 +15,7 @@
 tranformation_sort_order_equal: {
     options = {
         comparisons: true,
-    };
+    }
 
     input: { (a = parseInt('100')) == a }
     expect: { (a = parseInt('100')) == a }
@@ -24,7 +24,7 @@ tranformation_sort_order_equal: {
 tranformation_sort_order_unequal: {
     options = {
         comparisons: true,
-    };
+    }
 
     input: { (a = parseInt('100')) != a }
     expect: { (a = parseInt('100')) != a }
@@ -33,7 +33,7 @@ tranformation_sort_order_unequal: {
 tranformation_sort_order_lesser_or_equal: {
     options = {
         comparisons: true,
-    };
+    }
 
     input: { (a = parseInt('100')) <= a }
     expect: { (a = parseInt('100')) <= a }
@@ -41,7 +41,7 @@ tranformation_sort_order_lesser_or_equal: {
 tranformation_sort_order_greater_or_equal: {
     options = {
         comparisons: true,
-    };
+    }
 
     input: { (a = parseInt('100')) >= a }
     expect: { (a = parseInt('100')) >= a }

test/compress/issue-1431.js

@@ -1,6 +1,6 @@
 level_zero: {
     options = {
-        keep_fnames: true
+        keep_fnames: true,
     }
     mangle = {
         keep_fnames: true
@@ -29,7 +29,7 @@ level_zero: {
 
 level_one: {
     options = {
-        keep_fnames: true
+        keep_fnames: true,
     }
     mangle = {
         keep_fnames: true
@@ -58,7 +58,7 @@ level_one: {
 
 level_two: {
     options = {
-        keep_fnames: true
+        keep_fnames: true,
     }
     mangle = {
         keep_fnames: true
@@ -97,7 +97,7 @@ level_two: {
 
 level_three: {
     options = {
-        keep_fnames: true
+        keep_fnames: true,
     }
     mangle = {
         keep_fnames: true

test/compress/issue-1447.js

@@ -22,17 +22,17 @@ else_with_empty_statement: {
 
 conditional_false_stray_else_in_loop: {
     options = {
-        evaluate     : true,
-        comparisons  : true,
         booleans: true,
-        unused       : true,
+        comparisons: true,
+        conditionals: false,
+        dead_code: true,
+        evaluate: true,
+        hoist_vars: true,
+        if_return: true,
+        join_vars: true,
         loops: true,
         side_effects: true,
-        dead_code    : true,
+        unused: true,
-        hoist_vars   : true,
-        join_vars    : true,
-        if_return    : true,
-        conditionals : false,
     }
     input: {
         for (var i = 1; i <= 4; ++i) {

test/compress/issue-1833.js

@@ -125,8 +125,8 @@ label_do: {
 
 label_while: {
     options = {
-        evaluate: true,
         dead_code: true,
+        evaluate: true,
         loops: true,
     }
     input: {

test/compress/issue-208.js

@@ -1,6 +1,8 @@
 do_not_update_lhs: {
     options = {
-        global_defs: { DEBUG: 0 }
+        global_defs: {
+            DEBUG: 0,
+        },
     }
     input: {
         DEBUG++;
@@ -16,7 +18,9 @@ do_not_update_lhs: {
 
 do_update_rhs: {
     options = {
-        global_defs: { DEBUG: 0 }
+        global_defs: {
+            DEBUG: 0,
+        },
     }
     input: {
         MY_DEBUG = DEBUG;
@@ -35,7 +39,7 @@ mixed: {
             DEBUG: 0,
             ENV: 1,
             FOO: 2,
-        }
+        },
     }
     input: {
         var ENV = 3;
@@ -60,11 +64,11 @@ mixed: {
         x = 0;
     }
     expect_warnings: [
-        'WARN: global_defs ENV redefined [test/compress/issue-208.js:41,12]',
+        "WARN: global_defs ENV redefined [test/compress/issue-208.js:45,12]",
-        'WARN: global_defs FOO redefined [test/compress/issue-208.js:42,12]',
+        "WARN: global_defs FOO redefined [test/compress/issue-208.js:46,12]",
-        'WARN: global_defs FOO redefined [test/compress/issue-208.js:44,10]',
+        "WARN: global_defs FOO redefined [test/compress/issue-208.js:48,10]",
-        'WARN: global_defs DEBUG redefined [test/compress/issue-208.js:45,8]',
+        "WARN: global_defs DEBUG redefined [test/compress/issue-208.js:49,8]",
-        'WARN: global_defs DEBUG redefined [test/compress/issue-208.js:46,8]',
+        "WARN: global_defs DEBUG redefined [test/compress/issue-208.js:50,8]",
-        'WARN: global_defs DEBUG redefined [test/compress/issue-208.js:47,8]',
+        "WARN: global_defs DEBUG redefined [test/compress/issue-208.js:51,8]",
     ]
 }

test/compress/issue-22.js

@@ -1,5 +1,7 @@
 return_with_no_value_in_if_body: {
-    options = { conditionals: true };
+    options = {
+        conditionals: true,
+    }
     input: {
         function foo(bar) {
             if (bar) {

test/compress/issue-267.js

@@ -1,5 +1,7 @@
 issue_267: {
-    options = { comparisons: true };
+    options = {
+        comparisons: true,
+    }
     input: {
         x = a % b / b * c * 2;
         x = a % b * 2

test/compress/issue-269.js

@@ -1,5 +1,7 @@
 issue_269_1: {
-	options = {unsafe: true};
+	options = {
+        unsafe: true,
+    }
 	input: {
 		f(
 			String(x),
@@ -20,7 +22,9 @@ issue_269_1: {
 }
 
 issue_269_dangers: {
-	options = {unsafe: true};
+	options = {
+        unsafe: true,
+    }
 	input: {
 		f(
 			String(x, x),
@@ -34,7 +38,9 @@ issue_269_dangers: {
 }
 
 issue_269_in_scope: {
-	options = {unsafe: true};
+	options = {
+        unsafe: true,
+    }
 	input: {
 		var String, Number, Boolean;
 		f(
@@ -50,7 +56,9 @@ issue_269_in_scope: {
 }
 
 strings_concat: {
-	options = {unsafe: true};
+	options = {
+        unsafe: true,
+    }
 	input: {
 		f(
 			String(x + 'str'),
@@ -85,6 +93,6 @@ regexp: {
 		RegExp("should", "fail");
 	}
 	expect_warnings: [
-		'WARN: Error converting RegExp("should","fail") [test/compress/issue-269.js:78,2]',
+		'WARN: Error converting RegExp("should","fail") [test/compress/issue-269.js:86,2]',
 	]
 }

test/compress/issue-281.js

@@ -186,7 +186,7 @@ negate_iife_5_off: {
         inline: true,
         negate_iife: false,
         sequences: true,
-    };
+    }
     input: {
         if ((function(){ return t })()) {
             foo(true);
@@ -245,7 +245,7 @@ negate_iife_issue_1073: {
         reduce_vars: true,
         sequences: true,
         unused: true,
-    };
+    }
     input: {
         new (function(a) {
             return function Foo() {
@@ -273,7 +273,7 @@ issue_1288_side_effects: {
         reduce_vars: true,
         side_effects: true,
         unused: true,
-    };
+    }
     input: {
         if (w) ;
         else {

test/compress/issue-44.js

@@ -1,5 +1,7 @@
 issue_44_valid_ast_1: {
-    options = { unused: true };
+    options = {
+        unused: true,
+    }
     input: {
         function a(b) {
             for (var i = 0, e = b.qoo(); ; i++) {}
@@ -14,7 +16,9 @@ issue_44_valid_ast_1: {
 }
 
 issue_44_valid_ast_2: {
-    options = { unused: true };
+    options = {
+        unused: true,
+    }
     input: {
         function a(b) {
             if (foo) for (var i = 0, e = b.qoo(); ; i++) {}

test/compress/issue-59.js

@@ -1,8 +1,8 @@
 keep_continue: {
     options = {
         dead_code: true,
-        evaluate: true
+        evaluate: true,
-    };
+    }
     input: {
         while (a) {
             if (b) {

test/compress/issue-597.js

@@ -1,5 +1,5 @@
 NaN_and_Infinity_must_have_parens: {
-    options = {};
+    options = {}
     input: {
         Infinity.toString();
         NaN.toString();
@@ -11,7 +11,7 @@ NaN_and_Infinity_must_have_parens: {
 }
 
 NaN_and_Infinity_should_not_be_replaced_when_they_are_redefined: {
-    options = {};
+    options = {}
     input: {
         var Infinity, NaN;
         Infinity.toString();

test/compress/issue-611.js

@@ -1,8 +1,8 @@
 issue_611: {
   options = {
         sequences: true,
-    side_effects: true
+        side_effects: true,
-  };
+    }
   input: {
     define(function() {
       function fn() {}

test/compress/issue-637.js

@@ -1,9 +1,9 @@
 wrongly_optimized: {
     options = {
-        conditionals: true,
         booleans: true,
-        evaluate: true
+        conditionals: true,
-    };
+        evaluate: true,
+    }
     input: {
         function func() {
             foo();

test/compress/issue-640.js

@@ -82,8 +82,8 @@ drop_value: {
 
 wrongly_optimized: {
     options = {
-        conditionals: true,
         booleans: true,
+        conditionals: true,
         evaluate: true,
         expression: true,
     }
@@ -195,7 +195,7 @@ negate_iife_5_off: {
         expression: true,
         negate_iife: false,
         sequences: true,
-    };
+    }
     input: {
         if ((function(){ return t })()) {
             foo(true);
@@ -248,7 +248,9 @@ issue_1254_negate_iife_nested: {
 conditional: {
     options = {
         expression: true,
-        pure_funcs: [ "pure" ],
+        pure_funcs: [
+            "pure"
+        ],
         side_effects: true,
     }
     input: {

test/compress/issue-751.js

@@ -1,7 +1,7 @@
 negate_booleans_1: {
     options = {
-        comparisons: true
+        comparisons: true,
-    };
+    }
     input: {
         var a = !a || !b || !c || !d || !e || !f;
     }
@@ -12,8 +12,8 @@ negate_booleans_1: {
 
 negate_booleans_2: {
     options = {
-        comparisons: true
+        comparisons: true,
-    };
+    }
     input: {
         var match = !x &&       // should not touch this one
             (!z || c) &&

test/compress/issue-782.js

@@ -1,11 +1,31 @@
-remove_redundant_sequence_items: {
+remove_sequence: {
-    options = { side_effects: true };
+    options = {
+        side_effects: true,
+    }
     input: {
         (0, 1, eval)();
         (0, 1, logThis)();
         (0, 1, _decorators.logThis)();
     }
     expect: {
+        eval();
+        logThis();
+        (0, _decorators.logThis)();
+    }
+}
+
+remove_redundant_sequence_items: {
+    options = {
+        side_effects: true,
+    }
+    input: {
+        "use strict";
+        (0, 1, eval)();
+        (0, 1, logThis)();
+        (0, 1, _decorators.logThis)();
+    }
+    expect: {
+        "use strict";
         (0, eval)();
         logThis();
         (0, _decorators.logThis)();
@@ -13,13 +33,17 @@ remove_redundant_sequence_items: {
 }
 
 dont_remove_this_binding_sequence: {
-    options = { side_effects: true };
+    options = {
+        side_effects: true,
+    }
     input: {
+        "use strict";
         (0, eval)();
         (0, logThis)();
         (0, _decorators.logThis)();
     }
     expect: {
+        "use strict";
         (0, eval)();
         logThis();
         (0, _decorators.logThis)();

test/compress/issue-892.js

@@ -2,25 +2,25 @@ dont_mangle_arguments: {
     mangle = {
     };
     options = {
-        sequences     : true,
+        booleans: true,
-        properties    : true,
+        comparisons: true,
+        conditionals: true,
         dead_code: true,
         drop_debugger: true,
-        conditionals  : true,
-        comparisons   : true,
         evaluate: true,
-        booleans      : true,
-        loops         : true,
-        unused        : true,
         hoist_funs: true,
-        keep_fargs    : true,
-        keep_fnames   : false,
         hoist_vars: true,
         if_return: true,
         join_vars: true,
+        keep_fargs: true,
+        keep_fnames: false,
+        loops: true,
+        negate_iife: false,
+        properties: true,
+        sequences: true,
         side_effects: true,
-        negate_iife   : false
+        unused: true,
-    };
+    }
     input: {
         (function(){
             var arguments = arguments, not_arguments = 9;

test/compress/issue-913.js

@@ -1,8 +1,8 @@
 keep_var_for_in: {
     options = {
         hoist_vars: true,
-        unused: true
+        unused: true,
-    };
+    }
     input: {
         (function(obj){
             var foo = 5;

test/compress/issue-973.js

@@ -3,8 +3,9 @@ this_binding_conditionals: {
         conditionals: true,
         evaluate: true,
         side_effects: true,
-    };
+    }
     input: {
+        "use strict";
         (1 && a)();
         (0 || a)();
         (0 || 1 && a)();
@@ -26,6 +27,7 @@ this_binding_conditionals: {
         (1 ? eval : 0)();
     }
     expect: {
+        "use strict";
         a();
         a();
         a();
@@ -53,13 +55,15 @@ this_binding_collapse_vars: {
         collapse_vars: true,
         toplevel: true,
         unused: true,
-    };
+    }
     input: {
+        "use strict";
         var c = a; c();
         var d = a.b; d();
         var e = eval; e();
     }
     expect: {
+        "use strict";
         a();
         (0, a.b)();
         (0, eval)();
@@ -68,32 +72,89 @@ this_binding_collapse_vars: {
 
 this_binding_side_effects: {
     options = {
-        side_effects : true
+        side_effects: true,
-    };
+    }
     input: {
         (function(foo) {
             (0, foo)();
             (0, foo.bar)();
-            (0, eval)('console.log(foo);');
+            (0, eval)("console.log(foo);");
+        }());
+        (function(foo) {
+            "use strict";
+            (0, foo)();
+            (0, foo.bar)();
+            (0, eval)("console.log(foo);");
         }());
         (function(foo) {
             var eval = console;
             (0, foo)();
             (0, foo.bar)();
-            (0, eval)('console.log(foo);');
+            (0, eval)("console.log(foo);");
         }());
     }
     expect: {
         (function(foo) {
             foo();
             (0, foo.bar)();
-            (0, eval)('console.log(foo);');
+            eval("console.log(foo);");
+        }());
+        (function(foo) {
+            "use strict";
+            foo();
+            (0, foo.bar)();
+            (0, eval)("console.log(foo);");
         }());
         (function(foo) {
             var eval = console;
             foo();
             (0, foo.bar)();
-            (0, eval)('console.log(foo);');
+            eval("console.log(foo);");
         }());
     }
 }
+
+this_binding_sequences: {
+    options = {
+        sequences: true,
+        side_effects: true,
+    }
+    input: {
+        console.log(typeof function() {
+            return eval("this");
+        }());
+        console.log(typeof function() {
+            "use strict";
+            return eval("this");
+        }());
+        console.log(typeof function() {
+            return (0, eval)("this");
+        }());
+        console.log(typeof function() {
+            "use strict";
+            return (0, eval)("this");
+        }());
+    }
+    expect: {
+        console.log(typeof function() {
+            return eval("this");
+        }()),
+        console.log(typeof function() {
+            "use strict";
+            return eval("this");
+        }()),
+        console.log(typeof function() {
+            return eval("this");
+        }()),
+        console.log(typeof function() {
+            "use strict";
+            return (0, eval)("this");
+        }());
+    }
+    expect_stdout: [
+        "object",
+        "undefined",
+        "object",
+        "object",
+    ]
+}

test/compress/issue-976.js

@@ -1,9 +1,21 @@
 eval_collapse_vars: {
     options = {
-        collapse_vars:true, sequences:false, properties:true, dead_code:true, conditionals:true,
+        booleans: true,
-        comparisons:true, evaluate:true, booleans:true, loops:true, unused:true, hoist_funs:true,
+        collapse_vars: true,
-        keep_fargs:true, if_return:true, join_vars:true, side_effects:true
+        comparisons: true,
-    };
+        conditionals: true,
+        dead_code: true,
+        evaluate: true,
+        hoist_funs: true,
+        if_return: true,
+        join_vars: true,
+        keep_fargs: true,
+        loops: true,
+        properties: true,
+        sequences: false,
+        side_effects: true,
+        unused: true,
+    }
     input: {
         function f1() {
             var e = 7;
@@ -46,7 +58,10 @@ eval_collapse_vars: {
 }
 
 eval_unused: {
-    options = { unused: true, keep_fargs: false };
+    options = {
+        keep_fargs: false,
+        unused: true,
+    }
     input: {
         function f1(a, eval, c, d, e) {
             return a('c') + eval;

test/compress/issue-979.js

@@ -1,8 +1,19 @@
 issue979_reported: {
     options = {
-        sequences:true, properties:true, dead_code:true, conditionals:true,
+        booleans: true,
-        comparisons:true, evaluate:true, booleans:true, loops:true, unused:true, hoist_funs:true,
+        comparisons: true,
-        keep_fargs:true, if_return:true, join_vars:true, side_effects:true
+        conditionals: true,
+        dead_code: true,
+        evaluate: true,
+        hoist_funs: true,
+        if_return: true,
+        join_vars: true,
+        keep_fargs: true,
+        loops: true,
+        properties: true,
+        sequences: true,
+        side_effects: true,
+        unused: true,
     }
     input: {
         function f1() {
@@ -30,9 +41,20 @@ issue979_reported: {
 
 issue979_test_negated_is_best: {
     options = {
-        sequences:true, properties:true, dead_code:true, conditionals:true,
+        booleans: true,
-        comparisons:true, evaluate:true, booleans:true, loops:true, unused:true, hoist_funs:true,
+        comparisons: true,
-        keep_fargs:true, if_return:true, join_vars:true, side_effects:true
+        conditionals: true,
+        dead_code: true,
+        evaluate: true,
+        hoist_funs: true,
+        if_return: true,
+        join_vars: true,
+        keep_fargs: true,
+        loops: true,
+        properties: true,
+        sequences: true,
+        side_effects: true,
+        unused: true,
     }
     input: {
         function f3() {

test/compress/labels.js

@@ -1,5 +1,9 @@
 labels_1: {
-    options = { if_return: true, conditionals: true, dead_code: true };
+    options = {
+        conditionals: true,
+        dead_code: true,
+        if_return: true,
+    }
     input: {
         out: {
             if (foo) break out;
@@ -13,7 +17,11 @@ labels_1: {
 }
 
 labels_2: {
-    options = { if_return: true, conditionals: true, dead_code: true };
+    options = {
+        conditionals: true,
+        dead_code: true,
+        if_return: true,
+    }
     input: {
         out: {
             if (foo) print("stuff");
@@ -30,7 +38,11 @@ labels_2: {
 }
 
 labels_3: {
-    options = { if_return: true, conditionals: true, dead_code: true };
+    options = {
+        conditionals: true,
+        dead_code: true,
+        if_return: true,
+    }
     input: {
         for (var i = 0; i < 5; ++i) {
             if (i < 3) continue;
@@ -45,7 +57,11 @@ labels_3: {
 }
 
 labels_4: {
-    options = { if_return: true, conditionals: true, dead_code: true };
+    options = {
+        conditionals: true,
+        dead_code: true,
+        if_return: true,
+    }
     input: {
         out: for (var i = 0; i < 5; ++i) {
             if (i < 3) continue out;
@@ -60,7 +76,11 @@ labels_4: {
 }
 
 labels_5: {
-    options = { if_return: true, conditionals: true, dead_code: true };
+    options = {
+        conditionals: true,
+        dead_code: true,
+        if_return: true,
+    }
     // should keep the break-s in the following
     input: {
         while (foo) {
@@ -92,7 +112,11 @@ labels_6: {
 }
 
 labels_7: {
-    options = { if_return: true, conditionals: true, dead_code: true };
+    options = {
+        conditionals: true,
+        dead_code: true,
+        if_return: true,
+    }
     input: {
         while (foo) {
             x();
@@ -109,7 +133,11 @@ labels_7: {
 }
 
 labels_8: {
-    options = { if_return: true, conditionals: true, dead_code: true };
+    options = {
+        conditionals: true,
+        dead_code: true,
+        if_return: true,
+    }
     input: {
         while (foo) {
             x();
@@ -127,7 +155,11 @@ labels_8: {
 }
 
 labels_9: {
-    options = { if_return: true, conditionals: true, dead_code: true };
+    options = {
+        conditionals: true,
+        dead_code: true,
+        if_return: true,
+    }
     input: {
         out: while (foo) {
             x();
@@ -146,7 +178,11 @@ labels_9: {
 }
 
 labels_10: {
-    options = { if_return: true, conditionals: true, dead_code: true };
+    options = {
+        conditionals: true,
+        dead_code: true,
+        if_return: true,
+    }
     input: {
         out: while (foo) {
             x();

test/compress/loops.js

@@ -1,5 +1,7 @@
 while_becomes_for: {
-    options = { loops: true };
+    options = {
+        loops: true,
+    }
     input: {
         while (foo()) bar();
     }
@@ -9,7 +11,9 @@ while_becomes_for: {
 }
 
 drop_if_break_1: {
-    options = { loops: true };
+    options = {
+        loops: true,
+    }
     input: {
         for (;;)
             if (foo()) break;
@@ -20,7 +24,9 @@ drop_if_break_1: {
 }
 
 drop_if_break_2: {
-    options = { loops: true };
+    options = {
+        loops: true,
+    }
     input: {
         for (;bar();)
             if (foo()) break;
@@ -31,7 +37,9 @@ drop_if_break_2: {
 }
 
 drop_if_break_3: {
-    options = { loops: true };
+    options = {
+        loops: true,
+    }
     input: {
         for (;bar();) {
             if (foo()) break;
@@ -48,7 +56,10 @@ drop_if_break_3: {
 }
 
 drop_if_break_4: {
-    options = { loops: true, sequences: true };
+    options = {
+        loops: true,
+        sequences: true,
+    }
     input: {
         for (;bar();) {
             x();
@@ -64,7 +75,9 @@ drop_if_break_4: {
 }
 
 drop_if_else_break_1: {
-    options = { loops: true };
+    options = {
+        loops: true,
+    }
     input: {
         for (;;) if (foo()) bar(); else break;
     }
@@ -74,7 +87,9 @@ drop_if_else_break_1: {
 }
 
 drop_if_else_break_2: {
-    options = { loops: true };
+    options = {
+        loops: true,
+    }
     input: {
         for (;bar();) {
             if (foo()) baz();
@@ -87,7 +102,9 @@ drop_if_else_break_2: {
 }
 
 drop_if_else_break_3: {
-    options = { loops: true };
+    options = {
+        loops: true,
+    }
     input: {
         for (;bar();) {
             if (foo()) baz();
@@ -106,7 +123,10 @@ drop_if_else_break_3: {
 }
 
 drop_if_else_break_4: {
-    options = { loops: true, sequences: true };
+    options = {
+        loops: true,
+        sequences: true,
+    }
     input: {
         for (;bar();) {
             x();
@@ -123,7 +143,9 @@ drop_if_else_break_4: {
 }
 
 parse_do_while_with_semicolon: {
-    options = { loops: false };
+    options = {
+        loops: false,
+    }
     input: {
         do {
             x();
@@ -135,7 +157,9 @@ parse_do_while_with_semicolon: {
 }
 
 parse_do_while_without_semicolon: {
-    options = { loops: false };
+    options = {
+        loops: false,
+    }
     input: {
         do {
             x();
@@ -153,7 +177,7 @@ evaluate: {
         loops: true,
         passes: 2,
         side_effects: true,
-    };
+    }
     input: {
         while (true) {
             a();
@@ -457,7 +481,7 @@ init_side_effects: {
     options = {
         loops: true,
         side_effects: true,
-    };
+    }
     input: {
         for (function() {}(), i = 0; i < 5; i++) console.log(i);
         for (function() {}(); i < 10; i++) console.log(i);

test/compress/negate-iife.js

@@ -1,7 +1,7 @@
 negate_iife_1: {
     options = {
-        negate_iife: true
+        negate_iife: true,
-    };
+    }
     input: {
         (function(){ stuff() })();
     }
@@ -13,7 +13,7 @@ negate_iife_1: {
 negate_iife_1_off: {
     options = {
         negate_iife: false,
-    };
+    }
     input: {
         (function(){ stuff() })();
     }
@@ -24,7 +24,7 @@ negate_iife_2: {
     options = {
         inline: true,
         negate_iife: true,
-    };
+    }
     input: {
         (function(){ return {} })().x = 10;
     }
@@ -45,9 +45,9 @@ negate_iife_2_side_effects: {
 
 negate_iife_3: {
     options = {
+        conditionals: true,
         negate_iife: true,
-        conditionals: true
+    }
-    };
     input: {
         (function(){ return t })() ? console.log(true) : console.log(false);
     }
@@ -88,9 +88,9 @@ negate_iife_3_side_effects: {
 
 negate_iife_3_off: {
     options = {
-        negate_iife: false,
         conditionals: true,
-    };
+        negate_iife: false,
+    }
     input: {
         (function(){ return t })() ? console.log(true) : console.log(false);
     }
@@ -117,10 +117,10 @@ negate_iife_3_off_evaluate: {
 
 negate_iife_4: {
     options = {
-        negate_iife: true,
         conditionals: true,
-        sequences: true
+        negate_iife: true,
-    };
+        sequences: true,
+    }
     input: {
         (function(){ return t })() ? console.log(true) : console.log(false);
         (function(){
@@ -136,11 +136,11 @@ negate_iife_4: {
 
 sequence_off: {
     options = {
-        negate_iife: false,
         conditionals: true,
-        sequences: true,
+        negate_iife: false,
         passes: 2,
-    };
+        sequences: true,
+    }
     input: {
         function f() {
             (function(){ return t })() ? console.log(true) : console.log(false);
@@ -171,10 +171,10 @@ sequence_off: {
 
 negate_iife_5: {
     options = {
+        conditionals: true,
         negate_iife: true,
         sequences: true,
-        conditionals: true,
+    }
-    };
     input: {
         if ((function(){ return t })()) {
             foo(true);
@@ -194,10 +194,10 @@ negate_iife_5: {
 
 negate_iife_5_off: {
     options = {
+        conditionals: true,
         negate_iife: false,
         sequences: true,
-        conditionals: true,
+    }
-    };
     input: {
         if ((function(){ return t })()) {
             foo(true);
@@ -217,10 +217,10 @@ negate_iife_5_off: {
 
 negate_iife_nested: {
     options = {
+        conditionals: true,
         negate_iife: true,
         sequences: true,
-        conditionals: true,
+    }
-    };
     input: {
         function Foo(f) {
             this.f = f;
@@ -250,10 +250,10 @@ negate_iife_nested: {
 
 negate_iife_nested_off: {
     options = {
+        conditionals: true,
         negate_iife: false,
         sequences: true,
-        conditionals: true,
+    }
-    };
     input: {
         function Foo(f) {
             this.f = f;
@@ -283,10 +283,10 @@ negate_iife_nested_off: {
 
 negate_iife_issue_1073: {
     options = {
+        conditionals: true,
         negate_iife: true,
         sequences: true,
-        conditionals: true,
+    }
-    };
     input: {
         new (function(a) {
             return function Foo() {
@@ -356,7 +356,7 @@ issue_1288: {
         conditionals: true,
         negate_iife: true,
         side_effects: false,
-    };
+    }
     input: {
         if (w) ;
         else {

test/compress/new.js

@@ -36,7 +36,9 @@ new_statements_3: {
 }
 
 new_with_rewritten_true_value: {
-    options = { booleans: true }
+    options = {
+        booleans: true,
+    }
     input: {
         new true;
     }

test/compress/properties.js

@@ -1729,3 +1729,106 @@ issue_869_2: {
     }
     expect_stdout: "PASS"
 }
+
+issue_3188_1: {
+    options = {
+        collapse_vars: true,
+        inline: true,
+        properties: true,
+        reduce_vars: true,
+        side_effects: true,
+    }
+    input: {
+        (function() {
+            function f() {
+                console.log(this.p);
+            }
+            (function() {
+                var o = {
+                    p: "PASS",
+                    f: f
+                };
+                o.f();
+            })();
+        })();
+    }
+    expect: {
+        (function() {
+            function f() {
+                console.log(this.p);
+            }
+            ({
+                p: "PASS",
+                f: f
+            }).f();
+            var o;
+        })();
+    }
+    expect_stdout: "PASS"
+}
+
+issue_3188_2: {
+    options = {
+        collapse_vars: true,
+        inline: true,
+        properties: true,
+        reduce_vars: true,
+        side_effects: true,
+        unused: true,
+    }
+    input: {
+        (function() {
+            var f = function() {
+                console.log(this.p);
+            };
+            function g() {
+                var o = {
+                    p: "PASS",
+                    f: f
+                };
+                o.f();
+            }
+            g();
+        })();
+    }
+    expect: {
+        ({
+            p: "PASS",
+            f: function() {
+                console.log(this.p);
+            }
+        }).f();
+    }
+    expect_stdout: "PASS"
+}
+
+issue_3188_3: {
+    options = {
+        collapse_vars: true,
+        inline: true,
+        properties: true,
+        reduce_vars: true,
+        side_effects: true,
+    }
+    input: {
+        (function() {
+            function f() {
+                console.log(this[0]);
+            }
+            (function() {
+                var o = ["PASS", f];
+                o[1]();
+            })();
+        })();
+    }
+    expect: {
+        (function() {
+            function f() {
+                console.log(this[0]);
+            }
+            ["PASS", f][1]();
+            var o;
+        })();
+    }
+    expect_stdout: "PASS"
+}

test/compress/pure_getters.js

@@ -187,10 +187,10 @@ issue_2110_1: {
     options = {
         collapse_vars: true,
         pure_getters: "strict",
-        sequences: true,
-        side_effects: true,
         reduce_funcs: true,
         reduce_vars: true,
+        sequences: true,
+        side_effects: true,
         unused: true,
     }
     input: {

test/compress/reduce_vars.js

@@ -2,14 +2,14 @@ reduce_vars: {
     options = {
         conditionals: true,
         evaluate: true,
-        inline        : true,
         global_defs: {
-            C : 0
+            C: 0,
         },
+        inline: true,
         reduce_funcs: true,
         reduce_vars: true,
         toplevel: true,
-        unused        : true
+        unused: true,
     }
     input: {
         var A = 1;
@@ -189,7 +189,7 @@ unsafe_evaluate: {
         reduce_vars: true,
         side_effects: true,
         unsafe: true,
-        unused       : true
+        unused: true,
     }
     input: {
         function f0(){
@@ -347,7 +347,7 @@ unsafe_evaluate_object_1: {
         evaluate: true,
         reduce_funcs: true,
         reduce_vars: true,
-        unsafe       : true
+        unsafe: true,
     }
     input: {
         function f0(){
@@ -466,7 +466,7 @@ unsafe_evaluate_array_1: {
         evaluate: true,
         reduce_funcs: true,
         reduce_vars: true,
-        unsafe       : true
+        unsafe: true,
     }
     input: {
         function f0(){
@@ -646,7 +646,7 @@ unsafe_evaluate_equality_1: {
         reduce_funcs: true,
         reduce_vars: true,
         unsafe: true,
-        unused       : true
+        unused: true,
     }
     input: {
         function f0() {
@@ -679,7 +679,7 @@ unsafe_evaluate_equality_2: {
         reduce_funcs: true,
         reduce_vars: true,
         unsafe: true,
-        unused       : true
+        unused: true,
     }
     input: {
         function f2() {
@@ -1476,18 +1476,18 @@ defun_redefine: {
             };
             return g() + h();
         }
+        console.log(f());
     }
     expect:  {
         function f() {
-            function g() {
+            (function() {
-                return 1;
-            }
-            g = function() {
                 return 3;
-            };
+            });
-            return g() + 2;
+            return 3 + 2;
         }
+        console.log(f());
     }
+    expect_stdout: "5"
 }
 
 func_inline: {
@@ -1527,23 +1527,63 @@ func_modified: {
     }
     input: {
         function f(a) {
-            function a() { return 1; }
+            function a() {
-            function b() { return 2; }
+                return 1;
-            function c() { return 3; }
+            }
+            function b() {
+                return 2;
+            }
+            function c() {
+                return 3;
+            }
             b.inject = [];
-            c = function() { return 4; };
+            c = function() {
+                return 4;
+            };
             return a() + b() + c();
         }
+        console.log(f());
     }
     expect: {
         function f(a) {
-            function b() { return 2; }
+            function b() {
-            function c() { return 3; }
+                return 2;
+            }
             b.inject = [];
-            c = function() { return 4; };
+            (function() {
-            return 1 + 2 + c();
+                return 4;
+            });
+            return 1 + 2 + 4;
         }
+        console.log(f());
     }
+    expect_stdout: "7"
+}
+
+unused_modified: {
+    options = {
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        console.log(function() {
+            var b = 1, c = "FAIL";
+            if (0 || b--)
+                c = "PASS";
+            b = 1;
+            return c;
+        }());
+    }
+    expect: {
+        console.log(function() {
+            var b = 1, c = "FAIL";
+            if (0 || b--)
+                c = "PASS";
+            b = 1;
+            return c;
+        }());
+    }
+    expect_stdout: "PASS"
 }
 
 defun_label: {
@@ -1854,8 +1894,8 @@ issue_1670_1: {
     options = {
         comparisons: true,
         conditionals: true,
-        evaluate: true,
         dead_code: true,
+        evaluate: true,
         reduce_funcs: true,
         reduce_vars: true,
         side_effects: true,
@@ -1887,8 +1927,8 @@ issue_1670_1: {
 issue_1670_2: {
     options = {
         conditionals: true,
-        evaluate: true,
         dead_code: true,
+        evaluate: true,
         passes: 2,
         reduce_funcs: true,
         reduce_vars: true,
@@ -1920,8 +1960,8 @@ issue_1670_3: {
     options = {
         comparisons: true,
         conditionals: true,
-        evaluate: true,
         dead_code: true,
+        evaluate: true,
         reduce_funcs: true,
         reduce_vars: true,
         side_effects: true,
@@ -1953,8 +1993,8 @@ issue_1670_3: {
 issue_1670_4: {
     options = {
         conditionals: true,
-        evaluate: true,
         dead_code: true,
+        evaluate: true,
         passes: 2,
         reduce_funcs: true,
         reduce_vars: true,
@@ -5054,9 +5094,7 @@ defun_var_1: {
         console.log(typeof a, typeof b);
     }
     expect: {
-        var a = 42;
+        console.log("number", "function");
-        function a() {}
-        console.log(typeof a, "function");
     }
     expect_stdout: "number function"
 }
@@ -5076,9 +5114,7 @@ defun_var_2: {
         console.log(typeof a, typeof b);
     }
     expect: {
-        function a() {}
+        console.log("number", "function");
-        var a = 42;
-        console.log(typeof a, "function");
     }
     expect_stdout: "number function"
 }
@@ -5710,3 +5746,686 @@ issue_3068_2: {
     }
     expect_stdout: true
 }
+
+issue_3110_1: {
+    options = {
+        conditionals: true,
+        evaluate: true,
+        inline: true,
+        passes: 3,
+        properties: true,
+        reduce_vars: true,
+        sequences: true,
+        side_effects: true,
+        unused: true,
+    }
+    input: {
+        (function() {
+            function foo() {
+                return isDev ? "foo" : "bar";
+            }
+            var isDev = true;
+            var obj = {
+                foo: foo
+            };
+            console.log(foo());
+            console.log(obj.foo());
+        })();
+    }
+    expect: {
+        console.log("foo"),
+        console.log("foo");
+    }
+    expect_stdout: [
+        "foo",
+        "foo",
+    ]
+}
+
+issue_3110_2: {
+    options = {
+        conditionals: true,
+        evaluate: true,
+        inline: true,
+        passes: 4,
+        properties: true,
+        reduce_vars: true,
+        sequences: true,
+        side_effects: true,
+        unused: true,
+    }
+    input: {
+        (function() {
+            function foo() {
+                return isDev ? "foo" : "bar";
+            }
+            var isDev = true;
+            console.log(foo());
+            var obj = {
+                foo: foo
+            };
+            console.log(obj.foo());
+        })();
+    }
+    expect: {
+        console.log("foo"),
+        console.log("foo");
+    }
+    expect_stdout: [
+        "foo",
+        "foo",
+    ]
+}
+
+issue_3110_3: {
+    options = {
+        conditionals: true,
+        evaluate: true,
+        inline: true,
+        properties: true,
+        reduce_vars: true,
+        sequences: true,
+        side_effects: true,
+        unused: true,
+    }
+    input: {
+        (function() {
+            function foo() {
+                return isDev ? "foo" : "bar";
+            }
+            console.log(foo());
+            var isDev = true;
+            var obj = {
+                foo: foo
+            };
+            console.log(obj.foo());
+        })();
+    }
+    expect: {
+        (function() {
+            function foo() {
+                return isDev ? "foo" : "bar";
+            }
+            console.log(foo());
+            var isDev = true;
+            var obj = {
+                foo: foo
+            };
+            console.log(obj.foo());
+        })();
+    }
+    expect_stdout: [
+        "bar",
+        "foo",
+    ]
+}
+
+issue_3113_1: {
+    options = {
+        evaluate: true,
+        reduce_vars: true,
+    }
+    input: {
+        var c = 0;
+        (function() {
+            function f() {
+                while (g());
+            }
+            var a = f();
+            function g() {
+                a && a[c++];
+            }
+            g(a = 1);
+        })();
+        console.log(c);
+    }
+    expect: {
+        var c = 0;
+        (function() {
+            function f() {
+                while (g());
+            }
+            var a = f();
+            function g() {
+                a && a[c++];
+            }
+            g(a = 1);
+        })();
+        console.log(c);
+    }
+    expect_stdout: "1"
+}
+
+issue_3113_2: {
+    options = {
+        evaluate: true,
+        reduce_vars: true,
+    }
+    input: {
+        var c = 0;
+        (function() {
+            function f() {
+                while (g());
+            }
+            var a = f();
+            function g() {
+                a && a[c++];
+            }
+            a = 1;
+            g();
+        })();
+        console.log(c);
+    }
+    expect: {
+        var c = 0;
+        (function() {
+            function f() {
+                while (g());
+            }
+            var a = f();
+            function g() {
+                a && a[c++];
+            }
+            a = 1;
+            g();
+        })();
+        console.log(c);
+    }
+    expect_stdout: "1"
+}
+
+issue_3113_3: {
+    options = {
+        evaluate: true,
+        inline: true,
+        passes: 2,
+        pure_getters: "strict",
+        reduce_vars: true,
+        side_effects: true,
+        unused: true,
+    }
+    input: {
+        var c = 0;
+        (function() {
+            function f() {
+                while (g());
+            }
+            var a;
+            function g() {
+                a && a[c++];
+            }
+            g(a = 1);
+        })();
+        console.log(c);
+    }
+    expect: {
+        var c = 0;
+        c++;
+        console.log(c);
+    }
+    expect_stdout: "1"
+}
+
+issue_3113_4: {
+    options = {
+        evaluate: true,
+        reduce_vars: true,
+        toplevel: true,
+    }
+    input: {
+        var a = 0, b = 0;
+        function f() {
+            b += a;
+        }
+        f(f(), ++a);
+        console.log(a, b);
+    }
+    expect: {
+        var a = 0, b = 0;
+        function f() {
+            b += a;
+        }
+        f(f(), ++a);
+        console.log(a, b);
+    }
+    expect_stdout: "1 1"
+}
+
+issue_3113_5: {
+    options = {
+        evaluate: true,
+        reduce_vars: true,
+        toplevel: true,
+    }
+    input: {
+        function f() {
+            console.log(a);
+        }
+        function g() {
+            f();
+        }
+        while (g());
+        var a = 1;
+        f();
+    }
+    expect: {
+        function f() {
+            console.log(a);
+        }
+        function g() {
+            f();
+        }
+        while (g());
+        var a = 1;
+        f();
+    }
+    expect_stdout: [
+        "undefined",
+        "1",
+    ]
+}
+
+conditional_nested_1: {
+    options = {
+        evaluate: true,
+        reduce_vars: true,
+    }
+    input: {
+        var a = 1, b = 0;
+        (function f(c) {
+            function g() {
+                c && (c.a = 0);
+                c && (c.a = 0);
+                c && (c[b++] *= 0);
+            }
+            g(a-- && f(g(c = 42)));
+        })();
+        console.log(b);
+    }
+    expect: {
+        var a = 1, b = 0;
+        (function f(c) {
+            function g() {
+                c && (c.a = 0);
+                c && (c.a = 0);
+                c && (c[b++] *= 0);
+            }
+            g(a-- && f(g(c = 42)));
+        })();
+        console.log(b);
+    }
+    expect_stdout: "2"
+}
+
+conditional_nested_2: {
+    options = {
+        evaluate: true,
+        reduce_vars: true,
+    }
+    input: {
+        var c = 0;
+        (function(a) {
+            function f() {
+                a && c++;
+            }
+            f(!c && f(), a = 1);
+        })();
+        console.log(c);
+    }
+    expect: {
+        var c = 0;
+        (function(a) {
+            function f() {
+                a && c++;
+            }
+            f(!c && f(), a = 1);
+        })();
+        console.log(c);
+    }
+    expect_stdout: "1"
+}
+
+conditional_nested_3: {
+    options = {
+        evaluate: true,
+        reduce_vars: true,
+    }
+    input: {
+        var n = 2, c = 0;
+        (function f(a) {
+            0 < n-- && g(a = 1);
+            function g() {
+                a && c++;
+            }
+            g();
+            0 < n-- && f();
+        })();
+        console.log(c);
+    }
+    expect: {
+        var n = 2, c = 0;
+        (function f(a) {
+            0 < n-- && g(a = 1);
+            function g() {
+                a && c++;
+            }
+            g();
+            0 < n-- && f();
+        })();
+        console.log(c);
+    }
+    expect_stdout: "2"
+}
+
+issue_2436: {
+    options = {
+        evaluate: true,
+        reduce_vars: true,
+        toplevel: true,
+        unsafe: true,
+    }
+    input: {
+        var c;
+        console.log(((c = {
+            a: 1,
+            b: 2
+        }).a = 3, {
+            x: c.a,
+            y: c.b
+        }));
+    }
+    expect: {
+        var c;
+        console.log(((c = {
+            a: 1,
+            b: 2
+        }).a = 3, {
+            x: c.a,
+            y: c.b
+        }));
+    }
+    expect_stdout: true
+}
+
+issue_2916: {
+    options = {
+        collapse_vars: true,
+        evaluate: true,
+        inline: true,
+        passes: 2,
+        reduce_vars: true,
+        side_effects: true,
+        unsafe: true,
+        unused: true,
+    }
+    input: {
+        var c = "FAIL";
+        (function(b) {
+            (function(d) {
+                d[0] = 1;
+            })(b);
+            +b && (c = "PASS");
+        })([]);
+        console.log(c);
+    }
+    expect: {
+        var c = "FAIL";
+        (function(b) {
+            b[0] = 1;
+            +b && (c = "PASS");
+        })([]);
+        console.log(c);
+    }
+    expect_stdout: "PASS"
+}
+
+issue_3125: {
+    options = {
+        evaluate: true,
+        reduce_vars: true,
+        toplevel: true,
+        unsafe: true,
+    }
+    input: {
+        var o;
+        console.log((function() {
+            this.p++;
+        }.call(o = {
+            p: 6
+        }), o.p));
+    }
+    expect: {
+        var o;
+        console.log((function() {
+            this.p++;
+        }.call(o = {
+            p: 6
+        }), o.p));
+    }
+    expect_stdout: "7"
+}
+
+issue_3140_1: {
+    options = {
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        (function() {
+            var a;
+            function f() {
+            }
+            f.g = function g() {
+                function h() {
+                    console.log(a ? "PASS" : "FAIL");
+                }
+                a = true;
+                this();
+                a = false;
+                h.g = g;
+                return h;
+            };
+            return f;
+        })().g().g();
+    }
+    expect: {
+        (function() {
+            var a;
+            function f() {
+            }
+            f.g = function g() {
+                function h() {
+                    console.log(a ? "PASS" : "FAIL");
+                }
+                a = true;
+                this();
+                a = false;
+                h.g = g;
+                return h;
+            };
+            return f;
+        })().g().g();
+    }
+    expect_stdout: "PASS"
+}
+
+issue_3140_2: {
+    options = {
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        (function() {
+            var a;
+            function f() {
+            }
+            f.g = function g() {
+                var self = this;
+                function h() {
+                    console.log(a ? "PASS" : "FAIL");
+                }
+                a = true;
+                self();
+                a = false;
+                h.g = g;
+                return h;
+            };
+            return f;
+        })().g().g();
+    }
+    expect: {
+        (function() {
+            var a;
+            function f() {
+            }
+            f.g = function g() {
+                function h() {
+                    console.log(a ? "PASS" : "FAIL");
+                }
+                a = true;
+                this();
+                a = false;
+                h.g = g;
+                return h;
+            };
+            return f;
+        })().g().g();
+    }
+    expect_stdout: "PASS"
+}
+
+issue_3140_3: {
+    options = {
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        (function() {
+            var a;
+            function f() {
+            }
+            f.g = function g() {
+                var self = this;
+                function h() {
+                    console.log(a ? "PASS" : "FAIL");
+                }
+                a = true;
+                (function() {
+                    return self;
+                })()();
+                a = false;
+                h.g = g;
+                return h;
+            };
+            return f;
+        })().g().g();
+    }
+    expect: {
+        (function() {
+            var a;
+            function f() {
+            }
+            f.g = function g() {
+                var self = this;
+                function h() {
+                    console.log(a ? "PASS" : "FAIL");
+                }
+                a = true;
+                (function() {
+                    return self;
+                })()();
+                a = false;
+                h.g = g;
+                return h;
+            };
+            return f;
+        })().g().g();
+    }
+    expect_stdout: "PASS"
+}
+
+issue_3140_4: {
+    options = {
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        (function() {
+            var a;
+            function f() {
+            }
+            f.g = function g() {
+                var o = {
+                    p: this
+                };
+                function h() {
+                    console.log(a ? "PASS" : "FAIL");
+                }
+                a = true;
+                o.p();
+                a = false;
+                h.g = g;
+                return h;
+            };
+            return f;
+        })().g().g();
+    }
+    expect: {
+        (function() {
+            var a;
+            function f() {
+            }
+            f.g = function g() {
+                var o = {
+                    p: this
+                };
+                function h() {
+                    console.log(a ? "PASS" : "FAIL");
+                }
+                a = true;
+                o.p();
+                a = false;
+                h.g = g;
+                return h;
+            };
+            return f;
+        })().g().g();
+    }
+    expect_stdout: "PASS"
+}
+
+issue_3140_5: {
+    options = {
+        evaluate: true,
+        reduce_vars: true,
+    }
+    input: {
+        var n = 1, c = 0;
+        (function(a) {
+            var b = function() {
+                this;
+                n-- && h();
+            }();
+            function h() {
+                b && c++;
+            }
+            h(b = 1);
+        })();
+        console.log(c);
+    }
+    expect: {
+        var n = 1, c = 0;
+        (function(a) {
+            var b = function() {
+                this;
+                n-- && h();
+            }();
+            function h() {
+                b && c++;
+            }
+            h(b = 1);
+        })();
+        console.log(c);
+    }
+    expect_stdout: "1"
+}

test/compress/regexp.js

@@ -0,0 +1,37 @@
+regexp_simple: {
+    input: {
+        /rx/ig
+    }
+    expect_exact: "/rx/gi;"
+}
+
+regexp_slashes: {
+    input: {
+        /\\\/rx\/\\/ig
+    }
+    expect_exact: "/\\\\\\/rx\\/\\\\/gi;"
+}
+
+regexp_1: {
+    input: {
+        console.log(JSON.stringify("COMPASS? Overpass.".match(/([Sap]+)/ig)));
+    }
+    expect: {
+        console.log(JSON.stringify("COMPASS? Overpass.".match(/([Sap]+)/gi)));
+    }
+    expect_stdout: '["PASS","pass"]'
+}
+
+regexp_2: {
+    options = {
+        evaluate: true,
+        unsafe: true,
+    }
+    input: {
+        console.log(JSON.stringify("COMPASS? Overpass.".match(new RegExp("([Sap]+)", "ig"))));
+    }
+    expect: {
+        console.log(JSON.stringify("COMPASS? Overpass.".match(/([Sap]+)/gi)));
+    }
+    expect_stdout: '["PASS","pass"]'
+}

test/compress/return_undefined.js

@@ -1,24 +1,24 @@
 return_undefined: {
     options = {
-        sequences     : false,
-        if_return     : true,
-        evaluate      : true,
-        dead_code     : true,
-        conditionals  : true,
-        comparisons   : true,
         booleans: true,
-        unused        : true,
+        comparisons: true,
-        side_effects  : true,
+        conditionals: true,
-        properties    : true,
+        dead_code: true,
         drop_debugger: true,
-        loops         : true,
+        evaluate: true,
         hoist_funs: true,
+        hoist_vars: true,
+        if_return: true,
+        join_vars: true,
         keep_fargs: true,
         keep_fnames: false,
-        hoist_vars    : true,
+        loops: true,
-        join_vars     : true,
+        negate_iife: true,
-        negate_iife   : true
+        properties: true,
-    };
+        sequences: false,
+        side_effects: true,
+        unused: true,
+    }
     input: {
         function f0() {
         }

test/compress/sequences.js

@@ -1,7 +1,7 @@
 make_sequences_1: {
     options = {
-        sequences: true
+        sequences: true,
-    };
+    }
     input: {
         foo();
         bar();
@@ -14,8 +14,8 @@ make_sequences_1: {
 
 make_sequences_2: {
     options = {
-        sequences: true
+        sequences: true,
-    };
+    }
     input: {
         if (boo) {
             foo();
@@ -35,8 +35,8 @@ make_sequences_2: {
 
 make_sequences_3: {
     options = {
-        sequences: true
+        sequences: true,
-    };
+    }
     input: {
         function f() {
             foo();
@@ -61,8 +61,8 @@ make_sequences_3: {
 
 make_sequences_4: {
     options = {
-        sequences: true
+        sequences: true,
-    };
+    }
     input: {
         x = 5;
         if (y) z();
@@ -90,7 +90,9 @@ make_sequences_4: {
 }
 
 lift_sequences_1: {
-    options = { sequences: true };
+    options = {
+        sequences: true,
+    }
     input: {
         var foo, x, y, bar;
         foo = !(x(), y(), bar());
@@ -102,7 +104,10 @@ lift_sequences_1: {
 }
 
 lift_sequences_2: {
-    options = { sequences: true, evaluate: true };
+    options = {
+        evaluate: true,
+        sequences: true,
+    }
     input: {
         var foo = 1, bar;
         foo.x = (foo = {}, 10);
@@ -119,7 +124,10 @@ lift_sequences_2: {
 }
 
 lift_sequences_3: {
-    options = { sequences: true, conditionals: true };
+    options = {
+        conditionals: true,
+        sequences: true,
+    }
     input: {
         var x, foo, bar, baz;
         x = (foo(), bar(), baz()) ? 10 : 20;
@@ -131,7 +139,9 @@ lift_sequences_3: {
 }
 
 lift_sequences_4: {
-    options = { side_effects: true };
+    options = {
+        side_effects: true,
+    }
     input: {
         var x, foo, bar, baz;
         x = (foo, bar, baz);
@@ -160,7 +170,9 @@ lift_sequences_5: {
 }
 
 for_sequences: {
-    options = { sequences: true };
+    options = {
+        sequences: true,
+    }
     input: {
         // 1
         foo();
@@ -203,7 +215,7 @@ for_sequences: {
 limit_1: {
     options = {
         sequences: 3,
-    };
+    }
     input: {
         a;
         b;
@@ -228,7 +240,7 @@ limit_1: {
 limit_2: {
     options = {
         sequences: 3,
-    };
+    }
     input: {
         a, b;
         c, d;
@@ -246,9 +258,9 @@ limit_2: {
 
 negate_iife_for: {
     options = {
-        sequences: true,
         negate_iife: true,
-    };
+        sequences: true,
+    }
     input: {
         (function() {})();
         for (i = 0; i < 5; i++) console.log(i);
@@ -265,7 +277,7 @@ negate_iife_for: {
 iife: {
     options = {
         sequences: true,
-    };
+    }
     input: {
         x = 42;
         (function a() {})();
@@ -876,3 +888,59 @@ forin: {
     }
     expect_stdout: "PASS"
 }
+
+call: {
+    options = {
+        sequences: true,
+    }
+    input: {
+        var a = function() {
+            return this;
+        }();
+        function b() {
+            console.log("foo");
+        }
+        b.c = function() {
+            console.log(this === b ? "bar" : "baz");
+        };
+        (a, b)();
+        (a, b.c)();
+        (a, function() {
+            console.log(this === a);
+        })();
+        new (a, b)();
+        new (a, b.c)();
+        new (a, function() {
+            console.log(this === a);
+        })();
+    }
+    expect: {
+        var a = function() {
+            return this;
+        }();
+        function b() {
+            console.log("foo");
+        }
+        b.c = function() {
+            console.log(this === b ? "bar" : "baz");
+        },
+        a, b(),
+        (a, b.c)(),
+        a, function() {
+            console.log(this === a);
+        }(),
+        a, new b(),
+        a, new b.c(),
+        a, new function() {
+            console.log(this === a);
+        }();
+    }
+    expect_stdout: [
+        "foo",
+        "baz",
+        "true",
+        "foo",
+        "baz",
+        "false",
+    ]
+}

test/compress/string-literal.js

@@ -14,6 +14,13 @@ issue_1929: {
         function f(s) {
             return s.split(/[\\/]/);
         }
+        console.log(JSON.stringify(f("A/B\\C\\D/E\\F")));
     }
-    expect_exact: "function f(s){return s.split(/[\\\\/]/)}"
+    expect: {
+        function f(s) {
+            return s.split(/[\\/]/);
+        }
+        console.log(JSON.stringify(f("A/B\\C\\D/E\\F")));
+    }
+    expect_stdout: '["A","B","C","D","E","F"]'
 }

test/compress/switch.js

@@ -820,8 +820,8 @@ issue_1758: {
 
 issue_2535: {
     options = {
-        evaluate: true,
         dead_code: true,
+        evaluate: true,
         switches: true,
     }
     input: {

test/compress/typeof.js

@@ -2,7 +2,7 @@ typeof_evaluation: {
     options = {
         evaluate: true,
         typeofs: true,
-    };
+    }
     input: {
         a = typeof 1;
         b = typeof 'test';
@@ -28,10 +28,10 @@ typeof_evaluation: {
 typeof_in_boolean_context: {
     options = {
         booleans: true,
-        evaluate     : true,
         conditionals: true,
+        evaluate: true,
         side_effects: true,
-    };
+    }
     input: {
         function f1(x) { return typeof x ? "yes" : "no"; }
         function f2() { return typeof g()? "Yes" : "No"; }
@@ -90,17 +90,11 @@ typeof_defun_1: {
         "function" == typeof h && h();
     }
     expect: {
-        function g() {
-            h = 42;
-            console.log("NOPE");
-        }
         function h() {
             console.log("YUP");
         }
-        g = 42;
         console.log("YES");
-        "function" == typeof g && g();
+        h();
-        "function" == typeof h && h();
     }
     expect_stdout: [
         "YES",

test/compress/unicode.js

@@ -1,5 +1,5 @@
 unicode_parse_variables: {
-    options = {};
+    options = {}
     input: {
         var a = {};
         a.你好 = 456;

test/fetch.js

@@ -1,4 +1,5 @@
 var fs = require("fs");
+var parse = require("url").parse;
 var path = require("path");
 
 try {
@@ -19,7 +20,9 @@ module.exports = function(url, callback) {
     var result = read(url);
     result.on("error", function(e) {
         if (e.code != "ENOENT") return callback(e);
-        require(url.slice(0, url.indexOf(":"))).get(url, function(res) {
+        var options = parse(url);
+        options.rejectUnauthorized = false;
+        require(options.protocol.slice(0, -1)).get(options, function(res) {
             if (res.statusCode !== 200) return callback(res);
             res.pipe(fs.createWriteStream(local(url)).on("close", function() {
                 callback(null, read(url));

test/input/enclose/input.js

@@ -0,0 +1,4 @@
+function enclose() {
+    console.log("test enclose");
+}
+enclose();

test/jetstream.js

@@ -3,7 +3,7 @@
 
 "use strict";
 
-var site = "http://browserbench.org/JetStream";
+var site = "https://browserbench.org/JetStream";
 if (typeof phantom == "undefined") {
     require("../tools/exit");
     var args = process.argv.slice(2);

test/mocha.js

@@ -1,24 +1,114 @@
 var fs = require("fs");
-var Mocha = require("mocha");
-var path = require("path");
 
-// Instantiate a Mocha instance
+var config = {
-var mocha = new Mocha({
+    limit: 5000,
-    timeout: 5000
+    timeout: function(limit) {
-});
+        this.limit = limit;
-var testDir = __dirname + "/mocha/";
+    }
+};
+var tasks = [];
+var titles = [];
+describe = function(title, fn) {
+    config = Object.create(config);
+    titles.push(title);
+    fn.call(config);
+    titles.pop();
+    config = Object.getPrototypeOf(config);
+};
+it = function(title, fn) {
+    fn.limit = config.limit;
+    fn.titles = titles.slice();
+    fn.titles.push(title);
+    tasks.push(fn);
+};
 
-// Add each .js file to the Mocha instance
+fs.readdirSync("test/mocha").filter(function(file) {
-fs.readdirSync(testDir).filter(function(file) {
     return /\.js$/.test(file);
 }).forEach(function(file) {
-    mocha.addFile(path.join(testDir, file));
+    require("./mocha/" + file);
 });
 
-module.exports = function() {
+function log_titles(log, current, marker) {
-    mocha.run(function(failures) {
+    var indent = "";
-        if (failures) process.on("exit", function() {
+    var writing = false;
-            process.exit(failures);
+    for (var i = 0; i < current.length; i++, indent += "  ") {
-        });
+        if (titles[i] != current[i]) writing = true;
-    });
+        if (writing) log(indent + (i == current.length - 1 && marker || "") + current[i]);
+    }
+    titles = current;
+}
+
+function red(text) {
+    return "\u001B[31m" + text + "\u001B[39m";
+}
+
+function green(text) {
+    return "\u001B[32m" + text + "\u001B[39m";
+}
+
+var errors = [];
+var total = tasks.length;
+titles = [];
+process.nextTick(function run() {
+    var task = tasks.shift();
+    if (task) try {
+        var elapsed = Date.now();
+        var timer;
+        var done = function() {
+            reset();
+            elapsed = Date.now() - elapsed;
+            if (elapsed > task.limit) {
+                throw new Error("Timed out: " + elapsed + "ms > " + task.limit + "ms");
+            }
+            log_titles(console.log, task.titles, green('\u221A '));
+            process.nextTick(run);
         };
+        if (task.length) {
+            task.timeout = function(limit) {
+                clearTimeout(timer);
+                task.limit = limit;
+                timer = setTimeout(function() {
+                    raise(new Error("Timed out: exceeds " + limit + "ms"));
+                }, limit);
+            };
+            task.timeout(task.limit);
+            process.on("uncaughtException", raise);
+            task.call(task, done);
+        } else {
+            task.timeout = config.timeout;
+            task.call(task);
+            done();
+        }
+    } catch (err) {
+        raise(err);
+    } else if (errors.length) {
+        console.error();
+        console.log(red(errors.length + " test(s) failed!"));
+        titles = [];
+        errors.forEach(function(titles, index) {
+            console.error();
+            log_titles(console.error, titles, (index + 1) + ") ");
+            var lines = titles.error.stack.split('\n');
+            console.error(red(lines[0]));
+            console.error(lines.slice(1).join("\n"));
+        });
+        process.exit(1);
+    } else {
+        console.log();
+        console.log(green(total + " test(s) passed."));
+    }
+
+    function raise(err) {
+        reset();
+        task.titles.error = err;
+        errors.push(task.titles);
+        log_titles(console.log, task.titles, red('\u00D7 '));
+        process.nextTick(run);
+    }
+
+    function reset() {
+        clearTimeout(timer);
+        done = function() {};
+        process.removeListener("uncaughtException", raise);
+    }
+});

test/mocha/arguments.js

@@ -1,17 +1,14 @@
-var UglifyJS = require("../node");
 var assert = require("assert");
+var UglifyJS = require("../..");
 
 describe("arguments", function() {
     it("Should known that arguments in functions are local scoped", function() {
         var ast = UglifyJS.parse("var arguments; var f = function() {arguments.length}");
         ast.figure_out_scope();
-
         // Test scope of `var arguments`
         assert.strictEqual(ast.find_variable("arguments").global, true);
-
         // Select arguments symbol in function
         var symbol = ast.body[1].definitions[0].value.find_variable("arguments");
-
         assert.strictEqual(symbol.global, false);
         assert.strictEqual(symbol.scope, ast. // From ast
             body[1]. // Select 2nd statement (equals to `var f ...`)

test/mocha/cli.js

@@ -8,57 +8,45 @@ function read(path) {
 
 describe("bin/uglifyjs", function() {
     var uglifyjscmd = '"' + process.argv[0] + '" bin/uglifyjs';
-    it("should produce a functional build when using --self", function (done) {
+    it("Should produce a functional build when using --self", function(done) {
         this.timeout(30000);
-
         var command = uglifyjscmd + ' --self -cm --wrap WrappedUglifyJS';
-
         exec(command, function(err, stdout) {
             if (err) throw err;
-
             eval(stdout);
-
+            assert.strictEqual(typeof WrappedUglifyJS, "object");
-            assert.strictEqual(typeof WrappedUglifyJS, 'object');
             var result = WrappedUglifyJS.minify("foo([true,,2+3]);");
             assert.strictEqual(result.error, undefined);
             assert.strictEqual(result.code, "foo([!0,,5]);");
-
             done();
         });
     });
     it("Should be able to filter comments correctly with `--comments all`", function(done) {
         var command = uglifyjscmd + ' test/input/comments/filter.js --comments all';
-
         exec(command, function(err, stdout) {
             if (err) throw err;
-
             assert.strictEqual(stdout, "// foo\n/*@preserve*/\n// bar\n\n");
             done();
         });
     });
     it("Should be able to filter comments correctly with `--comment <RegExp>`", function(done) {
         var command = uglifyjscmd + ' test/input/comments/filter.js --comments /r/';
-
         exec(command, function(err, stdout) {
             if (err) throw err;
-
             assert.strictEqual(stdout, "/*@preserve*/\n// bar\n\n");
             done();
         });
     });
     it("Should be able to filter comments correctly with just `--comment`", function(done) {
         var command = uglifyjscmd + ' test/input/comments/filter.js --comments';
-
         exec(command, function(err, stdout) {
             if (err) throw err;
-
             assert.strictEqual(stdout, "/*@preserve*/\n\n");
             done();
         });
     });
     it("Should give sensible error against invalid input source map", function(done) {
         var command = uglifyjscmd + " test/mocha.js --source-map content=blah,url=inline";
-
         exec(command, function(err, stdout, stderr) {
             assert.ok(err);
             assert.deepEqual(stderr.split(/\n/).slice(0, 2), [
@@ -70,36 +58,33 @@ describe("bin/uglifyjs", function () {
     });
     it("Should append source map to output when using --source-map url=inline", function(done) {
         var command = uglifyjscmd + " test/input/issue-1323/sample.js --source-map url=inline";
-
         exec(command, function(err, stdout) {
             if (err) throw err;
-
+            assert.strictEqual(stdout, [
-            assert.strictEqual(stdout, "var bar=function(){function foo(bar){return bar}return foo}();\n" +
+                "var bar=function(){function foo(bar){return bar}return foo}();",
-                "//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRlc3QvaW5wdXQvaXNzdWUtMTMyMy9zYW1wbGUuanMiXSwibmFtZXMiOlsiYmFyIiwiZm9vIl0sIm1hcHBpbmdzIjoiQUFBQSxJQUFJQSxJQUFNLFdBQ04sU0FBU0MsSUFBS0QsS0FDVixPQUFPQSxJQUdYLE9BQU9DLElBTEQifQ==\n");
+                "//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRlc3QvaW5wdXQvaXNzdWUtMTMyMy9zYW1wbGUuanMiXSwibmFtZXMiOlsiYmFyIiwiZm9vIl0sIm1hcHBpbmdzIjoiQUFBQSxJQUFJQSxJQUFNLFdBQ04sU0FBU0MsSUFBS0QsS0FDVixPQUFPQSxJQUdYLE9BQU9DLElBTEQifQ==",
+                "",
+            ].join("\n"));
             done();
         });
     });
-    it("should not append source map to output when not using --source-map url=inline", function (done) {
+    it("Should not append source map to output when not using --source-map url=inline", function(done) {
         var command = uglifyjscmd + ' test/input/issue-1323/sample.js';
-
         exec(command, function(err, stdout) {
             if (err) throw err;
-
             assert.strictEqual(stdout, "var bar=function(){function foo(bar){return bar}return foo}();\n");
             done();
         });
     });
-    it("should not consider source map file content as source map file name (issue #2082)", function (done) {
+    it("Should not consider source map file content as source map file name (issue #2082)", function(done) {
         var command = [
             uglifyjscmd,
             "test/input/issue-2082/sample.js",
             "--source-map", "content=test/input/issue-2082/sample.js.map",
             "--source-map", "url=inline",
         ].join(" ");
-
         exec(command, function(err, stdout, stderr) {
             if (err) throw err;
-
             var stderrLines = stderr.split("\n");
             assert.strictEqual(stderrLines[0], "INFO: Using input source map: test/input/issue-2082/sample.js.map");
             assert.notStrictEqual(stderrLines[1], 'INFO: Using input source map: {"version": 3,"sources": ["index.js"],"mappings": ";"}');
@@ -138,80 +123,64 @@ describe("bin/uglifyjs", function () {
     });
     it("Should work with --keep-fnames (mangle only)", function(done) {
         var command = uglifyjscmd + ' test/input/issue-1431/sample.js --keep-fnames -m';
-
         exec(command, function(err, stdout) {
             if (err) throw err;
-
             assert.strictEqual(stdout, "function f(r){return function(){function n(n){return n*n}return r(n)}}function g(n){return n(1)+n(2)}console.log(f(g)()==5);\n");
             done();
         });
     });
     it("Should work with --keep-fnames (mangle & compress)", function(done) {
         var command = uglifyjscmd + ' test/input/issue-1431/sample.js --keep-fnames -m -c unused=false';
-
         exec(command, function(err, stdout) {
             if (err) throw err;
-
             assert.strictEqual(stdout, "function f(r){return function(){function n(n){return n*n}return r(n)}}function g(n){return n(1)+n(2)}console.log(5==f(g)());\n");
             done();
         });
     });
     it("Should work with keep_fnames under mangler options", function(done) {
         var command = uglifyjscmd + ' test/input/issue-1431/sample.js -m keep_fnames=true';
-
         exec(command, function(err, stdout) {
             if (err) throw err;
-
             assert.strictEqual(stdout, "function f(r){return function(){function n(n){return n*n}return r(n)}}function g(n){return n(1)+n(2)}console.log(f(g)()==5);\n");
             done();
         });
     });
     it("Should work with --define (simple)", function(done) {
         var command = uglifyjscmd + ' test/input/global_defs/simple.js --define D=5 -c';
-
         exec(command, function(err, stdout) {
             if (err) throw err;
-
             assert.strictEqual(stdout, "console.log(5);\n");
             done();
         });
     });
     it("Should work with --define (nested)", function(done) {
         var command = uglifyjscmd + ' test/input/global_defs/nested.js --define C.D=5,C.V=3 -c';
-
         exec(command, function(err, stdout) {
             if (err) throw err;
-
             assert.strictEqual(stdout, "console.log(3,5);\n");
             done();
         });
     });
     it("Should work with --define (AST_Node)", function(done) {
         var command = uglifyjscmd + ' test/input/global_defs/simple.js --define console.log=stdout.println -c';
-
         exec(command, function(err, stdout) {
             if (err) throw err;
-
             assert.strictEqual(stdout, "stdout.println(D);\n");
             done();
         });
     });
     it("Should work with `--beautify`", function(done) {
         var command = uglifyjscmd + ' test/input/issue-1482/input.js -b';
-
         exec(command, function(err, stdout) {
             if (err) throw err;
-
             assert.strictEqual(stdout, read("test/input/issue-1482/default.js"));
             done();
         });
     });
     it("Should work with `--beautify braces`", function(done) {
         var command = uglifyjscmd + ' test/input/issue-1482/input.js -b braces';
-
         exec(command, function(err, stdout) {
             if (err) throw err;
-
             assert.strictEqual(stdout, read("test/input/issue-1482/braces.js"));
             done();
         });
@@ -225,20 +194,16 @@ describe("bin/uglifyjs", function () {
             "--source-map", "includeSources=true",
             "--source-map", "url=inline",
         ].join(" ");
-
         exec(command, function(err, stdout) {
             if (err) throw err;
-
             assert.strictEqual(stdout, read("test/input/issue-520/output.js"));
             done();
         });
     });
     it("Should warn for missing inline source map", function(done) {
         var command = uglifyjscmd + " test/input/issue-1323/sample.js --source-map content=inline,url=inline";
-
         exec(command, function(err, stdout, stderr) {
             if (err) throw err;
-
             assert.strictEqual(stdout, [
                 "var bar=function(){function foo(bar){return bar}return foo}();",
                 "//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRlc3QvaW5wdXQvaXNzdWUtMTMyMy9zYW1wbGUuanMiXSwibmFtZXMiOlsiYmFyIiwiZm9vIl0sIm1hcHBpbmdzIjoiQUFBQSxJQUFJQSxJQUFNLFdBQ04sU0FBU0MsSUFBS0QsS0FDVixPQUFPQSxJQUdYLE9BQU9DLElBTEQifQ==",
@@ -256,10 +221,8 @@ describe("bin/uglifyjs", function () {
             "test/input/issue-1323/sample.js",
             "--source-map", "content=inline,url=inline",
         ].join(" ");
-
         exec(command, function(err, stdout, stderr) {
             if (err) throw err;
-
             assert.strictEqual(stdout, [
                 "var Foo=function Foo(){console.log(1+2)};new Foo;var bar=function(){function foo(bar){return bar}return foo}();",
                 "//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInN0ZGluIiwidGVzdC9pbnB1dC9pc3N1ZS0xMzIzL3NhbXBsZS5qcyJdLCJuYW1lcyI6WyJGb28iLCJjb25zb2xlIiwibG9nIiwiYmFyIiwiZm9vIl0sIm1hcHBpbmdzIjoiQUFBQSxJQUFNQSxJQUFJLFNBQUFBLE1BQWdCQyxRQUFRQyxJQUFJLEVBQUUsSUFBTyxJQUFJRixJQ0FuRCxJQUFJRyxJQUFNLFdBQ04sU0FBU0MsSUFBS0QsS0FDVixPQUFPQSxJQUdYLE9BQU9DLElBTEQifQ==",
@@ -272,7 +235,6 @@ describe("bin/uglifyjs", function () {
     });
     it("Should fail with acorn and inline source map", function(done) {
         var command = uglifyjscmd + " test/input/issue-520/input.js --source-map content=inline,url=inline -p acorn";
-
         exec(command, function(err, stdout, stderr) {
             assert.ok(err);
             assert.strictEqual(stderr, "ERROR: inline source map only works with built-in parser\n");
@@ -281,7 +243,6 @@ describe("bin/uglifyjs", function () {
     });
     it("Should fail with SpiderMonkey and inline source map", function(done) {
         var command = uglifyjscmd + " test/input/issue-520/input.js --source-map content=inline,url=inline -p spidermonkey";
-
         exec(command, function(err, stdout, stderr) {
             assert.ok(err);
             assert.strictEqual(stderr, "ERROR: inline source map only works with built-in parser\n");
@@ -290,7 +251,6 @@ describe("bin/uglifyjs", function () {
     });
     it("Should fail with invalid syntax", function(done) {
         var command = uglifyjscmd + ' test/input/invalid/simple.js';
-
         exec(command, function(err, stdout, stderr) {
             assert.ok(err);
             var lines = stderr.split(/\n/);
@@ -303,7 +263,6 @@ describe("bin/uglifyjs", function () {
     });
     it("Should fail with correct marking of tabs", function(done) {
         var command = uglifyjscmd + ' test/input/invalid/tab.js';
-
         exec(command, function(err, stdout, stderr) {
             assert.ok(err);
             var lines = stderr.split(/\n/);
@@ -316,7 +275,6 @@ describe("bin/uglifyjs", function () {
     });
     it("Should fail with correct marking at start of line", function(done) {
         var command = uglifyjscmd + ' test/input/invalid/eof.js';
-
         exec(command, function(err, stdout, stderr) {
             assert.ok(err);
             var lines = stderr.split(/\n/);
@@ -329,7 +287,6 @@ describe("bin/uglifyjs", function () {
     });
     it("Should fail with a missing loop body", function(done) {
         var command = uglifyjscmd + ' test/input/invalid/loop-no-body.js';
-
         exec(command, function(err, stdout, stderr) {
             assert.ok(err);
             var lines = stderr.split(/\n/);
@@ -342,7 +299,6 @@ describe("bin/uglifyjs", function () {
     });
     it("Should throw syntax error (5--)", function(done) {
         var command = uglifyjscmd + ' test/input/invalid/assign_1.js';
-
         exec(command, function(err, stdout, stderr) {
             assert.ok(err);
             assert.strictEqual(stdout, "");
@@ -357,7 +313,6 @@ describe("bin/uglifyjs", function () {
     });
     it("Should throw syntax error (Math.random() /= 2)", function(done) {
         var command = uglifyjscmd + ' test/input/invalid/assign_2.js';
-
         exec(command, function(err, stdout, stderr) {
             assert.ok(err);
             assert.strictEqual(stdout, "");
@@ -372,7 +327,6 @@ describe("bin/uglifyjs", function () {
     });
     it("Should throw syntax error (++this)", function(done) {
         var command = uglifyjscmd + ' test/input/invalid/assign_3.js';
-
         exec(command, function(err, stdout, stderr) {
             assert.ok(err);
             assert.strictEqual(stdout, "");
@@ -387,7 +341,6 @@ describe("bin/uglifyjs", function () {
     });
     it("Should throw syntax error (++null)", function(done) {
         var command = uglifyjscmd + ' test/input/invalid/assign_4.js';
-
         exec(command, function(err, stdout, stderr) {
             assert.ok(err);
             assert.strictEqual(stdout, "");
@@ -402,7 +355,6 @@ describe("bin/uglifyjs", function () {
     });
     it("Should throw syntax error (a.=)", function(done) {
         var command = uglifyjscmd + ' test/input/invalid/dot_1.js';
-
         exec(command, function(err, stdout, stderr) {
             assert.ok(err);
             assert.strictEqual(stdout, "");
@@ -417,7 +369,6 @@ describe("bin/uglifyjs", function () {
     });
     it("Should throw syntax error (%.a)", function(done) {
         var command = uglifyjscmd + ' test/input/invalid/dot_2.js';
-
         exec(command, function(err, stdout, stderr) {
             assert.ok(err);
             assert.strictEqual(stdout, "");
@@ -432,7 +383,6 @@ describe("bin/uglifyjs", function () {
     });
     it("Should throw syntax error (a./();)", function(done) {
         var command = uglifyjscmd + ' test/input/invalid/dot_3.js';
-
         exec(command, function(err, stdout, stderr) {
             assert.ok(err);
             assert.strictEqual(stdout, "");
@@ -447,7 +397,6 @@ describe("bin/uglifyjs", function () {
     });
     it("Should throw syntax error ({%: 1})", function(done) {
         var command = uglifyjscmd + ' test/input/invalid/object.js';
-
         exec(command, function(err, stdout, stderr) {
             assert.ok(err);
             assert.strictEqual(stdout, "");
@@ -462,7 +411,6 @@ describe("bin/uglifyjs", function () {
     });
     it("Should throw syntax error (delete x)", function(done) {
         var command = uglifyjscmd + ' test/input/invalid/delete.js';
-
         exec(command, function(err, stdout, stderr) {
             assert.ok(err);
             assert.strictEqual(stdout, "");
@@ -477,7 +425,6 @@ describe("bin/uglifyjs", function () {
     });
     it("Should throw syntax error (function g(arguments))", function(done) {
         var command = uglifyjscmd + ' test/input/invalid/function_1.js';
-
         exec(command, function(err, stdout, stderr) {
             assert.ok(err);
             assert.strictEqual(stdout, "");
@@ -492,7 +439,6 @@ describe("bin/uglifyjs", function () {
     });
     it("Should throw syntax error (function eval())", function(done) {
         var command = uglifyjscmd + ' test/input/invalid/function_2.js';
-
         exec(command, function(err, stdout, stderr) {
             assert.ok(err);
             assert.strictEqual(stdout, "");
@@ -507,7 +453,6 @@ describe("bin/uglifyjs", function () {
     });
     it("Should throw syntax error (iife arguments())", function(done) {
         var command = uglifyjscmd + ' test/input/invalid/function_3.js';
-
         exec(command, function(err, stdout, stderr) {
             assert.ok(err);
             assert.strictEqual(stdout, "");
@@ -522,7 +467,6 @@ describe("bin/uglifyjs", function () {
     });
     it("Should throw syntax error (catch(eval))", function(done) {
         var command = uglifyjscmd + ' test/input/invalid/try.js';
-
         exec(command, function(err, stdout, stderr) {
             assert.ok(err);
             assert.strictEqual(stdout, "");
@@ -537,7 +481,6 @@ describe("bin/uglifyjs", function () {
     });
     it("Should throw syntax error (var eval)", function(done) {
         var command = uglifyjscmd + ' test/input/invalid/var.js';
-
         exec(command, function(err, stdout, stderr) {
             assert.ok(err);
             assert.strictEqual(stdout, "");
@@ -552,7 +495,6 @@ describe("bin/uglifyjs", function () {
     });
     it("Should throw syntax error (else)", function(done) {
         var command = uglifyjscmd + ' test/input/invalid/else.js';
-
         exec(command, function(err, stdout, stderr) {
             assert.ok(err);
             assert.strictEqual(stdout, "");
@@ -567,7 +509,6 @@ describe("bin/uglifyjs", function () {
     });
     it("Should throw syntax error (return)", function(done) {
         var command = uglifyjscmd + ' test/input/invalid/return.js';
-
         exec(command, function(err, stdout, stderr) {
             assert.ok(err);
             assert.strictEqual(stdout, "");
@@ -582,7 +523,6 @@ describe("bin/uglifyjs", function () {
     });
     it("Should throw syntax error (for-in init)", function(done) {
         var command = uglifyjscmd + ' test/input/invalid/for-in_1.js';
-
         exec(command, function(err, stdout, stderr) {
             assert.ok(err);
             assert.strictEqual(stdout, "");
@@ -597,7 +537,6 @@ describe("bin/uglifyjs", function () {
     });
     it("Should throw syntax error (for-in var)", function(done) {
         var command = uglifyjscmd + ' test/input/invalid/for-in_2.js';
-
         exec(command, function(err, stdout, stderr) {
             assert.ok(err);
             assert.strictEqual(stdout, "");
@@ -617,10 +556,8 @@ describe("bin/uglifyjs", function () {
             "--source-map",
             'content="' + read_map() + '",url=inline'
         ].join(" ");
-
         exec(command, function(err, stdout) {
             if (err) throw err;
-
             assert.strictEqual(stdout, [
                 '"use strict";var foo=function foo(x){return"foo "+x};console.log(foo("bar"));',
                 "//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImluZGV4LmpzIl0sIm5hbWVzIjpbImZvbyIsIngiLCJjb25zb2xlIiwibG9nIl0sIm1hcHBpbmdzIjoiYUFBQSxJQUFJQSxJQUFNLFNBQU5BLElBQU1DLEdBQUEsTUFBSyxPQUFTQSxHQUN4QkMsUUFBUUMsSUFBSUgsSUFBSSJ9",
@@ -642,10 +579,8 @@ describe("bin/uglifyjs", function () {
             "-c",
             "--source-map", "url=inline",
         ].join(" ");
-
         exec(command, function(err, stdout, stderr) {
             if (err) throw err;
-
             assert.strictEqual(stdout, [
                 'function foo(){return function(){console.log("PASS")}}foo()();',
                 "//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRlc3QvaW5wdXQvaXNzdWUtMjMxMC9pbnB1dC5qcyJdLCJuYW1lcyI6WyJmb28iLCJjb25zb2xlIiwibG9nIiwiZiJdLCJtYXBwaW5ncyI6IkFBQUEsU0FBU0EsTUFDTCxPQUFPLFdBQ0hDLFFBQVFDLElBQUksU0FLUkYsS0FDUkcifQ==",
@@ -658,7 +593,6 @@ describe("bin/uglifyjs", function () {
         var command = uglifyjscmd + " test/input/global_defs/simple.js -mco ast";
         exec(command, function(err, stdout) {
             if (err) throw err;
-
             var ast = JSON.parse(stdout);
             assert.strictEqual(ast._class, "AST_Toplevel");
             assert.ok(Array.isArray(ast.body));
@@ -676,20 +610,16 @@ describe("bin/uglifyjs", function () {
     });
     it("Should work with --mangle reserved=[]", function(done) {
         var command = uglifyjscmd + " test/input/issue-505/input.js -m reserved=[callback]";
-
         exec(command, function(err, stdout) {
             if (err) throw err;
-
             assert.strictEqual(stdout, 'function test(callback){"aaaaaaaaaaaaaaaa";callback(err,data);callback(err,data)}\n');
             done();
         });
     });
     it("Should work with --mangle reserved=false", function(done) {
         var command = uglifyjscmd + " test/input/issue-505/input.js -m reserved=false";
-
         exec(command, function(err, stdout) {
             if (err) throw err;
-
             assert.strictEqual(stdout, 'function test(a){"aaaaaaaaaaaaaaaa";a(err,data);a(err,data)}\n');
             done();
         });
@@ -744,4 +674,36 @@ describe("bin/uglifyjs", function () {
             done();
         });
     });
+    it("Should work with --enclose", function(done) {
+        var command = uglifyjscmd + " test/input/enclose/input.js --enclose";
+        exec(command, function(err, stdout, stderr) {
+            if (err) throw err;
+            assert.strictEqual(stdout, '(function(){function enclose(){console.log("test enclose")}enclose()})();\n');
+            done();
+        });
+    });
+    it("Should work with --enclose arg", function(done) {
+        var command = uglifyjscmd + " test/input/enclose/input.js --enclose undefined";
+        exec(command, function(err, stdout, stderr) {
+            if (err) throw err;
+            assert.strictEqual(stdout, '(function(undefined){function enclose(){console.log("test enclose")}enclose()})();\n');
+            done();
+        });
+    });
+    it("Should work with --enclose arg:value", function(done) {
+        var command = uglifyjscmd + " test/input/enclose/input.js --enclose window,undefined:window";
+        exec(command, function(err, stdout, stderr) {
+            if (err) throw err;
+            assert.strictEqual(stdout, '(function(window,undefined){function enclose(){console.log("test enclose")}enclose()})(window);\n');
+            done();
+        });
+    });
+    it("Should work with --enclose & --wrap", function(done) {
+        var command = uglifyjscmd + " test/input/enclose/input.js --enclose window,undefined:window --wrap exports";
+        exec(command, function(err, stdout, stderr) {
+            if (err) throw err;
+            assert.strictEqual(stdout, '(function(window,undefined){(function(exports){function enclose(){console.log("test enclose")}enclose()})(typeof exports=="undefined"?exports={}:exports)})(window);\n');
+            done();
+        });
+    });
 });

test/mocha/comment-filter.js

@@ -1,89 +0,0 @@
-var UglifyJS = require("../node");
-var assert = require("assert");
-
-describe("comment filters", function() {
-    it("Should be able to filter comments by passing regexp", function() {
-        var ast = UglifyJS.parse("/*!test1*/\n/*test2*/\n//!test3\n//test4\n<!--test5\n<!--!test6\n-->test7\n-->!test8");
-        assert.strictEqual(ast.print_to_string({comments: /^!/}), "/*!test1*/\n//!test3\n//!test6\n//!test8\n");
-    });
-
-    it("Should be able to filter comments with the 'all' option", function() {
-        var ast = UglifyJS.parse("/*!test1*/\n/*test2*/\n//!test3\n//test4\n<!--test5\n<!--!test6\n-->test7\n-->!test8");
-        assert.strictEqual(ast.print_to_string({comments: "all"}), "/*!test1*/\n/*test2*/\n//!test3\n//test4\n//test5\n//!test6\n//test7\n//!test8\n");
-    });
-
-    it("Should be able to filter commments with the 'some' option", function() {
-        var ast = UglifyJS.parse("// foo\n/*@preserve*/\n// bar\n/*@license*/\n//@license with the wrong comment type\n/*@cc_on something*/");
-        assert.strictEqual(ast.print_to_string({comments: "some"}), "/*@preserve*/\n/*@license*/\n/*@cc_on something*/");
-    });
-
-    it("Should be able to filter comments by passing a function", function() {
-        var ast = UglifyJS.parse("/*TEST 123*/\n//An other comment\n//8 chars.");
-        var f = function(node, comment) {
-            return comment.value.length === 8;
-        };
-
-        assert.strictEqual(ast.print_to_string({comments: f}), "/*TEST 123*/\n//8 chars.\n");
-    });
-
-    it("Should be able to filter comments by passing regex in string format", function() {
-        var ast = UglifyJS.parse("/*!test1*/\n/*test2*/\n//!test3\n//test4\n<!--test5\n<!--!test6\n-->test7\n-->!test8");
-        assert.strictEqual(ast.print_to_string({comments: "/^!/"}), "/*!test1*/\n//!test3\n//!test6\n//!test8\n");
-    });
-
-    it("Should be able to get the comment and comment type when using a function", function() {
-        var ast = UglifyJS.parse("/*!test1*/\n/*test2*/\n//!test3\n//test4\n<!--test5\n<!--!test6\n-->test7\n-->!test8");
-        var f = function(node, comment) {
-            return comment.type == "comment1" || comment.type == "comment3";
-        };
-
-        assert.strictEqual(ast.print_to_string({comments: f}), "//!test3\n//test4\n//test5\n//!test6\n");
-    });
-
-    it("Should be able to filter comments by passing a boolean", function() {
-        var ast = UglifyJS.parse("/*!test1*/\n/*test2*/\n//!test3\n//test4\n<!--test5\n<!--!test6\n-->test7\n-->!test8");
-
-        assert.strictEqual(ast.print_to_string({comments: true}), "/*!test1*/\n/*test2*/\n//!test3\n//test4\n//test5\n//!test6\n//test7\n//!test8\n");
-        assert.strictEqual(ast.print_to_string({comments: false}), "");
-    });
-
-    it("Should never be able to filter comment5 (shebangs)", function() {
-        var ast = UglifyJS.parse("#!Random comment\n//test1\n/*test2*/");
-        var f = function(node, comment) {
-            assert.strictEqual(comment.type === "comment5", false);
-
-            return true;
-        };
-
-        assert.strictEqual(ast.print_to_string({comments: f}), "#!Random comment\n//test1\n/*test2*/");
-    });
-
-    it("Should never be able to filter comment5 when using 'some' as filter", function() {
-        var ast = UglifyJS.parse("#!foo\n//foo\n/*@preserve*/\n/* please hide me */");
-        assert.strictEqual(ast.print_to_string({comments: "some"}), "#!foo\n/*@preserve*/");
-    });
-
-    it("Should have no problem on multiple calls", function() {
-        const options = {
-            comments: /ok/
-        };
-
-        assert.strictEqual(UglifyJS.parse("/* ok */ function a(){}").print_to_string(options), "/* ok */function a(){}");
-        assert.strictEqual(UglifyJS.parse("/* ok */ function a(){}").print_to_string(options), "/* ok */function a(){}");
-        assert.strictEqual(UglifyJS.parse("/* ok */ function a(){}").print_to_string(options), "/* ok */function a(){}");
-    });
-
-    it("Should handle shebang and preamble correctly", function() {
-        var code = UglifyJS.minify("#!/usr/bin/node\nvar x = 10;", {
-            output: { preamble: "/* Build */" }
-        }).code;
-        assert.strictEqual(code, "#!/usr/bin/node\n/* Build */\nvar x=10;");
-    });
-
-    it("Should handle preamble without shebang correctly", function() {
-        var code = UglifyJS.minify("var x = 10;", {
-            output: { preamble: "/* Build */" }
-        }).code;
-        assert.strictEqual(code, "/* Build */\nvar x=10;");
-    });
-});

test/mocha/comment.js

@@ -1,262 +0,0 @@
-var assert = require("assert");
-var uglify = require("../node");
-
-describe("Comment", function() {
-    it("Should recognize eol of single line comments", function() {
-        var tests = [
-            "//Some comment 1\n>",
-            "//Some comment 2\r>",
-            "//Some comment 3\r\n>",
-            "//Some comment 4\u2028>",
-            "//Some comment 5\u2029>"
-        ];
-
-        var fail = function(e) {
-            return e instanceof uglify.JS_Parse_Error &&
-                e.message === "Unexpected token: operator (>)" &&
-                e.line === 2 &&
-                e.col === 0;
-        }
-
-        for (var i = 0; i < tests.length; i++) {
-            assert.throws(function() {
-                uglify.parse(tests[i]);
-            }, fail, tests[i]);
-        }
-    });
-
-    it("Should update the position of a multiline comment correctly", function() {
-        var tests = [
-            "/*Some comment 1\n\n\n*/\n>\n\n\n\n\n\n",
-            "/*Some comment 2\r\n\r\n\r\n*/\r\n>\n\n\n\n\n\n",
-            "/*Some comment 3\r\r\r*/\r>\n\n\n\n\n\n",
-            "/*Some comment 4\u2028\u2028\u2028*/\u2028>\n\n\n\n\n\n",
-            "/*Some comment 5\u2029\u2029\u2029*/\u2029>\n\n\n\n\n\n"
-        ];
-
-        var fail = function(e) {
-            return e instanceof uglify.JS_Parse_Error &&
-                e.message === "Unexpected token: operator (>)" &&
-                e.line === 5 &&
-                e.col === 0;
-        }
-
-        for (var i = 0; i < tests.length; i++) {
-            assert.throws(function() {
-                uglify.parse(tests[i]);
-            }, fail, tests[i]);
-        }
-    });
-
-    it("Should handle comment within return correctly", function() {
-        var result = uglify.minify([
-            "function unequal(x, y) {",
-            "    return (",
-            "        // Either one",
-            "        x < y",
-            "        ||",
-            "        y < x",
-            "    );",
-            "}",
-        ].join("\n"), {
-            compress: false,
-            mangle: false,
-            output: {
-                beautify: true,
-                comments: "all",
-            },
-        });
-        if (result.error) throw result.error;
-        assert.strictEqual(result.code, [
-            "function unequal(x, y) {",
-            "    // Either one",
-            "    return x < y || y < x;",
-            "}",
-        ].join("\n"));
-    });
-
-    it("Should handle comment folded into return correctly", function() {
-        var result = uglify.minify([
-            "function f() {",
-            "    /* boo */ x();",
-            "    return y();",
-            "}",
-        ].join("\n"), {
-            mangle: false,
-            output: {
-                beautify: true,
-                comments: "all",
-            },
-        });
-        if (result.error) throw result.error;
-        assert.strictEqual(result.code, [
-            "function f() {",
-            "    /* boo */",
-            "    return x(), y();",
-            "}",
-        ].join("\n"));
-    });
-
-    it("Should not drop comments after first OutputStream", function() {
-        var code = "/* boo */\nx();";
-        var ast = uglify.parse(code);
-        var out1 = uglify.OutputStream({
-            beautify: true,
-            comments: "all",
-        });
-        ast.print(out1);
-        var out2 = uglify.OutputStream({
-            beautify: true,
-            comments: "all",
-        });
-        ast.print(out2);
-        assert.strictEqual(out1.get(), code);
-        assert.strictEqual(out2.get(), out1.get());
-    });
-
-    it("Should retain trailing comments", function() {
-        var code = [
-            "if (foo /* lost comment */ && bar /* lost comment */) {",
-            "    // this one is kept",
-            "    {/* lost comment */}",
-            "    !function() {",
-            "        // lost comment",
-            "    }();",
-            "    function baz() {/* lost comment */}",
-            "    // lost comment",
-            "}",
-            "// comments right before EOF are lost as well",
-        ].join("\n");
-        var result = uglify.minify(code, {
-            compress: false,
-            mangle: false,
-            output: {
-                beautify: true,
-                comments: "all",
-            },
-        });
-        if (result.error) throw result.error;
-        assert.strictEqual(result.code, code);
-    });
-
-    it("Should retain comments within braces", function() {
-        var code = [
-            "{/* foo */}",
-            "a({/* foo */});",
-            "while (a) {/* foo */}",
-            "switch (a) {/* foo */}",
-            "if (a) {/* foo */} else {/* bar */}",
-        ].join("\n\n");
-        var result = uglify.minify(code, {
-            compress: false,
-            mangle: false,
-            output: {
-                beautify: true,
-                comments: "all",
-            },
-        });
-        if (result.error) throw result.error;
-        assert.strictEqual(result.code, code);
-    });
-
-    it("Should correctly preserve new lines around comments", function() {
-        var tests = [
-            [
-                "// foo",
-                "// bar",
-                "x();",
-            ].join("\n"),
-            [
-                "// foo",
-                "/* bar */",
-                "x();",
-            ].join("\n"),
-            [
-                "// foo",
-                "/* bar */ x();",
-            ].join("\n"),
-            [
-                "/* foo */",
-                "// bar",
-                "x();",
-            ].join("\n"),
-            [
-                "/* foo */ // bar",
-                "x();",
-            ].join("\n"),
-            [
-                "/* foo */",
-                "/* bar */",
-                "x();",
-            ].join("\n"),
-            [
-                "/* foo */",
-                "/* bar */ x();",
-            ].join("\n"),
-            [
-                "/* foo */ /* bar */",
-                "x();",
-            ].join("\n"),
-            "/* foo */ /* bar */ x();",
-        ].forEach(function(code) {
-            var result = uglify.minify(code, {
-                compress: false,
-                mangle: false,
-                output: {
-                    beautify: true,
-                    comments: "all",
-                },
-            });
-            if (result.error) throw result.error;
-            assert.strictEqual(result.code, code);
-        });
-    });
-
-    it("Should preserve new line before comment without beautify", function() {
-        var code = [
-            "function f(){",
-            "/* foo */bar()}",
-        ].join("\n");
-        var result = uglify.minify(code, {
-            compress: false,
-            mangle: false,
-            output: {
-                comments: "all",
-            },
-        });
-        if (result.error) throw result.error;
-        assert.strictEqual(result.code, code);
-    });
-
-    it("Should preserve comments around IIFE", function() {
-        var result = uglify.minify("/*a*/(/*b*/function(){/*c*/}/*d*/)/*e*/();", {
-            compress: false,
-            mangle: false,
-            output: {
-                comments: "all",
-            },
-        });
-        if (result.error) throw result.error;
-        assert.strictEqual(result.code, "/*a*/ /*b*/(function(){/*c*/}/*d*/ /*e*/)();");
-    });
-
-    it("Should output line comments after statements", function() {
-        var result = uglify.minify([
-            "x()//foo",
-            "{y()//bar",
-            "}",
-        ].join("\n"), {
-            compress: false,
-            mangle: false,
-            output: {
-                comments: "all",
-            },
-        });
-        if (result.error) throw result.error;
-        assert.strictEqual(result.code, [
-            "x();//foo",
-            "{y();//bar",
-            "}",
-        ].join("\n"));
-    });
-});

test/mocha/comment_before_constant.js

@@ -1,22 +0,0 @@
-var Uglify = require('../../');
-var assert = require("assert");
-
-describe("comment before constant", function() {
-    var js = 'function f() { /*c1*/ var /*c2*/ foo = /*c3*/ false; return foo; }';
-
-    it("Should test comment before constant is retained and output after mangle.", function() {
-        var result = Uglify.minify(js, {
-            compress: { collapse_vars: false, reduce_vars: false },
-            output: { comments: true },
-        });
-        assert.strictEqual(result.code, 'function f(){/*c1*/var/*c2*/n=/*c3*/!1;return n}');
-    });
-
-    it("Should test code works when comments disabled.", function() {
-        var result = Uglify.minify(js, {
-            compress: { collapse_vars: false, reduce_vars: false },
-            output: { comments: false },
-        });
-        assert.strictEqual(result.code, 'function f(){var n=!1;return n}');
-    });
-});

test/mocha/comments.js

@@ -0,0 +1,380 @@
+var assert = require("assert");
+var UglifyJS = require("../node");
+
+describe("comments", function() {
+    it("Should recognize eol of single line comments", function() {
+        var tests = [
+            "//Some comment 1\n>",
+            "//Some comment 2\r>",
+            "//Some comment 3\r\n>",
+            "//Some comment 4\u2028>",
+            "//Some comment 5\u2029>"
+        ];
+
+        var fail = function(e) {
+            return e instanceof UglifyJS.JS_Parse_Error
+                && e.message === "Unexpected token: operator (>)"
+                && e.line === 2
+                && e.col === 0;
+        }
+
+        for (var i = 0; i < tests.length; i++) {
+            assert.throws(function() {
+                UglifyJS.parse(tests[i]);
+            }, fail, tests[i]);
+        }
+    });
+
+    it("Should update the position of a multiline comment correctly", function() {
+        var tests = [
+            "/*Some comment 1\n\n\n*/\n>\n\n\n\n\n\n",
+            "/*Some comment 2\r\n\r\n\r\n*/\r\n>\n\n\n\n\n\n",
+            "/*Some comment 3\r\r\r*/\r>\n\n\n\n\n\n",
+            "/*Some comment 4\u2028\u2028\u2028*/\u2028>\n\n\n\n\n\n",
+            "/*Some comment 5\u2029\u2029\u2029*/\u2029>\n\n\n\n\n\n"
+        ];
+
+        var fail = function(e) {
+            return e instanceof UglifyJS.JS_Parse_Error
+                && e.message === "Unexpected token: operator (>)"
+                && e.line === 5
+                && e.col === 0;
+        }
+
+        for (var i = 0; i < tests.length; i++) {
+            assert.throws(function() {
+                UglifyJS.parse(tests[i]);
+            }, fail, tests[i]);
+        }
+    });
+
+    it("Should handle comment within return correctly", function() {
+        var result = UglifyJS.minify([
+            "function unequal(x, y) {",
+            "    return (",
+            "        // Either one",
+            "        x < y",
+            "        ||",
+            "        y < x",
+            "    );",
+            "}",
+        ].join("\n"), {
+            compress: false,
+            mangle: false,
+            output: {
+                beautify: true,
+                comments: "all",
+            },
+        });
+        if (result.error) throw result.error;
+        assert.strictEqual(result.code, [
+            "function unequal(x, y) {",
+            "    // Either one",
+            "    return x < y || y < x;",
+            "}",
+        ].join("\n"));
+    });
+
+    it("Should handle comment folded into return correctly", function() {
+        var result = UglifyJS.minify([
+            "function f() {",
+            "    /* boo */ x();",
+            "    return y();",
+            "}",
+        ].join("\n"), {
+            mangle: false,
+            output: {
+                beautify: true,
+                comments: "all",
+            },
+        });
+        if (result.error) throw result.error;
+        assert.strictEqual(result.code, [
+            "function f() {",
+            "    /* boo */",
+            "    return x(), y();",
+            "}",
+        ].join("\n"));
+    });
+
+    it("Should not drop comments after first OutputStream", function() {
+        var code = "/* boo */\nx();";
+        var ast = UglifyJS.parse(code);
+        var out1 = UglifyJS.OutputStream({
+            beautify: true,
+            comments: "all",
+        });
+        ast.print(out1);
+        var out2 = UglifyJS.OutputStream({
+            beautify: true,
+            comments: "all",
+        });
+        ast.print(out2);
+        assert.strictEqual(out1.get(), code);
+        assert.strictEqual(out2.get(), out1.get());
+    });
+
+    it("Should retain trailing comments", function() {
+        var code = [
+            "if (foo /* lost comment */ && bar /* lost comment */) {",
+            "    // this one is kept",
+            "    {/* lost comment */}",
+            "    !function() {",
+            "        // lost comment",
+            "    }();",
+            "    function baz() {/* lost comment */}",
+            "    // lost comment",
+            "}",
+            "// comments right before EOF are lost as well",
+        ].join("\n");
+        var result = UglifyJS.minify(code, {
+            compress: false,
+            mangle: false,
+            output: {
+                beautify: true,
+                comments: "all",
+            },
+        });
+        if (result.error) throw result.error;
+        assert.strictEqual(result.code, code);
+    });
+
+    it("Should retain comments within braces", function() {
+        var code = [
+            "{/* foo */}",
+            "a({/* foo */});",
+            "while (a) {/* foo */}",
+            "switch (a) {/* foo */}",
+            "if (a) {/* foo */} else {/* bar */}",
+        ].join("\n\n");
+        var result = UglifyJS.minify(code, {
+            compress: false,
+            mangle: false,
+            output: {
+                beautify: true,
+                comments: "all",
+            },
+        });
+        if (result.error) throw result.error;
+        assert.strictEqual(result.code, code);
+    });
+
+    it("Should correctly preserve new lines around comments", function() {
+        var tests = [
+            [
+                "// foo",
+                "// bar",
+                "x();",
+            ].join("\n"),
+            [
+                "// foo",
+                "/* bar */",
+                "x();",
+            ].join("\n"),
+            [
+                "// foo",
+                "/* bar */ x();",
+            ].join("\n"),
+            [
+                "/* foo */",
+                "// bar",
+                "x();",
+            ].join("\n"),
+            [
+                "/* foo */ // bar",
+                "x();",
+            ].join("\n"),
+            [
+                "/* foo */",
+                "/* bar */",
+                "x();",
+            ].join("\n"),
+            [
+                "/* foo */",
+                "/* bar */ x();",
+            ].join("\n"),
+            [
+                "/* foo */ /* bar */",
+                "x();",
+            ].join("\n"),
+            "/* foo */ /* bar */ x();",
+        ].forEach(function(code) {
+            var result = UglifyJS.minify(code, {
+                compress: false,
+                mangle: false,
+                output: {
+                    beautify: true,
+                    comments: "all",
+                },
+            });
+            if (result.error) throw result.error;
+            assert.strictEqual(result.code, code);
+        });
+    });
+
+    it("Should preserve new line before comment without beautify", function() {
+        var code = [
+            "function f(){",
+            "/* foo */bar()}",
+        ].join("\n");
+        var result = UglifyJS.minify(code, {
+            compress: false,
+            mangle: false,
+            output: {
+                comments: "all",
+            },
+        });
+        if (result.error) throw result.error;
+        assert.strictEqual(result.code, code);
+    });
+
+    it("Should preserve comments around IIFE", function() {
+        var result = UglifyJS.minify("/*a*/(/*b*/function(){/*c*/}/*d*/)/*e*/();", {
+            compress: false,
+            mangle: false,
+            output: {
+                comments: "all",
+            },
+        });
+        if (result.error) throw result.error;
+        assert.strictEqual(result.code, "/*a*/ /*b*/(function(){/*c*/}/*d*/ /*e*/)();");
+    });
+
+    it("Should output line comments after statements", function() {
+        var result = UglifyJS.minify([
+            "x()//foo",
+            "{y()//bar",
+            "}",
+        ].join("\n"), {
+            compress: false,
+            mangle: false,
+            output: {
+                comments: "all",
+            },
+        });
+        if (result.error) throw result.error;
+        assert.strictEqual(result.code, [
+            "x();//foo",
+            "{y();//bar",
+            "}",
+        ].join("\n"));
+    });
+
+    describe("comment before constant", function() {
+        var js = 'function f() { /*c1*/ var /*c2*/ foo = /*c3*/ false; return foo; }';
+
+        it("Should test comment before constant is retained and output after mangle.", function() {
+            var result = UglifyJS.minify(js, {
+                compress: { collapse_vars: false, reduce_vars: false },
+                output: { comments: true },
+            });
+            assert.strictEqual(result.code, 'function f(){/*c1*/var/*c2*/n=/*c3*/!1;return n}');
+        });
+
+        it("Should test code works when comments disabled.", function() {
+            var result = UglifyJS.minify(js, {
+                compress: { collapse_vars: false, reduce_vars: false },
+                output: { comments: false },
+            });
+            assert.strictEqual(result.code, 'function f(){var n=!1;return n}');
+        });
+    });
+
+    describe("comment filters", function() {
+        it("Should be able to filter comments by passing regexp", function() {
+            var ast = UglifyJS.parse("/*!test1*/\n/*test2*/\n//!test3\n//test4\n<!--test5\n<!--!test6\n-->test7\n-->!test8");
+            assert.strictEqual(ast.print_to_string({comments: /^!/}), "/*!test1*/\n//!test3\n//!test6\n//!test8\n");
+        });
+
+        it("Should be able to filter comments with the 'all' option", function() {
+            var ast = UglifyJS.parse("/*!test1*/\n/*test2*/\n//!test3\n//test4\n<!--test5\n<!--!test6\n-->test7\n-->!test8");
+            assert.strictEqual(ast.print_to_string({comments: "all"}), "/*!test1*/\n/*test2*/\n//!test3\n//test4\n//test5\n//!test6\n//test7\n//!test8\n");
+        });
+
+        it("Should be able to filter commments with the 'some' option", function() {
+            var ast = UglifyJS.parse("// foo\n/*@preserve*/\n// bar\n/*@license*/\n//@license with the wrong comment type\n/*@cc_on something*/");
+            assert.strictEqual(ast.print_to_string({comments: "some"}), "/*@preserve*/\n/*@license*/\n/*@cc_on something*/");
+        });
+
+        it("Should be able to filter comments by passing a function", function() {
+            var ast = UglifyJS.parse("/*TEST 123*/\n//An other comment\n//8 chars.");
+            var f = function(node, comment) {
+                return comment.value.length === 8;
+            };
+
+            assert.strictEqual(ast.print_to_string({comments: f}), "/*TEST 123*/\n//8 chars.\n");
+        });
+
+        it("Should be able to filter comments by passing regex in string format", function() {
+            var ast = UglifyJS.parse("/*!test1*/\n/*test2*/\n//!test3\n//test4\n<!--test5\n<!--!test6\n-->test7\n-->!test8");
+            assert.strictEqual(ast.print_to_string({comments: "/^!/"}), "/*!test1*/\n//!test3\n//!test6\n//!test8\n");
+        });
+
+        it("Should be able to get the comment and comment type when using a function", function() {
+            var ast = UglifyJS.parse("/*!test1*/\n/*test2*/\n//!test3\n//test4\n<!--test5\n<!--!test6\n-->test7\n-->!test8");
+            var f = function(node, comment) {
+                return comment.type == "comment1" || comment.type == "comment3";
+            };
+
+            assert.strictEqual(ast.print_to_string({comments: f}), "//!test3\n//test4\n//test5\n//!test6\n");
+        });
+
+        it("Should be able to filter comments by passing a boolean", function() {
+            var ast = UglifyJS.parse("/*!test1*/\n/*test2*/\n//!test3\n//test4\n<!--test5\n<!--!test6\n-->test7\n-->!test8");
+
+            assert.strictEqual(ast.print_to_string({comments: true}), "/*!test1*/\n/*test2*/\n//!test3\n//test4\n//test5\n//!test6\n//test7\n//!test8\n");
+            assert.strictEqual(ast.print_to_string({comments: false}), "");
+        });
+
+        it("Should never be able to filter comment5 (shebangs)", function() {
+            var ast = UglifyJS.parse("#!Random comment\n//test1\n/*test2*/");
+            var f = function(node, comment) {
+                assert.strictEqual(comment.type === "comment5", false);
+
+                return true;
+            };
+
+            assert.strictEqual(ast.print_to_string({comments: f}), "#!Random comment\n//test1\n/*test2*/");
+        });
+
+        it("Should never be able to filter comment5 when using 'some' as filter", function() {
+            var ast = UglifyJS.parse("#!foo\n//foo\n/*@preserve*/\n/* please hide me */");
+            assert.strictEqual(ast.print_to_string({comments: "some"}), "#!foo\n/*@preserve*/");
+        });
+
+        it("Should have no problem on multiple calls", function() {
+            const options = {
+                comments: /ok/
+            };
+
+            assert.strictEqual(UglifyJS.parse("/* ok */ function a(){}").print_to_string(options), "/* ok */function a(){}");
+            assert.strictEqual(UglifyJS.parse("/* ok */ function a(){}").print_to_string(options), "/* ok */function a(){}");
+            assert.strictEqual(UglifyJS.parse("/* ok */ function a(){}").print_to_string(options), "/* ok */function a(){}");
+        });
+
+        it("Should handle shebang and preamble correctly", function() {
+            var code = UglifyJS.minify("#!/usr/bin/node\nvar x = 10;", {
+                output: { preamble: "/* Build */" }
+            }).code;
+            assert.strictEqual(code, "#!/usr/bin/node\n/* Build */\nvar x=10;");
+        });
+
+        it("Should handle preamble without shebang correctly", function() {
+            var code = UglifyJS.minify("var x = 10;", {
+                output: { preamble: "/* Build */" }
+            }).code;
+            assert.strictEqual(code, "/* Build */\nvar x=10;");
+        });
+    });
+
+    describe("Huge number of comments.", function() {
+        it("Should parse and compress code with thousands of consecutive comments", function() {
+            var js = "function lots_of_comments(x) { return 7 -";
+            for (var i = 1; i <= 5000; ++i) js += "// " + i + "\n";
+            for (; i <= 10000; ++i) js += "/* " + i + " */ /**/";
+            js += "x; }";
+            var result = UglifyJS.minify(js, { mangle: false });
+            assert.strictEqual(result.code, "function lots_of_comments(x){return 7-x}");
+        });
+    });
+});

test/mocha/directives.js

@@ -1,15 +1,13 @@
 var assert = require("assert");
-var uglify = require("../node");
+var UglifyJS = require("../node");
 
 describe("Directives", function() {
     it("Should allow tokenizer to store directives state", function() {
-        var tokenizer = uglify.tokenizer("", "foo.js");
+        var tokenizer = UglifyJS.tokenizer("", "foo.js");
-
         // Stack level 0
         assert.strictEqual(tokenizer.has_directive("use strict"), false);
         assert.strictEqual(tokenizer.has_directive("use asm"), false);
         assert.strictEqual(tokenizer.has_directive("use thing"), false);
-
         // Stack level 2
         tokenizer.push_directives_stack();
         tokenizer.push_directives_stack();
@@ -17,7 +15,6 @@ describe("Directives", function() {
         assert.strictEqual(tokenizer.has_directive("use strict"), true);
         assert.strictEqual(tokenizer.has_directive("use asm"), false);
         assert.strictEqual(tokenizer.has_directive("use thing"), false);
-
         // Stack level 3
         tokenizer.push_directives_stack();
         tokenizer.add_directive("use strict");
@@ -25,13 +22,11 @@ describe("Directives", function() {
         assert.strictEqual(tokenizer.has_directive("use strict"), true);
         assert.strictEqual(tokenizer.has_directive("use asm"), true);
         assert.strictEqual(tokenizer.has_directive("use thing"), false);
-
         // Stack level 2
         tokenizer.pop_directives_stack();
         assert.strictEqual(tokenizer.has_directive("use strict"), true);
         assert.strictEqual(tokenizer.has_directive("use asm"), false);
         assert.strictEqual(tokenizer.has_directive("use thing"), false);
-
         // Stack level 3
         tokenizer.push_directives_stack();
         tokenizer.add_directive("use thing");
@@ -39,142 +34,128 @@ describe("Directives", function() {
         assert.strictEqual(tokenizer.has_directive("use strict"), true);
         assert.strictEqual(tokenizer.has_directive("use asm"), false); // Directives are strict!
         assert.strictEqual(tokenizer.has_directive("use thing"), true);
-
         // Stack level 2
         tokenizer.pop_directives_stack();
         assert.strictEqual(tokenizer.has_directive("use strict"), true);
         assert.strictEqual(tokenizer.has_directive("use asm"), false);
         assert.strictEqual(tokenizer.has_directive("use thing"), false);
-
         // Stack level 1
         tokenizer.pop_directives_stack();
         assert.strictEqual(tokenizer.has_directive("use strict"), false);
         assert.strictEqual(tokenizer.has_directive("use asm"), false);
         assert.strictEqual(tokenizer.has_directive("use thing"), false);
-
         // Stack level 0
         tokenizer.pop_directives_stack();
         assert.strictEqual(tokenizer.has_directive("use strict"), false);
         assert.strictEqual(tokenizer.has_directive("use asm"), false);
         assert.strictEqual(tokenizer.has_directive("use thing"), false);
     });
-
     it("Should know which strings are directive and which ones are not", function() {
-        var test_directive = function(tokenizer, test) {
+        [
-            test.directives.map(function(directive) {
+            [
-                assert.strictEqual(tokenizer.has_directive(directive), true, directive + " in " + test.input);
+                '"use strict"\n',
-            });
+                [ "use strict"],
-            test.non_directives.map(function(fake_directive) {
+                [ "use asm"]
-                assert.strictEqual(tokenizer.has_directive(fake_directive), false, fake_directive + " in " + test.input);
+            ],
-            });
+            [
-        }
+                '"use\\\nstrict";',
-
+                [],
-        var tests = [
+                [ "use strict", "use\nstrict", "use \nstrict", "use asm" ]
-            {
+            ],
-                input: '"use strict"\n',
+            [
-                directives: ["use strict"],
+                '"use strict"\n"use asm"\n"use bar"\n',
-                non_directives: ["use asm"]
+                [ "use strict", "use asm", "use bar" ],
-            },
+                [ "use foo", "use\\x20strict" ]
-            {
+            ],
-                input: '"use\\\nstrict";',
+            [
-                directives: [],
+                '"use \\\nstrict";"use strict";',
-                non_directives: ["use strict", "use\nstrict", "use \nstrict", "use asm"]
+                [],
-            },
+                [ "use strict", "use\nstrict", "use \nstrict", "use asm" ]
-            {
+            ],
-                input: '"use strict"\n"use asm"\n"use bar"\n',
+            [
-                directives: ["use strict", "use asm", "use bar"],
+                '"\\76";',
-                non_directives: ["use foo", "use\\x20strict"]
+                [],
-            },
+                [ ">", "\\76" ]
-            {
+            ],
-                input: '"use \\\nstrict";"use strict";',
+            [
-                directives: [],
+                // no ; or newline
-                non_directives: ["use strict", "use\nstrict", "use \nstrict", "use asm"]
+                '"use strict"',
-            },
+                [],
-            {
+                [ "use strict", "use\nstrict", "use \nstrict", "use asm" ]
-                input: '"\\76";',
+            ],
-                directives: [],
+            [
-                non_directives: [">", "\\76"]
+                ';"use strict"',
-            },
+                [],
-            {
+                [ "use strict", "use\nstrict", "use \nstrict", "use asm" ]
-                input: '"use strict"', // no ; or newline
+            ],
-                directives: [],
-                non_directives: ["use strict", "use\nstrict", "use \nstrict", "use asm"]
-            },
-            {
-                input: ';"use strict"',
-                directives: [],
-                non_directives: ["use strict", "use\nstrict", "use \nstrict", "use asm"]
-            },
             // Duplicate above code but put it in a function
-            {
+            [
-                input: 'function foo() {"use strict"\n',
+                'function foo() {"use strict"\n',
-                directives: ["use strict"],
+                [ "use strict" ],
-                non_directives: ["use asm"]
+                [ "use asm" ]
-            },
+            ],
-            {
+            [
-                input: 'function foo() {"use\\\nstrict";',
+                'function foo() {"use\\\nstrict";',
-                directives: [],
+                [],
-                non_directives: ["use strict", "use\nstrict", "use \nstrict", "use asm"]
+                [ "use strict", "use\nstrict", "use \nstrict", "use asm" ]
-            },
+            ],
-            {
+            [
-                input: 'function foo() {"use strict"\n"use asm"\n"use bar"\n',
+                'function foo() {"use strict"\n"use asm"\n"use bar"\n',
-                directives: ["use strict", "use asm", "use bar"],
+                [ "use strict", "use asm", "use bar" ],
-                non_directives: ["use foo", "use\\x20strict"]
+                [ "use foo", "use\\x20strict" ]
-            },
+            ],
-            {
+            [
-                input: 'function foo() {"use \\\nstrict";"use strict";',
+                'function foo() {"use \\\nstrict";"use strict";',
-                directives: [],
+                [],
-                non_directives: ["use strict", "use\nstrict", "use \nstrict", "use asm"]
+                [ "use strict", "use\nstrict", "use \nstrict", "use asm" ]
-            },
+            ],
-            {
+            [
-                input: 'var foo = function() {"\\76";',
+                'var foo = function() {"\\76";',
-                directives: [],
+                [],
-                non_directives: [">", "\\76"]
+                [ ">", "\\76" ]
-            },
+            ],
-            {
+            [
-                input: 'var foo = function() {"use strict"', // no ; or newline
+                'var foo = function() {"use strict"', // no ; or newline
-                directives: [],
+                [],
-                non_directives: ["use strict", "use\nstrict", "use \nstrict", "use asm"]
+                [ "use strict", "use\nstrict", "use \nstrict", "use asm" ]
-            },
+            ],
-            {
+            [
-                input: 'var foo = function() {;"use strict"',
+                'var foo = function() {;"use strict"',
-                directives: [],
+                [],
-                non_directives: ["use strict", "use\nstrict", "use \nstrict", "use asm"]
+                [ "use strict", "use\nstrict", "use \nstrict", "use asm" ]
-            },
+            ],
             // Special cases
-            {
+            [
-                input: '"1";"2";"3";"4";;"5"',
+                '"1";"2";"3";"4";;"5"',
-                directives: ["1", "2", "3", "4"],
+                [ "1", "2", "3", "4" ],
-                non_directives: ["5", "6", "use strict", "use asm"]
+                [ "5", "6", "use strict", "use asm" ]
-            },
+            ],
-            {
+            [
-                input: 'if(1){"use strict";',
+                'if(1){"use strict";',
-                directives: [],
+                [],
-                non_directives: ["use strict", "use\nstrict", "use \nstrict", "use asm"]
+                [ "use strict", "use\nstrict", "use \nstrict", "use asm" ]
-            },
+            ],
-            {
+            [
-                input: '"use strict";try{"use asm";',
+                '"use strict";try{"use asm";',
-                directives: ["use strict"],
+                [ "use strict" ],
-                non_directives: ["use\nstrict", "use \nstrict", "use asm"]
+                [ "use\nstrict", "use \nstrict", "use asm" ]
-            }
+            ],
-        ];
+        ].forEach(function(test) {
-
+            var tokenizer = UglifyJS.tokenizer(test[0] + "]", "foo.js");
-        for (var i = 0; i < tests.length; i++) {
+            assert.throws(function() {
-            // Fail parser deliberately to get state at failure
+                UglifyJS.parse(tokenizer);
-            var tokenizer = uglify.tokenizer(tests[i].input + "]", "foo.js");
+            }, function(e) {
-
+                return e instanceof UglifyJS.JS_Parse_Error
-            try {
+                    && e.message === "Unexpected token: punc (])"
-                var parser = uglify.parse(tokenizer);
+            }, test[0]);
-                throw new Error("Expected parser to fail");
+            test[1].forEach(function(directive) {
-            } catch (e) {
+                assert.strictEqual(tokenizer.has_directive(directive), true, directive + " in " + test[0]);
-                assert.strictEqual(e instanceof uglify.JS_Parse_Error, true);
+            });
-                assert.strictEqual(e.message, "Unexpected token: punc (])");
+            test[2].forEach(function(fake_directive) {
-            }
+                assert.strictEqual(tokenizer.has_directive(fake_directive), false, fake_directive + " in " + test[0]);
-
+            });
-            test_directive(tokenizer, tests[i]);
+        });
-        }
     });
-
     it("Should test EXPECT_DIRECTIVE RegExp", function() {
         [
             [ "", true ],
@@ -184,27 +165,41 @@ describe("Directives", function() {
             [ "'tests'", false ],
             [ "'tests';   \n\t", true ],
             [ "'tests';\n\n", true ],
-            ["\n\n\"use strict\";\n\n", true]
+            [ "\n\n\"use strict\";\n\n", true ],
         ].forEach(function(test) {
-            var out = uglify.OutputStream();
+            var out = UglifyJS.OutputStream();
             out.print(test[0]);
             out.print_string("", null, true);
             assert.strictEqual(out.get() === test[0] + ';""', test[1], test[0]);
         });
     });
-
     it("Should only print 2 semicolons spread over 2 lines in beautify mode", function() {
-        assert.strictEqual(
+        var result = UglifyJS.minify([
-            uglify.minify(
+            '"use strict";',
-                '"use strict";\'use strict\';"use strict";"use strict";;\'use strict\';console.log(\'use strict\');',
+            "'use strict';",
-                {output: {beautify: true, quote_style: 3}, compress: false}
+            '"use strict";',
-            ).code,
+            '"use strict";;',
-            '"use strict";\n\n\'use strict\';\n\n"use strict";\n\n"use strict";\n\n;\'use strict\';\n\nconsole.log(\'use strict\');'
+            "'use strict';",
-        );
+            "console.log('use strict');"
+        ].join(""), {
+            compress: false,
+            output: {
+                beautify: true,
+                quote_style: 3
+            }
+        });
+        if (result.error) throw result.error;
+        assert.strictEqual(result.code, [
+            '"use strict";',
+            "'use strict';",
+            '"use strict";',
+            '"use strict";',
+            ";'use strict';",
+            "console.log('use strict');"
+        ].join("\n\n"));
     });
-
     it("Should not add double semicolons in non-scoped block statements to avoid strings becoming directives", function() {
-        var tests = [
+        [
             [
                 '{"use\x20strict"}',
                 '{"use strict"}'
@@ -221,26 +216,27 @@ describe("Directives", function() {
                 'if(1){"use\x20strict"} else {"use strict"}',
                 'if(1){"use strict"}else{"use strict"}'
             ]
-        ];
+        ].forEach(function(test) {
-
+            var result = UglifyJS.minify(test[0], {
-        for (var i = 0; i < tests.length; i++) {
+                compress: false,
-            assert.strictEqual(
+                mangle: false
-                uglify.minify(tests[i][0], {compress: false, mangle: false}).code,
+            });
-                tests[i][1],
+            if (result.error) throw result.error;
-                tests[i][0]
+            assert.strictEqual(result.code, test[1], test[0]);
-            );
+        });
+    });
+    it("Should add double semicolon when relying on automatic semicolon insertion", function() {
+        var result = UglifyJS.minify('"use strict";"use\\x20strict";', {
+            compress: false,
+            output: {
+                semicolons: false
             }
         });
-
+        if (result.error) throw result.error;
-    it("Should add double semicolon when relying on automatic semicolon insertion", function() {
+        assert.strictEqual(result.code, '"use strict";;"use strict"\n');
-        var code = uglify.minify('"use strict";"use\\x20strict";',
-            {output: {semicolons: false}, compress: false}
-        ).code;
-        assert.strictEqual(code, '"use strict";;"use strict"\n');
     });
-
     it("Should check quote style of directives", function() {
-        var tests = [
+        [
             // 0. Prefer double quotes, unless string contains more double quotes than single quotes
             [
                 '"testing something";',
@@ -337,45 +333,53 @@ describe("Directives", function() {
                 3,
                 "'\"use strict\"';",
             ],
-        ];
+        ].forEach(function(test) {
-        for (var i = 0; i < tests.length; i++) {
+            var result = UglifyJS.minify(test[0], {
-            assert.strictEqual(
+                compress: false,
-                uglify.minify(tests[i][0], {output:{quote_style: tests[i][1]}, compress: false}).code,
+                output: {
-                tests[i][2],
+                    quote_style: test[1]
-                tests[i][0] + " using mode " + tests[i][1]
-            );
                 }
             });
+            if (result.error) throw result.error;
+            assert.strictEqual(result.code, test[2], test[0] + " using mode " + test[1]);
+        });
+    });
     it("Should be able to compress without side effects", function() {
-        // NOTE: the "use asm" directive disables any optimisation after being defined
+        [
-        var tests = [
             [
                 '"use strict";"use strict";"use strict";"use foo";"use strict";;"use sloppy";doSomething("foo");',
-                '"use strict";"use foo";doSomething("foo");',
+                '"use strict";doSomething("foo");'
-                'function f(){ "use strict" }',
-                'function f(){ "use asm" }',
-                'function f(){ "use nondirective" }',
-                'function f(){ ;"use strict" }',
-                'function f(){ "use \n"; }',
             ],
             [
                 // Nothing gets optimised in the compressor because "use asm" is the first statement
                 '"use asm";"use\\x20strict";1+1;',
-                '"use asm";;"use strict";1+1;', // Yet, the parser noticed that "use strict" wasn't a directive
+                // Yet, the parser noticed that "use strict" wasn't a directive
+                '"use asm";;"use strict";1+1;',
+            ],
+            [
                 'function f(){ "use strict" }',
+                'function f(){}'
+            ],
+            [
                 'function f(){ "use asm" }',
+                'function f(){"use asm"}'
+            ],
+            [
                 'function f(){ "use nondirective" }',
-                'function f(){}',
+                'function f(){}'
-                'function f(){}',
+            ],
-            ]
+            [
-        ];
+                'function f(){ ;"use strict" }',
-
+                'function f(){}'
-        for (var i = 0; i < tests.length; i++) {
+            ],
-            assert.strictEqual(
+            [
-                uglify.minify(tests[i][0]).code,
+                'function f(){ "use \\n"; }',
-                tests[i][1],
+                'function f(){}'
-                tests[i][0]
+            ],
-            );
+        ].forEach(function(test) {
-        }
+            var result = UglifyJS.minify(test[0]);
+            if (result.error) throw result.error;
+            assert.strictEqual(result.code, test[1], test[0]);
+        });
     });
 });

test/mocha/getter-setter.js

@@ -1,5 +1,5 @@
-var UglifyJS = require("../node");
 var assert = require("assert");
+var UglifyJS = require("../node");
 
 describe("Getters and setters", function() {
     it("Should not accept operator symbols as getter/setter name", function() {
@@ -61,29 +61,24 @@ describe("Getters and setters", function() {
 
             return results;
         };
-
         var testCase = function(data) {
             return function() {
                 UglifyJS.parse(data.code);
             };
         };
-
         var fail = function(data) {
             return function(e) {
-                return e instanceof UglifyJS.JS_Parse_Error &&
+                return e instanceof UglifyJS.JS_Parse_Error
-                    e.message === "Unexpected token: operator (" + data.operator + ")";
+                    && e.message === "Unexpected token: operator (" + data.operator + ")";
             };
         };
-
         var errorMessage = function(data) {
             return "Expected but didn't get a syntax error while parsing following line:\n" + data.code;
         };
-
         var tests = generator();
         for (var i = 0; i < tests.length; i++) {
             var test = tests[i];
             assert.throws(testCase(test), fail(test), errorMessage(test));
         }
     });
-
 });

test/mocha/glob.js

@@ -35,7 +35,7 @@ describe("bin/uglifyjs with input file globs", function() {
             done();
         });
     });
-    it("should throw with non-matching glob string", function(done) {
+    it("Should throw with non-matching glob string", function(done) {
         var command = uglifyjscmd + ' "test/input/issue-1242/blah.*"';
 
         exec(command, function(err, stdout, stderr) {
@@ -53,7 +53,7 @@ describe("bin/uglifyjs with input file globs", function() {
             done();
         });
     });
-    it("should handle special characters in glob string", function(done) {
+    it("Should handle special characters in glob string", function(done) {
         var command = uglifyjscmd + ' "test/input/issue-1632/^{*}[???](*)+$.??" -cm';
 
         exec(command, function(err, stdout) {
@@ -63,7 +63,7 @@ describe("bin/uglifyjs with input file globs", function() {
             done();
         });
     });
-    it("should handle array of glob strings - matching and otherwise", function(done) {
+    it("Should handle array of glob strings - matching and otherwise", function(done) {
         var dir = "test/input/issue-1242";
         var command = uglifyjscmd + ' "' + [
             path.join(dir, "b*.es5"),

test/mocha/huge-number-of-comments.js

@@ -1,14 +0,0 @@
-var Uglify = require('../../');
-var assert = require("assert");
-
-describe("Huge number of comments.", function() {
-    it("Should parse and compress code with thousands of consecutive comments", function() {
-        var js = 'function lots_of_comments(x) { return 7 -';
-        var i;
-        for (i = 1; i <= 5000; ++i) { js += "// " + i + "\n"; }
-        for (; i <= 10000; ++i) { js += "/* " + i + " */ /**/"; }
-        js += "x; }";
-        var result = Uglify.minify(js, { mangle: false });
-        assert.strictEqual(result.code, "function lots_of_comments(x){return 7-x}");
-    });
-});

test/mocha/ie8.js

@@ -0,0 +1,21 @@
+var assert = require("assert");
+var UglifyJS = require("../..");
+
+describe("ie8", function() {
+    it("Should be able to minify() with undefined as catch parameter in a try...catch statement", function() {
+        assert.strictEqual(
+            UglifyJS.minify([
+                "function a(b){",
+                "    try {",
+                "        throw 'Stuff';",
+                "    } catch (undefined) {",
+                "        console.log('caught: ' + undefined);",
+                "    }",
+                "    console.log('undefined is ' + undefined);",
+                "    return b === undefined;",
+                "};",
+            ].join("\n")).code,
+            'function a(o){try{throw"Stuff"}catch(o){console.log("caught: "+o)}return console.log("undefined is "+void 0),void 0===o}'
+        );
+    });
+});

test/mocha/input-sourcemaps.js

@@ -1,68 +0,0 @@
-var assert = require("assert");
-var Uglify = require("../../");
-var SourceMapConsumer = require("source-map").SourceMapConsumer;
-
-function getMap() {
-    return {
-        "version": 3,
-        "sources": ["index.js"],
-        "names": [],
-        "mappings": ";;AAAA,IAAI,MAAM,SAAN,GAAM;AAAA,SAAK,SAAS,CAAd;AAAA,CAAV;AACA,QAAQ,GAAR,CAAY,IAAI,KAAJ,CAAZ",
-        "file": "bundle.js",
-        "sourcesContent": ["let foo = x => \"foo \" + x;\nconsole.log(foo(\"bar\"));"]
-    };
-}
-
-function prepareMap(sourceMap) {
-    var code = [
-        '"use strict";',
-        "",
-        "var foo = function foo(x) {",
-        '  return "foo " + x;',
-        "};",
-        'console.log(foo("bar"));',
-        "",
-        "//# sourceMappingURL=bundle.js.map",
-    ].join("\n");
-    var result = Uglify.minify(code, {
-        sourceMap: {
-            content: sourceMap,
-            includeSources: true,
-        }
-    });
-    if (result.error) throw result.error;
-    return new SourceMapConsumer(result.map);
-}
-
-describe("input sourcemaps", function() {
-    it("Should copy over original sourcesContent", function() {
-        var orig = getMap();
-        var map = prepareMap(orig);
-        assert.equal(map.sourceContentFor("index.js"), orig.sourcesContent[0]);
-    });
-
-    it("Should copy sourcesContent if sources are relative", function() {
-        var relativeMap = getMap();
-        relativeMap.sources = ['./index.js'];
-        var map = prepareMap(relativeMap);
-        assert.notEqual(map.sourcesContent, null);
-        assert.equal(map.sourcesContent.length, 1);
-        assert.equal(map.sourceContentFor("index.js"), relativeMap.sourcesContent[0]);
-    });
-
-    it("Should not have invalid mappings from inputSourceMap (issue #882)", function() {
-        var map = prepareMap(getMap());
-        // The original source has only 2 lines, check that mappings don't have more lines
-        var msg = "Mapping should not have higher line number than the original file had";
-        map.eachMapping(function(mapping) {
-            assert.ok(mapping.originalLine <= 2, msg);
-        });
-        map.allGeneratedPositionsFor({
-            source: "index.js",
-            line: 1,
-            column: 1
-        }).forEach(function(pos) {
-            assert.ok(pos.line <= 2, msg);
-        });
-    });
-});

test/mocha/let.js

@@ -1,5 +1,5 @@
-var Uglify = require('../../');
 var assert = require("assert");
+var UglifyJS = require("../..");
 
 describe("let", function() {
     this.timeout(30000);
@@ -10,7 +10,7 @@ describe("let", function() {
             s += "var v" + i + "=0;";
         }
         s += '}';
-        var result = Uglify.minify(s, {
+        var result = UglifyJS.minify(s, {
             compress: false
         }).code;
 
@@ -39,7 +39,7 @@ describe("let", function() {
         for (var i = 0; i < 18000; i++) {
             s += "v.b" + i + ";";
         }
-        var result = Uglify.minify(s, {
+        var result = UglifyJS.minify(s, {
             compress: false,
             ie8: true,
             mangle: {

test/mocha/line-endings.js

@@ -1,5 +1,5 @@
-var Uglify = require("../node");
 var assert = require("assert");
+var UglifyJS = require("../node");
 
 describe("line-endings", function() {
     var options = {
@@ -14,19 +14,19 @@ describe("line-endings", function() {
 
     it("Should parse LF line endings", function() {
         var js = '/*!one\n2\n3*///comment\nfunction f(x) {\n if (x)\n//comment\n  return 3;\n}\n';
-        var result = Uglify.minify(js, options);
+        var result = UglifyJS.minify(js, options);
         assert.strictEqual(result.code, expected_code);
     });
 
     it("Should parse CR/LF line endings", function() {
         var js = '/*!one\r\n2\r\n3*///comment\r\nfunction f(x) {\r\n if (x)\r\n//comment\r\n  return 3;\r\n}\r\n';
-        var result = Uglify.minify(js, options);
+        var result = UglifyJS.minify(js, options);
         assert.strictEqual(result.code, expected_code);
     });
 
     it("Should parse CR line endings", function() {
         var js = '/*!one\r2\r3*///comment\rfunction f(x) {\r if (x)\r//comment\r  return 3;\r}\r';
-        var result = Uglify.minify(js, options);
+        var result = UglifyJS.minify(js, options);
         assert.strictEqual(result.code, expected_code);
     });
 
@@ -44,16 +44,15 @@ describe("line-endings", function() {
         ]
         var test = function(input) {
             return function() {
-                Uglify.parse(input);
+                UglifyJS.parse(input);
             }
         }
         var fail = function(e) {
-            return e instanceof Uglify.JS_Parse_Error &&
+            return e instanceof UglifyJS.JS_Parse_Error
-                e.message === "Unexpected line terminator";
+                && e.message === "Unexpected line terminator";
         }
         for (var i = 0; i < inputs.length; i++) {
             assert.throws(test(inputs[i]), fail);
         }
     });
 });
-

test/mocha/minify-file-map.js

@@ -1,22 +1,22 @@
-var Uglify = require('../../');
 var assert = require("assert");
+var UglifyJS = require("../..");
 
 describe("Input file as map", function() {
     it("Should accept object", function() {
         var jsMap = {
             '/scripts/foo.js': 'var foo = {"x": 1, y: 2, \'z\': 3};'
         };
-        var result = Uglify.minify(jsMap, {sourceMap: true});
+        var result = UglifyJS.minify(jsMap, {sourceMap: true});
 
         var map = JSON.parse(result.map);
         assert.strictEqual(result.code, 'var foo={x:1,y:2,z:3};');
         assert.deepEqual(map.sources, ['/scripts/foo.js']);
         assert.strictEqual(map.file, undefined);
 
-        result = Uglify.minify(jsMap);
+        result = UglifyJS.minify(jsMap);
         assert.strictEqual(result.map, undefined);
 
-        result = Uglify.minify(jsMap, {sourceMap: {filename: 'out.js'}});
+        result = UglifyJS.minify(jsMap, {sourceMap: {filename: 'out.js'}});
         map = JSON.parse(result.map);
         assert.strictEqual(map.file, 'out.js');
     });
@@ -26,7 +26,7 @@ describe("Input file as map", function() {
             'var foo = {"x": 1, y: 2, \'z\': 3};',
             'var bar = 15;'
         ];
-        var result = Uglify.minify(jsSeq, {sourceMap: true});
+        var result = UglifyJS.minify(jsSeq, {sourceMap: true});
 
         var map = JSON.parse(result.map);
         assert.strictEqual(result.code, 'var foo={x:1,y:2,z:3},bar=15;');
@@ -37,7 +37,7 @@ describe("Input file as map", function() {
         var jsMap = {
             '/scripts/foo.js': 'var foo = {"x": 1, y: 2, \'z\': 3};'
         };
-        var result = Uglify.minify(jsMap, {sourceMap: {includeSources: true}});
+        var result = UglifyJS.minify(jsMap, {sourceMap: {includeSources: true}});
 
         var map = JSON.parse(result.map);
         assert.strictEqual(result.code, 'var foo={x:1,y:2,z:3};');

test/mocha/minify.js

@@ -1,7 +1,7 @@
-var Uglify = require('../../');
 var assert = require("assert");
 var readFileSync = require("fs").readFileSync;
 var run_code = require("../sandbox").run_code;
+var UglifyJS = require("../../");
 
 function read(path) {
     return readFileSync(path, "utf8");
@@ -10,14 +10,14 @@ function read(path) {
 describe("minify", function() {
     it("Should test basic sanity of minify with default options", function() {
         var js = 'function foo(bar) { if (bar) return 3; else return 7; var u = not_called(); }';
-        var result = Uglify.minify(js);
+        var result = UglifyJS.minify(js);
         assert.strictEqual(result.code, 'function foo(n){return n?3:7}');
     });
 
     it("Should skip inherited keys from `files`", function() {
         var files = Object.create({ skip: this });
         files[0] = "alert(1 + 1)";
-        var result = Uglify.minify(files);
+        var result = UglifyJS.minify(files);
         assert.strictEqual(result.code, "alert(2);");
     });
 
@@ -32,7 +32,7 @@ describe("minify", function() {
             "qux.js",
         ].forEach(function(file) {
             var code = read("test/input/issue-1242/" + file);
-            var result = Uglify.minify(code, {
+            var result = UglifyJS.minify(code, {
                 mangle: {
                     cache: cache,
                     toplevel: true
@@ -65,7 +65,7 @@ describe("minify", function() {
             "qux.js",
         ].forEach(function(file) {
             var code = read("test/input/issue-1242/" + file);
-            var result = Uglify.minify(code, {
+            var result = UglifyJS.minify(code, {
                 mangle: {
                     toplevel: true
                 },
@@ -96,7 +96,7 @@ describe("minify", function() {
             '"xxyyy";var j={t:2,u:3},k=4;',
             'console.log(i.s,j.t,j.u,k);',
         ].forEach(function(code) {
-            var result = Uglify.minify(code, {
+            var result = UglifyJS.minify(code, {
                 compress: false,
                 mangle: {
                     properties: true,
@@ -117,15 +117,15 @@ describe("minify", function() {
     });
 
     it("Should not parse invalid use of reserved words", function() {
-        assert.strictEqual(Uglify.minify("function enum(){}").error, undefined);
+        assert.strictEqual(UglifyJS.minify("function enum(){}").error, undefined);
-        assert.strictEqual(Uglify.minify("function static(){}").error, undefined);
+        assert.strictEqual(UglifyJS.minify("function static(){}").error, undefined);
-        assert.strictEqual(Uglify.minify("function this(){}").error.message, "Unexpected token: name (this)");
+        assert.strictEqual(UglifyJS.minify("function this(){}").error.message, "Unexpected token: name (this)");
     });
 
     describe("keep_quoted_props", function() {
         it("Should preserve quotes in object literals", function() {
             var js = 'var foo = {"x": 1, y: 2, \'z\': 3};';
-            var result = Uglify.minify(js, {
+            var result = UglifyJS.minify(js, {
                 output: {
                     keep_quoted_props: true
                 }});
@@ -134,7 +134,7 @@ describe("minify", function() {
 
         it("Should preserve quote styles when quote_style is 3", function() {
             var js = 'var foo = {"x": 1, y: 2, \'z\': 3};';
-            var result = Uglify.minify(js, {
+            var result = UglifyJS.minify(js, {
                 output: {
                     keep_quoted_props: true,
                     quote_style: 3
@@ -144,7 +144,7 @@ describe("minify", function() {
 
         it("Should not preserve quotes in object literals when disabled", function() {
             var js = 'var foo = {"x": 1, y: 2, \'z\': 3};';
-            var result = Uglify.minify(js, {
+            var result = UglifyJS.minify(js, {
                 output: {
                     keep_quoted_props: false,
                     quote_style: 3
@@ -156,7 +156,7 @@ describe("minify", function() {
     describe("mangleProperties", function() {
         it("Shouldn't mangle quoted properties", function() {
             var js = 'a["foo"] = "bar"; a.color = "red"; x = {"bar": 10};';
-            var result = Uglify.minify(js, {
+            var result = UglifyJS.minify(js, {
                 compress: {
                     properties: false
                 },
@@ -174,7 +174,7 @@ describe("minify", function() {
                     'a["foo"]="bar",a.a="red",x={"bar":10};');
         });
         it("Should not mangle quoted property within dead code", function() {
-            var result = Uglify.minify('({ "keep": 1 }); g.keep = g.change;', {
+            var result = UglifyJS.minify('({ "keep": 1 }); g.keep = g.change;', {
                 mangle: {
                     properties: {
                         keep_quoted: true
@@ -187,8 +187,8 @@ describe("minify", function() {
     });
 
     describe("#__PURE__", function() {
-        it("should drop #__PURE__ hint after use", function() {
+        it("Should drop #__PURE__ hint after use", function() {
-            var result = Uglify.minify('//@__PURE__ comment1 #__PURE__ comment2\n foo(), bar();', {
+            var result = UglifyJS.minify('//@__PURE__ comment1 #__PURE__ comment2\n foo(), bar();', {
                 output: {
                     comments: "all",
                     beautify: false,
@@ -197,8 +197,8 @@ describe("minify", function() {
             var code = result.code;
             assert.strictEqual(code, "//  comment1   comment2\nbar();");
         });
-        it("should drop #__PURE__ hint if function is retained", function() {
+        it("Should drop #__PURE__ hint if function is retained", function() {
-            var result = Uglify.minify("var a = /*#__PURE__*/(function(){ foo(); })();", {
+            var result = UglifyJS.minify("var a = /*#__PURE__*/(function(){ foo(); })();", {
                 output: {
                     comments: "all",
                     beautify: false,
@@ -210,8 +210,8 @@ describe("minify", function() {
     });
 
     describe("JS_Parse_Error", function() {
-        it("should return syntax error", function() {
+        it("Should return syntax error", function() {
-            var result = Uglify.minify("function f(a{}");
+            var result = UglifyJS.minify("function f(a{}");
             var err = result.error;
             assert.ok(err instanceof Error);
             assert.strictEqual(err.stack.split(/\n/)[0], "SyntaxError: Unexpected token punc «{», expected punc «,»");
@@ -219,8 +219,8 @@ describe("minify", function() {
             assert.strictEqual(err.line, 1);
             assert.strictEqual(err.col, 12);
         });
-        it("should reject duplicated label name", function() {
+        it("Should reject duplicated label name", function() {
-            var result = Uglify.minify("L:{L:{}}");
+            var result = UglifyJS.minify("L:{L:{}}");
             var err = result.error;
             assert.ok(err instanceof Error);
             assert.strictEqual(err.stack.split(/\n/)[0], "SyntaxError: Label L defined twice");
@@ -231,8 +231,8 @@ describe("minify", function() {
     });
 
     describe("global_defs", function() {
-        it("should throw for non-trivial expressions", function() {
+        it("Should throw for non-trivial expressions", function() {
-            var result = Uglify.minify("alert(42);", {
+            var result = UglifyJS.minify("alert(42);", {
                 compress: {
                     global_defs: {
                         "@alert": "debugger"
@@ -243,10 +243,10 @@ describe("minify", function() {
             assert.ok(err instanceof Error);
             assert.strictEqual(err.stack.split(/\n/)[0], "SyntaxError: Unexpected token: keyword (debugger)");
         });
-        it("should skip inherited properties", function() {
+        it("Should skip inherited properties", function() {
             var foo = Object.create({ skip: this });
             foo.bar = 42;
-            var result = Uglify.minify("alert(FOO);", {
+            var result = UglifyJS.minify("alert(FOO);", {
                 compress: {
                     global_defs: {
                         FOO: foo
@@ -266,7 +266,7 @@ describe("minify", function() {
                 "}",
                 "f();",
             ].join("\n");
-            var ast = Uglify.minify(code, {
+            var ast = UglifyJS.minify(code, {
                 compress: false,
                 mangle: false,
                 output: {
@@ -279,7 +279,7 @@ describe("minify", function() {
             assert.strictEqual(ast.body[0].body.length, 2);
             assert.strictEqual(ast.body[0].body[0].TYPE, "SimpleStatement");
             var stat = ast.body[0].body[0];
-            Uglify.minify(ast, {
+            UglifyJS.minify(ast, {
                 compress: {
                     sequences: false
                 },
@@ -294,7 +294,7 @@ describe("minify", function() {
         it("Should be repeatable", function() {
             var code = "!function(x){return x(x)}(y);";
             for (var i = 0; i < 2; i++) {
-                assert.strictEqual(Uglify.minify(code, {
+                assert.strictEqual(UglifyJS.minify(code, {
                     compress: {
                         toplevel: true,
                     },
@@ -303,4 +303,45 @@ describe("minify", function() {
             }
         });
     });
+
+    describe("enclose", function() {
+        var code = read("test/input/enclose/input.js");
+        it("Should work with true", function() {
+            var result = UglifyJS.minify(code, {
+                compress: false,
+                enclose: true,
+                mangle: false,
+            });
+            if (result.error) throw result.error;
+            assert.strictEqual(result.code, '(function(){function enclose(){console.log("test enclose")}enclose()})();');
+        });
+        it("Should work with arg", function() {
+            var result = UglifyJS.minify(code, {
+                compress: false,
+                enclose: 'undefined',
+                mangle: false,
+            });
+            if (result.error) throw result.error;
+            assert.strictEqual(result.code, '(function(undefined){function enclose(){console.log("test enclose")}enclose()})();');
+        });
+        it("Should work with arg:value", function() {
+            var result = UglifyJS.minify(code, {
+                compress: false,
+                enclose: 'window,undefined:window',
+                mangle: false,
+            });
+            if (result.error) throw result.error;
+            assert.strictEqual(result.code, '(function(window,undefined){function enclose(){console.log("test enclose")}enclose()})(window);');
+        });
+        it("Should work alongside wrap", function() {
+            var result = UglifyJS.minify(code, {
+                compress: false,
+                enclose: 'window,undefined:window',
+                mangle: false,
+                wrap: 'exports',
+            });
+            if (result.error) throw result.error;
+            assert.strictEqual(result.code, '(function(window,undefined){(function(exports){function enclose(){console.log("test enclose")}enclose()})(typeof exports=="undefined"?exports={}:exports)})(window);');
+        });
+    });
 });

test/mocha/number-literal.js

@@ -1,5 +1,5 @@
 var assert = require("assert");
-var uglify = require("../node");
+var UglifyJS = require("../node");
 
 describe("Number literals", function() {
     it("Should not allow legacy octal literals in strict mode", function() {
@@ -7,16 +7,15 @@ describe("Number literals", function () {
             '"use strict";00;',
             '"use strict"; var foo = 00;'
         ];
-
         var test = function(input) {
             return function() {
-                uglify.parse(input);
+                UglifyJS.parse(input);
-            }
             }
+        };
         var error = function(e) {
-            return e instanceof uglify.JS_Parse_Error &&
+            return e instanceof UglifyJS.JS_Parse_Error
-                e.message === "Legacy octal literals are not allowed in strict mode";
+                && e.message === "Legacy octal literals are not allowed in strict mode";
-        }
+        };
         for (var i = 0; i < inputs.length; i++) {
             assert.throws(test(inputs[i]), error, inputs[i]);
         }

test/mocha/operator.js

@@ -1,5 +1,5 @@
-var UglifyJS = require("../node");
 var assert = require("assert");
+var UglifyJS = require("../..");
 
 describe("operator", function() {
     it("Should handle mixing of ++/+/--/- correctly", function() {

test/mocha/parentheses.js

@@ -1,5 +1,5 @@
 var assert = require("assert");
-var uglify = require("../../");
+var UglifyJS = require("../..");
 
 describe("parentheses", function() {
     it("Should add trailing parentheses for new expressions with zero arguments in beautify mode", function() {
@@ -33,7 +33,7 @@ describe("parentheses", function() {
         ];
         for (var i = 0; i < tests.length; i++) {
             assert.strictEqual(
-                uglify.minify(tests[i], {
+                UglifyJS.minify(tests[i], {
                     output: {beautify: true},
                     compress: false,
                     mangle: false
@@ -74,7 +74,7 @@ describe("parentheses", function() {
         ];
         for (var i = 0; i < tests.length; i++) {
             assert.strictEqual(
-                uglify.minify(tests[i], {
+                UglifyJS.minify(tests[i], {
                     output: {beautify: false},
                     compress: false,
                     mangle: false
@@ -94,7 +94,7 @@ describe("parentheses", function() {
             code = code.concat(code);
         }
         code = code.join("");
-        var result = uglify.minify(code, {
+        var result = UglifyJS.minify(code, {
             compress: false,
             mangle: false,
         });

test/mocha/screw-ie8.js

@@ -1,21 +0,0 @@
-var assert = require("assert");
-var uglify = require("../../");
-
-describe("screw-ie8", function () {
-    it("Should be able to minify() with undefined as catch parameter in a try...catch statement", function () {
-        assert.strictEqual(
-            uglify.minify(
-                "function a(b){\
-                    try {\
-                        throw 'Stuff';\
-                    } catch (undefined) {\
-                        console.log('caught: ' + undefined);\
-                    }\
-                    console.log('undefined is ' + undefined);\
-                    return b === undefined;\
-                };"
-            ).code,
-            'function a(o){try{throw"Stuff"}catch(o){console.log("caught: "+o)}return console.log("undefined is "+void 0),void 0===o}'
-        );
-    });
-});

test/mocha/sourcemaps.js

@@ -1,26 +1,58 @@
 var assert = require("assert");
 var readFileSync = require("fs").readFileSync;
-var Uglify = require("../../");
+var SourceMapConsumer = require("source-map").SourceMapConsumer;
+var UglifyJS = require("../..");
 
 function read(path) {
     return readFileSync(path, "utf8");
 }
 
 function source_map(code) {
-    return JSON.parse(Uglify.minify(code, {
+    return JSON.parse(UglifyJS.minify(code, {
         compress: false,
         mangle: false,
         sourceMap: true,
     }).map);
 }
 
+function get_map() {
+    return {
+        "version": 3,
+        "sources": ["index.js"],
+        "names": [],
+        "mappings": ";;AAAA,IAAI,MAAM,SAAN,GAAM;AAAA,SAAK,SAAS,CAAd;AAAA,CAAV;AACA,QAAQ,GAAR,CAAY,IAAI,KAAJ,CAAZ",
+        "file": "bundle.js",
+        "sourcesContent": ["let foo = x => \"foo \" + x;\nconsole.log(foo(\"bar\"));"]
+    };
+}
+
+function prepare_map(sourceMap) {
+    var code = [
+        '"use strict";',
+        "",
+        "var foo = function foo(x) {",
+        '  return "foo " + x;',
+        "};",
+        'console.log(foo("bar"));',
+        "",
+        "//# sourceMappingURL=bundle.js.map",
+    ].join("\n");
+    var result = UglifyJS.minify(code, {
+        sourceMap: {
+            content: sourceMap,
+            includeSources: true,
+        }
+    });
+    if (result.error) throw result.error;
+    return new SourceMapConsumer(result.map);
+}
+
 describe("sourcemaps", function() {
     it("Should give correct version", function() {
         var map = source_map("var x = 1 + 1;");
         assert.strictEqual(map.version, 3);
         assert.deepEqual(map.names, [ "x" ]);
     });
-
     it("Should give correct names", function() {
         var map = source_map([
             "({",
@@ -34,9 +66,8 @@ describe("sourcemaps", function() {
         ].join("\n"));
         assert.deepEqual(map.names, [ "enabled", "x" ]);
     });
-
     it("Should mark array/object literals", function() {
-        var result = Uglify.minify([
+        var result = UglifyJS.minify([
             "var obj = {};",
             "obj.wat([]);",
         ].join("\n"), {
@@ -47,43 +78,53 @@ describe("sourcemaps", function() {
         assert.strictEqual(result.code, "({}).wat([]);");
         assert.strictEqual(result.map, '{"version":3,"sources":["0"],"names":["wat"],"mappings":"CAAU,IACNA,IAAI"}');
     });
+    it("Should give correct sourceRoot", function() {
+        var code = "console.log(42);";
+        var result = UglifyJS.minify(code, {
+            sourceMap: {
+                root: "//foo.bar/",
+            },
+        });
+        if (result.error) throw result.error;
+        assert.strictEqual(result.code, code);
+        assert.strictEqual(result.map, '{"version":3,"sources":["0"],"names":["console","log"],"mappings":"AAAAA,QAAQC,IAAI","sourceRoot":"//foo.bar/"}');
+    });
 
     describe("inSourceMap", function() {
-        it("Should read the given string filename correctly when sourceMapIncludeSources is enabled (#1236)", function() {
+        it("Should read the given string filename correctly when sourceMapIncludeSources is enabled", function() {
-            var result = Uglify.minify(read("./test/input/issue-1236/simple.js"), {
+            var result = UglifyJS.minify(read("./test/input/issue-1236/simple.js"), {
                 sourceMap: {
                     content: read("./test/input/issue-1236/simple.js.map"),
                     filename: "simple.min.js",
                     includeSources: true
                 }
             });
-
+            if (result.error) throw result.error;
             var map = JSON.parse(result.map);
-
+            assert.equal(map.file, "simple.min.js");
-            assert.equal(map.file, 'simple.min.js');
             assert.equal(map.sourcesContent.length, 1);
-            assert.equal(map.sourcesContent[0],
+            assert.equal(map.sourcesContent[0], 'let foo = x => "foo " + x;\nconsole.log(foo("bar"));');
-                'let foo = x => "foo " + x;\nconsole.log(foo("bar"));');
         });
         it("Should process inline source map", function() {
-            var code = Uglify.minify(read("./test/input/issue-520/input.js"), {
+            var result = UglifyJS.minify(read("./test/input/issue-520/input.js"), {
                 compress: { toplevel: true },
                 sourceMap: {
                     content: "inline",
                     includeSources: true,
                     url: "inline"
                 }
-            }).code + "\n";
+            });
-            assert.strictEqual(code, readFileSync("test/input/issue-520/output.js", "utf8"));
+            if (result.error) throw result.error;
+            assert.strictEqual(result.code + "\n", readFileSync("test/input/issue-520/output.js", "utf8"));
         });
         it("Should warn for missing inline source map", function() {
-            var warn_function = Uglify.AST_Node.warn_function;
+            var warn_function = UglifyJS.AST_Node.warn_function;
             var warnings = [];
-            Uglify.AST_Node.warn_function = function(txt) {
+            UglifyJS.AST_Node.warn_function = function(txt) {
                 warnings.push(txt);
             };
             try {
-                var result = Uglify.minify(read("./test/input/issue-1323/sample.js"), {
+                var result = UglifyJS.minify(read("./test/input/issue-1323/sample.js"), {
                     mangle: false,
                     sourceMap: {
                         content: "inline"
@@ -93,17 +134,17 @@ describe("sourcemaps", function() {
                 assert.strictEqual(warnings.length, 1);
                 assert.strictEqual(warnings[0], "inline source map not found: 0");
             } finally {
-                Uglify.AST_Node.warn_function = warn_function;
+                UglifyJS.AST_Node.warn_function = warn_function;
             }
         });
         it("Should handle multiple input and inline source map", function() {
-            var warn_function = Uglify.AST_Node.warn_function;
+            var warn_function = UglifyJS.AST_Node.warn_function;
             var warnings = [];
-            Uglify.AST_Node.warn_function = function(txt) {
+            UglifyJS.AST_Node.warn_function = function(txt) {
                 warnings.push(txt);
             };
             try {
-                var result = Uglify.minify([
+                var result = UglifyJS.minify([
                     read("./test/input/issue-520/input.js"),
                     read("./test/input/issue-1323/sample.js"),
                 ], {
@@ -120,11 +161,11 @@ describe("sourcemaps", function() {
                 assert.strictEqual(warnings.length, 1);
                 assert.strictEqual(warnings[0], "inline source map not found: 1");
             } finally {
-                Uglify.AST_Node.warn_function = warn_function;
+                UglifyJS.AST_Node.warn_function = warn_function;
             }
         });
         it("Should drop source contents for includeSources=false", function() {
-            var result = Uglify.minify(read("./test/input/issue-520/input.js"), {
+            var result = UglifyJS.minify(read("./test/input/issue-520/input.js"), {
                 compress: false,
                 mangle: false,
                 sourceMap: {
@@ -135,7 +176,7 @@ describe("sourcemaps", function() {
             if (result.error) throw result.error;
             var map = JSON.parse(result.map);
             assert.strictEqual(map.sourcesContent.length, 1);
-            result = Uglify.minify(result.code, {
+            result = UglifyJS.minify(result.code, {
                 compress: false,
                 mangle: false,
                 sourceMap: {
@@ -149,23 +190,28 @@ describe("sourcemaps", function() {
     });
 
     describe("sourceMapInline", function() {
-        it("should append source map to output js when sourceMapInline is enabled", function() {
+        it("Should append source map to output js when sourceMapInline is enabled", function() {
-            var result = Uglify.minify('var a = function(foo) { return foo; };', {
+            var result = UglifyJS.minify('var a = function(foo) { return foo; };', {
                 sourceMap: {
                     url: "inline"
                 }
             });
+            if (result.error) throw result.error;
             var code = result.code;
             assert.strictEqual(code, "var a=function(n){return n};\n" +
                 "//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIjAiXSwibmFtZXMiOlsiYSIsImZvbyJdLCJtYXBwaW5ncyI6IkFBQUEsSUFBSUEsRUFBSSxTQUFTQyxHQUFPLE9BQU9BIn0=");
         });
-        it("should not append source map to output js when sourceMapInline is not enabled", function() {
+        it("Should not append source map to output js when sourceMapInline is not enabled", function() {
-            var result = Uglify.minify('var a = function(foo) { return foo; };');
+            var result = UglifyJS.minify('var a = function(foo) { return foo; };');
+            if (result.error) throw result.error;
             var code = result.code;
             assert.strictEqual(code, "var a=function(n){return n};");
         });
-        it("should work with max_line_len", function() {
+        it("Should work with max_line_len", function() {
-            var result = Uglify.minify(read("./test/input/issue-505/input.js"), {
+            var result = UglifyJS.minify(read("./test/input/issue-505/input.js"), {
+                compress: {
+                    directives: false,
+                },
                 output: {
                     max_line_len: 20
                 },
@@ -173,8 +219,70 @@ describe("sourcemaps", function() {
                     url: "inline"
                 }
             });
-            assert.strictEqual(result.error, undefined);
+            if (result.error) throw result.error;
             assert.strictEqual(result.code, read("./test/input/issue-505/output.js"));
         });
+        it("Should work with unicode characters", function() {
+            var code = [
+                "var tëst = '→unicøde←';",
+                "alert(tëst);",
+            ].join("\n");
+            var result = UglifyJS.minify(code, {
+                sourceMap: {
+                    includeSources: true,
+                    url: "inline",
+                }
+            });
+            if (result.error) throw result.error;
+            var map = JSON.parse(result.map);
+            assert.strictEqual(map.sourcesContent.length, 1);
+            assert.strictEqual(map.sourcesContent[0], code);
+            var encoded = result.code.slice(result.code.lastIndexOf(",") + 1);
+            map = JSON.parse(new Buffer(encoded, "base64").toString());
+            assert.strictEqual(map.sourcesContent.length, 1);
+            assert.strictEqual(map.sourcesContent[0], code);
+            result = UglifyJS.minify(result.code, {
+                sourceMap: {
+                    content: "inline",
+                    includeSources: true,
+                }
+            });
+            if (result.error) throw result.error;
+            map = JSON.parse(result.map);
+            assert.strictEqual(map.names.length, 2);
+            assert.strictEqual(map.names[0], "tëst");
+            assert.strictEqual(map.names[1], "alert");
+        });
+    });
+
+    describe("input sourcemaps", function() {
+        it("Should copy over original sourcesContent", function() {
+            var orig = get_map();
+            var map = prepare_map(orig);
+            assert.equal(map.sourceContentFor("index.js"), orig.sourcesContent[0]);
+        });
+        it("Should copy sourcesContent if sources are relative", function() {
+            var relativeMap = get_map();
+            relativeMap.sources = ['./index.js'];
+            var map = prepare_map(relativeMap);
+            assert.notEqual(map.sourcesContent, null);
+            assert.equal(map.sourcesContent.length, 1);
+            assert.equal(map.sourceContentFor("index.js"), relativeMap.sourcesContent[0]);
+        });
+        it("Should not have invalid mappings from inputSourceMap", function() {
+            var map = prepare_map(get_map());
+            // The original source has only 2 lines, check that mappings don't have more lines
+            var msg = "Mapping should not have higher line number than the original file had";
+            map.eachMapping(function(mapping) {
+                assert.ok(mapping.originalLine <= 2, msg);
+            });
+            map.allGeneratedPositionsFor({
+                source: "index.js",
+                line: 1,
+                column: 1
+            }).forEach(function(pos) {
+                assert.ok(pos.line <= 2, msg);
+            });
+        });
     });
 });