Merge pull request #1901 from alexlamsl/harmony-v3.0.3

Merging from master for 3.0.3

.github/ISSUE_TEMPLATE.md

@@ -1,25 +1,20 @@
-**Bug report or feature request?**
+**Bug report or feature request?** 
 
 <!-- Note: sub-optimal but correct code is not a bug -->
 
+**ES5 or ES6+ input?** 
+
+<!-- Note: for ES6 see: https://github.com/mishoo/UglifyJS2/tree/harmony#harmony -->
+
 **Uglify version (`uglifyjs -V`)**
 
-**JavaScript input**
-
-<!--
-    A complete parsable JS program exhibiting the issue with
-    UglifyJS alone - without third party tools or libraries.
-    Ideally the input should be as small as possible.
-    Post a link to a gist if necessary.
-
-    Issues without a reproducible test case will be closed.
--->
+**JavaScript input**  <!-- ideally as small as possible -->
 
 **The `uglifyjs` CLI command executed or `minify()` options used.**
 
 **JavaScript output or error produced.**
 
 <!--
-    Note: `uglify-js` only supports JavaScript.
-    Those wishing to minify ES6+ should transpile first.
+    Note: `uglify-js` only supports ES5. 
+    Those wishing to minify ES6 should use `uglify-es`.
 -->

.travis.yml

@@ -1,14 +1,12 @@
 language: node_js
+before_install: "npm install -g npm"
 node_js:
     - "0.10"
     - "0.12"
     - "4"
     - "6"
-    - "8"
 env:
     - UGLIFYJS_TEST_ALL=1
 matrix:
   fast_finish: true
 sudo: false
-cache:
-  directories: tmp

CONTRIBUTING.md

@@ -1,61 +0,0 @@
-Contributing
-============
-
-## Documentation
-
-Every new feature and API change should be accompanied by a README additon.
-
-## Testing
-
-All features and bugs should have tests that verify the fix. You can run all
-tests using `npm test`.
-
-The most common type of test are tests that verify input and output of the
-Uglify transforms. These tests exist in `test/compress`. New tests can be added
-either to an existing file or in a new file `issue-xxx.js`.
-
-Tests that cannot be expressed as a simple AST can be found in `test/mocha`.
-
-## Code style
-
-- File encoding must be `UTF-8`.
-- `LF` is always used as a line ending.
-- Statements end with semicolons.
-- Indentation uses 4 spaces, switch `case` 2 spaces.
-- Identifiers use `snake_case`.
-- Strings use double quotes (`"`).
-- Use a trailing comma for multiline array and object literals to minimize diffs.
-- The Uglify code only uses ES5, even in the `harmony` branch.
-- Line length should be at most 80 cols, except when it is easier to read a
-  longer line.
-- If both sides of a comparison are of the same type, `==` and `!=` are used.
-- Multiline conditions place `&&` and `||` first on the line.
-
-**Example feature**
-
-```js
-OPT(AST_Debugger, function(self, compressor) {
-    if (compressor.option("drop_debugger"))
-        return make_node(AST_EmptyStatement, self);
-    return self;
-});
-```
-
-**Example test case**
-
-```js
-drop_debugger: {
-    options = {
-        drop_debugger: true,
-    }
-    input: {
-        debugger;
-        if (foo) debugger;
-    }
-    expect: {
-        if (foo);
-    }
-}
-```
-
-

LICENSE

@@ -1,6 +1,6 @@
 UglifyJS is released under the BSD license:
 
-Copyright 2012-2018 (c) Mihai Bazon <mihai.bazon@gmail.com>
+Copyright 2012-2013 (c) Mihai Bazon <mihai.bazon@gmail.com>
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions

appveyor.yml

@@ -1,20 +1,24 @@
 environment:
   matrix:
-    - nodejs_version: "0.10"
-    - nodejs_version: "0.12"
-    - nodejs_version: "4"
-    - nodejs_version: "6"
-    - nodejs_version: "8"
-install:
-  - ps: Install-Product node $env:nodejs_version
-  - set UGLIFYJS_TEST_ALL=1
-  - npm install
-build: off
-cache:
-  - tmp
+  - nodejs_version: "0.10"
+  - nodejs_version: "0.12"
+  - nodejs_version: "4.0"
+  - nodejs_version: "6.0"
+
 matrix:
   fast_finish: true
+
+platform:
+  - x86
+  - x64
+
+install:
+  - ps: Install-Product node $env:nodejs_version $env:platform
+  - npm install
+
 test_script:
   - node --version
   - npm --version
   - npm test
+
+build: off

bin/uglifyjs

@@ -3,7 +3,11 @@
 
 "use strict";
 
-require("../tools/exit");
+// workaround for tty output truncation upon process.exit()
+[process.stdout, process.stderr].forEach(function(stream){
+    if (stream._handle && stream._handle.setBlocking)
+        stream._handle.setBlocking(true);
+});
 
 var fs = require("fs");
 var info = require("../package.json");
@@ -11,44 +15,31 @@ var path = require("path");
 var program = require("commander");
 var UglifyJS = require("../tools/node");
 
-var skip_keys = [ "cname", "inlined", "parent_scope", "scope", "uses_eval", "uses_with" ];
+var skip_keys = [ "cname", "enclosed", "parent_scope", "scope", "thedef", "uses_eval", "uses_with" ];
 var files = {};
 var options = {
     compress: false,
     mangle: false
 };
-program.version(info.name + " " + info.version);
+program._name = info.name;
+program.version(info.version);
 program.parseArgv = program.parse;
 program.parse = undefined;
-if (process.argv.indexOf("ast") >= 0) program.helpInformation = UglifyJS.describe_ast;
-else if (process.argv.indexOf("options") >= 0) program.helpInformation = function() {
-    var text = [];
-    var options = UglifyJS.default_options();
-    for (var option in options) {
-        text.push("--" + (option == "output" ? "beautify" : option == "sourceMap" ? "source-map" : option) + " options:");
-        text.push(format_object(options[option]));
-        text.push("");
-    }
-    return text.join("\n");
-};
-program.option("-p, --parse <options>", "Specify parser options.", parse_js());
-program.option("-c, --compress [options]", "Enable compressor/specify compressor options.", parse_js());
-program.option("-m, --mangle [options]", "Mangle names/specify mangler options.", parse_js());
-program.option("--mangle-props [options]", "Mangle properties/specify mangler options.", parse_js());
-program.option("-b, --beautify [options]", "Beautify output/specify output options.", parse_js());
+program.option("-p, --parse <options>", "Specify parser options.", parse_js("parse", true));
+program.option("-c, --compress [options]", "Enable compressor/specify compressor options.", parse_js("compress", true));
+program.option("-m, --mangle [options]", "Mangle names/specify mangler options.", parse_js("mangle", true));
+program.option("--mangle-props [options]", "Mangle properties/specify mangler options.", parse_js("mangle-props", true));
+program.option("-b, --beautify [options]", "Beautify output/specify output options.", parse_js("beautify", true));
 program.option("-o, --output <file>", "Output file (default STDOUT).");
 program.option("--comments [filter]", "Preserve copyright comments in the output.");
 program.option("--config-file <file>", "Read minify() options from JSON file.");
 program.option("-d, --define <expr>[=value]", "Global definitions.", parse_js("define"));
-program.option("-e, --enclose [arg[,...][:value[,...]]]", "Embed everything in a big function, with configurable argument(s) & value(s).");
 program.option("--ie8", "Support non-standard Internet Explorer 8.");
 program.option("--keep-fnames", "Do not mangle/drop function names. Useful for code relying on Function.prototype.name.");
 program.option("--name-cache <file>", "File to hold mangled name mappings.");
-program.option("--rename", "Force symbol expansion.");
-program.option("--no-rename", "Disable symbol expansion.");
 program.option("--self", "Build UglifyJS as a library (implies --wrap UglifyJS)");
-program.option("--source-map [options]", "Enable source map/specify source map options.", parse_js());
-program.option("--timings", "Display operations run time on STDERR.");
+program.option("--source-map [options]", "Enable source map/specify source map options.", parse_source_map());
+program.option("--stats", "Display operations run time on STDERR.")
 program.option("--toplevel", "Compress and/or mangle variables in toplevel scope.");
 program.option("--verbose", "Print diagnostic messages.");
 program.option("--warn", "Print warning messages.");
