v3.4.4

fixes #3206

.github/ISSUE_TEMPLATE.md

@@ -2,10 +2,6 @@
 
 <!-- Note: sub-optimal but correct code is not a bug -->
 
-**ES5 or ES6+ input?** 
-
-<!-- Note: for ES6 see: https://github.com/mishoo/UglifyJS2/tree/harmony#harmony -->
-
 **Uglify version (`uglifyjs -V`)**
 
 **JavaScript input**
@@ -15,6 +11,8 @@
     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.**
@@ -22,6 +20,6 @@
 **JavaScript output or error produced.**
 
 <!--
-    Note: `uglify-js` only supports ES5. 
+    Note: `uglify-js` only supports JavaScript.
-    Those wishing to minify ES6 should use `uglify-es`.
+    Those wishing to minify ES6+ should transpile first.
 -->

.travis.yml

@@ -1,14 +1,34 @@
-language: node_js
+addons:
-node_js:
+  apt:
-    - "0.10"
+    sources:
-    - "0.12"
+      - ubuntu-toolchain-r-test
-    - "4"
+    packages:
-    - "6"
+      - libstdc++-4.9-dev
-    - "8"
+cache:
-env:
+  directories: tmp
-    - UGLIFYJS_TEST_ALL=1
+language: generic
 matrix:
   fast_finish: true
 sudo: false
-cache:
+env:
-  directories: tmp
+  global:
+    - UGLIFYJS_TEST_ALL=1
+  matrix:
+    - NODEJS_VER=node/0.10
+    - NODEJS_VER=node/0.12
+    - NODEJS_VER=node/4
+    - NODEJS_VER=node/6
+    - NODEJS_VER=node/8
+    - NODEJS_VER=node/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

CONTRIBUTING.md

