Merge pull request #1805 from alexlamsl/harmony-v2.8.22

Merging from master for 2.8.22
Merge branch 'master' into harmony-v2.8.22
2017-04-09 17:27:30 +08:00 · 2017-04-09 15:50:38 +08:00 · 2017-04-09 11:36:57 +08:00 · 2017-04-09 03:18:14 +08:00 · 2017-04-09 01:36:38 +08:00 · 2017-04-08 16:46:25 +08:00
42 changed files with 3133 additions and 935 deletions
--- a/README.md
+++ b/README.md
@@ -411,6 +411,8 @@ to set `true`; it's effectively a shortcut for `foo=true`).
 - `pure_getters` -- the default is `false`.  If you pass `true` for
  this, UglifyJS will assume that object property access
  (e.g. `foo.bar` or `foo["bar"]`) doesn't have any side effects.
+  Specify `"strict"` to treat `foo.bar` as side-effect-free only when
+  `foo` is certain to not throw, i.e. not `null` or `undefined`.

 - `pure_funcs` -- default `null`.  You can pass an array of names and
  UglifyJS will assume that those functions do not produce side
@@ -443,6 +445,9 @@ to set `true`; it's effectively a shortcut for `foo=true`).
  integer argument larger than 1 to further reduce code size in some cases.
  Note: raising the number of passes will increase uglify compress time.

+- `keep_infinity` -- default `false`. Pass `true` to prevent `Infinity` from
+  being compressed into `1/0`, which may cause performance issues on Chrome.
+
 ### The `unsafe` option

 It enables some transformations that *might* break code logic in certain
--- a/lib/ast.js
+++ b/lib/ast.js
@@ -448,8 +448,6 @@ var AST_ArrowParametersOrSeq = DEFNODE("ArrowParametersOrSeq", "expressions", {
            } else if (ex instanceof AST_Hole) {
                return ex;
            } else if (ex instanceof AST_Destructuring) {
-                if (ex.names.length == 0)
-                    croak("Invalid destructuring function parameter", ex.start.line, ex.start.col);
                ex.names = ex.names.map(to_fun_args);
                return insert_default(ex, default_seen_above);
            } else if (ex instanceof AST_SymbolRef) {
@@ -470,6 +468,9 @@ var AST_ArrowParametersOrSeq = DEFNODE("ArrowParametersOrSeq", "expressions", {
                }), default_seen_above);
            } else if (ex instanceof AST_Assign) {
                return insert_default(to_fun_args(ex.left, undefined, undefined, ex.right), default_seen_above);
+            } else if (ex instanceof AST_DefaultAssign) {
+                ex.left = to_fun_args(ex.left, 0, [ex.left]);
+                return ex;
            } else {
                croak("Invalid function parameter", ex.start.line, ex.start.col);
            }
@@ -1378,16 +1379,16 @@ TreeWalker.prototype = {
            self = p;
        }
    },
