v3.3.18

Don't load source map until the JS source is fully received (#3040 )
give sensible error against invalid input source map (#3044 )
2018-04-02 04:26:28 +00:00 · 2018-03-31 20:26:40 +09:00 · 2018-03-31 18:48:20 +09:00 · 2018-03-31 15:03:46 +09:00 · 2018-03-31 04:13:45 +00:00 · 2018-03-30 16:23:09 +09:00
38 changed files with 1299 additions and 419 deletions
--- a/README.md
+++ b/README.md
@@ -6,9 +6,8 @@ UglifyJS is a JavaScript parser, minifier, compressor and beautifier toolkit.
 #### Note:
 - **`uglify-js@3` has a simplified [API](#api-reference) and [CLI](#command-line-usage) that is not backwards compatible with [`uglify-js@2`](https://github.com/mishoo/UglifyJS2/tree/v2.x)**.
 - **Documentation for UglifyJS `2.x` releases can be found [here](https://github.com/mishoo/UglifyJS2/tree/v2.x)**.
- `uglify-js` only supports ECMAScript 5 (ES5).
- Those wishing to minify
-ES2015+ (ES6+) should use the `npm` package [**uglify-es**](https://github.com/mishoo/UglifyJS2/tree/harmony).
+- `uglify-js` only supports JavaScript (ECMAScript 5).
+- To minify ECMAScript 2015 or above, transpile using tools like [Babel](https://babeljs.io/).

 Install
 -------
@@ -825,7 +824,7 @@ can pass additional arguments that control the code output:
  when you want to generate minified code, in order to specify additional
  arguments, so you can use `-b beautify=false` to override it.

- `bracketize` (default `false`) -- always insert brackets in `if`, `for`,
+- `braces` (default `false`) -- always insert braces in `if`, `for`,
  `do`, `while` or `with` statements, even if their body is a single
  statement.

@@ -837,8 +836,8 @@ can pass additional arguments that control the code output:

 - `indent_start` (default `0`) -- prefix all lines by that many spaces

- `inline_script` (default `false`) -- escape the slash in occurrences of
-  `</script` in strings
+- `inline_script` (default `true`) -- escape HTML comments and the slash in
+  occurrences of `</script>` in strings

 - `keep_quoted_props` (default `false`) -- when turned on, prevents stripping
  quotes from property names in object literals.
--- a/bin/uglifyjs
+++ b/bin/uglifyjs
@@ -46,7 +46,7 @@ program.option("--name-cache <file>", "File to hold mangled name mappings.");
 program.option("--rename", "Force symbol expansion.");
 program.option("--no-rename", "Disable symbol expansion.");
 program.option("--self", "Build UglifyJS as a library (implies --wrap UglifyJS)");
-program.option("--source-map [options]", "Enable source map/specify source map options.", parse_source_map());
+program.option("--source-map [options]", "Enable source map/specify source map options.", parse_js());
 program.option("--timings", "Display operations run time on STDERR.")
 program.option("--toplevel", "Compress and/or mangle variables in toplevel scope.");
 program.option("--verbose", "Print diagnostic messages.");
@@ -176,6 +176,11 @@ function run() {
    UglifyJS.AST_Node.warn_function = function(msg) {
        print_error("WARN: " + msg);
    };
+    var content = program.sourceMap && program.sourceMap.content;
+    if (content && content != "inline") {
+        print_error("INFO: Using input source map: " + content);
+        options.sourceMap.content = read_file(content, content);
+    }
    if (program.timings) options.timings = true;
    try {
        if (program.parse) {
@@ -377,19 +382,6 @@ function parse_js(flag) {
    }
 }

-function parse_source_map() {
-    var parse = parse_js();
-    return function(value, options) {
-        var hasContent = options && "content" in options;
-        var settings = parse(value, options);
-        if (!hasContent && settings.content && settings.content != "inline") {
-            print_error("INFO: Using input source map: " + settings.content);
-            settings.content = read_file(settings.content, settings.content);
-        }
-        return settings;
-    }
-}
-
 function skip_key(key) {
    return skip_keys.indexOf(key) >= 0;
 }
--- a/lib/ast.js
+++ b/lib/ast.js
@@ -165,7 +165,7 @@ function walk_body(node, visitor) {
 };

 var AST_Block = DEFNODE("Block", "body", {
-    $documentation: "A body of statements (usually bracketed)",
+    $documentation: "A body of statements (usually braced)",
    $propdoc: {
        body: "[AST_Statement*] an array of statements"
    },
@@ -916,5 +916,25 @@ TreeWalker.prototype = {
                || node instanceof AST_Break && x instanceof AST_Switch)
                return x;
        }
+    },
+    in_boolean_context: function() {
+        var self = this.self();
+        for (var i = 0, p; p = this.parent(i); i++) {
+            if (p instanceof AST_SimpleStatement
+                || p instanceof AST_Conditional && p.condition === self
+                || p instanceof AST_DWLoop && p.condition === self
+                || p instanceof AST_For && p.condition === self
+                || p instanceof AST_If && p.condition === self
+                || p instanceof AST_UnaryPrefix && p.operator == "!" && p.expression === self) {
+                return true;
+            }
+            if (p instanceof AST_Binary && (p.operator == "&&" || p.operator == "||")
+                || p instanceof AST_Conditional
+                || p.tail_node() === self) {
+                self = p;
+            } else {
+                return false;
+            }
+        }
    }
 };
--- a/lib/compress.js
+++ b/lib/compress.js
@@ -147,27 +147,6 @@ merge(Compressor.prototype, {
                return true;
        return false;
    },
-    in_boolean_context: function() {
-        if (!this.option("booleans")) return false;
-        var self = this.self();
-        for (var i = 0, p; p = this.parent(i); i++) {
-            if (p instanceof AST_SimpleStatement
-                || p instanceof AST_Conditional && p.condition === self
-                || p instanceof AST_DWLoop && p.condition === self
-                || p instanceof AST_For && p.condition === self
-                || p instanceof AST_If && p.condition === self
-                || p instanceof AST_UnaryPrefix && p.operator == "!" && p.expression === self) {
-                return true;
-            }
-            if (p instanceof AST_Binary && (p.operator == "&&" || p.operator == "||")
-                || p instanceof AST_Conditional
-                || p.tail_node() === self) {
-                self = p;
-            } else {
-                return false;
-            }
-        }
-    },
    compress: function(node) {
        if (this.option("expression")) {
            node.process_expression(true);
@@ -449,7 +428,7 @@ merge(Compressor.prototype, {
            var parent = tw.parent(level);
            if (value && value.is_constant()) return;
            if (parent instanceof AST_Assign && parent.operator == "=" && node === parent.right
-                || parent instanceof AST_Call && node !== parent.expression
+                || parent instanceof AST_Call && (node !== parent.expression || parent instanceof AST_New)
                || parent instanceof AST_Exit && node === parent.value && node.scope !== d.scope
                || parent instanceof AST_VarDef && node === parent.value) {
                if (depth > 1 && !(value && value.is_constant_expression(scope))) depth = 1;
@@ -517,6 +496,15 @@ merge(Compressor.prototype, {
            pop(tw);
            return true;
        });
+        def(AST_Case, function(tw) {
+            push(tw);
+            this.expression.walk(tw);
+            pop(tw);
+            push(tw);
+            walk_body(this, tw);
+            pop(tw);
+            return true;
+        });
        def(AST_Conditional, function(tw) {
            this.condition.walk(tw);
            push(tw);
@@ -527,6 +515,12 @@ merge(Compressor.prototype, {
            pop(tw);
            return true;
        });
+        def(AST_Default, function(tw, descend) {
+            push(tw);
+            descend();
+            pop(tw);
+            return true;
+        });
        def(AST_Defun, function(tw, descend, compressor) {
            this.inlined = false;
            var save_ids = tw.safe_ids;
@@ -624,12 +618,6 @@ merge(Compressor.prototype, {
            pop(tw);
            return true;
        });
-        def(AST_SwitchBranch, function(tw, descend) {
-            push(tw);
-            descend();
-            pop(tw);
-            return true;
-        });
        def(AST_SymbolCatch, function() {
            this.definition().fixed = false;
        });
@@ -778,8 +766,7 @@ merge(Compressor.prototype, {
                lhs = lhs.fixed_value();
            }
            if (!lhs) return true;
-            if (lhs instanceof AST_RegExp) return false;
-            if (lhs instanceof AST_Constant) return true;
+            if (lhs.is_constant()) return true;
            return is_lhs_read_only(lhs);
        }
        return false;
@@ -972,7 +959,7 @@ merge(Compressor.prototype, {
            var args;
            var candidates = [];
            var stat_index = statements.length;
-            var scanner = new TreeTransformer(function(node, descend) {
+            var scanner = new TreeTransformer(function(node) {
                if (abort) return node;
                // Skip nodes before `candidate` as quickly as possible
                if (!hit) {
@@ -1011,7 +998,7 @@ merge(Compressor.prototype, {
                if (can_replace
                    && !(node instanceof AST_SymbolDeclaration)
                    && (scan_lhs && (hit_lhs = lhs.equivalent_to(node))
-                        || scan_rhs && (hit_rhs = rhs.equivalent_to(node)))) {
+                        || scan_rhs && (hit_rhs = scan_rhs(node, this)))) {
                    if (stop_if_hit && (hit_rhs || !lhs_local || !replace_all)) {
                        abort = true;
                        return node;
@@ -1065,6 +1052,7 @@ merge(Compressor.prototype, {
                        && (side_effects || node.expression.may_throw_on_access(compressor))
                    || node instanceof AST_SymbolRef
                        && (symbol_in_lvalues(node) || side_effects && may_modify(node))
+                    || node instanceof AST_This && symbol_in_lvalues(node)
                    || node instanceof AST_VarDef && node.value
                        && (node.name.name in lvalues || side_effects && may_modify(node.name))
                    || (sym = is_lhs(node.left, node))
@@ -1380,12 +1368,16 @@ merge(Compressor.prototype, {
            }

            function foldable(expr) {
-                if (expr.is_constant()) return true;
-                if (expr instanceof AST_Array) return false;
-                if (expr instanceof AST_Function) return false;
-                if (expr instanceof AST_Object) return false;
-                if (expr instanceof AST_RegExp) return false;
-                if (expr instanceof AST_Symbol) return true;
+                if (expr instanceof AST_SymbolRef) {
+                    var value = expr.evaluate(compressor);
+                    if (value === expr) return rhs_exact_match;
+                    return rhs_fuzzy_match(value, rhs_exact_match);
+                }
+                if (expr instanceof AST_This) return rhs_exact_match;
+                if (expr.is_truthy()) return rhs_fuzzy_match(true, return_false);
+                if (expr.is_constant()) {
+                    return rhs_fuzzy_match(expr.evaluate(compressor), rhs_exact_match);
+                }
                if (!(lhs instanceof AST_SymbolRef)) return false;
                if (expr.has_side_effects(compressor)) return false;
                var circular;
@@ -1396,7 +1388,25 @@ merge(Compressor.prototype, {
                        circular = true;
                    }
                }));
-                return !circular;
+                return !circular && rhs_exact_match;
+            }
+
+            function rhs_exact_match(node) {
+                return rhs.equivalent_to(node);
+            }
+
+            function rhs_fuzzy_match(value, fallback) {
+                return function(node, tw) {
+                    if (tw.in_boolean_context()) {
+                        if (value && node.is_truthy() && !node.has_side_effects(compressor)) {
+                            return true;
+                        }
+                        if (node.is_constant()) {
+                            return !node.evaluate(compressor) == !value;
+                        }
+                    }
+                    return fallback(node);
+                };
            }

            function get_lvalues(expr) {
@@ -2033,6 +2043,28 @@ merge(Compressor.prototype, {
                && !node.expression.has_side_effects(compressor);
    }

+    // is_truthy()
+    // return true if `!!node === true`
+    (function(def) {
+        def(AST_Node, return_false);
+        def(AST_Array, return_true);
+        def(AST_Assign, function() {
+            return this.operator == "=" && this.right.is_truthy();
+        });
+        def(AST_Lambda, return_true);
+        def(AST_Object, return_true);
+        def(AST_RegExp, return_true);
+        def(AST_Sequence, function() {
+            return this.tail_node().is_truthy();
+        });
+        def(AST_SymbolRef, function() {
+            var fixed = this.fixed_value();
+            return fixed && fixed.is_truthy();
+        });
+    })(function(node, func) {
+        node.DEFMETHOD("is_truthy", func);
+    });
+
    // may_throw_on_access()
    // returns true if this node may be null, undefined or contain `AST_Accessor`
    (function(def) {
@@ -3106,6 +3138,8 @@ merge(Compressor.prototype, {
        var in_use = [];
        var in_use_ids = Object.create(null); // avoid expensive linear scans of in_use
        var fixed_ids = Object.create(null);
+        var value_read = Object.create(null);
+        var value_modified = Object.create(null);
        if (self instanceof AST_Toplevel && compressor.top_retain) {
            self.variables.each(function(def) {
                if (compressor.top_retain(def) && !(def.id in in_use_ids)) {
@@ -3373,6 +3407,17 @@ merge(Compressor.prototype, {
        );
        self.transform(tt);

+        function verify_safe_usage(def, read, modified) {
+            if (def.id in in_use_ids) return;
+            if (read && modified) {
+                in_use_ids[def.id] = true;
+                in_use.push(def);
+            } else {
+                value_read[def.id] = read;
+                value_modified[def.id] = modified;
+            }
+        }
+
        function scan_ref_scoped(node, descend) {
            var node_def, props = [], sym = assign_as_unused(node, props);
            if (sym instanceof AST_SymbolRef
@@ -3382,8 +3427,18 @@ merge(Compressor.prototype, {
                });
                if (node instanceof AST_Assign) {
                    node.right.walk(tw);
-                    if (node.left === sym && !node_def.chained && sym.fixed_value() === node.right) {
-                        fixed_ids[node_def.id] = node;
+                    if (node.left === sym) {
+                        if (!node_def.chained && sym.fixed_value() === node.right) {
+                            fixed_ids[node_def.id] = node;
+                        }
+                        if (!node.write_only) {
+                            verify_safe_usage(node_def, true, value_modified[node_def.id]);
+                        }
+                    } else {
+                        var fixed = sym.fixed_value();
+                        if (!fixed || !fixed.is_constant()) {
+                            verify_safe_usage(node_def, value_read[node_def.id], true);
+                        }
                    }
                }
                return true;
@@ -3471,8 +3526,9 @@ merge(Compressor.prototype, {
                var defs = [];
                vars.each(function(def, name){
                    if (self instanceof AST_Lambda
-                        && find_if(function(x){ return x.name == def.name.name },
-                                   self.argnames)) {
+                        && !all(self.argnames, function(argname) {
+                            return argname.name != name;
+                        })) {
                        vars.del(name);
                    } else {
                        def = def.clone();
@@ -3569,8 +3625,9 @@ merge(Compressor.prototype, {
                var sym = node.name, def, value;
                if (sym.scope === self
                    && (def = sym.definition()).escaped != 1
-                    && !def.single_use
+                    && !def.assignments
                    && !def.direct_access
+                    && !def.single_use
                    && !top_retain(def)
                    && (value = sym.fixed_value()) === node.value
                    && value instanceof AST_Object) {
@@ -3790,7 +3847,7 @@ merge(Compressor.prototype, {

    OPT(AST_Do, function(self, compressor){
        if (!compressor.option("loops")) return self;
-        var cond = self.condition.tail_node().evaluate(compressor);
+        var cond = self.condition.is_truthy() || self.condition.tail_node().evaluate(compressor);
        if (!(cond instanceof AST_Node)) {
            if (cond) return make_node(AST_For, self, {
                body: make_node(AST_BlockStatement, self.body, {
@@ -3912,9 +3969,11 @@ merge(Compressor.prototype, {
                    self.condition = best_of_expression(self.condition.transform(compressor), orig);
                }
            }
-            if (compressor.option("dead_code")) {
-                if (cond instanceof AST_Node) cond = self.condition.tail_node().evaluate(compressor);
-                if (!cond) {
+            if (cond instanceof AST_Node) {
+                cond = self.condition.is_truthy() || self.condition.tail_node().evaluate(compressor);
+            }
+            if (!cond) {
+                if (compressor.option("dead_code")) {
                    var body = [];
                    extract_declarations_from_unreachable_code(compressor, self.body, body);
                    if (self.init instanceof AST_Statement) {
@@ -3929,6 +3988,16 @@ merge(Compressor.prototype, {
                    }));
                    return make_node(AST_BlockStatement, self, { body: body }).optimize(compressor);
                }
+            } else if (self.condition && !(cond instanceof AST_Node)) {
+                self.body = make_node(AST_BlockStatement, self.body, {
+                    body: [
+                        make_node(AST_SimpleStatement, self.condition, {
+                            body: self.condition
+                        }),
+                        self.body
+                    ]
+                });
+                self.condition = null;
            }
        }
        return if_break_in_loop(self, compressor);
@@ -3949,7 +4018,9 @@ merge(Compressor.prototype, {
            self.condition = best_of_expression(self.condition.transform(compressor), orig);
        }
        if (compressor.option("dead_code")) {
-            if (cond instanceof AST_Node) cond = self.condition.tail_node().evaluate(compressor);
+            if (cond instanceof AST_Node) {
+                cond = self.condition.is_truthy() || self.condition.tail_node().evaluate(compressor);
+            }
            if (!cond) {
                compressor.warn("Condition always false [{file}:{line},{col}]", self.condition.start);
                var body = [];
@@ -4705,8 +4776,10 @@ merge(Compressor.prototype, {
                    var var_def = stat.definitions[j];
                    var name = var_def.name;
                    append_var(decls, expressions, name, var_def.value);
-                    if (in_loop) {
-                        var def = name.definition();
+                    if (in_loop && all(fn.argnames, function(argname) {
+                        return argname.name != name.name;
+                    })) {
+                        var def = fn.variables.get(name.name);
                        var sym = make_node(AST_SymbolRef, name, name);
                        def.references.push(sym);
                        expressions.splice(pos++, 0, make_node(AST_Assign, var_def, {
@@ -4833,8 +4906,10 @@ merge(Compressor.prototype, {
                return make_node(AST_Undefined, self).optimize(compressor);
            }
        }
-        if (compressor.in_boolean_context()) {
-            switch (self.operator) {
+        if (compressor.option("booleans")) {
+            if (self.operator == "!" && e.is_truthy()) {
+                return make_sequence(self, [ e, make_node(AST_False, self) ]).optimize(compressor);
+            } else if (compressor.in_boolean_context()) switch (self.operator) {
              case "!":
                if (e instanceof AST_UnaryPrefix && e.operator == "!") {
                    // !!foo ==> foo, if we're in boolean context
@@ -5020,7 +5095,7 @@ merge(Compressor.prototype, {
            }
            break;
        }
-        if (self.operator == "+" && compressor.in_boolean_context()) {
+        if (compressor.option("booleans") && self.operator == "+" && compressor.in_boolean_context()) {
            var ll = self.left.evaluate(compressor);
            var rr = self.right.evaluate(compressor);
            if (ll && typeof ll == "string") {
@@ -5075,7 +5150,7 @@ merge(Compressor.prototype, {
        if (compressor.option("evaluate")) {
            switch (self.operator) {
              case "&&":
-                var ll = self.left.truthy ? true : self.left.falsy ? false : self.left.evaluate(compressor);
+                var ll = fuzzy_eval(self.left);
                if (!ll) {
                    compressor.warn("Condition left of && always false [{file}:{line},{col}]", self.start);
                    return maintain_this_binding(compressor.parent(), compressor.self(), self.left).optimize(compressor);
@@ -5085,7 +5160,7 @@ merge(Compressor.prototype, {
                }
                var rr = self.right.evaluate(compressor);
                if (!rr) {
-                    if (compressor.in_boolean_context()) {
+                    if (compressor.option("booleans") && compressor.in_boolean_context()) {
                        compressor.warn("Boolean && always false [{file}:{line},{col}]", self.start);
                        return make_sequence(self, [
                            self.left,
@@ -5094,7 +5169,8 @@ merge(Compressor.prototype, {
                    } else self.falsy = true;
                } else if (!(rr instanceof AST_Node)) {
                    var parent = compressor.parent();
-                    if (parent.operator == "&&" && parent.left === compressor.self() || compressor.in_boolean_context()) {
+                    if (parent.operator == "&&" && parent.left === compressor.self()
+                        || compressor.option("booleans") && compressor.in_boolean_context()) {
                        compressor.warn("Dropping side-effect-free && [{file}:{line},{col}]", self.start);
                        return self.left.optimize(compressor);
                    }
@@ -5110,7 +5186,7 @@ merge(Compressor.prototype, {
                }
                break;
              case "||":
-                var ll = self.left.truthy ? true : self.left.falsy ? false : self.left.evaluate(compressor);
+                var ll = fuzzy_eval(self.left);
                if (!ll) {
                    compressor.warn("Condition left of || always false [{file}:{line},{col}]", self.start);
                    return make_sequence(self, [ self.left, self.right ]).optimize(compressor);
@@ -5121,12 +5197,13 @@ merge(Compressor.prototype, {
                var rr = self.right.evaluate(compressor);
                if (!rr) {
                    var parent = compressor.parent();
-                    if (parent.operator == "||" && parent.left === compressor.self() || compressor.in_boolean_context()) {
+                    if (parent.operator == "||" && parent.left === compressor.self()
+                        || compressor.option("booleans") && compressor.in_boolean_context()) {
                        compressor.warn("Dropping side-effect-free || [{file}:{line},{col}]", self.start);
                        return self.left.optimize(compressor);
                    }
                } else if (!(rr instanceof AST_Node)) {
-                    if (compressor.in_boolean_context()) {
+                    if (compressor.option("booleans") && compressor.in_boolean_context()) {
                        compressor.warn("Boolean || always true [{file}:{line},{col}]", self.start);
                        return make_sequence(self, [
                            self.left,
@@ -5348,6 +5425,13 @@ merge(Compressor.prototype, {
            return best_of(compressor, ev, self);
        }
        return self;
+
+        function fuzzy_eval(node) {
+            if (node.truthy) return true;
+            if (node.falsy) return false;
+            if (node.is_truthy()) return true;
+            return node.evaluate(compressor);
+        }
    });

    function recursive_ref(compressor, def) {
@@ -5643,15 +5727,13 @@ merge(Compressor.prototype, {
            expressions.push(self);
            return make_sequence(self, expressions);
        }
-        var cond = self.condition.evaluate(compressor);
-        if (cond !== self.condition) {
-            if (cond) {
-                compressor.warn("Condition always true [{file}:{line},{col}]", self.start);
-                return maintain_this_binding(compressor.parent(), compressor.self(), self.consequent);
-            } else {
-                compressor.warn("Condition always false [{file}:{line},{col}]", self.start);
-                return maintain_this_binding(compressor.parent(), compressor.self(), self.alternative);
-            }
+        var cond = self.condition.is_truthy() || self.condition.tail_node().evaluate(compressor);
+        if (!cond) {
+            compressor.warn("Condition always false [{file}:{line},{col}]", self.start);
+            return make_sequence(self, [ self.condition, self.alternative ]).optimize(compressor);
+        } else if (!(cond instanceof AST_Node)) {
+            compressor.warn("Condition always true [{file}:{line},{col}]", self.start);
+            return make_sequence(self, [ self.condition, self.consequent ]).optimize(compressor);
        }
        var negated = cond.negate(compressor, first_in_statement(compressor));
        if (best_of(compressor, cond, negated) === negated) {
@@ -5759,7 +5841,7 @@ merge(Compressor.prototype, {
                right: alternative
            }).optimize(compressor);
        }
-        var in_bool = compressor.in_boolean_context();
+        var in_bool = compressor.option("booleans") && compressor.in_boolean_context();
        if (is_true(self.consequent)) {
            if (is_false(self.alternative)) {
                // c ? true : false ---> !!c
@@ -5857,32 +5939,29 @@ merge(Compressor.prototype, {
    });

    OPT(AST_Boolean, function(self, compressor){
+        if (!compressor.option("booleans")) return self;
        if (compressor.in_boolean_context()) return make_node(AST_Number, self, {
            value: +self.value
        });
-        if (compressor.option("booleans")) {
-            var p = compressor.parent();
-            if (p instanceof AST_Binary && (p.operator == "=="
-                                            || p.operator == "!=")) {
-                compressor.warn("Non-strict equality against boolean: {operator} {value} [{file}:{line},{col}]", {
-                    operator : p.operator,
-                    value    : self.value,
-                    file     : p.start.file,
-                    line     : p.start.line,
-                    col      : p.start.col,
-                });
-                return make_node(AST_Number, self, {
-                    value: +self.value
-                });
-            }
-            return make_node(AST_UnaryPrefix, self, {
-                operator: "!",
-                expression: make_node(AST_Number, self, {
-                    value: 1 - self.value
-                })
+        var p = compressor.parent();
+        if (p instanceof AST_Binary && (p.operator == "==" || p.operator == "!=")) {
+            compressor.warn("Non-strict equality against boolean: {operator} {value} [{file}:{line},{col}]", {
+                operator : p.operator,
+                value    : self.value,
+                file     : p.start.file,
+                line     : p.start.line,
+                col      : p.start.col,
+            });
+            return make_node(AST_Number, self, {
+                value: +self.value
            });
        }
-        return self;
+        return make_node(AST_UnaryPrefix, self, {
+            operator: "!",
+            expression: make_node(AST_Number, self, {
+                value: 1 - self.value
+            })
+        });
    });

    OPT(AST_Sub, function(self, compressor){
@@ -6091,19 +6170,6 @@ merge(Compressor.prototype, {
        return self;
    });

-    function literals_in_boolean_context(self, compressor) {
-        if (compressor.in_boolean_context()) {
-            return best_of(compressor, self, make_sequence(self, [
-                self,
-                make_node(AST_True, self)
-            ]).optimize(compressor));
-        }
-        return self;
-    };
-    OPT(AST_Array, literals_in_boolean_context);
-    OPT(AST_Object, literals_in_boolean_context);
-    OPT(AST_RegExp, literals_in_boolean_context);
-
    OPT(AST_Return, function(self, compressor){
        if (self.value && is_undefined(self.value, compressor)) {
            self.value = null;
--- a/lib/minify.js
+++ b/lib/minify.js
@@ -165,7 +165,11 @@ function minify(files, options) {
        if (!HOP(options.output, "code") || options.output.code) {
            if (options.sourceMap) {
                if (typeof options.sourceMap.content == "string") {
-                    options.sourceMap.content = JSON.parse(options.sourceMap.content);
+                    try {
+                        options.sourceMap.content = JSON.parse(options.sourceMap.content);
+                    } catch (ex) {
+                        throw new Error("invalid input source map: " + options.sourceMap.content);
+                    }
                }
                options.output.source_map = SourceMap({
                    file: options.sourceMap.filename,
--- a/lib/mozilla-ast.js
+++ b/lib/mozilla-ast.js
@@ -180,6 +180,17 @@
                end    : my_end_token(M)
            };
            if (val === null) return new AST_Null(args);
+            var rx = M.regex;
+            if (rx && rx.pattern) {
+                // RegExpLiteral as per ESTree AST spec
+                args.value = new RegExp(rx.pattern, rx.flags);
+                args.value.raw_source = rx.pattern;
+                return new AST_RegExp(args);
+            } else if (rx) {
+                // support legacy RegExp
+                args.value = M.regex && M.raw ? M.raw : val;
+                return new AST_RegExp(args);
+            }
            switch (typeof val) {
              case "string":
                args.value = val;
@@ -189,16 +200,6 @@
                return new AST_Number(args);
              case "boolean":
                return new (val ? AST_True : AST_False)(args);
-              default:
-                var rx = M.regex;
-                if (rx && rx.pattern) {
-                    // RegExpLiteral as per ESTree AST spec
-                    args.value = new RegExp(rx.pattern, rx.flags).toString();
-                } else {
-                    // support legacy RegExp
-                    args.value = M.regex && M.raw ? M.raw : val;
-                }
-                return new AST_RegExp(args);
            }
        },
        Identifier: function(M) {
@@ -410,14 +411,15 @@
    });

    def_to_moz(AST_RegExp, function To_Moz_RegExpLiteral(M) {
-        var value = M.value;
+        var flags = M.value.toString().match(/[gimuy]*$/)[0];
+        var value = "/" + M.value.raw_source + "/" + flags;
        return {
            type: "Literal",
            value: value,
-            raw: value.toString(),
+            raw: value,
            regex: {
-                pattern: value.source,
-                flags: value.toString().match(/[gimuy]*$/)[0]
+                pattern: M.value.raw_source,
+                flags: flags
            }
        };
    });
@@ -564,6 +566,21 @@
        FROM_MOZ_STACK = [];
        var ast = from_moz(node);
        FROM_MOZ_STACK = save_stack;
+        ast.walk(new TreeWalker(function(node) {
+            if (node instanceof AST_LabelRef) {
+                for (var level = 0, parent; parent = this.parent(level); level++) {
+                    if (parent instanceof AST_Scope) break;
+                    if (parent instanceof AST_LabeledStatement && parent.label.name == node.name) {
+                        node.thedef = parent.label;
+                        break;
+                    }
+                }
+                if (!node.thedef) {
+                    var s = node.start;
+                    js_error("Undefined label " + node.name, s.file, s.line, s.col, s.pos);
+                }
+            }
+        }));
        return ast;
    };

--- a/lib/output.js
+++ b/lib/output.js
@@ -56,7 +56,7 @@ function OutputStream(options) {
    options = defaults(options, {
        ascii_only       : false,
        beautify         : false,
-        bracketize       : false,
+        braces           : false,
        comments         : false,
        ie8              : false,
        indent_level     : 4,
@@ -178,7 +178,7 @@ function OutputStream(options) {
    function encode_string(str, quote) {
        var ret = make_string(str, quote);
        if (options.inline_script) {
-            ret = ret.replace(/<\x2fscript([>\/\t\n\f\r ])/gi, "<\\/script$1");
+            ret = ret.replace(/<\x2f(script)([>\/\t\n\f\r ])/gi, "<\\/$1$2");
            ret = ret.replace(/\x3c!--/g, "\\x3c!--");
            ret = ret.replace(/--\x3e/g, "--\\x3e");
        }
@@ -576,7 +576,7 @@ function OutputStream(options) {
        indentation     : function() { return indentation },
        current_width   : function() { return current_col - indentation },
        should_break    : function() { return options.width && this.current_width() >= options.width },
-        has_parens      : function() { return OUTPUT.slice(-1) == "(" },
+        has_parens      : function() { return OUTPUT[OUTPUT.length - 1] == "(" },
        newline         : newline,
        print           : print,
        space           : space,
@@ -886,21 +886,22 @@ function OutputStream(options) {
        self.body.print(output);
        output.semicolon();
    });
-    function print_bracketed(self, output, allow_directives) {
+    function print_braced_empty(self, output) {
+        output.print("{");
+        output.with_indent(output.next_indent(), function() {
+            output.append_comments(self, true);
+        });
+        output.print("}");
+    }
+    function print_braced(self, output, allow_directives) {
        if (self.body.length > 0) {
            output.with_block(function() {
                display_body(self.body, false, output, allow_directives);
            });
-        } else {
-            output.print("{");
-            output.with_indent(output.next_indent(), function() {
-                output.append_comments(self, true);
-            });
-            output.print("}");
-        }
+        } else print_braced_empty(self, output);
    };
    DEFPRINT(AST_BlockStatement, function(self, output){
-        print_bracketed(self, output);
+        print_braced(self, output);
    });
    DEFPRINT(AST_EmptyStatement, function(self, output){
        output.semicolon();
@@ -995,7 +996,7 @@ function OutputStream(options) {
            });
        });
        output.space();
-        print_bracketed(self, output, true);
+        print_braced(self, output, true);
    });
    DEFPRINT(AST_Lambda, function(self, output){
        self._do_print(output);
@@ -1036,7 +1037,7 @@ function OutputStream(options) {
    /* -----[ if ]----- */
    function make_then(self, output) {
        var b = self.body;
-        if (output.option("bracketize")
+        if (output.option("braces")
            || output.option("ie8") && b instanceof AST_Do)
            return make_block(b, output);
        // The squeezer replaces "block"-s that contain only a single
@@ -1045,7 +1046,7 @@ function OutputStream(options) {
        // IF having an ELSE clause where the THEN clause ends in an
        // IF *without* an ELSE block (then the outer ELSE would refer
        // to the inner IF).  This function checks for this case and
-        // adds the block brackets if needed.
+        // adds the block braces if needed.
        if (!b) return output.force_semicolon();
        while (true) {
            if (b instanceof AST_If) {
@@ -1092,7 +1093,7 @@ function OutputStream(options) {
        });
        output.space();
        var last = self.body.length - 1;
-        if (last < 0) output.print("{}");
+        if (last < 0) print_braced_empty(self, output);
        else output.with_block(function(){
            self.body.forEach(function(branch, i){
                output.indent(true);
@@ -1126,7 +1127,7 @@ function OutputStream(options) {
    DEFPRINT(AST_Try, function(self, output){
        output.print("try");
        output.space();
-        print_bracketed(self, output);
+        print_braced(self, output);
        if (self.bcatch) {
            output.space();
            self.bcatch.print(output);
@@ -1143,12 +1144,12 @@ function OutputStream(options) {
            self.argname.print(output);
        });
        output.space();
-        print_bracketed(self, output);
+        print_braced(self, output);
    });
    DEFPRINT(AST_Finally, function(self, output){
        output.print("finally");
        output.space();
-        print_bracketed(self, output);
+        print_braced(self, output);
    });

    /* -----[ var/const ]----- */
@@ -1347,7 +1348,7 @@ function OutputStream(options) {
            });
            output.newline();
        });
-        else output.print("{}");
+        else print_braced_empty(self, output);
    });

    function print_property_name(key, quote, output) {
@@ -1419,7 +1420,7 @@ function OutputStream(options) {
    });

    function force_statement(stat, output) {
-        if (output.option("bracketize")) {
+        if (output.option("braces")) {
            make_block(stat, output);
        } else {
            if (!stat || stat instanceof AST_EmptyStatement)
@@ -1483,47 +1484,52 @@ function OutputStream(options) {
    /* -----[ source map generators ]----- */

    function DEFMAP(nodetype, generator) {
-        nodetype.DEFMETHOD("add_source_map", function(stream){
-            generator(this, stream);
+        nodetype.forEach(function(nodetype) {
+            nodetype.DEFMETHOD("add_source_map", generator);
        });
-    };
+    }

-    // We could easily add info for ALL nodes, but it seems to me that
-    // would be quite wasteful, hence this noop in the base class.
-    DEFMAP(AST_Node, noop);
-
-    function basic_sourcemap_gen(self, output) {
-        output.add_mapping(self.start);
-    };
+    DEFMAP([
+        // We could easily add info for ALL nodes, but it seems to me that
+        // would be quite wasteful, hence this noop in the base class.
+        AST_Node,
+        // since the label symbol will mark it
+        AST_LabeledStatement,
+        AST_Toplevel,
+    ], noop);

    // XXX: I'm not exactly sure if we need it for all of these nodes,
    // or if we should add even more.
-
-    DEFMAP(AST_Directive, basic_sourcemap_gen);
-    DEFMAP(AST_Debugger, basic_sourcemap_gen);
-    DEFMAP(AST_Symbol, basic_sourcemap_gen);
-    DEFMAP(AST_Jump, basic_sourcemap_gen);
-    DEFMAP(AST_StatementWithBody, basic_sourcemap_gen);
-    DEFMAP(AST_LabeledStatement, noop); // since the label symbol will mark it
-    DEFMAP(AST_Lambda, basic_sourcemap_gen);
-    DEFMAP(AST_Switch, basic_sourcemap_gen);
-    DEFMAP(AST_SwitchBranch, basic_sourcemap_gen);
-    DEFMAP(AST_BlockStatement, basic_sourcemap_gen);
-    DEFMAP(AST_Toplevel, noop);
-    DEFMAP(AST_New, basic_sourcemap_gen);
-    DEFMAP(AST_Try, basic_sourcemap_gen);
-    DEFMAP(AST_Catch, basic_sourcemap_gen);
-    DEFMAP(AST_Finally, basic_sourcemap_gen);
-    DEFMAP(AST_Definitions, basic_sourcemap_gen);
-    DEFMAP(AST_Constant, basic_sourcemap_gen);
-    DEFMAP(AST_ObjectSetter, function(self, output){
-        output.add_mapping(self.start, self.key.name);
-    });
-    DEFMAP(AST_ObjectGetter, function(self, output){
-        output.add_mapping(self.start, self.key.name);
-    });
-    DEFMAP(AST_ObjectProperty, function(self, output){
-        output.add_mapping(self.start, self.key);
+    DEFMAP([
+        AST_Array,
+        AST_BlockStatement,
+        AST_Catch,
+        AST_Constant,
+        AST_Debugger,
+        AST_Definitions,
+        AST_Directive,
+        AST_Finally,
+        AST_Jump,
+        AST_Lambda,
+        AST_New,
+        AST_Object,
+        AST_StatementWithBody,
+        AST_Symbol,
+        AST_Switch,
+        AST_SwitchBranch,
+        AST_Try,
+    ], function(output) {
+        output.add_mapping(this.start);
    });

+    DEFMAP([
+        AST_ObjectGetter,
+        AST_ObjectSetter,
+     ], function(output) {
+        output.add_mapping(this.start, this.key.name);
+    });
+
+    DEFMAP([ AST_ObjectProperty ], function(output) {
+        output.add_mapping(this.start, this.key);
+    });
 })();
--- a/lib/parse.js
+++ b/lib/parse.js
@@ -969,7 +969,9 @@ function parse($TEXT, options) {

    function labeled_statement() {
        var label = as_symbol(AST_Label);
-        if (find_if(function(l){ return l.name == label.name }, S.labels)) {
+        if (!all(S.labels, function(l) {
+            return l.name != label.name;
+        })) {
            // ECMA-262, 12.12: An ECMAScript program is considered
            // syntactically incorrect if it contains a
            // LabelledStatement that is enclosed by a
--- a/lib/scope.js
+++ b/lib/scope.js
@@ -74,17 +74,12 @@ SymbolDef.prototype = {
        var cache = options.cache && options.cache.props;
        if (this.global && cache && cache.has(this.name)) {
            this.mangled_name = cache.get(this.name);
-        }
-        else if (!this.mangled_name && !this.unmangleable(options)) {
-            var s = this.scope;
-            var sym = this.orig[0];
-            if (options.ie8 && sym instanceof AST_SymbolLambda)
-                s = s.parent_scope;
+        } else if (!this.mangled_name && !this.unmangleable(options)) {
            var def;
            if (def = this.redefined()) {
                this.mangled_name = def.mangled_name || def.name;
            } else {
-                this.mangled_name = next_mangled_name(s, options, this);
+                this.mangled_name = next_mangled_name(this.scope, options, this);
            }
            if (this.global && cache) {
                cache.set(this.name, this.mangled_name);
@@ -105,7 +100,6 @@ AST_Toplevel.DEFMETHOD("figure_out_scope", function(options){
    // pass 1: setup scope chaining and handle definitions
    var self = this;
    var scope = self.parent_scope = null;
-    var labels = new Dictionary();
    var defun = null;
    var tw = new TreeWalker(function(node, descend){
        if (node instanceof AST_Catch) {
@@ -120,25 +114,12 @@ AST_Toplevel.DEFMETHOD("figure_out_scope", function(options){
            node.init_scope_vars(scope);
            var save_scope = scope;
            var save_defun = defun;
-            var save_labels = labels;
            defun = scope = node;
-            labels = new Dictionary();
            descend();
            scope = save_scope;
            defun = save_defun;
-            labels = save_labels;
            return true;        // don't descend again in TreeWalker
        }
-        if (node instanceof AST_LabeledStatement) {
-            var l = node.label;
-            if (labels.has(l.name)) {
-                throw new Error(string_template("Label {name} defined twice", l));
-            }
-            labels.set(l.name, l);
-            descend();
-            labels.del(l.name);
-            return true;        // no descend again
-        }
        if (node instanceof AST_With) {
            for (var s = scope; s; s = s.parent_scope)
                s.uses_with = true;
@@ -176,15 +157,6 @@ AST_Toplevel.DEFMETHOD("figure_out_scope", function(options){
        else if (node instanceof AST_SymbolCatch) {
            scope.def_variable(node).defun = defun;
        }
-        else if (node instanceof AST_LabelRef) {
-            var sym = labels.get(node.name);
-            if (!sym) throw new Error(string_template("Undefined label {name} [{line},{col}]", {
-                name: node.name,
-                line: node.start.line,
-                col: node.start.col
-            }));
-            node.thedef = sym;
-        }
    });
    self.walk(tw);

@@ -377,6 +349,9 @@ 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;
 }

@@ -459,16 +434,19 @@ AST_Toplevel.DEFMETHOD("mangle_names", function(options){
            var redef = def.redefined();
            if (redef) {
                redefined.push(def);
-                def.references.forEach(function(ref) {
-                    ref.thedef = redef;
-                    ref.reference(options);
-                    ref.thedef = def;
-                });
+                reference(node.argname);
+                def.references.forEach(reference);
            }
            descend();
            if (!redef) mangle(def);
            return true;
        }
+
+        function reference(sym) {
+            sym.thedef = redef;
+            sym.reference(options);
+            sym.thedef = def;
+        }
    });
    this.walk(tw);
    redefined.forEach(mangle);
--- a/package.json
+++ b/package.json
@@ -1,10 +1,9 @@
 {
  "name": "uglify-js",
  "description": "JavaScript parser, mangler/compressor and beautifier toolkit",
-  "homepage": "http://lisperator.net/uglifyjs",
  "author": "Mihai Bazon <mihai.bazon@gmail.com> (http://lisperator.net/)",
  "license": "BSD-2-Clause",
-  "version": "3.3.13",
+  "version": "3.3.18",
  "engines": {
    "node": ">=0.8.0"
  },
@@ -24,16 +23,39 @@
    "LICENSE"
  ],
  "dependencies": {
-    "commander": "~2.14.1",
+    "commander": "~2.15.0",
    "source-map": "~0.6.1"
  },
  "devDependencies": {
-    "acorn": "~5.4.1",
+    "acorn": "~5.5.3",
    "mocha": "~3.5.1",
    "semver": "~5.5.0"
  },
  "scripts": {
    "test": "node test/run-tests.js"
  },
-  "keywords": ["uglify", "uglify-js", "minify", "minifier", "es5"]
+  "keywords": [
+    "cli",
+    "compress",
+    "compressor",
+    "ecma",
+    "ecmascript",
+    "es",
+    "es5",
+    "javascript",
+    "js",
+    "jsmin",
+    "min",
+    "minification",
+    "minifier",
+    "minify",
+    "optimize",
+    "optimizer",
+    "pack",
+    "packer",
+    "parse",
+    "parser",
+    "uglifier",
+    "uglify"
+  ]
 }
--- a/test/compress/collapse_vars.js
+++ b/test/compress/collapse_vars.js
@@ -4976,7 +4976,7 @@ collapse_rhs_array: {
    expect_stdout: "false false false"
 }

-collapse_rhs_boolean: {
+collapse_rhs_boolean_1: {
    options = {
        collapse_vars: true,
    }
@@ -5001,6 +5001,66 @@ collapse_rhs_boolean: {
    expect_stdout: "true true true"
 }

+collapse_rhs_boolean_2: {
+    options = {
+        collapse_vars: true,
+    }
+    input: {
+        var a;
+        (function f1() {
+            a = function() {};
+            if (/foo/)
+                console.log(typeof a);
+        })();
+        console.log(function f2() {
+            a = [];
+            return !1;
+        }());
+    }
+    expect: {
+        var a;
+        (function f1() {
+            if (a = function() {})
+                console.log(typeof a);
+        })();
+        console.log(function f2() {
+            return !(a = []);
+        }());
+    }
+    expect_stdout: [
+        "function",
+        "false",
+    ]
+}
+
+collapse_rhs_boolean_3: {
+    options = {
+        booleans: true,
+        collapse_vars: true,
+        conditionals: true,
+    }
+    input: {
+        var a, f, g, h, i, n, s, t, x, y;
+        if (x()) {
+            n = a;
+        } else if (y()) {
+            n = f();
+        } else if (s) {
+            i = false;
+            n = g(true);
+        } else if (t) {
+            i = false;
+            n = h(true);
+        } else {
+            n = [];
+        }
+    }
+    expect: {
+        var a, f, g, h, i, n, s, t, x, y;
+        n = x() ? a : y() ? f() : s ? g(!(i = !1)) : t ? h(!(i = !1)) : [];
+    }
+}
+
 collapse_rhs_function: {
    options = {
        collapse_vars: true,
@@ -5207,3 +5267,63 @@ collapse_rhs_undefined: {
    }
    expect_stdout: "true true true"
 }
+
+issue_2974: {
+    options = {
+        booleans: true,
+        collapse_vars: true,
+        evaluate: true,
+        loops: true,
+        passes: 2,
+        pure_getters: "strict",
+        reduce_vars: true,
+        sequences: true,
+        side_effects: true,
+        unused: true,
+    }
+    input: {
+        var c = 0;
+        (function f(b) {
+            var a = 2;
+            do {
+                b && b[b];
+                b && (b.null = -4);
+                c++;
+            } while (b.null && --a > 0);
+        })(true);
+        console.log(c);
+    }
+    expect: {
+        var c = 0;
+        (function(b) {
+            var a = 2;
+            for (; b.null = -4, c++, b.null && --a > 0;);
+        })(!0),
+        console.log(c);
+    }
+    expect_stdout: "1"
+}
+
+issue_3032: {
+    options = {
+        collapse_vars: true,
+        pure_getters: true,
+    }
+    input: {
+        console.log({
+            f: function() {
+                this.a = 42;
+                return [ this.a, !1 ];
+            }
+        }.f()[0]);
+    }
+    expect: {
+        console.log({
+            f: function() {
+                this.a = 42;
+                return [ this.a, !1 ];
+            }
+        }.f()[0]);
+    }
+    expect_stdout: "42"
+}
--- a/test/compress/conditionals.js
+++ b/test/compress/conditionals.js
@@ -703,10 +703,11 @@ ternary_boolean_alternative: {

 trivial_boolean_ternary_expressions : {
    options = {
+        booleans: true,
        conditionals: true,
-        evaluate    : true,
-        booleans    : true
-    };
+        evaluate: true,
+        side_effects: true,
+    }
    input: {
        f('foo' in m ? true  : false);
        f('foo' in m ? false : true);
--- a/test/compress/drop-unused.js
+++ b/test/compress/drop-unused.js
@@ -1785,3 +1785,32 @@ issue_805_2: {
        "bar",
    ]
 }
+
+issue_2995: {
+    options = {
+        pure_getters: "strict",
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        function f(a) {
+            var b;
+            a.b = b = function() {};
+            b.c = "PASS";
+        }
+        var o = {};
+        f(o);
+        console.log(o.b.c);
+    }
+    expect: {
+        function f(a) {
+            var b;
+            a.b = b = function() {};
+            b.c = "PASS";
+        }
+        var o = {};
+        f(o);
+        console.log(o.b.c);
+    }
+    expect_stdout: "PASS"
+}
--- a/test/compress/evaluate.js
+++ b/test/compress/evaluate.js
@@ -745,7 +745,7 @@ in_boolean_context: {
            !b("foo"),
            !b([1, 2]),
            !b(/foo/),
-            ![1, foo()],
+            (foo(), !1),
            (foo(), !1)
        );
    }
@@ -1566,3 +1566,43 @@ issue_2968: {
    }
    expect_stdout: "PASS"
 }
+
+truthy_conditionals: {
+    options = {
+        conditionals: true,
+        evaluate: true,
+    }
+    input: {
+        if (a = {}) x();
+        (b = /foo/) && y();
+        (c = function() {}) || z();
+    }
+    expect: {
+        a = {}, x();
+        b = /foo/, y();
+        c = function() {};
+    }
+}
+
+truthy_loops: {
+    options = {
+        evaluate: true,
+        loops: true,
+    }
+    input: {
+        while ([]) x();
+        do {
+            y();
+        } while(a = {});
+    }
+    expect: {
+        for (;;) {
+            [];
+            x();
+        }
+        for (;;) {
+            y();
+            a = {};
+        }
+    }
+}
--- a/test/compress/functions.js
+++ b/test/compress/functions.js
@@ -2051,3 +2051,189 @@ drop_lone_use_strict: {
        }
    }
 }
+
+issue_3016_1: {
+    options = {
+        inline: true,
+        toplevel: true,
+    }
+    input: {
+        var b = 1;
+        do {
+            (function(a) {
+                return a[b];
+                var a;
+            })(3);
+        } while (0);
+        console.log(b);
+    }
+    expect: {
+        var b = 1;
+        do {
+            a = 3,
+            a[b];
+        } while(0);
+        var a;
+        console.log(b);
+    }
+    expect_stdout: "1"
+}
+
+issue_3016_2: {
+    options = {
+        dead_code: true,
+        inline: true,
+        toplevel: true,
+    }
+    input: {
+        var b = 1;
+        do {
+            (function(a) {
+                return a[b];
+                try {
+                    a = 2;
+                } catch (a) {
+                    var a;
+                }
+            })(3);
+        } while (0);
+        console.log(b);
+    }
+    expect: {
+        var b = 1;
+        do {
+            a = 3,
+            a[b];
+        } while(0);
+        var a;
+        console.log(b);
+    }
+    expect_stdout: "1"
+}
+
+issue_3016_2_ie8: {
+    options = {
+        dead_code: true,
+        ie8: true,
+        inline: true,
+        toplevel: true,
+    }
+    input: {
+        var b = 1;
+        do {
+            (function(a) {
+                return a[b];
+                try {
+                    a = 2;
+                } catch (a) {
+                    var a;
+                }
+            })(3);
+        } while (0);
+        console.log(b);
+    }
+    expect: {
+        var b = 1;
+        do {
+            a = 3,
+            a[b];
+        } while(0);
+        var a;
+        console.log(b);
+    }
+    expect_stdout: "1"
+}
+
+issue_3016_3: {
+    options = {
+        dead_code: true,
+        inline: true,
+        toplevel: true,
+    }
+    input: {
+        var b = 1;
+        do {
+            console.log(function() {
+                return a ? "FAIL" : a = "PASS";
+                try {
+                    a = 2;
+                } catch (a) {
+                    var a;
+                }
+            }());
+        } while (b--);
+    }
+    expect: {
+        var b = 1;
+        do {
+            console.log((a = void 0, a ? "FAIL" : a = "PASS"));
+        } while(b--);
+        var a;
+    }
+    expect_stdout: [
+        "PASS",
+        "PASS",
+    ]
+}
+
+issue_3016_3_ie8: {
+    options = {
+        dead_code: true,
+        ie8: true,
+        inline: true,
+        toplevel: true,
+    }
+    input: {
+        var b = 1;
+        do {
+            console.log(function() {
+                return a ? "FAIL" : a = "PASS";
+                try {
+                    a = 2;
+                } catch (a) {
+                    var a;
+                }
+            }());
+        } while (b--);
+    }
+    expect: {
+        var b = 1;
+        do {
+            console.log((a = void 0, a ? "FAIL" : a = "PASS"));
+        } while(b--);
+        var a;
+    }
+    expect_stdout: [
+        "PASS",
+        "PASS",
+    ]
+}
+
+issue_3018: {
+    options = {
+        inline: true,
+        side_effects: true,
+        toplevel: true,
+    }
+    input: {
+        var b = 1, c = "PASS";
+        do {
+            (function() {
+                (function(a) {
+                    a = 0 != (a && (c = "FAIL"));
+                })();
+            })();
+        } while (b--);
+        console.log(c);
+    }
+    expect: {
+        var b = 1, c = "PASS";
+        do {
+            a = void 0,
+            a = 0 != (a && (c = "FAIL"));
+        } while (b--);
+        var a;
+        console.log(c);
+    }
+    expect_stdout: "PASS"
+}
--- a/test/compress/hoist_props.js
+++ b/test/compress/hoist_props.js
@@ -686,3 +686,33 @@ undefined_key: {
    }
    expect_stdout: "3"
 }
+
+issue_3021: {
+    options = {
+        hoist_props: true,
+        reduce_vars: true,
+    }
+    input: {
+        var a = 1, b = 2;
+        (function() {
+            b = a;
+            if (a++ + b--)
+                return 1;
+            return;
+            var b = {};
+        })();
+        console.log(a, b);
+    }
+    expect: {
+        var a = 1, b = 2;
+        (function() {
+            b = a;
+            if (a++ + b--)
+                return 1;
+            return;
+            var b = {};
+        })();
+        console.log(a, b);
+    }
+    expect_stdout: "2 2"
+}
--- a/test/compress/screw-ie8.js
+++ b/test/compress/screw-ie8.js
@@ -392,3 +392,149 @@ issue_2254_2: {
    }
    expect_stdout: "PASS"
 }
+
+issue_24_1: {
+    mangle = {
+        ie8: false,
+    }
+    input: {
+        (function(a) {
+            console.log(typeof function f(){} === typeof a ? "FAIL" : "PASS");
+        })();
+    }
+    expect: {
+        (function(o) {
+            console.log(typeof function o(){} === typeof o ? "FAIL" : "PASS");
+        })();
+    }
+    expect_stdout: "PASS"
+}
+
+issue_24_2: {
+    mangle = {
+        ie8: true,
+    }
+    input: {
+        (function(a) {
+            console.log(typeof function f(){} === typeof a ? "FAIL" : "PASS");
+        })();
+    }
+    expect: {
+        (function(n) {
+            console.log(typeof function o(){} === typeof n ? "FAIL" : "PASS");
+        })();
+    }
+    expect_stdout: "PASS"
+}
+
+issue_2976_1: {
+    mangle = {
+        ie8: false,
+    }
+    input: {
+        console.log(function f() {
+            var a;
+            return a === f ? "FAIL" : "PASS";
+        }());
+    }
+    expect: {
+        console.log(function n() {
+            var o;
+            return o === n ? "FAIL" : "PASS";
+        }());
+    }
+    expect_stdout: "PASS"
+}
+
+issue_2976_2: {
+    mangle = {
+        ie8: true,
+    }
+    input: {
+        console.log(function f() {
+            var a;
+            return a === f ? "FAIL" : "PASS";
+        }());
+    }
+    expect: {
+        console.log(function n() {
+            var o;
+            return o === n ? "FAIL" : "PASS";
+        }());
+    }
+    expect_stdout: "PASS"
+}
+
+issue_3035: {
+    mangle = {
+        ie8: false,
+    }
+    input: {
+        var c = "FAIL";
+        (function(a) {
+            try {
+                throw 1;
+            } catch (b) {
+                try {
+                    throw 0;
+                } catch (a) {
+                    b && (c = "PASS");
+                }
+            }
+        })();
+        console.log(c);
+    }
+    expect: {
+        var c = "FAIL";
+        (function(o) {
+            try {
+                throw 1;
+            } catch (t) {
+                try {
+                    throw 0;
+                } catch (o) {
+                    t && (c = "PASS");
+                }
+            }
+        })();
+        console.log(c);
+    }
+    expect_stdout: "PASS"
+}
+
+issue_3035_ie8: {
+    mangle = {
+        ie8: true,
+    }
+    input: {
+        var c = "FAIL";
+        (function(a) {
+            try {
+                throw 1;
+            } catch (b) {
+                try {
+                    throw 0;
+                } catch (a) {
+                    b && (c = "PASS");
+                }
+            }
+        })();
+        console.log(c);
+    }
+    expect: {
+        var c = "FAIL";
+        (function(t) {
+            try {
+                throw 1;
+            } catch (o) {
+                try {
+                    throw 0;
+                } catch (t) {
+                    o && (c = "PASS");
+                }
+            }
+        })();
+        console.log(c);
+    }
+    expect_stdout: "PASS"
+}
--- a/test/compress/issue-1261.js
+++ b/test/compress/issue-1261.js
@@ -175,8 +175,8 @@ should_warn: {
        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:141,31]",
        "WARN: Condition always true [test/compress/issue-1261.js:141,8]",
        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:142,23]",
-        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:143,24]",
        "WARN: Condition always true [test/compress/issue-1261.js:143,8]",
+        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:143,24]",
        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:144,31]",
        "WARN: Condition always false [test/compress/issue-1261.js:144,8]",
    ]
--- a/test/compress/issue-2989.js
+++ b/test/compress/issue-2989.js
@@ -0,0 +1,21 @@
+inline_script_off: {
+    beautify = {
+        inline_script: false,
+    }
+    input: {
+        console.log("</sCrIpT>");
+    }
+    expect_exact: 'console.log("</sCrIpT>");'
+    expect_stdout: "</sCrIpT>"
+}
+
+inline_script_on: {
+    beautify = {
+        inline_script: true,
+    }
+    input: {
+        console.log("</sCrIpT>");
+    }
+    expect_exact: 'console.log("<\\/sCrIpT>");'
+    expect_stdout: "</sCrIpT>"
+}
--- a/test/compress/loops.js
+++ b/test/compress/loops.js
@@ -294,10 +294,10 @@ issue_186_beautify_ie8: {
    ]
 }

-issue_186_bracketize: {
+issue_186_braces: {
    beautify = {
        beautify: false,
-        bracketize: true,
+        braces: true,
        ie8: false,
    }
    input: {
@@ -314,10 +314,10 @@ issue_186_bracketize: {
    expect_exact: 'var x=3;if(foo()){do{do{alert(x)}while(--x)}while(x)}else{bar()}'
 }

-issue_186_bracketize_ie8: {
+issue_186_braces_ie8: {
    beautify = {
        beautify: false,
-        bracketize: true,
+        braces: true,
        ie8: true,
    }
    input: {
@@ -334,10 +334,10 @@ issue_186_bracketize_ie8: {
    expect_exact: 'var x=3;if(foo()){do{do{alert(x)}while(--x)}while(x)}else{bar()}'
 }

-issue_186_beautify_bracketize: {
+issue_186_beautify_braces: {
    beautify = {
        beautify: true,
-        bracketize: true,
+        braces: true,
        ie8: false,
    }
    input: {
@@ -366,10 +366,10 @@ issue_186_beautify_bracketize: {
    ]
 }

-issue_186_beautify_bracketize_ie8: {
+issue_186_beautify_braces_ie8: {
    beautify = {
        beautify: true,
-        bracketize: true,
+        braces: true,
        ie8: true,
    }
    input: {
--- a/test/compress/negate-iife.js
+++ b/test/compress/negate-iife.js
@@ -67,7 +67,7 @@ negate_iife_3_evaluate: {
        (function(){ return true })() ? console.log(true) : console.log(false);
    }
    expect: {
-        console.log(true);
+        true, console.log(true);
    }
    expect_stdout: true
 }
@@ -110,7 +110,7 @@ negate_iife_3_off_evaluate: {
        (function(){ return true })() ? console.log(true) : console.log(false);
    }
    expect: {
-        console.log(true);
+        true, console.log(true);
    }
    expect_stdout: true
 }
--- a/test/compress/reduce_vars.js
+++ b/test/compress/reduce_vars.js
@@ -55,7 +55,7 @@ reduce_vars: {
            console.log(a - 5);
            eval("console.log(a);");
        })(eval);
-        "yes";
+        true, "yes";
        console.log(A + 1);
    }
    expect_stdout: true
@@ -147,7 +147,7 @@ modified: {
        }
        function f4() {
            var b = 2, c = 3;
-            b = c;
+            1, b = c;
            console.log(1 + b);
            console.log(b + c);
            console.log(1 + c);
@@ -715,10 +715,12 @@ passes: {
        passes: 2,
        reduce_funcs: true,
        reduce_vars: true,
+        sequences: true,
+        side_effects: true,
        unused: true,
    }
    input: {
-        function f() {
+        (function() {
            var a = 1, b = 2, c = 3;
            if (a) {
                b = c;
@@ -729,17 +731,22 @@ passes: {
            console.log(b + c);
            console.log(a + c);
            console.log(a + b + c);
-        }
+        })();
    }
    expect: {
-        function f() {
-            3;
-            console.log(4);
-            console.log(6);
-            console.log(4);
+        (function() {
+            console.log(4),
+            console.log(6),
+            console.log(4),
            console.log(7);
-        }
+        })();
    }
+    expect_stdout: [
+        "4",
+        "6",
+        "4",
+        "7",
+    ]
 }

 iife: {
@@ -5545,3 +5552,105 @@ issue_2919: {
    }
    expect_stdout: "function"
 }
+
+issue_2992: {
+    options = {
+        evaluate: true,
+        reduce_vars: true,
+    }
+    input: {
+        var c = "PASS";
+        (function f(b) {
+            switch (0) {
+            case 0:
+            case b = 1:
+                b && (c = "FAIL");
+            }
+        })();
+        console.log(c);
+    }
+    expect: {
+        var c = "PASS";
+        (function f(b) {
+            switch (0) {
+            case 0:
+            case b = 1:
+                b && (c = "FAIL");
+            }
+        })();
+        console.log(c);
+    }
+    expect_stdout: "PASS"
+}
+
+issue_3042_1: {
+    options = {
+        reduce_funcs: true,
+        reduce_vars: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        function f() {}
+        var a = [ 1, 2 ].map(function() {
+            return new f();
+        });
+        console.log(a[0].constructor === a[1].constructor);
+    }
+    expect: {
+        function f() {}
+        var a = [ 1, 2 ].map(function() {
+            return new f();
+        });
+        console.log(a[0].constructor === a[1].constructor);
+    }
+    expect_stdout: "true"
+}
+
+issue_3042_2: {
+    options = {
+        reduce_funcs: true,
+        reduce_vars: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        function Foo() {
+            this.isFoo = function(o) {
+                return o instanceof Foo;
+            };
+        }
+        function FooCollection() {
+            this.foos = [1, 1].map(function() {
+                return new Foo();
+            });
+        }
+        var fooCollection = new FooCollection();
+        console.log(fooCollection.foos[0].isFoo(fooCollection.foos[0]));
+        console.log(fooCollection.foos[0].isFoo(fooCollection.foos[1]));
+        console.log(fooCollection.foos[1].isFoo(fooCollection.foos[0]));
+        console.log(fooCollection.foos[1].isFoo(fooCollection.foos[1]));
+    }
+    expect: {
+        function Foo() {
+            this.isFoo = function(o) {
+                return o instanceof Foo;
+            };
+        }
+        var fooCollection = new function() {
+            this.foos = [1, 1].map(function() {
+                return new Foo();
+            });
+        }();
+        console.log(fooCollection.foos[0].isFoo(fooCollection.foos[0]));
+        console.log(fooCollection.foos[0].isFoo(fooCollection.foos[1]));
+        console.log(fooCollection.foos[1].isFoo(fooCollection.foos[0]));
+        console.log(fooCollection.foos[1].isFoo(fooCollection.foos[1]));
+    }
+    expect_stdout: [
+        "true",
+        "true",
+        "true",
+        "true",
+    ]
+}
--- a/test/compress/transform.js
+++ b/test/compress/transform.js
@@ -59,7 +59,7 @@ if_else_empty: {
        if ({} ? a : b); else {}
    }
    expect: {
-        !{} ? b : a;
+        ({}), a;
    }
 }

--- a/test/input/issue-1482/bracketize.js
+++ b/test/input/issue-1482/bracketize.js
--- a/test/input/pr-3040/expect.js
+++ b/test/input/pr-3040/expect.js
@@ -0,0 +1,2 @@
+function _toConsumableArray(arr){if(Array.isArray(arr)){for(var i=0,arr2=Array(arr.length);i<arr.length;i++){arr2[i]=arr[i]}return arr2}else{return Array.from(arr)}}var _require=require("bar"),foo=_require.foo;var _require2=require("world"),hello=_require2.hello;foo.x.apply(foo,_toConsumableArray(foo.y(hello.z)));
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImlucHV0Mi5qcyJdLCJuYW1lcyI6WyJyZXF1aXJlIiwiYXJyIl0sIm1hcHBpbmdzIjoiMEpBQWNBLEtBQVFDIiwic291cmNlc0NvbnRlbnQiOlsiY29uc3Qge2Zvb30gPSByZXF1aXJlKFwiYmFyXCIpO1xuY29uc3Qge2hlbGxvfSA9IHJlcXVpcmUoXCJ3b3JsZFwiKTtcblxuZm9vLngoLi4uZm9vLnkoaGVsbG8ueikpO1xuIl19
--- a/test/input/pr-3040/input.js
+++ b/test/input/pr-3040/input.js
@@ -0,0 +1,11 @@
+function _toConsumableArray(arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = Array(arr.length); i < arr.length; i++) { arr2[i] = arr[i]; } return arr2; } else { return Array.from(arr); } }
+
+var _require = require("bar"),
+    foo = _require.foo;
+
+var _require2 = require("world"),
+    hello = _require2.hello;
+
+foo.x.apply(foo, _toConsumableArray(foo.y(hello.z)));
+
+//# sourceMappingURL=input.js.map
--- a/test/input/pr-3040/input.js.map
+++ b/test/input/pr-3040/input.js.map
@@ -0,0 +1 @@
+{"version":3,"sources":["input2.js"],"names":["require","foo","hello","x","apply","_toConsumableArray","y","z"],"mappings":"kLAAcA,QAAQ,OAAfC,aAAAA,kBACSD,QAAQ,SAAjBE,gBAAAA,MAEPD,IAAIE,EAAJC,MAAAH,IAAAI,mBAASJ,IAAIK,EAAEJ,MAAMK","sourcesContent":["const {foo} = require(\"bar\");\nconst {hello} = require(\"world\");\n\nfoo.x(...foo.y(hello.z));\n"]}
--- a/test/mocha/cli.js
+++ b/test/mocha/cli.js
@@ -1,9 +1,9 @@
 var assert = require("assert");
 var exec = require("child_process").exec;
-var readFileSync = require("fs").readFileSync;
+var fs = require("fs");

 function read(path) {
-    return readFileSync(path, "utf8");
+    return fs.readFileSync(path, "utf8");
 }

 describe("bin/uglifyjs", function () {
@@ -56,6 +56,18 @@ describe("bin/uglifyjs", function () {
            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), [
+                "INFO: Using input source map: blah",
+                "ERROR: invalid input source map: blah",
+            ]);
+            done();
+        });
+    });
    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";

@@ -94,6 +106,35 @@ describe("bin/uglifyjs", function () {
            done();
        });
    });
+    it("Should not load source map before finish reading from STDIN", function(done) {
+        var mapFile = "tmp/input.js.map";
+        try {
+            fs.mkdirSync("./tmp");
+        } catch (e) {
+            if (e.code != "EEXIST") throw e;
+        }
+        try {
+            fs.unlinkSync(mapFile);
+        } catch (e) {
+            if (e.code != "ENOENT") throw e;
+        }
+        var command = [
+            uglifyjscmd,
+            "--source-map", "content=" + mapFile,
+            "--source-map", "url=inline"
+        ].join(" ");
+
+        var child = exec(command, function(err, stdout) {
+            if (err) throw err;
+
+            assert.strictEqual(stdout, read("test/input/pr-3040/expect.js"));
+            done();
+        });
+        setTimeout(function() {
+            fs.writeFileSync(mapFile, read("test/input/pr-3040/input.js.map"));
+            child.stdin.end(read("test/input/pr-3040/input.js"));
+        }, 1000);
+    });
    it("Should work with --keep-fnames (mangle only)", function (done) {
        var command = uglifyjscmd + ' test/input/issue-1431/sample.js --keep-fnames -m';

@@ -164,13 +205,13 @@ describe("bin/uglifyjs", function () {
            done();
        });
    });
-    it("Should work with `--beautify bracketize`", function (done) {
-        var command = uglifyjscmd + ' test/input/issue-1482/input.js -b bracketize';
+    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/bracketize.js"));
+            assert.strictEqual(stdout, read("test/input/issue-1482/braces.js"));
            done();
        });
    });
--- a/test/mocha/comment.js
+++ b/test/mocha/comment.js
@@ -139,6 +139,26 @@ describe("Comment", function() {
        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 = [
            [
--- a/test/mocha/minify.js
+++ b/test/mocha/minify.js
@@ -186,99 +186,6 @@ describe("minify", function() {
        });
    });

-    describe("inSourceMap", function() {
-        it("Should read the given string filename correctly when sourceMapIncludeSources is enabled (#1236)", function() {
-            var result = Uglify.minify(read("./test/input/issue-1236/simple.js"), {
-                sourceMap: {
-                    content: read("./test/input/issue-1236/simple.js.map"),
-                    filename: "simple.min.js",
-                    includeSources: true
-                }
-            });
-
-            var map = JSON.parse(result.map);
-
-            assert.equal(map.file, 'simple.min.js');
-            assert.equal(map.sourcesContent.length, 1);
-            assert.equal(map.sourcesContent[0],
-                '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"), {
-                compress: { toplevel: true },
-                sourceMap: {
-                    content: "inline",
-                    url: "inline"
-                }
-            }).code + "\n";
-            assert.strictEqual(code, 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 warnings = [];
-            Uglify.AST_Node.warn_function = function(txt) {
-                warnings.push(txt);
-            };
-            try {
-                var result = Uglify.minify(read("./test/input/issue-1323/sample.js"), {
-                    mangle: false,
-                    sourceMap: {
-                        content: "inline"
-                    }
-                });
-                assert.strictEqual(result.code, "var bar=function(bar){return bar};");
-                assert.strictEqual(warnings.length, 1);
-                assert.strictEqual(warnings[0], "inline source map not found");
-            } finally {
-                Uglify.AST_Node.warn_function = warn_function;
-            }
-        });
-        it("Should fail with multiple input and inline source map", function() {
-            var result = Uglify.minify([
-                read("./test/input/issue-520/input.js"),
-                read("./test/input/issue-520/output.js")
-            ], {
-                sourceMap: {
-                    content: "inline",
-                    url: "inline"
-                }
-            });
-            var err = result.error;
-            assert.ok(err instanceof Error);
-            assert.strictEqual(err.stack.split(/\n/)[0], "Error: inline source map only works with singular input");
-        });
-    });
-
-    describe("sourceMapInline", function() {
-        it("should append source map to output js when sourceMapInline is enabled", function() {
-            var result = Uglify.minify('var a = function(foo) { return foo; };', {
-                sourceMap: {
-                    url: "inline"
-                }
-            });
-            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() {
-            var result = Uglify.minify('var a = function(foo) { return foo; };');
-            var code = result.code;
-            assert.strictEqual(code, "var a=function(n){return n};");
-        });
-        it("should work with max_line_len", function() {
-            var result = Uglify.minify(read("./test/input/issue-505/input.js"), {
-                output: {
-                    max_line_len: 20
-                },
-                sourceMap: {
-                    url: "inline"
-                }
-            });
-            assert.strictEqual(result.error, undefined);
-            assert.strictEqual(result.code, read("./test/input/issue-505/output.js"));
-        });
-    });
-
    describe("#__PURE__", function() {
        it("should drop #__PURE__ hint after use", function() {
            var result = Uglify.minify('//@__PURE__ comment1 #__PURE__ comment2\n foo(), bar();', {
@@ -312,6 +219,15 @@ describe("minify", function() {
            assert.strictEqual(err.line, 1);
            assert.strictEqual(err.col, 12);
        });
+        it("should reject duplicated label name", function() {
+            var result = Uglify.minify("L:{L:{}}");
+            var err = result.error;
+            assert.ok(err instanceof Error);
+            assert.strictEqual(err.stack.split(/\n/)[0], "SyntaxError: Label L defined twice");
+            assert.strictEqual(err.filename, "0");
+            assert.strictEqual(err.line, 1);
+            assert.strictEqual(err.col, 4);
+        });
    });

    describe("global_defs", function() {
--- a/test/mocha/release.js
+++ b/test/mocha/release.js
@@ -17,7 +17,7 @@ describe("test/benchmark.js", function() {
    this.timeout(10 * 60 * 1000);
    [
        "-b",
-        "-b bracketize",
+        "-b braces",
        "-m",
        "-mc passes=3",
        "-mc passes=3,toplevel",
--- a/test/mocha/sourcemaps.js
+++ b/test/mocha/sourcemaps.js
@@ -0,0 +1,143 @@
+var assert = require("assert");
+var readFileSync = require("fs").readFileSync;
+var Uglify = require("../../");
+
+function read(path) {
+    return readFileSync(path, "utf8");
+}
+
+function source_map(code) {
+    return JSON.parse(Uglify.minify(code, {
+        compress: false,
+        mangle: false,
+        sourceMap: true,
+    }).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([
+            "({",
+            "    get enabled() {",
+            "        return 3;",
+            "    },",
+            "    set enabled(x) {",
+            "        ;",
+            "    }",
+            "});",
+        ].join("\n"));
+        assert.deepEqual(map.names, [ "enabled", "x" ]);
+    });
+
+    it("Should mark array/object literals", function() {
+        var result = Uglify.minify([
+            "var obj = {};",
+            "obj.wat([]);",
+        ].join("\n"), {
+            sourceMap: true,
+            toplevel: true,
+        });
+        if (result.error) throw result.error;
+        assert.strictEqual(result.code, "({}).wat([]);");
+        assert.strictEqual(result.map, '{"version":3,"sources":["0"],"names":["wat"],"mappings":"CAAU,IACNA,IAAI"}');
+    });
+
+    describe("inSourceMap", function() {
+        it("Should read the given string filename correctly when sourceMapIncludeSources is enabled (#1236)", function() {
+            var result = Uglify.minify(read("./test/input/issue-1236/simple.js"), {
+                sourceMap: {
+                    content: read("./test/input/issue-1236/simple.js.map"),
+                    filename: "simple.min.js",
+                    includeSources: true
+                }
+            });
+
+            var map = JSON.parse(result.map);
+
+            assert.equal(map.file, 'simple.min.js');
+            assert.equal(map.sourcesContent.length, 1);
+            assert.equal(map.sourcesContent[0],
+                '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"), {
+                compress: { toplevel: true },
+                sourceMap: {
+                    content: "inline",
+                    url: "inline"
+                }
+            }).code + "\n";
+            assert.strictEqual(code, 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 warnings = [];
+            Uglify.AST_Node.warn_function = function(txt) {
+                warnings.push(txt);
+            };
+            try {
+                var result = Uglify.minify(read("./test/input/issue-1323/sample.js"), {
+                    mangle: false,
+                    sourceMap: {
+                        content: "inline"
+                    }
+                });
+                assert.strictEqual(result.code, "var bar=function(bar){return bar};");
+                assert.strictEqual(warnings.length, 1);
+                assert.strictEqual(warnings[0], "inline source map not found");
+            } finally {
+                Uglify.AST_Node.warn_function = warn_function;
+            }
+        });
+        it("Should fail with multiple input and inline source map", function() {
+            var result = Uglify.minify([
+                read("./test/input/issue-520/input.js"),
+                read("./test/input/issue-520/output.js")
+            ], {
+                sourceMap: {
+                    content: "inline",
+                    url: "inline"
+                }
+            });
+            var err = result.error;
+            assert.ok(err instanceof Error);
+            assert.strictEqual(err.stack.split(/\n/)[0], "Error: inline source map only works with singular input");
+        });
+    });
+
+    describe("sourceMapInline", function() {
+        it("should append source map to output js when sourceMapInline is enabled", function() {
+            var result = Uglify.minify('var a = function(foo) { return foo; };', {
+                sourceMap: {
+                    url: "inline"
+                }
+            });
+            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() {
+            var result = Uglify.minify('var a = function(foo) { return foo; };');
+            var code = result.code;
+            assert.strictEqual(code, "var a=function(n){return n};");
+        });
+        it("should work with max_line_len", function() {
+            var result = Uglify.minify(read("./test/input/issue-505/input.js"), {
+                output: {
+                    max_line_len: 20
+                },
+                sourceMap: {
+                    url: "inline"
+                }
+            });
+            assert.strictEqual(result.error, undefined);
+            assert.strictEqual(result.code, read("./test/input/issue-505/output.js"));
+        });
+    });
+});
--- a/test/mocha/spidermonkey.js
+++ b/test/mocha/spidermonkey.js
@@ -23,6 +23,15 @@ describe("spidermonkey export/import sanity test", function() {
        });
    });

+    it("should not add unnecessary escape slashes to regexps", function() {
+        var input = "/[\\\\/]/;";
+        var ast = uglify.parse(input).to_mozilla_ast();
+        assert.equal(
+            uglify.AST_Node.from_mozilla_ast(ast).print_to_string(),
+            input
+        );
+    });
+
    it("Should judge between directives and strings correctly on import", function() {
        var tests = [
            {
--- a/test/mozilla-ast.js
+++ b/test/mozilla-ast.js
@@ -11,7 +11,7 @@ function try_beautify(code) {
        mangle: false,
        output: {
            beautify: true,
-            bracketize: true
+            braces: true
        }
    });
    if (beautified.error) {
--- a/test/run-tests.js
+++ b/test/run-tests.js
@@ -22,9 +22,6 @@ if (failures) {
 var mocha_tests = require("./mocha.js");
 mocha_tests();

-var run_sourcemaps_tests = require('./sourcemaps');
-run_sourcemaps_tests();
-
 /* -----[ utils ]----- */

 function tmpl() {
@@ -49,16 +46,9 @@ function log_test(name) {
 }

 function find_test_files(dir) {
-    var files = fs.readdirSync(dir).filter(function(name){
+    return fs.readdirSync(dir).filter(function(name) {
        return /\.js$/i.test(name);
    });
-    if (process.argv.length > 2) {
-        var x = process.argv.slice(2);
-        files = files.filter(function(f){
-            return x.indexOf(f) >= 0;
-        });
-    }
-    return files;
 }

 function test_directory(dir) {
@@ -343,7 +333,6 @@ function parse_test(file) {
 }

 function make_code(ast, options) {
-    options.inline_script = true;
    var stream = U.OutputStream(options);
    ast.print(stream);
    return stream.get();
--- a/test/sourcemaps.js
+++ b/test/sourcemaps.js
@@ -1,40 +0,0 @@
-var UglifyJS = require("..");
-var ok = require("assert");
-
-module.exports = function () {
-    console.log("--- Sourcemaps tests");
-
-    var basic = source_map([
-        'var x = 1 + 1;'
-    ].join('\n'));
-
-    ok.equal(basic.version, 3);
-    ok.deepEqual(basic.names, ['x']);
-
-    var issue836 = source_map([
-        "({",
-        "    get enabled() {",
-        "        return 3;",
-        "    },",
-        "    set enabled(x) {",
-        "        ;",
-        "    }",
-        "});",
-    ].join("\n"));
-
-    ok.deepEqual(issue836.names, ['enabled', 'x']);
-}
-
-function source_map(js) {
-    return JSON.parse(UglifyJS.minify(js, {
-        compress: false,
-        mangle: false,
-        sourceMap: true
-    }).map);
-}
-
-// Run standalone
-if (module.parent === null) {
-    module.exports();
-}
-
--- a/test/ufuzz.js
+++ b/test/ufuzz.js
@@ -975,7 +975,7 @@ function try_beautify(code, result, printfn) {
        mangle: false,
        output: {
            beautify: true,
-            bracketize: true,
+            braces: true,
        },
    });
    if (beautified.error) {
--- a/test/ufuzz.json
+++ b/test/ufuzz.json
@@ -4,7 +4,7 @@
        "mangle": false,
        "output": {
            "beautify": true,
-            "bracketize": true
+            "braces": true
        },
        "rename": true
    },
Author	SHA1	Message	Date
Alex Lam S.L	fcf542f262	v3.3.18	2018-04-02 04:26:28 +00:00
b-fuze	8adfc29f91	Don't load source map until the JS source is fully received (#3040 )	2018-03-31 20:26:40 +09:00
Alex Lam S.L	02f47e1713	give sensible error against invalid input source map (#3044 )	2018-03-31 18:48:20 +09:00
Alex Lam S.L	07f64d4050	fix escape analysis on `AST_New` (#3043 ) fixes #3042	2018-03-31 15:03:46 +09:00
Alex Lam S.L	6982a0554c	v3.3.17	2018-03-31 04:13:45 +00:00
Alex Lam S.L	fa3250199a	mangle unused nested `AST_SymbolCatch` correctly (#3038 ) fixes #3035	2018-03-30 16:23:09 +09:00
Alex Lam S.L	06b9894c19	handle modifications to `this` correctly (#3036 ) fixes #3032	2018-03-30 15:07:36 +09:00
Alex Lam S.L	9f9db504d7	improve test for #3023 (#3031 )	2018-03-29 23:36:40 +09:00
Alex Lam S.L	82ae95c334	improve source map granularity (#3030 ) fixes #3023	2018-03-29 14:47:55 +09:00
Fábio Santos	9a5e2052c4	fix extra regex slash when going through mozilla AST I/O (#3025 ) This relates to #1929, but in the context of mozilla AST input/output.	2018-03-27 03:22:01 +09:00
Alex Lam S.L	b1410be443	speed up `has_parens()` (#3014 )	2018-03-24 04:05:28 +08:00
Alex Lam S.L	12985d86c2	fix corner case in `hoist_props` (#3022 ) fixes #3021	2018-03-23 07:27:35 +08:00
Alex Lam S.L	49bfc6b555	improve performance (#3020 ) - replace `find_if()` with `all()` wherever possible - move ESTree-specific logic out of `figure_out_scope()`	2018-03-23 03:43:52 +08:00
Alex Lam S.L	d1c6bb8c7c	fix nested `inline` within loop (#3019 ) fixes #3018	2018-03-23 02:31:59 +08:00
Alex Lam S.L	5c169615a8	fix corner case in `inline` (#3017 ) fixes #3016	2018-03-22 23:46:26 +08:00
Alex Lam S.L	73d77f4f64	v3.3.16	2018-03-19 06:53:51 +00:00
Alex Lam S.L	ccf0e2ef4f	extend fuzzy RHS folding (#3006 ) - `a = []; if (1) x();` => `if (a = []) x();`	2018-03-17 03:10:21 +08:00
Alex Lam S.L	20ca0f5906	improve truthy compression (#3009 )	2018-03-16 06:12:59 +08:00
Alex Lam S.L	b29d435bb5	refactor brackets to braces (#3005 )	2018-03-15 15:46:45 +08:00
Alex Lam S.L	90585e29c2	v3.3.15	2018-03-14 16:45:38 +00:00
Alex Lam S.L	d8fc281915	update dependencies (#3002 ) acorn 5.5.3 commander 2.15.0 Miscellaneous - drop unmaintained package from README	2018-03-14 15:54:41 +08:00
Alex Lam S.L	188c39e8d5	retain comments within brackets (#2999 ) fixes #2998	2018-03-13 18:44:21 +08:00
Alex Lam S.L	5429234138	preserve non-constant value assignments with modifications (#2997 ) fixes #2995	2018-03-13 17:35:34 +08:00
Alex Lam S.L	b9f72a4a81	handle `case` correctly under `reduce_vars` (#2993 ) fixes #2992	2018-03-11 15:54:43 +08:00
Alex Lam S.L	fc6ebd04a5	preserve case when `inline_script` (#2991 ) fixes #2989	2018-03-11 05:11:12 +08:00
Alex Lam S.L	7e00a12741	v3.3.14	2018-03-10 13:20:14 +00:00
Alex Lam S.L	10b3752b1e	fix `mangle` of `AST_SymbolLambda` under `ie8` (#2978 ) fixes #2976	2018-03-07 17:20:38 +08:00
Alex Lam S.L	fe51a91395	handle negated constants correctly in `collapse_vars` (#2975 ) fixes #2974	2018-03-06 00:45:58 +08:00
				`@@ -0,0 +1 @@`
				`{"version":3,"sources":["input2.js"],"names":["require","foo","hello","x","apply","_toConsumableArray","y","z"],"mappings":"kLAAcA,QAAQ,OAAfC,aAAAA,kBACSD,QAAQ,SAAjBE,gBAAAA,MAEPD,IAAIE,EAAJC,MAAAH,IAAAI,mBAASJ,IAAIK,EAAEJ,MAAMK","sourcesContent":["const {foo} = require(\"bar\");\nconst {hello} = require(\"world\");\n\nfoo.x(...foo.y(hello.z));\n"]}`