@@ -0,0 +1,61 @@
+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-2013 (c) Mihai Bazon <mihai.bazon@gmail.com>
+Copyright 2012-2018 (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

README.md

@@ -6,9 +6,8 @@ UglifyJS is a JavaScript parser, minifier, compressor and beautifier toolkit.
 #### Note:
 - **`uglify-js@3` has a simplified [API](#api-reference) and [CLI](#command-line-usage) that is not backwards compatible with [`uglify-js@2`](https://github.com/mishoo/UglifyJS2/tree/v2.x)**.
 - **Documentation for UglifyJS `2.x` releases can be found [here](https://github.com/mishoo/UglifyJS2/tree/v2.x)**.
-- `uglify-js` only supports ECMAScript 5 (ES5).
+- `uglify-js` only supports JavaScript (ECMAScript 5).
-- Those wishing to minify
+- To minify ECMAScript 2015 or above, transpile using tools like [Babel](https://babeljs.io/).
-ES2015+ (ES6+) should use the `npm` package [**uglify-es**](https://github.com/mishoo/UglifyJS2/tree/harmony).
 
 Install
 -------
@@ -70,7 +69,7 @@ a double dash to prevent input files being used as option arguments:
                                 `debug`  Add debug prefix and suffix.
                                 `domprops`  Mangle property names that overlaps
                                             with DOM properties.
-                                `keep_quoted`  Only mangle unquoted properies.
+                                `keep_quoted`  Only mangle unquoted properties.
                                 `regex`  Only mangle matched property names.
                                 `reserved`  List of names that should not be mangled.
     -b, --beautify [options]    Beautify output/specify output options:
@@ -105,6 +104,8 @@ a double dash to prevent input files being used as option arguments:
                                 sequences.
     --config-file <file>        Read `minify()` options from JSON file.
     -d, --define <expr>[=value] Global definitions.
+    -e, --enclose [arg[:value]] Embed everything in a big function, with configurable
+                                argument(s) & value(s).
     --ie8                       Support non-standard Internet Explorer 8.
                                 Equivalent to setting `ie8: true` in `minify()`
                                 for `compress`, `mangle` and `output` options.
@@ -119,7 +120,8 @@ a double dash to prevent input files being used as option arguments:
                                            JS that was generated from some other original
                                            code. Specify "inline" if the source map is
                                            included within the sources.
-                                `filename`  Name and/or location of the output source.
+                                `filename`  Filename and/or location of the output source
+                                            (sets `file` attribute in source map).
                                 `includeSources`  Pass this flag if you want to include
                                                   the content of source files in the
                                                   source map as sourcesContent property.
@@ -150,7 +152,9 @@ debugging your compressed JavaScript.  To get a source map, pass
 
 Additional options:
 
-- `--source-map "filename='<NAME>'"` to specify the name of the source map.
+- `--source-map "filename='<NAME>'"` to specify the name of the source map. The value of
+  `filename` is only used to set `file` attribute (see [the spec][sm-spec])
+  in source map file.
 
 - `--source-map "root='<URL>'"` to pass the URL where the original files can be found.
 
@@ -598,25 +602,27 @@ If you're using the `X-SourceMap` header instead, you can just omit `sourceMap.u
 
 ## Compress options
 
-- `booleans` (default: `true`) -- various optimizations for boolean context, for example `!!a
+- `arguments` (default: `true`) -- replace `arguments[index]` with function
-  ? b : c → a ? b : c`
+  parameter name whenever possible.
 
-- `cascade` (default: `true`) -- small optimization for sequences, transform `x, x` into `x`
+- `booleans` (default: `true`) -- various optimizations for boolean context,
-  and `x = something(), x` into `x = something()`
+  for example `!!a ? b : c → a ? b : c`
 
-- `collapse_vars` (default: `true`) -- Collapse single-use non-constant variables - side
+- `collapse_vars` (default: `true`) -- Collapse single-use non-constant variables,
-  effects permitting.
+  side effects permitting.
 
-- `comparisons` (default: `true`) -- apply certain optimizations to binary nodes, for example:
+- `comparisons` (default: `true`) -- apply certain optimizations to binary nodes,
-  `!(a <= b) → a > b` (only when `unsafe_comps`), attempts to negate binary
+  e.g. `!(a <= b) → a > b`, attempts to negate binary nodes, e.g.
-  nodes, e.g. `a = !b && !c && !d && !e → a=!(b||c||d||e)` etc.
+  `a = !b && !c && !d && !e → a=!(b||c||d||e)` etc.
 
 - `conditionals` (default: `true`) -- apply optimizations for `if`-s and conditional
   expressions
 
 - `dead_code` (default: `true`) -- remove unreachable code
 
-- `drop_console` (default: `false`) -- default `false`.  Pass `true` to discard calls to
+- `directives` (default: `true`) -- remove redundant or non-standard directives
+
+- `drop_console` (default: `false`) -- Pass `true` to discard calls to
   `console.*` functions. If you wish to drop a specific function call
   such as `console.info` and/or retain side effects from function arguments
   after dropping the function call then use `pure_funcs` instead.
@@ -625,14 +631,14 @@ If you're using the `X-SourceMap` header instead, you can just omit `sourceMap.u
 
 - `evaluate` (default: `true`) -- attempt to evaluate constant expressions
 
-- `expression` (default: `false`) -- default `false`.  Pass `true` to preserve completion values
+- `expression` (default: `false`) -- Pass `true` to preserve completion values
   from terminal statements without `return`, e.g. in bookmarklets.
 
 - `global_defs` (default: `{}`) -- see [conditional compilation](#conditional-compilation)
 
-- `hoist_funs` (default: `true`) -- hoist function declarations
+- `hoist_funs` (default: `false`) -- hoist function declarations
 
-- `hoist_props` (default: `false`) -- hoist properties from constant object and
+- `hoist_props` (default: `true`) -- hoist properties from constant object and
   array literals into regular variables subject to a set of constraints. For example:
   `var o={p:1, q:2}; f(o.p, o.q);` is converted to `f(1, 2);`. Note: `hoist_props`
   works best with `mangle` enabled, the `compress` option `passes` set to `2` or higher,
@@ -643,23 +649,28 @@ If you're using the `X-SourceMap` header instead, you can just omit `sourceMap.u
 
 - `if_return` (default: `true`) -- optimizations for if/return and if/continue
 
-- `inline` (default: `true`) -- embed simple functions
+- `inline` (default: `true`) -- inline calls to function with simple/`return` statement:
+  - `false` -- same as `0`
+  - `0` -- disabled inlining
+  - `1` -- inline simple functions
+  - `2` -- inline functions with arguments
+  - `3` -- inline functions with arguments and variables
+  - `true` -- same as `3`
 
 - `join_vars` (default: `true`) -- join consecutive `var` statements
 
-- `keep_fargs` (default: `true`) -- default `true`.  Prevents the
+- `keep_fargs` (default: `true`) -- Prevents the compressor from discarding unused
-  compressor from discarding unused function arguments.  You need this
+  function arguments.  You need this for code which relies on `Function.length`.
-  for code which relies on `Function.length`.
 
 - `keep_fnames` (default: `false`) -- Pass `true` to prevent the
   compressor from discarding function names.  Useful for code relying on
   `Function.prototype.name`. See also: the `keep_fnames` [mangle option](#mangle).
 
-- `keep_infinity` (default: `false`) -- default `false`. Pass `true` to prevent `Infinity` from
+- `keep_infinity` (default: `false`) -- Pass `true` to prevent `Infinity` from
   being compressed into `1/0`, which may cause performance issues on Chrome.
 
-- `loops` (default: `true`) -- optimizations for `do`, `while` and `for` loops when we can
+- `loops` (default: `true`) -- optimizations for `do`, `while` and `for` loops
-  statically determine the condition
+  when we can statically determine the condition.
 
 - `negate_iife` (default: `true`) -- negate "Immediately-Called Function Expressions"
   where the return value is discarded, to avoid the parens that the
@@ -681,7 +692,8 @@ If you're using the `X-SourceMap` header instead, you can just omit `sourceMap.u
   pass `pure_funcs: [ 'Math.floor' ]` to let it know that this
   function won't produce any side effect, in which case the whole
   statement would get discarded.  The current implementation adds some
-  overhead (compression will be slower).
+  overhead (compression will be slower). Make sure symbols under `pure_funcs`
+  are also under `mangle.reserved` to avoid mangling.
 
 - `pure_getters` (default: `"strict"`) -- If you pass `true` for
   this, UglifyJS will assume that object property access
@@ -689,6 +701,12 @@ If you're using the `X-SourceMap` header instead, you can just omit `sourceMap.u
   Specify `"strict"` to treat `foo.bar` as side-effect-free only when
   `foo` is certain to not throw, i.e. not `null` or `undefined`.
 
+- `reduce_funcs` (default: `true`) -- Allows single-use functions to be
+  inlined as function expressions when permissible allowing further
+  optimization.  Enabled by default.  Option depends on `reduce_vars`
+  being enabled.  Some code runs faster in the Chrome V8 engine if this
+  option is disabled.  Does not negatively impact other major browsers.
+
 - `reduce_vars` (default: `true`) -- Improve optimization on variables assigned with and
   used as constant values.
 
@@ -701,34 +719,31 @@ If you're using the `X-SourceMap` header instead, you can just omit `sourceMap.u
   occasions the default sequences limit leads to very slow compress times in which
   case a value of `20` or less is recommended.
 
-- `side_effects` (default: `true`) -- default `true`. Pass `false` to disable potentially dropping
+- `side_effects` (default: `true`) -- Pass `false` to disable potentially dropping
   functions marked as "pure".  A function call is marked as "pure" if a comment
   annotation `/*@__PURE__*/` or `/*#__PURE__*/` immediately precedes the call. For
   example: `/*@__PURE__*/foo();`
 
 - `switches` (default: `true`) -- de-duplicate and remove unreachable `switch` branches
 
-- `toplevel` (default: `false`) -- drop unreferenced functions (`"funcs"`) and/or variables (`"vars"`)
+- `toplevel` (default: `false`) -- drop unreferenced functions (`"funcs"`) and/or
-  in the top level scope (`false` by default, `true` to drop both unreferenced
+  variables (`"vars"`) in the top level scope (`false` by default, `true` to drop
-  functions and variables)
+  both unreferenced functions and variables)
 
-- `top_retain` (default: `null`) -- prevent specific toplevel functions and variables from `unused`
+- `top_retain` (default: `null`) -- prevent specific toplevel functions and
-  removal (can be array, comma-separated, RegExp or function. Implies `toplevel`)
+  variables from `unused` removal (can be array, comma-separated, RegExp or
+  function. Implies `toplevel`)
 
-- `typeofs` (default: `true`) -- default `true`.  Transforms `typeof foo == "undefined"` into
+- `typeofs` (default: `true`) -- Transforms `typeof foo == "undefined"` into
   `foo === void 0`.  Note: recommend to set this value to `false` for IE10 and
   earlier versions due to known issues.
 
 - `unsafe` (default: `false`) -- apply "unsafe" transformations (discussion below)
 
-- `unsafe_comps` (default: `false`) -- Reverse `<` and `<=` to `>` and `>=` to
+- `unsafe_comps` (default: `false`) -- compress expressions like `a <= b` assuming
-  allow improved compression. This might be unsafe when an at least one of two
+  none of the operands can be (coerced to) `NaN`.
-  operands is an object with computed values due the use of methods like `get`,
-  or `valueOf`. This could cause change in execution order after operands in the
-  comparison are switching. Compression only works if both `comparisons` and
-  `unsafe_comps` are both set to true.
 
-- `unsafe_Func` (default: `false`) -- compress and mangle `Function(args, code)`
+- `unsafe_Function` (default: `false`) -- compress and mangle `Function(args, code)`
   when both `args` and `code` are string literals.
 
 - `unsafe_math` (default: `false`) -- optimize numerical expressions like
@@ -740,25 +755,29 @@ If you're using the `X-SourceMap` header instead, you can just omit `sourceMap.u
 - `unsafe_regexp` (default: `false`) -- enable substitutions of variables with
   `RegExp` values the same way as if they are constants.
 
-- `unused` (default: `true`) -- drop unreferenced functions and variables (simple direct variable
+- `unsafe_undefined` (default: `false`) -- substitute `void 0` if there is a
-  assignments do not count as references unless set to `"keep_assign"`)
+  variable named `undefined` in scope (variable name will be mangled, typically
+  reduced to a single character)
 
-- `warnings` (default: `false`) -- display warnings when dropping unreachable code or unused
+- `unused` (default: `true`) -- drop unreferenced functions and variables (simple
-  declarations etc.
+  direct variable assignments do not count as references unless set to `"keep_assign"`)
+
+- `warnings` (default: `false`) -- display warnings when dropping unreachable
+  code or unused declarations etc.
 
 ## Mangle options
 
-- `eval` (default `false`). Pass `true` to mangle names visible in scopes
+- `eval` (default `false`) -- Pass `true` to mangle names visible in scopes
   where `eval` or `with` are used.
 
-- `keep_fnames` (default `false`).  Pass `true` to not mangle function names.
+- `keep_fnames` (default `false`) -- Pass `true` to not mangle function names.
   Useful for code relying on `Function.prototype.name`. See also: the `keep_fnames`
   [compress option](#compress-options).
 
-- `reserved` (default `[]`). Pass an array of identifiers that should be
+- `reserved` (default `[]`) -- Pass an array of identifiers that should be
   excluded from mangling. Example: `["foo", "bar"]`.
 
-- `toplevel` (default `false`). Pass `true` to mangle names declared in the
+- `toplevel` (default `false`) -- Pass `true` to mangle names declared in the
   top level scope.
 
 Examples:
@@ -813,7 +832,7 @@ can pass additional arguments that control the code output:
   when you want to generate minified code, in order to specify additional
   arguments, so you can use `-b beautify=false` to override it.
 
-- `bracketize` (default `false`) -- always insert brackets in `if`, `for`,
+- `braces` (default `false`) -- always insert braces in `if`, `for`,
   `do`, `while` or `with` statements, even if their body is a single
   statement.
 
@@ -825,8 +844,8 @@ can pass additional arguments that control the code output:
 
 - `indent_start` (default `0`) -- prefix all lines by that many spaces
 
-- `inline_script` (default `false`) -- escape the slash in occurrences of
+- `inline_script` (default `true`) -- escape HTML comments and the slash in
-  `</script` in strings
+  occurrences of `</script>` in strings
 
 - `keep_quoted_props` (default `false`) -- when turned on, prevents stripping
   quotes from property names in object literals.
@@ -859,6 +878,9 @@ can pass additional arguments that control the code output:
 
 - `shebang` (default `true`) -- preserve shebang `#!` in preamble (bash scripts)
 
+- `webkit` (default `false`) -- enable workarounds for WebKit bugs.
+  PhantomJS users should set this option to `true`.
+
 - `width` (default `80`) -- only takes effect when beautification is on, this
   specifies an (orientative) line width that the beautifier will try to
   obey.  It refers to the width of the line text (excluding indentation).
@@ -910,9 +932,6 @@ when this flag is on:
 - `new Object()` → `{}`
 - `String(exp)` or `exp.toString()` → `"" + exp`
 - `new Object/RegExp/Function/Error/Array (...)` → we discard the `new`
-- `void 0` → `undefined` (if there is a variable named "undefined" in
-  scope; we do it because the variable name will be mangled, typically
-  reduced to a single character)
 
 ### Conditional compilation
 
@@ -1029,8 +1048,9 @@ var result = UglifyJS.minify(ast, {
 ### Working with Uglify AST
 
 Transversal and transformation of the native AST can be performed through
-[`TreeWalker`](http://lisperator.net/uglifyjs/walk) and
+[`TreeWalker`](https://github.com/mishoo/UglifyJS2/blob/master/lib/ast.js) and
-[`TreeTransformer`](http://lisperator.net/uglifyjs/transform) respectively.
+[`TreeTransformer`](https://github.com/mishoo/UglifyJS2/blob/master/lib/transform.js)
+respectively.
 
 ### ESTree / SpiderMonkey AST
 
@@ -1089,3 +1109,27 @@ To enable fast minify mode with the API use:
 ```js
 UglifyJS.minify(code, { compress: false, mangle: true });
 ```
+
+#### Source maps and debugging
+
+Various `compress` transforms that simplify, rearrange, inline and remove code
+are known to have an adverse effect on debugging with source maps. This is
+expected as code is optimized and mappings are often simply not possible as
+some code no longer exists. For highest fidelity in source map debugging
+disable the Uglify `compress` option and just use `mangle`.
+
+### Compiler assumptions
+
+To allow for better optimizations, the compiler makes various assumptions:
+
+- `.toString()` and `.valueOf()` don't have side effects, and for built-in
+  objects they have not been overridden.
+- `undefined`, `NaN` and `Infinity` have not been externally redefined.
+- `arguments.callee`, `arguments.caller` and `Function.prototype.caller` are not used.
+- The code doesn't expect the contents of `Function.prototype.toString()` or
+  `Error.prototype.stack` to be anything in particular.
+- Getting and setting properties on a plain object does not cause other side effects
+  (using `.watch()` or `Proxy`).
+- Object properties can be added, removed and modified (not prevented with
+  `Object.defineProperty()`, `Object.defineProperties()`, `Object.freeze()`,
+  `Object.preventExtensions()` or `Object.seal()`).

appveyor.yml

@@ -1,24 +1,25 @@
 environment:
+  UGLIFYJS_TEST_ALL: 1
   matrix:
-  - nodejs_version: "0.10"
+    - NODEJS_VER: node/0.10
-  - nodejs_version: "0.12"
+    - NODEJS_VER: node/0.12
-  - nodejs_version: "4.0"
+    - NODEJS_VER: node/4
-  - nodejs_version: "6.0"
+    - NODEJS_VER: node/6
-
+    - NODEJS_VER: node/8
+    - 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
-
-platform:
-  - x86
-  - x64
-
-install:
-  - ps: Install-Product node $env:nodejs_version $env:platform
-  - npm install
-
 test_script:
-  - node --version
+  - npm test --no-update-notifier
-  - npm --version
-  - npm test
-
-build: off

bin/uglifyjs

@@ -3,11 +3,7 @@
 
 "use strict";
 
-// workaround for tty output truncation upon process.exit()
+require("../tools/exit");
-[process.stdout, process.stderr].forEach(function(stream){
-    if (stream._handle && stream._handle.setBlocking)
-        stream._handle.setBlocking(true);
-});
 
 var fs = require("fs");
 var info = require("../package.json");
@@ -15,7 +11,7 @@ var path = require("path");
 var program = require("commander");
 var UglifyJS = require("../tools/node");
 
-var skip_keys = [ "cname", "enclosed", "parent_scope", "scope", "thedef", "uses_eval", "uses_with" ];
+var skip_keys = [ "cname", "inlined", "parent_scope", "scope", "uses_eval", "uses_with" ];
 var files = {};
 var options = {
     compress: false,
@@ -44,12 +40,15 @@ 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_source_map());
+program.option("--source-map [options]", "Enable source map/specify source map options.", parse_js());
-program.option("--timings", "Display operations run time on STDERR.")
+program.option("--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.");
@@ -63,6 +62,7 @@ if (!program.output && program.sourceMap && program.sourceMap.url != "inline") {
 }
 [
     "compress",
+    "enclose",
     "ie8",
     "mangle",
     "sourceMap",
@@ -122,6 +122,11 @@ if (program.parse) {
         fatal("ERROR: inline source map only works with built-in parser");
     }
 }
+if (~program.rawArgs.indexOf("--rename")) {
+    options.rename = true;
+} else if (!program.rename) {
+    options.rename = false;
+}
 var convert_path = function(name) {
     return name;
 };
@@ -173,6 +178,11 @@ function run() {
     UglifyJS.AST_Node.warn_function = function(msg) {
         print_error("WARN: " + msg);
     };
+    var content = program.sourceMap && program.sourceMap.content;
+    if (content && content != "inline") {
+        print_error("INFO: Using input source map: " + content);
+        options.sourceMap.content = read_file(content, content);
+    }
     if (program.timings) options.timings = true;
     try {
         if (program.parse) {
@@ -224,7 +234,20 @@ function run() {
         }
         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;
@@ -361,23 +384,16 @@ function parse_js(flag) {
     }
 }
 
-function parse_source_map() {
-    var parse = parse_js();
-    return function(value, options) {
-        var hasContent = options && "content" in options;
-        var settings = parse(value, options);
-        if (!hasContent && settings.content && settings.content != "inline") {
-            print_error("INFO: Using input source map: " + settings.content);
-            settings.content = read_file(settings.content, settings.content);
-        }
-        return settings;
-    }
-}
-
 function skip_key(key) {
     return skip_keys.indexOf(key) >= 0;
 }
 
+function symdef(def) {
+    var ret = (1e6 + def.id) + " " + def.name;
+    if (def.mangled_name) ret += " " + def.mangled_name;
+    return ret;
+}
+
 function format_object(obj) {
     var lines = [];
     var padding = "";

lib/ast.js

@@ -44,21 +44,21 @@
 "use strict";
 
 function DEFNODE(type, props, methods, base) {
-    if (arguments.length < 4) base = AST_Node;
+    if (typeof base === "undefined") base = AST_Node;
-    if (!props) props = [];
+    props = props ? props.split(/\s+/) : [];
-    else props = props.split(/\s+/);
     var self_props = props;
-    if (base && base.PROPS)
+    if (base && base.PROPS) props = props.concat(base.PROPS);
-        props = props.concat(base.PROPS);
+    var code = [
-    var code = "return function AST_" + type + "(props){ if (props) { ";
+        "return function AST_", type, "(props){",
-    for (var i = props.length; --i >= 0;) {
+        "if(props){",
-        code += "this." + props[i] + " = props." + props[i] + ";";
+    ];
-    }
+    props.forEach(function(prop) {
+        code.push("this.", prop, "=props.", prop, ";");
+    });
     var proto = base && new base;
-    if (proto && proto.initialize || (methods && methods.initialize))
+    if (proto && proto.initialize || methods && methods.initialize) code.push("this.initialize();");
-        code += "this.initialize();";
+    code.push("}}");
-    code += "}}";
+    var ctor = new Function(code.join(""))();
-    var ctor = new Function(code)();
     if (proto) {
         ctor.prototype = proto;
         ctor.BASE = base;
@@ -71,11 +71,11 @@ function DEFNODE(type, props, methods, base) {
     if (type) {
         ctor.prototype.TYPE = ctor.TYPE = type;
     }
-    if (methods) for (i in methods) if (HOP(methods, i)) {
+    if (methods) for (var name in methods) if (HOP(methods, name)) {
-        if (/^\$/.test(i)) {
+        if (/^\$/.test(name)) {
-            ctor[i.substr(1)] = methods[i];
+            ctor[name.substr(1)] = methods[name];
         } else {
-            ctor.prototype[i] = methods[i];
+            ctor.prototype[name] = methods[name];
         }
     }
     ctor.DEFMETHOD = function(name, method) {
@@ -85,9 +85,9 @@ function DEFNODE(type, props, methods, base) {
         exports["AST_" + type] = ctor;
     }
     return ctor;
-};
+}
 
-var AST_Token = DEFNODE("Token", "type value line col pos endline endcol endpos nlb comments_before file raw", {
+var AST_Token = DEFNODE("Token", "type value line col pos endline endcol endpos nlb comments_before comments_after file raw", {
 }, null);
 
 var AST_Node = DEFNODE("Node", "start end", {
@@ -158,14 +158,13 @@ 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);
+    });
 }
-    else for (var i = 0, len = body.length; i < len; i++) {
-        body[i]._walk(visitor);
-    }
-};
 
 var AST_Block = DEFNODE("Block", "body", {
-    $documentation: "A body of statements (usually bracketed)",
+    $documentation: "A body of statements (usually braced)",
     $propdoc: {
         body: "[AST_Statement*] an array of statements"
     },
@@ -267,11 +266,10 @@ var AST_For = DEFNODE("For", "init condition step", {
     }
 }, AST_IterationStatement);
 
-var AST_ForIn = DEFNODE("ForIn", "init name object", {
+var AST_ForIn = DEFNODE("ForIn", "init 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) {
@@ -309,6 +307,16 @@ 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", {
@@ -320,12 +328,29 @@ var AST_Toplevel = DEFNODE("Toplevel", "globals", {
         var body = this.body;
         var wrapped_tl = "(function(exports){'$ORIG';})(typeof " + name + "=='undefined'?(" + name + "={}):" + name + ");";
         wrapped_tl = parse(wrapped_tl);
-        wrapped_tl = wrapped_tl.transform(new TreeTransformer(function before(node){
+        wrapped_tl = wrapped_tl.transform(new TreeTransformer(function(node) {
             if (node instanceof AST_Directive && node.value == "$ORIG") {
                 return MAP.splice(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);
+            }
+        }));
     }
 }, AST_Scope);
 
@@ -339,10 +364,9 @@ var AST_Lambda = DEFNODE("Lambda", "name argnames uses_arguments", {
     _walk: function(visitor) {
         return visitor._visit(this, function() {
             if (this.name) this.name._walk(visitor);
-            var argnames = this.argnames;
+            this.argnames.forEach(function(argname) {
-            for (var i = 0, len = argnames.length; i < len; i++) {
+                argname._walk(visitor);
-                argnames[i]._walk(visitor);
+            });
-            }
             walk_body(this, visitor);
         });
     }
@@ -352,11 +376,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", null, {
+var AST_Function = DEFNODE("Function", "inlined", {
     $documentation: "A function expression"
 }, AST_Lambda);
 
-var AST_Defun = DEFNODE("Defun", null, {
+var AST_Defun = DEFNODE("Defun", "inlined", {
     $documentation: "A function definition"
 }, AST_Lambda);
 
@@ -502,10 +526,9 @@ var AST_Definitions = DEFNODE("Definitions", "definitions", {
     },
     _walk: function(visitor) {
         return visitor._visit(this, function() {
-            var definitions = this.definitions;
+            this.definitions.forEach(function(defn) {
-            for (var i = 0, len = definitions.length; i < len; i++) {
+                defn._walk(visitor);
-                definitions[i]._walk(visitor);
+            });
-            }
         });
     }
 }, AST_Statement);
@@ -538,11 +561,10 @@ var AST_Call = DEFNODE("Call", "expression args", {
     },
     _walk: function(visitor) {
         return visitor._visit(this, function() {
-            var args = this.args;
-            for (var i = 0, len = args.length; i < len; i++) {
-                args[i]._walk(visitor);
-            }
             this.expression._walk(visitor);
+            this.args.forEach(function(node) {
+                node._walk(visitor);
+            });
         });
     }
 });
@@ -657,10 +679,9 @@ var AST_Array = DEFNODE("Array", "elements", {
     },
     _walk: function(visitor) {
         return visitor._visit(this, function() {
-            var elements = this.elements;
+            this.elements.forEach(function(element) {
-            for (var i = 0, len = elements.length; i < len; i++) {
+                element._walk(visitor);
-                elements[i]._walk(visitor);
+            });
-            }
         });
     }
 });
@@ -672,10 +693,9 @@ var AST_Object = DEFNODE("Object", "properties", {
     },
     _walk: function(visitor) {
         return visitor._visit(this, function() {
-            var properties = this.properties;
+            this.properties.forEach(function(prop) {
-            for (var i = 0, len = properties.length; i < len; i++) {
+                prop._walk(visitor);
-                properties[i]._walk(visitor);
+            });
-            }
         });
     }
 });
@@ -683,8 +703,8 @@ var AST_Object = DEFNODE("Object", "properties", {
 var AST_ObjectProperty = DEFNODE("ObjectProperty", "key value", {
     $documentation: "Base class for literal object properties",
     $propdoc: {
-        key: "[string] the property name converted to a string for ObjectKeyVal.  For setters and getters this is an AST_SymbolAccessor.",
+        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 setters and getters this is an AST_Accessor."
+        value: "[AST_Node] property value.  For getters and setters this is an AST_Accessor."
     },
     _walk: function(visitor) {
         return visitor._visit(this, function() {
@@ -814,12 +834,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, {
@@ -847,7 +867,7 @@ function TreeWalker(callback) {
     this.visit = callback;
     this.stack = [];
     this.directives = Object.create(null);
-};
+}
 TreeWalker.prototype = {
     _visit: function(node, descend) {
         this.push(node);
@@ -898,24 +918,6 @@ TreeWalker.prototype = {
             }
         }
     },
-    in_boolean_context: function() {
-        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 == "||")))
-                return false;
-            self = p;
-        }
-    },
     loopcontrol_target: function(node) {
         var stack = this.stack;
         if (node.label) for (var i = stack.length; --i >= 0;) {
@@ -928,5 +930,25 @@ TreeWalker.prototype = {
                 || node instanceof AST_Break && x instanceof AST_Switch)
                 return x;
         }
+    },
+    in_boolean_context: function() {
+        var self = this.self();
+        for (var i = 0, p; p = this.parent(i); i++) {
+            if (p instanceof AST_SimpleStatement
+                || p instanceof AST_Conditional && p.condition === self
+                || p instanceof AST_DWLoop && p.condition === self
+                || p instanceof AST_For && p.condition === self
+                || p instanceof AST_If && p.condition === self
+                || p instanceof AST_UnaryPrefix && p.operator == "!" && p.expression === self) {
+                return true;
+            }
+            if (p instanceof AST_Binary && (p.operator == "&&" || p.operator == "||")
+                || p instanceof AST_Conditional
+                || p.tail_node() === self) {
+                self = p;
+            } else {
+                return false;
+            }
+        }
     }
 };

lib/minify.js

@@ -7,15 +7,23 @@ var to_base64 = typeof btoa == "undefined" ? function(str) {
     return new Buffer(str).toString("base64");
 } : btoa;
 
-function read_source_map(code) {
+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");
+        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) {
@@ -29,7 +37,6 @@ function set_shorthand(name, options, keys) {
 
 function init_cache(cache) {
     if (!cache) return;
-    if (!("cname" in cache)) cache.cname = -1;
     if (!("props" in cache)) {
         cache.props = new Dictionary();
     } else if (!(cache.props instanceof Dictionary)) {
@@ -39,7 +46,6 @@ function init_cache(cache) {
 
 function to_json(cache) {
     return {
-        cname: cache.cname,
         props: cache.props.toObject()
     };
 }
@@ -49,12 +55,14 @@ function minify(files, options) {
     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,
@@ -64,6 +72,9 @@ function minify(files, options) {
         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" ]);
@@ -111,7 +122,7 @@ function minify(files, options) {
             };
         }
         if (timings) timings.parse = Date.now();
-        var toplevel;
+        var source_maps, toplevel;
         if (files instanceof AST_Toplevel) {
             toplevel = files;
         } else {
@@ -120,13 +131,23 @@ function minify(files, options) {
             }
             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 (options.sourceMap && options.sourceMap.content == "inline") {
+                if (source_maps) {
-                    if (Object.keys(files).length > 1)
+                    if (source_map_content == "inline") {
-                        throw new Error("inline source map only works with singular input");
+                        var inlined_content = read_source_map(name, files[name]);
-                    options.sourceMap.content = read_source_map(files[name]);
+                        if (inlined_content) {
+                            source_maps[name] = parse_source_map(inlined_content);
+                        }
+                    } else {
+                        source_maps[name] = source_map_content;
+                    }
                 }
             }
             toplevel = options.parse.toplevel;
@@ -137,15 +158,20 @@ function minify(files, options) {
         if (options.wrap) {
             toplevel = toplevel.wrap_commonjs(options.wrap);
         }
-        if (timings) timings.scope1 = Date.now();
+        if (options.enclose) {
-        if (options.compress) toplevel.figure_out_scope(options.mangle);
+            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.scope2 = Date.now();
+        if (timings) timings.scope = Date.now();
         if (options.mangle) toplevel.figure_out_scope(options.mangle);
         if (timings) timings.mangle = Date.now();
         if (options.mangle) {
-            base54.reset();
             toplevel.compute_char_frequency(options.mangle);
             toplevel.mangle_names(options.mangle);
         }
@@ -160,12 +186,9 @@ function minify(files, options) {
         }
         if (!HOP(options.output, "code") || options.output.code) {
             if (options.sourceMap) {
-                if (typeof options.sourceMap.content == "string") {
-                    options.sourceMap.content = JSON.parse(options.sourceMap.content);
-                }
                 options.output.source_map = SourceMap({
                     file: options.sourceMap.filename,
-                    orig: options.sourceMap.content,
+                    orig: source_maps,
                     root: options.sourceMap.root
                 });
                 if (options.sourceMap.includeSources) {
@@ -174,6 +197,8 @@ function minify(files, options) {
                     } 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;
@@ -199,9 +224,10 @@ function minify(files, options) {
         if (timings) {
             timings.end = Date.now();
             result.timings = {
-                parse: 1e-3 * (timings.scope1 - timings.parse),
+                parse: 1e-3 * (timings.rename - timings.parse),
-                scope: 1e-3 * (timings.compress - timings.scope1 + timings.mangle - timings.scope2),
+                rename: 1e-3 * (timings.compress - timings.rename),
-                compress: 1e-3 * (timings.scope2 - timings.compress),
+                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),

lib/mozilla-ast.js

@@ -44,10 +44,8 @@
 "use strict";
 
 (function() {
-
+    function normalize_directives(body) {
-    var normalize_directives = function(body) {
         var in_directive = true;
-
         for (var i = 0; i < body.length; i++) {
             if (in_directive && body[i] instanceof AST_Statement && body[i].body instanceof AST_String) {
                 body[i] = new AST_Directive({
@@ -59,9 +57,8 @@
                 in_directive = false;
             }
         }
-
         return body;
-    };
+    }
 
     var MOZ_TO_ME = {
         Program: function(M) {
@@ -180,6 +177,17 @@
                 end    : my_end_token(M)
             };
             if (val === null) return new AST_Null(args);
+            var rx = M.regex;
+            if (rx && rx.pattern) {
+                // RegExpLiteral as per ESTree AST spec
+                args.value = new RegExp(rx.pattern, rx.flags);
+                args.value.raw_source = rx.pattern;
+                return new AST_RegExp(args);
+            } else if (rx) {
+                // support legacy RegExp
+                args.value = M.regex && M.raw ? M.raw : val;
+                return new AST_RegExp(args);
+            }
             switch (typeof val) {
               case "string":
                 args.value = val;
@@ -189,16 +197,6 @@
                 return new AST_Number(args);
               case "boolean":
                 return new (val ? AST_True : AST_False)(args);
-              default:
-                var rx = M.regex;
-                if (rx && rx.pattern) {
-                    // RegExpLiteral as per ESTree AST spec
-                    args.value = new RegExp(rx.pattern, rx.flags).toString();
-                } else {
-                    // support legacy RegExp
-                    args.value = M.regex && M.raw ? M.raw : val;
-                }
-                return new AST_RegExp(args);
             }
         },
         Identifier: function(M) {
@@ -410,14 +408,15 @@
     });
 
     def_to_moz(AST_RegExp, function To_Moz_RegExpLiteral(M) {
-        var value = M.value;
+        var flags = M.value.toString().match(/[gimuy]*$/)[0];
+        var value = "/" + M.value.raw_source + "/" + flags;
         return {
             type: "Literal",
             value: value,
-            raw: value.toString(),
+            raw: value,
             regex: {
-                pattern: value.source,
+                pattern: M.value.raw_source,
-                flags: value.toString().match(/[gimuy]*$/)[0]
+                flags: flags
             }
         };
     });
@@ -478,7 +477,7 @@
             endpos  : range ? range[0] : moznode.start,
             raw     : raw_token(moznode),
         });
-    };
+    }
 
     function my_end_token(moznode) {
         var loc = moznode.loc, end = loc && loc.end;
@@ -493,7 +492,7 @@
             endpos  : range ? range[1] : moznode.end,
             raw     : raw_token(moznode),
         });
-    };
+    }
 
     function map(moztype, mytype, propmap) {
         var moz_to_me = "function From_Moz_" + moztype + "(M){\n";
@@ -548,7 +547,7 @@
         );
         MOZ_TO_ME[moztype] = moz_to_me;
         def_to_moz(mytype, me_to_moz);
-    };
+    }
 
     var FROM_MOZ_STACK = null;
 
@@ -557,13 +556,28 @@
         var ret = node != null ? MOZ_TO_ME[node.type](node) : null;
         FROM_MOZ_STACK.pop();
         return ret;
-    };
+    }
 
     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;
     };
 
@@ -583,24 +597,24 @@
             }
         }
         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);
@@ -611,5 +625,5 @@
             type: type,
             body: body
         };
-    };
+    }
 })();

lib/output.js

@@ -52,10 +52,11 @@ function is_some_comments(comment) {
 
 function OutputStream(options) {
 
+    var readonly = !options;
     options = defaults(options, {
         ascii_only       : false,
         beautify         : false,
-        bracketize       : false,
+        braces           : false,
         comments         : false,
         ie8              : false,
         indent_level     : 4,
@@ -121,11 +122,16 @@ function OutputStream(options) {
             }
         });
     } : function(str) {
-        return str.replace(/[\ud800-\udbff](?![\udc00-\udfff])/g, function(ch) {
+        var s = "";
-            return "\\u" + ch.charCodeAt(0).toString(16);
+        for (var i = 0, len = str.length; i < len; i++) {
-        }).replace(/(^|[^\ud800-\udbff])([\udc00-\udfff])/g, function(match, prefix, ch) {
+            if (is_surrogate_pair_head(str[i]) && !is_surrogate_pair_tail(str[i + 1])
-            return prefix + "\\u" + ch.charCodeAt(0).toString(16);
+                || is_surrogate_pair_tail(str[i]) && !is_surrogate_pair_head(str[i - 1])) {
-        });
+                s += "\\u" + str.charCodeAt(i).toString(16);
+            } else {
+                s += str[i];
+            }
+        }
+        return s;
     };
 
     function make_string(str, quote) {
@@ -167,33 +173,37 @@ function OutputStream(options) {
           default:
             return dq > sq ? quote_single() : quote_double();
         }
-    };
+    }
 
     function encode_string(str, quote) {
         var ret = make_string(str, quote);
         if (options.inline_script) {
-            ret = ret.replace(/<\x2fscript([>\/\t\n\f\r ])/gi, "<\\/script$1");
+            ret = ret.replace(/<\x2f(script)([>\/\t\n\f\r ])/gi, "<\\/$1$2");
             ret = ret.replace(/\x3c!--/g, "\\x3c!--");
             ret = ret.replace(/--\x3e/g, "--\\x3e");
         }
         return ret;
-    };
+    }
 
     function make_name(name) {
         name = name.toString();
         name = to_utf8(name, true);
         return name;
-    };
+    }
 
     function make_indent(back) {
         return repeat_string(" ", options.indent_start + indentation - back * options.indent_level);
-    };
+    }
 
     /* -----[ beautification/minification ]----- */
 
+    var has_parens = false;
     var might_need_space = false;
     var might_need_semicolon = false;
     var might_add_newline = 0;
+    var need_newline_indented = false;
+    var need_space = false;
+    var newline_insert = -1;
     var last = "";
     var mapping_token, mapping_name, mappings = options.source_map && [];
 
@@ -252,12 +262,26 @@ function OutputStream(options) {
     function print(str) {
         str = String(str);
         var ch = str.charAt(0);
+        if (need_newline_indented && ch) {
+            need_newline_indented = false;
+            if (ch != "\n") {
+                print("\n");
+                indent();
+            }
+        }
+        if (need_space && ch) {
+            need_space = false;
+            if (!/[\s;})]/.test(ch)) {
+                space();
+            }
+        }
+        newline_insert = -1;
         var prev = last.charAt(last.length - 1);
         if (might_need_semicolon) {
             might_need_semicolon = false;
 
             if (prev == ":" && ch == "}" || (!ch || ";}".indexOf(ch) < 0) && prev != ";") {
-                if (options.semicolons || requireSemicolonChars(ch)) {
+                if (options.semicolons || requireSemicolonChars[ch]) {
                     OUTPUT += ";";
                     current_col++;
                     current_pos++;
@@ -317,6 +341,7 @@ function OutputStream(options) {
         }
 
         OUTPUT += str;
+        has_parens = str[str.length - 1] == "(";
         current_pos += str.length;
         var a = str.split(/\r?\n/), n = a.length - 1;
         current_line += n;
@@ -326,7 +351,7 @@ function OutputStream(options) {
             current_col = a[n].length;
         }
         last = str;
-    };
+    }
 
     var space = options.beautify ? function() {
         print(" ");
@@ -349,13 +374,21 @@ function OutputStream(options) {
         return ret;
     } : function(col, cont) { return cont() };
 
-    var newline = options.beautify ? function() {
+    var may_add_newline = options.max_line_len ? function() {
-        print("\n");
-    } : options.max_line_len ? function() {
         ensure_line_len();
         might_add_newline = OUTPUT.length;
     } : noop;
 
+    var newline = options.beautify ? function() {
+        if (newline_insert < 0) return print("\n");
+        if (OUTPUT[newline_insert] != "\n") {
+            OUTPUT = OUTPUT.slice(0, newline_insert) + "\n" + OUTPUT.slice(newline_insert);
+            current_pos++;
+            current_line++;
+        }
+        newline_insert++;
+    } : may_add_newline;
+
     var semicolon = options.beautify ? function() {
         print(";");
     } : function() {
@@ -365,11 +398,11 @@ function OutputStream(options) {
     function force_semicolon() {
         might_need_semicolon = false;
         print(";");
-    };
+    }
 
     function next_indent() {
         return indentation + options.indent_level;
-    };
+    }
 
     function with_block(cont) {
         var ret;
@@ -381,34 +414,40 @@ function OutputStream(options) {
         indent();
         print("}");
         return ret;
-    };
+    }
 
     function with_parens(cont) {
         print("(");
+        may_add_newline();
         //XXX: still nice to have that for argument lists
         //var ret = with_indent(current_col, cont);
         var ret = cont();
+        may_add_newline();
         print(")");
         return ret;
-    };
+    }
 
     function with_square(cont) {
         print("[");
+        may_add_newline();
         //var ret = with_indent(current_col, cont);
         var ret = cont();
+        may_add_newline();
         print("]");
         return ret;
-    };
+    }
 
     function comma() {
+        may_add_newline();
         print(",");
+        may_add_newline();
         space();
-    };
+    }
 
     function colon() {
         print(":");
         space();
-    };
+    }
 
     var add_mapping = mappings ? function(token, name) {
         mapping_token = token;
@@ -420,7 +459,124 @@ function OutputStream(options) {
             ensure_line_len();
         }
         return OUTPUT;
-    };
+    }
+
+    function has_nlb() {
+        var index = OUTPUT.lastIndexOf("\n");
+        return /^ *$/.test(OUTPUT.slice(index + 1));
+    }
+
+    function prepend_comments(node) {
+        var self = this;
+        var start = node.start;
+        if (!start) return;
+        if (start.comments_before && start.comments_before._dumped === self) return;
+        var comments = start.comments_before;
+        if (!comments) {
+            comments = start.comments_before = [];
+        }
+        comments._dumped = self;
+
+        if (node instanceof AST_Exit && node.value) {
+            var tw = new TreeWalker(function(node) {
+                var parent = tw.parent();
+                if (parent instanceof AST_Exit
+                    || parent instanceof AST_Binary && parent.left === node
+                    || parent.TYPE == "Call" && parent.expression === node
+                    || parent instanceof AST_Conditional && parent.condition === node
+                    || parent instanceof AST_Dot && parent.expression === node
+                    || parent instanceof AST_Sequence && parent.expressions[0] === node
+                    || parent instanceof AST_Sub && parent.expression === node
+                    || parent instanceof AST_UnaryPostfix) {
+                    var text = node.start.comments_before;
+                    if (text && text._dumped !== self) {
+                        text._dumped = self;
+                        comments = comments.concat(text);
+                    }
+                } else {
+                    return true;
+                }
+            });
+            tw.push(node);
+            node.value.walk(tw);
+        }
+
+        if (current_pos == 0) {
+            if (comments.length > 0 && options.shebang && comments[0].type == "comment5") {
+                print("#!" + comments.shift().value + "\n");
+                indent();
+            }
+            var preamble = options.preamble;
+            if (preamble) {
+                print(preamble.replace(/\r\n?|[\n\u2028\u2029]|\s*$/g, "\n"));
+            }
+        }
+
+        comments = comments.filter(comment_filter, node);
+        if (comments.length == 0) return;
+        var last_nlb = has_nlb();
+        comments.forEach(function(c, i) {
+            if (!last_nlb) {
+                if (c.nlb) {
+                    print("\n");
+                    indent();
+                    last_nlb = true;
+                } else if (i > 0) {
+                    space();
+                }
+            }
+            if (/comment[134]/.test(c.type)) {
+                print("//" + c.value.replace(/[@#]__PURE__/g, ' ') + "\n");
+                indent();
+                last_nlb = true;
+            } else if (c.type == "comment2") {
+                print("/*" + c.value.replace(/[@#]__PURE__/g, ' ') + "*/");
+                last_nlb = false;
+            }
+        });
+        if (!last_nlb) {
+            if (start.nlb) {
+                print("\n");
+                indent();
+            } else {
+                space();
+            }
+        }
+    }
+
+    function append_comments(node, tail) {
+        var self = this;
+        var token = node.end;
+        if (!token) return;
+        var comments = token[tail ? "comments_before" : "comments_after"];
+        if (!comments || comments._dumped === self) return;
+        if (!(node instanceof AST_Statement || all(comments, function(c) {
+            return !/comment[134]/.test(c.type);
+        }))) return;
+        comments._dumped = self;
+        var insert = OUTPUT.length;
+        comments.filter(comment_filter, node).forEach(function(c, i) {
+            need_space = false;
+            if (need_newline_indented) {
+                print("\n");
+                indent();
+                need_newline_indented = false;
+            } else if (c.nlb && (i > 0 || !has_nlb())) {
+                print("\n");
+                indent();
+            } else if (i > 0 || !tail) {
+                space();
+            }
+            if (/comment[134]/.test(c.type)) {
+                print("//" + c.value.replace(/[@#]__PURE__/g, ' '));
+                need_newline_indented = true;
+            } else if (c.type == "comment2") {
+                print("/*" + c.value.replace(/[@#]__PURE__/g, ' ') + "*/");
+                need_space = true;
+            }
+        });
+        if (OUTPUT.length > insert) newline_insert = insert;
+    }
 
     var stack = [];
     return {
@@ -430,6 +586,7 @@ function OutputStream(options) {
         indentation     : function() { return indentation },
         current_width   : function() { return current_col - indentation },
         should_break    : function() { return options.width && this.current_width() >= options.width },
+        has_parens      : function() { return has_parens },
         newline         : newline,
         print           : print,
         space           : space,
@@ -459,7 +616,8 @@ function OutputStream(options) {
         with_square     : with_square,
         add_mapping     : add_mapping,
         option          : function(opt) { return options[opt] },
-        comment_filter  : comment_filter,
+        prepend_comments: readonly ? noop : prepend_comments,
+        append_comments : readonly || comment_filter === return_false ? noop : append_comments,
         line            : function() { return current_line },
         col             : function() { return current_col },
         pos             : function() { return current_pos },
@@ -469,8 +627,7 @@ function OutputStream(options) {
             return stack[stack.length - 2 - (n || 0)];
         }
     };
-
+}
-};
 
 /* -----[ code generators ]----- */
 
@@ -480,7 +637,7 @@ function OutputStream(options) {
 
     function DEFPRINT(nodetype, generator) {
         nodetype.DEFMETHOD("_codegen", generator);
-    };
+    }
 
     var in_directive = false;
     var active_scope = null;
@@ -495,9 +652,10 @@ function OutputStream(options) {
             use_asm = active_scope;
         }
         function doit() {
-            self.add_comments(stream);
+            stream.prepend_comments(self);
             self.add_source_map(stream);
             generator(self, stream);
+            stream.append_comments(self);
         }
         stream.push_node(self);
         if (force_parens || self.needs_parens(stream)) {
@@ -514,77 +672,10 @@ function OutputStream(options) {
 
     AST_Node.DEFMETHOD("print_to_string", function(options) {
         var s = OutputStream(options);
-        if (!options) s._readonly = true;
         this.print(s);
         return s.get();
     });
 
-    /* -----[ comments ]----- */
-
-    AST_Node.DEFMETHOD("add_comments", function(output){
-        if (output._readonly) return;
-        var self = this;
-        var start = self.start;
-        if (start && !start._comments_dumped) {
-            start._comments_dumped = true;
-            var comments = start.comments_before || [];
-
-            // XXX: ugly fix for https://github.com/mishoo/UglifyJS2/issues/112
-            //               and https://github.com/mishoo/UglifyJS2/issues/372
-            if (self instanceof AST_Exit && self.value) {
-                self.value.walk(new TreeWalker(function(node){
-                    if (node.start && node.start.comments_before) {
-                        comments = comments.concat(node.start.comments_before);
-                        node.start.comments_before = [];
-                    }
-                    if (node instanceof AST_Function ||
-                        node instanceof AST_Array ||
-                        node instanceof AST_Object)
-                    {
-                        return true; // don't go inside.
-                    }
-                }));
-            }
-
-            if (output.pos() == 0) {
-                if (comments.length > 0 && output.option("shebang") && comments[0].type == "comment5") {
-                    output.print("#!" + comments.shift().value + "\n");
-                    output.indent();
-                }
-                var preamble = output.option("preamble");
-                if (preamble) {
-                    output.print(preamble.replace(/\r\n?|[\n\u2028\u2029]|\s*$/g, "\n"));
-                }
-            }
-
-            comments = comments.filter(output.comment_filter, self);
-
-            // Keep single line comments after nlb, after nlb
-            if (!output.option("beautify") && comments.length > 0 &&
-                /comment[134]/.test(comments[0].type) &&
-                output.col() !== 0 && comments[0].nlb)
-            {
-                output.print("\n");
-            }
-
-            comments.forEach(function(c){
-                if (/comment[134]/.test(c.type)) {
-                    output.print("//" + c.value + "\n");
-                    output.indent();
-                }
-                else if (c.type == "comment2") {
-                    output.print("/*" + c.value + "*/");
-                    if (start.nlb) {
-                        output.print("\n");
-                        output.indent();
-                    } else {
-                        output.space();
-                    }
-                }
-            });
-        }
-    });
-
     /* -----[ PARENTHESES ]----- */
 
     function PARENS(nodetype, func) {
@@ -595,16 +686,14 @@ function OutputStream(options) {
         } else {
             nodetype.DEFMETHOD("needs_parens", func);
         }
-    };
+    }
 
-    PARENS(AST_Node, function(){
+    PARENS(AST_Node, return_false);
-        return false;
-    });
 
     // a function expression needs parens around it when it's provably
     // the first token to appear in a statement.
     PARENS(AST_Function, function(output) {
-        if (first_in_statement(output)) {
+        if (!output.has_parens() && first_in_statement(output)) {
             return true;
         }
 
@@ -626,7 +715,7 @@ function OutputStream(options) {
     // same goes for an object literal, because otherwise it would be
     // interpreted as a block of code.
     PARENS(AST_Object, function(output) {
-        return first_in_statement(output);
+        return !output.has_parens() && first_in_statement(output);
     });
 
     PARENS(AST_Unary, function(output) {
@@ -783,7 +872,7 @@ function OutputStream(options) {
             }
         });
         in_directive = false;
-    };
+    }
 
     AST_StatementWithBody.DEFMETHOD("_do_print_body", function(output) {
         force_statement(this.body, output);
@@ -806,14 +895,22 @@ function OutputStream(options) {
         self.body.print(output);
         output.semicolon();
     });
-    function print_bracketed(body, output, allow_directives) {
+    function print_braced_empty(self, output) {
-        if (body.length > 0) output.with_block(function(){
+        output.print("{");
-            display_body(body, false, output, allow_directives);
+        output.with_indent(output.next_indent(), function() {
+            output.append_comments(self, true);
         });
-        else output.print("{}");
+        output.print("}");
-    };
+    }
+    function print_braced(self, output, allow_directives) {
+        if (self.body.length > 0) {
+            output.with_block(function() {
+                display_body(self.body, false, output, allow_directives);
+            });
+        } else print_braced_empty(self, output);
+    }
     DEFPRINT(AST_BlockStatement, function(self, output) {
-        print_bracketed(self.body, output);
+        print_braced(self, output);
     });
     DEFPRINT(AST_EmptyStatement, function(self, output) {
         output.semicolon();
@@ -908,48 +1005,39 @@ function OutputStream(options) {
             });
         });
         output.space();
-        print_bracketed(self.body, output, true);
+        print_braced(self, output, true);
     });
     DEFPRINT(AST_Lambda, function(self, output) {
         self._do_print(output);
     });
 
-    /* -----[ exits ]----- */
+    /* -----[ jumps ]----- */
-    AST_Exit.DEFMETHOD("_do_print", function(output, kind){
+    function print_jump(output, kind, target) {
         output.print(kind);
-        if (this.value) {
+        if (target) {
             output.space();
-            this.value.print(output);
+            target.print(output);
         }
         output.semicolon();
-    });
+    }
+
     DEFPRINT(AST_Return, function(self, output) {
-        self._do_print(output, "return");
+        print_jump(output, "return", self.value);
     });
     DEFPRINT(AST_Throw, function(self, output) {
-        self._do_print(output, "throw");
+        print_jump(output, "throw", self.value);
-    });
-
-    /* -----[ loop control ]----- */
-    AST_LoopControl.DEFMETHOD("_do_print", function(output, kind){
-        output.print(kind);
-        if (this.label) {
-            output.space();
-            this.label.print(output);
-        }
-        output.semicolon();
     });
     DEFPRINT(AST_Break, function(self, output) {
-        self._do_print(output, "break");
+        print_jump(output, "break", self.label);
     });
     DEFPRINT(AST_Continue, function(self, output) {
-        self._do_print(output, "continue");
+        print_jump(output, "continue", self.label);
     });
 
     /* -----[ if ]----- */
     function make_then(self, output) {
         var b = self.body;
-        if (output.option("bracketize")
+        if (output.option("braces")
             || output.option("ie8") && b instanceof AST_Do)
             return make_block(b, output);
         // The squeezer replaces "block"-s that contain only a single
@@ -958,7 +1046,7 @@ function OutputStream(options) {
         // IF having an ELSE clause where the THEN clause ends in an
         // IF *without* an ELSE block (then the outer ELSE would refer
         // to the inner IF).  This function checks for this case and
-        // adds the block brackets if needed.
+        // adds the block braces if needed.
         if (!b) return output.force_semicolon();
         while (true) {
             if (b instanceof AST_If) {
@@ -974,7 +1062,7 @@ function OutputStream(options) {
             else break;
         }
         force_statement(self.body, output);
-    };
+    }
     DEFPRINT(AST_If, function(self, output) {
         output.print("if");
         output.space();
@@ -1005,7 +1093,7 @@ function OutputStream(options) {
         });
         output.space();
         var last = self.body.length - 1;
-        if (last < 0) output.print("{}");
+        if (last < 0) print_braced_empty(self, output);
         else output.with_block(function() {
             self.body.forEach(function(branch, i) {
                 output.indent(true);
@@ -1039,7 +1127,7 @@ function OutputStream(options) {
     DEFPRINT(AST_Try, function(self, output) {
         output.print("try");
         output.space();
-        print_bracketed(self.body, output);
+        print_braced(self, output);
         if (self.bcatch) {
             output.space();
             self.bcatch.print(output);
@@ -1056,30 +1144,23 @@ function OutputStream(options) {
             self.argname.print(output);
         });
         output.space();
-        print_bracketed(self.body, output);
+        print_braced(self, output);
     });
     DEFPRINT(AST_Finally, function(self, output) {
         output.print("finally");
         output.space();
-        print_bracketed(self.body, output);
+        print_braced(self, output);
     });
 
-    /* -----[ var/const ]----- */
+    DEFPRINT(AST_Var, function(self, output) {
-    AST_Definitions.DEFMETHOD("_do_print", function(output, kind){
+        output.print("var");
-        output.print(kind);
         output.space();
-        this.definitions.forEach(function(def, i){
+        self.definitions.forEach(function(def, i) {
             if (i) output.comma();
             def.print(output);
         });
         var p = output.parent();
-        var in_for = p instanceof AST_For || p instanceof AST_ForIn;
+        if (p.init !== self || !(p instanceof AST_For || p instanceof AST_ForIn)) output.semicolon();
-        var avoid_semicolon = in_for && p.init === this;
-        if (!avoid_semicolon)
-            output.semicolon();
-    });
-    DEFPRINT(AST_Var, function(self, output){
-        self._do_print(output, "var");
     });
 
     function parenthesize_for_noin(node, output, noin) {
@@ -1094,7 +1175,7 @@ function OutputStream(options) {
             }
         }));
         node.print(output, parens);
-    };
+    }
 
     DEFPRINT(AST_VarDef, function(self, output) {
         self.name.print(output);
@@ -1128,9 +1209,8 @@ function OutputStream(options) {
         output.space();
         AST_Call.prototype._codegen(self, output);
     });
-
+    DEFPRINT(AST_Sequence, function(self, output) {
-    AST_Sequence.DEFMETHOD("_do_print", function(output){
+        self.expressions.forEach(function(node, index) {
-        this.expressions.forEach(function(node, index) {
             if (index > 0) {
                 output.comma();
                 if (output.should_break()) {
@@ -1141,22 +1221,11 @@ function OutputStream(options) {
             node.print(output);
         });
     });
-    DEFPRINT(AST_Sequence, function(self, output){
-        self._do_print(output);
-        // var p = output.parent();
-        // if (p instanceof AST_Statement) {
-        //     output.with_indent(output.next_indent(), function(){
-        //         self._do_print(output);
-        //     });
-        // } else {
-        //     self._do_print(output);
-        // }
-    });
     DEFPRINT(AST_Dot, function(self, output) {
         var expr = self.expression;
         expr.print(output);
         var prop = self.property;
-        if (output.option("ie8") && RESERVED_WORDS(prop)) {
+        if (output.option("ie8") && RESERVED_WORDS[prop]) {
             output.print("[");
             output.add_mapping(self.end);
             output.print_string(prop);
@@ -1260,18 +1329,15 @@ function OutputStream(options) {
             });
             output.newline();
         });
-        else output.print("{}");
+        else print_braced_empty(self, output);
     });
 
     function print_property_name(key, quote, output) {
         if (output.option("quote_keys")) {
-            output.print_string(key + "");
+            output.print_string(key);
-        } else if ((typeof key == "number"
+        } else if ("" + +key == key && key >= 0) {
-                    || !output.option("beautify")
-                    && +key + "" == key)
-                   && parseFloat(key) >= 0) {
             output.print(make_num(key));
-        } else if (RESERVED_WORDS(key) ? !output.option("ie8") : is_identifier_string(key)) {
+        } else if (RESERVED_WORDS[key] ? !output.option("ie8") : is_identifier_string(key)) {
             if (quote && output.option("keep_quoted_props")) {
                 output.print_string(key, quote);
             } else {
@@ -1335,7 +1401,7 @@ function OutputStream(options) {
     });
 
     function force_statement(stat, output) {
-        if (output.option("bracketize")) {
+        if (output.option("braces")) {
             make_block(stat, output);
         } else {
             if (!stat || stat instanceof AST_EmptyStatement)
@@ -1343,7 +1409,7 @@ function OutputStream(options) {
             else
                 stat.print(output);
         }
-    };
+    }
 
     // self should be AST_New.  decide if we want to show parens or not.
     function need_constructor_parens(self, output) {
@@ -1351,7 +1417,7 @@ function OutputStream(options) {
         if (self.args.length > 0) return true;
 
         return output.option("beautify");
-    };
+    }
 
     function best_of(a) {
         var best = a[0], len = best.length;
@@ -1362,27 +1428,31 @@ function OutputStream(options) {
             }
         }
         return best;
-    };
+    }
 
     function make_num(num) {
-        var str = num.toString(10), a = [ str.replace(/^0\./, ".").replace('e+', 'e') ], m;
+        var str = num.toString(10).replace(/^0\./, ".").replace("e+", "e");
+        var candidates = [ str ];
         if (Math.floor(num) === num) {
-            if (num >= 0) {
+            if (num < 0) {
-                a.push("0x" + num.toString(16).toLowerCase(), // probably pointless
+                candidates.push("-0x" + (-num).toString(16).toLowerCase());
-                       "0" + num.toString(8)); // same.
             } else {
-                a.push("-0x" + (-num).toString(16).toLowerCase(), // probably pointless
+                candidates.push("0x" + num.toString(16).toLowerCase());
-                       "-0" + (-num).toString(8)); // same.
             }
-            if ((m = /^(.*?)(0+)$/.exec(num))) {
-                a.push(m[1] + "e" + m[2].length);
         }
-        } else if ((m = /^0?\.(0+)(.*)$/.exec(num))) {
+        var match, len, digits;
-            a.push(m[2] + "e-" + (m[1].length + m[2].length),
+        if (match = /^\.0+/.exec(str)) {
-                   str.substr(str.indexOf(".")));
+            len = match[0].length;
+            digits = str.slice(len);
+            candidates.push(digits + "e-" + (digits.length + len - 1));
+        } else if (match = /0+$/.exec(str)) {
+            len = match[0].length;
+            candidates.push(str.slice(0, -len) + "e" + len);
+        } else if (match = /^(\d)\.(\d+)e(-?\d+)$/.exec(str)) {
+            candidates.push(match[1] + match[2] + "e" + (match[3] - match[2].length));
+        }
+        return best_of(candidates);
     }
-        return best_of(a);
-    };
 
     function make_block(stmt, output) {
         if (!stmt || stmt instanceof AST_EmptyStatement)
@@ -1394,52 +1464,57 @@ function OutputStream(options) {
             stmt.print(output);
             output.newline();
         });
-    };
+    }
 
     /* -----[ source map generators ]----- */
 
     function DEFMAP(nodetype, generator) {
-        nodetype.DEFMETHOD("add_source_map", function(stream){
+        nodetype.forEach(function(nodetype) {
-            generator(this, stream);
+            nodetype.DEFMETHOD("add_source_map", generator);
         });
-    };
+    }
 
+    DEFMAP([
         // We could easily add info for ALL nodes, but it seems to me that
         // would be quite wasteful, hence this noop in the base class.
-    DEFMAP(AST_Node, noop);
+        AST_Node,
-
+        // since the label symbol will mark it
-    function basic_sourcemap_gen(self, output) {
+        AST_LabeledStatement,
-        output.add_mapping(self.start);
+        AST_Toplevel,
-    };
+    ], noop);
 
     // XXX: I'm not exactly sure if we need it for all of these nodes,
     // or if we should add even more.
-
+    DEFMAP([
-    DEFMAP(AST_Directive, basic_sourcemap_gen);
+        AST_Array,
-    DEFMAP(AST_Debugger, basic_sourcemap_gen);
+        AST_BlockStatement,
-    DEFMAP(AST_Symbol, basic_sourcemap_gen);
+        AST_Catch,
-    DEFMAP(AST_Jump, basic_sourcemap_gen);
+        AST_Constant,
-    DEFMAP(AST_StatementWithBody, basic_sourcemap_gen);
+        AST_Debugger,
-    DEFMAP(AST_LabeledStatement, noop); // since the label symbol will mark it
+        AST_Definitions,
-    DEFMAP(AST_Lambda, basic_sourcemap_gen);
+        AST_Directive,
-    DEFMAP(AST_Switch, basic_sourcemap_gen);
+        AST_Finally,
-    DEFMAP(AST_SwitchBranch, basic_sourcemap_gen);
+        AST_Jump,
-    DEFMAP(AST_BlockStatement, basic_sourcemap_gen);
+        AST_Lambda,
-    DEFMAP(AST_Toplevel, noop);
+        AST_New,
-    DEFMAP(AST_New, basic_sourcemap_gen);
+        AST_Object,
-    DEFMAP(AST_Try, basic_sourcemap_gen);
+        AST_StatementWithBody,
-    DEFMAP(AST_Catch, basic_sourcemap_gen);
+        AST_Symbol,
-    DEFMAP(AST_Finally, basic_sourcemap_gen);
+        AST_Switch,
-    DEFMAP(AST_Definitions, basic_sourcemap_gen);
+        AST_SwitchBranch,
-    DEFMAP(AST_Constant, basic_sourcemap_gen);
+        AST_Try,
-    DEFMAP(AST_ObjectSetter, function(self, output){
+    ], function(output) {
-        output.add_mapping(self.start, self.key.name);
+        output.add_mapping(this.start);
-    });
-    DEFMAP(AST_ObjectGetter, function(self, output){
-        output.add_mapping(self.start, self.key.name);
-    });
-    DEFMAP(AST_ObjectProperty, function(self, output){
-        output.add_mapping(self.start, self.key);
     });
 
+    DEFMAP([
+        AST_ObjectGetter,
+        AST_ObjectSetter,
+     ], function(output) {
+        output.add_mapping(this.start, this.key.name);
+    });
+
+    DEFMAP([ AST_ObjectProperty ], function(output) {
+        output.add_mapping(this.start, this.key);
+    });
 })();

lib/parse.js

@@ -130,15 +130,27 @@ function is_letter(code) {
     return (code >= 97 && code <= 122)
         || (code >= 65 && code <= 90)
         || (code >= 0xaa && UNICODE.letter.test(String.fromCharCode(code)));
-};
+}
+
+function is_surrogate_pair_head(code) {
+    if (typeof code == "string")
+        code = code.charCodeAt(0);
+    return code >= 0xd800 && code <= 0xdbff;
+}
+
+function is_surrogate_pair_tail(code) {
+    if (typeof code == "string")
+        code = code.charCodeAt(0);
+    return code >= 0xdc00 && code <= 0xdfff;
+}
 
 function is_digit(code) {
     return code >= 48 && code <= 57;
-};
+}
 
 function is_alphanumeric_char(code) {
     return is_digit(code) || is_letter(code);
-};
+}
 
 function is_unicode_digit(code) {
     return UNICODE.digit.test(String.fromCharCode(code));
@@ -146,19 +158,19 @@ function is_unicode_digit(code) {
 
 function is_unicode_combining_mark(ch) {
     return UNICODE.non_spacing_mark.test(ch) || UNICODE.space_combining_mark.test(ch);
-};
+}
 
 function is_unicode_connector_punctuation(ch) {
     return UNICODE.connector_punctuation.test(ch);
-};
+}
 
 function is_identifier(name) {
-    return !RESERVED_WORDS(name) && /^[a-z_$][a-z0-9_$]*$/i.test(name);
+    return !RESERVED_WORDS[name] && /^[a-z_$][a-z0-9_$]*$/i.test(name);
-};
+}
 
 function is_identifier_start(code) {
     return code == 36 || code == 95 || is_letter(code);
-};
+}
 
 function is_identifier_char(ch) {
     var code = ch.charCodeAt(0);
@@ -170,11 +182,11 @@ function is_identifier_char(ch) {
         || is_unicode_connector_punctuation(ch)
         || is_unicode_digit(code)
     ;
-};
+}
 
 function is_identifier_string(str) {
     return /^[a-z_$][a-z0-9_$]*$/i.test(str);
-};
+}
 
 function parse_js_number(num) {
     if (RE_HEX_NUMBER.test(num)) {
@@ -185,7 +197,7 @@ function parse_js_number(num) {
         var val = parseFloat(num);
         if (val == num) return val;
     }
-};
+}
 
 function JS_Parse_Error(message, filename, line, col, pos) {
     this.message = message;
@@ -193,7 +205,7 @@ function JS_Parse_Error(message, filename, line, col, pos) {
     this.line = line;
     this.col = col;
     this.pos = pos;
-};
+}
 JS_Parse_Error.prototype = Object.create(Error.prototype);
 JS_Parse_Error.prototype.constructor = JS_Parse_Error;
 JS_Parse_Error.prototype.name = "SyntaxError";
@@ -201,11 +213,11 @@ configure_error_stack(JS_Parse_Error);
 
 function js_error(message, filename, line, col, pos) {
     throw new JS_Parse_Error(message, filename, line, col, pos);
-};
+}
 
 function is_token(token, type, val) {
     return token.type == type && (val == null || token.value == val);
-};
+}
 
 var EX_EOF = {};
 
@@ -227,13 +239,15 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
         directive_stack : []
     };
 
-    function peek() { return S.text.charAt(S.pos); };
+    function peek() {
+        return S.text.charAt(S.pos);
+    }
 
     function next(signal_eof, in_string) {
         var ch = S.text.charAt(S.pos++);
         if (signal_eof && !ch)
             throw EX_EOF;
-        if (NEWLINE_CHARS(ch)) {
+        if (NEWLINE_CHARS[ch]) {
             S.newline_before = S.newline_before || !in_string;
             ++S.line;
             S.col = 0;
@@ -246,43 +260,43 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
             ++S.col;
         }
         return ch;
-    };
+    }
 
     function forward(i) {
         while (i-- > 0) next();
-    };
+    }
 
     function looking_at(str) {
         return S.text.substr(S.pos, str.length) == str;
-    };
+    }
 
     function find_eol() {
         var text = S.text;
         for (var i = S.pos, n = S.text.length; i < n; ++i) {
             var ch = text[i];
-            if (NEWLINE_CHARS(ch))
+            if (NEWLINE_CHARS[ch])
                 return i;
         }
         return -1;
-    };
+    }
 
     function find(what, signal_eof) {
         var pos = S.text.indexOf(what, S.pos);
         if (signal_eof && pos == -1) throw EX_EOF;
         return pos;
-    };
+    }
 
     function start_token() {
         S.tokline = S.line;
         S.tokcol = S.col;
         S.tokpos = S.pos;
-    };
+    }
 
     var prev_was_dot = false;
     function token(type, value, is_comment) {
-        S.regex_allowed = ((type == "operator" && !UNARY_POSTFIX(value)) ||
+        S.regex_allowed = ((type == "operator" && !UNARY_POSTFIX[value]) ||
-                           (type == "keyword" && KEYWORDS_BEFORE_EXPRESSION(value)) ||
+                           (type == "keyword" && KEYWORDS_BEFORE_EXPRESSION[value]) ||
-                           (type == "punc" && PUNC_BEFORE_EXPRESSION(value)));
+                           (type == "punc" && PUNC_BEFORE_EXPRESSION[value]));
         if (type == "punc" && value == ".") {
             prev_was_dot = true;
         } else if (!is_comment) {
@@ -305,31 +319,27 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
         }
         if (!is_comment) {
             ret.comments_before = S.comments_before;
-            S.comments_before = [];
+            ret.comments_after = S.comments_before = [];
-            // make note of any newlines in the comments that came before
-            for (var i = 0, len = ret.comments_before.length; i < len; i++) {
-                ret.nlb = ret.nlb || ret.comments_before[i].nlb;
-            }
         }
         S.newline_before = false;
         return new AST_Token(ret);
-    };
+    }
 
     function skip_whitespace() {
-        while (WHITESPACE_CHARS(peek()))
+        while (WHITESPACE_CHARS[peek()])
             next();
-    };
+    }
 
     function read_while(pred) {
         var ret = "", ch, i = 0;
         while ((ch = peek()) && pred(ch, i++))
             ret += next();
         return ret;
-    };
+    }
 
     function parse_error(err) {
         js_error(err, filename, S.tokline, S.tokcol, S.tokpos);
-    };
+    }
 
     function read_num(prefix) {
         var has_e = false, after_e = false, has_x = false, has_dot = prefix == ".";
@@ -359,7 +369,7 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
         } else {
             parse_error("Invalid syntax: " + num);
         }
-    };
+    }
 
     function read_escaped_char(in_string) {
         var ch = next(true, in_string);
@@ -382,7 +392,7 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
         if (ch >= "0" && ch <= "7")
             return read_octal_escape_sequence(ch);
         return ch;
-    };
+    }
 
     function read_octal_escape_sequence(ch) {
         // Read
@@ -409,14 +419,14 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
             num = (num << 4) | digit;
         }
         return num;
-    };
+    }
 
     var read_string = with_eof_error("Unterminated string constant", function(quote_char) {
         var quote = next(), ret = "";
         for (;;) {
             var ch = next(true, true);
             if (ch == "\\") ch = read_escaped_char(true);
-            else if (NEWLINE_CHARS(ch)) parse_error("Unterminated string constant");
+            else if (NEWLINE_CHARS[ch]) parse_error("Unterminated string constant");
             else if (ch == quote) break;
             ret += ch;
         }
@@ -439,7 +449,7 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
         S.comments_before.push(token(type, ret, true));
         S.regex_allowed = regex_allowed;
         return next_token;
-    };
+    }
 
     var skip_multiline_comment = with_eof_error("Unterminated multiline comment", function() {
         var regex_allowed = S.regex_allowed;
@@ -468,16 +478,16 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
                 backslash = false;
             }
         }
-        if (KEYWORDS(name) && escaped) {
+        if (KEYWORDS[name] && escaped) {
             hex = name.charCodeAt(0).toString(16).toUpperCase();
             name = "\\u" + "0000".substr(hex.length) + hex + name.slice(1);
         }
         return name;
-    };
+    }
 
     var read_regexp = with_eof_error("Unterminated regular expression", function(source) {
         var prev_backslash = false, ch, in_class = false;
-        while ((ch = next(true))) if (NEWLINE_CHARS(ch)) {
+        while ((ch = next(true))) if (NEWLINE_CHARS[ch]) {
             parse_error("Unexpected line terminator");
         } else if (prev_backslash) {
             source += "\\" + ch;
@@ -509,15 +519,15 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
         function grow(op) {
             if (!peek()) return op;
             var bigger = op + peek();
-            if (OPERATORS(bigger)) {
+            if (OPERATORS[bigger]) {
                 next();
                 return grow(bigger);
             } else {
                 return op;
             }
-        };
+        }
         return token("operator", grow(prefix || next()));
-    };
+    }
 
     function handle_slash() {
         next();
@@ -530,23 +540,23 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
             return skip_multiline_comment();
         }
         return S.regex_allowed ? read_regexp("") : read_operator("/");
-    };
+    }
 
     function handle_dot() {
         next();
         return is_digit(peek().charCodeAt(0))
             ? read_num(".")
             : token("punc", ".");
-    };
+    }
 
     function read_word() {
         var word = read_name();
         if (prev_was_dot) return token("name", word);
-        return KEYWORDS_ATOM(word) ? token("atom", word)
+        return KEYWORDS_ATOM[word] ? token("atom", word)
-            : !KEYWORDS(word) ? token("name", word)
+            : !KEYWORDS[word] ? token("name", word)
-            : OPERATORS(word) ? token("operator", word)
+            : OPERATORS[word] ? token("operator", word)
             : token("keyword", word);
-    };
+    }
 
     function with_eof_error(eof_error, cont) {
         return function(x) {
@@ -557,7 +567,7 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
                 else throw ex;
             }
         };
-    };
+    }
 
     function next_token(force_regexp) {
         if (force_regexp != null)
@@ -595,13 +605,13 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
               }
             }
             if (is_digit(code)) return read_num();
-            if (PUNC_CHARS(ch)) return token("punc", next());
+            if (PUNC_CHARS[ch]) return token("punc", next());
-            if (OPERATOR_CHARS(ch)) return read_operator();
+            if (OPERATOR_CHARS[ch]) return read_operator();
             if (code == 92 || is_identifier_start(code)) return read_word();
             break;
         }
         parse_error("Unexpected character '" + ch + "'");
-    };
+    }
 
     next_token.context = function(nc) {
         if (nc) S = nc;
@@ -637,8 +647,7 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
     }
 
     return next_token;
-
+}
-};
 
 /* -----[ Parser (constants) ]----- */
 
@@ -658,7 +667,7 @@ var UNARY_POSTFIX = makePredicate([ "--", "++" ]);
 
 var ASSIGNMENT = makePredicate([ "=", "+=", "-=", "/=", "*=", "%=", ">>=", "<<=", ">>>=", "|=", "^=", "&=" ]);
 
-var PRECEDENCE = (function(a, ret){
+var PRECEDENCE = function(a, ret) {
     for (var i = 0; i < a.length; ++i) {
         var b = a[i];
         for (var j = 0; j < b.length; ++j) {
@@ -666,8 +675,7 @@ var PRECEDENCE = (function(a, ret){
         }
     }
     return ret;
-})(
+}([
-    [
     ["||"],
     ["&&"],
     ["|"],
@@ -678,16 +686,13 @@ var PRECEDENCE = (function(a, ret){
     [">>", "<<", ">>>"],
     ["+", "-"],
     ["*", "/", "%"]
-    ],
+], {});
-    {}
-);
 
 var ATOMIC_START_TOKEN = makePredicate([ "atom", "num", "string", "regexp", "name" ]);
 
 /* -----[ Parser ]----- */
 
 function parse($TEXT, options) {
-
     options = defaults(options, {
         bare_returns   : false,
         expression     : false,
@@ -716,9 +721,11 @@ function parse($TEXT, options) {
 
     function is(type, value) {
         return is_token(S.token, type, value);
-    };
+    }
 
-    function peek() { return S.peeked || (S.peeked = S.input()); };
+    function peek() {
+        return S.peeked || (S.peeked = S.input());
+    }
 
     function next() {
         S.prev = S.token;
@@ -732,11 +739,11 @@ function parse($TEXT, options) {
             S.token.type == "string" || is("punc", ";")
         );
         return S.token;
-    };
+    }
 
     function prev() {
         return S.prev;
-    };
+    }
 
     function croak(msg, line, col, pos) {
         var ctx = S.input.context();
@@ -745,74 +752,81 @@ function parse($TEXT, options) {
                  line != null ? line : ctx.tokline,
                  col != null ? col : ctx.tokcol,
                  pos != null ? pos : ctx.tokpos);
-    };
+    }
 
     function token_error(token, msg) {
         croak(msg, token.line, token.col);
-    };
+    }
 
     function unexpected(token) {
         if (token == null)
             token = S.token;
         token_error(token, "Unexpected token: " + token.type + " (" + token.value + ")");
-    };
+    }
 
     function expect_token(type, val) {
         if (is(type, val)) {
             return next();
         }
         token_error(S.token, "Unexpected token " + S.token.type + " «" + S.token.value + "»" + ", expected " + type + " «" + val + "»");
-    };
+    }
 
-    function expect(punc) { return expect_token("punc", punc); };
+    function expect(punc) {
+        return expect_token("punc", punc);
+    }
+
+    function has_newline_before(token) {
+        return token.nlb || !all(token.comments_before, function(comment) {
+            return !comment.nlb;
+        });
+    }
 
     function can_insert_semicolon() {
-        return !options.strict && (
+        return !options.strict
-            S.token.nlb || is("eof") || is("punc", "}")
+            && (is("eof") || is("punc", "}") || has_newline_before(S.token));
-        );
+    }
-    };
 
     function semicolon(optional) {
         if (is("punc", ";")) next();
         else if (!optional && !can_insert_semicolon()) unexpected();
-    };
+    }
 
     function parenthesised() {
         expect("(");
         var exp = expression(true);
         expect(")");
         return exp;
-    };
+    }
 
     function embed_tokens(parser) {
         return function() {
             var start = S.token;
-            var expr = parser();
+            var expr = parser.apply(null, arguments);
             var end = prev();
             expr.start = start;
             expr.end = end;
             return expr;
         };
-    };
+    }
 
     function handle_regexp() {
         if (is("operator", "/") || is("operator", "/=")) {
             S.peeked = null;
             S.token = S.input(S.token.value.substr(1)); // force regexp
         }
-    };
+    }
 
-    var statement = embed_tokens(function() {
+    var statement = embed_tokens(function(strict_defun) {
         handle_regexp();
         switch (S.token.type) {
           case "string":
             if (S.in_directives) {
                 var token = peek();
                 if (S.token.raw.indexOf("\\") == -1
-                    && (token.nlb
+                    && (is_token(token, "punc", ";")
-                        || is_token(token, "eof")
+                        || is_token(token, "punc", "}")
-                        || is_token(token, "punc", ";")
+                        || has_newline_before(token)
-                        || is_token(token, "punc", "}"))) {
+                        || is_token(token, "eof"))) {
                     S.input.add_directive(S.token.value);
                 } else {
                     S.in_directives = false;
@@ -888,6 +902,9 @@ function parse($TEXT, options) {
                 return for_();
 
               case "function":
+                if (!strict_defun && S.input.has_directive("use strict")) {
+                    croak("In strict mode code, functions can only be declared at top level or immediately within another function.");
+                }
                 next();
                 return function_(AST_Defun);
 
@@ -919,7 +936,7 @@ function parse($TEXT, options) {
 
               case "throw":
                 next();
-                if (S.token.nlb)
+                if (has_newline_before(S.token))
                     croak("Illegal newline after 'throw'");
                 var value = expression(true);
                 semicolon();
@@ -953,7 +970,9 @@ function parse($TEXT, options) {
 
     function labeled_statement() {
         var label = as_symbol(AST_Label);
-        if (find_if(function(l){ return l.name == label.name }, S.labels)) {
+        if (!all(S.labels, function(l) {
+            return l.name != label.name;
+        })) {
             // ECMA-262, 12.12: An ECMAScript program is considered
             // syntactically incorrect if it contains a
             // LabelledStatement that is enclosed by a
@@ -977,11 +996,11 @@ function parse($TEXT, options) {
             });
         }
         return new AST_LabeledStatement({ body: stat, label: label });
-    };
+    }
 
     function simple_statement(tmp) {
         return new AST_SimpleStatement({ body: (tmp = expression(true), semicolon(), tmp) });
-    };
+    }
 
     function break_cont(type) {
         var label = null, ldef;
@@ -989,18 +1008,17 @@ function parse($TEXT, options) {
             label = as_symbol(AST_LabelRef, true);
         }
         if (label != null) {
-            ldef = find_if(function(l){ return l.name == label.name }, S.labels);
+            ldef = find_if(function(l) {
-            if (!ldef)
+                return l.name == label.name;
-                croak("Undefined label " + label.name);
+            }, S.labels);
+            if (!ldef) croak("Undefined label " + label.name);
             label.thedef = ldef;
-        }
+        } else if (S.in_loop == 0) croak(type.TYPE + " not inside a loop or switch");
-        else if (S.in_loop == 0)
-            croak(type.TYPE + " not inside a loop or switch");
         semicolon();
         var stat = new type({ label: label });
         if (ldef) ldef.references.push(stat);
         return stat;
-    };
+    }
 
     function for_() {
         expect("(");
@@ -1021,7 +1039,7 @@ function parse($TEXT, options) {
             }
         }
         return regular_for(init);
-    };
+    }
 
     function regular_for(init) {
         expect(";");
@@ -1035,19 +1053,17 @@ function parse($TEXT, options) {
             step      : step,
             body      : in_loop(statement)
         });
-    };
+    }
 
     function for_in(init) {
-        var lhs = init instanceof AST_Var ? init.definitions[0].name : null;
         var obj = expression(true);
         expect(")");
         return new AST_ForIn({
             init   : init,
-            name   : lhs,
             object : obj,
             body   : in_loop(statement)
         });
-    };
+    }
 
     var function_ = function(ctor) {
         var in_statement = ctor === AST_Defun;
@@ -1070,7 +1086,7 @@ function parse($TEXT, options) {
         S.input.push_directives_stack();
         S.in_loop = 0;
         S.labels = [];
-        var body = block_();
+        var body = block_(true);
         if (S.input.has_directive("use strict")) {
             if (name) strict_verify_symbol(name);
             argnames.forEach(strict_verify_symbol);
@@ -1097,18 +1113,18 @@ function parse($TEXT, options) {
             body        : body,
             alternative : belse
         });
-    };
+    }
 
-    function block_() {
+    function block_(strict_defun) {
         expect("{");
         var a = [];
         while (!is("punc", "}")) {
             if (is("eof")) unexpected();
-            a.push(statement());
+            a.push(statement(strict_defun));
         }
         next();
         return a;
-    };
+    }
 
     function switch_body_() {
         expect("{");
@@ -1143,7 +1159,7 @@ function parse($TEXT, options) {
         if (branch) branch.end = prev();
         next();
         return a;
-    };
+    }
 
     function try_() {
         var body = block_(), bcatch = null, bfinally = null;
@@ -1176,7 +1192,7 @@ function parse($TEXT, options) {
             bcatch   : bcatch,
             bfinally : bfinally
         });
-    };
+    }
 
     function vardefs(no_in) {
         var a = [];
@@ -1192,7 +1208,7 @@ function parse($TEXT, options) {
             next();
         }
         return a;
-    };
+    }
 
     var var_ = function(no_in) {
         return new AST_Var({
@@ -1212,12 +1228,14 @@ function parse($TEXT, options) {
         } else {
             args = [];
         }
-        return subscripts(new AST_New({
+        var call = new AST_New({
             start      : start,
             expression : newexp,
             args       : args,
             end        : prev()
-        }), allow_calls);
+        });
+        mark_pure(call);
+        return subscripts(call, allow_calls);
     };
 
     function as_atom_node() {
@@ -1256,7 +1274,7 @@ function parse($TEXT, options) {
         }
         next();
         return ret;
-    };
+    }
 
     var expr_atom = function(allow_calls) {
         if (is("operator", "new")) {
@@ -1268,9 +1286,26 @@ function parse($TEXT, options) {
               case "(":
                 next();
                 var ex = expression(true);
+                var len = start.comments_before.length;
+                [].unshift.apply(ex.start.comments_before, start.comments_before);
+                start.comments_before = ex.start.comments_before;
+                start.comments_before_length = len;
+                if (len == 0 && start.comments_before.length > 0) {
+                    var comment = start.comments_before[0];
+                    if (!comment.nlb) {
+                        comment.nlb = start.nlb;
+                        start.nlb = false;
+                    }
+                }
+                start.comments_after = ex.start.comments_after;
                 ex.start = start;
-                ex.end = S.token;
                 expect(")");
+                var end = prev();
+                end.comments_before = ex.end.comments_before;
+                [].push.apply(ex.end.comments_after, end.comments_after);
+                end.comments_after = ex.end.comments_after;
+                ex.end = end;
+                if (ex instanceof AST_Call) mark_pure(ex);
                 return subscripts(ex, allow_calls);
               case "[":
                 return subscripts(array_(), allow_calls);
@@ -1286,7 +1321,7 @@ function parse($TEXT, options) {
             func.end = prev();
             return subscripts(func, allow_calls);
         }
-        if (ATOMIC_START_TOKEN(S.token.type)) {
+        if (ATOMIC_START_TOKEN[S.token.type]) {
             return subscripts(as_atom_node(), allow_calls);
         }
         unexpected();
@@ -1305,7 +1340,7 @@ function parse($TEXT, options) {
         }
         next();
         return a;
-    };
+    }
 
     var array_ = embed_tokens(function() {
         expect("[");
@@ -1332,7 +1367,7 @@ function parse($TEXT, options) {
             if (type == "name" && !is("punc", ":")) {
                 var key = new AST_SymbolAccessor({
                     start: S.token,
-                    name: as_property_name(),
+                    name: "" + as_property_name(),
                     end: prev()
                 });
                 if (name == "get") {
@@ -1358,7 +1393,7 @@ function parse($TEXT, options) {
             a.push(new AST_ObjectKeyVal({
                 start : start,
                 quote : start.quote,
-                key   : name,
+                key   : "" + name,
                 value : expression(false),
                 end   : prev()
             }));
@@ -1371,7 +1406,7 @@ function parse($TEXT, options) {
         var tmp = S.token;
         switch (tmp.type) {
           case "operator":
-            if (!KEYWORDS(tmp.value)) unexpected();
+            if (!KEYWORDS[tmp.value]) unexpected();
           case "num":
           case "string":
           case "name":
@@ -1382,14 +1417,14 @@ function parse($TEXT, options) {
           default:
             unexpected();
         }
-    };
+    }
 
     function as_name() {
         var tmp = S.token;
         if (tmp.type != "name") unexpected();
         next();
         return tmp.value;
-    };
+    }
 
     function _make_symbol(type) {
         var name = S.token.value;
@@ -1398,7 +1433,7 @@ function parse($TEXT, options) {
             start : S.token,
             end   : S.token
         });
-    };
+    }
 
     function strict_verify_symbol(sym) {
         if (sym.name == "arguments" || sym.name == "eval")
@@ -1416,7 +1451,20 @@ function parse($TEXT, options) {
         }
         next();
         return sym;
-    };
+    }
+
+    function mark_pure(call) {
+        var start = call.start;
+        var comments = start.comments_before;
+        var i = HOP(start, "comments_before_length") ? start.comments_before_length : comments.length;
+        while (--i >= 0) {
+            var comment = comments[i];
+            if (/[@#]__PURE__/.test(comment.value)) {
+                call.pure = comment;
+                break;
+            }
+        }
+    }
 
     var subscripts = function(expr, allow_calls) {
         var start = expr.start;
@@ -1442,19 +1490,21 @@ function parse($TEXT, options) {
         }
         if (allow_calls && is("punc", "(")) {
             next();
-            return subscripts(new AST_Call({
+            var call = new AST_Call({
                 start      : start,
                 expression : expr,
                 args       : expr_list(")"),
                 end        : prev()
-            }), true);
+            });
+            mark_pure(call);
+            return subscripts(call, true);
         }
         return expr;
     };
 
     var maybe_unary = function(allow_calls) {
         var start = S.token;
-        if (is("operator") && UNARY_PREFIX(start.value)) {
+        if (is("operator") && UNARY_PREFIX[start.value]) {
             next();
             handle_regexp();
             var ex = make_unary(AST_UnaryPrefix, start, maybe_unary(allow_calls));
@@ -1463,7 +1513,7 @@ function parse($TEXT, options) {
             return ex;
         }
         var val = expr_atom(allow_calls);
-        while (is("operator") && UNARY_POSTFIX(S.token.value) && !S.token.nlb) {
+        while (is("operator") && UNARY_POSTFIX[S.token.value] && !has_newline_before(S.token)) {
             val = make_unary(AST_UnaryPostfix, S.token, val);
             val.start = start;
             val.end = S.token;
@@ -1486,7 +1536,7 @@ function parse($TEXT, options) {
             break;
         }
         return new ctor({ operator: op, expression: expr });
-    };
+    }
 
     var expr_op = function(left, min_prec, no_in) {
         var op = is("operator") ? S.token.value : null;
@@ -1508,7 +1558,7 @@ function parse($TEXT, options) {
 
     function expr_ops(no_in) {
         return expr_op(maybe_unary(true), 0, no_in);
-    };
+    }
 
     var maybe_conditional = function(no_in) {
         var start = S.token;
@@ -1530,12 +1580,12 @@ function parse($TEXT, options) {
 
     function is_assignable(expr) {
         return expr instanceof AST_PropAccess || expr instanceof AST_SymbolRef;
-    };
+    }
 
     var maybe_assign = function(no_in) {
         var start = S.token;
         var left = maybe_conditional(no_in), val = S.token.value;
-        if (is("operator") && ASSIGNMENT(val)) {
+        if (is("operator") && ASSIGNMENT[val]) {
             if (is_assignable(left)) {
                 next();
                 return new AST_Assign({
@@ -1572,18 +1622,18 @@ function parse($TEXT, options) {
         var ret = cont();
         --S.in_loop;
         return ret;
-    };
+    }
 
     if (options.expression) {
         return expression(true);
     }
 
-    return (function(){
+    return function() {
         var start = S.token;
         var body = [];
         S.input.push_directives_stack();
         while (!is("eof"))
-            body.push(statement());
+            body.push(statement(true));
         S.input.pop_directives_stack();
         var end = prev();
         var toplevel = options.toplevel;
@@ -1594,6 +1644,5 @@ function parse($TEXT, options) {
             toplevel = new AST_Toplevel({ start: start, body: body, end: end });
         }
         return toplevel;
-    })();
+    }();
-
+}
-};

lib/propmangle.js

@@ -84,7 +84,7 @@ function reserve_quoted_keys(ast, reserved) {
 function addStrings(node, add) {
     node.walk(new TreeWalker(function(node) {
         if (node instanceof AST_Sequence) {
-            addStrings(node.expressions[node.expressions.length - 1], add);
+            addStrings(node.tail_node(), add);
         } else if (node instanceof AST_String) {
             add(node.value);
         } else if (node instanceof AST_Conditional) {
@@ -110,12 +110,15 @@ function mangle_properties(ast, options) {
     if (!Array.isArray(reserved)) reserved = [];
     if (!options.builtins) find_builtins(reserved);
 
-    var cache = options.cache;
+    var cname = -1;
-    if (cache == null) {
+    var cache;
-        cache = {
+    if (options.cache) {
-            cname: -1,
+        cache = options.cache.props;
-            props: new Dictionary()
+        cache.each(function(mangled_name) {
-        };
+            push_uniq(reserved, mangled_name);
+        });
+    } else {
+        cache = new Dictionary();
     }
 
     var regex = options.regex;
@@ -147,6 +150,10 @@ function mangle_properties(ast, options) {
         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
@@ -164,6 +171,10 @@ function mangle_properties(ast, options) {
         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
@@ -172,7 +183,7 @@ function mangle_properties(ast, options) {
         if (unmangleable.indexOf(name) >= 0) return false;
         if (reserved.indexOf(name) >= 0) return false;
         if (options.only_cache) {
-            return cache.props.has(name);
+            return cache.has(name);
         }
         if (/^-?[0-9]+(\.[0-9]+)?(e[+-][0-9]+)?$/.test(name)) return false;
         return true;
@@ -181,7 +192,7 @@ function mangle_properties(ast, options) {
     function should_mangle(name) {
         if (regex && !regex.test(name)) return false;
         if (reserved.indexOf(name) >= 0) return false;
-        return cache.props.has(name)
+        return cache.has(name)
             || names_to_mangle.indexOf(name) >= 0;
     }
 
@@ -199,7 +210,7 @@ function mangle_properties(ast, options) {
             return name;
         }
 
-        var mangled = cache.props.get(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_.
@@ -213,11 +224,11 @@ function mangle_properties(ast, options) {
             // either debug mode is off, or it is on and we could not use the mangled name
             if (!mangled) {
                 do {
-                    mangled = base54(++cache.cname);
+                    mangled = base54(++cname);
                 } while (!can_mangle(mangled));
             }
 
-            cache.props.set(name, mangled);
+            cache.set(name, mangled);
         }
         return mangled;
     }

lib/scope.js

@@ -43,17 +43,19 @@
 
 "use strict";
 
-function SymbolDef(scope, index, orig) {
+function SymbolDef(scope, orig, init) {
     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.index = index;
     this.id = SymbolDef.next_id++;
-};
+}
 
 SymbolDef.next_id = 1;
 
@@ -61,28 +63,24 @@ SymbolDef.prototype = {
     unmangleable: function(options) {
         if (!options) options = {};
 
-        return (this.global && !options.toplevel)
+        return this.global && !options.toplevel
             || this.undeclared
-            || (!options.eval && (this.scope.uses_eval || this.scope.uses_with))
+            || !options.eval && this.scope.pinned()
-            || (options.keep_fnames
+            || 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)) {
-        else if (!this.mangled_name && !this.unmangleable(options)) {
-            var s = this.scope;
-            var sym = this.orig[0];
-            if (options.ie8 && sym instanceof AST_SymbolLambda)
-                s = s.parent_scope;
             var def;
             if (def = this.redefined()) {
                 this.mangled_name = def.mangled_name || def.name;
-            } else
+            } else {
-                this.mangled_name = s.next_mangled(options, this);
+                this.mangled_name = next_mangled_name(this.scope, options, this);
+            }
             if (this.global && cache) {
                 cache.set(this.name, this.mangled_name);
             }
@@ -102,7 +100,6 @@ AST_Toplevel.DEFMETHOD("figure_out_scope", function(options){
     // pass 1: setup scope chaining and handle definitions
     var self = this;
     var scope = self.parent_scope = null;
-    var labels = new Dictionary();
     var defun = null;
     var tw = new TreeWalker(function(node, descend) {
         if (node instanceof AST_Catch) {
@@ -117,25 +114,12 @@ AST_Toplevel.DEFMETHOD("figure_out_scope", function(options){
             node.init_scope_vars(scope);
             var save_scope = scope;
             var save_defun = defun;
-            var save_labels = labels;
             defun = scope = node;
-            labels = new Dictionary();
             descend();
             scope = save_scope;
             defun = save_defun;
-            labels = save_labels;
             return true;        // don't descend again in TreeWalker
         }
-        if (node instanceof AST_LabeledStatement) {
-            var l = node.label;
-            if (labels.has(l.name)) {
-                throw new Error(string_template("Label {name} defined twice", l));
-            }
-            labels.set(l.name, l);
-            descend();
-            labels.del(l.name);
-            return true;        // no descend again
-        }
         if (node instanceof AST_With) {
             for (var s = scope; s; s = s.parent_scope)
                 s.uses_with = true;
@@ -148,40 +132,31 @@ AST_Toplevel.DEFMETHOD("figure_out_scope", function(options){
             node.thedef = node;
             node.references = [];
         }
-        if (node instanceof AST_SymbolLambda) {
+        if (node instanceof AST_SymbolDefun || options.ie8 && node instanceof AST_SymbolLambda) {
-            defun.def_function(node);
-        }
-        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);
+            (node.scope = defun.parent_scope).def_function(node, defun);
+        }
+        else if (node instanceof AST_SymbolLambda) {
+            defun.def_function(node, node.name == "arguments" ? undefined : defun);
         }
         else if (node instanceof AST_SymbolVar) {
-            defun.def_variable(node);
+            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);
                 }
+                node.reference(options);
             }
         }
         else if (node instanceof AST_SymbolCatch) {
             scope.def_variable(node).defun = defun;
         }
-        else if (node instanceof AST_LabelRef) {
-            var sym = labels.get(node.name);
-            if (!sym) throw new Error(string_template("Undefined label {name} [{line},{col}]", {
-                name: node.name,
-                line: node.start.line,
-                col: node.start.col
-            }));
-            node.thedef = sym;
-        }
     });
     self.walk(tw);
 
@@ -240,10 +215,6 @@ AST_Toplevel.DEFMETHOD("figure_out_scope", function(options){
             }
         }));
     }
-
-    if (options.cache) {
-        this.cname = options.cache.cname;
-    }
 });
 
 AST_Toplevel.DEFMETHOD("def_global", function(node) {
@@ -251,7 +222,7 @@ AST_Toplevel.DEFMETHOD("def_global", function(node){
     if (globals.has(name)) {
         return globals.get(name);
     } else {
-        var g = new SymbolDef(this, globals.size(), node);
+        var g = new SymbolDef(this, node);
         g.undeclared = true;
         g.global = true;
         globals.set(name, g);
@@ -305,61 +276,81 @@ AST_Scope.DEFMETHOD("find_variable", function(name){
         || (this.parent_scope && this.parent_scope.find_variable(name));
 });
 
-AST_Scope.DEFMETHOD("def_function", function(symbol){
+AST_Scope.DEFMETHOD("def_function", function(symbol, init) {
-    this.functions.set(symbol.name, this.def_variable(symbol));
+    var def = this.def_variable(symbol, init);
+    if (!def.init || def.init instanceof AST_Defun) def.init = init;
+    this.functions.set(symbol.name, def);
+    return def;
 });
 
-AST_Scope.DEFMETHOD("def_variable", function(symbol){
+AST_Scope.DEFMETHOD("def_variable", function(symbol, init) {
-    var def;
+    var def = this.variables.get(symbol.name);
-    if (!this.variables.has(symbol.name)) {
+    if (def) {
-        def = new SymbolDef(this, this.variables.size(), symbol);
+        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);
         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_Scope.DEFMETHOD("next_mangled", function(options){
+function names_in_use(scope, options) {
-    var ext = this.enclosed;
+    var names = scope.names_in_use;
-    out: while (true) {
+    if (!names) {
-        var m = base54(++this.cname);
+        scope.names_in_use = names = Object.create(scope.mangled_names || null);
-        if (!is_identifier(m)) continue; // skip over "do"
+        scope.cname_holes = [];
-
+        scope.enclosed.forEach(function(def) {
-        // https://github.com/mishoo/UglifyJS2/issues/242 -- do not
+            if (def.unmangleable(options)) names[def.name] = true;
-        // shadow a name reserved from mangling.
-        if (options.reserved.indexOf(m) >= 0) continue;
-
-        // we must ensure that the mangled name does not shadow a name
-        // from some parent scope that is referenced in this or in
-        // inner scopes.
-        for (var i = ext.length; --i >= 0;) {
-            var sym = ext[i];
-            var name = sym.mangled_name || (sym.unmangleable(options) && sym.name);
-            if (m == name) continue out;
-        }
-        return m;
-    }
         });
+    }
+    return names;
+}
 
-AST_Function.DEFMETHOD("next_mangled", function(options, def){
+function next_mangled_name(scope, options, def) {
+    var in_use = names_in_use(scope, options);
+    var holes = scope.cname_holes;
+    var names = Object.create(null);
     // #179, #326
     // in Safari strict mode, something like (function x(x){...}) is a syntax error;
     // a function expression's argument cannot shadow the function expression's name
-
+    if (scope instanceof AST_Function && scope.name && def.orig[0] instanceof AST_SymbolFunarg) {
-    var tricky_def = def.orig[0] instanceof AST_SymbolFunarg && this.name && this.name.definition();
+        var tricky_def = scope.name.definition();
-
         // the function's mangled_name is null when keep_fnames is true
-    var tricky_name = tricky_def ? tricky_def.mangled_name || tricky_def.name : null;
+        names[tricky_def.mangled_name || tricky_def.name] = true;
-
+    }
-    while (true) {
+    var scopes = [ scope ];
-        var name = AST_Lambda.prototype.next_mangled.call(this, options, def);
+    def.references.forEach(function(sym) {
-        if (!tricky_name || tricky_name != name)
+        var scope = sym.scope;
+        do {
+            if (scopes.indexOf(scope) < 0) {
+                for (var name in names_in_use(scope, options)) {
+                    names[name] = true;
+                }
+                scopes.push(scope);
+            } else break;
+        } while (scope = scope.parent_scope);
+    });
+    var name;
+    for (var i = 0, len = holes.length; i < len; i++) {
+        name = base54(holes[i]);
+        if (names[name]) continue;
+        holes.splice(i, 1);
+        scope.names_in_use[name] = true;
+        return name;
+    }
+    while (true) {
+        name = base54(++scope.cname);
+        if (in_use[name] || !is_identifier(name) || options.reserved.has[name]) continue;
+        if (!names[name]) break;
+        holes.push(scope.cname);
+    }
+    scope.names_in_use[name] = true;
     return name;
 }
-});
 
 AST_Symbol.DEFMETHOD("unmangleable", function(options) {
     var def = this.definition();
@@ -370,8 +361,7 @@ AST_Symbol.DEFMETHOD("unmangleable", function(options){
 AST_Label.DEFMETHOD("unmangleable", return_false);
 
 AST_Symbol.DEFMETHOD("unreferenced", function() {
-    return this.definition().references.length == 0
+    return !this.definition().references.length && !this.scope.pinned();
-        && !(this.scope.uses_eval || this.scope.uses_with);
 });
 
 AST_Symbol.DEFMETHOD("definition", function() {
@@ -382,7 +372,7 @@ AST_Symbol.DEFMETHOD("global", function(){
     return this.definition().global;
 });
 
-AST_Toplevel.DEFMETHOD("_default_mangler_options", function(options){
+function _default_mangler_options(options) {
     options = defaults(options, {
         eval        : false,
         ie8         : false,
@@ -391,30 +381,29 @@ AST_Toplevel.DEFMETHOD("_default_mangler_options", function(options){
         toplevel    : false,
     });
     if (!Array.isArray(options.reserved)) options.reserved = [];
+    // Never mangle arguments
+    push_uniq(options.reserved, "arguments");
+    options.reserved.has = makePredicate(options.reserved);
     return options;
-});
+}
 
 AST_Toplevel.DEFMETHOD("mangle_names", function(options) {
-    options = this._default_mangler_options(options);
+    options = _default_mangler_options(options);
-
-    // Never mangle arguments
-    options.reserved.push('arguments');
 
     // We only need to mangle declaration nodes.  Special logic wired
     // into the code generator will display the mangled name if it's
     // present (and for AST_SymbolRef-s it'll use the mangled name of
     // the AST_SymbolDeclaration that it points to).
     var lname = -1;
-    var to_mangle = [];
 
-    if (options.cache) {
+    if (options.cache && options.cache.props) {
-        this.globals.each(function(symbol){
+        var mangled_names = this.mangled_names = Object.create(null);
-            if (options.reserved.indexOf(symbol.name) < 0) {
+        options.cache.props.each(function(mangled_name) {
-                to_mangle.push(symbol);
+            mangled_names[mangled_name] = true;
-            }
         });
     }
 
+    var redefined = [];
     var tw = new TreeWalker(function(node, descend) {
         if (node instanceof AST_LabeledStatement) {
             // lname is incremented when we get to the AST_Label
@@ -424,14 +413,12 @@ AST_Toplevel.DEFMETHOD("mangle_names", function(options){
             return true;        // don't descend again in TreeWalker
         }
         if (node instanceof AST_Scope) {
-            var p = tw.parent(), a = [];
+            descend();
-            node.variables.each(function(symbol){
+            if (options.cache && node instanceof AST_Toplevel) {
-                if (options.reserved.indexOf(symbol.name) < 0) {
+                node.globals.each(mangle);
-                    a.push(symbol);
             }
-            });
+            node.variables.each(mangle);
-            to_mangle.push.apply(to_mangle, a);
+            return true;
-            return;
         }
         if (node instanceof AST_Label) {
             var name;
@@ -439,21 +426,100 @@ AST_Toplevel.DEFMETHOD("mangle_names", function(options){
             node.mangled_name = name;
             return true;
         }
-        if (!options.ie8 && node instanceof AST_SymbolCatch) {
+        if (!options.ie8 && node instanceof AST_Catch) {
-            to_mangle.push(node.definition());
+            var def = node.argname.definition();
-            return;
+            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;
         }
     });
     this.walk(tw);
-    to_mangle.forEach(function(def){ def.mangle(options) });
+    redefined.forEach(mangle);
 
-    if (options.cache) {
+    function mangle(def) {
-        options.cache.cname = this.cname;
+        if (options.reserved.has[def.name]) return;
+        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 = this._default_mangler_options(options);
+    options = _default_mangler_options(options);
+    base54.reset();
     try {
         AST_Node.prototype.print = function(stream, force_parens) {
             this._print(stream, force_parens);
@@ -480,23 +546,27 @@ AST_Toplevel.DEFMETHOD("compute_char_frequency", function(options){
             skip_string(node.consequent);
             skip_string(node.alternative);
         } else if (node instanceof AST_Sequence) {
-            skip_string(node.expressions[node.expressions.length - 1]);
+            skip_string(node.tail_node());
         }
     }
 });
 
 var base54 = (function() {
-    var leading = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ$_".split("");
+    var freq = Object.create(null);
-    var digits = "0123456789".split("");
+    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 chars, frequency;
     function reset() {
-        frequency = Object.create(null);
+        frequency = Object.create(freq);
-        leading.forEach(function(ch) {
-            frequency[ch] = 0;
-        });
-        digits.forEach(function(ch) {
-            frequency[ch] = 0;
-        });
     }
     base54.consider = function(str, delta) {
         for (var i = str.length; --i >= 0;) {
@@ -507,7 +577,7 @@ var base54 = (function() {
         return frequency[b] - frequency[a];
     }
     base54.sort = function() {
-        chars = mergeSort(leading, compare).concat(mergeSort(digits, compare));
+        chars = leading.sort(compare).concat(digits.sort(compare));
     };
     base54.reset = reset;
     reset();
@@ -521,6 +591,6 @@ var base54 = (function() {
             base = 64;
         } while (num > 0);
         return ret;
-    };
+    }
     return base54;
 })();

lib/sourcemap.js

@@ -49,49 +49,56 @@ function SourceMap(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
     });
-    var orig_map = options.orig && new MOZ_SourceMap.SourceMapConsumer(options.orig);
+    var maps = options.orig && Object.create(null);
-
+    if (maps) for (var source in options.orig) {
-    if (orig_map && Array.isArray(options.orig.sources)) {
+        var map = new MOZ_SourceMap.SourceMapConsumer(options.orig[source]);
-        orig_map._sources.toArray().forEach(function(source) {
+        if (Array.isArray(options.orig[source].sources)) {
-            var sourceContent = orig_map.sourceContentFor(source, true);
+            map._sources.toArray().forEach(function(source) {
-            if (sourceContent) {
+                var sourceContent = map.sourceContentFor(source, true);
-                generator.setSourceContent(source, sourceContent);
+                if (sourceContent) generator.setSourceContent(source, sourceContent);
-            }
             });
         }
-
+        maps[source] = map;
-    function add(source, gen_line, gen_col, orig_line, orig_col, name) {
+    }
-        if (orig_map) {
+    return {
-            var info = orig_map.originalPositionFor({
+        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) {
+                if (info.source === null) return;
-                return;
-            }
                 source = info.source;
                 orig_line = info.line;
                 orig_col = info.column;
                 name = info.name || name;
             }
             generator.addMapping({
-            generated : { line: gen_line + options.dest_line_diff, column: gen_col },
+                name: name,
-            original  : { line: orig_line + options.orig_line_diff, column: orig_col },
                 source: source,
-            name      : name
+                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());
+        }
     };
-    return {
+}
-        add        : add,
-        get        : function() { return generator },
-        toString   : function() { return JSON.stringify(generator.toJSON()); }
-    };
-};

lib/transform.js

@@ -43,8 +43,6 @@
 
 "use strict";
 
-// Tree transformer helpers.
-
 function TreeTransformer(before, after) {
     TreeWalker.call(this);
     this.before = before;
@@ -52,166 +50,136 @@ function TreeTransformer(before, after) {
 }
 TreeTransformer.prototype = new TreeWalker;
 
-(function(undefined){
+(function(DEF) {
-
-    function _(node, descend) {
-        node.DEFMETHOD("transform", function(tw, in_list){
-            var x, y;
-            tw.push(this);
-            if (tw.before) x = tw.before(this, descend, in_list);
-            if (x === undefined) {
-                if (!tw.after) {
-                    x = this;
-                    descend(x, tw);
-                } else {
-                    tw.stack[tw.stack.length - 1] = x = this;
-                    descend(x, tw);
-                    y = tw.after(x, in_list);
-                    if (y !== undefined) x = y;
-                }
-            }
-            tw.pop();
-            return x;
-        });
-    };
-
     function do_list(list, tw) {
         return MAP(list, function(node) {
             return node.transform(tw, true);
         });
-    };
+    }
 
-    _(AST_Node, noop);
+    DEF(AST_Node, noop);
-
+    DEF(AST_LabeledStatement, function(self, tw) {
-    _(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) {
-    _(AST_DWLoop, function(self, tw){
+        self.body = self.body.transform(tw);
+        self.condition = self.condition.transform(tw);
+    });
+    DEF(AST_While, 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) {
-    _(AST_Sequence, function(self, tw){
         self.expressions = do_list(self.expressions, tw);
     });
-
+    DEF(AST_Dot, function(self, tw) {
-    _(AST_Dot, function(self, tw){
         self.expression = self.expression.transform(tw);
     });
-
+    DEF(AST_Sub, function(self, tw) {
-    _(AST_Sub, function(self, tw){
         self.expression = self.expression.transform(tw);
         self.property = self.property.transform(tw);
     });
-
+    DEF(AST_Unary, function(self, tw) {
-    _(AST_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,33 +43,25 @@
 
 "use strict";
 
-function slice(a, start) {
-    return Array.prototype.slice.call(a, start || 0);
-};
-
 function characters(str) {
     return str.split("");
-};
+}
 
 function member(name, array) {
     return array.indexOf(name) >= 0;
-};
+}
 
 function find_if(func, array) {
-    for (var i = 0, n = array.length; i < n; ++i) {
+    for (var i = array.length; --i >= 0;) if (func(array[i])) return array[i];
-        if (func(array[i]))
-            return array[i];
 }
-};
 
 function repeat_string(str, i) {
     if (i <= 0) return "";
     if (i == 1) return str;
     var d = repeat_string(str, i >> 1);
     d += d;
-    if (i & 1) d += str;
+    return i & 1 ? d + str : d;
-    return d;
+}
-};
 
 function configure_error_stack(fn) {
     Object.defineProperty(fn.prototype, "stack", {
@@ -88,27 +80,23 @@ function configure_error_stack(fn) {
 function DefaultsError(msg, defs) {
     this.message = msg;
     this.defs = defs;
-};
+}
 DefaultsError.prototype = Object.create(Error.prototype);
 DefaultsError.prototype.constructor = DefaultsError;
 DefaultsError.prototype.name = "DefaultsError";
 configure_error_stack(DefaultsError);
 
-DefaultsError.croak = function(msg, defs) {
-    throw new DefaultsError(msg, defs);
-};
-
 function defaults(args, defs, croak) {
-    if (args === true)
+    if (args === true) args = {};
-        args = {};
     var ret = args || {};
-    if (croak) for (var i in ret) if (HOP(ret, i) && !HOP(defs, i))
+    if (croak) for (var i in ret) if (HOP(ret, i) && !HOP(defs, i)) {
-        DefaultsError.croak("`" + i + "` is not a supported option", defs);
+        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];
     }
     return ret;
-};
+}
 
 function merge(obj, ext) {
     var count = 0;
@@ -117,7 +105,7 @@ function merge(obj, ext) {
         count++;
     }
     return count;
-};
+}
 
 function noop() {}
 function return_false() { return false; }
@@ -148,8 +136,8 @@ var MAP = (function(){
                 }
             }
             return is_last;
-        };
+        }
-        if (a instanceof Array) {
+        if (Array.isArray(a)) {
             if (backwards) {
                 for (i = a.length; --i >= 0;) if (doit()) break;
                 ret.reverse();
@@ -162,127 +150,54 @@ var MAP = (function(){
             for (i in a) if (HOP(a, i)) if (doit()) break;
         }
         return top.concat(ret);
-    };
+    }
     MAP.at_top = function(val) { return new AtTop(val) };
     MAP.splice = function(val) { return new Splice(val) };
     MAP.last = function(val) { return new Last(val) };
     var skip = MAP.skip = {};
-    function AtTop(val) { this.v = val };
+    function AtTop(val) { this.v = val }
-    function Splice(val) { this.v = val };
+    function Splice(val) { this.v = val }
-    function Last(val) { this.v = val };
+    function Last(val) { this.v = val }
     return MAP;
 })();
 
 function push_uniq(array, el) {
     if (array.indexOf(el) < 0)
         array.push(el);
-};
+}
 
 function string_template(text, props) {
     return text.replace(/\{(.+?)\}/g, function(str, p) {
         return props && props[p];
     });
-};
+}
 
 function remove(array, el) {
     for (var i = array.length; --i >= 0;) {
         if (array[i] === el) array.splice(i, 1);
     }
-};
-
-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;
-    });
-};
-
-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(" ");
+    if (!Array.isArray(words)) words = words.split(" ");
-    var f = "", cats = [];
+    var map = Object.create(null);
-    out: for (var i = 0; i < words.length; ++i) {
+    words.forEach(function(word) {
-        for (var j = 0; j < cats.length; ++j)
+        map[word] = true;
-            if (cats[j][0].length == words[i].length) {
-                cats[j].push(words[i]);
-                continue out;
-            }
-        cats.push([words[i]]);
-    }
-    function quote(word) {
-        return JSON.stringify(word).replace(/[\u2028\u2029]/g, function(s) {
-            switch (s) {
-                case "\u2028": return "\\u2028";
-                case "\u2029": return "\\u2029";
-            }
-            return s;
     });
+    return map;
 }
-    function compareTo(arr) {
-        if (arr.length == 1) return f += "return str === " + quote(arr[0]) + ";";
-        f += "switch(str){";
-        for (var i = 0; i < arr.length; ++i) f += "case " + quote(arr[i]) + ":";
-        f += "return true}return false;";
-    }
-    // When there are more than three length categories, an outer
-    // switch first dispatches on the lengths, to save on comparisons.
-    if (cats.length > 3) {
-        cats.sort(function(a, b) {return b.length - a.length;});
-        f += "switch(str.length){";
-        for (var i = 0; i < cats.length; ++i) {
-            var cat = cats[i];
-            f += "case " + cat[0].length + ":";
-            compareTo(cat);
-        }
-        f += "}";
-        // Otherwise, simply generate a flat `switch` statement.
-    } else {
-        compareTo(words);
-    }
-    return new Function("str", f);
-};
 
 function all(array, predicate) {
     for (var i = array.length; --i >= 0;)
         if (!predicate(array[i]))
             return false;
     return true;
-};
+}
 
 function Dictionary() {
     this._values = Object.create(null);
     this._size = 0;
-};
+}
 Dictionary.prototype = {
     set: function(key, val) {
         if (!this.has(key)) ++this._size;
@@ -319,6 +234,13 @@ Dictionary.prototype = {
             ret.push(f(this._values[i], i.substr(1)));
         return ret;
     },
+    clone: function() {
+        var ret = new Dictionary();
+        for (var i in this._values)
+            ret._values[i] = this._values[i];
+        ret._size = this._size;
+        return ret;
+    },
     toObject: function() { return this._values }
 };
 Dictionary.fromObject = function(obj) {
@@ -336,20 +258,22 @@ function HOP(obj, prop) {
 // a statement.
 function first_in_statement(stack) {
     var node = stack.parent(-1);
-    for (var i = 0, p; p = stack.parent(i); i++) {
+    for (var i = 0, p; p = stack.parent(i++); node = p) {
-        if (p instanceof AST_Statement && p.body === node)
+        if (p.TYPE == "Call") {
-            return true;
+            if (p.expression === node) continue;
-        if ((p instanceof AST_Sequence      && p.expressions[0] === node) ||
+        } else if (p instanceof AST_Binary) {
-            (p instanceof AST_Call          && p.expression === node && !(p instanceof AST_New) ) ||
+            if (p.left === node) continue;
-            (p instanceof AST_Dot           && p.expression === node ) ||
+        } else if (p instanceof AST_Conditional) {
-            (p instanceof AST_Sub           && p.expression === node ) ||
+            if (p.condition === node) continue;
-            (p instanceof AST_Conditional   && p.condition === node  ) ||
+        } else if (p instanceof AST_PropAccess) {
-            (p instanceof AST_Binary        && p.left === node       ) ||
+            if (p.expression === node) continue;
-            (p instanceof AST_UnaryPostfix  && p.expression === node ))
+        } else if (p instanceof AST_Sequence) {
-        {
+            if (p.expressions[0] === node) continue;
-            node = p;
+        } else if (p instanceof AST_Statement) {
-        } else {
+            return p.body === node;
+        } else if (p instanceof AST_UnaryPostfix) {
+            if (p.expression === node) continue;
+        }
         return false;
     }
 }
-}

package.json

@@ -1,23 +1,17 @@
 {
   "name": "uglify-js",
   "description": "JavaScript parser, mangler/compressor and beautifier toolkit",
-  "homepage": "http://lisperator.net/uglifyjs",
   "author": "Mihai Bazon <mihai.bazon@gmail.com> (http://lisperator.net/)",
   "license": "BSD-2-Clause",
-  "version": "3.1.6",
+  "version": "3.4.4",
   "engines": {
     "node": ">=0.8.0"
   },
   "maintainers": [
+    "Alex Lam <alexlamsl@gmail.com>",
     "Mihai Bazon <mihai.bazon@gmail.com> (http://lisperator.net/)"
   ],
-  "repository": {
+  "repository": "mishoo/UglifyJS2",
-    "type": "git",
-    "url": "https://github.com/mishoo/UglifyJS2.git"
-  },
-  "bugs": {
-    "url": "https://github.com/mishoo/UglifyJS2/issues"
-  },
   "main": "tools/node.js",
   "bin": {
     "uglifyjs": "bin/uglifyjs"
@@ -29,16 +23,38 @@
     "LICENSE"
   ],
   "dependencies": {
-    "commander": "~2.11.0",
+    "commander": "~2.16.0",
     "source-map": "~0.6.1"
   },
   "devDependencies": {
-    "acorn": "~5.1.1",
+    "acorn": "~5.7.1",
-    "mocha": "~3.5.1",
+    "semver": "~5.5.0"
-    "semver": "~5.4.1"
   },
   "scripts": {
     "test": "node test/run-tests.js"
   },
-  "keywords": ["uglify", "uglify-js", "minify", "minifier", "es5"]
+  "keywords": [
+    "cli",
+    "compress",
+    "compressor",
+    "ecma",
+    "ecmascript",
+    "es",
+    "es5",
+    "javascript",
+    "js",
+    "jsmin",
+    "min",
+    "minification",
+    "minifier",
+    "minify",
+    "optimize",
+    "optimizer",
+    "pack",
+    "packer",
+    "parse",
+    "parser",
+    "uglifier",
+    "uglify"
+  ]
 }

test/benchmark.js

@@ -21,12 +21,14 @@ var urls = [
     "http://builds.emberjs.com/tags/v2.11.0/ember.prod.js",
     "https://cdn.jsdelivr.net/lodash/4.17.4/lodash.js",
     "https://cdnjs.cloudflare.com/ajax/libs/d3/4.5.0/d3.js",
+    "https://raw.githubusercontent.com/kangax/html-minifier/v3.5.7/dist/htmlminifier.js",
 ];
 var results = {};
 var remaining = 2 * urls.length;
 function done() {
     if (!--remaining) {
         var failures = [];
+        var sum = { input: 0, output: 0, gzip: 0 };
         urls.forEach(function(url) {
             var info = results[url];
             console.log();
@@ -39,6 +41,9 @@ function done() {
             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:");
@@ -46,6 +51,13 @@ function done() {
                 console.error(url);
             });
             process.exit(1);
+        } else {
+            console.log();
+            console.log("Subtotal");
+            console.log();
+            console.log("Original:", sum.input, "bytes");
+            console.log("Uglified:", sum.output, "bytes");
+            console.log("GZipped: ", sum.gzip, "bytes");
         }
     }
 }

test/compress/arguments.js

@@ -0,0 +1,239 @@
+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"
+}

test/compress/arrays.js

@@ -15,9 +15,9 @@ holes_and_undefined: {
 
 constant_join: {
     options = {
+        evaluate: true,
         unsafe: true,
-        evaluate : true
+    }
-    };
     input: {
         var a = [ "foo", "bar", "baz" ].join("");
         var a1 = [ "foo", "bar", "baz" ].join();
@@ -64,9 +64,9 @@ constant_join: {
 
 constant_join_2: {
     options = {
+        evaluate: true,
         unsafe: true,
-        evaluate : true
+    }
-    };
     input: {
         var a = [ "foo", "bar", boo(), "baz", "x", "y" ].join("");
         var b = [ "foo", "bar", boo(), "baz", "x", "y" ].join("-");
@@ -93,9 +93,9 @@ constant_join_2: {
 
 constant_join_3: {
     options = {
-        unsafe: true,
         evaluate: true,
-    };
+        unsafe: true,
+    }
     input: {
         var a = [ null ].join();
         var b = [ , ].join();
@@ -129,10 +129,11 @@ constant_join_3: {
 for_loop: {
     options = {
         evaluate: true,
+        reduce_funcs: true,
         reduce_vars: true,
         unsafe: true,
         unused: true,
-    };
+    }
     input: {
         function f0() {
             var a = [1, 2, 3];
@@ -185,6 +186,7 @@ for_loop: {
 index: {
     options = {
         evaluate: true,
+        reduce_funcs: true,
         reduce_vars: true,
         toplevel: true,
         unsafe: true,
@@ -203,6 +205,7 @@ index: {
 length: {
     options = {
         evaluate: true,
+        reduce_funcs: true,
         reduce_vars: true,
         toplevel: true,
         unsafe: true,
@@ -221,6 +224,7 @@ length: {
 index_length: {
     options = {
         evaluate: true,
+        reduce_funcs: true,
         reduce_vars: true,
         toplevel: true,
         unsafe: true,

test/compress/asm.js

@@ -1,25 +1,24 @@
 asm_mixed: {
     options = {
-        sequences     : true,
+        booleans: true,
-        properties    : true,
+        comparisons: true,
+        conditionals: true,
         dead_code: true,
         drop_debugger: true,
-        conditionals  : true,
-        comparisons   : true,
         evaluate: true,
-        booleans      : true,
-        loops         : true,
-        unused        : true,
         hoist_funs: true,
-        keep_fargs    : true,
-        keep_fnames   : false,
         hoist_vars: true,
         if_return: true,
         join_vars: true,
-        cascade       : true,
+        keep_fargs: true,
+        keep_fnames: false,
+        loops: true,
+        negate_iife: true,
+        properties: true,
+        sequences: true,
         side_effects: true,
-        negate_iife   : true
+        unused: true,
-    };
+    }
     input: {
         // adapted from http://asmjs.org/spec/latest/
         function asm_GeometricMean(stdlib, foreign, buffer) {

test/compress/comparing.js

@@ -1,62 +1,42 @@
-keep_comparisons: {
+comparisons: {
     options = {
         comparisons: true,
-        unsafe_comps: false
     }
     input: {
-        var obj1 = {
+        var obj1, obj2;
-            valueOf: function() {triggeredFirst();}
-        }
-        var obj2 = {
-            valueOf: function() {triggeredSecond();}
-        }
         var result1 = obj1 <= obj2;
         var result2 = obj1 <  obj2;
         var result3 = obj1 >= obj2;
         var result4 = obj1 >  obj2;
     }
     expect: {
-        var obj1 = {
+        var obj1, obj2;
-            valueOf: function() {triggeredFirst();}
-        }
-        var obj2 = {
-            valueOf: function() {triggeredSecond();}
-        }
         var result1 = obj1 <= obj2;
         var result2 = obj1 <  obj2;
-        var result3 = obj1 >= obj2;
+        var result3 = obj2 <= obj1;
-        var result4 = obj1 >  obj2;
+        var result4 = obj2 <  obj1;
     }
 }
 
-keep_comparisons_with_unsafe_comps: {
+unsafe_comps: {
     options = {
         comparisons: true,
-        unsafe_comps: true
+        conditionals: true,
+        unsafe_comps: true,
     }
     input: {
-        var obj1 = {
+        var obj1, obj2;
-            valueOf: function() {triggeredFirst();}
+        obj1 <= obj2 ? f1() : g1();
-        }
+        obj1 <  obj2 ? f2() : g2();
-        var obj2 = {
+        obj1 >= obj2 ? f3() : g3();
-            valueOf: function() {triggeredSecond();}
+        obj1 >  obj2 ? f4() : g4();
-        }
-        var result1 = obj1 <= obj2;
-        var result2 = obj1 <  obj2;
-        var result3 = obj1 >= obj2;
-        var result4 = obj1 >  obj2;
     }
     expect: {
-        var obj1 = {
+        var obj1, obj2;
-            valueOf: function() {triggeredFirst();}
+        obj2 <  obj1 ? g1() : f1();
-        }
+        obj1 <  obj2 ? f2() : g2();
-        var obj2 = {
+        obj1 <  obj2 ? g3() : f3();
-            valueOf: function() {triggeredSecond();}
+        obj2 <  obj1 ? f4() : g4();
-        }
-        var result1 = obj2 >= obj1;
-        var result2 = obj2 >  obj1;
-        var result3 = obj1 >= obj2;
-        var result4 = obj1 >  obj2;
     }
 }
 
@@ -96,6 +76,7 @@ self_comparison_1: {
 self_comparison_2: {
     options = {
         comparisons: true,
+        reduce_funcs: true,
         reduce_vars: true,
         toplevel: true,
     }
@@ -111,3 +92,234 @@ self_comparison_2: {
     }
     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"
+}

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";
@@ -26,7 +26,7 @@ concat_1: {
 }
 
 concat_2: {
-    options = {};
+    options = {}
     input: {
         console.log(
             1 + (2 + 3),
@@ -55,7 +55,7 @@ concat_2: {
 }
 
 concat_3: {
-    options = {};
+    options = {}
     input: {
         console.log(
             1 + 2 + (3 + 4 + 5),
@@ -84,7 +84,7 @@ concat_3: {
 }
 
 concat_4: {
-    options = {};
+    options = {}
     input: {
         console.log(
             1 + "2" + (3 + 4 + 5),
@@ -113,7 +113,7 @@ concat_4: {
 }
 
 concat_5: {
-    options = {};
+    options = {}
     input: {
         console.log(
             "1" + 2 + (3 + 4 + 5),
@@ -142,7 +142,7 @@ concat_5: {
 }
 
 concat_6: {
-    options = {};
+    options = {}
     input: {
         console.log(
             "1" + "2" + (3 + 4 + 5),

test/compress/conditionals.js

@@ -1,7 +1,7 @@
 ifs_1: {
     options = {
-        conditionals: true
+        conditionals: true,
-    };
+    }
     input: {
         if (foo) bar();
         if (!foo); else bar();
@@ -18,8 +18,8 @@ ifs_1: {
 
 ifs_2: {
     options = {
-        conditionals: true
+        conditionals: true,
-    };
+    }
     input: {
         if (foo) {
             x();
@@ -47,12 +47,12 @@ ifs_2: {
 
 ifs_3_should_warn: {
     options = {
+        booleans: true,
         conditionals: true,
         dead_code: true,
         evaluate: true,
-        booleans     : true,
         side_effects: true,
-    };
+    }
     input: {
         var x, y;
         if (x && !(x + "1") && y) { // 1
@@ -78,8 +78,8 @@ ifs_3_should_warn: {
 
 ifs_4: {
     options = {
-        conditionals: true
+        conditionals: true,
-    };
+    }
     input: {
         if (foo && bar) {
             x(foo)[10].bar.baz = something();
@@ -95,10 +95,10 @@ ifs_4: {
 
 ifs_5: {
     options = {
-        if_return: true,
-        conditionals: true,
         comparisons: true,
-    };
+        conditionals: true,
+        if_return: true,
+    }
     input: {
         function f() {
             if (foo) return;
@@ -132,9 +132,9 @@ ifs_5: {
 
 ifs_6: {
     options = {
+        comparisons: true,
         conditionals: true,
-        comparisons: true
+    }
-    };
     input: {
         var x, y;
         if (!foo && !bar && !baz && !boo) {
@@ -163,50 +163,54 @@ ifs_6: {
 
 cond_1: {
     options = {
-        conditionals: true
+        conditionals: true,
-    };
+    }
     input: {
-        var do_something; // if undeclared it's assumed to have side-effects
+        function foo(do_something, some_condition) {
-        if (some_condition()) {
+            if (some_condition) {
                 do_something(x);
             } else {
                 do_something(y);
             }
-        if (some_condition()) {
+            if (some_condition) {
                 side_effects(x);
             } else {
                 side_effects(y);
             }
         }
+    }
     expect: {
-        var do_something;
+        function foo(do_something, some_condition) {
-        do_something(some_condition() ? x : y);
+            do_something(some_condition ? x : y);
-        some_condition() ? side_effects(x) : side_effects(y);
+            some_condition ? side_effects(x) : side_effects(y);
+        }
     }
 }
 
 cond_2: {
     options = {
-        conditionals: true
+        conditionals: true,
-    };
+    }
     input: {
-        var x, FooBar;
+        function foo(x, FooBar, some_condition) {
-        if (some_condition()) {
+            if (some_condition) {
                 x = new FooBar(1);
             } else {
                 x = new FooBar(2);
             }
         }
+    }
     expect: {
-        var x, FooBar;
+        function foo(x, FooBar, some_condition) {
-        x = new FooBar(some_condition() ? 1 : 2);
+            x = new FooBar(some_condition ? 1 : 2);
+        }
     }
 }
 
 cond_3: {
     options = {
-        conditionals: true
+        conditionals: true,
-    };
+    }
     input: {
         var FooBar;
         if (some_condition()) {
@@ -223,8 +227,8 @@ cond_3: {
 
 cond_4: {
     options = {
-        conditionals: true
+        conditionals: true,
-    };
+    }
     input: {
         var do_something;
         if (some_condition()) {
@@ -247,8 +251,8 @@ cond_4: {
 
 cond_5: {
     options = {
-        conditionals: true
+        conditionals: true,
-    };
+    }
     input: {
         if (some_condition()) {
             if (some_other_condition()) {
@@ -277,7 +281,7 @@ cond_7: {
         conditionals: true,
         evaluate: true,
         side_effects: true,
-    };
+    }
     input: {
         var x, y, z, a, b;
         // compress these
@@ -328,7 +332,7 @@ cond_7: {
         x = 'foo';
         x = 'foo';
         x = (condition(), 20);
-        x = z ? 'fuji' : (condition(), 'fuji');
+        x = (z || condition(), 'fuji');
         x = (condition(), 'foobar');
         x = y ? a : b;
         x = y ? 'foo' : 'fo';
@@ -338,8 +342,8 @@ cond_7: {
 cond_7_1: {
     options = {
         conditionals: true,
-        evaluate    : true
+        evaluate: true,
-    };
+    }
     input: {
         var x;
         // access to global should be assumed to have side effects
@@ -357,10 +361,10 @@ cond_7_1: {
 
 cond_8: {
     options = {
+        booleans: false,
         conditionals: true,
         evaluate: true,
-        booleans    : false
+    }
-    };
     input: {
         var a;
         // compress these
@@ -441,10 +445,10 @@ cond_8: {
 
 cond_8b: {
     options = {
+        booleans: true,
         conditionals: true,
         evaluate: true,
-        booleans    : true
+    }
-    };
     input: {
         var a;
         // compress these
@@ -524,10 +528,10 @@ cond_8b: {
 
 cond_8c: {
     options = {
+        booleans: false,
         conditionals: true,
         evaluate: false,
-        booleans    : false
+    }
-    };
     input: {
         var a;
         // compress these
@@ -605,11 +609,59 @@ cond_8c: {
     }
 }
 
+cond_9: {
+    options = {
+        conditionals: true,
+    }
+    input: {
+        function f(x, y) {
+            g() ? x(1) : x(2);
+            x ? (y || x)() : (y || x)();
+            x ? y(a, b) : y(d, b, c);
+            x ? y(a, b, c) : y(a, b, c);
+            x ? y(a, b, c) : y(a, b, f);
+            x ? y(a, b, c) : y(a, e, c);
+            x ? y(a, b, c) : y(a, e, f);
+            x ? y(a, b, c) : y(d, b, c);
+            x ? y(a, b, c) : y(d, b, f);
+            x ? y(a, b, c) : y(d, e, c);
+            x ? y(a, b, c) : y(d, e, f);
+        }
+    }
+    expect: {
+        function f(x, y) {
+            g() ? x(1) : x(2);
+            x, (y || x)();
+            x ? y(a, b) : y(d, b, c);
+            x, y(a, b, c);
+            y(a, b, x ? c : f);
+            y(a, x ? b : e, c);
+            x ? y(a, b, c) : y(a, e, f);
+            y(x ? a : d, b, c);
+            x ? y(a, b, c) : y(d, b, f);
+            x ? y(a, b, c) : y(d, e, c);
+            x ? y(a, b, c) : y(d, e, f);
+        }
+    }
+}
+
 ternary_boolean_consequent: {
     options = {
-        collapse_vars:true, sequences:true, properties:true, dead_code:true, conditionals:true,
+        booleans: true,
-        comparisons:true, evaluate:true, booleans:true, loops:true, unused:true, hoist_funs:true,
+        collapse_vars: true,
-        keep_fargs:true, if_return:true, join_vars:true, cascade:true, side_effects: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() { return a == b ? true : x; }
@@ -635,9 +687,21 @@ ternary_boolean_consequent: {
 
 ternary_boolean_alternative: {
     options = {
-        collapse_vars:true, sequences:true, properties:true, dead_code:true, conditionals:true,
+        booleans: true,
-        comparisons:true, evaluate:true, booleans:true, loops:true, unused:true, hoist_funs:true,
+        collapse_vars: true,
-        keep_fargs:true, if_return:true, join_vars:true, cascade:true, side_effects: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() { return a == b ? x : true; }
@@ -663,10 +727,11 @@ ternary_boolean_alternative: {
 
 trivial_boolean_ternary_expressions : {
     options = {
+        booleans: true,
         conditionals: true,
         evaluate: true,
-        booleans    : true
+        side_effects: true,
-    };
+    }
     input: {
         f('foo' in m ? true  : false);
         f('foo' in m ? false : true);
@@ -737,11 +802,11 @@ trivial_boolean_ternary_expressions : {
 
 issue_1154: {
     options = {
+        booleans: true,
         conditionals: true,
         evaluate: true,
-        booleans    : true,
         side_effects: true,
-    };
+    }
     input: {
         function f1(x) { return x ? -1 : -1; }
         function f2(x) { return x ? +2 : +2; }
@@ -1015,3 +1080,215 @@ delete_conditional_2: {
     }
     expect_stdout: true
 }
+
+issue_2535_1: {
+    options = {
+        booleans: true,
+        conditionals: true,
+        evaluate: true,
+        passes: 2,
+        side_effects: true,
+    }
+    input: {
+        if (true || x()) y();
+        if (true && x()) y();
+        if (x() || true) y();
+        if (x() && true) y();
+        if (false || x()) y();
+        if (false && x()) y();
+        if (x() || false) y();
+        if (x() && false) y();
+    }
+    expect: {
+        y();
+        x() && y();
+        (x(), 1) && y();
+        x() && y();
+        x() && y();
+        x() && y();
+        (x(), 0) && y();
+    }
+}
+
+issue_2535_2: {
+    options = {
+        booleans: true,
+        conditionals: true,
+        evaluate: true,
+        side_effects: true,
+    }
+    input: {
+        function x() {}
+        function y() {
+            return "foo";
+        }
+        console.log((x() || true) || y());
+        console.log((y() || true) || x());
+        console.log((x() || true) && y());
+        console.log((y() || true) && x());
+        console.log((x() && true) || y());
+        console.log((y() && true) || x());
+        console.log((x() && true) && y());
+        console.log((y() && true) && x());
+        console.log((x() || false) || y());
+        console.log((y() || false) || x());
+        console.log((x() || false) && y());
+        console.log((y() || false) && x());
+        console.log((x() && false) || y());
+        console.log((y() && false) || x());
+        console.log((x() && false) && y());
+        console.log((y() && false) && x());
+    }
+    expect: {
+        function x() {}
+        function y() {
+            return "foo";
+        }
+        console.log(x() || !0);
+        console.log(y() || !0);
+        console.log((x(), y()));
+        console.log((y(), x()));
+        console.log(!!x() || y());
+        console.log(!!y() || x());
+        console.log(x() && y());
+        console.log(y() && x());
+        console.log(x() || y());
+        console.log(y() || x());
+        console.log(!!x() && y());
+        console.log(!!y() && x());
+        console.log((x(), y()));
+        console.log((y(), x()));
+        console.log(x() && !1);
+        console.log(y() && !1);
+    }
+    expect_stdout: [
+        "true",
+        "foo",
+        "foo",
+        "undefined",
+        "foo",
+        "true",
+        "undefined",
+        "undefined",
+        "foo",
+        "foo",
+        "false",
+        "undefined",
+        "foo",
+        "undefined",
+        "undefined",
+        "false",
+    ]
+}
+
+issue_2560: {
+    options = {
+        conditionals: true,
+        inline: true,
+        reduce_funcs: true,
+        reduce_vars: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        function log(x) {
+            console.log(x);
+        }
+        function foo() {
+            return log;
+        }
+        function bar() {
+            if (x !== (x = foo())) {
+                x(1);
+            } else {
+                x(2);
+            }
+        }
+        var x = function() {
+            console.log("init");
+        };
+        bar();
+        bar();
+    }
+    expect: {
+        function log(x) {
+            console.log(x);
+        }
+        function bar() {
+            x !== (x = log) ? x(1) : x(2);
+        }
+        var x = function() {
+            console.log("init");
+        };
+        bar();
+        bar();
+    }
+    expect_stdout: [
+        "1",
+        "2",
+    ]
+}
+
+hoist_decl: {
+    options = {
+        conditionals: true,
+        join_vars: true,
+        sequences: true,
+    }
+    input: {
+        if (x()) {
+            var a;
+            y();
+        } else {
+            z();
+            var b;
+        }
+    }
+    expect: {
+        var a, b;
+        x() ? y() : z();
+    }
+}
+
+to_and_or: {
+    options = {
+        conditionals: true,
+    }
+    input: {
+        var values = [
+            0,
+            null,
+            true,
+            "foo",
+            false,
+            -1 / 0,
+            void 0,
+        ];
+        values.forEach(function(x) {
+            values.forEach(function(y) {
+                values.forEach(function(z) {
+                    console.log(x ? y || z : z);
+                });
+            });
+        });
+    }
+    expect: {
+        var values = [
+            0,
+            null,
+            true,
+            "foo",
+            false,
+            -1 / 0,
+            void 0,
+        ];
+        values.forEach(function(x) {
+            values.forEach(function(y) {
+                values.forEach(function(z) {
+                    console.log(x && y || z);
+                });
+            });
+        });
+    }
+    expect_stdout: true
+}

test/compress/dead-code.js

@@ -1,7 +1,7 @@
 dead_code_1: {
     options = {
-        dead_code: true
+        dead_code: true,
-    };
+    }
     input: {
         function f() {
             a();
@@ -25,8 +25,8 @@ dead_code_1: {
 
 dead_code_2_should_warn: {
     options = {
-        dead_code: true
+        dead_code: true,
-    };
+    }
     input: {
         function f() {
             g();
@@ -62,55 +62,15 @@ dead_code_2_should_warn: {
     node_version: "<=4"
 }
 
-dead_code_2_should_warn_strict: {
-    options = {
-        dead_code: true
-    };
-    input: {
-        "use strict";
-        function f() {
-            g();
-            x = 10;
-            throw new Error("foo");
-            // completely discarding the `if` would introduce some
-            // bugs.  UglifyJS v1 doesn't deal with this issue; in v2
-            // we copy any declarations to the upper scope.
-            if (x) {
-                y();
-                var x;
-                function g(){};
-                // but nested declarations should not be kept.
-                (function(){
-                    var q;
-                    function y(){};
-                })();
-            }
-        }
-        f();
-    }
-    expect: {
-        "use strict";
-        function f() {
-            g();
-            x = 10;
-            throw new Error("foo");
-            var x;
-        }
-        f();
-    }
-    expect_stdout: true
-    node_version: ">=4"
-}
-
 dead_code_constant_boolean_should_warn_more: {
     options = {
-        dead_code    : true,
-        loops        : true,
         booleans: true,
         conditionals: true,
+        dead_code: true,
         evaluate: true,
+        loops: true,
         side_effects: true,
-    };
+    }
     input: {
         while (!((foo && bar) || (x + "0"))) {
             console.log("unreachable");
@@ -129,55 +89,21 @@ dead_code_constant_boolean_should_warn_more: {
         function bar() {}
         // nothing for the while
         // as for the for, it should keep:
-        var x = 10, y;
         var moo;
+        var x = 10, y;
         bar();
     }
     expect_stdout: true
     node_version: "<=4"
 }
 
-dead_code_constant_boolean_should_warn_more_strict: {
-    options = {
-        dead_code    : true,
-        loops        : true,
-        booleans     : true,
-        conditionals : true,
-        evaluate     : true,
-        side_effects : true,
-    };
-    input: {
-        "use strict";
-        while (!((foo && bar) || (x + "0"))) {
-            console.log("unreachable");
-            var foo;
-            function bar() {}
-        }
-        for (var x = 10, y; x && (y || x) && (!typeof x); ++x) {
-            asdf();
-            foo();
-            var moo;
-        }
-        bar();
-    }
-    expect: {
-        "use strict";
-        var foo;
-        // nothing for the while
-        // as for the for, it should keep:
-        var x = 10, y;
-        var moo;
-        bar();
-    }
-    expect_stdout: true
-    node_version: ">=4"
-}
-
 try_catch_finally: {
     options = {
         conditionals: true,
         dead_code: true,
         evaluate: true,
+        passes: 2,
+        side_effects: true,
     }
     input: {
         var a = 1;
@@ -292,6 +218,7 @@ global_timeout_and_interval_symbols: {
 issue_2233_2: {
     options = {
         pure_getters: "strict",
+        reduce_funcs: true,
         reduce_vars: true,
         side_effects: true,
         unsafe: true,
@@ -323,6 +250,7 @@ issue_2233_2: {
 issue_2233_3: {
     options = {
         pure_getters: "strict",
+        reduce_funcs: true,
         reduce_vars: true,
         side_effects: true,
         toplevel: true,
@@ -413,3 +341,604 @@ global_fns: {
         "RangeError",
     ]
 }
+
+collapse_vars_assignment: {
+    options = {
+        collapse_vars: true,
+        dead_code: true,
+        passes: 2,
+        unused: true,
+    }
+    input: {
+        function f0(c) {
+            var a = 3 / c;
+            return a = a;
+        }
+    }
+    expect: {
+        function f0(c) {
+            return 3 / c;
+        }
+    }
+}
+
+collapse_vars_lvalues_drop_assign: {
+    options = {
+        collapse_vars: true,
+        dead_code: true,
+        unused: true,
+    }
+    input: {
+        function f0(x) { var i = ++x; return x += i; }
+        function f1(x) { var a = (x -= 3); return x += a; }
+        function f2(x) { var z = x, a = ++z; return z += a; }
+    }
+    expect: {
+        function f0(x) { var i = ++x; return x + i; }
+        function f1(x) { var a = (x -= 3); return x + a; }
+        function f2(x) { var z = x, a = ++z; return z + a; }
+    }
+}
+
+collapse_vars_misc1: {
+    options = {
+        collapse_vars: true,
+        dead_code: true,
+        unused: true,
+    }
+    input: {
+        function f10(x) { var a = 5, b = 3; return a += b; }
+        function f11(x) { var a = 5, b = 3; return a += --b; }
+    }
+    expect: {
+        function f10(x) { return 5 + 3; }
+        function f11(x) { var b = 3; return 5 + --b; }
+    }
+}
+
+return_assignment: {
+    options = {
+        dead_code: true,
+        unused: true,
+    }
+    input: {
+        function f1(a, b, c) {
+            return a = x(), b = y(), b = a && (c >>= 5);
+        }
+        function f2() {
+            return e = x();
+        }
+        function f3(e) {
+            return e = x();
+        }
+        function f4() {
+            var e;
+            return e = x();
+        }
+        function f5(a) {
+            try {
+                return a = x();
+            } catch (b) {
+                console.log(a);
+            }
+        }
+        function f6(a) {
+            try {
+                return a = x();
+            } finally {
+                console.log(a);
+            }
+        }
+        function y() {
+            console.log("y");
+        }
+        function test(inc) {
+            var counter = 0;
+            x = function() {
+                counter += inc;
+                if (inc < 0) throw counter;
+                return counter;
+            };
+            [ f1, f2, f3, f4, f5, f6 ].forEach(function(f, i) {
+                e = null;
+                try {
+                    i += 1;
+                    console.log("result " + f(10 * i, 100 * i, 1000 * i));
+                } catch (x) {
+                    console.log("caught " + x);
+                }
+                if (null !== e) console.log("e: " + e);
+            });
+        }
+        var x, e;
+        test(1);
+        test(-1);
+    }
+    expect: {
+        function f1(a, b, c) {
+            return a = x(), y(), a && (c >> 5);
+        }
+        function f2() {
+            return e = x();
+        }
+        function f3(e) {
+            return x();
+        }
+        function f4() {
+            return x();
+        }
+        function f5(a) {
+            try {
+                return x();
+            } catch (b) {
+                console.log(a);
+            }
+        }
+        function f6(a) {
+            try {
+                return a = x();
+            } finally {
+                console.log(a);
+            }
+        }
+        function y() {
+            console.log("y");
+        }
+        function test(inc) {
+            var counter = 0;
+            x = function() {
+                counter += inc;
+                if (inc < 0) throw counter;
+                return counter;
+            };
+            [ f1, f2, f3, f4, f5, f6 ].forEach(function(f, i) {
+                e = null;
+                try {
+                    i += 1;
+                    console.log("result " + f(10 * i, 100 * i, 1000 * i));
+                } catch (x) {
+                    console.log("caught " + x);
+                }
+                if (null !== e) console.log("e: " + e);
+            });
+        }
+        var x, e;
+        test(1);
+        test(-1);
+    }
+    expect_stdout: [
+        "y",
+        "result 31",
+        "result 2",
+        "e: 2",
+        "result 3",
+        "result 4",
+        "result 5",
+        "6",
+        "result 6",
+        "caught -1",
+        "caught -2",
+        "caught -3",
+        "caught -4",
+        "50",
+        "result undefined",
+        "60",
+        "caught -6",
+    ]
+}
+
+throw_assignment: {
+    options = {
+        dead_code: true,
+        unused: true,
+    }
+    input: {
+        function f1() {
+            throw a = x();
+        }
+        function f2(a) {
+            throw a = x();
+        }
+        function f3() {
+            var a;
+            throw a = x();
+        }
+        function f4() {
+            try {
+                throw a = x();
+            } catch (b) {
+                console.log(a);
+            }
+        }
+        function f5(a) {
+            try {
+                throw a = x();
+            } catch (b) {
+                console.log(a);
+            }
+        }
+        function f6() {
+            var a;
+            try {
+                throw a = x();
+            } catch (b) {
+                console.log(a);
+            }
+        }
+        function f7() {
+            try {
+                throw a = x();
+            } finally {
+                console.log(a);
+            }
+        }
+        function f8(a) {
+            try {
+                throw a = x();
+            } finally {
+                console.log(a);
+            }
+        }
+        function f9() {
+            var a;
+            try {
+                throw a = x();
+            } finally {
+                console.log(a);
+            }
+        }
+        function test(inc) {
+            var counter = 0;
+            x = function() {
+                counter += inc;
+                if (inc < 0) throw counter;
+                return counter;
+            };
+            [ f1, f2, f3, f4, f5, f6, f7, f8, f9 ].forEach(function(f, i) {
+                a = null;
+                try {
+                    f(10 * (1 + i));
+                } catch (x) {
+                    console.log("caught " + x);
+                }
+                if (null !== a) console.log("a: " + a);
+            });
+        }
+        var x, a;
+        test(1);
+        test(-1);
+    }
+    expect: {
+        function f1() {
+            throw a = x();
+        }
+        function f2(a) {
+            throw x();
+        }
+        function f3() {
+            throw x();
+        }
+        function f4() {
+            try {
+                throw a = x();
+            } catch (b) {
+                console.log(a);
+            }
+        }
+        function f5(a) {
+            try {
+                throw a = x();
+            } catch (b) {
+                console.log(a);
+            }
+        }
+        function f6() {
+            var a;
+            try {
+                throw a = x();
+            } catch (b) {
+                console.log(a);
+            }
+        }
+        function f7() {
+            try {
+                throw a = x();
+            } finally {
+                console.log(a);
+            }
+        }
+        function f8(a) {
+            try {
+                throw a = x();
+            } finally {
+                console.log(a);
+            }
+        }
+        function f9() {
+            var a;
+            try {
+                throw a = x();
+            } finally {
+                console.log(a);
+            }
+        }
+        function test(inc) {
+            var counter = 0;
+            x = function() {
+                counter += inc;
+                if (inc < 0) throw counter;
+                return counter;
+            };
+            [ f1, f2, f3, f4, f5, f6, f7, f8, f9 ].forEach(function(f, i) {
+                a = null;
+                try {
+                    f(10 * (1 + i));
+                } catch (x) {
+                    console.log("caught " + x);
+                }
+                if (null !== a) console.log("a: " + a);
+            });
+        }
+        var x, a;
+        test(1);
+        test(-1);
+    }
+    expect_stdout: [
+        "caught 1",
+        "a: 1",
+        "caught 2",
+        "caught 3",
+        "4",
+        "a: 4",
+        "5",
+        "6",
+        "7",
+        "caught 7",
+        "a: 7",
+        "8",
+        "caught 8",
+        "9",
+        "caught 9",
+        "caught -1",
+        "caught -2",
+        "caught -3",
+        "null",
+        "50",
+        "undefined",
+        "null",
+        "caught -7",
+        "80",
+        "caught -8",
+        "undefined",
+        "caught -9",
+    ]
+}
+
+issue_2597: {
+    options = {
+        dead_code: true,
+    }
+    input: {
+        function f(b) {
+            try {
+                try {
+                    throw "foo";
+                } catch (e) {
+                    return b = true;
+                }
+            } finally {
+                b && (a = "PASS");
+            }
+        }
+        var a = "FAIL";
+        f();
+        console.log(a);
+    }
+    expect: {
+        function f(b) {
+            try {
+                try {
+                    throw "foo";
+                } catch (e) {
+                    return b = true;
+                }
+            } finally {
+                b && (a = "PASS");
+            }
+        }
+        var a = "FAIL";
+        f();
+        console.log(a);
+    }
+    expect_stdout: "PASS"
+}
+
+issue_2666: {
+    options = {
+        dead_code: true,
+    }
+    input: {
+        function f(a) {
+            return a = {
+                p: function() {
+                    return a;
+                }
+            };
+        }
+        console.log(typeof f().p());
+    }
+    expect: {
+        function f(a) {
+            return a = {
+                p: function() {
+                    return a;
+                }
+            };
+        }
+        console.log(typeof f().p());
+    }
+    expect_stdout: "object"
+}
+
+issue_2692: {
+    options = {
+        dead_code: true,
+        reduce_vars: false,
+    }
+    input: {
+        function f(a) {
+            return a = g;
+            function g() {
+                return a;
+            }
+        }
+        console.log(typeof f()());
+    }
+    expect: {
+        function f(a) {
+            return a = g;
+            function g() {
+                return a;
+            }
+        }
+        console.log(typeof f()());
+    }
+    expect_stdout: "function"
+}
+
+issue_2701: {
+    options = {
+        dead_code: true,
+        inline: false,
+    }
+    input: {
+        function f(a) {
+            return a = function() {
+                return function() {
+                    return a;
+                };
+            }();
+        }
+        console.log(typeof f()());
+    }
+    expect: {
+        function f(a) {
+            return a = function() {
+                return function() {
+                    return a;
+                };
+            }();
+        }
+        console.log(typeof f()());
+    }
+    expect_stdout: "function"
+}
+
+issue_2749: {
+    options = {
+        dead_code: true,
+        inline: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        var a = 2, c = "PASS";
+        while (a--)
+            (function() {
+                return b ? c = "FAIL" : b = 1;
+                try {
+                } catch (b) {
+                    var b;
+                }
+            })();
+        console.log(c);
+    }
+    expect: {
+        var a = 2, c = "PASS";
+        while (a--)
+            b = void 0, b ? c = "FAIL" : b = 1;
+        var b;
+        console.log(c);
+    }
+    expect_stdout: "PASS"
+}
+
+unsafe_builtin: {
+    options = {
+        side_effects: true,
+        unsafe: true,
+    }
+    input: {
+        (!w).constructor(x);
+        Math.abs(y);
+        [ 1, 2, z ].valueOf();
+    }
+    expect: {
+        w, x;
+        y;
+        z;
+    }
+}
+
+issue_2860_1: {
+    options = {
+        dead_code: true,
+        evaluate: true,
+        reduce_vars: true,
+    }
+    input: {
+        console.log(function(a) {
+            return a ^= 1;
+        }());
+    }
+    expect: {
+        console.log(function(a) {
+            return 1 ^ a;
+        }());
+    }
+    expect_stdout: "1"
+}
+
+issue_2860_2: {
+    options = {
+        dead_code: true,
+        evaluate: true,
+        inline: true,
+        passes: 2,
+        reduce_vars: true,
+    }
+    input: {
+        console.log(function(a) {
+            return a ^= 1;
+        }());
+    }
+    expect: {
+        console.log(1);
+    }
+    expect_stdout: "1"
+}
+
+issue_2929: {
+    options = {
+        dead_code: true,
+    }
+    input: {
+        console.log(function(a) {
+            try {
+                return null.p = a = 1;
+            } catch (e) {
+                return a ? "PASS" : "FAIL";
+            }
+        }());
+    }
+    expect: {
+        console.log(function(a) {
+            try {
+                return null.p = a = 1;
+            } catch (e) {
+                return a ? "PASS" : "FAIL";
+            }
+        }());
+    }
+    expect_stdout: "PASS"
+}

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,5 +1,5 @@
 drop_console_1: {
-    options = {};
+    options = {}
     input: {
         console.log('foo');
         console.log.apply(console, arguments);
@@ -11,7 +11,9 @@ drop_console_1: {
 }
 
 drop_console_2: {
-    options = { drop_console: true };
+    options = {
+        drop_console: true,
+    }
     input: {
         console.log('foo');
         console.log.apply(console, arguments);

test/compress/evaluate.js

@@ -1,6 +1,7 @@
 and: {
     options = {
-        evaluate: true
+        evaluate: true,
+        side_effects: true,
     }
     input: {
         var a;
@@ -76,7 +77,8 @@ and: {
 
 or: {
     options = {
-        evaluate: true
+        evaluate: true,
+        side_effects: true,
     }
     input: {
         var a;
@@ -158,7 +160,8 @@ or: {
 
 unary_prefix: {
     options = {
-        evaluate: true
+        evaluate: true,
+        side_effects: true,
     }
     input: {
         a = !0 && b;
@@ -183,7 +186,9 @@ unary_prefix: {
 }
 
 negative_zero: {
-    options = { evaluate: true }
+    options = {
+        evaluate: true,
+    }
     input: {
         console.log(
             -"",
@@ -204,7 +209,9 @@ negative_zero: {
 }
 
 positive_zero: {
-    options = { evaluate: true }
+    options = {
+        evaluate: true,
+    }
     input: {
         console.log(
             +"",
@@ -227,7 +234,7 @@ positive_zero: {
 unsafe_constant: {
     options = {
         evaluate: true,
-        unsafe    : true
+        unsafe: true,
     }
     input: {
         console.log(
@@ -251,6 +258,7 @@ unsafe_constant: {
 unsafe_object: {
     options = {
         evaluate: true,
+        reduce_funcs: true,
         reduce_vars: true,
         toplevel: true,
         unsafe: true,
@@ -279,6 +287,7 @@ unsafe_object: {
 unsafe_object_nested: {
     options = {
         evaluate: true,
+        reduce_funcs: true,
         reduce_vars: true,
         toplevel: true,
         unsafe: true,
@@ -307,6 +316,7 @@ unsafe_object_nested: {
 unsafe_object_complex: {
     options = {
         evaluate: true,
+        reduce_funcs: true,
         reduce_vars: true,
         toplevel: true,
         unsafe: true,
@@ -335,6 +345,7 @@ unsafe_object_complex: {
 unsafe_object_repeated: {
     options = {
         evaluate: true,
+        reduce_funcs: true,
         reduce_vars: true,
         toplevel: true,
         unsafe: true,
@@ -363,6 +374,7 @@ unsafe_object_repeated: {
 unsafe_object_accessor: {
     options = {
         evaluate: true,
+        reduce_funcs: true,
         reduce_vars: true,
         unsafe: true,
     }
@@ -414,7 +426,7 @@ prop_function: {
 unsafe_integer_key: {
     options = {
         evaluate: true,
-        unsafe    : true
+        unsafe: true,
     }
     input: {
         console.log(
@@ -442,7 +454,7 @@ unsafe_integer_key: {
 unsafe_integer_key_complex: {
     options = {
         evaluate: true,
-        unsafe    : true
+        unsafe: true,
     }
     input: {
         console.log(
@@ -470,7 +482,7 @@ unsafe_integer_key_complex: {
 unsafe_float_key: {
     options = {
         evaluate: true,
-        unsafe    : true
+        unsafe: true,
     }
     input: {
         console.log(
@@ -498,7 +510,7 @@ unsafe_float_key: {
 unsafe_float_key_complex: {
     options = {
         evaluate: true,
-        unsafe    : true
+        unsafe: true,
     }
     input: {
         console.log(
@@ -526,7 +538,7 @@ unsafe_float_key_complex: {
 unsafe_array: {
     options = {
         evaluate: true,
-        unsafe    : true
+        unsafe: true,
     }
     input: {
         console.log(
@@ -562,7 +574,7 @@ unsafe_array: {
 unsafe_string: {
     options = {
         evaluate: true,
-        unsafe    : true
+        unsafe: true,
     }
     input: {
         console.log(
@@ -590,7 +602,7 @@ unsafe_string: {
 unsafe_array_bad_index: {
     options = {
         evaluate: true,
-        unsafe    : true
+        unsafe: true,
     }
     input: {
         console.log(
@@ -612,7 +624,7 @@ unsafe_array_bad_index: {
 unsafe_string_bad_index: {
     options = {
         evaluate: true,
-        unsafe    : true
+        unsafe: true,
     }
     input: {
         console.log(
@@ -663,6 +675,7 @@ call_args: {
     options = {
         evaluate: true,
         inline: true,
+        reduce_funcs: true,
         reduce_vars: true,
         toplevel: true,
     }
@@ -686,6 +699,7 @@ call_args_drop_param: {
         evaluate: true,
         inline: true,
         keep_fargs: false,
+        reduce_funcs: true,
         reduce_vars: true,
         toplevel: true,
         unused: true,
@@ -735,7 +749,7 @@ in_boolean_context: {
             !b("foo"),
             !b([1, 2]),
             !b(/foo/),
-            ![1, foo()],
+            (foo(), !1),
             (foo(), !1)
         );
     }
@@ -745,7 +759,7 @@ in_boolean_context: {
 unsafe_charAt: {
     options = {
         evaluate: true,
-        unsafe    : true
+        unsafe: true,
     }
     input: {
         console.log(
@@ -773,7 +787,7 @@ unsafe_charAt: {
 unsafe_charAt_bad_index: {
     options = {
         evaluate: true,
-        unsafe    : true
+        unsafe: true,
     }
     input: {
         console.log(
@@ -795,7 +809,7 @@ unsafe_charAt_bad_index: {
 unsafe_charAt_noop: {
     options = {
         evaluate: true,
-        unsafe    : true
+        unsafe: true,
     }
     input: {
         console.log(
@@ -1016,6 +1030,7 @@ Infinity_NaN_undefined_LHS: {
 issue_1964_1: {
     options = {
         evaluate: true,
+        reduce_funcs: true,
         reduce_vars: true,
         unsafe_regexp: false,
         unused: true,
@@ -1045,6 +1060,7 @@ issue_1964_1: {
 issue_1964_2: {
     options = {
         evaluate: true,
+        reduce_funcs: true,
         reduce_vars: true,
         unsafe_regexp: true,
         unused: true,
@@ -1182,6 +1198,9 @@ issue_2231_1: {
         console.log(Object.keys(void 0));
     }
     expect_stdout: true
+    expect_warnings: [
+        "WARN: Error evaluating Object.keys(void 0) [test/compress/evaluate.js:1195,20]",
+    ]
 }
 
 issue_2231_2: {
@@ -1196,11 +1215,29 @@ issue_2231_2: {
         console.log(Object.getOwnPropertyNames(null));
     }
     expect_stdout: true
+    expect_warnings: [
+        "WARN: Error evaluating Object.getOwnPropertyNames(null) [test/compress/evaluate.js:1212,20]",
+    ]
+}
+
+issue_2231_3: {
+    options = {
+        evaluate: true,
+        unsafe: true,
+    }
+    input: {
+        console.log(Object.keys({ foo: "bar" })[0]);
+    }
+    expect: {
+        console.log("foo");
+    }
+    expect_stdout: "foo"
 }
 
 self_comparison_1: {
     options = {
         evaluate: true,
+        reduce_funcs: true,
         reduce_vars: true,
         toplevel: true,
         unsafe: true,
@@ -1221,6 +1258,7 @@ self_comparison_2: {
         evaluate: true,
         hoist_props: true,
         passes: 2,
+        reduce_funcs: true,
         reduce_vars: true,
         toplevel: true,
         unused: true,
@@ -1234,3 +1272,341 @@ self_comparison_2: {
     }
     expect_stdout: "false false true true 'number'"
 }
+
+issue_2535_1: {
+    options = {
+        booleans: true,
+        evaluate: true,
+        sequences: true,
+        side_effects: true,
+    }
+    input: {
+        if ((x() || true) || y()) z();
+        if ((x() || true) && y()) z();
+        if ((x() && true) || y()) z();
+        if ((x() && true) && y()) z();
+        if ((x() || false) || y()) z();
+        if ((x() || false) && y()) z();
+        if ((x() && false) || y()) z();
+        if ((x() && false) && y()) z();
+    }
+    expect: {
+        if (x(), 1) z();
+        if (x(), y()) z();
+        if (x() || y()) z();
+        if (x() && y()) z();
+        if (x() || y()) z();
+        if (x() && y()) z();
+        if (x(), y()) z();
+        if (x(), 0) z();
+    }
+}
+
+issue_2535_2: {
+    options = {
+        booleans: true,
+        evaluate: true,
+        sequences: true,
+        side_effects: true,
+    }
+    input: {
+        (x() || true) || y();
+        (x() || true) && y();
+        (x() && true) || y();
+        (x() && true) && y();
+        (x() || false) || y();
+        (x() || false) && y();
+        (x() && false) || y();
+        (x() && false) && y();
+    }
+    expect: {
+        x(),
+        x(), y(),
+        x() || y(),
+        x() && y(),
+        x() || y(),
+        x() && y(),
+        x(), y(),
+        x();
+    }
+}
+
+issue_2535_3: {
+    options = {
+        booleans: true,
+        evaluate: true,
+    }
+    input: {
+        console.log(Object(1) && 1 && 2);
+        console.log(Object(1) && true && 1 && 2 && Object(2));
+        console.log(Object(1) && true && 1 && null && 2 && Object(2));
+        console.log(2 == Object(1) || 0 || void 0 || null);
+        console.log(2 == Object(1) || 0 || void 0 || null || Object(2));
+        console.log(2 == Object(1) || 0 || void 0 || "ok" || null || Object(2));
+    }
+    expect: {
+        console.log(Object(1) && 2);
+        console.log(Object(1) && Object(2));
+        console.log(Object(1) && null);
+        console.log(2 == Object(1) || null);
+        console.log(2 == Object(1) || Object(2));
+        console.log(2 == Object(1) || "ok");
+    }
+    expect_stdout: true
+    expect_warnings: [
+        "WARN: Dropping side-effect-free && [test/compress/evaluate.js:1340,20]",
+        "WARN: Dropping side-effect-free && [test/compress/evaluate.js:1341,20]",
+        "WARN: Dropping side-effect-free && [test/compress/evaluate.js:1342,20]",
+        "WARN: Condition left of && always false [test/compress/evaluate.js:1342,20]",
+        "WARN: Dropping side-effect-free || [test/compress/evaluate.js:1343,20]",
+        "WARN: Dropping side-effect-free || [test/compress/evaluate.js:1344,20]",
+        "WARN: Dropping side-effect-free || [test/compress/evaluate.js:1345,20]",
+        "WARN: Condition left of || always true [test/compress/evaluate.js:1345,20]",
+    ]
+}
+
+issue_2822: {
+    options = {
+        evaluate: true,
+        unsafe: true,
+    }
+    input: {
+        console.log([ function() {}, "PASS", "FAIL" ][1]);
+    }
+    expect: {
+        console.log("PASS");
+    }
+    expect_stdout: "PASS"
+}
+
+string_case: {
+    options = {
+        evaluate: true,
+        unsafe: true,
+    }
+    input: {
+        console.log("İ".toLowerCase().charCodeAt(0));
+        console.log("I".toLowerCase().charCodeAt(0));
+        console.log("Ş".toLowerCase().charCodeAt(0));
+        console.log("Ğ".toLowerCase().charCodeAt(0));
+        console.log("Ü".toLowerCase().charCodeAt(0));
+        console.log("Ö".toLowerCase().charCodeAt(0));
+        console.log("Ç".toLowerCase().charCodeAt(0));
+        console.log("i".toUpperCase().charCodeAt(0));
+        console.log("ı".toUpperCase().charCodeAt(0));
+        console.log("ş".toUpperCase().charCodeAt(0));
+        console.log("ğ".toUpperCase().charCodeAt(0));
+        console.log("ü".toUpperCase().charCodeAt(0));
+        console.log("ö".toUpperCase().charCodeAt(0));
+        console.log("ç".toUpperCase().charCodeAt(0));
+    }
+    expect: {
+        console.log(105);
+        console.log(105);
+        console.log(351);
+        console.log(287);
+        console.log(252);
+        console.log(246);
+        console.log(231);
+        console.log(73);
+        console.log(73);
+        console.log(350);
+        console.log(286);
+        console.log(220);
+        console.log(214);
+        console.log(199);
+    }
+    expect_stdout: [
+        "105",
+        "105",
+        "351",
+        "287",
+        "252",
+        "246",
+        "231",
+        "73",
+        "73",
+        "350",
+        "286",
+        "220",
+        "214",
+        "199",
+    ]
+}
+
+issue_2916_1: {
+    options = {
+        evaluate: true,
+        reduce_vars: true,
+        unsafe: true,
+    }
+    input: {
+        var c = "PASS";
+        (function(a, b) {
+            (function(d) {
+                d[0] = 1;
+            })(b);
+            a == b && (c = "FAIL");
+        })("", []);
+        console.log(c);
+    }
+    expect: {
+        var c = "PASS";
+        (function(a, b) {
+            (function(d) {
+                d[0] = 1;
+            })(b);
+            a == b && (c = "FAIL");
+        })("", []);
+        console.log(c);
+    }
+    expect_stdout: "PASS"
+}
+
+issue_2916_2: {
+    options = {
+        collapse_vars: true,
+        evaluate: true,
+        inline: true,
+        reduce_vars: true,
+        side_effects: true,
+        unsafe: true,
+        unused: true,
+    }
+    input: {
+        var c = "FAIL";
+        (function(b) {
+            (function(d) {
+                d[0] = 1;
+            })(b);
+            +b && (c = "PASS");
+        })([]);
+        console.log(c);
+    }
+    expect: {
+        var c = "FAIL";
+        (function(b) {
+            b[0] = 1;
+            +b && (c = "PASS");
+        })([]);
+        console.log(c);
+    }
+    expect_stdout: "PASS"
+}
+
+issue_2919: {
+    options = {
+        evaluate: true,
+        unsafe: true,
+    }
+    input: {
+        console.log([ function() {} ].toString());
+    }
+    expect: {
+        console.log("function(){}");
+    }
+}
+
+issue_2926_1: {
+    options = {
+        evaluate: true,
+        reduce_vars: true,
+        unsafe: true,
+    }
+    input: {
+        (function f(a) {
+            console.log(f.name.length, f.length);
+        })();
+    }
+    expect: {
+        (function f(a) {
+            console.log(1, 1);
+        })();
+    }
+    expect_stdout: "1 1"
+}
+
+issue_2926_2: {
+    options = {
+        evaluate: true,
+        unsafe: true,
+    }
+    input: {
+        console.log(typeof function() {}.valueOf());
+    }
+    expect: {
+        console.log("function");
+    }
+    expect_stdout: "function"
+}
+
+issue_2968: {
+    options = {
+        collapse_vars: true,
+        evaluate: true,
+        inline: true,
+        passes: 2,
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        var c = "FAIL";
+        (function() {
+            (function(a, b) {
+                a <<= 0;
+                a && (a[(c = "PASS", 0 >>> (b += 1))] = 0);
+            })(42, -42);
+        })();
+        console.log(c);
+    }
+    expect: {
+        var c = "FAIL";
+        (function() {
+            b = -(a = 42),
+            void ((a <<= 0) && (a[(c = "PASS", 0 >>> (b += 1))] = 0));
+            var a, b;
+        })();
+        console.log(c);
+    }
+    expect_stdout: "PASS"
+}
+
+truthy_conditionals: {
+    options = {
+        conditionals: true,
+        evaluate: true,
+    }
+    input: {
+        if (a = {}) x();
+        (b = /foo/) && y();
+        (c = function() {}) || z();
+    }
+    expect: {
+        a = {}, x();
+        b = /foo/, y();
+        c = function() {};
+    }
+}
+
+truthy_loops: {
+    options = {
+        evaluate: true,
+        loops: true,
+    }
+    input: {
+        while ([]) x();
+        do {
+            y();
+        } while(a = {});
+    }
+    expect: {
+        for (;;) {
+            [];
+            x();
+        }
+        for (;;) {
+            y();
+            a = {};
+        }
+    }
+}

test/compress/global_defs.js

@@ -2,7 +2,7 @@ must_replace: {
     options = {
         global_defs: {
             D: "foo bar",
-        }
+        },
     }
     input: {
         console.log(D);
@@ -141,9 +141,9 @@ mixed: {
         console.log(CONFIG);
     }
     expect_warnings: [
-        'WARN: global_defs CONFIG.VALUE redefined [test/compress/global_defs.js:127,22]',
+        "WARN: global_defs CONFIG.VALUE redefined [test/compress/global_defs.js:127,22]",
-        'WARN: global_defs CONFIG.VALUE redefined [test/compress/global_defs.js:128,22]',
+        "WARN: global_defs CONFIG.VALUE redefined [test/compress/global_defs.js:128,22]",
-        'WARN: global_defs CONFIG.VALUE redefined [test/compress/global_defs.js:130,8]',
+        "WARN: global_defs CONFIG.VALUE redefined [test/compress/global_defs.js:130,8]",
     ]
 }
 
@@ -184,6 +184,7 @@ issue_2167: {
         global_defs: {
             "@isDevMode": "function(){}",
         },
+        passes: 2,
         side_effects: true,
     }
     input: {

test/compress/hoist_props.js

@@ -1,8 +1,9 @@
 issue_2377_1: {
     options = {
         evaluate: true,
-        inline: true,
         hoist_props: true,
+        inline: true,
+        reduce_funcs: true,
         reduce_vars: true,
         toplevel: true,
         unused: true,
@@ -32,9 +33,10 @@ issue_2377_1: {
 issue_2377_2: {
     options = {
         evaluate: true,
-        inline: true,
         hoist_props: true,
+        inline: true,
         passes: 2,
+        reduce_funcs: true,
         reduce_vars: true,
         toplevel: true,
         unused: true,
@@ -53,9 +55,8 @@ issue_2377_2: {
         console.log(obj.foo, obj.cube(3));
     }
     expect: {
-        console.log(1, function(x) {
+        console.log(1, (x = 3, x * x * x));
-            return x * x * x;
+        var x;
-        }(3));
     }
     expect_stdout: "1 27"
 }
@@ -63,10 +64,12 @@ issue_2377_2: {
 issue_2377_3: {
     options = {
         evaluate: true,
-        inline: true,
         hoist_props: true,
-        passes: 3,
+        inline: true,
+        passes: 4,
+        reduce_funcs: true,
         reduce_vars: true,
+        side_effects: true,
         toplevel: true,
         unused: true,
     }
@@ -92,6 +95,7 @@ issue_2377_3: {
 direct_access_1: {
     options = {
         hoist_props: true,
+        reduce_funcs: true,
         reduce_vars: true,
         toplevel: true,
         unused: true,
@@ -120,6 +124,7 @@ direct_access_1: {
 direct_access_2: {
     options = {
         hoist_props: true,
+        reduce_funcs: true,
         reduce_vars: true,
         toplevel: true,
         unused: true,
@@ -143,6 +148,7 @@ direct_access_2: {
 direct_access_3: {
     options = {
         hoist_props: true,
+        reduce_funcs: true,
         reduce_vars: true,
         toplevel: true,
         unused: true,
@@ -163,6 +169,7 @@ direct_access_3: {
 single_use: {
     options = {
         hoist_props: true,
+        reduce_funcs: true,
         reduce_vars: true,
         toplevel: true,
         unused: true,
@@ -187,6 +194,7 @@ single_use: {
 name_collision_1: {
     options = {
         hoist_props: true,
+        reduce_funcs: true,
         reduce_vars: true,
         toplevel: true,
     }
@@ -224,20 +232,21 @@ name_collision_1: {
 name_collision_2: {
     options = {
         hoist_props: true,
+        reduce_funcs: true,
         reduce_vars: true,
         toplevel: true,
     }
     input: {
         var o = {
             p: 1,
-            0: function(x) {
+            "+": function(x) {
                 return x;
             },
-            1: function(x) {
+            "-": function(x) {
                 return x + 1;
             }
         }, o__$0 = 2, o__$1 = 3;
-        console.log(o.p === o.p, o[0](4), o[1](5), o__$0, o__$1);
+        console.log(o.p === o.p, o["+"](4), o["-"](5), o__$0, o__$1);
     }
     expect: {
         var o_p = 1,
@@ -257,20 +266,21 @@ name_collision_2: {
 name_collision_3: {
     options = {
         hoist_props: true,
+        reduce_funcs: true,
         reduce_vars: true,
         toplevel: true,
     }
     input: {
         var o = {
             p: 1,
-            0: function(x) {
+            "+": function(x) {
                 return x;
             },
-            1: function(x) {
+            "-": function(x) {
                 return x + 1;
             }
         }, o__$0 = 2, o__$1 = 3;
-        console.log(o.p === o.p, o[0](4), o[1](5));
+        console.log(o.p === o.p, o["+"](4), o["-"](5));
     }
     expect: {
         var o_p = 1,
@@ -293,6 +303,7 @@ contains_this_1: {
         hoist_props: true,
         inline: true,
         passes: 2,
+        reduce_funcs: true,
         reduce_vars: true,
         toplevel: true,
         unused: true,
@@ -318,6 +329,7 @@ contains_this_2: {
         hoist_props: true,
         inline: true,
         passes: 2,
+        reduce_funcs: true,
         reduce_vars: true,
         toplevel: true,
         unused: true,
@@ -345,6 +357,7 @@ contains_this_3: {
         hoist_props: true,
         inline: true,
         passes: 2,
+        reduce_funcs: true,
         reduce_vars: true,
         toplevel: true,
         unused: true,
@@ -369,3 +382,483 @@ contains_this_3: {
     }
     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/ie8.js

@@ -102,12 +102,12 @@ dont_screw_try_catch: {
         };
     }
     expect: {
-        bad = function(n){
+        bad = function(t){
-            return function(t){
+            return function(n){
                 try{
-                    n()
+                    t()
-                } catch(n) {
+                } catch(t) {
-                    t(n)
+                    n(t)
                 }
             }
         };
@@ -187,8 +187,9 @@ dont_screw_try_catch_undefined: {
 reduce_vars: {
     options = {
         evaluate: true,
-        reduce_vars: true,
         ie8: true,
+        reduce_funcs: true,
+        reduce_vars: true,
         unused: true,
     }
     mangle = {
@@ -348,11 +349,11 @@ issue_2254_1: {
         try {
             console.log(f("PASS"));
         } catch (e) {}
-        function f(e) {
+        function f(t) {
             try {
                 throw "FAIL";
-            } catch (t) {
+            } catch (e) {
-                return e;
+                return t;
             }
         }
     }
@@ -391,3 +392,322 @@ issue_2254_2: {
     }
     expect_stdout: "PASS"
 }
+
+issue_24_1: {
+    mangle = {
+        ie8: false,
+    }
+    input: {
+        (function(a) {
+            console.log(typeof function f(){} === typeof a ? "FAIL" : "PASS");
+        })();
+    }
+    expect: {
+        (function(o) {
+            console.log(typeof function o(){} === typeof o ? "FAIL" : "PASS");
+        })();
+    }
+    expect_stdout: "PASS"
+}
+
+issue_24_2: {
+    mangle = {
+        ie8: true,
+    }
+    input: {
+        (function(a) {
+            console.log(typeof function f(){} === typeof a ? "FAIL" : "PASS");
+        })();
+    }
+    expect: {
+        (function(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() {};
+            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() {};
+            return "function" == typeof bar;
+        }());
+    }
+    expect: {
+        console.log(function() {
+            (function bar() {});
+            return "function" == typeof bar;
+        }());
+    }
+    expect_stdout: "false"
+}

test/compress/if_return.js

@@ -1,14 +1,14 @@
 if_return_1: {
     options = {
+        booleans: true,
+        comparisons: true,
+        conditionals: true,
+        dead_code: true,
+        evaluate: true,
         if_return: true,
         sequences: true,
-        conditionals : true,
-        comparisons  : true,
-        evaluate     : true,
-        booleans     : true,
-        unused       : true,
         side_effects: true,
-        dead_code    : true,
+        unused: true,
     }
     input: {
         function f(x) {
@@ -24,15 +24,15 @@ if_return_1: {
 
 if_return_2: {
     options = {
+        booleans: true,
+        comparisons: true,
+        conditionals: true,
+        dead_code: true,
+        evaluate: true,
         if_return: true,
         sequences: true,
-        conditionals : true,
-        comparisons  : true,
-        evaluate     : true,
-        booleans     : true,
-        unused       : true,
         side_effects: true,
-        dead_code    : true,
+        unused: true,
     }
     input: {
         function f(x, y) {
@@ -49,15 +49,15 @@ if_return_2: {
 
 if_return_3: {
     options = {
+        booleans: true,
+        comparisons: true,
+        conditionals: true,
+        dead_code: true,
+        evaluate: true,
         if_return: true,
         sequences: true,
-        conditionals : true,
-        comparisons  : true,
-        evaluate     : true,
-        booleans     : true,
-        unused       : true,
         side_effects: true,
-        dead_code    : true,
+        unused: true,
     }
     input: {
         function f(x) {
@@ -75,15 +75,15 @@ if_return_3: {
 
 if_return_4: {
     options = {
+        booleans: true,
+        comparisons: true,
+        conditionals: true,
+        dead_code: true,
+        evaluate: true,
         if_return: true,
         sequences: true,
-        conditionals : true,
-        comparisons  : true,
-        evaluate     : true,
-        booleans     : true,
-        unused       : true,
         side_effects: true,
-        dead_code    : true,
+        unused: true,
     }
     input: {
         function f(x, y) {
@@ -100,15 +100,15 @@ if_return_4: {
 
 if_return_5: {
     options = {
+        booleans: true,
+        comparisons: true,
+        conditionals: true,
+        dead_code: true,
+        evaluate: true,
         if_return: true,
         sequences: true,
-        conditionals : true,
-        comparisons  : true,
-        evaluate     : true,
-        booleans     : true,
-        unused       : true,
         side_effects: true,
-        dead_code    : true,
+        unused: true,
     }
     input: {
         function f() {
@@ -126,15 +126,15 @@ if_return_5: {
 
 if_return_6: {
     options = {
+        booleans: true,
+        comparisons: true,
+        conditionals: true,
+        dead_code: true,
+        evaluate: true,
         if_return: true,
         sequences: true,
-        conditionals : true,
-        comparisons  : true,
-        evaluate     : true,
-        booleans     : true,
-        unused       : true,
         side_effects: true,
-        dead_code    : true,
+        unused: true,
     }
     input: {
         function f(x) {
@@ -150,15 +150,15 @@ if_return_6: {
 
 if_return_7: {
     options = {
+        booleans: true,
+        comparisons: true,
+        conditionals: true,
+        dead_code: true,
+        evaluate: true,
         if_return: true,
         sequences: true,
-        conditionals : true,
-        comparisons  : true,
-        evaluate     : true,
-        booleans     : true,
-        unused       : true,
         side_effects: true,
-        dead_code    : true,
+        unused: true,
     }
     input: {
         function f(x) {
@@ -176,9 +176,9 @@ if_return_7: {
 
 if_return_8: {
     options = {
+        conditionals: true,
         if_return: true,
         sequences: true,
-        conditionals:  true,
         side_effects: true,
     }
     input: {
@@ -220,15 +220,15 @@ if_return_8: {
 
 issue_1089: {
     options = {
+        booleans: true,
+        comparisons: true,
+        conditionals: true,
+        dead_code: true,
+        evaluate: true,
         if_return: true,
         sequences: true,
-        conditionals : true,
-        comparisons  : true,
-        evaluate     : true,
-        booleans     : true,
-        unused       : true,
         side_effects: true,
-        dead_code    : true,
+        unused: true,
     }
     input: {
         function x() {
@@ -243,7 +243,7 @@ issue_1089: {
     expect: {
         function x() {
             var f = document.getElementById("fname");
-            if (f.files[0].size > 12345)
+            if (12345 < f.files[0].size)
                 return alert("alert"), f.focus(), !1;
         }
     }
@@ -251,9 +251,9 @@ issue_1089: {
 
 issue_1437: {
     options = {
+        conditionals: false,
         if_return: true,
         sequences: true,
-        conditionals : false
     }
     input: {
         function x() {
@@ -283,7 +283,7 @@ issue_1437_conditionals: {
     options = {
         conditionals: true,
         if_return: true,
-        sequences    : true
+        sequences: true,
     }
     input: {
         function x() {
@@ -326,3 +326,73 @@ issue_512: {
         }
     }
 }
+
+if_var_return: {
+    options = {
+        conditionals: true,
+        if_return: true,
+        join_vars: true,
+        sequences: true,
+    }
+    input: {
+        function f() {
+            var a;
+            return;
+            var b;
+        }
+        function g() {
+            var a;
+            if (u()) {
+                var b;
+                return v();
+                var c;
+            }
+            var d;
+            if (w()) {
+                var e;
+                return x();
+                var f;
+            } else {
+                var g;
+                y();
+                var h;
+            }
+            var i;
+            z();
+            var j;
+        }
+    }
+    expect: {
+        function f() {
+            var a, b;
+        }
+        function g() {
+            var a, b, c, d, e, f, g, h, i, j;
+            return u() ? v() : w() ? x() : (y(), z(), void 0);
+        }
+    }
+}
+
+if_if_return_return: {
+    options = {
+        conditionals: true,
+        if_return: true,
+    }
+    input: {
+        function f(a, b) {
+            if (a) {
+                if (b)
+                    return b;
+                return;
+            }
+            g();
+        }
+    }
+    expect: {
+        function f(a, b) {
+            if (a)
+                return b || void 0;
+            g();
+        }
+    }
+}

test/compress/issue-1034.js

@@ -1,8 +1,17 @@
 non_hoisted_function_after_return: {
     options = {
-        hoist_funs: false, dead_code: true, conditionals: true, comparisons: true,
+        booleans: true,
-        evaluate: true, booleans: true, loops: true, unused: true, keep_fargs: true,
+        comparisons: true,
-        if_return: true, join_vars: true, cascade: true, side_effects: 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) {
@@ -27,19 +36,30 @@ non_hoisted_function_after_return: {
         }
     }
     expect_warnings: [
-        'WARN: Dropping unreachable code [test/compress/issue-1034.js:11,16]',
+        "WARN: Dropping unreachable code [test/compress/issue-1034.js:20,16]",
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:14,16]",
+        "WARN: Dropping unreachable code [test/compress/issue-1034.js:23,16]",
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:17,12]",
+        "WARN: Dropping unreachable code [test/compress/issue-1034.js:26,12]",
-        "WARN: Dropping unused function UnusedFunction [test/compress/issue-1034.js:18,21]"
+        "WARN: Dropping unused function UnusedFunction [test/compress/issue-1034.js:27,21]"
     ]
 }
 
 non_hoisted_function_after_return_2a: {
     options = {
-        hoist_funs: false, dead_code: true, conditionals: true, comparisons: true,
+        booleans: true,
-        evaluate: true, booleans: true, loops: true, unused: true, keep_fargs: true,
+        collapse_vars: false,
-        if_return: true, join_vars: true, cascade: true, side_effects: true,
+        comparisons: true,
-        collapse_vars: false, passes: 2, warnings: "verbose"
+        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) {
@@ -65,28 +85,37 @@ non_hoisted_function_after_return_2a: {
         }
     }
     expect_warnings: [
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:48,16]",
+        "WARN: Dropping unreachable code [test/compress/issue-1034.js:68,16]",
-        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:48,16]",
+        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:68,16]",
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:51,16]",
+        "WARN: Dropping unreachable code [test/compress/issue-1034.js:71,16]",
-        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:51,16]",
+        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:71,16]",
-        "WARN: Dropping unused variable a [test/compress/issue-1034.js:48,20]",
+        "WARN: Dropping unused variable a [test/compress/issue-1034.js:68,20]",
-        "WARN: Dropping unused function nope [test/compress/issue-1034.js:55,21]",
+        "WARN: Dropping unused function nope [test/compress/issue-1034.js:75,21]",
         "WARN: pass 0: last_count: Infinity, count: 37",
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:53,12]",
+        "WARN: Dropping unreachable code [test/compress/issue-1034.js:73,12]",
-        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:53,12]",
+        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:73,12]",
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:56,12]",
+        "WARN: Dropping unreachable code [test/compress/issue-1034.js:76,12]",
-        "WARN: Dropping unused variable b [test/compress/issue-1034.js:51,20]",
+        "WARN: Dropping unused variable b [test/compress/issue-1034.js:71,20]",
-        "WARN: Dropping unused variable c [test/compress/issue-1034.js:53,16]",
+        "WARN: Dropping unused variable c [test/compress/issue-1034.js:73,16]",
         "WARN: pass 1: last_count: 37, count: 18",
     ]
 }
 
 non_hoisted_function_after_return_2b: {
     options = {
-        hoist_funs: false, dead_code: true, conditionals: true, comparisons: true,
+        booleans: true,
-        evaluate: true, booleans: true, loops: true, unused: true, keep_fargs: true,
+        collapse_vars: false,
-        if_return: true, join_vars: true, cascade: true, side_effects: true,
+        comparisons: true,
-        collapse_vars: false
+        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) {
@@ -111,19 +140,28 @@ non_hoisted_function_after_return_2b: {
     }
     expect_warnings: [
         // duplicate warnings no longer emitted
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:97,16]",
+        "WARN: Dropping unreachable code [test/compress/issue-1034.js:126,16]",
-        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:97,16]",
+        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:126,16]",
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:99,12]",
+        "WARN: Dropping unreachable code [test/compress/issue-1034.js:128,12]",
-        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:99,12]",
+        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:128,12]",
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:103,12]",
+        "WARN: Dropping unreachable code [test/compress/issue-1034.js:132,12]",
     ]
 }
 
 non_hoisted_function_after_return_strict: {
     options = {
-        hoist_funs: false, dead_code: true, conditionals: true, comparisons: true,
+        booleans: true,
-        evaluate: true, booleans: true, loops: true, unused: true, keep_fargs: true,
+        comparisons: true,
-        if_return: true, join_vars: true, cascade: true, side_effects: 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";
@@ -153,19 +191,30 @@ non_hoisted_function_after_return_strict: {
     }
     expect_stdout: "8 7"
     expect_warnings: [
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:133,16]",
+        "WARN: Dropping unreachable code [test/compress/issue-1034.js:171,16]",
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:136,16]",
+        "WARN: Dropping unreachable code [test/compress/issue-1034.js:174,16]",
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:139,12]",
+        "WARN: Dropping unreachable code [test/compress/issue-1034.js:177,12]",
-        "WARN: Dropping unused function UnusedFunction [test/compress/issue-1034.js:140,21]",
+        "WARN: Dropping unused function UnusedFunction [test/compress/issue-1034.js:178,21]",
     ]
 }
 
 non_hoisted_function_after_return_2a_strict: {
     options = {
-        hoist_funs: false, dead_code: true, conditionals: true, comparisons: true,
+        booleans: true,
-        evaluate: true, booleans: true, loops: true, unused: true, keep_fargs: true,
+        collapse_vars: false,
-        if_return: true, join_vars: true, cascade: true, side_effects: true,
+        comparisons: true,
-        collapse_vars: false, passes: 2, warnings: "verbose"
+        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";
@@ -196,28 +245,37 @@ non_hoisted_function_after_return_2a_strict: {
     }
     expect_stdout: "5 6"
     expect_warnings: [
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:175,16]",
+        "WARN: Dropping unreachable code [test/compress/issue-1034.js:224,16]",
-        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:175,16]",
+        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:224,16]",
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:178,16]",
+        "WARN: Dropping unreachable code [test/compress/issue-1034.js:227,16]",
-        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:178,16]",
+        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:227,16]",
-        "WARN: Dropping unused variable a [test/compress/issue-1034.js:175,20]",
+        "WARN: Dropping unused variable a [test/compress/issue-1034.js:224,20]",
-        "WARN: Dropping unused function nope [test/compress/issue-1034.js:182,21]",
+        "WARN: Dropping unused function nope [test/compress/issue-1034.js:231,21]",
         "WARN: pass 0: last_count: Infinity, count: 48",
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:180,12]",
+        "WARN: Dropping unreachable code [test/compress/issue-1034.js:229,12]",
-        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:180,12]",
+        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:229,12]",
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:183,12]",
+        "WARN: Dropping unreachable code [test/compress/issue-1034.js:232,12]",
-        "WARN: Dropping unused variable b [test/compress/issue-1034.js:178,20]",
+        "WARN: Dropping unused variable b [test/compress/issue-1034.js:227,20]",
-        "WARN: Dropping unused variable c [test/compress/issue-1034.js:180,16]",
+        "WARN: Dropping unused variable c [test/compress/issue-1034.js:229,16]",
         "WARN: pass 1: last_count: 48, count: 29",
     ]
 }
 
 non_hoisted_function_after_return_2b_strict: {
     options = {
-        hoist_funs: false, dead_code: true, conditionals: true, comparisons: true,
+        booleans: true,
-        evaluate: true, booleans: true, loops: true, unused: true, keep_fargs: true,
+        collapse_vars: false,
-        if_return: true, join_vars: true, cascade: true, side_effects: true,
+        comparisons: true,
-        collapse_vars: false
+        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";
@@ -247,10 +305,10 @@ non_hoisted_function_after_return_2b_strict: {
     expect_stdout: "5 6"
     expect_warnings: [
         // duplicate warnings no longer emitted
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:229,16]",
+        "WARN: Dropping unreachable code [test/compress/issue-1034.js:287,16]",
-        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:229,16]",
+        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:287,16]",
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:231,12]",
+        "WARN: Dropping unreachable code [test/compress/issue-1034.js:289,12]",
-        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:231,12]",
+        "WARN: Declarations in unreachable code! [test/compress/issue-1034.js:289,12]",
-        "WARN: Dropping unreachable code [test/compress/issue-1034.js:235,12]",
+        "WARN: Dropping unreachable code [test/compress/issue-1034.js:293,12]",
     ]
 }

test/compress/issue-1041.js

@@ -1,8 +1,9 @@
 const_pragma: {
     options = {
         evaluate: true,
+        reduce_funcs: true,
         reduce_vars: true,
-    };
+    }
 
     input: {
         /** @const */ var goog = goog || {};
@@ -16,8 +17,9 @@ const_pragma: {
 not_const: {
     options = {
         evaluate: true,
+        reduce_funcs: true,
         reduce_vars: true,
-    };
+    }
 
     input: {
         var goog = goog || {};

test/compress/issue-1105.js

@@ -1,6 +1,6 @@
 with_in_global_scope: {
     options = {
-        unused: true
+        unused: true,
     }
     input: {
         var o = 42;
@@ -18,7 +18,7 @@ with_in_global_scope: {
 }
 with_in_function_scope: {
     options = {
-        unused: true
+        unused: true,
     }
     input: {
         function foo() {
@@ -40,7 +40,7 @@ with_in_function_scope: {
 }
 compress_with_with_in_other_scope: {
     options = {
-        unused: true
+        unused: true,
     }
     input: {
         function foo() {
@@ -69,7 +69,7 @@ compress_with_with_in_other_scope: {
 }
 with_using_existing_variable_outside_scope: {
     options = {
-        unused: true
+        unused: true,
     }
     input: {
         function f() {
@@ -99,7 +99,7 @@ with_using_existing_variable_outside_scope: {
 }
 check_drop_unused_in_peer_function: {
     options = {
-        unused: true
+        unused: true,
     }
     input: {
         function outer() {
@@ -148,7 +148,7 @@ check_drop_unused_in_peer_function: {
 
 Infinity_not_in_with_scope: {
     options = {
-        unused: true
+        unused: true,
     }
     input: {
         var o = { Infinity: 'oInfinity' };
@@ -164,7 +164,7 @@ Infinity_not_in_with_scope: {
 
 Infinity_in_with_scope: {
     options = {
-        unused: true
+        unused: true,
     }
     input: {
         var o = { Infinity: 'oInfinity' };
@@ -180,20 +180,19 @@ Infinity_in_with_scope: {
 
 assorted_Infinity_NaN_undefined_in_with_scope: {
     options = {
-        unused:        true,
-        evaluate:      true,
-        dead_code:     true,
-        conditionals:  true,
-        comparisons:   true,
         booleans: true,
+        comparisons: true,
+        conditionals: true,
+        dead_code: true,
+        evaluate: true,
         hoist_funs: true,
-        keep_fargs:    true,
         if_return: true,
         join_vars: true,
-        cascade:       true,
+        keep_fargs: true,
-        side_effects:  true,
-        sequences:     false,
         keep_infinity: false,
+        sequences: false,
+        side_effects: true,
+        unused: true,
     }
     input: {
         var f = console.log;
@@ -243,20 +242,19 @@ assorted_Infinity_NaN_undefined_in_with_scope: {
 
 assorted_Infinity_NaN_undefined_in_with_scope_keep_infinity: {
     options = {
-        unused:        true,
-        evaluate:      true,
-        dead_code:     true,
-        conditionals:  true,
-        comparisons:   true,
         booleans: true,
+        comparisons: true,
+        conditionals: true,
+        dead_code: true,
+        evaluate: true,
         hoist_funs: true,
-        keep_fargs:    true,
         if_return: true,
         join_vars: true,
-        cascade:       true,
+        keep_fargs: true,
-        side_effects:  true,
-        sequences:     false,
         keep_infinity: true,
+        sequences: false,
+        side_effects: true,
+        unused: true,
     }
     input: {
         var f = console.log;

test/compress/issue-12.js

@@ -1,11 +1,15 @@
 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 () {} } }
 }

test/compress/issue-1202.js

@@ -1,7 +1,7 @@
 mangle_keep_fnames_false: {
     options = {
-        keep_fnames : true,
         keep_fargs: true,
+        keep_fnames: true,
     }
     mangle = {
         keep_fnames : false,
@@ -26,8 +26,8 @@ mangle_keep_fnames_false: {
 
 mangle_keep_fnames_true: {
     options = {
-        keep_fnames : true,
         keep_fargs: true,
+        keep_fnames: true,
     }
     mangle = {
         keep_fnames : true,

test/compress/issue-1261.js

@@ -1,15 +1,14 @@
 pure_function_calls: {
     options = {
-        evaluate     : true,
-        conditionals : true,
-        comparisons  : true,
-        side_effects : true,
         booleans: true,
-        unused       : true,
+        comparisons: true,
+        conditionals: true,
+        evaluate: true,
         if_return: true,
         join_vars: true,
-        cascade      : true,
         negate_iife: true,
+        side_effects: true,
+        unused: true,
     }
     input: {
         // pure top-level IIFE will be dropped
@@ -49,29 +48,28 @@ pure_function_calls: {
         a.b(), f.g();
     }
     expect_warnings: [
-        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:17,8]",
+        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:16,8]",
-        "WARN: Dropping side-effect-free statement [test/compress/issue-1261.js:17,8]",
+        "WARN: Dropping side-effect-free statement [test/compress/issue-1261.js:16,8]",
-        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:30,37]",
+        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:29,37]",
-        "WARN: Dropping unused variable iife2 [test/compress/issue-1261.js:30,16]",
+        "WARN: Dropping unused variable iife2 [test/compress/issue-1261.js:29,16]",
-        "WARN: Dropping side-effect-free statement [test/compress/issue-1261.js:28,8]",
+        "WARN: Dropping side-effect-free statement [test/compress/issue-1261.js:27,8]",
-        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:38,8]",
+        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:37,8]",
-        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:39,31]",
+        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:38,31]",
     ]
 }
 
 pure_function_calls_toplevel: {
     options = {
-        evaluate     : true,
-        conditionals : true,
-        comparisons  : true,
-        side_effects : true,
         booleans: true,
-        unused       : true,
+        comparisons: true,
+        conditionals: true,
+        evaluate: true,
         if_return: true,
         join_vars: true,
-        cascade      : true,
         negate_iife: true,
+        side_effects: true,
         toplevel: true,
+        unused: true,
     }
     input: {
         // pure top-level IIFE will be dropped
@@ -112,17 +110,17 @@ pure_function_calls_toplevel: {
         a.b(), f.g();
     }
     expect_warnings: [
-        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:79,8]",
+        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:77,8]",
-        "WARN: Dropping side-effect-free statement [test/compress/issue-1261.js:79,8]",
+        "WARN: Dropping side-effect-free statement [test/compress/issue-1261.js:77,8]",
-        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:92,37]",
+        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:90,37]",
-        "WARN: Dropping unused variable iife2 [test/compress/issue-1261.js:92,16]",
+        "WARN: Dropping unused variable iife2 [test/compress/issue-1261.js:90,16]",
-        "WARN: Dropping side-effect-free statement [test/compress/issue-1261.js:90,8]",
+        "WARN: Dropping side-effect-free statement [test/compress/issue-1261.js:88,8]",
-        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:107,8]",
+        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:105,8]",
-        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:108,31]",
+        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:106,31]",
-        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:84,33]",
+        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:82,33]",
-        "WARN: Dropping unused variable iife1 [test/compress/issue-1261.js:84,12]",
+        "WARN: Dropping unused variable iife1 [test/compress/issue-1261.js:82,12]",
-        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:100,45]",
+        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:98,45]",
-        "WARN: Dropping unused variable MyClass [test/compress/issue-1261.js:100,12]",
+        "WARN: Dropping unused variable MyClass [test/compress/issue-1261.js:98,12]",
     ]
 }
 
@@ -157,29 +155,29 @@ should_warn: {
         baz();
     }
     expect_warnings: [
-        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:137,61]",
+        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:135,61]",
-        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:137,23]",
+        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:135,23]",
-        "WARN: Dropping side-effect-free statement [test/compress/issue-1261.js:137,23]",
+        "WARN: Dropping side-effect-free statement [test/compress/issue-1261.js:135,23]",
-        "WARN: Boolean || always true [test/compress/issue-1261.js:138,23]",
+        "WARN: Boolean || always true [test/compress/issue-1261.js:136,23]",
+        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:136,23]",
+        "WARN: Condition always true [test/compress/issue-1261.js:136,23]",
+        "WARN: Condition left of || always true [test/compress/issue-1261.js:137,8]",
+        "WARN: Condition always true [test/compress/issue-1261.js:137,8]",
+        "WARN: Boolean && always false [test/compress/issue-1261.js:138,23]",
         "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:138,23]",
-        "WARN: Condition always true [test/compress/issue-1261.js:138,23]",
+        "WARN: Condition always false [test/compress/issue-1261.js:138,23]",
-        "WARN: Condition left of || always true [test/compress/issue-1261.js:139,8]",
+        "WARN: Condition left of && always false [test/compress/issue-1261.js:139,8]",
-        "WARN: Condition always true [test/compress/issue-1261.js:139,8]",
+        "WARN: Condition always false [test/compress/issue-1261.js:139,8]",
-        "WARN: Boolean && always false [test/compress/issue-1261.js:140,23]",
+        "WARN: + in boolean context always true [test/compress/issue-1261.js:140,23]",
         "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:140,23]",
-        "WARN: Condition always false [test/compress/issue-1261.js:140,23]",
+        "WARN: Condition always true [test/compress/issue-1261.js:140,23]",
-        "WARN: Condition left of && always false [test/compress/issue-1261.js:141,8]",
+        "WARN: + in boolean context always true [test/compress/issue-1261.js:141,8]",
-        "WARN: Condition always false [test/compress/issue-1261.js:141,8]",
+        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:141,31]",
-        "WARN: + in boolean context always true [test/compress/issue-1261.js:142,23]",
+        "WARN: Condition always true [test/compress/issue-1261.js:141,8]",
         "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:142,23]",
-        "WARN: Condition always true [test/compress/issue-1261.js:142,23]",
-        "WARN: + in boolean context always true [test/compress/issue-1261.js:143,8]",
-        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:143,31]",
         "WARN: Condition always true [test/compress/issue-1261.js:143,8]",
-        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:144,23]",
+        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:143,24]",
-        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:145,24]",
+        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:144,31]",
-        "WARN: Condition always true [test/compress/issue-1261.js:145,8]",
+        "WARN: Condition always false [test/compress/issue-1261.js:144,8]",
-        "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:146,31]",
-        "WARN: Condition always false [test/compress/issue-1261.js:146,8]",
     ]
 }

test/compress/issue-1275.js

@@ -1,17 +1,16 @@
 string_plus_optimization: {
     options = {
-        side_effects  : true,
-        evaluate      : true,
-        conditionals  : true,
-        comparisons   : true,
-        dead_code     : true,
         booleans: true,
-        unused        : true,
+        comparisons: true,
+        conditionals: true,
+        dead_code: true,
+        evaluate: true,
+        hoist_funs: true,
         if_return: true,
         join_vars: true,
-        cascade       : true,
+        side_effects: true,
-        hoist_funs    : true,
+        unused: true,
-    };
+    }
     input: {
         function foo(anything) {
             function throwing_function() {

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,6 +1,6 @@
 level_zero: {
     options = {
-        keep_fnames: true
+        keep_fnames: true,
     }
     mangle = {
         keep_fnames: true
@@ -29,7 +29,7 @@ level_zero: {
 
 level_one: {
     options = {
-        keep_fnames: true
+        keep_fnames: true,
     }
     mangle = {
         keep_fnames: true
@@ -58,7 +58,7 @@ level_one: {
 
 level_two: {
     options = {
-        keep_fnames: true
+        keep_fnames: true,
     }
     mangle = {
         keep_fnames: true
@@ -97,7 +97,7 @@ level_two: {
 
 level_three: {
     options = {
-        keep_fnames: true
+        keep_fnames: true,
     }
     mangle = {
         keep_fnames: true

test/compress/issue-1443.js

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

test/compress/issue-1447.js

@@ -22,18 +22,17 @@ else_with_empty_statement: {
 
 conditional_false_stray_else_in_loop: {
     options = {
-        evaluate     : true,
-        comparisons  : true,
         booleans: true,
-        unused       : true,
+        comparisons: true,
+        conditionals: false,
+        dead_code: true,
+        evaluate: true,
+        hoist_vars: true,
+        if_return: true,
+        join_vars: true,
         loops: true,
         side_effects: true,
-        dead_code    : true,
+        unused: true,
-        hoist_vars   : true,
-        join_vars    : true,
-        if_return    : true,
-        cascade      : true,
-        conditionals : false,
     }
     input: {
         for (var i = 1; i <= 4; ++i) {

test/compress/issue-1588.js

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

test/compress/issue-1609.js

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

test/compress/issue-1639.js

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

test/compress/issue-1656.js

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

test/compress/issue-1673.js

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

test/compress/issue-1704.js

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

test/compress/issue-1733.js

@@ -15,7 +15,7 @@ function_iife_catch: {
         }
         f();
     }
-    expect_exact: "function f(o){!function(){try{throw 0}catch(c){var o=1;console.log(c,o)}}()}f();"
+    expect_exact: "function f(o){!function(){try{throw 0}catch(o){var c=1;console.log(o,c)}}()}f();"
     expect_stdout: "0 1"
 }
 
@@ -36,7 +36,7 @@ function_iife_catch_ie8: {
         }
         f();
     }
-    expect_exact: "function f(o){!function(){try{throw 0}catch(o){var c=1;console.log(o,c)}}()}f();"
+    expect_exact: "function f(c){!function(){try{throw 0}catch(c){var o=1;console.log(c,o)}}()}f();"
     expect_stdout: "0 1"
 }
 
@@ -61,7 +61,7 @@ function_catch_catch: {
         }
         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_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",

test/compress/issue-1750.js

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

test/compress/issue-1770.js

@@ -84,12 +84,12 @@ numeric_literal: {
         '    0: 0,',
         '    "-0": 1,',
         '    42: 2,',
-        '    "42": 3,',
+        '    42: 3,',
         '    37: 4,',
         '    o: 5,',
         '    1e42: 6,',
         '    b: 7,',
-        '    "1e+42": 8',
+        '    1e42: 8',
         '};',
         '',
         'console.log(obj[-0], obj[-""], obj["-0"]);',

test/compress/issue-1787.js

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

test/compress/issue-1833.js

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

test/compress/issue-208.js

@@ -1,6 +1,8 @@
 do_not_update_lhs: {
     options = {
-        global_defs: { DEBUG: 0 }
+        global_defs: {
+            DEBUG: 0,
+        },
     }
     input: {
         DEBUG++;
@@ -16,7 +18,9 @@ do_not_update_lhs: {
 
 do_update_rhs: {
     options = {
-        global_defs: { DEBUG: 0 }
+        global_defs: {
+            DEBUG: 0,
+        },
     }
     input: {
         MY_DEBUG = DEBUG;
@@ -35,7 +39,7 @@ mixed: {
             DEBUG: 0,
             ENV: 1,
             FOO: 2,
-        }
+        },
     }
     input: {
         var ENV = 3;
@@ -60,11 +64,11 @@ mixed: {
         x = 0;
     }
     expect_warnings: [
-        'WARN: global_defs ENV redefined [test/compress/issue-208.js:41,12]',
+        "WARN: global_defs ENV redefined [test/compress/issue-208.js:45,12]",
-        'WARN: global_defs FOO redefined [test/compress/issue-208.js:42,12]',
+        "WARN: global_defs FOO redefined [test/compress/issue-208.js:46,12]",
-        'WARN: global_defs FOO redefined [test/compress/issue-208.js:44,10]',
+        "WARN: global_defs FOO redefined [test/compress/issue-208.js:48,10]",
-        'WARN: global_defs DEBUG redefined [test/compress/issue-208.js:45,8]',
+        "WARN: global_defs DEBUG redefined [test/compress/issue-208.js:49,8]",
-        'WARN: global_defs DEBUG redefined [test/compress/issue-208.js:46,8]',
+        "WARN: global_defs DEBUG redefined [test/compress/issue-208.js:50,8]",
-        'WARN: global_defs DEBUG redefined [test/compress/issue-208.js:47,8]',
+        "WARN: global_defs DEBUG redefined [test/compress/issue-208.js:51,8]",
     ]
 }

test/compress/issue-22.js

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

test/compress/issue-2652.js

@@ -0,0 +1,33 @@
+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,5 +1,7 @@
 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,5 +1,7 @@
 issue_269_1: {
-	options = {unsafe: true};
+	options = {
+        unsafe: true,
+    }
 	input: {
 		f(
 			String(x),
@@ -20,7 +22,9 @@ issue_269_1: {
 }
 
 issue_269_dangers: {
-	options = {unsafe: true};
+	options = {
+        unsafe: true,
+    }
 	input: {
 		f(
 			String(x, x),
@@ -34,7 +38,9 @@ issue_269_dangers: {
 }
 
 issue_269_in_scope: {
-	options = {unsafe: true};
+	options = {
+        unsafe: true,
+    }
 	input: {
 		var String, Number, Boolean;
 		f(
@@ -50,7 +56,9 @@ issue_269_in_scope: {
 }
 
 strings_concat: {
-	options = {unsafe: true};
+	options = {
+        unsafe: true,
+    }
 	input: {
 		f(
 			String(x + 'str'),
@@ -64,3 +72,27 @@ 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:86,2]',
+	]
+}

test/compress/issue-2719.js

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

test/compress/issue-281.js

@@ -3,6 +3,7 @@ collapse_vars_constants: {
         collapse_vars: true,
         evaluate: true,
         inline: true,
+        reduce_funcs: true,
         reduce_vars: true,
         unused: true,
     }
@@ -185,7 +186,7 @@ negate_iife_5_off: {
         inline: true,
         negate_iife: false,
         sequences: true,
-    };
+    }
     input: {
         if ((function(){ return t })()) {
             foo(true);
@@ -240,10 +241,11 @@ negate_iife_issue_1073: {
         evaluate: true,
         inline: true,
         negate_iife: true,
+        reduce_funcs: true,
         reduce_vars: true,
         sequences: true,
         unused: true,
-    };
+    }
     input: {
         new (function(a) {
             return function Foo() {
@@ -267,10 +269,11 @@ issue_1288_side_effects: {
         evaluate: true,
         inline: true,
         negate_iife: true,
+        reduce_funcs: true,
         reduce_vars: true,
         side_effects: true,
         unused: true,
-    };
+    }
     input: {
         if (w) ;
         else {
@@ -299,6 +302,7 @@ inner_var_for_in_1: {
     options = {
         evaluate: true,
         inline: true,
+        reduce_funcs: true,
         reduce_vars: true,
     }
     input: {
@@ -330,6 +334,7 @@ issue_1595_3: {
         evaluate: true,
         inline: true,
         passes: 2,
+        reduce_funcs: true,
         reduce_vars: true,
         unused: true,
     }
@@ -448,7 +453,7 @@ pure_annotation_2: {
 
 drop_fargs: {
     options = {
-        cascade: true,
+        collapse_vars: true,
         inline: true,
         keep_fargs: false,
         side_effects: true,
@@ -471,7 +476,7 @@ drop_fargs: {
 
 keep_fargs: {
     options = {
-        cascade: true,
+        collapse_vars: true,
         inline: true,
         keep_fargs: true,
         side_effects: true,

test/compress/issue-2871.js

@@ -0,0 +1,37 @@
+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

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

test/compress/issue-368.js

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

test/compress/issue-44.js

@@ -1,5 +1,7 @@
 issue_44_valid_ast_1: {
-    options = { unused: true };
+    options = {
+        unused: true,
+    }
     input: {
         function a(b) {
             for (var i = 0, e = b.qoo(); ; i++) {}
@@ -14,7 +16,9 @@ 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,5 +1,5 @@
 NaN_and_Infinity_must_have_parens: {
-    options = {};
+    options = {}
     input: {
         Infinity.toString();
         NaN.toString();
@@ -11,7 +11,7 @@ NaN_and_Infinity_must_have_parens: {
 }
 
 NaN_and_Infinity_should_not_be_replaced_when_they_are_redefined: {
-    options = {};
+    options = {}
     input: {
         var Infinity, NaN;
         Infinity.toString();

test/compress/issue-611.js

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

test/compress/issue-637.js

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

test/compress/issue-640.js

@@ -82,8 +82,8 @@ drop_value: {
 
 wrongly_optimized: {
     options = {
-        conditionals: true,
         booleans: true,
+        conditionals: true,
         evaluate: true,
         expression: true,
     }
@@ -100,7 +100,7 @@ wrongly_optimized: {
             foo();
         }
         // TODO: optimize to `func(), bar()`
-        if (func(), !0) bar();
+        if (func(), 1) bar();
     }
 }
 
@@ -195,7 +195,7 @@ negate_iife_5_off: {
         expression: true,
         negate_iife: false,
         sequences: true,
-    };
+    }
     input: {
         if ((function(){ return t })()) {
             foo(true);
@@ -248,7 +248,9 @@ issue_1254_negate_iife_nested: {
 conditional: {
     options = {
         expression: true,
-        pure_funcs: [ "pure" ],
+        pure_funcs: [
+            "pure"
+        ],
         side_effects: true,
     }
     input: {

test/compress/issue-751.js

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

test/compress/issue-782.js

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

test/compress/issue-892.js

@@ -2,26 +2,25 @@ dont_mangle_arguments: {
     mangle = {
     };
     options = {
-        sequences     : true,
+        booleans: true,
-        properties    : true,
+        comparisons: true,
+        conditionals: true,
         dead_code: true,
         drop_debugger: true,
-        conditionals  : true,
-        comparisons   : true,
         evaluate: true,
-        booleans      : true,
-        loops         : true,
-        unused        : true,
         hoist_funs: true,
-        keep_fargs    : true,
-        keep_fnames   : false,
         hoist_vars: true,
         if_return: true,
         join_vars: true,
-        cascade       : true,
+        keep_fargs: true,
+        keep_fnames: false,
+        loops: true,
+        negate_iife: false,
+        properties: true,
+        sequences: true,
         side_effects: true,
-        negate_iife   : false
+        unused: true,
-    };
+    }
     input: {
         (function(){
             var arguments = arguments, not_arguments = 9;

test/compress/issue-913.js

@@ -1,8 +1,8 @@
 keep_var_for_in: {
     options = {
         hoist_vars: true,
-        unused: true
+        unused: true,
-    };
+    }
     input: {
         (function(obj){
             var foo = 5;

test/compress/issue-973.js

@@ -1,9 +1,11 @@
 this_binding_conditionals: {
     options = {
         conditionals: true,
-        evaluate    : true
+        evaluate: true,
-    };
+        side_effects: true,
+    }
     input: {
+        "use strict";
         (1 && a)();
         (0 || a)();
         (0 || 1 && a)();
@@ -25,6 +27,7 @@ this_binding_conditionals: {
         (1 ? eval : 0)();
     }
     expect: {
+        "use strict";
         a();
         a();
         a();
@@ -51,13 +54,16 @@ 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)();
@@ -66,32 +72,89 @@ this_binding_collapse_vars: {
 
 this_binding_side_effects: {
     options = {
-        side_effects : true
+        side_effects: true,
-    };
+    }
     input: {
         (function(foo) {
             (0, foo)();
             (0, foo.bar)();
-            (0, eval)('console.log(foo);');
+            (0, eval)("console.log(foo);");
+        }());
+        (function(foo) {
+            "use strict";
+            (0, foo)();
+            (0, foo.bar)();
+            (0, eval)("console.log(foo);");
         }());
         (function(foo) {
             var eval = console;
             (0, foo)();
             (0, foo.bar)();
-            (0, eval)('console.log(foo);');
+            (0, eval)("console.log(foo);");
         }());
     }
     expect: {
         (function(foo) {
             foo();
             (0, foo.bar)();
-            (0, eval)('console.log(foo);');
+            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)();
-            (0, eval)('console.log(foo);');
+            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,9 +1,21 @@
 eval_collapse_vars: {
     options = {
-        collapse_vars:true, sequences:false, properties:true, dead_code:true, conditionals:true,
+        booleans: true,
-        comparisons:true, evaluate:true, booleans:true, loops:true, unused:true, hoist_funs:true,
+        collapse_vars: true,
-        keep_fargs:true, if_return:true, join_vars:true, cascade:true, side_effects: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;
@@ -46,7 +58,10 @@ eval_collapse_vars: {
 }
 
 eval_unused: {
-    options = { unused: true, keep_fargs: false };
+    options = {
+        keep_fargs: false,
+        unused: true,
+    }
     input: {
         function f1(a, eval, c, d, e) {
             return a('c') + eval;

test/compress/issue-979.js

@@ -1,8 +1,19 @@
 issue979_reported: {
     options = {
-        sequences:true, properties:true, dead_code:true, conditionals:true,
+        booleans: true,
-        comparisons:true, evaluate:true, booleans:true, loops:true, unused:true, hoist_funs:true,
+        comparisons: true,
-        keep_fargs:true, if_return:true, join_vars:true, cascade:true, side_effects: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() {
@@ -30,9 +41,20 @@ issue979_reported: {
 
 issue979_test_negated_is_best: {
     options = {
-        sequences:true, properties:true, dead_code:true, conditionals:true,
+        booleans: true,
-        comparisons:true, evaluate:true, booleans:true, loops:true, unused:true, hoist_funs:true,
+        comparisons: true,
-        keep_fargs:true, if_return:true, join_vars:true, cascade:true, side_effects: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() {

test/compress/labels.js

@@ -1,5 +1,9 @@
 labels_1: {
-    options = { if_return: true, conditionals: true, dead_code: true };
+    options = {
+        conditionals: true,
+        dead_code: true,
+        if_return: true,
+    }
     input: {
         out: {
             if (foo) break out;
@@ -13,7 +17,11 @@ labels_1: {
 }
 
 labels_2: {
-    options = { if_return: true, conditionals: true, dead_code: true };
+    options = {
+        conditionals: true,
+        dead_code: true,
+        if_return: true,
+    }
     input: {
         out: {
             if (foo) print("stuff");
@@ -30,7 +38,11 @@ labels_2: {
 }
 
 labels_3: {
-    options = { if_return: true, conditionals: true, dead_code: true };
+    options = {
+        conditionals: true,
+        dead_code: true,
+        if_return: true,
+    }
     input: {
         for (var i = 0; i < 5; ++i) {
             if (i < 3) continue;
@@ -45,7 +57,11 @@ labels_3: {
 }
 
 labels_4: {
-    options = { if_return: true, conditionals: true, dead_code: true };
+    options = {
+        conditionals: true,
+        dead_code: true,
+        if_return: true,
+    }
     input: {
         out: for (var i = 0; i < 5; ++i) {
             if (i < 3) continue out;
@@ -60,7 +76,11 @@ labels_4: {
 }
 
 labels_5: {
-    options = { if_return: true, conditionals: true, dead_code: true };
+    options = {
+        conditionals: true,
+        dead_code: true,
+        if_return: true,
+    }
     // should keep the break-s in the following
     input: {
         while (foo) {
@@ -92,7 +112,11 @@ labels_6: {
 }
 
 labels_7: {
-    options = { if_return: true, conditionals: true, dead_code: true };
+    options = {
+        conditionals: true,
+        dead_code: true,
+        if_return: true,
+    }
     input: {
         while (foo) {
             x();
@@ -109,7 +133,11 @@ labels_7: {
 }
 
 labels_8: {
-    options = { if_return: true, conditionals: true, dead_code: true };
+    options = {
+        conditionals: true,
+        dead_code: true,
+        if_return: true,
+    }
     input: {
         while (foo) {
             x();
@@ -127,7 +155,11 @@ labels_8: {
 }
 
 labels_9: {
-    options = { if_return: true, conditionals: true, dead_code: true };
+    options = {
+        conditionals: true,
+        dead_code: true,
+        if_return: true,
+    }
     input: {
         out: while (foo) {
             x();
@@ -146,7 +178,11 @@ labels_9: {
 }
 
 labels_10: {
-    options = { if_return: true, conditionals: true, dead_code: true };
+    options = {
+        conditionals: true,
+        dead_code: true,
+        if_return: true,
+    }
     input: {
         out: while (foo) {
             x();

test/compress/loops.js

@@ -1,5 +1,7 @@
 while_becomes_for: {
-    options = { loops: true };
+    options = {
+        loops: true,
+    }
     input: {
         while (foo()) bar();
     }
@@ -9,7 +11,9 @@ while_becomes_for: {
 }
 
 drop_if_break_1: {
-    options = { loops: true };
+    options = {
+        loops: true,
+    }
     input: {
         for (;;)
             if (foo()) break;
@@ -20,7 +24,9 @@ drop_if_break_1: {
 }
 
 drop_if_break_2: {
-    options = { loops: true };
+    options = {
+        loops: true,
+    }
     input: {
         for (;bar();)
             if (foo()) break;
@@ -31,7 +37,9 @@ drop_if_break_2: {
 }
 
 drop_if_break_3: {
-    options = { loops: true };
+    options = {
+        loops: true,
+    }
     input: {
         for (;bar();) {
             if (foo()) break;
@@ -48,7 +56,10 @@ drop_if_break_3: {
 }
 
 drop_if_break_4: {
-    options = { loops: true, sequences: true };
+    options = {
+        loops: true,
+        sequences: true,
+    }
     input: {
         for (;bar();) {
             x();
@@ -64,7 +75,9 @@ drop_if_break_4: {
 }
 
 drop_if_else_break_1: {
-    options = { loops: true };
+    options = {
+        loops: true,
+    }
     input: {
         for (;;) if (foo()) bar(); else break;
     }
@@ -74,7 +87,9 @@ drop_if_else_break_1: {
 }
 
 drop_if_else_break_2: {
-    options = { loops: true };
+    options = {
+        loops: true,
+    }
     input: {
         for (;bar();) {
             if (foo()) baz();
@@ -87,7 +102,9 @@ drop_if_else_break_2: {
 }
 
 drop_if_else_break_3: {
-    options = { loops: true };
+    options = {
+        loops: true,
+    }
     input: {
         for (;bar();) {
             if (foo()) baz();
@@ -106,7 +123,10 @@ drop_if_else_break_3: {
 }
 
 drop_if_else_break_4: {
-    options = { loops: true, sequences: true };
+    options = {
+        loops: true,
+        sequences: true,
+    }
     input: {
         for (;bar();) {
             x();
@@ -123,7 +143,9 @@ drop_if_else_break_4: {
 }
 
 parse_do_while_with_semicolon: {
-    options = { loops: false };
+    options = {
+        loops: false,
+    }
     input: {
         do {
             x();
@@ -135,7 +157,9 @@ parse_do_while_with_semicolon: {
 }
 
 parse_do_while_without_semicolon: {
-    options = { loops: false };
+    options = {
+        loops: false,
+    }
     input: {
         do {
             x();
@@ -148,10 +172,12 @@ parse_do_while_without_semicolon: {
 
 evaluate: {
     options = {
-        loops: true,
         dead_code: true,
         evaluate: true,
-    };
+        loops: true,
+        passes: 2,
+        side_effects: true,
+    }
     input: {
         while (true) {
             a();
@@ -292,10 +318,10 @@ issue_186_beautify_ie8: {
     ]
 }
 
-issue_186_bracketize: {
+issue_186_braces: {
     beautify = {
         beautify: false,
-        bracketize: true,
+        braces: true,
         ie8: false,
     }
     input: {
@@ -312,10 +338,10 @@ issue_186_bracketize: {
     expect_exact: 'var x=3;if(foo()){do{do{alert(x)}while(--x)}while(x)}else{bar()}'
 }
 
-issue_186_bracketize_ie8: {
+issue_186_braces_ie8: {
     beautify = {
         beautify: false,
-        bracketize: true,
+        braces: true,
         ie8: true,
     }
     input: {
@@ -332,10 +358,10 @@ issue_186_bracketize_ie8: {
     expect_exact: 'var x=3;if(foo()){do{do{alert(x)}while(--x)}while(x)}else{bar()}'
 }
 
-issue_186_beautify_bracketize: {
+issue_186_beautify_braces: {
     beautify = {
         beautify: true,
-        bracketize: true,
+        braces: true,
         ie8: false,
     }
     input: {
@@ -364,10 +390,10 @@ issue_186_beautify_bracketize: {
     ]
 }
 
-issue_186_beautify_bracketize_ie8: {
+issue_186_beautify_braces_ie8: {
     beautify = {
         beautify: true,
-        bracketize: true,
+        braces: true,
         ie8: true,
     }
     input: {
@@ -450,3 +476,173 @@ in_parenthesis_2: {
     }
     expect_exact: 'for(function(){"foo"in{}};0;);'
 }
+
+init_side_effects: {
+    options = {
+        loops: true,
+        side_effects: true,
+    }
+    input: {
+        for (function() {}(), i = 0; i < 5; i++) console.log(i);
+        for (function() {}(); i < 10; i++) console.log(i);
+    }
+    expect: {
+        for (i = 0; i < 5; i++) console.log(i);
+        for (; i < 10; i++) console.log(i);
+    }
+    expect_stdout: true
+}
+
+dead_code_condition: {
+    options = {
+        dead_code: true,
+        evaluate: true,
+        loops: true,
+        sequences: true,
+    }
+    input: {
+        for (var a = 0, b = 5; (a += 1, 3) - 3 && b > 0; b--) {
+            var c = function() {
+                b--;
+            }(a++);
+        }
+        console.log(a);
+    }
+    expect: {
+        var c;
+        var a = 0, b = 5;
+        a += 1, 0,
+        console.log(a);
+    }
+    expect_stdout: "1"
+}
+
+issue_2740_1: {
+    options = {
+        dead_code: true,
+        loops: true,
+    }
+    input: {
+        for (; ; ) break;
+        for (a(); ; ) break;
+        for (; b(); ) break;
+        for (c(); d(); ) break;
+        for (; ; e()) break;
+        for (f(); ; g()) break;
+        for (; h(); i()) break;
+        for (j(); k(); l()) break;
+    }
+    expect: {
+        a();
+        b();
+        c();
+        d();
+        f();
+        h();
+        j();
+        k();
+    }
+}
+
+issue_2740_2: {
+    options = {
+        dead_code: true,
+        loops: true,
+        passes: 2,
+    }
+    input: {
+        L1: while (x()) {
+            break L1;
+        }
+    }
+    expect: {
+        x();
+    }
+}
+
+issue_2740_3: {
+    options = {
+        dead_code: true,
+        loops: true,
+    }
+    input: {
+        L1: for (var x = 0; x < 3; x++) {
+            L2: for (var y = 0; y < 2; y++) {
+                break L1;
+            }
+        }
+        console.log(x, y);
+    }
+    expect: {
+        L1: for (var x = 0; x < 3; x++)
+            for (var y = 0; y < 2; y++)
+                break L1;
+        console.log(x, y);
+    }
+    expect_stdout: "0 0"
+}
+
+issue_2740_4: {
+    options = {
+        dead_code: true,
+        loops: true,
+        passes: 2,
+    }
+    input: {
+        L1: for (var x = 0; x < 3; x++) {
+            L2: for (var y = 0; y < 2; y++) {
+                break L2;
+            }
+        }
+        console.log(x, y);
+    }
+    expect: {
+        for (var x = 0; x < 3; x++) {
+            var y = 0;
+            y < 2;
+        }
+        console.log(x, y);
+    }
+    expect_stdout: "3 0"
+}
+
+issue_2740_5: {
+    options = {
+        dead_code: true,
+        loops: true,
+        passes: 2,
+    }
+    input: {
+        L1: for (var x = 0; x < 3; x++) {
+            break L1;
+            L2: for (var y = 0; y < 2; y++) {
+                break L2;
+            }
+        }
+        console.log(x, y);
+    }
+    expect: {
+        var x = 0;
+        x < 3;
+        var y;
+        console.log(x,y);
+    }
+    expect_stdout: "0 undefined"
+}
+
+issue_2904: {
+    options = {
+        join_vars: true,
+        loops: true,
+    }
+    input: {
+        var a = 1;
+        do {
+            console.log(a);
+        } while (--a);
+    }
+    expect: {
+        for (var a = 1; console.log(a), --a;);
+    }
+    expect_stdout: "1"
+}

test/compress/max_line_len.js

@@ -8,14 +8,14 @@ too_short: {
         }
     }
     expect_exact: [
-        'function f(a){',
+        "function f(",
-        'return{',
+        "a){return{",
-        'c:42,',
+        "c:42,d:a(",
-        'd:a(),',
+        '),e:"foo"}',
-        'e:"foo"}}',
+        "}",
     ]
     expect_warnings: [
-        "WARN: Output exceeds 10 characters"
+        "WARN: Output exceeds 10 characters",
     ]
 }
 
@@ -29,11 +29,25 @@ just_enough: {
         }
     }
     expect_exact: [
-        'function f(a){',
+        "function f(a){",
-        'return{c:42,',
+        "return{c:42,",
         'd:a(),e:"foo"}',
-        '}',
+        "}",
-    ]
-    expect_warnings: [
     ]
+    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() })();
     }
@@ -13,7 +13,7 @@ negate_iife_1: {
 negate_iife_1_off: {
     options = {
         negate_iife: false,
-    };
+    }
     input: {
         (function(){ stuff() })();
     }
@@ -24,7 +24,7 @@ negate_iife_2: {
     options = {
         inline: true,
         negate_iife: true,
-    };
+    }
     input: {
         (function(){ return {} })().x = 10;
     }
@@ -45,9 +45,9 @@ negate_iife_2_side_effects: {
 
 negate_iife_3: {
     options = {
+        conditionals: true,
         negate_iife: true,
-        conditionals: true
+    }
-    };
     input: {
         (function(){ return t })() ? console.log(true) : console.log(false);
     }
@@ -67,7 +67,7 @@ negate_iife_3_evaluate: {
         (function(){ return true })() ? console.log(true) : console.log(false);
     }
     expect: {
-        console.log(true);
+        true, console.log(true);
     }
     expect_stdout: true
 }
@@ -88,9 +88,9 @@ negate_iife_3_side_effects: {
 
 negate_iife_3_off: {
     options = {
-        negate_iife: false,
         conditionals: true,
-    };
+        negate_iife: false,
+    }
     input: {
         (function(){ return t })() ? console.log(true) : console.log(false);
     }
@@ -110,17 +110,17 @@ negate_iife_3_off_evaluate: {
         (function(){ return true })() ? console.log(true) : console.log(false);
     }
     expect: {
-        console.log(true);
+        true, console.log(true);
     }
     expect_stdout: true
 }
 
 negate_iife_4: {
     options = {
-        negate_iife: true,
         conditionals: true,
-        sequences: true
+        negate_iife: true,
-    };
+        sequences: true,
+    }
     input: {
         (function(){ return t })() ? console.log(true) : console.log(false);
         (function(){
@@ -136,11 +136,11 @@ negate_iife_4: {
 
 sequence_off: {
     options = {
-        negate_iife: false,
         conditionals: true,
-        sequences: true,
+        negate_iife: false,
         passes: 2,
-    };
+        sequences: true,
+    }
     input: {
         function f() {
             (function(){ return t })() ? console.log(true) : console.log(false);
@@ -171,10 +171,10 @@ sequence_off: {
 
 negate_iife_5: {
     options = {
+        conditionals: true,
         negate_iife: true,
         sequences: true,
-        conditionals: true,
+    }
-    };
     input: {
         if ((function(){ return t })()) {
             foo(true);
@@ -194,10 +194,10 @@ negate_iife_5: {
 
 negate_iife_5_off: {
     options = {
+        conditionals: true,
         negate_iife: false,
         sequences: true,
-        conditionals: true,
+    }
-    };
     input: {
         if ((function(){ return t })()) {
             foo(true);
@@ -217,10 +217,10 @@ negate_iife_5_off: {
 
 negate_iife_nested: {
     options = {
+        conditionals: true,
         negate_iife: true,
         sequences: true,
-        conditionals: true,
+    }
-    };
     input: {
         function Foo(f) {
             this.f = f;
@@ -250,10 +250,10 @@ negate_iife_nested: {
 
 negate_iife_nested_off: {
     options = {
+        conditionals: true,
         negate_iife: false,
         sequences: true,
-        conditionals: true,
+    }
-    };
     input: {
         function Foo(f) {
             this.f = f;
@@ -283,10 +283,10 @@ negate_iife_nested_off: {
 
 negate_iife_issue_1073: {
     options = {
+        conditionals: true,
         negate_iife: true,
         sequences: true,
-        conditionals: true,
+    }
-    };
     input: {
         new (function(a) {
             return function Foo() {
@@ -356,7 +356,7 @@ issue_1288: {
         conditionals: true,
         negate_iife: true,
         side_effects: false,
-    };
+    }
     input: {
         if (w) ;
         else {

test/compress/new.js

@@ -36,7 +36,9 @@ new_statements_3: {
 }
 
 new_with_rewritten_true_value: {
-    options = { booleans: true }
+    options = {
+        booleans: true,
+    }
     input: {
         new true;
     }

test/compress/numbers.js

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

test/compress/properties.js

@@ -567,16 +567,41 @@ native_prototype: {
     }
     input: {
         Array.prototype.splice.apply(a, [1, 2, b, c]);
+        Function.prototype.call.apply(console.log, console, [ "foo" ]);
+        Number.prototype.toFixed.call(Math.PI, 2);
         Object.prototype.hasOwnProperty.call(d, "foo");
+        RegExp.prototype.test.call(/foo/, "bar");
         String.prototype.indexOf.call(e, "bar");
     }
     expect: {
         [].splice.apply(a, [1, 2, b, c]);
+        (function() {}).call.apply(console.log, console, [ "foo" ]);
+        0..toFixed.call(Math.PI, 2);
         ({}).hasOwnProperty.call(d, "foo");
+        /t/.test.call(/foo/, "bar");
         "".indexOf.call(e, "bar");
     }
 }
 
+native_prototype_lhs: {
+    options = {
+        unsafe_proto: true,
+    }
+    input: {
+        console.log(function() {
+            Function.prototype.bar = "PASS";
+            return function() {};
+        }().bar);
+    }
+    expect: {
+        console.log(function() {
+            Function.prototype.bar = "PASS";
+            return function() {};
+        }().bar);
+    }
+    expect_stdout: "PASS"
+}
+
 accessor_boolean: {
     input: {
         var a = 1;
@@ -833,6 +858,7 @@ lhs_prop_2: {
         evaluate: true,
         inline: true,
         properties: true,
+        reduce_funcs: true,
         reduce_vars: true,
         side_effects: true,
         unused: true,
@@ -879,6 +905,7 @@ prop_side_effects_1: {
         evaluate: true,
         inline: true,
         properties: true,
+        reduce_funcs: true,
         reduce_vars: true,
         side_effects: true,
         toplevel: true,
@@ -915,6 +942,7 @@ prop_side_effects_2: {
         inline: true,
         passes: 2,
         properties: true,
+        reduce_funcs: true,
         reduce_vars: true,
         side_effects: true,
         toplevel: true,
@@ -1006,3 +1034,801 @@ array_hole: {
     }
     expect_stdout: "2 undefined 3"
 }
+
+new_this: {
+    options = {
+        properties: true,
+        side_effects: true,
+    }
+    input: {
+        new {
+            f: function(a) {
+                this.a = a;
+            }
+        }.f(42);
+    }
+    expect: {
+        new function(a) {
+            this.a = a;
+        }(42);
+    }
+}
+
+issue_2513: {
+    options = {
+        evaluate: true,
+        properties: true,
+    }
+    input: {
+        !function(Infinity, NaN, undefined) {
+            console.log("a"[1/0], "b"["Infinity"]);
+            console.log("c"[0/0], "d"["NaN"]);
+            console.log("e"[void 0], "f"["undefined"]);
+        }(0, 0, 0);
+    }
+    expect: {
+        !function(Infinity, NaN, undefined) {
+            console.log("a"[1/0], "b"[1/0]);
+            console.log("c".NaN, "d".NaN);
+            console.log("e"[void 0], "f"[void 0]);
+        }(0, 0, 0);
+    }
+    expect_stdout: [
+        "undefined undefined",
+        "undefined undefined",
+        "undefined undefined",
+    ]
+}
+
+const_prop_assign_strict: {
+    options = {
+        pure_getters: "strict",
+        side_effects: true,
+    }
+    input: {
+        function Simulator() {
+            /abc/.index = 1;
+            this._aircraft = [];
+        }
+        (function() {}).prototype.destroy = x();
+    }
+    expect: {
+        function Simulator() {
+            this._aircraft = [];
+        }
+        x();
+    }
+}
+
+const_prop_assign_pure: {
+    options = {
+        pure_getters: true,
+        side_effects: true,
+    }
+    input: {
+        function Simulator() {
+            /abc/.index = 1;
+            this._aircraft = [];
+        }
+        (function() {}).prototype.destroy = x();
+    }
+    expect: {
+        function Simulator() {
+            this._aircraft = [];
+        }
+        x();
+    }
+}
+
+join_object_assignments_1: {
+    options = {
+        evaluate: true,
+        join_vars: true,
+    }
+    input: {
+        console.log(function() {
+            var x = {
+                a: 1,
+                c: (console.log("c"), "C"),
+            };
+            x.b = 2;
+            x[3] = function() {
+                console.log(x);
+            },
+            x["a"] = /foo/,
+            x.bar = x;
+            return x;
+        }());
+    }
+    expect: {
+        console.log(function() {
+            var x = {
+                a: 1,
+                c: (console.log("c"), "C"),
+                b: 2,
+                3: function() {
+                    console.log(x);
+                },
+                a: /foo/,
+            };
+            x.bar = x;
+            return x;
+        }());
+    }
+    expect_stdout: true
+}
+
+join_object_assignments_2: {
+    options = {
+        evaluate: true,
+        hoist_props: true,
+        join_vars: true,
+        passes: 3,
+        reduce_vars: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        var o = {
+            foo: 1,
+        };
+        o.bar = 2;
+        o.baz = 3;
+        console.log(o.foo, o.bar + o.bar, o.foo * o.bar * o.baz);
+    }
+    expect: {
+        console.log(1, 4, 6);
+    }
+    expect_stdout: "1 4 6"
+}
+
+join_object_assignments_3: {
+    options = {
+        evaluate: true,
+        join_vars: true,
+    }
+    input: {
+        console.log(function() {
+            var o = {
+                a: "PASS",
+            }, a = o.a;
+            o.a = "FAIL";
+            return a;
+        }());
+    }
+    expect: {
+        console.log(function() {
+            var o = {
+                a: "PASS",
+            }, a = o.a;
+            o.a = "FAIL";
+            return a;
+        }());
+    }
+    expect_stdout: "PASS"
+}
+
+join_object_assignments_4: {
+    options = {
+        join_vars: true,
+        sequences: true,
+    }
+    input: {
+        var o;
+        console.log(o);
+        o = {};
+        o.a = "foo";
+        console.log(o.b);
+        o.b = "bar";
+        console.log(o.a);
+    }
+    expect: {
+        var o;
+        console.log(o),
+        o = {
+            a: "foo",
+        },
+        console.log(o.b),
+        o.b = "bar",
+        console.log(o.a);
+    }
+    expect_stdout: [
+        "undefined",
+        "undefined",
+        "foo",
+    ]
+}
+
+join_object_assignments_return_1: {
+    options = {
+        join_vars: true,
+    }
+    input: {
+        console.log(function() {
+            var o = {
+                p: 3
+            };
+            return o.q = "foo";
+        }());
+    }
+    expect: {
+        console.log(function() {
+            var o = {
+                p: 3,
+                q: "foo"
+            };
+            return o.q;
+        }());
+    }
+    expect_stdout: "foo"
+}
+
+join_object_assignments_return_2: {
+    options = {
+        join_vars: true,
+    }
+    input: {
+        console.log(function() {
+            var o = {
+                p: 3
+            };
+            return o.q = /foo/,
+            o.r = "bar";
+        }());
+    }
+    expect: {
+        console.log(function() {
+            var o = {
+                p: 3,
+                q: /foo/,
+                r: "bar"
+            };
+            return o.r;
+        }());
+    }
+    expect_stdout: "bar"
+}
+
+join_object_assignments_return_3: {
+    options = {
+        join_vars: true,
+    }
+    input: {
+        console.log(function() {
+            var o = {
+                p: 3
+            };
+            return o.q = "foo",
+            o.p += "",
+            console.log(o.q),
+            o.p;
+        }());
+    }
+    expect: {
+        console.log(function() {
+            var o = {
+                p: 3,
+                q: "foo"
+            };
+            return o.p += "",
+            console.log(o.q),
+            o.p;
+        }());
+    }
+    expect_stdout: [
+        "foo",
+        "3",
+    ]
+}
+
+join_object_assignments_for: {
+    options = {
+        join_vars: true,
+    }
+    input: {
+        console.log(function() {
+            var o = {
+                p: 3
+            };
+            for (o.q = "foo"; console.log(o.q););
+            return o.p;
+        }());
+    }
+    expect: {
+        console.log(function() {
+            for (var o = {
+                p: 3,
+                q: "foo"
+            }; console.log(o.q););
+            return o.p;
+        }());
+    }
+    expect_stdout: [
+        "foo",
+        "3",
+    ]
+}
+
+join_object_assignments_if: {
+    options = {
+        join_vars: true,
+    }
+    input: {
+        console.log(function() {
+            var o = {};
+            if (o.a = "PASS") return o.a;
+        }())
+    }
+    expect: {
+        console.log(function() {
+            var o = { a: "PASS" };
+            if (o.a) return o.a;
+        }());
+    }
+    expect_stdout: "PASS"
+}
+
+join_object_assignments_forin: {
+    options = {
+        join_vars: true,
+    }
+    input: {
+        console.log(function() {
+            var o = {};
+            for (var a in o.a = "PASS", o)
+                return o[a];
+        }())
+    }
+    expect: {
+        console.log(function() {
+            var o = { a: "PASS" };
+            for (var a in o)
+                return o[a];
+        }());
+    }
+    expect_stdout: "PASS"
+}
+
+join_object_assignments_negative: {
+    options = {
+        evaluate: true,
+        join_vars: true,
+        properties: true,
+    }
+    input: {
+        var o = {};
+        o[0] = 0;
+        o[-0] = 1;
+        o[-1] = 2;
+        console.log(o[0], o[-0], o[-1]);
+    }
+    expect: {
+        var o = {
+            0: 0,
+            0: 1,
+            "-1": 2
+        };
+        console.log(o[0], o[-0], o[-1]);
+    }
+    expect_stdout: "1 1 2"
+}
+
+join_object_assignments_NaN_1: {
+    options = {
+        join_vars: true,
+    }
+    input: {
+        var o = {};
+        o[NaN] = 1;
+        o[0/0] = 2;
+        console.log(o[NaN], o[NaN]);
+    }
+    expect: {
+        var o = {};
+        o[NaN] = 1;
+        o[0/0] = 2;
+        console.log(o[NaN], o[NaN]);
+    }
+    expect_stdout: "2 2"
+}
+
+join_object_assignments_NaN_2: {
+    options = {
+        evaluate: true,
+        join_vars: true,
+        properties: true,
+    }
+    input: {
+        var o = {};
+        o[NaN] = 1;
+        o[0/0] = 2;
+        console.log(o[NaN], o[NaN]);
+    }
+    expect: {
+        var o = {
+            NaN: 1,
+            NaN: 2
+        };
+        console.log(o.NaN, o.NaN);
+    }
+    expect_stdout: "2 2"
+}
+
+join_object_assignments_null_0: {
+    options = {
+        join_vars: true,
+    }
+    input: {
+        var o = {};
+        o[null] = 1;
+        console.log(o[null]);
+    }
+    expect: {
+        var o = {};
+        o[null] = 1;
+        console.log(o[null]);
+    }
+    expect_stdout: "1"
+}
+
+join_object_assignments_null_1: {
+    options = {
+        evaluate: true,
+        join_vars: true,
+        properties: true,
+    }
+    input: {
+        var o = {};
+        o[null] = 1;
+        console.log(o[null]);
+    }
+    expect: {
+        var o = {
+            null: 1
+        };
+        console.log(o.null);
+    }
+    expect_stdout: "1"
+}
+
+join_object_assignments_void_0: {
+    options = {
+        evaluate: true,
+        join_vars: true,
+    }
+    input: {
+        var o = {};
+        o[void 0] = 1;
+        console.log(o[void 0]);
+    }
+    expect: {
+        var o = {
+            undefined: 1
+        };
+        console.log(o[void 0]);
+    }
+    expect_stdout: "1"
+}
+
+join_object_assignments_undefined_1: {
+    options = {
+        join_vars: true,
+    }
+    input: {
+        var o = {};
+        o[undefined] = 1;
+        console.log(o[undefined]);
+    }
+    expect: {
+        var o = {};
+        o[void 0] = 1;
+        console.log(o[void 0]);
+    }
+    expect_stdout: "1"
+}
+
+join_object_assignments_undefined_2: {
+    options = {
+        evaluate: true,
+        join_vars: true,
+        properties: true,
+    }
+    input: {
+        var o = {};
+        o[undefined] = 1;
+        console.log(o[undefined]);
+    }
+    expect: {
+        var o = {
+            undefined : 1
+        };
+        console.log(o[void 0]);
+    }
+    expect_stdout: "1"
+}
+
+join_object_assignments_Infinity: {
+    options = {
+        evaluate: true,
+        join_vars: true,
+        properties: true,
+    }
+    input: {
+        var o = {};
+        o[Infinity] = 1;
+        o[1/0] = 2;
+        o[-Infinity] = 3;
+        o[-1/0] = 4;
+        console.log(o[Infinity], o[1/0], o[-Infinity], o[-1/0]);
+    }
+    expect: {
+        var o = {
+            Infinity: 1,
+            Infinity: 2,
+            "-Infinity": 3,
+            "-Infinity": 4
+        };
+        console.log(o[1/0], o[1/0], o[-1/0], o[-1/0]);
+    }
+    expect_stdout: "2 2 4 4"
+}
+
+join_object_assignments_regex: {
+    options = {
+        evaluate: true,
+        join_vars: true,
+        properties: true,
+    }
+    input: {
+        var o = {};
+        o[/rx/] = 1;
+        console.log(o[/rx/]);
+    }
+    expect: {
+        var o = {
+            "/rx/": 1
+        };
+        console.log(o[/rx/]);
+    }
+    expect_stdout: "1"
+}
+
+issue_2816: {
+    options = {
+        join_vars: true,
+    }
+    input: {
+        "use strict";
+        var o = {
+            a: 1
+        };
+        o.b = 2;
+        o.a = 3;
+        o.c = 4;
+        console.log(o.a, o.b, o.c);
+    }
+    expect: {
+        "use strict";
+        var o = {
+            a: 1,
+            b: 2
+        };
+        o.a = 3;
+        o.c = 4;
+        console.log(o.a, o.b, o.c);
+    }
+    expect_stdout: "3 2 4"
+}
+
+issue_2893_1: {
+    options = {
+        join_vars: true,
+    }
+    input: {
+        var o = {
+            get a() {
+                return "PASS";
+            },
+        };
+        o.a = "FAIL";
+        console.log(o.a);
+    }
+    expect: {
+        var o = {
+            get a() {
+                return "PASS";
+            },
+        };
+        o.a = "FAIL";
+        console.log(o.a);
+    }
+    expect_stdout: "PASS"
+}
+
+issue_2893_2: {
+    options = {
+        join_vars: true,
+    }
+    input: {
+        var o = {
+            set a(v) {
+                this.b = v;
+            },
+            b: "FAIL",
+        };
+        o.a = "PASS";
+        console.log(o.b);
+    }
+    expect: {
+        var o = {
+            set a(v) {
+                this.b = v;
+            },
+            b: "FAIL",
+        };
+        o.a = "PASS";
+        console.log(o.b);
+    }
+    expect_stdout: "PASS"
+}
+
+issue_869_1: {
+    mangle = {
+        properties: {
+            reserved: [ "get" ]
+        },
+    }
+    input: {
+        var o = { p: "FAIL" };
+        Object.defineProperty(o, "p", {
+            get: function() {
+                return "PASS";
+            }
+        });
+        console.log(o.p);
+    }
+    expect: {
+        var o = { o: "FAIL" };
+        Object.defineProperty(o, "o", {
+            get: function() {
+                return "PASS";
+            }
+        });
+        console.log(o.o);
+    }
+    expect_stdout: "PASS"
+}
+
+issue_869_2: {
+    mangle = {
+        properties: {
+            reserved: [ "get" ]
+        },
+    }
+    input: {
+        var o = { p: "FAIL" };
+        Object.defineProperties(o, {
+            p: {
+                get: function() {
+                    return "PASS";
+                }
+            }
+        });
+        console.log(o.p);
+    }
+    expect: {
+        var o = { o: "FAIL" };
+        Object.defineProperties(o, {
+            o: {
+                get: function() {
+                    return "PASS";
+                }
+            }
+        });
+        console.log(o.o);
+    }
+    expect_stdout: "PASS"
+}
+
+issue_3188_1: {
+    options = {
+        collapse_vars: true,
+        inline: true,
+        properties: true,
+        reduce_vars: true,
+        side_effects: true,
+    }
+    input: {
+        (function() {
+            function f() {
+                console.log(this.p);
+            }
+            (function() {
+                var o = {
+                    p: "PASS",
+                    f: f
+                };
+                o.f();
+            })();
+        })();
+    }
+    expect: {
+        (function() {
+            function f() {
+                console.log(this.p);
+            }
+            ({
+                p: "PASS",
+                f: f
+            }).f();
+            var o;
+        })();
+    }
+    expect_stdout: "PASS"
+}
+
+issue_3188_2: {
+    options = {
+        collapse_vars: true,
+        inline: true,
+        properties: true,
+        reduce_vars: true,
+        side_effects: true,
+        unused: true,
+    }
+    input: {
+        (function() {
+            var f = function() {
+                console.log(this.p);
+            };
+            function g() {
+                var o = {
+                    p: "PASS",
+                    f: f
+                };
+                o.f();
+            }
+            g();
+        })();
+    }
+    expect: {
+        ({
+            p: "PASS",
+            f: function() {
+                console.log(this.p);
+            }
+        }).f();
+    }
+    expect_stdout: "PASS"
+}
+
+issue_3188_3: {
+    options = {
+        collapse_vars: true,
+        inline: true,
+        properties: true,
+        reduce_vars: true,
+        side_effects: true,
+    }
+    input: {
+        (function() {
+            function f() {
+                console.log(this[0]);
+            }
+            (function() {
+                var o = ["PASS", f];
+                o[1]();
+            })();
+        })();
+    }
+    expect: {
+        (function() {
+            function f() {
+                console.log(this[0]);
+            }
+            ["PASS", f][1]();
+            var o;
+        })();
+    }
+    expect_stdout: "PASS"
+}

test/compress/pure_funcs.js

@@ -293,3 +293,352 @@ unary: {
         bar();
     }
 }
+
+issue_2629_1: {
+    options = {
+        side_effects: true,
+    }
+    beautify = {
+        comments: "all",
+    }
+    input: {
+        /*@__PURE__*/ a();
+        /*@__PURE__*/ (b());
+        (/*@__PURE__*/ c)();
+        (/*@__PURE__*/ d());
+    }
+    expect_exact: [
+        "/* */c();",
+    ]
+}
+
+issue_2629_2: {
+    options = {
+        side_effects: true,
+    }
+    beautify = {
+        comments: "all",
+    }
+    input: {
+        /*@__PURE__*/ a(1)(2)(3);
+        /*@__PURE__*/ (b(1))(2)(3);
+        /*@__PURE__*/ (c(1)(2))(3);
+        /*@__PURE__*/ (d(1)(2)(3));
+        (/*@__PURE__*/ e)(1)(2)(3);
+        (/*@__PURE__*/ f(1))(2)(3);
+        (/*@__PURE__*/ g(1)(2))(3);
+        (/*@__PURE__*/ h(1)(2)(3));
+    }
+    expect_exact: [
+        "/* */e(1)(2)(3);",
+        "/* */f(1)(2)(3);",
+        "/* */g(1)(2)(3);",
+    ]
+}
+
+issue_2629_3: {
+    options = {
+        side_effects: true,
+    }
+    beautify = {
+        comments: "all",
+    }
+    input: {
+        /*@__PURE__*/ a.x(1).y(2).z(3);
+        /*@__PURE__*/ (b.x)(1).y(2).z(3);
+        /*@__PURE__*/ (c.x(1)).y(2).z(3);
+        /*@__PURE__*/ (d.x(1).y)(2).z(3);
+        /*@__PURE__*/ (e.x(1).y(2)).z(3);
+        /*@__PURE__*/ (f.x(1).y(2).z)(3);
+        /*@__PURE__*/ (g.x(1).y(2).z(3));
+        (/*@__PURE__*/ h).x(1).y(2).z(3);
+        (/*@__PURE__*/ i.x)(1).y(2).z(3);
+        (/*@__PURE__*/ j.x(1)).y(2).z(3);
+        (/*@__PURE__*/ k.x(1).y)(2).z(3);
+        (/*@__PURE__*/ l.x(1).y(2)).z(3);
+        (/*@__PURE__*/ m.x(1).y(2).z)(3);
+        (/*@__PURE__*/ n.x(1).y(2).z(3));
+    }
+    expect_exact: [
+        "/* */h.x(1).y(2).z(3);",
+        "/* */i.x(1).y(2).z(3);",
+        "/* */j.x(1).y(2).z(3);",
+        "/* */k.x(1).y(2).z(3);",
+        "/* */l.x(1).y(2).z(3);",
+        "/* */m.x(1).y(2).z(3);",
+    ]
+}
+
+issue_2629_4: {
+    options = {
+        side_effects: true,
+    }
+    input: {
+        (/*@__PURE__*/ x(), y());
+        (w(), /*@__PURE__*/ x(), y());
+    }
+    expect: {
+        y();
+        w(), y();
+    }
+}
+
+issue_2629_5: {
+    options = {
+        side_effects: true,
+    }
+    input: {
+        [ /*@__PURE__*/ x() ];
+        [ /*@__PURE__*/ x(), y() ];
+        [ w(), /*@__PURE__*/ x(), y() ];
+    }
+    expect: {
+        y();
+        w(), y();
+    }
+}
+
+issue_2638: {
+    options = {
+        side_effects: true,
+    }
+    beautify = {
+        comments: "all",
+    }
+    input: {
+        /*@__PURE__*/(g() || h())(x(), y());
+        (/*@__PURE__*/ (a() || b()))(c(), d());
+    }
+    expect_exact: [
+        "/* */x(),y();",
+        "/* */(a()||b())(c(),d());",
+    ]
+}
+
+issue_2705_1: {
+    options = {
+        side_effects: true,
+    }
+    beautify = {
+        comments: "all",
+    }
+    input: {
+        /*@__PURE__*/ new a();
+        /*@__PURE__*/ (new b());
+        new (/*@__PURE__*/ c)();
+        (/*@__PURE__*/ new d());
+    }
+    expect_exact: [
+        "new/* */c;",
+    ]
+}
+
+issue_2705_2: {
+    options = {
+        side_effects: true,
+    }
+    beautify = {
+        comments: "all",
+    }
+    input: {
+        /*@__PURE__*/ new a(1)(2)(3);
+        /*@__PURE__*/ new (b(1))(2)(3);
+        /*@__PURE__*/ new (c(1)(2))(3);
+        /*@__PURE__*/ new (d(1)(2)(3));
+        new (/*@__PURE__*/ e)(1)(2)(3);
+        (/*@__PURE__*/ new f(1))(2)(3);
+        (/*@__PURE__*/ new g(1)(2))(3);
+        (/*@__PURE__*/ new h(1)(2)(3));
+    }
+    expect_exact: [
+        "new/* */e(1)(2)(3);",
+        "/* */new f(1)(2)(3);",
+        "/* */new g(1)(2)(3);",
+    ]
+}
+
+issue_2705_3: {
+    options = {
+        side_effects: true,
+    }
+    beautify = {
+        comments: "all",
+    }
+    input: {
+        /*@__PURE__*/ new a.x(1).y(2).z(3);
+        /*@__PURE__*/ new (b.x)(1).y(2).z(3);
+        /*@__PURE__*/ new (c.x(1)).y(2).z(3);
+        /*@__PURE__*/ new (d.x(1).y)(2).z(3);
+        /*@__PURE__*/ new (e.x(1).y(2)).z(3);
+        /*@__PURE__*/ new (f.x(1).y(2).z)(3);
+        /*@__PURE__*/ new (g.x(1).y(2).z(3));
+        new (/*@__PURE__*/ h).x(1).y(2).z(3);
+        /* */ new (/*@__PURE__*/ i.x)(1).y(2).z(3);
+        (/*@__PURE__*/ new j.x(1)).y(2).z(3);
+        (/*@__PURE__*/ new k.x(1).y)(2).z(3);
+        (/*@__PURE__*/ new l.x(1).y(2)).z(3);
+        (/*@__PURE__*/ new m.x(1).y(2).z)(3);
+        (/*@__PURE__*/ new n.x(1).y(2).z(3));
+    }
+    expect_exact: [
+        "new/* */h.x(1).y(2).z(3);",
+        "/* */new/* */i.x(1).y(2).z(3);",
+        "/* */new j.x(1).y(2).z(3);",
+        "/* */new k.x(1).y(2).z(3);",
+        "/* */new l.x(1).y(2).z(3);",
+        "/* */new m.x(1).y(2).z(3);",
+    ]
+}
+
+issue_2705_4: {
+    options = {
+        side_effects: true,
+    }
+    input: {
+        (/*@__PURE__*/ new x(), y());
+        (w(), /*@__PURE__*/ new x(), y());
+    }
+    expect: {
+        y();
+        w(), y();
+    }
+}
+
+issue_2705_5: {
+    options = {
+        side_effects: true,
+    }
+    input: {
+        [ /*@__PURE__*/ new x() ];
+        [ /*@__PURE__*/ new x(), y() ];
+        [ w(), /*@__PURE__*/ new x(), y() ];
+    }
+    expect: {
+        y();
+        w(), y();
+    }
+}
+
+issue_2705_6: {
+    options = {
+        side_effects: true,
+    }
+    beautify = {
+        comments: "all",
+    }
+    input: {
+        /*@__PURE__*/new (g() || h())(x(), y());
+        /* */ new (/*@__PURE__*/ (a() || b()))(c(), d());
+    }
+    expect_exact: [
+        "/* */x(),y();",
+        "/* */new(/* */a()||b())(c(),d());",
+    ]
+}
+
+issue_3065_1: {
+    options = {
+        inline: true,
+        pure_funcs: [ "pureFunc" ],
+        reduce_vars: true,
+        side_effects: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        function modifyWrapper(a, f, wrapper) {
+            wrapper.a = a;
+            wrapper.f = f;
+            return wrapper;
+        }
+        function pureFunc(fun) {
+            return modifyWrapper(1, fun, function(a) {
+                return fun(a);
+            });
+        }
+        var unused = pureFunc(function(x) {
+            return x;
+        });
+    }
+    expect: {}
+}
+
+issue_3065_2: {
+    rename = true
+    options = {
+        inline: true,
+        pure_funcs: [ "pureFunc" ],
+        reduce_vars: true,
+        side_effects: true,
+        toplevel: true,
+        unused: true,
+    }
+    mangle = {
+        reserved: [ "pureFunc" ],
+        toplevel: true,
+    }
+    input: {
+        function modifyWrapper(a, f, wrapper) {
+            wrapper.a = a;
+            wrapper.f = f;
+            return wrapper;
+        }
+        function pureFunc(fun) {
+            return modifyWrapper(1, fun, function(a) {
+                return fun(a);
+            });
+        }
+        var unused = pureFunc(function(x) {
+            return x;
+        });
+    }
+    expect: {}
+}
+
+issue_3065_3: {
+    options = {
+        pure_funcs: [ "debug" ],
+        reduce_vars: true,
+        side_effects: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        function debug(msg) {
+            console.log(msg);
+        }
+        debug(function() {
+            console.log("PASS");
+            return "FAIL";
+        }());
+    }
+    expect: {
+        (function() {
+            console.log("PASS");
+        })();
+    }
+}
+
+issue_3065_4: {
+    options = {
+        pure_funcs: [ "debug" ],
+        reduce_vars: true,
+        side_effects: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        var debug = function(msg) {
+            console.log(msg);
+        };
+        debug(function() {
+            console.log("PASS");
+            return "FAIL";
+        }());
+    }
+    expect: {
+        (function() {
+            console.log("PASS");
+        })();
+    }
+}

test/compress/pure_getters.js

@@ -1,6 +1,7 @@
 strict: {
     options = {
         pure_getters: "strict",
+        reduce_funcs: false,
         reduce_vars: false,
         side_effects: true,
         toplevel: true,
@@ -30,6 +31,7 @@ strict: {
 strict_reduce_vars: {
     options = {
         pure_getters: "strict",
+        reduce_funcs: true,
         reduce_vars: true,
         side_effects: true,
         toplevel: true,
@@ -58,6 +60,7 @@ strict_reduce_vars: {
 unsafe: {
     options = {
         pure_getters: true,
+        reduce_funcs: false,
         reduce_vars: false,
         side_effects: true,
         toplevel: true,
@@ -84,6 +87,7 @@ unsafe: {
 unsafe_reduce_vars: {
     options = {
         pure_getters: true,
+        reduce_funcs: true,
         reduce_vars: true,
         side_effects: true,
         toplevel: true,
@@ -181,11 +185,12 @@ impure_getter_2: {
 
 issue_2110_1: {
     options = {
-        cascade: true,
+        collapse_vars: true,
         pure_getters: "strict",
+        reduce_funcs: true,
+        reduce_vars: true,
         sequences: true,
         side_effects: true,
-        reduce_vars: true,
         unused: true,
     }
     input: {
@@ -215,6 +220,7 @@ issue_2110_2: {
     options = {
         collapse_vars: true,
         pure_getters: "strict",
+        reduce_funcs: true,
         reduce_vars: true,
         unused: true,
     }
@@ -247,6 +253,7 @@ set_immutable_1: {
         collapse_vars: true,
         evaluate: true,
         pure_getters: "strict",
+        reduce_funcs: true,
         reduce_vars: true,
         toplevel: true,
         unused: true,
@@ -267,9 +274,10 @@ set_immutable_1: {
 
 set_immutable_2: {
     options = {
-        cascade: true,
+        collapse_vars: true,
         conditionals: true,
         pure_getters: "strict",
+        reduce_funcs: true,
         reduce_vars: true,
         sequences: true,
         side_effects: true,
@@ -293,6 +301,7 @@ set_immutable_3: {
         collapse_vars: true,
         evaluate: true,
         pure_getters: "strict",
+        reduce_funcs: true,
         reduce_vars: true,
         toplevel: true,
         unused: true,
@@ -315,9 +324,10 @@ set_immutable_3: {
 
 set_immutable_4: {
     options = {
-        cascade: true,
+        collapse_vars: true,
         conditionals: true,
         pure_getters: "strict",
+        reduce_funcs: true,
         reduce_vars: true,
         sequences: true,
         side_effects: true,
@@ -338,11 +348,63 @@ set_immutable_4: {
     expect_stdout: true
 }
 
+set_immutable_5: {
+    options = {
+        collapse_vars: true,
+        conditionals: true,
+        evaluate: true,
+        pure_getters: "strict",
+        reduce_funcs: true,
+        reduce_vars: true,
+        side_effects: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        "use strict";
+        var a = 1;
+        a.foo += "";
+        if (a.foo) console.log("FAIL");
+        else console.log("PASS");
+    }
+    expect: {
+        "use strict";
+        1..foo += "";
+        1..foo ? console.log("FAIL") : console.log("PASS");
+    }
+    expect_stdout: true
+}
+
+set_immutable_6: {
+    options = {
+        collapse_vars: true,
+        conditionals: true,
+        evaluate: true,
+        pure_getters: "strict",
+        reduce_funcs: true,
+        reduce_vars: true,
+        side_effects: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        var a = 1;
+        a.foo += "";
+        if (a.foo) console.log("FAIL");
+        else console.log("PASS");
+    }
+    expect: {
+        1..foo ? console.log("FAIL") : console.log("PASS");
+    }
+    expect_stdout: true
+}
+
 set_mutable_1: {
     options = {
         collapse_vars: true,
         evaluate: true,
         pure_getters: "strict",
+        reduce_funcs: true,
         reduce_vars: true,
         unused: true,
     }
@@ -364,9 +426,10 @@ set_mutable_1: {
 
 set_mutable_2: {
     options = {
-        cascade: true,
+        collapse_vars: true,
         conditionals: true,
         pure_getters: "strict",
+        reduce_funcs: true,
         reduce_vars: true,
         sequences: true,
         side_effects: true,
@@ -388,7 +451,7 @@ set_mutable_2: {
 
 issue_2313_1: {
     options = {
-        cascade: true,
+        collapse_vars: true,
         conditionals: true,
         pure_getters: "strict",
         sequences: true,
@@ -434,7 +497,7 @@ issue_2313_1: {
 
 issue_2313_2: {
     options = {
-        cascade: true,
+        collapse_vars: true,
         conditionals: true,
         pure_getters: true,
         sequences: true,
@@ -599,3 +662,502 @@ issue_2313_6: {
         x();
     }
 }
+
+issue_2678: {
+    options = {
+        pure_getters: "strict",
+        side_effects: true,
+    }
+    input: {
+        var a = 1, c = "FAIL";
+        (function f() {
+            (a-- && f()).p;
+            return {
+                get p() {
+                    c = "PASS";
+                }
+            };
+        })();
+        console.log(c);
+    }
+    expect: {
+        var a = 1, c = "FAIL";
+        (function f() {
+            (a-- && f()).p;
+            return {
+                get p() {
+                    c = "PASS";
+                }
+            };
+        })();
+        console.log(c);
+    }
+    expect_stdout: "PASS"
+}
+
+issue_2838: {
+    options = {
+        pure_getters: true,
+        side_effects: true,
+    }
+    input: {
+        function f(a, b) {
+            (a || b).c = "PASS";
+            (function() {
+                return f(a, b);
+            }).prototype.foo = "bar";
+        }
+        var o = {};
+        f(null, o);
+        console.log(o.c);
+    }
+    expect: {
+        function f(a, b) {
+            (a || b).c = "PASS";
+        }
+        var o = {};
+        f(null, o);
+        console.log(o.c);
+    }
+    expect_stdout: "PASS"
+}
+
+issue_2938_1: {
+    options = {
+        pure_getters: true,
+        unused: true,
+    }
+    input: {
+        function f(a) {
+            a.b = "PASS";
+        }
+        var o = {};
+        f(o);
+        console.log(o.b);
+    }
+    expect: {
+        function f(a) {
+            a.b = "PASS";
+        }
+        var o = {};
+        f(o);
+        console.log(o.b);
+    }
+    expect_stdout: "PASS"
+}
+
+issue_2938_2: {
+    options = {
+        pure_getters: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        var Parser = function Parser() {};
+        var p = Parser.prototype;
+        p.initialContext = function initialContext() {
+            console.log("PASS");
+        };
+        p.braceIsBlock = function() {};
+        (new Parser).initialContext();
+    }
+    expect: {
+        var Parser = function() {};
+        var p = Parser.prototype;
+        p.initialContext = function() {
+            console.log("PASS");
+        };
+        p.braceIsBlock = function() {};
+        (new Parser).initialContext();
+    }
+    expect_stdout: "PASS"
+}
+
+issue_2938_3: {
+    options = {
+        pure_getters: true,
+        side_effects: true,
+        unused: true,
+    }
+    input: {
+        function f(a) {
+            var unused = a.a;
+            a.b = "PASS";
+            a.c;
+        }
+        var o = {};
+        o.d;
+        f(o);
+        console.log(o.b);
+    }
+    expect: {
+        function f(a) {
+            a.b = "PASS";
+        }
+        var o = {};
+        f(o);
+        console.log(o.b);
+    }
+    expect_stdout: "PASS"
+}
+
+issue_2938_4: {
+    options = {
+        pure_getters: true,
+        side_effects: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        var Parser = function Parser() {};
+        var p = Parser.prototype;
+        var unused = p.x;
+        p.initialContext = function initialContext() {
+            p.y;
+            console.log("PASS");
+        };
+        p.braceIsBlock = function() {};
+        (new Parser).initialContext();
+    }
+    expect: {
+        var Parser = function() {};
+        var p = Parser.prototype;
+        p.initialContext = function() {
+            console.log("PASS");
+        };
+        p.braceIsBlock = function() {};
+        (new Parser).initialContext();
+    }
+    expect_stdout: "PASS"
+}
+
+collapse_vars_1_true: {
+    options = {
+        collapse_vars: true,
+        pure_getters: true,
+        unused: true,
+    }
+    input: {
+        function f(a, b) {
+            for (;;) {
+                var c = a.g();
+                var d = b.p;
+                if (c || d) break;
+            }
+        }
+    }
+    expect: {
+        function f(a, b) {
+            for (;;) {
+                if (a.g() || b.p) break;
+            }
+        }
+    }
+}
+
+collapse_vars_1_false: {
+    options = {
+        collapse_vars: true,
+        pure_getters: false,
+        unused: true,
+    }
+    input: {
+        function f(a, b) {
+            for (;;) {
+                var c = a.g();
+                var d = b.p;
+                if (c || d) break;
+            }
+        }
+    }
+    expect: {
+        function f(a, b) {
+            for (;;) {
+                var c = a.g();
+                var d = b.p;
+                if (c || d) break;
+            }
+        }
+    }
+}
+
+collapse_vars_1_strict: {
+    options = {
+        collapse_vars: true,
+        pure_getters: "strict",
+        unused: true,
+    }
+    input: {
+        function f(a, b) {
+            for (;;) {
+                var c = a.g();
+                var d = b.p;
+                if (c || d) break;
+            }
+        }
+    }
+    expect: {
+        function f(a, b) {
+            for (;;) {
+                var c = a.g();
+                var d = b.p;
+                if (c || d) break;
+            }
+        }
+    }
+}
+
+collapse_vars_2_true: {
+    options = {
+        collapse_vars: true,
+        pure_getters: true,
+        reduce_vars: true,
+    }
+    input: {
+        function f() {
+            function g() {}
+            g.a = function() {};
+            g.b = g.a;
+            return g;
+        }
+    }
+    expect: {
+        function f() {
+            function g() {}
+            g.b = g.a = function() {};
+            return g;
+        }
+    }
+}
+
+collapse_vars_2_false: {
+    options = {
+        collapse_vars: true,
+        pure_getters: false,
+        reduce_vars: true,
+    }
+    input: {
+        function f() {
+            function g() {}
+            g.a = function() {};
+            g.b = g.a;
+            return g;
+        }
+    }
+    expect: {
+        function f() {
+            function g() {}
+            g.a = function() {};
+            g.b = g.a;
+            return g;
+        }
+    }
+}
+
+collapse_vars_2_strict: {
+    options = {
+        collapse_vars: true,
+        pure_getters: "strict",
+        reduce_vars: true,
+    }
+    input: {
+        function f() {
+            function g() {}
+            g.a = function() {};
+            g.b = g.a;
+            return g;
+        }
+    }
+    expect: {
+        function f() {
+            function g() {}
+            g.b = g.a = function() {};
+            return g;
+        }
+    }
+}
+
+collapse_rhs_true: {
+    options = {
+        collapse_vars: true,
+        pure_getters: true,
+    }
+    input: {
+        console.log((42..length = "PASS", "PASS"));
+        console.log(("foo".length = "PASS", "PASS"));
+        console.log((false.length = "PASS", "PASS"));
+        console.log((function() {}.length = "PASS", "PASS"));
+        console.log(({
+            get length() {
+                return "FAIL";
+            }
+        }.length = "PASS", "PASS"));
+    }
+    expect: {
+        console.log(42..length = "PASS");
+        console.log("foo".length = "PASS");
+        console.log(false.length = "PASS");
+        console.log(function() {}.length = "PASS");
+        console.log({
+            get length() {
+                return "FAIL";
+            }
+        }.length = "PASS");
+    }
+    expect_stdout: [
+        "PASS",
+        "PASS",
+        "PASS",
+        "PASS",
+        "PASS",
+    ]
+}
+
+collapse_rhs_false: {
+    options = {
+        collapse_vars: true,
+        pure_getters: false,
+    }
+    input: {
+        console.log((42..length = "PASS", "PASS"));
+        console.log(("foo".length = "PASS", "PASS"));
+        console.log((false.length = "PASS", "PASS"));
+        console.log((function() {}.length = "PASS", "PASS"));
+        console.log(({
+            get length() {
+                return "FAIL";
+            }
+        }.length = "PASS", "PASS"));
+    }
+    expect: {
+        console.log(42..length = "PASS");
+        console.log("foo".length = "PASS");
+        console.log(false.length = "PASS");
+        console.log(function() {}.length = "PASS");
+        console.log({
+            get length() {
+                return "FAIL";
+            }
+        }.length = "PASS");
+    }
+    expect_stdout: [
+        "PASS",
+        "PASS",
+        "PASS",
+        "PASS",
+        "PASS",
+    ]
+}
+
+collapse_rhs_strict: {
+    options = {
+        collapse_vars: true,
+        pure_getters: "strict",
+    }
+    input: {
+        console.log((42..length = "PASS", "PASS"));
+        console.log(("foo".length = "PASS", "PASS"));
+        console.log((false.length = "PASS", "PASS"));
+        console.log((function() {}.length = "PASS", "PASS"));
+        console.log(({
+            get length() {
+                return "FAIL";
+            }
+        }.length = "PASS", "PASS"));
+    }
+    expect: {
+        console.log(42..length = "PASS");
+        console.log("foo".length = "PASS");
+        console.log(false.length = "PASS");
+        console.log(function() {}.length = "PASS");
+        console.log({
+            get length() {
+                return "FAIL";
+            }
+        }.length = "PASS");
+    }
+    expect_stdout: [
+        "PASS",
+        "PASS",
+        "PASS",
+        "PASS",
+        "PASS",
+    ]
+}
+
+collapse_rhs_setter: {
+    options = {
+        collapse_vars: true,
+        pure_getters: "strict",
+    }
+    input: {
+        try {
+            console.log(({
+                set length(v) {
+                    throw "PASS";
+                }
+            }.length = "FAIL", "FAIL"));
+        } catch (e) {
+            console.log(e);
+        }
+    }
+    expect: {
+        try {
+            console.log({
+                set length(v) {
+                    throw "PASS";
+                }
+            }.length = "FAIL");
+        } catch (e) {
+            console.log(e);
+        }
+    }
+    expect_stdout: "PASS"
+}
+
+collapse_rhs_call: {
+    options = {
+        collapse_vars: true,
+        passes: 2,
+        pure_getters: "strict",
+        reduce_vars: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        var o = {};
+        function f() {
+            console.log("PASS");
+        }
+        o.f = f;
+        f();
+    }
+    expect: {
+        ({}.f = function() {
+            console.log("PASS");
+        })();
+    }
+    expect_stdout: "PASS"
+}
+
+collapse_rhs_lhs: {
+    options = {
+        collapse_vars: true,
+        pure_getters: true,
+    }
+    input: {
+        function f(a, b) {
+            a.b = b, b += 2;
+            console.log(a.b, b);
+        }
+        f({}, 1);
+    }
+    expect: {
+        function f(a, b) {
+            a.b = b, b += 2;
+            console.log(a.b, b);
+        }
+        f({}, 1);
+    }
+    expect_stdout: "1 3"
+}

test/compress/regexp.js

@@ -0,0 +1,37 @@
+regexp_simple: {
+    input: {
+        /rx/ig
+    }
+    expect_exact: "/rx/gi;"
+}
+
+regexp_slashes: {
+    input: {
+        /\\\/rx\/\\/ig
+    }
+    expect_exact: "/\\\\\\/rx\\/\\\\/gi;"
+}
+
+regexp_1: {
+    input: {
+        console.log(JSON.stringify("COMPASS? Overpass.".match(/([Sap]+)/ig)));
+    }
+    expect: {
+        console.log(JSON.stringify("COMPASS? Overpass.".match(/([Sap]+)/gi)));
+    }
+    expect_stdout: '["PASS","pass"]'
+}
+
+regexp_2: {
+    options = {
+        evaluate: true,
+        unsafe: true,
+    }
+    input: {
+        console.log(JSON.stringify("COMPASS? Overpass.".match(new RegExp("([Sap]+)", "ig"))));
+    }
+    expect: {
+        console.log(JSON.stringify("COMPASS? Overpass.".match(/([Sap]+)/gi)));
+    }
+    expect_stdout: '["PASS","pass"]'
+}

test/compress/rename.js

@@ -0,0 +1,536 @@
+mangle_catch: {
+    rename = true
+    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: {
+    rename = true
+    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: {
+    rename = true
+    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: {
+    rename = true
+    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: {
+    rename = true
+    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: {
+    rename = true
+    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: {
+    rename = true
+    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: {
+    rename = true
+    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: {
+    rename = true
+    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: {
+    rename = true
+    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: {
+    rename = true
+    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: {
+    rename = true
+    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: {
+    rename = true
+    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: {
+    rename = true
+    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: {
+    rename = true
+    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: {
+    rename = true
+    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"
+}
+
+issue_2120_1: {
+    rename = true
+    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: {
+    rename = true
+    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"
+}
+function_iife_catch: {
+    rename = true
+    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: {
+    rename = true
+    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: {
+    rename = true
+    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: {
+    rename = true
+    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/return_undefined.js

@@ -1,25 +1,24 @@
 return_undefined: {
     options = {
-        sequences     : false,
-        if_return     : true,
-        evaluate      : true,
-        dead_code     : true,
-        conditionals  : true,
-        comparisons   : true,
         booleans: true,
-        unused        : true,
+        comparisons: true,
-        side_effects  : true,
+        conditionals: true,
-        properties    : true,
+        dead_code: true,
         drop_debugger: true,
-        loops         : true,
+        evaluate: true,
         hoist_funs: true,
+        hoist_vars: true,
+        if_return: true,
+        join_vars: true,
         keep_fargs: true,
         keep_fnames: false,
-        hoist_vars    : true,
+        loops: true,
-        join_vars     : true,
+        negate_iife: true,
-        cascade       : true,
+        properties: true,
-        negate_iife   : true
+        sequences: false,
-    };
+        side_effects: true,
+        unused: true,
+    }
     input: {
         function f0() {
         }
@@ -122,3 +121,25 @@ return_undefined: {
         }
     }
 }
+
+return_void: {
+    options = {
+        if_return: true,
+        inline: true,
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        function f() {
+            function g() {
+                h();
+            }
+            return g();
+        }
+    }
+    expect: {
+        function f() {
+            h();
+        }
+    }
+}

test/compress/sequences.js

@@ -1,7 +1,7 @@
 make_sequences_1: {
     options = {
-        sequences: true
+        sequences: true,
-    };
+    }
     input: {
         foo();
         bar();
@@ -14,8 +14,8 @@ make_sequences_1: {
 
 make_sequences_2: {
     options = {
-        sequences: true
+        sequences: true,
-    };
+    }
     input: {
         if (boo) {
             foo();
@@ -35,8 +35,8 @@ make_sequences_2: {
 
 make_sequences_3: {
     options = {
-        sequences: true
+        sequences: true,
-    };
+    }
     input: {
         function f() {
             foo();
@@ -61,8 +61,8 @@ make_sequences_3: {
 
 make_sequences_4: {
     options = {
-        sequences: true
+        sequences: true,
-    };
+    }
     input: {
         x = 5;
         if (y) z();
@@ -90,7 +90,9 @@ make_sequences_4: {
 }
 
 lift_sequences_1: {
-    options = { sequences: true };
+    options = {
+        sequences: true,
+    }
     input: {
         var foo, x, y, bar;
         foo = !(x(), y(), bar());
@@ -102,7 +104,10 @@ lift_sequences_1: {
 }
 
 lift_sequences_2: {
-    options = { sequences: true, evaluate: true };
+    options = {
+        evaluate: true,
+        sequences: true,
+    }
     input: {
         var foo = 1, bar;
         foo.x = (foo = {}, 10);
@@ -119,7 +124,10 @@ lift_sequences_2: {
 }
 
 lift_sequences_3: {
-    options = { sequences: true, conditionals: true };
+    options = {
+        conditionals: true,
+        sequences: true,
+    }
     input: {
         var x, foo, bar, baz;
         x = (foo(), bar(), baz()) ? 10 : 20;
@@ -131,7 +139,9 @@ lift_sequences_3: {
 }
 
 lift_sequences_4: {
-    options = { side_effects: true };
+    options = {
+        side_effects: true,
+    }
     input: {
         var x, foo, bar, baz;
         x = (foo, bar, baz);
@@ -160,7 +170,9 @@ lift_sequences_5: {
 }
 
 for_sequences: {
-    options = { sequences: true };
+    options = {
+        sequences: true,
+    }
     input: {
         // 1
         foo();
@@ -203,7 +215,7 @@ for_sequences: {
 limit_1: {
     options = {
         sequences: 3,
-    };
+    }
     input: {
         a;
         b;
@@ -228,7 +240,7 @@ limit_1: {
 limit_2: {
     options = {
         sequences: 3,
-    };
+    }
     input: {
         a, b;
         c, d;
@@ -246,19 +258,18 @@ limit_2: {
 
 negate_iife_for: {
     options = {
-        sequences: true,
         negate_iife: true,
-    };
+        sequences: true,
+    }
     input: {
         (function() {})();
         for (i = 0; i < 5; i++) console.log(i);
-
         (function() {})();
-        for (; i < 5; i++) console.log(i);
+        for (; i < 10; i++) console.log(i);
     }
     expect: {
         for (!function() {}(), i = 0; i < 5; i++) console.log(i);
-        for (function() {}(); i < 5; i++) console.log(i);
+        for (!function() {}(); i < 10; i++) console.log(i);
     }
     expect_stdout: true
 }
@@ -266,7 +277,7 @@ negate_iife_for: {
 iife: {
     options = {
         sequences: true,
-    };
+    }
     input: {
         x = 42;
         (function a() {})();
@@ -289,7 +300,7 @@ unsafe_undefined: {
         if_return: true,
         sequences: true,
         side_effects: true,
-        unsafe: true,
+        unsafe_undefined: true,
     }
     input: {
         function f(undefined) {
@@ -318,7 +329,7 @@ unsafe_undefined: {
 
 issue_1685: {
     options = {
-        cascade: true,
+        collapse_vars: true,
         side_effects: true,
     }
     input: {
@@ -342,7 +353,7 @@ issue_1685: {
 
 func_def_1: {
     options = {
-        cascade: true,
+        collapse_vars: true,
         side_effects: true,
     }
     input: {
@@ -362,7 +373,7 @@ func_def_1: {
 
 func_def_2: {
     options = {
-        cascade: true,
+        collapse_vars: true,
         side_effects: true,
     }
     input: {
@@ -380,7 +391,7 @@ func_def_2: {
 
 func_def_3: {
     options = {
-        cascade: true,
+        collapse_vars: true,
         side_effects: true,
     }
     input: {
@@ -402,7 +413,7 @@ func_def_3: {
 
 func_def_4: {
     options = {
-        cascade: true,
+        collapse_vars: true,
         side_effects: true,
     }
     input: {
@@ -428,7 +439,7 @@ func_def_4: {
 
 func_def_5: {
     options = {
-        cascade: true,
+        collapse_vars: true,
         side_effects: true,
     }
     input: {
@@ -635,7 +646,7 @@ side_effects: {
 
 side_effects_cascade_1: {
     options = {
-        cascade: true,
+        collapse_vars: true,
         conditionals: true,
         sequences: true,
         side_effects: true,
@@ -656,7 +667,7 @@ side_effects_cascade_1: {
 
 side_effects_cascade_2: {
     options = {
-        cascade: true,
+        collapse_vars: true,
         side_effects: true,
     }
     input: {
@@ -669,8 +680,7 @@ side_effects_cascade_2: {
     }
     expect: {
         function f(a, b) {
-            b = a,
+            !(b = a) + (b += a) || (b += a),
-            !a + (b += a) || (b += a),
             b = a;
         }
     }
@@ -678,7 +688,7 @@ side_effects_cascade_2: {
 
 side_effects_cascade_3: {
     options = {
-        cascade: true,
+        collapse_vars: true,
         conditionals: true,
         side_effects: true,
     }
@@ -693,14 +703,14 @@ side_effects_cascade_3: {
     expect: {
         function f(a, b) {
             !(b += a) && ((b = a) || (b -= a, b ^= a)),
-            --a;
+            a--;
         }
     }
 }
 
 issue_27: {
     options = {
-        cascade: true,
+        collapse_vars: true,
         passes: 2,
         sequences: true,
         side_effects: true,
@@ -723,7 +733,7 @@ issue_27: {
 issue_2062: {
     options = {
         booleans: true,
-        cascade: true,
+        collapse_vars: true,
         conditionals: true,
         side_effects: true,
     }
@@ -742,7 +752,7 @@ issue_2062: {
 
 issue_2313: {
     options = {
-        cascade: true,
+        collapse_vars: true,
         sequences: true,
         side_effects: true,
     }
@@ -780,3 +790,157 @@ issue_2313: {
     }
     expect_stdout: "2 1"
 }
+
+cascade_assignment_in_return: {
+    options = {
+        collapse_vars: true,
+        unused: true,
+    }
+    input: {
+        function f(a, b) {
+            return a = x(), b(a);
+        }
+    }
+    expect: {
+        function f(a, b) {
+            return b(x());
+        }
+    }
+}
+
+hoist_defun: {
+    options = {
+        join_vars: true,
+        sequences: true,
+    }
+    input: {
+        x();
+        function f() {}
+        y();
+    }
+    expect: {
+        function f() {}
+        x(), y();
+    }
+}
+
+hoist_decl: {
+    options = {
+        join_vars: true,
+        sequences: true,
+    }
+    input: {
+        var a;
+        w();
+        var b = x();
+        y();
+        for (var c; 0;) z();
+        var d;
+    }
+    expect: {
+        var a;
+        w();
+        var b = x(), c, d;
+        for (y(); 0;) z();
+    }
+}
+
+for_init_var: {
+    options = {
+        join_vars: true,
+        unused: false,
+    }
+    input: {
+        var a = "PASS";
+        (function() {
+            var b = 42;
+            for (var c = 5; c > 0;) c--;
+            a = "FAIL";
+            var a;
+        })();
+        console.log(a);
+    }
+    expect: {
+        var a = "PASS";
+        (function() {
+            for (var b = 42, c = 5, a; c > 0;) c--;
+            a = "FAIL";
+        })();
+        console.log(a);
+    }
+    expect_stdout: "PASS"
+}
+
+forin: {
+    options = {
+        sequences: true,
+    }
+    input: {
+        var o = [];
+        o.push("PASS");
+        for (var a in o)
+            console.log(o[a]);
+    }
+    expect: {
+        var o = [];
+        for (var a in o.push("PASS"), o)
+            console.log(o[a]);
+    }
+    expect_stdout: "PASS"
+}
+
+call: {
+    options = {
+        sequences: true,
+    }
+    input: {
+        var a = function() {
+            return this;
+        }();
+        function b() {
+            console.log("foo");
+        }
+        b.c = function() {
+            console.log(this === b ? "bar" : "baz");
+        };
+        (a, b)();
+        (a, b.c)();
+        (a, function() {
+            console.log(this === a);
+        })();
+        new (a, b)();
+        new (a, b.c)();
+        new (a, function() {
+            console.log(this === a);
+        })();
+    }
+    expect: {
+        var a = function() {
+            return this;
+        }();
+        function b() {
+            console.log("foo");
+        }
+        b.c = function() {
+            console.log(this === b ? "bar" : "baz");
+        },
+        a, b(),
+        (a, b.c)(),
+        a, function() {
+            console.log(this === a);
+        }(),
+        a, new b(),
+        a, new b.c(),
+        a, new function() {
+            console.log(this === a);
+        }();
+    }
+    expect_stdout: [
+        "foo",
+        "baz",
+        "true",
+        "foo",
+        "baz",
+        "false",
+    ]
+}

test/compress/string-literal.js

@@ -14,6 +14,13 @@ issue_1929: {
         function f(s) {
             return s.split(/[\\/]/);
         }
+        console.log(JSON.stringify(f("A/B\\C\\D/E\\F")));
     }
-    expect_exact: "function f(s){return s.split(/[\\\\/]/)}"
+    expect: {
+        function f(s) {
+            return s.split(/[\\/]/);
+        }
+        console.log(JSON.stringify(f("A/B\\C\\D/E\\F")));
+    }
+    expect_stdout: '["A","B","C","D","E","F"]'
 }

test/compress/switch.js

@@ -714,6 +714,7 @@ issue_1705_2: {
     options = {
         dead_code: true,
         evaluate: true,
+        reduce_funcs: true,
         reduce_vars: true,
         sequences: true,
         side_effects: true,
@@ -816,3 +817,50 @@ issue_1758: {
     }
     expect_stdout: "0 3"
 }
+
+issue_2535: {
+    options = {
+        dead_code: true,
+        evaluate: true,
+        switches: true,
+    }
+    input: {
+        switch(w(), 42) {
+            case 13: x();
+            case 42: y();
+            default: z();
+        }
+    }
+    expect: {
+        w(), 42;
+        42;
+        y();
+        z();
+    }
+}
+
+issue_1750: {
+    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;
+        true;
+        a, true;
+        b = 2;
+        console.log(a, b);
+    }
+    expect_stdout: "0 2"
+}

test/compress/transform.js

@@ -45,9 +45,9 @@ condition_evaluate: {
         if (void 0 == null);
     }
     expect: {
-        while (!1);
+        while (0);
-        for (; !0;);
+        for (; 1;);
-        if (!0);
+        if (1);
     }
 }
 
@@ -59,7 +59,7 @@ if_else_empty: {
         if ({} ? a : b); else {}
     }
     expect: {
-        !{} ? b : a;
+        ({}), a;
     }
 }
 
@@ -68,6 +68,7 @@ label_if_break: {
         conditionals: true,
         dead_code: true,
         evaluate: true,
+        side_effects: true,
     }
     input: {
         L: if (true) {
@@ -103,6 +104,7 @@ if_return: {
         conditionals: true,
         if_return: true,
         sequences: true,
+        side_effects: true,
     }
     input: {
         function f(w, x, y, z) {
@@ -123,7 +125,7 @@ if_return: {
                 if (w) {
                     if (y) return;
                 } else if (z) return;
-                return x == y || (x && w(), y && z(), !0);
+                return x == y || (x && w(), y && z()), !0;
             }
         }
     }

test/compress/typeof.js

@@ -1,7 +1,8 @@
 typeof_evaluation: {
     options = {
-        evaluate: true
+        evaluate: true,
-    };
+        typeofs: true,
+    }
     input: {
         a = typeof 1;
         b = typeof 'test';
@@ -27,10 +28,10 @@ typeof_evaluation: {
 typeof_in_boolean_context: {
     options = {
         booleans: true,
-        evaluate     : true,
         conditionals: true,
+        evaluate: true,
         side_effects: true,
-    };
+    }
     input: {
         function f1(x) { return typeof x ? "yes" : "no"; }
         function f2() { return typeof g()? "Yes" : "No"; }
@@ -44,7 +45,7 @@ typeof_in_boolean_context: {
         function f2() { return g(), "Yes"; }
         foo();
         console.log(1);
-        var a = !(console.log(2), !0);
+        var a = !(console.log(2), 1);
         foo();
     }
 }
@@ -57,6 +58,240 @@ issue_1668: {
         if (typeof bar);
     }
     expect: {
-        if (!0);
+        if (1);
     }
 }
+
+typeof_defun_1: {
+    options = {
+        evaluate: true,
+        inline: true,
+        passes: 2,
+        reduce_vars: true,
+        side_effects: true,
+        toplevel: true,
+        typeofs: true,
+        unused: true,
+    }
+    input: {
+        function f() {
+            console.log("YES");
+        }
+        function g() {
+            h = 42;
+            console.log("NOPE");
+        }
+        function h() {
+            console.log("YUP");
+        }
+        g = 42;
+        "function" == typeof f && f();
+        "function" == typeof g && g();
+        "function" == typeof h && h();
+    }
+    expect: {
+        function h() {
+            console.log("YUP");
+        }
+        console.log("YES");
+        h();
+    }
+    expect_stdout: [
+        "YES",
+        "YUP",
+    ]
+}
+
+typeof_defun_2: {
+    options = {
+        evaluate: true,
+        reduce_vars: true,
+        toplevel: true,
+        typeofs: true,
+    }
+    input: {
+        var f = function() {
+            console.log(x);
+        };
+        var x = 0;
+        x++ < 2 && typeof f == "function" && f();
+        x++ < 2 && typeof f == "function" && f();
+        x++ < 2 && typeof f == "function" && f();
+    }
+    expect: {
+        var f = function() {
+            console.log(x);
+        };
+        var x = 0;
+        x++ < 2 && f();
+        x++ < 2 && f();
+        x++ < 2 && f();
+    }
+    expect_stdout: [
+        "1",
+        "2",
+    ]
+}
+
+duplicate_defun_arg_name: {
+    options = {
+        evaluate: true,
+        reduce_vars: true,
+        typeofs: true,
+    }
+    input: {
+        function long_name(long_name) {
+            return typeof long_name;
+        }
+        console.log(typeof long_name, long_name());
+    }
+    expect: {
+        function long_name(long_name) {
+            return typeof long_name;
+        }
+        console.log(typeof long_name, long_name());
+    }
+    expect_stdout: "function undefined"
+}
+
+duplicate_lambda_arg_name: {
+    options = {
+        evaluate: true,
+        reduce_vars: true,
+        typeofs: true,
+    }
+    input: {
+        console.log(function long_name(long_name) {
+            return typeof long_name;
+        }());
+    }
+    expect: {
+        console.log(function long_name(long_name) {
+            return typeof long_name;
+        }());
+    }
+    expect_stdout: "undefined"
+}
+
+issue_2728_1: {
+    options = {
+        evaluate: true,
+        reduce_vars: true,
+        typeofs: true,
+    }
+    input: {
+        (function arguments() {
+            console.log(typeof arguments);
+        })();
+    }
+    expect: {
+        (function arguments() {
+            console.log(typeof arguments);
+        })();
+    }
+    expect_stdout: "object"
+}
+
+issue_2728_2: {
+    options = {
+        evaluate: true,
+        reduce_vars: true,
+        typeofs: true,
+    }
+    input: {
+        function arguments() {
+            return typeof arguments;
+        }
+        console.log(typeof arguments, arguments());
+    }
+    expect: {
+        function arguments() {
+            return typeof arguments;
+        }
+        console.log(typeof arguments, arguments());
+    }
+    expect_stdout: "function object"
+}
+
+issue_2728_3: {
+    options = {
+        evaluate: true,
+        reduce_vars: true,
+        typeofs: true,
+    }
+    input: {
+        (function() {
+            function arguments() {
+            }
+            console.log(typeof arguments);
+        })();
+    }
+    expect: {
+        (function() {
+            function arguments() {
+            }
+            console.log("function");
+        })();
+    }
+    expect_stdout: "function"
+}
+
+issue_2728_4: {
+    options = {
+        evaluate: true,
+        reduce_vars: true,
+        toplevel: true,
+        typeofs: true,
+    }
+    input: {
+        function arguments() {
+        }
+        console.log(typeof arguments);
+    }
+    expect: {
+        function arguments() {
+        }
+        console.log("function");
+    }
+    expect_stdout: "function"
+}
+
+issue_2728_5: {
+    options = {
+        evaluate: true,
+        reduce_vars: true,
+        typeofs: true,
+    }
+    input: {
+        (function arguments(arguments) {
+            console.log(typeof arguments);
+        })();
+    }
+    expect: {
+        (function arguments(arguments) {
+            console.log(typeof arguments);
+        })();
+    }
+    expect_stdout: "undefined"
+}
+
+issue_2728_6: {
+    options = {
+        evaluate: true,
+        reduce_vars: true,
+        typeofs: true,
+    }
+    input: {
+        function arguments(arguments) {
+            return typeof arguments;
+        }
+        console.log(typeof arguments, arguments());
+    }
+    expect: {
+        function arguments(arguments) {
+            return typeof arguments;
+        }
+        console.log(typeof arguments, arguments());
+    }
+    expect_stdout: "function undefined"
+}