v3.5.3

fixes #3355

.travis.yml

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

README.md

@@ -605,6 +605,8 @@ If you're using the `X-SourceMap` header instead, you can just omit `sourceMap.u
 - `arguments` (default: `true`) -- replace `arguments[index]` with function
   parameter name whenever possible.
 
+- `assignments` (default: `true`) -- apply optimizations to assignment expressions.
+
 - `booleans` (default: `true`) -- various optimizations for boolean context,
   for example `!!a ? b : c → a ? b : c`
 
@@ -664,7 +666,7 @@ If you're using the `X-SourceMap` header instead, you can just omit `sourceMap.u
 
 - `keep_fnames` (default: `false`) -- Pass `true` to prevent the
   compressor from discarding function names.  Useful for code relying on
-  `Function.prototype.name`. See also: the `keep_fnames` [mangle option](#mangle).
+  `Function.prototype.name`. See also: the `keep_fnames` [mangle option](#mangle-options).
 
 - `keep_infinity` (default: `false`) -- Pass `true` to prevent `Infinity` from
   being compressed into `1/0`, which may cause performance issues on Chrome.
@@ -857,8 +859,8 @@ can pass additional arguments that control the code output:
   adjust for this text.  Can be used to insert a comment containing
   licensing information, for example.
 
-- `preserve_line` (default `false`) -- pass `true` to preserve lines, but it
+- `preserve_line` (default `false`) -- pass `true` to retain line numbering on
-  only works if `beautify` is set to `false`.
+  a best effort basis.
 
 - `quote_keys` (default `false`) -- pass `true` to quote all keys in literal
   objects

appveyor.yml

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

bin/uglifyjs

@@ -56,6 +56,11 @@ program.option("--wrap <name>", "Embed everything as a function with “exports
 program.arguments("[files...]").parseArgv(process.argv);
 if (program.configFile) {
     options = JSON.parse(read_file(program.configFile));
+    if (options.mangle && options.mangle.properties && options.mangle.properties.regex) {
+        options.mangle.properties.regex = UglifyJS.parse(options.mangle.properties.regex, {
+            expression: true
+        }).getValue();
+    }
 }
 if (!program.output && program.sourceMap && program.sourceMap.url != "inline") {
     fatal("ERROR: cannot write source map to STDOUT");
@@ -100,7 +105,7 @@ if (program.mangleProps) {
         if (typeof program.mangleProps != "object") program.mangleProps = {};
         if (!Array.isArray(program.mangleProps.reserved)) program.mangleProps.reserved = [];
         require("../tools/domprops").forEach(function(name) {
-            UglifyJS._push_uniq(program.mangleProps.reserved, name);
+            UglifyJS.push_uniq(program.mangleProps.reserved, name);
         });
     }
     if (typeof options.mangle != "object") options.mangle = {};
@@ -337,17 +342,9 @@ function parse_js(flag) {
     return function(value, options) {
         options = options || {};
         try {
-            UglifyJS.minify(value, {
+            UglifyJS.parse(value, {
-                parse: {
+                expression: true
-                    expression: true
+            }).walk(new UglifyJS.TreeWalker(function(node) {
-                },
-                compress: false,
-                mangle: false,
-                output: {
-                    ast: true,
-                    code: false
-                }
-            }).ast.walk(new UglifyJS.TreeWalker(function(node) {
                 if (node instanceof UglifyJS.AST_Assign) {
                     var name = node.left.print_to_string();
                     var value = node.right;

lib/ast.js

@@ -118,10 +118,8 @@ var AST_Node = DEFNODE("Node", "start end", {
     }
 }, null);
 
-AST_Node.warn_function = null;
 AST_Node.warn = function(txt, props) {
-    if (AST_Node.warn_function)
+    if (AST_Node.warn_function) AST_Node.warn_function(string_template(txt, props));
-        AST_Node.warn_function(string_template(txt, props));
 };
 
 /* -----[ statements ]----- */
@@ -207,8 +205,7 @@ var AST_LabeledStatement = DEFNODE("LabeledStatement", "label", {
             var label = node.label;
             var def = this.label;
             node.walk(new TreeWalker(function(node) {
-                if (node instanceof AST_LoopControl
+                if (node instanceof AST_LoopControl && node.label && node.label.thedef === def) {
-                    && node.label && node.label.thedef === def) {
                     node.label.thedef = label;
                     label.references.push(node);
                 }

lib/output.js

@@ -198,16 +198,24 @@ function OutputStream(options) {
     /* -----[ beautification/minification ]----- */
 
     var has_parens = false;
+    var line_end = 0;
+    var line_fixed = true;
     var might_need_space = false;
     var might_need_semicolon = false;
-    var might_add_newline = 0;
     var need_newline_indented = false;
     var need_space = false;
     var newline_insert = -1;
     var last = "";
     var mapping_token, mapping_name, mappings = options.source_map && [];
 
-    var do_add_mapping = mappings ? function() {
+    var adjust_mappings = mappings ? function(line, col) {
+        mappings.forEach(function(mapping) {
+            mapping.line += line;
+            mapping.col += col;
+        });
+    } : noop;
+
+    var flush_mappings = mappings ? function() {
         mappings.forEach(function(mapping) {
             try {
                 options.source_map.add(
@@ -230,31 +238,30 @@ function OutputStream(options) {
         mappings = [];
     } : noop;
 
-    var ensure_line_len = options.max_line_len ? function() {
+    function insert_newlines(count) {
-        if (current_col > options.max_line_len) {
+        var index = OUTPUT.lastIndexOf("\n");
-            if (might_add_newline) {
+        if (line_end < index) line_end = index;
-                var left = OUTPUT.slice(0, might_add_newline);
+        var left = OUTPUT.slice(0, line_end);
-                var right = OUTPUT.slice(might_add_newline);
+        var right = OUTPUT.slice(line_end);
-                if (mappings) {
+        adjust_mappings(count, right.length - current_col);
-                    var delta = right.length - current_col;
+        current_line += count;
-                    mappings.forEach(function(mapping) {
+        current_pos += count;
-                        mapping.line++;
+        current_col = right.length;
-                        mapping.col += delta;
+        OUTPUT = left;
-                    });
+        while (count--) OUTPUT += "\n";
-                }
+        OUTPUT += right;
-                OUTPUT = left + "\n" + right;
+    }
-                current_line++;
+
-                current_pos++;
+    var fix_line = options.max_line_len ? function() {
-                current_col = right.length;
+        if (line_fixed) {
-            }
             if (current_col > options.max_line_len) {
                 AST_Node.warn("Output exceeds {max_line_len} characters", options);
             }
+            return;
         }
-        if (might_add_newline) {
+        if (current_col > options.max_line_len) insert_newlines(1);
-            might_add_newline = 0;
+        line_fixed = true;
-            do_add_mapping();
+        flush_mappings();
-        }
     } : noop;
 
     var requireSemicolonChars = makePredicate("( [ + * / - , .");
@@ -286,7 +293,7 @@ function OutputStream(options) {
                     current_col++;
                     current_pos++;
                 } else {
-                    ensure_line_len();
+                    fix_line();
                     OUTPUT += "\n";
                     current_pos++;
                     current_line++;
@@ -304,18 +311,6 @@ function OutputStream(options) {
             }
         }
 
-        if (!options.beautify && options.preserve_line && stack[stack.length - 1]) {
-            var target_line = stack[stack.length - 1].start.line;
-            while (current_line < target_line) {
-                ensure_line_len();
-                OUTPUT += "\n";
-                current_pos++;
-                current_line++;
-                current_col = 0;
-                might_need_space = false;
-            }
-        }
-
         if (might_need_space) {
             if ((is_identifier_char(prev)
                     && (is_identifier_char(ch) || ch == "\\"))
@@ -337,7 +332,7 @@ function OutputStream(options) {
                 col: current_col
             });
             mapping_token = false;
-            if (!might_add_newline) do_add_mapping();
+            if (line_fixed) flush_mappings();
         }
 
         OUTPUT += str;
@@ -347,7 +342,7 @@ function OutputStream(options) {
         current_line += n;
         current_col += a[0].length;
         if (n > 0) {
-            ensure_line_len();
+            fix_line();
             current_col = a[n].length;
         }
         last = str;
@@ -374,9 +369,10 @@ function OutputStream(options) {
         return ret;
     } : function(col, cont) { return cont() };
 
-    var may_add_newline = options.max_line_len ? function() {
+    var may_add_newline = options.max_line_len || options.preserve_line ? function() {
-        ensure_line_len();
+        fix_line();
-        might_add_newline = OUTPUT.length;
+        line_end = OUTPUT.length;
+        line_fixed = false;
     } : noop;
 
     var newline = options.beautify ? function() {
@@ -455,9 +451,7 @@ function OutputStream(options) {
     } : noop;
 
     function get() {
-        if (might_add_newline) {
+        if (!line_fixed) fix_line();
-            ensure_line_len();
-        }
         return OUTPUT;
     }
 
@@ -622,7 +616,14 @@ function OutputStream(options) {
         col             : function() { return current_col },
         pos             : function() { return current_pos },
         push_node       : function(node) { stack.push(node) },
-        pop_node        : function() { return stack.pop() },
+        pop_node        : options.preserve_line ? function() {
+            var node = stack.pop();
+            if (node.start && node.start.line > current_line) {
+                insert_newlines(node.start.line - current_line);
+            }
+        } : function() {
+            stack.pop();
+        },
         parent          : function(n) {
             return stack[stack.length - 2 - (n || 0)];
         }
@@ -693,23 +694,15 @@ function OutputStream(options) {
     // a function expression needs parens around it when it's provably
     // the first token to appear in a statement.
     PARENS(AST_Function, function(output) {
-        if (!output.has_parens() && first_in_statement(output)) {
+        if (!output.has_parens() && first_in_statement(output)) return true;
-            return true;
-        }
-
         if (output.option('webkit')) {
             var p = output.parent();
-            if (p instanceof AST_PropAccess && p.expression === this) {
+            if (p instanceof AST_PropAccess && p.expression === this) return true;
-                return true;
-            }
         }
-
         if (output.option('wrap_iife')) {
             var p = output.parent();
-            return p instanceof AST_Call && p.expression === this;
+            if (p instanceof AST_Call && p.expression === this) return true;
         }
-
-        return false;
     });
 
     // same goes for an object literal, because otherwise it would be
@@ -783,17 +776,17 @@ function OutputStream(options) {
     });
 
     PARENS(AST_Call, function(output) {
-        var p = output.parent(), p1;
+        var p = output.parent();
-        if (p instanceof AST_New && p.expression === this)
+        if (p instanceof AST_New && p.expression === this) return true;
-            return true;
-
-        // workaround for Safari bug.
         // https://bugs.webkit.org/show_bug.cgi?id=123506
-        return this.expression instanceof AST_Function
+        if (output.option('webkit')) {
-            && p instanceof AST_PropAccess
+            var g = output.parent(1);
-            && p.expression === this
+            return this.expression instanceof AST_Function
-            && (p1 = output.parent(1)) instanceof AST_Assign
+                && p instanceof AST_PropAccess
-            && p1.left === p;
+                && p.expression === this
+                && g instanceof AST_Assign
+                && g.left === p;
+        }
     });
 
     PARENS(AST_New, function(output) {
@@ -1160,7 +1153,7 @@ function OutputStream(options) {
             def.print(output);
         });
         var p = output.parent();
-        if (p.init !== self || !(p instanceof AST_For || p instanceof AST_ForIn)) output.semicolon();
+        if (p && p.init !== self || !(p instanceof AST_For || p instanceof AST_ForIn)) output.semicolon();
     });
 
     function parenthesize_for_noin(node, output, noin) {

lib/parse.js

@@ -758,17 +758,21 @@ function parse($TEXT, options) {
         croak(msg, token.line, token.col);
     }
 
+    function token_to_string(type, value) {
+        return type + (value === undefined ? "" : " «" + value + "»");
+    }
+
     function unexpected(token) {
         if (token == null)
             token = S.token;
-        token_error(token, "Unexpected token: " + token.type + " (" + token.value + ")");
+        token_error(token, "Unexpected token: " + token_to_string(token.type, token.value));
     }
 
     function expect_token(type, val) {
         if (is(type, val)) {
             return next();
         }
-        token_error(S.token, "Unexpected token " + S.token.type + " «" + S.token.value + "»" + ", expected " + type + " «" + val + "»");
+        token_error(S.token, "Unexpected token: " + token_to_string(S.token.type, S.token.value) + ", expected: " + token_to_string(type, val));
     }
 
     function expect(punc) {
@@ -788,7 +792,7 @@ function parse($TEXT, options) {
 
     function semicolon(optional) {
         if (is("punc", ";")) next();
-        else if (!optional && !can_insert_semicolon()) unexpected();
+        else if (!optional && !can_insert_semicolon()) expect_token("punc", ";");
     }
 
     function parenthesised() {
@@ -1069,7 +1073,7 @@ function parse($TEXT, options) {
         var in_statement = ctor === AST_Defun;
         var name = is("name") ? as_symbol(in_statement ? AST_SymbolDefun : AST_SymbolLambda) : null;
         if (in_statement && !name)
-            unexpected();
+            expect_token("name");
         if (name && ctor !== AST_Accessor && !(name instanceof AST_SymbolDeclaration))
             unexpected(prev());
         expect("(");
@@ -1119,7 +1123,7 @@ function parse($TEXT, options) {
         expect("{");
         var a = [];
         while (!is("punc", "}")) {
-            if (is("eof")) unexpected();
+            if (is("eof")) expect_token("punc", "}");
             a.push(statement(strict_defun));
         }
         next();
@@ -1130,7 +1134,7 @@ function parse($TEXT, options) {
         expect("{");
         var a = [], cur = null, branch = null, tmp;
         while (!is("punc", "}")) {
-            if (is("eof")) unexpected();
+            if (is("eof")) expect_token("punc", "}");
             if (is("keyword", "case")) {
                 if (branch) branch.end = prev();
                 cur = [];
@@ -1141,8 +1145,7 @@ function parse($TEXT, options) {
                 });
                 a.push(branch);
                 expect(":");
-            }
+            } else if (is("keyword", "default")) {
-            else if (is("keyword", "default")) {
                 if (branch) branch.end = prev();
                 cur = [];
                 branch = new AST_Default({
@@ -1150,8 +1153,7 @@ function parse($TEXT, options) {
                     body  : cur
                 });
                 a.push(branch);
-            }
+            } else {
-            else {
                 if (!cur) unexpected();
                 cur.push(statement());
             }
@@ -1420,10 +1422,10 @@ function parse($TEXT, options) {
     }
 
     function as_name() {
-        var tmp = S.token;
+        if (!is("name")) expect_token("name");
-        if (tmp.type != "name") unexpected();
+        var name = S.token.value;
         next();
-        return tmp.value;
+        return name;
     }
 
     function _make_symbol(type) {
@@ -1625,6 +1627,7 @@ function parse($TEXT, options) {
     }
 
     if (options.expression) {
+        handle_regexp();
         return expression(true);
     }
 

lib/propmangle.js

@@ -53,25 +53,30 @@ function find_builtins(reserved) {
         "-Infinity",
         "undefined",
     ].forEach(add);
-    [ Object, Array, Function, Number,
+    [
-      String, Boolean, Error, Math,
+        Array,
-      Date, RegExp
+        Boolean,
+        Date,
+        Error,
+        Function,
+        Math,
+        Number,
+        Object,
+        RegExp,
+        String,
     ].forEach(function(ctor) {
         Object.getOwnPropertyNames(ctor).map(add);
         if (ctor.prototype) {
             Object.getOwnPropertyNames(ctor.prototype).map(add);
         }
     });
+
     function add(name) {
         push_uniq(reserved, name);
     }
 }
 
 function reserve_quoted_keys(ast, reserved) {
-    function add(name) {
-        push_uniq(reserved, name);
-    }
-
     ast.walk(new TreeWalker(function(node) {
         if (node instanceof AST_ObjectKeyVal && node.quote) {
             add(node.key);
@@ -79,6 +84,10 @@ function reserve_quoted_keys(ast, reserved) {
             addStrings(node.property, add);
         }
     }));
+
+    function add(name) {
+        push_uniq(reserved, name);
+    }
 }
 
 function addStrings(node, add) {
@@ -127,10 +136,8 @@ function mangle_properties(ast, options) {
     // note debug may be enabled as an empty string, which is falsey. Also treat passing 'true'
     // the same as passing an empty string.
     var debug = options.debug !== false;
-    var debug_name_suffix;
+    var debug_suffix;
-    if (debug) {
+    if (debug) debug_suffix = options.debug === true ? "" : options.debug;
-        debug_name_suffix = (options.debug === true ? "" : options.debug);
-    }
 
     var names_to_mangle = [];
     var unmangleable = [];
@@ -139,18 +146,14 @@ function mangle_properties(ast, options) {
     ast.walk(new TreeWalker(function(node) {
         if (node instanceof AST_ObjectKeyVal) {
             add(node.key);
-        }
+        } else if (node instanceof AST_ObjectProperty) {
-        else if (node instanceof AST_ObjectProperty) {
             // setter or getter, since KeyVal is handled above
             add(node.key.name);
-        }
+        } else if (node instanceof AST_Dot) {
-        else if (node instanceof AST_Dot) {
             add(node.property);
-        }
+        } else if (node instanceof AST_Sub) {
-        else if (node instanceof AST_Sub) {
             addStrings(node.property, add);
-        }
+        } else if (node instanceof AST_Call
-        else if (node instanceof AST_Call
             && node.expression.print_to_string() == "Object.defineProperty") {
             addStrings(node.args[1], add);
         }
@@ -160,18 +163,14 @@ function mangle_properties(ast, options) {
     return ast.transform(new TreeTransformer(function(node) {
         if (node instanceof AST_ObjectKeyVal) {
             node.key = mangle(node.key);
-        }
+        } else if (node instanceof AST_ObjectProperty) {
-        else if (node instanceof AST_ObjectProperty) {
             // setter or getter
             node.key.name = mangle(node.key.name);
-        }
+        } else if (node instanceof AST_Dot) {
-        else if (node instanceof AST_Dot) {
             node.property = mangle(node.property);
-        }
+        } else if (!options.keep_quoted && node instanceof AST_Sub) {
-        else if (!options.keep_quoted && node instanceof AST_Sub) {
             node.property = mangleStrings(node.property);
-        }
+        } else if (node instanceof AST_Call
-        else if (node instanceof AST_Call
             && node.expression.print_to_string() == "Object.defineProperty") {
             node.args[1] = mangleStrings(node.args[1]);
         }
@@ -182,9 +181,7 @@ function mangle_properties(ast, options) {
     function can_mangle(name) {
         if (unmangleable.indexOf(name) >= 0) return false;
         if (reserved.indexOf(name) >= 0) return false;
-        if (options.only_cache) {
+        if (options.only_cache) return cache.has(name);
-            return cache.has(name);
-        }
         if (/^-?[0-9]+(\.[0-9]+)?(e[+-][0-9]+)?$/.test(name)) return false;
         return true;
     }
@@ -192,42 +189,29 @@ function mangle_properties(ast, options) {
     function should_mangle(name) {
         if (regex && !regex.test(name)) return false;
         if (reserved.indexOf(name) >= 0) return false;
-        return cache.has(name)
+        return cache.has(name) || names_to_mangle.indexOf(name) >= 0;
-            || names_to_mangle.indexOf(name) >= 0;
     }
 
     function add(name) {
-        if (can_mangle(name))
+        if (can_mangle(name)) push_uniq(names_to_mangle, name);
-            push_uniq(names_to_mangle, name);
+        if (!should_mangle(name)) push_uniq(unmangleable, name);
-
-        if (!should_mangle(name)) {
-            push_uniq(unmangleable, name);
-        }
     }
 
     function mangle(name) {
         if (!should_mangle(name)) {
             return name;
         }
-
         var mangled = cache.get(name);
         if (!mangled) {
             if (debug) {
                 // debug mode: use a prefix and suffix to preserve readability, e.g. o.foo -> o._$foo$NNN_.
-                var debug_mangled = "_$" + name + "$" + debug_name_suffix + "_";
+                var debug_mangled = "_$" + name + "$" + debug_suffix + "_";
-
+                if (can_mangle(debug_mangled)) mangled = debug_mangled;
-                if (can_mangle(debug_mangled)) {
-                    mangled = debug_mangled;
-                }
             }
-
             // either debug mode is off, or it is on and we could not use the mangled name
-            if (!mangled) {
+            if (!mangled) do {
-                do {
+                mangled = base54(++cname);
-                    mangled = base54(++cname);
+            } while (!can_mangle(mangled));
-                } while (!can_mangle(mangled));
-            }
-
             cache.set(name, mangled);
         }
         return mangled;
@@ -238,11 +222,9 @@ function mangle_properties(ast, options) {
             if (node instanceof AST_Sequence) {
                 var last = node.expressions.length - 1;
                 node.expressions[last] = mangleStrings(node.expressions[last]);
-            }
+            } else if (node instanceof AST_String) {
-            else if (node instanceof AST_String) {
                 node.value = mangle(node.value);
-            }
+            } else if (node instanceof AST_Conditional) {
-            else if (node instanceof AST_Conditional) {
                 node.consequent = mangleStrings(node.consequent);
                 node.alternative = mangleStrings(node.alternative);
             }

lib/scope.js

@@ -118,11 +118,10 @@ AST_Toplevel.DEFMETHOD("figure_out_scope", function(options) {
             descend();
             scope = save_scope;
             defun = save_defun;
-            return true;        // don't descend again in TreeWalker
+            return true;
         }
         if (node instanceof AST_With) {
-            for (var s = scope; s; s = s.parent_scope)
+            for (var s = scope; s; s = s.parent_scope) s.uses_with = true;
-                s.uses_with = true;
             return;
         }
         if (node instanceof AST_Symbol) {
@@ -132,18 +131,14 @@ AST_Toplevel.DEFMETHOD("figure_out_scope", function(options) {
             node.thedef = node;
             node.references = [];
         }
-        if (node instanceof AST_SymbolDefun || options.ie8 && node instanceof AST_SymbolLambda) {
+        if (node instanceof AST_SymbolDefun) {
-            // Careful here, the scope where this should be defined is
+            // This should be defined in the parent scope, as we encounter the
-            // the parent scope.  The reason is that we enter a new
+            // AST_Defun node before getting to its AST_Symbol.
-            // scope when we encounter the AST_Defun node (which is
+            (node.scope = defun.parent_scope.resolve()).def_function(node, defun);
-            // instanceof AST_Scope) but we get to the symbol a bit
+        } else if (node instanceof AST_SymbolLambda) {
-            // later.
+            var def = defun.def_function(node, node.name == "arguments" ? undefined : defun);
-            (node.scope = defun.parent_scope).def_function(node, defun);
+            if (options.ie8) def.defun = defun.parent_scope.resolve();
-        }
+        } else if (node instanceof AST_SymbolVar) {
-        else if (node instanceof AST_SymbolLambda) {
-            defun.def_function(node, node.name == "arguments" ? undefined : defun);
-        }
-        else if (node instanceof AST_SymbolVar) {
             defun.def_variable(node, node.TYPE == "SymbolVar" ? null : undefined);
             if (defun !== scope) {
                 node.mark_enclosed(options);
@@ -153,8 +148,7 @@ AST_Toplevel.DEFMETHOD("figure_out_scope", function(options) {
                 }
                 node.reference(options);
             }
-        }
+        } else if (node instanceof AST_SymbolCatch) {
-        else if (node instanceof AST_SymbolCatch) {
             scope.def_variable(node).defun = defun;
         }
     });
@@ -162,9 +156,9 @@ AST_Toplevel.DEFMETHOD("figure_out_scope", function(options) {
 
     // pass 2: find back references and eval
     self.globals = new Dictionary();
-    var tw = new TreeWalker(function(node, descend) {
+    var tw = new TreeWalker(function(node) {
-        if (node instanceof AST_LoopControl && node.label) {
+        if (node instanceof AST_LoopControl) {
-            node.label.thedef.references.push(node);
+            if (node.label) node.label.thedef.references.push(node);
             return true;
         }
         if (node instanceof AST_SymbolRef) {
@@ -185,35 +179,39 @@ AST_Toplevel.DEFMETHOD("figure_out_scope", function(options) {
             return true;
         }
         // ensure mangling works if catch reuses a scope variable
-        var def;
+        if (node instanceof AST_SymbolCatch) {
-        if (node instanceof AST_SymbolCatch && (def = node.definition().redefined())) {
+            var def = node.definition().redefined();
-            var s = node.scope;
+            if (def) for (var s = node.scope; s; s = s.parent_scope) {
-            while (s) {
                 push_uniq(s.enclosed, def);
                 if (s === def.scope) break;
-                s = s.parent_scope;
             }
+            return true;
         }
     });
     self.walk(tw);
 
     // pass 3: fix up any scoping issue with IE8
-    if (options.ie8) {
+    if (options.ie8) self.walk(new TreeWalker(function(node) {
-        self.walk(new TreeWalker(function(node, descend) {
+        if (node instanceof AST_SymbolCatch) {
-            if (node instanceof AST_SymbolCatch) {
+            redefine(node, node.thedef.defun);
-                var name = node.name;
+            return true;
-                var refs = node.thedef.references;
+        }
-                var scope = node.thedef.defun;
+        if (node instanceof AST_SymbolLambda) {
-                var def = scope.find_variable(name) || self.globals.get(name) || scope.def_variable(node);
+            var def = node.thedef;
-                refs.forEach(function(ref) {
+            redefine(node, node.scope.parent_scope);
-                    ref.thedef = def;
+            node.thedef.init = def.init;
-                    ref.reference(options);
+            return true;
-                });
+        }
-                node.thedef = def;
+    }));
-                node.reference(options);
+
-                return true;
+    function redefine(node, scope) {
-            }
+        var name = node.name;
-        }));
+        var old_def = node.thedef;
+        var new_def = scope.find_variable(name) || self.globals.get(name) || scope.def_variable(node);
+        old_def.orig.concat(old_def.references).forEach(function(node) {
+            node.thedef = new_def;
+            node.reference(options);
+        });
     }
 });
 
@@ -252,8 +250,7 @@ AST_Lambda.DEFMETHOD("init_scope_vars", function() {
 
 AST_Symbol.DEFMETHOD("mark_enclosed", function(options) {
     var def = this.definition();
-    var s = this.scope;
+    for (var s = this.scope; s; s = s.parent_scope) {
-    while (s) {
         push_uniq(s.enclosed, def);
         if (options.keep_fnames) {
             s.functions.each(function(d) {
@@ -261,7 +258,6 @@ AST_Symbol.DEFMETHOD("mark_enclosed", function(options) {
             });
         }
         if (s === def.scope) break;
-        s = s.parent_scope;
     }
 });
 
@@ -298,13 +294,23 @@ AST_Scope.DEFMETHOD("def_variable", function(symbol, init) {
     return symbol.thedef = def;
 });
 
+AST_Lambda.DEFMETHOD("resolve", return_this);
+AST_Scope.DEFMETHOD("resolve", function() {
+    return this.parent_scope;
+});
+AST_Toplevel.DEFMETHOD("resolve", return_this);
+
 function names_in_use(scope, options) {
     var names = scope.names_in_use;
     if (!names) {
         scope.names_in_use = names = Object.create(scope.mangled_names || null);
         scope.cname_holes = [];
+        var cache = options.cache && options.cache.props;
         scope.enclosed.forEach(function(def) {
             if (def.unmangleable(options)) names[def.name] = true;
+            if (def.global && cache && cache.has(def.name)) {
+                names[cache.get(def.name)] = true;
+            }
         });
     }
     return names;
@@ -314,14 +320,6 @@ function next_mangled_name(scope, options, def) {
     var in_use = names_in_use(scope, options);
     var holes = scope.cname_holes;
     var names = Object.create(null);
-    // #179, #326
-    // in Safari strict mode, something like (function x(x){...}) is a syntax error;
-    // a function expression's argument cannot shadow the function expression's name
-    if (scope instanceof AST_Function && scope.name && def.orig[0] instanceof AST_SymbolFunarg) {
-        var tricky_def = scope.name.definition();
-        // the function's mangled_name is null when keep_fnames is true
-        names[tricky_def.mangled_name || tricky_def.name] = true;
-    }
     var scopes = [ scope ];
     def.references.forEach(function(sym) {
         var scope = sym.scope;
@@ -410,7 +408,7 @@ AST_Toplevel.DEFMETHOD("mangle_names", function(options) {
             var save_nesting = lname;
             descend();
             lname = save_nesting;
-            return true;        // don't descend again in TreeWalker
+            return true;
         }
         if (node instanceof AST_Scope) {
             descend();
@@ -422,7 +420,9 @@ AST_Toplevel.DEFMETHOD("mangle_names", function(options) {
         }
         if (node instanceof AST_Label) {
             var name;
-            do name = base54(++lname); while (!is_identifier(name));
+            do {
+                name = base54(++lname);
+            } while (!is_identifier(name));
             node.mangled_name = name;
             return true;
         }

lib/utils.js

@@ -162,8 +162,7 @@ var MAP = (function() {
 })();
 
 function push_uniq(array, el) {
-    if (array.indexOf(el) < 0)
+    if (array.indexOf(el) < 0) return array.push(el);
-        array.push(el);
 }
 
 function string_template(text, props) {
@@ -173,9 +172,8 @@ function string_template(text, props) {
 }
 
 function remove(array, el) {
-    for (var i = array.length; --i >= 0;) {
+    var index = array.indexOf(el);
-        if (array[i] === el) array.splice(i, 1);
+    if (index >= 0) array.splice(index, 1);
-    }
 }
 
 function makePredicate(words) {

package.json

@@ -3,7 +3,7 @@
   "description": "JavaScript parser, mangler/compressor and beautifier toolkit",
   "author": "Mihai Bazon <mihai.bazon@gmail.com> (http://lisperator.net/)",
   "license": "BSD-2-Clause",
-  "version": "3.4.3",
+  "version": "3.5.3",
   "engines": {
     "node": ">=0.8.0"
   },
@@ -23,12 +23,12 @@
     "LICENSE"
   ],
   "dependencies": {
-    "commander": "~2.16.0",
+    "commander": "~2.19.0",
     "source-map": "~0.6.1"
   },
   "devDependencies": {
-    "acorn": "~5.7.1",
+    "acorn": "~6.1.1",
-    "semver": "~5.5.0"
+    "semver": "~5.6.0"
   },
   "scripts": {
     "test": "node test/run-tests.js"

test/compress/arguments.js

@@ -237,3 +237,342 @@ duplicate_argname: {
     }
     expect_stdout: "bar 42 foo 42 bar"
 }
+
+issue_3273: {
+    options = {
+        arguments: true,
+    }
+    input: {
+        function f(a) {
+            console.log(arguments[0], a);
+            arguments[0]++;
+            console.log(arguments[0], a);
+        }
+        f(0);
+    }
+    expect: {
+        function f(a) {
+            console.log(a, a);
+            a++;
+            console.log(a, a);
+        }
+        f(0);
+    }
+    expect_stdout: [
+        "0 0",
+        "1 1",
+    ]
+}
+
+issue_3273_reduce_vars: {
+    options = {
+        arguments: true,
+        reduce_vars: true,
+    }
+    input: {
+        function f(a) {
+            console.log(arguments[0], a);
+            arguments[0]++;
+            console.log(arguments[0], a);
+        }
+        f(0);
+    }
+    expect: {
+        function f(a) {
+            console.log(a, a);
+            a++;
+            console.log(a, a);
+        }
+        f(0);
+    }
+    expect_stdout: [
+        "0 0",
+        "1 1",
+    ]
+}
+
+issue_3273_local_strict: {
+    options = {
+        arguments: true,
+    }
+    input: {
+        function f(a) {
+            "use strict";
+            console.log(arguments[0], a);
+            arguments[0]++;
+            console.log(arguments[0], a);
+        }
+        f(0);
+    }
+    expect: {
+        function f(a) {
+            "use strict";
+            console.log(arguments[0], a);
+            arguments[0]++;
+            console.log(arguments[0], a);
+        }
+        f(0);
+    }
+    expect_stdout: [
+        "0 0",
+        "1 0",
+    ]
+}
+
+issue_3273_local_strict_reduce_vars: {
+    options = {
+        arguments: true,
+        reduce_vars: true,
+    }
+    input: {
+        function f(a) {
+            "use strict";
+            console.log(arguments[0], a);
+            arguments[0]++;
+            console.log(arguments[0], a);
+        }
+        f(0);
+    }
+    expect: {
+        function f(a) {
+            "use strict";
+            console.log(arguments[0], a);
+            arguments[0]++;
+            console.log(arguments[0], a);
+        }
+        f(0);
+    }
+    expect_stdout: [
+        "0 0",
+        "1 0",
+    ]
+}
+
+issue_3273_global_strict: {
+    options = {
+        arguments: true,
+    }
+    input: {
+        "use strict";
+        function f(a) {
+            console.log(arguments[0], a);
+            arguments[0]++;
+            console.log(arguments[0], a);
+        }
+        f(0);
+    }
+    expect: {
+        "use strict";
+        function f(a) {
+            console.log(arguments[0], a);
+            arguments[0]++;
+            console.log(arguments[0], a);
+        }
+        f(0);
+    }
+    expect_stdout: [
+        "0 0",
+        "1 0",
+    ]
+}
+
+issue_3273_global_strict_reduce_vars: {
+    options = {
+        arguments: true,
+        reduce_vars: true,
+    }
+    input: {
+        "use strict";
+        function f(a) {
+            console.log(arguments[0], a);
+            arguments[0]++;
+            console.log(arguments[0], a);
+        }
+        f(0);
+    }
+    expect: {
+        "use strict";
+        function f(a) {
+            console.log(arguments[0], a);
+            arguments[0]++;
+            console.log(arguments[0], a);
+        }
+        f(0);
+    }
+    expect_stdout: [
+        "0 0",
+        "1 0",
+    ]
+}
+
+issue_3282_1: {
+    options = {
+        arguments: true,
+        reduce_funcs: true,
+        reduce_vars: true,
+        keep_fargs: false,
+        unused: true,
+    }
+    input: {
+        (function(t) {
+            return function() {
+                t();
+            };
+        })(function() {
+            'use strict';
+            function e() {
+                return arguments[0];
+            }
+            e();
+            e();
+        })();
+    }
+    expect: {
+        (function() {
+            return function() {
+                (function() {
+                    "use strict";
+                    function e() {
+                        return arguments[0];
+                    }
+                    e();
+                    e();
+                })();
+            };
+        })()();
+    }
+    expect_stdout: true
+}
+
+issue_3282_1_passes: {
+    options = {
+        arguments: true,
+        passes: 2,
+        reduce_funcs: true,
+        reduce_vars: true,
+        keep_fargs: false,
+        unused: true,
+    }
+    input: {
+        (function(t) {
+            return function() {
+                t();
+            };
+        })(function() {
+            'use strict';
+            function e() {
+                return arguments[0];
+            }
+            e();
+            e();
+        })();
+    }
+    expect: {
+        (function() {
+            return function() {
+                (function() {
+                    "use strict";
+                    function e(argument_0) {
+                        return argument_0;
+                    }
+                    e();
+                    e();
+                })();
+            };
+        })()();
+    }
+    expect_stdout: true
+}
+
+issue_3282_2: {
+    options = {
+        arguments: true,
+        reduce_vars: true,
+        keep_fargs: false,
+        unused: true,
+    }
+    input: {
+        (function(f) {
+            f();
+        })(function() {
+            return (function(t) {
+                return function() {
+                    t();
+                };
+            })(function() {
+                'use strict';
+                function e() {
+                    return arguments[0];
+                }
+                e();
+                e();
+            })();
+        });
+    }
+    expect: {
+        (function() {
+            (function() {
+                return function(t) {
+                    return function() {
+                        t();
+                    };
+                }(function() {
+                    "use strict";
+                    function e() {
+                        return arguments[0];
+                    }
+                    e();
+                    e();
+                })();
+            })();
+        })();
+    }
+    expect_stdout: true
+}
+
+issue_3282_2_passes: {
+    options = {
+        arguments: true,
+        passes: 2,
+        reduce_vars: true,
+        keep_fargs: false,
+        unused: true,
+    }
+    input: {
+        (function(f) {
+            f();
+        })(function() {
+            return (function(t) {
+                return function() {
+                    t();
+                };
+            })(function() {
+                'use strict';
+                function e() {
+                    return arguments[0];
+                }
+                e();
+                e();
+            })();
+        });
+    }
+    expect: {
+        (function() {
+            (function() {
+                return function(t) {
+                    return function() {
+                        t();
+                    };
+                }(function() {
+                    "use strict";
+                    function e(argument_0) {
+                        return argument_0;
+                    }
+                    e();
+                    e();
+                })();
+            })();
+        })();
+    }
+    expect_stdout: true
+}

test/compress/arrays.js

@@ -239,3 +239,113 @@ index_length: {
     }
     expect_stdout: "1 2"
 }
+
+constructor_bad: {
+    options = {
+        unsafe: true
+    }
+    input: {
+        try {
+            Array(NaN);
+            console.log("FAIL1");
+        } catch (ex) {
+            try {
+                new Array(NaN);
+                console.log("FAIL2");
+            } catch (ex) {
+                console.log("PASS");
+            }
+        }
+        try {
+            Array(3.14);
+            console.log("FAIL1");
+        } catch (ex) {
+            try {
+                new Array(3.14);
+                console.log("FAIL2");
+            } catch (ex) {
+                console.log("PASS");
+            }
+        }
+    }
+    expect: {
+        try {
+            Array(NaN);
+            console.log("FAIL1");
+        } catch (ex) {
+            try {
+                Array(NaN);
+                console.log("FAIL2");
+            } catch (ex) {
+                console.log("PASS");
+            }
+        }
+        try {
+            Array(3.14);
+            console.log("FAIL1");
+        } catch (ex) {
+            try {
+                Array(3.14);
+                console.log("FAIL2");
+            } catch (ex) {
+                console.log("PASS");
+            }
+        }
+    }
+    expect_stdout: [
+        "PASS",
+        "PASS",
+    ]
+    expect_warnings: [
+        "WARN: Invalid array length: 3.14 [test/compress/arrays.js:13,12]",
+        "WARN: Invalid array length: 3.14 [test/compress/arrays.js:17,16]",
+    ]
+}
+
+constructor_good: {
+    options = {
+        unsafe: true
+    }
+    input: {
+        console.log(Array());
+        console.log(Array(0));
+        console.log(Array(1));
+        console.log(Array(6));
+        console.log(Array(7));
+        console.log(Array(1, 2));
+        console.log(Array(false));
+        console.log(Array("foo"));
+        console.log(Array(Array));
+        console.log(new Array());
+        console.log(new Array(0));
+        console.log(new Array(1));
+        console.log(new Array(6));
+        console.log(new Array(7));
+        console.log(new Array(1, 2));
+        console.log(new Array(false));
+        console.log(new Array("foo"));
+        console.log(new Array(Array));
+    }
+    expect: {
+        console.log([]);
+        console.log([]);
+        console.log([,]);
+        console.log([,,,,,,]);
+        console.log(Array(7));
+        console.log([ 1, 2 ]);
+        console.log([ false ]);
+        console.log([ "foo" ]);
+        console.log(Array(Array));
+        console.log([]);
+        console.log([]);
+        console.log([,]);
+        console.log([,,,,,,]);
+        console.log(Array(7));
+        console.log([ 1, 2 ]);
+        console.log([ false ]);
+        console.log([ "foo" ]);
+        console.log(Array(Array));
+    }
+    expect_stdout: true
+    expect_warnings: []
+}

test/compress/asm.js

@@ -1,5 +1,6 @@
 asm_mixed: {
     options = {
+        assignments: true,
         booleans: true,
         comparisons: true,
         conditionals: true,

test/compress/assignment.js

@@ -1,5 +1,6 @@
 op_equals_left_local_var: {
     options = {
+        assignments: true,
         evaluate: true,
     }
     input: {
@@ -60,6 +61,7 @@ op_equals_left_local_var: {
 
 op_equals_right_local_var: {
     options = {
+        assignments: true,
         evaluate: true,
     }
     input: {
@@ -123,6 +125,7 @@ op_equals_right_local_var: {
 }
 op_equals_left_global_var: {
     options = {
+        assignments: true,
         evaluate: true,
     }
     input: {
@@ -179,6 +182,7 @@ op_equals_left_global_var: {
 
 op_equals_right_global_var: {
     options = {
+        assignments: true,
         evaluate: true,
     }
     input: {
@@ -236,3 +240,52 @@ op_equals_right_global_var: {
         x = g() &   x;
     }
 }
+
+increment_decrement_1: {
+    options = {
+        assignments: true,
+        reduce_vars: true,
+    }
+    input: {
+        console.log(function(a) {
+            a += 1;
+            a -= 1;
+            return a;
+        }(42));
+    }
+    expect: {
+        console.log(function(a){
+            ++a;
+            --a;
+            return a;
+        }(42));
+    }
+    expect_stdout: "42"
+}
+
+increment_decrement_2: {
+    options = {
+        assignments: true,
+        passes: 2,
+        reduce_vars: true,
+    }
+    input: {
+        console.log(function(a) {
+            a = a + 1;
+            a = a - 1;
+            a += 1;
+            a -= 1;
+            return a;
+        }(42));
+    }
+    expect: {
+        console.log(function(a){
+            ++a;
+            --a;
+            ++a;
+            --a;
+            return a;
+        }(42));
+    }
+    expect_stdout: "42"
+}

test/compress/collapse_vars.js

@@ -944,10 +944,10 @@ collapse_vars_misc1: {
         function f5(x) { var z = foo(); return (5 - window.x) / z }
         function f6() { return window.a * window.z && zap() }
         function f7() { var b = window.a * window.z; return b + b }
-        function f8() { var b = window.a * window.z; return b + (b + 5) }
+        function f8() { var b = window.a * window.z; return b + (5 + b) }
         function f9() { var b = window.a * window.z; return bar() || b }
         function f10(x) { var a = 5; return a += 3; }
-        function f11(x) { var a = 5, b = 3; return a += --b; }
+        function f11(x) { var a = 5; return a += 2; }
     }
 }
 
@@ -3895,11 +3895,11 @@ issue_2436_10: {
             o = { b: 3 };
             return n;
         }
-        console.log((c = o, [
+        console.log([
-            c.a,
+            (c = o).a,
             f(c.b),
             c.b,
-        ]).join(" "));
+        ].join(" "));
         var c;
     }
     expect_stdout: "1 2 2"
@@ -5730,3 +5730,430 @@ issue_3096: {
     }
     expect_stdout: "ab"
 }
+
+issue_3215_1: {
+    options = {
+        collapse_vars: true,
+        evaluate: true,
+        ie8: false,
+        inline: true,
+        passes: 2,
+        side_effects: true,
+        unused: true,
+    }
+    input: {
+        console.log(function a() {
+            var a = 42;
+            return typeof a;
+        }());
+    }
+    expect: {
+        console.log("number");
+    }
+    expect_stdout: "number"
+}
+
+issue_3215_2: {
+    options = {
+        collapse_vars: true,
+        evaluate: true,
+        ie8: true,
+        inline: true,
+        passes: 2,
+        side_effects: true,
+        unused: true,
+    }
+    input: {
+        console.log(function a() {
+            var a = 42;
+            return typeof a;
+        }());
+    }
+    expect: {
+        console.log(function a() {
+            var a = 42;
+            return typeof a;
+        }());
+    }
+    expect_stdout: "number"
+}
+
+issue_3215_3: {
+    options = {
+        collapse_vars: true,
+        evaluate: true,
+        ie8: false,
+        inline: true,
+        passes: 2,
+        side_effects: true,
+        unused: true,
+    }
+    input: {
+        console.log(function() {
+            var a = 42;
+            (function a() {});
+            return typeof a;
+        }());
+    }
+    expect: {
+        console.log("number");
+    }
+    expect_stdout: "number"
+}
+
+issue_3215_4: {
+    options = {
+        collapse_vars: true,
+        evaluate: true,
+        ie8: true,
+        inline: true,
+        passes: 2,
+        side_effects: true,
+        unused: true,
+    }
+    input: {
+        console.log(function() {
+            var a = 42;
+            (function a() {});
+            return typeof a;
+        }());
+    }
+    expect: {
+        console.log(function() {
+            var a = 42;
+            (function a() {});
+            return typeof a;
+        }());
+    }
+    expect_stdout: "number"
+}
+
+issue_3238_1: {
+    options = {
+        collapse_vars: true,
+        unsafe: true,
+    }
+    input: {
+        function f(a) {
+            var b, c;
+            if (a) {
+                b = Object.create(null);
+                c = Object.create(null);
+            }
+            return b === c;
+        }
+        console.log(f(0), f(1));
+    }
+    expect: {
+        function f(a) {
+            var b, c;
+            if (a) {
+                b = Object.create(null);
+                c = Object.create(null);
+            }
+            return b === c;
+        }
+        console.log(f(0), f(1));
+    }
+    expect_stdout: "true false"
+}
+
+issue_3238_2: {
+    options = {
+        collapse_vars: true,
+        unsafe: true,
+    }
+    input: {
+        function f(a) {
+            var b, c;
+            if (a) {
+                b = Error();
+                c = Error();
+            }
+            return b === c;
+        }
+        console.log(f(0), f(1));
+    }
+    expect: {
+        function f(a) {
+            var b, c;
+            if (a) {
+                b = Error();
+                c = Error();
+            }
+            return b === c;
+        }
+        console.log(f(0), f(1));
+    }
+    expect_stdout: "true false"
+}
+
+issue_3238_3: {
+    options = {
+        collapse_vars: true,
+        unsafe: true,
+    }
+    input: {
+        function f(a) {
+            var b, c;
+            if (a) {
+                b = new Date();
+                c = new Date();
+            }
+            return b === c;
+        }
+        console.log(f(0), f(1));
+    }
+    expect: {
+        function f(a) {
+            var b, c;
+            if (a) {
+                b = new Date();
+                c = new Date();
+            }
+            return b === c;
+        }
+        console.log(f(0), f(1));
+    }
+    expect_stdout: "true false"
+}
+
+issue_3238_4: {
+    options = {
+        collapse_vars: true,
+        unsafe: true,
+    }
+    input: {
+        function f(a) {
+            var b, c;
+            if (a) {
+                b = a && {};
+                c = a && {};
+            }
+            return b === c;
+        }
+        console.log(f(0), f(1));
+    }
+    expect: {
+        function f(a) {
+            var b, c;
+            if (a) {
+                b = a && {};
+                c = a && {};
+            }
+            return b === c;
+        }
+        console.log(f(0), f(1));
+    }
+    expect_stdout: "true false"
+}
+
+issue_3238_5: {
+    options = {
+        collapse_vars: true,
+        unsafe: true,
+    }
+    input: {
+        function f(a) {
+            var b, c;
+            if (a) {
+                b = a ? [] : 42;
+                c = a ? [] : 42;
+            }
+            return b === c;
+        }
+        console.log(f(0), f(1));
+    }
+    expect: {
+        function f(a) {
+            var b, c;
+            if (a) {
+                b = a ? [] : 42;
+                c = a ? [] : 42;
+            }
+            return b === c;
+        }
+        console.log(f(0), f(1));
+    }
+    expect_stdout: "true false"
+}
+
+issue_3238_6: {
+    options = {
+        collapse_vars: true,
+        unsafe: true,
+    }
+    input: {
+        function f(a) {
+            var b, c;
+            if (a) {
+                b = a && 0 || [];
+                c = a && 0 || [];
+            }
+            return b === c;
+        }
+        console.log(f(0), f(1));
+    }
+    expect: {
+        function f(a) {
+            var b, c;
+            if (a) {
+                b = a && 0 || [];
+                c = a && 0 || [];
+            }
+            return b === c;
+        }
+        console.log(f(0), f(1));
+    }
+    expect_stdout: "true false"
+}
+
+issue_3247: {
+    options = {
+        collapse_vars: true,
+    }
+    input: {
+        function f(o) {
+            console.log(o.p);
+        }
+        var a;
+        a = Object({ p: "PASS" });
+        a.q = true;
+        f(a, true);
+    }
+    expect: {
+        function f(o) {
+            console.log(o.p);
+        }
+        var a;
+        (a = Object({ p: "PASS" })).q = true;
+        f(a, true);
+    }
+    expect_stdout: "PASS"
+}
+
+issue_3305: {
+    options = {
+        collapse_vars: true,
+        conditionals: true,
+        sequences: true,
+    }
+    input: {
+        function calc(a) {
+            var x, w;
+            if (a) {
+                x = a;
+                w = 1;
+            } else {
+                x = 1;
+                w = 0;
+            }
+            return add(x, w);
+        }
+        function add(x, w) {
+            return x + w;
+        }
+        console.log(calc(41));
+    }
+    expect: {
+        function calc(a) {
+            var x, w;
+            return w = a ? (x = a, 1) : (x = 1, 0), add(x, w);
+        }
+        function add(x, w) {
+            return x + w;
+        }
+        console.log(calc(41));
+    }
+    expect_stdout: "42"
+}
+
+issue_3314: {
+    options = {
+        collapse_vars: true,
+    }
+    input: {
+        function test(a, b) {
+            console.log(a, b);
+        }
+        var a = "FAIL", b;
+        b = a = "PASS";
+        test(a, b);
+    }
+    expect: {
+        function test(a, b) {
+            console.log(a, b);
+        }
+        var a = "FAIL", b;
+        b = a = "PASS";
+        test(a, b);
+    }
+    expect_stdout: "PASS PASS"
+}
+
+issue_3327: {
+    options = {
+        collapse_vars: true,
+        conditionals: true,
+        sequences: true,
+    }
+    input: {
+        var a, b, l = ["PASS", 42];
+        if (l.length === 1) {
+            a = l[0].a;
+            b = l[0].b;
+        } else {
+            a = l[0];
+            b = l[1];
+        }
+        function echo(a, b) {
+            console.log(a, b);
+        }
+        echo(a, b);
+    }
+    expect: {
+        var a, b, l = ["PASS", 42];
+        function echo(a, b) {
+            console.log(a, b);
+        }
+        b = 1 === l.length ? (a = l[0].a, l[0].b) : (a = l[0], l[1]),
+        echo(a,b);
+    }
+    expect_stdout: "PASS 42"
+}
+
+assign_left: {
+    options = {
+        collapse_vars: true,
+    }
+    input: {
+        console.log(function(a, b) {
+            (b = a, b.p).q = "PASS";
+            return a.p.q;
+        }({p: {}}));
+    }
+    expect: {
+        console.log(function(a, b) {
+            (b = a).p.q = "PASS";
+            return a.p.q;
+        }({p: {}}));
+    }
+    expect_stdout: "PASS"
+}
+
+sub_property: {
+    options = {
+        collapse_vars: true,
+    }
+    input: {
+        console.log(function(a, b) {
+            return a[(b = a, b.length - 1)];
+        }([ "FAIL", "PASS" ]));
+    }
+    expect: {
+        console.log(function(a, b) {
+            return a[(b = a).length - 1];
+        }([ "FAIL", "PASS" ]));
+    }
+    expect_stdout: "PASS"
+}

test/compress/comparisons.js

@@ -323,3 +323,25 @@ is_number_unsafe: {
     }
     expect_stdout: "true"
 }
+
+is_boolean_var: {
+    options = {
+        comparisons: true,
+        reduce_vars: true,
+    }
+    input: {
+        console.log(function(a, b) {
+            for (var i = 0, c = !b; i < a.length; i++)
+                if (!a[i] === c)
+                    return i;
+        }([ false, true ], 42));
+    }
+    expect: {
+        console.log(function(a, b) {
+            for (var i = 0, c = !b; i < a.length; i++)
+                if (!a[i] == c)
+                    return i;
+        }([ false, true ], 42));
+    }
+    expect_stdout: "1"
+}

test/compress/conditionals.js

@@ -1292,3 +1292,127 @@ to_and_or: {
     }
     expect_stdout: true
 }
+
+cond_seq_assign_1: {
+    options = {
+        conditionals: true,
+        sequences: true,
+    }
+    input: {
+        function f(a) {
+            var t;
+            if (a) {
+                t = "foo";
+                t = "bar";
+            } else {
+                console.log(t);
+                t = 42;
+            }
+            console.log(t);
+        }
+        f(f);
+        f();
+    }
+    expect: {
+        function f(a) {
+            var t;
+            t = a ? (t = "foo", "bar") : (console.log(t), 42),
+            console.log(t);
+        }
+        f(f),
+        f();
+    }
+    expect_stdout: [
+        "bar",
+        "undefined",
+        "42",
+    ]
+}
+
+cond_seq_assign_2: {
+    options = {
+        conditionals: true,
+        sequences: true,
+    }
+    input: {
+        function f(a) {
+            var t;
+            if (a) {
+                t = "foo";
+                a = "bar";
+            } else {
+                console.log(t);
+                t = 42;
+            }
+            console.log(t);
+        }
+        f(f);
+        f();
+    }
+    expect: {
+        function f(a) {
+            var t;
+            a ? (t = "foo", a = "bar") : (console.log(t), t = 42),
+            console.log(t);
+        }
+        f(f),
+        f();
+    }
+    expect_stdout: [
+        "foo",
+        "undefined",
+        "42",
+    ]
+}
+
+cond_seq_assign_3: {
+    options = {
+        assignments: true,
+        conditionals: true,
+    }
+    input: {
+        var c = 0;
+        if (this)
+            c = 1 + c, c = c + 1;
+        else
+            c = 1 + c, c = c + 1;
+        console.log(c);
+    }
+    expect: {
+        var c = 0;
+        this, c = 1 + c, c += 1;
+        console.log(c);
+    }
+    expect_stdout: "2"
+}
+
+issue_3271: {
+    options = {
+        conditionals: true,
+    }
+    input: {
+        function f(a) {
+            var i = 0, b = [];
+            if (a) {
+                b[i++] = 4,
+                b[i++] = 1;
+            } else {
+                b[i++] = 3,
+                b[i++] = 2,
+                b[i++] = 1;
+            }
+            return b;
+        }
+        console.log(f(0).pop(), f(1).pop());
+    }
+    expect: {
+        function f(a) {
+            var i = 0, b = [];
+            a ? b[i++] = 4 : (b[i++] = 3, b[i++] = 2),
+            b[i++] = 1;
+            return b;
+        }
+        console.log(f(0).pop(), f(1).pop());
+    }
+    expect_stdout: "1 1"
+}

test/compress/drop-unused.js

@@ -1982,3 +1982,26 @@ issue_3192: {
         "foo bar",
     ]
 }
+
+issue_3233: {
+    options = {
+        pure_getters: "strict",
+        side_effects: true,
+        unused: true,
+    }
+    input: {
+        var a = function b() {
+            b.c = "PASS";
+        };
+        a();
+        console.log(a.c);
+    }
+    expect: {
+        var a = function b() {
+            b.c = "PASS";
+        };
+        a();
+        console.log(a.c);
+    }
+    expect_stdout: "PASS"
+}

test/compress/evaluate.js

@@ -1124,14 +1124,14 @@ issue_2207_1: {
         console.log(Math.max(3, 6, 2, 7, 3, 4));
         console.log(Math.cos(1.2345));
         console.log(Math.cos(1.2345) - Math.sin(4.321));
-        console.log(Math.pow(Math.PI, Math.E - Math.LN10));
+        console.log(Math.pow(Math.PI, Math.E - Math.LN10).toFixed(15));
     }
     expect: {
         console.log("A");
         console.log(7);
         console.log(Math.cos(1.2345));
         console.log(1.2543732512566947);
-        console.log(1.6093984514472044);
+        console.log("1.609398451447204");
     }
     expect_stdout: true
 }
@@ -1199,7 +1199,7 @@ issue_2231_1: {
     }
     expect_stdout: true
     expect_warnings: [
-        "WARN: Error evaluating Object.keys(void 0) [test/compress/evaluate.js:1195,20]",
+        "WARN: Error evaluating Object.keys(void 0) [test/compress/evaluate.js:1,20]",
     ]
 }
 
@@ -1216,7 +1216,7 @@ issue_2231_2: {
     }
     expect_stdout: true
     expect_warnings: [
-        "WARN: Error evaluating Object.getOwnPropertyNames(null) [test/compress/evaluate.js:1212,20]",
+        "WARN: Error evaluating Object.getOwnPropertyNames(null) [test/compress/evaluate.js:1,20]",
     ]
 }
 
@@ -1245,12 +1245,12 @@ self_comparison_1: {
     }
     input: {
         var o = { n: NaN };
-        console.log(o.n == o.n, o.n === o.n, o.n != o.n, o.n !== o.n, typeof o.n);
+        console.log(typeof o.n, o.n == o.n, o.n === o.n, o.n != o.n, o.n !== o.n);
     }
     expect: {
-        console.log(false, false, true, true, "number");
+        console.log("number", false, false, true, true);
     }
-    expect_stdout: "false false true true 'number'"
+    expect_stdout: "number false false true true"
 }
 
 self_comparison_2: {
@@ -1265,12 +1265,12 @@ self_comparison_2: {
     }
     input: {
         var o = { n: NaN };
-        console.log(o.n == o.n, o.n === o.n, o.n != o.n, o.n !== o.n, typeof o.n);
+        console.log(typeof o.n, o.n == o.n, o.n === o.n, o.n != o.n, o.n !== o.n);
     }
     expect: {
-        console.log(false, false, true, true, "number");
+        console.log("number", false, false, true, true);
     }
-    expect_stdout: "false false true true 'number'"
+    expect_stdout: "number false false true true"
 }
 
 issue_2535_1: {
@@ -1354,14 +1354,14 @@ issue_2535_3: {
     }
     expect_stdout: true
     expect_warnings: [
-        "WARN: Dropping side-effect-free && [test/compress/evaluate.js:1340,20]",
+        "WARN: Dropping side-effect-free && [test/compress/evaluate.js:1,20]",
-        "WARN: Dropping side-effect-free && [test/compress/evaluate.js:1341,20]",
+        "WARN: Dropping side-effect-free && [test/compress/evaluate.js:2,20]",
-        "WARN: Dropping side-effect-free && [test/compress/evaluate.js:1342,20]",
+        "WARN: Dropping side-effect-free && [test/compress/evaluate.js:3,20]",
-        "WARN: Condition left of && always false [test/compress/evaluate.js:1342,20]",
+        "WARN: Condition left of && always false [test/compress/evaluate.js:3,20]",
-        "WARN: Dropping side-effect-free || [test/compress/evaluate.js:1343,20]",
+        "WARN: Dropping side-effect-free || [test/compress/evaluate.js:4,20]",
-        "WARN: Dropping side-effect-free || [test/compress/evaluate.js:1344,20]",
+        "WARN: Dropping side-effect-free || [test/compress/evaluate.js:5,20]",
-        "WARN: Dropping side-effect-free || [test/compress/evaluate.js:1345,20]",
+        "WARN: Dropping side-effect-free || [test/compress/evaluate.js:6,20]",
-        "WARN: Condition left of || always true [test/compress/evaluate.js:1345,20]",
+        "WARN: Condition left of || always true [test/compress/evaluate.js:6,20]",
     ]
 }
 
@@ -1540,7 +1540,7 @@ issue_2926_2: {
     expect_stdout: "function"
 }
 
-issue_2968: {
+issue_2968_1: {
     options = {
         collapse_vars: true,
         evaluate: true,
@@ -1571,6 +1571,39 @@ issue_2968: {
     expect_stdout: "PASS"
 }
 
+issue_2968_2: {
+    options = {
+        assignments: true,
+        collapse_vars: true,
+        evaluate: true,
+        inline: true,
+        passes: 2,
+        reduce_vars: true,
+        side_effects: true,
+        unused: true,
+    }
+    input: {
+        var c = "FAIL";
+        (function() {
+            (function(a, b) {
+                a <<= 0;
+                a && (a[(c = "PASS", 0 >>> (b += 1))] = 0);
+            })(42, -42);
+        })();
+        console.log(c);
+    }
+    expect: {
+        var c = "FAIL";
+        (function() {
+            a = 42,
+            ((a <<= 0) && (a[(c = "PASS", 0)] = 0));
+            var a;
+        })();
+        console.log(c);
+    }
+    expect_stdout: "PASS"
+}
+
 truthy_conditionals: {
     options = {
         conditionals: true,
@@ -1610,3 +1643,47 @@ truthy_loops: {
         }
     }
 }
+
+if_increment: {
+    options = {
+        evaluate: true,
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        console.log(function(a) {
+            if (console)
+                return ++a;
+        }(0));
+    }
+    expect: {
+        console.log(function(a) {
+            if (console)
+                return 1;
+        }());
+    }
+    expect_stdout: "1"
+}
+
+try_increment: {
+    options = {
+        evaluate: true,
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        console.log(function(a) {
+            try {
+                return ++a;
+            } catch (e) {}
+        }(0));
+    }
+    expect: {
+        console.log(function(a) {
+            try {
+                return 1;
+            } catch (e) {}
+        }());
+    }
+    expect_stdout: "1"
+}

test/compress/functions.js

@@ -236,32 +236,6 @@ issue_203: {
     expect_stdout: "42"
 }
 
-no_webkit: {
-    beautify = {
-        webkit: false,
-    }
-    input: {
-        console.log(function() {
-            1 + 1;
-        }.a = 1);
-    }
-    expect_exact: "console.log(function(){1+1}.a=1);"
-    expect_stdout: "1"
-}
-
-webkit: {
-    beautify = {
-        webkit: true,
-    }
-    input: {
-        console.log(function() {
-            1 + 1;
-        }.a = 1);
-    }
-    expect_exact: "console.log((function(){1+1}).a=1);"
-    expect_stdout: "1"
-}
-
 issue_2084: {
     options = {
         collapse_vars: true,
@@ -384,6 +358,7 @@ inner_ref: {
 
 issue_2107: {
     options = {
+        assignments: true,
         collapse_vars: true,
         inline: true,
         passes: 3,
@@ -413,6 +388,7 @@ issue_2107: {
 
 issue_2114_1: {
     options = {
+        assignments: true,
         collapse_vars: true,
         if_return: true,
         inline: true,
@@ -445,6 +421,7 @@ issue_2114_1: {
 
 issue_2114_2: {
     options = {
+        assignments: true,
         collapse_vars: true,
         if_return: true,
         inline: true,
@@ -1249,6 +1226,7 @@ issue_2630_1: {
 
 issue_2630_2: {
     options = {
+        assignments: true,
         collapse_vars: true,
         inline: true,
         passes: 2,
@@ -1346,6 +1324,7 @@ issue_2630_4: {
 
 issue_2630_5: {
     options = {
+        assignments: true,
         collapse_vars: true,
         inline: true,
         reduce_vars: true,
@@ -1424,6 +1403,8 @@ recursive_inline_2: {
 issue_2657: {
     options = {
         inline: true,
+        passes: 2,
+        reduce_funcs: true,
         reduce_vars: true,
         sequences: true,
         unused: true,
@@ -2341,3 +2322,384 @@ issue_3125: {
     }
     expect_stdout: "PASS"
 }
+
+issue_3274: {
+    options = {
+        collapse_vars: true,
+        inline: true,
+        join_vars: true,
+        loops: true,
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        (function() {
+            var g = function(a) {
+                var c = a.p, b = c;
+                return b != c;
+            };
+            while (g(1))
+                console.log("FAIL");
+            console.log("PASS");
+        })();
+    }
+    expect: {
+        (function() {
+            for (var c; void 0, (c = 1..p) != c;)
+                console.log("FAIL");
+            console.log("PASS");
+        })();
+    }
+    expect_stdout: "PASS"
+}
+
+issue_3297_1: {
+    options = {
+        collapse_vars: true,
+        inline: true,
+        reduce_vars: true,
+        unused: true,
+    }
+    mangle = {}
+    input: {
+        function function1() {
+            var r = {
+                function2: function2
+            };
+            function function2() {
+                alert(1234);
+                function function3() {
+                    function2();
+                };
+                function3();
+            }
+            return r;
+        }
+    }
+    expect: {
+        function function1() {
+            return {
+                function2: function n() {
+                    alert(1234);
+                    function t() {
+                        n();
+                    }
+                    t();
+                }
+            };
+        }
+    }
+}
+
+issue_3297_2: {
+    options = {
+        collapse_vars: true,
+        conditionals: true,
+        inline: true,
+        reduce_vars: true,
+        unused: true,
+    }
+    mangle = {}
+    input: {
+        function function1(session) {
+            var public = {
+                processBulk: processBulk
+            };
+            return public;
+            function processBulk(bulk) {
+                var subparam1 = session();
+                function processOne(param1) {
+                    var param2 = {
+                        subparam1: subparam1
+                    };
+                    doProcessOne({
+                        param1: param1,
+                        param2: param2,
+                    }, function () {
+                        processBulk(bulk);
+                    });
+                };
+                if (bulk && bulk.length > 0)
+                    processOne(bulk.shift());
+            }
+            function doProcessOne(config, callback) {
+                console.log(JSON.stringify(config));
+                callback();
+            }
+        }
+        function1(function session() {
+            return 42;
+        }).processBulk([1, 2, 3]);
+    }
+    expect: {
+        function function1(o) {
+            return {
+                processBulk: function t(u) {
+                    var r = o();
+                    function n(n) {
+                        var o = {
+                            subparam1: r
+                        };
+                        c({
+                            param1: n,
+                            param2: o
+                        }, function() {
+                            t(u);
+                        });
+                    }
+                    u && u.length > 0 && n(u.shift());
+                }
+            };
+            function c(n, o) {
+                console.log(JSON.stringify(n));
+                o();
+            }
+        }
+        function1(function() {
+            return 42;
+        }).processBulk([ 1, 2, 3 ]);
+    }
+    expect_stdout: [
+        '{"param1":1,"param2":{"subparam1":42}}',
+        '{"param1":2,"param2":{"subparam1":42}}',
+        '{"param1":3,"param2":{"subparam1":42}}',
+    ]
+}
+
+issue_3297_3: {
+    options = {
+        collapse_vars: true,
+        comparisons: true,
+        conditionals: true,
+        inline: true,
+        join_vars: true,
+        passes: 3,
+        reduce_funcs: true,
+        reduce_vars: true,
+        sequences: true,
+        side_effects: true,
+        unused: true,
+    }
+    mangle = {}
+    input: {
+        function function1(session) {
+            var public = {
+                processBulk: processBulk
+            };
+            return public;
+            function processBulk(bulk) {
+                var subparam1 = session();
+                function processOne(param1) {
+                    var param2 = {
+                        subparam1: subparam1
+                    };
+                    doProcessOne({
+                        param1: param1,
+                        param2: param2,
+                    }, function () {
+                        processBulk(bulk);
+                    });
+                };
+                if (bulk && bulk.length > 0)
+                    processOne(bulk.shift());
+            }
+            function doProcessOne(config, callback) {
+                console.log(JSON.stringify(config));
+                callback();
+            }
+        }
+        function1(function session() {
+            return 42;
+        }).processBulk([1, 2, 3]);
+    }
+    expect: {
+        function function1(u) {
+            return {
+                processBulk: function n(r) {
+                    var o, t = u();
+                    r && 0 < r.length && (o = {
+                        param1: r.shift(),
+                        param2: {
+                            subparam1: t
+                        }
+                    },
+                    console.log(JSON.stringify(o)),
+                    n(r));
+                }
+            };
+        }
+        function1(function() {
+            return 42;
+        }).processBulk([ 1, 2, 3 ]);
+    }
+    expect_stdout: [
+        '{"param1":1,"param2":{"subparam1":42}}',
+        '{"param1":2,"param2":{"subparam1":42}}',
+        '{"param1":3,"param2":{"subparam1":42}}',
+    ]
+}
+
+cross_references_1: {
+    options = {
+        inline: true,
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        var Math = {
+            square: function(n) {
+                return n * n;
+            }
+        };
+        console.log((function(factory) {
+            return factory();
+        })(function() {
+            return function(Math) {
+                return function(n) {
+                    return Math.square(n);
+                };
+            }(Math);
+        })(3));
+    }
+    expect: {
+        var Math = {
+            square: function(n) {
+                return n * n;
+            }
+        };
+        console.log(function(Math) {
+            return function(n) {
+                return Math.square(n);
+            };
+        }(Math)(3));
+    }
+    expect_stdout: "9"
+}
+
+cross_references_2: {
+    options = {
+        collapse_vars: true,
+        evaluate: true,
+        hoist_props: true,
+        inline: true,
+        passes: 4,
+        pure_getters: true,
+        reduce_vars: true,
+        sequences: true,
+        side_effects: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        var Math = {
+            square: function(n) {
+                return n * n;
+            }
+        };
+        console.log((function(factory) {
+            return factory();
+        })(function() {
+            return function(Math) {
+                return function(n) {
+                    return Math.square(n);
+                };
+            }(Math);
+        })(3));
+    }
+    expect: {
+        console.log(9);
+    }
+    expect_stdout: "9"
+}
+
+cross_references_3: {
+    options = {
+        inline: true,
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        var Math = {
+            square: function(n) {
+                return n * n;
+            },
+            cube: function(n) {
+                return n * n * n;
+            }
+        };
+        console.log(function(factory) {
+            return factory();
+        }(function() {
+            return function(Math) {
+                return function(n) {
+                    Math = {
+                        square: function(x) {
+                            return "(SQUARE" + x + ")";
+                        },
+                        cube: function(x) {
+                            return "(CUBE" + x + ")";
+                        }
+                    };
+                    return Math.square(n) + Math.cube(n);
+                };
+            }(Math);
+        })(2));
+        console.log(Math.square(3), Math.cube(3));
+    }
+    expect: {
+        var Math = {
+            square: function(n) {
+                return n * n;
+            },
+            cube: function(n) {
+                return n * n * n;
+            }
+        };
+        console.log(function(Math) {
+            return function(n) {
+                Math = {
+                    square: function(x) {
+                        return "(SQUARE" + x + ")";
+                    },
+                    cube: function(x) {
+                        return "(CUBE" + x + ")";
+                    }
+                };
+                return Math.square(n) + Math.cube(n);
+            };
+        }(Math)(2));
+        console.log(Math.square(3), Math.cube(3));
+    }
+    expect_stdout: [
+        "(SQUARE2)(CUBE2)",
+        "9 27",
+    ]
+}
+
+loop_inline: {
+    options = {
+        inline: true,
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        console.log(function(o) {
+            function g(p) {
+                return o[p];
+            }
+            function h(q) {
+                while (g(q));
+            }
+            return h;
+        }([ 1, "foo", 0 ])(2));
+    }
+    expect: {
+        console.log(function(o) {
+            return function(q) {
+                while (p = q, o[p]);
+                var p;
+            };
+        }([ 1, "foo", 0 ])(2));
+    }
+    expect_stdout: "undefined"
+}

test/compress/global_defs.js

@@ -141,9 +141,8 @@ mixed: {
         console.log(CONFIG);
     }
     expect_warnings: [
-        "WARN: global_defs CONFIG.VALUE redefined [test/compress/global_defs.js:127,22]",
+        "WARN: global_defs CONFIG.VALUE redefined [test/compress/global_defs.js:4,22]",
-        "WARN: global_defs CONFIG.VALUE redefined [test/compress/global_defs.js:128,22]",
+        "WARN: global_defs CONFIG.VALUE redefined [test/compress/global_defs.js:7,8]",
-        "WARN: global_defs CONFIG.VALUE redefined [test/compress/global_defs.js:130,8]",
     ]
 }
 
@@ -197,3 +196,23 @@ issue_2167: {
         doWork();
     }
 }
+
+issue_3217: {
+    options = {
+        collapse_vars: true,
+        global_defs: {
+            "@o": "{fn:function(){var a=42;console.log(a)}}",
+        },
+        inline: true,
+        properties: true,
+        reduce_vars: true,
+        side_effects: true,
+        unused: true,
+    }
+    input: {
+        o.fn();
+    }
+    expect: {
+        console.log(42);
+    }
+}

test/compress/ie8.js

@@ -666,3 +666,306 @@ issue_3197_2_ie8: {
     }
     expect_stdout: "true"
 }
+
+issue_3206_1: {
+    options = {
+        evaluate: true,
+        ie8: false,
+        reduce_vars: true,
+        typeofs: true,
+        unused: true,
+    }
+    input: {
+        console.log(function() {
+            var foo = function bar() {};
+            var baz = function moo() {};
+            return "function" == typeof bar;
+        }());
+    }
+    expect: {
+        console.log(function() {
+            return "function" == typeof bar;
+        }());
+    }
+    expect_stdout: "false"
+}
+
+issue_3206_2: {
+    options = {
+        evaluate: true,
+        ie8: true,
+        reduce_vars: true,
+        typeofs: true,
+        unused: true,
+    }
+    input: {
+        console.log(function() {
+            var foo = function bar() {};
+            var baz = function moo() {};
+            return "function" == typeof bar;
+        }());
+    }
+    expect: {
+        console.log(function() {
+            (function bar() {});
+            return "function" == typeof bar;
+        }());
+    }
+    expect_stdout: "false"
+}
+
+issue_3215_1: {
+    mangle = {
+        ie8: false,
+    }
+    input: {
+        console.log(function foo() {
+            var bar = function bar(name) {
+                return "PASS";
+            };
+            try {
+                "moo";
+            } catch (e) {
+                bar = function bar(name) {
+                    return "FAIL";
+                };
+            }
+            return bar;
+        }()());
+    }
+    expect: {
+        console.log(function n() {
+            var o = function n(o) {
+                return "PASS";
+            };
+            try {
+                "moo";
+            } catch (n) {
+                o = function n(o) {
+                    return "FAIL";
+                };
+            }
+            return o;
+        }()());
+    }
+    expect_stdout: "PASS"
+}
+
+issue_3215_2: {
+    mangle = {
+        ie8: true,
+    }
+    input: {
+        console.log(function foo() {
+            var bar = function bar(name) {
+                return "PASS";
+            };
+            try {
+                "moo";
+            } catch (e) {
+                bar = function bar(name) {
+                    return "FAIL";
+                };
+            }
+            return bar;
+        }()());
+    }
+    expect: {
+        console.log(function foo() {
+            var o = function o(n) {
+                return "PASS";
+            };
+            try {
+                "moo";
+            } catch (n) {
+                o = function o(n) {
+                    return "FAIL";
+                };
+            }
+            return o;
+        }()());
+    }
+    expect_stdout: "PASS"
+}
+
+issue_3215_3: {
+    mangle = {
+        ie8: false,
+    }
+    input: {
+        console.log(function foo() {
+            var bar = function bar(name) {
+                return "FAIL";
+            };
+            try {
+                moo;
+            } catch (e) {
+                bar = function bar(name) {
+                    return "PASS";
+                };
+            }
+            return bar;
+        }()());
+    }
+    expect: {
+        console.log(function n() {
+            var o = function n(o) {
+                return "FAIL";
+            };
+            try {
+                moo;
+            } catch (n) {
+                o = function n(o) {
+                    return "PASS";
+                };
+            }
+            return o;
+        }()());
+    }
+    expect_stdout: "PASS"
+}
+
+issue_3215_4: {
+    mangle = {
+        ie8: true,
+    }
+    input: {
+        console.log(function foo() {
+            var bar = function bar(name) {
+                return "FAIL";
+            };
+            try {
+                moo;
+            } catch (e) {
+                bar = function bar(name) {
+                    return "PASS";
+                };
+            }
+            return bar;
+        }()());
+    }
+    expect: {
+        console.log(function foo() {
+            var o = function o(n) {
+                return "FAIL";
+            };
+            try {
+                moo;
+            } catch (n) {
+                o = function o(n) {
+                    return "PASS";
+                };
+            }
+            return o;
+        }()());
+    }
+    expect_stdout: "PASS"
+}
+
+issue_3355_1: {
+    mangle = {
+        ie8: false,
+    }
+    input: {
+        (function f() {
+            var f;
+        })();
+        (function g() {
+        })();
+        console.log(typeof f === typeof g);
+    }
+    expect: {
+        (function o() {
+            var o;
+        })();
+        (function o() {
+        })();
+        console.log(typeof f === typeof g);
+    }
+    expect_stdout: "true"
+}
+
+issue_3355_2: {
+    mangle = {
+        ie8: true,
+    }
+    input: {
+        (function f() {
+            var f;
+        })();
+        (function g() {
+        })();
+        console.log(typeof f === typeof g);
+    }
+    expect: {
+        (function f() {
+            var f;
+        })();
+        (function g() {
+        })();
+        console.log(typeof f === typeof g);
+    }
+    expect_stdout: "true"
+}
+
+issue_3355_3: {
+    mangle = {
+        ie8: false,
+    }
+    input: {
+        !function(a) {
+            "aaaaaaaaaa";
+            a();
+            var b = function c() {
+                var c = 42;
+                console.log("FAIL");
+            };
+        }(function() {
+            console.log("PASS");
+        });
+    }
+    expect: {
+        !function(a) {
+            "aaaaaaaaaa";
+            a();
+            var o = function a() {
+                var a = 42;
+                console.log("FAIL");
+            };
+        }(function() {
+            console.log("PASS");
+        });
+    }
+    expect_stdout: "PASS"
+}
+
+issue_3355_4: {
+    mangle = {
+        ie8: true,
+    }
+    input: {
+        !function(a) {
+            "aaaaaaaaaa";
+            a();
+            var b = function c() {
+                var c = 42;
+                console.log("FAIL");
+            };
+        }(function() {
+            console.log("PASS");
+        });
+    }
+    expect: {
+        !function(a) {
+            "aaaaaaaaaa";
+            a();
+            var o = function n() {
+                var n = 42;
+                console.log("FAIL");
+            };
+        }(function() {
+            console.log("PASS");
+        });
+    }
+    expect_stdout: "PASS"
+}

test/compress/if_return.js

@@ -396,3 +396,151 @@ if_if_return_return: {
         }
     }
 }
+
+if_body_return_1: {
+    options = {
+        if_return: true,
+    }
+    input: {
+        var c = "PASS";
+        function f(a, b) {
+            if (a) {
+                if (b) throw new Error(c);
+                return 42;
+            }
+            return true;
+        }
+        console.log(f(0, 0));
+        console.log(f(0, 1));
+        console.log(f(1, 0));
+        try {
+            f(1, 1);
+            console.log("FAIL");
+        } catch (e) {
+            console.log(e.message);
+        }
+    }
+    expect: {
+        var c = "PASS";
+        function f(a, b) {
+            if (a) {
+                if (b) throw new Error(c);
+                return 42;
+            }
+            return true;
+        }
+        console.log(f(0, 0));
+        console.log(f(0, 1));
+        console.log(f(1, 0));
+        try {
+            f(1, 1);
+            console.log("FAIL");
+        } catch (e) {
+            console.log(e.message);
+        }
+    }
+    expect_stdout: [
+        "true",
+        "true",
+        "42",
+        "PASS",
+    ]
+}
+
+if_body_return_2: {
+    options = {
+        if_return: true,
+    }
+    input: {
+        var c = "PASS";
+        function f(a, b) {
+            if (0 + a) {
+                if (b) throw new Error(c);
+                return 42;
+            }
+            return true;
+        }
+        console.log(f(0, 0));
+        console.log(f(0, 1));
+        console.log(f(1, 0));
+        try {
+            f(1, 1);
+            console.log("FAIL");
+        } catch (e) {
+            console.log(e.message);
+        }
+    }
+    expect: {
+        var c = "PASS";
+        function f(a, b) {
+            if (0 + a) {
+                if (b) throw new Error(c);
+                return 42;
+            }
+            return true;
+        }
+        console.log(f(0, 0));
+        console.log(f(0, 1));
+        console.log(f(1, 0));
+        try {
+            f(1, 1);
+            console.log("FAIL");
+        } catch (e) {
+            console.log(e.message);
+        }
+    }
+    expect_stdout: [
+        "true",
+        "true",
+        "42",
+        "PASS",
+    ]
+}
+
+if_body_return_3: {
+    options = {
+        if_return: true,
+    }
+    input: {
+        var c = "PASS";
+        function f(a, b) {
+            if (1 == a) {
+                if (b) throw new Error(c);
+                return 42;
+            }
+            return true;
+        }
+        console.log(f(0, 0));
+        console.log(f(0, 1));
+        console.log(f(1, 0));
+        try {
+            f(1, 1);
+            console.log("FAIL");
+        } catch (e) {
+            console.log(e.message);
+        }
+    }
+    expect: {
+        var c = "PASS";
+        function f(a, b) {
+            if (1 != a) return true;
+            if (b) throw new Error(c);
+            return 42;
+        }
+        console.log(f(0, 0));
+        console.log(f(0, 1));
+        console.log(f(1, 0));
+        try {
+            f(1, 1);
+            console.log("FAIL");
+        } catch (e) {
+            console.log(e.message);
+        }
+    }
+    expect_stdout: [
+        "true",
+        "true",
+        "42",
+        "PASS",
+    ]
+}

test/compress/issue-1034.js

@@ -36,10 +36,10 @@ non_hoisted_function_after_return: {
         }
     }
     expect_warnings: [
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:20,16]",
+        "WARN: Dropping unreachable code [test/compress/issue-1034.js:4,16]",
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:23,16]",
+        "WARN: Dropping unreachable code [test/compress/issue-1034.js:7,16]",
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:26,12]",
+        "WARN: Dropping unreachable code [test/compress/issue-1034.js:10,12]",
-        "WARN: Dropping unused function UnusedFunction [test/compress/issue-1034.js:27,21]"
+        "WARN: Dropping unused function UnusedFunction [test/compress/issue-1034.js:11,21]"
     ]
 }
 
@@ -85,18 +85,18 @@ non_hoisted_function_after_return_2a: {
         }
     }
     expect_warnings: [
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:68,16]",
+        "WARN: Dropping unreachable code [test/compress/issue-1034.js:4,16]",
-        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:68,16]",
+        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:4,16]",
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:71,16]",
+        "WARN: Dropping unreachable code [test/compress/issue-1034.js:7,16]",
-        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:71,16]",
+        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:7,16]",
-        "WARN: Dropping unused variable a [test/compress/issue-1034.js:68,20]",
+        "WARN: Dropping unused variable a [test/compress/issue-1034.js:4,20]",
-        "WARN: Dropping unused function nope [test/compress/issue-1034.js:75,21]",
+        "WARN: Dropping unused function nope [test/compress/issue-1034.js:11,21]",
         "WARN: pass 0: last_count: Infinity, count: 37",
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:73,12]",
+        "WARN: Dropping unreachable code [test/compress/issue-1034.js:9,12]",
-        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:73,12]",
+        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:9,12]",
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:76,12]",
+        "WARN: Dropping unreachable code [test/compress/issue-1034.js:12,12]",
-        "WARN: Dropping unused variable b [test/compress/issue-1034.js:71,20]",
+        "WARN: Dropping unused variable b [test/compress/issue-1034.js:7,20]",
-        "WARN: Dropping unused variable c [test/compress/issue-1034.js:73,16]",
+        "WARN: Dropping unused variable c [test/compress/issue-1034.js:9,16]",
         "WARN: pass 1: last_count: 37, count: 18",
     ]
 }
@@ -139,12 +139,11 @@ non_hoisted_function_after_return_2b: {
         }
     }
     expect_warnings: [
-        // duplicate warnings no longer emitted
+        "WARN: Dropping unreachable code [test/compress/issue-1034.js:6,16]",
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:126,16]",
+        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:6,16]",
-        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:126,16]",
+        "WARN: Dropping unreachable code [test/compress/issue-1034.js:8,12]",
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:128,12]",
+        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:8,12]",
-        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:128,12]",
+        "WARN: Dropping unreachable code [test/compress/issue-1034.js:12,12]",
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:132,12]",
     ]
 }
 
@@ -191,10 +190,10 @@ non_hoisted_function_after_return_strict: {
     }
     expect_stdout: "8 7"
     expect_warnings: [
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:171,16]",
+        "WARN: Dropping unreachable code [test/compress/issue-1034.js:5,16]",
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:174,16]",
+        "WARN: Dropping unreachable code [test/compress/issue-1034.js:8,16]",
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:177,12]",
+        "WARN: Dropping unreachable code [test/compress/issue-1034.js:11,12]",
-        "WARN: Dropping unused function UnusedFunction [test/compress/issue-1034.js:178,21]",
+        "WARN: Dropping unused function UnusedFunction [test/compress/issue-1034.js:12,21]",
     ]
 }
 
@@ -245,18 +244,18 @@ non_hoisted_function_after_return_2a_strict: {
     }
     expect_stdout: "5 6"
     expect_warnings: [
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:224,16]",
+        "WARN: Dropping unreachable code [test/compress/issue-1034.js:5,16]",
-        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:224,16]",
+        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:5,16]",
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:227,16]",
+        "WARN: Dropping unreachable code [test/compress/issue-1034.js:8,16]",
-        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:227,16]",
+        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:8,16]",
-        "WARN: Dropping unused variable a [test/compress/issue-1034.js:224,20]",
+        "WARN: Dropping unused variable a [test/compress/issue-1034.js:5,20]",
-        "WARN: Dropping unused function nope [test/compress/issue-1034.js:231,21]",
+        "WARN: Dropping unused function nope [test/compress/issue-1034.js:12,21]",
         "WARN: pass 0: last_count: Infinity, count: 48",
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:229,12]",
+        "WARN: Dropping unreachable code [test/compress/issue-1034.js:10,12]",
-        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:229,12]",
+        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:10,12]",
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:232,12]",
+        "WARN: Dropping unreachable code [test/compress/issue-1034.js:13,12]",
-        "WARN: Dropping unused variable b [test/compress/issue-1034.js:227,20]",
+        "WARN: Dropping unused variable b [test/compress/issue-1034.js:8,20]",
-        "WARN: Dropping unused variable c [test/compress/issue-1034.js:229,16]",
+        "WARN: Dropping unused variable c [test/compress/issue-1034.js:10,16]",
         "WARN: pass 1: last_count: 48, count: 29",
     ]
 }
@@ -304,11 +303,10 @@ non_hoisted_function_after_return_2b_strict: {
     }
     expect_stdout: "5 6"
     expect_warnings: [
-        // duplicate warnings no longer emitted
+        "WARN: Dropping unreachable code [test/compress/issue-1034.js:7,16]",
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:287,16]",
+        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:7,16]",
-        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:287,16]",
+        "WARN: Dropping unreachable code [test/compress/issue-1034.js:9,12]",
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:289,12]",
+        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:9,12]",
-        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:289,12]",
+        "WARN: Dropping unreachable code [test/compress/issue-1034.js:13,12]",
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:293,12]",
     ]
 }

test/compress/issue-1261.js

@@ -48,13 +48,13 @@ pure_function_calls: {
         a.b(), f.g();
     }
     expect_warnings: [
-        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:16,8]",
+        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:3,8]",
-        "WARN: Dropping side-effect-free statement [test/compress/issue-1261.js:16,8]",
+        "WARN: Dropping side-effect-free statement [test/compress/issue-1261.js:3,8]",
-        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:29,37]",
+        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:16,37]",
-        "WARN: Dropping unused variable iife2 [test/compress/issue-1261.js:29,16]",
+        "WARN: Dropping unused variable iife2 [test/compress/issue-1261.js:16,16]",
-        "WARN: Dropping side-effect-free statement [test/compress/issue-1261.js:27,8]",
+        "WARN: Dropping side-effect-free statement [test/compress/issue-1261.js:14,8]",
-        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:37,8]",
+        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:24,8]",
-        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:38,31]",
+        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:25,31]",
     ]
 }
 
@@ -110,17 +110,17 @@ pure_function_calls_toplevel: {
         a.b(), f.g();
     }
     expect_warnings: [
-        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:77,8]",
+        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:3,8]",
-        "WARN: Dropping side-effect-free statement [test/compress/issue-1261.js:77,8]",
+        "WARN: Dropping side-effect-free statement [test/compress/issue-1261.js:3,8]",
-        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:90,37]",
+        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:16,37]",
-        "WARN: Dropping unused variable iife2 [test/compress/issue-1261.js:90,16]",
+        "WARN: Dropping unused variable iife2 [test/compress/issue-1261.js:16,16]",
-        "WARN: Dropping side-effect-free statement [test/compress/issue-1261.js:88,8]",
+        "WARN: Dropping side-effect-free statement [test/compress/issue-1261.js:14,8]",
-        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:105,8]",
+        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:31,8]",
-        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:106,31]",
+        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:32,31]",
-        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:82,33]",
+        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:8,33]",
-        "WARN: Dropping unused variable iife1 [test/compress/issue-1261.js:82,12]",
+        "WARN: Dropping unused variable iife1 [test/compress/issue-1261.js:8,12]",
-        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:98,45]",
+        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:24,45]",
-        "WARN: Dropping unused variable MyClass [test/compress/issue-1261.js:98,12]",
+        "WARN: Dropping unused variable MyClass [test/compress/issue-1261.js:24,12]",
     ]
 }
 
@@ -155,29 +155,29 @@ should_warn: {
         baz();
     }
     expect_warnings: [
-        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:135,61]",
+        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:1,61]",
-        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:135,23]",
+        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:1,23]",
-        "WARN: Dropping side-effect-free statement [test/compress/issue-1261.js:135,23]",
+        "WARN: Dropping side-effect-free statement [test/compress/issue-1261.js:1,23]",
-        "WARN: Boolean || always true [test/compress/issue-1261.js:136,23]",
+        "WARN: Boolean || always true [test/compress/issue-1261.js:2,23]",
-        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:136,23]",
+        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:2,23]",
-        "WARN: Condition always true [test/compress/issue-1261.js:136,23]",
+        "WARN: Condition always true [test/compress/issue-1261.js:2,23]",
-        "WARN: Condition left of || always true [test/compress/issue-1261.js:137,8]",
+        "WARN: Condition left of || always true [test/compress/issue-1261.js:3,8]",
-        "WARN: Condition always true [test/compress/issue-1261.js:137,8]",
+        "WARN: Condition always true [test/compress/issue-1261.js:3,8]",
-        "WARN: Boolean && always false [test/compress/issue-1261.js:138,23]",
+        "WARN: Boolean && always false [test/compress/issue-1261.js:4,23]",
-        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:138,23]",
+        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:4,23]",
-        "WARN: Condition always false [test/compress/issue-1261.js:138,23]",
+        "WARN: Condition always false [test/compress/issue-1261.js:4,23]",
-        "WARN: Condition left of && always false [test/compress/issue-1261.js:139,8]",
+        "WARN: Condition left of && always false [test/compress/issue-1261.js:5,8]",
-        "WARN: Condition always false [test/compress/issue-1261.js:139,8]",
+        "WARN: Condition always false [test/compress/issue-1261.js:5,8]",
-        "WARN: + in boolean context always true [test/compress/issue-1261.js:140,23]",
+        "WARN: + in boolean context always true [test/compress/issue-1261.js:6,23]",
-        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:140,23]",
+        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:6,23]",
-        "WARN: Condition always true [test/compress/issue-1261.js:140,23]",
+        "WARN: Condition always true [test/compress/issue-1261.js:6,23]",
-        "WARN: + in boolean context always true [test/compress/issue-1261.js:141,8]",
+        "WARN: + in boolean context always true [test/compress/issue-1261.js:7,8]",
-        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:141,31]",
+        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:7,31]",
-        "WARN: Condition always true [test/compress/issue-1261.js:141,8]",
+        "WARN: Condition always true [test/compress/issue-1261.js:7,8]",
-        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:142,23]",
+        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:8,23]",
-        "WARN: Condition always true [test/compress/issue-1261.js:143,8]",
+        "WARN: Condition always true [test/compress/issue-1261.js:9,8]",
-        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:143,24]",
+        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:9,24]",
-        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:144,31]",
+        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:10,31]",
-        "WARN: Condition always false [test/compress/issue-1261.js:144,8]",
+        "WARN: Condition always false [test/compress/issue-1261.js:10,8]",
     ]
 }

test/compress/issue-208.js

@@ -64,11 +64,11 @@ mixed: {
         x = 0;
     }
     expect_warnings: [
-        "WARN: global_defs ENV redefined [test/compress/issue-208.js:45,12]",
+        "WARN: global_defs ENV redefined [test/compress/issue-208.js:1,12]",
-        "WARN: global_defs FOO redefined [test/compress/issue-208.js:46,12]",
+        "WARN: global_defs FOO redefined [test/compress/issue-208.js:2,12]",
-        "WARN: global_defs FOO redefined [test/compress/issue-208.js:48,10]",
+        "WARN: global_defs FOO redefined [test/compress/issue-208.js:4,10]",
-        "WARN: global_defs DEBUG redefined [test/compress/issue-208.js:49,8]",
+        "WARN: global_defs DEBUG redefined [test/compress/issue-208.js:5,8]",
-        "WARN: global_defs DEBUG redefined [test/compress/issue-208.js:50,8]",
+        "WARN: global_defs DEBUG redefined [test/compress/issue-208.js:6,8]",
-        "WARN: global_defs DEBUG redefined [test/compress/issue-208.js:51,8]",
+        "WARN: global_defs DEBUG redefined [test/compress/issue-208.js:7,8]",
     ]
 }

test/compress/issue-269.js

@@ -93,6 +93,6 @@ regexp: {
 		RegExp("should", "fail");
 	}
 	expect_warnings: [
-		'WARN: Error converting RegExp("should","fail") [test/compress/issue-269.js:86,2]',
+		'WARN: Error converting RegExp("should","fail") [test/compress/issue-269.js:5,2]',
 	]
 }

test/compress/issue-2719.js

@@ -26,7 +26,7 @@ warn: {
         }().length);
     }
     expect_warnings: [
-        "WARN: Function.protoype.caller not supported [test/compress/issue-2719.js:17,19]",
+        "WARN: Function.prototype.caller not supported [test/compress/issue-2719.js:5,19]",
-        "WARN: Function.protoype.arguments not supported [test/compress/issue-2719.js:17,19]",
+        "WARN: Function.prototype.arguments not supported [test/compress/issue-2719.js:5,19]",
     ]
 }

test/compress/preserve_line.js

@@ -0,0 +1,181 @@
+return_1: {
+    beautify = {
+        beautify: false,
+        preserve_line: true,
+    }
+    input: {
+        console.log(function f() {
+            return (
+                f.toString() != 42
+            );
+        }());
+    }
+    expect_exact: [
+        "console.log(function f(){",
+        "",
+        "return 42!=f.toString()}());",
+    ]
+    expect_stdout: "true"
+}
+
+return_2: {
+    beautify = {
+        beautify: true,
+        preserve_line: true,
+    }
+    input: {
+        console.log(function f() {
+            return (
+                f.toString() != 42
+            );
+        }());
+    }
+    expect_exact: [
+        "console.log(function f() {",
+        "",
+        "    return 42 != f.toString();",
+        "}());",
+    ]
+    expect_stdout: "true"
+}
+
+return_3: {
+    options = {}
+    beautify = {
+        beautify: false,
+        preserve_line: true,
+    }
+    input: {
+        console.log(function f() {
+            return (
+                f.toString() != 42
+            );
+        }());
+    }
+    expect_exact: [
+        "console.log(function f(){",
+        "",
+        "return 42!=f.toString()}());",
+    ]
+    expect_stdout: "true"
+}
+
+return_4: {
+    options = {}
+    beautify = {
+        beautify: true,
+        preserve_line: true,
+    }
+    input: {
+        console.log(function f() {
+            return (
+                f.toString() != 42
+            );
+        }());
+    }
+    expect_exact: [
+        "console.log(function f() {",
+        "",
+        "    return 42 != f.toString();",
+        "}());",
+    ]
+    expect_stdout: "true"
+}
+
+return_5: {
+    beautify = {
+        beautify: false,
+        preserve_line: true,
+    }
+    input: {
+        _is_selected = function(tags, slug) {
+            var ref;
+            return (ref = _.find(tags, {
+                slug: slug
+            })) != null ? ref.selected : void 0;
+        };
+    }
+    expect_exact: [
+        "_is_selected=function(tags,slug){",
+        "var ref",
+        "",
+        "",
+        ";return null!=(ref=_.find(tags,{slug:slug}))?ref.selected:void 0};",
+    ]
+}
+
+return_6: {
+    beautify = {
+        beautify: true,
+        preserve_line: true,
+    }
+    input: {
+        _is_selected = function(tags, slug) {
+            var ref;
+            return (ref = _.find(tags, {
+                slug: slug
+            })) != null ? ref.selected : void 0;
+        };
+    }
+    expect_exact: [
+        "_is_selected = function(tags, slug) {",
+        "    var ref;",
+        "",
+        "",
+        "    return null != (ref = _.find(tags, {",
+        "        slug: slug",
+        "    })) ? ref.selected : void 0;",
+        "};",
+    ]
+}
+
+return_7: {
+    options = {}
+    mangle = {}
+    beautify = {
+        beautify: false,
+        preserve_line: true,
+    }
+    input: {
+        _is_selected = function(tags, slug) {
+            var ref;
+            return (ref = _.find(tags, {
+                slug: slug
+            })) != null ? ref.selected : void 0;
+        };
+    }
+    expect_exact: [
+        "_is_selected=function(e,l){",
+        "var n",
+        "",
+        "",
+        ";return null!=(n=_.find(e,{slug:l}))?n.selected:void 0};",
+    ]
+}
+
+return_8: {
+    options = {}
+    mangle = {}
+    beautify = {
+        beautify: true,
+        preserve_line: true,
+    }
+    input: {
+        _is_selected = function(tags, slug) {
+            var ref;
+            return (ref = _.find(tags, {
+                slug: slug
+            })) != null ? ref.selected : void 0;
+        };
+    }
+    expect_exact: [
+        "_is_selected = function(e, l) {",
+        "    var n;",
+        "",
+        "",
+        "    return null != (n = _.find(e, {",
+        "        slug: l",
+        "    })) ? n.selected : void 0;",
+        "};",
+    ]
+}

test/compress/properties.js

@@ -1832,3 +1832,33 @@ issue_3188_3: {
     }
     expect_stdout: "PASS"
 }
