v2.4.17

.gitattributes

@@ -1 +0,0 @@
-*.js    text eol=lf

.github/ISSUE_TEMPLATE.md

@@ -1,25 +0,0 @@
-**Bug report or feature request?**
-
-<!-- Note: sub-optimal but correct code is not a bug -->
-
-**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.
--->
-
-**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.
--->

.gitignore

@@ -1,3 +1,2 @@
-/node_modules/
-/npm-debug.log
 tmp/
+node_modules/

.travis.yml

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

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,26 +0,0 @@
-environment:
-  UGLIFYJS_TEST_ALL: 1
-  matrix:
-    - NODEJS_VER: node/0.10
-    - NODEJS_VER: node/0.12
-    - NODEJS_VER: node/4
-    - NODEJS_VER: node/6
-    - NODEJS_VER: node/8
-    - NODEJS_VER: node/10
-    - NODEJS_VER: node/latest
-install:
-  - git clone --branch v1.4.2 --depth 1 https://github.com/jasongin/nvs.git %LOCALAPPDATA%\nvs
-  - set PATH=%LOCALAPPDATA%\nvs;%PATH%
-  - nvs --version
-  - nvs add %NODEJS_VER%
-  - nvs use %NODEJS_VER%
-  - node --version
-  - npm --version --no-update-notifier
-  - npm install --no-optional --no-save --no-update-notifier
-build: off
-cache:
-  - tmp
-matrix:
-  fast_finish: true
-test_script:
-  - npm test --no-update-notifier

bin/uglifyjs

@@ -3,412 +3,478 @@
 
 "use strict";
 
-require("../tools/exit");
-
-var fs = require("fs");
-var info = require("../package.json");
-var path = require("path");
-var program = require("commander");
 var UglifyJS = require("../tools/node");
+var sys = require("util");
+var yargs = require("yargs");
+var fs = require("fs");
+var path = require("path");
+var async = require("async");
+var acorn;
+var ARGS = yargs
+    .usage("$0 input1.js [input2.js ...] [options]\n\
+Use a single dash to read input from the standard input.\
+\n\n\
+NOTE: by default there is no mangling/compression.\n\
+Without [options] it will simply parse input files and dump the AST\n\
+with whitespace and comments discarded.  To achieve compression and\n\
+mangling you need to use `-c` and `-m`.\
+")
+    .describe("source-map", "Specify an output file where to generate source map.")
+    .describe("source-map-root", "The path to the original source to be included in the source map.")
+    .describe("source-map-url", "The path to the source map to be added in //# sourceMappingURL.  Defaults to the value passed with --source-map.")
+    .describe("source-map-include-sources", "Pass this flag if you want to include the content of source files in the source map as sourcesContent property.")
+    .describe("in-source-map", "Input source map, useful if you're compressing JS that was generated from some other original code.")
+    .describe("screw-ie8", "Pass this flag if you don't care about full compliance with Internet Explorer 6-8 quirks (by default UglifyJS will try to be IE-proof).")
+    .describe("expr", "Parse a single expression, rather than a program (for parsing JSON)")
+    .describe("p", "Skip prefix for original filenames that appear in source maps. \
+For example -p 3 will drop 3 directories from file names and ensure they are relative paths. \
+You can also specify -p relative, which will make UglifyJS figure out itself the relative paths between original sources, \
+the source map and the output file.")
+    .describe("o", "Output file (default STDOUT).")
+    .describe("b", "Beautify output/specify output options.")
+    .describe("m", "Mangle names/pass mangler options.")
+    .describe("r", "Reserved names to exclude from mangling.")
+    .describe("c", "Enable compressor/pass compressor options. \
+Pass options like -c hoist_vars=false,if_return=false. \
+Use -c with no argument to use the default compression options.")
+    .describe("d", "Global definitions")
+    .describe("e", "Embed everything in a big function, with a configurable parameter/argument list.")
 