-    loopcontrol_target: function(label) {
+    loopcontrol_target: function(node) {
        var stack = this.stack;
-        if (label) for (var i = stack.length; --i >= 0;) {
+        if (node.label) for (var i = stack.length; --i >= 0;) {
            var x = stack[i];
-            if (x instanceof AST_LabeledStatement && x.label.name == label.name) {
+            if (x instanceof AST_LabeledStatement && x.label.name == node.label.name)
                return x.body;
-            }
        } else for (var i = stack.length; --i >= 0;) {
            var x = stack[i];
-            if (x instanceof AST_Switch || x instanceof AST_IterationStatement)
+            if (x instanceof AST_IterationStatement
+                || node instanceof AST_Break && x instanceof AST_Switch)
                return x;
        }
    }
--- a/lib/compress.js
+++ b/lib/compress.js
--- a/lib/output.js
+++ b/lib/output.js
@@ -53,29 +53,29 @@ function is_some_comments(comment) {
 function OutputStream(options) {

    options = defaults(options, {
-        indent_start     : 0,
-        indent_level     : 4,
-        quote_keys       : false,
-        space_colon      : true,
        ascii_only       : false,
        ascii_identifiers: undefined,
-        unescape_regexps : false,
-        inline_script    : false,
-        width            : 80,
-        max_line_len     : false,
        beautify         : false,
-        source_map       : null,
        bracketize       : false,
-        semicolons       : true,
        comments         : false,
-        shebang          : true,
-        preserve_line    : false,
-        screw_ie8        : true,
-        preamble         : null,
-        quote_style      : 0,
-        keep_quoted_props: false,
-        shorthand        : undefined,
        ecma             : 5,
+        indent_level     : 4,
+        indent_start     : 0,
+        inline_script    : true,
+        keep_quoted_props: false,
+        max_line_len     : false,
+        preamble         : null,
+        preserve_line    : false,
+        quote_keys       : false,
+        quote_style      : 0,
+        screw_ie8        : true,
+        semicolons       : true,
+        shebang          : true,
+        shorthand        : undefined,
+        source_map       : null,
+        space_colon      : true,
+        unescape_regexps : false,
+        width            : 80,
        wrap_iife        : false,
    }, true);

@@ -559,8 +559,8 @@ function OutputStream(options) {
                }));
            }

-            if (comments.length > 0 && output.pos() == 0) {
-                if (output.option("shebang") && comments[0].type == "comment5") {
+            if (output.pos() == 0) {
+                if (comments.length > 0 && output.option("shebang") && comments[0].type == "comment5") {
                    output.print("#!" + comments.shift().value + "\n");
                    output.indent();
                }
@@ -640,7 +640,7 @@ function OutputStream(options) {
        return first_in_statement(output);
    });

-    PARENS([ AST_Unary, AST_Undefined ], function(output){
+    PARENS(AST_Unary, function(output){
        var p = output.parent();
        return p instanceof AST_PropAccess && p.expression === this
            || p instanceof AST_Call && p.expression === this
@@ -654,17 +654,18 @@ function OutputStream(options) {

    PARENS(AST_Seq, function(output){
        var p = output.parent();
-        return p instanceof AST_Call             // (foo, bar)() or foo(1, (2, 3), 4)
-            || p instanceof AST_Unary            // !(foo, bar, baz)
-            || p instanceof AST_Binary           // 1 + (2, 3) + 4 ==> 8
-            || p instanceof AST_VarDef           // var a = (1, 2), b = a + a; ==> b == 4
-            || p instanceof AST_PropAccess       // (1, {foo:2}).foo or (1, {foo:2})["foo"] ==> 2
-            || p instanceof AST_Array            // [ 1, (2, 3), 4 ] ==> [ 1, 3, 4 ]
-            || p instanceof AST_ObjectProperty   // { foo: (1, 2) }.foo ==> 2
-            || p instanceof AST_Conditional      /* (false, true) ? (a = 10, b = 20) : (c = 30)
-                                                  * ==> 20 (side effect, set a := 10 and b := 20) */
-            || p instanceof AST_Arrow            // x => (x, x)
-            || p instanceof AST_DefaultAssign    // x => (x = (0, function(){}))
+        return p instanceof AST_Call                          // (foo, bar)() or foo(1, (2, 3), 4)
+            || p instanceof AST_Unary                         // !(foo, bar, baz)
+            || p instanceof AST_Binary                        // 1 + (2, 3) + 4 ==> 8
+            || p instanceof AST_VarDef                        // var a = (1, 2), b = a + a; ==> b == 4
+            || p instanceof AST_PropAccess                    // (1, {foo:2}).foo or (1, {foo:2})["foo"] ==> 2
+            || p instanceof AST_Array                         // [ 1, (2, 3), 4 ] ==> [ 1, 3, 4 ]
+            || p instanceof AST_ObjectProperty                // { foo: (1, 2) }.foo ==> 2
+            || p instanceof AST_Conditional                   /* (false, true) ? (a = 10, b = 20) : (c = 30)
+                                                               * ==> 20 (side effect, set a := 10 and b := 20) */
+            || p instanceof AST_Arrow                         // x => (x, x)
+            || p instanceof AST_DefaultAssign                 // x => (x = (0, function(){}))
+            || (p instanceof AST_Class && p.extends === this) // class D extends (calls++, C) {}
        ;
    });

@@ -1139,24 +1140,24 @@ function OutputStream(options) {
            self.expression.print(output);
        });
        output.space();
-        if (self.body.length > 0) output.with_block(function(){
-            self.body.forEach(function(stmt, i){
-                if (i) output.newline();
+        var last = self.body.length - 1;
+        if (last < 0) output.print("{}");
+        else output.with_block(function(){
+            self.body.forEach(function(branch, i){
                output.indent(true);
-                stmt.print(output);
+                branch.print(output);
+                if (i < last && branch.body.length > 0)
+                    output.newline();
            });
        });
-        else output.print("{}");
    });
    AST_SwitchBranch.DEFMETHOD("_do_print_body", function(output){
-        if (this.body.length > 0) {
+        output.newline();
+        this.body.forEach(function(stmt){
+            output.indent();
+            stmt.print(output);
            output.newline();
-            this.body.forEach(function(stmt){
-                output.indent();
-                stmt.print(output);
-                output.newline();
-            });
-        }
+        });
    });
    DEFPRINT(AST_Default, function(self, output){
        output.print("default:");
@@ -1233,17 +1234,21 @@ function OutputStream(options) {
            output.space();
        }
        if (self.imported_names) {
-            output.print("{");
-            self.imported_names.forEach(function(name_import, i) {
-                output.space();
-                name_import.print(output);
-                if (i < self.imported_names.length - 1) {
-                    output.print(",");
+            if (self.imported_names.length === 1 && self.imported_names[0].foreign_name.name === "*") {
+                self.imported_names[0].print(output);
+            } else {
+                output.print("{");
+                self.imported_names.forEach(function (name_import, i) {
                    output.space();
-                }
-            });
-            output.space();
-            output.print("}");
+                    name_import.print(output);
+                    if (i < self.imported_names.length - 1) {
+                        output.print(",");
+                        output.space();
+                    }
+                });
+                output.space();
+                output.print("}");
+            }
        }
        if (self.imported_name || self.imported_names) {
            output.space();
@@ -1612,16 +1617,7 @@ function OutputStream(options) {
    DEFPRINT(AST_SymbolDeclaration, function(self, output){
        self._do_print(output);
    });
-    DEFPRINT(AST_Undefined, function(self, output){
-        output.print("void 0");
-    });
    DEFPRINT(AST_Hole, noop);
-    DEFPRINT(AST_Infinity, function(self, output){
-        output.print("Infinity");
-    });
-    DEFPRINT(AST_NaN, function(self, output){
-        output.print("NaN");
-    });
    DEFPRINT(AST_This, function(self, output){
        output.print("this");
    });
--- a/lib/parse.js
+++ b/lib/parse.js
@@ -845,14 +845,14 @@ var ATOMIC_START_TOKEN = array_to_hash([ "atom", "num", "string", "regexp", "nam
 function parse($TEXT, options) {

    options = defaults(options, {
-        strict         : false,
-        filename       : null,
-        toplevel       : null,
-        expression     : false,
-        html5_comments : true,
        bare_returns   : false,
-        shebang        : true,
        cli            : false,
+        expression     : false,
+        filename       : null,
+        html5_comments : true,
+        shebang        : true,
+        strict         : false,
+        toplevel       : null,
    });

    var S = {
@@ -2176,17 +2176,7 @@ function parse($TEXT, options) {
            next();
        }

-        if (is("punc", "{")) {
-            next();
-            imported_names = [];
-            while (!is("punc", "}")) {
-                imported_names.push(import_name());
-                if (is("punc", ",")) {
-                    next();
-                }
-            }
-            next();
-        }
+        imported_names = import_names(true);

        if (imported_names || imported_name) {
            expect_token("name", "from");
@@ -2237,16 +2227,14 @@ function parse($TEXT, options) {
        })
    }

-    function import_nameAsterisk() {
+    function import_nameAsterisk(name) {
        var start = S.token;
        var foreign_name;
-        var name;

-        next();

        var end = prev();

-        name = new AST_SymbolImport({
+        name = name || new AST_SymbolImport({
            name: '*',
            start: start,
            end: end,
@@ -2266,6 +2254,30 @@ function parse($TEXT, options) {
        })
    }

+    function import_names(allow_as) {
+        var names;
+        if (is("punc", "{")) {
+            next();
+            names = [];
+            while (!is("punc", "}")) {
+                names.push(import_name());
+                if (is("punc", ",")) {
+                    next();
+                }
+            }
+            next();
+        } else if (is("operator", "*")) {
+            var name;
+            next();
+            if (allow_as && is("name", "as")) {
+                next();  // The "as" word
+                name = as_symbol(AST_SymbolImportForeign);
+            }
+            names = [import_nameAsterisk(name)];
+        }
+        return names;
+    }
+
    function export_() {
        var start = S.token;
        var is_default;
@@ -2278,42 +2290,38 @@ function parse($TEXT, options) {
            next();
        }

-        if (is("punc", "{")) {
-            next();
-            exported_names = [];
-            while (!is("punc", "}")) {
-                exported_names.push(import_name());
-                if (is("punc", ",")) {
-                    next();
-                }
-            }
-            next();
-        } else if (is("operator", "*")) {
-            var st = prev();
-            exported_names = [import_nameAsterisk()];
-        }
+        exported_names = import_names(false);

        if (exported_names) {
-            expect_token("name", "from");
+            if (is("name", "from")) {
+                next();

-            var mod_str = S.token;
-            if (mod_str.type !== 'string') {
-                unexpected();
+                var mod_str = S.token;
+                if (mod_str.type !== 'string') {
+                    unexpected();
+                }
+                next();
+
+                return new AST_Export({
+                    start: start,
+                    is_default: is_default,
+                    exported_names: exported_names,
+                    module_name: new AST_String({
+                        start: mod_str,
+                        value: mod_str.value,
+                        quote: mod_str.quote,
+                        end: mod_str,
+                    }),
+                    end: prev(),
+                });
+            } else {
+                return new AST_Export({
+                    start: start,
+                    is_default: is_default,
+                    exported_names: exported_names,
+                    end: prev(),
+                });
            }
-            next();
-
-            return new AST_Export({
-                start: start,
-                is_default: is_default,
-                exported_names: exported_names,
-                module_name: new AST_String({
-                    start: mod_str,
-                    value: mod_str.value,
-                    quote: mod_str.quote,
-                    end: mod_str,
-                }),
-                end: prev(),
-            });
        }

        var is_definition =
--- a/lib/propmangle.js
+++ b/lib/propmangle.js
@@ -53,7 +53,15 @@ function find_builtins() {
        objects[new_global] = global[new_global] || new Function();
    });

-    var a = [];
+    // NaN will be included due to Number.NaN
+    var a = [
+        "null",
+        "true",
+        "false",
+        "Infinity",
+        "-Infinity",
+        "undefined",
+    ];
    [ Object, Array, Function, Number,
      String, Boolean, Error, Math,
      Date, RegExp, objects.Symbol, ArrayBuffer,
@@ -79,12 +87,12 @@ function find_builtins() {

 function mangle_properties(ast, options) {
    options = defaults(options, {
-        reserved : null,
-        cache : null,
-        only_cache : false,
-        regex : null,
-        ignore_quoted : false,
-        debug : false
+        cache: null,
+        debug: false,
+        ignore_quoted: false,
+        only_cache: false,
+        regex: null,
+        reserved: null,
    });

    var reserved = options.reserved;
@@ -174,13 +182,12 @@ function mangle_properties(ast, options) {
    // only function declarations after this line

    function can_mangle(name) {
-        if (!is_identifier(name)) return false;
        if (unmangleable.indexOf(name) >= 0) return false;
        if (reserved.indexOf(name) >= 0) return false;
        if (options.only_cache) {
            return cache.props.has(name);
        }
-        if (/^[0-9.]+$/.test(name)) return false;
+        if (/^-?[0-9]+(\.[0-9]+)?(e[+-][0-9]+)?$/.test(name)) return false;
        return true;
    }

--- a/lib/scope.js
+++ b/lib/scope.js
@@ -87,9 +87,7 @@ SymbolDef.prototype = {
            if (!options.screw_ie8 && sym instanceof AST_SymbolLambda)
                s = s.parent_scope;
            var def;
-            if (options.screw_ie8
-                && sym instanceof AST_SymbolCatch
-                && (def = s.parent_scope.find_variable(sym))) {
+            if (this.defun && (def = this.defun.variables.get(this.name))) {
                this.mangled_name = def.mangled_name || def.name;
            } else
                this.mangled_name = s.next_mangled(options, this);
@@ -102,8 +100,8 @@ SymbolDef.prototype = {

 AST_Toplevel.DEFMETHOD("figure_out_scope", function(options){
    options = defaults(options, {
+        cache: null,
        screw_ie8: true,
-        cache: null
    });

    // pass 1: setup scope chaining and handle definitions
@@ -229,7 +227,7 @@ AST_Toplevel.DEFMETHOD("figure_out_scope", function(options){
            }
        }
        else if (node instanceof AST_SymbolCatch) {
-            scope.def_variable(node, in_export, in_block);
+            scope.def_variable(node, in_export, in_block).defun = defun;
        }
        else if (node instanceof AST_LabelRef) {
            var sym = labels.get(node.name);
@@ -293,7 +291,7 @@ AST_Toplevel.DEFMETHOD("figure_out_scope", function(options){
            if (node instanceof AST_SymbolCatch) {
                var name = node.name;
                var refs = node.thedef.references;
-                var scope = node.thedef.scope.parent_scope.parent_scope;
+                var scope = node.thedef.defun;
                var def = scope.find_variable(name) || self.globals.get(name) || scope.def_variable(node);
                refs.forEach(function(ref) {
                    ref.thedef = def;
@@ -492,13 +490,13 @@ AST_Symbol.DEFMETHOD("global", function(){

 AST_Toplevel.DEFMETHOD("_default_mangler_options", function(options){
    return defaults(options, {
-        except      : [],
        eval        : false,
+        except      : [],
+        keep_classnames: false,
+        keep_fnames : false,
+        screw_ie8   : true,
        sort        : false, // Ignored. Flag retained for backwards compatibility.
        toplevel    : false,
-        screw_ie8   : true,
-        keep_fnames : false,
-        keep_classnames : false
    });
 });

@@ -683,12 +681,12 @@ var base54 = (function() {

 AST_Toplevel.DEFMETHOD("scope_warnings", function(options){
    options = defaults(options, {
-        undeclared       : false, // this makes a lot of noise
-        unreferenced     : true,
        assign_to_global : true,
+        eval             : true,
        func_arguments   : true,
        nested_defuns    : true,
-        eval             : true
+        undeclared       : false, // this makes a lot of noise
+        unreferenced     : true,
    });
    var tw = new TreeWalker(function(node){
        if (options.undeclared
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
  "homepage": "http://lisperator.net/uglifyjs",
  "author": "Mihai Bazon <mihai.bazon@gmail.com> (http://lisperator.net/)",
  "license": "BSD-2-Clause",
-  "version": "2.8.17",
+  "version": "2.8.22",
  "engines": {
    "node": ">=0.8.0"
  },
--- a/test/compress/collapse_vars.js
+++ b/test/compress/collapse_vars.js
@@ -1672,6 +1672,7 @@ var_side_effects_3: {
    options = {
        collapse_vars: true,
        pure_getters: true,
+        unsafe: true,
    }
    input: {
        var print = console.log.bind(console);
--- a/test/compress/conditionals.js
+++ b/test/compress/conditionals.js
@@ -962,3 +962,56 @@ condition_symbol_matches_consequent: {
    }
    expect_stdout: "3 7 true 4"
 }
+
+delete_conditional_1: {
+    options = {
+        booleans: true,
+        conditionals: true,
+        evaluate: true,
+        side_effects: true,
+    }
+    input: {
+        console.log(delete (1 ? undefined : x));
+        console.log(delete (1 ? void 0 : x));
+        console.log(delete (1 ? Infinity : x));
+        console.log(delete (1 ? 1 / 0 : x));
+        console.log(delete (1 ? NaN : x));
+        console.log(delete (1 ? 0 / 0 : x));
+    }
+    expect: {
+        console.log((void 0, !0));
+        console.log((void 0, !0));
+        console.log((1 / 0, !0));
+        console.log((1 / 0, !0));
+        console.log((NaN, !0));
+        console.log((NaN, !0));
+    }
+    expect_stdout: true
+}
+
+delete_conditional_2: {
+    options = {
+        booleans: true,
+        conditionals: true,
+        evaluate: true,
+        keep_infinity: true,
+        side_effects: true,
+    }
+    input: {
+        console.log(delete (0 ? x : undefined));
+        console.log(delete (0 ? x : void 0));
+        console.log(delete (0 ? x : Infinity));
+        console.log(delete (0 ? x : 1 / 0));
+        console.log(delete (0 ? x : NaN));
+        console.log(delete (0 ? x : 0 / 0));
+    }
+    expect: {
+        console.log((void 0, !0));
+        console.log((void 0, !0));
+        console.log((Infinity, !0));
+        console.log((1 / 0, !0));
+        console.log((NaN, !0));
+        console.log((NaN, !0));
+    }
+    expect_stdout: true
+}
--- a/test/compress/dead-code.js
+++ b/test/compress/dead-code.js
@@ -236,3 +236,45 @@ dead_code_const_annotation_complex_scope: {
    }
    expect_stdout: true
 }
+
+try_catch_finally: {
+    options = {
+        conditionals: true,
+        dead_code: true,
+        evaluate: true,
+    }
+    input: {
+        var a = 1;
+        !function() {
+            try {
+                if (false) throw x;
+            } catch (a) {
+                var a = 2;
+                console.log("FAIL");
+            } finally {
+                a = 3;
+                console.log("PASS");
+            }
+        }();
+        try {
+            console.log(a);
+        } finally {
+        }
+    }
+    expect: {
+        var a = 1;
+        !function() {
+            var a;
+            a = 3;
+            console.log("PASS");
+        }();
+        try {
+            console.log(a);
+        } finally {
+        }
+    }
+    expect_stdout: [
+        "PASS",
+        "1",
+    ]
+}
--- a/test/compress/destructuring.js
+++ b/test/compress/destructuring.js
@@ -151,8 +151,12 @@ destructuring_remove_unused_1: {
        function e() {
            var unused = "foo";
            var a = [1, 2, 3, 4, 5];
+            var x = [[1, 2, 3]];
+            var y = {h: 1};
            var [b, ...c] = a;
-            f(b, c);
+            var [...[e, f]] = x;
+            var [...{g: h}] = y;
+            f(b, c, e, f, g);
        }
    }
    expect: {
@@ -178,8 +182,12 @@ destructuring_remove_unused_1: {
        }
        function e() {
            var a = [1, 2, 3, 4, 5];
+            var x = [[1, 2, 3]];
+            var y = {h: 1};
            var [b, ...c] = a;
-            f(b, c);
+            var [...[e, f]] = x;
+            var [...{g: h}] = y;
+            f(b, c, e, f, g);
        }
    }
 }
--- a/test/compress/drop-unused.js
+++ b/test/compress/drop-unused.js
@@ -934,7 +934,9 @@ issue_1715_1: {
        var a = 1;
        function f() {
            a++;
-            try {} catch (a) {
+            try {
+                x();
+            } catch (a) {
                var a;
            }
        }
@@ -945,7 +947,9 @@ issue_1715_1: {
        var a = 1;
        function f() {
            a++;
-            try {} catch (a) {
+            try {
+                x();
+            } catch (a) {
                var a;
            }
        }
@@ -963,7 +967,9 @@ issue_1715_2: {
        var a = 1;
        function f() {
            a++;
-            try {} catch (a) {
+            try {
+                x();
+            } catch (a) {
                var a = 2;
            }
        }
@@ -974,7 +980,9 @@ issue_1715_2: {
        var a = 1;
        function f() {
            a++;
-            try {} catch (a) {
+            try {
+                x();
+            } catch (a) {
                var a;
            }
        }
@@ -992,7 +1000,9 @@ issue_1715_3: {
        var a = 1;
        function f() {
            a++;
-            try {} catch (a) {
+            try {
+                console;
+            } catch (a) {
                var a = 2 + x();
            }
        }
@@ -1003,7 +1013,9 @@ issue_1715_3: {
        var a = 1;
        function f() {
            a++;
-            try {} catch (a) {
+            try {
+                console;
+            } catch (a) {
                var a = x();
            }
        }
@@ -1012,3 +1024,89 @@ issue_1715_3: {
    }
    expect_stdout: "1"
 }
+
+issue_1715_4: {
+    options = {
+        unused: true,
+    }
+    input: {
+        var a = 1;
+        !function a() {
+            a++;
+            try {
+                x();
+            } catch (a) {
+                var a;
+            }
+        }();
+        console.log(a);
+    }
+    expect: {
+        var a = 1;
+        !function() {
+            a++;
+            try {
+                x();
+            } catch (a) {
+                var a;
+            }
+        }();
+        console.log(a);
+    }
+    expect_stdout: "1"
+}
+
+delete_assign_1: {
+    options = {
+        booleans: true,
+        side_effects: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        var a;
+        console.log(delete (a = undefined));
+        console.log(delete (a = void 0));
+        console.log(delete (a = Infinity));
+        console.log(delete (a = 1 / 0));
+        console.log(delete (a = NaN));
+        console.log(delete (a = 0 / 0));
+    }
+    expect: {
+        console.log((void 0, !0));
+        console.log((void 0, !0));
+        console.log((1 / 0, !0));
+        console.log((1 / 0, !0));
+        console.log((NaN, !0));
+        console.log((0 / 0, !0));
+    }
+    expect_stdout: true
+}
+
+delete_assign_2: {
+    options = {
+        booleans: true,
+        keep_infinity: true,
+        side_effects: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        var a;
+        console.log(delete (a = undefined));
+        console.log(delete (a = void 0));
+        console.log(delete (a = Infinity));
+        console.log(delete (a = 1 / 0));
+        console.log(delete (a = NaN));
+        console.log(delete (a = 0 / 0));
+    }
+    expect: {
+        console.log((void 0, !0));
+        console.log((void 0, !0));
+        console.log((Infinity, !0));
+        console.log((1 / 0, !0));
+        console.log((NaN, !0));
+        console.log((0 / 0, !0));
+    }
+    expect_stdout: true
+}
--- a/test/compress/evaluate.js
+++ b/test/compress/evaluate.js
@@ -196,8 +196,8 @@ negative_zero: {
        console.log(
            -0,
            0,
-            1 / (-0),
-            1 / (-0)
+            -1/0,
+            -1/0
        );
    }
    expect_stdout: true
@@ -217,8 +217,8 @@ positive_zero: {
        console.log(
            0,
            -0,
-            1 / (0),
-            1 / (0)
+            1/0,
+            1/0
        );
    }
    expect_stdout: true
@@ -306,11 +306,11 @@ pow_with_number_constants: {
        var b = 1;
        var c = 1;
        var d = NaN;
-        var e = Infinity;
+        var e = 1/0;
        var f = 0;
        var g = NaN;
-        var h = Infinity;
-        var i = -Infinity;
+        var h = 1/0;
+        var i = -1/0;
        var j = .125;
        var k = .125;
        var l = .25;
@@ -896,3 +896,190 @@ issue_1649: {
    }
    expect_stdout: "-2";
 }
+
+issue_1760_1: {
+    options = {
+        evaluate: true,
+    }
+    input: {
+        !function(a) {
+            try {
+                throw 0;
+            } catch (NaN) {
+                a = +"foo";
+            }
+            console.log(a);
+        }();
+    }
+    expect: {
+        !function(a) {
+            try {
+                throw 0;
+            } catch (NaN) {
+                a = 0 / 0;
+            }
+            console.log(a);
+        }();
+    }
+    expect_stdout: "NaN"
+}
+
+issue_1760_2: {
+    options = {
+        evaluate: true,
+        keep_infinity: true,
+    }
+    input: {
+        !function(a) {
+            try {
+                throw 0;
+            } catch (Infinity) {
+                a = 123456789 / 0;
+            }
+            console.log(a);
+        }();
+    }
+    expect: {
+        !function(a) {
+            try {
+                throw 0;
+            } catch (Infinity) {
+                a = 1 / 0;
+            }
+            console.log(a);
+        }();
+    }
+    expect_stdout: "Infinity"
+}
+
+delete_expr_1: {
+    options = {
+        booleans: true,
+        evaluate: true,
+    }
+    input: {
+        console.log(delete undefined);
+        console.log(delete void 0);
+        console.log(delete Infinity);
+        console.log(delete (1 / 0));
+        console.log(delete NaN);
+        console.log(delete (0 / 0));
+    }
+    expect: {
+        console.log(delete undefined);
+        console.log((void 0, !0));
+        console.log(delete Infinity);
+        console.log((1 / 0, !0));
+        console.log(delete NaN);
+        console.log((0 / 0, !0));
+    }
+    expect_stdout: true
+}
+
+delete_expr_2: {
+    options = {
+        booleans: true,
+        evaluate: true,
+        keep_infinity: true,
+    }
+    input: {
+        console.log(delete undefined);
+        console.log(delete void 0);
+        console.log(delete Infinity);
+        console.log(delete (1 / 0));
+        console.log(delete NaN);
+        console.log(delete (0 / 0));
+    }
+    expect: {
+        console.log(delete undefined);
+        console.log((void 0, !0));
+        console.log(delete Infinity);
+        console.log((1 / 0, !0));
+        console.log(delete NaN);
+        console.log((0 / 0, !0));
+    }
+    expect_stdout: true
+}
+
+delete_binary_1: {
+    options = {
+        booleans: true,
+        evaluate: true,
+        side_effects: true,
+    }
+    input: {
+        console.log(delete (true && undefined));
+        console.log(delete (true && void 0));
+        console.log(delete (true && Infinity));
+        console.log(delete (true && (1 / 0)));
+        console.log(delete (true && NaN));
+        console.log(delete (true && (0 / 0)));
+    }
+    expect: {
+        console.log((void 0, !0));
+        console.log((void 0, !0));
+        console.log((1 / 0, !0));
+        console.log((1 / 0, !0));
+        console.log((NaN, !0));
+        console.log((NaN, !0));
+    }
+    expect_stdout: true
+}
+
+delete_binary_2: {
+    options = {
+        booleans: true,
+        evaluate: true,
+        keep_infinity: true,
+        side_effects: true,
+    }
+    input: {
+        console.log(delete (false || undefined));
+        console.log(delete (false || void 0));
+        console.log(delete (false || Infinity));
+        console.log(delete (false || (1 / 0)));
+        console.log(delete (false || NaN));
+        console.log(delete (false || (0 / 0)));
+    }
+    expect: {
+        console.log((void 0, !0));
+        console.log((void 0, !0));
+        console.log((Infinity, !0));
+        console.log((1 / 0, !0));
+        console.log((NaN, !0));
+        console.log((NaN, !0));
+    }
+    expect_stdout: true
+}
+
+Infinity_NaN_undefined_LHS: {
+    beautify = {
+        beautify: true,
+    }
+    input: {
+        function f() {
+            Infinity = Infinity;
+            ++Infinity;
+            Infinity--;
+            NaN *= NaN;
+            ++NaN;
+            NaN--;
+            undefined |= undefined;
+            ++undefined;
+            undefined--;
+        }
+    }
+    expect_exact: [
+        "function f() {",
+        "    Infinity = 1 / 0;",
+        "    ++Infinity;",
+        "    Infinity--;",
+        "    NaN *= NaN;",
+        "    ++NaN;",
+        "    NaN--;",
+        "    undefined |= void 0;",
+        "    ++undefined;",
+        "    undefined--;",
+        "}",
+    ]
+}
--- a/test/compress/expression.js
+++ b/test/compress/expression.js
@@ -26,7 +26,7 @@ pow_with_number_constants: {
        var c = 42 ** -0;
        var d = NaN ** 1;
        var e = 2 ** (1/0);
-        var f = 2 ** -(1/0);
+        var f = 2 ** (-1/0);
    }
 }

--- a/test/compress/global_defs.js
+++ b/test/compress/global_defs.js
@@ -145,3 +145,18 @@ mixed: {
        'WARN: global_defs CONFIG.VALUE redefined [test/compress/global_defs.js:129,8]',
    ]
 }
+
+issue_1801: {
+    options = {
+        booleans: true,
+        global_defs: {
+            "CONFIG.FOO.BAR": true,
+        },
+    }
+    input: {
+        console.log(CONFIG.FOO.BAR);
+    }
+    expect: {
+        console.log(!0);
+    }
+}
--- a/test/compress/harmony.js
+++ b/test/compress/harmony.js
@@ -152,6 +152,13 @@ class_methods_and_getters_with_keep_quoted_props_enabled: {
    expect_exact: 'class clss{a(){}"b"(){}get c(){return"c"}get"d"(){return"d"}set e(a){doSomething(a)}set\'f\'(a){doSomething(b)}static g(){}static"h"(){}}'
 }

+classes_with_expression_as_expand: {
+    input: {
+        class D extends (calls++, C) {}
+    }
+    expect_exact: "class D extends(calls++,C){}"
+}
+
 new_target: {
    input: {
        new.target;
@@ -184,7 +191,15 @@ import_statement: {
        import Bar, { Foo } from 'lel';
        import { Bar as kex, Baz as food } from 'lel';
    }
-    expect_exact: "import\"mod-name\";import Foo from\"bar\";import{Bar,Baz}from\"lel\";import Bar,{Foo}from\"lel\";import{Bar as kex,Baz as food}from\"lel\";"
+    expect_exact: 'import"mod-name";import Foo from"bar";import{Bar,Baz}from"lel";import Bar,{Foo}from"lel";import{Bar as kex,Baz as food}from"lel";'
+}
+
+import_all_statement: {
+    input: {
+        import * from 'lel';
+        import * as Lel from 'lel';
+    }
+    expect_exact: 'import*from"lel";import*as Lel from"lel";'
 }

 export_statement: {
@@ -204,8 +219,9 @@ export_module_statement: {
        export * from "a.js";
        export {A} from "a.js";
        export {A, B} from "a.js";
+        export {C};
    }
-    expect_exact: 'export*from"a.js";export{A}from"a.js";export{A,B}from"a.js";'
+    expect_exact: 'export*from"a.js";export{A}from"a.js";export{A,B}from"a.js";export{C};'
 }

 import_statement_mangling: {
@@ -305,11 +321,25 @@ default_assign: {
        function f(a, b = 3) {
            console.log(a);
        }
+
+        g = ([[] = 123]) => {};
+        h = ([[x, y, z] = [4, 5, 6]] = []) => {};
+
+        function i([[x, y, z] = [4, 5, 6]] = []) {
+            console.log(b);
+        };
    }
    expect: {
        function f(a) {
            console.log(a);
        }
+
+        g = ([[] = 123]) => {};
+        h = ([[x, y, z] = [4, 5, 6]] = []) => {};
+
+        function i([[x, y, z] = [4, 5, 6]] = []) {
+            console.log(b);
+        };
    }
 }

--- a/test/compress/issue-1105.js
+++ b/test/compress/issue-1105.js
@@ -193,13 +193,15 @@ assorted_Infinity_NaN_undefined_in_with_scope: {
        cascade:       true,
        side_effects:  true,
        sequences:     false,
+        keep_infinity: false,
    }
    input: {
+        var f = console.log;
        var o = {
            undefined : 3,
            NaN       : 4,
            Infinity  : 5,
-        }
+        };
        if (o) {
            f(undefined, void 0);
            f(NaN, 0/0);
@@ -216,25 +218,88 @@ assorted_Infinity_NaN_undefined_in_with_scope: {
        }
    }
    expect: {
-        var o = {
+        var f = console.log, o = {
            undefined : 3,
            NaN       : 4,
            Infinity  : 5
-        }
+        };
        if (o) {
            f(void 0, void 0);
            f(NaN, NaN);
            f(1/0, 1/0);
-            f(-(1/0), -(1/0));
+            f(-1/0, -1/0);
            f(NaN, NaN);
        }
        with (o) {
            f(undefined, void 0);
            f(NaN, 0/0);
            f(Infinity, 1/0);
-            f(-Infinity, -(1/0));
+            f(-Infinity, -1/0);
            f(9 + undefined, 9 + void 0);
        }
    }
+    expect_stdout: true
 }

+assorted_Infinity_NaN_undefined_in_with_scope_keep_infinity: {
+    options = {
+        unused:        true,
+        evaluate:      true,
+        dead_code:     true,
+        conditionals:  true,
+        comparisons:   true,
+        booleans:      true,
+        hoist_funs:    true,
+        keep_fargs:    true,
+        if_return:     true,
+        join_vars:     true,
+        cascade:       true,
+        side_effects:  true,
+        sequences:     false,
+        keep_infinity: true,
+    }
+    input: {
+        var f = console.log;
+        var o = {
+            undefined : 3,
+            NaN       : 4,
+            Infinity  : 5,
+        };
+        if (o) {
+            f(undefined, void 0);
+            f(NaN, 0/0);
+            f(Infinity, 1/0);
+            f(-Infinity, -(1/0));
+            f(2 + 7 + undefined, 2 + 7 + void 0);
+        }
+        with (o) {
+            f(undefined, void 0);
+            f(NaN, 0/0);
+            f(Infinity, 1/0);
+            f(-Infinity, -(1/0));
+            f(2 + 7 + undefined, 2 + 7 + void 0);
+        }
+    }
+    expect: {
+        var f = console.log, o = {
+            undefined : 3,
+            NaN       : 4,
+            Infinity  : 5
+        };
+        if (o) {
+            f(void 0, void 0);
+            f(NaN, NaN);
+            f(Infinity, 1/0);
+            f(-Infinity, -1/0);
+            f(NaN, NaN);
+        }
+        with (o) {
+            f(undefined, void 0);
+            f(NaN, 0/0);
+            f(Infinity, 1/0);
+            f(-Infinity, -1/0);
+            f(9 + undefined, 9 + void 0);
+        }
+    }
+    expect_stdout: true
+}
--- a/test/compress/issue-1261.js
+++ b/test/compress/issue-1261.js
@@ -154,12 +154,12 @@ should_warn: {
        "WARN: Boolean || always true [test/compress/issue-1261.js:129,23]",
        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:129,23]",
        "WARN: Condition always true [test/compress/issue-1261.js:129,23]",
-        "WARN: Boolean || always true [test/compress/issue-1261.js:130,8]",
+        "WARN: Condition left of || always true [test/compress/issue-1261.js:130,8]",
        "WARN: Condition always true [test/compress/issue-1261.js:130,8]",
        "WARN: Boolean && always false [test/compress/issue-1261.js:131,23]",
        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:131,23]",
        "WARN: Condition always false [test/compress/issue-1261.js:131,23]",
-        "WARN: Boolean && always false [test/compress/issue-1261.js:132,8]",
+        "WARN: Condition left of && always false [test/compress/issue-1261.js:132,8]",
        "WARN: Condition always false [test/compress/issue-1261.js:132,8]",
        "WARN: + in boolean context always true [test/compress/issue-1261.js:133,23]",
        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:133,23]",
--- a/test/compress/issue-1609.js
+++ b/test/compress/issue-1609.js
@@ -45,11 +45,10 @@ chained_evaluation_2: {
    }
    expect: {
        (function() {
-            var a = "long piece of string";
            (function() {
-                var c;
-                c = f(a);
-                c.bar = a;
+                var c, b = "long piece of string";
+                c = f(b);
+                c.bar = b;
            })();
        })();
    }
--- a/test/compress/issue-1673.js
+++ b/test/compress/issue-1673.js
@@ -70,6 +70,7 @@ side_effects_finally: {
        function f() {
            function g() {
                try {
+                    x();
                } catch (e) {
                } finally {
                    console.log("PASS");
@@ -83,6 +84,7 @@ side_effects_finally: {
        function f() {
            (function() {
                try {
+                    x();
                } catch (e) {
                } finally {
                    console.log("PASS");
--- a/test/compress/issue-1733.js
+++ b/test/compress/issue-1733.js
@@ -0,0 +1,97 @@
+function_iife_catch: {
+    mangle = {
+        screw_ie8: true,
+    }
+    input: {
+        function f(n) {
+            !function() {
+                try {
+                    throw 0;
+                } catch (n) {
+                    var a = 1;
+                    console.log(n, a);
+                }
+            }();
+        }
+        f();
+    }
+    expect_exact: "function f(o){!function(){try{throw 0}catch(c){var o=1;console.log(c,o)}}()}f();"
+    expect_stdout: "0 1"
+}
+
+function_iife_catch_ie8: {
+    mangle = {
+        screw_ie8: false,
+    }
+    input: {
+        function f(n) {
+            !function() {
+                try {
+                    throw 0;
+                } catch (n) {
+                    var a = 1;
+                    console.log(n, a);
+                }
+            }();
+        }
+        f();
+    }
+    expect_exact: "function f(o){!function(){try{throw 0}catch(o){var c=1;console.log(o,c)}}()}f();"
+    expect_stdout: "0 1"
+}
+
+function_catch_catch: {
+    mangle = {
+        screw_ie8: true,
+    }
+    input: {
+        var o = 0;
+        function f() {
+            try {
+                throw 1;
+            } catch (c) {
+                try {
+                    throw 2;
+                } catch (o) {
+                    var o = 3;
+                    console.log(o);
+                }
+            }
+            console.log(o);
+        }
+        f();
+    }
+    expect_exact: "var o=0;function f(){try{throw 1}catch(c){try{throw 2}catch(o){var o=3;console.log(o)}}console.log(o)}f();"
+    expect_stdout: [
+        "3",
+        "undefined",
+    ]
+}
+
+function_catch_catch_ie8: {
+    mangle = {
+        screw_ie8: false,
+    }
+    input: {
+        var o = 0;
+        function f() {
+            try {
+                throw 1;
+            } catch (c) {
+                try {
+                    throw 2;
+                } catch (o) {
+                    var o = 3;
+                    console.log(o);
+                }
+            }
+            console.log(o);
+        }
+        f();
+    }
+    expect_exact: "var o=0;function f(){try{throw 1}catch(c){try{throw 2}catch(o){var o=3;console.log(o)}}console.log(o)}f();"
+    expect_stdout: [
+        "3",
+        "undefined",
+    ]
+}
--- a/test/compress/issue-1750.js
+++ b/test/compress/issue-1750.js
@@ -0,0 +1,54 @@
+case_1: {
+    options = {
+        dead_code: true,
+        evaluate: true,
+        switches: true,
+    }
+    input: {
+        var a = 0, b = 1;
+        switch (true) {
+          case a, true:
+          default:
+            b = 2;
+          case true:
+        }
+        console.log(a, b);
+    }
+    expect: {
+        var a = 0, b = 1;
+        switch (true) {
+          case a, true:
+            b = 2;
+        }
+        console.log(a, b);
+    }
+    expect_stdout: "0 2"
+}
+
+case_2: {
+    options = {
+        dead_code: true,
+        evaluate: true,
+        switches: true,
+    }
+    input: {
+        var a = 0, b = 1;
+        switch (0) {
+          default:
+            b = 2;
+          case a:
+            a = 3;
+          case 0:
+        }
+        console.log(a, b);
+    }
+    expect: {
+        var a = 0, b = 1;
+        switch (0) {
+          case a:
+            a = 3;
+        }
+        console.log(a, b);
+    }
+    expect_stdout: "3 1"
+}
--- a/test/compress/issue-1770.js
+++ b/test/compress/issue-1770.js
@@ -0,0 +1,105 @@
+mangle_props: {
+    mangle_props = {}
+    input: {
+        var obj = {
+            undefined: 1,
+            NaN: 2,
+            Infinity: 3,
+            "-Infinity": 4,
+            null: 5,
+        };
+        console.log(
+            obj[void 0],
+            obj[undefined],
+            obj["undefined"],
+            obj[0/0],
+            obj[NaN],
+            obj["NaN"],
+            obj[1/0],
+            obj[Infinity],
+            obj["Infinity"],
+            obj[-1/0],
+            obj[-Infinity],
+            obj["-Infinity"],
+            obj[null],
+            obj["null"]
+        );
+    }
+    expect: {
+        var obj = {
+            undefined: 1,
+            NaN: 2,
+            Infinity: 3,
+            "-Infinity": 4,
+            null: 5,
+        };
+        console.log(
+            obj[void 0],
+            obj[void 0],
+            obj["undefined"],
+            obj[0/0],
+            obj[NaN],
+            obj["NaN"],
+            obj[1/0],
+            obj[1/0],
+            obj["Infinity"],
+            obj[-1/0],
+            obj[-1/0],
+            obj["-Infinity"],
+            obj[null],
+            obj["null"]
+        );
+    }
+    expect_stdout: "1 1 1 2 2 2 3 3 3 4 4 4 5 5"
+}
+
+numeric_literal: {
+    beautify = {
+        beautify: true,
+    }
+    mangle_props = {}
+    input: {
+        var obj = {
+            0: 0,
+            "-0": 1,
+            42: 2,
+            "42": 3,
+            0x25: 4,
+            "0x25": 5,
+            1E42: 6,
+            "1E42": 7,
+            "1e+42": 8,
+        };
+        console.log(obj[-0], obj[-""], obj["-0"]);
+        console.log(obj[42], obj["42"]);
+        console.log(obj[0x25], obj["0x25"], obj[37], obj["37"]);
+        console.log(obj[1E42], obj["1E42"], obj["1e+42"]);
+    }
+    expect_exact: [
+        'var obj = {',
+        '    0: 0,',
+        '    "-0": 1,',
+        '    42: 2,',
+        '    "42": 3,',
+        '    37: 4,',
+        '    a: 5,',
+        '    1e42: 6,',
+        '    b: 7,',
+        '    "1e+42": 8',
+        '};',
+        '',
+        'console.log(obj[-0], obj[-""], obj["-0"]);',
+        '',
+        'console.log(obj[42], obj["42"]);',
+        '',
+        'console.log(obj[37], obj["a"], obj[37], obj["37"]);',
+        '',
+        'console.log(obj[1e42], obj["b"], obj["1e+42"]);',
+    ]
+    expect_stdout: [
+        "0 0 1",
+        "3 3",
+        "4 5 4 4",
+        "8 7 8",
+    ]
+}
--- a/test/compress/issue-1787.js
+++ b/test/compress/issue-1787.js
@@ -0,0 +1,19 @@
+unary_prefix: {
+    options = {
+        evaluate: true,
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        console.log(function() {
+            var x = -(2 / 3);
+            return x;
+        }());
+    }
+    expect: {
+        console.log(function() {
+            return -2 / 3;
+        }());
+    }
+    expect_stdout: true
+}
--- a/test/compress/issue-597.js
+++ b/test/compress/issue-597.js
@@ -6,7 +6,7 @@ NaN_and_Infinity_must_have_parens: {
    }
    expect: {
        (1/0).toString();
-        NaN.toString();         // transformation to 0/0 dropped
+        NaN.toString();
    }
 }

@@ -23,3 +23,135 @@ NaN_and_Infinity_should_not_be_replaced_when_they_are_redefined: {
        NaN.toString();
    }
 }
+
+NaN_and_Infinity_must_have_parens_evaluate: {
+    options = {
+        evaluate: true,
+    }
+    input: {
+        (123456789 / 0).toString();
+        (+"foo").toString();
+    }
+    expect: {
+        (1/0).toString();
+        NaN.toString();
+    }
+}
+
+NaN_and_Infinity_should_not_be_replaced_when_they_are_redefined_evaluate: {
+    options = {
+        evaluate: true,
+    }
+    input: {
+        var Infinity, NaN;
+        (123456789 / 0).toString();
+        (+"foo").toString();
+    }
+    expect: {
+        var Infinity, NaN;
+        (1/0).toString();
+        (0/0).toString();
+    }
+}
+
+beautify_off_1: {
+    options = {
+        evaluate: true,
+    }
+    beautify = {
+        beautify: false,
+    }
+    input: {
+        var NaN;
+        console.log(
+            null,
+            undefined,
+            Infinity,
+            NaN,
+            Infinity * undefined,
+            Infinity.toString(),
+            NaN.toString(),
+            (Infinity * undefined).toString()
+        );
+    }
+    expect_exact: "var NaN;console.log(null,void 0,1/0,NaN,0/0,(1/0).toString(),NaN.toString(),(0/0).toString());"
+    expect_stdout: true
+}
+
+beautify_off_2: {
+    options = {
+        evaluate: true,
+    }
+    beautify = {
+        beautify: false,
+    }
+    input: {
+        console.log(
+            null.toString(),
+            undefined.toString()
+        );
+    }
+    expect_exact: "console.log(null.toString(),(void 0).toString());"
+}
+
+beautify_on_1: {
+    options = {
+        evaluate: true,
+    }
+    beautify = {
+        beautify: true,
+    }
+    input: {
+        var NaN;
+        console.log(
+            null,
+            undefined,
+            Infinity,
+            NaN,
+            Infinity * undefined,
+            Infinity.toString(),
+            NaN.toString(),
+            (Infinity * undefined).toString()
+        );
+    }
+    expect_exact: [
+        "var NaN;",
+        "",
+        "console.log(null, void 0, 1 / 0, NaN, 0 / 0, (1 / 0).toString(), NaN.toString(), (0 / 0).toString());",
+    ]
+    expect_stdout: true
+}
+
+beautify_on_2: {
+    options = {
+        evaluate: true,
+    }
+    beautify = {
+        beautify: true,
+    }
+    input: {
+        console.log(
+            null.toString(),
+            undefined.toString()
+        );
+    }
+    expect_exact: "console.log(null.toString(), (void 0).toString());"
+}
+
+issue_1724: {
+    input: {
+        var a = 0;
+        ++a % Infinity | Infinity ? a++ : 0;
+        console.log(a);
+    }
+    expect_exact: "var a=0;++a%(1/0)|1/0?a++:0;console.log(a);"
+    expect_stdout: "2"
+}
+
+issue_1725: {
+    input: {
+        ([].length === 0) % Infinity ? console.log("PASS") : console.log("FAIL");
+    }
+    expect_exact: '(0===[].length)%(1/0)?console.log("PASS"):console.log("FAIL");'
+    expect_stdout: "PASS"
+}
--- a/test/compress/loops.js
+++ b/test/compress/loops.js
@@ -215,8 +215,7 @@ evaluate: {
            a();
        for(;;)
            c();
-        // rule disabled due to issue_1532
-        do d(); while (false);
+        d();
    }
 }

@@ -458,3 +457,26 @@ issue_1648: {
    }
    expect_exact: "function f(){for(x();1;);}"
 }
+
+do_switch: {
+    options = {
+        evaluate: true,
+        loops: true,
+    }
+    input: {
+        do {
+            switch (a) {
+              case b:
+                continue;
+            }
+        } while (false);
+    }
+    expect: {
+        do {
+            switch (a) {
+              case b:
+                continue;
+            }
+        } while (false);
+    }
+}
--- a/test/compress/numbers.js
+++ b/test/compress/numbers.js
@@ -168,3 +168,37 @@ issue_1710: {
    }
    expect_stdout: true
 }
+
+unary_binary_parenthesis: {
+    input: {
+        var v = [ 0, 1, NaN, Infinity, null, undefined, true, false, "", "foo", /foo/ ];
+        v.forEach(function(x) {
+            v.forEach(function(y) {
+                console.log(
+                    +(x*y),
+                    +(x/y),
+                    +(x%y),
+                    -(x*y),
+                    -(x/y),
+                    -(x%y)
+                );
+            });
+        });
+    }
+    expect: {
+        var v = [ 0, 1, NaN, 1/0, null, void 0, true, false, "", "foo", /foo/ ];
+        v.forEach(function(x) {
+            v.forEach(function(y) {
+                console.log(
+                    +x*y,
+                    +x/y,
+                    +x%y,
+                    -x*y,
+                    -x/y,
+                    -x%y
+                );
+            });
+        });
+    }
+    expect_stdout: true
+}
--- a/test/compress/pure_getters.js
+++ b/test/compress/pure_getters.js
@@ -0,0 +1,121 @@
+strict: {
+    options = {
+        pure_getters: "strict",
+        reduce_vars: false,
+        side_effects: true,
+        toplevel: true,
+    }
+    input: {
+        var a, b = null, c = {};
+        a.prop;
+        b.prop;
+        c.prop;
+        d.prop;
+        null.prop;
+        (void 0).prop;
+        undefined.prop;
+    }
+    expect: {
+        var a, b = null, c = {};
+        a.prop;
+        b.prop;
+        c.prop;
+        d.prop;
+        null.prop;
+        (void 0).prop;
+        (void 0).prop;
+    }
+}
+
+strict_reduce_vars: {
+    options = {
+        pure_getters: "strict",
+        reduce_vars: true,
+        side_effects: true,
+        toplevel: true,
+    }
+    input: {
+        var a, b = null, c = {};
+        a.prop;
+        b.prop;
+        c.prop;
+        d.prop;
+        null.prop;
+        (void 0).prop;
+        undefined.prop;
+    }
+    expect: {
+        var a, b = null, c = {};
+        a.prop;
+        b.prop;
+        d.prop;
+        null.prop;
+        (void 0).prop;
+        (void 0).prop;
+    }
+}
+
+unsafe: {
+    options = {
+        pure_getters: true,
+        reduce_vars: false,
+        side_effects: true,
+        toplevel: true,
+    }
+    input: {
+        var a, b = null, c = {};
+        a.prop;
+        b.prop;
+        c.prop;
+        d.prop;
+        null.prop;
+        (void 0).prop;
+        undefined.prop;
+    }
+    expect: {
+        var a, b = null, c = {};
+        d;
+        null.prop;
+        (void 0).prop;
+        (void 0).prop;
+    }
+}
+
+unsafe_reduce_vars: {
+    options = {
+        pure_getters: true,
+        reduce_vars: true,
+        side_effects: true,
+        toplevel: true,
+    }
+    input: {
+        var a, b = null, c = {};
+        a.prop;
+        b.prop;
+        c.prop;
+        d.prop;
+        null.prop;
+        (void 0).prop;
+        undefined.prop;
+    }
+    expect: {
+        var a, b = null, c = {};
+        d;
+        null.prop;
+        (void 0).prop;
+        (void 0).prop;
+    }
+}
+
+chained: {
+    options = {
+        pure_getters: "strict",
+        side_effects: true,
+    }
+    input: {
+        a.b.c;
+    }
+    expect: {
+        a.b.c;
+    }
+}
--- a/test/compress/reduce_vars.js
+++ b/test/compress/reduce_vars.js
@@ -1399,6 +1399,8 @@ issue_1670_1: {
        evaluate: true,
        dead_code: true,
        reduce_vars: true,
+        side_effects: true,
+        switches: true,
        unused: true,
    }
    input: {
@@ -1429,6 +1431,8 @@ issue_1670_2: {
        dead_code: true,
        passes: 2,
        reduce_vars: true,
+        side_effects: true,
+        switches: true,
        unused: true,
    }
    input: {
@@ -1458,6 +1462,8 @@ issue_1670_3: {
        evaluate: true,
        dead_code: true,
        reduce_vars: true,
+        side_effects: true,
+        switches: true,
        unused: true,
    }
    input: {
@@ -1488,6 +1494,8 @@ issue_1670_4: {
        dead_code: true,
        passes: 2,
        reduce_vars: true,
+        side_effects: true,
+        switches: true,
        unused: true,
    }
    input: {
@@ -1516,6 +1524,8 @@ issue_1670_5: {
        evaluate: true,
        keep_fargs: false,
        reduce_vars: true,
+        side_effects: true,
+        switches: true,
        unused: true,
    }
    input: {
@@ -1544,6 +1554,8 @@ issue_1670_6: {
        evaluate: true,
        keep_fargs: false,
        reduce_vars: true,
+        side_effects: true,
+        switches: true,
        unused: true,
    }
    input: {
@@ -1854,3 +1866,132 @@ delay_def: {
    }
    expect_stdout: true
 }
+
+booleans: {
+    options = {
+        booleans: true,
+        evaluate: true,
+        reduce_vars: true,
+    }
+    input: {
+        console.log(function(a) {
+            if (a != 0);
+            switch (a) {
+              case 0:
+                return "FAIL";
+              case false:
+                return "PASS";
+            }
+        }(false));
+    }
+    expect: {
+        console.log(function(a) {
+            if (!1);
+            switch (!1) {
+              case 0:
+                return "FAIL";
+              case !1:
+                return "PASS";
+            }
+        }(!1));
+    }
+    expect_stdout: "PASS"
+}
+
+side_effects_assign: {
+    options = {
+        evaluate: true,
+        reduce_vars: true,
+        sequences: true,
+        side_effects: true,
+        toplevel: true,
+    }
+    input: {
+        var a = typeof void (a && a.in == 1, 0);
+        console.log(a);
+    }
+    expect: {
+        var a = typeof void (a && a.in);
+        console.log(a);
+    }
+    expect_stdout: "undefined"
+}
+
+pure_getters_1: {
+    options = {
+        pure_getters: "strict",
+        reduce_vars: true,
+        side_effects: true,
+        toplevel: true,
+    }
+    input: {
+        try {
+            var a = (a.b, 2);
+        } catch (e) {}
+        console.log(a);
+    }
+    expect: {
+        try {
+            var a = (a.b, 2);
+        } catch (e) {}
+        console.log(a);
+    }
+    expect_stdout: "undefined"
+}
+
+pure_getters_2: {
+    options = {
+        pure_getters: "strict",
+        reduce_vars: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        var a;
+        var a = a && a.b;
+    }
+    expect: {
+        var a;
+        var a = a && a.b;
+    }
+}
+
+pure_getters_3: {
+    options = {
+        pure_getters: true,
+        reduce_vars: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        var a;
+        var a = a && a.b;
+    }
+    expect: {
+    }
+}
+
+catch_var: {
+    options = {
+        booleans: true,
+        evaluate: true,
+        reduce_vars: true,
+    }
+    input: {
+        try {
+            throw {};
+        } catch (e) {
+            var e;
+            console.log(!!e);
+        }
+    }
+    expect: {
+        try {
+            throw {};
+        } catch (e) {
+            var e;
+            console.log(!!e);
+        }
+    }
+    expect_stdout: "true"
+}
--- a/test/compress/screw-ie8.js
+++ b/test/compress/screw-ie8.js
@@ -204,13 +204,13 @@ issue_1586_1: {
    input: {
        function f() {
            try {
+                x();
            } catch (err) {
                console.log(err.message);
            }
        }
    }
-    expect_exact: "function f(){try{}catch(c){console.log(c.message)}}"
-    expect_stdout: true
+    expect_exact: "function f(){try{x()}catch(c){console.log(c.message)}}"
 }

 issue_1586_2: {
@@ -223,11 +223,11 @@ issue_1586_2: {
    input: {
        function f() {
            try {
+                x();
            } catch (err) {
                console.log(err.message);
            }
        }
    }
-    expect_exact: "function f(){try{}catch(c){console.log(c.message)}}"
-    expect_stdout: true
+    expect_exact: "function f(){try{x()}catch(c){console.log(c.message)}}"
 }
--- a/test/compress/sequences.js
+++ b/test/compress/sequences.js
@@ -440,3 +440,173 @@ func_def_5: {
    }
    expect_stdout: "true"
 }
+
+issue_1758: {
+    options = {
+        sequences: true,
+        side_effects: true,
+    }
+    input: {
+        console.log(function(c) {
+            var undefined = 42;
+            return function() {
+                c--;
+                c--, c.toString();
+                return;
+            }();
+        }());
+    }
+    expect: {
+        console.log(function(c) {
+            var undefined = 42;
+            return function() {
+                return c--, c--, c.toString(), void 0;
+            }();
+        }());
+    }
+    expect_stdout: "undefined"
+}
+
+delete_seq_1: {
+    options = {
+        booleans: true,
+        side_effects: true,
+    }
+    input: {
+        console.log(delete (1, undefined));
+        console.log(delete (1, void 0));
+        console.log(delete (1, Infinity));
+        console.log(delete (1, 1 / 0));
+        console.log(delete (1, NaN));
+        console.log(delete (1, 0 / 0));
+    }
+    expect: {
+        console.log((void 0, !0));
+        console.log((void 0, !0));
+        console.log((1 / 0, !0));
+        console.log((1 / 0, !0));
+        console.log((NaN, !0));
+        console.log((0 / 0, !0));
+    }
+    expect_stdout: true
+}
+
+delete_seq_2: {
+    options = {
+        booleans: true,
+        side_effects: true,
+    }
+    input: {
+        console.log(delete (1, 2, undefined));
+        console.log(delete (1, 2, void 0));
+        console.log(delete (1, 2, Infinity));
+        console.log(delete (1, 2, 1 / 0));
+        console.log(delete (1, 2, NaN));
+        console.log(delete (1, 2, 0 / 0));
+    }
+    expect: {
+        console.log((void 0, !0));
+        console.log((void 0, !0));
+        console.log((1 / 0, !0));
+        console.log((1 / 0, !0));
+        console.log((NaN, !0));
+        console.log((0 / 0, !0));
+    }
+    expect_stdout: true
+}
+
+delete_seq_3: {
+    options = {
+        booleans: true,
+        keep_infinity: true,
+        side_effects: true,
+    }
+    input: {
+        console.log(delete (1, 2, undefined));
+        console.log(delete (1, 2, void 0));
+        console.log(delete (1, 2, Infinity));
+        console.log(delete (1, 2, 1 / 0));
+        console.log(delete (1, 2, NaN));
+        console.log(delete (1, 2, 0 / 0));
+    }
+    expect: {
+        console.log((void 0, !0));
+        console.log((void 0, !0));
+        console.log((Infinity, !0));
+        console.log((1 / 0, !0));
+        console.log((NaN, !0));
+        console.log((0 / 0, !0));
+    }
+    expect_stdout: true
+}
+
+delete_seq_4: {
+    options = {
+        booleans: true,
+        sequences: true,
+        side_effects: true,
+    }
+    input: {
+        function f() {}
+        console.log(delete (f(), undefined));
+        console.log(delete (f(), void 0));
+        console.log(delete (f(), Infinity));
+        console.log(delete (f(), 1 / 0));
+        console.log(delete (f(), NaN));
+        console.log(delete (f(), 0 / 0));
+    }
+    expect: {
+        function f() {}
+        console.log((f(), !0)),
+        console.log((f(), !0)),
+        console.log((f(), !0)),
+        console.log((f(), !0)),
+        console.log((f(), !0)),
+        console.log((f(), !0));
+    }
+    expect_stdout: true
+}
+
+delete_seq_5: {
+    options = {
+        booleans: true,
+        keep_infinity: true,
+        sequences: true,
+        side_effects: true,
+    }
+    input: {
+        function f() {}
+        console.log(delete (f(), undefined));
+        console.log(delete (f(), void 0));
+        console.log(delete (f(), Infinity));
+        console.log(delete (f(), 1 / 0));
+        console.log(delete (f(), NaN));
+        console.log(delete (f(), 0 / 0));
+    }
+    expect: {
+        function f() {}
+        console.log((f(), !0)),
+        console.log((f(), !0)),
+        console.log((f(), !0)),
+        console.log((f(), !0)),
+        console.log((f(), !0)),
+        console.log((f(), !0));
+    }
+    expect_stdout: true
+}
+
+delete_seq_6: {
+    options = {
+        booleans: true,
+        side_effects: true,
+    }
+    input: {
+        var a;
+        console.log(delete (1, a));
+    }
+    expect: {
+        var a;
+        console.log((a, !0));
+    }
+    expect_stdout: true
+}
--- a/test/compress/switch.js
+++ b/test/compress/switch.js
@@ -1,5 +1,10 @@
 constant_switch_1: {
-    options = { dead_code: true, evaluate: true };
+    options = {
+        dead_code: true,
+        evaluate: true,
+        side_effects: true,
+        switches: true,
+    }
    input: {
        switch (1+1) {
          case 1: foo(); break;
@@ -13,7 +18,12 @@ constant_switch_1: {
 }

 constant_switch_2: {
-    options = { dead_code: true, evaluate: true };
+    options = {
+        dead_code: true,
+        evaluate: true,
+        side_effects: true,
+        switches: true,
+    }
    input: {
        switch (1) {
          case 1: foo();
@@ -28,7 +38,12 @@ constant_switch_2: {
 }

 constant_switch_3: {
-    options = { dead_code: true, evaluate: true };
+    options = {
+        dead_code: true,
+        evaluate: true,
+        side_effects: true,
+        switches: true,
+    }
    input: {
        switch (10) {
          case 1: foo();
@@ -44,7 +59,12 @@ constant_switch_3: {
 }

 constant_switch_4: {
-    options = { dead_code: true, evaluate: true };
+    options = {
+        dead_code: true,
+        evaluate: true,
+        side_effects: true,
+        switches: true,
+    }
    input: {
        switch (2) {
          case 1:
@@ -65,7 +85,12 @@ constant_switch_4: {
 }

 constant_switch_5: {
-    options = { dead_code: true, evaluate: true };
+    options = {
+        dead_code: true,
+        evaluate: true,
+        side_effects: true,
+        switches: true,
+    }
    input: {
        switch (1) {
          case 1:
@@ -94,7 +119,12 @@ constant_switch_5: {
 }

 constant_switch_6: {
-    options = { dead_code: true, evaluate: true };
+    options = {
+        dead_code: true,
+        evaluate: true,
+        side_effects: true,
+        switches: true,
+    }
    input: {
        OUT: {
            foo();
@@ -123,7 +153,12 @@ constant_switch_6: {
 }

 constant_switch_7: {
-    options = { dead_code: true, evaluate: true };
+    options = {
+        dead_code: true,
+        evaluate: true,
+        side_effects: true,
+        switches: true,
+    }
    input: {
        OUT: {
            foo();
@@ -161,7 +196,12 @@ constant_switch_7: {
 }

 constant_switch_8: {
-    options = { dead_code: true, evaluate: true };
+    options = {
+        dead_code: true,
+        evaluate: true,
+        side_effects: true,
+        switches: true,
+    }
    input: {
        OUT: switch (1) {
          case 1:
@@ -185,7 +225,12 @@ constant_switch_8: {
 }

 constant_switch_9: {
-    options = { dead_code: true, evaluate: true };
+    options = {
+        dead_code: true,
+        evaluate: true,
+        side_effects: true,
+        switches: true,
+    }
    input: {
        OUT: switch (1) {
          case 1:
@@ -210,7 +255,10 @@ constant_switch_9: {
 }

 drop_default_1: {
-    options = { dead_code: true };
+    options = {
+        dead_code: true,
+        switches: true,
+    }
    input: {
        switch (foo) {
          case 'bar': baz();
@@ -225,7 +273,10 @@ drop_default_1: {
 }

 drop_default_2: {
-    options = { dead_code: true };
+    options = {
+        dead_code: true,
+        switches: true,
+    }
    input: {
        switch (foo) {
          case 'bar': baz(); break;
@@ -241,7 +292,10 @@ drop_default_2: {
 }

 keep_default: {
-    options = { dead_code: true };
+    options = {
+        dead_code: true,
+        switches: true,
+    }
    input: {
        switch (foo) {
          case 'bar': baz();
@@ -263,6 +317,8 @@ issue_1663: {
    options = {
        dead_code: true,
        evaluate: true,
+        side_effects: true,
+        switches: true,
    }
    input: {
        var a = 100, b = 10;
@@ -294,6 +350,7 @@ issue_1663: {
 drop_case: {
    options = {
        dead_code: true,
+        switches: true,
    }
    input: {
        switch (foo) {
@@ -312,6 +369,7 @@ drop_case: {
 keep_case: {
    options = {
        dead_code: true,
+        switches: true,
    }
    input: {
        switch (foo) {
@@ -332,6 +390,7 @@ issue_376: {
    options = {
        dead_code: true,
        evaluate: true,
+        switches: true,
    }
    input: {
        switch (true) {
@@ -354,6 +413,7 @@ issue_376: {
 issue_441_1: {
    options = {
        dead_code: true,
+        switches: true,
    }
    input: {
        switch (foo) {
@@ -381,6 +441,7 @@ issue_441_1: {
 issue_441_2: {
    options = {
        dead_code: true,
+        switches: true,
    }
    input: {
        switch (foo) {
@@ -414,6 +475,8 @@ issue_1674: {
    options = {
        dead_code: true,
        evaluate: true,
+        side_effects: true,
+        switches: true,
    }
    input: {
        switch (0) {
@@ -435,6 +498,7 @@ issue_1679: {
    options = {
        dead_code: true,
        evaluate: true,
+        switches: true,
    }
    input: {
        var a = 100, b = 10;
@@ -482,6 +546,7 @@ issue_1680_1: {
    options = {
        dead_code: true,
        evaluate: true,
+        switches: true,
    }
    input: {
        function f(x) {
@@ -522,6 +587,7 @@ issue_1680_1: {
 issue_1680_2: {
    options = {
        dead_code: true,
+        switches: true,
    }
    input: {
        var a = 100, b = 10;
@@ -557,6 +623,7 @@ issue_1680_2: {
 issue_1690_1: {
    options = {
        dead_code: true,
+        switches: true,
    }
    input: {
        switch (console.log("PASS")) {}
@@ -570,6 +637,7 @@ issue_1690_1: {
 issue_1690_2: {
    options = {
        dead_code: false,
+        switches: true,
    }
    input: {
        switch (console.log("PASS")) {}
@@ -585,6 +653,7 @@ if_switch_typeof: {
        conditionals: true,
        dead_code: true,
        side_effects: true,
+        switches: true,
    }
    input: {
        if (a) switch(typeof b) {}
@@ -597,6 +666,7 @@ if_switch_typeof: {
 issue_1698: {
    options = {
        side_effects: true,
+        switches: true,
    }
    input: {
        var a = 1;
@@ -618,6 +688,7 @@ issue_1698: {
 issue_1705_1: {
    options = {
        dead_code: true,
+        switches: true,
    }
    input: {
        var a = 0;
@@ -646,6 +717,7 @@ issue_1705_2: {
        reduce_vars: true,
        sequences: true,
        side_effects: true,
+        switches: true,
        toplevel: true,
        unused: true,
    }
@@ -666,6 +738,7 @@ issue_1705_2: {
 issue_1705_3: {
    options = {
        dead_code: true,
+        switches: true,
    }
    input: {
        switch (a) {
@@ -680,3 +753,66 @@ issue_1705_3: {
    }
    expect_stdout: true
 }
+
+beautify: {
+    beautify = {
+        beautify: true,
+    }
+    input: {
+        switch (a) {
+          case 0:
+          case 1:
+            break;
+          case 2:
+          default:
+        }
+        switch (b) {
+          case 3:
+            foo();
+            bar();
+          default:
+            break;
+        }
+    }
+    expect_exact: [
+        "switch (a) {",
+        "  case 0:",
+        "  case 1:",
+        "    break;",
+        "",
+        "  case 2:",
+        "  default:",
+        "}",
+        "",
+        "switch (b) {",
+        "  case 3:",
+        "    foo();",
+        "    bar();",
+        "",
+        "  default:",
+        "    break;",
+        "}",
+    ]
+}
+
+issue_1758: {
+    options = {
+        dead_code: true,
+        switches: true,
+    }
+    input: {
+        var a = 1, b = 2;
+        switch (a--) {
+          default:
+            b++;
+        }
+        console.log(a, b);
+    }
+    expect: {
+        var a = 1, b = 2;
+        a--;
+        b++;
+        console.log(a, b);
+    }
+    expect_stdout: "0 3"
+}
--- a/test/mocha/comment-filter.js
+++ b/test/mocha/comment-filter.js
@@ -79,5 +79,13 @@ describe("comment filters", function() {
            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;", {
+            fromString: true,
+            output: { preamble: "/* Build */" }
+        }).code;
+        assert.strictEqual(code, "/* Build */\nvar x=10;");
+    });
 });
--- a/test/mocha/directives.js
+++ b/test/mocha/directives.js
@@ -186,7 +186,7 @@ describe("Directives", function() {
    });

    it("Should test EXPECT_DIRECTIVE RegExp", function() {
-        var tests = [
+        [
            ["", true],
            ["'test';", true],
            ["'test';;", true],
@@ -195,11 +195,12 @@ describe("Directives", function() {
            ["'tests';   \n\t", true],
            ["'tests';\n\n", true],
            ["\n\n\"use strict\";\n\n", true]
-        ];
-
-        for (var i = 0; i < tests.length; i++) {
-            assert.strictEqual(uglify.EXPECT_DIRECTIVE.test(tests[i][0]), tests[i][1], tests[i][0]);
-        }
+        ].forEach(function(test) {
+            var out = uglify.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() {
--- a/test/mocha/issue1702.js
+++ b/test/mocha/issue1702.js
@@ -1,35 +0,0 @@
-var uglify = require('../../');
-var assert = require("assert");
-
-describe("For statement", function() {
-    it("For variable should list enclosing scope in its references (issue #17022)", function() {
-        var ast = uglify.parse("function f() { for (var a = 0; a < 10; a++) {} }");
-        ast.figure_out_scope();
-
-        var checkWalker = new uglify.TreeWalker(function(node, descend) {
-            if (node instanceof uglify.AST_VarDef) {
-                console.log("AST_VarDef");
-                // one reference should be in the AST_Defun scope - search for it
-
-                var walkNode = function (r) {
-                    console.log(r.CTOR.name);
-                    var walker = new uglify.TreeWalker(function(node, descend){
-                        // do not walk into any other scope, it should be listed if needed
-                        console.log("  " + node.CTOR.name);
-                        if (node instanceof uglify.AST_Scope && node != r.scope) return true;
-                        if (node instanceof uglify.AST_For) {
-                            console.log("Great - we found the for statement referencing the variable")
-                        }
-                        return false;
-                    });
-                    r.scope.walk(walker);
-                    r.walk(walker);
-                };
-
-                node.name.thedef.orig.forEach(walkNode);
-                node.name.thedef.references.forEach(walkNode);
-            }
-        });
-        ast.walk(checkWalker);
-    });
-});
--- a/test/run-tests.js
+++ b/test/run-tests.js
@@ -1,27 +1,14 @@
 #! /usr/bin/env node

-global.UGLIFY_DEBUG = true;
-
 var U = require("../tools/node");
 var path = require("path");
 var fs = require("fs");
 var assert = require("assert");
-var vm = require("vm");
+var sandbox = require("./sandbox");

 var tests_dir = path.dirname(module.filename);
 var failures = 0;
 var failed_files = {};
-var same_stdout = ~process.version.lastIndexOf("v0.12.", 0) ? function(expected, actual) {
-    if (typeof expected != typeof actual) return false;
-    if (typeof expected != "string") {
-        if (expected.name != actual.name) return false;
-        expected = expected.message.slice(expected.message.lastIndexOf("\n") + 1);
-        actual = actual.message.slice(actual.message.lastIndexOf("\n") + 1);
-    }
-    return expected == actual;
-} : function(expected, actual) {
-    return typeof expected == typeof actual && expected.toString() == actual.toString();
-};

 run_compress_tests();
 if (failures) {
@@ -184,11 +171,11 @@ function run_compress_tests() {
                    }
                }
                if (test.expect_stdout) {
-                    var stdout = run_code(input_code);
+                    var stdout = sandbox.run_code(input_code);
                    if (test.expect_stdout === true) {
                        test.expect_stdout = stdout;
                    }
-                    if (!same_stdout(test.expect_stdout, stdout)) {
+                    if (!sandbox.same_stdout(test.expect_stdout, stdout)) {
                        log("!!! Invalid input or expected stdout\n---INPUT---\n{input}\n---EXPECTED {expected_type}---\n{expected}\n---ACTUAL {actual_type}---\n{actual}\n\n", {
                            input: input_formatted,
                            expected_type: typeof test.expect_stdout == "string" ? "STDOUT" : "ERROR",
@@ -199,8 +186,8 @@ function run_compress_tests() {
                        failures++;
                        failed_files[file] = 1;
                    } else {
-                        stdout = run_code(output);
-                        if (!same_stdout(test.expect_stdout, stdout)) {
+                        stdout = sandbox.run_code(output);
+                        if (!sandbox.same_stdout(test.expect_stdout, stdout)) {
                            log("!!! failed\n---INPUT---\n{input}\n---EXPECTED {expected_type}---\n{expected}\n---ACTUAL {actual_type}---\n{actual}\n\n", {
                                input: input_formatted,
                                expected_type: typeof test.expect_stdout == "string" ? "STDOUT" : "ERROR",
@@ -332,19 +319,3 @@ function evaluate(code) {
        code = make_code(code, { beautify: true });
    return new Function("return(" + code + ")")();
 }
-
-function run_code(code) {
-    var stdout = "";
-    var original_write = process.stdout.write;
-    process.stdout.write = function(chunk) {
-        stdout += chunk;
-    };
-    try {
-        new vm.Script(code).runInNewContext({ console: console }, { timeout: 5000 });
-        return stdout;
-    } catch (ex) {
-        return ex;
-    } finally {
-        process.stdout.write = original_write;
-    }
-}
--- a/test/sandbox.js
+++ b/test/sandbox.js
@@ -0,0 +1,54 @@
+var vm = require("vm");
+
+var FUNC_TOSTRING = [
+    "Function.prototype.toString = Function.prototype.valueOf = function() {",
+    "    var ids = [];",
+    "    return function() {",
+    "        var i = ids.indexOf(this);",
+    "        if (i < 0) {",
+    "            i = ids.length;",
+    "            ids.push(this);",
+    "        }",
+    '        return "[Function: __func_" + i + "__]";',
+    "    }",
+    "}();",
+].join("\n");
+exports.run_code = function(code) {
+    var stdout = "";
+    var original_write = process.stdout.write;
+    process.stdout.write = function(chunk) {
+        stdout += chunk;
+    };
+    try {
+        vm.runInNewContext([
+            "!function() {",
+            FUNC_TOSTRING,
+            code,
+            "}();",
+        ].join("\n"), {
+            console: {
+                log: function() {
+                    return console.log.apply(console, [].map.call(arguments, function(arg) {
+                        return typeof arg == "function" || arg && /Error$/.test(arg.name) ? arg.toString() : arg;
+                    }));
+                }
+            }
+        }, { timeout: 5000 });
+        return stdout;
+    } catch (ex) {
+        return ex;
+    } finally {
+        process.stdout.write = original_write;
+    }
+};
+exports.same_stdout = ~process.version.lastIndexOf("v0.12.", 0) ? function(expected, actual) {
+    if (typeof expected != typeof actual) return false;
+    if (typeof expected != "string") {
+        if (expected.name != actual.name) return false;
+        expected = expected.message.slice(expected.message.lastIndexOf("\n") + 1);
+        actual = actual.message.slice(actual.message.lastIndexOf("\n") + 1);
+    }
+    return expected == actual;
+} : function(expected, actual) {
+    return typeof expected == typeof actual && expected.toString() == actual.toString();
+};
--- a/test/ufuzz.js
+++ b/test/ufuzz.js
--- a/test/ufuzz.json
+++ b/test/ufuzz.json
@@ -0,0 +1,40 @@
+[
+    {
+        "compress": false,
+        "mangle": false,
+        "output": {
+            "beautify": true,
+            "bracketize": true
+        }
+    },
+    {
+        "compress": false
+    },
+    {
+        "compress": {
+            "warnings": false
+        },
+        "mangle": false
+    },
+    {
+        "compress": {
+            "warnings": false
+        }
+    },
+    {
+        "compress": {
+            "toplevel": true,
+            "warnings": false
+        },
+        "mangle": {
+            "toplevel": true
+        }
+    },
+    {
+        "compress": {
+            "keep_fargs": false,
+            "passes": 3,
+            "warnings": false
+        }
+    }
+]
--- a/tools/exports.js
+++ b/tools/exports.js
@@ -17,7 +17,3 @@ exports["string_template"] = string_template;
 exports["tokenizer"] = tokenizer;
 exports["is_identifier"] = is_identifier;
 exports["SymbolDef"] = SymbolDef;
-
-if (global.UGLIFY_DEBUG) {
-    exports["EXPECT_DIRECTIVE"] = EXPECT_DIRECTIVE;
-}
--- a/tools/node.js
+++ b/tools/node.js
@@ -46,21 +46,21 @@ function read_source_map(code) {

 UglifyJS.minify = function(files, options) {
    options = UglifyJS.defaults(options, {
-        spidermonkey     : false,
-        outSourceMap     : null,
-        outFileName      : null,
-        sourceRoot       : null,
-        inSourceMap      : null,
-        sourceMapUrl     : null,
-        sourceMapInline  : false,
+        compress         : {},
        fromString       : false,
-        warnings         : false,
+        inSourceMap      : null,
        mangle           : {},
        mangleProperties : false,
        nameCache        : null,
+        outFileName      : null,
        output           : null,
-        compress         : {},
-        parse            : {}
+        outSourceMap     : null,
+        parse            : {},
+        sourceMapInline  : false,
+        sourceMapUrl     : null,
+        sourceRoot       : null,
+        spidermonkey     : false,
+        warnings         : false,
    });
    UglifyJS.base54.reset();
Author	SHA1	Message	Date
Alex Lam S.L	278577f3cb	Merge pull request #1805 from alexlamsl/harmony-v2.8.22 Merging from master for 2.8.22	2017-04-09 17:27:30 +08:00
alexlamsl	0d8597e904	Merge branch 'master' into harmony-v2.8.22	2017-04-09 15:50:38 +08:00
Alex Lam S.L	04b8964505	v2.8.22	2017-04-09 11:36:57 +08:00
Alex Lam S.L	d6fbc365e2	fix LHS cases for NaN & friends (#1804 ) `Infinity = beyond` should not become `1/0 = beyond`	2017-04-09 03:18:14 +08:00
Alex Lam S.L	9a978843f5	enhance `test/ufuzz.js` (#1803 ) - `-E` to report test cases with runtime errors - favor returning expressions rather than empty return - emit a newline upon fuzzer completion to not erase the iteration count closes #1800	2017-04-09 01:36:38 +08:00
Alex Lam S.L	0479ff0c54	fix a couple of bugs in `global_defs` (#1802 ) - `optimize()` substituted expression - compute nested property string correctly fixes #1801 Miscellaneous - reset optimisation flags on all node types	2017-04-08 16:46:25 +08:00
Alex Lam S.L	cf72fe552f	fix `delete` corner cases (#1799 ) - assignment - boolean - conditional - sequence	2017-04-08 14:25:28 +08:00
Alex Lam S.L	a1532eb076	extend ufuzz generator (#1783 ) - property access - property assignment - allow bare expression within try-block - normalise `Error` in `console.log()` - generate more unary expressions - add parenthesis to enforce precedence - adjust variable reuse/creation - add parameters to function declaration & expression - add return expression - add trivial arguments to function call	2017-04-07 18:47:30 +08:00
Alex Lam S.L	c2a1bceb77	fix `pure_getters` for chained property access (#1798 )	2017-04-07 17:06:01 +08:00
Alex Lam S.L	e3c9c22c75	fix corner cases with `delete` (#1796 ) `delete Infinity` returns `false` where as `delete (1/0)` returns `true`	2017-04-07 15:39:59 +08:00
Alex Lam S.L	0f4cd73dcc	introduce "strict" to `pure_getters` (#1795 )	2017-04-07 13:31:58 +08:00
Alex Lam S.L	281e882d27	fix `reduce_vars` on catch variable (#1794 ) Improved catch handling in `figure_out_scope()` means special case treatment of IE8 is no longer valid in `reset_opt_flags()`. Also fixed recursive assignment in variable definition.	2017-04-07 12:32:56 +08:00
Alex Lam S.L	cc6aa3e5ac	fix incorrect context in variable substitution (#1791 ) `AST_Node.optimize()` is context-aware, so don't cache its results to be used elsewhere. Also fixed a few cases of AST corruption and beef up safety of `pure_getters`.	2017-04-07 03:42:17 +08:00
Alex Lam S.L	e869779a98	enable `inline_script` by default (#1793 )	2017-04-07 00:45:51 +08:00
Alex Lam S.L	06cdb74279	improve `pure_getters` (#1786 ) - property access to `null` & `undefined` always has side effects - utilise `reduce_vars` to determine safe property access - may-be cases treated as side effects unless `unsafe`	2017-04-06 11:18:59 +08:00
Alex Lam S.L	ff289b90a9	implement delayed resolution for `reduce_vars` (#1788 ) Although it would be nice to enforce `AST_Node` cloning during transformation, that ship has sailed a long time ago. We now get the assigned value when resolving `AST_SymbolRef` instead of `reset_opt_flags()`, which has the added advantage of improved compressor efficiency. fixes #1787	2017-04-05 21:06:42 +08:00
Alex Lam S.L	9b6bc67c33	optimise `do{...}while(false)` (#1785 ) - better heuristics to avoid issues like #1532 - fix `TreeWalker.loopcontrol_target()` - `continue` cannot refer to `switch` blocks	2017-04-04 23:48:22 +08:00
Alex Lam S.L	4b90dc1fdb	remove `--mangle-props` from fuzzing (#1777 ) The inherently unsafe nature makes this feature unsuitable to be tested this way. fixes #1774	2017-04-04 16:24:16 +08:00
Anthony Van de Gejuchte	c20bb99a62	Put expression after extend between parentheses if necessary (#1780 )	2017-04-04 12:38:13 +08:00
Alex Lam S.L	951770fc68	exclude mangling of special property names (#1779 ) - `null` - `true` - `false` - numeric literals	2017-04-04 03:50:19 +08:00
Anthony Van de Gejuchte	2377171200	Fix walker not able to handle destr pattern in spread when compressing (#1438 )	2017-04-04 01:23:22 +08:00
Anthony Van de Gejuchte	603d92effc	Allow AST_DefaultAssign as parameter (#1778 ) This may be the case for parsing arrow functions, as left side expressions are converted to destructuring patterns before being converted to parameters.	2017-04-04 00:46:05 +08:00
Alex Lam S.L	48b3fe9952	fix `mangleProperties` on identifiers (#1776 ) - fix handling of "-Infinity" - add test case for "-0" reverts #1481	2017-04-03 23:17:47 +08:00
Alex Lam S.L	a400741868	workaround Node.js bugs (#1775 ) Wrap test code in IIFE before passing to `vm` fixes #1768 fixes #1771	2017-04-03 18:56:11 +08:00
Anthony Van de Gejuchte	17f0cc359f	Allow empty destructuring (#1773 )	2017-04-03 17:21:27 +08:00
Alex Lam S.L	59a4e56bc8	fix mangleProperties of `undefined` & `Infinity` (#1772 ) `NaN` already works by the happy accident of `Number.NaN` fixes #1770	2017-04-03 12:31:05 +08:00
Alex Lam S.L	1f1fccc45d	extend `test/ufuzz.js` (#1769 ) New expressions: - property access - array literal - object literal Miscellaneous: - reduce execution timeout - test `toplevel` and `mangleProperties`	2017-04-03 04:00:33 +08:00
Alex Lam S.L	35bae3fcd0	Merge pull request #1766 from alexlamsl/harmony-v2.8.21 Merging from master for 2.8.21	2017-04-02 18:10:58 +08:00
alexlamsl	4614b5b46e	Merge branch 'master' into harmony-v2.8.21	2017-04-02 17:25:20 +08:00
Alex Lam S.L	b7f6b73f4e	v2.8.21	2017-04-02 17:07:55 +08:00
Alex Lam S.L	9469c03ac9	fix corner case in `switch` (#1765 )	2017-04-02 17:07:20 +08:00
Alex Lam S.L	d57527697f	avoid confusion of `NaN` & `Infinity` with `catch` symbol of the same name (#1763 ) fixes #1760 fixes #1761	2017-04-02 16:14:09 +08:00
Alex Lam S.L	f7ca4f2297	fix corner cases in switch and undefined (#1762 ) - fix side effects in switch condition for singular blocks - fix `undefined` confusion with local variable - gate `OPT(AST_Switch)` with `switches` fixes #1758 fixes #1759	2017-04-02 14:52:25 +08:00
Alex Lam S.L	c076e7b60d	speed up fuzzer code generation (#1757 ) - only output one top-level function or statement block - reduce `rng()` granularity from 2^32 to 65536 - fix overflow in `rng()` - track `canThrow` during `typeof` creation	2017-04-02 05:11:29 +08:00
Alex Lam S.L	4a55bb0be5	minor tweaks to `test/ufuzz.js` (#1756 ) - count iterations from `1` instead of `0` - remove `unsafe` from default set of `minify()` tests - improve usability of help	2017-04-02 03:17:01 +08:00
Alex Lam S.L	28ecea50a6	upgrade fuzzer (#1754 ) - configurable set of `minify()` options - test and report suspects upon failure - continue after failure if infinite iterations is specified	2017-04-02 02:10:50 +08:00
kzc	9a311705f5	fuzz regexp literals, more constant numbers, typeof expression (#1755 )	2017-04-02 02:08:46 +08:00
Alex Lam S.L	ee3fe0f4cd	fix switch branch elimination (#1752 ) Merge unreachable case body with previous fallthrough case fixes #1750	2017-04-01 17:19:57 +08:00
Alex Lam S.L	87f6e1b091	minor tweaks to fuzzer (#1751 ) - remove `let` as variable name - employ `crypto.randomBytes()`	2017-04-01 17:09:52 +08:00
Alex Lam S.L	c934fc8142	implement `test/sandbox.js` (#1749 ) - `test/run-tests.js` and `test/ufuzz.js` now shares the same `run_code()` and `same_stdout()` - re-enable fuzzer to generate top-level `NaN`, `Infinity` & `undefined` - attempt to show beautified output only when `run_code()` output is preserved	2017-04-01 05:47:11 +08:00
Alex Lam S.L	257ddc3bdb	improve compression of undefined, NaN & Infinitiy (#1748 ) - migrate transformation logic from `OutputStream` to `Compressor` - always turn `undefined` into `void 0` (unless `unsafe`) - always keep `NaN` except when avoiding local variable redefinition - introduce `keep_infinity` to suppress `1/0` transform, except when avoiding local variable redefinition supersedes #1723 fixes #1730	2017-04-01 03:02:14 +08:00
Alex Lam S.L	1ddc05725d	combine rules for binary boolean operations (#1744 )	2017-03-31 18:47:44 +08:00
Ondřej Španěl	2f93058c6e	More variants of import added (#1738 ) - `import * from "x.js"` - `import * as Name from "x.js"`	2017-03-31 17:52:56 +08:00
Ondřej Španěl	a729c43e87	Another variant of export added - export {Name}. (#1737 )	2017-03-31 17:51:27 +08:00
Peter van der Zee	e6b76a4879	Massive extension of the fuzzer (#1697 ) Fix bug where a `throw` was generated without expression Reenable try/catch/finally and fix them up Skip serialization errors Allow function decl in other funcs but not in blocks etc Rename function to be more appropriate Fix global functions not getting certain names Make the canaries more likely to appear as expressions Add a silly rounding edge case Add a new canary, `c`, which should only ever be incremented Refactoring Fix (another) iife not actually being invoked When a statement hits recursion max return an expression instead of `;` When a expression hits recursion max also inc `c` Generate global code as well as function code Also fixes some argument juggling related bugs. No longer reduces the recursion max when generating sub functions. Generates a function arg. Add used names to var name pool while in that scope This is a little wonky, possibly a hack, but since it's synchronous code I think it's alright to do this. The alternative is to slice the varnames array and juggle them through almost all the generator functions and there are various reasons why this patch is a better alternative. Minify generated code, not beautified code. Prevents beautifier bias. Prevent unnecessary duplication Remove serialization protection because I think it got handled elsewhere Abstract toplevel code generation Add example line of running test case Add poor man options parser, and some options Reindent to 4 spaces Lower chance of `default` generation Comment example of testing a case and output improvement Enable `default` clause appearing at any clause index Removing some training wheels; dont add parens where we dont absolutely need them Support `-s1` and `-s2` to force specific statements being generated at that recursion level Add round number to output when failing. For stats and fun and profit. Solidify statement depth counting. The argument juggling is real. Renamed option to something long. -scf was ugly and probably confusing. Fix missing arguments causing `canThrow` to be truthy, generating crashing code Generate more binary nested expressions Add black and white list cli options for statement generation Allows you to explicitly require or forbid certain statements from/to being made. ``` node test/ufuzz.js --without-stmt switch,try -t 5 -r 5 -V ``` ``` node test/ufuzz.js --only-stmt ifelse,expr -t 5 -r 5 -V ``` Similar granularity for expression may be added later. There can be no comma between names; it just does a split on that arg. Trim down the binary expression generator Prevent scoping issues in nodejs by preventing certain names in global space Oh this list was incomplete? Allow bin-expr to generate assignments too. More vigilant with storing and reusing vars. Add more global builtin names Update wrapper code Also patch Function valueOf	2017-03-31 17:23:50 +08:00
Alex Lam S.L	a0c3836ba0	sort options in alphabetical order (#1743 ) They started off as functional groups I guess, but given the sheer number of options this is becoming too difficult to read.	2017-03-31 16:41:04 +08:00
Alex Lam S.L	f8a71b56fd	v2.8.20	2017-03-31 15:27:40 +08:00
Alex Lam S.L	11e9bdc427	fix missing preamble when shebang is absent (#1742 )	2017-03-31 15:26:57 +08:00
Alex Lam S.L	66e9039350	Merge pull request #1740 from alexlamsl/harmony-v2.8.19 Merging from master for 2.8.19	2017-03-31 13:28:56 +08:00
alexlamsl	d717bf9ce8	Merge branch 'master' into harmony	2017-03-31 12:54:03 +08:00
Alex Lam S.L	a84564d1a8	v2.8.19	2017-03-31 12:26:10 +08:00
Alex Lam S.L	c595b84032	fix catch symbol mangling (#1734 ) Only need to look up the immediate non-block/catch scope for the same-name special case. fixes #1733	2017-03-31 02:57:47 +08:00
Alex Lam S.L	7cb1adf455	remove paranthesis for `-(x*y)` (#1732 )	2017-03-30 16:09:00 +08:00
Alex Lam S.L	7bea38a05d	optimize try-catch-finally (#1731 ) - eliminate empty blocks - flatten out if try-block does not throw	2017-03-30 12:16:58 +08:00
Alex Lam S.L	0f910ee25c	improve tests from #1726 (#1729 )	2017-03-30 00:13:46 +08:00
Alex Lam S.L	beb9659778	speed up IIFE elimination (#1728 ) - `side_effects` will clean up inner statements, so checking for an empty function body should suffice - drop side effects when dropping `return` from statement	2017-03-29 23:27:35 +08:00
Alex Lam S.L	f1a833a7aa	speed up `equivalent_to()` and `AST_Switch` (#1727 )	2017-03-29 22:08:26 +08:00
Alex Lam S.L	2e41cd6394	fix missing parentheses around NaN/Infinity shorthands (#1726 ) fixes #1724 fixes #1725	2017-03-29 20:53:03 +08:00
Alex Lam S.L	09f77c7d4d	output optimal representations of NaN & Infinity (#1723 ) - move these optimisations out from `Compressor` to `OutputStream` - fixes behaviour inconsistency when running uglified code from global or module levels due to redefinition	2017-03-29 18:31:55 +08:00
Alex Lam S.L	fef0bf9ee0	improve beautified output of switch blocks (#1721 )	2017-03-29 04:40:05 +08:00
Alex Lam S.L	ae740b933f	v2.8.18	2017-03-29 03:13:30 +08:00
Alex Lam S.L	ec7f37f314	remove UGLIFY_DEBUG (#1720 ) fixes #1719	2017-03-29 01:27:24 +08:00
Alex Lam S.L	eb48a035e7	fix corner case in `unused` (#1718 ) When fixing catch-related issue in #1715, it tries to optimise for duplicate definitions but did not take anonymous functions into account. Remove such optimisation for now and we can cover this as a more general rule later.	2017-03-29 01:00:21 +08:00