+
+join_expr: {
+    options = {
+        evaluate: true,
+        join_vars: true,
+    }
+    input: {
+        var c = "FAIL";
+        (function() {
+            var a = 0;
+            switch ((a = {}) && (a.b = 0)) {
+              case 0:
+                c = "PASS";
+            }
+        })();
+        console.log(c);
+    }
+    expect: {
+        var c = "FAIL";
+        (function() {
+            var a = 0;
+            switch (a = { b: 0 }, a.b) {
+              case 0:
+                c = "PASS";
+            }
+        })();
+        console.log(c);
+    }
+    expect_stdout: "PASS"
+}

test/compress/pure_funcs.js

@@ -642,3 +642,41 @@ issue_3065_4: {
         })();
     }
 }
+
+issue_3325_1: {
+    options = {
+        pure_funcs: "cb",
+        side_effects: true,
+    }
+    input: {
+        function cb() {
+            console.log("PASS");
+        }
+        cb();
+    }
+    expect: {
+        function cb() {
+            console.log("PASS");
+        }
+    }
+}
+
+issue_3325_2: {
+    options = {
+        pure_funcs: "xxxcbxxx",
+        side_effects: true,
+    }
+    input: {
+        function cb() {
+            console.log("PASS");
+        }
+        cb();
+    }
+    expect: {
+        function cb() {
+            console.log("PASS");
+        }
+        cb();
+    }
+    expect_stdout: "PASS"
+}