-var skip_keys = [ "cname", "inlined", "parent_scope", "scope", "uses_eval", "uses_with" ];
-var files = {};
-var options = {
-    compress: false,
-    mangle: false
-};
-program.version(info.name + " " + 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("-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("--toplevel", "Compress and/or mangle variables in toplevel scope.");
-program.option("--verbose", "Print diagnostic messages.");
-program.option("--warn", "Print warning messages.");
-program.option("--wrap <name>", "Embed everything as a function with “exports” corresponding to “name” globally.");
-program.arguments("[files...]").parseArgv(process.argv);
-if (program.configFile) {
-    options = JSON.parse(read_file(program.configFile));
-    if (options.mangle && options.mangle.properties && options.mangle.properties.regex) {
-        options.mangle.properties.regex = UglifyJS.parse(options.mangle.properties.regex, {
-            expression: true
-        }).getValue();
-    }
-}
-if (!program.output && program.sourceMap && program.sourceMap.url != "inline") {
-    fatal("ERROR: cannot write source map to STDOUT");
-}
-[
-    "compress",
-    "enclose",
-    "ie8",
-    "mangle",
-    "sourceMap",
-    "toplevel",
-    "wrap"
-].forEach(function(name) {
-    if (name in program) {
-        options[name] = program[name];
-    }
-});
-if (program.beautify) {
-    options.output = typeof program.beautify == "object" ? program.beautify : {};
-    if (!("beautify" in options.output)) {
-        options.output.beautify = true;
-    }
-}
-if (program.comments) {
-    if (typeof options.output != "object") options.output = {};
-    options.output.comments = typeof program.comments == "string" ? program.comments : "some";
-}
-if (program.define) {
-    if (typeof options.compress != "object") options.compress = {};
-    if (typeof options.compress.global_defs != "object") options.compress.global_defs = {};
-    for (var expr in program.define) {
-        options.compress.global_defs[expr] = program.define[expr];
-    }
-}
-if (program.keepFnames) {
-    options.keep_fnames = true;
-}
-if (program.mangleProps) {
-    if (program.mangleProps.domprops) {
-        delete program.mangleProps.domprops;
-    } else {
-        if (typeof program.mangleProps != "object") program.mangleProps = {};
-        if (!Array.isArray(program.mangleProps.reserved)) program.mangleProps.reserved = [];
-        require("../tools/domprops").forEach(function(name) {
-            UglifyJS.push_uniq(program.mangleProps.reserved, name);
-        });
-    }
-    if (typeof options.mangle != "object") options.mangle = {};
-    options.mangle.properties = program.mangleProps;
-}
-if (program.nameCache) {
-    options.nameCache = JSON.parse(read_file(program.nameCache, "{}"));
-}
-if (program.output == "ast") {
-    options.output = {
-        ast: true,
-        code: false
+    .describe("comments", "Preserve copyright comments in the output. \
+By default this works like Google Closure, keeping JSDoc-style comments that contain \"@license\" or \"@preserve\". \
+You can optionally pass one of the following arguments to this flag:\n\
+- \"all\" to keep all comments\n\
+- a valid JS regexp (needs to start with a slash) to keep only comments that match.\n\
+\
+Note that currently not *all* comments can be kept when compression is on, \
+because of dead code removal or cascading statements into sequences.")
+
+    .describe("preamble", "Preamble to prepend to the output.  You can use this to insert a \
+comment, for example for licensing information.  This will not be \
+parsed, but the source map will adjust for its presence.")
+
+    .describe("stats", "Display operations run time on STDERR.")
+    .describe("acorn", "Use Acorn for parsing.")
+    .describe("spidermonkey", "Assume input files are SpiderMonkey AST format (as JSON).")
+    .describe("self", "Build itself (UglifyJS2) as a library (implies --wrap=UglifyJS --export-all)")
+    .describe("wrap", "Embed everything in a big function, making the “exports” and “global” variables available. \
+You need to pass an argument to this option to specify the name that your module will take when included in, say, a browser.")
+    .describe("export-all", "Only used when --wrap, this tells UglifyJS to add code to automatically export all globals.")
+    .describe("lint", "Display some scope warnings")
+    .describe("v", "Verbose")
+    .describe("V", "Print version number and exit.")
+    .describe("noerr", "Don't throw an error for unknown options in -c, -b or -m.")
+    .describe("bare-returns", "Allow return outside of functions.  Useful when minifying CommonJS modules.")
+    .describe("keep-fnames", "Do not mangle/drop function names.  Useful for code relying on Function.prototype.name.")
+    .describe("quotes", "Quote style (0 - auto, 1 - single, 2 - double, 3 - original)")
+
+    .alias("p", "prefix")
+    .alias("o", "output")
+    .alias("v", "verbose")
+    .alias("b", "beautify")
+    .alias("m", "mangle")
+    .alias("c", "compress")
+    .alias("d", "define")
+    .alias("r", "reserved")
+    .alias("V", "version")
+    .alias("e", "enclose")
+    .alias("q", "quotes")
+
+    .string("source-map")
+    .string("source-map-root")
+    .string("source-map-url")
+    .string("b")
+    .string("m")
+    .string("c")
+    .string("d")
+    .string("e")
+    .string("comments")
+    .string("wrap")
+    .string("p")
+
+    .boolean("expr")
+    .boolean("source-map-include-sources")
+    .boolean("screw-ie8")
+    .boolean("export-all")
+    .boolean("self")
+    .boolean("v")
+    .boolean("stats")
+    .boolean("acorn")
+    .boolean("spidermonkey")
+    .boolean("lint")
+    .boolean("V")
+    .boolean("noerr")
+    .boolean("bare-returns")
+    .boolean("keep-fnames")
+
+    .wrap(80)
+
+    .argv
+;
+
+normalize(ARGS);
+
+if (ARGS.noerr) {
+    UglifyJS.DefaultsError.croak = function(msg, defs) {
+        sys.error("WARN: " + msg);
     };
 }
-if (program.parse) {
-    if (!program.parse.acorn && !program.parse.spidermonkey) {
-        options.parse = program.parse;
-    } else if (program.sourceMap && program.sourceMap.content == "inline") {
-        fatal("ERROR: inline source map only works with built-in parser");
-    }
+
+if (ARGS.version || ARGS.V) {
+    var json = require("../package.json");
+    sys.puts(json.name + ' ' + json.version);
+    process.exit(0);
 }
-if (~program.rawArgs.indexOf("--rename")) {
-    options.rename = true;
-} else if (!program.rename) {
-    options.rename = false;
+
+if (ARGS.ast_help) {
+    var desc = UglifyJS.describe_ast();
+    sys.puts(typeof desc == "string" ? desc : JSON.stringify(desc, null, 2));
+    process.exit(0);
 }
-var convert_path = function(name) {
-    return name;
+
+if (ARGS.h || ARGS.help) {
+    sys.puts(yargs.help());
+    process.exit(0);
+}
+
+if (ARGS.acorn) {
+    acorn = require("acorn");
+}
+
+var COMPRESS = getOptions("c", true);
+var MANGLE = getOptions("m", true);
+var BEAUTIFY = getOptions("b", true);
+
+if (ARGS.d) {
+    if (COMPRESS) COMPRESS.global_defs = getOptions("d");
+}
+
+if (ARGS.r) {
+    if (MANGLE) MANGLE.except = ARGS.r.replace(/^\s+|\s+$/g).split(/\s*,+\s*/);
+}
+
+if (ARGS.quotes === true) {
+    ARGS.quotes = 3;
+}
+
+var OUTPUT_OPTIONS = {
+    beautify    : BEAUTIFY ? true : false,
+    preamble    : ARGS.preamble || null,
+    quote_style : ARGS.quotes != null ? ARGS.quotes : 0
 };
-if (typeof program.sourceMap == "object" && "base" in program.sourceMap) {
-    convert_path = function() {
-        var base = program.sourceMap.base;
-        delete options.sourceMap.base;
-        return function(name) {
-            return path.relative(base, name);
-        };
-    }();
-}
-if (program.verbose) {
-    options.warnings = "verbose";
-} else if (program.warn) {
-    options.warnings = true;
-}
-if (program.self) {
-    if (program.args.length) {
-        print_error("WARN: Ignoring input files since --self was passed");
-    }
-    if (!options.wrap) options.wrap = "UglifyJS";
-    simple_glob(UglifyJS.FILES).forEach(function(name) {
-        files[convert_path(name)] = read_file(name);
-    });
-    run();
-} else if (program.args.length) {
-    simple_glob(program.args).forEach(function(name) {
-        files[convert_path(name)] = read_file(name);
-    });
-    run();
-} else {
-    var chunks = [];
-    process.stdin.setEncoding("utf8");
-    process.stdin.on("data", function(chunk) {
-        chunks.push(chunk);
-    }).on("end", function() {
-        files = [ chunks.join("") ];
-        run();
-    });
-    process.stdin.resume();
+
+if (ARGS.screw_ie8) {
+    if (COMPRESS) COMPRESS.screw_ie8 = true;
+    if (MANGLE) MANGLE.screw_ie8 = true;
+    OUTPUT_OPTIONS.screw_ie8 = true;
 }
 
-function convert_ast(fn) {
-    return UglifyJS.AST_Node.from_mozilla_ast(Object.keys(files).reduce(fn, null));
+if (ARGS.keep_fnames) {
+    if (COMPRESS) COMPRESS.keep_fnames = true;
+    if (MANGLE) MANGLE.keep_fnames = true;
 }
 
-function run() {
-    UglifyJS.AST_Node.warn_function = function(msg) {
-        print_error("WARN: " + msg);
-    };
-    var content = program.sourceMap && program.sourceMap.content;
-    if (content && content != "inline") {
-        print_error("INFO: Using input source map: " + content);
-        options.sourceMap.content = read_file(content, content);
-    }
-    if (program.timings) options.timings = true;
-    try {
-        if (program.parse) {
-            if (program.parse.acorn) {
-                files = convert_ast(function(toplevel, name) {
-                    return require("acorn").parse(files[name], {
-                        locations: true,
-                        program: toplevel,
-                        sourceFile: name
-                    });
-                });
-            } else if (program.parse.spidermonkey) {
-                files = convert_ast(function(toplevel, name) {
-                    var obj = JSON.parse(files[name]);
-                    if (!toplevel) return obj;
-                    toplevel.body = toplevel.body.concat(obj.body);
-                    return toplevel;
-                });
-            }
-        }
-    } catch (ex) {
-        fatal(ex);
-    }
-    var result = UglifyJS.minify(files, options);
-    if (result.error) {
-        var ex = result.error;
-        if (ex.name == "SyntaxError") {
-            print_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];
-            if (!line && !col) {
-                line = lines[ex.line - 2];
-                col = line.length;
-            }
-            if (line) {
-                var limit = 70;
-                if (col > limit) {
-                    line = line.slice(col - limit);
-                    col = limit;
-                }
-                print_error(line.slice(0, 80));
-                print_error(line.slice(0, col).replace(/\S/g, " ") + "^");
-            }
-        }
-        if (ex.defs) {
-            print_error("Supported options:");
-            print_error(format_object(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;
-            }
-            if (skip_key(key)) return;
-            if (value instanceof UglifyJS.AST_Token) return;
-            if (value instanceof UglifyJS.Dictionary) return;
-            if (value instanceof UglifyJS.AST_Node) {
-                var result = {
-                    _class: "AST_" + value.TYPE
-                };
-                value.CTOR.PROPS.forEach(function(prop) {
-                    result[prop] = value[prop];
-                });
-                return result;
-            }
-            return value;
-        }, 2));
-    } else if (program.output == "spidermonkey") {
-        print(JSON.stringify(UglifyJS.minify(result.code, {
-            compress: false,
-            mangle: false,
-            output: {
-                ast: true,
-                code: false
-            }
-        }).ast.to_mozilla_ast(), null, 2));
-    } else if (program.output) {
-        fs.writeFileSync(program.output, result.code);
-        if (result.map) {
-            fs.writeFileSync(program.output + ".map", result.map);
+if (BEAUTIFY)
+    UglifyJS.merge(OUTPUT_OPTIONS, BEAUTIFY);
+
+if (ARGS.comments) {
+    if (/^\/.*\/[a-zA-Z]*$/.test(ARGS.comments)) {
+        var regex_pos = ARGS.comments.lastIndexOf("/");
+        try {
+            OUTPUT_OPTIONS.comments = new RegExp(ARGS.comments.substr(1, regex_pos - 1), ARGS.comments.substr(regex_pos + 1));
+        } catch (e) {
+            sys.error("ERROR: Invalid --comments: " + e.message);
         }
+    } else if (ARGS.comments == "all") {
+        OUTPUT_OPTIONS.comments = true;
     } else {
-        print(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");
+        OUTPUT_OPTIONS.comments = function(node, comment) {
+            var text = comment.value;
+            var type = comment.type;
+            if (type == "comment2") {
+                // multiline comment
+                return /@preserve|@license|@cc_on/i.test(text);
+            }
+        }
     }
 }
 
-function fatal(message) {
-    if (message instanceof Error) message = message.stack.replace(/^\S*?Error:/, "ERROR:")
-    print_error(message);
+var files = ARGS._.slice();
+
+if (ARGS.self) {
+    if (files.length > 0) {
+        sys.error("WARN: Ignoring input files since --self was passed");
+    }
+    files = UglifyJS.FILES;
+    if (!ARGS.wrap) ARGS.wrap = "UglifyJS";
+    ARGS.export_all = true;
+}
+
+var ORIG_MAP = ARGS.in_source_map;
+
+if (ORIG_MAP) {
+    ORIG_MAP = JSON.parse(fs.readFileSync(ORIG_MAP));
+    if (files.length == 0) {
+        sys.error("INFO: Using file from the input source map: " + ORIG_MAP.file);
+        files = [ ORIG_MAP.file ];
+    }
+    if (ARGS.source_map_root == null) {
+        ARGS.source_map_root = ORIG_MAP.sourceRoot;
+    }
+}
+
+if (files.length == 0) {
+    files = [ "-" ];
+}
+
+if (files.indexOf("-") >= 0 && ARGS.source_map) {
+    sys.error("ERROR: Source map doesn't work with input from STDIN");
     process.exit(1);
 }
 
-// A file glob function that only supports "*" and "?" wildcards in the basename.
-// Example: "foo/bar/*baz??.*.js"
-// Argument `glob` may be a string or an array of strings.
-// Returns an array of strings. Garbage in, garbage out.
-function simple_glob(glob) {
-    if (Array.isArray(glob)) {
-        return [].concat.apply([], glob.map(simple_glob));
+if (files.filter(function(el){ return el == "-" }).length > 1) {
+    sys.error("ERROR: Can read a single file from STDIN (two or more dashes specified)");
+    process.exit(1);
+}
+
+var STATS = {};
+var OUTPUT_FILE = ARGS.o;
+var TOPLEVEL = null;
+var P_RELATIVE = ARGS.p && ARGS.p == "relative";
+var SOURCES_CONTENT = {};
+
+var SOURCE_MAP = ARGS.source_map ? UglifyJS.SourceMap({
+    file: P_RELATIVE ? path.relative(path.dirname(ARGS.source_map), OUTPUT_FILE) : OUTPUT_FILE,
+    root: ARGS.source_map_root,
+    orig: ORIG_MAP,
+}) : null;
+
+OUTPUT_OPTIONS.source_map = SOURCE_MAP;
+
+try {
+    var output = UglifyJS.OutputStream(OUTPUT_OPTIONS);
+    var compressor = COMPRESS && UglifyJS.Compressor(COMPRESS);
+} catch(ex) {
+    if (ex instanceof UglifyJS.DefaultsError) {
+        sys.error(ex.msg);
+        sys.error("Supported options:");
+        sys.error(sys.inspect(ex.defs));
+        process.exit(1);
     }
-    if (glob.match(/\*|\?/)) {
-        var dir = path.dirname(glob);
-        try {
-            var entries = fs.readdirSync(dir);
-        } catch (ex) {}
-        if (entries) {
-            var pattern = "^" + path.basename(glob)
-                .replace(/[.+^$[\]\\(){}]/g, "\\$&")
-                .replace(/\*/g, "[^/\\\\]*")
-                .replace(/\?/g, "[^/\\\\]") + "$";
-            var mod = process.platform === "win32" ? "i" : "";
-            var rx = new RegExp(pattern, mod);
-            var results = entries.filter(function(name) {
-                return rx.test(name);
-            }).map(function(name) {
-                return path.join(dir, name);
-            });
-            if (results.length) return results;
+}
+
+async.eachLimit(files, 1, function (file, cb) {
+    read_whole_file(file, function (err, code) {
+        if (err) {
+            sys.error("ERROR: can't read file: " + file);
+            process.exit(1);
         }
-    }
-    return [ glob ];
-}
-
-function read_file(path, default_value) {
-    try {
-        return fs.readFileSync(path, "utf8");
-    } catch (ex) {
-        if (ex.code == "ENOENT" && default_value != null) return default_value;
-        fatal(ex);
-    }
-}
-
-function parse_js(flag) {
-    return function(value, options) {
-        options = options || {};
-        try {
-            UglifyJS.parse(value, {
-                expression: true
-            }).walk(new UglifyJS.TreeWalker(function(node) {
-                if (node instanceof UglifyJS.AST_Assign) {
-                    var name = node.left.print_to_string();
-                    var value = node.right;
-                    if (flag) {
-                        options[name] = value;
-                    } else if (value instanceof UglifyJS.AST_Array) {
-                        options[name] = value.elements.map(to_string);
-                    } else {
-                        options[name] = to_string(value);
-                    }
-                    return true;
-                }
-                if (node instanceof UglifyJS.AST_Symbol || node instanceof UglifyJS.AST_PropAccess) {
-                    var name = node.print_to_string();
-                    options[name] = true;
-                    return true;
-                }
-                if (!(node instanceof UglifyJS.AST_Sequence)) throw node;
-
-                function to_string(value) {
-                    return value instanceof UglifyJS.AST_Constant ? value.getValue() : value.print_to_string({
-                        quote_keys: true
-                    });
-                }
-            }));
-        } catch(ex) {
-            if (flag) {
-                fatal("Error parsing arguments for '" + flag + "': " + value);
+        if (ARGS.p != null) {
+            if (P_RELATIVE) {
+                file = path.relative(path.dirname(ARGS.source_map), file).replace(/\\/g, '/');
             } else {
-                options[value] = null;
+                var p = parseInt(ARGS.p, 10);
+                if (!isNaN(p)) {
+                    file = file.replace(/^\/+/, "").split(/\/+/).slice(ARGS.p).join("/");
+                }
             }
         }
-        return options;
+        SOURCES_CONTENT[file] = code;
+        time_it("parse", function(){
+            if (ARGS.spidermonkey) {
+                var program = JSON.parse(code);
+                if (!TOPLEVEL) TOPLEVEL = program;
+                else TOPLEVEL.body = TOPLEVEL.body.concat(program.body);
+            }
+            else if (ARGS.acorn) {
+                TOPLEVEL = acorn.parse(code, {
+                    locations     : true,
+                    sourceFile    : file,
+                    program       : TOPLEVEL
+                });
+            }
+            else {
+                try {
+                    TOPLEVEL = UglifyJS.parse(code, {
+                        filename     : file,
+                        toplevel     : TOPLEVEL,
+                        expression   : ARGS.expr,
+                        bare_returns : ARGS.bare_returns,
+                    });
+                } catch(ex) {
+                    if (ex instanceof UglifyJS.JS_Parse_Error) {
+                        sys.error("Parse error at " + file + ":" + ex.line + "," + ex.col);
+                        sys.error(ex.message);
+                        sys.error(ex.stack);
+                        process.exit(1);
+                    }
+                    throw ex;
+                }
+            };
+        });
+        cb();
+    });
+}, function () {
+    if (ARGS.acorn || ARGS.spidermonkey) time_it("convert_ast", function(){
+        TOPLEVEL = UglifyJS.AST_Node.from_mozilla_ast(TOPLEVEL);
+    });
+
+    if (ARGS.wrap) {
+        TOPLEVEL = TOPLEVEL.wrap_commonjs(ARGS.wrap, ARGS.export_all);
+    }
+
+    if (ARGS.enclose) {
+        var arg_parameter_list = ARGS.enclose;
+        if (arg_parameter_list === true) {
+            arg_parameter_list = [];
+        }
+        else if (!(arg_parameter_list instanceof Array)) {
+            arg_parameter_list = [arg_parameter_list];
+        }
+        TOPLEVEL = TOPLEVEL.wrap_enclose(arg_parameter_list);
+    }
+
+    var SCOPE_IS_NEEDED = COMPRESS || MANGLE || ARGS.lint;
+
+    if (SCOPE_IS_NEEDED) {
+        time_it("scope", function(){
+            TOPLEVEL.figure_out_scope({ screw_ie8: ARGS.screw_ie8 });
+            if (ARGS.lint) {
+                TOPLEVEL.scope_warnings();
+            }
+        });
+    }
+
+    if (COMPRESS) {
+        time_it("squeeze", function(){
+            TOPLEVEL = TOPLEVEL.transform(compressor);
+        });
+    }
+
+    if (SCOPE_IS_NEEDED) {
+        time_it("scope", function(){
+            TOPLEVEL.figure_out_scope({ screw_ie8: ARGS.screw_ie8 });
+            if (MANGLE) {
+                TOPLEVEL.compute_char_frequency(MANGLE);
+            }
+        });
+    }
+
+    if (MANGLE) time_it("mangle", function(){
+        TOPLEVEL.mangle_names(MANGLE);
+    });
+
+    if (ARGS.source_map_include_sources) {
+        for (var file in SOURCES_CONTENT) {
+            if (SOURCES_CONTENT.hasOwnProperty(file)) {
+                SOURCE_MAP.get().setSourceContent(file, SOURCES_CONTENT[file]);
+            }
+        }
+    }
+
+    time_it("generate", function(){
+        TOPLEVEL.print(output);
+    });
+
+    output = output.get();
+
+    if (SOURCE_MAP) {
+        fs.writeFileSync(ARGS.source_map, SOURCE_MAP, "utf8");
+        var source_map_url = ARGS.source_map_url || (
+            P_RELATIVE
+                ? path.relative(path.dirname(OUTPUT_FILE), ARGS.source_map)
+                : ARGS.source_map
+        );
+        output += "\n//# sourceMappingURL=" + source_map_url;
+    }
+
+    if (OUTPUT_FILE) {
+        fs.writeFileSync(OUTPUT_FILE, output, "utf8");
+    } else {
+        sys.print(output);
+    }
+
+    if (ARGS.stats) {
+        sys.error(UglifyJS.string_template("Timing information (compressed {count} files):", {
+            count: files.length
+        }));
+        for (var i in STATS) if (STATS.hasOwnProperty(i)) {
+            sys.error(UglifyJS.string_template("- {name}: {time}s", {
+                name: i,
+                time: (STATS[i] / 1000).toFixed(3)
+            }));
+        }
+    }
+});
+
+/* -----[ functions ]----- */
+
+function normalize(o) {
+    for (var i in o) if (o.hasOwnProperty(i) && /-/.test(i)) {
+        o[i.replace(/-/g, "_")] = o[i];
+        delete o[i];
     }
 }
 
-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;
+function getOptions(x, constants) {
+    x = ARGS[x];
+    if (!x) return null;
+    var ret = {};
+    if (x !== true) {
+        var ast;
+        try {
+            ast = UglifyJS.parse(x, { expression: true });
+        } catch(ex) {
+            if (ex instanceof UglifyJS.JS_Parse_Error) {
+                sys.error("Error parsing arguments in: " + x);
+                process.exit(1);
+            }
+        }
+        ast.walk(new UglifyJS.TreeWalker(function(node){
+            if (node instanceof UglifyJS.AST_Seq) return; // descend
+            if (node instanceof UglifyJS.AST_Assign) {
+                var name = node.left.print_to_string({ beautify: false }).replace(/-/g, "_");
+                var value = node.right;
+                if (constants)
+                    value = new Function("return (" + value.print_to_string() + ")")();
+                ret[name] = value;
+                return true;    // no descend
+            }
+            if (node instanceof UglifyJS.AST_Symbol || node instanceof UglifyJS.AST_Binary) {
+                var name = node.print_to_string({ beautify: false }).replace(/-/g, "_");
+                ret[name] = true;
+                return true;    // no descend
+            }
+            sys.error(node.TYPE)
+            sys.error("Error parsing arguments in: " + x);
+            process.exit(1);
+        }));
+    }
     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 read_whole_file(filename, cb) {
+    if (filename == "-") {
+        var chunks = [];
+        process.stdin.setEncoding('utf-8');
+        process.stdin.on('data', function (chunk) {
+            chunks.push(chunk);
+        }).on('end', function () {
+            cb(null, chunks.join(""));
+        });
+        process.openStdin();
+    } else {
+        fs.readFile(filename, "utf-8", cb);
+    }
 }
 
-function print_error(msg) {
-    process.stderr.write(msg);
-    process.stderr.write("\n");
-}
-
-function print(txt) {
-    process.stdout.write(txt);
-    process.stdout.write("\n");
+function time_it(name, cont) {
+    var t1 = new Date().getTime();
+    var ret = cont();
+    if (ARGS.stats) {
+        var spent = new Date().getTime() - t1;
+        if (STATS[name]) STATS[name] += spent;
+        else STATS[name] = spent;
+    }
+    return ret;
 }

lib/ast.js

@@ -44,21 +44,21 @@
 "use strict";
 
 function DEFNODE(type, props, methods, base) {
-    if (typeof base === "undefined") base = AST_Node;
-    props = props ? props.split(/\s+/) : [];
+    if (arguments.length < 4) base = AST_Node;
+    if (!props) props = [];
+    else props = props.split(/\s+/);
     var self_props = props;
-    if (base && base.PROPS) props = props.concat(base.PROPS);
-    var code = [
-        "return function AST_", type, "(props){",
-        "if(props){",
-    ];
-    props.forEach(function(prop) {
-        code.push("this.", prop, "=props.", prop, ";");
-    });
+    if (base && base.PROPS)
+        props = props.concat(base.PROPS);
+    var code = "return function AST_" + type + "(props){ if (props) { ";
+    for (var i = props.length; --i >= 0;) {
+        code += "this." + props[i] + " = props." + props[i] + ";";
+    }
     var proto = base && new base;
-    if (proto && proto.initialize || methods && methods.initialize) code.push("this.initialize();");
-    code.push("}}");
-    var ctor = new Function(code.join(""))();
+    if (proto && proto.initialize || (methods && methods.initialize))
+        code += "this.initialize();";
+    code += "}}";
+    var ctor = new Function(code)();
     if (proto) {
         ctor.prototype = proto;
         ctor.BASE = base;
@@ -71,40 +71,26 @@ function DEFNODE(type, props, methods, base) {
     if (type) {
         ctor.prototype.TYPE = ctor.TYPE = type;
     }
-    if (methods) for (var name in methods) if (HOP(methods, name)) {
-        if (/^\$/.test(name)) {
-            ctor[name.substr(1)] = methods[name];
+    if (methods) for (i in methods) if (methods.hasOwnProperty(i)) {
+        if (/^\$/.test(i)) {
+            ctor[i.substr(1)] = methods[i];
         } else {
-            ctor.prototype[name] = methods[name];
+            ctor.prototype[i] = methods[i];
         }
     }
     ctor.DEFMETHOD = function(name, method) {
         this.prototype[name] = method;
     };
-    if (typeof exports !== "undefined") {
-        exports["AST_" + type] = ctor;
-    }
     return ctor;
-}
+};
 
-var AST_Token = DEFNODE("Token", "type value line col pos endline endcol endpos nlb comments_before comments_after file raw", {
+var AST_Token = DEFNODE("Token", "type value line col pos endline endcol endpos nlb comments_before file", {
 }, null);
 
 var AST_Node = DEFNODE("Node", "start end", {
-    _clone: function(deep) {
-        if (deep) {
-            var self = this.clone();
-            return self.transform(new TreeTransformer(function(node) {
-                if (node !== self) {
-                    return node.clone(true);
-                }
-            }));
-        }
+    clone: function() {
         return new this.CTOR(this);
     },
-    clone: function(deep) {
-        return this._clone(deep);
-    },
     $documentation: "Base class of all AST nodes",
     $propdoc: {
         start: "[AST_Token] The first token of this node",
@@ -118,8 +104,10 @@ var AST_Node = DEFNODE("Node", "start end", {
     }
 }, null);
 
+AST_Node.warn_function = null;
 AST_Node.warn = function(txt, props) {
-    if (AST_Node.warn_function) AST_Node.warn_function(string_template(txt, props));
+    if (AST_Node.warn_function)
+        AST_Node.warn_function(string_template(txt, props));
 };
 
 /* -----[ statements ]----- */
@@ -132,10 +120,11 @@ var AST_Debugger = DEFNODE("Debugger", null, {
     $documentation: "Represents a debugger statement",
 }, AST_Statement);
 
-var AST_Directive = DEFNODE("Directive", "value quote", {
+var AST_Directive = DEFNODE("Directive", "value scope quote", {
     $documentation: "Represents a directive, like \"use strict\";",
     $propdoc: {
         value: "[string] The value of this directive as a plain string (it's not an AST_String!)",
+        scope: "[AST_Scope/S] The scope that this directive affects",
         quote: "[string] the original quote character"
     },
 }, AST_Statement);
@@ -146,28 +135,28 @@ var AST_SimpleStatement = DEFNODE("SimpleStatement", "body", {
         body: "[AST_Node] an expression node (should not be instanceof AST_Statement)"
     },
     _walk: function(visitor) {
-        return visitor._visit(this, function() {
+        return visitor._visit(this, function(){
             this.body._walk(visitor);
         });
     }
 }, AST_Statement);
 
 function walk_body(node, visitor) {
-    var body = node.body;
-    if (body instanceof AST_Statement) {
-        body._walk(visitor);
-    } else body.forEach(function(node) {
-        node._walk(visitor);
+    if (node.body instanceof AST_Statement) {
+        node.body._walk(visitor);
+    }
+    else node.body.forEach(function(stat){
+        stat._walk(visitor);
     });
-}
+};
 
 var AST_Block = DEFNODE("Block", "body", {
-    $documentation: "A body of statements (usually braced)",
+    $documentation: "A body of statements (usually bracketed)",
     $propdoc: {
         body: "[AST_Statement*] an array of statements"
     },
     _walk: function(visitor) {
-        return visitor._visit(this, function() {
+        return visitor._visit(this, function(){
             walk_body(this, visitor);
         });
     }
@@ -178,13 +167,21 @@ var AST_BlockStatement = DEFNODE("BlockStatement", null, {
 }, AST_Block);
 
 var AST_EmptyStatement = DEFNODE("EmptyStatement", null, {
-    $documentation: "The empty statement (empty block or simply a semicolon)"
+    $documentation: "The empty statement (empty block or simply a semicolon)",
+    _walk: function(visitor) {
+        return visitor._visit(this);
+    }
 }, AST_Statement);
 
 var AST_StatementWithBody = DEFNODE("StatementWithBody", "body", {
     $documentation: "Base class for all statements that contain one nested body: `For`, `ForIn`, `Do`, `While`, `With`",
     $propdoc: {
         body: "[AST_Statement] the body; this should always be present, even if it's an AST_EmptyStatement"
+    },
+    _walk: function(visitor) {
+        return visitor._visit(this, function(){
+            this.body._walk(visitor);
+        });
     }
 }, AST_Statement);
 
@@ -194,24 +191,10 @@ var AST_LabeledStatement = DEFNODE("LabeledStatement", "label", {
         label: "[AST_Label] a label definition"
     },
     _walk: function(visitor) {
-        return visitor._visit(this, function() {
+        return visitor._visit(this, function(){
             this.label._walk(visitor);
             this.body._walk(visitor);
         });
-    },
-    clone: function(deep) {
-        var node = this._clone(deep);
-        if (deep) {
-            var label = node.label;
-            var def = this.label;
-            node.walk(new TreeWalker(function(node) {
-                if (node instanceof AST_LoopControl && node.label && node.label.thedef === def) {
-                    node.label.thedef = label;
-                    label.references.push(node);
-                }
-            }));
-        }
-        return node;
     }
 }, AST_StatementWithBody);
 
@@ -229,7 +212,7 @@ var AST_DWLoop = DEFNODE("DWLoop", "condition", {
 var AST_Do = DEFNODE("Do", null, {
     $documentation: "A `do` statement",
     _walk: function(visitor) {
-        return visitor._visit(this, function() {
+        return visitor._visit(this, function(){
             this.body._walk(visitor);
             this.condition._walk(visitor);
         });
@@ -239,7 +222,7 @@ var AST_Do = DEFNODE("Do", null, {
 var AST_While = DEFNODE("While", null, {
     $documentation: "A `while` statement",
     _walk: function(visitor) {
-        return visitor._visit(this, function() {
+        return visitor._visit(this, function(){
             this.condition._walk(visitor);
             this.body._walk(visitor);
         });
@@ -254,7 +237,7 @@ var AST_For = DEFNODE("For", "init condition step", {
         step: "[AST_Node?] the `for` update clause, or null if empty"
     },
     _walk: function(visitor) {
-        return visitor._visit(this, function() {
+        return visitor._visit(this, function(){
             if (this.init) this.init._walk(visitor);
             if (this.condition) this.condition._walk(visitor);
             if (this.step) this.step._walk(visitor);
@@ -263,14 +246,15 @@ var AST_For = DEFNODE("For", "init condition step", {
     }
 }, AST_IterationStatement);
 
-var AST_ForIn = DEFNODE("ForIn", "init object", {
+var AST_ForIn = DEFNODE("ForIn", "init name object", {
     $documentation: "A `for ... in` statement",
     $propdoc: {
         init: "[AST_Node] the `for/in` initialization code",
+        name: "[AST_SymbolRef?] the loop variable, only if `init` is AST_Var",
         object: "[AST_Node] the object that we're looping through"
     },
     _walk: function(visitor) {
-        return visitor._visit(this, function() {
+        return visitor._visit(this, function(){
             this.init._walk(visitor);
             this.object._walk(visitor);
             this.body._walk(visitor);
@@ -284,7 +268,7 @@ var AST_With = DEFNODE("With", "expression", {
         expression: "[AST_Node] the `with` expression"
     },
     _walk: function(visitor) {
-        return visitor._visit(this, function() {
+        return visitor._visit(this, function(){
             this.expression._walk(visitor);
             this.body._walk(visitor);
         });
@@ -293,9 +277,10 @@ var AST_With = DEFNODE("With", "expression", {
 
 /* -----[ scope and functions ]----- */
 
-var AST_Scope = DEFNODE("Scope", "variables functions uses_with uses_eval parent_scope enclosed cname", {
+var AST_Scope = DEFNODE("Scope", "directives variables functions uses_with uses_eval parent_scope enclosed cname", {
     $documentation: "Base class for all statements introducing a lexical scope",
     $propdoc: {
+        directives: "[string*/S] an array of directives declared in this scope",
         variables: "[Object/S] a map of name -> SymbolDef for all variables/functions defined in this scope",
         functions: "[Object/S] like `variables`, but only lists function declarations",
         uses_with: "[boolean/S] tells whether this scope uses the `with` statement",
@@ -304,16 +289,6 @@ var AST_Scope = DEFNODE("Scope", "variables functions uses_with uses_eval parent
         enclosed: "[SymbolDef*/S] a list of all symbol definitions that are accessed from this scope or any subscopes",
         cname: "[integer/S] current index for mangling variables (used internally by the mangler)",
     },
-    clone: function(deep) {
-        var node = this._clone(deep);
-        if (this.variables) node.variables = this.variables.clone();
-        if (this.functions) node.functions = this.functions.clone();
-        if (this.enclosed) node.enclosed = this.enclosed.slice();
-        return node;
-    },
-    pinned: function() {
-        return this.uses_eval || this.uses_with;
-    }
 }, AST_Block);
 
 var AST_Toplevel = DEFNODE("Toplevel", "globals", {
@@ -321,33 +296,66 @@ var AST_Toplevel = DEFNODE("Toplevel", "globals", {
     $propdoc: {
         globals: "[Object/S] a map of name -> SymbolDef for all undeclared names",
     },
-    wrap_commonjs: function(name) {
-        var body = this.body;
-        var wrapped_tl = "(function(exports){'$ORIG';})(typeof " + name + "=='undefined'?(" + name + "={}):" + name + ");";
+    wrap_enclose: function(arg_parameter_pairs) {
+        var self = this;
+        var args = [];
+        var parameters = [];
+
+        arg_parameter_pairs.forEach(function(pair) {
+            var splitAt = pair.lastIndexOf(":");
+
+            args.push(pair.substr(0, splitAt));
+            parameters.push(pair.substr(splitAt + 1));
+        });
+
+        var wrapped_tl = "(function(" + parameters.join(",") + "){ '$ORIG'; })(" + args.join(",") + ")";
         wrapped_tl = parse(wrapped_tl);
-        wrapped_tl = wrapped_tl.transform(new TreeTransformer(function(node) {
+        wrapped_tl = wrapped_tl.transform(new TreeTransformer(function before(node){
             if (node instanceof AST_Directive && node.value == "$ORIG") {
-                return MAP.splice(body);
+                return MAP.splice(self.body);
             }
         }));
         return wrapped_tl;
     },
-    wrap_enclose: function(args_values) {
-        if (typeof args_values != "string") args_values = "";
-        var index = args_values.indexOf(":");
-        if (index < 0) index = args_values.length;
-        var body = this.body;
-        return parse([
-            "(function(",
-            args_values.slice(0, index),
-            '){"$ORIG"})(',
-            args_values.slice(index + 1),
-            ")"
-        ].join("")).transform(new TreeTransformer(function(node) {
-            if (node instanceof AST_Directive && node.value == "$ORIG") {
-                return MAP.splice(body);
+    wrap_commonjs: function(name, export_all) {
+        var self = this;
+        var to_export = [];
+        if (export_all) {
+            self.figure_out_scope();
+            self.walk(new TreeWalker(function(node){
+                if (node instanceof AST_SymbolDeclaration && node.definition().global) {
+                    if (!find_if(function(n){ return n.name == node.name }, to_export))
+                        to_export.push(node);
+                }
+            }));
+        }
+        var wrapped_tl = "(function(exports, global){ global['" + name + "'] = exports; '$ORIG'; '$EXPORTS'; }({}, (function(){return this}())))";
+        wrapped_tl = parse(wrapped_tl);
+        wrapped_tl = wrapped_tl.transform(new TreeTransformer(function before(node){
+            if (node instanceof AST_SimpleStatement) {
+                node = node.body;
+                if (node instanceof AST_String) switch (node.getValue()) {
+                  case "$ORIG":
+                    return MAP.splice(self.body);
+                  case "$EXPORTS":
+                    var body = [];
+                    to_export.forEach(function(sym){
+                        body.push(new AST_SimpleStatement({
+                            body: new AST_Assign({
+                                left: new AST_Sub({
+                                    expression: new AST_SymbolRef({ name: "exports" }),
+                                    property: new AST_String({ value: sym.name }),
+                                }),
+                                operator: "=",
+                                right: new AST_SymbolRef(sym),
+                            }),
+                        }));
+                    });
+                    return MAP.splice(body);
+                }
             }
         }));
+        return wrapped_tl;
     }
 }, AST_Scope);
 
@@ -359,10 +367,10 @@ var AST_Lambda = DEFNODE("Lambda", "name argnames uses_arguments", {
         uses_arguments: "[boolean/S] tells whether this function accesses the arguments array"
     },
     _walk: function(visitor) {
-        return visitor._visit(this, function() {
+        return visitor._visit(this, function(){
             if (this.name) this.name._walk(visitor);
-            this.argnames.forEach(function(argname) {
-                argname._walk(visitor);
+            this.argnames.forEach(function(arg){
+                arg._walk(visitor);
             });
             walk_body(this, visitor);
         });
@@ -373,11 +381,11 @@ var AST_Accessor = DEFNODE("Accessor", null, {
     $documentation: "A setter/getter function.  The `name` property is always null."
 }, AST_Lambda);
 
-var AST_Function = DEFNODE("Function", "inlined", {
+var AST_Function = DEFNODE("Function", null, {
     $documentation: "A function expression"
 }, AST_Lambda);
 
-var AST_Defun = DEFNODE("Defun", "inlined", {
+var AST_Defun = DEFNODE("Defun", null, {
     $documentation: "A function definition"
 }, AST_Lambda);
 
@@ -393,7 +401,7 @@ var AST_Exit = DEFNODE("Exit", "value", {
         value: "[AST_Node?] the value returned or thrown by this statement; could be null for AST_Return"
     },
     _walk: function(visitor) {
-        return visitor._visit(this, this.value && function() {
+        return visitor._visit(this, this.value && function(){
             this.value._walk(visitor);
         });
     }
@@ -413,7 +421,7 @@ var AST_LoopControl = DEFNODE("LoopControl", "label", {
         label: "[AST_LabelRef?] the label, or null if none",
     },
     _walk: function(visitor) {
-        return visitor._visit(this, this.label && function() {
+        return visitor._visit(this, this.label && function(){
             this.label._walk(visitor);
         });
     }
@@ -436,7 +444,7 @@ var AST_If = DEFNODE("If", "condition alternative", {
         alternative: "[AST_Statement?] the `else` part, or null if not present"
     },
     _walk: function(visitor) {
-        return visitor._visit(this, function() {
+        return visitor._visit(this, function(){
             this.condition._walk(visitor);
             this.body._walk(visitor);
             if (this.alternative) this.alternative._walk(visitor);
@@ -452,7 +460,7 @@ var AST_Switch = DEFNODE("Switch", "expression", {
         expression: "[AST_Node] the `switch` “discriminant”"
     },
     _walk: function(visitor) {
-        return visitor._visit(this, function() {
+        return visitor._visit(this, function(){
             this.expression._walk(visitor);
             walk_body(this, visitor);
         });
@@ -473,7 +481,7 @@ var AST_Case = DEFNODE("Case", "expression", {
         expression: "[AST_Node] the `case` expression"
     },
     _walk: function(visitor) {
-        return visitor._visit(this, function() {
+        return visitor._visit(this, function(){
             this.expression._walk(visitor);
             walk_body(this, visitor);
         });
@@ -489,7 +497,7 @@ var AST_Try = DEFNODE("Try", "bcatch bfinally", {
         bfinally: "[AST_Finally?] the finally block, or null if not present"
     },
     _walk: function(visitor) {
-        return visitor._visit(this, function() {
+        return visitor._visit(this, function(){
             walk_body(this, visitor);
             if (this.bcatch) this.bcatch._walk(visitor);
             if (this.bfinally) this.bfinally._walk(visitor);
@@ -503,7 +511,7 @@ var AST_Catch = DEFNODE("Catch", "argname", {
         argname: "[AST_SymbolCatch] symbol for the exception"
     },
     _walk: function(visitor) {
-        return visitor._visit(this, function() {
+        return visitor._visit(this, function(){
             this.argname._walk(visitor);
             walk_body(this, visitor);
         });
@@ -514,17 +522,17 @@ var AST_Finally = DEFNODE("Finally", null, {
     $documentation: "A `finally` node; only makes sense as part of a `try` statement"
 }, AST_Block);
 
-/* -----[ VAR ]----- */
+/* -----[ VAR/CONST ]----- */
 
 var AST_Definitions = DEFNODE("Definitions", "definitions", {
-    $documentation: "Base class for `var` nodes (variable declarations/initializations)",
+    $documentation: "Base class for `var` or `const` nodes (variable declarations/initializations)",
     $propdoc: {
         definitions: "[AST_VarDef*] array of variable definitions"
     },
     _walk: function(visitor) {
-        return visitor._visit(this, function() {
-            this.definitions.forEach(function(defn) {
-                defn._walk(visitor);
+        return visitor._visit(this, function(){
+            this.definitions.forEach(function(def){
+                def._walk(visitor);
             });
         });
     }
@@ -534,14 +542,18 @@ var AST_Var = DEFNODE("Var", null, {
     $documentation: "A `var` statement"
 }, AST_Definitions);
 
+var AST_Const = DEFNODE("Const", null, {
+    $documentation: "A `const` statement"
+}, AST_Definitions);
+
 var AST_VarDef = DEFNODE("VarDef", "name value", {
     $documentation: "A variable declaration; only appears in a AST_Definitions node",
     $propdoc: {
-        name: "[AST_SymbolVar] name of the variable",
+        name: "[AST_SymbolVar|AST_SymbolConst] name of the variable",
         value: "[AST_Node?] initializer, or null of there's no initializer"
     },
     _walk: function(visitor) {
-        return visitor._visit(this, function() {
+        return visitor._visit(this, function(){
             this.name._walk(visitor);
             if (this.value) this.value._walk(visitor);
         });
@@ -557,10 +569,10 @@ var AST_Call = DEFNODE("Call", "expression args", {
         args: "[AST_Node*] array of arguments"
     },
     _walk: function(visitor) {
-        return visitor._visit(this, function() {
+        return visitor._visit(this, function(){
             this.expression._walk(visitor);
-            this.args.forEach(function(node) {
-                node._walk(visitor);
+            this.args.forEach(function(arg){
+                arg._walk(visitor);
             });
         });
     }
@@ -570,16 +582,61 @@ var AST_New = DEFNODE("New", null, {
     $documentation: "An object instantiation.  Derives from a function call since it has exactly the same properties"
 }, AST_Call);
 
-var AST_Sequence = DEFNODE("Sequence", "expressions", {
-    $documentation: "A sequence expression (comma-separated expressions)",
+var AST_Seq = DEFNODE("Seq", "car cdr", {
+    $documentation: "A sequence expression (two comma-separated expressions)",
     $propdoc: {
-        expressions: "[AST_Node*] array of expressions (at least two)"
+        car: "[AST_Node] first element in sequence",
+        cdr: "[AST_Node] second element in sequence"
+    },
+    $cons: function(x, y) {
+        var seq = new AST_Seq(x);
+        seq.car = x;
+        seq.cdr = y;
+        return seq;
+    },
+    $from_array: function(array) {
+        if (array.length == 0) return null;
+        if (array.length == 1) return array[0].clone();
+        var list = null;
+        for (var i = array.length; --i >= 0;) {
+            list = AST_Seq.cons(array[i], list);
+        }
+        var p = list;
+        while (p) {
+            if (p.cdr && !p.cdr.cdr) {
+                p.cdr = p.cdr.car;
+                break;
+            }
+            p = p.cdr;
+        }
+        return list;
+    },
+    to_array: function() {
+        var p = this, a = [];
+        while (p) {
+            a.push(p.car);
+            if (p.cdr && !(p.cdr instanceof AST_Seq)) {
+                a.push(p.cdr);
+                break;
+            }
+            p = p.cdr;
+        }
+        return a;
+    },
+    add: function(node) {
+        var p = this;
+        while (p) {
+            if (!(p.cdr instanceof AST_Seq)) {
+                var cell = AST_Seq.cons(p.cdr, node);
+                return p.cdr = cell;
+            }
+            p = p.cdr;
+        }
     },
     _walk: function(visitor) {
-        return visitor._visit(this, function() {
-            this.expressions.forEach(function(node) {
-                node._walk(visitor);
-            });
+        return visitor._visit(this, function(){
+            this.car._walk(visitor);
+            if (this.cdr) this.cdr._walk(visitor);
         });
     }
 });
@@ -595,7 +652,7 @@ var AST_PropAccess = DEFNODE("PropAccess", "expression property", {
 var AST_Dot = DEFNODE("Dot", null, {
     $documentation: "A dotted property access expression",
     _walk: function(visitor) {
-        return visitor._visit(this, function() {
+        return visitor._visit(this, function(){
             this.expression._walk(visitor);
         });
     }
@@ -604,7 +661,7 @@ var AST_Dot = DEFNODE("Dot", null, {
 var AST_Sub = DEFNODE("Sub", null, {
     $documentation: "Index-style property access, i.e. `a[\"foo\"]`",
     _walk: function(visitor) {
-        return visitor._visit(this, function() {
+        return visitor._visit(this, function(){
             this.expression._walk(visitor);
             this.property._walk(visitor);
         });
@@ -618,7 +675,7 @@ var AST_Unary = DEFNODE("Unary", "operator expression", {
         expression: "[AST_Node] expression that this unary operator applies to"
     },
     _walk: function(visitor) {
-        return visitor._visit(this, function() {
+        return visitor._visit(this, function(){
             this.expression._walk(visitor);
         });
     }
@@ -632,7 +689,7 @@ var AST_UnaryPostfix = DEFNODE("UnaryPostfix", null, {
     $documentation: "Unary postfix expression, i.e. `i++`"
 }, AST_Unary);
 
-var AST_Binary = DEFNODE("Binary", "operator left right", {
+var AST_Binary = DEFNODE("Binary", "left operator right", {
     $documentation: "Binary expression, i.e. `a + b`",
     $propdoc: {
         left: "[AST_Node] left-hand side expression",
@@ -640,7 +697,7 @@ var AST_Binary = DEFNODE("Binary", "operator left right", {
         right: "[AST_Node] right-hand side expression"
     },
     _walk: function(visitor) {
-        return visitor._visit(this, function() {
+        return visitor._visit(this, function(){
             this.left._walk(visitor);
             this.right._walk(visitor);
         });
@@ -655,7 +712,7 @@ var AST_Conditional = DEFNODE("Conditional", "condition consequent alternative",
         alternative: "[AST_Node]"
     },
     _walk: function(visitor) {
-        return visitor._visit(this, function() {
+        return visitor._visit(this, function(){
             this.condition._walk(visitor);
             this.consequent._walk(visitor);
             this.alternative._walk(visitor);
@@ -675,9 +732,9 @@ var AST_Array = DEFNODE("Array", "elements", {
         elements: "[AST_Node*] array of elements"
     },
     _walk: function(visitor) {
-        return visitor._visit(this, function() {
-            this.elements.forEach(function(element) {
-                element._walk(visitor);
+        return visitor._visit(this, function(){
+            this.elements.forEach(function(el){
+                el._walk(visitor);
             });
         });
     }
@@ -689,8 +746,8 @@ var AST_Object = DEFNODE("Object", "properties", {
         properties: "[AST_ObjectProperty*] array of properties"
     },
     _walk: function(visitor) {
-        return visitor._visit(this, function() {
-            this.properties.forEach(function(prop) {
+        return visitor._visit(this, function(){
+            this.properties.forEach(function(prop){
                 prop._walk(visitor);
             });
         });
@@ -700,11 +757,11 @@ var AST_Object = DEFNODE("Object", "properties", {
 var AST_ObjectProperty = DEFNODE("ObjectProperty", "key value", {
     $documentation: "Base class for literal object properties",
     $propdoc: {
-        key: "[string|AST_SymbolAccessor] property name. For ObjectKeyVal this is a string. For getters and setters this is an AST_SymbolAccessor.",
-        value: "[AST_Node] property value.  For getters and setters this is an AST_Accessor."
+        key: "[string] the property name converted to a string for ObjectKeyVal.  For setters and getters this is an arbitrary AST_Node.",
+        value: "[AST_Node] property value.  For setters and getters this is an AST_Function."
     },
     _walk: function(visitor) {
-        return visitor._visit(this, function() {
+        return visitor._visit(this, function(){
             this.value._walk(visitor);
         });
     }
@@ -739,13 +796,20 @@ var AST_SymbolAccessor = DEFNODE("SymbolAccessor", null, {
 }, AST_Symbol);
 
 var AST_SymbolDeclaration = DEFNODE("SymbolDeclaration", "init", {
-    $documentation: "A declaration symbol (symbol in var, function name or argument, symbol in catch)",
+    $documentation: "A declaration symbol (symbol in var/const, function name or argument, symbol in catch)",
+    $propdoc: {
+        init: "[AST_Node*/S] array of initializers for this declaration."
+    }
 }, AST_Symbol);
 
 var AST_SymbolVar = DEFNODE("SymbolVar", null, {
     $documentation: "Symbol defining a variable",
 }, AST_SymbolDeclaration);
 
+var AST_SymbolConst = DEFNODE("SymbolConst", null, {
+    $documentation: "A constant declaration"
+}, AST_SymbolDeclaration);
+
 var AST_SymbolFunarg = DEFNODE("SymbolFunarg", null, {
     $documentation: "Symbol naming a function argument",
 }, AST_SymbolVar);
@@ -800,11 +864,10 @@ var AST_String = DEFNODE("String", "value quote", {
     }
 }, AST_Constant);
 
-var AST_Number = DEFNODE("Number", "value literal", {
+var AST_Number = DEFNODE("Number", "value", {
     $documentation: "A number literal",
     $propdoc: {
-        value: "[number] the numeric value",
-        literal: "[string] numeric value as string (optional)"
+        value: "[number] the numeric value"
     }
 }, AST_Constant);
 
@@ -831,12 +894,12 @@ var AST_NaN = DEFNODE("NaN", null, {
 
 var AST_Undefined = DEFNODE("Undefined", null, {
     $documentation: "The `undefined` value",
-    value: function(){}()
+    value: (function(){}())
 }, AST_Atom);
 
 var AST_Hole = DEFNODE("Hole", null, {
     $documentation: "A hole in an array",
-    value: function(){}()
+    value: (function(){}())
 }, AST_Atom);
 
 var AST_Infinity = DEFNODE("Infinity", null, {
@@ -863,35 +926,27 @@ var AST_True = DEFNODE("True", null, {
 function TreeWalker(callback) {
     this.visit = callback;
     this.stack = [];
-    this.directives = Object.create(null);
-}
+};
 TreeWalker.prototype = {
     _visit: function(node, descend) {
-        this.push(node);
-        var ret = this.visit(node, descend ? function() {
+        this.stack.push(node);
+        var ret = this.visit(node, descend ? function(){
             descend.call(node);
         } : noop);
         if (!ret && descend) {
             descend.call(node);
         }
-        this.pop();
+        this.stack.pop();
         return ret;
     },
     parent: function(n) {
         return this.stack[this.stack.length - 2 - (n || 0)];
     },
-    push: function(node) {
-        if (node instanceof AST_Lambda) {
-            this.directives = Object.create(this.directives);
-        } else if (node instanceof AST_Directive && !this.directives[node.value]) {
-            this.directives[node.value] = node;
-        }
+    push: function (node) {
         this.stack.push(node);
     },
     pop: function() {
-        if (this.stack.pop() instanceof AST_Lambda) {
-            this.directives = Object.getPrototypeOf(this.directives);
-        }
+        return this.stack.pop();
     },
     self: function() {
         return this.stack[this.stack.length - 1];
@@ -904,48 +959,37 @@ TreeWalker.prototype = {
         }
     },
     has_directive: function(type) {
-        var dir = this.directives[type];
-        if (dir) return dir;
-        var node = this.stack[this.stack.length - 1];
-        if (node instanceof AST_Scope) {
-            for (var i = 0; i < node.body.length; ++i) {
-                var st = node.body[i];
-                if (!(st instanceof AST_Directive)) break;
-                if (st.value == type) return st;
-            }
-        }
-    },
-    loopcontrol_target: function(node) {
-        var stack = this.stack;
-        if (node.label) for (var i = stack.length; --i >= 0;) {
-            var x = stack[i];
-            if (x instanceof AST_LabeledStatement && x.label.name == node.label.name)
-                return x.body;
-        } else for (var i = stack.length; --i >= 0;) {
-            var x = stack[i];
-            if (x instanceof AST_IterationStatement
-                || node instanceof AST_Break && x instanceof AST_Switch)
-                return x;
-        }
+        return this.find_parent(AST_Scope).has_directive(type);
     },
     in_boolean_context: function() {
-        var self = this.self();
-        for (var i = 0, p; p = this.parent(i); i++) {
-            if (p instanceof AST_SimpleStatement
-                || p instanceof AST_Conditional && p.condition === self
-                || p instanceof AST_DWLoop && p.condition === self
-                || p instanceof AST_For && p.condition === self
-                || p instanceof AST_If && p.condition === self
-                || p instanceof AST_UnaryPrefix && p.operator == "!" && p.expression === self) {
+        var stack = this.stack;
+        var i = stack.length, self = stack[--i];
+        while (i > 0) {
+            var p = stack[--i];
+            if ((p instanceof AST_If           && p.condition === self) ||
+                (p instanceof AST_Conditional  && p.condition === self) ||
+                (p instanceof AST_DWLoop       && p.condition === self) ||
+                (p instanceof AST_For          && p.condition === self) ||
+                (p instanceof AST_UnaryPrefix  && p.operator == "!" && p.expression === self))
+            {
                 return true;
             }
-            if (p instanceof AST_Binary && (p.operator == "&&" || p.operator == "||")
-                || p instanceof AST_Conditional
-                || p.tail_node() === self) {
-                self = p;
-            } else {
+            if (!(p instanceof AST_Binary && (p.operator == "&&" || p.operator == "||")))
                 return false;
+            self = p;
+        }
+    },
+    loopcontrol_target: function(label) {
+        var stack = this.stack;
+        if (label) for (var i = stack.length; --i >= 0;) {
+            var x = stack[i];
+            if (x instanceof AST_LabeledStatement && x.label.name == label.name) {
+                return x.body;
             }
+        } else for (var i = stack.length; --i >= 0;) {
+            var x = stack[i];
+            if (x instanceof AST_Switch || x instanceof AST_IterationStatement)
+                return x;
         }
     }
 };

lib/minify.js

@@ -1,246 +0,0 @@
-"use strict";
-
-var to_ascii = typeof atob == "undefined" ? function(b64) {
-    return new Buffer(b64, "base64").toString();
-} : atob;
-var to_base64 = typeof btoa == "undefined" ? function(str) {
-    return new Buffer(str).toString("base64");
-} : btoa;
-
-function read_source_map(name, code) {
-    var match = /\n\/\/# sourceMappingURL=data:application\/json(;.*?)?;base64,(.*)/.exec(code);
-    if (!match) {
-        AST_Node.warn("inline source map not found: " + name);
-        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) {
-            if (options[key]) {
-                if (typeof options[key] != "object") options[key] = {};
-                if (!(name in options[key])) options[key][name] = options[name];
-            }
-        });
-    }
-}
-
-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 {
-        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 || {}),
-                eval: false,
-                ie8: false,
-                keep_fnames: false,
-                properties: false,
-                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, {
-                content: null,
-                filename: null,
-                includeSources: false,
-                root: null,
-                url: null,
-            }, true);
-        }
-        var warnings = [];
-        if (options.warnings && !AST_Node.warn_function) {
-            AST_Node.warn_function = function(warning) {
-                warnings.push(warning);
-            };
-        }
-        if (timings) timings.parse = Date.now();
-        var source_maps, 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)) {
-                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;
-                    }
-                }
-            }
-            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) {
-            toplevel.figure_out_scope(options.mangle);
-            toplevel.expand_names(options.mangle);
-        }
-        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.compute_char_frequency(options.mangle);
-            toplevel.mangle_names(options.mangle);
-        }
-        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) {
-                options.output.source_map = SourceMap({
-                    file: options.sourceMap.filename,
-                    orig: source_maps,
-                    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)) {
-                        options.output.source_map.get().setSourceContent(name, files[name]);
-                    }
-                } else {
-                    options.output.source_map.get()._sourcesContents = null;
-                }
-            }
-            delete options.output.ast;
-            delete options.output.code;
-            var stream = OutputStream(options.output);
-            toplevel.print(stream);
-            result.code = stream.get();
-            if (options.sourceMap) {
-                result.map = options.output.source_map.toString();
-                if (options.sourceMap.url == "inline") {
-                    result.code += "\n//# sourceMappingURL=data:application/json;charset=utf-8;base64," + to_base64(result.map);
-                } else if (options.sourceMap.url) {
-                    result.code += "\n//# sourceMappingURL=" + options.sourceMap.url;
-                }
-            }
-        }
-        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;
-        }
-        return result;
-    } catch (ex) {
-        return { error: ex };
-    } finally {
-        AST_Node.warn_function = warn_function;
-    }
-}

lib/mozilla-ast.js

@@ -43,54 +43,22 @@
 
 "use strict";
 
-(function() {
-    function normalize_directives(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({
-                    start: body[i].start,
-                    end: body[i].end,
-                    value: body[i].body.value
-                });
-            } else if (in_directive && !(body[i] instanceof AST_Statement && body[i].body instanceof AST_String)) {
-                in_directive = false;
-            }
-        }
-        return body;
-    }
+(function(){
 
     var MOZ_TO_ME = {
-        Program: function(M) {
-            return new AST_Toplevel({
-                start: my_start_token(M),
-                end: my_end_token(M),
-                body: normalize_directives(M.body.map(from_moz))
-            });
-        },
-        FunctionDeclaration: function(M) {
-            return new AST_Defun({
-                start: my_start_token(M),
-                end: my_end_token(M),
-                name: from_moz(M.id),
-                argnames: M.params.map(from_moz),
-                body: normalize_directives(from_moz(M.body).body)
-            });
-        },
-        FunctionExpression: function(M) {
-            return new AST_Function({
-                start: my_start_token(M),
-                end: my_end_token(M),
-                name: from_moz(M.id),
-                argnames: M.params.map(from_moz),
-                body: normalize_directives(from_moz(M.body).body)
-            });
-        },
         ExpressionStatement: function(M) {
+            var expr = M.expression;
+            if (expr.type === "Literal" && typeof expr.value === "string") {
+                return new AST_Directive({
+                    start: my_start_token(M),
+                    end: my_end_token(M),
+                    value: expr.value
+                });
+            }
             return new AST_SimpleStatement({
                 start: my_start_token(M),
                 end: my_end_token(M),
-                body: from_moz(M.expression)
+                body: from_moz(expr)
             });
         },
         TryStatement: function(M) {
@@ -108,45 +76,36 @@
         },
         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);
-        },
-        ArrayExpression: function(M) {
-            return new AST_Array({
-                start    : my_start_token(M),
-                end      : my_end_token(M),
-                elements : M.elements.map(function(elem) {
-                    return elem === null ? new AST_Hole() : from_moz(elem);
-                })
-            });
+            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);
+            }
         },
         ObjectExpression: function(M) {
             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)
                 })
             });
         },
         SequenceExpression: function(M) {
-            return new AST_Sequence({
-                start      : my_start_token(M),
-                end        : my_end_token(M),
-                expressions: M.expressions.map(from_moz)
-            });
+            return AST_Seq.from_array(M.expressions.map(from_moz));
         },
         MemberExpression: function(M) {
             return new (M.computed ? AST_Sub : AST_Dot)({
@@ -165,7 +124,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 +136,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 +145,15 @@
                 return new AST_Number(args);
               case "boolean":
                 return new (val ? AST_True : AST_False)(args);
+              default:
+                args.value = 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
@@ -227,6 +178,7 @@
         });
     };
 
+    map("Program", AST_Toplevel, "body@body");
     map("EmptyStatement", AST_EmptyStatement);
     map("BlockStatement", AST_BlockStatement, "body@body");
     map("IfStatement", AST_If, "test>condition, consequent>body, alternate>alternative");
@@ -242,10 +194,13 @@
     map("ForStatement", AST_For, "init>init, test>condition, update>step, body>body");
     map("ForInStatement", AST_ForIn, "left>init, right>object, body>body");
     map("DebuggerStatement", AST_Debugger);
+    map("FunctionDeclaration", AST_Defun, "id>name, params@argnames, body%body");
     map("VariableDeclarator", AST_VarDef, "id>name, init>value");
     map("CatchClause", AST_Catch, "param>argname, body%body");
 
     map("ThisExpression", AST_This);
+    map("ArrayExpression", AST_Array, "elements@elements");
+    map("FunctionExpression", AST_Function, "id>name, params@argnames, body%body");
     map("BinaryExpression", AST_Binary, "operator=operator, left>left, right>right");
     map("LogicalExpression", AST_Binary, "operator=operator, left>left, right>right");
     map("AssignmentExpression", AST_Assign, "operator=operator, left>left, right>right");
@@ -253,28 +208,6 @@
     map("NewExpression", AST_New, "callee>expression, arguments@args");
     map("CallExpression", AST_Call, "callee>expression, arguments@args");
 
-    def_to_moz(AST_Toplevel, function To_Moz_Program(M) {
-        return to_moz_scope("Program", M);
-    });
-
-    def_to_moz(AST_Defun, function To_Moz_FunctionDeclaration(M) {
-        return {
-            type: "FunctionDeclaration",
-            id: to_moz(M.name),
-            params: M.argnames.map(to_moz),
-            body: to_moz_scope("BlockStatement", M)
-        }
-    });
-
-    def_to_moz(AST_Function, function To_Moz_FunctionExpression(M) {
-        return {
-            type: "FunctionExpression",
-            id: to_moz(M.name),
-            params: M.argnames.map(to_moz),
-            body: to_moz_scope("BlockStatement", M)
-        }
-    });
-
     def_to_moz(AST_Directive, function To_Moz_Directive(M) {
         return {
             type: "ExpressionStatement",
@@ -322,15 +255,15 @@
     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)
         };
     });
 
-    def_to_moz(AST_Sequence, function To_Moz_SequenceExpression(M) {
+    def_to_moz(AST_Seq, function To_Moz_SequenceExpression(M) {
         return {
             type: "SequenceExpression",
-            expressions: M.expressions.map(to_moz)
+            expressions: M.to_array().map(to_moz)
         };
     });
 
@@ -362,13 +295,6 @@
         };
     });
 
-    def_to_moz(AST_Array, function To_Moz_ArrayExpression(M) {
-        return {
-            type: "ArrayExpression",
-            elements: M.elements.map(to_moz)
-        };
-    });
-
     def_to_moz(AST_Object, function To_Moz_ObjectExpression(M) {
         return {
             type: "ObjectExpression",
@@ -377,10 +303,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";
@@ -407,20 +334,6 @@
         };
     });
 
-    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;
-        return {
-            type: "Literal",
-            value: value,
-            raw: value,
-            regex: {
-                pattern: M.value.raw_source,
-                flags: flags
-            }
-        };
-    });
-
     def_to_moz(AST_Constant, function To_Moz_Literal(M) {
         var value = M.value;
         if (typeof value === 'number' && (value < 0 || (value === 0 && 1 / value < 0))) {
@@ -430,15 +343,13 @@
                 prefix: true,
                 argument: {
                     type: "Literal",
-                    value: -value,
-                    raw: M.start.raw
+                    value: -value
                 }
             };
         }
         return {
             type: "Literal",
-            value: value,
-            raw: M.start.raw
+            value: value
         };
     });
 
@@ -458,12 +369,6 @@
 
     /* -----[ tools ]----- */
 
-    function raw_token(moznode) {
-        if (moznode.type == "Literal") {
-            return moznode.raw != null ? moznode.raw : moznode.value + "";
-        }
-    }
-
     function my_start_token(moznode) {
         var loc = moznode.loc, start = loc && loc.start;
         var range = moznode.range;
@@ -474,10 +379,9 @@
             pos     : range ? range[0] : moznode.start,
             endline : start && start.line,
             endcol  : start && start.column,
-            endpos  : range ? range[0] : moznode.start,
-            raw     : raw_token(moznode),
+            endpos  : range ? range[0] : moznode.start
         });
-    }
+    };
 
     function my_end_token(moznode) {
         var loc = moznode.loc, end = loc && loc.end;
@@ -489,14 +393,13 @@
             pos     : range ? range[1] : moznode.end,
             endline : end && end.line,
             endcol  : end && end.column,
-            endpos  : range ? range[1] : moznode.end,
-            raw     : raw_token(moznode),
+            endpos  : range ? range[1] : moznode.end
         });
-    }
+    };
 
     function map(moztype, mytype, propmap) {
         var moz_to_me = "function From_Moz_" + moztype + "(M){\n";
-        moz_to_me += "return new U2." + mytype.name + "({\n" +
+        moz_to_me += "return new " + mytype.name + "({\n" +
             "start: my_start_token(M),\n" +
             "end: my_end_token(M)";
 
@@ -504,7 +407,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];
@@ -539,15 +442,15 @@
         //me_to_moz = parse(me_to_moz).print_to_string({ beautify: true });
         //console.log(moz_to_me);
 
-        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
+        moz_to_me = new Function("my_start_token", "my_end_token", "from_moz", "return(" + moz_to_me + ")")(
+            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 +459,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 +485,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

@@ -1,234 +0,0 @@
-/***********************************************************************
-
-  A JavaScript tokenizer / parser / beautifier / compressor.
-  https://github.com/mishoo/UglifyJS2
-
-  -------------------------------- (C) ---------------------------------
-
-                           Author: Mihai Bazon
-                         <mihai.bazon@gmail.com>
-                       http://mihai.bazon.net/blog
-
-  Distributed under the BSD license:
-
-    Copyright 2012 (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
-    are met:
-
-        * Redistributions of source code must retain the above
-          copyright notice, this list of conditions and the following
-          disclaimer.
-
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials
-          provided with the distribution.
-
-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER “AS IS” AND ANY
-    EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-    PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE
-    LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-    PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-    PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-    THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
-    TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-    THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-    SUCH DAMAGE.
-
- ***********************************************************************/
-
-"use strict";
-
-function find_builtins(reserved) {
-    // NaN will be included due to Number.NaN
-    [
-        "null",
-        "true",
-        "false",
-        "Infinity",
-        "-Infinity",
-        "undefined",
-    ].forEach(add);
-    [
-        Array,
-        Boolean,
-        Date,
-        Error,
-        Function,
-        Math,
-        Number,
-        Object,
-        RegExp,
-        String,
-    ].forEach(function(ctor) {
-        Object.getOwnPropertyNames(ctor).map(add);
-        if (ctor.prototype) {
-            Object.getOwnPropertyNames(ctor.prototype).map(add);
-        }
-    });
-
-    function add(name) {
-        push_uniq(reserved, name);
-    }
-}
-
-function reserve_quoted_keys(ast, reserved) {
-    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 add(name) {
-        push_uniq(reserved, name);
-    }
-}
-
-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,
-        cache: null,
-        debug: false,
-        keep_quoted: false,
-        only_cache: false,
-        regex: null,
-        reserved: null,
-    }, true);
-
-    var reserved = options.reserved;
-    if (!Array.isArray(reserved)) 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 regex = options.regex;
-
-    // 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'
-    // the same as passing an empty string.
-    var debug = options.debug !== false;
-    var debug_suffix;
-    if (debug) debug_suffix = options.debug === true ? "" : options.debug;
-
-    var names_to_mangle = [];
-    var unmangleable = [];
-
-    // step 1: find candidates to mangle
-    ast.walk(new TreeWalker(function(node) {
-        if (node instanceof AST_ObjectKeyVal) {
-            add(node.key);
-        } else if (node instanceof AST_ObjectProperty) {
-            // setter or getter, since KeyVal is handled above
-            add(node.key.name);
-        } else if (node instanceof AST_Dot) {
-            add(node.property);
-        } else if (node instanceof AST_Sub) {
-            addStrings(node.property, add);
-        } else if (node instanceof AST_Call
-            && node.expression.print_to_string() == "Object.defineProperty") {
-            addStrings(node.args[1], add);
-        }
-    }));
-
-    // step 2: transform the tree, renaming properties
-    return ast.transform(new TreeTransformer(function(node) {
-        if (node instanceof AST_ObjectKeyVal) {
-            node.key = mangle(node.key);
-        } else if (node instanceof AST_ObjectProperty) {
-            // setter or getter
-            node.key.name = mangle(node.key.name);
-        } 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_Call
-            && node.expression.print_to_string() == "Object.defineProperty") {
-            node.args[1] = mangleStrings(node.args[1]);
-        }
-    }));
-
-    // only function declarations after this line
-
-    function can_mangle(name) {
-        if (unmangleable.indexOf(name) >= 0) return false;
-        if (reserved.indexOf(name) >= 0) return false;
-        if (options.only_cache) return cache.has(name);
-        if (/^-?[0-9]+(\.[0-9]+)?(e[+-][0-9]+)?$/.test(name)) return false;
-        return true;
-    }
-
-    function should_mangle(name) {
-        if (regex && !regex.test(name)) return false;
-        if (reserved.indexOf(name) >= 0) return false;
-        return cache.has(name) || names_to_mangle.indexOf(name) >= 0;
-    }
-
-    function add(name) {
-        if (can_mangle(name)) push_uniq(names_to_mangle, name);
-        if (!should_mangle(name)) push_uniq(unmangleable, name);
-    }
-
-    function mangle(name) {
-        if (!should_mangle(name)) {
-            return name;
-        }
-        var mangled = cache.get(name);
-        if (!mangled) {
-            if (debug) {
-                // debug mode: use a prefix and suffix to preserve readability, e.g. o.foo -> o._$foo$NNN_.
-                var debug_mangled = "_$" + name + "$" + debug_suffix + "_";
-                if (can_mangle(debug_mangled)) mangled = debug_mangled;
-            }
-            // either debug mode is off, or it is on and we could not use the mangled name
-            if (!mangled) do {
-                mangled = base54(++cname);
-            } while (!can_mangle(mangled));
-            cache.set(name, mangled);
-        }
-        return mangled;
-    }
-
-    function mangleStrings(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]);
-            } else if (node instanceof AST_String) {
-                node.value = mangle(node.value);
-            } else if (node instanceof AST_Conditional) {
-                node.consequent = mangleStrings(node.consequent);
-                node.alternative = mangleStrings(node.alternative);
-            }
-            return node;
-        }));
-    }
-}

lib/scope.js

@@ -43,558 +43,534 @@
 
 "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.mangled_name = null;
     this.undeclared = false;
-    this.id = SymbolDef.next_id++;
-}
-
-SymbolDef.next_id = 1;
+    this.constant = false;
+    this.index = index;
+};
 
 SymbolDef.prototype = {
     unmangleable: function(options) {
         if (!options) options = {};
 
-        return this.global && !options.toplevel
+        return (this.global && !options.toplevel)
             || 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));
     },
     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)) {
-            var def;
-            if (def = this.redefined()) {
-                this.mangled_name = def.mangled_name || def.name;
-            } else {
-                this.mangled_name = next_mangled_name(this.scope, options, this);
-            }
-            if (this.global && cache) {
-                cache.set(this.name, this.mangled_name);
-            }
+        if (!this.mangled_name && !this.unmangleable(options)) {
+            var s = this.scope;
+            if (!options.screw_ie8 && this.orig[0] instanceof AST_SymbolLambda)
+                s = s.parent_scope;
+            this.mangled_name = s.next_mangled(options, this);
         }
-    },
-    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,
+        screw_ie8: false
     });
 
     // pass 1: setup scope chaining and handle definitions
     var self = this;
     var scope = self.parent_scope = null;
     var defun = null;
-    var tw = new TreeWalker(function(node, descend) {
-        if (node instanceof AST_Catch) {
+    var nesting = 0;
+    var tw = new TreeWalker(function(node, descend){
+        if (options.screw_ie8 && node instanceof AST_Catch) {
             var save_scope = scope;
             scope = new AST_Scope(node);
-            scope.init_scope_vars(save_scope);
+            scope.init_scope_vars(nesting);
+            scope.parent_scope = save_scope;
             descend();
             scope = save_scope;
             return true;
         }
         if (node instanceof AST_Scope) {
-            node.init_scope_vars(scope);
-            var save_scope = scope;
+            node.init_scope_vars(nesting);
+            var save_scope = node.parent_scope = scope;
             var save_defun = defun;
             defun = scope = node;
-            descend();
+            ++nesting; descend(); --nesting;
             scope = save_scope;
             defun = save_defun;
+            return true;        // don't descend again in TreeWalker
+        }
+        if (node instanceof AST_Directive) {
+            node.scope = scope;
+            push_uniq(scope.directives, node.value);
             return true;
         }
         if (node instanceof AST_With) {
-            for (var s = scope; s; s = s.parent_scope) s.uses_with = true;
+            for (var s = scope; s; s = s.parent_scope)
+                s.uses_with = true;
             return;
         }
         if (node instanceof AST_Symbol) {
             node.scope = scope;
         }
-        if (node instanceof AST_Label) {
-            node.thedef = node;
-            node.references = [];
+        if (node instanceof AST_SymbolLambda) {
+            defun.def_function(node);
         }
-        if (node instanceof AST_SymbolDefun) {
-            // This should be defined in the parent scope, as we encounter the
-            // AST_Defun node before getting to its AST_Symbol.
-            (node.scope = defun.parent_scope.resolve()).def_function(node, defun);
-        } else if (node instanceof AST_SymbolLambda) {
-            var def = defun.def_function(node, node.name == "arguments" ? undefined : defun);
-            if (options.ie8) def.defun = defun.parent_scope.resolve();
-        } else if (node instanceof AST_SymbolVar) {
-            defun.def_variable(node, node.TYPE == "SymbolVar" ? null : undefined);
-            if (defun !== scope) {
-                node.mark_enclosed(options);
-                var def = scope.find_variable(node);
-                if (node.thedef !== def) {
-                    node.thedef = def;
-                }
-                node.reference(options);
-            }
-        } else if (node instanceof AST_SymbolCatch) {
-            scope.def_variable(node).defun = defun;
+        else if (node instanceof AST_SymbolDefun) {
+            // Careful here, the scope where this should be defined is
+            // the parent scope.  The reason is that we enter a new
+            // scope when we encounter the AST_Defun node (which is
+            // instanceof AST_Scope) but we get to the symbol a bit
+            // later.
+            (node.scope = defun.parent_scope).def_function(node);
+        }
+        else if (node instanceof AST_SymbolVar
+                 || node instanceof AST_SymbolConst) {
+            var def = defun.def_variable(node);
+            def.constant = node instanceof AST_SymbolConst;
+            def.init = tw.parent().value;
+        }
+        else if (node instanceof AST_SymbolCatch) {
+            (options.screw_ie8 ? scope : defun)
+                .def_variable(node);
         }
     });
     self.walk(tw);
 
     // pass 2: find back references and eval
-    self.globals = new Dictionary();
-    var tw = new TreeWalker(function(node) {
-        if (node instanceof AST_LoopControl) {
-            if (node.label) node.label.thedef.references.push(node);
+    var func = 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_SymbolRef) {
             var name = node.name;
-            if (name == "eval" && tw.parent() instanceof AST_Call) {
-                for (var s = node.scope; s && !s.uses_eval; s = s.parent_scope) {
-                    s.uses_eval = true;
-                }
-            }
             var sym = node.scope.find_variable(name);
             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
-        if (node instanceof AST_SymbolCatch) {
-            var def = node.definition().redefined();
-            if (def) for (var s = node.scope; s; s = s.parent_scope) {
-                push_uniq(s.enclosed, def);
-                if (s === def.scope) break;
+                var g;
+                if (globals.has(name)) {
+                    g = globals.get(name);
+                } else {
+                    g = new SymbolDef(self, globals.size(), node);
+                    g.undeclared = true;
+                    g.global = true;
+                    globals.set(name, g);
+                }
+                node.thedef = g;
+                if (name == "eval" && tw.parent() instanceof AST_Call) {
+                    for (var s = node.scope; s && !s.uses_eval; s = s.parent_scope)
+                        s.uses_eval = true;
+                }
+                if (func && name == "arguments") {
+                    func.uses_arguments = true;
+                }
+            } else {
+                node.thedef = sym;
             }
+            node.reference();
             return true;
         }
     });
     self.walk(tw);
-
-    // pass 3: fix up any scoping issue with IE8
-    if (options.ie8) self.walk(new TreeWalker(function(node) {
-        if (node instanceof AST_SymbolCatch) {
-            redefine(node, node.thedef.defun);
-            return true;
-        }
-        if (node instanceof AST_SymbolLambda) {
-            var def = node.thedef;
-            if (def.orig.length == 1) {
-                redefine(node, node.scope.parent_scope);
-                node.thedef.init = def.init;
-            }
-            return true;
-        }
-    }));
-
-    function redefine(node, scope) {
-        var name = node.name;
-        var refs = node.thedef.references;
-        var def = scope.find_variable(name) || self.globals.get(name) || scope.def_variable(node);
-        refs.forEach(function(ref) {
-            ref.thedef = def;
-            ref.reference(options);
-        });
-        node.thedef = def;
-        node.reference(options);
-    }
 });
 
-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);
-        g.undeclared = true;
-        g.global = true;
-        globals.set(name, g);
-        return g;
-    }
+AST_Scope.DEFMETHOD("init_scope_vars", function(nesting){
+    this.directives = [];     // contains the directives defined in this scope, i.e. "use strict"
+    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
+    this.uses_eval = false;   // will be set to true if this or nested scope uses the global `eval`
+    this.parent_scope = null; // the parent scope
+    this.enclosed = [];       // a list of variables from this or outer scope(s) that are referenced from this or inner scopes
+    this.cname = -1;          // the current index for mangling functions/variables
+    this.nesting = nesting;   // the nesting level of this scope (0 means toplevel)
 });
 
-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
-    this.uses_eval = false;             // will be set to true if this or nested scope uses the global `eval`
-    this.parent_scope = parent_scope;   // the parent scope
-    this.enclosed = [];                 // a list of variables from this or outer scope(s) that are referenced from this or inner scopes
-    this.cname = -1;                    // the current index for mangling functions/variables
+AST_Scope.DEFMETHOD("strict", function(){
+    return this.has_directive("use strict");
 });
 
-AST_Lambda.DEFMETHOD("init_scope_vars", function() {
+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({
-        name: "arguments",
-        start: this.start,
-        end: this.end
-    }));
 });
 
-AST_Symbol.DEFMETHOD("mark_enclosed", function(options) {
+AST_SymbolRef.DEFMETHOD("reference", function() {
     var def = this.definition();
-    for (var s = this.scope; s; s = s.parent_scope) {
+    def.references.push(this);
+    var s = this.scope;
+    while (s) {
         push_uniq(s.enclosed, def);
-        if (options.keep_fnames) {
-            s.functions.each(function(d) {
-                push_uniq(def.scope.enclosed, d);
-            });
-        }
         if (s === def.scope) break;
+        s = s.parent_scope;
     }
+    this.frame = this.scope.nesting - def.scope.nesting;
 });
 
-AST_Symbol.DEFMETHOD("reference", function(options) {
-    this.definition().references.push(this);
-    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("has_directive", function(value){
+    return this.parent_scope && this.parent_scope.has_directive(value)
+        || (this.directives.indexOf(value) >= 0 ? this : null);
 });
 
-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;
-        }
-    } else {
-        def = new SymbolDef(this, symbol, init);
+AST_Scope.DEFMETHOD("def_function", function(symbol){
+    this.functions.set(symbol.name, this.def_variable(symbol));
+});
+
+AST_Scope.DEFMETHOD("def_variable", function(symbol){
+    var def;
+    if (!this.variables.has(symbol.name)) {
+        def = new SymbolDef(this, this.variables.size(), symbol);
         this.variables.set(symbol.name, def);
         def.global = !this.parent_scope;
+    } else {
+        def = this.variables.get(symbol.name);
+        def.orig.push(symbol);
     }
     return symbol.thedef = def;
 });
 
-AST_Lambda.DEFMETHOD("resolve", return_this);
-AST_Scope.DEFMETHOD("resolve", function() {
-    return this.parent_scope;
+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"
+
+        // https://github.com/mishoo/UglifyJS2/issues/242 -- do not
+        // shadow a name excepted from mangling.
+        if (options.except.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_Toplevel.DEFMETHOD("resolve", return_this);
 
-function names_in_use(scope, options) {
-    var names = scope.names_in_use;
-    if (!names) {
-        scope.names_in_use = names = Object.create(scope.mangled_names || null);
-        scope.cname_holes = [];
-        var cache = options.cache && options.cache.props;
-        scope.enclosed.forEach(function(def) {
-            if (def.unmangleable(options)) names[def.name] = true;
-            if (def.global && cache && cache.has(def.name)) {
-                names[cache.get(def.name)] = true;
-            }
-        });
-    }
-    return names;
-}
+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
 
-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);
-    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;
-    }
+    var tricky_def = def.orig[0] instanceof AST_SymbolFunarg && this.name && this.name.definition();
     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);
+        var name = AST_Lambda.prototype.next_mangled.call(this, options, def);
+        if (!(tricky_def && tricky_def.mangled_name == name))
+            return name;
     }
-    scope.names_in_use[name] = true;
-    return name;
-}
+});
 
-AST_Symbol.DEFMETHOD("unmangleable", function(options) {
-    var def = this.definition();
-    return !def || def.unmangleable(options);
+AST_Scope.DEFMETHOD("references", function(sym){
+    if (sym instanceof AST_Symbol) sym = sym.definition();
+    return this.enclosed.indexOf(sym) < 0 ? null : sym;
+});
+
+AST_Symbol.DEFMETHOD("unmangleable", function(options){
+    return this.definition().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, {
+        except      : [],
         eval        : false,
-        ie8         : false,
-        keep_fnames : false,
-        reserved    : [],
+        sort        : false,
         toplevel    : false,
+        screw_ie8   : false,
+        keep_fnames : 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);
     // 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;
-
-    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;
-        });
-    }
-
-    var redefined = [];
-    var tw = new TreeWalker(function(node, descend) {
+    var to_mangle = [];
+    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;
             descend();
             lname = save_nesting;
-            return true;
+            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.except.indexOf(symbol.name) < 0) {
+                    a.push(symbol);
+                }
+            });
+            if (options.sort) a.sort(function(a, b){
+                return b.references.length - a.references.length;
+            });
+            to_mangle.push.apply(to_mangle, a);
+            return;
         }
         if (node instanceof AST_Label) {
             var name;
-            do {
-                name = base54(++lname);
-            } while (!is_identifier(name));
+            do name = base54(++lname); while (!is_identifier(name));
             node.mangled_name = name;
             return true;
         }
-        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;
+        if (options.screw_ie8 && node instanceof AST_SymbolCatch) {
+            to_mangle.push(node.definition());
+            return;
         }
     });
     this.walk(tw);
-    redefined.forEach(mangle);
-
-    function mangle(def) {
-        if (options.reserved.has[def.name]) return;
-        def.mangle(options);
-    }
+    to_mangle.forEach(function(def){ def.mangle(options) });
 });
 
-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" + node.key);
+        else if (node instanceof AST_ObjectGetter)
+            base54.consider("get" + node.key);
+        else if (node instanceof AST_ObjectKeyVal)
+            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_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_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;
 })();
+
+AST_Toplevel.DEFMETHOD("scope_warnings", function(options){
+    options = defaults(options, {
+        undeclared       : false, // this makes a lot of noise
+        unreferenced     : true,
+        assign_to_global : true,
+        func_arguments   : true,
+        nested_defuns    : true,
+        eval             : true
+    });
+    var tw = new TreeWalker(function(node){
+        if (options.undeclared
+            && node instanceof AST_SymbolRef
+            && node.undeclared())
+        {
+            // XXX: this also warns about JS standard names,
+            // i.e. Object, Array, parseInt etc.  Should add a list of
+            // exceptions.
+            AST_Node.warn("Undeclared symbol: {name} [{file}:{line},{col}]", {
+                name: node.name,
+                file: node.start.file,
+                line: node.start.line,
+                col: node.start.col
+            });
+        }
+        if (options.assign_to_global)
+        {
+            var sym = null;
+            if (node instanceof AST_Assign && node.left instanceof AST_SymbolRef)
+                sym = node.left;
+            else if (node instanceof AST_ForIn && node.init instanceof AST_SymbolRef)
+                sym = node.init;
+            if (sym
+                && (sym.undeclared()
+                    || (sym.global() && sym.scope !== sym.definition().scope))) {
+                AST_Node.warn("{msg}: {name} [{file}:{line},{col}]", {
+                    msg: sym.undeclared() ? "Accidental global?" : "Assignment to global",
+                    name: sym.name,
+                    file: sym.start.file,
+                    line: sym.start.line,
+                    col: sym.start.col
+                });
+            }
+        }
+        if (options.eval
+            && node instanceof AST_SymbolRef
+            && node.undeclared()
+            && node.name == "eval") {
+            AST_Node.warn("Eval is used [{file}:{line},{col}]", node.start);
+        }
+        if (options.unreferenced
+            && (node instanceof AST_SymbolDeclaration || node instanceof AST_Label)
+            && !(node instanceof AST_SymbolCatch)
+            && node.unreferenced()) {
+            AST_Node.warn("{type} {name} is declared but not referenced [{file}:{line},{col}]", {
+                type: node instanceof AST_Label ? "Label" : "Symbol",
+                name: node.name,
+                file: node.start.file,
+                line: node.start.line,
+                col: node.start.col
+            });
+        }
+        if (options.func_arguments
+            && node instanceof AST_Lambda
+            && node.uses_arguments) {
+            AST_Node.warn("arguments used in function {name} [{file}:{line},{col}]", {
+                name: node.name ? node.name.name : "anonymous",
+                file: node.start.file,
+                line: node.start.line,
+                col: node.start.col
+            });
+        }
+        if (options.nested_defuns
+            && node instanceof AST_Defun
+            && !(tw.parent() instanceof AST_Scope)) {
+            AST_Node.warn("Function {name} declared in nested statement \"{type}\" [{file}:{line},{col}]", {
+                name: node.name.name,
+                type: tw.parent().TYPE,
+                file: node.start.file,
+                line: node.start.line,
+                col: node.start.col
+            });
+        }
+    });
+    this.walk(tw);
+});

lib/sourcemap.js

@@ -46,59 +46,47 @@
 // 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);
+    var orig_map = options.orig && new MOZ_SourceMap.SourceMapConsumer(options.orig);
+    var generator;
+    if (orig_map) {
+      generator = MOZ_SourceMap.SourceMapGenerator.fromSourceMap(orig_map);
+    } else {
+        generator = new MOZ_SourceMap.SourceMapGenerator({
+            file       : options.file,
+            sourceRoot : options.root
+        });
+    }
+    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
             });
+            if (info.source === null) {
+                return;
+            }
+            source = info.source;
+            orig_line = info.line;
+            orig_col = info.column;
+            name = info.name || name;
         }
-        maps[source] = map;
+        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: 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;
-            }
-            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
-                }
-            });
-        },
-        get: function() {
-            return generator;
-        },
-        toString: function() {
-            return JSON.stringify(generator.toJSON());
-        }
+        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,167 @@ 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.clone();
+                    descend(x, tw);
+                    y = tw.after(x, in_list);
+                    if (y !== undefined) x = y;
+                }
+            }
+            tw.pop();
+            return x;
+        });
+    };
+
     function do_list(list, tw) {
-        return MAP(list, function(node) {
+        return 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_Lambda, function(self, tw){
         if (self.name) self.name = self.name.transform(tw);
         self.argnames = do_list(self.argnames, tw);
         self.body = do_list(self.body, tw);
     });
-    DEF(AST_Call, function(self, tw) {
+
+    _(AST_Call, function(self, tw){
         self.expression = self.expression.transform(tw);
         self.args = do_list(self.args, tw);
     });
-    DEF(AST_Sequence, function(self, tw) {
-        self.expressions = do_list(self.expressions, tw);
+
+    _(AST_Seq, function(self, tw){
+        self.car = self.car.transform(tw);
+        self.cdr = self.cdr.transform(tw);
     });
-    DEF(AST_Dot, function(self, tw) {
+
+    _(AST_Dot, function(self, tw){
         self.expression = self.expression.transform(tw);
     });
-    DEF(AST_Sub, function(self, tw) {
+
+    _(AST_Sub, function(self, tw){
         self.expression = self.expression.transform(tw);
         self.property = self.property.transform(tw);
     });
-    DEF(AST_Unary, function(self, tw) {
+
+    _(AST_Unary, function(self, tw){
         self.expression = self.expression.transform(tw);
     });
-    DEF(AST_Binary, function(self, tw) {
+
+    _(AST_Binary, function(self, tw){
         self.left = self.left.transform(tw);
         self.right = self.right.transform(tw);
     });
-    DEF(AST_Conditional, function(self, tw) {
+
+    _(AST_Conditional, function(self, tw){
         self.condition = self.condition.transform(tw);
         self.consequent = self.consequent.transform(tw);
         self.alternative = self.alternative.transform(tw);
     });
-    DEF(AST_Array, function(self, tw) {
+
+    _(AST_Array, function(self, tw){
         self.elements = do_list(self.elements, tw);
     });
-    DEF(AST_Object, function(self, tw) {
+
+    _(AST_Object, function(self, tw){
         self.properties = do_list(self.properties, tw);
     });
-    DEF(AST_ObjectProperty, function(self, tw) {
+
+    _(AST_ObjectProperty, function(self, tw){
         self.value = self.value.transform(tw);
     });
-})(function(node, descend) {
-    node.DEFMETHOD("transform", function(tw, in_list) {
-        var x, y;
-        tw.push(this);
-        if (tw.before) x = tw.before(this, descend, in_list);
-        if (typeof x === "undefined") {
-            x = this;
-            descend(x, tw);
-            if (tw.after) {
-                y = tw.after(x, in_list);
-                if (typeof y !== "undefined") x = y;
-            }
-        }
-        tw.pop();
-        return x;
-    });
-});
+
+})();

lib/utils.js

@@ -43,77 +43,78 @@
 
 "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;
-}
+    for (var i = array.length; --i >= 0;)
+        if (array[i] == name)
+            return true;
+    return false;
+};
 
 function find_if(func, array) {
-    for (var i = array.length; --i >= 0;) if (func(array[i])) return array[i];
-}
+    for (var i = 0, n = array.length; i < n; ++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;
-}
-
-function configure_error_stack(fn) {
-    Object.defineProperty(fn.prototype, "stack", {
-        get: function() {
-            var err = new Error(this.message);
-            err.name = this.name;
-            try {
-                throw err;
-            } catch(e) {
-                return e.stack;
-            }
-        }
-    });
-}
+    if (i & 1) d += str;
+    return d;
+};
 
 function DefaultsError(msg, defs) {
-    this.message = msg;
+    Error.call(this, msg);
+    this.msg = 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);
-    }
-    for (var i in defs) if (HOP(defs, i)) {
-        ret[i] = (args && HOP(args, i)) ? args[i] : defs[i];
+    if (croak) for (var i in ret) if (ret.hasOwnProperty(i) && !defs.hasOwnProperty(i))
+        DefaultsError.croak("`" + i + "` is not a supported option", defs);
+    for (var i in defs) if (defs.hasOwnProperty(i)) {
+        ret[i] = (args && args.hasOwnProperty(i)) ? args[i] : defs[i];
     }
     return ret;
-}
+};
 
 function merge(obj, ext) {
-    var count = 0;
-    for (var i in ext) if (HOP(ext, i)) {
+    for (var i in ext) if (ext.hasOwnProperty(i)) {
         obj[i] = ext[i];
-        count++;
     }
-    return count;
-}
+    return obj;
+};
 
-function noop() {}
-function return_false() { return false; }
-function return_true() { return true; }
-function return_this() { return this; }
-function return_null() { return null; }
+function noop() {};
 
-var MAP = (function() {
+var MAP = (function(){
     function MAP(a, f, backwards) {
         var ret = [], top = [], i;
         function doit() {
@@ -136,8 +137,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();
@@ -147,55 +148,121 @@ var MAP = (function() {
             }
         }
         else {
-            for (i in a) if (HOP(a, i)) if (doit()) break;
+            for (i in a) if (a.hasOwnProperty(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) return array.push(el);
-}
+    if (array.indexOf(el) < 0)
+        array.push(el);
+};
 
 function string_template(text, props) {
-    return text.replace(/\{(.+?)\}/g, function(str, p) {
-        return props && props[p];
+    return text.replace(/\{(.+?)\}/g, function(str, p){
+        return props[p];
     });
-}
+};
 
 function remove(array, el) {
-    var index = array.indexOf(el);
-    if (index >= 0) array.splice(index, 1);
-}
+    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 compareTo(arr) {
+        if (arr.length == 1) return f += "return str === " + JSON.stringify(arr[0]) + ";";
+        f += "switch(str){";
+        for (var i = 0; i < arr.length; ++i) f += "case " + JSON.stringify(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;
@@ -231,47 +298,5 @@ Dictionary.prototype = {
         for (var i in this._values)
             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) {
-    var dict = new Dictionary();
-    dict._size = merge(dict._values, obj);
-    return dict;
-};
-
-function HOP(obj, prop) {
-    return Object.prototype.hasOwnProperty.call(obj, prop);
-}
-
-// return true if the node at the top of the stack (that means the
-// innermost node in the current output) is lexically the first in
-// 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;
-        }
-        return false;
     }
-}
+};

package.json

@@ -1,60 +1,37 @@
 {
   "name": "uglify-js",
   "description": "JavaScript parser, mangler/compressor and beautifier toolkit",
-  "author": "Mihai Bazon <mihai.bazon@gmail.com> (http://lisperator.net/)",
-  "license": "BSD-2-Clause",
-  "version": "3.5.1",
-  "engines": {
-    "node": ">=0.8.0"
-  },
-  "maintainers": [
-    "Alex Lam <alexlamsl@gmail.com>",
-    "Mihai Bazon <mihai.bazon@gmail.com> (http://lisperator.net/)"
-  ],
-  "repository": "mishoo/UglifyJS2",
-  "main": "tools/node.js",
-  "bin": {
-    "uglifyjs": "bin/uglifyjs"
-  },
-  "files": [
-    "bin",
-    "lib",
-    "tools",
-    "LICENSE"
-  ],
-  "dependencies": {
-    "commander": "~2.19.0",
-    "source-map": "~0.6.1"
-  },
-  "devDependencies": {
-    "acorn": "~6.1.1",
-    "semver": "~5.6.0"
-  },
-  "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"
-  ]
+    "homepage": "http://lisperator.net/uglifyjs",
+    "main": "tools/node.js",
+    "version": "2.4.17",
+    "engines": { "node" : ">=0.4.0" },
+    "maintainers": [{
+        "name": "Mihai Bazon",
+        "email": "mihai.bazon@gmail.com",
+        "web": "http://lisperator.net/"
+    }],
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/mishoo/UglifyJS2.git"
+    },
+    "dependencies": {
+        "async"      : "~0.2.6",
+        "source-map" : "0.1.34",
+        "yargs": "~1.3.3",
+        "uglify-to-browserify": "~1.0.0"
+    },
+    "devDependencies": {
+        "acorn": "~0.6.0",
+        "escodegen": "~1.3.3",
+        "esfuzz": "~0.3.1",
+        "estraverse": "~1.5.1"
+    },
+    "browserify": {
+        "transform": [ "uglify-to-browserify" ]
+    },
+    "bin": {
+        "uglifyjs" : "bin/uglifyjs"
+    },
+    "license": "BSD",
+    "scripts": {"test": "node test/run-tests.js"}
 }

test/benchmark.js

@@ -1,96 +0,0 @@
-#! /usr/bin/env node
-// -*- js -*-
-
-"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");
-var urls = [
-    "https://code.jquery.com/jquery-3.2.1.js",
-    "https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.6.4/angular.js",
-    "https://cdnjs.cloudflare.com/ajax/libs/mathjs/3.9.0/math.js",
-    "https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.js",
-    "https://unpkg.com/react@15.3.2/dist/react.js",
-    "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);
-            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:");
-            failures.forEach(function(url) {
-                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");
-        }
-    }
-}
-urls.forEach(function(url) {
-    results[url] = {
-        input: 0,
-        output: 0,
-        gzip: 0,
-        log: ""
-    };
-    fetch(url, function(err, res) {
-        if (err) throw err;
-        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();
-        });
-        uglifyjs.stderr.setEncoding("utf8");
-        uglifyjs.stderr.on("data", function(data) {
-            results[url].log += data;
-        });
-        uglifyjs.on("exit", function(code) {
-            results[url].code = code;
-            done();
-        });
-    });
-});

test/compress/angular-inject.js

@@ -0,0 +1,67 @@
+ng_inject_defun: {
+    options = {
+        angular: true
+    };
+    input: {
+        /*@ngInject*/
+        function Controller(dependency) {
+            return dependency;
+        }
+    }
+    expect: {
+        function Controller(dependency) {
+            return dependency;
+        }
+        Controller.$inject=['dependency']
+    }
+}
+
+ng_inject_assignment: {
+    options = {
+        angular: true
+    };
+    input: {
+        /*@ngInject*/
+        var Controller = function(dependency) {
+            return dependency;
+        }
+    }
+    expect: {
+        var Controller = function(dependency) {
+            return dependency;
+        }
+        Controller.$inject=['dependency']
+    }
+}
+
+ng_inject_inline: {
+    options = {
+        angular: true
+    };
+    input: {
+        angular.module('a').
+            factory('b',
+                /*@ngInject*/
+                function(dependency) {
+                    return dependency;
+                }).
+            directive('c',
+                /*@ngInject*/
+                function(anotherDependency) {
+                    return anotherDependency;
+                })
+    }
+    expect: {
+        angular.module('a').
+            factory('b',[
+                'dependency',
+                function(dependency) {
+                    return dependency;
+                }]).
+            directive('c',[
+                'anotherDependency',
+                function(anotherDependency) {
+                    return anotherDependency;
+                }])
+    }
+}

test/compress/arguments.js

@@ -1,578 +0,0 @@
-replace_index: {
-    options = {
-        arguments: true,
-        evaluate: true,
-        properties: true,
-    }
-    input: {
-        var arguments = [];
-        console.log(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: {
-        var arguments = [];
-        console.log(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_strict: {
-    options = {
-        arguments: true,
-        evaluate: true,
-        properties: true,
-        reduce_vars: true,
-    }
-    input: {
-        "use strict";
-        (function() {
-            console.log(arguments[1], arguments["1"], arguments["foo"]);
-        })("bar", 42);
-        (function(a, b) {
-            console.log(arguments[1], arguments["1"], arguments["foo"]);
-        })("bar", 42);
-    }
-    expect: {
-        "use strict";
-        (function() {
-            console.log(arguments[1], arguments[1], arguments.foo);
-        })("bar", 42);
-        (function(a, b) {
-            console.log(b, b, arguments.foo);
-        })("bar", 42);
-    }
-    expect_stdout: [
-        "42 42 undefined",
-        "42 42 undefined",
-    ]
-}
-
-replace_index_keep_fargs: {
-    options = {
-        arguments: true,
-        evaluate: true,
-        keep_fargs: false,
-        properties: true,
-    }
-    input: {
-        var arguments = [];
-        console.log(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: {
-        var arguments = [];
-        console.log(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",
-    ]
-}
-
-replace_index_keep_fargs_strict: {
-    options = {
-        arguments: true,
-        evaluate: true,
-        keep_fargs: false,
-        properties: true,
-        reduce_vars: true,
-    }
-    input: {
-        "use strict";
-        (function() {
-            console.log(arguments[1], arguments["1"], arguments["foo"]);
-        })("bar", 42);
-        (function(a, b) {
-            console.log(arguments[1], arguments["1"], arguments["foo"]);
-        })("bar", 42);
-    }
-    expect: {
-        "use strict";
-        (function(argument_0, argument_1) {
-            console.log(argument_1, argument_1, arguments.foo);
-        })("bar", 42);
-        (function(a, b) {
-            console.log(b, b, arguments.foo);
-        })("bar", 42);
-    }
-    expect_stdout: [
-        "42 42 undefined",
-        "42 42 undefined",
-    ]
-}
-
-modified: {
-    options = {
-        arguments: true,
-    }
-    input: {
-        (function(a, b) {
-            var c = arguments[0];
-            var d = arguments[1];
-            var a = "foo";
-            b++;
-            arguments[0] = "moo";
-            arguments[1] *= 2;
-            console.log(a, b, c, d, arguments[0], arguments[1]);
-        })("bar", 42);
-    }
-    expect: {
-        (function(a, b) {
-            var c = a;
-            var d = b;
-            var a = "foo";
-            b++;
-            a = "moo";
-            b *= 2;
-            console.log(a, b, c, d, a, b);
-        })("bar", 42);
-    }
-    expect_stdout: "moo 86 bar 42 moo 86"
-}
-
-modified_strict: {
-    options = {
-        arguments: true,
-        reduce_vars: true,
-    }
-    input: {
-        "use strict";
-        (function(a, b) {
-            var c = arguments[0];
-            var d = arguments[1];
-            var a = "foo";
-            b++;
-            arguments[0] = "moo";
-            arguments[1] *= 2;
-            console.log(a, b, c, d, arguments[0], arguments[1]);
-        })("bar", 42);
-    }
-    expect: {
-        "use strict";
-        (function(a, b) {
-            var c = arguments[0];
-            var d = arguments[1];
-            var a = "foo";
-            b++;
-            arguments[0] = "moo";
-            arguments[1] *= 2;
-            console.log(a, b, c, d, arguments[0], arguments[1]);
-        })("bar", 42);
-    }
-    expect_stdout: "foo 43 bar 42 moo 84"
-}
-
-duplicate_argname: {
-    options = {
-        arguments: true,
-    }
-    input: {
-        (function(a, b, a) {
-            console.log(a, b, arguments[0], arguments[1], arguments[2]);
-        })("foo", 42, "bar");
-    }
-    expect: {
-        (function(a, b, a) {
-            console.log(a, b, arguments[0], b, a);
-        })("foo", 42, "bar");
-    }
-    expect_stdout: "bar 42 foo 42 bar"
-}
-
-issue_3273: {
-    options = {
-        arguments: true,
-    }
-    input: {
-        function f(a) {
-            console.log(arguments[0], a);
-            arguments[0]++;
-            console.log(arguments[0], a);
-        }
-        f(0);
-    }
-    expect: {
-        function f(a) {
-            console.log(a, a);
-            a++;
-            console.log(a, a);
-        }
-        f(0);
-    }
-    expect_stdout: [
-        "0 0",
-        "1 1",
-    ]
-}
-
-issue_3273_reduce_vars: {
-    options = {
-        arguments: true,
-        reduce_vars: true,
-    }
-    input: {
-        function f(a) {
-            console.log(arguments[0], a);
-            arguments[0]++;
-            console.log(arguments[0], a);
-        }
-        f(0);
-    }
-    expect: {
-        function f(a) {
-            console.log(a, a);
-            a++;
-            console.log(a, a);
-        }
-        f(0);
-    }
-    expect_stdout: [
-        "0 0",
-        "1 1",
-    ]
-}
-
-issue_3273_local_strict: {
-    options = {
-        arguments: true,
-    }
-    input: {
-        function f(a) {
-            "use strict";
-            console.log(arguments[0], a);
-            arguments[0]++;
-            console.log(arguments[0], a);
-        }
-        f(0);
-    }
-    expect: {
-        function f(a) {
-            "use strict";
-            console.log(arguments[0], a);
-            arguments[0]++;
-            console.log(arguments[0], a);
-        }
-        f(0);
-    }
-    expect_stdout: [
-        "0 0",
-        "1 0",
-    ]
-}
-
-issue_3273_local_strict_reduce_vars: {
-    options = {
-        arguments: true,
-        reduce_vars: true,
-    }
-    input: {
-        function f(a) {
-            "use strict";
-            console.log(arguments[0], a);
-            arguments[0]++;
-            console.log(arguments[0], a);
-        }
-        f(0);
-    }
-    expect: {
-        function f(a) {
-            "use strict";
-            console.log(arguments[0], a);
-            arguments[0]++;
-            console.log(arguments[0], a);
-        }
-        f(0);
-    }
-    expect_stdout: [
-        "0 0",
-        "1 0",
-    ]
-}
-
-issue_3273_global_strict: {
-    options = {
-        arguments: true,
-    }
-    input: {
-        "use strict";
-        function f(a) {
-            console.log(arguments[0], a);
-            arguments[0]++;
-            console.log(arguments[0], a);
-        }
-        f(0);
-    }
-    expect: {
-        "use strict";
-        function f(a) {
-            console.log(arguments[0], a);
-            arguments[0]++;
-            console.log(arguments[0], a);
-        }
-        f(0);
-    }
-    expect_stdout: [
-        "0 0",
-        "1 0",
-    ]
-}
-
-issue_3273_global_strict_reduce_vars: {
-    options = {
-        arguments: true,
-        reduce_vars: true,
-    }
-    input: {
-        "use strict";
-        function f(a) {
-            console.log(arguments[0], a);
-            arguments[0]++;
-            console.log(arguments[0], a);
-        }
-        f(0);
-    }
-    expect: {
-        "use strict";
-        function f(a) {
-            console.log(arguments[0], a);
-            arguments[0]++;
-            console.log(arguments[0], a);
-        }
-        f(0);
-    }
-    expect_stdout: [
-        "0 0",
-        "1 0",
-    ]
-}
-
-issue_3282_1: {
-    options = {
-        arguments: true,
-        reduce_funcs: true,
-        reduce_vars: true,
-        keep_fargs: false,
-        unused: true,
-    }
-    input: {
-        (function(t) {
-            return function() {
-                t();
-            };
-        })(function() {
-            'use strict';
-            function e() {
-                return arguments[0];
-            }
-            e();
-            e();
-        })();
-    }
-    expect: {
-        (function() {
-            return function() {
-                (function() {
-                    "use strict";
-                    function e() {
-                        return arguments[0];
-                    }
-                    e();
-                    e();
-                })();
-            };
-        })()();
-    }
-    expect_stdout: true
-}
-
-issue_3282_1_passes: {
-    options = {
-        arguments: true,
-        passes: 2,
-        reduce_funcs: true,
-        reduce_vars: true,
-        keep_fargs: false,
-        unused: true,
-    }
-    input: {
-        (function(t) {
-            return function() {
-                t();
-            };
-        })(function() {
-            'use strict';
-            function e() {
-                return arguments[0];
-            }
-            e();
-            e();
-        })();
-    }
-    expect: {
-        (function() {
-            return function() {
-                (function() {
-                    "use strict";
-                    function e(argument_0) {
-                        return argument_0;
-                    }
-                    e();
-                    e();
-                })();
-            };
-        })()();
-    }
-    expect_stdout: true
-}
-
-issue_3282_2: {
-    options = {
-        arguments: true,
-        reduce_vars: true,
-        keep_fargs: false,
-        unused: true,
-    }
-    input: {
-        (function(f) {
-            f();
-        })(function() {
-            return (function(t) {
-                return function() {
-                    t();
-                };
-            })(function() {
-                'use strict';
-                function e() {
-                    return arguments[0];
-                }
-                e();
-                e();
-            })();
-        });
-    }
-    expect: {
-        (function() {
-            (function() {
-                return function(t) {
-                    return function() {
-                        t();
-                    };
-                }(function() {
-                    "use strict";
-                    function e() {
-                        return arguments[0];
-                    }
-                    e();
-                    e();
-                })();
-            })();
-        })();
-    }
-    expect_stdout: true
-}
-
-issue_3282_2_passes: {
-    options = {
-        arguments: true,
-        passes: 2,
-        reduce_vars: true,
-        keep_fargs: false,
-        unused: true,
-    }
-    input: {
-        (function(f) {
-            f();
-        })(function() {
-            return (function(t) {
-                return function() {
-                    t();
-                };
-            })(function() {
-                'use strict';
-                function e() {
-                    return arguments[0];
-                }
-                e();
-                e();
-            })();
-        });
-    }
-    expect: {
-        (function() {
-            (function() {
-                return function(t) {
-                    return function() {
-                        t();
-                    };
-                }(function() {
-                    "use strict";
-                    function e(argument_0) {
-                        return argument_0;
-                    }
-                    e();
-                    e();
-                })();
-            })();
-        })();
-    }
-    expect_stdout: true
-}

test/compress/arrays.js

@@ -15,25 +15,16 @@ holes_and_undefined: {
 
 constant_join: {
     options = {
-        evaluate: true,
-        unsafe: true,
-    }
+        unsafe   : true,
+        evaluate : true
+    };
     input: {
         var a = [ "foo", "bar", "baz" ].join("");
         var a1 = [ "foo", "bar", "baz" ].join();
-        var a2 = [ "foo", "bar", "baz" ].join(null);
-        var a3 = [ "foo", "bar", "baz" ].join(void 0);
-        var a4 = [ "foo", , "baz" ].join();
-        var a5 = [ "foo", null, "baz" ].join();
-        var a6 = [ "foo", void 0, "baz" ].join();
         var b = [ "foo", 1, 2, 3, "bar" ].join("");
         var c = [ boo(), "foo", 1, 2, 3, "bar", bar() ].join("");
         var c1 = [ boo(), bar(), "foo", 1, 2, 3, "bar", bar() ].join("");
         var c2 = [ 1, 2, "foo", "bar", baz() ].join("");
-        var c3 = [ boo() + bar() + "foo", 1, 2, 3, "bar", bar() + "foo" ].join("");
-        var c4 = [ 1, 2, null, undefined, "foo", "bar", baz() ].join("");
-        var c5 = [ boo() + bar() + "foo", 1, 2, 3, "bar", bar() + "foo" ].join();
-        var c6 = [ 1, 2, null, undefined, "foo", "bar", baz() ].join();
         var d = [ "foo", 1 + 2 + "bar", "baz" ].join("-");
         var e = [].join(foo + bar);
         var f = [].join("");
@@ -42,19 +33,10 @@ constant_join: {
     expect: {
         var a = "foobarbaz";
         var a1 = "foo,bar,baz";
-        var a2 = "foonullbarnullbaz";
-        var a3 = "foo,bar,baz";
-        var a4 = "foo,,baz";
-        var a5 = "foo,,baz";
-        var a6 = "foo,,baz";
         var b = "foo123bar";
         var c = boo() + "foo123bar" + bar();
         var c1 = "" + boo() + bar() + "foo123bar" + bar();
         var c2 = "12foobar" + baz();
-        var c3 = boo() + bar() + "foo123bar" + bar() + "foo";
-        var c4 = "12foobar" + baz();
-        var c5 = [ boo() + bar() + "foo", 1, 2, 3, "bar", bar() + "foo" ].join();
-        var c6 = [ "1,2,,,foo,bar", baz() ].join();
         var d = "foo-3bar-baz";
         var e = [].join(foo + bar);
         var f = "";
@@ -64,9 +46,9 @@ constant_join: {
 
 constant_join_2: {
     options = {
-        evaluate: true,
-        unsafe: true,
-    }
+        unsafe   : true,
+        evaluate : true
+    };
     input: {
         var a = [ "foo", "bar", boo(), "baz", "x", "y" ].join("");
         var b = [ "foo", "bar", boo(), "baz", "x", "y" ].join("-");
@@ -90,262 +72,3 @@ constant_join_2: {
         var f = "strstr" + variable + "foobarmoo" + foo;
     }
 }
-
-constant_join_3: {
-    options = {
-        evaluate: true,
-        unsafe: true,
-    }
-    input: {
-        var a = [ null ].join();
-        var b = [ , ].join();
-        var c = [ , 1, , 3 ].join();
-        var d = [ foo ].join();
-        var e = [ foo, null, undefined, bar ].join("-");
-        var f = [ foo, bar ].join("");
-        var g = [ null, "foo", null, bar + "baz" ].join("");
-        var h = [ null, "foo", null, bar + "baz" ].join("-");
-        var i = [ "foo" + bar, null, baz + "moo" ].join("");
-        var j = [ foo + "bar", baz ].join("");
-        var k = [ foo, "bar" + baz ].join("");
-        var l = [ foo, bar + "baz" ].join("");
-    }
-    expect: {
-        var a = "";
-        var b = "";
-        var c = ",1,,3";
-        var d = "" + foo;
-        var e = [ foo, "-", bar ].join("-");
-        var f = "" + foo + bar;
-        var g = "foo" + bar + "baz";
-        var h = [ "-foo-", bar + "baz" ].join("-");
-        var i = "foo" + bar + baz + "moo";
-        var j = foo + "bar" + baz;
-        var k = foo + "bar" + baz;
-        var l = foo + (bar + "baz");
-    }
-}
-
-for_loop: {
-    options = {
-        evaluate: true,
-        reduce_funcs: true,
-        reduce_vars: true,
-        unsafe: true,
-        unused: 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;
-        }
-        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;
-        }
-        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: {
-        function f0() {
-            var a = [1, 2, 3];
-            var b = 0;
-            for (var i = 0; i < 3; i++)
-                b += a[i];
-            return b;
-        }
-        function f1() {
-            var a = [1, 2, 3];
-            var b = 0;
-            for (var i = 0; i < 3; i++)
-                b += a[i];
-            return b;
-        }
-        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"
-}
-
-constructor_bad: {
-    options = {
-        unsafe: true
-    }
-    input: {
-        try {
-            Array(NaN);
-            console.log("FAIL1");
-        } catch (ex) {
-            try {
-                new Array(NaN);
-                console.log("FAIL2");
-            } catch (ex) {
-                console.log("PASS");
-            }
-        }
-        try {
-            Array(3.14);
-            console.log("FAIL1");
-        } catch (ex) {
-            try {
-                new Array(3.14);
-                console.log("FAIL2");
-            } catch (ex) {
-                console.log("PASS");
-            }
-        }
-    }
-    expect: {
-        try {
-            Array(NaN);
-            console.log("FAIL1");
-        } catch (ex) {
-            try {
-                Array(NaN);
-                console.log("FAIL2");
-            } catch (ex) {
-                console.log("PASS");
-            }
-        }
-        try {
-            Array(3.14);
-            console.log("FAIL1");
-        } catch (ex) {
-            try {
-                Array(3.14);
-                console.log("FAIL2");
-            } catch (ex) {
-                console.log("PASS");
-            }
-        }
-    }
-    expect_stdout: [
-        "PASS",
-        "PASS",
-    ]
-    expect_warnings: [
-        "WARN: Invalid array length: 3.14 [test/compress/arrays.js:13,12]",
-        "WARN: Invalid array length: 3.14 [test/compress/arrays.js:17,16]",
-    ]
-}
-
-constructor_good: {
-    options = {
-        unsafe: true
-    }
-    input: {
-        console.log(Array());
-        console.log(Array(0));
-        console.log(Array(1));
-        console.log(Array(6));
-        console.log(Array(7));
-        console.log(Array(1, 2));
-        console.log(Array(false));
-        console.log(Array("foo"));
-        console.log(Array(Array));
-        console.log(new Array());
-        console.log(new Array(0));
-        console.log(new Array(1));
-        console.log(new Array(6));
-        console.log(new Array(7));
-        console.log(new Array(1, 2));
-        console.log(new Array(false));
-        console.log(new Array("foo"));
-        console.log(new Array(Array));
-    }
-    expect: {
-        console.log([]);
-        console.log([]);
-        console.log([,]);
-        console.log([,,,,,,]);
-        console.log(Array(7));
-        console.log([ 1, 2 ]);
-        console.log([ false ]);
-        console.log([ "foo" ]);
-        console.log(Array(Array));
-        console.log([]);
-        console.log([]);
-        console.log([,]);
-        console.log([,,,,,,]);
-        console.log(Array(7));
-        console.log([ 1, 2 ]);
-        console.log([ false ]);
-        console.log([ "foo" ]);
-        console.log(Array(Array));
-    }
-    expect_stdout: true
-    expect_warnings: []
-}

test/compress/ascii.js

@@ -1,35 +0,0 @@
-ascii_only_true: {
-    options = {}
-    beautify = {
-        ascii_only : true,
-        ie8        : false,
-        beautify   : false,
-    }
-    input: {
-        function f() {
-            return "\x000\x001\x007\x008\x00" +
-                   "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f" +
-                   "\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f" +
-                   "\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\'}'
-}
-
-ascii_only_false: {
-    options = {}
-    beautify = {
-        ascii_only : false,
-        ie8        : false,
-        beautify   : false,
-    }
-    input: {
-        function f() {
-            return "\x000\x001\x007\x008\x00" +
-                   "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f" +
-                   "\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f" +
-                   "\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\'}'
-}

test/compress/asm.js

@@ -1,168 +0,0 @@
-asm_mixed: {
-    options = {
-        assignments: true,
-        booleans: true,
-        comparisons: true,
-        conditionals: true,
-        dead_code: true,
-        drop_debugger: true,
-        evaluate: true,
-        hoist_funs: true,
-        hoist_vars: true,
-        if_return: true,
-        join_vars: true,
-        keep_fargs: true,
-        keep_fnames: false,
-        loops: true,
-        negate_iife: true,
-        properties: true,
-        sequences: true,
-        side_effects: true,
-        unused: true,
-    }
-    input: {
-        // adapted from http://asmjs.org/spec/latest/
-        function asm_GeometricMean(stdlib, foreign, buffer) {
-          "use asm";
-          var exp = stdlib.Math.exp;
-          var log = stdlib.Math.log;
-          var values = new stdlib.Float64Array(buffer);
-          function logSum(start, end) {
-            start = start|0;
-            end = end|0;
-            var sum = 0.0, p = 0, q = 0;
-            // asm.js forces byte addressing of the heap by requiring shifting by 3
-            for (p = start << 3, q = end << 3; (p|0) < (q|0); p = (p + 8)|0) {
-              sum = sum + +log(values[p>>3]);
-            }
-            return +sum;
-          }
-          function geometricMean(start, end) {
-            start = start|0;
-            end = end|0;
-            return +exp(+logSum(start, end) / +((end - start)|0));
-          }
-          return { geometricMean: geometricMean };
-        }
-        function no_asm_GeometricMean(stdlib, foreign, buffer) {
-          var exp = stdlib.Math.exp;
-          var log = stdlib.Math.log;
-          var values = new stdlib.Float64Array(buffer);
-          function logSum(start, end) {
-            start = start|0;
-            end = end|0;
-            var sum = 0.0, p = 0, q = 0;
-            // asm.js forces byte addressing of the heap by requiring shifting by 3
-            for (p = start << 3, q = end << 3; (p|0) < (q|0); p = (p + 8)|0) {
-              sum = sum + +log(values[p>>3]);
-            }
-            return +sum;
-          }
-          function geometricMean(start, end) {
-            start = start|0;
-            end = end|0;
-            return +exp(+logSum(start, end) / +((end - start)|0));
-          }
-          return { geometricMean: geometricMean };
-        }
-    }
-    expect: {
-        function asm_GeometricMean(stdlib, foreign, buffer) {
-            "use asm";
-            var exp = stdlib.Math.exp;
-            var log = stdlib.Math.log;
-            var values = new stdlib.Float64Array(buffer);
-            function logSum(start, end) {
-                start = start | 0;
-                end = end | 0;
-                var sum = 0.0, p = 0, q = 0;
-                for (p = start << 3, q = end << 3; (p | 0) < (q | 0); p = p + 8 | 0) {
-                    sum = sum + +log(values[p >> 3]);
-                }
-                return +sum;
-            }
-            function geometricMean(start, end) {
-                start = start | 0;
-                end = end | 0;
-                return +exp(+logSum(start, end) / +(end - start | 0));
-            }
-            return { geometricMean: geometricMean };
-        }
-        function no_asm_GeometricMean(stdlib, foreign, buffer) {
-            function logSum(start, end) {
-                start |= 0, end |= 0;
-                var sum = 0, p = 0, q = 0;
-                for (p = start << 3, q = end << 3; (0 | p) < (0 | q); p = p + 8 | 0) sum += +log(values[p >> 3]);
-                return +sum;
-            }
-            function geometricMean(start, end) {
-                return start |= 0, end |= 0, +exp(+logSum(start, end) / +(end - start | 0));
-            }
-            var exp = stdlib.Math.exp, log = stdlib.Math.log, values = new stdlib.Float64Array(buffer);
-            return { geometricMean: geometricMean };
-        }
-    }
-}
-
-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/assignment.js

@@ -1,291 +0,0 @@
-op_equals_left_local_var: {
-    options = {
-        assignments: true,
-        evaluate: true,
-    }
-    input: {
-        var x;
-
-        x = x +   3;
-        x = x -   3;
-        x = x /   3;
-        x = x *   3;
-        x = x >>  3;
-        x = x <<  3;
-        x = x >>> 3;
-        x = x |   3;
-        x = x ^   3;
-        x = x %   3;
-        x = x &   3;
-
-        x = x +   g();
-        x = x -   g();
-        x = x /   g();
-        x = x *   g();
-        x = x >>  g();
-        x = x <<  g();
-        x = x >>> g();
-        x = x |   g();
-        x = x ^   g();
-        x = x %   g();
-        x = x &   g();
-    }
-    expect: {
-        var x;
-
-        x   += 3;
-        x   -= 3;
-        x   /= 3;
-        x   *= 3;
-        x  >>= 3;
-        x  <<= 3;
-        x >>>= 3;
-        x   |= 3;
-        x   ^= 3;
-        x   %= 3;
-        x   &= 3;
-
-        x   += g();
-        x   -= g();
-        x   /= g();
-        x   *= g();
-        x  >>= g();
-        x  <<= g();
-        x >>>= g();
-        x   |= g();
-        x   ^= g();
-        x   %= g();
-        x   &= g();
-    }
-}
-
-op_equals_right_local_var: {
-    options = {
-        assignments: true,
-        evaluate: true,
-    }
-    input: {
-        var x;
-
-        x = (x -= 2) ^ x;
-
-        x = 3 +   x;
-        x = 3 -   x;
-        x = 3 /   x;
-        x = 3 *   x;
-        x = 3 >>  x;
-        x = 3 <<  x;
-        x = 3 >>> x;
-        x = 3 |   x;
-        x = 3 ^   x;
-        x = 3 %   x;
-        x = 3 &   x;
-
-        x = g() +   x;
-        x = g() -   x;
-        x = g() /   x;
-        x = g() *   x;
-        x = g() >>  x;
-        x = g() <<  x;
-        x = g() >>> x;
-        x = g() |   x;
-        x = g() ^   x;
-        x = g() %   x;
-        x = g() &   x;
-    }
-    expect: {
-        var x;
-
-        x = (x -= 2) ^ x;
-
-        x = 3 + x;
-        x = 3 - x;
-        x = 3 / x;
-        x *= 3;
-        x = 3 >> x;
-        x = 3 << x;
-        x = 3 >>> x;
-        x |= 3;
-        x ^= 3;
-        x = 3 % x;
-        x &= 3;
-
-        x = g() +   x;
-        x = g() -   x;
-        x = g() /   x;
-        x = g() *   x;
-        x = g() >>  x;
-        x = g() <<  x;
-        x = g() >>> x;
-        x = g() |   x;
-        x = g() ^   x;
-        x = g() %   x;
-        x = g() &   x;
-    }
-}
-op_equals_left_global_var: {
-    options = {
-        assignments: true,
-        evaluate: true,
-    }
-    input: {
-        x = x +   3;
-        x = x -   3;
-        x = x /   3;
-        x = x *   3;
-        x = x >>  3;
-        x = x <<  3;
-        x = x >>> 3;
-        x = x |   3;
-        x = x ^   3;
-        x = x %   3;
-        x = x &   3;
-
-        x = x +   g();
-        x = x -   g();
-        x = x /   g();
-        x = x *   g();
-        x = x >>  g();
-        x = x <<  g();
-        x = x >>> g();
-        x = x |   g();
-        x = x ^   g();
-        x = x %   g();
-        x = x &   g();
-    }
-    expect: {
-        x   += 3;
-        x   -= 3;
-        x   /= 3;
-        x   *= 3;
-        x  >>= 3;
-        x  <<= 3;
-        x >>>= 3;
-        x   |= 3;
-        x   ^= 3;
-        x   %= 3;
-        x   &= 3;
-
-        x   += g();
-        x   -= g();
-        x   /= g();
-        x   *= g();
-        x  >>= g();
-        x  <<= g();
-        x >>>= g();
-        x   |= g();
-        x   ^= g();
-        x   %= g();
-        x   &= g();
-    }
-}
-
-op_equals_right_global_var: {
-    options = {
-        assignments: true,
-        evaluate: true,
-    }
-    input: {
-        x = (x -= 2) ^ x;
-
-        x = 3 +   x;
-        x = 3 -   x;
-        x = 3 /   x;
-        x = 3 *   x;
-        x = 3 >>  x;
-        x = 3 <<  x;
-        x = 3 >>> x;
-        x = 3 |   x;
-        x = 3 ^   x;
-        x = 3 %   x;
-        x = 3 &   x;
-
-        x = g() +   x;
-        x = g() -   x;
-        x = g() /   x;
-        x = g() *   x;
-        x = g() >>  x;
-        x = g() <<  x;
-        x = g() >>> x;
-        x = g() |   x;
-        x = g() ^   x;
-        x = g() %   x;
-        x = g() &   x;
-    }
-    expect: {
-        x = (x -= 2) ^ x;
-
-        x = 3 +   x;
-        x = 3 -   x;
-        x = 3 /   x;
-        x *= 3;
-        x = 3 >>  x;
-        x = 3 <<  x;
-        x = 3 >>> x;
-        x |= 3;
-        x ^= 3;
-        x = 3 %   x;
-        x &= 3;
-
-        x = g() +   x;
-        x = g() -   x;
-        x = g() /   x;
-        x = g() *   x;
-        x = g() >>  x;
-        x = g() <<  x;
-        x = g() >>> x;
-        x = g() |   x;
-        x = g() ^   x;
-        x = g() %   x;
-        x = g() &   x;
-    }
-}
-
-increment_decrement_1: {
-    options = {
-        assignments: true,
-        reduce_vars: true,
-    }
-    input: {
-        console.log(function(a) {
-            a += 1;
-            a -= 1;
-            return a;
-        }(42));
-    }
-    expect: {
-        console.log(function(a){
-            ++a;
-            --a;
-            return a;
-        }(42));
-    }
-    expect_stdout: "42"
-}
-
-increment_decrement_2: {
-    options = {
-        assignments: true,
-        passes: 2,
-        reduce_vars: true,
-    }
-    input: {
-        console.log(function(a) {
-            a = a + 1;
-            a = a - 1;
-            a += 1;
-            a -= 1;
-            return a;
-        }(42));
-    }
-    expect: {
-        console.log(function(a){
-            ++a;
-            --a;
-            ++a;
-            --a;
-            return a;
-        }(42));
-    }
-    expect_stdout: "42"
-}

test/compress/comparisons.js

@@ -1,347 +0,0 @@
-comparisons: {
-    options = {
-        comparisons: true,
-    }
-    input: {
-        var obj1, obj2;
-        var result1 = obj1 <= obj2;
-        var result2 = obj1 <  obj2;
-        var result3 = obj1 >= obj2;
-        var result4 = obj1 >  obj2;
-    }
-    expect: {
-        var obj1, obj2;
-        var result1 = obj1 <= obj2;
-        var result2 = obj1 <  obj2;
-        var result3 = obj2 <= obj1;
-        var result4 = obj2 <  obj1;
-    }
-}
-
-unsafe_comps: {
-    options = {
-        comparisons: true,
-        conditionals: true,
-        unsafe_comps: true,
-    }
-    input: {
-        var obj1, obj2;
-        obj1 <= obj2 ? f1() : g1();
-        obj1 <  obj2 ? f2() : g2();
-        obj1 >= obj2 ? f3() : g3();
-        obj1 >  obj2 ? f4() : g4();
-    }
-    expect: {
-        var obj1, obj2;
-        obj2 <  obj1 ? g1() : f1();
-        obj1 <  obj2 ? f2() : g2();
-        obj1 <  obj2 ? g3() : f3();
-        obj2 <  obj1 ? f4() : g4();
-    }
-}
-
-dont_change_in_or_instanceof_expressions: {
-    input: {
-        1 in 1;
-        null in null;
-        1 instanceof 1;
-        null instanceof null;
-    }
-    expect: {
-        1 in 1;
-        null in null;
-        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"
-}
-
-is_boolean_unsafe: {
-    options = {
-        comparisons: true,
-        unsafe: true,
-    }
-    input: {
-        console.log(/foo/.test("bar") === [].isPrototypeOf({}));
-    }
-    expect: {
-        console.log(/foo/.test("bar") == [].isPrototypeOf({}));
-    }
-    expect_stdout: "true"
-}
-
-is_number_unsafe: {
-    options = {
-        comparisons: true,
-        unsafe: true,
-    }
-    input: {
-        console.log(Math.acos(42) !== "foo".charCodeAt(4));
-    }
-    expect: {
-        console.log(Math.acos(42) != "foo".charCodeAt(4));
-    }
-    expect_stdout: "true"
-}
-
-is_boolean_var: {
-    options = {
-        comparisons: true,
-        reduce_vars: true,
-    }
-    input: {
-        console.log(function(a, b) {
-            for (var i = 0, c = !b; i < a.length; i++)
-                if (!a[i] === c)
-                    return i;
-        }([ false, true ], 42));
-    }
-    expect: {
-        console.log(function(a, b) {
-            for (var i = 0, c = !b; i < a.length; i++)
-                if (!a[i] == c)
-                    return i;
-        }([ false, true ], 42));
-    }
-    expect_stdout: "1"
-}

test/compress/concat-strings.js

@@ -1,7 +1,7 @@
 concat_1: {
     options = {
-        evaluate: true,
-    }
+        evaluate: true
+    };
     input: {
         var a = "foo" + "bar" + x() + "moo" + "foo" + y() + "x" + "y" + "z" + q();
         var b = "foo" + 1 + x() + 2 + "boo";
@@ -11,9 +11,6 @@ concat_1: {
         var d = 1 + x() + 2 + 3 + "boo";
 
         var e = 1 + x() + 2 + "X" + 3 + "boo";
-
-        // be careful with concatentation with "\0" with octal-looking strings.
-        var f = "\0" + 360 + "\0" + 8 + "\0";
     }
     expect: {
         var a = "foobar" + x() + "moofoo" + y() + "xyz" + q();
@@ -21,203 +18,5 @@ 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";
     }
 }
-
-concat_2: {
-    options = {}
-    input: {
-        console.log(
-            1 + (2 + 3),
-            1 + (2 + "3"),
-            1 + ("2" + 3),
-            1 + ("2" + "3"),
-            "1" + (2 + 3),
-            "1" + (2 + "3"),
-            "1" + ("2" + 3),
-            "1" + ("2" + "3")
-        );
-    }
-    expect: {
-        console.log(
-            1 + (2 + 3),
-            1 + (2 + "3"),
-            1 + "2" + 3,
-            1 + "2" + "3",
-            "1" + (2 + 3),
-            "1" + 2 + "3",
-            "1" + "2" + 3,
-            "1" + "2" + "3"
-        );
-    }
-    expect_stdout: true
-}
-
-concat_3: {
-    options = {}
-    input: {
-        console.log(
-            1 + 2 + (3 + 4 + 5),
-            1 + 2 + (3 + 4 + "5"),
-            1 + 2 + (3 + "4" + 5),
-            1 + 2 + (3 + "4" + "5"),
-            1 + 2 + ("3" + 4 + 5),
-            1 + 2 + ("3" + 4 + "5"),
-            1 + 2 + ("3" + "4" + 5),
-            1 + 2 + ("3" + "4" + "5")
-        );
-    }
-    expect: {
-        console.log(
-            1 + 2 + (3 + 4 + 5),
-            1 + 2 + (3 + 4 + "5"),
-            1 + 2 + (3 + "4") + 5,
-            1 + 2 + (3 + "4") + "5",
-            1 + 2 + "3" + 4 + 5,
-            1 + 2 + "3" + 4 + "5",
-            1 + 2 + "3" + "4" + 5,
-            1 + 2 + "3" + "4" + "5"
-        );
-    }
-    expect_stdout: true
-}
-
-concat_4: {
-    options = {}
-    input: {
-        console.log(
-            1 + "2" + (3 + 4 + 5),
-            1 + "2" + (3 + 4 + "5"),
-            1 + "2" + (3 + "4" + 5),
-            1 + "2" + (3 + "4" + "5"),
-            1 + "2" + ("3" + 4 + 5),
-            1 + "2" + ("3" + 4 + "5"),
-            1 + "2" + ("3" + "4" + 5),
-            1 + "2" + ("3" + "4" + "5")
-        );
-    }
-    expect: {
-        console.log(
-            1 + "2" + (3 + 4 + 5),
-            1 + "2" + (3 + 4) + "5",
-            1 + "2" + 3 + "4" + 5,
-            1 + "2" + 3 + "4" + "5",
-            1 + "2" + "3" + 4 + 5,
-            1 + "2" + "3" + 4 + "5",
-            1 + "2" + "3" + "4" + 5,
-            1 + "2" + "3" + "4" + "5"
-        );
-    }
-    expect_stdout: true
-}
-
-concat_5: {
-    options = {}
-    input: {
-        console.log(
-            "1" + 2 + (3 + 4 + 5),
-            "1" + 2 + (3 + 4 + "5"),
-            "1" + 2 + (3 + "4" + 5),
-            "1" + 2 + (3 + "4" + "5"),
-            "1" + 2 + ("3" + 4 + 5),
-            "1" + 2 + ("3" + 4 + "5"),
-            "1" + 2 + ("3" + "4" + 5),
-            "1" + 2 + ("3" + "4" + "5")
-        );
-    }
-    expect: {
-        console.log(
-            "1" + 2 + (3 + 4 + 5),
-            "1" + 2 + (3 + 4) + "5",
-            "1" + 2 + 3 + "4" + 5,
-            "1" + 2 + 3 + "4" + "5",
-            "1" + 2 + "3" + 4 + 5,
-            "1" + 2 + "3" + 4 + "5",
-            "1" + 2 + "3" + "4" + 5,
-            "1" + 2 + "3" + "4" + "5"
-        );
-    }
-    expect_stdout: true
-}
-
-concat_6: {
-    options = {}
-    input: {
-        console.log(
-            "1" + "2" + (3 + 4 + 5),
-            "1" + "2" + (3 + 4 + "5"),
-            "1" + "2" + (3 + "4" + 5),
-            "1" + "2" + (3 + "4" + "5"),
-            "1" + "2" + ("3" + 4 + 5),
-            "1" + "2" + ("3" + 4 + "5"),
-            "1" + "2" + ("3" + "4" + 5),
-            "1" + "2" + ("3" + "4" + "5")
-        );
-    }
-    expect: {
-        console.log(
-            "1" + "2" + (3 + 4 + 5),
-            "1" + "2" + (3 + 4) + "5",
-            "1" + "2" + 3 + "4" + 5,
-            "1" + "2" + 3 + "4" + "5",
-            "1" + "2" + "3" + 4 + 5,
-            "1" + "2" + "3" + 4 + "5",
-            "1" + "2" + "3" + "4" + 5,
-            "1" + "2" + "3" + "4" + "5"
-        );
-    }
-    expect_stdout: true
-}
-
-concat_7: {
-    input: {
-        console.log(
-            "" + 1,
-            "" + "1",
-            "" + 1 + 2,
-            "" + 1 + "2",
-            "" + "1" + 2,
-            "" + "1" + "2",
-            "" + (x += "foo")
-        );
-    }
-    expect: {
-        console.log(
-            "" + 1,
-            "1",
-            "" + 1 + 2,
-            1 + "2",
-            "1" + 2,
-            "1" + "2",
-            x += "foo"
-        );
-    }
-    expect_stdout: true
-}
-
-concat_8: {
-    input: {
-        console.log(
-            1 + "",
-            "1" + "",
-            1 + 2 + "",
-            1 + "2" + "",
-            "1" + 2 + "",
-            "1" + "2" + "",
-            (x += "foo") + ""
-        );
-    }
-    expect: {
-        console.log(
-            1 + "",
-            "1",
-            1 + 2 + "",
-            1 + "2",
-            "1" + 2,
-            "1" + "2",
-            x += "foo"
-        );
-    }
-    expect_stdout: true
-}

test/compress/debugger.js

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

test/compress/drop-console.js

@@ -1,26 +1,24 @@
-drop_console_1: {
-    options = {}
-    input: {
-        console.log('foo');
-        console.log.apply(console, arguments);
-    }
-    expect: {
-        console.log('foo');
-        console.log.apply(console, arguments);
-    }
-}
-
-drop_console_2: {
-    options = {
-        drop_console: true,
-    }
-    input: {
-        console.log('foo');
-        console.log.apply(console, arguments);
-    }
-    expect: {
-        // with regular compression these will be stripped out as well
-        void 0;
-        void 0;
-    }
-}
+drop_console_1: {
+    options = {};
+    input: {
+        console.log('foo');
+        console.log.apply(console, arguments);
+    }
+    expect: {
+        console.log('foo');
+        console.log.apply(console, arguments);
+    }
+}
+
+drop_console_1: {
+    options = { drop_console: true };
+    input: {
+        console.log('foo');
+        console.log.apply(console, arguments);
+    }
+    expect: {
+        // with regular compression these will be stripped out as well
+        void 0;
+        void 0;
+    }
+}

test/compress/global_defs.js

@@ -1,218 +0,0 @@
-must_replace: {
-    options = {
-        global_defs: {
-            D: "foo bar",
-        },
-    }
-    input: {
-        console.log(D);
-    }
-    expect: {
-        console.log("foo bar");
-    }
-}
-
-keyword: {
-    options = {
-        global_defs: {
-            undefined: 0,
-            NaN: 1,
-            Infinity: 2,
-        },
-    }
-    input: {
-        console.log(undefined, NaN, Infinity);
-    }
-    expect: {
-        console.log(0, 1, 2);
-    }
-}
-
-object: {
-    options = {
-        evaluate: true,
-        global_defs: {
-            CONFIG: {
-                DEBUG: [ 0 ],
-                VALUE: 42,
-            },
-        },
-        side_effects: true,
-        unsafe: true,
-    }
-    input: {
-        function f(CONFIG) {
-            // CONFIG not global - do not replace
-            return CONFIG.VALUE;
-        }
-        function g() {
-            var CONFIG = { VALUE: 1 };
-            // CONFIG not global - do not replace
-            return CONFIG.VALUE;
-        }
-        function h() {
-            return CONFIG.VALUE;
-        }
-        if (CONFIG.DEBUG[0])
-            console.debug("foo");
-    }
-    expect: {
-        function f(CONFIG) {
-            return CONFIG.VALUE;
-        }
-        function g() {
-            var CONFIG = { VALUE: 1 };
-            return CONFIG.VALUE;
-        }
-        function h() {
-            return 42;
-        }
-        if (0)
-            console.debug("foo");
-    }
-}
-
-expanded: {
-    options = {
-        global_defs: {
-            "CONFIG.DEBUG": [ 0 ],
-            "CONFIG.VALUE": 42,
-        },
-    }
-    input: {
-        function f(CONFIG) {
-            // CONFIG not global - do not replace
-            return CONFIG.VALUE;
-        }
-        function g() {
-            var CONFIG = { VALUE: 1 };
-            // CONFIG not global - do not replace
-            return CONFIG.VALUE;
-        }
-        function h() {
-            return CONFIG.VALUE;
-        }
-        if (CONFIG.DEBUG[0])
-            console.debug("foo");
-    }
-    expect: {
-        function f(CONFIG) {
-            return CONFIG.VALUE;
-        }
-        function g() {
-            var CONFIG = { VALUE: 1 };
-            return CONFIG.VALUE;
-        }
-        function h() {
-            return 42;
-        }
-        if ([0][0])
-            console.debug("foo");
-    }
-}
-
-mixed: {
-    options = {
-        evaluate: true,
-        global_defs: {
-            "CONFIG.VALUE": 42,
-            "FOO.BAR": "moo",
-        },
-        properties: true,
-    }
-    input: {
-        var FOO = { BAR: 0 };
-        console.log(FOO.BAR);
-        console.log(++CONFIG.DEBUG);
-        console.log(++CONFIG.VALUE);
-        console.log(++CONFIG["VAL" + "UE"]);
-        console.log(++DEBUG[CONFIG.VALUE]);
-        CONFIG.VALUE.FOO = "bar";
-        console.log(CONFIG);
-    }
-    expect: {
-        var FOO = { BAR: 0 };
-        console.log("moo");
-        console.log(++CONFIG.DEBUG);
-        console.log(++CONFIG.VALUE);
-        console.log(++CONFIG.VALUE);
-        console.log(++DEBUG[42]);
-        CONFIG.VALUE.FOO = "bar";
-        console.log(CONFIG);
-    }
-    expect_warnings: [
-        "WARN: global_defs CONFIG.VALUE redefined [test/compress/global_defs.js:4,22]",
-        "WARN: global_defs CONFIG.VALUE redefined [test/compress/global_defs.js:7,8]",
-    ]
-}
-
-issue_1801: {
-    options = {
-        booleans: true,
-        global_defs: {
-            "CONFIG.FOO.BAR": true,
-        },
-    }
-    input: {
-        console.log(CONFIG.FOO.BAR);
-    }
-    expect: {
-        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();
-    }
-}
-
-issue_3217: {
-    options = {
-        collapse_vars: true,
-        global_defs: {
-            "@o": "{fn:function(){var a=42;console.log(a)}}",
-        },
-        inline: true,
-        properties: true,
-        reduce_vars: true,
-        side_effects: true,
-        unused: true,
-    }
-    input: {
-        o.fn();
-    }
-    expect: {
-        console.log(42);
-    }
-}

test/compress/hoist_props.js

@@ -1,864 +0,0 @@
-issue_2377_1: {
-    options = {
-        evaluate: true,
-        hoist_props: true,
-        inline: 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,
-        hoist_props: true,
-        inline: 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,
-        hoist_props: true,
-        inline: 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,
-        hoist_props: true,
-        inline: true,
-        join_vars: 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,
-        hoist_props: true,
-        inline: true,
-        join_vars: 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,
-        hoist_props: true,
-        inline: true,
-        join_vars: 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

@@ -1,111 +0,0 @@
-statements: {
-    options = {
-        hoist_funs: false,
-        hoist_vars: true,
-    }
-    input: {
-        function f() {
-            var a = 1;
-            var b = 2;
-            var c = 3;
-            function g() {}
-            return g(a, b, c);
-        }
-    }
-    expect: {
-        function f() {
-            var a = 1, b = 2, c = 3;
-            function g() {}
-            return g(a, b, c);
-        }
-    }
-}
-
-statements_funs: {
-    options = {
-        hoist_funs: true,
-        hoist_vars: true,
-    }
-    input: {
-        function f() {
-            var a = 1;
-            var b = 2;
-            var c = 3;
-            function g() {}
-            return g(a, b, c);
-        }
-    }
-    expect: {
-        function f() {
-            function g() {}
-            var a = 1, b = 2, c = 3;
-            return g(a, b, c);
-        }
-    }
-}
-
-sequences: {
-    options = {
-        hoist_funs: false,
-        hoist_vars: true,
-    }
-    input: {
-        function f() {
-            var a = 1, b = 2;
-            function g() {}
-            var c = 3;
-            return g(a, b, c);
-        }
-    }
-    expect: {
-        function f() {
-            var c, a = 1, b = 2;
-            function g() {}
-            c = 3;
-            return g(a, b, c);
-        }
-    }
-}
-
-sequences_funs: {
-    options = {
-        hoist_funs: true,
-        hoist_vars: true,
-    }
-    input: {
-        function f() {
-            var a = 1, b = 2;
-            function g() {}
-            var c = 3;
-            return g(a, b, c);
-        }
-    }
-    expect: {
-        function f() {
-            function g() {}
-            var a = 1, b = 2, c = 3;
-            return g(a, b, c);
-        }
-    }
-}
-
-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

@@ -1,55 +0,0 @@
-html_comment_in_expression: {
-    input: {
-        function f(a, b, x, y) { return a < !--b && x-- > y; }
-    }
-    expect_exact: "function f(a,b,x,y){return a< !--b&&x-- >y}";
-}
-
-html_comment_in_less_than: {
-    input: {
-        function f(a, b) { return a < !--b; }
-    }
-    expect_exact: "function f(a,b){return a< !--b}";
-}
-
-html_comment_in_left_shift: {
-    input: {
-        function f(a, b) { return a << !--b; }
-    }
-    expect_exact: "function f(a,b){return a<< !--b}";
-}
-
-html_comment_in_right_shift: {
-    input: {
-        function f(a, b) { return a-- >> b; }
-    }
-    expect_exact: "function f(a,b){return a-- >>b}";
-}
-
-html_comment_in_zero_fill_right_shift: {
-    input: {
-        function f(a, b) { return a-- >>> b; }
-    }
-    expect_exact: "function f(a,b){return a-- >>>b}";
-}
-
-html_comment_in_greater_than: {
-    input: {
-        function f(a, b) { return a-- > b; }
-    }
-    expect_exact: "function f(a,b){return a-- >b}";
-}
-
-html_comment_in_greater_than_or_equal: {
-    input: {
-        function f(a, b) { return a-- >= b; }
-    }
-    expect_exact: "function f(a,b){return a-- >=b}";
-}
-
-html_comment_in_string_literal: {
-    input: {
-        function f() { return "<!--HTML-->comment in<!--string literal-->"; }
-    }
-    expect_exact: 'function f(){return"\\x3c!--HTML--\\x3ecomment in\\x3c!--string literal--\\x3e"}';
-}

test/compress/ie8.js

@@ -1,863 +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,
-        ie8: true,
-        reduce_funcs: true,
-        reduce_vars: 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(o) {
-            console.log(typeof function n(){} === typeof o ? "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 f() {
-            var n;
-            return n === f ? "FAIL" : "PASS";
-        }());
-    }
-    expect_stdout: "PASS"
-}
-
-issue_2976_3: {
-    mangle = {
-        ie8: true,
-        toplevel: true,
-    }
-    input: {
-        console.log(function f() {
-            var a;
-            return a === f ? "FAIL" : "PASS";
-        }());
-    }
-    expect: {
-        console.log(function o() {
-            var n;
-            return n === o ? "FAIL" : "PASS";
-        }());
-    }
-    expect_stdout: "PASS"
-}
-
-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"
-}
-
-issue_3197_1: {
-    options = {
-        ie8: false,
-        inline: true,
-        reduce_vars: true,
-        side_effects: true,
-        unused: true,
-    }
-    mangle = {
-        ie8: false,
-    }
-    input: {
-        var window = {};
-        !function() {
-            function Foo() {
-                console.log(this instanceof Foo);
-            }
-            window.Foo = Foo;
-        }();
-        new window.Foo();
-    }
-    expect: {
-        var window = {};
-        window.Foo = function o() {
-            console.log(this instanceof o);
-        };
-        new window.Foo();
-    }
-    expect_stdout: "true"
-}
-
-issue_3197_1_ie8: {
-    options = {
-        ie8: true,
-        inline: true,
-        reduce_vars: true,
-        side_effects: true,
-        unused: true,
-    }
-    mangle = {
-        ie8: true,
-    }
-    input: {
-        var window = {};
-        !function() {
-            function Foo() {
-                console.log(this instanceof Foo);
-            }
-            window.Foo = Foo;
-        }();
-        new window.Foo();
-    }
-    expect: {
-        var window = {};
-        window.Foo = function Foo() {
-            console.log(this instanceof Foo);
-        };
-        new window.Foo();
-    }
-    expect_stdout: "true"
-}
-
-issue_3197_2: {
-    mangle = {
-        ie8: false,
-    }
-    input: {
-        (function(a) {
-            var f = function f() {
-                console.log(this instanceof f);
-            };
-            new f(a);
-        })();
-    }
-    expect: {
-        (function(n) {
-            var o = function n() {
-                console.log(this instanceof n);
-            };
-            new o(n);
-        })();
-    }
-    expect_stdout: "true"
-}
-
-issue_3197_2_ie8: {
-    mangle = {
-        ie8: true,
-    }
-    input: {
-        (function(a) {
-            var f = function f() {
-                console.log(this instanceof f);
-            };
-            new f(a);
-        })();
-    }
-    expect: {
-        (function(n) {
-            var o = function o() {
-                console.log(this instanceof o);
-            };
-            new o(n);
-        })();
-    }
-    expect_stdout: "true"
-}
-
-issue_3206_1: {
-    options = {
-        evaluate: true,
-        ie8: false,
-        reduce_vars: true,
-        typeofs: true,
-        unused: true,
-    }
-    input: {
-        console.log(function() {
-            var foo = function bar() {};
-            var baz = function moo() {};
-            return "function" == typeof bar;
-        }());
-    }
-    expect: {
-        console.log(function() {
-            return "function" == typeof bar;
-        }());
-    }
-    expect_stdout: "false"
-}
-
-issue_3206_2: {
-    options = {
-        evaluate: true,
-        ie8: true,
-        reduce_vars: true,
-        typeofs: true,
-        unused: true,
-    }
-    input: {
-        console.log(function() {
-            var foo = function bar() {};
-            var baz = function moo() {};
-            return "function" == typeof bar;
-        }());
-    }
-    expect: {
-        console.log(function() {
-            (function bar() {});
-            return "function" == typeof bar;
-        }());
-    }
-    expect_stdout: "false"
-}
-
-issue_3215_1: {
-    mangle = {
-        ie8: false,
-    }
-    input: {
-        console.log(function foo() {
-            var bar = function bar(name) {
-                return "PASS";
-            };
-            try {
-                "moo";
-            } catch (e) {
-                bar = function bar(name) {
-                    return "FAIL";
-                };
-            }
-            return bar;
-        }()());
-    }
-    expect: {
-        console.log(function n() {
-            var o = function n(o) {
-                return "PASS";
-            };
-            try {
-                "moo";
-            } catch (n) {
-                o = function n(o) {
-                    return "FAIL";
-                };
-            }
-            return o;
-        }()());
-    }
-    expect_stdout: "PASS"
-}
-
-issue_3215_2: {
-    mangle = {
-        ie8: true,
-    }
-    input: {
-        console.log(function foo() {
-            var bar = function bar(name) {
-                return "PASS";
-            };
-            try {
-                "moo";
-            } catch (e) {
-                bar = function bar(name) {
-                    return "FAIL";
-                };
-            }
-            return bar;
-        }()());
-    }
-    expect: {
-        console.log(function foo() {
-            var o = function o(n) {
-                return "PASS";
-            };
-            try {
-                "moo";
-            } catch (n) {
-                o = function o(n) {
-                    return "FAIL";
-                };
-            }
-            return o;
-        }()());
-    }
-    expect_stdout: "PASS"
-}
-
-issue_3215_3: {
-    mangle = {
-        ie8: false,
-    }
-    input: {
-        console.log(function foo() {
-            var bar = function bar(name) {
-                return "FAIL";
-            };
-            try {
-                moo;
-            } catch (e) {
-                bar = function bar(name) {
-                    return "PASS";
-                };
-            }
-            return bar;
-        }()());
-    }
-    expect: {
-        console.log(function n() {
-            var o = function n(o) {
-                return "FAIL";
-            };
-            try {
-                moo;
-            } catch (n) {
-                o = function n(o) {
-                    return "PASS";
-                };
-            }
-            return o;
-        }()());
-    }
-    expect_stdout: "PASS"
-}
-
-issue_3215_4: {
-    mangle = {
-        ie8: true,
-    }
-    input: {
-        console.log(function foo() {
-            var bar = function bar(name) {
-                return "FAIL";
-            };
-            try {
-                moo;
-            } catch (e) {
-                bar = function bar(name) {
-                    return "PASS";
-                };
-            }
-            return bar;
-        }()());
-    }
-    expect: {
-        console.log(function foo() {
-            var o = function o(n) {
-                return "FAIL";
-            };
-            try {
-                moo;
-            } catch (n) {
-                o = function o(n) {
-                    return "PASS";
-                };
-            }
-            return o;
-        }()());
-    }
-    expect_stdout: "PASS"
-}

test/compress/if_return.js

@@ -1,546 +0,0 @@
-if_return_1: {
-    options = {
-        booleans: true,
-        comparisons: true,
-        conditionals: true,
-        dead_code: true,
-        evaluate: true,
-        if_return: true,
-        sequences: true,
-        side_effects: true,
-        unused: true,
-    }
-    input: {
-        function f(x) {
-            if (x) {
-                return true;
-            }
-        }
-    }
-    expect: {
-        function f(x){if(x)return!0}
-    }
-}
-
-if_return_2: {
-    options = {
-        booleans: true,
-        comparisons: true,
-        conditionals: true,
-        dead_code: true,
-        evaluate: true,
-        if_return: true,
-        sequences: true,
-        side_effects: true,
-        unused: true,
-    }
-    input: {
-        function f(x, y) {
-            if (x)
-                return 3;
-            if (y)
-                return c();
-        }
-    }
-    expect: {
-        function f(x,y){return x?3:y?c():void 0}
-    }
-}
-
-if_return_3: {
-    options = {
-        booleans: true,
-        comparisons: true,
-        conditionals: true,
-        dead_code: true,
-        evaluate: true,
-        if_return: true,
-        sequences: true,
-        side_effects: true,
-        unused: true,
-    }
-    input: {
-        function f(x) {
-            a();
-            if (x) {
-                b();
-                return false;
-            }
-        }
-    }
-    expect: {
-        function f(x){if(a(),x)return b(),!1}
-    }
-}
-
-if_return_4: {
-    options = {
-        booleans: true,
-        comparisons: true,
-        conditionals: true,
-        dead_code: true,
-        evaluate: true,
-        if_return: true,
-        sequences: true,
-        side_effects: true,
-        unused: true,
-    }
-    input: {
-        function f(x, y) {
-            a();
-            if (x) return 3;
-            b();
-            if (y) return c();
-        }
-    }
-    expect: {
-        function f(x,y){return a(),x?3:(b(),y?c():void 0)}
-    }
-}
-
-if_return_5: {
-    options = {
-        booleans: true,
-        comparisons: true,
-        conditionals: true,
-        dead_code: true,
-        evaluate: true,
-        if_return: true,
-        sequences: true,
-        side_effects: true,
-        unused: true,
-    }
-    input: {
-        function f() {
-            if (x)
-                return;
-            return 7;
-            if (y)
-                return j;
-        }
-    }
-    expect: {
-        function f(){if(!x)return 7}
-    }
-}
-
-if_return_6: {
-    options = {
-        booleans: true,
-        comparisons: true,
-        conditionals: true,
-        dead_code: true,
-        evaluate: true,
-        if_return: true,
-        sequences: true,
-        side_effects: true,
-        unused: true,
-    }
-    input: {
-        function f(x) {
-          return x ? true : void 0;
-          return y;
-        }
-    }
-    expect: {
-        // suboptimal
-        function f(x){return!!x||void 0}
-    }
-}
-
-if_return_7: {
-    options = {
-        booleans: true,
-        comparisons: true,
-        conditionals: true,
-        dead_code: true,
-        evaluate: true,
-        if_return: true,
-        sequences: true,
-        side_effects: true,
-        unused: true,
-    }
-    input: {
-        function f(x) {
-            if (x) {
-                return true;
-            }
-            foo();
-            bar();
-        }
-    }
-    expect: {
-        function f(x){if(x)return!0;foo(),bar()}
-    }
-}
-
-if_return_8: {
-    options = {
-        conditionals: true,
-        if_return: true,
-        sequences: true,
-        side_effects: true,
-    }
-    input: {
-        function f(e) {
-            if (2 == e) return foo();
-            if (3 == e) return bar();
-            if (4 == e) return baz();
-            fail(e);
-        }
-
-        function g(e) {
-            if (a(e)) return foo();
-            if (b(e)) return bar();
-            if (c(e)) return baz();
-            fail(e);
-        }
-
-        function h(e) {
-            if (a(e)) return foo();
-            else if (b(e)) return bar();
-            else if (c(e)) return baz();
-            else fail(e);
-        }
-
-        function i(e) {
-            if (a(e)) return foo();
-            else if (b(e)) return bar();
-            else if (c(e)) return baz();
-            fail(e);
-        }
-    }
-    expect: {
-        function f(e){return 2==e?foo():3==e?bar():4==e?baz():void fail(e)}
-        function g(e){return a(e)?foo():b(e)?bar():c(e)?baz():void fail(e)}
-        function h(e){return a(e)?foo():b(e)?bar():c(e)?baz():void fail(e)}
-        function i(e){return a(e)?foo():b(e)?bar():c(e)?baz():void fail(e)}
-    }
-}
-
-issue_1089: {
-    options = {
-        booleans: true,
-        comparisons: true,
-        conditionals: true,
-        dead_code: true,
-        evaluate: true,
-        if_return: true,
-        sequences: true,
-        side_effects: true,
-        unused: true,
-    }
-    input: {
-        function x() {
-            var f = document.getElementById("fname");
-            if (f.files[0].size > 12345) {
-                alert("alert");
-                f.focus();
-                return false;
-            }
-        }
-    }
-    expect: {
-        function x() {
-            var f = document.getElementById("fname");
-            if (12345 < f.files[0].size)
-                return alert("alert"), f.focus(), !1;
-        }
-    }
-}
-
-issue_1437: {
-    options = {
-        conditionals: false,
-        if_return: true,
-        sequences: true,
-    }
-    input: {
-        function x() {
-            if (a())
-                return b();
-            if (c())
-                return d();
-            else
-                e();
-            f();
-        }
-    }
-    expect: {
-        function x() {
-            if (a())
-                return b();
-            if (c())
-                return d();
-            else
-                e()
-            f();
-        }
-    }
-}
-
-issue_1437_conditionals: {
-    options = {
-        conditionals: true,
-        if_return: true,
-        sequences: true,
-    }
-    input: {
-        function x() {
-            if (a())
-                return b();
-            if (c())
-                return d();
-            else
-                e();
-            f();
-        }
-    }
-    expect: {
-        function x() {
-            return a() ? b() : c() ? d() : (e(), f(), void 0);
-        }
-    }
-}
-
-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();
-        }
-    }
-}
-
-if_body_return_1: {
-    options = {
-        if_return: true,
-    }
-    input: {
-        var c = "PASS";
-        function f(a, b) {
-            if (a) {
-                if (b) throw new Error(c);
-                return 42;
-            }
-            return true;
-        }
-        console.log(f(0, 0));
-        console.log(f(0, 1));
-        console.log(f(1, 0));
-        try {
-            f(1, 1);
-            console.log("FAIL");
-        } catch (e) {
-            console.log(e.message);
-        }
-    }
-    expect: {
-        var c = "PASS";
-        function f(a, b) {
-            if (a) {
-                if (b) throw new Error(c);
-                return 42;
-            }
-            return true;
-        }
-        console.log(f(0, 0));
-        console.log(f(0, 1));
-        console.log(f(1, 0));
-        try {
-            f(1, 1);
-            console.log("FAIL");
-        } catch (e) {
-            console.log(e.message);
-        }
-    }
-    expect_stdout: [
-        "true",
-        "true",
-        "42",
-        "PASS",
-    ]
-}
-
-if_body_return_2: {
-    options = {
-        if_return: true,
-    }
-    input: {
-        var c = "PASS";
-        function f(a, b) {
-            if (0 + a) {
-                if (b) throw new Error(c);
-                return 42;
-            }
-            return true;
-        }
-        console.log(f(0, 0));
-        console.log(f(0, 1));
-        console.log(f(1, 0));
-        try {
-            f(1, 1);
-            console.log("FAIL");
-        } catch (e) {
-            console.log(e.message);
-        }
-    }
-    expect: {
-        var c = "PASS";
-        function f(a, b) {
-            if (0 + a) {
-                if (b) throw new Error(c);
-                return 42;
-            }
-            return true;
-        }
-        console.log(f(0, 0));
-        console.log(f(0, 1));
-        console.log(f(1, 0));
-        try {
-            f(1, 1);
-            console.log("FAIL");
-        } catch (e) {
-            console.log(e.message);
-        }
-    }
-    expect_stdout: [
-        "true",
-        "true",
-        "42",
-        "PASS",
-    ]
-}
-
-if_body_return_3: {
-    options = {
-        if_return: true,
-    }
-    input: {
-        var c = "PASS";
-        function f(a, b) {
-            if (1 == a) {
-                if (b) throw new Error(c);
-                return 42;
-            }
-            return true;
-        }
-        console.log(f(0, 0));
-        console.log(f(0, 1));
-        console.log(f(1, 0));
-        try {
-            f(1, 1);
-            console.log("FAIL");
-        } catch (e) {
-            console.log(e.message);
-        }
-    }
-    expect: {
-        var c = "PASS";
-        function f(a, b) {
-            if (1 != a) return true;
-            if (b) throw new Error(c);
-            return 42;
-        }
-        console.log(f(0, 0));
-        console.log(f(0, 1));
-        console.log(f(1, 0));
-        try {
-            f(1, 1);
-            console.log("FAIL");
-        } catch (e) {
-            console.log(e.message);
-        }
-    }
-    expect_stdout: [
-        "true",
-        "true",
-        "42",
-        "PASS",
-    ]
-}

test/compress/issue-1034.js

@@ -1,312 +0,0 @@
-non_hoisted_function_after_return: {
-    options = {
-        booleans: true,
-        comparisons: true,
-        conditionals: true,
-        dead_code: true,
-        evaluate: true,
-        hoist_funs: false,
-        if_return: true,
-        join_vars: true,
-        keep_fargs: true,
-        loops: true,
-        side_effects: true,
-        unused: true,
-    }
-    input: {
-        function foo(x) {
-            if (x) {
-                return bar();
-                not_called1();
-            } else {
-                return baz();
-                not_called2();
-            }
-            function bar() { return 7; }
-            return not_reached;
-            function UnusedFunction() {}
-            function baz() { return 8; }
-        }
-    }
-    expect: {
-        function foo(x) {
-            return x ? bar() : baz();
-            function bar() { return 7 }
-            function baz() { return 8 }
-        }
-    }
-    expect_warnings: [
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:4,16]",
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:7,16]",
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:10,12]",
-        "WARN: Dropping unused function UnusedFunction [test/compress/issue-1034.js:11,21]"
-    ]
-}
-
-non_hoisted_function_after_return_2a: {
-    options = {
-        booleans: true,
-        collapse_vars: false,
-        comparisons: true,
-        conditionals: true,
-        dead_code: true,
-        evaluate: true,
-        hoist_funs: false,
-        if_return: true,
-        join_vars: true,
-        keep_fargs: true,
-        loops: true,
-        passes: 2,
-        side_effects: true,
-        unused: true,
-        warnings: "verbose",
-    }
-    input: {
-        function foo(x) {
-            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;
-        }
-    }
-    expect: {
-        function foo(x) {
-            return bar(x ? 1 : 2);
-            function bar(x) {
-                return 7 - x;
-            }
-        }
-    }
-    expect_warnings: [
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:4,16]",
-        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:4,16]",
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:7,16]",
-        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:7,16]",
-        "WARN: Dropping unused variable a [test/compress/issue-1034.js:4,20]",
-        "WARN: Dropping unused function nope [test/compress/issue-1034.js:11,21]",
-        "WARN: pass 0: last_count: Infinity, count: 37",
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:9,12]",
-        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:9,12]",
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:12,12]",
-        "WARN: Dropping unused variable b [test/compress/issue-1034.js:7,20]",
-        "WARN: Dropping unused variable c [test/compress/issue-1034.js:9,16]",
-        "WARN: pass 1: last_count: 37, count: 18",
-    ]
-}
-
-non_hoisted_function_after_return_2b: {
-    options = {
-        booleans: true,
-        collapse_vars: false,
-        comparisons: true,
-        conditionals: true,
-        dead_code: true,
-        evaluate: true,
-        hoist_funs: false,
-        if_return: true,
-        join_vars: true,
-        keep_fargs: true,
-        loops: true,
-        side_effects: true,
-        unused: true,
-    }
-    input: {
-        function foo(x) {
-            if (x) {
-                return bar(1);
-            } else {
-                return bar(2);
-                var b;
-            }
-            var c = bar(3);
-            function bar(x) {
-                return 7 - x;
-            }
-            return b || c;
-        }
-    }
-    expect: {
-        function foo(x) {
-            return bar(x ? 1 : 2);
-            function bar(x) { return 7 - x; }
-        }
-    }
-    expect_warnings: [
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:6,16]",
-        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:6,16]",
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:8,12]",
-        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:8,12]",
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:12,12]",
-    ]
-}
-
-non_hoisted_function_after_return_strict: {
-    options = {
-        booleans: true,
-        comparisons: true,
-        conditionals: true,
-        dead_code: true,
-        evaluate: true,
-        hoist_funs: false,
-        if_return: true,
-        join_vars: true,
-        keep_fargs: true,
-        loops: true,
-        side_effects: true,
-        unused: true,
-    }
-    input: {
-        "use strict";
-        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:5,16]",
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:8,16]",
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:11,12]",
-        "WARN: Dropping unused function UnusedFunction [test/compress/issue-1034.js:12,21]",
-    ]
-}
-
-non_hoisted_function_after_return_2a_strict: {
-    options = {
-        booleans: true,
-        collapse_vars: false,
-        comparisons: true,
-        conditionals: true,
-        dead_code: true,
-        evaluate: true,
-        hoist_funs: false,
-        if_return: true,
-        join_vars: true,
-        keep_fargs: true,
-        loops: true,
-        passes: 2,
-        side_effects: true,
-        unused: true,
-        warnings: "verbose",
-    }
-    input: {
-        "use strict";
-        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:5,16]",
-        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:5,16]",
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:8,16]",
-        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:8,16]",
-        "WARN: Dropping unused variable a [test/compress/issue-1034.js:5,20]",
-        "WARN: Dropping unused function nope [test/compress/issue-1034.js:12,21]",
-        "WARN: pass 0: last_count: Infinity, count: 48",
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:10,12]",
-        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:10,12]",
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:13,12]",
-        "WARN: Dropping unused variable b [test/compress/issue-1034.js:8,20]",
-        "WARN: Dropping unused variable c [test/compress/issue-1034.js:10,16]",
-        "WARN: pass 1: last_count: 48, count: 29",
-    ]
-}
-
-non_hoisted_function_after_return_2b_strict: {
-    options = {
-        booleans: true,
-        collapse_vars: false,
-        comparisons: true,
-        conditionals: true,
-        dead_code: true,
-        evaluate: true,
-        hoist_funs: false,
-        if_return: true,
-        join_vars: true,
-        keep_fargs: true,
-        loops: true,
-        side_effects: true,
-        unused: true,
-    }
-    input: {
-        "use strict";
-        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: [
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:7,16]",
-        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:7,16]",
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:9,12]",
-        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:9,12]",
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:13,12]",
-    ]
-}

test/compress/issue-1041.js

@@ -1,30 +0,0 @@
-const_pragma: {
-    options = {
-        evaluate: true,
-        reduce_funcs: true,
-        reduce_vars: true,
-    }
-
-    input: {
-        /** @const */ var goog = goog || {};
-    }
-    expect: {
-        var goog = goog || {};
-    }
-}
-
-// for completeness' sake
-not_const: {
-    options = {
-        evaluate: true,
-        reduce_funcs: true,
-        reduce_vars: true,
-    }
-
-    input: {
-        var goog = goog || {};
-    }
-    expect: {
-        var goog = goog || {};
-    }
-}

test/compress/issue-105.js

@@ -0,0 +1,25 @@
+typeof_eq_undefined: {
+    options = {
+        comparisons: true
+    };
+    input: { a = typeof b.c != "undefined" }
+    expect: { a = "undefined" != typeof b.c }
+}
+
+typeof_eq_undefined_unsafe: {
+    options = {
+        comparisons: true,
+        unsafe: true
+    };
+    input: { a = typeof b.c != "undefined" }
+    expect: { a = void 0 !== b.c }
+}
+
+typeof_eq_undefined_unsafe2: {
+    options = {
+        comparisons: true,
+        unsafe: true
+    };
+    input: { a = "undefined" != typeof b.c }
+    expect: { a = void 0 !== b.c }
+}

test/compress/issue-1052.js

@@ -1,164 +0,0 @@
-multiple_functions: {
-    options = {
-        hoist_funs: false,
-        if_return: true,
-    }
-    input: {
-        ( function() {
-            if ( !window ) {
-                return;
-            }
-            function f() {}
-            function g() {}
-        } )();
-    }
-    expect: {
-        ( function() {
-            // 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,
-    }
-    input: {
-        ( function() {
-            if ( !window ) {
-                return;
-            }
-            function f() {}
-        } )();
-    }
-    expect: {
-        ( function() {
-            if ( window );
-            function f() {}
-        } )();
-    }
-}
-
-deeply_nested: {
-    options = {
-        hoist_funs: false,
-        if_return: true,
-    }
-    input: {
-        ( function() {
-            if ( !window ) {
-                return;
-            }
-            function f() {}
-            function g() {}
-            if ( !document ) {
-                return;
-            }
-            function h() {}
-        } )();
-    }
-    expect: {
-        ( function() {
-            // 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,
-    }
-    input: {
-        ( function() {
-            if ( !window ) {
-                return;
-            }
-            if ( foo ) function f() {}
-        } )();
-    }
-    expect: {
-        ( function() {
-            if ( window )
-                if ( foo ) function f() {}
-        } )();
-    }
-}
-
-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

@@ -1,303 +0,0 @@
-with_in_global_scope: {
-    options = {
-        unused: true,
-    }
-    input: {
-        var o = 42;
-        with(o) {
-            var foo = 'something'
-        }
-        doSomething(o);
-    }
-    expect: {
-        var o=42;
-        with(o)
-            var foo = "something";
-        doSomething(o);
-    }
-}
-with_in_function_scope: {
-    options = {
-        unused: true,
-    }
-    input: {
-        function foo() {
-            var o = 42;
-            with(o) {
-                var foo = "something"
-            }
-            doSomething(o);
-        }
-    }
-    expect: {
-        function foo() {
-            var o=42;
-            with(o)
-                var foo = "something";
-            doSomething(o)
-        }
-    }
-}
-compress_with_with_in_other_scope: {
-    options = {
-        unused: true,
-    }
-    input: {
-        function foo() {
-            var o = 42;
-            with(o) {
-                var foo = "something"
-            }
-            doSomething(o);
-        }
-        function bar() {
-            var unused = 42;
-            return something();
-        }
-    }
-    expect: {
-        function foo() {
-            var o = 42;
-            with(o)
-                var foo = "something";
-            doSomething(o)
-        }
-        function bar() {
-            return something()
-        }
-    }
-}
-with_using_existing_variable_outside_scope: {
-    options = {
-        unused: true,
-    }
-    input: {
-        function f() {
-            var o = {};
-            var unused = {}; // Doesn't get removed because upper scope uses with
-            function foo() {
-                with(o) {
-                    var foo = "something"
-                }
-                doSomething(o);
-            }
-            foo()
-        }
-    }
-    expect: {
-        function f() {
-            var o = {};
-            var unused = {};
-            function foo() {
-                with(o)
-                    var foo = "something";
-                doSomething(o)
-            }
-            foo()
-        }
-    }
-}
-check_drop_unused_in_peer_function: {
-    options = {
-        unused: true,
-    }
-    input: {
-        function outer() {
-            var o = {};
-            var unused = {};     // should be kept
-            function foo() {     // should be kept
-                function not_in_use() {
-                    var nested_unused = "foo"; // should be dropped
-                    return 24;
-                }
-                var unused = {}; // should be kept
-                with (o) {
-                    var foo = "something";
-                }
-                doSomething(o);
-            }
-            function bar() {
-                var unused = {}; // should be dropped
-                doSomethingElse();
-            }
-            foo();
-            bar();
-        }
-    }
-    expect: {
-        function outer() {
-            var o = {};
-            var unused = {};     // should be kept
-            function foo() {     // should be kept
-                function not_in_use() {
-                    return 24;
-                }
-                var unused = {}; // should be kept
-                with (o)
-                    var foo = "something";
-                doSomething(o);
-            }
-            function bar() {
-                doSomethingElse();
-            }
-            foo();
-            bar();
-        }
-    }
-}
-
-Infinity_not_in_with_scope: {
-    options = {
-        unused: true,
-    }
-    input: {
-        var o = { Infinity: 'oInfinity' };
-        var vInfinity = "Infinity";
-        vInfinity = Infinity;
-    }
-    expect: {
-        var o = { Infinity: 'oInfinity' }
-        var vInfinity = "Infinity"
-        vInfinity = 1/0
-    }
-}
-
-Infinity_in_with_scope: {
-    options = {
-        unused: true,
-    }
-    input: {
-        var o = { Infinity: 'oInfinity' };
-        var vInfinity = "Infinity";
-        with (o) { vInfinity = Infinity; }
-    }
-    expect: {
-        var o = { Infinity: 'oInfinity' }
-        var vInfinity = "Infinity"
-        with (o) vInfinity = Infinity
-    }
-}
-
-assorted_Infinity_NaN_undefined_in_with_scope: {
-    options = {
-        booleans: true,
-        comparisons: true,
-        conditionals: true,
-        dead_code: true,
-        evaluate: true,
-        hoist_funs: true,
-        if_return: true,
-        join_vars: true,
-        keep_fargs: true,
-        keep_infinity: false,
-        sequences: false,
-        side_effects: true,
-        unused: true,
-    }
-    input: {
-        var f = console.log;
-        var o = {
-            undefined : 3,
-            NaN       : 4,
-            Infinity  : 5,
-        };
-        if (o) {
-            f(undefined, void 0);
-            f(NaN, 0/0);
-            f(Infinity, 1/0);
-            f(-Infinity, -(1/0));
-            f(2 + 7 + undefined, 2 + 7 + void 0);
-        }
-        with (o) {
-            f(undefined, void 0);
-            f(NaN, 0/0);
-            f(Infinity, 1/0);
-            f(-Infinity, -(1/0));
-            f(2 + 7 + undefined, 2 + 7 + void 0);
-        }
-    }
-    expect: {
-        var f = console.log, o = {
-            undefined : 3,
-            NaN       : 4,
-            Infinity  : 5
-        };
-        if (o) {
-            f(void 0, void 0);
-            f(NaN, NaN);
-            f(1/0, 1/0);
-            f(-1/0, -1/0);
-            f(NaN, NaN);
-        }
-        with (o) {
-            f(undefined, void 0);
-            f(NaN, 0/0);
-            f(Infinity, 1/0);
-            f(-Infinity, -1/0);
-            f(9 + undefined, 9 + void 0);
-        }
-    }
-    expect_stdout: true
-}
-
-assorted_Infinity_NaN_undefined_in_with_scope_keep_infinity: {
-    options = {
-        booleans: true,
-        comparisons: true,
-        conditionals: true,
-        dead_code: true,
-        evaluate: true,
-        hoist_funs: true,
-        if_return: true,
-        join_vars: true,
-        keep_fargs: true,
-        keep_infinity: true,
-        sequences: false,
-        side_effects: true,
-        unused: true,
-    }
-    input: {
-        var f = console.log;
-        var o = {
-            undefined : 3,
-            NaN       : 4,
-            Infinity  : 5,
-        };
-        if (o) {
-            f(undefined, void 0);
-            f(NaN, 0/0);
-            f(Infinity, 1/0);
-            f(-Infinity, -(1/0));
-            f(2 + 7 + undefined, 2 + 7 + void 0);
-        }
-        with (o) {
-            f(undefined, void 0);
-            f(NaN, 0/0);
-            f(Infinity, 1/0);
-            f(-Infinity, -(1/0));
-            f(2 + 7 + undefined, 2 + 7 + void 0);
-        }
-    }
-    expect: {
-        var f = console.log, o = {
-            undefined : 3,
-            NaN       : 4,
-            Infinity  : 5
-        };
-        if (o) {
-            f(void 0, void 0);
-            f(NaN, NaN);
-            f(Infinity, 1/0);
-            f(-Infinity, -1/0);
-            f(NaN, NaN);
-        }
-        with (o) {
-            f(undefined, void 0);
-            f(NaN, 0/0);
-            f(Infinity, 1/0);
-            f(-Infinity, -1/0);
-            f(9 + undefined, 9 + void 0);
-        }
-    }
-    expect_stdout: true
-}

test/compress/issue-12.js

@@ -1,62 +1,11 @@
 keep_name_of_getter: {
-    options = {
-        unused: true,
-    }
+    options = { unused: true };
     input: { a = { get foo () {} } }
     expect: { a = { get foo () {} } }
 }
 
 keep_name_of_setter: {
-    options = {
-        unused: true,
-    }
+    options = { unused: true };
     input: { a = { set foo () {} } }
     expect: { a = { set foo () {} } }
 }
-
-setter_with_operator_keys: {
-    input: {
-        var tokenCodes  = {
-            get instanceof(){
-                return test0;
-            },
-            set instanceof(value){
-                test0 = value;
-            },
-            set typeof(value){
-                test1 = value;
-            },
-            get typeof(){
-                return test1;
-            },
-            set else(value){
-                test2 = value;
-            },
-            get else(){
-                return test2;
-            }
-        };
-    }
-    expect: {
-        var tokenCodes  = {
-            get instanceof(){
-                return test0;
-            },
-            set instanceof(value){
-                test0 = value;
-            },
-            set typeof(value){
-                test1 = value;
-            },
-            get typeof(){
-                return test1;
-            },
-            set else(value){
-                test2 = value;
-            },
-            get else(){
-                return test2;
-            }
-        };
-    }
-}

test/compress/issue-1202.js

@@ -1,51 +0,0 @@
-mangle_keep_fnames_false: {
-    options = {
-        keep_fargs: true,
-        keep_fnames: true,
-    }
-    mangle = {
-        keep_fnames : false,
-    }
-    input: {
-        "use strict";
-        function total() {
-            return function n(a, b, c) {
-                return a + b + c;
-            };
-        }
-    }
-    expect: {
-        "use strict";
-        function total() {
-            return function t(n, r, u) {
-                return n + r + u;
-            };
-        }
-    }
-}
-
-mangle_keep_fnames_true: {
-    options = {
-        keep_fargs: true,
-        keep_fnames: true,
-    }
-    mangle = {
-        keep_fnames : true,
-    }
-    input: {
-        "use strict";
-        function total() {
-            return function n(a, b, c) {
-                return a + b + c;
-            };
-        }
-    }
-    expect: {
-        "use strict";
-        function total() {
-            return function n(t, r, u) {
-                return t + r + u;
-            };
-        }
-    }
-}

test/compress/issue-1261.js

@@ -1,183 +0,0 @@
-pure_function_calls: {
-    options = {
-        booleans: true,
-        comparisons: true,
-        conditionals: true,
-        evaluate: true,
-        if_return: true,
-        join_vars: true,
-        negate_iife: true,
-        side_effects: true,
-        unused: true,
-    }
-    input: {
-        // pure top-level IIFE will be dropped
-        // @__PURE__ - comment
-        (function() {
-            console.log("iife0");
-        })();
-
-        // pure top-level IIFE assigned to unreferenced var will not be dropped
-        var iife1 = /*@__PURE__*/(function() {
-            console.log("iife1");
-            function iife1() {}
-            return iife1;
-        })();
-
-        (function(){
-            // pure IIFE in function scope assigned to unreferenced var will be dropped
-            var iife2 = /*#__PURE__*/(function() {
-                console.log("iife2");
-                function iife2() {}
-                return iife2;
-            })();
-        })();
-
-        // comment #__PURE__ comment
-        bar(), baz(), quux();
-        a.b(), /* @__PURE__ */ c.d.e(), f.g();
-    }
-    expect: {
-        var iife1 = function() {
-            console.log("iife1");
-            function iife1() {}
-            return iife1;
-        }();
-
-        baz(), quux();
-        a.b(), f.g();
-    }
-    expect_warnings: [
-        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:3,8]",
-        "WARN: Dropping side-effect-free statement [test/compress/issue-1261.js:3,8]",
-        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:16,37]",
-        "WARN: Dropping unused variable iife2 [test/compress/issue-1261.js:16,16]",
-        "WARN: Dropping side-effect-free statement [test/compress/issue-1261.js:14,8]",
-        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:24,8]",
-        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:25,31]",
-    ]
-}
-
-pure_function_calls_toplevel: {
-    options = {
-        booleans: true,
-        comparisons: true,
-        conditionals: true,
-        evaluate: true,
-        if_return: true,
-        join_vars: true,
-        negate_iife: true,
-        side_effects: true,
-        toplevel: true,
-        unused: true,
-    }
-    input: {
-        // pure top-level IIFE will be dropped
-        // @__PURE__ - comment
-        (function() {
-            console.log("iife0");
-        })();
-
-        // pure top-level IIFE assigned to unreferenced var will be dropped
-        var iife1 = /*@__PURE__*/(function() {
-            console.log("iife1");
-            function iife1() {}
-            return iife1;
-        })();
-
-        (function(){
-            // pure IIFE in function scope assigned to unreferenced var will be dropped
-            var iife2 = /*#__PURE__*/(function() {
-                console.log("iife2");
-                function iife2() {}
-                return iife2;
-            })();
-        })();
-
-        // 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();
-    }
-    expect: {
-        baz(), quux();
-        a.b(), f.g();
-    }
-    expect_warnings: [
-        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:3,8]",
-        "WARN: Dropping side-effect-free statement [test/compress/issue-1261.js:3,8]",
-        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:16,37]",
-        "WARN: Dropping unused variable iife2 [test/compress/issue-1261.js:16,16]",
-        "WARN: Dropping side-effect-free statement [test/compress/issue-1261.js:14,8]",
-        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:31,8]",
-        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:32,31]",
-        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:8,33]",
-        "WARN: Dropping unused variable iife1 [test/compress/issue-1261.js:8,12]",
-        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:24,45]",
-        "WARN: Dropping unused variable MyClass [test/compress/issue-1261.js:24,12]",
-    ]
-}
-
-should_warn: {
-    options = {
-        booleans: true,
-        conditionals: true,
-        evaluate: true,
-        side_effects: true,
-    }
-    input: {
-        /* @__PURE__ */(function(){x})(), void/* @__PURE__ */(function(){y})();
-        /* @__PURE__ */(function(){x})() || true ? foo() : bar();
-        true || /* @__PURE__ */(function(){y})() ? foo() : bar();
-        /* @__PURE__ */(function(){x})() && false ? foo() : bar();
-        false && /* @__PURE__ */(function(){y})() ? foo() : bar();
-        /* @__PURE__ */(function(){x})() + "foo" ? bar() : baz();
-        "foo" + /* @__PURE__ */(function(){y})() ? bar() : baz();
-        /* @__PURE__ */(function(){x})() ? foo() : foo();
-        [/* @__PURE__ */(function(){x})()] ? foo() : bar();
-        !{ foo: /* @__PURE__ */(function(){x})() } ? bar() : baz();
-    }
-    expect: {
-        foo();
-        foo();
-        bar();
-        bar();
-        bar();
-        bar();
-        foo();
-        foo();
-        baz();
-    }
-    expect_warnings: [
-        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:1,61]",
-        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:1,23]",
-        "WARN: Dropping side-effect-free statement [test/compress/issue-1261.js:1,23]",
-        "WARN: Boolean || always true [test/compress/issue-1261.js:2,23]",
-        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:2,23]",
-        "WARN: Condition always true [test/compress/issue-1261.js:2,23]",
-        "WARN: Condition left of || always true [test/compress/issue-1261.js:3,8]",
-        "WARN: Condition always true [test/compress/issue-1261.js:3,8]",
-        "WARN: Boolean && always false [test/compress/issue-1261.js:4,23]",
-        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:4,23]",
-        "WARN: Condition always false [test/compress/issue-1261.js:4,23]",
-        "WARN: Condition left of && always false [test/compress/issue-1261.js:5,8]",
-        "WARN: Condition always false [test/compress/issue-1261.js:5,8]",
-        "WARN: + in boolean context always true [test/compress/issue-1261.js:6,23]",
-        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:6,23]",
-        "WARN: Condition always true [test/compress/issue-1261.js:6,23]",
-        "WARN: + in boolean context always true [test/compress/issue-1261.js:7,8]",
-        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:7,31]",
-        "WARN: Condition always true [test/compress/issue-1261.js:7,8]",
-        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:8,23]",
-        "WARN: Condition always true [test/compress/issue-1261.js:9,8]",
-        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:9,24]",
-        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:10,31]",
-        "WARN: Condition always false [test/compress/issue-1261.js:10,8]",
-    ]
-}

test/compress/issue-1275.js

@@ -1,49 +0,0 @@
-string_plus_optimization: {
-    options = {
-        booleans: true,
-        comparisons: true,
-        conditionals: true,
-        dead_code: true,
-        evaluate: true,
-        hoist_funs: true,
-        if_return: true,
-        join_vars: true,
-        side_effects: true,
-        unused: true,
-    }
-    input: {
-        function foo(anything) {
-            function throwing_function() {
-                throw "nope";
-            }
-            try {
-                console.log('0' + throwing_function() ? "yes" : "no");
-            } catch (ex) {
-                console.log(ex);
-            }
-            console.log('0' + anything ? "yes" : "no");
-            console.log(anything + '0' ? "Yes" : "No");
-            console.log('' + anything);
-            console.log(anything + '');
-        }
-        foo();
-    }
-    expect: {
-        function foo(anything) {
-            function throwing_function() {
-                throw "nope";
-            }
-            try {
-                console.log((throwing_function(), "yes"));
-            } catch (ex) {
-                console.log(ex);
-            }
-            console.log("yes");
-            console.log("Yes");
-            console.log('' + anything);
-            console.log(anything + '');
-        }
-        foo();
-    }
-    expect_stdout: true
-}

test/compress/issue-1321.js

@@ -1,63 +0,0 @@
-issue_1321_no_debug: {
-    mangle = {
-        properties: {
-            keep_quoted: true,
-        },
-    }
-    input: {
-        var x = {};
-        x.foo = 1;
-        x["a"] = 2 * x.foo;
-        console.log(x.foo, x["a"]);
-    }
-    expect: {
-        var x = {};
-        x.x = 1;
-        x["a"] = 2 * x.x;
-        console.log(x.x, x["a"]);
-    }
-    expect_stdout: true
-}
-
-issue_1321_debug: {
-    mangle = {
-        properties: {
-            debug: "",
-            keep_quoted: true,
-        },
-    }
-    input: {
-        var x = {};
-        x.foo = 1;
-        x["_$foo$_"] = 2 * x.foo;
-        console.log(x.foo, x["_$foo$_"]);
-    }
-    expect: {
-        var x = {};
-        x.x = 1;
-        x["_$foo$_"] = 2 * x.x;
-        console.log(x.x, x["_$foo$_"]);
-    }
-    expect_stdout: true
-}
-
-issue_1321_with_quoted: {
-    mangle = {
-        properties: {
-            keep_quoted: false,
-        },
-    }
-    input: {
-        var x = {};
-        x.foo = 1;
-        x["a"] = 2 * x.foo;
-        console.log(x.foo, x["a"]);
-    }
-    expect: {
-        var x = {};
-        x.x = 1;
-        x["o"] = 2 * x.x;
-        console.log(x.x, x["o"]);
-    }
-    expect_stdout: true
-}

test/compress/issue-143.js

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

test/compress/issue-1431.js

@@ -1,151 +0,0 @@
-level_zero: {
-    options = {
-        keep_fnames: true,
-    }
-    mangle = {
-        keep_fnames: true
-    }
-    input: {
-        function f(x) {
-            function n(a) {
-                return a * a;
-            }
-            return function() {
-                return x;
-            };
-        }
-    }
-    expect: {
-        function f(r) {
-            function n(n) {
-                return n * n;
-            }
-            return function() {
-                return r;
-            };
-        }
-    }
-}
-
-level_one: {
-    options = {
-        keep_fnames: true,
-    }
-    mangle = {
-        keep_fnames: true
-    }
-    input: {
-        function f(x) {
-            return function() {
-                function n(a) {
-                    return a * a;
-                }
-                return x(n);
-            };
-        }
-    }
-    expect: {
-        function f(r) {
-            return function() {
-                function n(n) {
-                    return n * n;
-                }
-                return r(n);
-            };
-        }
-    }
-}
-
-level_two: {
-    options = {
-        keep_fnames: true,
-    }
-    mangle = {
-        keep_fnames: true
-    }
-    input: {
-        function f(x) {
-            return function() {
-                function r(a) {
-                    return a * a;
-                }
-                return function() {
-                    function n(a) {
-                        return a * a;
-                    }
-                    return x(n);
-                };
-            };
-        }
-    }
-    expect: {
-        function f(t) {
-            return function() {
-                function r(n) {
-                    return n * n;
-                }
-                return function() {
-                    function n(n) {
-                        return n * n;
-                    }
-                    return t(n);
-                };
-            };
-        }
-    }
-}
-
-level_three: {
-    options = {
-        keep_fnames: true,
-    }
-    mangle = {
-        keep_fnames: true
-    }
-    input: {
-        function f(x) {
-            return function() {
-                function r(a) {
-                    return a * a;
-                }
-                return [
-                    function() {
-                        function t(a) {
-                            return a * a;
-                        }
-                        return t;
-                    },
-                    function() {
-                        function n(a) {
-                            return a * a;
-                        }
-                        return x(n);
-                    }
-                ];
-            };
-        }
-    }
-    expect: {
-        function f(t) {
-            return function() {
-                function r(n) {
-                    return n * n;
-                }
-                return [
-                    function() {
-                        function t(n) {
-                            return n * n;
-                        }
-                        return t;
-                    },
-                    function() {
-                        function n(n) {
-                            return n * n;
-                        }
-                        return t(n);
-                    }
-                ];
-            };
-        }
-    }
-}

test/compress/issue-1443.js

@@ -1,61 +0,0 @@
-// tests assume that variable `undefined` not redefined and has `void 0` as value
-
-unsafe_undefined: {
-    options = {
-        conditionals: true,
-        if_return: true,
-        unsafe_undefined: true,
-    }
-    mangle = {}
-    input: {
-        function f(undefined) {
-            return function() {
-                if (a)
-                    return b;
-                if (c)
-                    return d;
-            };
-        }
-    }
-    expect: {
-        function f(n) {
-            return function() {
-                return a ? b : c ? d : n;
-            };
-        }
-    }
-}
-
-keep_fnames: {
-    options = {
-        conditionals: true,
-        if_return: true,
-        unsafe_undefined: true,
-    }
-    mangle = {
-        keep_fnames: true
-    }
-    input: {
-        function f(undefined) {
-            return function() {
-                function n(a) {
-                    return a * a;
-                }
-                if (a)
-                    return b;
-                if (c)
-                    return d;
-            };
-        }
-    }
-    expect: {
-        function f(r) {
-            return function() {
-                function n(n) {
-                    return n * n;
-                }
-                return a ? b : c ? d : r;
-            };
-        }
-    }
-}

test/compress/issue-1446.js

@@ -1,75 +0,0 @@
-typeof_eq_undefined: {
-    options = {
-        comparisons: true,
-        typeofs: true,
-    }
-    input: {
-        var a = typeof b != "undefined";
-        b = typeof a != "undefined";
-        var c = typeof d.e !== "undefined";
-        var f = "undefined" === typeof g;
-        g = "undefined" === typeof f;
-        var h = "undefined" == typeof i.j;
-    }
-    expect: {
-        var a = "undefined" != typeof b;
-        b = void 0 !== a;
-        var c = void 0 !== d.e;
-        var f = "undefined" == typeof g;
-        g = void 0 === f;
-        var h = void 0 === i.j;
-    }
-}
-
-typeof_eq_undefined_ie8: {
-    options = {
-        comparisons: true,
-        ie8: true,
-        typeofs: true,
-    }
-    input: {
-        var a = typeof b != "undefined";
-        b = typeof a != "undefined";
-        var c = typeof d.e !== "undefined";
-        var f = "undefined" === typeof g;
-        g = "undefined" === typeof f;
-        var h = "undefined" == typeof i.j;
-    }
-    expect: {
-        var a = "undefined" != typeof b;
-        b = void 0 !== a;
-        var c = "undefined" != typeof d.e;
-        var f = "undefined" == typeof g;
-        g = void 0 === f;
-        var h = "undefined" == typeof i.j;
-    }
-}
-
-undefined_redefined: {
-    options = {
-        comparisons: true,
-        typeofs: true,
-    }
-    input: {
-        function f(undefined) {
-            var n = 1;
-            return typeof n == "undefined";
-        }
-    }
-    expect_exact: "function f(undefined){var n=1;return void 0===n}"
-}
-
-undefined_redefined_mangle: {
-    options = {
-        comparisons: true,
-        typeofs: true,
-    }
-    mangle = {}
-    input: {
-        function f(undefined) {
-            var n = 1;
-            return typeof n == "undefined";
-        }
-    }
-    expect_exact: "function f(n){var r=1;return void 0===r}"
-}

test/compress/issue-1447.js

@@ -1,45 +0,0 @@
-else_with_empty_block: {
-    options = {}
-    input: {
-        if (x)
-            yes();
-        else {
-        }
-    }
-    expect_exact: "if(x)yes();"
-}
-
-else_with_empty_statement: {
-    options = {}
-    input: {
-        if (x)
-            yes();
-        else
-            ;
-    }
-    expect_exact: "if(x)yes();"
-}
-
-conditional_false_stray_else_in_loop: {
-    options = {
-        booleans: true,
-        comparisons: true,
-        conditionals: false,
-        dead_code: true,
-        evaluate: true,
-        hoist_vars: true,
-        if_return: true,
-        join_vars: true,
-        loops: true,
-        side_effects: true,
-        unused: true,
-    }
-    input: {
-        for (var i = 1; i <= 4; ++i) {
-            if (i <= 2) continue;
-            console.log(i);
-        }
-    }
-    expect_exact: "for(var i=1;i<=4;++i)if(!(i<=2))console.log(i);"
-    expect_stdout: true
-}

test/compress/issue-1569.js

@@ -1,19 +0,0 @@
-inner_reference: {
-    options = {
-        side_effects: true,
-    }
-    input: {
-        !function f(a) {
-            return a && f(a - 1) + a;
-        }(42);
-        !function g(a) {
-            return a;
-        }(42);
-    }
-    expect: {
-        !function f(a) {
-            return a && f(a - 1) + a;
-        }(42);
-        !void 0;
-    }
-}

test/compress/issue-1588.js

@@ -1,87 +0,0 @@
-screw_ie8: {
-    options = {
-        ie8: false,
-    }
-    mangle = {
-        ie8: false,
-    }
-    input: {
-        try { throw "foo"; } catch (x) { console.log(x); }
-    }
-    expect_exact: 'try{throw"foo"}catch(o){console.log(o)}'
-    expect_stdout: [
-        "foo"
-    ]
-}
-
-support_ie8: {
-    options = {
-        ie8: true,
-    }
-    mangle = {
-        ie8: true,
-    }
-    input: {
-        try { throw "foo"; } catch (x) { console.log(x); }
-    }
-    expect_exact: 'try{throw"foo"}catch(x){console.log(x)}'
-    expect_stdout: "foo"
-}
-
-safe_undefined: {
-    options = {
-        conditionals: true,
-        if_return: true,
-        unsafe: false,
-    }
-    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(function(n) {
-            return function() {
-                return a ? b : c ? d : void 0;
-            };
-        }(1)());
-    }
-    expect_stdout: true
-}
-
-unsafe_undefined: {
-    options = {
-        conditionals: true,
-        if_return: true,
-        unsafe_undefined: true,
-    }
-    mangle = {}
-    input: {
-        var a, c;
-        console.log(function(undefined) {
-            return function() {
-                if (a)
-                    return b;
-                if (c)
-                    return d;
-            };
-        }()());
-    }
-    expect: {
-        var a, c;
-        console.log(function(n) {
-            return function() {
-                return a ? b : c ? d : n;
-            };
-        }()());
-    }
-    expect_stdout: true
-}

test/compress/issue-1609.js

@@ -1,54 +0,0 @@
-chained_evaluation_1: {
-    options = {
-        collapse_vars: true,
-        evaluate: true,
-        reduce_funcs: true,
-        reduce_vars: true,
-        unused: true,
-    }
-    input: {
-        (function() {
-            var a = 1;
-            (function() {
-                var b = a, c;
-                c = f(b);
-                c.bar = b;
-            })();
-        })();
-    }
-    expect: {
-        (function() {
-            (function() {
-                f(1).bar = 1;
-            })();
-        })();
-    }
-}
-
-chained_evaluation_2: {
-    options = {
-        collapse_vars: true,
-        evaluate: true,
-        reduce_funcs: true,
-        reduce_vars: true,
-        unused: true,
-    }
-    input: {
-        (function() {
-            var a = "long piece of string";
-            (function() {
-                var b = a, c;
-                c = f(b);
-                c.bar = b;
-            })();
-        })();
-    }
-    expect: {
-        (function() {
-            (function() {
-                var b = "long piece of string";
-                f(b).bar = b;
-            })();
-        })();
-    }
-}

test/compress/issue-1639.js

@@ -1,88 +0,0 @@
-
-issue_1639_1: {
-    options = {
-        booleans: true,
-        collapse_vars: true,
-        conditionals: true,
-        evaluate: true,
-        join_vars: true,
-        loops: true,
-        sequences: true,
-        side_effects: true,
-    }
-    input: {
-        var a = 100, b = 10;
-
-        var L1 = 5;
-        while (--L1 > 0) {
-            if ((--b), false) {
-                if (b) {
-                    var ignore = 0;
-                }
-            }
-        }
-
-        console.log(a, b);
-    }
-    expect: {
-        for (var a = 100, b = 10, L1 = 5; --L1 > 0;)
-            if (--b, 0) var ignore = 0;
-        console.log(a, b);
-    }
-    expect_stdout: true
-}
-
-issue_1639_2: {
-    options = {
-        booleans: true,
-        collapse_vars: true,
-        conditionals: true,
-        evaluate: true,
-        join_vars: true,
-        sequences: true,
-        side_effects: true,
-    }
-    input: {
-        var a = 100, b = 10;
-
-        function f19() {
-            if (++a, false)
-                if (a)
-                    if (++a);
-        }
-        f19();
-
-        console.log(a, b);
-    }
-    expect: {
-        var a = 100, b = 10;
-        function f19() {
-            ++a, 0;
-        }
-        f19(),
-        console.log(a, b);
-    }
-    expect_stdout: true
-}
-
-issue_1639_3: {
-    options = {
-        booleans: true,
-        collapse_vars: true,
-        conditionals: true,
-        evaluate: true,
-        sequences: true,
-        side_effects: true,
-    }
-    input: {
-        var a = 100, b = 10;
-        a++ && false && a ? 0 : 0;
-        console.log(a, b);
-    }
-    expect: {
-        var a = 100, b = 10;
-        a++,
-        console.log(a, b);
-    }
-    expect_stdout: true
-}

test/compress/issue-1656.js

@@ -1,45 +0,0 @@
-f7: {
-    options = {
-        booleans: true,
-        collapse_vars: true,
-        comparisons: true,
-        conditionals: true,
-        dead_code: true,
-        drop_debugger: true,
-        evaluate: true,
-        hoist_funs: true,
-        if_return: true,
-        join_vars: true,
-        loops: true,
-        negate_iife: true,
-        passes: 3,
-        properties: true,
-        reduce_funcs: true,
-        reduce_vars: true,
-        sequences: true,
-        side_effects: true,
-        toplevel: true,
-        unused: true,
-    }
-    beautify = {
-        beautify: true,
-    }
-    input: {
-        var a = 100, b = 10;
-        function f22464() {
-            var brake146670 = 5;
-            while (((b = a) ? !a : ~a ? null : b += a) && --brake146670 > 0) {
-            }
-        }
-        f22464();
-        console.log(a, b);
-    }
-    expect_exact: [
-        "var b = 10;",
-        "",
-        "!function() {",
-        "    b = 100;",
-        "}(), console.log(100, b);",
-    ]
-    expect_stdout: true
-}

test/compress/issue-1673.js

@@ -1,166 +0,0 @@
-side_effects_catch: {
-    options = {
-        reduce_funcs: true,
-        reduce_vars: true,
-        side_effects: true,
-        unused: true,
-    }
-    input: {
-        function f() {
-            function g() {
-                try {
-                    throw 0;
-                } catch (e) {
-                    console.log("PASS");
-                }
-            }
-            g();
-        }
-        f();
-    }
-    expect: {
-        function f() {
-            (function() {
-                try {
-                    throw 0;
-                } catch (e) {
-                    console.log("PASS");
-                }
-            })();
-        }
-        f();
-    }
-    expect_stdout: "PASS"
-}
-
-side_effects_else: {
-    options = {
-        reduce_funcs: true,
-        reduce_vars: true,
-        side_effects: true,
-        unused: true,
-    }
-    input: {
-        function f(x) {
-            function g() {
-                if (x);
-                else console.log("PASS");
-            }
-            g();
-        }
-        f(0);
-    }
-    expect: {
-        function f(x) {
-            (function() {
-                if (x);
-                else console.log("PASS");
-            })();
-        }
-        f(0);
-    }
-    expect_stdout: "PASS"
-}
-
-side_effects_finally: {
-    options = {
-        reduce_funcs: true,
-        reduce_vars: true,
-        side_effects: true,
-        unused: true,
-    }
-    input: {
-        function f() {
-            function g() {
-                try {
-                    x();
-                } catch (e) {
-                } finally {
-                    console.log("PASS");
-                }
-            }
-            g();
-        }
-        f();
-    }
-    expect: {
-        function f() {
-            (function() {
-                try {
-                    x();
-                } catch (e) {
-                } finally {
-                    console.log("PASS");
-                }
-            })();
-        }
-        f();
-    }
-    expect_stdout: "PASS"
-}
-
-side_effects_label: {
-    options = {
-        reduce_funcs: true,
-        reduce_vars: true,
-        side_effects: true,
-        unused: true,
-    }
-    input: {
-        function f(x) {
-            function g() {
-                L: {
-                    console.log("PASS");
-                    break L;
-                }
-            }
-            g();
-        }
-        f(0);
-    }
-    expect: {
-        function f(x) {
-            (function() {
-                L: {
-                    console.log("PASS");
-                    break L;
-                }
-            })();
-        }
-        f(0);
-    }
-    expect_stdout: "PASS"
-}
-
-side_effects_switch: {
-    options = {
-        reduce_funcs: true,
-        reduce_vars: true,
-        side_effects: true,
-        unused: true,
-    }
-    input: {
-        function f() {
-            function g() {
-                switch (0) {
-                  default:
-                  case console.log("PASS"):
-                }
-            }
-            g();
-        }
-        f();
-    }
-    expect: {
-        function f() {
-            (function() {
-                switch (0) {
-                  default:
-                  case console.log("PASS"):
-                }
-            })();
-        }
-        f();
-    }
-    expect_stdout: "PASS"
-}

test/compress/issue-1704.js

@@ -1,439 +0,0 @@
-mangle_catch: {
-    options = {
-        ie8: false,
-        toplevel: false,
-    }
-    mangle = {
-        ie8: false,
-        toplevel: false,
-    }
-    input: {
-        var a = "FAIL";
-        try {
-            throw 1;
-        } catch (args) {
-            a = "PASS";
-        }
-        console.log(a);
-    }
-    expect_exact: 'var a="FAIL";try{throw 1}catch(o){a="PASS"}console.log(a);'
-    expect_stdout: "PASS"
-}
-
-mangle_catch_ie8: {
-    options = {
-        ie8: true,
-        toplevel: false,
-    }
-    mangle = {
-        ie8: true,
-        toplevel: false,
-    }
-    input: {
-        var a = "FAIL";
-        try {
-            throw 1;
-        } catch (args) {
-            a = "PASS";
-        }
-        console.log(a);
-    }
-    expect_exact: 'var a="FAIL";try{throw 1}catch(args){a="PASS"}console.log(a);'
-    expect_stdout: "PASS"
-}
-
-mangle_catch_var: {
-    options = {
-        ie8: false,
-        toplevel: false,
-    }
-    mangle = {
-        ie8: false,
-        toplevel: false,
-    }
-    input: {
-        var a = "FAIL";
-        try {
-            throw 1;
-        } catch (args) {
-            var a = "PASS";
-        }
-        console.log(a);
-    }
-    expect_exact: 'var a="FAIL";try{throw 1}catch(o){var a="PASS"}console.log(a);'
-    expect_stdout: "PASS"
-}
-
-mangle_catch_var_ie8: {
-    options = {
-        ie8: true,
-        toplevel: false,
-    }
-    mangle = {
-        ie8: true,
-        toplevel: false,
-    }
-    input: {
-        var a = "FAIL";
-        try {
-            throw 1;
-        } catch (args) {
-            var a = "PASS";
-        }
-        console.log(a);
-    }
-    expect_exact: 'var a="FAIL";try{throw 1}catch(args){var a="PASS"}console.log(a);'
-    expect_stdout: "PASS"
-}
-
-mangle_catch_toplevel: {
-    options = {
-        ie8: false,
-        toplevel: true,
-    }
-    mangle = {
-        ie8: false,
-        toplevel: true,
-    }
-    input: {
-        var a = "FAIL";
-        try {
-            throw 1;
-        } catch (args) {
-            a = "PASS";
-        }
-        console.log(a);
-    }
-    expect_exact: 'var c="FAIL";try{throw 1}catch(o){c="PASS"}console.log(c);'
-    expect_stdout: "PASS"
-}
-
-mangle_catch_ie8_toplevel: {
-    options = {
-        ie8: true,
-        toplevel: true,
-    }
-    mangle = {
-        ie8: true,
-        toplevel: true,
-    }
-    input: {
-        var a = "FAIL";
-        try {
-            throw 1;
-        } catch (args) {
-            a = "PASS";
-        }
-        console.log(a);
-    }
-    expect_exact: 'var o="FAIL";try{throw 1}catch(c){o="PASS"}console.log(o);'
-    expect_stdout: "PASS"
-}
-
-mangle_catch_var_toplevel: {
-    options = {
-        ie8: false,
-        toplevel: true,
-    }
-    mangle = {
-        ie8: false,
-        toplevel: true,
-    }
-    input: {
-        var a = "FAIL";
-        try {
-            throw 1;
-        } catch (args) {
-            var a = "PASS";
-        }
-        console.log(a);
-    }
-    expect_exact: 'var r="FAIL";try{throw 1}catch(o){var r="PASS"}console.log(r);'
-    expect_stdout: "PASS"
-}
-
-mangle_catch_var_ie8_toplevel: {
-    options = {
-        ie8: true,
-        toplevel: true,
-    }
-    mangle = {
-        ie8: true,
-        toplevel: true,
-    }
-    input: {
-        var a = "FAIL";
-        try {
-            throw 1;
-        } catch (args) {
-            var a = "PASS";
-        }
-        console.log(a);
-    }
-    expect_exact: 'var o="FAIL";try{throw 1}catch(r){var o="PASS"}console.log(o);'
-    expect_stdout: "PASS"
-}
-
-mangle_catch_redef_1: {
-    options = {
-        ie8: false,
-        toplevel: false,
-    }
-    mangle = {
-        ie8: false,
-        toplevel: false,
-    }
-    input: {
-        var a = "PASS";
-        try {
-            throw "FAIL1";
-        } catch (a) {
-            var a = "FAIL2";
-        }
-        console.log(a);
-    }
-    expect_exact: 'var a="PASS";try{throw"FAIL1"}catch(a){var a="FAIL2"}console.log(a);'
-    expect_stdout: "PASS"
-}
-
-mangle_catch_redef_1_ie8: {
-    options = {
-        ie8: true,
-        toplevel: false,
-    }
-    mangle = {
-        ie8: true,
-        toplevel: false,
-    }
-    input: {
-        var a = "PASS";
-        try {
-            throw "FAIL1";
-        } catch (a) {
-            var a = "FAIL2";
-        }
-        console.log(a);
-    }
-    expect_exact: 'var a="PASS";try{throw"FAIL1"}catch(a){var a="FAIL2"}console.log(a);'
-    expect_stdout: "PASS"
-}
-
-mangle_catch_redef_1_toplevel: {
-    options = {
-        ie8: false,
-        toplevel: true,
-    }
-    mangle = {
-        ie8: false,
-        toplevel: true,
-    }
-    input: {
-        var a = "PASS";
-        try {
-            throw "FAIL1";
-        } catch (a) {
-            var a = "FAIL2";
-        }
-        console.log(a);
-    }
-    expect_exact: 'var o="PASS";try{throw"FAIL1"}catch(o){var o="FAIL2"}console.log(o);'
-    expect_stdout: "PASS"
-}
-
-mangle_catch_redef_1_ie8_toplevel: {
-    options = {
-        ie8: true,
-        toplevel: true,
-    }
-    mangle = {
-        ie8: true,
-        toplevel: true,
-    }
-    input: {
-        var a = "PASS";
-        try {
-            throw "FAIL1";
-        } catch (a) {
-            var a = "FAIL2";
-        }
-        console.log(a);
-    }
-    expect_exact: 'var o="PASS";try{throw"FAIL1"}catch(o){var o="FAIL2"}console.log(o);'
-    expect_stdout: "PASS"
-}
-
-mangle_catch_redef_2: {
-    options = {
-        ie8: false,
-        toplevel: false,
-    }
-    mangle = {
-        ie8: false,
-        toplevel: false,
-    }
-    input: {
-        try {
-            throw "FAIL1";
-        } catch (a) {
-            var a = "FAIL2";
-        }
-        console.log(a);
-    }
-    expect_exact: 'try{throw"FAIL1"}catch(a){var a="FAIL2"}console.log(a);'
-    expect_stdout: "undefined"
-}
-
-mangle_catch_redef_2_ie8: {
-    options = {
-        ie8: true,
-        toplevel: false,
-    }
-    mangle = {
-        ie8: true,
-        toplevel: false,
-    }
-    input: {
-        try {
-            throw "FAIL1";
-        } catch (a) {
-            var a = "FAIL2";
-        }
-        console.log(a);
-    }
-    expect_exact: 'try{throw"FAIL1"}catch(a){var a="FAIL2"}console.log(a);'
-    expect_stdout: "undefined"
-}
-
-mangle_catch_redef_2_toplevel: {
-    options = {
-        ie8: false,
-        toplevel: true,
-    }
-    mangle = {
-        ie8: false,
-        toplevel: true,
-    }
-    input: {
-        try {
-            throw "FAIL1";
-        } catch (a) {
-            var a = "FAIL2";
-        }
-        console.log(a);
-    }
-    expect_exact: 'try{throw"FAIL1"}catch(o){var o="FAIL2"}console.log(o);'
-    expect_stdout: "undefined"
-}
-
-mangle_catch_redef_2_ie8_toplevel: {
-    options = {
-        ie8: true,
-        toplevel: true,
-    }
-    mangle = {
-        ie8: true,
-        toplevel: true,
-    }
-    input: {
-        try {
-            throw "FAIL1";
-        } catch (a) {
-            var a = "FAIL2";
-        }
-        console.log(a);
-    }
-    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

@@ -1,97 +0,0 @@
-function_iife_catch: {
-    mangle = {
-        ie8: false,
-    }
-    input: {
-        function f(n) {
-            !function() {
-                try {
-                    throw 0;
-                } catch (n) {
-                    var a = 1;
-                    console.log(n, a);
-                }
-            }();
-        }
-        f();
-    }
-    expect_exact: "function f(o){!function(){try{throw 0}catch(o){var c=1;console.log(o,c)}}()}f();"
-    expect_stdout: "0 1"
-}
-
-function_iife_catch_ie8: {
-    mangle = {
-        ie8: true,
-    }
-    input: {
-        function f(n) {
-            !function() {
-                try {
-                    throw 0;
-                } catch (n) {
-                    var a = 1;
-                    console.log(n, a);
-                }
-            }();
-        }
-        f();
-    }
-    expect_exact: "function f(c){!function(){try{throw 0}catch(c){var o=1;console.log(c,o)}}()}f();"
-    expect_stdout: "0 1"
-}
-
-function_catch_catch: {
-    mangle = {
-        ie8: false,
-    }
-    input: {
-        var o = 0;
-        function f() {
-            try {
-                throw 1;
-            } catch (c) {
-                try {
-                    throw 2;
-                } catch (o) {
-                    var o = 3;
-                    console.log(o);
-                }
-            }
-            console.log(o);
-        }
-        f();
-    }
-    expect_exact: "var o=0;function f(){try{throw 1}catch(o){try{throw 2}catch(c){var c=3;console.log(c)}}console.log(c)}f();"
-    expect_stdout: [
-        "3",
-        "undefined",
-    ]
-}
-
-function_catch_catch_ie8: {
-    mangle = {
-        ie8: true,
-    }
-    input: {
-        var o = 0;
-        function f() {
-            try {
-                throw 1;
-            } catch (c) {
-                try {
-                    throw 2;
-                } catch (o) {
-                    var o = 3;
-                    console.log(o);
-                }
-            }
-            console.log(o);
-        }
-        f();
-    }
-    expect_exact: "var o=0;function f(){try{throw 1}catch(c){try{throw 2}catch(o){var o=3;console.log(o)}}console.log(o)}f();"
-    expect_stdout: [
-        "3",
-        "undefined",
-    ]
-}

test/compress/issue-1750.js

@@ -1,54 +0,0 @@
-case_1: {
-    options = {
-        dead_code: true,
-        evaluate: true,
-        switches: true,
-    }
-    input: {
-        var a = 0, b = 1;
-        switch (true) {
-          case a || true:
-          default:
-            b = 2;
-          case true:
-        }
-        console.log(a, b);
-    }
-    expect: {
-        var a = 0, b = 1;
-        switch (true) {
-          case a || true:
-            b = 2;
-        }
-        console.log(a, b);
-    }
-    expect_stdout: "0 2"
-}
-
-case_2: {
-    options = {
-        dead_code: true,
-        evaluate: true,
-        switches: true,
-    }
-    input: {
-        var a = 0, b = 1;
-        switch (0) {
-          default:
-            b = 2;
-          case a:
-            a = 3;
-          case 0:
-        }
-        console.log(a, b);
-    }
-    expect: {
-        var a = 0, b = 1;
-        switch (0) {
-          case a:
-            a = 3;
-        }
-        console.log(a, b);
-    }
-    expect_stdout: "3 1"
-}

test/compress/issue-1770.js

@@ -1,245 +0,0 @@
-mangle_props: {
-    mangle = {
-        properties: true,
-    }
-    input: {
-        var obj = {
-            undefined: 1,
-            NaN: 2,
-            Infinity: 3,
-            "-Infinity": 4,
-            null: 5,
-        };
-        console.log(
-            obj[void 0],
-            obj[undefined],
-            obj["undefined"],
-            obj[0/0],
-            obj[NaN],
-            obj["NaN"],
-            obj[1/0],
-            obj[Infinity],
-            obj["Infinity"],
-            obj[-1/0],
-            obj[-Infinity],
-            obj["-Infinity"],
-            obj[null],
-            obj["null"]
-        );
-    }
-    expect: {
-        var obj = {
-            undefined: 1,
-            NaN: 2,
-            Infinity: 3,
-            "-Infinity": 4,
-            null: 5,
-        };
-        console.log(
-            obj[void 0],
-            obj[void 0],
-            obj["undefined"],
-            obj[0/0],
-            obj[NaN],
-            obj["NaN"],
-            obj[1/0],
-            obj[1/0],
-            obj["Infinity"],
-            obj[-1/0],
-            obj[-1/0],
-            obj["-Infinity"],
-            obj[null],
-            obj["null"]
-        );
-    }
-    expect_stdout: "1 1 1 2 2 2 3 3 3 4 4 4 5 5"
-}
-
-numeric_literal: {
-    mangle = {
-        properties: true,
-    }
-    beautify = {
-        beautify: true,
-    }
-    input: {
-        var obj = {
-            0: 0,
-            "-0": 1,
-            42: 2,
-            "42": 3,
-            0x25: 4,
-            "0x25": 5,
-            1E42: 6,
-            "1E42": 7,
-            "1e+42": 8,
-        };
-        console.log(obj[-0], obj[-""], obj["-0"]);
-        console.log(obj[42], obj["42"]);
-        console.log(obj[0x25], obj["0x25"], obj[37], obj["37"]);
-        console.log(obj[1E42], obj["1E42"], obj["1e+42"]);
-    }
-    expect_exact: [
-        'var obj = {',
-        '    0: 0,',
-        '    "-0": 1,',
-        '    42: 2,',
-        '    42: 3,',
-        '    37: 4,',
-        '    o: 5,',
-        '    1e42: 6,',
-        '    b: 7,',
-        '    1e42: 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[1e42], obj["b"], obj["1e+42"]);',
-    ]
-    expect_stdout: [
-        "0 0 1",
-        "3 3",
-        "4 5 4 4",
-        "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,17 +0,0 @@
-unary_prefix: {
-    options = {
-        evaluate: true,
-        inline: true,
-        reduce_funcs: true,
-        reduce_vars: true,
-        unused: true,
-    }
-    input: {
-        console.log(function() {
-            var x = -(2 / 3);
-            return x;
-        }());
-    }
-    expect_exact: "console.log(-2/3);"
-    expect_stdout: true
-}

test/compress/issue-1833.js

@@ -1,138 +0,0 @@
-iife_for: {
-    options = {
-        negate_iife: true,
-        reduce_funcs: true,
-        reduce_vars: true,
-        toplevel: true,
-        unused: true,
-    }
-    input: {
-        function f() {
-            function g() {
-                L: for (;;) break L;
-            }
-            g();
-        }
-        f();
-    }
-    expect: {
-        !function() {
-            !function() {
-                L: for (;;) break L;
-            }();
-        }();
-    }
-}
-
-iife_for_in: {
-    options = {
-        negate_iife: true,
-        reduce_funcs: true,
-        reduce_vars: true,
-        toplevel: true,
-        unused: true,
-    }
-    input: {
-        function f() {
-            function g() {
-                L: for (var a in x) break L;
-            }
-            g();
-        }
-        f();
-    }
-    expect: {
-        !function() {
-            !function() {
-                L: for (var a in x) break L;
-            }();
-        }();
-    }
-}
-
-iife_do: {
-    options = {
-        negate_iife: true,
-        reduce_funcs: true,
-        reduce_vars: true,
-        toplevel: true,
-        unused: true,
-    }
-    input: {
-        function f() {
-            function g() {
-                L: do {
-                    break L;
-                } while (1);
-            }
-            g();
-        }
-        f();
-    }
-    expect: {
-        !function() {
-            !function() {
-                L: do {
-                    break L;
-                } while (1);
-            }();
-        }();
-    }
-}
-
-iife_while: {
-    options = {
-        negate_iife: true,
-        reduce_funcs: true,
-        reduce_vars: true,
-        toplevel: true,
-        unused: true,
-    }
-    input: {
-        function f() {
-            function g() {
-                L: while (1) break L;
-            }
-            g();
-        }
-        f();
-    }
-    expect: {
-        !function() {
-            !function() {
-                L: while (1) break L;
-            }();
-        }();
-    }
-}
-
-label_do: {
-    options = {
-        evaluate: true,
-        loops: true,
-    }
-    input: {
-        L: do {
-            continue L;
-        } while (0);
-    }
-    expect: {
-        L: do {
-            continue L;
-        } while (0);
-    }
-}
-
-label_while: {
-    options = {
-        dead_code: true,
-        evaluate: true,
-        loops: true,
-    }
-    input: {
-        function f() {
-            L: while (0) continue L;
-        }
-    }
-    expect_exact: "function f(){L:0}"
-}

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-208.js

@@ -1,74 +0,0 @@
-do_not_update_lhs: {
-    options = {
-        global_defs: {
-            DEBUG: 0,
-        },
-    }
-    input: {
-        DEBUG++;
-        DEBUG += 1;
-        DEBUG = 1;
-    }
-    expect: {
-        DEBUG++;
-        DEBUG += 1;
-        DEBUG = 1;
-    }
-}
-
-do_update_rhs: {
-    options = {
-        global_defs: {
-            DEBUG: 0,
-        },
-    }
-    input: {
-        MY_DEBUG = DEBUG;
-        MY_DEBUG += DEBUG;
-    }
-    expect: {
-        MY_DEBUG = 0;
-        MY_DEBUG += 0;
-    }
-}
-
-mixed: {
-    options = {
-        evaluate: true,
-        global_defs: {
-            DEBUG: 0,
-            ENV: 1,
-            FOO: 2,
-        },
-    }
-    input: {
-        var ENV = 3;
-        var FOO = 4;
-        f(ENV * 10);
-        --FOO;
-        DEBUG = 1;
-        DEBUG++;
-        DEBUG += 1;
-        f(DEBUG);
-        x = DEBUG;
-    }
-    expect: {
-        var ENV = 3;
-        var FOO = 4;
-        f(10);
-        --FOO;
-        DEBUG = 1;
-        DEBUG++;
-        DEBUG += 1;
-        f(0);
-        x = 0;
-    }
-    expect_warnings: [
-        "WARN: global_defs ENV redefined [test/compress/issue-208.js:1,12]",
-        "WARN: global_defs FOO redefined [test/compress/issue-208.js:2,12]",
-        "WARN: global_defs FOO redefined [test/compress/issue-208.js:4,10]",
-        "WARN: global_defs DEBUG redefined [test/compress/issue-208.js:5,8]",
-        "WARN: global_defs DEBUG redefined [test/compress/issue-208.js:6,8]",
-        "WARN: global_defs DEBUG redefined [test/compress/issue-208.js:7,8]",
-    ]
-}

test/compress/issue-22.js

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

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-267.js

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

test/compress/issue-269.js

@@ -1,7 +1,5 @@
 issue_269_1: {
-	options = {
-        unsafe: true,
-    }
+	options = {unsafe: true};
 	input: {
 		f(
 			String(x),
@@ -22,9 +20,7 @@ issue_269_1: {
 }
 
 issue_269_dangers: {
-	options = {
-        unsafe: true,
-    }
+	options = {unsafe: true};
 	input: {
 		f(
 			String(x, x),
@@ -38,9 +34,7 @@ issue_269_dangers: {
 }
 
 issue_269_in_scope: {
-	options = {
-        unsafe: true,
-    }
+	options = {unsafe: true};
 	input: {
 		var String, Number, Boolean;
 		f(
@@ -56,9 +50,7 @@ issue_269_in_scope: {
 }
 
 strings_concat: {
-	options = {
-        unsafe: true,
-    }
+	options = {unsafe: true};
 	input: {
 		f(
 			String(x + 'str'),
@@ -72,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:5,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.prototype.caller not supported [test/compress/issue-2719.js:5,19]",
-        "WARN: Function.prototype.arguments not supported [test/compress/issue-2719.js:5,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,55 +0,0 @@
-collapse: {
-    options = {
-        collapse_vars: true,
-        sequences: true,
-        side_effects: true,
-        unused: true,
-    }
-    input: {
-        function f1() {
-            var a;
-            a = typeof b === 'function' ? b() : b;
-            return a !== undefined && c();
-        }
-        function f2(b) {
-            var a;
-            b = c();
-            a = typeof b === 'function' ? b() : b;
-            return 'stirng' == typeof a && d();
-        }
-        function f3(c) {
-            var a;
-            a = b(a / 2);
-            if (a < 0) {
-                a++;
-                ++c;
-                return c / 2;
-            }
-        }
-        function f4(c) {
-            var a;
-            a = b(a / 2);
-            if (a < 0) {
-                a++;
-                c++;
-                return c / 2;
-            }
-        }
-    }
-    expect: {
-        function f1() {
-            return void 0 !== ('function' === typeof b ? b() : b) && c();
-        }
-        function f2(b) {
-            return 'stirng' == typeof ('function' === typeof (b = c()) ? b() : b) && d();
-        }
-        function f3(c) {
-            var a;
-            if ((a = b(a / 2)) < 0) return a++, ++c / 2;
-        }
-        function f4(c) {
-            var a;
-            if ((a = b(a / 2)) < 0) return a++, ++c / 2;
-        }
-    }
-}

test/compress/issue-44.js

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

test/compress/issue-59.js

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

test/compress/issue-597.js

@@ -1,157 +1,25 @@
 NaN_and_Infinity_must_have_parens: {
-    options = {}
+    options = {};
     input: {
         Infinity.toString();
         NaN.toString();
     }
     expect: {
-        (1/0).toString();
-        NaN.toString();
-    }
-}
-
-NaN_and_Infinity_should_not_be_replaced_when_they_are_redefined: {
-    options = {}
-    input: {
-        var Infinity, NaN;
-        Infinity.toString();
-        NaN.toString();
-    }
-    expect: {
-        var Infinity, NaN;
-        Infinity.toString();
-        NaN.toString();
-    }
-}
-
-NaN_and_Infinity_must_have_parens_evaluate: {
-    options = {
-        evaluate: true,
-    }
-    input: {
-        (123456789 / 0).toString();
-        (+"foo").toString();
-    }
-    expect: {
-        (1/0).toString();
-        NaN.toString();
-    }
-}
-
-NaN_and_Infinity_should_not_be_replaced_when_they_are_redefined_evaluate: {
-    options = {
-        evaluate: true,
-    }
-    input: {
-        var Infinity, NaN;
-        (123456789 / 0).toString();
-        (+"foo").toString();
-    }
-    expect: {
-        var Infinity, NaN;
         (1/0).toString();
         (0/0).toString();
     }
 }
 
-beautify_off_1: {
-    options = {
-        evaluate: true,
-    }
-    beautify = {
-        beautify: false,
-    }
+NaN_and_Infinity_should_not_be_replaced_when_they_are_redefined: {
+    options = {};
     input: {
-        var NaN;
-        console.log(
-            null,
-            undefined,
-            Infinity,
-            NaN,
-            Infinity * undefined,
-            Infinity.toString(),
-            NaN.toString(),
-            (Infinity * undefined).toString()
-        );
+        var Infinity, NaN;
+        Infinity.toString();
+        NaN.toString();
+    }
+    expect: {
+        var Infinity, NaN;
+        Infinity.toString();
+        NaN.toString();
     }
-    expect_exact: "var NaN;console.log(null,void 0,1/0,NaN,0/0,(1/0).toString(),NaN.toString(),(0/0).toString());"
-    expect_stdout: true
-}
-
-beautify_off_2: {
-    options = {
-        evaluate: true,
-    }
-    beautify = {
-        beautify: false,
-    }
-    input: {
-        console.log(
-            null.toString(),
-            undefined.toString()
-        );
-    }
-    expect_exact: "console.log(null.toString(),(void 0).toString());"
-}
-
-beautify_on_1: {
-    options = {
-        evaluate: true,
-    }
-    beautify = {
-        beautify: true,
-    }
-    input: {
-        var NaN;
-        console.log(
-            null,
-            undefined,
-            Infinity,
-            NaN,
-            Infinity * undefined,
-            Infinity.toString(),
-            NaN.toString(),
-            (Infinity * undefined).toString()
-        );
-    }
-    expect_exact: [
-        "var NaN;",
-        "",
-        "console.log(null, void 0, 1 / 0, NaN, 0 / 0, (1 / 0).toString(), NaN.toString(), (0 / 0).toString());",
-    ]
-    expect_stdout: true
-}
-
-beautify_on_2: {
-    options = {
-        evaluate: true,
-    }
-    beautify = {
-        beautify: true,
-    }
-    input: {
-        console.log(
-            null.toString(),
-            undefined.toString()
-        );
-    }
-    expect_exact: "console.log(null.toString(), (void 0).toString());"
-}
-
-issue_1724: {
-    input: {
-        var a = 0;
-        ++a % Infinity | Infinity ? a++ : 0;
-        console.log(a);
-    }
-    expect_exact: "var a=0;++a%(1/0)|1/0?a++:0;console.log(a);"
-    expect_stdout: "2"
-}
-
-issue_1725: {
-    input: {
-        ([].length === 0) % Infinity ? console.log("PASS") : console.log("FAIL");
-    }
-    expect_exact: '(0===[].length)%(1/0)?console.log("PASS"):console.log("FAIL");'
-    expect_stdout: "PASS"
 }

test/compress/issue-611.js

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

test/compress/issue-637.js

@@ -1,9 +1,9 @@
 wrongly_optimized: {
     options = {
-        booleans: true,
         conditionals: true,
-        evaluate: true,
-    }
+        booleans: true,
+        evaluate: true
+    };
     input: {
         function func() {
             foo();
@@ -17,6 +17,6 @@ wrongly_optimized: {
             foo();
         }
         // TODO: optimize to `func(), bar()`
-        (func(), 1) && bar();
+        (func(), 0) || bar();
     }
 }

test/compress/issue-640.js

@@ -1,322 +0,0 @@
-cond_5: {
-    options = {
-        conditionals: true,
-        expression: true,
-    }
-    input: {
-        if (some_condition()) {
-            if (some_other_condition()) {
-                do_something();
-            } else {
-                alternate();
-            }
-        } else {
-            alternate();
-        }
-
-        if (some_condition()) {
-            if (some_other_condition()) {
-                do_something();
-            }
-        }
-    }
-    expect: {
-        some_condition() && some_other_condition() ? do_something() : alternate();
-        if (some_condition() && some_other_condition()) do_something();
-    }
-}
-
-dead_code_const_annotation_regex: {
-    options = {
-        booleans: true,
-        conditionals: true,
-        dead_code: true,
-        evaluate: true,
-        expression: true,
-        loops: true,
-    }
-    input: {
-        var unused;
-        // @constraint this shouldn't be a constant
-        var CONST_FOO_ANN = false;
-        if (CONST_FOO_ANN) {
-            console.log("reachable");
-        }
-    }
-    expect: {
-        var unused;
-        var CONST_FOO_ANN = !1;
-        if (CONST_FOO_ANN) console.log('reachable');
-    }
-    expect_stdout: true
-}
-
-drop_console_2: {
-    options = {
-        drop_console: true,
-        expression: true,
-    }
-    input: {
-        console.log('foo');
-        console.log.apply(console, arguments);
-    }
-    expect: {
-        // with regular compression these will be stripped out as well
-        void 0;
-        void 0;
-    }
-}
-
-drop_value: {
-    options = {
-        expression: true,
-        side_effects: true,
-    }
-    input: {
-        (1, [2, foo()], 3, {a:1, b:bar()});
-    }
-    expect: {
-        foo(), {a:1, b:bar()};
-    }
-}
-
-wrongly_optimized: {
-    options = {
-        booleans: true,
-        conditionals: true,
-        evaluate: true,
-        expression: true,
-    }
-    input: {
-        function func() {
-            foo();
-        }
-        if (func() || true) {
-            bar();
-        }
-    }
-    expect: {
-        function func() {
-            foo();
-        }
-        // TODO: optimize to `func(), bar()`
-        if (func(), 1) bar();
-    }
-}
-
-negate_iife_1: {
-    options = {
-        expression: true,
-        negate_iife: true,
-    }
-    input: {
-        (function(){ stuff() })();
-    }
-    expect: {
-        (function(){ stuff() })();
-    }
-}
-
-negate_iife_3: {
-    options = {
-        conditionals: true,
-        expression: true,
-        negate_iife: true,
-    }
-    input: {
-        (function(){ return t })() ? console.log(true) : console.log(false);
-    }
-    expect: {
-        (function(){ return t })() ? console.log(true) : console.log(false);
-    }
-}
-
-negate_iife_3_off: {
-    options = {
-        conditionals: true,
-        expression: true,
-        negate_iife: false,
-    }
-    input: {
-        (function(){ return t })() ? console.log(true) : console.log(false);
-    }
-    expect: {
-        (function(){ return t })() ? console.log(true) : console.log(false);
-    }
-}
-
-negate_iife_4: {
-    options = {
-        conditionals: true,
-        expression: true,
-        negate_iife: true,
-        sequences: true,
-    }
-    input: {
-        (function(){ return t })() ? console.log(true) : console.log(false);
-        (function(){
-            console.log("something");
-        })();
-    }
-    expect: {
-        !function(){ return t }() ? console.log(false) : console.log(true), function(){
-            console.log("something");
-        }();
-    }
-}
-
-negate_iife_5: {
-    options = {
-        conditionals: true,
-        expression: true,
-        negate_iife: true,
-        sequences: true,
-    }
-    input: {
-        if ((function(){ return t })()) {
-            foo(true);
-        } else {
-            bar(false);
-        }
-        (function(){
-            console.log("something");
-        })();
-    }
-    expect: {
-        !function(){ return t }() ? bar(false) : foo(true), function(){
-            console.log("something");
-        }();
-    }
-}
-
-negate_iife_5_off: {
-    options = {
-        conditionals: true,
-        expression: true,
-        negate_iife: false,
-        sequences: true,
-    }
-    input: {
-        if ((function(){ return t })()) {
-            foo(true);
-        } else {
-            bar(false);
-        }
-        (function(){
-            console.log("something");
-        })();
-    }
-    expect: {
-        !function(){ return t }() ? bar(false) : foo(true), function(){
-            console.log("something");
-        }();
-    }
-}
-
-issue_1254_negate_iife_true: {
-    options = {
-        expression: true,
-        negate_iife: true,
-    }
-    input: {
-        (function() {
-            return function() {
-                console.log('test')
-            };
-        })()();
-    }
-    expect_exact: '(function(){return function(){console.log("test")}})()();'
-    expect_stdout: true
-}
-
-issue_1254_negate_iife_nested: {
-    options = {
-        expression: true,
-        negate_iife: true,
-    }
-    input: {
-        (function() {
-            return function() {
-                console.log('test')
-            };
-        })()()()()();
-    }
-    expect_exact: '(function(){return function(){console.log("test")}})()()()()();'
-    expect_stdout: true
-}
-
-conditional: {
-    options = {
-        expression: true,
-        pure_funcs: [
-            "pure"
-        ],
-        side_effects: true,
-    }
-    input: {
-        pure(1 | a() ? 2 & b() : 7 ^ c());
-        pure(1 | a() ? 2 & b() : 5);
-        pure(1 | a() ? 4 : 7 ^ c());
-        pure(1 | a() ? 4 : 5);
-        pure(3 ? 2 & b() : 7 ^ c());
-        pure(3 ? 2 & b() : 5);
-        pure(3 ? 4 : 7 ^ c());
-        pure(3 ? 4 : 5);
-    }
-    expect: {
-        1 | a() ? b() : c();
-        1 | a() && b();
-        1 | a() || c();
-        a();
-        3 ? b() : c();
-        3 && b();
-        3 || c();
-        pure(3 ? 4 : 5);
-    }
-}
-
-limit_1: {
-    options = {
-        expression: true,
-        sequences: 3,
-    }
-    input: {
-        a;
-        b;
-        c;
-        d;
-        e;
-        f;
-        g;
-        h;
-        i;
-        j;
-        k;
-    }
-    expect: {
-        // Turned into a single return statement
-        // so it can no longer be split into lines
-        a,b,c,d,e,f,g,h,i,j,k;
-    }
-}
-
-iife: {
-    options = {
-        expression: true,
-        sequences: true,
-    }
-    input: {
-        x = 42;
-        (function a() {})();
-        !function b() {}();
-        ~function c() {}();
-        +function d() {}();
-        -function e() {}();
-        void function f() {}();
-        typeof function g() {}();
-    }
-    expect: {
-        x = 42, function a() {}(), function b() {}(), function c() {}(),
-        function d() {}(), function e() {}(), function f() {}(), typeof function g() {}();
-    }
-}

test/compress/issue-747.js

@@ -1,45 +0,0 @@
-dont_reuse_prop: {
-    mangle = {
-        properties: {
-            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/,
-        },
-    }
-    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-751.js

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

test/compress/issue-782.js

@@ -1,51 +0,0 @@
-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,
-    }
-    input: {
-        "use strict";
-        (0, 1, eval)();
-        (0, 1, logThis)();
-        (0, 1, _decorators.logThis)();
-    }
-    expect: {
-        "use strict";
-        (0, eval)();
-        logThis();
-        (0, _decorators.logThis)();
-    }
-}
-
-dont_remove_this_binding_sequence: {
-    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

@@ -1,32 +0,0 @@
-dont_mangle_arguments: {
-    mangle = {
-    };
-    options = {
-        booleans: true,
-        comparisons: true,
-        conditionals: true,
-        dead_code: true,
-        drop_debugger: true,
-        evaluate: true,
-        hoist_funs: true,
-        hoist_vars: true,
-        if_return: true,
-        join_vars: true,
-        keep_fargs: true,
-        keep_fnames: false,
-        loops: true,
-        negate_iife: false,
-        properties: true,
-        sequences: true,
-        side_effects: true,
-        unused: true,
-    }
-    input: {
-        (function(){
-            var arguments = arguments, not_arguments = 9;
-            console.log(not_arguments, arguments);
-        })(5,6,7);
-    }
-    expect_exact: "(function(){var arguments=arguments,o=9;console.log(o,arguments)})(5,6,7);"
-    expect_stdout: true
-}

test/compress/issue-913.js

@@ -1,20 +0,0 @@
-keep_var_for_in: {
-    options = {
-        hoist_vars: true,
-        unused: true,
-    }
-    input: {
-        (function(obj){
-            var foo = 5;
-            for (var i in obj)
-                return foo;
-        })();
-    }
-    expect: {
-        (function(obj){
-            var i, foo = 5;
-            for (i in obj)
-                return foo;
-        })();
-    }
-}

test/compress/issue-973.js

@@ -1,160 +0,0 @@
-this_binding_conditionals: {
-    options = {
-        conditionals: true,
-        evaluate: true,
-        side_effects: true,
-    }
-    input: {
-        "use strict";
-        (1 && a)();
-        (0 || a)();
-        (0 || 1 && a)();
-        (1 ? a : 0)();
-
-        (1 && a.b)();
-        (0 || a.b)();
-        (0 || 1 && a.b)();
-        (1 ? a.b : 0)();
-
-        (1 && a[b])();
-        (0 || a[b])();
-        (0 || 1 && a[b])();
-        (1 ? a[b] : 0)();
-
-        (1 && eval)();
-        (0 || eval)();
-        (0 || 1 && eval)();
-        (1 ? eval : 0)();
-    }
-    expect: {
-        "use strict";
-        a();
-        a();
-        a();
-        a();
-
-        (0, a.b)();
-        (0, a.b)();
-        (0, a.b)();
-        (0, a.b)();
-
-        (0, a[b])();
-        (0, a[b])();
-        (0, a[b])();
-        (0, a[b])();
-
-        (0, eval)();
-        (0, eval)();
-        (0, eval)();
-        (0, eval)();
-    }
-}
-
-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)();
-    }
-}
-
-this_binding_side_effects: {
-    options = {
-        side_effects: true,
-    }
-    input: {
-        (function(foo) {
-            (0, foo)();
-            (0, foo.bar)();
-            (0, eval)("console.log(foo);");
-        }());
-        (function(foo) {
-            "use strict";
-            (0, foo)();
-            (0, foo.bar)();
-            (0, eval)("console.log(foo);");
-        }());
-        (function(foo) {
-            var eval = console;
-            (0, foo)();
-            (0, foo.bar)();
-            (0, eval)("console.log(foo);");
-        }());
-    }
-    expect: {
-        (function(foo) {
-            foo();
-            (0, foo.bar)();
-            eval("console.log(foo);");
-        }());
-        (function(foo) {
-            "use strict";
-            foo();
-            (0, foo.bar)();
-            (0, eval)("console.log(foo);");
-        }());
-        (function(foo) {
-            var eval = console;
-            foo();
-            (0, foo.bar)();
-            eval("console.log(foo);");
-        }());
-    }
-}
-
-this_binding_sequences: {
-    options = {
-        sequences: true,
-        side_effects: true,
-    }
-    input: {
-        console.log(typeof function() {
-            return eval("this");
-        }());
-        console.log(typeof function() {
-            "use strict";
-            return eval("this");
-        }());
-        console.log(typeof function() {
-            return (0, eval)("this");
-        }());
-        console.log(typeof function() {
-            "use strict";
-            return (0, eval)("this");
-        }());
-    }
-    expect: {
-        console.log(typeof function() {
-            return eval("this");
-        }()),
-        console.log(typeof function() {
-            "use strict";
-            return eval("this");
-        }()),
-        console.log(typeof function() {
-            return eval("this");
-        }()),
-        console.log(typeof function() {
-            "use strict";
-            return (0, eval)("this");
-        }());
-    }
-    expect_stdout: [
-        "object",
-        "undefined",
-        "object",
-        "object",
-    ]
-}

test/compress/issue-976.js

@@ -1,104 +0,0 @@
-eval_collapse_vars: {
-    options = {
-        booleans: true,
-        collapse_vars: true,
-        comparisons: true,
-        conditionals: true,
-        dead_code: true,
-        evaluate: true,
-        hoist_funs: true,
-        if_return: true,
-        join_vars: true,
-        keep_fargs: true,
-        loops: true,
-        properties: true,
-        sequences: false,
-        side_effects: true,
-        unused: true,
-    }
-    input: {
-        function f1() {
-            var e = 7;
-            var s = "abcdef";
-            var i = 2;
-            var eval = console.log.bind(console);
-            var x = s.charAt(i++);
-            var y = s.charAt(i++);
-            var z = s.charAt(i++);
-            eval(x, y, z, e);
-        }
-        function p1() { var a = foo(), b = bar(), eval = baz(); return a + b + eval; }
-        function p2() { var a = foo(), b = bar(), eval = baz; return a + b + eval(); }
-        (function f2(eval) {
-            var a = 2;
-            console.log(a - 5);
-            eval("console.log(a);");
-        })(eval);
-    }
-    expect: {
-        function f1() {
-            var e = 7,
-                s = "abcdef",
-                i = 2,
-                eval = console.log.bind(console),
-                x = s.charAt(i++),
-                y = s.charAt(i++),
-                z = s.charAt(i++);
-            eval(x, y, z, e);
-        }
-        function p1() { return foo() + bar() + baz(); }
-        function p2() { var a = foo(), b = bar(), eval = baz; return a + b + eval(); }
-        (function f2(eval) {
-            var a = 2;
-            console.log(a - 5);
-            eval("console.log(a);");
-        })(eval);
-    }
-    expect_stdout: true
-}
-
-eval_unused: {
-    options = {
-        keep_fargs: false,
-        unused: true,
-    }
-    input: {
-        function f1(a, eval, c, d, e) {
-            return a('c') + eval;
-        }
-        function f2(a, b, c, d, e) {
-            return a + eval('c');
-        }
-        function f3(a, eval, c, d, e) {
-            return a + eval('c');
-        }
-    }
-    expect: {
-        function f1(a, eval) {
-            return a('c') + eval;
-        }
-        function f2(a, b, c, d, e) {
-            return a + eval('c');
-        }
-        function f3(a, eval, c, d, e) {
-            return a + eval('c');
-        }
-    }
-}
-
-eval_mangle: {
-    mangle = {
-    };
-    input: {
-        function f1(a, eval, c, d, e) {
-            return a('c') + eval;
-        }
-        function f2(a, b, c, d, e) {
-            return a + eval('c');
-        }
-        function f3(a, eval, c, d, e) {
-            return a + eval('c');
-        }
-    }
-    expect_exact: 'function f1(n,c,e,a,f){return n("c")+c}function f2(a,b,c,d,e){return a+eval("c")}function f3(a,eval,c,d,e){return a+eval("c")}'
-}

test/compress/issue-979.js

@@ -1,111 +0,0 @@
-issue979_reported: {
-    options = {
-        booleans: true,
-        comparisons: true,
-        conditionals: true,
-        dead_code: true,
-        evaluate: true,
-        hoist_funs: true,
-        if_return: true,
-        join_vars: true,
-        keep_fargs: true,
-        loops: true,
-        properties: true,
-        sequences: true,
-        side_effects: true,
-        unused: true,
-    }
-    input: {
-        function f1() {
-            if (a == 1 || b == 2) {
-                foo();
-            }
-        }
-        function f2() {
-            if (!(a == 1 || b == 2)) {
-            }
-            else {
-                foo();
-            }
-        }
-    }
-    expect: {
-        function f1() {
-            1!=a&&2!=b||foo();
-        }
-        function f2() {
-            1!=a&&2!=b||foo();
-        }
-    }
-}
-
-issue979_test_negated_is_best: {
-    options = {
-        booleans: true,
-        comparisons: true,
-        conditionals: true,
-        dead_code: true,
-        evaluate: true,
-        hoist_funs: true,
-        if_return: true,
-        join_vars: true,
-        keep_fargs: true,
-        loops: true,
-        properties: true,
-        sequences: true,
-        side_effects: true,
-        unused: true,
-    }
-    input: {
-        function f3() {
-            if (a == 1 | b == 2) {
-                foo();
-            }
-        }
-        function f4() {
-            if (!(a == 1 | b == 2)) {
-            }
-            else {
-                foo();
-            }
-        }
-        function f5() {
-            if (a == 1 && b == 2) {
-                foo();
-            }
-        }
-        function f6() {
-            if (!(a == 1 && b == 2)) {
-            }
-            else {
-                foo();
-            }
-        }
-        function f7() {
-            if (a == 1 || b == 2) {
-                foo();
-            }
-            else {
-                return bar();
-            }
-        }
-    }
-    expect: {
-        function f3() {
-            1==a|2==b&&foo();
-        }
-        function f4() {
-            1==a|2==b&&foo();
-        }
-        function f5() {
-            1==a&&2==b&&foo();
-        }
-        function f6() {
-            1!=a||2!=b||foo();
-        }
-        function f7() {
-            if(1!=a&&2!=b)return bar();foo()
-        }
-    }
-}
-

test/compress/labels.js

@@ -1,9 +1,5 @@
 labels_1: {
-    options = {
-        conditionals: true,
-        dead_code: true,
-        if_return: true,
-    }
+    options = { if_return: true, conditionals: true, dead_code: true };
     input: {
         out: {
             if (foo) break out;
@@ -13,15 +9,10 @@ labels_1: {
     expect: {
         foo || console.log("bar");
     }
-    expect_stdout: true
 }
 
 labels_2: {
-    options = {
-        conditionals: true,
-        dead_code: true,
-        if_return: true,
-    }
+    options = { if_return: true, conditionals: true, dead_code: true };
     input: {
         out: {
             if (foo) print("stuff");
@@ -38,11 +29,7 @@ labels_2: {
 }
 
 labels_3: {
-    options = {
-        conditionals: true,
-        dead_code: true,
-        if_return: true,
-    }
+    options = { if_return: true, conditionals: true, dead_code: true };
     input: {
         for (var i = 0; i < 5; ++i) {
             if (i < 3) continue;
@@ -53,15 +40,10 @@ labels_3: {
         for (var i = 0; i < 5; ++i)
             i < 3 || console.log(i);
     }
-    expect_stdout: true
 }
 
 labels_4: {
-    options = {
-        conditionals: true,
-        dead_code: true,
-        if_return: true,
-    }
+    options = { if_return: true, conditionals: true, dead_code: true };
     input: {
         out: for (var i = 0; i < 5; ++i) {
             if (i < 3) continue out;
@@ -72,15 +54,10 @@ labels_4: {
         for (var i = 0; i < 5; ++i)
             i < 3 || console.log(i);
     }
-    expect_stdout: true
 }
 
 labels_5: {
-    options = {
-        conditionals: true,
-        dead_code: true,
-        if_return: true,
-    }
+    options = { if_return: true, conditionals: true, dead_code: true };
     // should keep the break-s in the following
     input: {
         while (foo) {
@@ -112,11 +89,7 @@ labels_6: {
 }
 
 labels_7: {
-    options = {
-        conditionals: true,
-        dead_code: true,
-        if_return: true,
-    }
+    options = { if_return: true, conditionals: true, dead_code: true };
     input: {
         while (foo) {
             x();
@@ -133,11 +106,7 @@ labels_7: {
 }
 
 labels_8: {
-    options = {
-        conditionals: true,
-        dead_code: true,
-        if_return: true,
-    }
+    options = { if_return: true, conditionals: true, dead_code: true };
     input: {
         while (foo) {
             x();
@@ -155,11 +124,7 @@ labels_8: {
 }
 
 labels_9: {
-    options = {
-        conditionals: true,
-        dead_code: true,
-        if_return: true,
-    }
+    options = { if_return: true, conditionals: true, dead_code: true };
     input: {
         out: while (foo) {
             x();
@@ -178,11 +143,7 @@ labels_9: {
 }
 
 labels_10: {
-    options = {
-        conditionals: true,
-        dead_code: true,
-        if_return: true,
-    }
+    options = { if_return: true, conditionals: true, dead_code: true };
     input: {
         out: while (foo) {
             x();

test/compress/loops.js

@@ -1,7 +1,5 @@
 while_becomes_for: {
-    options = {
-        loops: true,
-    }
+    options = { loops: true };
     input: {
         while (foo()) bar();
     }
@@ -11,9 +9,7 @@ while_becomes_for: {
 }
 
 drop_if_break_1: {
-    options = {
-        loops: true,
-    }
+    options = { loops: true };
     input: {
         for (;;)
             if (foo()) break;
@@ -24,9 +20,7 @@ drop_if_break_1: {
 }
 
 drop_if_break_2: {
-    options = {
-        loops: true,
-    }
+    options = { loops: true };
     input: {
         for (;bar();)
             if (foo()) break;
@@ -37,9 +31,7 @@ drop_if_break_2: {
 }
 
 drop_if_break_3: {
-    options = {
-        loops: true,
-    }
+    options = { loops: true };
     input: {
         for (;bar();) {
             if (foo()) break;
@@ -56,10 +48,7 @@ drop_if_break_3: {
 }
 
 drop_if_break_4: {
-    options = {
-        loops: true,
-        sequences: true,
-    }
+    options = { loops: true, sequences: true };
     input: {
         for (;bar();) {
             x();
@@ -75,9 +64,7 @@ drop_if_break_4: {
 }
 
 drop_if_else_break_1: {
-    options = {
-        loops: true,
-    }
+    options = { loops: true };
     input: {
         for (;;) if (foo()) bar(); else break;
     }
@@ -87,9 +74,7 @@ drop_if_else_break_1: {
 }
 
 drop_if_else_break_2: {
-    options = {
-        loops: true,
-    }
+    options = { loops: true };
     input: {
         for (;bar();) {
             if (foo()) baz();
@@ -102,9 +87,7 @@ drop_if_else_break_2: {
 }
 
 drop_if_else_break_3: {
-    options = {
-        loops: true,
-    }
+    options = { loops: true };
     input: {
         for (;bar();) {
             if (foo()) baz();
@@ -123,10 +106,7 @@ drop_if_else_break_3: {
 }
 
 drop_if_else_break_4: {
-    options = {
-        loops: true,
-        sequences: true,
-    }
+    options = { loops: true, sequences: true };
     input: {
         for (;bar();) {
             x();
@@ -141,508 +121,3 @@ drop_if_else_break_4: {
         for (; bar() && (x(), y(), foo());) baz(), z(), k();
     }
 }
-
-parse_do_while_with_semicolon: {
-    options = {
-        loops: false,
-    }
-    input: {
-        do {
-            x();
-        } while (false);y()
-    }
-    expect: {
-        do x(); while (false);y();
-    }
-}
-
-parse_do_while_without_semicolon: {
-    options = {
-        loops: false,
-    }
-    input: {
-        do {
-            x();
-        } while (false)y()
-    }
-    expect: {
-        do x(); while (false);y();
-    }
-}
-
-evaluate: {
-    options = {
-        dead_code: true,
-        evaluate: true,
-        loops: true,
-        passes: 2,
-        side_effects: true,
-    }
-    input: {
-        while (true) {
-            a();
-        }
-        while (false) {
-            b();
-        }
-        do {
-            c();
-        } while (true);
-        do {
-            d();
-        } while (false);
-    }
-    expect: {
-        for(;;)
-            a();
-        for(;;)
-            c();
-        d();
-    }
-}
-
-issue_1532: {
-    options = {
-        evaluate: true,
-        loops: true,
-    }
-    input: {
-        function f(x, y) {
-            do {
-                if (x) break;
-                foo();
-            } while (false);
-        }
-    }
-    expect: {
-        function f(x, y) {
-            do {
-                if (x) break;
-                foo();
-            } while (false);
-        }
-    }
-}
-
-issue_186: {
-    beautify = {
-        beautify: false,
-        ie8: false,
-    }
-    input: {
-        var x = 3;
-        if (foo())
-            do
-                do
-                    alert(x);
-                while (--x);
-            while (x);
-        else
-            bar();
-    }
-    expect_exact: 'var x=3;if(foo())do{do{alert(x)}while(--x)}while(x);else bar();'
-}
-
-issue_186_ie8: {
-    beautify = {
-        beautify: false,
-        ie8: true,
-    }
-    input: {
-        var x = 3;
-        if (foo())
-            do
-                do
-                    alert(x);
-                while (--x);
-            while (x);
-        else
-            bar();
-    }
-    expect_exact: 'var x=3;if(foo()){do{do{alert(x)}while(--x)}while(x)}else bar();'
-}
-
-issue_186_beautify: {
-    beautify = {
-        beautify: true,
-        ie8: false,
-    }
-    input: {
-        var x = 3;
-        if (foo())
-            do
-                do
-                    alert(x);
-                while (--x);
-            while (x);
-        else
-            bar();
-    }
-    expect_exact: [
-        'var x = 3;',
-        '',
-        'if (foo()) do {',
-        '    do {',
-        '        alert(x);',
-        '    } while (--x);',
-        '} while (x); else bar();',
-    ]
-}
-
-issue_186_beautify_ie8: {
-    beautify = {
-        beautify: true,
-        ie8: true,
-    }
-    input: {
-        var x = 3;
-        if (foo())
-            do
-                do
-                    alert(x);
-                while (--x);
-            while (x);
-        else
-            bar();
-    }
-    expect_exact: [
-        'var x = 3;',
-        '',
-        'if (foo()) {',
-        '    do {',
-        '        do {',
-        '            alert(x);',
-        '        } while (--x);',
-        '    } while (x);',
-        '} else bar();',
-    ]
-}
-
-issue_186_braces: {
-    beautify = {
-        beautify: false,
-        braces: true,
-        ie8: false,
-    }
-    input: {
-        var x = 3;
-        if (foo())
-            do
-                do
-                    alert(x);
-                while (--x);
-            while (x);
-        else
-            bar();
-    }
-    expect_exact: 'var x=3;if(foo()){do{do{alert(x)}while(--x)}while(x)}else{bar()}'
-}
-
-issue_186_braces_ie8: {
-    beautify = {
-        beautify: false,
-        braces: true,
-        ie8: true,
-    }
-    input: {
-        var x = 3;
-        if (foo())
-            do
-                do
-                    alert(x);
-                while (--x);
-            while (x);
-        else
-            bar();
-    }
-    expect_exact: 'var x=3;if(foo()){do{do{alert(x)}while(--x)}while(x)}else{bar()}'
-}
-
-issue_186_beautify_braces: {
-    beautify = {
-        beautify: true,
-        braces: true,
-        ie8: false,
-    }
-    input: {
-        var x = 3;
-        if (foo())
-            do
-                do
-                    alert(x);
-                while (--x);
-            while (x);
-        else
-            bar();
-    }
-    expect_exact: [
-        'var x = 3;',
-        '',
-        'if (foo()) {',
-        '    do {',
-        '        do {',
-        '            alert(x);',
-        '        } while (--x);',
-        '    } while (x);',
-        '} else {',
-        '    bar();',
-        '}',
-    ]
-}
-
-issue_186_beautify_braces_ie8: {
-    beautify = {
-        beautify: true,
-        braces: true,
-        ie8: true,
-    }
-    input: {
-        var x = 3;
-        if (foo())
-            do
-                do
-                    alert(x);
-                while (--x);
-            while (x);
-        else
-            bar();
-    }
-    expect_exact: [
-        'var x = 3;',
-        '',
-        'if (foo()) {',
-        '    do {',
-        '        do {',
-        '            alert(x);',
-        '        } while (--x);',
-        '    } while (x);',
-        '} else {',
-        '    bar();',
-        '}',
-    ]
-}
-
-issue_1648: {
-    options = {
-        join_vars: true,
-        loops: true,
-        passes: 2,
-        sequences: true,
-        unused: true,
-    }
-    input: {
-        function f() {
-            x();
-            var b = 1;
-            while (1);
-        }
-    }
-    expect_exact: "function f(){for(x();1;);}"
-}
-
-do_switch: {
-    options = {
-        evaluate: true,
-        loops: true,
-    }
-    input: {
-        do {
-            switch (a) {
-              case b:
-                continue;
-            }
-        } while (false);
-    }
-    expect: {
-        do {
-            switch (a) {
-              case b:
-                continue;
-            }
-        } while (false);
-    }
-}
-
-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

@@ -1,53 +0,0 @@
-too_short: {
-    beautify = {
-        max_line_len: 10,
-    }
-    input: {
-        function f(a) {
-            return { c: 42, d: a(), e: "foo"};
-        }
-    }
-    expect_exact: [
-        "function f(",
-        "a){return{",
-        "c:42,d:a(",
-        '),e:"foo"}',
-        "}",
-    ]
-    expect_warnings: [
-        "WARN: Output exceeds 10 characters",
-    ]
-}
-
-just_enough: {
-    beautify = {
-        max_line_len: 14,
-    }
-    input: {
-        function f(a) {
-            return { c: 42, d: a(), e: "foo"};
-        }
-    }
-    expect_exact: [
-        "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: []
-}

test/compress/negate-iife.js

@@ -1,7 +1,7 @@
 negate_iife_1: {
     options = {
-        negate_iife: true,
-    }
+        negate_iife: true
+    };
     input: {
         (function(){ stuff() })();
     }
@@ -10,173 +10,56 @@ negate_iife_1: {
     }
 }
 
-negate_iife_1_off: {
-    options = {
-        negate_iife: false,
-    }
-    input: {
-        (function(){ stuff() })();
-    }
-    expect_exact: '(function(){stuff()})();'
-}
-
 negate_iife_2: {
     options = {
-        inline: true,
-        negate_iife: true,
-    }
+        negate_iife: true
+    };
     input: {
+        (function(){ return {} })().x = 10; // should not transform this one
+    }
+    expect: {
         (function(){ return {} })().x = 10;
     }
-    expect_exact: "({}).x=10;"
-}
-
-negate_iife_2_side_effects: {
-    options = {
-        inline: true,
-        negate_iife: true,
-        side_effects: true,
-    }
-    input: {
-        (function(){ return {} })().x = 10;
-    }
-    expect_exact: "({}).x=10;"
 }
 
 negate_iife_3: {
     options = {
-        conditionals: true,
         negate_iife: true,
-    }
-    input: {
-        (function(){ return t })() ? console.log(true) : console.log(false);
-    }
-    expect: {
-        !function(){ return t }() ? console.log(false) : console.log(true);
-    }
-}
-
-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);
+        !function(){ return true }() ? console.log(false) : console.log(true);
     }
-    expect_stdout: true
 }
 
-negate_iife_3_side_effects: {
+negate_iife_3: {
     options = {
-        conditionals: true,
         negate_iife: true,
-        side_effects: true,
-    }
-    input: {
-        (function(){ return t })() ? console.log(true) : console.log(false);
-    }
-    expect: {
-        !function(){ return t }() ? console.log(false) : console.log(true);
-    }
-}
-
-negate_iife_3_off: {
-    options = {
-        conditionals: true,
-        negate_iife: false,
-    }
-    input: {
-        (function(){ return t })() ? console.log(true) : console.log(false);
-    }
-    expect: {
-        !function(){ return t }() ? console.log(false) : console.log(true);
-    }
-}
-
-negate_iife_3_off_evaluate: {
-    options = {
-        conditionals: true,
-        evaluate: true,
-        inline: true,
-        negate_iife: false,
-    }
+        sequences: true
+    };
     input: {
         (function(){ return true })() ? console.log(true) : console.log(false);
+        (function(){
+            console.log("something");
+        })();
     }
     expect: {
-        true, console.log(true);
+        !function(){ return true }() ? console.log(false) : console.log(true), function(){
+            console.log("something");
+        }();
     }
-    expect_stdout: true
 }
 
 negate_iife_4: {
     options = {
-        conditionals: true,
         negate_iife: true,
         sequences: true,
-    }
-    input: {
-        (function(){ return t })() ? console.log(true) : console.log(false);
-        (function(){
-            console.log("something");
-        })();
-    }
-    expect: {
-        !function(){ return t }() ? console.log(false) : console.log(true), function(){
-            console.log("something");
-        }();
-    }
-}
-
-sequence_off: {
-    options = {
         conditionals: true,
-        negate_iife: false,
-        passes: 2,
-        sequences: true,
-    }
+    };
     input: {
-        function f() {
-            (function(){ return t })() ? console.log(true) : console.log(false);
-            (function(){
-                console.log("something");
-            })();
-        }
-        function g() {
-            (function(){
-                console.log("something");
-            })();
-            (function(){ return t })() ? console.log(true) : console.log(false);
-        }
-    }
-    expect: {
-        function f() {
-            !function(){ return t }() ? console.log(false) : console.log(true), function(){
-                console.log("something");
-            }();
-        }
-        function g() {
-            (function(){
-                console.log("something");
-            })(), function(){ return t }() ? console.log(true) : console.log(false);
-        }
-    }
-}
-
-negate_iife_5: {
-    options = {
-        conditionals: true,
-        negate_iife: true,
-        sequences: true,
-    }
-    input: {
-        if ((function(){ return t })()) {
+        if ((function(){ return true })()) {
             foo(true);
         } else {
             bar(false);
@@ -186,233 +69,8 @@ negate_iife_5: {
         })();
     }
     expect: {
-        !function(){ return t }() ? bar(false) : foo(true), function(){
+        !function(){ return true }() ? bar(false) : foo(true), function(){
             console.log("something");
         }();
     }
 }
-
-negate_iife_5_off: {
-    options = {
-        conditionals: true,
-        negate_iife: false,
-        sequences: true,
-    }
-    input: {
-        if ((function(){ return t })()) {
-            foo(true);
-        } else {
-            bar(false);
-        }
-        (function(){
-            console.log("something");
-        })();
-    }
-    expect: {
-        !function(){ return t }() ? bar(false) : foo(true), function(){
-            console.log("something");
-        }();
-    }
-}
-
-negate_iife_nested: {
-    options = {
-        conditionals: true,
-        negate_iife: true,
-        sequences: true,
-    }
-    input: {
-        function Foo(f) {
-            this.f = f;
-        }
-        new Foo(function() {
-            (function(x) {
-                (function(y) {
-                    console.log(y);
-                })(x);
-            })(7);
-        }).f();
-    }
-    expect: {
-        function Foo(f) {
-            this.f = f;
-        }
-        new Foo(function() {
-            !function(x) {
-                !function(y) {
-                    console.log(y);
-                }(x);
-            }(7);
-        }).f();
-    }
-    expect_stdout: true
-}
-
-negate_iife_nested_off: {
-    options = {
-        conditionals: true,
-        negate_iife: false,
-        sequences: true,
-    }
-    input: {
-        function Foo(f) {
-            this.f = f;
-        }
-        new Foo(function() {
-            (function(x) {
-                (function(y) {
-                    console.log(y);
-                })(x);
-            })(7);
-        }).f();
-    }
-    expect: {
-        function Foo(f) {
-            this.f = f;
-        }
-        new Foo(function() {
-            (function(x) {
-                (function(y) {
-                    console.log(y);
-                })(x);
-            })(7);
-        }).f();
-    }
-    expect_stdout: true
-}
-
-negate_iife_issue_1073: {
-    options = {
-        conditionals: true,
-        negate_iife: true,
-        sequences: true,
-    }
-    input: {
-        new (function(a) {
-            return function Foo() {
-                this.x = a;
-                console.log(this);
-            };
-        }(7))();
-    }
-    expect: {
-        new (function(a) {
-            return function Foo() {
-                this.x = a,
-                console.log(this);
-            };
-        }(7))();
-    }
-    expect_stdout: true
-}
-
-issue_1254_negate_iife_false: {
-    options = {
-        negate_iife: false,
-    }
-    input: {
-        (function() {
-            return function() {
-                console.log('test')
-            };
-        })()();
-    }
-    expect_exact: '(function(){return function(){console.log("test")}})()();'
-    expect_stdout: true
-}
-
-issue_1254_negate_iife_true: {
-    options = {
-        negate_iife: true,
-    }
-    input: {
-        (function() {
-            return function() {
-                console.log('test')
-            };
-        })()();
-    }
-    expect_exact: '!function(){return function(){console.log("test")}}()();'
-    expect_stdout: true
-}
-
-issue_1254_negate_iife_nested: {
-    options = {
-        negate_iife: true,
-    }
-    input: {
-        (function() {
-            return function() {
-                console.log('test')
-            };
-        })()()()()();
-    }
-    expect_exact: '!function(){return function(){console.log("test")}}()()()()();'
-    expect_stdout: true
-}
-
-issue_1288: {
-    options = {
-        conditionals: true,
-        negate_iife: true,
-        side_effects: false,
-    }
-    input: {
-        if (w) ;
-        else {
-            (function f() {})();
-        }
-        if (!x) {
-            (function() {
-                x = {};
-            })();
-        }
-        if (y)
-            (function() {})();
-        else
-            (function(z) {
-                return z;
-            })(0);
-    }
-    expect: {
-        w || !function f() {}();
-        x || !function() {
-            x = {};
-        }();
-        y ? !function() {}() : !function(z) {
-            return z;
-        }(0);
-    }
-}
-
-issue_1288_side_effects: {
-    options = {
-        conditionals: true,
-        negate_iife: true,
-        side_effects: true,
-    }
-    input: {
-        if (w) ;
-        else {
-            (function f() {})();
-        }
-        if (!x) {
-            (function() {
-                x = {};
-            })();
-        }
-        if (y)
-            (function() {})();
-        else
-            (function(z) {
-                return z;
-            })(0);
-    }
-    expect: {
-        w;
-        x || function() {
-            x = {};
-        }();
-        y;
-    }
-}