@@ -62,7 +53,6 @@ if (!program.output && program.sourceMap && program.sourceMap.url != "inline") {
 }
 [
     "compress",
-    "enclose",
     "ie8",
     "mangle",
     "sourceMap",
@@ -106,8 +96,17 @@ if (program.mangleProps) {
     if (typeof options.mangle != "object") options.mangle = {};
     options.mangle.properties = program.mangleProps;
 }
+var cache;
 if (program.nameCache) {
-    options.nameCache = JSON.parse(read_file(program.nameCache, "{}"));
+    cache = JSON.parse(read_file(program.nameCache, "{}"));
+    if (options.mangle) {
+        if (typeof options.mangle != "object") options.mangle = {};
+        options.mangle.cache = to_cache("vars");
+        if (options.mangle.properties) {
+            if (typeof options.mangle.properties != "object") options.mangle.properties = {};
+            options.mangle.properties.cache = to_cache("props");
+        }
+    }
 }
 if (program.output == "ast") {
     options.output = {
@@ -116,17 +115,12 @@ if (program.output == "ast") {
     };
 }
 if (program.parse) {
-    if (!program.parse.acorn && !program.parse.spidermonkey) {
+    if (program.parse.acorn || program.parse.spidermonkey) {
+        if (program.sourceMap) fatal("ERROR: inline source map only works with built-in parser");
+    } else {
         options.parse = program.parse;
-    } else if (program.sourceMap && program.sourceMap.content == "inline") {
-        fatal("ERROR: inline source map only works with built-in parser");
     }
 }
-if (~program.rawArgs.indexOf("--rename")) {
-    options.rename = true;
-} else if (!program.rename) {
-    options.rename = false;
-}
 var convert_path = function(name) {
     return name;
 };
@@ -146,7 +140,7 @@ if (program.verbose) {
 }
 if (program.self) {
     if (program.args.length) {
-        print_error("WARN: Ignoring input files since --self was passed");
+        console.error("WARN: Ignoring input files since --self was passed");
     }
     if (!options.wrap) options.wrap = "UglifyJS";
     simple_glob(UglifyJS.FILES).forEach(function(name) {
@@ -176,14 +170,9 @@ function convert_ast(fn) {
 
 function run() {
     UglifyJS.AST_Node.warn_function = function(msg) {
-        print_error("WARN: " + msg);
+        console.error("WARN:", msg);
     };
-    var content = program.sourceMap && program.sourceMap.content;
-    if (content && content != "inline") {
-        print_error("INFO: Using input source map: " + content);
-        options.sourceMap.content = read_file(content, content);
-    }
-    if (program.timings) options.timings = true;
+    if (program.stats) program.stats = Date.now();
     try {
         if (program.parse) {
             if (program.parse.acorn) {
@@ -210,7 +199,7 @@ function run() {
     if (result.error) {
         var ex = result.error;
         if (ex.name == "SyntaxError") {
-            print_error("Parse error at " + ex.filename + ":" + ex.line + "," + ex.col);
+            console.error("Parse error at " + ex.filename + ":" + ex.line + "," + ex.col);
             var col = ex.col;
             var lines = files[ex.filename].split(/\r?\n/);
             var line = lines[ex.line - 1];
@@ -219,35 +208,21 @@ function run() {
                 col = line.length;
             }
             if (line) {
-                var limit = 70;
-                if (col > limit) {
-                    line = line.slice(col - limit);
-                    col = limit;
+                if (col > 40) {
+                    line = line.slice(col - 40);
+                    col = 40;
                 }
-                print_error(line.slice(0, 80));
-                print_error(line.slice(0, col).replace(/\S/g, " ") + "^");
+                console.error(line.slice(0, 80));
+                console.error(line.slice(0, col).replace(/\S/g, " ") + "^");
             }
         }
         if (ex.defs) {
-            print_error("Supported options:");
-            print_error(format_object(ex.defs));
+            console.error("Supported options:");
+            console.error(ex.defs);
         }
         fatal(ex);
     } else if (program.output == "ast") {
-        if (!options.compress && !options.mangle) {
-            result.ast.figure_out_scope({});
-        }
-        print(JSON.stringify(result.ast, function(key, value) {
-            if (value) switch (key) {
-              case "thedef":
-                return symdef(value);
-              case "enclosed":
-                return value.length ? value.map(symdef) : undefined;
-              case "variables":
-              case "functions":
-              case "globals":
-                return value.size() ? value.map(symdef) : undefined;
-            }
+        console.log(JSON.stringify(result.ast, function(key, value) {
             if (skip_key(key)) return;
             if (value instanceof UglifyJS.AST_Token) return;
             if (value instanceof UglifyJS.Dictionary) return;
@@ -263,7 +238,7 @@ function run() {
             return value;
         }, 2));
     } else if (program.output == "spidermonkey") {
-        print(JSON.stringify(UglifyJS.minify(result.code, {
+        console.log(JSON.stringify(UglifyJS.minify(result.code, {
             compress: false,
             mangle: false,
             output: {
@@ -277,19 +252,19 @@ function run() {
             fs.writeFileSync(program.output + ".map", result.map);
         }
     } else {
-        print(result.code);
+        console.log(result.code);
     }
     if (program.nameCache) {
-        fs.writeFileSync(program.nameCache, JSON.stringify(options.nameCache));
-    }
-    if (result.timings) for (var phase in result.timings) {
-        print_error("- " + phase + ": " + result.timings[phase].toFixed(3) + "s");
+        fs.writeFileSync(program.nameCache, JSON.stringify(cache, function(key, value) {
+            return value instanceof UglifyJS.Dictionary ? value.toObject() : value;
+        }));
     }
+    if (program.stats) console.error("Elapsed:", Date.now() - program.stats);
 }
 
 function fatal(message) {
     if (message instanceof Error) message = message.stack.replace(/^\S*?Error:/, "ERROR:")
-    print_error(message);
+    console.error(message);
     process.exit(1);
 }
 
@@ -333,7 +308,7 @@ function read_file(path, default_value) {
     }
 }
 
-function parse_js(flag) {
+function parse_js(flag, constants) {
     return function(value, options) {
         options = options || {};
         try {
@@ -351,7 +326,7 @@ function parse_js(flag) {
                 if (node instanceof UglifyJS.AST_Assign) {
                     var name = node.left.print_to_string();
                     var value = node.right;
-                    if (flag) {
+                    if (!constants) {
                         options[name] = value;
                     } else if (value instanceof UglifyJS.AST_Array) {
                         options[name] = value.elements.map(to_string);
@@ -374,44 +349,37 @@ function parse_js(flag) {
                 }
             }));
         } catch(ex) {
-            if (flag) {
-                fatal("Error parsing arguments for '" + flag + "': " + value);
-            } else {
-                options[value] = null;
-            }
+            fatal("Error parsing arguments for '" + flag + "': " + value);
         }
         return options;
     }
 }
 
+function parse_source_map() {
+    var parse = parse_js("sourceMap", true);
+    return function(value, options) {
+        var hasContent = options && options.sourceMap && "content" in options.sourceMap;
+        var settings = parse(value, options);
+        if (!hasContent && settings.content && settings.content != "inline") {
+            console.error("INFO: Using input source map:", settings.content);
+            settings.content = read_file(settings.content, settings.content);
+        }
+        return settings;
+    }
+}
+
+function to_cache(key) {
+    if (cache[key]) {
+        cache[key].props = UglifyJS.Dictionary.fromObject(cache[key].props);
+    } else {
+        cache[key] = {
+            cname: -1,
+            props: new UglifyJS.Dictionary()
+        };
+    }
+    return cache[key];
+}
+
 function skip_key(key) {
     return skip_keys.indexOf(key) >= 0;
 }
-
-function symdef(def) {
-    var ret = (1e6 + def.id) + " " + def.name;
-    if (def.mangled_name) ret += " " + def.mangled_name;
-    return ret;
-}
-
-function format_object(obj) {
-    var lines = [];
-    var padding = "";
-    Object.keys(obj).map(function(name) {
-        if (padding.length < name.length) padding = Array(name.length + 1).join(" ");
-        return [ name, JSON.stringify(obj[name]) ];
-    }).forEach(function(tokens) {
-        lines.push("  " + tokens[0] + padding.slice(tokens[0].length - 2) + tokens[1]);
-    });
-    return lines.join("\n");
-}
-
-function print_error(msg) {
-    process.stderr.write(msg);
-    process.stderr.write("\n");
-}
-
-function print(txt) {
-    process.stdout.write(txt);
-    process.stdout.write("\n");
-}

lib/minify.js

@@ -7,23 +7,15 @@ var to_base64 = typeof btoa == "undefined" ? function(str) {
     return new Buffer(str).toString("base64");
 } : btoa;
 
-function read_source_map(name, code) {
+function read_source_map(code) {
     var match = /\n\/\/# sourceMappingURL=data:application\/json(;.*?)?;base64,(.*)/.exec(code);
     if (!match) {
-        AST_Node.warn("inline source map not found: " + name);
+        AST_Node.warn("inline source map not found");
         return null;
     }
     return to_ascii(match[2]);
 }
 
-function parse_source_map(content) {
-    try {
-        return JSON.parse(content);
-    } catch (ex) {
-        throw new Error("invalid input source map: " + content);
-    }
-}
-
 function set_shorthand(name, options, keys) {
     if (options[name]) {
         keys.forEach(function(key) {
@@ -35,54 +27,31 @@ function set_shorthand(name, options, keys) {
     }
 }
 
-function init_cache(cache) {
-    if (!cache) return;
-    if (!("props" in cache)) {
-        cache.props = new Dictionary();
-    } else if (!(cache.props instanceof Dictionary)) {
-        cache.props = Dictionary.fromObject(cache.props);
-    }
-}
-
-function to_json(cache) {
-    return {
-        props: cache.props.toObject()
-    };
-}
-
 function minify(files, options) {
     var warn_function = AST_Node.warn_function;
     try {
+        if (typeof files == "string") {
+            files = [ files ];
+        }
         options = defaults(options, {
             compress: {},
-            enclose: false,
             ie8: false,
             keep_fnames: false,
             mangle: {},
-            nameCache: null,
             output: {},
             parse: {},
-            rename: undefined,
             sourceMap: false,
-            timings: false,
             toplevel: false,
             warnings: false,
             wrap: false,
         }, true);
-        var timings = options.timings && {
-            start: Date.now()
-        };
-        if (options.rename === undefined) {
-            options.rename = options.compress && options.mangle;
-        }
         set_shorthand("ie8", options, [ "compress", "mangle", "output" ]);
         set_shorthand("keep_fnames", options, [ "compress", "mangle" ]);
         set_shorthand("toplevel", options, [ "compress", "mangle" ]);
         set_shorthand("warnings", options, [ "compress" ]);
-        var quoted_props;
         if (options.mangle) {
             options.mangle = defaults(options.mangle, {
-                cache: options.nameCache && (options.nameCache.vars || {}),
+                cache: null,
                 eval: false,
                 ie8: false,
                 keep_fnames: false,
@@ -90,21 +59,6 @@ function minify(files, options) {
                 reserved: [],
                 toplevel: false,
             }, true);
-            if (options.mangle.properties) {
-                if (typeof options.mangle.properties != "object") {
-                    options.mangle.properties = {};
-                }
-                if (options.mangle.properties.keep_quoted) {
-                    quoted_props = options.mangle.properties.reserved;
-                    if (!Array.isArray(quoted_props)) quoted_props = [];
-                    options.mangle.properties.reserved = quoted_props;
-                }
-                if (options.nameCache && !("cache" in options.mangle.properties)) {
-                    options.mangle.properties.cache = options.nameCache.props || {};
-                }
-            }
-            init_cache(options.mangle.cache);
-            init_cache(options.mangle.properties.cache);
         }
         if (options.sourceMap) {
             options.sourceMap = defaults(options.sourceMap, {
@@ -121,84 +75,57 @@ function minify(files, options) {
                 warnings.push(warning);
             };
         }
-        if (timings) timings.parse = Date.now();
-        var source_maps, toplevel;
+        var toplevel;
         if (files instanceof AST_Toplevel) {
             toplevel = files;
         } else {
-            if (typeof files == "string") {
-                files = [ files ];
-            }
             options.parse = options.parse || {};
             options.parse.toplevel = null;
-            var source_map_content = options.sourceMap && options.sourceMap.content;
-            if (typeof source_map_content == "string" && source_map_content != "inline") {
-                source_map_content = parse_source_map(source_map_content);
-            }
-            source_maps = source_map_content && Object.create(null);
-            for (var name in files) if (HOP(files, name)) {
+            for (var name in files) {
                 options.parse.filename = name;
                 options.parse.toplevel = parse(files[name], options.parse);
-                if (source_maps) {
-                    if (source_map_content == "inline") {
-                        var inlined_content = read_source_map(name, files[name]);
-                        if (inlined_content) {
-                            source_maps[name] = parse_source_map(inlined_content);
-                        }
-                    } else {
-                        source_maps[name] = source_map_content;
-                    }
+                if (options.sourceMap && options.sourceMap.content == "inline") {
+                    if (Object.keys(files).length > 1)
+                        throw new Error("inline source map only works with singular input");
+                    options.sourceMap.content = read_source_map(files[name]);
                 }
             }
             toplevel = options.parse.toplevel;
         }
-        if (quoted_props) {
-            reserve_quoted_keys(toplevel, quoted_props);
-        }
         if (options.wrap) {
             toplevel = toplevel.wrap_commonjs(options.wrap);
         }
-        if (options.enclose) {
-            toplevel = toplevel.wrap_enclose(options.enclose);
-        }
-        if (timings) timings.rename = Date.now();
-        if (options.rename) {
+        if (options.compress) {
             toplevel.figure_out_scope(options.mangle);
-            toplevel.expand_names(options.mangle);
+            toplevel = new Compressor(options.compress).compress(toplevel);
         }
-        if (timings) timings.compress = Date.now();
-        if (options.compress) toplevel = new Compressor(options.compress).compress(toplevel);
-        if (timings) timings.scope = Date.now();
-        if (options.mangle) toplevel.figure_out_scope(options.mangle);
-        if (timings) timings.mangle = Date.now();
         if (options.mangle) {
+            toplevel.figure_out_scope(options.mangle);
+            base54.reset();
             toplevel.compute_char_frequency(options.mangle);
             toplevel.mangle_names(options.mangle);
+            if (options.mangle.properties) {
+                toplevel = mangle_properties(toplevel, options.mangle.properties);
+            }
         }
-        if (timings) timings.properties = Date.now();
-        if (options.mangle && options.mangle.properties) {
-            toplevel = mangle_properties(toplevel, options.mangle.properties);
-        }
-        if (timings) timings.output = Date.now();
         var result = {};
         if (options.output.ast) {
             result.ast = toplevel;
         }
         if (!HOP(options.output, "code") || options.output.code) {
             if (options.sourceMap) {
+                if (typeof options.sourceMap.content == "string") {
+                    options.sourceMap.content = JSON.parse(options.sourceMap.content);
+                }
                 options.output.source_map = SourceMap({
                     file: options.sourceMap.filename,
-                    orig: source_maps,
+                    orig: options.sourceMap.content,
                     root: options.sourceMap.root
                 });
                 if (options.sourceMap.includeSources) {
-                    if (files instanceof AST_Toplevel) {
-                        throw new Error("original source content unavailable");
-                    } else for (var name in files) if (HOP(files, name)) {
+                    for (var name in files) {
                         options.output.source_map.get().setSourceContent(name, files[name]);
                     }
-                } else {
-                    options.output.source_map.get()._sourcesContents = null;
                 }
             }
             delete options.output.ast;
@@ -215,25 +142,6 @@ function minify(files, options) {
                 }
             }
         }
-        if (options.nameCache && options.mangle) {
-            if (options.mangle.cache) options.nameCache.vars = to_json(options.mangle.cache);
-            if (options.mangle.properties && options.mangle.properties.cache) {
-                options.nameCache.props = to_json(options.mangle.properties.cache);
-            }
-        }
-        if (timings) {
-            timings.end = Date.now();
-            result.timings = {
-                parse: 1e-3 * (timings.rename - timings.parse),
-                rename: 1e-3 * (timings.compress - timings.rename),
-                compress: 1e-3 * (timings.scope - timings.compress),
-                scope: 1e-3 * (timings.mangle - timings.scope),
-                mangle: 1e-3 * (timings.properties - timings.mangle),
-                properties: 1e-3 * (timings.output - timings.properties),
-                output: 1e-3 * (timings.end - timings.output),
-                total: 1e-3 * (timings.end - timings.start)
-            }
-        }
         if (warnings.length) {
             result.warnings = warnings;
         }

lib/mozilla-ast.js

@@ -43,9 +43,11 @@
 
 "use strict";
 
-(function() {
-    function normalize_directives(body) {
+(function(){
+
+    var normalize_directives = function(body) {
         var in_directive = true;
+
         for (var i = 0; i < body.length; i++) {
             if (in_directive && body[i] instanceof AST_Statement && body[i].body instanceof AST_String) {
                 body[i] = new AST_Directive({
@@ -57,8 +59,9 @@
                 in_directive = false;
             }
         }
+
         return body;
-    }
+    };
 
     var MOZ_TO_ME = {
         Program: function(M) {
@@ -108,25 +111,29 @@
         },
         Property: function(M) {
             var key = M.key;
+            var name = key.type == "Identifier" ? key.name : key.value;
             var args = {
                 start    : my_start_token(key),
                 end      : my_end_token(M.value),
-                key      : key.type == "Identifier" ? key.name : key.value,
+                key      : name,
                 value    : from_moz(M.value)
             };
-            if (M.kind == "init") return new AST_ObjectKeyVal(args);
-            args.key = new AST_SymbolAccessor({
-                name: args.key
-            });
-            args.value = new AST_Accessor(args.value);
-            if (M.kind == "get") return new AST_ObjectGetter(args);
-            if (M.kind == "set") return new AST_ObjectSetter(args);
+            switch (M.kind) {
+              case "init":
+                return new AST_ObjectKeyVal(args);
+              case "set":
+                args.value.name = from_moz(key);
+                return new AST_ObjectSetter(args);
+              case "get":
+                args.value.name = from_moz(key);
+                return new AST_ObjectGetter(args);
+            }
         },
         ArrayExpression: function(M) {
             return new AST_Array({
                 start    : my_start_token(M),
                 end      : my_end_token(M),
-                elements : M.elements.map(function(elem) {
+                elements : M.elements.map(function(elem){
                     return elem === null ? new AST_Hole() : from_moz(elem);
                 })
             });
@@ -135,7 +142,7 @@
             return new AST_Object({
                 start      : my_start_token(M),
                 end        : my_end_token(M),
-                properties : M.properties.map(function(prop) {
+                properties : M.properties.map(function(prop){
                     prop.type = "Property";
                     return from_moz(prop)
                 })
@@ -165,7 +172,7 @@
             });
         },
         VariableDeclaration: function(M) {
-            return new AST_Var({
+            return new (M.kind === "const" ? AST_Const : AST_Var)({
                 start       : my_start_token(M),
                 end         : my_end_token(M),
                 definitions : M.declarations.map(from_moz)
@@ -177,17 +184,6 @@
                 end    : my_end_token(M)
             };
             if (val === null) return new AST_Null(args);
-            var rx = M.regex;
-            if (rx && rx.pattern) {
-                // RegExpLiteral as per ESTree AST spec
-                args.value = new RegExp(rx.pattern, rx.flags);
-                args.value.raw_source = rx.pattern;
-                return new AST_RegExp(args);
-            } else if (rx) {
-                // support legacy RegExp
-                args.value = M.regex && M.raw ? M.raw : val;
-                return new AST_RegExp(args);
-            }
             switch (typeof val) {
               case "string":
                 args.value = val;
@@ -197,12 +193,22 @@
                 return new AST_Number(args);
               case "boolean":
                 return new (val ? AST_True : AST_False)(args);
+              default:
+                var rx = M.regex;
+                if (rx && rx.pattern) {
+                    // RegExpLiteral as per ESTree AST spec
+                    args.value = new RegExp(rx.pattern, rx.flags).toString();
+                } else {
+                    // support legacy RegExp
+                    args.value = M.regex && M.raw ? M.raw : val;
+                }
+                return new AST_RegExp(args);
             }
         },
         Identifier: function(M) {
             var p = FROM_MOZ_STACK[FROM_MOZ_STACK.length - 2];
             return new (  p.type == "LabeledStatement" ? AST_Label
-                        : p.type == "VariableDeclarator" && p.id === M ? AST_SymbolVar
+                        : p.type == "VariableDeclarator" && p.id === M ? (p.kind == "const" ? AST_SymbolConst : AST_SymbolVar)
                         : p.type == "FunctionExpression" ? (p.id === M ? AST_SymbolLambda : AST_SymbolFunarg)
                         : p.type == "FunctionDeclaration" ? (p.id === M ? AST_SymbolDefun : AST_SymbolFunarg)
                         : p.type == "CatchClause" ? AST_SymbolCatch
@@ -254,7 +260,10 @@
     map("CallExpression", AST_Call, "callee>expression, arguments@args");
 
     def_to_moz(AST_Toplevel, function To_Moz_Program(M) {
-        return to_moz_scope("Program", M);
+        return {
+            type: "Program",
+            body: M.body.map(to_moz)
+        };
     });
 
     def_to_moz(AST_Defun, function To_Moz_FunctionDeclaration(M) {
@@ -262,7 +271,7 @@
             type: "FunctionDeclaration",
             id: to_moz(M.name),
             params: M.argnames.map(to_moz),
-            body: to_moz_scope("BlockStatement", M)
+            body: to_moz_block(M)
         }
     });
 
@@ -271,7 +280,7 @@
             type: "FunctionExpression",
             id: to_moz(M.name),
             params: M.argnames.map(to_moz),
-            body: to_moz_scope("BlockStatement", M)
+            body: to_moz_block(M)
         }
     });
 
@@ -322,7 +331,7 @@
     def_to_moz(AST_Definitions, function To_Moz_VariableDeclaration(M) {
         return {
             type: "VariableDeclaration",
-            kind: "var",
+            kind: M instanceof AST_Const ? "const" : "var",
             declarations: M.definitions.map(to_moz)
         };
     });
@@ -377,10 +386,11 @@
     });
 
     def_to_moz(AST_ObjectProperty, function To_Moz_Property(M) {
-        var key = {
-            type: "Literal",
-            value: M.key instanceof AST_SymbolAccessor ? M.key.name : M.key
-        };
+        var key = (
+            is_identifier(M.key)
+            ? {type: "Identifier", name: M.key}
+            : {type: "Literal", value: M.key}
+        );
         var kind;
         if (M instanceof AST_ObjectKeyVal) {
             kind = "init";
@@ -408,15 +418,14 @@
     });
 
     def_to_moz(AST_RegExp, function To_Moz_RegExpLiteral(M) {
-        var flags = M.value.toString().match(/[gimuy]*$/)[0];
-        var value = "/" + M.value.raw_source + "/" + flags;
+        var value = M.value;
         return {
             type: "Literal",
             value: value,
-            raw: value,
+            raw: value.toString(),
             regex: {
-                pattern: M.value.raw_source,
-                flags: flags
+                pattern: value.source,
+                flags: value.toString().match(/[gimuy]*$/)[0]
             }
         };
     });
@@ -477,7 +486,7 @@
             endpos  : range ? range[0] : moznode.start,
             raw     : raw_token(moznode),
         });
-    }
+    };
 
     function my_end_token(moznode) {
         var loc = moznode.loc, end = loc && loc.end;
@@ -492,7 +501,7 @@
             endpos  : range ? range[1] : moznode.end,
             raw     : raw_token(moznode),
         });
-    }
+    };
 
     function map(moztype, mytype, propmap) {
         var moz_to_me = "function From_Moz_" + moztype + "(M){\n";
@@ -504,7 +513,7 @@
         me_to_moz += "return {\n" +
             "type: " + JSON.stringify(moztype);
 
-        if (propmap) propmap.split(/\s*,\s*/).forEach(function(prop) {
+        if (propmap) propmap.split(/\s*,\s*/).forEach(function(prop){
             var m = /([a-z0-9$_]+)(=|@|>|%)([a-z0-9$_]+)/i.exec(prop);
             if (!m) throw new Error("Can't understand property map: " + prop);
             var moz = m[1], how = m[2], my = m[3];
@@ -542,12 +551,12 @@
         moz_to_me = new Function("U2", "my_start_token", "my_end_token", "from_moz", "return(" + moz_to_me + ")")(
             exports, my_start_token, my_end_token, from_moz
         );
-        me_to_moz = new Function("to_moz", "to_moz_block", "to_moz_scope", "return(" + me_to_moz + ")")(
-            to_moz, to_moz_block, to_moz_scope
+        me_to_moz = new Function("to_moz", "to_moz_block", "return(" + me_to_moz + ")")(
+            to_moz, to_moz_block
         );
         MOZ_TO_ME[moztype] = moz_to_me;
         def_to_moz(mytype, me_to_moz);
-    }
+    };
 
     var FROM_MOZ_STACK = null;
 
@@ -556,28 +565,13 @@
         var ret = node != null ? MOZ_TO_ME[node.type](node) : null;
         FROM_MOZ_STACK.pop();
         return ret;
-    }
+    };
 
-    AST_Node.from_mozilla_ast = function(node) {
+    AST_Node.from_mozilla_ast = function(node){
         var save_stack = FROM_MOZ_STACK;
         FROM_MOZ_STACK = [];
         var ast = from_moz(node);
         FROM_MOZ_STACK = save_stack;
-        ast.walk(new TreeWalker(function(node) {
-            if (node instanceof AST_LabelRef) {
-                for (var level = 0, parent; parent = this.parent(level); level++) {
-                    if (parent instanceof AST_Scope) break;
-                    if (parent instanceof AST_LabeledStatement && parent.label.name == node.name) {
-                        node.thedef = parent.label;
-                        break;
-                    }
-                }
-                if (!node.thedef) {
-                    var s = node.start;
-                    js_error("Undefined label " + node.name, s.file, s.line, s.col, s.pos);
-                }
-            }
-        }));
         return ast;
     };
 
@@ -597,33 +591,23 @@
             }
         }
         return moznode;
-    }
+    };
 
     function def_to_moz(mytype, handler) {
         mytype.DEFMETHOD("to_mozilla_ast", function() {
             return set_moz_loc(this, handler(this));
         });
-    }
+    };
 
     function to_moz(node) {
         return node != null ? node.to_mozilla_ast() : null;
-    }
+    };
 
     function to_moz_block(node) {
         return {
             type: "BlockStatement",
             body: node.body.map(to_moz)
         };
-    }
+    };
 
-    function to_moz_scope(type, node) {
-        var body = node.body.map(to_moz);
-        if (node.body[0] instanceof AST_SimpleStatement && node.body[0].body instanceof AST_String) {
-            body.unshift(to_moz(new AST_EmptyStatement(node.body[0])));
-        }
-        return {
-            type: type,
-            body: body
-        };
-    }
 })();

lib/propmangle.js

@@ -44,6 +44,15 @@
 "use strict";
 
 function find_builtins(reserved) {
+
+    // Compatibility fix for some standard defined globals not defined on every js environment
+    var new_globals = ["Symbol", "Map", "Promise", "Proxy", "Reflect", "Set", "WeakMap", "WeakSet"];
+    var objects = {};
+
+    new_globals.forEach(function (new_global) {
+        objects[new_global] = global[new_global] || new Function();
+    });
+
     // NaN will be included due to Number.NaN
     [
         "null",
@@ -55,8 +64,16 @@ function find_builtins(reserved) {
     ].forEach(add);
     [ Object, Array, Function, Number,
       String, Boolean, Error, Math,
-      Date, RegExp
-    ].forEach(function(ctor) {
+      Date, RegExp, objects.Symbol, ArrayBuffer,
+      DataView, decodeURI, decodeURIComponent,
+      encodeURI, encodeURIComponent, eval, EvalError,
+      Float32Array, Float64Array, Int8Array, Int16Array,
+      Int32Array, isFinite, isNaN, JSON, objects.Map, parseFloat,
+      parseInt, objects.Promise, objects.Proxy, RangeError, ReferenceError,
+      objects.Reflect, objects.Set, SyntaxError, TypeError, Uint8Array,
+      Uint8ClampedArray, Uint16Array, Uint32Array, URIError,
+      objects.WeakMap, objects.WeakSet
+    ].forEach(function(ctor){
         Object.getOwnPropertyNames(ctor).map(add);
         if (ctor.prototype) {
             Object.getOwnPropertyNames(ctor.prototype).map(add);
@@ -67,34 +84,6 @@ function find_builtins(reserved) {
     }
 }
 
-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);
-        } else if (node instanceof AST_Sub) {
-            addStrings(node.property, add);
-        }
-    }));
-}
-
-function addStrings(node, add) {
-    node.walk(new TreeWalker(function(node) {
-        if (node instanceof AST_Sequence) {
-            addStrings(node.tail_node(), add);
-        } else if (node instanceof AST_String) {
-            add(node.value);
-        } else if (node instanceof AST_Conditional) {
-            addStrings(node.consequent, add);
-            addStrings(node.alternative, add);
-        }
-        return true;
-    }));
-}
-
 function mangle_properties(ast, options) {
     options = defaults(options, {
         builtins: false,
@@ -104,24 +93,21 @@ function mangle_properties(ast, options) {
         only_cache: false,
         regex: null,
         reserved: null,
-    }, true);
+    });
 
-    var reserved = options.reserved;
-    if (!Array.isArray(reserved)) reserved = [];
+    var reserved = options.reserved || [];
     if (!options.builtins) find_builtins(reserved);
 
-    var cname = -1;
-    var cache;
-    if (options.cache) {
-        cache = options.cache.props;
-        cache.each(function(mangled_name) {
-            push_uniq(reserved, mangled_name);
-        });
-    } else {
-        cache = new Dictionary();
+    var cache = options.cache;
+    if (cache == null) {
+        cache = {
+            cname: -1,
+            props: new Dictionary()
+        };
     }
 
     var regex = options.regex;
+    var keep_quoted = options.keep_quoted;
 
     // note debug is either false (disabled), or a string of the debug suffix to use (enabled).
     // note debug may be enabled as an empty string, which is falsey. Also treat passing 'true'
@@ -134,11 +120,12 @@ function mangle_properties(ast, options) {
 
     var names_to_mangle = [];
     var unmangleable = [];
+    var to_keep = {};
 
     // step 1: find candidates to mangle
-    ast.walk(new TreeWalker(function(node) {
+    ast.walk(new TreeWalker(function(node){
         if (node instanceof AST_ObjectKeyVal) {
-            add(node.key);
+            add(node.key, keep_quoted && node.quote);
         }
         else if (node instanceof AST_ObjectProperty) {
             // setter or getter, since KeyVal is handled above
@@ -148,18 +135,18 @@ function mangle_properties(ast, options) {
             add(node.property);
         }
         else if (node instanceof AST_Sub) {
-            addStrings(node.property, add);
+            addStrings(node.property, keep_quoted);
         }
-        else if (node instanceof AST_Call
-            && node.expression.print_to_string() == "Object.defineProperty") {
-            addStrings(node.args[1], add);
+        else if (node instanceof AST_ConciseMethod) {
+            add(node.name.name);
         }
     }));
 
     // step 2: transform the tree, renaming properties
-    return ast.transform(new TreeTransformer(function(node) {
+    return ast.transform(new TreeTransformer(function(node){
         if (node instanceof AST_ObjectKeyVal) {
-            node.key = mangle(node.key);
+            if (!(keep_quoted && node.quote))
+                node.key = mangle(node.key);
         }
         else if (node instanceof AST_ObjectProperty) {
             // setter or getter
@@ -168,13 +155,27 @@ function mangle_properties(ast, options) {
         else if (node instanceof AST_Dot) {
             node.property = mangle(node.property);
         }
-        else if (!options.keep_quoted && node instanceof AST_Sub) {
-            node.property = mangleStrings(node.property);
+        else if (node instanceof AST_Sub) {
+            if (!keep_quoted)
+                node.property = mangleStrings(node.property);
         }
-        else if (node instanceof AST_Call
-            && node.expression.print_to_string() == "Object.defineProperty") {
-            node.args[1] = mangleStrings(node.args[1]);
+        else if (node instanceof AST_ConciseMethod) {
+            if (should_mangle(node.name.name)) {
+                node.name.name = mangle(node.name.name);
+            }
         }
+        // else if (node instanceof AST_String) {
+        //     if (should_mangle(node.value)) {
+        //         AST_Node.warn(
+        //             "Found \"{prop}\" property candidate for mangling in an arbitrary string [{file}:{line},{col}]", {
+        //                 file : node.start.file,
+        //                 line : node.start.line,
+        //                 col  : node.start.col,
+        //                 prop : node.value
+        //             }
+        //         );
+        //     }
+        // }
     }));
 
     // only function declarations after this line
@@ -183,20 +184,26 @@ function mangle_properties(ast, options) {
         if (unmangleable.indexOf(name) >= 0) return false;
         if (reserved.indexOf(name) >= 0) return false;
         if (options.only_cache) {
-            return cache.has(name);
+            return cache.props.has(name);
         }
         if (/^-?[0-9]+(\.[0-9]+)?(e[+-][0-9]+)?$/.test(name)) return false;
         return true;
     }
 
     function should_mangle(name) {
+        if (keep_quoted && name in to_keep) return false;
         if (regex && !regex.test(name)) return false;
         if (reserved.indexOf(name) >= 0) return false;
-        return cache.has(name)
+        return cache.props.has(name)
             || names_to_mangle.indexOf(name) >= 0;
     }
 
-    function add(name) {
+    function add(name, keep) {
+        if (keep) {
+            to_keep[name] = true;
+            return;
+        }
+
         if (can_mangle(name))
             push_uniq(names_to_mangle, name);
 
@@ -210,31 +217,60 @@ function mangle_properties(ast, options) {
             return name;
         }
 
-        var mangled = cache.get(name);
+        var mangled = cache.props.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 + "_";
 
-                if (can_mangle(debug_mangled)) {
+                if (can_mangle(debug_mangled) && !(keep_quoted && debug_mangled in to_keep)) {
                     mangled = debug_mangled;
                 }
             }
 
             // either debug mode is off, or it is on and we could not use the mangled name
             if (!mangled) {
+                // Note: `can_mangle()` does not check if the name collides with the `to_keep` set
+                // (filled with quoted properties when `keep_quoted` is set). Make sure we add this
+                // check so we don't collide with a quoted name.
                 do {
-                    mangled = base54(++cname);
-                } while (!can_mangle(mangled));
+                    mangled = base54(++cache.cname);
+                } while (!can_mangle(mangled) || keep_quoted && mangled in to_keep);
             }
 
-            cache.set(name, mangled);
+            cache.props.set(name, mangled);
         }
         return mangled;
     }
 
+    function addStrings(node, keep) {
+        var out = {};
+        try {
+            (function walk(node){
+                node.walk(new TreeWalker(function(node){
+                    if (node instanceof AST_Sequence) {
+                        walk(node.expressions[node.expressions.length - 1]);
+                        return true;
+                    }
+                    if (node instanceof AST_String) {
+                        add(node.value, keep);
+                        return true;
+                    }
+                    if (node instanceof AST_Conditional) {
+                        walk(node.consequent);
+                        walk(node.alternative);
+                        return true;
+                    }
+                    throw out;
+                }));
+            })(node);
+        } catch(ex) {
+            if (ex !== out) throw ex;
+        }
+    }
+
     function mangleStrings(node) {
-        return node.transform(new TreeTransformer(function(node) {
+        return node.transform(new TreeTransformer(function(node){
             if (node instanceof AST_Sequence) {
                 var last = node.expressions.length - 1;
                 node.expressions[last] = mangleStrings(node.expressions[last]);

lib/scope.js

@@ -43,19 +43,19 @@
 
 "use strict";
 
-function SymbolDef(scope, orig, init) {
+function SymbolDef(scope, index, orig) {
     this.name = orig.name;
     this.orig = [ orig ];
-    this.init = init;
-    this.eliminated = 0;
     this.scope = scope;
     this.references = [];
-    this.replaced = 0;
     this.global = false;
+    this.export = false;
     this.mangled_name = null;
+    this.object_destructuring_arg = false;
     this.undeclared = false;
+    this.index = index;
     this.id = SymbolDef.next_id++;
-}
+};
 
 SymbolDef.next_id = 1;
 
@@ -63,35 +63,42 @@ SymbolDef.prototype = {
     unmangleable: function(options) {
         if (!options) options = {};
 
-        return this.global && !options.toplevel
+        return (this.global && !options.toplevel)
+            || this.export
+            || this.object_destructuring_arg
             || this.undeclared
-            || !options.eval && this.scope.pinned()
-            || options.keep_fnames
+            || (!options.eval && (this.scope.uses_eval || this.scope.uses_with))
+            || (options.keep_fnames
                 && (this.orig[0] instanceof AST_SymbolLambda
-                    || this.orig[0] instanceof AST_SymbolDefun);
+                    || this.orig[0] instanceof AST_SymbolDefun))
+            || this.orig[0] instanceof AST_SymbolMethod
+            || (options.keep_classnames
+                && (this.orig[0] instanceof AST_SymbolClass
+                    || this.orig[0] instanceof AST_SymbolDefClass));
     },
     mangle: function(options) {
         var cache = options.cache && options.cache.props;
         if (this.global && cache && cache.has(this.name)) {
             this.mangled_name = cache.get(this.name);
-        } else if (!this.mangled_name && !this.unmangleable(options)) {
+        }
+        else if (!this.mangled_name && !this.unmangleable(options)) {
+            var s = this.scope;
+            var sym = this.orig[0];
+            if (options.ie8 && sym instanceof AST_SymbolLambda)
+                s = s.parent_scope;
             var def;
-            if (def = this.redefined()) {
+            if (this.defun && (def = this.defun.variables.get(this.name))) {
                 this.mangled_name = def.mangled_name || def.name;
-            } else {
-                this.mangled_name = next_mangled_name(this.scope, options, this);
-            }
+            } else
+                this.mangled_name = s.next_mangled(options, this);
             if (this.global && cache) {
                 cache.set(this.name, this.mangled_name);
             }
         }
-    },
-    redefined: function() {
-        return this.defun && this.defun.variables.get(this.name);
     }
 };
 
-AST_Toplevel.DEFMETHOD("figure_out_scope", function(options) {
+AST_Toplevel.DEFMETHOD("figure_out_scope", function(options){
     options = defaults(options, {
         cache: null,
         ie8: false,
@@ -100,26 +107,70 @@ AST_Toplevel.DEFMETHOD("figure_out_scope", function(options) {
     // pass 1: setup scope chaining and handle definitions
     var self = this;
     var scope = self.parent_scope = null;
+    var labels = new Dictionary();
     var defun = null;
-    var tw = new TreeWalker(function(node, descend) {
-        if (node instanceof AST_Catch) {
+    var in_destructuring = null;
+    var in_export = false;
+    var in_block = 0;
+    var tw = new TreeWalker(function(node, descend){
+        if (node.is_block_scope()) {
             var save_scope = scope;
             scope = new AST_Scope(node);
             scope.init_scope_vars(save_scope);
+            if (!(node instanceof AST_Scope)) {
+                scope.uses_with = save_scope.uses_with;
+                scope.uses_eval = save_scope.uses_eval;
+                scope.directives = save_scope.directives;
+            }
             descend();
             scope = save_scope;
             return true;
         }
+        if (node instanceof AST_Destructuring && node.is_array === false) {
+            in_destructuring = node;  // These don't nest
+            descend();
+            in_destructuring = null;
+            return true;
+        }
         if (node instanceof AST_Scope) {
             node.init_scope_vars(scope);
             var save_scope = scope;
             var save_defun = defun;
+            var save_labels = labels;
             defun = scope = node;
+            labels = new Dictionary();
             descend();
             scope = save_scope;
             defun = save_defun;
+            labels = save_labels;
             return true;        // don't descend again in TreeWalker
         }
+        if (node instanceof AST_Export) {
+            in_export = true;
+            descend();
+            in_export = false;
+            return true;
+        }
+        if (node instanceof AST_BlockStatement
+            || node instanceof AST_Switch
+            || node instanceof AST_Try
+            || node instanceof AST_Catch
+            || node instanceof AST_Finally) {
+            in_block++;
+            descend();
+            in_block--;
+            return true;
+        }
+        if (node instanceof AST_LabeledStatement) {
+            var l = node.label;
+            if (labels.has(l.name)) {
+                throw new Error(string_template("Label {name} defined twice", l));
+            }
+            labels.set(l.name, l);
+            descend();
+            labels.del(l.name);
+            return true;        // no descend again
+        }
         if (node instanceof AST_With) {
             for (var s = scope; s; s = s.parent_scope)
                 s.uses_with = true;
@@ -128,12 +179,15 @@ AST_Toplevel.DEFMETHOD("figure_out_scope", function(options) {
         if (node instanceof AST_Symbol) {
             node.scope = scope;
         }
+        if (node instanceof AST_SymbolFunarg) {
+            node.object_destructuring_arg = !!in_destructuring;
+        }
         if (node instanceof AST_Label) {
             node.thedef = node;
             node.references = [];
         }
         if (node instanceof AST_SymbolLambda) {
-            defun.def_function(node, node.name == "arguments" ? undefined : defun);
+            defun.def_function(node, in_export, in_block);
         }
         else if (node instanceof AST_SymbolDefun) {
             // Careful here, the scope where this should be defined is
@@ -141,28 +195,71 @@ AST_Toplevel.DEFMETHOD("figure_out_scope", function(options) {
             // scope when we encounter the AST_Defun node (which is
             // instanceof AST_Scope) but we get to the symbol a bit
             // later.
-            (node.scope = defun.parent_scope).def_function(node, defun);
+            var parent_lambda = defun.parent_scope;
+            while (parent_lambda.is_block_scope()) {
+                parent_lambda = parent_lambda.parent_scope;
+            }
+            (node.scope = parent_lambda).def_function(node, in_export, in_block);
         }
-        else if (node instanceof AST_SymbolVar) {
-            defun.def_variable(node, node.TYPE == "SymbolVar" ? null : undefined);
+        else if (node instanceof AST_SymbolClass) {
+            defun.def_variable(node, in_export, in_block);
+        }
+        else if (node instanceof AST_SymbolImport) {
+            scope.def_variable(node, in_export, in_block);
+        }
+        else if (node instanceof AST_SymbolDefClass) {
+            // This deals with the name of the class being available
+            // inside the class.
+            (node.scope = defun.parent_scope).def_function(node, in_export, in_block);
+        }
+        else if (node instanceof AST_SymbolVar
+            || node instanceof AST_SymbolLet
+            || node instanceof AST_SymbolConst) {
+            var def = ((node instanceof AST_SymbolBlockDeclaration) ? scope : defun).def_variable(node, in_export, in_block);
+            def.destructuring = in_destructuring;
             if (defun !== scope) {
                 node.mark_enclosed(options);
                 var def = scope.find_variable(node);
                 if (node.thedef !== def) {
                     node.thedef = def;
+                    node.reference(options);
                 }
-                node.reference(options);
             }
         }
         else if (node instanceof AST_SymbolCatch) {
-            scope.def_variable(node).defun = defun;
+            scope.def_variable(node, in_export, in_block).defun = defun;
+        }
+        else if (node instanceof AST_LabelRef) {
+            var sym = labels.get(node.name);
+            if (!sym) throw new Error(string_template("Undefined label {name} [{line},{col}]", {
+                name: node.name,
+                line: node.start.line,
+                col: node.start.col
+            }));
+            node.thedef = sym;
         }
     });
     self.walk(tw);
 
     // pass 2: find back references and eval
-    self.globals = new Dictionary();
-    var tw = new TreeWalker(function(node, descend) {
+    var func = null;
+    var cls = null;
+    var globals = self.globals = new Dictionary();
+    var tw = new TreeWalker(function(node, descend){
+        if (node instanceof AST_Lambda) {
+            var prev_func = func;
+            func = node;
+            descend();
+            func = prev_func;
+            return true;
+        }
+        if (node instanceof AST_Class) {
+            var prev_cls = cls;
+            cls = node;
+            descend();
+            cls = prev_cls;
+            return true;
+        }
         if (node instanceof AST_LoopControl && node.label) {
             node.label.thedef.references.push(node);
             return true;
@@ -175,25 +272,16 @@ AST_Toplevel.DEFMETHOD("figure_out_scope", function(options) {
                 }
             }
             var sym = node.scope.find_variable(name);
+            if (node.scope instanceof AST_Lambda && name == "arguments") {
+                node.scope.uses_arguments = true;
+            }
             if (!sym) {
                 sym = self.def_global(node);
-            } else if (sym.scope instanceof AST_Lambda && name == "arguments") {
-                sym.scope.uses_arguments = true;
             }
             node.thedef = sym;
             node.reference(options);
             return true;
         }
-        // ensure mangling works if catch reuses a scope variable
-        var def;
-        if (node instanceof AST_SymbolCatch && (def = node.definition().redefined())) {
-            var s = node.scope;
-            while (s) {
-                push_uniq(s.enclosed, def);
-                if (s === def.scope) break;
-                s = s.parent_scope;
-            }
-        }
     });
     self.walk(tw);
 
@@ -210,19 +298,22 @@ AST_Toplevel.DEFMETHOD("figure_out_scope", function(options) {
                     ref.reference(options);
                 });
                 node.thedef = def;
-                node.reference(options);
                 return true;
             }
         }));
     }
+
+    if (options.cache) {
+        this.cname = options.cache.cname;
+    }
 });
 
-AST_Toplevel.DEFMETHOD("def_global", function(node) {
+AST_Toplevel.DEFMETHOD("def_global", function(node){
     var globals = this.globals, name = node.name;
     if (globals.has(name)) {
         return globals.get(name);
     } else {
-        var g = new SymbolDef(this, node);
+        var g = new SymbolDef(this, globals.size(), node);
         g.undeclared = true;
         g.global = true;
         globals.set(name, g);
@@ -230,7 +321,7 @@ AST_Toplevel.DEFMETHOD("def_global", function(node) {
     }
 });
 
-AST_Scope.DEFMETHOD("init_scope_vars", function(parent_scope) {
+AST_Scope.DEFMETHOD("init_scope_vars", function(parent_scope){
     this.variables = new Dictionary();  // map name to AST_SymbolVar (variables defined in this scope; includes functions)
     this.functions = new Dictionary();  // map name to AST_SymbolDefun (functions defined in this scope)
     this.uses_with = false;             // will be set to true if this or some nested scope uses the `with` statement
@@ -240,10 +331,27 @@ AST_Scope.DEFMETHOD("init_scope_vars", function(parent_scope) {
     this.cname = -1;                    // the current index for mangling functions/variables
 });
 
-AST_Lambda.DEFMETHOD("init_scope_vars", function() {
+AST_Node.DEFMETHOD("is_block_scope", function(){
+    return false; // Behaviour will be overridden by AST_Block
+});
+
+AST_Block.DEFMETHOD("is_block_scope", function(){
+    return (
+        !(this instanceof AST_Lambda) &&
+        !(this instanceof AST_Toplevel) &&
+        !(this instanceof AST_Class) &&
+        !(this instanceof AST_SwitchBranch)
+    );
+});
+
+AST_IterationStatement.DEFMETHOD("is_block_scope", function(){
+     return true;
+});
+
+AST_Lambda.DEFMETHOD("init_scope_vars", function(){
     AST_Scope.prototype.init_scope_vars.apply(this, arguments);
     this.uses_arguments = false;
-    this.def_variable(new AST_SymbolFunarg({
+    this.def_variable(new AST_SymbolConst({
         name: "arguments",
         start: this.start,
         end: this.end
@@ -270,144 +378,149 @@ AST_Symbol.DEFMETHOD("reference", function(options) {
     this.mark_enclosed(options);
 });
 
-AST_Scope.DEFMETHOD("find_variable", function(name) {
+AST_Scope.DEFMETHOD("find_variable", function(name){
     if (name instanceof AST_Symbol) name = name.name;
     return this.variables.get(name)
         || (this.parent_scope && this.parent_scope.find_variable(name));
 });
 
-AST_Scope.DEFMETHOD("def_function", function(symbol, init) {
-    var def = this.def_variable(symbol, init);
-    if (!def.init || def.init instanceof AST_Defun) def.init = init;
-    this.functions.set(symbol.name, def);
-    return def;
+AST_Scope.DEFMETHOD("def_function", function(symbol, in_export, in_block){
+    this.functions.set(symbol.name, this.def_variable(symbol, in_export, in_block));
 });
 
-AST_Scope.DEFMETHOD("def_variable", function(symbol, init) {
-    var def = this.variables.get(symbol.name);
-    if (def) {
-        def.orig.push(symbol);
-        if (def.init && (def.scope !== symbol.scope || def.init instanceof AST_Function)) {
-            def.init = init;
+AST_Scope.DEFMETHOD("def_variable", function(symbol, in_export, in_block){
+    var def;
+    if (!this.variables.has(symbol.name)) {
+        def = new SymbolDef(this, this.variables.size(), symbol);
+        this.variables.set(symbol.name, def);
+        def.object_destructuring_arg = symbol.object_destructuring_arg;
+        if (in_export) {
+            def.export = true;
+        }
+        if (in_block && symbol instanceof AST_SymbolBlockDeclaration) {
+            def.global = false;
+        } else {
+            def.global = !this.parent_scope;
         }
     } else {
-        def = new SymbolDef(this, symbol, init);
-        this.variables.set(symbol.name, def);
-        def.global = !this.parent_scope;
+        def = this.variables.get(symbol.name);
+        def.orig.push(symbol);
     }
     return symbol.thedef = def;
 });
 
-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 = [];
-        scope.enclosed.forEach(function(def) {
-            if (def.unmangleable(options)) names[def.name] = true;
-        });
-    }
-    return names;
-}
+AST_Scope.DEFMETHOD("next_mangled", function(options){
+    var ext = this.enclosed;
+    out: while (true) {
+        var m = base54(++this.cname);
+        if (!is_identifier(m)) continue; // skip over "do"
 
-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);
+        // https://github.com/mishoo/UglifyJS2/issues/242 -- do not
+        // shadow a name reserved from mangling.
+        if (options.reserved.indexOf(m) >= 0) continue;
+
+        // we must ensure that the mangled name does not shadow a name
+        // from some parent scope that is referenced in this or in
+        // inner scopes.
+        for (var i = ext.length; --i >= 0;) {
+            var sym = ext[i];
+            var name = sym.mangled_name || (sym.unmangleable(options) && sym.name);
+            if (m == name) continue out;
+        }
+        return m;
+    }
+});
+
+AST_Function.DEFMETHOD("next_mangled", function(options, def){
     // #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;
-        do {
-            if (scopes.indexOf(scope) < 0) {
-                for (var name in names_in_use(scope, options)) {
-                    names[name] = true;
-                }
-                scopes.push(scope);
-            } else break;
-        } while (scope = scope.parent_scope);
-    });
-    var name;
-    for (var i = 0, len = holes.length; i < len; i++) {
-        name = base54(holes[i]);
-        if (names[name]) continue;
-        holes.splice(i, 1);
-        scope.names_in_use[name] = true;
-        return name;
-    }
-    while (true) {
-        name = base54(++scope.cname);
-        if (in_use[name] || !is_identifier(name) || options.reserved.has[name]) continue;
-        if (!names[name]) break;
-        holes.push(scope.cname);
-    }
-    scope.names_in_use[name] = true;
-    if (options.ie8 && def.orig[0] instanceof AST_SymbolLambda) {
-        names_in_use(scope.parent_scope, options)[name] = true;
-    }
-    return name;
-}
 
-AST_Symbol.DEFMETHOD("unmangleable", function(options) {
+    var tricky_def = def.orig[0] instanceof AST_SymbolFunarg && this.name && this.name.definition();
+
+    // the function's mangled_name is null when keep_fnames is true
+    var tricky_name = tricky_def ? tricky_def.mangled_name || tricky_def.name : null;
+
+    while (true) {
+        var name = AST_Lambda.prototype.next_mangled.call(this, options, def);
+        if (!tricky_name || tricky_name != name)
+            return name;
+    }
+});
+
+AST_Symbol.DEFMETHOD("unmangleable", function(options){
     var def = this.definition();
-    return !def || def.unmangleable(options);
+    return def && def.unmangleable(options);
+});
+
+// property accessors are not mangleable
+AST_SymbolAccessor.DEFMETHOD("unmangleable", function(){
+    return true;
 });
 
 // labels are always mangleable
-AST_Label.DEFMETHOD("unmangleable", return_false);
-
-AST_Symbol.DEFMETHOD("unreferenced", function() {
-    return !this.definition().references.length && !this.scope.pinned();
+AST_Label.DEFMETHOD("unmangleable", function(){
+    return false;
 });
 
-AST_Symbol.DEFMETHOD("definition", function() {
+AST_Symbol.DEFMETHOD("unreferenced", function(){
+    return this.definition().references.length == 0
+        && !(this.scope.uses_eval || this.scope.uses_with);
+});
+
+AST_Symbol.DEFMETHOD("undeclared", function(){
+    return this.definition().undeclared;
+});
+
+AST_LabelRef.DEFMETHOD("undeclared", function(){
+    return false;
+});
+
+AST_Label.DEFMETHOD("undeclared", function(){
+    return false;
+});
+
+AST_Symbol.DEFMETHOD("definition", function(){
     return this.thedef;
 });
 
-AST_Symbol.DEFMETHOD("global", function() {
+AST_Symbol.DEFMETHOD("global", function(){
     return this.definition().global;
 });
 
-function _default_mangler_options(options) {
-    options = defaults(options, {
+AST_Toplevel.DEFMETHOD("_default_mangler_options", function(options){
+    return defaults(options, {
         eval        : false,
         ie8         : false,
+        keep_classnames: false,
         keep_fnames : false,
         reserved    : [],
         toplevel    : false,
     });
-    if (!Array.isArray(options.reserved)) options.reserved = [];
-    // Never mangle arguments
-    push_uniq(options.reserved, "arguments");
-    options.reserved.has = makePredicate(options.reserved);
-    return options;
-}
+});
 
-AST_Toplevel.DEFMETHOD("mangle_names", function(options) {
-    options = _default_mangler_options(options);
+AST_Toplevel.DEFMETHOD("mangle_names", function(options){
+    options = this._default_mangler_options(options);
+
+    // Never mangle arguments
+    options.reserved.push('arguments');
 
     // We only need to mangle declaration nodes.  Special logic wired
     // into the code generator will display the mangled name if it's
     // present (and for AST_SymbolRef-s it'll use the mangled name of
     // the AST_SymbolDeclaration that it points to).
     var lname = -1;
+    var to_mangle = [];
 
-    if (options.cache && options.cache.props) {
-        var mangled_names = this.mangled_names = Object.create(null);
-        options.cache.props.each(function(mangled_name) {
-            mangled_names[mangled_name] = true;
+    if (options.cache) {
+        this.globals.each(function(symbol){
+            if (options.reserved.indexOf(symbol.name) < 0) {
+                to_mangle.push(symbol);
+            }
         });
     }
 
-    var redefined = [];
-    var tw = new TreeWalker(function(node, descend) {
+    var tw = new TreeWalker(function(node, descend){
         if (node instanceof AST_LabeledStatement) {
             // lname is incremented when we get to the AST_Label
             var save_nesting = lname;
@@ -416,12 +529,14 @@ AST_Toplevel.DEFMETHOD("mangle_names", function(options) {
             return true;        // don't descend again in TreeWalker
         }
         if (node instanceof AST_Scope) {
-            descend();
-            if (options.cache && node instanceof AST_Toplevel) {
-                node.globals.each(mangle);
-            }
-            node.variables.each(mangle);
-            return true;
+            var p = tw.parent(), a = [];
+            node.variables.each(function(symbol){
+                if (options.reserved.indexOf(symbol.name) < 0) {
+                    a.push(symbol);
+                }
+            });
+            to_mangle.push.apply(to_mangle, a);
+            return;
         }
         if (node instanceof AST_Label) {
             var name;
@@ -429,171 +544,136 @@ AST_Toplevel.DEFMETHOD("mangle_names", function(options) {
             node.mangled_name = name;
             return true;
         }
-        if (!options.ie8 && node instanceof AST_Catch) {
-            var def = node.argname.definition();
-            var redef = def.redefined();
-            if (redef) {
-                redefined.push(def);
-                reference(node.argname);
-                def.references.forEach(reference);
-            }
-            descend();
-            if (!redef) mangle(def);
-            return true;
-        }
-
-        function reference(sym) {
-            sym.thedef = redef;
-            sym.reference(options);
-            sym.thedef = def;
+        var mangle_with_block_scope =
+            (!options.ie8 && node instanceof AST_SymbolCatch) ||
+            node instanceof AST_SymbolBlockDeclaration;
+        if (mangle_with_block_scope) {
+            to_mangle.push(node.definition());
+            return;
         }
     });
     this.walk(tw);
-    redefined.forEach(mangle);
-
-    function mangle(def) {
-        if (options.reserved.has[def.name]) return;
+    to_mangle.forEach(function(def){
+        if (def.destructuring && !def.destructuring.is_array) return;
         def.mangle(options);
+    });
+
+    if (options.cache) {
+        options.cache.cname = this.cname;
     }
 });
 
-AST_Toplevel.DEFMETHOD("find_colliding_names", function(options) {
-    var cache = options.cache && options.cache.props;
-    var avoid = Object.create(null);
-    options.reserved.forEach(to_avoid);
-    this.globals.each(add_def);
-    this.walk(new TreeWalker(function(node) {
-        if (node instanceof AST_Scope) node.variables.each(add_def);
-        if (node instanceof AST_SymbolCatch) add_def(node.definition());
-    }));
-    return avoid;
-
-    function to_avoid(name) {
-        avoid[name] = true;
-    }
-
-    function add_def(def) {
-        var name = def.name;
-        if (def.global && cache && cache.has(name)) name = cache.get(name);
-        else if (!def.unmangleable(options)) return;
-        to_avoid(name);
-    }
-});
-
-AST_Toplevel.DEFMETHOD("expand_names", function(options) {
-    base54.reset();
-    base54.sort();
-    options = _default_mangler_options(options);
-    var avoid = this.find_colliding_names(options);
-    var cname = 0;
-    this.globals.each(rename);
-    this.walk(new TreeWalker(function(node) {
-        if (node instanceof AST_Scope) node.variables.each(rename);
-        if (node instanceof AST_SymbolCatch) rename(node.definition());
-    }));
-
-    function next_name() {
-        var name;
-        do {
-            name = base54(cname++);
-        } while (avoid[name] || !is_identifier(name));
-        return name;
-    }
-
-    function rename(def) {
-        if (def.global && options.cache) return;
-        if (def.unmangleable(options)) return;
-        if (options.reserved.has[def.name]) return;
-        var d = def.redefined();
-        def.name = d ? d.name : next_name();
-        def.orig.forEach(function(sym) {
-            sym.name = def.name;
-        });
-        def.references.forEach(function(sym) {
-            sym.name = def.name;
-        });
-    }
-});
-
-AST_Node.DEFMETHOD("tail_node", return_this);
-AST_Sequence.DEFMETHOD("tail_node", function() {
-    return this.expressions[this.expressions.length - 1];
-});
-
-AST_Toplevel.DEFMETHOD("compute_char_frequency", function(options) {
-    options = _default_mangler_options(options);
-    base54.reset();
-    try {
-        AST_Node.prototype.print = function(stream, force_parens) {
-            this._print(stream, force_parens);
-            if (this instanceof AST_Symbol && !this.unmangleable(options)) {
-                base54.consider(this.name, -1);
-            } else if (options.properties) {
-                if (this instanceof AST_Dot) {
-                    base54.consider(this.property, -1);
-                } else if (this instanceof AST_Sub) {
-                    skip_string(this.property);
-                }
-            }
-        };
-        base54.consider(this.print_to_string(), 1);
-    } finally {
-        AST_Node.prototype.print = AST_Node.prototype._print;
-    }
-    base54.sort();
-
-    function skip_string(node) {
-        if (node instanceof AST_String) {
-            base54.consider(node.value, -1);
-        } else if (node instanceof AST_Conditional) {
-            skip_string(node.consequent);
-            skip_string(node.alternative);
-        } else if (node instanceof AST_Sequence) {
-            skip_string(node.tail_node());
+AST_Toplevel.DEFMETHOD("compute_char_frequency", function(options){
+    options = this._default_mangler_options(options);
+    var tw = new TreeWalker(function(node){
+        if (node instanceof AST_Constant)
+            base54.consider(node.print_to_string());
+        else if (node instanceof AST_Return)
+            base54.consider("return");
+        else if (node instanceof AST_Throw)
+            base54.consider("throw");
+        else if (node instanceof AST_Continue)
+            base54.consider("continue");
+        else if (node instanceof AST_Break)
+            base54.consider("break");
+        else if (node instanceof AST_Debugger)
+            base54.consider("debugger");
+        else if (node instanceof AST_Directive)
+            base54.consider(node.value);
+        else if (node instanceof AST_While)
+            base54.consider("while");
+        else if (node instanceof AST_Do)
+            base54.consider("do while");
+        else if (node instanceof AST_If) {
+            base54.consider("if");
+            if (node.alternative) base54.consider("else");
         }
-    }
+        else if (node instanceof AST_Var)
+            base54.consider("var");
+        else if (node instanceof AST_Const)
+            base54.consider("const");
+        else if (node instanceof AST_Lambda)
+            base54.consider("function");
+        else if (node instanceof AST_For)
+            base54.consider("for");
+        else if (node instanceof AST_ForIn)
+            base54.consider("for in");
+        else if (node instanceof AST_Switch)
+            base54.consider("switch");
+        else if (node instanceof AST_Case)
+            base54.consider("case");
+        else if (node instanceof AST_Default)
+            base54.consider("default");
+        else if (node instanceof AST_With)
+            base54.consider("with");
+        else if (node instanceof AST_ObjectSetter)
+            base54.consider("set" + (typeof node.key === "string" ? node.key : ""));
+        else if (node instanceof AST_ObjectGetter)
+            base54.consider("get" + (typeof node.key === "string" ? node.key : ""));
+        else if (node instanceof AST_ObjectKeyVal && typeof node.key === "string")
+            base54.consider(node.key);
+        else if (node instanceof AST_ConciseMethod && typeof node.key === "string")
+            base54.consider(node.key);
+        else if (node instanceof AST_New)
+            base54.consider("new");
+        else if (node instanceof AST_This)
+            base54.consider("this");
+        else if (node instanceof AST_Super)
+            base54.consider("super");
+        else if (node instanceof AST_Try)
+            base54.consider("try");
+        else if (node instanceof AST_Catch)
+            base54.consider("catch");
+        else if (node instanceof AST_Finally)
+            base54.consider("finally");
+        else if (node instanceof AST_Yield)
+            base54.consider("yield");
+        else if (node instanceof AST_Symbol && node.unmangleable(options))
+            base54.consider(node.name);
+        else if (node instanceof AST_Unary || node instanceof AST_Binary)
+            base54.consider(node.operator);
+        else if (node instanceof AST_Dot)
+            base54.consider(node.property);
+    });
+    this.walk(tw);
+    base54.sort();
 });
 
 var base54 = (function() {
-    var freq = Object.create(null);
-    function init(chars) {
-        var array = [];
-        for (var i = 0, len = chars.length; i < len; i++) {
-            var ch = chars[i];
-            array.push(ch);
-            freq[ch] = -1e-2 * i;
-        }
-        return array;
-    }
-    var digits = init("0123456789");
-    var leading = init("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ$_");
+    var string = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ$_0123456789";
     var chars, frequency;
     function reset() {
-        frequency = Object.create(freq);
+        frequency = Object.create(null);
+        chars = string.split("").map(function(ch){ return ch.charCodeAt(0) });
+        chars.forEach(function(ch){ frequency[ch] = 0 });
     }
-    base54.consider = function(str, delta) {
+    base54.consider = function(str){
         for (var i = str.length; --i >= 0;) {
-            frequency[str[i]] += delta;
+            var code = str.charCodeAt(i);
+            if (code in frequency) ++frequency[code];
         }
     };
-    function compare(a, b) {
-        return frequency[b] - frequency[a];
-    }
     base54.sort = function() {
-        chars = leading.sort(compare).concat(digits.sort(compare));
+        chars = mergeSort(chars, function(a, b){
+            if (is_digit(a) && !is_digit(b)) return 1;
+            if (is_digit(b) && !is_digit(a)) return -1;
+            return frequency[b] - frequency[a];
+        });
     };
     base54.reset = reset;
     reset();
+    base54.get = function(){ return chars };
+    base54.freq = function(){ return frequency };
     function base54(num) {
         var ret = "", base = 54;
         num++;
         do {
             num--;
-            ret += chars[num % base];
+            ret += String.fromCharCode(chars[num % base]);
             num = Math.floor(num / base);
             base = 64;
         } while (num > 0);
         return ret;
-    }
+    };
     return base54;
 })();

lib/sourcemap.js

@@ -46,59 +46,52 @@
 // a small wrapper around fitzgen's source-map library
 function SourceMap(options) {
     options = defaults(options, {
-        file: null,
-        root: null,
-        orig: null,
-        orig_line_diff: 0,
-        dest_line_diff: 0,
-    }, true);
-    var generator = new MOZ_SourceMap.SourceMapGenerator({
-        file: options.file,
-        sourceRoot: options.root
+        file : null,
+        root : null,
+        orig : null,
+
+        orig_line_diff : 0,
+        dest_line_diff : 0,
     });
-    var maps = options.orig && Object.create(null);
-    if (maps) for (var source in options.orig) {
-        var map = new MOZ_SourceMap.SourceMapConsumer(options.orig[source]);
-        if (Array.isArray(options.orig[source].sources)) {
-            map._sources.toArray().forEach(function(source) {
-                var sourceContent = map.sourceContentFor(source, true);
-                if (sourceContent) generator.setSourceContent(source, sourceContent);
-            });
-        }
-        maps[source] = map;
-    }
-    return {
-        add: function(source, gen_line, gen_col, orig_line, orig_col, name) {
-            var map = maps && maps[source];
-            if (map) {
-                var info = map.originalPositionFor({
-                    line: orig_line,
-                    column: orig_col
-                });
-                if (info.source === null) return;
-                source = info.source;
-                orig_line = info.line;
-                orig_col = info.column;
-                name = info.name || name;
+    var generator = new MOZ_SourceMap.SourceMapGenerator({
+        file       : options.file,
+        sourceRoot : options.root
+    });
+    var orig_map = options.orig && new MOZ_SourceMap.SourceMapConsumer(options.orig);
+
+    if (orig_map && Array.isArray(options.orig.sources)) {
+        orig_map._sources.toArray().forEach(function(source) {
+            var sourceContent = orig_map.sourceContentFor(source, true);
+            if (sourceContent) {
+                generator.setSourceContent(source, sourceContent);
             }
-            generator.addMapping({
-                name: name,
-                source: source,
-                generated: {
-                    line: gen_line + options.dest_line_diff,
-                    column: gen_col
-                },
-                original: {
-                    line: orig_line + options.orig_line_diff,
-                    column: orig_col
-                }
+        });
+    }
+
+    function add(source, gen_line, gen_col, orig_line, orig_col, name) {
+        if (orig_map) {
+            var info = orig_map.originalPositionFor({
+                line: orig_line,
+                column: orig_col
             });
-        },
-        get: function() {
-            return generator;
-        },
-        toString: function() {
-            return JSON.stringify(generator.toJSON());
+            if (info.source === null) {
+                return;
+            }
+            source = info.source;
+            orig_line = info.line;
+            orig_col = info.column;
+            name = info.name || name;
         }
+        generator.addMapping({
+            generated : { line: gen_line + options.dest_line_diff, column: gen_col },
+            original  : { line: orig_line + options.orig_line_diff, column: orig_col },
+            source    : source,
+            name      : name
+        });
     };
-}
+    return {
+        add        : add,
+        get        : function() { return generator },
+        toString   : function() { return JSON.stringify(generator.toJSON()); }
+    };
+};

lib/transform.js

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

lib/utils.js

@@ -43,27 +43,40 @@
 
 "use strict";
 
+function array_to_hash(a) {
+    var ret = Object.create(null);
+    for (var i = 0; i < a.length; ++i)
+        ret[a[i]] = true;
+    return ret;
+};
+
+function slice(a, start) {
+    return Array.prototype.slice.call(a, start || 0);
+};
+
 function characters(str) {
     return str.split("");
-}
+};
 
 function member(name, array) {
     return array.indexOf(name) >= 0;
-}
+};
 
 function find_if(func, array) {
     for (var i = 0, n = array.length; i < n; ++i) {
-        if (func(array[i])) return array[i];
+        if (func(array[i]))
+            return array[i];
     }
-}
+};
 
 function repeat_string(str, i) {
     if (i <= 0) return "";
     if (i == 1) return str;
     var d = repeat_string(str, i >> 1);
     d += d;
-    return i & 1 ? d + str : d;
-}
+    if (i & 1) d += str;
+    return d;
+};
 
 function configure_error_stack(fn) {
     Object.defineProperty(fn.prototype, "stack", {
@@ -82,23 +95,27 @@ function configure_error_stack(fn) {
 function DefaultsError(msg, defs) {
     this.message = msg;
     this.defs = defs;
-}
+};
 DefaultsError.prototype = Object.create(Error.prototype);
 DefaultsError.prototype.constructor = DefaultsError;
 DefaultsError.prototype.name = "DefaultsError";
 configure_error_stack(DefaultsError);
 
+DefaultsError.croak = function(msg, defs) {
+    throw new DefaultsError(msg, defs);
+};
+
 function defaults(args, defs, croak) {
-    if (args === true) args = {};
+    if (args === true)
+        args = {};
     var ret = args || {};
-    if (croak) for (var i in ret) if (HOP(ret, i) && !HOP(defs, i)) {
-        throw new DefaultsError("`" + i + "` is not a supported option", defs);
-    }
+    if (croak) for (var i in ret) if (HOP(ret, i) && !HOP(defs, i))
+        DefaultsError.croak("`" + i + "` is not a supported option", defs);
     for (var i in defs) if (HOP(defs, i)) {
         ret[i] = (args && HOP(args, i)) ? args[i] : defs[i];
     }
     return ret;
-}
+};
 
 function merge(obj, ext) {
     var count = 0;
@@ -107,7 +124,7 @@ function merge(obj, ext) {
         count++;
     }
     return count;
-}
+};
 
 function noop() {}
 function return_false() { return false; }
@@ -115,7 +132,7 @@ function return_true() { return true; }
 function return_this() { return this; }
 function return_null() { return null; }
 
-var MAP = (function() {
+var MAP = (function(){
     function MAP(a, f, backwards) {
         var ret = [], top = [], i;
         function doit() {
@@ -138,8 +155,8 @@ var MAP = (function() {
                 }
             }
             return is_last;
-        }
-        if (Array.isArray(a)) {
+        };
+        if (a instanceof Array) {
             if (backwards) {
                 for (i = a.length; --i >= 0;) if (doit()) break;
                 ret.reverse();
@@ -152,54 +169,127 @@ var MAP = (function() {
             for (i in a) if (HOP(a, i)) if (doit()) break;
         }
         return top.concat(ret);
-    }
+    };
     MAP.at_top = function(val) { return new AtTop(val) };
     MAP.splice = function(val) { return new Splice(val) };
     MAP.last = function(val) { return new Last(val) };
     var skip = MAP.skip = {};
-    function AtTop(val) { this.v = val }
-    function Splice(val) { this.v = val }
-    function Last(val) { this.v = val }
+    function AtTop(val) { this.v = val };
+    function Splice(val) { this.v = val };
+    function Last(val) { this.v = val };
     return MAP;
 })();
 
 function push_uniq(array, el) {
     if (array.indexOf(el) < 0)
         array.push(el);
-}
+};
 
 function string_template(text, props) {
-    return text.replace(/\{(.+?)\}/g, function(str, p) {
+    return text.replace(/\{(.+?)\}/g, function(str, p){
         return props && props[p];
     });
-}
+};
 
 function remove(array, el) {
     for (var i = array.length; --i >= 0;) {
         if (array[i] === el) array.splice(i, 1);
     }
-}
+};
 
-function makePredicate(words) {
-    if (!Array.isArray(words)) words = words.split(" ");
-    var map = Object.create(null);
-    words.forEach(function(word) {
-        map[word] = true;
+function mergeSort(array, cmp) {
+    if (array.length < 2) return array.slice();
+    function merge(a, b) {
+        var r = [], ai = 0, bi = 0, i = 0;
+        while (ai < a.length && bi < b.length) {
+            cmp(a[ai], b[bi]) <= 0
+                ? r[i++] = a[ai++]
+                : r[i++] = b[bi++];
+        }
+        if (ai < a.length) r.push.apply(r, a.slice(ai));
+        if (bi < b.length) r.push.apply(r, b.slice(bi));
+        return r;
+    };
+    function _ms(a) {
+        if (a.length <= 1)
+            return a;
+        var m = Math.floor(a.length / 2), left = a.slice(0, m), right = a.slice(m);
+        left = _ms(left);
+        right = _ms(right);
+        return merge(left, right);
+    };
+    return _ms(array);
+};
+
+function set_difference(a, b) {
+    return a.filter(function(el){
+        return b.indexOf(el) < 0;
     });
-    return map;
-}
+};
+
+function set_intersection(a, b) {
+    return a.filter(function(el){
+        return b.indexOf(el) >= 0;
+    });
+};
+
+// this function is taken from Acorn [1], written by Marijn Haverbeke
+// [1] https://github.com/marijnh/acorn
+function makePredicate(words) {
+    if (!(words instanceof Array)) words = words.split(" ");
+    var f = "", cats = [];
+    out: for (var i = 0; i < words.length; ++i) {
+        for (var j = 0; j < cats.length; ++j)
+            if (cats[j][0].length == words[i].length) {
+                cats[j].push(words[i]);
+                continue out;
+            }
+        cats.push([words[i]]);
+    }
+    function quote(word) {
+        return JSON.stringify(word).replace(/[\u2028\u2029]/g, function(s) {
+            switch (s) {
+                case "\u2028": return "\\u2028";
+                case "\u2029": return "\\u2029";
+            }
+            return s;
+        });
+    }
+    function compareTo(arr) {
+        if (arr.length == 1) return f += "return str === " + quote(arr[0]) + ";";
+        f += "switch(str){";
+        for (var i = 0; i < arr.length; ++i) f += "case " + quote(arr[i]) + ":";
+        f += "return true}return false;";
+    }
+    // When there are more than three length categories, an outer
+    // switch first dispatches on the lengths, to save on comparisons.
+    if (cats.length > 3) {
+        cats.sort(function(a, b) {return b.length - a.length;});
+        f += "switch(str.length){";
+        for (var i = 0; i < cats.length; ++i) {
+            var cat = cats[i];
+            f += "case " + cat[0].length + ":";
+            compareTo(cat);
+        }
+        f += "}";
+        // Otherwise, simply generate a flat `switch` statement.
+    } else {
+        compareTo(words);
+    }
+    return new Function("str", f);
+};
 
 function all(array, predicate) {
     for (var i = array.length; --i >= 0;)
         if (!predicate(array[i]))
             return false;
     return true;
-}
+};
 
 function Dictionary() {
     this._values = Object.create(null);
     this._size = 0;
-}
+};
 Dictionary.prototype = {
     set: function(key, val) {
         if (!this.has(key)) ++this._size;
@@ -236,13 +326,6 @@ Dictionary.prototype = {
             ret.push(f(this._values[i], i.substr(1)));
         return ret;
     },
-    clone: function() {
-        var ret = new Dictionary();
-        for (var i in this._values)
-            ret._values[i] = this._values[i];
-        ret._size = this._size;
-        return ret;
-    },
     toObject: function() { return this._values }
 };
 Dictionary.fromObject = function(obj) {
@@ -260,22 +343,20 @@ function HOP(obj, prop) {
 // a statement.
 function first_in_statement(stack) {
     var node = stack.parent(-1);
-    for (var i = 0, p; p = stack.parent(i++); node = p) {
-        if (p.TYPE == "Call") {
-            if (p.expression === node) continue;
-        } else if (p instanceof AST_Binary) {
-            if (p.left === node) continue;
-        } else if (p instanceof AST_Conditional) {
-            if (p.condition === node) continue;
-        } else if (p instanceof AST_PropAccess) {
-            if (p.expression === node) continue;
-        } else if (p instanceof AST_Sequence) {
-            if (p.expressions[0] === node) continue;
-        } else if (p instanceof AST_Statement) {
-            return p.body === node;
-        } else if (p instanceof AST_UnaryPostfix) {
-            if (p.expression === node) continue;
+    for (var i = 0, p; p = stack.parent(i); i++) {
+        if (p instanceof AST_Statement && p.body === node)
+            return true;
+        if ((p instanceof AST_Sequence      && p.expressions[0] === node) ||
+            (p instanceof AST_Call          && p.expression === node && !(p instanceof AST_New) ) ||
+            (p instanceof AST_Dot           && p.expression === node ) ||
+            (p instanceof AST_Sub           && p.expression === node ) ||
+            (p instanceof AST_Conditional   && p.condition === node  ) ||
+            (p instanceof AST_Binary        && p.left === node       ) ||
+            (p instanceof AST_UnaryPostfix  && p.expression === node ))
+        {
+            node = p;
+        } else {
+            return false;
         }
-        return false;
     }
 }

package.json

@@ -1,17 +1,23 @@
 {
-  "name": "uglify-js",
+  "name": "uglify-es",
   "description": "JavaScript parser, mangler/compressor and beautifier toolkit",
+  "homepage": "http://lisperator.net/uglifyjs",
   "author": "Mihai Bazon <mihai.bazon@gmail.com> (http://lisperator.net/)",
   "license": "BSD-2-Clause",
-  "version": "3.4.1",
+  "version": "3.0.3",
   "engines": {
     "node": ">=0.8.0"
   },
   "maintainers": [
-    "Alex Lam <alexlamsl@gmail.com>",
     "Mihai Bazon <mihai.bazon@gmail.com> (http://lisperator.net/)"
   ],
-  "repository": "mishoo/UglifyJS2",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/mishoo/UglifyJS2.git"
+  },
+  "bugs": {
+    "url": "https://github.com/mishoo/UglifyJS2/issues"
+  },
   "main": "tools/node.js",
   "bin": {
     "uglifyjs": "bin/uglifyjs"
@@ -23,38 +29,26 @@
     "LICENSE"
   ],
   "dependencies": {
-    "commander": "~2.15.0",
-    "source-map": "~0.6.1"
+    "commander": "~2.9.0",
+    "source-map": "~0.5.1"
   },
   "devDependencies": {
-    "acorn": "~5.5.3",
-    "semver": "~5.5.0"
+    "acorn": "~0.6.0",
+    "escodegen": "~1.3.3",
+    "esfuzz": "~0.3.1",
+    "estraverse": "~1.5.1",
+    "mocha": "~2.3.4"
+  },
+  "optionalDependencies": {
+    "uglify-to-browserify": "~1.0.0"
+  },
+  "browserify": {
+    "transform": [
+      "uglify-to-browserify"
+    ]
   },
   "scripts": {
     "test": "node test/run-tests.js"
   },
-  "keywords": [
-    "cli",
-    "compress",
-    "compressor",
-    "ecma",
-    "ecmascript",
-    "es",
-    "es5",
-    "javascript",
-    "js",
-    "jsmin",
-    "min",
-    "minification",
-    "minifier",
-    "minify",
-    "optimize",
-    "optimizer",
-    "pack",
-    "packer",
-    "parse",
-    "parser",
-    "uglifier",
-    "uglify"
-  ]
+  "keywords": ["uglify", "uglify-js", "minify", "minifier"]
 }

test/benchmark.js

@@ -4,14 +4,12 @@
 "use strict";
 
 var createHash = require("crypto").createHash;
-var fetch = require("./fetch");
 var fork = require("child_process").fork;
-var zlib = require("zlib");
 var args = process.argv.slice(2);
 if (!args.length) {
     args.push("-mc");
 }
-args.push("--timings");
+args.push("--stats");
 var urls = [
     "https://code.jquery.com/jquery-3.2.1.js",
     "https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.6.4/angular.js",
@@ -21,29 +19,28 @@ var urls = [
     "http://builds.emberjs.com/tags/v2.11.0/ember.prod.js",
     "https://cdn.jsdelivr.net/lodash/4.17.4/lodash.js",
     "https://cdnjs.cloudflare.com/ajax/libs/d3/4.5.0/d3.js",
-    "https://raw.githubusercontent.com/kangax/html-minifier/v3.5.7/dist/htmlminifier.js",
 ];
 var results = {};
 var remaining = 2 * urls.length;
 function done() {
     if (!--remaining) {
         var failures = [];
-        var sum = { input: 0, output: 0, gzip: 0 };
         urls.forEach(function(url) {
             var info = results[url];
             console.log();
             console.log(url);
-            console.log(info.log);
+            var elapsed = 0;
+            console.log(info.log.replace(/Elapsed: ([0-9]+)\s*/g, function(match, time) {
+                elapsed += 1e-3 * parseInt(time);
+                return "";
+            }));
+            console.log("Run-time:", elapsed.toFixed(3), "s");
             console.log("Original:", info.input, "bytes");
             console.log("Uglified:", info.output, "bytes");
-            console.log("GZipped: ", info.gzip, "bytes");
             console.log("SHA1 sum:", info.sha1);
             if (info.code) {
                 failures.push(url);
             }
-            sum.input += info.input;
-            sum.output += info.output;
-            sum.gzip += info.gzip;
         });
         if (failures.length) {
             console.error("Benchmark failed:");
@@ -51,13 +48,6 @@ function done() {
                 console.error(url);
             });
             process.exit(1);
-        } else {
-            console.log();
-            console.log("Subtotal");
-            console.log();
-            console.log("Original:", sum.input, "bytes");
-            console.log("Uglified:", sum.output, "bytes");
-            console.log("GZipped: ", sum.gzip, "bytes");
         }
     }
 }
@@ -65,21 +55,15 @@ urls.forEach(function(url) {
     results[url] = {
         input: 0,
         output: 0,
-        gzip: 0,
         log: ""
     };
-    fetch(url, function(err, res) {
-        if (err) throw err;
+    require(url.slice(0, url.indexOf(":"))).get(url, function(res) {
         var uglifyjs = fork("bin/uglifyjs", args, { silent: true });
         res.on("data", function(data) {
             results[url].input += data.length;
         }).pipe(uglifyjs.stdin);
         uglifyjs.stdout.on("data", function(data) {
             results[url].output += data.length;
-        }).pipe(zlib.createGzip({
-            level: zlib.Z_BEST_COMPRESSION
-        })).on("data", function(data) {
-            results[url].gzip += data.length;
         }).pipe(createHash("sha1")).on("data", function(data) {
             results[url].sha1 = data.toString("hex");
             done();

test/compress/arguments.js

@@ -1,119 +0,0 @@
-replace_index: {
-    options = {
-        arguments: true,
-        evaluate: true,
-        properties: true,
-    }
-    input: {
-        console.log(arguments && arguments[0]);
-        (function() {
-            console.log(arguments[1], arguments["1"], arguments["foo"]);
-        })("bar", 42);
-        (function(a, b) {
-            console.log(arguments[1], arguments["1"], arguments["foo"]);
-        })("bar", 42);
-        (function(arguments) {
-            console.log(arguments[1], arguments["1"], arguments["foo"]);
-        })("bar", 42);
-        (function() {
-            var arguments;
-            console.log(arguments[1], arguments["1"], arguments["foo"]);
-        })("bar", 42);
-    }
-    expect: {
-        console.log(arguments && arguments[0]);
-        (function() {
-            console.log(arguments[1], arguments[1], arguments.foo);
-        })("bar", 42);
-        (function(a, b) {
-            console.log(b, b, arguments.foo);
-        })("bar", 42);
-        (function(arguments) {
-            console.log(arguments[1], arguments[1], arguments.foo);
-        })("bar", 42);
-        (function() {
-            var arguments;
-            console.log(arguments[1], arguments[1], arguments.foo);
-        })("bar", 42);
-    }
-    expect_stdout: [
-        "undefined",
-        "42 42 undefined",
-        "42 42 undefined",
-        "a a undefined",
-        "42 42 undefined",
-    ]
-}
-
-replace_index_keep_fargs: {
-    options = {
-        arguments: true,
-        evaluate: true,
-        keep_fargs: false,
-        properties: true,
-    }
-    input: {
-        console.log(arguments && arguments[0]);
-        (function() {
-            console.log(arguments[1], arguments["1"], arguments["foo"]);
-        })("bar", 42);
-        (function(a, b) {
-            console.log(arguments[1], arguments["1"], arguments["foo"]);
-        })("bar", 42);
-        (function(arguments) {
-            console.log(arguments[1], arguments["1"], arguments["foo"]);
-        })("bar", 42);
-        (function() {
-            var arguments;
-            console.log(arguments[1], arguments["1"], arguments["foo"]);
-        })("bar", 42);
-    }
-    expect: {
-        console.log(arguments && arguments[0]);
-        (function(argument_0, argument_1) {
-            console.log(argument_1, argument_1, arguments.foo);
-        })("bar", 42);
-        (function(a, b) {
-            console.log(b, b, arguments.foo);
-        })("bar", 42);
-        (function(arguments) {
-            console.log(arguments[1], arguments[1], arguments.foo);
-        })("bar", 42);
-        (function() {
-            var arguments;
-            console.log(arguments[1], arguments[1], arguments.foo);
-        })("bar", 42);
-    }
-    expect_stdout: [
-        "undefined",
-        "42 42 undefined",
-        "42 42 undefined",
-        "a a undefined",
-        "42 42 undefined",
-    ]
-}
-
-modified: {
-    options = {
-        arguments: true,
-    }
-    input: {
-        (function(a, b) {
-            var c = arguments[0];
-            var d = arguments[1];
-            a = "foo";
-            b++;
-            console.log(a, b, c, d, arguments[0], arguments[1]);
-        })("bar", 42);
-    }
-    expect: {
-        (function(a, b) {
-            var c = a;
-            var d = b;
-            a = "foo";
-            b++;
-            console.log(a, b, c, d, a, b);
-        })("bar", 42);
-    }
-    expect_stdout: "foo 43 bar 42 foo 43"
-}

test/compress/arrays.js

@@ -1,3 +1,5 @@
+// NOTE trailing comma doesn't contribute to length of an array
+// That also means the array changes length if previous element is a hole too and got cut off
 holes_and_undefined: {
     input: {
         w = [1,,];
@@ -91,6 +93,79 @@ constant_join_2: {
     }
 }
 
+spread_with_variable_as_last_element: {
+    input: {
+        var values = [4, 5, 6];
+        var a = [1, 2, 3, ...values];
+    }
+    expect: {
+        var values = [4, 5, 6];
+        var a = [1, 2, 3, ...values];
+    }
+}
+
+spread_with_variable_in_middle: {
+    input: {
+        var values = [4, 5, 6];
+        var a = [1, 2, 3, ...values, 7,,,];
+    }
+    expect: {
+        var values = [4, 5, 6];
+        var a = [1, 2, 3, ...values, 7,,,];
+    }
+}
+
+spread_with_variable_at_front: {
+    input: {
+        var values = [1, 2, 3];
+        var a = [...values, 4, 5, 6];
+    }
+    expect: {
+        var values = [1, 2, 3];
+        var a = [...values, 4, 5, 6];
+    }
+}
+
+spread_with_variable_at_front_after_elisions: {
+    input: {
+        var values = [1, 2, 3];
+        var a = [,,,...values, 4, 5, 6];
+    }
+    expect: {
+        var values = [1, 2, 3];
+        var a = [,,,...values, 4, 5, 6];
+    }
+}
+
+spread_with_array_at_end: {
+    input: {
+        var a = [1, 2, ...[4, 5, 6]];
+    }
+    expect: {
+        var a = [1, 2, ...[4, 5, 6]];
+    }
+}
+
+spread_with_logical_expression_at_end: {
+    options = { evaluate: true }
+    input: {
+        var a = [1, 2, 3, ...[2+2]]
+    }
+    expect: {
+        var a = [1, 2, 3, ...[4]]
+    }
+}
+
+spread_with_logical_expression_at_middle: {
+    options = { evaluate: true }
+    input: {
+        var a = [1, 1, ...[1+1, 1+2, 2+3], 8]
+    }
+    expect: {
+        var a = [1, 1, ...[2, 3, 5], 8]
+    }
+}
+
 constant_join_3: {
     options = {
         unsafe: true,
@@ -128,114 +203,50 @@ constant_join_3: {
 
 for_loop: {
     options = {
-        evaluate: true,
-        reduce_funcs: true,
-        reduce_vars: true,
-        unsafe: true,
-        unused: true,
+        unsafe      : true,
+        unused      : true,
+        evaluate    : true,
+        reduce_vars : true
     };
     input: {
         function f0() {
             var a = [1, 2, 3];
-            var b = 0;
-            for (var i = 0; i < a.length; i++)
-                b += a[i];
-            return b;
+            for (var i = 0; i < a.length; i++) {
+                console.log(a[i]);
+            }
         }
+
         function f1() {
             var a = [1, 2, 3];
-            var b = 0;
-            for (var i = 0, len = a.length; i < len; i++)
-                b += a[i];
-            return b;
+            for (var i = 0, len = a.length; i < len; i++) {
+                console.log(a[i]);
+            }
         }
+
         function f2() {
             var a = [1, 2, 3];
-            for (var i = 0; i < a.length; i++)
+            for (var i = 0; i < a.length; i++) {
                 a[i]++;
-            return a[2];
+            }
         }
-        console.log(f0(), f1(), f2());
     }
     expect: {
         function f0() {
             var a = [1, 2, 3];
-            var b = 0;
             for (var i = 0; i < 3; i++)
-                b += a[i];
-            return b;
+                console.log(a[i]);
         }
+
         function f1() {
             var a = [1, 2, 3];
-            var b = 0;
             for (var i = 0; i < 3; i++)
-                b += a[i];
-            return b;
+                console.log(a[i]);
         }
+
         function f2() {
             var a = [1, 2, 3];
             for (var i = 0; i < a.length; i++)
                 a[i]++;
-            return a[2];
         }
-        console.log(f0(), f1(), f2());
     }
-    expect_stdout: "6 6 4"
-}
-
-index: {
-    options = {
-        evaluate: true,
-        reduce_funcs: true,
-        reduce_vars: true,
-        toplevel: true,
-        unsafe: true,
-        unused: true,
-    }
-    input: {
-        var a = [ 1, 2 ];
-        console.log(a[0], a[1]);
-    }
-    expect: {
-        console.log(1, 2);
-    }
-    expect_stdout: "1 2"
-}
-
-length: {
-    options = {
-        evaluate: true,
-        reduce_funcs: true,
-        reduce_vars: true,
-        toplevel: true,
-        unsafe: true,
-        unused: true,
-    }
-    input: {
-        var a = [ 1, 2 ];
-        console.log(a.length);
-    }
-    expect: {
-        console.log(2);
-    }
-    expect_stdout: "2"
-}
-
-index_length: {
-    options = {
-        evaluate: true,
-        reduce_funcs: true,
-        reduce_vars: true,
-        toplevel: true,
-        unsafe: true,
-        unused: true,
-    }
-    input: {
-        var a = [ 1, 2 ];
-        console.log(a[0], a.length);
-    }
-    expect: {
-        console.log(1, 2);
-    }
-    expect_stdout: "1 2"
 }

test/compress/arrow.js

@@ -0,0 +1,137 @@
+arrow_functions_without_body: {
+    input: {
+        var a1 = () => 42;
+        var a2 = (p) => p;
+        var a3 = p => p;
+        var a4 = (...p) => p;
+        var a5 = (b, c) => b + c;
+        var a6 = (b, ...c) => b + c[0];
+        var a7 = (...b) => b.join();
+    }
+    expect: {
+        var a1 = () => 42;
+        var a2 = (p) => p;
+        var a3 = p => p;
+        var a4 = (...p) => p;
+        var a5 = (b, c) => b + c;
+        var a6 = (b, ...c) => b + c[0];
+        var a7 = (...b) => b.join();
+    }
+}
+
+arrow_functions_with_body: {
+    input: {
+        var a1 = () => {
+            var a = 42 * Math.random();
+            return a;
+        };
+        var a2 = (p) => {
+            var a = Math.random() * p;
+            return a;
+        };
+        var a3 = p => {
+            var a = Math.random() * p;
+            return a;
+        };
+        var a4 = (...p) => {
+            var a = Math.random() * p;
+            return a;
+        };
+        var a5 = (b, c) => {
+            var result = b * c + b / c;
+            return result
+        };
+        var a6 = (b, ...c) => {
+            var result = b;
+            for (var i = 0; i < c.length; i++)
+                result += c[i];
+            return result
+        };
+        var a7 = (...b) => {
+            b.join();
+        }
+    }
+    expect: {
+        var a1 = () => {
+            var a = 42 * Math.random();
+            return a;
+        };
+        var a2 = (p) => {
+            var a = Math.random() * p;
+            return a;
+        };
+        var a3 = p => {
+            var a = Math.random() * p;
+            return a;
+        };
+        var a4 = (...p) => {
+            var a = Math.random() * p;
+            return a;
+        };
+        var a5 = (b, c) => {
+            var result = b * c + b / c;
+            return result
+        };
+        var a6 = (b, ...c) => {
+            var result = b;
+            for (var i = 0; i < c.length; i++)
+                result += c[i];
+            return result
+        };
+        var a7 = (...b) => {
+            b.join();
+        };
+    }
+}
+
+arrow_function_with_single_parameter_with_default: {
+    input: {
+        var foo = (a = 0) => doSomething(a);
+    }
+    expect_exact: "var foo=(a=0)=>doSomething(a);"
+}
+
+arrow_binding_pattern: {
+    input: {
+        var foo = ([]) => "foo";
+        var bar = ({}) => "bar";
+        var with_default = (foo = "default") => foo;
+        var object_with_default = ({foo = "default", bar: baz = "default"}) => foo;
+        var array_after_spread = (...[foo]) => foo;
+        var array_after_spread = (...{foo}) => foo;
+        var computed = ({ [compute()]: x }) => {};
+        var array_hole = ([, , ...x] = [1, 2]) => {};
+        var object_trailing_elision = ({foo,}) => {};
+        var spread_empty_array = (...[]) => "foo";
+        var spread_empty_object = (...{}) => "foo";
+    }
+    expect: {
+        var foo = ([]) => "foo";
+        var bar = ({}) => "bar";
+        var with_default = (foo = "default") => foo;
+        var object_with_default = ({foo = "default", bar: baz = "default"}) => foo;
+        var array_after_spread = (...[foo]) => foo;
+        var array_after_spread = (...{foo}) => foo;
+        var computed = ({ [compute()]: x }) => {};
+        var array_hole = ([, , ...x] = [1, 2]) => {};
+        var object_trailing_elision = ({foo,}) => {};
+        var spread_empty_array = (...[]) => "foo";
+        var spread_empty_object = (...{}) => "foo";
+    }
+}
+
+arrow_binding_pattern_strict: {
+    input: {
+        var foo = ([,]) => "foo";
+    }
+    expect_exact: 'var foo=([,])=>"foo";'
+}
+
+arrow_with_regexp: {
+    input: {
+        num => /\d{11,14}/.test( num )
+    }
+    expect: {
+        num => /\d{11,14}/.test( num )
+    }
+}

test/compress/ascii.js

@@ -13,7 +13,7 @@ ascii_only_true: {
                    "\x20\x21\x22\x23 ... \x7d\x7e\x7f\x80\x81 ... \xfe\xff\u0fff\uffff";
         }
     }
-    expect_exact: 'function f(){return"\\x000\\x001\\x007\\x008\\0"+"\\0\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\b\\t\\n\\v\\f\\r\\x0e\\x0f"+"\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f"+\' !"# ... }~\\x7f\\x80\\x81 ... \\xfe\\xff\\u0fff\\uffff\'}'
+    expect_exact: 'function f(){return"\\x000\\x001\\x007\\08\\0"+"\\0\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\b\\t\\n\\v\\f\\r\\x0e\\x0f"+"\\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17\\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f"+\' !"# ... }~\\x7f\\x80\\x81 ... \\xfe\\xff\\u0fff\\uffff\'}'
 }
 
 ascii_only_false: {
@@ -31,5 +31,5 @@ ascii_only_false: {
                    "\x20\x21\x22\x23 ... \x7d\x7e\x7f\x80\x81 ... \xfe\xff\u0fff\uffff";
         }
     }
-    expect_exact: 'function f(){return"\\x000\\x001\\x007\\x008\\0"+"\\0\x01\x02\x03\x04\x05\x06\x07\\b\\t\\n\\v\\f\\r\x0e\x0f"+"\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f"+\' !"# ... }~\x7f\x80\x81 ... \xfe\xff\u0fff\uffff\'}'
+    expect_exact: 'function f(){return"\\x000\\x001\\x007\\08\\0"+"\\0\x01\x02\x03\x04\x05\x06\x07\\b\\t\\n\\v\\f\\r\x0e\x0f"+"\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f"+\' !"# ... }~\x7f\x80\x81 ... \xfe\xff\u0fff\uffff\'}'
 }

test/compress/asm.js

@@ -16,6 +16,7 @@ asm_mixed: {
         hoist_vars    : true,
         if_return     : true,
         join_vars     : true,
+        cascade       : true,
         side_effects  : true,
         negate_iife   : true
     };
@@ -103,65 +104,3 @@ asm_mixed: {
     }
 }
 
-asm_toplevel: {
-    options = {}
-    input: {
-        "use asm";
-        0.0;
-        function f() {
-            0.0;
-            (function(){
-                0.0;
-            });
-        }
-        0.0;
-    }
-    expect_exact: '"use asm";0.0;function f(){0.0;(function(){0.0})}0.0;'
-}
-
-asm_function_expression: {
-    options = {}
-    input: {
-        0.0;
-        var a = function() {
-            "use asm";
-            0.0;
-        }
-        function f() {
-            0.0;
-            return function(){
-                "use asm";
-                0.0;
-            }
-            0.0;
-        }
-        0.0;
-    }
-    expect_exact: '0;var a=function(){"use asm";0.0};function f(){0;return function(){"use asm";0.0};0}0;'
-}
-
-asm_nested_functions: {
-    options = {}
-    input: {
-        0.0;
-        function a() {
-            "use asm";
-            0.0;
-        }
-        0.0;
-        function b() {
-            0.0;
-            function c(){
-                "use asm";
-                0.0;
-            }
-            0.0;
-            function d(){
-                0.0;
-            }
-            0.0;
-        }
-        0.0;
-    }
-    expect_exact: '0;function a(){"use asm";0.0}0;function b(){0;function c(){"use asm";0.0}0;function d(){0}0}0;'
-}

test/compress/block-scope.js

@@ -0,0 +1,177 @@
+
+let_statement: {
+    input: {
+        let x = 6;
+    }
+    expect_exact: "let x=6;"
+}
+
+do_not_hoist_let: {
+    options = {
+        hoist_vars: true,
+    };
+    input: {
+        function x() {
+            if (FOO) {
+                let let1;
+                let let2;
+                var var1;
+                var var2;
+            }
+        }
+    }
+    expect: {
+        function x() {
+            var var1, var2;
+            if (FOO) {
+                let let1;
+                let let2;
+            }
+        }
+    }
+}
+
+do_not_remove_anon_blocks_if_they_have_decls: {
+    input: {
+        function x() {
+            {
+                let x;
+            }
+            {
+                var x;
+            }
+            {
+                const y;
+                class Zee {};
+            }
+        }
+        {
+            let y;
+        }
+        {
+            var y;
+        }
+    }
+    expect: {
+        function x(){
+            {
+                let x
+            }
+            var x;
+            {
+                const y;
+                class Zee {}
+            }
+        }
+        {
+            let y
+        }
+        var y;
+    }
+}
+
+remove_unused_in_global_block: {
+    options = {
+        unused: true,
+    }
+    input: {
+        {
+            let x;
+            const y;
+            class Zee {};
+            var w;
+        }
+        let ex;
+        const why;
+        class Zed {};
+        var wut;
+        console.log(x, y, Zee);
+    }
+    expect: {
+        var w;
+        let ex;
+        const why;
+        class Zed {};
+        var wut;
+        console.log(x, y, Zee);
+    }
+}
+
+regression_block_scope_resolves: {
+    mangle = { };
+    options = {
+        dead_code: false
+    };
+    input: {
+        (function () {
+            if(1) {
+                let x;
+                const y;
+                class Zee {};
+            }
+            if(1) {
+                let ex;
+                const why;
+                class Zi {};
+            }
+            console.log(x, y, Zee, ex, why, Zi);
+        }());
+    }
+    expect: {
+        (function () {
+            if (1) {
+                let o;
+                const n;
+                class c {};
+            }
+            if (1) {
+                let o;
+                const n;
+                class c {};
+            }
+            console.log(x, y, Zee, ex, why, Zi);
+        }());
+    }
+}
+
+switch_block_scope_mangler: {
+    mangle = {}
+    input: {
+        var fn = function(code) {
+            switch (code) {
+                case 1:
+                    let apple = code + 1;
+                    let dog = code + 4;
+                    console.log(apple, dog);
+                    break;
+                case 2:
+                    let banana = code + 2;
+                    console.log(banana);
+                    break;
+                default:
+                    let cat = code + 3;
+                    console.log(cat);
+            }
+        };
+    }
+    expect: {
+        var fn = function(o) {
+            switch (o) {
+              case 1:
+                let e = o + 1
+                let c = o + 4;
+                console.log(e, c);
+                break;
+
+              case 2:
+                let l = o + 2;
+                console.log(l);
+                break;
+
+              default:
+                let a = o + 3;
+                console.log(a);
+            }
+        };
+    }
+}

test/compress/comparing.js

@@ -1,42 +1,62 @@
-comparisons: {
+keep_comparisons: {
     options = {
         comparisons: true,
+        unsafe_comps: false
     }
     input: {
-        var obj1, obj2;
+        var obj1 = {
+            valueOf: function() {triggeredFirst();}
+        }
+        var obj2 = {
+            valueOf: function() {triggeredSecond();}
+        }
         var result1 = obj1 <= obj2;
         var result2 = obj1 <  obj2;
         var result3 = obj1 >= obj2;
         var result4 = obj1 >  obj2;
     }
     expect: {
-        var obj1, obj2;
+        var obj1 = {
+            valueOf: function() {triggeredFirst();}
+        }
+        var obj2 = {
+            valueOf: function() {triggeredSecond();}
+        }
         var result1 = obj1 <= obj2;
         var result2 = obj1 <  obj2;
-        var result3 = obj2 <= obj1;
-        var result4 = obj2 <  obj1;
+        var result3 = obj1 >= obj2;
+        var result4 = obj1 >  obj2;
     }
 }
 
-unsafe_comps: {
+keep_comparisons_with_unsafe_comps: {
     options = {
         comparisons: true,
-        conditionals: true,
-        unsafe_comps: true,
+        unsafe_comps: true
     }
     input: {
-        var obj1, obj2;
-        obj1 <= obj2 ? f1() : g1();
-        obj1 <  obj2 ? f2() : g2();
-        obj1 >= obj2 ? f3() : g3();
-        obj1 >  obj2 ? f4() : g4();
+        var obj1 = {
+            valueOf: function() {triggeredFirst();}
+        }
+        var obj2 = {
+            valueOf: function() {triggeredSecond();}
+        }
+        var result1 = obj1 <= obj2;
+        var result2 = obj1 <  obj2;
+        var result3 = obj1 >= obj2;
+        var result4 = obj1 >  obj2;
     }
     expect: {
-        var obj1, obj2;
-        obj2 <  obj1 ? g1() : f1();
-        obj1 <  obj2 ? f2() : g2();
-        obj1 <  obj2 ? g3() : f3();
-        obj2 <  obj1 ? f4() : g4();
+        var obj1 = {
+            valueOf: function() {triggeredFirst();}
+        }
+        var obj2 = {
+            valueOf: function() {triggeredSecond();}
+        }
+        var result1 = obj2 >= obj1;
+        var result2 = obj2 >  obj1;
+        var result3 = obj1 >= obj2;
+        var result4 = obj1 >  obj2;
     }
 }
 
@@ -53,245 +73,4 @@ dont_change_in_or_instanceof_expressions: {
         1 instanceof 1;
         null instanceof null;
     }
-}
-
-self_comparison_1: {
-    options = {
-        comparisons: true,
-    }
-    input: {
-        a === a;
-        a !== b;
-        b.c === a.c;
-        b.c !== b.c;
-    }
-    expect: {
-        a == a;
-        a !== b;
-        b.c === a.c;
-        b.c != b.c;
-    }
-}
-
-self_comparison_2: {
-    options = {
-        comparisons: true,
-        reduce_funcs: true,
-        reduce_vars: true,
-        toplevel: true,
-    }
-    input: {
-        function f() {}
-        var o = {};
-        console.log(f != f, o === o);
-    }
-    expect: {
-        function f() {}
-        var o = {};
-        console.log(false, true);
-    }
-    expect_stdout: "false true"
-}
-
-issue_2857_1: {
-    options = {
-        comparisons: true,
-    }
-    input: {
-        function f1(a) {
-            a === undefined || a === null;
-            a === undefined || a !== null;
-            a !== undefined || a === null;
-            a !== undefined || a !== null;
-            a === undefined && a === null;
-            a === undefined && a !== null;
-            a !== undefined && a === null;
-            a !== undefined && a !== null;
-        }
-        function f2(a) {
-            a === null || a === undefined;
-            a === null || a !== undefined;
-            a !== null || a === undefined;
-            a !== null || a !== undefined;
-            a === null && a === undefined;
-            a === null && a !== undefined;
-            a !== null && a === undefined;
-            a !== null && a !== undefined;
-        }
-    }
-    expect: {
-        function f1(a) {
-            null == a;
-            void 0 === a || null !== a;
-            void 0 !== a || null === a;
-            void 0 !== a || null !== a;
-            void 0 === a && null === a;
-            void 0 === a && null !== a;
-            void 0 !== a && null === a;
-            null != a;
-        }
-        function f2(a) {
-            null == a;
-            null === a || void 0 !== a;
-            null !== a || void 0 === a;
-            null !== a || void 0 !== a;
-            null === a && void 0 === a;
-            null === a && void 0 !== a;
-            null !== a && void 0 === a;
-            null != a;
-        }
-    }
-}
-
-issue_2857_2: {
-    options = {
-        comparisons: true,
-    }
-    input: {
-        function f(a, p) {
-            a === undefined || a === null || p;
-            a === undefined || a !== null || p;
-            a !== undefined || a === null || p;
-            a !== undefined || a !== null || p;
-            a === undefined && a === null || p;
-            a === undefined && a !== null || p;
-            a !== undefined && a === null || p;
-            a !== undefined && a !== null || p;
-        }
-    }
-    expect: {
-        function f(a, p) {
-            null == a || p;
-            void 0 === a || null !== a || p;
-            void 0 !== a || null === a || p;
-            void 0 !== a || null !== a || p;
-            void 0 === a && null === a || p;
-            void 0 === a && null !== a || p;
-            void 0 !== a && null === a || p;
-            null != a || p;
-        }
-    }
-}
-
-issue_2857_3: {
-    options = {
-        comparisons: true,
-    }
-    input: {
-        function f(a, p) {
-            a === undefined || a === null && p;
-            a === undefined || a !== null && p;
-            a !== undefined || a === null && p;
-            a !== undefined || a !== null && p;
-            a === undefined && a === null && p;
-            a === undefined && a !== null && p;
-            a !== undefined && a === null && p;
-            a !== undefined && a !== null && p;
-        }
-    }
-    expect: {
-        function f(a, p) {
-            void 0 === a || null === a && p;
-            void 0 === a || null !== a && p;
-            void 0 !== a || null === a && p;
-            void 0 !== a || null !== a && p;
-            void 0 === a && null === a && p;
-            void 0 === a && null !== a && p;
-            void 0 !== a && null === a && p;
-            null != a && p;
-        }
-    }
-}
-
-issue_2857_4: {
-    options = {
-        comparisons: true,
-    }
-    input: {
-        function f(a, p) {
-            p || a === undefined || a === null;
-            p || a === undefined || a !== null;
-            p || a !== undefined || a === null;
-            p || a !== undefined || a !== null;
-            p || a === undefined && a === null;
-            p || a === undefined && a !== null;
-            p || a !== undefined && a === null;
-            p || a !== undefined && a !== null;
-        }
-    }
-    expect: {
-        function f(a, p) {
-            p || null == a;
-            p || void 0 === a || null !== a;
-            p || void 0 !== a || null === a;
-            p || void 0 !== a || null !== a;
-            p || void 0 === a && null === a;
-            p || void 0 === a && null !== a;
-            p || void 0 !== a && null === a;
-            p || null != a;
-        }
-    }
-}
-
-issue_2857_5: {
-    options = {
-        comparisons: true,
-    }
-    input: {
-        function f(a, p) {
-            p && a === undefined || a === null;
-            p && a === undefined || a !== null;
-            p && a !== undefined || a === null;
-            p && a !== undefined || a !== null;
-            p && a === undefined && a === null;
-            p && a === undefined && a !== null;
-            p && a !== undefined && a === null;
-            p && a !== undefined && a !== null;
-        }
-    }
-    expect: {
-        function f(a, p) {
-            p && void 0 === a || null === a;
-            p && void 0 === a || null !== a;
-            p && void 0 !== a || null === a;
-            p && void 0 !== a || null !== a;
-            p && void 0 === a && null === a;
-            p && void 0 === a && null !== a;
-            p && void 0 !== a && null === a;
-            p && null != a;
-        }
-    }
-}
-
-issue_2857_6: {
-    options = {
-        comparisons: true,
-        pure_getters: "strict",
-        reduce_vars: true,
-    }
-    input: {
-        function f(a) {
-            if (({}).b === undefined || {}.b === null)
-                return a.b !== undefined && a.b !== null;
-        }
-        console.log(f({
-            a: [ null ],
-            get b() {
-                return this.a.shift();
-            }
-        }));
-    }
-    expect: {
-        function f(a) {
-            if (null == {}.b)
-                return void 0 !== a.b && null !== a.b;
-        }
-        console.log(f({
-            a: [ null ],
-            get b() {
-                return this.a.shift();
-            }
-        }));
-    }
-    expect_stdout: "true"
-}
+}

test/compress/concat-strings.js

@@ -21,7 +21,7 @@ concat_1: {
         var c = 1 + x() + 2 + "boo";
         var d = 1 + x() + 2 + 3 + "boo";
         var e = 1 + x() + 2 + "X3boo";
-        var f = "\x00360\x008\0";
+        var f = "\x00360\08\0";
     }
 }
 

test/compress/conditionals.js

@@ -166,24 +166,22 @@ cond_1: {
         conditionals: true
     };
     input: {
-        function foo(do_something, some_condition) {
-            if (some_condition) {
-                do_something(x);
-            } else {
-                do_something(y);
-            }
-            if (some_condition) {
-                side_effects(x);
-            } else {
-                side_effects(y);
-            }
+        var do_something; // if undeclared it's assumed to have side-effects
+        if (some_condition()) {
+            do_something(x);
+        } else {
+            do_something(y);
+        }
+        if (some_condition()) {
+            side_effects(x);
+        } else {
+            side_effects(y);
         }
     }
     expect: {
-        function foo(do_something, some_condition) {
-            do_something(some_condition ? x : y);
-            some_condition ? side_effects(x) : side_effects(y);
-        }
+        var do_something;
+        do_something(some_condition() ? x : y);
+        some_condition() ? side_effects(x) : side_effects(y);
     }
 }
 
@@ -192,18 +190,16 @@ cond_2: {
         conditionals: true
     };
     input: {
-        function foo(x, FooBar, some_condition) {
-            if (some_condition) {
-                x = new FooBar(1);
-            } else {
-                x = new FooBar(2);
-            }
+        var x, FooBar;
+        if (some_condition()) {
+            x = new FooBar(1);
+        } else {
+            x = new FooBar(2);
         }
     }
     expect: {
-        function foo(x, FooBar, some_condition) {
-            x = new FooBar(some_condition ? 1 : 2);
-        }
+        var x, FooBar;
+        x = new FooBar(some_condition() ? 1 : 2);
     }
 }
 
@@ -332,7 +328,7 @@ cond_7: {
         x = 'foo';
         x = 'foo';
         x = (condition(), 20);
-        x = (z || condition(), 'fuji');
+        x = z ? 'fuji' : (condition(), 'fuji');
         x = (condition(), 'foobar');
         x = y ? a : b;
         x = y ? 'foo' : 'fo';
@@ -609,47 +605,11 @@ cond_8c: {
     }
 }
 
-cond_9: {
-    options = {
-        conditionals: true,
-    }
-    input: {
-        function f(x, y) {
-            g() ? x(1) : x(2);
-            x ? (y || x)() : (y || x)();
-            x ? y(a, b) : y(d, b, c);
-            x ? y(a, b, c) : y(a, b, c);
-            x ? y(a, b, c) : y(a, b, f);
-            x ? y(a, b, c) : y(a, e, c);
-            x ? y(a, b, c) : y(a, e, f);
-            x ? y(a, b, c) : y(d, b, c);
-            x ? y(a, b, c) : y(d, b, f);
-            x ? y(a, b, c) : y(d, e, c);
-            x ? y(a, b, c) : y(d, e, f);
-        }
-    }
-    expect: {
-        function f(x, y) {
-            g() ? x(1) : x(2);
-            x, (y || x)();
-            x ? y(a, b) : y(d, b, c);
-            x, y(a, b, c);
-            y(a, b, x ? c : f);
-            y(a, x ? b : e, c);
-            x ? y(a, b, c) : y(a, e, f);
-            y(x ? a : d, b, c);
-            x ? y(a, b, c) : y(d, b, f);
-            x ? y(a, b, c) : y(d, e, c);
-            x ? y(a, b, c) : y(d, e, f);
-        }
-    }
-}
-
 ternary_boolean_consequent: {
     options = {
         collapse_vars:true, sequences:true, properties:true, dead_code:true, conditionals:true,
         comparisons:true, evaluate:true, booleans:true, loops:true, unused:true, hoist_funs:true,
-        keep_fargs:true, if_return:true, join_vars:true, side_effects:true
+        keep_fargs:true, if_return:true, join_vars:true, cascade:true, side_effects:true
     }
     input: {
         function f1() { return a == b ? true : x; }
@@ -677,7 +637,7 @@ ternary_boolean_alternative: {
     options = {
         collapse_vars:true, sequences:true, properties:true, dead_code:true, conditionals:true,
         comparisons:true, evaluate:true, booleans:true, loops:true, unused:true, hoist_funs:true,
-        keep_fargs:true, if_return:true, join_vars:true, side_effects:true
+        keep_fargs:true, if_return:true, join_vars:true, cascade:true, side_effects:true
     }
     input: {
         function f1() { return a == b ? x : true; }
@@ -703,11 +663,10 @@ ternary_boolean_alternative: {
 
 trivial_boolean_ternary_expressions : {
     options = {
-        booleans: true,
         conditionals: true,
-        evaluate: true,
-        side_effects: true,
-    }
+        evaluate    : true,
+        booleans    : true
+    };
     input: {
         f('foo' in m ? true  : false);
         f('foo' in m ? false : true);
@@ -1056,215 +1015,3 @@ delete_conditional_2: {
     }
     expect_stdout: true
 }
-
-issue_2535_1: {
-    options = {
-        booleans: true,
-        conditionals: true,
-        evaluate: true,
-        passes: 2,
-        side_effects: true,
-    }
-    input: {
-        if (true || x()) y();
-        if (true && x()) y();
-        if (x() || true) y();
-        if (x() && true) y();
-        if (false || x()) y();
-        if (false && x()) y();
-        if (x() || false) y();
-        if (x() && false) y();
-    }
-    expect: {
-        y();
-        x() && y();
-        (x(), 1) && y();
-        x() && y();
-        x() && y();
-        x() && y();
-        (x(), 0) && y();
-    }
-}
-
-issue_2535_2: {
-    options = {
-        booleans: true,
-        conditionals: true,
-        evaluate: true,
-        side_effects: true,
-    }
-    input: {
-        function x() {}
-        function y() {
-            return "foo";
-        }
-        console.log((x() || true) || y());
-        console.log((y() || true) || x());
-        console.log((x() || true) && y());
-        console.log((y() || true) && x());
-        console.log((x() && true) || y());
-        console.log((y() && true) || x());
-        console.log((x() && true) && y());
-        console.log((y() && true) && x());
-        console.log((x() || false) || y());
-        console.log((y() || false) || x());
-        console.log((x() || false) && y());
-        console.log((y() || false) && x());
-        console.log((x() && false) || y());
-        console.log((y() && false) || x());
-        console.log((x() && false) && y());
-        console.log((y() && false) && x());
-    }
-    expect: {
-        function x() {}
-        function y() {
-            return "foo";
-        }
-        console.log(x() || !0);
-        console.log(y() || !0);
-        console.log((x(), y()));
-        console.log((y(), x()));
-        console.log(!!x() || y());
-        console.log(!!y() || x());
-        console.log(x() && y());
-        console.log(y() && x());
-        console.log(x() || y());
-        console.log(y() || x());
-        console.log(!!x() && y());
-        console.log(!!y() && x());
-        console.log((x(), y()));
-        console.log((y(), x()));
-        console.log(x() && !1);
-        console.log(y() && !1);
-    }
-    expect_stdout: [
-        "true",
-        "foo",
-        "foo",
-        "undefined",
-        "foo",
-        "true",
-        "undefined",
-        "undefined",
-        "foo",
-        "foo",
-        "false",
-        "undefined",
-        "foo",
-        "undefined",
-        "undefined",
-        "false",
-    ]
-}
-
-issue_2560: {
-    options = {
-        conditionals: true,
-        inline: true,
-        reduce_funcs: true,
-        reduce_vars: true,
-        toplevel: true,
-        unused: true,
-    }
-    input: {
-        function log(x) {
-            console.log(x);
-        }
-        function foo() {
-            return log;
-        }
-        function bar() {
-            if (x !== (x = foo())) {
-                x(1);
-            } else {
-                x(2);
-            }
-        }
-        var x = function() {
-            console.log("init");
-        };
-        bar();
-        bar();
-    }
-    expect: {
-        function log(x) {
-            console.log(x);
-        }
-        function bar() {
-            x !== (x = log) ? x(1) : x(2);
-        }
-        var x = function() {
-            console.log("init");
-        };
-        bar();
-        bar();
-    }
-    expect_stdout: [
-        "1",
-        "2",
-    ]
-}
-
-hoist_decl: {
-    options = {
-        conditionals: true,
-        join_vars: true,
-        sequences: true,
-    }
-    input: {
-        if (x()) {
-            var a;
-            y();
-        } else {
-            z();
-            var b;
-        }
-    }
-    expect: {
-        var a, b;
-        x() ? y() : z();
-    }
-}
-
-to_and_or: {
-    options = {
-        conditionals: true,
-    }
-    input: {
-        var values = [
-            0,
-            null,
-            true,
-            "foo",
-            false,
-            -1 / 0,
-            void 0,
-        ];
-        values.forEach(function(x) {
-            values.forEach(function(y) {
-                values.forEach(function(z) {
-                    console.log(x ? y || z : z);
-                });
-            });
-        });
-    }
-    expect: {
-        var values = [
-            0,
-            null,
-            true,
-            "foo",
-            false,
-            -1 / 0,
-            void 0,
-        ];
-        values.forEach(function(x) {
-            values.forEach(function(y) {
-                values.forEach(function(z) {
-                    console.log(x && y || z);
-                });
-            });
-        });
-    }
-    expect_stdout: true
-}

test/compress/const.js

@@ -0,0 +1,166 @@
+issue_1191: {
+    options = {
+        evaluate      : true,
+        booleans      : true,
+        comparisons   : true,
+        dead_code     : true,
+        conditionals  : true,
+        side_effects  : true,
+        unused        : true,
+        hoist_funs    : true,
+        if_return     : true,
+        join_vars     : true,
+        sequences     : false,
+        collapse_vars : false,
+        reduce_vars   : true,
+    }
+    input: {
+        function foo(rot) {
+            const rotTol = 5;
+            if (rot < -rotTol || rot > rotTol)
+                bar();
+            baz();
+        }
+    }
+    expect: {
+        function foo(rot) {
+            (rot < -5 || rot > 5) && bar();
+            baz();
+        }
+    }
+}
+
+issue_1194: {
+    options = {
+        evaluate      : true,
+        booleans      : true,
+        comparisons   : true,
+        dead_code     : true,
+        conditionals  : true,
+        side_effects  : true,
+        unused        : true,
+        hoist_funs    : true,
+        if_return     : true,
+        join_vars     : true,
+        sequences     : false,
+        collapse_vars : false,
+        reduce_vars   : true,
+    }
+    input: {
+        function f1() {const a = "X"; return a + a;}
+        function f2() {const aa = "X"; return aa + aa;}
+        function f3() {const aaa = "X"; return aaa + aaa;}
+    }
+    expect: {
+        function f1(){return"XX"}
+        function f2(){return"XX"}
+        function f3(){return"XX"}
+    }
+}
+
+issue_1396: {
+    options = {
+        evaluate      : true,
+        booleans      : true,
+        comparisons   : true,
+        dead_code     : true,
+        conditionals  : true,
+        side_effects  : true,
+        unused        : true,
+        hoist_funs    : true,
+        if_return     : true,
+        join_vars     : true,
+        sequences     : false,
+        collapse_vars : false,
+        reduce_vars   : true,
+    }
+    input: {
+        function foo(a) {
+            const VALUE = 1;
+            console.log(2 | VALUE);
+            console.log(VALUE + 1);
+            console.log(VALUE);
+            console.log(a & VALUE);
+        }
+        function bar() {
+            const s = "01234567890123456789";
+            console.log(s + s + s + s + s);
+
+            const CONSTANT = "abc";
+            console.log(CONSTANT + CONSTANT + CONSTANT + CONSTANT + CONSTANT);
+        }
+    }
+    expect: {
+        function foo(a) {
+            console.log(3);
+            console.log(2);
+            console.log(1);
+            console.log(1 & a);
+        }
+        function bar() {
+            const s = "01234567890123456789";
+            console.log(s + s + s + s + s);
+
+            console.log("abcabcabcabcabc");
+        }
+    }
+}
+
+unused_regexp_literal: {
+    options = {
+        evaluate      : true,
+        booleans      : true,
+        comparisons   : true,
+        dead_code     : true,
+        conditionals  : true,
+        side_effects  : true,
+        unused        : true,
+        hoist_funs    : true,
+        if_return     : true,
+        join_vars     : true,
+        sequences     : false,
+        collapse_vars : false,
+    }
+    input: {
+        function f(){ var a = /b/; }
+    }
+    expect: {
+        function f(){}
+    }
+}
+
+regexp_literal_not_const: {
+    options = {
+        evaluate      : true,
+        booleans      : true,
+        comparisons   : true,
+        dead_code     : true,
+        conditionals  : true,
+        side_effects  : true,
+        unused        : true,
+        hoist_funs    : true,
+        if_return     : true,
+        join_vars     : true,
+        sequences     : false,
+        collapse_vars : false,
+        reduce_vars   : true,
+    }
+    input: {
+        (function(){
+            var result;
+            const s = 'acdabcdeabbb';
+            const REGEXP_LITERAL = /ab*/g;
+            while (result = REGEXP_LITERAL.exec(s)) {
+                console.log(result[0]);
+            }
+        })();
+    }
+    expect: {
+        (function() {
+            var result;
+            const REGEXP_LITERAL = /ab*/g;
+            while (result = REGEXP_LITERAL.exec("acdabcdeabbb")) console.log(result[0]);
+        })();
+    }
+    expect_stdout: true
+}

test/compress/destructuring.js

@@ -0,0 +1,332 @@
+destructuring_arrays: {
+    input: {
+        {const [aa, bb] = cc;}
+        {const [aa, [bb, cc]] = dd;}
+        {let [aa, bb] = cc;}
+        {let [aa, [bb, cc]] = dd;}
+        var [aa, bb] = cc;
+        var [aa, [bb, cc]] = dd;
+        var [,[,,,,,],,,zz,] = xx; // Trailing comma
+        var [,,zzz,,] = xxx; // Trailing comma after hole
+    }
+    expect: {
+        {const [aa, bb] = cc;}
+        {const [aa, [bb, cc]] = dd;}
+        {let [aa, bb] = cc;}
+        {let [aa, [bb, cc]] = dd;}
+        var [aa, bb] = cc;
+        var [aa, [bb, cc]] = dd;
+        var [,[,,,,,],,,zz] = xx;
+        var [,,zzz,,] = xxx;
+    }
+}
+
+destructuring_arrays_holes: {
+    input: {
+        var [,,,,] = a;
+        var [,,b,] = c;
+        var [d,,]  = e;
+    }
+    expect_exact: "var[,,,,]=a;var[,,b]=c;var[d,,]=e;"
+}
+
+destructuring_objects: {
+    input: {
+        {const {aa, bb} = {aa:1, bb:2};}
+        {const {aa, bb: {cc, dd}} = {aa:1, bb: {cc:2, dd: 3}};}
+        {let {aa, bb} = {aa:1, bb:2};}
+        {let {aa, bb: {cc, dd}} = {aa:1, bb: {cc:2, dd: 3}};}
+        var {aa, bb} = {aa:1, bb:2};
+        var {aa, bb: {cc, dd}} = {aa:1, bb: {cc:2, dd: 3}};
+    }
+    expect: {
+        {const {aa, bb} = {aa:1, bb:2};}
+        {const {aa, bb: {cc, dd}} = {aa:1, bb: {cc:2, dd: 3}};}
+        {let {aa, bb} = {aa:1, bb:2};}
+        {let {aa, bb: {cc, dd}} = {aa:1, bb: {cc:2, dd: 3}};}
+        var {aa, bb} = {aa:1, bb:2};
+        var {aa, bb: {cc, dd}} = {aa:1, bb: {cc:2, dd: 3}};
+    }
+}
+
+destructuring_objects_trailing_elision: {
+    beautify = {
+        ecma: 6
+    }
+    input: {
+        var {cc,} = foo;
+    }
+    expect_exact: "var{cc}=foo;"
+}
+
+nested_destructuring_objects: {
+    beautify = {
+        ecma: 6
+    }
+    input: {
+        const [{a},b] = c;
+        let [{a},b] = c;
+        var [{a},b] = c;
+    }
+    expect_exact: 'const[{a},b]=c;let[{a},b]=c;var[{a},b]=c;';
+}
+
+destructuring_constdef_in_loops: {
+    beautify = {
+        ecma: 6
+    }
+    input: {
+        for (const [x,y] in pairs);
+        for (const [a] = 0;;);
+        for (const {c} of cees);
+    }
+    expect_exact: "for(const[x,y]in pairs);for(const[a]=0;;);for(const{c}of cees);"
+}
+
+destructuring_letdef_in_loops: {
+    beautify = {
+        ecma: 6
+    }
+    input: {
+        for (let [x,y] in pairs);
+        for (let [a] = 0;;);
+        for (let {c} of cees);
+    }
+    expect_exact: "for(let[x,y]in pairs);for(let[a]=0;;);for(let{c}of cees);"
+}
+
+destructuring_vardef_in_loops: {
+    beautify = {
+        ecma: 6
+    }
+    input: {
+        for (var [x,y] in pairs);
+        for (var [a] = 0;;);
+        for (var {c} of cees);
+    }
+    expect_exact: "for(var[x,y]in pairs);for(var[a]=0;;);for(var{c}of cees);"
+}
+
+destructuring_expressions: {
+    beautify = {
+        ecma: 6
+    }
+    input: {
+        ({a, b});
+        [{a}];
+        f({x});
+    }
+    expect_exact: "({a,b});[{a}];f({x});"
+}
+
+destructuring_remove_unused_1: {
+    options = {
+        unused: true
+    }
+    input: {
+        function a() {
+            var unused = "foo";
+            var a = [1];
+            var [b] = a;
+            f(b);
+        }
+        function b() {
+            var unused = "foo";
+            var a = {b: 1};
+            var {b} = a;
+            f(b);
+        }
+        function c() {
+            var unused = "foo";
+            var a = [[1]];
+            var [[b]] = a;
+            f(b);
+        }
+        function d() {
+            var unused = "foo";
+            var a = {b: {b:1}};
+            var {b:{b}} = a;
+            f(b);
+        }
+        function e() {
+            var unused = "foo";
+            var a = [1, 2, 3, 4, 5];
+            var x = [[1, 2, 3]];
+            var y = {h: 1};
+            var [b, ...c] = a;
+            var [...[e, f]] = x;
+            var [...{g: h}] = y;
+            f(b, c, e, f, g);
+        }
+    }
+    expect: {
+        function a() {
+            var a = [1];
+            var [b] = a;
+            f(b);
+        }
+        function b() {
+            var a = {b: 1};
+            var {b} = a;
+            f(b);
+        }
+        function c() {
+            var a = [[1]];
+            var [[b]] = a;
+            f(b);
+        }
+        function d() {
+            var a = {b: {b:1}};
+            var {b:{b}} = a;
+            f(b);
+        }
+        function e() {
+            var a = [1, 2, 3, 4, 5];
+            var x = [[1, 2, 3]];
+            var y = {h: 1};
+            var [b, ...c] = a;
+            var [...[e, f]] = x;
+            var [...{g: h}] = y;
+            f(b, c, e, f, g);
+        }
+    }
+}
+
+destructuring_remove_unused_2: {
+    options = {
+        unused: true
+    }
+    input: {
+        function a() {
+            var unused = "foo";
+            var a = [,,1];
+            var [b] = a;
+            f(b);
+        }
+        function b() {
+            var unused = "foo";
+            var a = [{a: [1]}];
+            var [{b: a}] = a;
+            f(b);
+        }
+    }
+    expect: {
+        function a() {
+            var a = [,,1];
+            var [b] = a;
+            f(b);
+        }
+        function b() {
+            var a = [{a: [1]}];
+            var [{b: a}] = a;
+            f(b);
+        }
+    }
+}
+
+object_destructuring_may_need_parentheses: {
+    beautify = {
+        ecma: 6
+    }
+    input: {
+        ({a, b} = {a: 1, b: 2});
+    }
+    expect_exact: "({a,b}={a:1,b:2});"
+}
+
+destructuring_with_undefined_as_default_assignment: {
+    options = {
+        evaluate: true
+    }
+    input: {
+        [foo = undefined] = bar;
+        [foo = void 0] = bar;
+    }
+    expect: {
+        [foo] = bar;
+        [foo] = bar;
+    }
+}
+
+destructuring_dont_evaluate_with_undefined_as_default_assignment: {
+    options = {
+        evaluate: false
+    }
+    input: {
+        [foo = undefined] = bar;
+    }
+    expect: {
+        [foo = void 0] = bar;
+    }
+}
+
+reduce_vars: {
+    options = {
+        reduce_vars: true,
+    }
+    input: {
+        {const [aa, [bb, cc]] = dd;}
+        {let [aa, [bb, cc]] = dd;}
+        var [aa, [bb, cc]] = dd;
+        [aa, [bb, cc]] = dd;
+        {const {aa, bb: {cc, dd}} = {aa:1, bb: {cc:2, dd: 3}};}
+        {let {aa, bb: {cc, dd}} = {aa:1, bb: {cc:2, dd: 3}};}
+        var {aa, bb: {cc, dd}} = {aa:1, bb: {cc:2, dd: 3}};
+        ({aa, bb: {cc, dd}} = {aa:1, bb: {cc:2, dd: 3}});
+        const [{a},b] = c;
+        let [{a},b] = c;
+        var [{a},b] = c;
+        [{a},b] = c;
+        for (const [x,y] in pairs);
+        for (let [x,y] in pairs);
+        for (var [x,y] in pairs);
+        for ([x,y] in pairs);
+    }
+    expect: {
+        {const [aa, [bb, cc]] = dd;}
+        {let [aa, [bb, cc]] = dd;}
+        var [aa, [bb, cc]] = dd;
+        [aa, [bb, cc]] = dd;
+        {const {aa, bb: {cc, dd}} = {aa:1, bb: {cc:2, dd: 3}};}
+        {let {aa, bb: {cc, dd}} = {aa:1, bb: {cc:2, dd: 3}};}
+        var {aa, bb: {cc, dd}} = {aa:1, bb: {cc:2, dd: 3}};
+        ({aa, bb: {cc, dd}} = {aa:1, bb: {cc:2, dd: 3}});
+        const [{a},b] = c;
+        let [{a},b] = c;
+        var [{a},b] = c;
+        [{a},b] = c;
+        for (const [x,y] in pairs);
+        for (let [x,y] in pairs);
+        for (var [x,y] in pairs);
+        for ([x,y] in pairs);
+    }
+}
+
+unused: {
+    options = {
+        unused: true,
+    }
+    input: {
+        let { foo: [, , ...a] } = { foo: [1, 2, 3, 4], bar: 5 };
+        console.log(a);
+    }
+    expect: {
+        let { foo: [, , ...a] } = { foo: [1, 2, 3, 4], bar: 5 };
+        console.log(a);
+    }
+}
+
+issue_1886: {
+    options = {
+        collapse_vars: true,
+    }
+    input: {
+        let [a] = [1];
+        console.log(a);
+    }
+    expect: {
+        let [a] = [1];
+        console.log(a);
+    }
+    expect_exact: "1"
+}

test/compress/directives.js

@@ -0,0 +1,10 @@
+class_directives_compression: {
+    input: {
+        class foo {
+            foo() {
+                "use strict";
+            }
+        }
+    }
+    expect_exact: "class foo{foo(){}}"
+}

test/compress/evaluate.js

@@ -1,7 +1,6 @@
 and: {
     options = {
-        evaluate: true,
-        side_effects: true,
+        evaluate: true
     }
     input: {
         var a;
@@ -77,8 +76,7 @@ and: {
 
 or: {
     options = {
-        evaluate: true,
-        side_effects: true,
+        evaluate: true
     }
     input: {
         var a;
@@ -160,8 +158,7 @@ or: {
 
 unary_prefix: {
     options = {
-        evaluate: true,
-        side_effects: true,
+        evaluate: true
     }
     input: {
         a = !0 && b;
@@ -227,6 +224,100 @@ positive_zero: {
     expect_stdout: true
 }
 
+pow: {
+    options = { evaluate: true }
+    input: {
+        var a = 5 ** 3;
+    }
+    expect: {
+        var a = 125;
+    }
+}
+
+pow_sequence: {
+    options = {
+        evaluate: true
+    }
+    input: {
+        var a = 2 ** 3 ** 2;
+    }
+    expect: {
+        var a = 512;
+    }
+}
+
+pow_mixed: {
+    options = {
+        evaluate: true
+    }
+    input: {
+        var a = 5 + 2 ** 3 + 5;
+        var b = 5 * 3 ** 2;
+        var c = 5 ** 3 * 2;
+        var d = 5 ** +3;
+    }
+    expect: {
+        var a = 18;
+        var b = 45;
+        var c = 250;
+        var d = 125;
+    }
+}
+
+pow_with_right_side_evaluating_to_unary: {
+    options = {
+        evaluate: true
+    }
+    input: {
+        var a = (4 - 7) ** foo;
+        var b = ++bar ** 3;
+        var c = --baz ** 2;
+    }
+    expect_exact: "var a=(-3)**foo;var b=++bar**3;var c=--baz**2;"
+}
+
+pow_with_number_constants: {
+    options = {
+        evaluate: true
+    }
+    input: {
+        var a = 5 ** NaN;
+        /* NaN exponent results to NaN */
+        var b = 42 ** +0;
+        /* +0 exponent results to NaN */
+        var c = 42 ** -0;
+        /* -0 exponent results to NaN */
+        var d = NaN ** 1;
+        /* NaN with non-zero exponent is NaN */
+        var e = 2 ** Infinity;
+        /* abs(base) > 1 with Infinity as exponent is Infinity */
+        var f = 2 ** -Infinity;
+        /* abs(base) > 1 with -Infinity as exponent is +0 */
+        var g = (-7) ** (0.5);
+        var h = 2324334 ** 34343443;
+        var i = (-2324334) ** 34343443;
+        var j = 2 ** (-3);
+        var k = 2.0 ** -3;
+        var l = 2.0 ** (5 - 7);
+        var m = 3 ** -10;  // Result will be 0.000016935087808430286, which is too long
+    }
+    expect: {
+        var a = NaN;
+        var b = 1;
+        var c = 1;
+        var d = NaN;
+        var e = 1/0;
+        var f = 0;
+        var g = NaN;
+        var h = 1/0;
+        var i = -1/0;
+        var j = .125;
+        var k = .125;
+        var l = .25;
+        var m = 3 ** -10;
+    }
+}
+
 unsafe_constant: {
     options = {
         evaluate  : true,
@@ -253,27 +344,22 @@ unsafe_constant: {
 
 unsafe_object: {
     options = {
-        evaluate: true,
-        reduce_funcs: true,
-        reduce_vars: true,
-        toplevel: true,
-        unsafe: true,
+        evaluate  : true,
+        unsafe    : true
     }
     input: {
-        var o = { a: 1 };
         console.log(
-            o + 1,
-            o.a + 1,
-            o.b + 1,
-            o.a.b + 1
+            ({a:1}) + 1,
+            ({a:1}).a + 1,
+            ({a:1}).b + 1,
+            ({a:1}).a.b + 1
         );
     }
     expect: {
-        var o = { a: 1 };
         console.log(
-            o + 1,
+            ({a:1}) + 1,
             2,
-            o.b + 1,
+            ({a:1}).b + 1,
             1..b + 1
         );
     }
@@ -282,27 +368,22 @@ unsafe_object: {
 
 unsafe_object_nested: {
     options = {
-        evaluate: true,
-        reduce_funcs: true,
-        reduce_vars: true,
-        toplevel: true,
-        unsafe: true,
+        evaluate  : true,
+        unsafe    : true
     }
     input: {
-        var o = { a: { b: 1 } };
         console.log(
-            o + 1,
-            o.a + 1,
-            o.b + 1,
-            o.a.b + 1
+            ({a:{b:1}}) + 1,
+            ({a:{b:1}}).a + 1,
+            ({a:{b:1}}).b + 1,
+            ({a:{b:1}}).a.b + 1
         );
     }
     expect: {
-        var o = { a: { b: 1 } };
         console.log(
-            o + 1,
-            o.a + 1,
-            o.b + 1,
+            ({a:{b:1}}) + 1,
+            ({a:{b:1}}).a + 1,
+            ({a:{b:1}}).b + 1,
             2
         );
     }
@@ -311,26 +392,21 @@ unsafe_object_nested: {
 
 unsafe_object_complex: {
     options = {
-        evaluate: true,
-        reduce_funcs: true,
-        reduce_vars: true,
-        toplevel: true,
-        unsafe: true,
+        evaluate  : true,
+        unsafe    : true
     }
     input: {
-        var o = { a: { b: 1 }, b: 1 };
         console.log(
-            o + 1,
-            o.a + 1,
-            o.b + 1,
-            o.a.b + 1
+            ({a:{b:1},b:1}) + 1,
+            ({a:{b:1},b:1}).a + 1,
+            ({a:{b:1},b:1}).b + 1,
+            ({a:{b:1},b:1}).a.b + 1
         );
     }
     expect: {
-        var o = { a: { b: 1 }, b: 1 };
         console.log(
-            o + 1,
-            o.a + 1,
+            ({a:{b:1},b:1}) + 1,
+            ({a:{b:1},b:1}).a + 1,
             2,
             2
         );
@@ -340,27 +416,22 @@ unsafe_object_complex: {
 
 unsafe_object_repeated: {
     options = {
-        evaluate: true,
-        reduce_funcs: true,
-        reduce_vars: true,
-        toplevel: true,
-        unsafe: true,
+        evaluate  : true,
+        unsafe    : true
     }
     input: {
-        var o = { a: { b: 1 }, a: 1 };
         console.log(
-            o + 1,
-            o.a + 1,
-            o.b + 1,
-            o.a.b + 1
+            ({a:{b:1},a:1}) + 1,
+            ({a:{b:1},a:1}).a + 1,
+            ({a:{b:1},a:1}).b + 1,
+            ({a:{b:1},a:1}).a.b + 1
         );
     }
     expect: {
-        var o = { a: { b: 1 }, a: 1 };
         console.log(
-            o + 1,
+            ({a:{b:1},a:1}) + 1,
             2,
-            o.b + 1,
+            ({a:{b:1},a:1}).b + 1,
             1..b + 1
         );
     }
@@ -370,7 +441,6 @@ unsafe_object_repeated: {
 unsafe_object_accessor: {
     options = {
         evaluate: true,
-        reduce_funcs: true,
         reduce_vars: true,
         unsafe: true,
     }
@@ -394,11 +464,10 @@ unsafe_object_accessor: {
     }
 }
 
-prop_function: {
+unsafe_function: {
     options = {
-        evaluate: true,
-        properties: true,
-        side_effects: true,
+        evaluate  : true,
+        unsafe    : true
     }
     input: {
         console.log(
@@ -411,9 +480,9 @@ prop_function: {
     expect: {
         console.log(
             ({a:{b:1},b:function(){}}) + 1,
-            ({b:1}) + 1,
-            function(){} + 1,
-            2
+            ({a:{b:1},b:function(){}}).a + 1,
+            ({a:{b:1},b:function(){}}).b + 1,
+            ({a:{b:1},b:function(){}}).a.b + 1
         );
     }
     expect_stdout: true
@@ -639,11 +708,10 @@ unsafe_string_bad_index: {
     expect_stdout: true
 }
 
-prototype_function: {
+unsafe_prototype_function: {
     options = {
-        evaluate: true,
-        properties: true,
-        side_effects: true,
+        evaluate  : true,
+        unsafe    : true
     }
     input: {
         var a = ({valueOf: 0}) < 1;
@@ -662,28 +730,25 @@ prototype_function: {
         var d = ({toString: 0}) + "";
         var e = (({valueOf: 0}) + "")[2];
         var f = (({toString: 0}) + "")[2];
-        var g = 0();
-        var h = 0();
+        var g = ({valueOf: 0}).valueOf();
+        var h = "" + ({toString: 0});
     }
 }
 
 call_args: {
     options = {
         evaluate: true,
-        inline: true,
-        reduce_funcs: true,
         reduce_vars: true,
-        toplevel: true,
     }
     input: {
-        var a = 1;
+        const a = 1;
         console.log(a);
         +function(a) {
             return a;
         }(a);
     }
     expect: {
-        var a = 1;
+        const a = 1;
         console.log(1);
         +(1, 1);
     }
@@ -693,21 +758,19 @@ call_args: {
 call_args_drop_param: {
     options = {
         evaluate: true,
-        inline: true,
         keep_fargs: false,
-        reduce_funcs: true,
         reduce_vars: true,
-        toplevel: true,
         unused: true,
     }
     input: {
-        var a = 1;
+        const a = 1;
         console.log(a);
         +function(a) {
             return a;
         }(a, b);
     }
     expect: {
+        const a = 1;
         console.log(1);
         +(b, 1);
     }
@@ -745,7 +808,7 @@ in_boolean_context: {
             !b("foo"),
             !b([1, 2]),
             !b(/foo/),
-            (foo(), !1),
+            ![1, foo()],
             (foo(), !1)
         );
     }
@@ -810,15 +873,13 @@ unsafe_charAt_noop: {
     input: {
         console.log(
             s.charAt(0),
-            "string".charAt(x),
-            (typeof x).charAt()
+            "string".charAt(x)
         );
     }
     expect: {
         console.log(
             s.charAt(0),
-            "string".charAt(x),
-            (typeof x)[0]
+            "string".charAt(x)
         );
     }
 }
@@ -1022,587 +1083,3 @@ Infinity_NaN_undefined_LHS: {
         "}",
     ]
 }
-
-issue_1964_1: {
-    options = {
-        evaluate: true,
-        reduce_funcs: true,
-        reduce_vars: true,
-        unsafe_regexp: false,
-        unused: true,
-    }
-    input: {
-        function f() {
-            var long_variable_name = /\s/;
-            console.log(long_variable_name.source);
-            return "a b c".split(long_variable_name)[1];
-        }
-        console.log(f());
-    }
-    expect: {
-        function f() {
-            var long_variable_name = /\s/;
-            console.log(long_variable_name.source);
-            return "a b c".split(long_variable_name)[1];
-        }
-        console.log(f());
-    }
-    expect_stdout: [
-        "\\s",
-        "b",
-    ]
-}
-
-issue_1964_2: {
-    options = {
-        evaluate: true,
-        reduce_funcs: true,
-        reduce_vars: true,
-        unsafe_regexp: true,
-        unused: true,
-    }
-    input: {
-        function f() {
-            var long_variable_name = /\s/;
-            console.log(long_variable_name.source);
-            return "a b c".split(long_variable_name)[1];
-        }
-        console.log(f());
-    }
-    expect: {
-        function f() {
-            console.log(/\s/.source);
-            return "a b c".split(/\s/)[1];
-        }
-        console.log(f());
-    }
-    expect_stdout: [
-        "\\s",
-        "b",
-    ]
-}
-
-array_slice_index: {
-    options = {
-        evaluate: true,
-        unsafe: true,
-    }
-    input: {
-        console.log([1,2,3].slice(1)[1]);
-    }
-    expect: {
-        console.log(3);
-    }
-    expect_stdout: "3"
-}
-
-string_charCodeAt: {
-    options = {
-        evaluate: true,
-        unsafe: true,
-    }
-    input: {
-        console.log("foo".charCodeAt("bar".length));
-    }
-    expect: {
-        console.log(NaN);
-    }
-    expect_stdout: "NaN"
-}
-
-issue_2207_1: {
-    options = {
-        evaluate: true,
-        unsafe: true,
-    }
-    input: {
-        console.log(String.fromCharCode(65));
-        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));
-    }
-    expect: {
-        console.log("A");
-        console.log(7);
-        console.log(Math.cos(1.2345));
-        console.log(1.2543732512566947);
-        console.log(1.6093984514472044);
-    }
-    expect_stdout: true
-}
-
-issue_2207_2: {
-    options = {
-        evaluate: true,
-        unsafe: true,
-    }
-    input: {
-        console.log(Math.E);
-        console.log(Math.LN10);
-        console.log(Math.LN2);
-        console.log(Math.LOG2E);
-        console.log(Math.LOG10E);
-        console.log(Math.PI);
-        console.log(Math.SQRT1_2);
-        console.log(Math.SQRT2);
-    }
-    expect: {
-        console.log(Math.E);
-        console.log(Math.LN10);
-        console.log(Math.LN2);
-        console.log(Math.LOG2E);
-        console.log(Math.LOG10E);
-        console.log(Math.PI);
-        console.log(Math.SQRT1_2);
-        console.log(Math.SQRT2);
-    }
-    expect_stdout: true
-}
-
-issue_2207_3: {
-    options = {
-        evaluate: true,
-        unsafe: true,
-    }
-    input: {
-        console.log(Number.MAX_VALUE);
-        console.log(Number.MIN_VALUE);
-        console.log(Number.NaN);
-        console.log(Number.NEGATIVE_INFINITY);
-        console.log(Number.POSITIVE_INFINITY);
-    }
-    expect: {
-        console.log(Number.MAX_VALUE);
-        console.log(5e-324);
-        console.log(NaN);
-        console.log(-1/0);
-        console.log(1/0);
-    }
-    expect_stdout: true
-}
-
-issue_2231_1: {
-    options = {
-        evaluate: true,
-        unsafe: true,
-    }
-    input: {
-        console.log(Object.keys(void 0));
-    }
-    expect: {
-        console.log(Object.keys(void 0));
-    }
-    expect_stdout: true
-    expect_warnings: [
-        "WARN: Error evaluating Object.keys(void 0) [test/compress/evaluate.js:1191,20]",
-    ]
-}
-
-issue_2231_2: {
-    options = {
-        evaluate: true,
-        unsafe: true,
-    }
-    input: {
-        console.log(Object.getOwnPropertyNames(null));
-    }
-    expect: {
-        console.log(Object.getOwnPropertyNames(null));
-    }
-    expect_stdout: true
-    expect_warnings: [
-        "WARN: Error evaluating Object.getOwnPropertyNames(null) [test/compress/evaluate.js:1208,20]",
-    ]
-}
-
-issue_2231_3: {
-    options = {
-        evaluate: true,
-        unsafe: true,
-    }
-    input: {
-        console.log(Object.keys({ foo: "bar" })[0]);
-    }
-    expect: {
-        console.log("foo");
-    }
-    expect_stdout: "foo"
-}
-
-self_comparison_1: {
-    options = {
-        evaluate: true,
-        reduce_funcs: true,
-        reduce_vars: true,
-        toplevel: true,
-        unsafe: true,
-        unused: true,
-    }
-    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);
-    }
-    expect: {
-        console.log(false, false, true, true, "number");
-    }
-    expect_stdout: "false false true true 'number'"
-}
-
-self_comparison_2: {
-    options = {
-        evaluate: true,
-        hoist_props: true,
-        passes: 2,
-        reduce_funcs: true,
-        reduce_vars: true,
-        toplevel: true,
-        unused: true,
-    }
-    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);
-    }
-    expect: {
-        console.log(false, false, true, true, "number");
-    }
-    expect_stdout: "false false true true 'number'"
-}
-
-issue_2535_1: {
-    options = {
-        booleans: true,
-        evaluate: true,
-        sequences: true,
-        side_effects: true,
-    }
-    input: {
-        if ((x() || true) || y()) z();
-        if ((x() || true) && y()) z();
-        if ((x() && true) || y()) z();
-        if ((x() && true) && y()) z();
-        if ((x() || false) || y()) z();
-        if ((x() || false) && y()) z();
-        if ((x() && false) || y()) z();
-        if ((x() && false) && y()) z();
-    }
-    expect: {
-        if (x(), 1) z();
-        if (x(), y()) z();
-        if (x() || y()) z();
-        if (x() && y()) z();
-        if (x() || y()) z();
-        if (x() && y()) z();
-        if (x(), y()) z();
-        if (x(), 0) z();
-    }
-}
-
-issue_2535_2: {
-    options = {
-        booleans: true,
-        evaluate: true,
-        sequences: true,
-        side_effects: true,
-    }
-    input: {
-        (x() || true) || y();
-        (x() || true) && y();
-        (x() && true) || y();
-        (x() && true) && y();
-        (x() || false) || y();
-        (x() || false) && y();
-        (x() && false) || y();
-        (x() && false) && y();
-    }
-    expect: {
-        x(),
-        x(), y(),
-        x() || y(),
-        x() && y(),
-        x() || y(),
-        x() && y(),
-        x(), y(),
-        x();
-    }
-}
-
-issue_2535_3: {
-    options = {
-        booleans: true,
-        evaluate: true,
-    }
-    input: {
-        console.log(Object(1) && 1 && 2);
-        console.log(Object(1) && true && 1 && 2 && Object(2));
-        console.log(Object(1) && true && 1 && null && 2 && Object(2));
-        console.log(2 == Object(1) || 0 || void 0 || null);
-        console.log(2 == Object(1) || 0 || void 0 || null || Object(2));
-        console.log(2 == Object(1) || 0 || void 0 || "ok" || null || Object(2));
-    }
-    expect: {
-        console.log(Object(1) && 2);
-        console.log(Object(1) && Object(2));
-        console.log(Object(1) && null);
-        console.log(2 == Object(1) || null);
-        console.log(2 == Object(1) || Object(2));
-        console.log(2 == Object(1) || "ok");
-    }
-    expect_stdout: true
-    expect_warnings: [
-        "WARN: Dropping side-effect-free && [test/compress/evaluate.js:1336,20]",
-        "WARN: Dropping side-effect-free && [test/compress/evaluate.js:1337,20]",
-        "WARN: Dropping side-effect-free && [test/compress/evaluate.js:1338,20]",
-        "WARN: Condition left of && always false [test/compress/evaluate.js:1338,20]",
-        "WARN: Dropping side-effect-free || [test/compress/evaluate.js:1339,20]",
-        "WARN: Dropping side-effect-free || [test/compress/evaluate.js:1340,20]",
-        "WARN: Dropping side-effect-free || [test/compress/evaluate.js:1341,20]",
-        "WARN: Condition left of || always true [test/compress/evaluate.js:1341,20]",
-    ]
-}
-
-issue_2822: {
-    options = {
-        evaluate: true,
-        unsafe: true,
-    }
-    input: {
-        console.log([ function() {}, "PASS", "FAIL" ][1]);
-    }
-    expect: {
-        console.log("PASS");
-    }
-    expect_stdout: "PASS"
-}
-
-string_case: {
-    options = {
-        evaluate: true,
-        unsafe: true,
-    }
-    input: {
-        console.log("İ".toLowerCase().charCodeAt(0));
-        console.log("I".toLowerCase().charCodeAt(0));
-        console.log("Ş".toLowerCase().charCodeAt(0));
-        console.log("Ğ".toLowerCase().charCodeAt(0));
-        console.log("Ü".toLowerCase().charCodeAt(0));
-        console.log("Ö".toLowerCase().charCodeAt(0));
-        console.log("Ç".toLowerCase().charCodeAt(0));
-        console.log("i".toUpperCase().charCodeAt(0));
-        console.log("ı".toUpperCase().charCodeAt(0));
-        console.log("ş".toUpperCase().charCodeAt(0));
-        console.log("ğ".toUpperCase().charCodeAt(0));
-        console.log("ü".toUpperCase().charCodeAt(0));
-        console.log("ö".toUpperCase().charCodeAt(0));
-        console.log("ç".toUpperCase().charCodeAt(0));
-    }
-    expect: {
-        console.log(105);
-        console.log(105);
-        console.log(351);
-        console.log(287);
-        console.log(252);
-        console.log(246);
-        console.log(231);
-        console.log(73);
-        console.log(73);
-        console.log(350);
-        console.log(286);
-        console.log(220);
-        console.log(214);
-        console.log(199);
-    }
-    expect_stdout: [
-        "105",
-        "105",
-        "351",
-        "287",
-        "252",
-        "246",
-        "231",
-        "73",
-        "73",
-        "350",
-        "286",
-        "220",
-        "214",
-        "199",
-    ]
-}
-
-issue_2916_1: {
-    options = {
-        evaluate: true,
-        reduce_vars: true,
-        unsafe: true,
-    }
-    input: {
-        var c = "PASS";
-        (function(a, b) {
-            (function(d) {
-                d[0] = 1;
-            })(b);
-            a == b && (c = "FAIL");
-        })("", []);
-        console.log(c);
-    }
-    expect: {
-        var c = "PASS";
-        (function(a, b) {
-            (function(d) {
-                d[0] = 1;
-            })(b);
-            a == b && (c = "FAIL");
-        })("", []);
-        console.log(c);
-    }
-    expect_stdout: "PASS"
-}
-
-issue_2916_2: {
-    options = {
-        collapse_vars: true,
-        evaluate: true,
-        inline: true,
-        reduce_vars: true,
-        side_effects: true,
-        unsafe: true,
-        unused: true,
-    }
-    input: {
-        var c = "FAIL";
-        (function(b) {
-            (function(d) {
-                d[0] = 1;
-            })(b);
-            +b && (c = "PASS");
-        })([]);
-        console.log(c);
-    }
-    expect: {
-        var c = "FAIL";
-        (function(b) {
-            b[0] = 1;
-            +b && (c = "PASS");
-        })([]);
-        console.log(c);
-    }
-    expect_stdout: "PASS"
-}
-
-issue_2919: {
-    options = {
-        evaluate: true,
-        unsafe: true,
-    }
-    input: {
-        console.log([ function() {} ].toString());
-    }
-    expect: {
-        console.log("function(){}");
-    }
-}
-
-issue_2926_1: {
-    options = {
-        evaluate: true,
-        reduce_vars: true,
-        unsafe: true,
-    }
-    input: {
-        (function f(a) {
-            console.log(f.name.length, f.length);
-        })();
-    }
-    expect: {
-        (function f(a) {
-            console.log(1, 1);
-        })();
-    }
-    expect_stdout: "1 1"
-}
-
-issue_2926_2: {
-    options = {
-        evaluate: true,
-        unsafe: true,
-    }
-    input: {
-        console.log(typeof function() {}.valueOf());
-    }
-    expect: {
-        console.log("function");
-    }
-    expect_stdout: "function"
-}
-
-issue_2968: {
-    options = {
-        collapse_vars: true,
-        evaluate: true,
-        inline: true,
-        passes: 2,
-        reduce_vars: 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() {
-            b = -(a = 42),
-            void ((a <<= 0) && (a[(c = "PASS", 0 >>> (b += 1))] = 0));
-            var a, b;
-        })();
-        console.log(c);
-    }
-    expect_stdout: "PASS"
-}
-
-truthy_conditionals: {
-    options = {
-        conditionals: true,
-        evaluate: true,
-    }
-    input: {
-        if (a = {}) x();
-        (b = /foo/) && y();
-        (c = function() {}) || z();
-    }
-    expect: {
-        a = {}, x();
-        b = /foo/, y();
-        c = function() {};
-    }
-}
-
-truthy_loops: {
-    options = {
-        evaluate: true,
-        loops: true,
-    }
-    input: {
-        while ([]) x();
-        do {
-            y();
-        } while(a = {});
-    }
-    expect: {
-        for (;;) {
-            [];
-            x();
-        }
-        for (;;) {
-            y();
-            a = {};
-        }
-    }
-}

test/compress/expansions.js

@@ -0,0 +1,28 @@
+
+expand_arguments: {
+    input: {
+        func(a, ...rest);
+        func(...all);
+    }
+    expect_exact: "func(a,...rest);func(...all);"
+}
+
+expand_expression_arguments: {
+    input: {
+        f(...a.b);
+        f(...a.b());
+        f(...(a));
+        f(...(a.b));
+        f(...a[i]);
+    }
+    expect_exact: "f(...a.b);f(...a.b());f(...a);f(...a.b);f(...a[i]);"
+}
+
+expand_parameters: {
+    input: {
+        (function (a, ...b){});
+        (function (...args){});
+    }
+    expect_exact: "(function(a,...b){});(function(...args){});"
+}
+

test/compress/expression.js

@@ -0,0 +1,52 @@
+pow: {
+    input: {
+        var a = 2 ** 7;
+        var b = 3;
+        b **= 2;
+    }
+    expect: {
+        var a = 2 ** 7;
+        var b = 3;
+        b **= 2;
+    }
+}
+
+pow_with_number_constants: {
+    input: {
+        var a = 5 ** NaN;
+        var b = 42 ** +0;
+        var c = 42 ** -0;
+        var d = NaN ** 1;
+        var e = 2 ** Infinity;
+        var f = 2 ** -Infinity;
+    }
+    expect: {
+        var a = 5 ** NaN;
+        var b = 42 ** +0;
+        var c = 42 ** -0;
+        var d = NaN ** 1;
+        var e = 2 ** (1/0);
+        var f = 2 ** (-1/0);
+    }
+}
+
+pow_with_parentheses: {
+    input: {
+        var g = (-7) ** (0.5);
+        var h = 2324334 ** 34343443;
+        var i = (-2324334) ** 34343443;
+        var j = 2 ** (-3);
+        var k = 2.0 ** -3;
+        var l = 2.0 ** (5 - 7);
+    }
+    expect_exact: "var g=(-7)**.5;var h=2324334**34343443;var i=(-2324334)**34343443;var j=2**-3;var k=2**-3;var l=2**(5-7);"
+}
+
+pow_with_unary_between_brackets: {
+    input: {
+        var a = (-(+5)) ** 3;
+    }
+    expect: {
+        var a = (-+5)**3;
+    }
+}

test/compress/global_defs.js

@@ -37,7 +37,6 @@ object: {
                 VALUE: 42,
             },
         },
-        side_effects: true,
         unsafe: true,
     }
     input: {
@@ -121,7 +120,7 @@ mixed: {
         properties: true,
     }
     input: {
-        var FOO = { BAR: 0 };
+        const FOO = { BAR: 0 };
         console.log(FOO.BAR);
         console.log(++CONFIG.DEBUG);
         console.log(++CONFIG.VALUE);
@@ -131,7 +130,7 @@ mixed: {
         console.log(CONFIG);
     }
     expect: {
-        var FOO = { BAR: 0 };
+        const FOO = { BAR: 0 };
         console.log("moo");
         console.log(++CONFIG.DEBUG);
         console.log(++CONFIG.VALUE);
@@ -141,9 +140,9 @@ mixed: {
         console.log(CONFIG);
     }
     expect_warnings: [
+        'WARN: global_defs CONFIG.VALUE redefined [test/compress/global_defs.js:126,22]',
         'WARN: global_defs CONFIG.VALUE redefined [test/compress/global_defs.js:127,22]',
-        'WARN: global_defs CONFIG.VALUE redefined [test/compress/global_defs.js:128,22]',
-        'WARN: global_defs CONFIG.VALUE redefined [test/compress/global_defs.js:130,8]',
+        'WARN: global_defs CONFIG.VALUE redefined [test/compress/global_defs.js:129,8]',
     ]
 }
 
@@ -161,39 +160,3 @@ issue_1801: {
         console.log(!0);
     }
 }
-
-issue_1986: {
-    options = {
-        global_defs: {
-            "@alert": "console.log",
-        },
-    }
-    input: {
-        alert(42);
-    }
-    expect: {
-        console.log(42);
-    }
-}
-
-issue_2167: {
-    options = {
-        conditionals: true,
-        dead_code: true,
-        evaluate: true,
-        global_defs: {
-            "@isDevMode": "function(){}",
-        },
-        passes: 2,
-        side_effects: true,
-    }
-    input: {
-        if (isDevMode()) {
-            greetOverlord();
-        }
-        doWork();
-    }
-    expect: {
-        doWork();
-    }
-}

test/compress/harmony.js

@@ -0,0 +1,426 @@
+arrow_function_parens: {
+    input: {
+        something && (() => {});
+    }
+    expect_exact: "something&&(()=>{});"
+}
+arrow_function_parens_2: {
+    input: {
+        (() => null)();
+    }
+    expect_exact: "(()=>null)();"
+}
+
+typeof_arrow_functions: {
+    options = {
+        evaluate: true
+    }
+    input: {
+        var foo = typeof (x) => null;
+    }
+    expect_exact: "var foo=\"function\";"
+}
+
+classes: {
+    input: {
+        class SomeClass {
+            constructor() {
+            };
+            foo() {};
+        };
+        class NoSemi {
+            constructor(...args) {
+            }
+            foo() {}
+        };
+        class ChildClass extends SomeClass {};
+        var asExpression = class AsExpression {};
+        var nameless = class {};
+    }
+    expect_exact: "class SomeClass{constructor(){}foo(){}}class NoSemi{constructor(...args){}foo(){}}class ChildClass extends SomeClass{}var asExpression=class AsExpression{};var nameless=class{};"
+}
+
+class_statics: {
+    input: {
+        x = class {
+            static staticMethod() {}
+            static get foo() {}
+            static set bar() {}
+            static() { /* "static" can be a method name! */ }
+            get() { /* "get" can be a method name! */ }
+            set() { /* "set" can be a method name! */ }
+        }
+    }
+    expect_exact: "x=class{static staticMethod(){}static get foo(){}static set bar(){}static(){}get(){}set(){}};"
+}
+
+class_name_can_be_mangled: {
+    mangle = { };
+    input: {
+        function x() {
+            class Foo {
+            }
+            var class1 = Foo
+            var class2 = class Bar {}
+        }
+    }
+    expect: {
+        function x() {
+            class a { }
+            var n = a
+            var r = class a {}
+        }
+    }
+}
+
+class_name_can_be_preserved: {
+    mangle = {
+        keep_classnames: true
+    }
+    input: {
+        function x() {
+            (class Baz { });
+            class Foo {};
+        }
+    }
+    expect: {
+        function x() {
+            (class Baz { });
+            class Foo {};
+        }
+    }
+}
+
+classes_can_have_generators: {
+    input: {
+        class Foo {
+            *bar() {}
+            static *baz() {}
+        }
+    }
+    expect: {
+        class Foo {
+            *bar() {}
+            static *baz() {}
+        }
+    }
+}
+
+classes_can_have_computed_generators: {
+    input: {
+        class C4 {
+            *['constructor']() {}
+        }
+    }
+    expect: {
+        class C4 {
+            *['constructor']() {}
+        }
+    }
+}
+
+classes_can_have_computed_static: {
+    input: {
+        class C4 {
+            static ['constructor']() {}
+        }
+    }
+    expect: {
+        class C4 {
+            static ['constructor']() {}
+        }
+    }
+}
+
+class_methods_and_getters_with_keep_quoted_props_enabled: {
+    beautify = {
+        quote_style: 3,
+        keep_quoted_props: true,
+    }
+    input: {
+        class clss {
+            a() {}
+            "b"() {}
+            get c() { return "c"}
+            get "d"() { return "d"}
+            set e(a) { doSomething(a); }
+            set 'f'(a) { doSomething(b); }
+            static g() {}
+            static "h"() {}
+        }
+    }
+    expect_exact: 'class clss{a(){}"b"(){}get c(){return"c"}get"d"(){return"d"}set e(a){doSomething(a)}set\'f\'(a){doSomething(b)}static g(){}static"h"(){}}'
+}
+
+classes_with_expression_as_expand: {
+    input: {
+        class D extends (calls++, C) {}
+    }
+    expect_exact: "class D extends(calls++,C){}"
+}
+
+new_target: {
+    input: {
+        new.target;
+        new.target.name;
+    }
+    expect_exact: "new.target;new.target.name;"
+}
+
+number_literals: {
+    input: {
+        0b1001;
+        0B1001;
+        0o11;
+        0O11;
+    }
+
+    expect: {
+        9;
+        9;
+        9;
+        9;
+    }
+}
+
+import_statement: {
+    input: {
+        import "mod-name";
+        import Foo from "bar";
+        import { Bar, Baz } from 'lel';
+        import Bar, { Foo } from 'lel';
+        import { Bar as kex, Baz as food } from 'lel';
+    }
+    expect_exact: 'import"mod-name";import Foo from"bar";import{Bar,Baz}from"lel";import Bar,{Foo}from"lel";import{Bar as kex,Baz as food}from"lel";'
+}
+
+import_all_statement: {
+    input: {
+        import * from 'lel';
+        import * as Lel from 'lel';
+    }
+    expect_exact: 'import*from"lel";import*as Lel from"lel";'
+}
+
+export_statement: {
+    input: {
+        export default 1;
+        export var foo = 4;
+        export let foo = 6;
+        export const foo = 6;
+        export function foo() {};
+        export class foo { };
+    }
+    expect_exact: "export default 1;export var foo=4;export let foo=6;export const foo=6;export function foo(){};export class foo{};"
+}
+
+export_module_statement: {
+    input: {
+        export * from "a.js";
+        export {A} from "a.js";
+        export {A, B} from "a.js";
+        export {C};
+    }
+    expect_exact: 'export*from"a.js";export{A}from"a.js";export{A,B}from"a.js";export{C};'
+}
+
+import_statement_mangling: {
+    mangle = { toplevel: true };
+    input: {
+        import Foo from "foo";
+        import Bar, {Food} from "lel";
+        import {What as Whatever} from "lel";
+        Foo();
+        Bar();
+        Food();
+        Whatever();
+    }
+    expect: {
+        import l from "foo";
+        import e, {Food as o} from "lel";
+        import {What as f} from "lel";
+        l();
+        e();
+        o();
+        f();
+    }
+}
+
+export_statement_mangling: {
+    mangle = { };
+    input: {
+        export var foo = 6;
+        export function bar() { }
+        export class Baz { }
+        bar(foo, Baz)
+    }
+    expect: {
+        export var foo = 6;
+        export function bar() { }
+        export class Baz { }
+        bar(foo, Baz)
+    }
+}
+
+// https://github.com/mishoo/UglifyJS2/issues/1021
+regression_for_of_const: {
+    input: {
+        for (const x of y) {}
+        for (const x in y) {}
+    }
+    expect: {
+        for (const x of y);for (const x in y);
+    }
+}
+
+// Fabio: My patches accidentally caused a crash whenever
+// there's an extraneous set of parens around an object.
+regression_cannot_destructure: {
+    input: {
+        var x = ({ x : 3 });
+        x(({ x: 3 }));
+    }
+    expect_exact: "var x={x:3};x({x:3});";
+}
+
+regression_cannot_use_of: {
+    input: {
+        function of() {
+        }
+        var of = "is a valid variable name";
+        of = { of: "is ok" };
+        x.of;
+        of: foo()
+    }
+    expect: {
+        function of(){}
+        var of="is a valid variable name";
+        of={of:"is ok"};
+        x.of;
+        foo();  /* Label statement missing? No prob. */
+    }
+}
+
+fat_arrow_as_param: {
+    input: {
+        foo(x => x);
+        foo(x => x, y => y);
+
+        foo(x => (x, x));
+        foo(x => (x, x), y => (y, y));
+    }
+    expect_exact: "foo(x=>x);foo(x=>x,y=>y);foo(x=>(x,x));foo(x=>(x,x),y=>(y,y));"
+}
+
+default_assign: {
+    options = {
+        keep_fargs: false,
+        unused: true,
+    }
+    input: {
+        function f(a, b = 3) {
+            console.log(a);
+        }
+
+        g = ([[] = 123]) => {};
+        h = ([[x, y, z] = [4, 5, 6]] = []) => {};
+
+        function i([[x, y, z] = [4, 5, 6]] = []) {
+            console.log(b);
+        };
+    }
+    expect: {
+        function f(a) {
+            console.log(a);
+        }
+
+        g = ([[] = 123]) => {};
+        h = ([[x, y, z] = [4, 5, 6]] = []) => {};
+
+        function i([[x, y, z] = [4, 5, 6]] = []) {
+            console.log(b);
+        };
+    }
+}
+
+expansion: {
+    options = {
+        keep_fargs: false,
+        unused: true,
+    }
+    input: {
+        function f(a, ...b) {
+            console.log(a);
+        }
+    }
+    expect: {
+        function f(a) {
+            console.log(a);
+        }
+    }
+}
+
+issue_1613: {
+  mangle = { toplevel: true };
+  input: {
+    const name = 1;
+    const foo = {
+      name
+    };
+  }
+  expect_exact: "const n=1;const c={name:n};"
+}
+
+format_methods: {
+    beautify = {
+        beautify: true,
+    }
+    input: {
+        class A extends B {constructor(a){x()} static s(b,c){y()} run(d,e,f){z()}}
+    }
+    expect_exact: [
+        "class A extends B {",
+        "    constructor(a) {",
+        "        x();",
+        "    }",
+        "    static s(b, c) {",
+        "        y();",
+        "    }",
+        "    run(d, e, f) {",
+        "        z();",
+        "    }",
+        "}",
+    ]
+}
+
+issue_1898: {
+    options = {
+    }
+    mangle = {
+    }
+    input: {
+        class Foo {
+            bar() {
+                for (const x of [ 6, 5 ]) {
+                    for (let y of [ 4, 3 ]) {
+                        for (var z of [ 2, 1 ]) {
+                            console.log(x, y, z);
+                        }
+                    }
+                }
+            }
+        }
+        new Foo().bar();
+    }
+    expect: {
+        class Foo {
+            bar() {
+                for (const n of [ 6, 5 ])
+                    for (let r of [ 4, 3 ])
+                        for (var o of [ 2, 1 ])
+                            console.log(n, r, o);
+            }
+        }
+        new Foo().bar();
+    }
+}

test/compress/hoist.js

@@ -0,0 +1,85 @@
+
+hoist_vars: {
+    options = {
+        hoist_vars: true
+    }
+    input: {
+        function a() {
+            bar();
+            var var1;
+            var var2;
+        }
+        function b(anArg) {
+            bar();
+            var var1;
+            var anArg;
+        }
+    }
+    expect: {
+        function a() {
+            var var1, var2;  // Vars go up and are joined
+            bar();
+        }
+        function b(anArg) {
+            var var1;
+            bar();
+            // But vars named like arguments go away!
+        }
+    }
+}
+
+hoist_funs: {
+    options = {
+        hoist_funs: true
+    }
+    input: {
+        function a() {
+            bar();
+            function foo() {}
+        }
+    }
+    expect: {
+        function a() {
+            function foo() {}  // Funs go up
+            bar();
+        }
+    }
+}
+
+hoist_no_destructurings: {
+    options = {
+        hoist_vars: true,
+        hoist_funs: true
+    }
+    input: {
+        function a([anArg]) {
+            bar();
+            var var1;
+            var anArg;  // Because anArg is already declared, this goes away!
+        }
+    }
+    expect: {
+        function a([anArg]) {
+            var var1;
+            bar();
+        }
+    }
+}
+
+dont_hoist_var_destructurings: {
+    options = {
+        hoist_vars: true,
+        hoist_funs: true
+    }
+    input: {
+        function x() {
+            // If foo is null or undefined, this should be an exception
+            var {x,y} = foo;
+        }
+    }
+    expect: {
+        function x() {
+            var {x,y} = foo;
+        }
+    }
+}

test/compress/hoist_props.js

@@ -1,858 +0,0 @@
-issue_2377_1: {
-    options = {
-        evaluate: true,
-        inline: true,
-        hoist_props: true,
-        reduce_funcs: true,
-        reduce_vars: true,
-        toplevel: true,
-        unused: true,
-    }
-    input: {
-        var obj = {
-            foo: 1,
-            bar: 2,
-            square: function(x) {
-                return x * x;
-            },
-            cube: function(x) {
-                return x * x * x;
-            },
-        };
-        console.log(obj.foo, obj.cube(3));
-    }
-    expect: {
-        var obj_foo = 1, obj_cube = function(x) {
-            return x * x * x;
-        };
-        console.log(obj_foo, obj_cube(3));
-    }
-    expect_stdout: "1 27"
-}
-
-issue_2377_2: {
-    options = {
-        evaluate: true,
-        inline: true,
-        hoist_props: true,
-        passes: 2,
-        reduce_funcs: true,
-        reduce_vars: true,
-        toplevel: true,
-        unused: true,
-    }
-    input: {
-        var obj = {
-            foo: 1,
-            bar: 2,
-            square: function(x) {
-                return x * x;
-            },
-            cube: function(x) {
-                return x * x * x;
-            },
-        };
-        console.log(obj.foo, obj.cube(3));
-    }
-    expect: {
-        console.log(1, (x = 3, x * x * x));
-        var x;
-    }
-    expect_stdout: "1 27"
-}
-
-issue_2377_3: {
-    options = {
-        evaluate: true,
-        inline: true,
-        hoist_props: true,
-        passes: 4,
-        reduce_funcs: true,
-        reduce_vars: true,
-        side_effects: true,
-        toplevel: true,
-        unused: true,
-    }
-    input: {
-        var obj = {
-            foo: 1,
-            bar: 2,
-            square: function(x) {
-                return x * x;
-            },
-            cube: function(x) {
-                return x * x * x;
-            },
-        };
-        console.log(obj.foo, obj.cube(3));
-    }
-    expect: {
-        console.log(1, 27);
-    }
-    expect_stdout: "1 27"
-}
-
-direct_access_1: {
-    options = {
-        hoist_props: true,
-        reduce_funcs: true,
-        reduce_vars: true,
-        toplevel: true,
-        unused: true,
-    }
-    input: {
-        var a = 0;
-        var obj = {
-            a: 1,
-            b: 2,
-        };
-        for (var k in obj) a++;
-        console.log(a, obj.a);
-    }
-    expect: {
-        var a = 0;
-        var obj = {
-            a: 1,
-            b: 2,
-        };
-        for (var k in obj) a++;
-        console.log(a, obj.a);
-    }
-    expect_stdout: "2 1"
-}
-
-direct_access_2: {
-    options = {
-        hoist_props: true,
-        reduce_funcs: true,
-        reduce_vars: true,
-        toplevel: true,
-        unused: true,
-    }
-    input: {
-        var o = { a: 1 };
-        var f = function(k) {
-            if (o[k]) return "PASS";
-        };
-        console.log(f("a"));
-    }
-    expect: {
-        var o = { a: 1 };
-        console.log(function(k) {
-            if (o[k]) return "PASS";
-        }("a"));
-    }
-    expect_stdout: "PASS"
-}
-
-direct_access_3: {
-    options = {
-        hoist_props: true,
-        reduce_funcs: true,
-        reduce_vars: true,
-        toplevel: true,
-        unused: true,
-    }
-    input: {
-        var o = { a: 1 };
-        o.b;
-        console.log(o.a);
-    }
-    expect: {
-        var o = { a: 1 };
-        o.b;
-        console.log(o.a);
-    }
-    expect_stdout: "1"
-}
-
-single_use: {
-    options = {
-        hoist_props: true,
-        reduce_funcs: true,
-        reduce_vars: true,
-        toplevel: true,
-        unused: true,
-    }
-    input: {
-        var obj = {
-            bar: function() {
-                return 42;
-            },
-        };
-        console.log(obj.bar());
-    }
-    expect: {
-        console.log({
-            bar: function() {
-                return 42;
-            },
-        }.bar());
-    }
-}
-
-name_collision_1: {
-    options = {
-        hoist_props: true,
-        reduce_funcs: true,
-        reduce_vars: true,
-        toplevel: true,
-    }
-    input: {
-        var obj_foo = 1;
-        var obj_bar = 2;
-        function f() {
-            var obj = {
-                foo: 3,
-                bar: 4,
-                "b-r": 5,
-                "b+r": 6,
-                "b!r": 7,
-            };
-            console.log(obj_foo, obj.foo, obj.bar, obj["b-r"], obj["b+r"], obj["b!r"]);
-        }
-        f();
-    }
-    expect: {
-        var obj_foo = 1;
-        var obj_bar = 2;
-        function f() {
-            var obj_foo$0 = 3,
-                obj_bar = 4,
-                obj_b_r = 5,
-                obj_b_r$0 = 6,
-                obj_b_r$1 = 7;
-            console.log(obj_foo, obj_foo$0, obj_bar, obj_b_r, obj_b_r$0, obj_b_r$1);
-        }
-        f();
-    }
-    expect_stdout: "1 3 4 5 6 7"
-}
-
-name_collision_2: {
-    options = {
-        hoist_props: true,
-        reduce_funcs: true,
-        reduce_vars: true,
-        toplevel: true,
-    }
-    input: {
-        var o = {
-            p: 1,
-            "+": function(x) {
-                return x;
-            },
-            "-": function(x) {
-                return x + 1;
-            }
-        }, o__$0 = 2, o__$1 = 3;
-        console.log(o.p === o.p, o["+"](4), o["-"](5), o__$0, o__$1);
-    }
-    expect: {
-        var o_p = 1,
-            o__ = function(x) {
-                return x;
-            },
-            o__$2 = function(x) {
-                return x + 1;
-            },
-            o__$0 = 2,
-            o__$1 = 3;
-        console.log(o_p === o_p, o__(4), o__$2(5), o__$0, o__$1);
-    }
-    expect_stdout: "true 4 6 2 3"
-}
-
-name_collision_3: {
-    options = {
-        hoist_props: true,
-        reduce_funcs: true,
-        reduce_vars: true,
-        toplevel: true,
-    }
-    input: {
-        var o = {
-            p: 1,
-            "+": function(x) {
-                return x;
-            },
-            "-": function(x) {
-                return x + 1;
-            }
-        }, o__$0 = 2, o__$1 = 3;
-        console.log(o.p === o.p, o["+"](4), o["-"](5));
-    }
-    expect: {
-        var o_p = 1,
-            o__ = function(x) {
-                return x;
-            },
-            o__$2 = function(x) {
-                return x + 1;
-            },
-            o__$0 = 2,
-            o__$1 = 3;
-        console.log(o_p === o_p, o__(4), o__$2(5));
-    }
-    expect_stdout: "true 4 6"
-}
-
-contains_this_1: {
-    options = {
-        evaluate: true,
-        hoist_props: true,
-        inline: true,
-        passes: 2,
-        reduce_funcs: true,
-        reduce_vars: true,
-        toplevel: true,
-        unused: true,
-    }
-    input: {
-        var o = {
-            u: function() {
-                return this === this;
-            },
-            p: 1
-        };
-        console.log(o.p, o.p);
-    }
-    expect: {
-        console.log(1, 1);
-    }
-    expect_stdout: "1 1"
-}
-
-contains_this_2: {
-    options = {
-        evaluate: true,
-        hoist_props: true,
-        inline: true,
-        passes: 2,
-        reduce_funcs: true,
-        reduce_vars: true,
-        toplevel: true,
-        unused: true,
-    }
-    input: {
-        var o = {
-            u: function() {
-                return this === this;
-            },
-            p: 1
-        };
-        console.log(o.p, o.p, o.u);
-    }
-    expect: {
-        console.log(1, 1, function() {
-            return this === this;
-        });
-    }
-    expect_stdout: true
-}
-
-contains_this_3: {
-    options = {
-        evaluate: true,
-        hoist_props: true,
-        inline: true,
-        passes: 2,
-        reduce_funcs: true,
-        reduce_vars: true,
-        toplevel: true,
-        unused: true,
-    }
-    input: {
-        var o = {
-            u: function() {
-                return this === this;
-            },
-            p: 1
-        };
-        console.log(o.p, o.p, o.u());
-    }
-    expect: {
-        var o = {
-            u: function() {
-                return this === this;
-            },
-            p: 1
-        };
-        console.log(o.p, o.p, o.u());
-    }
-    expect_stdout: "1 1 true"
-}
-
-new_this: {
-    options = {
-        evaluate: true,
-        hoist_props: true,
-        inline: true,
-        passes: 2,
-        reduce_funcs: true,
-        reduce_vars: true,
-        toplevel: true,
-        unused: true,
-    }
-    input: {
-        var o = {
-            a: 1,
-            b: 2,
-            f: function(a) {
-                this.b = a;
-            }
-        };
-        console.log(new o.f(o.a).b, o.b);
-    }
-    expect: {
-        console.log(new function(a) {
-            this.b = a;
-        }(1).b, 2);
-    }
-    expect_stdout: "1 2"
-}
-
-issue_2473_1: {
-    options = {
-        hoist_props: false,
-        reduce_vars: true,
-        top_retain: [ "x", "y" ],
-        toplevel: true,
-        unused: true,
-    }
-    input: {
-        var x = {};
-        var y = [];
-        var z = {};
-    }
-    expect: {
-        var x = {};
-        var y = [];
-    }
-}
-
-issue_2473_2: {
-    options = {
-        hoist_props: true,
-        reduce_vars: true,
-        top_retain: [ "x", "y" ],
-        toplevel: true,
-        unused: true,
-    }
-    input: {
-        var x = {};
-        var y = [];
-        var z = {};
-    }
-    expect: {
-        var x = {};
-        var y = [];
-    }
-}
-
-issue_2473_3: {
-    options = {
-        hoist_props: true,
-        reduce_vars: true,
-        top_retain: "o",
-        toplevel: true,
-        unused: true,
-    }
-    input: {
-        var o = {
-            a: 1,
-            b: 2,
-        };
-        console.log(o.a, o.b);
-    }
-    expect: {
-        var o = {
-            a: 1,
-            b: 2,
-        };
-        console.log(o.a, o.b);
-    }
-    expect_stdout: "1 2"
-}
-
-issue_2473_4: {
-    options = {
-        hoist_props: true,
-        reduce_vars: true,
-        top_retain: "o",
-        toplevel: true,
-        unused: true,
-    }
-    input: {
-        (function() {
-            var o = {
-                a: 1,
-                b: 2,
-            };
-            console.log(o.a, o.b);
-        })();
-    }
-    expect: {
-        (function() {
-            var o_a = 1, o_b = 2;
-            console.log(o_a, o_b);
-        })();
-    }
-    expect_stdout: "1 2"
-}
-
-issue_2508_1: {
-    options = {
-        collapse_vars: true,
-        hoist_props: true,
-        reduce_vars: true,
-        toplevel: true,
-        unused: true,
-    }
-    input: {
-        var o = {
-            a: [ 1 ],
-            f: function(x) {
-                console.log(x);
-            }
-        };
-        o.f(o.a);
-    }
-    expect: {
-        (function(x) {
-            console.log(x);
-        })([ 1 ]);
-    }
-    expect_stdout: true
-}
-
-issue_2508_2: {
-    options = {
-        collapse_vars: true,
-        hoist_props: true,
-        reduce_vars: true,
-        toplevel: true,
-        unused: true,
-    }
-    input: {
-        var o = {
-            a: { b: 2 },
-            f: function(x) {
-                console.log(x);
-            }
-        };
-        o.f(o.a);
-    }
-    expect: {
-        (function(x) {
-            console.log(x);
-        })({ b: 2 });
-    }
-    expect_stdout: true
-}
-
-issue_2508_3: {
-    options = {
-        collapse_vars: true,
-        hoist_props: true,
-        reduce_vars: true,
-        toplevel: true,
-        unused: true,
-    }
-    input: {
-        var o = {
-            a: [ o ],
-            f: function(x) {
-                console.log(x);
-            }
-        };
-        o.f(o.a);
-    }
-    expect: {
-        var o = {
-            a: [ o ],
-            f: function(x) {
-                console.log(x);
-            }
-        };
-        o.f(o.a);
-    }
-    expect_stdout: true
-}
-
-issue_2508_4: {
-    options = {
-        collapse_vars: true,
-        hoist_props: true,
-        reduce_vars: true,
-        toplevel: true,
-        unused: true,
-    }
-    input: {
-        var o = {
-            a: { b: o },
-            f: function(x) {
-                console.log(x);
-            }
-        };
-        o.f(o.a);
-    }
-    expect: {
-        var o = {
-            a: { b: o },
-            f: function(x) {
-                console.log(x);
-            }
-        };
-        o.f(o.a);
-    }
-    expect_stdout: true
-}
-
-issue_2508_5: {
-    options = {
-        collapse_vars: true,
-        hoist_props: true,
-        reduce_vars: true,
-        toplevel: true,
-        unused: true,
-    }
-    input: {
-        var o = {
-            f: function(x) {
-                console.log(x);
-            }
-        };
-        o.f(o.f);
-    }
-    expect: {
-        var o_f = function(x) {
-            console.log(x);
-        };
-        o_f(o_f);
-    }
-    expect_stdout: true
-}
-
-issue_2519: {
-    options = {
-        collapse_vars: true,
-        evaluate: true,
-        hoist_props: true,
-        reduce_vars: true,
-        unused: true,
-    }
-    input: {
-        function testFunc() {
-            var dimensions = {
-                minX: 5,
-                maxX: 6,
-            };
-            var scale = 1;
-            var d = {
-                x: (dimensions.maxX + dimensions.minX) / 2,
-            };
-            return d.x * scale;
-        }
-        console.log(testFunc());
-    }
-    expect: {
-        function testFunc() {
-            return 1 * ((6 + 5) / 2);
-        }
-        console.log(testFunc());
-    }
-    expect_stdout: "5.5"
-}
-
-undefined_key: {
-    options = {
-        evaluate: true,
-        hoist_props: true,
-        join_vars: true,
-        passes: 4,
-        reduce_vars: true,
-        toplevel: true,
-        unused: true,
-    }
-    input: {
-        var a, o = {};
-        o[a] = 1;
-        o.b = 2;
-        console.log(o[a] + o.b);
-    }
-    expect: {
-        console.log(3);
-    }
-    expect_stdout: "3"
-}
-
-issue_3021: {
-    options = {
-        hoist_props: true,
-        reduce_vars: true,
-    }
-    input: {
-        var a = 1, b = 2;
-        (function() {
-            b = a;
-            if (a++ + b--)
-                return 1;
-            return;
-            var b = {};
-        })();
-        console.log(a, b);
-    }
-    expect: {
-        var a = 1, b = 2;
-        (function() {
-            b = a;
-            if (a++ + b--)
-                return 1;
-            return;
-            var b = {};
-        })();
-        console.log(a, b);
-    }
-    expect_stdout: "2 2"
-}
-
-issue_3046: {
-    options = {
-        hoist_props: true,
-        reduce_vars: true,
-    }
-    input: {
-        console.log(function(a) {
-            do {
-                var b = {
-                    c: a++
-                };
-            } while (b.c && a);
-            return a;
-        }(0));
-    }
-    expect: {
-        console.log(function(a) {
-            do {
-                var b_c = a++;
-            } while (b_c && a);
-            return a;
-        }(0));
-    }
-    expect_stdout: "1"
-}
-
-issue_3071_1: {
-    options = {
-        evaluate: true,
-        inline: true,
-        join_vars: true,
-        hoist_props: true,
-        passes: 3,
-        reduce_vars: true,
-        sequences: true,
-        side_effects: true,
-        toplevel: true,
-        unused: true,
-    }
-    input: {
-        (function() {
-            var obj = {};
-            obj.one = 1;
-            obj.two = 2;
-            console.log(obj.one);
-        })();
-    }
-    expect: {
-        console.log(1);
-    }
-    expect_stdout: "1"
-}
-
-issue_3071_2: {
-    options = {
-        evaluate: true,
-        inline: true,
-        join_vars: true,
-        hoist_props: true,
-        passes: 3,
-        reduce_vars: true,
-        sequences: true,
-        side_effects: true,
-        unused: true,
-    }
-    input: {
-        (function() {
-            obj = {};
-            obj.one = 1;
-            obj.two = 2;
-            console.log(obj.one);
-            var obj;
-        })();
-    }
-    expect: {
-        console.log(1);
-    }
-    expect_stdout: "1"
-}
-
-issue_3071_2_toplevel: {
-    options = {
-        evaluate: true,
-        inline: true,
-        join_vars: true,
-        hoist_props: true,
-        passes: 3,
-        reduce_vars: true,
-        sequences: true,
-        side_effects: true,
-        toplevel: true,
-        unused: true,
-    }
-    input: {
-        (function() {
-            obj = {};
-            obj.one = 1;
-            obj.two = 2;
-            console.log(obj.one);
-            var obj;
-        })();
-    }
-    expect: {
-        console.log(1);
-    }
-    expect_stdout: "1"
-}
-
-issue_3071_3: {
-    options = {
-        hoist_props: true,
-        reduce_vars: true,
-    }
-    input: {
-        var c = 0;
-        (function(a, b) {
-            (function f(o) {
-                var n = 2;
-                while (--b + (o = {
-                    p: c++,
-                }) && --n > 0);
-            })();
-        })();
-        console.log(c);
-    }
-    expect: {
-        var c = 0;
-        (function(a, b) {
-            (function f(o) {
-                var n = 2;
-                while (--b + (o = {
-                    p: c++,
-                }) && --n > 0);
-            })();
-        })();
-        console.log(c);
-    }
-    expect_stdout: "2"
-}

test/compress/hoist_vars.js

@@ -88,24 +88,3 @@ sequences_funs: {
         }
     }
 }
-
-issue_2295: {
-    options = {
-        collapse_vars: true,
-        hoist_vars: true,
-    }
-    input: {
-        function foo(o) {
-            var a = o.a;
-            if (a) return a;
-            var a = 1;
-        }
-    }
-    expect: {
-        function foo(o) {
-            var a = o.a;
-            if (a) return a;
-            a = 1;
-        }
-    }
-}

test/compress/html_comments.js

@@ -53,3 +53,12 @@ html_comment_in_string_literal: {
     }
     expect_exact: 'function f(){return"\\x3c!--HTML--\\x3ecomment in\\x3c!--string literal--\\x3e"}';
 }
+
+html_comment_after_multiline_comment: {
+    input: {
+        var foo; /*
+*/-->   var bar;
+        var foobar;
+    }
+    expect_exact: "var foo;var foobar;"
+}

test/compress/ie8.js

@@ -1,540 +0,0 @@
-do_screw: {
-    options = {
-        ie8: false,
-    }
-    beautify = {
-        ie8: false,
-        ascii_only: true,
-    }
-    input: {
-        f("\v");
-    }
-    expect_exact: 'f("\\v");'
-}
-
-dont_screw: {
-    options = {
-        ie8: true,
-    }
-    beautify = {
-        ie8: true,
-        ascii_only: true,
-    }
-    input: {
-        f("\v");
-    }
-    expect_exact: 'f("\\x0B");'
-}
-
-do_screw_constants: {
-    options = {
-        ie8: false,
-    }
-    input: {
-        f(undefined, Infinity);
-    }
-    expect_exact: "f(void 0,1/0);"
-}
-
-dont_screw_constants: {
-    options = {
-        ie8: true,
-    }
-    input: {
-        f(undefined, Infinity);
-    }
-    expect_exact: "f(undefined,Infinity);"
-}
-
-do_screw_try_catch: {
-    options = {
-        ie8: false,
-    }
-    mangle = {
-        ie8: false,
-    }
-    beautify = {
-        ie8: false,
-    }
-    input: {
-        good = function(e){
-            return function(error){
-                try{
-                    e()
-                } catch(e) {
-                    error(e)
-                }
-            }
-        };
-    }
-    expect: {
-        good = function(n){
-            return function(t){
-                try{
-                    n()
-                } catch(n) {
-                    t(n)
-                }
-            }
-        };
-    }
-}
-
-dont_screw_try_catch: {
-    options = {
-        ie8: true,
-    }
-    mangle = {
-        ie8: true,
-    }
-    beautify = {
-        ie8: true,
-    }
-    input: {
-        bad = function(e){
-            return function(error){
-                try{
-                    e()
-                } catch(e) {
-                    error(e)
-                }
-            }
-        };
-    }
-    expect: {
-        bad = function(t){
-            return function(n){
-                try{
-                    t()
-                } catch(t) {
-                    n(t)
-                }
-            }
-        };
-    }
-}
-
-do_screw_try_catch_undefined: {
-    options = {
-        ie8: false,
-    }
-    mangle = {
-        ie8: false,
-    }
-    beautify = {
-        ie8: false,
-    }
-    input: {
-        function a(b){
-            try {
-                throw 'Stuff';
-            } catch (undefined) {
-                console.log('caught: ' + undefined);
-            }
-            console.log('undefined is ' + undefined);
-            return b === undefined;
-        };
-    }
-    expect: {
-        function a(o){
-            try{
-                throw "Stuff"
-            } catch (o) {
-                console.log("caught: "+o)
-            }
-            console.log("undefined is " + void 0);
-            return void 0===o
-        }
-    }
-    expect_stdout: true
-}
-
-dont_screw_try_catch_undefined: {
-    options = {
-        ie8: true,
-    }
-    mangle = {
-        ie8: true,
-    }
-    beautify = {
-        ie8: true,
-    }
-    input: {
-        function a(b){
-            try {
-                throw 'Stuff';
-            } catch (undefined) {
-                console.log('caught: ' + undefined);
-            }
-            console.log('undefined is ' + undefined);
-            return b === undefined;
-        };
-    }
-    expect: {
-        function a(n){
-            try{
-                throw "Stuff"
-            } catch (undefined) {
-                console.log("caught: " + undefined)
-            }
-            console.log("undefined is " + undefined);
-            return n === undefined
-        }
-    }
-    expect_stdout: true
-}
-
-reduce_vars: {
-    options = {
-        evaluate: true,
-        reduce_funcs: true,
-        reduce_vars: true,
-        ie8: true,
-        unused: true,
-    }
-    mangle = {
-        ie8: true,
-    }
-    input: {
-        function f() {
-            var a;
-            try {
-                x();
-            } catch (a) {
-                y();
-            }
-            alert(a);
-        }
-    }
-    expect: {
-        function f() {
-            var t;
-            try {
-                x();
-            } catch (t) {
-                y();
-            }
-            alert(t);
-        }
-    }
-}
-
-issue_1586_1: {
-    options = {
-        ie8: true,
-    }
-    mangle = {
-        ie8: true,
-    }
-    input: {
-        function f() {
-            try {
-                x();
-            } catch (err) {
-                console.log(err.message);
-            }
-        }
-    }
-    expect_exact: "function f(){try{x()}catch(c){console.log(c.message)}}"
-}
-
-issue_1586_2: {
-    options = {
-        ie8: false,
-    }
-    mangle = {
-        ie8: false,
-    }
-    input: {
-        function f() {
-            try {
-                x();
-            } catch (err) {
-                console.log(err.message);
-            }
-        }
-    }
-    expect_exact: "function f(){try{x()}catch(c){console.log(c.message)}}"
-}
-
-issue_2120_1: {
-    mangle = {
-        ie8: false,
-    }
-    input: {
-        "aaaaaaaa";
-        var a = 1, b = "FAIL";
-        try {
-            throw 1;
-        } catch (c) {
-            try {
-                throw 0;
-            } catch (a) {
-                if (c) b = "PASS";
-            }
-        }
-        console.log(b);
-    }
-    expect: {
-        "aaaaaaaa";
-        var a = 1, b = "FAIL";
-        try {
-            throw 1;
-        } catch (t) {
-            try {
-                throw 0;
-            } catch (a) {
-                if (t) b = "PASS";
-            }
-        }
-        console.log(b);
-    }
-    expect_stdout: "PASS"
-}
-
-issue_2120_2: {
-    mangle = {
-        ie8: true,
-    }
-    input: {
-        "aaaaaaaa";
-        var a = 1, b = "FAIL";
-        try {
-            throw 1;
-        } catch (c) {
-            try {
-                throw 0;
-            } catch (a) {
-                if (c) b = "PASS";
-            }
-        }
-        console.log(b);
-    }
-    expect: {
-        "aaaaaaaa";
-        var a = 1, b = "FAIL";
-        try {
-            throw 1;
-        } catch (c) {
-            try {
-                throw 0;
-            } catch (a) {
-                if (c) b = "PASS";
-            }
-        }
-        console.log(b);
-    }
-    expect_stdout: "PASS"
-}
-
-issue_2254_1: {
-    mangle = {
-        ie8: false,
-    }
-    input: {
-        "eeeeee";
-        try {
-            console.log(f("PASS"));
-        } catch (e) {}
-        function f(s) {
-            try {
-                throw "FAIL";
-            } catch (e) {
-                return s;
-            }
-        }
-    }
-    expect: {
-        "eeeeee";
-        try {
-            console.log(f("PASS"));
-        } catch (e) {}
-        function f(t) {
-            try {
-                throw "FAIL";
-            } catch (e) {
-                return t;
-            }
-        }
-    }
-    expect_stdout: "PASS"
-}
-
-issue_2254_2: {
-    mangle = {
-        ie8: true,
-    }
-    input: {
-        "eeeeee";
-        try {
-            console.log(f("PASS"));
-        } catch (e) {}
-        function f(s) {
-            try {
-                throw "FAIL";
-            } catch (e) {
-                return s;
-            }
-        }
-    }
-    expect: {
-        "eeeeee";
-        try {
-            console.log(f("PASS"));
-        } catch (e) {}
-        function f(t) {
-            try {
-                throw "FAIL";
-            } catch (e) {
-                return t;
-            }
-        }
-    }
-    expect_stdout: "PASS"
-}
-
-issue_24_1: {
-    mangle = {
-        ie8: false,
-    }
-    input: {
-        (function(a) {
-            console.log(typeof function f(){} === typeof a ? "FAIL" : "PASS");
-        })();
-    }
-    expect: {
-        (function(o) {
-            console.log(typeof function o(){} === typeof o ? "FAIL" : "PASS");
-        })();
-    }
-    expect_stdout: "PASS"
-}
-
-issue_24_2: {
-    mangle = {
-        ie8: true,
-    }
-    input: {
-        (function(a) {
-            console.log(typeof function f(){} === typeof a ? "FAIL" : "PASS");
-        })();
-    }
-    expect: {
-        (function(n) {
-            console.log(typeof function o(){} === typeof n ? "FAIL" : "PASS");
-        })();
-    }
-    expect_stdout: "PASS"
-}
-
-issue_2976_1: {
-    mangle = {
-        ie8: false,
-    }
-    input: {
-        console.log(function f() {
-            var a;
-            return a === f ? "FAIL" : "PASS";
-        }());
-    }
-    expect: {
-        console.log(function n() {
-            var o;
-            return o === n ? "FAIL" : "PASS";
-        }());
-    }
-    expect_stdout: "PASS"
-}
-
-issue_2976_2: {
-    mangle = {
-        ie8: true,
-    }
-    input: {
-        console.log(function f() {
-            var a;
-            return a === f ? "FAIL" : "PASS";
-        }());
-    }
-    expect: {
-        console.log(function n() {
-            var o;
-            return o === n ? "FAIL" : "PASS";
-        }());
-    }
-    expect_stdout: "PASS"
-}
-
-issue_3035: {
-    mangle = {
-        ie8: false,
-    }
-    input: {
-        var c = "FAIL";
-        (function(a) {
-            try {
-                throw 1;
-            } catch (b) {
-                try {
-                    throw 0;
-                } catch (a) {
-                    b && (c = "PASS");
-                }
-            }
-        })();
-        console.log(c);
-    }
-    expect: {
-        var c = "FAIL";
-        (function(o) {
-            try {
-                throw 1;
-            } catch (t) {
-                try {
-                    throw 0;
-                } catch (o) {
-                    t && (c = "PASS");
-                }
-            }
-        })();
-        console.log(c);
-    }
-    expect_stdout: "PASS"
-}
-
-issue_3035_ie8: {
-    mangle = {
-        ie8: true,
-    }
-    input: {
-        var c = "FAIL";
-        (function(a) {
-            try {
-                throw 1;
-            } catch (b) {
-                try {
-                    throw 0;
-                } catch (a) {
-                    b && (c = "PASS");
-                }
-            }
-        })();
-        console.log(c);
-    }
-    expect: {
-        var c = "FAIL";
-        (function(t) {
-            try {
-                throw 1;
-            } catch (o) {
-                try {
-                    throw 0;
-                } catch (t) {
-                    o && (c = "PASS");
-                }
-            }
-        })();
-        console.log(c);
-    }
-    expect_stdout: "PASS"
-}

test/compress/if_return.js

@@ -243,7 +243,7 @@ issue_1089: {
     expect: {
         function x() {
             var f = document.getElementById("fname");
-            if (12345 < f.files[0].size)
+            if (f.files[0].size > 12345)
                 return alert("alert"), f.focus(), !1;
         }
     }
@@ -302,97 +302,3 @@ issue_1437_conditionals: {
         }
     }
 }
-
-issue_512: {
-    options = {
-        conditionals: true,
-        if_return: true,
-        sequences: true,
-        side_effects: true,
-    }
-    input: {
-        function a() {
-            if (b()) {
-                c();
-                return;
-            }
-            throw e;
-        }
-    }
-    expect: {
-        function a() {
-            if (!b()) throw e;
-            c();
-        }
-    }
-}
-
-if_var_return: {
-    options = {
-        conditionals: true,
-        if_return: true,
-        join_vars: true,
-        sequences: true,
-    }
-    input: {
-        function f() {
-            var a;
-            return;
-            var b;
-        }
-        function g() {
-            var a;
-            if (u()) {
-                var b;
-                return v();
-                var c;
-            }
-            var d;
-            if (w()) {
-                var e;
-                return x();
-                var f;
-            } else {
-                var g;
-                y();
-                var h;
-            }
-            var i;
-            z();
-            var j;
-        }
-    }
-    expect: {
-        function f() {
-            var a, b;
-        }
-        function g() {
-            var a, b, c, d, e, f, g, h, i, j;
-            return u() ? v() : w() ? x() : (y(), z(), void 0);
-        }
-    }
-}
-
-if_if_return_return: {
-    options = {
-        conditionals: true,
-        if_return: true,
-    }
-    input: {
-        function f(a, b) {
-            if (a) {
-                if (b)
-                    return b;
-                return;
-            }
-            g();
-        }
-    }
-    expect: {
-        function f(a, b) {
-            if (a)
-                return b || void 0;
-            g();
-        }
-    }
-}

test/compress/issue-1001.js

@@ -0,0 +1,8 @@
+parenthesis_strings_in_parenthesis: {
+    input: {
+        var foo = ('(');
+        a(')');
+
+    }
+    expect_exact: 'var foo="(";a(")");'
+}

test/compress/issue-1034.js

@@ -2,7 +2,7 @@ non_hoisted_function_after_return: {
     options = {
         hoist_funs: false, dead_code: true, conditionals: true, comparisons: true,
         evaluate: true, booleans: true, loops: true, unused: true, keep_fargs: true,
-        if_return: true, join_vars: true, side_effects: true
+        if_return: true, join_vars: true, cascade: true, side_effects: true
     }
     input: {
         function foo(x) {
@@ -38,7 +38,7 @@ non_hoisted_function_after_return_2a: {
     options = {
         hoist_funs: false, dead_code: true, conditionals: true, comparisons: true,
         evaluate: true, booleans: true, loops: true, unused: true, keep_fargs: true,
-        if_return: true, join_vars: true, side_effects: true,
+        if_return: true, join_vars: true, cascade: true, side_effects: true,
         collapse_vars: false, passes: 2, warnings: "verbose"
     }
     input: {
@@ -71,13 +71,11 @@ non_hoisted_function_after_return_2a: {
         "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:51,16]",
         "WARN: Dropping unused variable a [test/compress/issue-1034.js:48,20]",
         "WARN: Dropping unused function nope [test/compress/issue-1034.js:55,21]",
-        "WARN: pass 0: last_count: Infinity, count: 37",
         "WARN: Dropping unreachable code [test/compress/issue-1034.js:53,12]",
         "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:53,12]",
         "WARN: Dropping unreachable code [test/compress/issue-1034.js:56,12]",
         "WARN: Dropping unused variable b [test/compress/issue-1034.js:51,20]",
         "WARN: Dropping unused variable c [test/compress/issue-1034.js:53,16]",
-        "WARN: pass 1: last_count: 37, count: 18",
     ]
 }
 
@@ -85,7 +83,7 @@ non_hoisted_function_after_return_2b: {
     options = {
         hoist_funs: false, dead_code: true, conditionals: true, comparisons: true,
         evaluate: true, booleans: true, loops: true, unused: true, keep_fargs: true,
-        if_return: true, join_vars: true, side_effects: true,
+        if_return: true, join_vars: true, cascade: true, side_effects: true,
         collapse_vars: false
     }
     input: {
@@ -111,146 +109,10 @@ non_hoisted_function_after_return_2b: {
     }
     expect_warnings: [
         // duplicate warnings no longer emitted
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:97,16]",
-        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:97,16]",
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:99,12]",
-        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:99,12]",
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:103,12]",
-    ]
-}
-
-non_hoisted_function_after_return_strict: {
-    options = {
-        hoist_funs: false, dead_code: true, conditionals: true, comparisons: true,
-        evaluate: true, booleans: true, loops: true, unused: true, keep_fargs: true,
-        if_return: true, join_vars: true, side_effects: true
-    }
-    input: {
-        "use strict";
-        function foo(x) {
-            if (x) {
-                return bar();
-                not_called1();
-            } else {
-                return baz();
-                not_called2();
-            }
-            function bar() { return 7; }
-            return not_reached;
-            function UnusedFunction() {}
-            function baz() { return 8; }
-        }
-        console.log(foo(0), foo(1));
-    }
-    expect: {
-        "use strict";
-        function foo(x) {
-            return x ? bar() : baz();
-            function bar() { return 7 }
-            function baz() { return 8 }
-        }
-        console.log(foo(0), foo(1));
-    }
-    expect_stdout: "8 7"
-    expect_warnings: [
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:133,16]",
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:136,16]",
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:139,12]",
-        "WARN: Dropping unused function UnusedFunction [test/compress/issue-1034.js:140,21]",
-    ]
-}
-
-non_hoisted_function_after_return_2a_strict: {
-    options = {
-        hoist_funs: false, dead_code: true, conditionals: true, comparisons: true,
-        evaluate: true, booleans: true, loops: true, unused: true, keep_fargs: true,
-        if_return: true, join_vars: true, side_effects: true,
-        collapse_vars: false, passes: 2, warnings: "verbose"
-    }
-    input: {
-        "use strict";
-        function foo(x) {
-            if (x) {
-                return bar(1);
-                var a = not_called(1);
-            } else {
-                return bar(2);
-                var b = not_called(2);
-            }
-            var c = bar(3);
-            function bar(x) { return 7 - x; }
-            function nope() {}
-            return b || c;
-        }
-        console.log(foo(0), foo(1));
-    }
-    expect: {
-        "use strict";
-        function foo(x) {
-            return bar(x ? 1 : 2);
-            function bar(x) {
-                return 7 - x;
-            }
-        }
-        console.log(foo(0), foo(1));
-    }
-    expect_stdout: "5 6"
-    expect_warnings: [
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:175,16]",
-        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:175,16]",
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:178,16]",
-        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:178,16]",
-        "WARN: Dropping unused variable a [test/compress/issue-1034.js:175,20]",
-        "WARN: Dropping unused function nope [test/compress/issue-1034.js:182,21]",
-        "WARN: pass 0: last_count: Infinity, count: 48",
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:180,12]",
-        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:180,12]",
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:183,12]",
-        "WARN: Dropping unused variable b [test/compress/issue-1034.js:178,20]",
-        "WARN: Dropping unused variable c [test/compress/issue-1034.js:180,16]",
-        "WARN: pass 1: last_count: 48, count: 29",
-    ]
-}
-
-non_hoisted_function_after_return_2b_strict: {
-    options = {
-        hoist_funs: false, dead_code: true, conditionals: true, comparisons: true,
-        evaluate: true, booleans: true, loops: true, unused: true, keep_fargs: true,
-        if_return: true, join_vars: true, side_effects: true,
-        collapse_vars: false
-    }
-    input: {
-        "use strict";
-        function foo(x) {
-            if (x) {
-                return bar(1);
-            } else {
-                return bar(2);
-                var b;
-            }
-            var c = bar(3);
-            function bar(x) {
-                return 7 - x;
-            }
-            return b || c;
-        }
-        console.log(foo(0), foo(1));
-    }
-    expect: {
-        "use strict";
-        function foo(x) {
-            return bar(x ? 1 : 2);
-            function bar(x) { return 7 - x; }
-        }
-        console.log(foo(0), foo(1));
-    }
-    expect_stdout: "5 6"
-    expect_warnings: [
-        // duplicate warnings no longer emitted
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:229,16]",
-        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:229,16]",
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:231,12]",
-        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:231,12]",
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:235,12]",
+        "WARN: Dropping unreachable code [test/compress/issue-1034.js:95,16]",
+        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:95,16]",
+        "WARN: Dropping unreachable code [test/compress/issue-1034.js:97,12]",
+        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:97,12]",
+        "WARN: Dropping unreachable code [test/compress/issue-1034.js:101,12]",
     ]
 }

test/compress/issue-1041.js

@@ -1,7 +1,19 @@
+const_declaration: {
+    options = {
+        evaluate: true
+    };
+
+    input: {
+        const goog = goog || {};
+    }
+    expect: {
+        const goog = goog || {};
+    }
+}
+
 const_pragma: {
     options = {
         evaluate: true,
-        reduce_funcs: true,
         reduce_vars: true,
     };
 
@@ -17,7 +29,6 @@ const_pragma: {
 not_const: {
     options = {
         evaluate: true,
-        reduce_funcs: true,
         reduce_vars: true,
     };
 

test/compress/issue-1043.js

@@ -0,0 +1,30 @@
+issue_1043: {
+    options = {
+        side_effects: true
+    };
+
+    input: {
+        function* range(start = 0, end = null, step = 1) {
+            if (end == null) {
+                end = start;
+                start = 0;
+            }
+
+            for (let i = start; i < end; i += step) {
+                yield i;
+            }
+        }
+    }
+
+    expect: {
+        function* range(start = 0, end = null, step = 1) {
+            if (null == end) {
+                end = start;
+                start = 0;
+            }
+
+            for (let i = start; i < end; i += step)
+                yield i;
+        }
+    }
+}

test/compress/issue-1044.js

@@ -0,0 +1,9 @@
+issue_1044: {
+    options = { evaluate: true, conditionals: true };
+    input: {
+        const mixed = Base ? class extends Base {} : class {}
+    }
+    expect: {
+        const mixed = Base ? class extends Base {} : class {}
+    }
+}

test/compress/issue-1052.js

@@ -1,91 +1,90 @@
 multiple_functions: {
-    options = {
-        hoist_funs: false,
-        if_return: true,
-    }
+    options = { if_return: true, hoist_funs: false };
     input: {
         ( function() {
             if ( !window ) {
                 return;
             }
+
             function f() {}
             function g() {}
         } )();
     }
     expect: {
         ( function() {
+            function f() {}
+            function g() {}
+
             // NOTE: other compression steps will reduce this
             // down to just `window`.
             if ( window );
-            function f() {}
-            function g() {}
         } )();
     }
 }
 
 single_function: {
-    options = {
-        hoist_funs: false,
-        if_return: true,
-    }
+    options = { if_return: true, hoist_funs: false };
     input: {
         ( function() {
             if ( !window ) {
                 return;
             }
+
             function f() {}
         } )();
     }
     expect: {
         ( function() {
-            if ( window );
             function f() {}
+
+            if ( window );
         } )();
     }
 }
 
 deeply_nested: {
-    options = {
-        hoist_funs: false,
-        if_return: true,
-    }
+    options = { if_return: true, hoist_funs: false };
     input: {
         ( function() {
             if ( !window ) {
                 return;
             }
+
             function f() {}
             function g() {}
+
             if ( !document ) {
                 return;
             }
+
             function h() {}
         } )();
     }
     expect: {
         ( function() {
+            function f() {}
+            function g() {}
+
+            function h() {}
+
             // NOTE: other compression steps will reduce this
             // down to just `window`.
             if ( window )
                 if (document);
-            function f() {}
-            function g() {}
-            function h() {}
         } )();
     }
 }
 
 not_hoisted_when_already_nested: {
-    options = {
-        hoist_funs: false,
-        if_return: true,
-    }
+    options = { if_return: true, hoist_funs: false };
     input: {
         ( function() {
             if ( !window ) {
                 return;
             }
+
             if ( foo ) function f() {}
+
         } )();
     }
     expect: {
@@ -95,70 +94,3 @@ not_hoisted_when_already_nested: {
         } )();
     }
 }
-
-defun_if_return: {
-    options = {
-        hoist_funs: false,
-        if_return: true,
-    }
-    input: {
-        function e() {
-            function f() {}
-            if (!window) return;
-            else function g() {}
-            function h() {}
-        }
-    }
-    expect: {
-        function e() {
-            function f() {}
-            if (window) function g() {}
-            function h() {}
-        }
-    }
-}
-
-defun_hoist_funs: {
-    options = {
-        hoist_funs: true,
-        if_return: true,
-    }
-    input: {
-        function e() {
-            function f() {}
-            if (!window) return;
-            else function g() {}
-            function h() {}
-        }
-    }
-    expect: {
-        function e() {
-            function f() {}
-            function g() {}
-            function h() {}
-            if (window);
-        }
-    }
-}
-
-defun_else_if_return: {
-    options = {
-        hoist_funs: false,
-        if_return: true,
-    }
-    input: {
-        function e() {
-            function f() {}
-            if (window) function g() {}
-            else return;
-            function h() {}
-        }
-    }
-    expect: {
-        function e() {
-            function f() {}
-            if (window) function g() {}
-            function h() {}
-        }
-    }
-}

test/compress/issue-1105.js

@@ -190,6 +190,7 @@ assorted_Infinity_NaN_undefined_in_with_scope: {
         keep_fargs:    true,
         if_return:     true,
         join_vars:     true,
+        cascade:       true,
         side_effects:  true,
         sequences:     false,
         keep_infinity: false,
@@ -252,6 +253,7 @@ assorted_Infinity_NaN_undefined_in_with_scope_keep_infinity: {
         keep_fargs:    true,
         if_return:     true,
         join_vars:     true,
+        cascade:       true,
         side_effects:  true,
         sequences:     false,
         keep_infinity: true,

test/compress/issue-1212.js

@@ -0,0 +1,76 @@
+issue_1212_debug_false: {
+    options = {
+        global_defs   : { DEBUG: false },
+        sequences     : true,
+        properties    : true,
+        dead_code     : true,
+        conditionals  : true,
+        comparisons   : true,
+        evaluate      : true,
+        booleans      : true,
+        loops         : true,
+        unused        : true,
+        hoist_funs    : true,
+        keep_fargs    : true,
+        if_return     : true,
+        join_vars     : true,
+        cascade       : true,
+        side_effects  : true,
+    }
+    input: {
+        class foo {
+            bar() {
+                if (DEBUG)
+                    console.log("DEV");
+                else
+                    console.log("PROD");
+            }
+        }
+        new foo().bar();
+    }
+    expect: {
+        class foo{
+            bar() { console.log("PROD") }
+        }
+        (new foo).bar();
+    }
+}
+
+issue_1212_debug_true: {
+    options = {
+        global_defs   : { DEBUG: true },
+        sequences     : true,
+        properties    : true,
+        dead_code     : true,
+        conditionals  : true,
+        comparisons   : true,
+        evaluate      : true,
+        booleans      : true,
+        loops         : true,
+        unused        : true,
+        hoist_funs    : true,
+        keep_fargs    : true,
+        if_return     : true,
+        join_vars     : true,
+        cascade       : true,
+        side_effects  : true,
+    }
+    input: {
+        class foo {
+            bar() {
+                if (DEBUG)
+                    console.log("DEV");
+                else
+                    console.log("PROD");
+            }
+        }
+        new foo().bar();
+    }
+    expect: {
+        class foo{
+            bar() { console.log("DEV") }
+        }
+        (new foo).bar();
+    }
+}
+

test/compress/issue-1261.js

@@ -8,6 +8,7 @@ pure_function_calls: {
         unused       : true,
         if_return    : true,
         join_vars    : true,
+        cascade      : true,
         negate_iife  : true,
     }
     input: {
@@ -48,13 +49,13 @@ pure_function_calls: {
         a.b(), f.g();
     }
     expect_warnings: [
-        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:16,8]",
-        "WARN: Dropping side-effect-free statement [test/compress/issue-1261.js:16,8]",
-        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:29,37]",
-        "WARN: Dropping unused variable iife2 [test/compress/issue-1261.js:29,16]",
-        "WARN: Dropping side-effect-free statement [test/compress/issue-1261.js:27,8]",
-        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:37,8]",
-        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:38,31]",
+        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:17,8]",
+        "WARN: Dropping side-effect-free statement [test/compress/issue-1261.js:17,8]",
+        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:30,37]",
+        "WARN: Dropping unused variable iife2 [test/compress/issue-1261.js:30,16]",
+        "WARN: Dropping side-effect-free statement [test/compress/issue-1261.js:28,8]",
+        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:38,8]",
+        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:39,31]",
     ]
 }
 
@@ -68,6 +69,7 @@ pure_function_calls_toplevel: {
         unused       : true,
         if_return    : true,
         join_vars    : true,
+        cascade      : true,
         negate_iife  : true,
         toplevel     : true,
     }
@@ -94,13 +96,6 @@ pure_function_calls_toplevel: {
             })();
         })();
 
-        // pure top-level calls will be dropped regardless of the leading comments position
-        var MyClass = /*#__PURE__*//*@class*/(function(){
-            function MyClass() {}
-            MyClass.prototype.method = function() {};
-            return MyClass;
-        })();
-
         // comment #__PURE__ comment
         bar(), baz(), quux();
         a.b(), /* @__PURE__ */ c.d.e(), f.g();
@@ -110,17 +105,15 @@ pure_function_calls_toplevel: {
         a.b(), f.g();
     }
     expect_warnings: [
-        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:77,8]",
-        "WARN: Dropping side-effect-free statement [test/compress/issue-1261.js:77,8]",
-        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:90,37]",
-        "WARN: Dropping unused variable iife2 [test/compress/issue-1261.js:90,16]",
-        "WARN: Dropping side-effect-free statement [test/compress/issue-1261.js:88,8]",
-        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:105,8]",
-        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:106,31]",
-        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:82,33]",
-        "WARN: Dropping unused variable iife1 [test/compress/issue-1261.js:82,12]",
-        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:98,45]",
-        "WARN: Dropping unused variable MyClass [test/compress/issue-1261.js:98,12]",
+        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:79,8]",
+        "WARN: Dropping side-effect-free statement [test/compress/issue-1261.js:79,8]",
+        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:92,37]",
+        "WARN: Dropping unused variable iife2 [test/compress/issue-1261.js:92,16]",
+        "WARN: Dropping side-effect-free statement [test/compress/issue-1261.js:90,8]",
+        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:100,8]",
+        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:101,31]",
+        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:84,33]",
+        "WARN: Dropping unused variable iife1 [test/compress/issue-1261.js:84,12]",
     ]
 }
 
@@ -155,29 +148,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:128,61]",
+        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:128,23]",
+        "WARN: Dropping side-effect-free statement [test/compress/issue-1261.js:128,23]",
+        "WARN: Boolean || always true [test/compress/issue-1261.js:129,23]",
+        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:129,23]",
+        "WARN: Condition always true [test/compress/issue-1261.js:129,23]",
+        "WARN: Condition left of || always true [test/compress/issue-1261.js:130,8]",
+        "WARN: Condition always true [test/compress/issue-1261.js:130,8]",
+        "WARN: Boolean && always false [test/compress/issue-1261.js:131,23]",
+        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:131,23]",
+        "WARN: Condition always false [test/compress/issue-1261.js:131,23]",
+        "WARN: Condition left of && always false [test/compress/issue-1261.js:132,8]",
+        "WARN: Condition always false [test/compress/issue-1261.js:132,8]",
+        "WARN: + in boolean context always true [test/compress/issue-1261.js:133,23]",
+        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:133,23]",
+        "WARN: Condition always true [test/compress/issue-1261.js:133,23]",
+        "WARN: + in boolean context always true [test/compress/issue-1261.js:134,8]",
+        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:134,31]",
+        "WARN: Condition always true [test/compress/issue-1261.js:134,8]",
         "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:135,23]",
-        "WARN: Dropping side-effect-free statement [test/compress/issue-1261.js:135,23]",
-        "WARN: Boolean || always true [test/compress/issue-1261.js:136,23]",
-        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:136,23]",
-        "WARN: Condition always true [test/compress/issue-1261.js:136,23]",
-        "WARN: Condition left of || always true [test/compress/issue-1261.js:137,8]",
-        "WARN: Condition always true [test/compress/issue-1261.js:137,8]",
-        "WARN: Boolean && always false [test/compress/issue-1261.js:138,23]",
-        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:138,23]",
-        "WARN: Condition always false [test/compress/issue-1261.js:138,23]",
-        "WARN: Condition left of && always false [test/compress/issue-1261.js:139,8]",
-        "WARN: Condition always false [test/compress/issue-1261.js:139,8]",
-        "WARN: + in boolean context always true [test/compress/issue-1261.js:140,23]",
-        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:140,23]",
-        "WARN: Condition always true [test/compress/issue-1261.js:140,23]",
-        "WARN: + in boolean context always true [test/compress/issue-1261.js:141,8]",
-        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:141,31]",
-        "WARN: Condition always true [test/compress/issue-1261.js:141,8]",
-        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:142,23]",
-        "WARN: Condition always true [test/compress/issue-1261.js:143,8]",
-        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:143,24]",
-        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:144,31]",
-        "WARN: Condition always false [test/compress/issue-1261.js:144,8]",
+        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:136,24]",
+        "WARN: Condition always true [test/compress/issue-1261.js:136,8]",
+        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:137,31]",
+        "WARN: Condition always false [test/compress/issue-1261.js:137,8]",
     ]
 }

test/compress/issue-1275.js

@@ -9,6 +9,7 @@ string_plus_optimization: {
         unused        : true,
         if_return     : true,
         join_vars     : true,
+        cascade       : true,
         hoist_funs    : true,
     };
     input: {

test/compress/issue-1321.js

@@ -1,8 +1,6 @@
 issue_1321_no_debug: {
-    mangle = {
-        properties: {
-            keep_quoted: true,
-        },
+    mangle_props = {
+        keep_quoted: true
     }
     input: {
         var x = {};
@@ -12,19 +10,17 @@ issue_1321_no_debug: {
     }
     expect: {
         var x = {};
-        x.x = 1;
-        x["a"] = 2 * x.x;
-        console.log(x.x, x["a"]);
+        x.b = 1;
+        x["a"] = 2 * x.b;
+        console.log(x.b, x["a"]);
     }
     expect_stdout: true
 }
 
 issue_1321_debug: {
-    mangle = {
-        properties: {
-            debug: "",
-            keep_quoted: true,
-        },
+    mangle_props = {
+        keep_quoted: true,
+        debug: ""
     }
     input: {
         var x = {};
@@ -34,18 +30,16 @@ issue_1321_debug: {
     }
     expect: {
         var x = {};
-        x.x = 1;
-        x["_$foo$_"] = 2 * x.x;
-        console.log(x.x, x["_$foo$_"]);
+        x.a = 1;
+        x["_$foo$_"] = 2 * x.a;
+        console.log(x.a, x["_$foo$_"]);
     }
     expect_stdout: true
 }
 
 issue_1321_with_quoted: {
-    mangle = {
-        properties: {
-            keep_quoted: false,
-        },
+    mangle_props = {
+        keep_quoted: false
     }
     input: {
         var x = {};
@@ -55,9 +49,9 @@ issue_1321_with_quoted: {
     }
     expect: {
         var x = {};
-        x.x = 1;
-        x["o"] = 2 * x.x;
-        console.log(x.x, x["o"]);
+        x.a = 1;
+        x["b"] = 2 * x.a;
+        console.log(x.a, x["b"]);
     }
     expect_stdout: true
 }

test/compress/issue-1443.js

@@ -4,7 +4,7 @@ unsafe_undefined: {
     options = {
         conditionals: true,
         if_return: true,
-        unsafe_undefined: true,
+        unsafe: true
     }
     mangle = {}
     input: {
@@ -30,7 +30,7 @@ keep_fnames: {
     options = {
         conditionals: true,
         if_return: true,
-        unsafe_undefined: true,
+        unsafe: true
     }
     mangle = {
         keep_fnames: true

test/compress/issue-1446.js

@@ -1,7 +1,6 @@
 typeof_eq_undefined: {
     options = {
-        comparisons: true,
-        typeofs: true,
+        comparisons: true
     }
     input: {
         var a = typeof b != "undefined";
@@ -25,7 +24,6 @@ typeof_eq_undefined_ie8: {
     options = {
         comparisons: true,
         ie8: true,
-        typeofs: true,
     }
     input: {
         var a = typeof b != "undefined";
@@ -47,8 +45,7 @@ typeof_eq_undefined_ie8: {
 
 undefined_redefined: {
     options = {
-        comparisons: true,
-        typeofs: true,
+        comparisons: true
     }
     input: {
         function f(undefined) {
@@ -61,8 +58,7 @@ undefined_redefined: {
 
 undefined_redefined_mangle: {
     options = {
-        comparisons: true,
-        typeofs: true,
+        comparisons: true
     }
     mangle = {}
     input: {

test/compress/issue-1447.js

@@ -32,6 +32,7 @@ conditional_false_stray_else_in_loop: {
         hoist_vars   : true,
         join_vars    : true,
         if_return    : true,
+        cascade      : true,
         conditionals : false,
     }
     input: {

test/compress/issue-1466.js

@@ -0,0 +1,291 @@
+same_variable_in_multiple_for_loop: {
+    options = {
+        hoist_funs: true,
+        dead_code: true,
+        conditionals: true,
+        comparisons: true,
+        evaluate: true,
+        booleans: true,
+        loops: true,
+        unused: true,
+        keep_fargs: true,
+        if_return: true,
+        join_vars: true,
+        cascade: true,
+        side_effects: true,
+        collapse_vars: true,
+    }
+    mangle = {}
+    input: {
+        for (let i = 0; i < 3; i++) {
+            let a = 100;
+            console.log(i, a);
+            for (let i = 0; i < 2; i++) {
+                console.log(i, a);
+                let c = 2;
+                console.log(c);
+            }
+        }
+    }
+    expect: {
+        for (let o = 0; o < 3; o++) {
+            let l = 100;
+            console.log(o, l);
+            for (let o = 0; o < 2; o++) {
+                console.log(o, l);
+                let c = 2;
+                console.log(c);
+            }
+        }
+    }
+    expect_stdout: true
+}
+
+same_variable_in_multiple_forOf: {
+    options = {
+        hoist_funs: true,
+        dead_code: true,
+        conditionals: true,
+        comparisons: true,
+        evaluate: true,
+        booleans: true,
+        loops: true,
+        unused: true,
+        keep_fargs: true,
+        if_return: true,
+        join_vars: true,
+        cascade: true,
+        side_effects: true,
+        collapse_vars: true,
+    }
+    mangle = {}
+    input: {
+        var test = [ "a", "b", "c" ];
+        for (let tmp of test) {
+            console.log(tmp);
+            let dd;
+            dd = [ "e", "f", "g" ];
+            for (let tmp of dd) {
+                console.log(tmp);
+            }
+        }
+    }
+    expect: {
+        var test = [ "a", "b", "c" ];
+        for (let o of test) {
+            console.log(o);
+            let e;
+            e = [ "e", "f", "g" ];
+            for (let o of e)
+                console.log(o);
+        }
+    }
+    expect_stdout: true
+}
+
+same_variable_in_multiple_forIn: {
+    options = {
+        hoist_funs: true,
+        dead_code: true,
+        conditionals: true,
+        comparisons: true,
+        evaluate: true,
+        booleans: true,
+        loops: true,
+        unused: false,
+        keep_fargs: true,
+        if_return: true,
+        join_vars: true,
+        cascade: true,
+        side_effects: true,
+        collapse_vars: true,
+    }
+    mangle = {}
+    input: {
+        var test = [ "a", "b", "c" ];
+        for (let tmp in test) {
+            console.log(tmp);
+            let dd;
+            dd = [ "e", "f", "g" ];
+            for (let tmp in test) {
+                console.log(tmp);
+            }
+        }
+    }
+    expect: {
+        var test = [ "a", "b", "c" ];
+        for (let o in test) {
+            console.log(o);
+            let e;
+            e = [ "e", "f", "g" ];
+            for (let o in test)
+                console.log(o);
+        }
+    }
+    expect_stdout: true
+}
+
+different_variable_in_multiple_for_loop: {
+    options = {
+        hoist_funs: true,
+        dead_code: true,
+        conditionals: true,
+        comparisons: true,
+        evaluate: true,
+        booleans: true,
+        loops: true,
+        unused: true,
+        keep_fargs: true,
+        if_return: true,
+        join_vars: true,
+        cascade: true,
+        side_effects: true,
+        collapse_vars: true,
+    }
+    mangle = {}
+    input: {
+        for (let i = 0; i < 3; i++) {
+            let a = 100;
+            console.log(i, a);
+            for (let j = 0; j < 2; j++) {
+                console.log(j, a);
+                let c = 2;
+                console.log(c);
+            }
+        }
+    }
+    expect: {
+        for (let o = 0; o < 3; o++) {
+            let l = 100;
+            console.log(o, l);
+            for (let o = 0; o < 2; o++) {
+                console.log(o, l);
+                let c = 2;
+                console.log(c);
+            }
+        }
+    }
+    expect_stdout: true
+}
+
+different_variable_in_multiple_forOf: {
+    options = {
+        hoist_funs: true,
+        dead_code: true,
+        conditionals: true,
+        comparisons: true,
+        evaluate: true,
+        booleans: true,
+        loops: true,
+        unused: true,
+        keep_fargs: true,
+        if_return: true,
+        join_vars: true,
+        cascade: true,
+        side_effects: true,
+        collapse_vars: true,
+    }
+    mangle = {}
+    input: {
+        var test = [ "a", "b", "c" ];
+        for (let tmp of test) {
+            console.log(tmp);
+            let dd;
+            dd = [ "e", "f", "g" ];
+            for (let t of dd) {
+                console.log(t);
+            }
+        }
+    }
+    expect: {
+        var test = [ "a", "b", "c" ];
+        for (let o of test) {
+            console.log(o);
+            let e;
+            e = [ "e", "f", "g" ];
+            for (let o of e)
+                console.log(o);
+        }
+    }
+    expect_stdout: true
+}
+
+different_variable_in_multiple_forIn: {
+    options = {
+        hoist_funs: true,
+        dead_code: true,
+        conditionals: true,
+        comparisons: true,
+        evaluate: true,
+        booleans: true,
+        loops: true,
+        unused: false,
+        keep_fargs: true,
+        if_return: true,
+        join_vars: true,
+        cascade: true,
+        side_effects: true,
+        collapse_vars: true,
+    }
+    mangle = {}
+    input: {
+        var test = [ "a", "b", "c" ];
+        for (let tmp in test) {
+            console.log(tmp);
+            let dd;
+            dd = [ "e", "f", "g" ];
+            for (let t in test) {
+                console.log(t);
+            }
+        }
+    }
+    expect: {
+        var test = [ "a", "b", "c" ];
+        for (let o in test) {
+            console.log(o);
+            let e;
+            e = [ "e", "f", "g" ];
+            for (let o in test)
+                console.log(o);
+        }
+    }
+    expect_stdout: true
+}
+
+more_variable_in_multiple_for: {
+    options = {
+        hoist_funs: true,
+        dead_code: true,
+        conditionals: true,
+        comparisons: true,
+        evaluate: true,
+        booleans: true,
+        loops: true,
+        unused: false,
+        keep_fargs: true,
+        if_return: true,
+        join_vars: true,
+        cascade: true,
+        side_effects: true,
+        collapse_vars: true,
+    }
+    mangle = {}
+    input: {
+        for (let a = 9, i = 0; i < 20; i += a) {
+            let b = a++ + i;
+            console.log(a, b, i);
+            for (let k = b, m = b*b, i = 0; i < 10; i++) {
+                console.log(a, b, m, k, i);
+            }
+        }
+    }
+    expect: {
+        for (let o = 9, l = 0; l < 20; l += o) {
+            let c = o++ + l;
+            console.log(o, c, l);
+            for (let l = c, e = c * c, f = 0; f < 10; f++)
+                console.log(o, c, e, l, f);
+        }
+    }
+    expect_stdout: true
+}

test/compress/issue-1588.js

@@ -61,7 +61,7 @@ unsafe_undefined: {
     options = {
         conditionals: true,
         if_return: true,
-        unsafe_undefined: true,
+        unsafe: true,
     }
     mangle = {}
     input: {
@@ -85,3 +85,15 @@ unsafe_undefined: {
     }
     expect_stdout: true
 }
+
+runtime_error: {
+    input: {
+        const a = 1;
+        console.log(a++);
+    }
+    expect: {
+        const a = 1;
+        console.log(a++);
+    }
+    expect_stdout: true
+}

test/compress/issue-1609.js

@@ -2,7 +2,6 @@ chained_evaluation_1: {
     options = {
         collapse_vars: true,
         evaluate: true,
-        reduce_funcs: true,
         reduce_vars: true,
         unused: true,
     }
@@ -29,7 +28,6 @@ chained_evaluation_2: {
     options = {
         collapse_vars: true,
         evaluate: true,
-        reduce_funcs: true,
         reduce_vars: true,
         unused: true,
     }

test/compress/issue-1639.js

@@ -2,7 +2,7 @@
 issue_1639_1: {
     options = {
         booleans: true,
-        collapse_vars: true,
+        cascade: true,
         conditionals: true,
         evaluate: true,
         join_vars: true,
@@ -26,7 +26,7 @@ issue_1639_1: {
     }
     expect: {
         for (var a = 100, b = 10, L1 = 5; --L1 > 0;)
-            if (--b, 0) var ignore = 0;
+            if (--b, !1) var ignore = 0;
         console.log(a, b);
     }
     expect_stdout: true
@@ -35,7 +35,7 @@ issue_1639_1: {
 issue_1639_2: {
     options = {
         booleans: true,
-        collapse_vars: true,
+        cascade: true,
         conditionals: true,
         evaluate: true,
         join_vars: true,
@@ -57,7 +57,7 @@ issue_1639_2: {
     expect: {
         var a = 100, b = 10;
         function f19() {
-            ++a, 0;
+            ++a, 1;
         }
         f19(),
         console.log(a, b);
@@ -68,7 +68,7 @@ issue_1639_2: {
 issue_1639_3: {
     options = {
         booleans: true,
-        collapse_vars: true,
+        cascade: true,
         conditionals: true,
         evaluate: true,
         sequences: true,

test/compress/issue-1656.js

@@ -1,6 +1,7 @@
 f7: {
     options = {
         booleans: true,
+        cascade: true,
         collapse_vars: true,
         comparisons: true,
         conditionals: true,
@@ -14,7 +15,6 @@ f7: {
         negate_iife: true,
         passes: 3,
         properties: true,
-        reduce_funcs: true,
         reduce_vars: true,
         sequences: true,
         side_effects: true,
@@ -38,7 +38,7 @@ f7: {
         "var b = 10;",
         "",
         "!function() {",
-        "    b = 100;",
+        "    for (;b = 100, !1; ) ;",
         "}(), console.log(100, b);",
     ]
     expect_stdout: true

test/compress/issue-1673.js

@@ -1,6 +1,5 @@
 side_effects_catch: {
     options = {
-        reduce_funcs: true,
         reduce_vars: true,
         side_effects: true,
         unused: true,
@@ -35,7 +34,6 @@ side_effects_catch: {
 
 side_effects_else: {
     options = {
-        reduce_funcs: true,
         reduce_vars: true,
         side_effects: true,
         unused: true,
@@ -64,7 +62,6 @@ side_effects_else: {
 
 side_effects_finally: {
     options = {
-        reduce_funcs: true,
         reduce_vars: true,
         side_effects: true,
         unused: true,
@@ -101,7 +98,6 @@ side_effects_finally: {
 
 side_effects_label: {
     options = {
-        reduce_funcs: true,
         reduce_vars: true,
         side_effects: true,
         unused: true,
@@ -134,7 +130,6 @@ side_effects_label: {
 
 side_effects_switch: {
     options = {
-        reduce_funcs: true,
         reduce_vars: true,
         side_effects: true,
         unused: true,

test/compress/issue-1704.js

@@ -104,7 +104,7 @@ mangle_catch_toplevel: {
         }
         console.log(a);
     }
-    expect_exact: 'var c="FAIL";try{throw 1}catch(o){c="PASS"}console.log(c);'
+    expect_exact: 'var o="FAIL";try{throw 1}catch(c){o="PASS"}console.log(o);'
     expect_stdout: "PASS"
 }
 
@@ -148,7 +148,7 @@ mangle_catch_var_toplevel: {
         }
         console.log(a);
     }
-    expect_exact: 'var r="FAIL";try{throw 1}catch(o){var r="PASS"}console.log(r);'
+    expect_exact: 'var o="FAIL";try{throw 1}catch(r){var o="PASS"}console.log(o);'
     expect_stdout: "PASS"
 }
 
@@ -345,95 +345,3 @@ mangle_catch_redef_2_ie8_toplevel: {
     expect_exact: 'try{throw"FAIL1"}catch(o){var o="FAIL2"}console.log(o);'
     expect_stdout: "undefined"
 }
-
-mangle_catch_redef_3: {
-    mangle = {
-        ie8: false,
-        toplevel: false,
-    }
-    input: {
-        var o = "PASS";
-        try {
-            throw 0;
-        } catch (o) {
-            (function() {
-                function f() {
-                    o = "FAIL";
-                }
-                f(), f();
-            })();
-        }
-        console.log(o);
-    }
-    expect_exact: 'var o="PASS";try{throw 0}catch(o){(function(){function c(){o="FAIL"}c(),c()})()}console.log(o);'
-    expect_stdout: "PASS"
-}
-
-mangle_catch_redef_3_toplevel: {
-    mangle = {
-        ie8: false,
-        toplevel: true,
-    }
-    input: {
-        var o = "PASS";
-        try {
-            throw 0;
-        } catch (o) {
-            (function() {
-                function f() {
-                    o = "FAIL";
-                }
-                f(), f();
-            })();
-        }
-        console.log(o);
-    }
-    expect_exact: 'var c="PASS";try{throw 0}catch(c){(function(){function o(){c="FAIL"}o(),o()})()}console.log(c);'
-    expect_stdout: "PASS"
-}
-
-mangle_catch_redef_ie8_3: {
-    mangle = {
-        ie8: true,
-        toplevel: false,
-    }
-    input: {
-        var o = "PASS";
-        try {
-            throw 0;
-        } catch (o) {
-            (function() {
-                function f() {
-                    o = "FAIL";
-                }
-                f(), f();
-            })();
-        }
-        console.log(o);
-    }
-    expect_exact: 'var o="PASS";try{throw 0}catch(o){(function(){function c(){o="FAIL"}c(),c()})()}console.log(o);'
-    expect_stdout: "PASS"
-}
-
-mangle_catch_redef_3_ie8_toplevel: {
-    mangle = {
-        ie8: true,
-        toplevel: true,
-    }
-    input: {
-        var o = "PASS";
-        try {
-            throw 0;
-        } catch (o) {
-            (function() {
-                function f() {
-                    o = "FAIL";
-                }
-                f(), f();
-            })();
-        }
-        console.log(o);
-    }
-    expect_exact: 'var c="PASS";try{throw 0}catch(c){(function(){function o(){c="FAIL"}o(),o()})()}console.log(c);'
-    expect_stdout: "PASS"
-}

test/compress/issue-1733.js

@@ -15,7 +15,7 @@ function_iife_catch: {
         }
         f();
     }
-    expect_exact: "function f(o){!function(){try{throw 0}catch(o){var c=1;console.log(o,c)}}()}f();"
+    expect_exact: "function f(o){!function(){try{throw 0}catch(c){var o=1;console.log(c,o)}}()}f();"
     expect_stdout: "0 1"
 }
 
@@ -36,7 +36,7 @@ function_iife_catch_ie8: {
         }
         f();
     }
-    expect_exact: "function f(c){!function(){try{throw 0}catch(c){var o=1;console.log(c,o)}}()}f();"
+    expect_exact: "function f(o){!function(){try{throw 0}catch(o){var c=1;console.log(o,c)}}()}f();"
     expect_stdout: "0 1"
 }
 
@@ -61,7 +61,7 @@ function_catch_catch: {
         }
         f();
     }
-    expect_exact: "var o=0;function f(){try{throw 1}catch(o){try{throw 2}catch(c){var c=3;console.log(c)}}console.log(c)}f();"
+    expect_exact: "var o=0;function f(){try{throw 1}catch(c){try{throw 2}catch(o){var o=3;console.log(o)}}console.log(o)}f();"
     expect_stdout: [
         "3",
         "undefined",

test/compress/issue-1750.js

@@ -7,7 +7,7 @@ case_1: {
     input: {
         var a = 0, b = 1;
         switch (true) {
-          case a || true:
+          case a, true:
           default:
             b = 2;
           case true:
@@ -17,7 +17,7 @@ case_1: {
     expect: {
         var a = 0, b = 1;
         switch (true) {
-          case a || true:
+          case a, true:
             b = 2;
         }
         console.log(a, b);

test/compress/issue-1770.js

@@ -1,7 +1,5 @@
 mangle_props: {
-    mangle = {
-        properties: true,
-    }
+    mangle_props = {}
     input: {
         var obj = {
             undefined: 1,
@@ -56,12 +54,10 @@ mangle_props: {
 }
 
 numeric_literal: {
-    mangle = {
-        properties: true,
-    }
     beautify = {
         beautify: true,
     }
+    mangle_props = {}
     input: {
         var obj = {
             0: 0,
@@ -84,19 +80,19 @@ numeric_literal: {
         '    0: 0,',
         '    "-0": 1,',
         '    42: 2,',
-        '    42: 3,',
+        '    "42": 3,',
         '    37: 4,',
-        '    o: 5,',
+        '    a: 5,',
         '    1e42: 6,',
         '    b: 7,',
-        '    1e42: 8',
+        '    "1e+42": 8',
         '};',
         '',
         'console.log(obj[-0], obj[-""], obj["-0"]);',
         '',
         'console.log(obj[42], obj["42"]);',
         '',
-        'console.log(obj[37], obj["o"], obj[37], obj["37"]);',
+        'console.log(obj[37], obj["a"], obj[37], obj["37"]);',
         '',
         'console.log(obj[1e42], obj["b"], obj["1e+42"]);',
     ]
@@ -107,139 +103,3 @@ numeric_literal: {
         "8 7 8",
     ]
 }
-
-identifier: {
-    mangle = {
-        properties: true,
-    }
-    input: {
-        var obj = {
-            abstract: 1,
-            boolean: 2,
-            byte: 3,
-            char: 4,
-            class: 5,
-            double: 6,
-            enum: 7,
-            export: 8,
-            extends: 9,
-            final: 10,
-            float: 11,
-            goto: 12,
-            implements: 13,
-            import: 14,
-            int: 15,
-            interface: 16,
-            let: 17,
-            long: 18,
-            native: 19,
-            package: 20,
-            private: 21,
-            protected: 22,
-            public: 23,
-            short: 24,
-            static: 25,
-            super: 26,
-            synchronized: 27,
-            this: 28,
-            throws: 29,
-            transient: 30,
-            volatile: 31,
-            yield: 32,
-            false: 33,
-            null: 34,
-            true: 35,
-            break: 36,
-            case: 37,
-            catch: 38,
-            const: 39,
-            continue: 40,
-            debugger: 41,
-            default: 42,
-            delete: 43,
-            do: 44,
-            else: 45,
-            finally: 46,
-            for: 47,
-            function: 48,
-            if: 49,
-            in: 50,
-            instanceof: 51,
-            new: 52,
-            return: 53,
-            switch: 54,
-            throw: 55,
-            try: 56,
-            typeof: 57,
-            var: 58,
-            void: 59,
-            while: 60,
-            with: 61,
-        };
-    }
-    expect: {
-        var obj = {
-            e: 1,
-            t: 2,
-            n: 3,
-            a: 4,
-            i: 5,
-            o: 6,
-            r: 7,
-            l: 8,
-            s: 9,
-            c: 10,
-            f: 11,
-            u: 12,
-            d: 13,
-            h: 14,
-            p: 15,
-            b: 16,
-            v: 17,
-            w: 18,
-            y: 19,
-            g: 20,
-            m: 21,
-            k: 22,
-            x: 23,
-            j: 24,
-            z: 25,
-            q: 26,
-            A: 27,
-            B: 28,
-            C: 29,
-            D: 30,
-            F: 31,
-            G: 32,
-            false: 33,
-            null: 34,
-            true: 35,
-            H: 36,
-            I: 37,
-            J: 38,
-            K: 39,
-            L: 40,
-            M: 41,
-            N: 42,
-            O: 43,
-            P: 44,
-            Q: 45,
-            R: 46,
-            S: 47,
-            T: 48,
-            U: 49,
-            V: 50,
-            W: 51,
-            X: 52,
-            Y: 53,
-            Z: 54,
-            $: 55,
-            _: 56,
-            ee: 57,
-            te: 58,
-            ne: 59,
-            ae: 60,
-            ie: 61,
-        };
-    }
-}

test/compress/issue-1787.js

@@ -1,8 +1,6 @@
 unary_prefix: {
     options = {
         evaluate: true,
-        inline: true,
-        reduce_funcs: true,
         reduce_vars: true,
         unused: true,
     }

test/compress/issue-1833.js

@@ -1,7 +1,6 @@
 iife_for: {
     options = {
         negate_iife: true,
-        reduce_funcs: true,
         reduce_vars: true,
         toplevel: true,
         unused: true,
@@ -27,7 +26,6 @@ iife_for: {
 iife_for_in: {
     options = {
         negate_iife: true,
-        reduce_funcs: true,
         reduce_vars: true,
         toplevel: true,
         unused: true,
@@ -53,7 +51,6 @@ iife_for_in: {
 iife_do: {
     options = {
         negate_iife: true,
-        reduce_funcs: true,
         reduce_vars: true,
         toplevel: true,
         unused: true,
@@ -83,7 +80,6 @@ iife_do: {
 iife_while: {
     options = {
         negate_iife: true,
-        reduce_funcs: true,
         reduce_vars: true,
         toplevel: true,
         unused: true,
@@ -134,5 +130,5 @@ label_while: {
             L: while (0) continue L;
         }
     }
-    expect_exact: "function f(){L:0}"
+    expect_exact: "function f(){L:;}"
 }

test/compress/issue-1943.js

@@ -1,31 +0,0 @@
-operator: {
-    input: {
-        a. //comment
-        typeof
-    }
-    expect_exact: "a.typeof;"
-}
-
-name: {
-    input: {
-        a. //comment
-        b
-    }
-    expect_exact: "a.b;"
-}
-
-keyword: {
-    input: {
-        a. //comment
-        default
-    }
-    expect_exact: "a.default;"
-}
-
-atom: {
-    input: {
-        a. //comment
-        true
-    }
-    expect_exact: "a.true;"
-}

test/compress/issue-203.js

@@ -0,0 +1,34 @@
+
+compress_new_function: {
+    options = {
+        unsafe: true
+    }
+    input: {
+        new Function("aa, bb", 'return aa;');
+    }
+    expect: {
+        Function("a", "b", "return a");
+    }
+}
+
+compress_new_function_with_destruct: {
+    options = {
+        unsafe: true,
+        ecma: 6
+    }
+    beautify = {
+        ecma: 6
+    }
+    input: {
+        new Function("aa, [bb]", 'return aa;');
+        new Function("aa, {bb}", 'return aa;');
+        new Function("[[aa]], [{bb}]", 'return aa;');
+    }
+    expect: {
+        Function("a", "[b]", "return a");
+        Function("a", "{bb}", "return a");
+        Function("[[a]]", "[{bb}]", 'return a');
+    }
+}
+
+

test/compress/issue-208.js

@@ -38,7 +38,7 @@ mixed: {
         }
     }
     input: {
-        var ENV = 3;
+        const ENV = 3;
         var FOO = 4;
         f(ENV * 10);
         --FOO;
@@ -49,7 +49,7 @@ mixed: {
         x = DEBUG;
     }
     expect: {
-        var ENV = 3;
+        const ENV = 3;
         var FOO = 4;
         f(10);
         --FOO;
@@ -60,7 +60,7 @@ mixed: {
         x = 0;
     }
     expect_warnings: [
-        'WARN: global_defs ENV redefined [test/compress/issue-208.js:41,12]',
+        'WARN: global_defs ENV redefined [test/compress/issue-208.js:41,14]',
         'WARN: global_defs FOO redefined [test/compress/issue-208.js:42,12]',
         'WARN: global_defs FOO redefined [test/compress/issue-208.js:44,10]',
         'WARN: global_defs DEBUG redefined [test/compress/issue-208.js:45,8]',

test/compress/issue-2652.js

@@ -1,33 +0,0 @@
-insert_semicolon: {
-    beautify = {
-        beautify: true,
-        comments: "all",
-    }
-    input: {
-        var a
-        /* foo */ var b
-    }
-    expect_exact: [
-        "var a",
-        "/* foo */;",
-        "",
-        "var b;",
-    ]
-}
-
-unary_postfix: {
-    beautify = {
-        beautify: true,
-        comments: "all",
-    }
-    input: {
-        a
-        /* foo */++b
-    }
-    expect_exact: [
-        "a",
-        "/* foo */;",
-        "",
-        "++b;",
-    ]
-}

test/compress/issue-269.js

@@ -64,27 +64,3 @@ strings_concat: {
 		);
 	}
 }
-
-regexp: {
-	options = {
-		evaluate: true,
-		unsafe: true,
-	}
-	input: {
-		RegExp("foo");
-		RegExp("bar", "ig");
-		RegExp(foo);
-		RegExp("bar", ig);
-		RegExp("should", "fail");
-	}
-	expect: {
-		/foo/;
-		/bar/ig;
-		RegExp(foo);
-		RegExp("bar", ig);
-		RegExp("should", "fail");
-	}
-	expect_warnings: [
-		'WARN: Error converting RegExp("should","fail") [test/compress/issue-269.js:78,2]',
-	]
-}

test/compress/issue-2719.js

@@ -1,32 +0,0 @@
-warn: {
-    options = {
-        evaluate: true,
-        inline: true,
-        passes: 2,
-        properties: true,
-        reduce_funcs: true,
-        reduce_vars: true,
-        toplevel: true,
-        unused: true,
-    }
-    input: {
-        function f() {
-            return g();
-        }
-        function g() {
-            return g["call" + "er"].arguments;
-        }
-        // 3
-        console.log(f(1, 2, 3).length);
-    }
-    expect: {
-        // TypeError: Cannot read property 'arguments' of null
-        console.log(function g() {
-            return g.caller.arguments;
-        }().length);
-    }
-    expect_warnings: [
-        "WARN: Function.protoype.caller not supported [test/compress/issue-2719.js:17,19]",
-        "WARN: Function.protoype.arguments not supported [test/compress/issue-2719.js:17,19]",
-    ]
-}

test/compress/issue-281.js

@@ -1,498 +0,0 @@
-collapse_vars_constants: {
-    options = {
-        collapse_vars: true,
-        evaluate: true,
-        inline: true,
-        reduce_funcs: true,
-        reduce_vars: true,
-        unused: true,
-    }
-    input: {
-        function f1(x) {
-            var a = 4, b = x.prop, c = 5, d = sideeffect1(), e = sideeffect2();
-            return b + (function() { return d - a * e - c; })();
-        }
-        function f2(x) {
-            var a = 4, b = x.prop, c = 5, not_used = sideeffect1(), e = sideeffect2();
-            return b + (function() { return -a * e - c; })();
-        }
-    }
-    expect: {
-        function f1(x) {
-            var b = x.prop, d = sideeffect1(), e = sideeffect2();
-            return b + (d - 4 * e - 5);
-        }
-        function f2(x) {
-            var b = x.prop;
-            sideeffect1();
-            return b + (-4 * sideeffect2() - 5);
-        }
-    }
-}
-
-modified: {
-    options = {
-        collapse_vars: true,
-        inline: true,
-        unused: true,
-    }
-    input: {
-        function f5(b) {
-            var a = function() {
-                return b;
-            }();
-            return b++ + a;
-        }
-        console.log(f5(1));
-    }
-    expect: {
-        function f5(b) {
-            var a = b;
-            return b++ + a;
-        }
-        console.log(f5(1));
-    }
-    expect_stdout: "2"
-}
-
-ref_scope: {
-    options = {
-        collapse_vars: true,
-        inline: true,
-        unused: true,
-    }
-    input: {
-        console.log(function() {
-            var a = 1, b = 2, c = 3;
-            var a = c++, b = b /= a;
-            return function() {
-                return a;
-            }() + b;
-        }());
-    }
-    expect: {
-        console.log(function() {
-            var a = 1, b = 2, c = 3;
-            b = b /= a = c++;
-            return a + b;
-        }());
-    }
-    expect_stdout: true
-}
-
-safe_undefined: {
-    options = {
-        conditionals: true,
-        if_return: true,
-        inline: true,
-        unsafe: false,
-        unused: true,
-    }
-    mangle = {}
-    input: {
-        var a, c;
-        console.log(function(undefined) {
-            return function() {
-                if (a)
-                    return b;
-                if (c)
-                    return d;
-            };
-        }(1)());
-    }
-    expect: {
-        var a, c;
-        console.log(a ? b : c ? d : void 0);
-    }
-    expect_stdout: true
-}
-
-negate_iife_3: {
-    options = {
-        conditionals: true,
-        expression: true,
-        inline: true,
-        negate_iife: true,
-    }
-    input: {
-        (function(){ return t })() ? console.log(true) : console.log(false);
-    }
-    expect: {
-        t ? console.log(true) : console.log(false);
-    }
-}
-
-negate_iife_3_off: {
-    options = {
-        conditionals: true,
-        expression: true,
-        inline: true,
-        negate_iife: false,
-    }
-    input: {
-        (function(){ return t })() ? console.log(true) : console.log(false);
-    }
-    expect: {
-        t ? console.log(true) : console.log(false);
-    }
-}
-
-negate_iife_4: {
-    options = {
-        conditionals: true,
-        expression: true,
-        inline: true,
-        negate_iife: true,
-        sequences: true,
-    }
-    input: {
-        (function(){ return t })() ? console.log(true) : console.log(false);
-        (function(){
-            console.log("something");
-        })();
-    }
-    expect: {
-        t ? console.log(true) : console.log(false), void console.log("something");
-    }
-}
-
-negate_iife_5: {
-    options = {
-        conditionals: true,
-        expression: true,
-        inline: true,
-        negate_iife: true,
-        sequences: true,
-    }
-    input: {
-        if ((function(){ return t })()) {
-            foo(true);
-        } else {
-            bar(false);
-        }
-        (function(){
-            console.log("something");
-        })();
-    }
-    expect: {
-        t ? foo(true) : bar(false), void console.log("something");
-    }
-}
-
-negate_iife_5_off: {
-    options = {
-        conditionals: true,
-        expression: true,
-        inline: true,
-        negate_iife: false,
-        sequences: true,
-    };
-    input: {
-        if ((function(){ return t })()) {
-            foo(true);
-        } else {
-            bar(false);
-        }
-        (function(){
-            console.log("something");
-        })();
-    }
-    expect: {
-        t ? foo(true) : bar(false), void console.log("something");
-    }
-}
-
-issue_1254_negate_iife_true: {
-    options = {
-        expression: true,
-        inline: true,
-        negate_iife: true,
-    }
-    input: {
-        (function() {
-            return function() {
-                console.log('test')
-            };
-        })()();
-    }
-    expect_exact: 'void console.log("test");'
-    expect_stdout: true
-}
-
-issue_1254_negate_iife_nested: {
-    options = {
-        expression: true,
-        inline: true,
-        negate_iife: true,
-    }
-    input: {
-        (function() {
-            return function() {
-                console.log('test')
-            };
-        })()()()()();
-    }
-    expect_exact: '(void console.log("test"))()()();'
-}
-
-negate_iife_issue_1073: {
-    options = {
-        conditionals: true,
-        evaluate: true,
-        inline: true,
-        negate_iife: true,
-        reduce_funcs: true,
-        reduce_vars: true,
-        sequences: true,
-        unused: true,
-    };
-    input: {
-        new (function(a) {
-            return function Foo() {
-                this.x = a;
-                console.log(this);
-            };
-        }(7))();
-    }
-    expect: {
-        new function() {
-            this.x = 7,
-            console.log(this);
-        }();
-    }
-    expect_stdout: true
-}
-
-issue_1288_side_effects: {
-    options = {
-        conditionals: true,
-        evaluate: true,
-        inline: true,
-        negate_iife: true,
-        reduce_funcs: true,
-        reduce_vars: true,
-        side_effects: true,
-        unused: true,
-    };
-    input: {
-        if (w) ;
-        else {
-            (function f() {})();
-        }
-        if (!x) {
-            (function() {
-                x = {};
-            })();
-        }
-        if (y)
-            (function() {})();
-        else
-            (function(z) {
-                return z;
-            })(0);
-    }
-    expect: {
-        w;
-        x || (x = {});
-        y;
-    }
-}
-
-inner_var_for_in_1: {
-    options = {
-        evaluate: true,
-        inline: true,
-        reduce_funcs: true,
-        reduce_vars: true,
-    }
-    input: {
-        function f() {
-            var a = 1, b = 2;
-            for (b in (function() {
-                return x(a, b, c);
-            })()) {
-                var c = 3, d = 4;
-                x(a, b, c, d);
-            }
-            x(a, b, c, d);
-        }
-    }
-    expect: {
-        function f() {
-            var a = 1, b = 2;
-            for (b in x(1, b, c)) {
-                var c = 3, d = 4;
-                x(1, b, c, d);
-            }
-            x(1, b, c, d);
-        }
-    }
-}
-
-issue_1595_3: {
-    options = {
-        evaluate: true,
-        inline: true,
-        passes: 2,
-        reduce_funcs: true,
-        reduce_vars: true,
-        unused: true,
-    }
-    input: {
-        (function f(a) {
-            return g(a + 1);
-        })(2);
-    }
-    expect: {
-        g(3);
-    }
-}
-
-issue_1758: {
-    options = {
-        inline: true,
-        sequences: true,
-        side_effects: true,
-    }
-    input: {
-        console.log(function(c) {
-            var undefined = 42;
-            return function() {
-                c--;
-                c--, c.toString();
-                return;
-            }();
-        }());
-    }
-    expect: {
-        console.log(function(c) {
-            var undefined = 42;
-            return c--, c--, void c.toString();
-        }());
-    }
-    expect_stdout: "undefined"
-}
-wrap_iife: {
-    options = {
-        inline: true,
-        negate_iife: false,
-    }
-    beautify = {
-        wrap_iife: true,
-    }
-    input: {
-        (function() {
-            return function() {
-                console.log('test')
-            };
-        })()();
-    }
-    expect_exact: 'void console.log("test");'
-}
-
-wrap_iife_in_expression: {
-    options = {
-        inline: true,
-        negate_iife: false,
-    }
-    beautify = {
-        wrap_iife: true,
-    }
-    input: {
-        foo = (function() {
-            return bar();
-        })();
-    }
-    expect_exact: 'foo=bar();'
-}
-
-wrap_iife_in_return_call: {
-    options = {
-        inline: true,
-        negate_iife: false,
-    }
-    beautify = {
-        wrap_iife: true,
-    }
-    input: {
-        (function() {
-            return (function() {
-                console.log('test')
-            })();
-        })()();
-    }
-    expect_exact: '(void console.log("test"))();'
-}
-
-pure_annotation_1: {
-    options = {
-        inline: true,
-        side_effects: true,
-    }
-    input: {
-        /*@__PURE__*/(function() {
-            console.log("hello");
-        }());
-    }
-    expect_exact: ""
-}
-
-pure_annotation_2: {
-    options = {
-        collapse_vars: true,
-        inline: true,
-        side_effects: true,
-    }
-    input: {
-        /*@__PURE__*/(function(n) {
-            console.log("hello", n);
-        }(42));
-    }
-    expect_exact: ""
-}
-
-drop_fargs: {
-    options = {
-        collapse_vars: true,
-        inline: true,
-        keep_fargs: false,
-        side_effects: true,
-        unused: true,
-    }
-    input: {
-        var a = 1;
-        !function(a_1) {
-            a++;
-        }(a++ + (a && a.var));
-        console.log(a);
-    }
-    expect: {
-        var a = 1;
-        ++a && a.var, a++;
-        console.log(a);
-    }
-    expect_stdout: "3"
-}
-
-keep_fargs: {
-    options = {
-        collapse_vars: true,
-        inline: true,
-        keep_fargs: true,
-        side_effects: true,
-        unused: true,
-    }
-    input: {
-        var a = 1;
-        !function(a_1) {
-            a++;
-        }(a++ + (a && a.var));
-        console.log(a);
-    }
-    expect: {
-        var a = 1;
-        ++a && a.var, a++;
-        console.log(a);
-    }
-    expect_stdout: "3"
-}

test/compress/issue-2871.js

@@ -1,37 +0,0 @@
-comparison_with_undefined: {
-    options = {
-        comparisons: true,
-    }
-    input: {
-        a == undefined;
-        a != undefined;
-        a === undefined;
-        a !== undefined;
-
-        undefined == a;
-        undefined != a;
-        undefined === a;
-        undefined !== a;
-
-        void 0 == a;
-        void 0 != a;
-        void 0 === a;
-        void 0 !== a;
-    }
-    expect: {
-        null == a;
-        null != a;
-        void 0 === a;
-        void 0 !== a;
-
-        null == a;
-        null != a;
-        void 0 === a;
-        void 0 !== a;
-
-        null == a;
-        null != a;
-        void 0 === a;
-        void 0 !== a;
-    }
-}

test/compress/issue-2989.js

@@ -1,21 +0,0 @@
-inline_script_off: {
-    beautify = {
-        inline_script: false,
-    }
-    input: {
-        console.log("</sCrIpT>");
-    }
-    expect_exact: 'console.log("</sCrIpT>");'
-    expect_stdout: "</sCrIpT>"
-}
-
-inline_script_on: {
-    beautify = {
-        inline_script: true,
-    }
-    input: {
-        console.log("</sCrIpT>");
-    }
-    expect_exact: 'console.log("<\\/sCrIpT>");'
-    expect_stdout: "</sCrIpT>"
-}

test/compress/issue-368.js

@@ -1,6 +1,6 @@
 collapse: {
     options = {
-        collapse_vars: true,
+        cascade: true,
         sequences: true,
         side_effects: true,
         unused: true,
@@ -41,7 +41,7 @@ collapse: {
             return void 0 !== ('function' === typeof b ? b() : b) && c();
         }
         function f2(b) {
-            return 'stirng' == typeof ('function' === typeof (b = c()) ? b() : b) && d();
+            return b = c(), 'stirng' == typeof ('function' === typeof b ? b() : b) && d();
         }
         function f3(c) {
             var a;

test/compress/issue-637.js

@@ -17,6 +17,6 @@ wrongly_optimized: {
             foo();
         }
         // TODO: optimize to `func(), bar()`
-        (func(), 1) && bar();
+        (func(), 0) || bar();
     }
 }

test/compress/issue-640.js

@@ -100,7 +100,7 @@ wrongly_optimized: {
             foo();
         }
         // TODO: optimize to `func(), bar()`
-        if (func(), 1) bar();
+        if (func(), !0) bar();
     }
 }
 

test/compress/issue-747.js

@@ -1,45 +1,37 @@
 dont_reuse_prop: {
-    mangle = {
-        properties: {
-            regex: /asd/,
-        },
-    }
+    mangle_props = {
+        regex: /asd/
+    };
+
     input: {
-        "aaaaaaaaaabbbbb";
         var obj = {};
         obj.a = 123;
         obj.asd = 256;
         console.log(obj.a);
     }
     expect: {
-        "aaaaaaaaaabbbbb";
         var obj = {};
         obj.a = 123;
         obj.b = 256;
         console.log(obj.a);
     }
-    expect_stdout: "123"
 }
 
 unmangleable_props_should_always_be_reserved: {
-    mangle = {
-        properties: {
-            regex: /asd/,
-        },
-    }
+    mangle_props = {
+        regex: /asd/
+    };
+
     input: {
-        "aaaaaaaaaabbbbb";
         var obj = {};
         obj.asd = 256;
         obj.a = 123;
         console.log(obj.a);
     }
     expect: {
-        "aaaaaaaaaabbbbb";
         var obj = {};
         obj.b = 256;
         obj.a = 123;
         console.log(obj.a);
     }
-    expect_stdout: "123"
-}
+}

test/compress/issue-782.js

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

test/compress/issue-892.js

@@ -18,6 +18,7 @@ dont_mangle_arguments: {
         hoist_vars    : true,
         if_return     : true,
         join_vars     : true,
+        cascade       : true,
         side_effects  : true,
         negate_iife   : false
     };

test/compress/issue-926.js

@@ -0,0 +1,9 @@
+template_strings: {
+    input: {
+        foo(
+            `<span>${contents}</span>`,
+            `<a href="${url}">${text}</a>`
+        );
+    }
+    expect_exact: "foo(`<span>${contents}</span>`,`<a href=\"${url}\">${text}</a>`);"
+}

test/compress/issue-973.js

@@ -1,11 +1,9 @@
 this_binding_conditionals: {
     options = {
         conditionals: true,
-        evaluate: true,
-        side_effects: true,
-    }
+        evaluate    : true
+    };
     input: {
-        "use strict";
         (1 && a)();
         (0 || a)();
         (0 || 1 && a)();
@@ -27,7 +25,6 @@ this_binding_conditionals: {
         (1 ? eval : 0)();
     }
     expect: {
-        "use strict";
         a();
         a();
         a();
@@ -54,16 +51,13 @@ this_binding_collapse_vars: {
     options = {
         collapse_vars: true,
         toplevel: true,
-        unused: true,
-    }
+    };
     input: {
-        "use strict";
         var c = a; c();
         var d = a.b; d();
         var e = eval; e();
     }
     expect: {
-        "use strict";
         a();
         (0, a.b)();
         (0, eval)();
@@ -73,88 +67,31 @@ this_binding_collapse_vars: {
 this_binding_side_effects: {
     options = {
         side_effects : true
-    }
+    };
     input: {
-        (function(foo) {
+        (function (foo) {
             (0, foo)();
             (0, foo.bar)();
-            (0, eval)("console.log(foo);");
+            (0, eval)('console.log(foo);');
         }());
-        (function(foo) {
-            "use strict";
-            (0, foo)();
-            (0, foo.bar)();
-            (0, eval)("console.log(foo);");
-        }());
-        (function(foo) {
+        (function (foo) {
             var eval = console;
             (0, foo)();
             (0, foo.bar)();
-            (0, eval)("console.log(foo);");
+            (0, eval)('console.log(foo);');
         }());
     }
     expect: {
-        (function(foo) {
+        (function (foo) {
             foo();
             (0, foo.bar)();
-            eval("console.log(foo);");
+            (0, eval)('console.log(foo);');
         }());
-        (function(foo) {
-            "use strict";
-            foo();
-            (0, foo.bar)();
-            (0, eval)("console.log(foo);");
-        }());
-        (function(foo) {
+        (function (foo) {
             var eval = console;
             foo();
             (0, foo.bar)();
-            eval("console.log(foo);");
+            (0, eval)('console.log(foo);');
         }());
     }
-}
-
-this_binding_sequences: {
-    options = {
-        sequences: true,
-        side_effects: true,
-    }
-    input: {
-        console.log(typeof function() {
-            return eval("this");
-        }());
-        console.log(typeof function() {
-            "use strict";
-            return eval("this");
-        }());
-        console.log(typeof function() {
-            return (0, eval)("this");
-        }());
-        console.log(typeof function() {
-            "use strict";
-            return (0, eval)("this");
-        }());
-    }
-    expect: {
-        console.log(typeof function() {
-            return eval("this");
-        }()),
-        console.log(typeof function() {
-            "use strict";
-            return eval("this");
-        }()),
-        console.log(typeof function() {
-            return eval("this");
-        }()),
-        console.log(typeof function() {
-            "use strict";
-            return (0, eval)("this");
-        }());
-    }
-    expect_stdout: [
-        "object",
-        "undefined",
-        "object",
-        "object",
-    ]
-}
+}

test/compress/issue-976.js

@@ -2,7 +2,7 @@ eval_collapse_vars: {
     options = {
         collapse_vars:true, sequences:false, properties:true, dead_code:true, conditionals:true,
         comparisons:true, evaluate:true, booleans:true, loops:true, unused:true, hoist_funs:true,
-        keep_fargs:true, if_return:true, join_vars:true, side_effects:true
+        keep_fargs:true, if_return:true, join_vars:true, cascade:true, side_effects:true
     };
     input: {
         function f1() {

test/compress/issue-979.js

@@ -2,7 +2,7 @@ issue979_reported: {
     options = {
         sequences:true, properties:true, dead_code:true, conditionals:true,
         comparisons:true, evaluate:true, booleans:true, loops:true, unused:true, hoist_funs:true,
-        keep_fargs:true, if_return:true, join_vars:true, side_effects:true
+        keep_fargs:true, if_return:true, join_vars:true, cascade:true, side_effects:true
     }
     input: {
         function f1() {
@@ -32,7 +32,7 @@ issue979_test_negated_is_best: {
     options = {
         sequences:true, properties:true, dead_code:true, conditionals:true,
         comparisons:true, evaluate:true, booleans:true, loops:true, unused:true, hoist_funs:true,
-        keep_fargs:true, if_return:true, join_vars:true, side_effects:true
+        keep_fargs:true, if_return:true, join_vars:true, cascade:true, side_effects:true
     }
     input: {
         function f3() {

test/compress/join-vars.js

@@ -0,0 +1,40 @@
+only_vars: {
+    options = { join_vars: true };
+    input: {
+        let netmaskBinary = '';
+        for (let i = 0; i < netmaskBits; ++i) {
+            netmaskBinary += '1';
+        }
+    }
+    expect: {
+        let netmaskBinary = '';
+        for (let i = 0; i < netmaskBits; ++i) netmaskBinary += '1';
+    }
+}
+
+issue_1079_with_vars: {
+    options = { join_vars: true };
+    input: {
+        var netmaskBinary = '';
+        for (var i = 0; i < netmaskBits; ++i) {
+            netmaskBinary += '1';
+        }
+    }
+    expect: {
+        for (var netmaskBinary = '', i = 0; i < netmaskBits; ++i) netmaskBinary += '1';
+    }
+}
+
+issue_1079_with_mixed: {
+    options = { join_vars: true };
+    input: {
+        var netmaskBinary = '';
+        for (let i = 0; i < netmaskBits; ++i) {
+            netmaskBinary += '1';
+        }
+    }
+    expect: {
+        var netmaskBinary = ''
+        for (let i = 0; i < netmaskBits; ++i) netmaskBinary += '1';
+    }
+}

test/compress/loops.js

@@ -146,13 +146,55 @@ parse_do_while_without_semicolon: {
     }
 }
 
+
+keep_collapse_const_in_own_block_scope: {
+    options = {
+        join_vars: true,
+        loops: true
+    }
+    input: {
+        var i=2;
+        const c=5;
+        while(i--)
+            console.log(i);
+        console.log(c);
+    }
+    expect: {
+        var i=2;
+        const c=5;
+        for(;i--;)
+            console.log(i);
+        console.log(c);
+    }
+    expect_stdout: true
+}
+
+keep_collapse_const_in_own_block_scope_2: {
+    options = {
+        join_vars: true,
+        loops: true
+    }
+    input: {
+        const c=5;
+        var i=2; // Moves to loop, while it did not in previous test
+        while(i--)
+            console.log(i);
+        console.log(c);
+    }
+    expect: {
+        const c=5;
+        for(var i=2;i--;)
+            console.log(i);
+        console.log(c);
+    }
+    expect_stdout: true
+}
+
 evaluate: {
     options = {
+        loops: true,
         dead_code: true,
         evaluate: true,
-        loops: true,
-        passes: 2,
-        side_effects: true,
     };
     input: {
         while (true) {
@@ -294,10 +336,10 @@ issue_186_beautify_ie8: {
     ]
 }
 
-issue_186_braces: {
+issue_186_bracketize: {
     beautify = {
         beautify: false,
-        braces: true,
+        bracketize: true,
         ie8: false,
     }
     input: {
@@ -314,10 +356,10 @@ issue_186_braces: {
     expect_exact: 'var x=3;if(foo()){do{do{alert(x)}while(--x)}while(x)}else{bar()}'
 }
 
-issue_186_braces_ie8: {
+issue_186_bracketize_ie8: {
     beautify = {
         beautify: false,
-        braces: true,
+        bracketize: true,
         ie8: true,
     }
     input: {
@@ -334,10 +376,10 @@ issue_186_braces_ie8: {
     expect_exact: 'var x=3;if(foo()){do{do{alert(x)}while(--x)}while(x)}else{bar()}'
 }
 
-issue_186_beautify_braces: {
+issue_186_beautify_bracketize: {
     beautify = {
         beautify: true,
-        braces: true,
+        bracketize: true,
         ie8: false,
     }
     input: {
@@ -366,10 +408,10 @@ issue_186_beautify_braces: {
     ]
 }
 
-issue_186_beautify_braces_ie8: {
+issue_186_beautify_bracketize_ie8: {
     beautify = {
         beautify: true,
-        braces: true,
+        bracketize: true,
         ie8: true,
     }
     input: {
@@ -438,187 +480,3 @@ do_switch: {
         } while (false);
     }
 }
-
-in_parenthesis_1: {
-    input: {
-        for (("foo" in {});0;);
-    }
-    expect_exact: 'for(("foo"in{});0;);'
-}
-
-in_parenthesis_2: {
-    input: {
-        for ((function(){ "foo" in {}; });0;);
-    }
-    expect_exact: 'for(function(){"foo"in{}};0;);'
-}
-
-init_side_effects: {
-    options = {
-        loops: true,
-        side_effects: true,
-    };
-    input: {
-        for (function() {}(), i = 0; i < 5; i++) console.log(i);
-        for (function() {}(); i < 10; i++) console.log(i);
-    }
-    expect: {
-        for (i = 0; i < 5; i++) console.log(i);
-        for (; i < 10; i++) console.log(i);
-    }
-    expect_stdout: true
-}
-
-dead_code_condition: {
-    options = {
-        dead_code: true,
-        evaluate: true,
-        loops: true,
-        sequences: true,
-    }
-    input: {
-        for (var a = 0, b = 5; (a += 1, 3) - 3 && b > 0; b--) {
-            var c = function() {
-                b--;
-            }(a++);
-        }
-        console.log(a);
-    }
-    expect: {
-        var c;
-        var a = 0, b = 5;
-        a += 1, 0,
-        console.log(a);
-    }
-    expect_stdout: "1"
-}
-
-issue_2740_1: {
-    options = {
-        dead_code: true,
-        loops: true,
-    }
-    input: {
-        for (; ; ) break;
-        for (a(); ; ) break;
-        for (; b(); ) break;
-        for (c(); d(); ) break;
-        for (; ; e()) break;
-        for (f(); ; g()) break;
-        for (; h(); i()) break;
-        for (j(); k(); l()) break;
-    }
-    expect: {
-        a();
-        b();
-        c();
-        d();
-        f();
-        h();
-        j();
-        k();
-    }
-}
-
-issue_2740_2: {
-    options = {
-        dead_code: true,
-        loops: true,
-        passes: 2,
-    }
-    input: {
-        L1: while (x()) {
-            break L1;
-        }
-    }
-    expect: {
-        x();
-    }
-}
-
-issue_2740_3: {
-    options = {
-        dead_code: true,
-        loops: true,
-    }
-    input: {
-        L1: for (var x = 0; x < 3; x++) {
-            L2: for (var y = 0; y < 2; y++) {
-                break L1;
-            }
-        }
-        console.log(x, y);
-    }
-    expect: {
-        L1: for (var x = 0; x < 3; x++)
-            for (var y = 0; y < 2; y++)
-                break L1;
-        console.log(x, y);
-    }
-    expect_stdout: "0 0"
-}
-
-issue_2740_4: {
-    options = {
-        dead_code: true,
-        loops: true,
-        passes: 2,
-    }
-    input: {
-        L1: for (var x = 0; x < 3; x++) {
-            L2: for (var y = 0; y < 2; y++) {
-                break L2;
-            }
-        }
-        console.log(x, y);
-    }
-    expect: {
-        for (var x = 0; x < 3; x++) {
-            var y = 0;
-            y < 2;
-        }
-        console.log(x, y);
-    }
-    expect_stdout: "3 0"
-}
-
-issue_2740_5: {
-    options = {
-        dead_code: true,
-        loops: true,
-        passes: 2,
-    }
-    input: {
-        L1: for (var x = 0; x < 3; x++) {
-            break L1;
-            L2: for (var y = 0; y < 2; y++) {
-                break L2;
-            }
-        }
-        console.log(x, y);
-    }
-    expect: {
-        var x = 0;
-        x < 3;
-        var y;
-        console.log(x,y);
-    }
-    expect_stdout: "0 undefined"
-}
-
-issue_2904: {
-    options = {
-        join_vars: true,
-        loops: true,
-    }
-    input: {
-        var a = 1;
-        do {
-            console.log(a);
-        } while (--a);
-    }
-    expect: {
-        for (var a = 1; console.log(a), --a;);
-    }
-    expect_stdout: "1"
-}

test/compress/max_line_len.js

@@ -8,14 +8,14 @@ too_short: {
         }
     }
     expect_exact: [
-        "function f(",
-        "a){return{",
-        "c:42,d:a(",
-        '),e:"foo"}',
-        "}",
+        'function f(a){',
+        'return{',
+        'c:42,',
+        'd:a(),',
+        'e:"foo"}}',
     ]
     expect_warnings: [
-        "WARN: Output exceeds 10 characters",
+        "WARN: Output exceeds 10 characters"
     ]
 }
 
@@ -29,25 +29,11 @@ just_enough: {
         }
     }
     expect_exact: [
-        "function f(a){",
-        "return{c:42,",
+        'function f(a){',
+        'return{c:42,',
         'd:a(),e:"foo"}',
-        "}",
+        '}',
     ]
-    expect_warnings: []
-}
-
-issue_304: {
-    beautify = {
-        max_line_len: 10,
-    }
-    input: {
-        var a = 0, b = 0, c = 0, d = 0, e = 0;
-    }
-    expect_exact: [
-        "var a=0,",
-        "b=0,c=0,",
-        "d=0,e=0;",
+    expect_warnings: [
     ]
-    expect_warnings: []
 }

test/compress/negate-iife.js

@@ -22,8 +22,7 @@ negate_iife_1_off: {
 
 negate_iife_2: {
     options = {
-        inline: true,
-        negate_iife: true,
+        negate_iife: true
     };
     input: {
         (function(){ return {} })().x = 10;
@@ -33,7 +32,6 @@ negate_iife_2: {
 
 negate_iife_2_side_effects: {
     options = {
-        inline: true,
         negate_iife: true,
         side_effects: true,
     }
@@ -60,14 +58,13 @@ negate_iife_3_evaluate: {
     options = {
         conditionals: true,
         evaluate: true,
-        inline: true,
         negate_iife: true,
     }
     input: {
         (function(){ return true })() ? console.log(true) : console.log(false);
     }
     expect: {
-        true, console.log(true);
+        console.log(true);
     }
     expect_stdout: true
 }
@@ -103,14 +100,13 @@ negate_iife_3_off_evaluate: {
     options = {
         conditionals: true,
         evaluate: true,
-        inline: true,
         negate_iife: false,
     }
     input: {
         (function(){ return true })() ? console.log(true) : console.log(false);
     }
     expect: {
-        true, console.log(true);
+        console.log(true);
     }
     expect_stdout: true
 }

test/compress/new.js

@@ -83,18 +83,18 @@ new_with_unary_prefix: {
     expect_exact: 'var bar=(+new Date).toString(32);';
 }
 
-dot_parenthesis_1: {
-    input: {
-        console.log(new (Math.random().constructor) instanceof Number);
+new_with_assignement_expression: {
+    options = {
+        evaluate: true
     }
-    expect_exact: "console.log(new(Math.random().constructor)instanceof Number);"
-    expect_stdout: "true"
-}
-
-dot_parenthesis_2: {
     input: {
-        console.log(typeof new function(){Math.random()}.constructor);
+        var a;
+        new x(a = 5 * 2, b = [1, 2, 3], c = {a: "a", b: "b", cd: "c" + "d"});
+        new y([a, b] = [3, 4]);
+    }
+    expect: {
+        var a;
+        new x(a = 10, b = [1, 2, 3], c = {a: "a", b: "b", cd: "cd"});
+        new y([a, b] = [3, 4]);
     }
-    expect_exact: "console.log(typeof new function(){Math.random()}.constructor);"
-    expect_stdout: "function"
 }

test/compress/node_version.js

@@ -1,38 +0,0 @@
-eval_let_6: {
-    input: {
-        eval("let a;");
-        console.log();
-    }
-    expect: {
-        eval("let a;");
-        console.log();
-    }
-    expect_stdout: ""
-    node_version: ">=6"
-}
-
-eval_let_4: {
-    input: {
-        eval("let a;");
-        console.log();
-    }
-    expect: {
-        eval("let a;");
-        console.log();
-    }
-    expect_stdout: SyntaxError("Block-scoped declarations (let, const, function, class) not yet supported outside strict mode")
-    node_version: "4"
-}
-
-eval_let_0: {
-    input: {
-        eval("let a;");
-        console.log();
-    }
-    expect: {
-        eval("let a;");
-        console.log();
-    }
-    expect_stdout: SyntaxError("Unexpected identifier")
-    node_version: "<=0.12"
-}

test/compress/numbers.js

@@ -1,49 +1,21 @@
 hex_numbers_in_parentheses_for_prototype_functions: {
-    beautify = {
-        beautify: true,
-    }
     input: {
-        function f() {
-            (-2);
-            (-2).toFixed(0);
+        (-2);
+        (-2).toFixed(0);
 
-            (2);
-            (2).toFixed(0);
+        (2);
+        (2).toFixed(0);
 
-            (0.2);
-            (0.2).toFixed(0);
+        (0.2);
+        (0.2).toFixed(0);
 
-            (2.34e20);
-            (2.34e20).toFixed(0);
+        (0.00000002);
+        (0.00000002).toFixed(0);
 
-            (0.00000002);
-            (0.00000002).toFixed(0);
-
-            (1000000000000000128);
-            (1000000000000000128).toFixed(0);
-
-            (-1000000000000000128);
-            (-1000000000000000128).toFixed(0);
-        }
+        (1000000000000000128);
+        (1000000000000000128).toFixed(0);
     }
-    expect_exact: [
-        "function f() {",
-        "    -2;",
-        "    (-2).toFixed(0);",
-        "    2;",
-        "    2..toFixed(0);",
-        "    .2;",
-        "    .2.toFixed(0);",
-        "    234e18;",
-        "    234e18.toFixed(0);",
-        "    2e-8;",
-        "    2e-8.toFixed(0);",
-        "    0xde0b6b3a7640080;",
-        "    (0xde0b6b3a7640080).toFixed(0);",
-        "    -0xde0b6b3a7640080;",
-        "    (-0xde0b6b3a7640080).toFixed(0);",
-        "}",
-    ]
+    expect_exact: "-2;(-2).toFixed(0);2;2..toFixed(0);.2;.2.toFixed(0);2e-8;2e-8.toFixed(0);0xde0b6b3a7640080;(0xde0b6b3a7640080).toFixed(0);"
 }
 
 comparisons: {

test/compress/object.js

@@ -0,0 +1,512 @@
+getter_setter: {
+    input: {
+        var get = "bar";
+        var a = {
+            get,
+            set: "foo",
+            get bar() {
+                return this.get;
+            },
+            get 5() {
+                return "five";
+            },
+            get 0xf55() {
+                return "f five five";
+            },
+            get "five"() {
+                return 5;
+            },
+            set one(value) {
+                this._one = value;
+            },
+            set 9(value) {
+                this._nine = value;
+            },
+            set 0b1010(value) {
+                this._ten = value;
+            },
+            set "eleven"(value) {
+                this._eleven = value;
+            }
+        };
+        var b = {
+            get() { return "gift"; },
+            set: function(code) { return "Storing code " + code; }
+        };
+        var c = {
+            ["get"]: "foo",
+            ["set"]: "bar"
+        };
+        var d = {
+            get: "foo",
+            set: "bar"
+        };
+    }
+    expect: {
+        var get = "bar";
+        var a = {
+            get,
+            set: "foo",
+            get bar() {
+                return this.get;
+            },
+            get 5() {
+                return "five";
+            },
+            get 0xf55() {
+                return "f five five";
+            },
+            get "five"() {
+                return 5;
+            },
+            set one(value) {
+                this._one = value;
+            },
+            set 9(value) {
+                this._nine = value;
+            },
+            set 0b1010(value) {
+                this._ten = value;
+            },
+            set "eleven"(value) {
+                this._eleven = value;
+            }
+        };
+        var b = {
+            get() { return "gift"; },
+            set: function(code) { return "Storing code " + code; }
+        };
+        var c = {
+            ["get"]: "foo",
+            ["set"]: "bar"
+        };
+        var d = {
+            get: "foo",
+            set: "bar"
+        };
+    }
+}
+
+getter_setter_mangler: {
+    mangle = {}
+    beautify = {
+        ecma: 6
+    }
+    input: {
+        function f(get,set) {
+            return {
+                get,
+                set,
+                get g(){},
+                set s(n){},
+                c,
+                a:1,
+                m(){}
+            };
+        }
+    }
+    expect_exact: "function f(n,t){return{get:n,set:t,get g(){},set s(n){},c,a:1,m(){}}}"
+}
+
+use_shorthand_opportunity: {
+    beautify = {
+        ecma: 6
+    }
+    input: {
+        var foo = 123;
+        var obj = {foo: foo};
+    }
+    expect_exact: "var foo=123;var obj={foo};"
+}
+
+computed_property_names: {
+    input: {
+        obj({ ["x" + "x"]: 6 });
+    }
+    expect_exact: 'obj({["x"+"x"]:6});'
+}
+
+computed_property_names_evaluated_1: {
+    options = {
+        evaluate: true
+    }
+    input: {
+        obj({
+            [1 + 1]: 2,
+            ["x" + "x"]: 6
+        });
+    }
+    expect_exact: 'obj({[2]:2,["xx"]:6});'
+}
+
+computed_property_names_evaluated_2: {
+    options = {
+        evaluate: true
+    }
+    input: {
+        var foo = something();
+
+        var obj = {
+            [foo]() {
+                return "blah";
+            }
+        }
+    }
+    expect_exact: 'var foo=something();var obj={[foo](){return"blah"}};'
+}
+
+shorthand_properties: {
+    mangle = true;
+    input: {
+        (function() {
+            var prop = 1;
+            const value = {prop};
+            return value;
+        })();
+    }
+    expect: {
+        (function() {
+            var n = 1;
+            const r = {prop:n};
+            return r;
+        })();
+    }
+}
+
+concise_methods: {
+    beautify = {
+        ecma: 6
+    }
+    input: {
+        x = {
+            foo(a, b) {
+                return x;
+            }
+        }
+        y = {
+            foo([{a}]) {
+                return a;
+            },
+            bar(){}
+        }
+    }
+    expect_exact: "x={foo(a,b){return x}};y={foo([{a}]){return a},bar(){}};"
+}
+
+concise_methods_with_computed_property: {
+    options = {
+        evaluate: true
+    }
+    input: {
+        var foo = {
+            [Symbol.iterator]() {
+                return { /* stuff */ }
+            },
+            [1 + 2]() {
+                return 3;
+            },
+            ["1" + "4"]() {
+                return 14;
+            }
+        }
+    }
+    expect: {
+        var foo = {
+            [Symbol.iterator]() {
+                return { /* stuff */ }
+            },
+            [3]() {
+                return 3;
+            },
+            ["14"]() {
+                return 14;
+            }
+        }
+    }
+}
+
+concise_methods_with_computed_property2: {
+    options = {
+        evaluate: true
+    }
+    input: {
+        var foo = {
+            [[1]](){
+                return "success";
+            }
+        };
+        doSomething(foo[[1]]());
+    }
+    expect_exact: 'var foo={[[1]](){return"success"}};doSomething(foo[[1]]());'
+}
+
+concise_methods_with_various_property_names: {
+    input: {
+        var get = "bar";
+        var a = {
+            bar() {
+                return this.get;
+            },
+            5() {
+                return "five";
+            },
+            0xf55() {
+                return "f five five";
+            },
+            "five"() {
+                return 5;
+            },
+            0b1010(value) {
+                this._ten = value;
+            }
+        };
+    }
+    expect: {
+        var get = "bar";
+        var a = {
+            bar() {
+                return this.get;
+            },
+            5() {
+                return "five";
+            },
+            0xf55() {
+                return "f five five";
+            },
+            "five"() {
+                return 5;
+            },
+            0b1010(value) {
+                this._ten = value;
+            }
+        };
+    }
+}
+
+concise_methods_and_mangle_props: {
+    mangle_props = {
+        regex: /_/
+    };
+    input: {
+        function x() {
+            obj = {
+                _foo() { return 1; }
+            }
+        }
+    }
+    expect: {
+        function x() {
+            obj = {
+                a() { return 1; }
+            }
+        }
+    }
+}
+
+concise_generators: {
+    beautify = {
+        ecma: 6
+    }
+    input: {
+        x = {
+            *foo(a, b) {
+                return x;
+            }
+        }
+        y = {
+            *foo([{a}]) {
+                yield a;
+            },
+            bar(){}
+        }
+    }
+    expect_exact: "x={*foo(a,b){return x}};y={*foo([{a}]){yield a},bar(){}};"
+}
+
+concise_methods_and_keyword_names: {
+    input: {
+        x = {
+            catch() {},
+            throw() {}
+        }
+    }
+    expect: {
+        x={catch(){},throw(){}};
+    }
+}
+
+getter_setter_with_computed_value: {
+    input: {
+        class C {
+            get ['a']() {
+                return 'A';
+            }
+            set ['a'](value) {
+                do_something(a);
+            }
+        }
+        var x = {
+            get [a.b]() {
+                return 42;
+            }
+        };
+        class MyArray extends Array {
+            get [Symbol.species]() {
+                return Array;
+            }
+        }
+    }
+    expect_exact: 'class C{get["a"](){return"A"}set["a"](value){do_something(a)}}var x={get[a.b](){return 42}};class MyArray extends Array{get[Symbol.species](){return Array}}'
+}
+
+property_with_operator_value: {
+    input: {
+        var foo = {
+            "*": 1,
+            get "*"() {
+                return 2;
+            },
+            *"*"() {
+                return 3;
+            },
+            "%": 1,
+            get "%"() {
+                return 2;
+            },
+            *"%"() {
+                return 3;
+            }
+        }
+        class bar {
+            get "*"() {
+                return 1
+            }
+            *"*"() {
+                return 2;
+            }
+            get "%"() {
+                return 1
+            }
+            *"%"() {
+                return 2;
+            }
+        }
+    }
+    expect_exact: 'var foo={"*":1,get"*"(){return 2},*"*"(){return 3},"%":1,get"%"(){return 2},*"%"(){return 3}};class bar{get"*"(){return 1}*"*"(){return 2}get"%"(){return 1}*"%"(){return 2}}'
+}
+
+property_with_unprintable: {
+    input: {
+        var foo = {
+            "\x00\x01": "foo",
+            get "\x00\x01"() {
+                return "bar";
+            },
+            set "\x00\x01"(foo) {
+                save(foo);
+            },
+            *"\x00\x01"() {
+                return "foobar";
+            }
+        }
+        class bar {
+            get "\x00\x01"() {
+                return "bar"
+            }
+            set "\x00\x01"(foo) {
+                save(foo);
+            }
+            *"\x00\x01"() {
+                return "foobar";
+            }
+        }
+    }
+    expect_exact: 'var foo={"\\0\x01":"foo",get"\\0\x01"(){return"bar"},set"\\0\x01"(foo){save(foo)},*"\\0\x01"(){return"foobar"}};class bar{get"\\0\x01"(){return"bar"}set"\\0\x01"(foo){save(foo)}*"\\0\x01"(){return"foobar"}}'
+}
+
+property_with_unprintable_ascii_only: {
+    beautify = {
+        ascii_only: true,
+    }
+    input: {
+        var foo = {
+            "\x00\x01": "foo",
+            get "\x00\x01"() {
+                return "bar";
+            },
+            set "\x00\x01"(foo) {
+                save(foo);
+            },
+            *"\x00\x01"() {
+                return "foobar";
+            }
+        }
+        class bar {
+            get "\x00\x01"() {
+                return "bar"
+            }
+            set "\x00\x01"(foo) {
+                save(foo);
+            }
+            *"\x00\x01"() {
+                return "foobar";
+            }
+        }
+    }
+    expect_exact: 'var foo={"\\0\\x01":"foo",get"\\0\\x01"(){return"bar"},set"\\0\\x01"(foo){save(foo)},*"\\0\\x01"(){return"foobar"}};class bar{get"\\0\\x01"(){return"bar"}set"\\0\\x01"(foo){save(foo)}*"\\0\\x01"(){return"foobar"}}'
+}
+
+property_with_unprintable_ascii_only_static: {
+    beautify = {
+        ascii_only: true
+    }
+    input: {
+        class foo {
+            static get "\x02\x03"() {
+                return "bar";
+            }
+            static set "\x04\x05"(foo) {
+                save(foo);
+            }
+        }
+    }
+    expect_exact: 'class foo{static get"\\x02\\x03"(){return"bar"}static set"\\x04\\x05"(foo){save(foo)}}'
+}
+
+methods_and_getters_with_keep_quoted_props_enabled: {
+    beautify = {
+        quote_style: 3,
+        keep_quoted_props: true,
+    }
+    input: {
+        var obj = {
+            a() {},
+            "b"() {},
+            get c() { return "c"},
+            get "d"() { return "d"},
+            set e(a) { doSomething(a); },
+            set f(a) { doSomething(b); }
+        }
+    }
+    expect_exact: 'var obj={a(){},"b"(){},get c(){return"c"},get"d"(){return"d"},set e(a){doSomething(a)},set f(a){doSomething(b)}};'
+}
+
+allow_assignments_to_property_values: {
+    input: {
+        var foo = {123: foo = 123} = {foo: "456"};
+    }
+    expect: {
+        var foo = {123: foo = 123} = {foo: "456"};
+    }
+}
+
+variable_as_computed_property: {
+    input: {
+        function getLine(header) {
+            return {
+                [header]: {}
+            };
+        }
+    }
+    expect_exact: "function getLine(header){return{[header]:{}}}"
+}