test/compress/reduce_vars.js

@@ -2740,18 +2740,18 @@ issue_1814_2: {
         !function() {
             var b = a + 1;
             !function(a) {
-                console.log(a++, b);
+                console.log(b, a++);
             }(0);
         }();
     }
     expect: {
         !function() {
             !function(a) {
-                console.log(a++, "321");
+                console.log("321", a++);
             }(0);
         }();
     }
-    expect_stdout: "0 '321'"
+    expect_stdout: "321 0"
 }
 
 try_abort: {
@@ -5231,11 +5231,11 @@ defun_catch_4: {
         try {
             throw 42;
         } catch (a) {
-            function a() {}
             console.log(a);
         }
     }
-    expect_stdout: true
+    expect_stdout: "42"
+    node_version: "<=4"
 }
 
 defun_catch_5: {
@@ -5257,10 +5257,10 @@ defun_catch_5: {
             throw 42;
         } catch (a) {
             console.log(a);
-            function a() {}
         }
     }
-    expect_stdout: true
+    expect_stdout: "42"
+    node_version: "<=4"
 }
 
 defun_catch_6: {
@@ -5354,6 +5354,7 @@ issue_2774: {
 
 issue_2799_1: {
     options = {
+        passes: 2,
         reduce_funcs: true,
         reduce_vars: true,
         unused: true,
@@ -6429,3 +6430,310 @@ issue_3140_5: {
     }
     expect_stdout: "1"
 }
+
+issue_3240_1: {
+    options = {
+        reduce_funcs: true,
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        (function() {
+            f(1);
+            function f(a) {
+                console.log(a);
+                var g = function() {
+                    f(a - 1);
+                };
+                if (a) g();
+            }
+        })();
+    }
+    expect: {
+        (function() {
+            (function f(a) {
+                console.log(a);
+                var g = function() {
+                    f(a - 1);
+                };
+                if (a) g();
+            })(1);
+        })();
+    }
+    expect_stdout: [
+        "1",
+        "0",
+    ]
+}
+
+issue_3240_2: {
+    options = {
+        passes: 2,
+        reduce_funcs: true,
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        (function() {
+            f(1);
+            function f(a) {
+                console.log(a);
+                var g = function() {
+                    f(a - 1);
+                };
+                if (a) g();
+            }
+        })();
+    }
+    expect: {
+        (function() {
+            (function f(a) {
+                console.log(a);
+                if (a) (function() {
+                    f(a - 1);
+                })();
+            })(1);
+        })();
+    }
+    expect_stdout: [
+        "1",
+        "0",
+    ]
+}
+
+issue_3240_3: {
+    options = {
+        reduce_funcs: true,
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        (function() {
+            f();
+            function f(b) {
+                if (!f.a) f.a = 0;
+                console.log(f.a.toString());
+                var g = function() {
+                    (b ? function() {} : function() {
+                        f.a++;
+                        f(1);
+                    })();
+                };
+                g();
+            }
+        })();
+    }
+    expect: {
+        (function() {
+            (function f(b) {
+                if (!f.a) f.a = 0;
+                console.log(f.a.toString());
+                var g = function() {
+                    (b ? function() {} : function() {
+                        f.a++;
+                        f(1);
+                    })();
+                };
+                g();
+            })();
+        })();
+    }
+    expect_stdout: [
+        "0",
+        "1",
+    ]
+}
+
+issue_3240_4: {
+    options = {
+        passes: 2,
+        reduce_funcs: true,
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        (function() {
+            f();
+            function f(b) {
+                if (!f.a) f.a = 0;
+                console.log(f.a.toString());
+                var g = function() {
+                    (b ? function() {} : function() {
+                        f.a++;
+                        f(1);
+                    })();
+                };
+                g();
+            }
+        })();
+    }
+    expect: {
+        (function() {
+            (function f(b) {
+                if (!f.a) f.a = 0;
+                console.log(f.a.toString());
+                (function() {
+                    (b ? function() {} : function() {
+                        f.a++;
+                        f(1);
+                    })();
+                })();
+            })();
+        })();
+    }
+    expect_stdout: [
+        "0",
+        "1",
+    ]
+}
+
+issues_3267_1: {
+    options = {
+        collapse_vars: true,
+        conditionals: true,
+        dead_code: true,
+        evaluate: true,
+        inline: true,
+        reduce_vars: true,
+        sequences: true,
+        side_effects: true,
+        unused: true,
+    }
+    input: {
+        (function(x) {
+            x();
+        })(function() {
+            (function(i) {
+                if (i)
+                    return console.log("PASS");
+                throw "FAIL";
+            })(Object());
+        });
+    }
+    expect: {
+        !function(i) {
+            if (i)
+                return console.log("PASS");
+            throw "FAIL";
+        }(Object());
+    }
+    expect_stdout: "PASS"
+}
+
+issues_3267_2: {
+    options = {
+        collapse_vars: true,
+        conditionals: true,
+        dead_code: true,
+        evaluate: true,
+        inline: true,
+        keep_fargs: false,
+        passes: 2,
+        reduce_vars: true,
+        sequences: true,
+        side_effects: true,
+        unused: true,
+    }
+    input: {
+        (function(x) {
+            x();
+        })(function() {
+            (function(i) {
+                if (i)
+                    return console.log("PASS");
+                throw "FAIL";
+            })(Object());
+        });
+    }
+    expect: {
+        !function() {
+            if (Object())
+                return console.log("PASS");
+            throw "FAIL";
+        }();
+    }
+    expect_stdout: "PASS"
+}
+
+issues_3267_3: {
+    options = {
+        collapse_vars: true,
+        conditionals: true,
+        dead_code: true,
+        evaluate: true,
+        inline: true,
+        keep_fargs: false,
+        passes: 2,
+        reduce_vars: true,
+        sequences: true,
+        side_effects: true,
+        unsafe: true,
+        unused: true,
+    }
+    input: {
+        (function(x) {
+            x();
+        })(function() {
+            (function(i) {
+                if (i)
+                    return console.log("PASS");
+                throw "FAIL";
+            })(Object());
+        });
+    }
+    expect: {
+        console.log("PASS");
+    }
+    expect_stdout: "PASS"
+}
+
+issue_3297: {
+    options = {
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        (function() {
+            function f() {
+                var a;
+                var b = function a() {
+                    console.log(a === b) && f();
+                };
+                b();
+            }
+            f();
+        })();
+    }
+    expect: {
+        (function() {
+            (function f() {
+                var b = function a() {
+                    console.log(a === b) && f();
+                };
+                b();
+            })();
+        })();
+    }
+    expect_stdout: "true"
+}
+
+drop_side_effect_free: {
+    options = {
+        collapse_vars: true,
+        evaluate: true,
+        reduce_vars: true,
+        side_effects: true,
+        toplevel: true,
+    }
+    input: {
+        var a = 123;
+        "" + (a && (a.b = 0) || a);
+        console.log(a);
+    }
+    expect: {
+        var a = 123;
+        a.b = 0;
+        console.log(a);
+    }
+    expect_stdout: "123"
+}

test/compress/rename.js

@@ -534,3 +534,80 @@ function_catch_catch_ie8: {
         "undefined",
     ]
 }
+
+function_do_catch_ie8: {
+    rename = true
+    options = {
+        ie8: true,
+        side_effects: true,
+        unused: true,
+    }
+    mangle = {
+        ie8: true,
+        toplevel: true,
+    }
+    input: {
+        var a = 1, b = 1, c = 0;
+        function d(e) {
+            var f, g, h, i;
+            do {
+                try {
+                    try {
+                        var j = function q(){}();
+                    } catch (r) {
+                        --a && w("ddddddddeeeeeeegggggggggiiiiilllllllnnnnntuuuuuuuuyyyyyyy");
+                        var k, l, m, n, o;
+                        --m;
+                        --n;
+                        --o;
+                    }
+                    try {
+                        i[1];
+                    } catch (s) {
+                        var p;
+                        switch (function t() {
+                            c++;
+                        }()) {
+                          case j + --p:
+                        }
+                    }
+                } catch (u) {}
+            } while (--i);
+            b--;
+        }
+        d();
+        console.log(b, c);
+    }
+    expect: {
+        var t = 1, u = 1, y = 0;
+        function c(c) {
+            var d;
+            do {
+                try {
+                    try {
+                        var e = void 0;
+                    } catch (i) {
+                        --t && w("ddddddddeeeeeeegggggggggiiiiilllllllnnnnntuuuuuuuuyyyyyyy");
+                        0;
+                        0;
+                        0;
+                    }
+                    try {
+                        d[1];
+                    } catch (l) {
+                        var g;
+                        switch(function x() {
+                            y++;
+                        }()) {
+                          case e + --g:
+                        }
+                    }
+                } catch (n) {}
+            } while (--d);
+            u--;
+        }
+        c();
+        console.log(u, y);
+    }
+    expect_stdout: "0 1"
+}

test/compress/sequences.js

@@ -924,14 +924,14 @@ call: {
         b.c = function() {
             console.log(this === b ? "bar" : "baz");
         },
-        a, b(),
+        b(),
         (a, b.c)(),
-        a, function() {
+        function() {
             console.log(this === a);
         }(),
-        a, new b(),
+        new b(),
-        a, new b.c(),
+        new b.c(),
-        a, new function() {
+        new function() {
             console.log(this === a);
         }();
     }
@@ -944,3 +944,23 @@ call: {
         "false",
     ]
 }
+
+missing_link: {
+    options = {
+        conditionals: true,
+        evaluate: true,
+        sequences: true,
+    }
+    input: {
+        var a = 100;
+        a;
+        a++ + (0 ? 2 : 1);
+        console.log(a);
+    }
+    expect: {
+        var a = 100;
+        a,
+        a++,
+        console.log(a);
+    }
+}

test/compress/webkit.js

@@ -0,0 +1,109 @@
+lambda_call_dot_assign: {
+    beautify = {
+        webkit: false,
+    }
+    input: {
+        console.log(function() {
+            return {};
+        }().a = 1);
+    }
+    expect_exact: "console.log(function(){return{}}().a=1);"
+    expect_stdout: "1"
+}
+
+lambda_call_dot_assign_webkit: {
+    beautify = {
+        webkit: true,
+    }
+    input: {
+        console.log(function() {
+            return {};
+        }().a = 1);
+    }
+    expect_exact: "console.log((function(){return{}}()).a=1);"
+    expect_stdout: "1"
+}
+
+lambda_dot_assign: {
+    beautify = {
+        webkit: false,
+    }
+    input: {
+        console.log(function() {
+            1 + 1;
+        }.a = 1);
+    }
+    expect_exact: "console.log(function(){1+1}.a=1);"
+    expect_stdout: "1"
+}
+
+lambda_dot_assign_webkit: {
+    beautify = {
+        webkit: true,
+    }
+    input: {
+        console.log(function() {
+            1 + 1;
+        }.a = 1);
+    }
+    expect_exact: "console.log((function(){1+1}).a=1);"
+    expect_stdout: "1"
+}
+
+lambda_name_mangle: {
+    mangle = {}
+    input: {
+        console.log(typeof function foo(bar) {});
+    }
+    expect_exact: "console.log(typeof function o(n){});"
+    expect_stdout: "function"
+}
+
+lambda_name_mangle_ie8: {
+    mangle = {
+        ie8: true,
+        toplevel: true,
+    }
+    input: {
+        console.log(typeof function foo(bar) {});
+    }
+    expect_exact: "console.log(typeof function n(o){});"
+    expect_stdout: "function"
+}
+
+function_name_mangle: {
+    options = {
+        keep_fnames: true,
+        reduce_vars: true,
+        unused: true,
+    }
+    mangle = {}
+    input: {
+        (function() {
+            function foo(bar) {}
+            console.log(typeof foo);
+        })();
+    }
+    expect_exact: "(function(){console.log(typeof function o(n){})})();"
+    expect_stdout: "function"
+}
+
+function_name_mangle_ie8: {
+    options = {
+        keep_fnames: true,
+        reduce_vars: true,
+        unused: true,
+    }
+    mangle = {
+        ie8: true,
+        toplevel: true,
+    }
+    input: {
+        (function() {
+            function foo(bar) {}
+            console.log(typeof foo);
+        })();
+    }
+    expect_exact: "(function(){console.log(typeof function n(o){})})();"
+    expect_stdout: "function"
+}

test/exports.js

@@ -1,14 +1,16 @@
-exports["Compressor"] = Compressor;
-exports["JS_Parse_Error"] = JS_Parse_Error;
-exports["OutputStream"] = OutputStream;
-exports["SourceMap"] = SourceMap;
-exports["TreeWalker"] = TreeWalker;
 exports["base54"] = base54;
+exports["Compressor"] = Compressor;
 exports["defaults"] = defaults;
+exports["is_identifier"] = is_identifier;
+exports["JS_Parse_Error"] = JS_Parse_Error;
 exports["mangle_properties"] = mangle_properties;
 exports["minify"] = minify;
+exports["OutputStream"] = OutputStream;
 exports["parse"] = parse;
+exports["push_uniq"] = push_uniq;
 exports["reserve_quoted_keys"] = reserve_quoted_keys;
+exports["SourceMap"] = SourceMap;
 exports["string_template"] = string_template;
 exports["tokenizer"] = tokenizer;
-exports["is_identifier"] = is_identifier;
+exports["TreeTransformer"] = TreeTransformer;
+exports["TreeWalker"] = TreeWalker;

test/fetch.js

@@ -23,10 +23,9 @@ module.exports = function(url, callback) {
         var options = parse(url);
         options.rejectUnauthorized = false;
         require(options.protocol.slice(0, -1)).get(options, function(res) {
-            if (res.statusCode !== 200) return callback(res);
+            if (res.statusCode !== 200) return callback(res.statusCode);
-            res.pipe(fs.createWriteStream(local(url)).on("close", function() {
+            res.pipe(fs.createWriteStream(local(url)));
-                callback(null, read(url));
+            callback(null, res);
-            }));
         });
     }).on("open", function() {
         callback(null, result);

test/input/issue-3315/config.json

@@ -0,0 +1,8 @@
+{
+    "compress": false,
+    "mangle": {
+        "properties": {
+            "regex": "/^_/"
+        }
+    }
+}

test/input/issue-3315/input.js

@@ -0,0 +1,8 @@
+function f() {
+    "aaaaaaaaaa";
+    var o = {
+        prop: 1,
+        _int: 2,
+    };
+    return o.prop + o._int;
+}

test/jetstream.js

@@ -25,30 +25,35 @@ if (typeof phantom == "undefined") {
         request.resume();
         var url = site + request.url;
         fetch(url, function(err, res) {
-            if (err) throw err;
+            if (err) {
-            response.writeHead(200, {
+                if (typeof err != "number") throw err;
-                "Content-Type": {
+                response.writeHead(err);
-                    css: "text/css",
+                response.end();
-                    js: "application/javascript",
-                    png: "image/png"
-                }[url.slice(url.lastIndexOf(".") + 1)] || "text/html; charset=utf-8"
-            });
-            if (/\.js$/.test(url)) {
-                var stderr = "";
-                var uglifyjs = child_process.fork("bin/uglifyjs", args, {
-                    silent: true
-                }).on("exit", function(code) {
-                    console.log("uglifyjs", url.slice(site.length + 1), args.join(" "));
-                    console.log(stderr);
-                    if (code) throw new Error("uglifyjs failed with code " + code);
-                });
-                uglifyjs.stderr.on("data", function(data) {
-                    stderr += data;
-                }).setEncoding("utf8");
-                uglifyjs.stdout.pipe(response);
-                res.pipe(uglifyjs.stdin);
             } else {
-                res.pipe(response);
+                response.writeHead(200, {
+                    "Content-Type": {
+                        css: "text/css",
+                        js: "application/javascript",
+                        png: "image/png"
+                    }[url.slice(url.lastIndexOf(".") + 1)] || "text/html; charset=utf-8"
+                });
+                if (/\.js$/.test(url)) {
+                    var stderr = "";
+                    var uglifyjs = child_process.fork("bin/uglifyjs", args, {
+                        silent: true
+                    }).on("exit", function(code) {
+                        console.log("uglifyjs", url.slice(site.length + 1), args.join(" "));
+                        console.log(stderr);
+                        if (code) throw new Error("uglifyjs failed with code " + code);
+                    });
+                    uglifyjs.stderr.on("data", function(data) {
+                        stderr += data;
+                    }).setEncoding("utf8");
+                    uglifyjs.stdout.pipe(response);
+                    res.pipe(uglifyjs.stdin);
+                } else {
+                    res.pipe(response);
+                }
             }
         });
     }).listen();

test/mocha/cli.js

@@ -1,6 +1,7 @@
 var assert = require("assert");
 var exec = require("child_process").exec;
 var fs = require("fs");
+var run_code = require("../sandbox").run_code;
 
 function read(path) {
     return fs.readFileSync(path, "utf8");
@@ -257,7 +258,7 @@ describe("bin/uglifyjs", function() {
             assert.strictEqual(lines[0], "Parse error at test/input/invalid/simple.js:1,12");
             assert.strictEqual(lines[1], "function f(a{}");
             assert.strictEqual(lines[2], "            ^");
-            assert.strictEqual(lines[3], "ERROR: Unexpected token punc «{», expected punc «,»");
+            assert.strictEqual(lines[3], "ERROR: Unexpected token: punc «{», expected: punc «,»");
             done();
         });
     });
@@ -281,7 +282,7 @@ describe("bin/uglifyjs", function() {
             assert.strictEqual(lines[0], "Parse error at test/input/invalid/eof.js:2,0");
             assert.strictEqual(lines[1], "foo, bar(");
             assert.strictEqual(lines[2], "         ^");
-            assert.strictEqual(lines[3], "ERROR: Unexpected token: eof (undefined)");
+            assert.strictEqual(lines[3], "ERROR: Unexpected token: eof");
             done();
         });
     });
@@ -293,7 +294,7 @@ describe("bin/uglifyjs", function() {
             assert.strictEqual(lines[0], "Parse error at test/input/invalid/loop-no-body.js:2,0");
             assert.strictEqual(lines[1], "for (var i = 0; i < 1; i++) ");
             assert.strictEqual(lines[2], "                            ^");
-            assert.strictEqual(lines[3], "ERROR: Unexpected token: eof (undefined)");
+            assert.strictEqual(lines[3], "ERROR: Unexpected token: eof");
             done();
         });
     });
@@ -362,7 +363,7 @@ describe("bin/uglifyjs", function() {
                 "Parse error at test/input/invalid/dot_1.js:1,2",
                 "a.=",
                 "  ^",
-                "ERROR: Unexpected token: operator (=)"
+                "ERROR: Unexpected token: operator «=», expected: name"
             ].join("\n"));
             done();
         });
@@ -376,7 +377,7 @@ describe("bin/uglifyjs", function() {
                 "Parse error at test/input/invalid/dot_2.js:1,0",
                 "%.a;",
                 "^",
-                "ERROR: Unexpected token: operator (%)"
+                "ERROR: Unexpected token: operator «%»"
             ].join("\n"));
             done();
         });
@@ -390,7 +391,7 @@ describe("bin/uglifyjs", function() {
                 "Parse error at test/input/invalid/dot_3.js:1,2",
                 "a./();",
                 "  ^",
-                "ERROR: Unexpected token: operator (/)"
+                "ERROR: Unexpected token: operator «/», expected: name"
             ].join("\n"));
             done();
         });
@@ -404,7 +405,7 @@ describe("bin/uglifyjs", function() {
                 "Parse error at test/input/invalid/object.js:1,13",
                 "console.log({%: 1});",
                 "             ^",
-                "ERROR: Unexpected token: operator (%)"
+                "ERROR: Unexpected token: operator «%»"
             ].join("\n"));
             done();
         });
@@ -502,7 +503,7 @@ describe("bin/uglifyjs", function() {
                 "Parse error at test/input/invalid/else.js:1,7",
                 "if (0) else 1;",
                 "       ^",
-                "ERROR: Unexpected token: keyword (else)"
+                "ERROR: Unexpected token: keyword «else»"
             ].join("\n"));
             done();
         });
@@ -633,6 +634,14 @@ describe("bin/uglifyjs", function() {
             done();
         });
     });
+    it("Should work with mangle.properties.regex from --config-file", function(done) {
+        var command = uglifyjscmd + " test/input/issue-3315/input.js --config-file test/input/issue-3315/config.json";
+        exec(command, function(err, stdout) {
+            if (err) throw err;
+            assert.strictEqual(stdout, 'function f(){"aaaaaaaaaa";var a={prop:1,a:2};return a.prop+a.a}\n');
+            done();
+        });
+    });
     it("Should fail with --define a-b", function(done) {
         var command = uglifyjscmd + " test/input/issue-505/input.js --define a-b";
         exec(command, function(err, stdout, stderr) {
@@ -651,7 +660,7 @@ describe("bin/uglifyjs", function() {
         });
     });
     it("Should work with explicit --no-rename", function(done) {
-        var command = uglifyjscmd + " test/input/rename/input.js -mc --no-rename";
+        var command = uglifyjscmd + " test/input/rename/input.js -mc passes=2 --no-rename";
         exec(command, function(err, stdout, stderr) {
             if (err) throw err;
             assert.strictEqual(stdout, "function f(n){return function(n){return n}(n)}\n");
@@ -659,7 +668,7 @@ describe("bin/uglifyjs", function() {
         });
     });
     it("Should work with implicit --rename", function(done) {
-        var command = uglifyjscmd + " test/input/rename/input.js -mc";
+        var command = uglifyjscmd + " test/input/rename/input.js -mc passes=2";
         exec(command, function(err, stdout, stderr) {
             if (err) throw err;
             assert.strictEqual(stdout, "function f(n){return n}\n");
@@ -667,7 +676,7 @@ describe("bin/uglifyjs", function() {
         });
     });
     it("Should work with implicit --no-rename", function(done) {
-        var command = uglifyjscmd + " test/input/rename/input.js -c";
+        var command = uglifyjscmd + " test/input/rename/input.js -c passes=2";
         exec(command, function(err, stdout, stderr) {
             if (err) throw err;
             assert.strictEqual(stdout, "function f(x){return function(x){return x}(x)}\n");
@@ -706,4 +715,32 @@ describe("bin/uglifyjs", function() {
             done();
         });
     });
+    it("Should compress swarm of unused variables with reasonable performance", function(done) {
+        var code = [
+            "console.log(function() {",
+        ];
+        for (var i = 0; i < 10000; i++) {
+            code.push("var obj" + i + " = {p: " + i + "};");
+        }
+        code.push("var map = {");
+        for (var i = 0; i < 10000; i++) {
+            code.push("obj" + i + ": obj" + i + ",");
+        }
+        code = code.concat([
+            "};",
+            "return obj25.p + obj121.p + obj1024.p;",
+            "}());",
+        ]).join("\n");
+        exec(uglifyjscmd + " -mc", function(err, stdout) {
+            if (err) throw err;
+            assert.strictEqual(stdout, [
+                "console.log(function(){",
+                "var p={p:25},n={p:121},o={p:1024};",
+                "return p.p+n.p+o.p",
+                "}());\n",
+            ].join(""));
+            assert.strictEqual(run_code(stdout), run_code(code));
+            done();
+        }).stdin.end(code);
+    });
 });

test/mocha/comments.js

@@ -13,7 +13,7 @@ describe("comments", function() {
 
         var fail = function(e) {
             return e instanceof UglifyJS.JS_Parse_Error
-                && e.message === "Unexpected token: operator (>)"
+                && e.message === "Unexpected token: operator «>»"
                 && e.line === 2
                 && e.col === 0;
         }
@@ -36,7 +36,7 @@ describe("comments", function() {
 
         var fail = function(e) {
             return e instanceof UglifyJS.JS_Parse_Error
-                && e.message === "Unexpected token: operator (>)"
+                && e.message === "Unexpected token: operator «>»"
                 && e.line === 5
                 && e.col === 0;
         }

test/mocha/directives.js

@@ -146,7 +146,7 @@ describe("Directives", function() {
                 UglifyJS.parse(tokenizer);
             }, function(e) {
                 return e instanceof UglifyJS.JS_Parse_Error
-                    && e.message === "Unexpected token: punc (])"
+                    && /^Unexpected token: punc «]»/.test(e.message)
             }, test[0]);
             test[1].forEach(function(directive) {
                 assert.strictEqual(tokenizer.has_directive(directive), true, directive + " in " + test[0]);

test/mocha/getter-setter.js

@@ -69,7 +69,7 @@ describe("Getters and setters", function() {
         var fail = function(data) {
             return function(e) {
                 return e instanceof UglifyJS.JS_Parse_Error
-                    && e.message === "Unexpected token: operator (" + data.operator + ")";
+                    && e.message === "Unexpected token: operator «" + data.operator + "»";
             };
         };
         var errorMessage = function(data) {

test/mocha/minify.js

@@ -87,7 +87,7 @@ describe("minify", function() {
         assert.strictEqual(run_code(compressed), run_code(original));
     });
 
-    it("Should avoid mangled names in cache", function() {
+    it("Should avoid cached names when mangling top-level variables", function() {
         var cache = {};
         var original = "";
         var compressed = "";
@@ -116,10 +116,34 @@ describe("minify", function() {
         assert.strictEqual(run_code(compressed), run_code(original));
     });
 
+    it("Should avoid cached names when mangling inner-scoped variables", function() {
+        var cache = {};
+        var original = "";
+        var compressed = "";
+        [
+            'var extend = function(a, b) { console.log("extend"); a(); b(); }; function A() { console.log("A"); };',
+            'var B = function(A) { function B() { console.log("B") }; extend(B, A); return B; }(A);',
+        ].forEach(function(code) {
+            var result = UglifyJS.minify(code, {
+                compress: false,
+                nameCache: cache,
+                toplevel: true,
+            });
+            if (result.error) throw result.error;
+            original += code;
+            compressed += result.code;
+        });
+        assert.strictEqual(compressed, [
+            'var o=function(o,n){console.log("extend");o();n()};function n(){console.log("A")}',
+            'var e=function(n){function e(){console.log("B")}o(e,n);return e}(n);',
+        ].join(""));
+        assert.strictEqual(run_code(compressed), run_code(original));
+    });
+
     it("Should not parse invalid use of reserved words", function() {
         assert.strictEqual(UglifyJS.minify("function enum(){}").error, undefined);
         assert.strictEqual(UglifyJS.minify("function static(){}").error, undefined);
-        assert.strictEqual(UglifyJS.minify("function this(){}").error.message, "Unexpected token: name (this)");
+        assert.strictEqual(UglifyJS.minify("function this(){}").error.message, "Unexpected token: name «this»");
     });
 
     describe("keep_quoted_props", function() {
@@ -214,7 +238,7 @@ describe("minify", function() {
             var result = UglifyJS.minify("function f(a{}");
             var err = result.error;
             assert.ok(err instanceof Error);
-            assert.strictEqual(err.stack.split(/\n/)[0], "SyntaxError: Unexpected token punc «{», expected punc «,»");
+            assert.strictEqual(err.stack.split(/\n/)[0], "SyntaxError: Unexpected token: punc «{», expected: punc «,»");
             assert.strictEqual(err.filename, "0");
             assert.strictEqual(err.line, 1);
             assert.strictEqual(err.col, 12);
@@ -241,7 +265,7 @@ describe("minify", function() {
             });
             var err = result.error;
             assert.ok(err instanceof Error);
-            assert.strictEqual(err.stack.split(/\n/)[0], "SyntaxError: Unexpected token: keyword (debugger)");
+            assert.strictEqual(err.stack.split(/\n/)[0], "SyntaxError: Unexpected token: keyword «debugger»");
         });
         it("Should skip inherited properties", function() {
             var foo = Object.create({ skip: this });

test/run-tests.js

@@ -23,68 +23,200 @@ require("./mocha.js");
 
 /* -----[ utils ]----- */
 
-function tmpl() {
+function evaluate(code) {
-    return U.string_template.apply(this, arguments);
+    if (code instanceof U.AST_Node) code = make_code(code, { beautify: true });
+    return new Function("return(" + code + ")")();
 }
 
 function log() {
-    var txt = tmpl.apply(this, arguments);
+    console.log("%s", tmpl.apply(null, arguments));
-    console.log("%s", txt);
 }
 
-function log_directory(dir) {
+function make_code(ast, options) {
-    log("*** Entering [{dir}]", { dir: dir });
+    var stream = U.OutputStream(options);
+    ast.print(stream);
+    return stream.get();
 }
 
-function log_start_file(file) {
+function parse_test(file) {
-    log("--- {file}", { file: file });
+    var script = fs.readFileSync(file, "utf8");
-}
+    // TODO try/catch can be removed after fixing https://github.com/mishoo/UglifyJS2/issues/348
-
+    try {
-function log_test(name) {
+        var ast = U.parse(script, {
-    log("    Running test [{name}]", { name: name });
+            filename: file
-}
+        });
-
+    } catch (e) {
-function find_test_files(dir) {
+        console.log("Caught error while parsing tests in " + file + "\n");
-    return fs.readdirSync(dir).filter(function(name) {
+        console.log(e);
-        return /\.js$/i.test(name);
+        throw e;
-    });
-}
-
-function test_directory(dir) {
-    return path.resolve(tests_dir, dir);
-}
-
-function as_toplevel(input, mangle_options) {
-    if (!(input instanceof U.AST_BlockStatement))
-        throw new Error("Unsupported input syntax");
-    for (var i = 0; i < input.body.length; i++) {
-        var stat = input.body[i];
-        if (stat instanceof U.AST_SimpleStatement && stat.body instanceof U.AST_String)
-            input.body[i] = new U.AST_Directive(stat.body);
-        else break;
     }
-    var toplevel = new U.AST_Toplevel(input);
+    var tests = {};
-    toplevel.figure_out_scope(mangle_options);
+    var tw = new U.TreeWalker(function(node, descend) {
-    return toplevel;
+        if (node instanceof U.AST_LabeledStatement
+            && tw.parent() instanceof U.AST_Toplevel) {
+            var name = node.label.name;
+            if (name in tests) {
+                throw new Error('Duplicated test name "' + name + '" in ' + file);
+            }
+            tests[name] = get_one_test(name, node.body);
+            return true;
+        }
+        if (!(node instanceof U.AST_Toplevel)) croak(node);
+    });
+    ast.walk(tw);
+    return tests;
+
+    function croak(node) {
+        throw new Error(tmpl("Can't understand test file {file} [{line},{col}]\n{code}", {
+            file: file,
+            line: node.start.line,
+            col: node.start.col,
+            code: make_code(node, { beautify: false })
+        }));
+    }
+
+    function read_string(stat) {
+        if (stat.TYPE == "SimpleStatement") {
+            var body = stat.body;
+            switch(body.TYPE) {
+              case "String":
+                return body.value;
+              case "Array":
+                return body.elements.map(function(element) {
+                    if (element.TYPE !== "String")
+                        throw new Error("Should be array of strings");
+                    return element.value;
+                }).join("\n");
+            }
+        }
+        throw new Error("Should be string or array of strings");
+    }
+
+    function get_one_test(name, block) {
+        var test = { name: name, options: {} };
+        var tw = new U.TreeWalker(function(node, descend) {
+            if (node instanceof U.AST_Assign) {
+                if (!(node.left instanceof U.AST_SymbolRef)) {
+                    croak(node);
+                }
+                var name = node.left.name;
+                test[name] = evaluate(node.right);
+                return true;
+            }
+            if (node instanceof U.AST_LabeledStatement) {
+                var label = node.label;
+                assert.ok([
+                    "input",
+                    "expect",
+                    "expect_exact",
+                    "expect_warnings",
+                    "expect_stdout",
+                    "node_version",
+                ].indexOf(label.name) >= 0, tmpl("Unsupported label {name} [{line},{col}]", {
+                    name: label.name,
+                    line: label.start.line,
+                    col: label.start.col
+                }));
+                var stat = node.body;
+                if (label.name == "expect_exact" || label.name == "node_version") {
+                    test[label.name] = read_string(stat);
+                } else if (label.name == "expect_stdout") {
+                    var body = stat.body;
+                    if (body instanceof U.AST_Boolean) {
+                        test[label.name] = body.value;
+                    } else if (body instanceof U.AST_Call) {
+                        var ctor = global[body.expression.name];
+                        assert.ok(ctor === Error || ctor.prototype instanceof Error, tmpl("Unsupported expect_stdout format [{line},{col}]", {
+                            line: label.start.line,
+                            col: label.start.col
+                        }));
+                        test[label.name] = ctor.apply(null, body.args.map(function(node) {
+                            assert.ok(node instanceof U.AST_Constant, tmpl("Unsupported expect_stdout format [{line},{col}]", {
+                                line: label.start.line,
+                                col: label.start.col
+                            }));
+                            return node.value;
+                        }));
+                    } else {
+                        test[label.name] = read_string(stat) + "\n";
+                    }
+                } else {
+                    test[label.name] = stat;
+                }
+                return true;
+            }
+        });
+        block.walk(tw);
+        return test;
+    }
+}
+
+// Try to reminify original input with standard options
+// to see if it matches expect_stdout.
+function reminify(orig_options, input_code, input_formatted, expect_stdout) {
+    for (var i = 0; i < minify_options.length; i++) {
+        var options = JSON.parse(minify_options[i]);
+        if (options.compress) [
+            "keep_fargs",
+            "keep_fnames",
+        ].forEach(function(name) {
+            if (name in orig_options) {
+                options.compress[name] = orig_options[name];
+            }
+        });
+        var options_formatted = JSON.stringify(options, null, 4);
+        var result = U.minify(input_code, options);
+        if (result.error) {
+            log("!!! failed input reminify\n---INPUT---\n{input}\n---OPTIONS---\n{options}\n--ERROR---\n{error}\n\n", {
+                input: input_formatted,
+                options: options_formatted,
+                error: result.error,
+            });
+            return false;
+        } else {
+            var stdout = run_code(result.code);
+            if (typeof expect_stdout != "string" && typeof stdout != "string" && expect_stdout.name == stdout.name) {
+                stdout = expect_stdout;
+            }
+            if (!sandbox.same_stdout(expect_stdout, stdout)) {
+                log("!!! failed running reminified input\n---INPUT---\n{input}\n---OPTIONS---\n{options}\n---OUTPUT---\n{output}\n---EXPECTED {expected_type}---\n{expected}\n---ACTUAL {actual_type}---\n{actual}\n\n", {
+                    input: input_formatted,
+                    options: options_formatted,
+                    output: result.code,
+                    expected_type: typeof expect_stdout == "string" ? "STDOUT" : "ERROR",
+                    expected: expect_stdout,
+                    actual_type: typeof stdout == "string" ? "STDOUT" : "ERROR",
+                    actual: stdout,
+                });
+                return false;
+            }
+        }
+    }
+    return true;
+}
+
+function run_code(code) {
+    var result = sandbox.run_code(code, true);
+    return typeof result == "string" ? result.replace(/\u001b\[\d+m/g, "") : result;
 }
 
 function run_compress_tests() {
-    var dir = test_directory("compress");
+    var dir = path.resolve(tests_dir, "compress");
-    log_directory("compress");
+    fs.readdirSync(dir).filter(function(name) {
-    var files = find_test_files(dir);
+        return /\.js$/i.test(name);
-    function test_file(file) {
+    }).forEach(function(file) {
-        log_start_file(file);
+        log("--- {file}", { file: file });
         function test_case(test) {
-            log_test(test.name);
+            log("    Running test [{name}]", { name: test.name });
             var output_options = test.beautify || {};
             var expect;
             if (test.expect) {
-                expect = make_code(as_toplevel(test.expect, test.mangle), output_options);
+                expect = make_code(to_toplevel(test.expect, test.mangle), output_options);
             } else {
                 expect = test.expect_exact;
             }
-            var input = as_toplevel(test.input, test.mangle);
+            var input = to_toplevel(test.input, test.mangle);
-            var input_code = make_code(input, output_options);
+            var input_code = make_code(input);
             var input_formatted = make_code(test.input, {
                 beautify: true,
                 quote_style: 3,
@@ -209,185 +341,27 @@ function run_compress_tests() {
                 failed_files[file] = 1;
             }
         }
-    }
-    files.forEach(function(file) {
-        test_file(file);
     });
 }
 
-function parse_test(file) {
+function tmpl() {
-    var script = fs.readFileSync(file, "utf8");
+    return U.string_template.apply(null, arguments);
-    // TODO try/catch can be removed after fixing https://github.com/mishoo/UglifyJS2/issues/348
-    try {
-        var ast = U.parse(script, {
-            filename: file
-        });
-    } catch (e) {
-        console.log("Caught error while parsing tests in " + file + "\n");
-        console.log(e);
-        throw e;
-    }
-    var tests = {};
-    var tw = new U.TreeWalker(function(node, descend) {
-        if (node instanceof U.AST_LabeledStatement
-            && tw.parent() instanceof U.AST_Toplevel) {
-            var name = node.label.name;
-            if (name in tests) {
-                throw new Error('Duplicated test name "' + name + '" in ' + file);
-            }
-            tests[name] = get_one_test(name, node.body);
-            return true;
-        }
-        if (!(node instanceof U.AST_Toplevel)) croak(node);
-    });
-    ast.walk(tw);
-    return tests;
-
-    function croak(node) {
-        throw new Error(tmpl("Can't understand test file {file} [{line},{col}]\n{code}", {
-            file: file,
-            line: node.start.line,
-            col: node.start.col,
-            code: make_code(node, { beautify: false })
-        }));
-    }
-
-    function read_string(stat) {
-        if (stat.TYPE == "SimpleStatement") {
-            var body = stat.body;
-            switch(body.TYPE) {
-              case "String":
-                return body.value;
-              case "Array":
-                return body.elements.map(function(element) {
-                    if (element.TYPE !== "String")
-                        throw new Error("Should be array of strings");
-                    return element.value;
-                }).join("\n");
-            }
-        }
-        throw new Error("Should be string or array of strings");
-    }
-
-    function get_one_test(name, block) {
-        var test = { name: name, options: {} };
-        var tw = new U.TreeWalker(function(node, descend) {
-            if (node instanceof U.AST_Assign) {
-                if (!(node.left instanceof U.AST_SymbolRef)) {
-                    croak(node);
-                }
-                var name = node.left.name;
-                test[name] = evaluate(node.right);
-                return true;
-            }
-            if (node instanceof U.AST_LabeledStatement) {
-                var label = node.label;
-                assert.ok(
-                    [
-                        "input",
-                        "expect",
-                        "expect_exact",
-                        "expect_warnings",
-                        "expect_stdout",
-                        "node_version",
-                    ].indexOf(label.name) >= 0,
-                    tmpl("Unsupported label {name} [{line},{col}]", {
-                        name: label.name,
-                        line: label.start.line,
-                        col: label.start.col
-                    })
-                );
-                var stat = node.body;
-                if (label.name == "expect_exact" || label.name == "node_version") {
-                    test[label.name] = read_string(stat);
-                } else if (label.name == "expect_stdout") {
-                    var body = stat.body;
-                    if (body instanceof U.AST_Boolean) {
-                        test[label.name] = body.value;
-                    } else if (body instanceof U.AST_Call) {
-                        var ctor = global[body.expression.name];
-                        assert.ok(ctor === Error || ctor.prototype instanceof Error, tmpl("Unsupported expect_stdout format [{line},{col}]", {
-                            line: label.start.line,
-                            col: label.start.col
-                        }));
-                        test[label.name] = ctor.apply(null, body.args.map(function(node) {
-                            assert.ok(node instanceof U.AST_Constant, tmpl("Unsupported expect_stdout format [{line},{col}]", {
-                                line: label.start.line,
-                                col: label.start.col
-                            }));
-                            return node.value;
-                        }));
-                    } else {
-                        test[label.name] = read_string(stat) + "\n";
-                    }
-                } else {
-                    test[label.name] = stat;
-                }
-                return true;
-            }
-        });
-        block.walk(tw);
-        return test;
-    };
 }
 
-function make_code(ast, options) {
+function to_toplevel(input, mangle_options) {
-    var stream = U.OutputStream(options);
+    if (!(input instanceof U.AST_BlockStatement)) throw new Error("Unsupported input syntax");
-    ast.print(stream);
+    var directive = true;
-    return stream.get();
+    var offset = input.start.line;
-}
+    var tokens = [];
-
+    var toplevel = new U.AST_Toplevel(input.transform(new U.TreeTransformer(function(node) {
-function evaluate(code) {
+        if (U.push_uniq(tokens, node.start)) node.start.line -= offset;
-    if (code instanceof U.AST_Node)
+        if (!directive || node === input) return;
-        code = make_code(code, { beautify: true });
+        if (node instanceof U.AST_SimpleStatement && node.body instanceof U.AST_String) {
-    return new Function("return(" + code + ")")();
+            return new U.AST_Directive(node.body);
-}
-
-function run_code(code) {
-    var result = sandbox.run_code(code, true);
-    return typeof result == "string" ? result.replace(/\u001b\[\d+m/g, "") : result;
-}
-
-// Try to reminify original input with standard options
-// to see if it matches expect_stdout.
-function reminify(orig_options, input_code, input_formatted, expect_stdout) {
-    for (var i = 0; i < minify_options.length; i++) {
-        var options = JSON.parse(minify_options[i]);
-        if (options.compress) [
-            "keep_fargs",
-            "keep_fnames",
-        ].forEach(function(name) {
-            if (name in orig_options) {
-                options.compress[name] = orig_options[name];
-            }
-        });
-        var options_formatted = JSON.stringify(options, null, 4);
-        var result = U.minify(input_code, options);
-        if (result.error) {
-            log("!!! failed input reminify\n---INPUT---\n{input}\n---OPTIONS---\n{options}\n--ERROR---\n{error}\n\n", {
-                input: input_formatted,
-                options: options_formatted,
-                error: result.error,
-            });
-            return false;
         } else {
-            var stdout = run_code(result.code);
+            directive = false;
-            if (typeof expect_stdout != "string" && typeof stdout != "string" && expect_stdout.name == stdout.name) {
-                stdout = expect_stdout;
-            }
-            if (!sandbox.same_stdout(expect_stdout, stdout)) {
-                log("!!! failed running reminified input\n---INPUT---\n{input}\n---OPTIONS---\n{options}\n---OUTPUT---\n{output}\n---EXPECTED {expected_type}---\n{expected}\n---ACTUAL {actual_type}---\n{actual}\n\n", {
-                    input: input_formatted,
-                    options: options_formatted,
-                    output: result.code,
-                    expected_type: typeof expect_stdout == "string" ? "STDOUT" : "ERROR",
-                    expected: expect_stdout,
-                    actual_type: typeof stdout == "string" ? "STDOUT" : "ERROR",
-                    actual: stdout,
-                });
-                return false;
-            }
         }
-    }
+    })));
-    return true;
+    toplevel.figure_out_scope(mangle_options);
+    return toplevel;
 }

test/sandbox.js

@@ -1,21 +1,6 @@
 var semver = require("semver");
 var vm = require("vm");
 
-function createContext() {
-    return vm.createContext(Object.defineProperty({}, "console", {
-        value: {
-            log: function(msg) {
-                if (arguments.length == 1 && typeof msg == "string") {
-                    return console.log("%s", msg);
-                }
-                return console.log.apply(console, [].map.call(arguments, function(arg) {
-                    return safe_log(arg, 3);
-                }));
-            }
-        }
-    }));
-}
-
 function safe_log(arg, level) {
     if (arg) switch (typeof arg) {
       case "function":
@@ -25,21 +10,21 @@ function safe_log(arg, level) {
         arg.constructor.toString();
         if (level--) for (var key in arg) {
             var desc = Object.getOwnPropertyDescriptor(arg, key);
-            if (!desc || !desc.get) {
+            if (!desc || !desc.get) arg[key] = safe_log(arg[key], level);
-                arg[key] = safe_log(arg[key], level);
-            }
         }
     }
     return arg;
 }
 
-function strip_func_ids(text) {
+function log(msg) {
-    return ("" + text).replace(/F[0-9]{6}N/g, "<F<>N>");
+    if (arguments.length == 1 && typeof msg == "string") return console.log("%s", msg);
+    return console.log.apply(console, [].map.call(arguments, function(arg) {
+        return safe_log(arg, 3);
+    }));
 }
 
-var context;
+var func_toString = new vm.Script([
-var FUNC_TOSTRING = [
+    "[ Array, Boolean, Error, Function, Number, Object, RegExp, String ].forEach(function(f) {",
-    "[ Array, Boolean, Error, Function, Number, Object, RegExp, String].forEach(function(f) {",
     "    f.toString = Function.prototype.toString;",
     "});",
     "Function.prototype.toString = function() {",
@@ -59,7 +44,15 @@ var FUNC_TOSTRING = [
     '        return "function(){}";',
     "    };",
     "}();",
-]).join("\n");
+]).join("\n"));
+
+function createContext() {
+    var ctx = vm.createContext(Object.defineProperty({}, "console", { value: { log: log } }));
+    func_toString.runInContext(ctx);
+    return ctx;
+}
+
+var context;
 exports.run_code = function(code, reuse) {
     var stdout = "";
     var original_write = process.stdout.write;
@@ -69,7 +62,6 @@ exports.run_code = function(code, reuse) {
     try {
         if (!reuse || !context) context = createContext();
         vm.runInContext([
-            FUNC_TOSTRING,
             "!function() {",
             code,
             "}();",
@@ -86,6 +78,11 @@ exports.run_code = function(code, reuse) {
         }
     }
 };
+
+function strip_func_ids(text) {
+    return ("" + text).replace(/F[0-9]{6}N/g, "<F<>N>");
+}
+
 exports.same_stdout = semver.satisfies(process.version, "0.12") ? function(expected, actual) {
     if (typeof expected != typeof actual) return false;
     if (typeof expected != "string") {

test/travis-ufuzz.js

@@ -15,6 +15,7 @@ if (process.argv[2] == "run") {
     var branch = process.argv[3] || "v" + require("../package.json").version;
     var repository = encodeURIComponent(process.argv[4] || "mishoo/UglifyJS2");
     var concurrency = process.argv[5] || 1;
+    var platform = process.argv[6] || "node/latest";
     (function request() {
         setTimeout(request, (period + wait) / concurrency);
         var options = url.parse("https://api.travis-ci.org/repo/" + repository + "/requests");
@@ -32,20 +33,18 @@ if (process.argv[2] == "run") {
             res.on("data", console.log);
         }).on("error", console.error).end(JSON.stringify({
             request: {
-                message: "ufuzz testing (when idle)",
+                message: "ufuzz testing",
                 branch: branch,
                 config: {
-                    merge_mode: "replace",
+                    cache: false,
-                    language: "node_js",
+                    env: "NODEJS_VER=" + platform,
-                    node_js: "9",
-                    sudo: false,
                     script: "node test/travis-ufuzz run"
                 }
             }
         }));
     })();
 } else {
-    console.log("Usage: test/travis-ufuzz.js <token> [branch] [repository] [concurrency]");
+    console.log("Usage: test/travis-ufuzz.js <token> [branch] [repository] [concurrency] [platform]");
 }
 
 function spawn(endTime) {

test/ufuzz.json

@@ -16,6 +16,7 @@
     },
     {},
     {
+        "ie8": true,
         "toplevel": true
     },
     {

tools/exports.js

@@ -1,6 +1,6 @@
 exports["Dictionary"] = Dictionary;
-exports["TreeWalker"] = TreeWalker;
-exports["TreeTransformer"] = TreeTransformer;
 exports["minify"] = minify;
 exports["parse"] = parse;
-exports["_push_uniq"] = push_uniq;
+exports["push_uniq"] = push_uniq;
+exports["TreeTransformer"] = TreeTransformer;
+exports["TreeWalker"] = TreeWalker;