v2.8.29

fixes #2040

.travis.yml

@@ -1,5 +1,4 @@
 language: node_js
-before_install: "npm install -g npm"
 node_js:
     - "0.10"
     - "0.12"

README.md

@@ -11,9 +11,10 @@ There's also an
 Chrome and probably Safari).
 
 #### Note:
-- release versions of `uglify-js` only support ECMAScript 5 (ES5). If you wish to minify
-ES2015+ (ES6+) code then please use the [harmony](#harmony) development branch.
-- Node 7 has a known performance regression and runs `uglify-js` twice as slow.
+- `uglify-js` only supports ECMAScript 5 (ES5).
+- Support for `const` is [present but incomplete](#support-for-const), and may not be
+  transformed properly.
+- Those wishing to minify ES2015+ (ES6+) should use the `npm` package [**uglify-es**](https://github.com/mishoo/UglifyJS2/tree/harmony).
 
 Install
 -------
@@ -29,12 +30,6 @@ From NPM for programmatic use:
 
     npm install uglify-js
 
-From Git:
-
-    git clone git://github.com/mishoo/UglifyJS2.git
-    cd UglifyJS2
-    npm link .
-
 Usage
 -----
 
@@ -358,6 +353,9 @@ to set `true`; it's effectively a shortcut for `foo=true`).
 - `unsafe_proto` (default: false) -- optimize expressions like
   `Array.prototype.slice.call(a)` into `[].slice.call(a)`
 
+- `unsafe_regexp` (default: false) -- enable substitutions of variables with
+  `RegExp` values the same way as if they are constants.
+
 - `conditionals` -- apply optimizations for `if`-s and conditional
   expressions
 
@@ -411,6 +409,8 @@ to set `true`; it's effectively a shortcut for `foo=true`).
 - `pure_getters` -- the default is `false`.  If you pass `true` for
   this, UglifyJS will assume that object property access
   (e.g. `foo.bar` or `foo["bar"]`) doesn't have any side effects.
+  Specify `"strict"` to treat `foo.bar` as side-effect-free only when
+  `foo` is certain to not throw, i.e. not `null` or `undefined`.
 
 - `pure_funcs` -- default `null`.  You can pass an array of names and
   UglifyJS will assume that those functions do not produce side
@@ -439,9 +439,18 @@ to set `true`; it's effectively a shortcut for `foo=true`).
   compressor from discarding function names.  Useful for code relying on
   `Function.prototype.name`. See also: the `keep_fnames` [mangle option](#mangle).
 
-- `passes` -- default `1`. Number of times to run compress. Use an
-  integer argument larger than 1 to further reduce code size in some cases.
-  Note: raising the number of passes will increase uglify compress time.
+- `passes` -- default `1`. Number of times to run compress with a maximum of 3.
+  In some cases more than one pass leads to further compressed code.  Keep in
+  mind more passes will take more time.
+
+- `keep_infinity` -- default `false`. Pass `true` to prevent `Infinity` from
+  being compressed into `1/0`, which may cause performance issues on Chrome.
+
+- `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();`
+
 
 ### The `unsafe` option
 
@@ -558,9 +567,6 @@ can pass additional arguments that control the code output:
   - `3` -- always use the original quotes
 - `keep_quoted_props` (default `false`) -- when turned on, prevents stripping
   quotes from property names in object literals.
-- `ecma` (default `5`) -- set output printing mode.  This will only change the
-  output in direct control of the beautifier.  Non-compatible features in the
-  abstract syntax tree will still be outputted as is.
 
 ### Keeping copyright notices or other comments
 
@@ -981,19 +987,9 @@ The `source_map_options` (optional) can contain the following properties:
   [compressor]: http://lisperator.net/uglifyjs/compress
   [parser]: http://lisperator.net/uglifyjs/parser
 
-#### Harmony
+#### Support for `const`
 
-If you wish to use the experimental [harmony](https://github.com/mishoo/UglifyJS2/commits/harmony)
-branch to minify ES2015+ (ES6+) code please use the following in your `package.json` file:
-
-```
-"uglify-js": "git+https://github.com/mishoo/UglifyJS2.git#harmony"
-```
-
-or to directly install the experimental harmony version of uglify:
-
-```
-npm install --save-dev uglify-js@github:mishoo/UglifyJS2#harmony
-```
-
-See [#448](https://github.com/mishoo/UglifyJS2/issues/448) for additional details.
+`const` in `uglify-js@2.x` has function scope and as such behaves much like
+`var` - unlike `const` in ES2015 (ES6) which has block scope. It is recommended
+to avoid using `const` for this reason as it will have undefined behavior when
+run on an ES2015 compatible browser.

bin/uglifyjs

@@ -367,19 +367,19 @@ var index = 0;
                     if (ex instanceof UglifyJS.JS_Parse_Error) {
                         print_error("Parse error at " + file + ":" + ex.line + "," + ex.col);
                         var col = ex.col;
-                        var line = code.split(/\r?\n/)[ex.line - (col ? 1 : 2)];
+                        var lines = code.split(/\r?\n/);
+                        var line = lines[ex.line - 1];
+                        if (!line && !col) {
+                            line = lines[ex.line - 2];
+                            col = line.length;
+                        }
                         if (line) {
                             if (col > 40) {
                                 line = line.slice(col - 40);
                                 col = 40;
                             }
-                            if (col) {
-                                print_error(line.slice(0, 80));
-                                print_error(line.slice(0, col).replace(/\S/g, " ") + "^");
-                            } else {
-                                print_error(line.slice(-40));
-                                print_error(line.slice(-40).replace(/\S/g, " ") + "^");
-                            }
+                            print_error(line.slice(0, 80));
+                            print_error(line.slice(0, col).replace(/\S/g, " ") + "^");
                         }
                         print_error(ex.stack);
                         process.exit(1);

lib/ast.js

@@ -157,7 +157,7 @@ var AST_SimpleStatement = DEFNODE("SimpleStatement", "body", {
 
 function walk_body(node, visitor) {
     var body = node.body;
-    if (body instanceof AST_Node) {
+    if (body instanceof AST_Statement) {
         body._walk(visitor);
     }
     else for (var i = 0, len = body.length; i < len; i++) {
@@ -214,12 +214,13 @@ var AST_LabeledStatement = DEFNODE("LabeledStatement", "label", {
     clone: function(deep) {
         var node = this._clone(deep);
         if (deep) {
-            var refs = node.label.references;
-            var label = this.label;
+            var label = node.label;
+            var def = this.label;
             node.walk(new TreeWalker(function(node) {
                 if (node instanceof AST_LoopControl
-                    && node.label && node.label.thedef === label) {
-                    refs.push(node);
+                    && node.label && node.label.thedef === def) {
+                    node.label.thedef = label;
+                    label.references.push(node);
                 }
             }));
         }
@@ -291,10 +292,6 @@ var AST_ForIn = DEFNODE("ForIn", "init name object", {
     }
 }, AST_IterationStatement);
 
-var AST_ForOf = DEFNODE("ForOf", null, {
-    $documentation: "A `for ... of` statement",
-}, AST_ForIn);
-
 var AST_With = DEFNODE("With", "expression", {
     $documentation: "A `with` statement",
     $propdoc: {
@@ -322,13 +319,6 @@ var AST_Scope = DEFNODE("Scope", "directives variables functions uses_with uses_
         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)",
     },
-    get_defun_scope: function () {
-        var self = this;
-        while (self.is_block_scope() && self.parent_scope) {
-            self = self.parent_scope;
-        }
-        return self;
-    }
 }, AST_Block);
 
 var AST_Toplevel = DEFNODE("Toplevel", "globals", {
@@ -398,107 +388,13 @@ var AST_Toplevel = DEFNODE("Toplevel", "globals", {
     }
 }, AST_Scope);
 
-var AST_Expansion = DEFNODE("Expansion", "expression", {
-    $documentation: "An expandible argument, such as ...rest, a splat, such as [1,2,...all], or an expansion in a variable declaration, such as var [first, ...rest] = list",
-    $propdoc: {
-        expression: "AST_Symbol the thing to be expanded"
-    },
-    _walk: function(visitor) {
-        var self = this;
-        return visitor._visit(this, function(){
-            self.expression.walk(visitor);
-        });
-    }
-});
-
-var AST_ArrowParametersOrSeq = DEFNODE("ArrowParametersOrSeq", "expressions", {
-    $documentation: "A set of arrow function parameters or a sequence expression. This is used because when the parser sees a \"(\" it could be the start of a seq, or the start of a parameter list of an arrow function.",
-    $propdoc: {
-        expressions: "[AST_Expression|AST_Destructuring|AST_Expansion*] array of expressions or argument names or destructurings."
-    },
-    as_params: function (croak) {
-        // We don't want anything which doesn't belong in a destructuring
-        var root = this;
-        return this.expressions.map(function to_fun_args(ex, _, __, default_seen_above) {
-            var insert_default = function(ex, default_value) {
-                if (default_value) {
-                    return new AST_DefaultAssign({
-                        start: ex.start,
-                        left: ex,
-                        operator: "=",
-                        right: default_value,
-                        end: default_value.end
-                    });
-                }
-                return ex;
-            }
-            if (ex instanceof AST_Object) {
-                return insert_default(new AST_Destructuring({
-                    start: ex.start,
-                    end: ex.end,
-                    is_array: false,
-                    names: ex.properties.map(to_fun_args)
-                }), default_seen_above);
-            } else if (ex instanceof AST_ObjectKeyVal) {
-                if (ex.key instanceof AST_SymbolRef) {
-                    ex.key = to_fun_args(ex.key, 0, [ex.key]);
-                }
-                ex.value = to_fun_args(ex.value, 0, [ex.key]);
-                return insert_default(ex, default_seen_above);
-            } else if (ex instanceof AST_Hole) {
-                return ex;
-            } else if (ex instanceof AST_Destructuring) {
-                if (ex.names.length == 0)
-                    croak("Invalid destructuring function parameter", ex.start.line, ex.start.col);
-                ex.names = ex.names.map(to_fun_args);
-                return insert_default(ex, default_seen_above);
-            } else if (ex instanceof AST_SymbolRef) {
-                return insert_default(new AST_SymbolFunarg({
-                    name: ex.name,
-                    start: ex.start,
-                    end: ex.end
-                }), default_seen_above);
-            } else if (ex instanceof AST_Expansion) {
-                ex.expression = to_fun_args(ex.expression);
-                return insert_default(ex, default_seen_above);
-            } else if (ex instanceof AST_Array) {
-                return insert_default(new AST_Destructuring({
-                    start: ex.start,
-                    end: ex.end,
-                    is_array: true,
-                    names: ex.elements.map(to_fun_args)
-                }), default_seen_above);
-            } else if (ex instanceof AST_Assign) {
-                return insert_default(to_fun_args(ex.left, undefined, undefined, ex.right), default_seen_above);
-            } else {
-                croak("Invalid function parameter", ex.start.line, ex.start.col);
-            }
-        });
-    },
-    as_expr: function (croak) {
-        return AST_Seq.from_array(this.expressions);
-    }
-});
-
-var AST_Lambda = DEFNODE("Lambda", "name argnames uses_arguments is_generator", {
+var AST_Lambda = DEFNODE("Lambda", "name argnames uses_arguments", {
     $documentation: "Base class for functions",
     $propdoc: {
-        is_generator: "[boolean] is generatorFn or not",
         name: "[AST_SymbolDeclaration?] the name of this function",
-        argnames: "[AST_SymbolFunarg|AST_Destructuring|AST_Expansion|AST_DefaultAssign*] array of function arguments, destructurings, or expanding arguments",
+        argnames: "[AST_SymbolFunarg*] array of function arguments",
         uses_arguments: "[boolean/S] tells whether this function accesses the arguments array"
     },
-    args_as_names: function () {
-        var out = [];
-        for (var i = 0; i < this.argnames.length; i++) {
-            if (this.argnames[i] instanceof AST_Destructuring) {
-                out = out.concat(this.argnames[i].all_symbols());
-            } else {
-                out.push(this.argnames[i]);
-            }
-        }
-        return out;
-    },
     _walk: function(visitor) {
         return visitor._visit(this, function(){
             if (this.name) this.name._walk(visitor);
@@ -519,78 +415,10 @@ var AST_Function = DEFNODE("Function", null, {
     $documentation: "A function expression"
 }, AST_Lambda);
 
-var AST_Arrow = DEFNODE("Arrow", null, {
-    $documentation: "An ES6 Arrow function ((a) => b)"
-}, AST_Lambda);
-
 var AST_Defun = DEFNODE("Defun", null, {
     $documentation: "A function definition"
 }, AST_Lambda);
 
-/* -----[ DESTRUCTURING ]----- */
-var AST_Destructuring = DEFNODE("Destructuring", "names is_array", {
-    $documentation: "A destructuring of several names. Used in destructuring assignment and with destructuring function argument names",
-    $propdoc: {
-        "names": "[AST_Node*] Array of properties or elements",
-        "is_array": "[Boolean] Whether the destructuring represents an object or array"
-    },
-    _walk: function(visitor) {
-        return visitor._visit(this, function(){
-            this.names.forEach(function(name){
-                name._walk(visitor);
-            });
-        });
-    },
-    all_symbols: function() {
-        var out = [];
-        this.walk(new TreeWalker(function (node) {
-            if (node instanceof AST_Symbol) {
-                out.push(node);
-            }
-            if (node instanceof AST_Expansion) {
-                out.push(node.expression);
-            }
-        }));
-        return out;
-    }
-});
-
-var AST_PrefixedTemplateString = DEFNODE("PrefixedTemplateString", "template_string prefix", {
-    $documentation: "A templatestring with a prefix, such as String.raw`foobarbaz`",
-    $propdoc: {
-        template_string: "[AST_TemplateString] The template string",
-        prefix: "[AST_SymbolRef|AST_PropAccess] The prefix, which can be a symbol such as `foo` or a dotted expression such as `String.raw`."
-    },
-    _walk: function(visitor) {
-        this.prefix._walk(visitor);
-        this.template_string._walk(visitor);
-    }
-})
-
-var AST_TemplateString = DEFNODE("TemplateString", "segments", {
-    $documentation: "A template string literal",
-    $propdoc: {
-        segments: "[AST_TemplateSegment|AST_Expression]* One or more segments, starting with AST_TemplateSegment. AST_Expression may follow AST_TemplateSegment, but each AST_Expression must be followed by AST_TemplateSegment."
-    },
-    _walk: function(visitor) {
-        return visitor._visit(this, function(){
-            this.segments.forEach(function(seg, i){
-                if (i % 2 !== 0) {
-                    seg._walk(visitor);
-                }
-            });
-        });
-    }
-});
-
-var AST_TemplateSegment = DEFNODE("TemplateSegment", "value raw", {
-    $documentation: "A segment of a template string literal",
-    $propdoc: {
-        value: "Content of the segment",
-        raw: "Raw content of the segment"
-    }
-});
-
 /* -----[ JUMPS ]----- */
 
 var AST_Jump = DEFNODE("Jump", null, {
@@ -710,7 +538,7 @@ var AST_Try = DEFNODE("Try", "bcatch bfinally", {
 var AST_Catch = DEFNODE("Catch", "argname", {
     $documentation: "A `catch` node; only makes sense as part of a `try` statement",
     $propdoc: {
-        argname: "[AST_SymbolCatch|AST_Destructuring|AST_Expansion|AST_DefaultAssign] symbol for the exception"
+        argname: "[AST_SymbolCatch] symbol for the exception"
     },
     _walk: function(visitor) {
         return visitor._visit(this, function(){
@@ -745,75 +573,14 @@ var AST_Var = DEFNODE("Var", null, {
     $documentation: "A `var` statement"
 }, AST_Definitions);
 
-var AST_Let = DEFNODE("Let", null, {
-    $documentation: "A `let` statement"
-}, AST_Definitions);
-
 var AST_Const = DEFNODE("Const", null, {
     $documentation: "A `const` statement"
 }, AST_Definitions);
 
-var AST_NameImport = DEFNODE("NameImport", "foreign_name name", {
-    $documentation: "The part of the import statement that imports names from a module.",
-    $propdoc: {
-        foreign_name: "[AST_SymbolImportForeign] The name being imported (as specified in the module)",
-        name: "[AST_SymbolImport] The name as it becomes available to this module."
-    },
-    _walk: function (visitor) {
-        return visitor._visit(this, function() {
-            this.foreign_name._walk(visitor);
-            this.name._walk(visitor);
-        });
-    }
-})
-
-var AST_Import = DEFNODE("Import", "imported_name imported_names module_name", {
-    $documentation: "An `import` statement",
-    $propdoc: {
-        imported_name: "[AST_SymbolImport] The name of the variable holding the module's default export.",
-        imported_names: "[AST_NameImport*] The names of non-default imported variables",
-        module_name: "[AST_String] String literal describing where this module came from",
-    },
-    _walk: function(visitor) {
-        return visitor._visit(this, function() {
-            if (this.imported_name) {
-                this.imported_name._walk(visitor);
-            }
-            if (this.imported_names) {
-                this.imported_names.forEach(function (name_import) {
-                    name_import._walk(visitor);
-                });
-            }
-            this.module_name._walk(visitor);
-        });
-    }
-});
-
-var AST_Export = DEFNODE("Export", "exported_definition exported_value is_default exported_names module_name", {
-    $documentation: "An `export` statement",
-    $propdoc: {
-        exported_definition: "[AST_Defun|AST_Definitions|AST_DefClass?] An exported definition",
-        exported_value: "[AST_Node?] An exported value",
-        exported_names: "[AST_NameImport*?] List of exported names",
-        module_name: "[AST_String?] Name of the file to load exports from",
-        is_default: "[Boolean] Whether this is the default exported value of this module"
-    },
-    _walk: function (visitor) {
-        visitor._visit(this, function () {
-            if (this.exported_definition) {
-                this.exported_definition._walk(visitor);
-            }
-            if (this.exported_value) {
-                this.exported_value._walk(visitor);
-            }
-        });
-    }
-}, AST_Statement);
-
 var AST_VarDef = DEFNODE("VarDef", "name value", {
     $documentation: "A variable declaration; only appears in a AST_Definitions node",
     $propdoc: {
-        name: "[AST_SymbolVar|AST_SymbolConst|AST_Destructuring] name of the variable",
+        name: "[AST_SymbolVar|AST_SymbolConst] name of the variable",
         value: "[AST_Node?] initializer, or null of there's no initializer"
     },
     _walk: function(visitor) {
@@ -996,10 +763,6 @@ var AST_Assign = DEFNODE("Assign", null, {
     $documentation: "An assignment expression — `a = b + 5`",
 }, AST_Binary);
 
-var AST_DefaultAssign = DEFNODE("DefaultAssign", null, {
-    $documentation: "A default assignment expression like in `(a = 3) => a`"
-}, AST_Binary);
-
 /* -----[ LITERALS ]----- */
 
 var AST_Array = DEFNODE("Array", "elements", {
@@ -1035,13 +798,11 @@ var AST_Object = DEFNODE("Object", "properties", {
 var AST_ObjectProperty = DEFNODE("ObjectProperty", "key value", {
     $documentation: "Base class for literal object properties",
     $propdoc: {
-        key: "[string|AST_Node] the property name converted to a string for ObjectKeyVal. For setters, getters and computed property this is an arbitrary AST_Node",
-        value: "[AST_Node] property value. For setters and getters this is an AST_Function."
+        key: "[string] the property name converted to a string for ObjectKeyVal.  For setters and getters this is an AST_SymbolAccessor.",
+        value: "[AST_Node] property value.  For setters and getters this is an AST_Accessor."
     },
     _walk: function(visitor) {
         return visitor._visit(this, function(){
-            if (this.key instanceof AST_Node)
-                this.key._walk(visitor);
             this.value._walk(visitor);
         });
     }
@@ -1054,72 +815,21 @@ var AST_ObjectKeyVal = DEFNODE("ObjectKeyVal", "quote", {
     }
 }, AST_ObjectProperty);
 
-var AST_ObjectSetter = DEFNODE("ObjectSetter", "quote static", {
-    $propdoc: {
-        quote: "[string|undefined] the original quote character, if any",
-        static: "[boolean] whether this is a static setter (classes only)"
-    },
+var AST_ObjectSetter = DEFNODE("ObjectSetter", null, {
     $documentation: "An object setter property",
 }, AST_ObjectProperty);
 
-var AST_ObjectGetter = DEFNODE("ObjectGetter", "quote static", {
-    $propdoc: {
-        quote: "[string|undefined] the original quote character, if any",
-        static: "[boolean] whether this is a static getter (classes only)"
-    },
+var AST_ObjectGetter = DEFNODE("ObjectGetter", null, {
     $documentation: "An object getter property",
 }, AST_ObjectProperty);
 
-var AST_ConciseMethod = DEFNODE("ConciseMethod", "quote static is_generator", {
-    $propdoc: {
-        quote: "[string|undefined] the original quote character, if any",
-        static: "[boolean] whether this method is static (classes only)",
-        is_generator: "[boolean] is generatorFn or not",
-    },
-    $documentation: "An ES6 concise method inside an object or class"
-}, AST_ObjectProperty);
-
-var AST_Class = DEFNODE("Class", "name extends properties", {
-    $propdoc: {
-        name: "[AST_SymbolClass|AST_SymbolDefClass?] optional class name.",
-        extends: "[AST_Node]? optional parent class",
-        properties: "[AST_ObjectProperty*] array of properties"
-    },
-    $documentation: "An ES6 class",
-    _walk: function(visitor) {
-        return visitor._visit(this, function(){
-            if (this.name) {
-                this.name._walk(visitor);
-            }
-            if (this.extends) {
-                this.extends._walk(visitor);
-            }
-            this.properties.forEach(function(prop){
-                prop._walk(visitor);
-            });
-        });
-    },
-}, AST_Scope);
-
-var AST_DefClass = DEFNODE("DefClass", null, {
-    $documentation: "A class definition",
-}, AST_Class);
-
-var AST_ClassExpression = DEFNODE("ClassExpression", null, {
-    $documentation: "A class expression."
-}, AST_Class);
-
 var AST_Symbol = DEFNODE("Symbol", "scope name thedef", {
     $propdoc: {
         name: "[string] name of this symbol",
         scope: "[AST_Scope/S] the current scope (not necessarily the definition scope)",
         thedef: "[SymbolDef/S] the definition of this symbol"
     },
-    $documentation: "Base class for all symbols"
-});
-
-var AST_NewTarget = DEFNODE("NewTarget", null, {
-    $documentation: "A reference to new.target"
+    $documentation: "Base class for all symbols",
 });
 
 var AST_SymbolAccessor = DEFNODE("SymbolAccessor", null, {
@@ -1134,17 +844,9 @@ var AST_SymbolVar = DEFNODE("SymbolVar", null, {
     $documentation: "Symbol defining a variable",
 }, AST_SymbolDeclaration);
 
-var AST_SymbolBlockDeclaration = DEFNODE("SymbolBlockDeclaration", null, {
-    $documentation: "Base class for block-scoped declaration symbols"
-}, AST_SymbolDeclaration);
-
 var AST_SymbolConst = DEFNODE("SymbolConst", null, {
     $documentation: "A constant declaration"
-}, AST_SymbolBlockDeclaration);
-
-var AST_SymbolLet = DEFNODE("SymbolLet", null, {
-    $documentation: "A block-scoped `let` declaration"
-}, AST_SymbolBlockDeclaration);
+}, AST_SymbolDeclaration);
 
 var AST_SymbolFunarg = DEFNODE("SymbolFunarg", null, {
     $documentation: "Symbol naming a function argument",
@@ -1154,33 +856,13 @@ var AST_SymbolDefun = DEFNODE("SymbolDefun", null, {
     $documentation: "Symbol defining a function",
 }, AST_SymbolDeclaration);
 
-var AST_SymbolMethod = DEFNODE("SymbolMethod", null, {
-    $documentation: "Symbol in an object defining a method",
-}, AST_Symbol);
-
 var AST_SymbolLambda = DEFNODE("SymbolLambda", null, {
     $documentation: "Symbol naming a function expression",
 }, AST_SymbolDeclaration);
 
-var AST_SymbolDefClass = DEFNODE("SymbolDefClass", null, {
-    $documentation: "Symbol naming a class's name in a class declaration. Lexically scoped to its containing scope, and accessible within the class."
-}, AST_SymbolBlockDeclaration);
-
-var AST_SymbolClass = DEFNODE("SymbolClass", null, {
-    $documentation: "Symbol naming a class's name. Lexically scoped to the class."
-}, AST_SymbolDeclaration);
-
 var AST_SymbolCatch = DEFNODE("SymbolCatch", null, {
     $documentation: "Symbol naming the exception in catch",
-}, AST_SymbolBlockDeclaration);
-
-var AST_SymbolImport = DEFNODE("SymbolImport", null, {
-    $documentation: "Symbol refering to an imported name",
-}, AST_SymbolBlockDeclaration);
-
-var AST_SymbolImportForeign = DEFNODE("SymbolImportForeign", null, {
-    $documentation: "A symbol imported from a module, but it is defined in the other module, and its real name is irrelevant for this module's purposes",
-}, AST_Symbol);
+}, AST_SymbolDeclaration);
 
 var AST_Label = DEFNODE("Label", "references", {
     $documentation: "Symbol naming a label (declaration)",
@@ -1205,10 +887,6 @@ var AST_This = DEFNODE("This", null, {
     $documentation: "The `this` symbol",
 }, AST_Symbol);
 
-var AST_Super = DEFNODE("Super", null, {
-    $documentation: "The `super` symbol",
-}, AST_Symbol);
-
 var AST_Constant = DEFNODE("Constant", null, {
     $documentation: "Base class for all constants",
     getValue: function() {
@@ -1282,21 +960,6 @@ var AST_True = DEFNODE("True", null, {
     value: true
 }, AST_Boolean);
 
-/* -----[ Yield ]----- */
-
-var AST_Yield = DEFNODE("Yield", "expression is_star", {
-    $documentation: "A `yield` statement",
-    $propdoc: {
-        expression: "[AST_Node?] the value returned or thrown by this statement; could be null (representing undefined) but only when is_star is set to false",
-        is_star: "[Boolean] Whether this is a yield or yield* statement"
-    },
-    _walk: function(visitor) {
-        return visitor._visit(this, this.expression && function(){
-            this.expression._walk(visitor);
-        });
-    }
-});
-
 /* -----[ TreeWalker ]----- */
 
 function TreeWalker(callback) {
@@ -1324,17 +987,12 @@ TreeWalker.prototype = {
             this.directives = Object.create(this.directives);
         } else if (node instanceof AST_Directive && !this.directives[node.value]) {
             this.directives[node.value] = node;
-        } else if (node instanceof AST_Class) {
-            this.directives = Object.create(this.directives);
-            if (!this.directives["use strict"]) {
-                this.directives["use strict"] = node;
-            }
         }
         this.stack.push(node);
     },
     pop: function(node) {
         this.stack.pop();
-        if (node instanceof AST_Lambda || node instanceof AST_Class) {
+        if (node instanceof AST_Lambda) {
             this.directives = Object.getPrototypeOf(this.directives);
         }
     },
@@ -1352,7 +1010,7 @@ TreeWalker.prototype = {
         var dir = this.directives[type];
         if (dir) return dir;
         var node = this.stack[this.stack.length - 1];
-        if (node instanceof AST_Scope && node.body) {
+        if (node instanceof AST_Scope) {
             for (var i = 0; i < node.body.length; ++i) {
                 var st = node.body[i];
                 if (!(st instanceof AST_Directive)) break;
@@ -1378,16 +1036,16 @@ TreeWalker.prototype = {
             self = p;
         }
     },
-    loopcontrol_target: function(label) {
+    loopcontrol_target: function(node) {
         var stack = this.stack;
-        if (label) for (var i = stack.length; --i >= 0;) {
+        if (node.label) for (var i = stack.length; --i >= 0;) {
             var x = stack[i];
-            if (x instanceof AST_LabeledStatement && x.label.name == label.name) {
+            if (x instanceof AST_LabeledStatement && x.label.name == node.label.name)
                 return x.body;
-            }
         } else for (var i = stack.length; --i >= 0;) {
             var x = stack[i];
-            if (x instanceof AST_Switch || x instanceof AST_IterationStatement)
+            if (x instanceof AST_IterationStatement
+                || node instanceof AST_Break && x instanceof AST_Switch)
                 return x;
         }
     }

lib/mozilla-ast.js

@@ -111,23 +111,19 @@
         },
         Property: function(M) {
             var key = M.key;
-            var name = key.type == "Identifier" ? key.name : key.value;
             var args = {
                 start    : my_start_token(key),
                 end      : my_end_token(M.value),
-                key      : name,
+                key      : key.type == "Identifier" ? key.name : key.value,
                 value    : from_moz(M.value)
             };
-            switch (M.kind) {
-              case "init":
-                return new AST_ObjectKeyVal(args);
-              case "set":
-                args.value.name = from_moz(key);
-                return new AST_ObjectSetter(args);
-              case "get":
-                args.value.name = from_moz(key);
-                return new AST_ObjectGetter(args);
-            }
+            if (M.kind == "init") return new AST_ObjectKeyVal(args);
+            args.key = new AST_SymbolAccessor({
+                name: args.key
+            });
+            args.value = new AST_Accessor(args.value);
+            if (M.kind == "get") return new AST_ObjectGetter(args);
+            if (M.kind == "set") return new AST_ObjectSetter(args);
         },
         ArrayExpression: function(M) {
             return new AST_Array({
@@ -256,10 +252,7 @@
     map("CallExpression", AST_Call, "callee>expression, arguments@args");
 
     def_to_moz(AST_Toplevel, function To_Moz_Program(M) {
-        return {
-            type: "Program",
-            body: M.body.map(to_moz)
-        };
+        return to_moz_scope("Program", M);
     });
 
     def_to_moz(AST_Defun, function To_Moz_FunctionDeclaration(M) {
@@ -267,7 +260,7 @@
             type: "FunctionDeclaration",
             id: to_moz(M.name),
             params: M.argnames.map(to_moz),
-            body: to_moz_block(M)
+            body: to_moz_scope("BlockStatement", M)
         }
     });
 
@@ -276,7 +269,7 @@
             type: "FunctionExpression",
             id: to_moz(M.name),
             params: M.argnames.map(to_moz),
-            body: to_moz_block(M)
+            body: to_moz_scope("BlockStatement", M)
         }
     });
 
@@ -382,11 +375,10 @@
     });
 
     def_to_moz(AST_ObjectProperty, function To_Moz_Property(M) {
-        var key = (
-            is_identifier(M.key)
-            ? {type: "Identifier", name: M.key}
-            : {type: "Literal", value: M.key}
-        );
+        var key = {
+            type: "Literal",
+            value: M.key instanceof AST_SymbolAccessor ? M.key.name : M.key
+        };
         var kind;
         if (M instanceof AST_ObjectKeyVal) {
             kind = "init";
@@ -547,8 +539,8 @@
         moz_to_me = new Function("U2", "my_start_token", "my_end_token", "from_moz", "return(" + moz_to_me + ")")(
             exports, my_start_token, my_end_token, from_moz
         );
-        me_to_moz = new Function("to_moz", "to_moz_block", "return(" + me_to_moz + ")")(
-            to_moz, to_moz_block
+        me_to_moz = new Function("to_moz", "to_moz_block", "to_moz_scope", "return(" + me_to_moz + ")")(
+            to_moz, to_moz_block, to_moz_scope
         );
         MOZ_TO_ME[moztype] = moz_to_me;
         def_to_moz(mytype, me_to_moz);
@@ -606,4 +598,14 @@
         };
     };
 
+    function to_moz_scope(type, node) {
+        var body = node.body.map(to_moz);
+        if (node.body[0] instanceof AST_SimpleStatement && node.body[0].body instanceof AST_String) {
+            body.unshift(to_moz(new AST_EmptyStatement(node.body[0])));
+        }
+        return {
+            type: type,
+            body: body
+        };
+    };
 })();

lib/output.js

@@ -53,38 +53,29 @@ function is_some_comments(comment) {
 function OutputStream(options) {
 
     options = defaults(options, {
-        indent_start     : 0,
-        indent_level     : 4,
-        quote_keys       : false,
-        space_colon      : true,
         ascii_only       : false,
-        ascii_identifiers: undefined,
-        unescape_regexps : false,
-        inline_script    : false,
-        width            : 80,
-        max_line_len     : false,
         beautify         : false,
-        source_map       : null,
         bracketize       : false,
-        semicolons       : true,
         comments         : false,
-        shebang          : true,
-        preserve_line    : false,
-        screw_ie8        : true,
-        preamble         : null,
-        quote_style      : 0,
+        indent_level     : 4,
+        indent_start     : 0,
+        inline_script    : true,
         keep_quoted_props: false,
-        shorthand        : undefined,
-        ecma             : 5,
+        max_line_len     : false,
+        preamble         : null,
+        preserve_line    : false,
+        quote_keys       : false,
+        quote_style      : 0,
+        screw_ie8        : true,
+        semicolons       : true,
+        shebang          : true,
+        source_map       : null,
+        space_colon      : true,
+        unescape_regexps : false,
+        width            : 80,
         wrap_iife        : false,
     }, true);
 
-    if (typeof options.ascii_identifiers === 'undefined')
-        options.ascii_identifiers = options.ascii_only;
-
-    if (options.shorthand === undefined)
-        options.shorthand = options.ecma > 5;
-
     // Convert comment option to RegExp if neccessary and set up comments filter
     var comment_filter = return_false; // Default case, throw all comments away
     if (options.comments) {
@@ -120,19 +111,9 @@ function OutputStream(options) {
     var OUTPUT = "";
 
     function to_ascii(str, identifier) {
-        return str.replace(/[\ud800-\udbff][\udc00-\udfff]|[\u0000-\u001f\u007f-\uffff]/g, function(ch) {
-            var code = get_full_char_code(ch, 0).toString(16);
-
-            if ((identifier && code.length === 1 && options.ecma >= 6) || code.length > 4) {
-                if (options.ecma < 6) {
-                    if (identifier) {
-                        return ch; // no \u{} support
-                    }
-                    return "\\u" + ch.charCodeAt(0).toString(16) + "\\u"
-                        + ch.charCodeAt(1).toString(16);
-                }
-                return "\\u{" + code + "}";
-            } else if (code.length <= 2 && !identifier) {
+        return str.replace(/[\u0000-\u001f\u007f-\uffff]/g, function(ch) {
+            var code = ch.charCodeAt(0).toString(16);
+            if (code.length <= 2 && !identifier) {
                 while (code.length < 2) code = "0" + code;
                 return "\\x" + code;
             } else {
@@ -160,7 +141,7 @@ function OutputStream(options) {
               case "\u2029": return "\\u2029";
               case "\ufeff": return "\\ufeff";
               case "\0":
-                  return /[0-7]/.test(get_full_char(str, i+1)) ? "\\x00" : "\\0";
+                  return /[0-7]/.test(str.charAt(i+1)) ? "\\x00" : "\\0";
             }
             return s;
         });
@@ -170,22 +151,7 @@ function OutputStream(options) {
         function quote_double() {
             return '"' + str.replace(/\x22/g, '\\"') + '"';
         }
-        function quote_template() {
-            if (!options.ascii_only) {
-                str = str.replace(/\\(n|r|u2028|u2029)/g, function(s, c) {
-                    switch(c) {
-                        case "n": return "\n";
-                        case "r": return "\r";
-                        case "u2028": return "\u2028";
-                        case "u2029": return "\u2029";
-                    }
-                    return s;
-                });
-            }
-            return '`' + str.replace(/`/g, '\\`') + '`';
-        }
         if (options.ascii_only) str = to_ascii(str);
-        if (quote === "`") return quote_template();
         switch (options.quote_style) {
           case 1:
             return quote_single();
@@ -210,7 +176,7 @@ function OutputStream(options) {
 
     function make_name(name) {
         name = name.toString();
-        if (options.ascii_identifiers)
+        if (options.ascii_only)
             name = to_ascii(name, true);
         return name;
     };
@@ -224,17 +190,7 @@ function OutputStream(options) {
     var might_need_space = false;
     var might_need_semicolon = false;
     var might_add_newline = 0;
-    var last = null;
-
-    function last_char() {
-        var char = last.charAt(last.length - 1);
-
-        if (is_surrogate_pair_tail(char)) {
-            return last.charAt(last.length - 2) + char;
-        }
-
-        return char;
-    };
+    var last = "";
 
     var ensure_line_len = options.max_line_len ? function() {
         if (current_col > options.max_line_len) {
@@ -257,11 +213,12 @@ function OutputStream(options) {
 
     function print(str) {
         str = String(str);
-        var ch = get_full_char(str, 0);
+        var ch = str.charAt(0);
+        var prev = last.charAt(last.length - 1);
         if (might_need_semicolon) {
             might_need_semicolon = false;
 
-            if ((!ch || ";}".indexOf(ch) < 0) && !/[;]$/.test(last)) {
+            if (prev == ":" && ch == "}" || (!ch || ";}".indexOf(ch) < 0) && prev != ";") {
                 if (options.semicolons || requireSemicolonChars(ch)) {
                     OUTPUT += ";";
                     current_col++;
@@ -298,7 +255,6 @@ function OutputStream(options) {
         }
 
         if (might_need_space) {
-            var prev = last_char();
             if ((is_identifier_char(prev)
                     && (is_identifier_char(ch) || ch == "\\"))
                 || (ch == "/" && ch == prev)
@@ -322,10 +278,6 @@ function OutputStream(options) {
         last = str;
     };
 
-    var star = function(){
-        print("*");
-    }
-
     var space = options.beautify ? function() {
         print(" ");
     } : function() {
@@ -445,7 +397,6 @@ function OutputStream(options) {
         should_break    : function() { return options.width && this.current_width() >= options.width },
         newline         : newline,
         print           : print,
-        star            : star,
         space           : space,
         comma           : comma,
         colon           : colon,
@@ -465,10 +416,6 @@ function OutputStream(options) {
             }
             print(encoded);
         },
-        print_template_string_chars: function(str) {
-            var encoded = encode_string(str, '`').replace(/\${/g, "\\${");
-            return print(encoded.substr(1, encoded.length - 2));
-        },
         encode_string   : encode_string,
         next_indent     : next_indent,
         with_indent     : with_indent,
@@ -559,8 +506,8 @@ function OutputStream(options) {
                 }));
             }
 
-            if (comments.length > 0 && output.pos() == 0) {
-                if (output.option("shebang") && comments[0].type == "comment5") {
+            if (output.pos() == 0) {
+                if (comments.length > 0 && output.option("shebang") && comments[0].type == "comment5") {
                     output.print("#!" + comments.shift().value + "\n");
                     output.indent();
                 }
@@ -629,27 +576,16 @@ function OutputStream(options) {
         return false;
     });
 
-    PARENS(AST_Arrow, function(output){
-        var p = output.parent();
-        return p instanceof AST_PropAccess && p.expression === this;
-    });
-
     // 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);
     });
 
-    PARENS([ AST_Unary, AST_Undefined ], function(output){
+    PARENS(AST_Unary, function(output){
         var p = output.parent();
         return p instanceof AST_PropAccess && p.expression === this
-            || p instanceof AST_Call && p.expression === this
-            || p instanceof AST_Binary
-                && p.operator === "**"
-                && this instanceof AST_UnaryPrefix
-                && p.left === this
-                && this.operator !== "++"
-                && this.operator !== "--";
+            || p instanceof AST_Call && p.expression === this;
     });
 
     PARENS(AST_Seq, function(output){
@@ -663,8 +599,6 @@ function OutputStream(options) {
             || p instanceof AST_ObjectProperty   // { foo: (1, 2) }.foo ==> 2
             || p instanceof AST_Conditional      /* (false, true) ? (a = 10, b = 20) : (c = 30)
                                                   * ==> 20 (side effect, set a := 10 and b := 20) */
-            || p instanceof AST_Arrow            // x => (x, x)
-            || p instanceof AST_DefaultAssign    // x => (x = (0, function(){}))
         ;
     });
 
@@ -691,24 +625,6 @@ function OutputStream(options) {
         }
     });
 
-    PARENS(AST_Yield, function(output){
-        var p = output.parent();
-        // (yield 1) + (yield 2)
-        // a = yield 3
-        if (p instanceof AST_Binary && p.operator !== "=")
-            return true;
-        // (yield 1) ? yield 2 : yield 3
-        if (p instanceof AST_Conditional && p.condition === this)
-            return true;
-        // -(yield 4)
-        if (p instanceof AST_Unary)
-            return true;
-        // (yield x).foo
-        // (yield x)['foo']
-        if (p instanceof AST_PropAccess && p.expression === this)
-            return true;
-    });
-
     PARENS(AST_PropAccess, function(output){
         var p = output.parent();
         if (p instanceof AST_New && p.expression === this) {
@@ -778,9 +694,6 @@ function OutputStream(options) {
         // (a = foo)["prop"] —or— (a = foo).prop
         if (p instanceof AST_PropAccess && p.expression === this)
             return true;
-        // ({a, b} = {a: 1, b: 2}), a destructuring assignment
-        if (this instanceof AST_Assign && this.left instanceof AST_Destructuring && this.left.is_array === false)
-            return true;
     });
 
     /* -----[ PRINTERS ]----- */
@@ -789,28 +702,6 @@ function OutputStream(options) {
         output.print_string(self.value, self.quote);
         output.semicolon();
     });
-
-    DEFPRINT(AST_Expansion, function (self, output) {
-        output.print('...');
-        self.expression.print(output);
-    });
-
-    DEFPRINT(AST_Destructuring, function (self, output) {
-        output.print(self.is_array ? "[" : "{");
-        var first = true;
-        var len = self.names.length;
-        self.names.forEach(function (name, i) {
-            if (first) first = false; else { output.comma(); output.space(); }
-            name.print(output);
-            // If the final element is a hole, we need to make sure it
-            // doesn't look like a trailing comma, by inserting an actual
-            // trailing comma.
-            if (i === len - 1 && name instanceof AST_Hole)
-              output.comma();
-        })
-        output.print(self.is_array ? "]" : "}");
-    });
-
     DEFPRINT(AST_Debugger, function(self, output){
         output.print("debugger");
         output.semicolon();
@@ -935,11 +826,7 @@ function OutputStream(options) {
         output.with_parens(function(){
             self.init.print(output);
             output.space();
-            if (self instanceof AST_ForOf) {
-                output.print("of");
-            } else {
-                output.print("in");
-            }
+            output.print("in");
             output.space();
             self.object.print(output);
         });
@@ -961,19 +848,10 @@ function OutputStream(options) {
         var self = this;
         if (!nokeyword) {
             output.print("function");
-            if (this.is_generator) {
-                output.star();
-            }
-            if (self.name) {
-                output.space();
-            }
         }
-        if (self.name instanceof AST_Symbol) {
+        if (self.name) {
+            output.space();
             self.name.print(output);
-        } else if (nokeyword && self.name instanceof AST_Node) {
-            output.with_square(function() {
-                self.name.print(output); // Computed method name
-            });
         }
         output.with_parens(function(){
             self.argnames.forEach(function(arg, i){
@@ -988,56 +866,6 @@ function OutputStream(options) {
         self._do_print(output);
     });
 
-    DEFPRINT(AST_PrefixedTemplateString, function(self, output) {
-        self.prefix.print(output);
-        self.template_string.print(output);
-    });
-    DEFPRINT(AST_TemplateString, function(self, output) {
-        var is_tagged = output.parent() instanceof AST_PrefixedTemplateString;
-
-        output.print("`");
-        for (var i = 0; i < self.segments.length; i++) {
-            if (!(self.segments[i] instanceof AST_TemplateSegment)) {
-                output.print("${");
-                self.segments[i].print(output);
-                output.print("}");
-            } else if (is_tagged) {
-                output.print(self.segments[i].raw);
-            } else {
-                output.print_template_string_chars(self.segments[i].value);
-            }
-        }
-        output.print("`");
-    });
-
-    AST_Arrow.DEFMETHOD("_do_print", function(output){
-        var self = this;
-        var parent = output.parent();
-        var needs_parens = parent instanceof AST_Binary ||
-            parent instanceof AST_Unary ||
-            (parent instanceof AST_Call && self === parent.expression);
-        if (needs_parens) { output.print("(") }
-        if (self.argnames.length === 1 && self.argnames[0] instanceof AST_Symbol) {
-            self.argnames[0].print(output);
-        } else {
-            output.with_parens(function(){
-                self.argnames.forEach(function(arg, i){
-                    if (i) output.comma();
-                    arg.print(output);
-                });
-            });
-        }
-        output.space();
-        output.print('=>');
-        output.space();
-        if (self.body instanceof AST_Node) {
-            this.body.print(output);
-        } else {
-            print_bracketed(this.body, output);
-        }
-        if (needs_parens) { output.print(")") }
-    });
-
     /* -----[ exits ]----- */
     AST_Exit.DEFMETHOD("_do_print", function(output, kind){
         output.print(kind);
@@ -1054,17 +882,6 @@ function OutputStream(options) {
         self._do_print(output, "throw");
     });
 
-    /* -----[ yield ]----- */
-
-    DEFPRINT(AST_Yield, function(self, output){
-        var star = self.is_star ? "*" : "";
-        output.print("yield" + star);
-        if (self.expression) {
-            output.space();
-            self.expression.print(output);
-        }
-    });
-
     /* -----[ loop control ]----- */
     AST_LoopControl.DEFMETHOD("_do_print", function(output, kind){
         output.print(kind);
@@ -1139,24 +956,24 @@ function OutputStream(options) {
             self.expression.print(output);
         });
         output.space();
-        if (self.body.length > 0) output.with_block(function(){
-            self.body.forEach(function(stmt, i){
-                if (i) output.newline();
+        var last = self.body.length - 1;
+        if (last < 0) output.print("{}");
+        else output.with_block(function(){
+            self.body.forEach(function(branch, i){
                 output.indent(true);
-                stmt.print(output);
+                branch.print(output);
+                if (i < last && branch.body.length > 0)
+                    output.newline();
             });
         });
-        else output.print("{}");
     });
     AST_SwitchBranch.DEFMETHOD("_do_print_body", function(output){
-        if (this.body.length > 0) {
+        output.newline();
+        this.body.forEach(function(stmt){
+            output.indent();
+            stmt.print(output);
             output.newline();
-            this.body.forEach(function(stmt){
-                output.indent();
-                stmt.print(output);
-                output.newline();
-            });
-        }
+        });
     });
     DEFPRINT(AST_Default, function(self, output){
         output.print("default:");
@@ -1213,103 +1030,12 @@ function OutputStream(options) {
         if (!avoid_semicolon)
             output.semicolon();
     });
-    DEFPRINT(AST_Let, function(self, output){
-        self._do_print(output, "let");
-    });
     DEFPRINT(AST_Var, function(self, output){
         self._do_print(output, "var");
     });
     DEFPRINT(AST_Const, function(self, output){
         self._do_print(output, "const");
     });
-    DEFPRINT(AST_Import, function(self, output) {
-        output.print("import");
-        output.space();
-        if (self.imported_name) {
-            self.imported_name.print(output);
-        }
-        if (self.imported_name && self.imported_names) {
-            output.print(",");
-            output.space();
-        }
-        if (self.imported_names) {
-            output.print("{");
-            self.imported_names.forEach(function(name_import, i) {
-                output.space();
-                name_import.print(output);
-                if (i < self.imported_names.length - 1) {
-                    output.print(",");
-                    output.space();
-                }
-            });
-            output.space();
-            output.print("}");
-        }
-        if (self.imported_name || self.imported_names) {
-            output.space();
-            output.print("from")
-            output.space();
-        }
-        self.module_name.print(output);
-        output.semicolon();
-    });
-
-    DEFPRINT(AST_NameImport, function(self, output) {
-        var definition = self.name.definition();
-        var names_are_different =
-            (definition && definition.mangled_name || self.name.name) !==
-            self.foreign_name.name;
-        if (names_are_different) {
-            output.print(self.foreign_name.name);
-            output.space();
-            output.print("as");
-            output.space();
-            self.name.print(output);
-        } else {
-            self.name.print(output);
-        }
-    });
-
-    DEFPRINT(AST_Export, function(self, output) {
-        output.print("export");
-        output.space();
-        if (self.is_default) {
-            output.print("default");
-            output.space();
-        }
-        if (self.exported_names) {
-            output.space();
-
-            if (self.exported_names.length === 1 && self.exported_names[0].name.name === "*") {
-                self.exported_names[0].print(output);
-            } else {
-                output.print("{");
-                self.exported_names.forEach(function (name_import, i) {
-                    output.space();
-                    name_import.print(output);
-                    if (i < self.exported_names.length - 1) {
-                        output.print(",");
-                        output.space();
-                    }
-                });
-                output.space();
-                output.print("}");
-            }
-            output.space();
-        }
-        else if (self.exported_value) {
-            self.exported_value.print(output);
-        } else if (self.exported_definition) {
-            self.exported_definition.print(output);
-        }
-        if (self.module_name) {
-            output.space();
-            output.print("from");
-            output.space();
-            self.module_name.print(output);
-        }
-        output.semicolon();
-    });
 
     function parenthesize_for_noin(node, output, noin) {
         if (!noin) node.print(output);
@@ -1481,35 +1207,8 @@ function OutputStream(options) {
         });
         else output.print("{}");
     });
-    DEFPRINT(AST_Class, function(self, output){
-        output.print("class");
-        output.space();
-        if (self.name) {
-            self.name.print(output);
-            output.space();
-        }
-        if (self.extends) {
-            output.print("extends");
-            output.space();
-            self.extends.print(output);
-            output.space();
-        }
-        if (self.properties.length > 0) output.with_block(function(){
-            self.properties.forEach(function(prop, i){
-                if (i) {
-                    output.newline();
-                }
-                output.indent();
-                prop.print(output);
-            });
-            output.newline();
-        });
-        else output.print("{}");
-    });
-    DEFPRINT(AST_NewTarget, function(self, output) {
-        output.print("new.target");
-    });
-    AST_ObjectProperty.DEFMETHOD("print_property_name", function(key, quote, output) {
+
+    function print_property_name(key, quote, output) {
         if (output.option("quote_keys")) {
             output.print_string(key + "");
         } else if ((typeof key == "number"
@@ -1526,108 +1225,33 @@ function OutputStream(options) {
         } else {
             output.print_string(key, quote);
         }
-    });
+    }
+
     DEFPRINT(AST_ObjectKeyVal, function(self, output){
-        function get_name(self) {
-            var def = self.definition();
-            return def ? def.mangled_name || def.name : self.name;
-        }
-
-        var allowShortHand = output.option("shorthand");
-        if (allowShortHand &&
-            self.value instanceof AST_Symbol &&
-            is_identifier_string(self.key) &&
-            get_name(self.value) === self.key
-        ) {
-            self.print_property_name(self.key, self.quote, output);
-
-        } else if (allowShortHand &&
-            self.value instanceof AST_DefaultAssign &&
-            self.value.left instanceof AST_Symbol &&
-            is_identifier_string(self.key) &&
-            get_name(self.value.left) === self.key
-        ) {
-            self.print_property_name(self.key, self.quote, output);
-            output.print("=");
-            self.value.right.print(output);
-        } else {
-            if (!(self.key instanceof AST_Node)) {
-                self.print_property_name(self.key, self.quote, output);
-            } else {
-                output.with_square(function() {
-                    self.key.print(output);
-                });
-            }
-            output.colon();
-            self.value.print(output);
-        }
+        print_property_name(self.key, self.quote, output);
+        output.colon();
+        self.value.print(output);
     });
-    AST_ObjectProperty.DEFMETHOD("_print_getter_setter", function(type, self, output) {
-        if (self.static) {
-            output.print("static");
-            output.space();
-        }
+    AST_ObjectProperty.DEFMETHOD("_print_getter_setter", function(type, output) {
         output.print(type);
         output.space();
-        if (self.key instanceof AST_SymbolMethod) {
-            self.print_property_name(self.key.name, self.quote, output);
-        } else {
-            output.with_square(function() {
-                self.key.print(output);
-            });
-        }
-        self.value._do_print(output, true);
+        print_property_name(this.key.name, this.quote, output);
+        this.value._do_print(output, true);
     });
     DEFPRINT(AST_ObjectSetter, function(self, output){
-        self._print_getter_setter("set", self, output);
+        self._print_getter_setter("set", output);
     });
     DEFPRINT(AST_ObjectGetter, function(self, output){
-        self._print_getter_setter("get", self, output);
+        self._print_getter_setter("get", output);
     });
-    DEFPRINT(AST_ConciseMethod, function(self, output){
-        if (self.static) {
-            output.print("static");
-            output.space();
-        }
-        if (self.is_generator) {
-            output.print("*");
-        }
-        output.space();
-        if (self.key instanceof AST_SymbolMethod) {
-            self.print_property_name(self.key.name, self.quote, output);
-        } else {
-            output.with_square(function() {
-                self.key.print(output);
-            });
-        }
-        self.value._do_print(output, true);
-    });
-    AST_Symbol.DEFMETHOD("_do_print", function(output){
-        var def = this.definition();
-        output.print_name(def ? def.mangled_name || def.name : this.name);
-    });
-    DEFPRINT(AST_Symbol, function (self, output) {
-        self._do_print(output);
-    });
-    DEFPRINT(AST_SymbolDeclaration, function(self, output){
-        self._do_print(output);
-    });
-    DEFPRINT(AST_Undefined, function(self, output){
-        output.print("void 0");
+    DEFPRINT(AST_Symbol, function(self, output){
+        var def = self.definition();
+        output.print_name(def ? def.mangled_name || def.name : self.name);
     });
     DEFPRINT(AST_Hole, noop);
-    DEFPRINT(AST_Infinity, function(self, output){
-        output.print("Infinity");
-    });
-    DEFPRINT(AST_NaN, function(self, output){
-        output.print("NaN");
-    });
     DEFPRINT(AST_This, function(self, output){
         output.print("this");
     });
-    DEFPRINT(AST_Super, function(self, output){
-        output.print("super");
-    });
     DEFPRINT(AST_Constant, function(self, output){
         output.print(self.getValue());
     });

lib/propmangle.js

@@ -44,27 +44,18 @@
 "use strict";
 
 function find_builtins() {
-
-    // Compatibility fix for some standard defined globals not defined on every js environment
-    var new_globals = ["Symbol", "Map", "Promise", "Proxy", "Reflect", "Set", "WeakMap", "WeakSet"];
-    var objects = {};
-
-    new_globals.forEach(function (new_global) {
-        objects[new_global] = global[new_global] || new Function();
-    });
-
-    var a = [];
+    // NaN will be included due to Number.NaN
+    var a = [
+        "null",
+        "true",
+        "false",
+        "Infinity",
+        "-Infinity",
+        "undefined",
+    ];
     [ Object, Array, Function, Number,
       String, Boolean, Error, Math,
-      Date, RegExp, objects.Symbol, ArrayBuffer,
-      DataView, decodeURI, decodeURIComponent,
-      encodeURI, encodeURIComponent, eval, EvalError,
-      Float32Array, Float64Array, Int8Array, Int16Array,
-      Int32Array, isFinite, isNaN, JSON, objects.Map, parseFloat,
-      parseInt, objects.Promise, objects.Proxy, RangeError, ReferenceError,
-      objects.Reflect, objects.Set, SyntaxError, TypeError, Uint8Array,
-      Uint8ClampedArray, Uint16Array, Uint32Array, URIError,
-      objects.WeakMap, objects.WeakSet
+      Date, RegExp
     ].forEach(function(ctor){
         Object.getOwnPropertyNames(ctor).map(add);
         if (ctor.prototype) {
@@ -79,12 +70,12 @@ function find_builtins() {
 
 function mangle_properties(ast, options) {
     options = defaults(options, {
-        reserved : null,
-        cache : null,
-        only_cache : false,
-        regex : null,
-        ignore_quoted : false,
-        debug : false
+        cache: null,
+        debug: false,
+        ignore_quoted: false,
+        only_cache: false,
+        regex: null,
+        reserved: null,
     });
 
     var reserved = options.reserved;
@@ -130,9 +121,6 @@ function mangle_properties(ast, options) {
         else if (node instanceof AST_Sub) {
             addStrings(node.property, ignore_quoted);
         }
-        else if (node instanceof AST_ConciseMethod) {
-            add(node.name.name);
-        }
     }));
 
     // step 2: transform the tree, renaming properties
@@ -152,11 +140,6 @@ function mangle_properties(ast, options) {
             if (!ignore_quoted)
                 node.property = mangleStrings(node.property);
         }
-        else if (node instanceof AST_ConciseMethod) {
-            if (should_mangle(node.name.name)) {
-                node.name.name = mangle(node.name.name);
-            }
-        }
         // else if (node instanceof AST_String) {
         //     if (should_mangle(node.value)) {
         //         AST_Node.warn(
@@ -174,13 +157,12 @@ function mangle_properties(ast, options) {
     // only function declarations after this line
 
     function can_mangle(name) {
-        if (!is_identifier(name)) return false;
         if (unmangleable.indexOf(name) >= 0) return false;
         if (reserved.indexOf(name) >= 0) return false;
         if (options.only_cache) {
             return cache.props.has(name);
         }
-        if (/^[0-9.]+$/.test(name)) return false;
+        if (/^-?[0-9]+(\.[0-9]+)?(e[+-][0-9]+)?$/.test(name)) return false;
         return true;
     }
 

lib/scope.js

@@ -49,9 +49,7 @@ function SymbolDef(scope, index, orig) {
     this.scope = scope;
     this.references = [];
     this.global = false;
-    this.export = false;
     this.mangled_name = null;
-    this.object_destructuring_arg = false;
     this.undeclared = false;
     this.index = index;
     this.id = SymbolDef.next_id++;
@@ -64,17 +62,11 @@ SymbolDef.prototype = {
         if (!options) options = {};
 
         return (this.global && !options.toplevel)
-            || this.export
-            || this.object_destructuring_arg
             || this.undeclared
             || (!options.eval && (this.scope.uses_eval || this.scope.uses_with))
             || (options.keep_fnames
                 && (this.orig[0] instanceof AST_SymbolLambda
-                    || this.orig[0] instanceof AST_SymbolDefun))
-            || this.orig[0] instanceof AST_SymbolMethod
-            || (options.keep_classnames
-                && (this.orig[0] instanceof AST_SymbolClass
-                    || this.orig[0] instanceof AST_SymbolDefClass));
+                    || this.orig[0] instanceof AST_SymbolDefun));
     },
     mangle: function(options) {
         var cache = options.cache && options.cache.props;
@@ -87,9 +79,7 @@ SymbolDef.prototype = {
             if (!options.screw_ie8 && sym instanceof AST_SymbolLambda)
                 s = s.parent_scope;
             var def;
-            if (options.screw_ie8
-                && sym instanceof AST_SymbolCatch
-                && (def = s.parent_scope.find_variable(sym))) {
+            if (this.defun && (def = this.defun.variables.get(this.name))) {
                 this.mangled_name = def.mangled_name || def.name;
             } else
                 this.mangled_name = s.next_mangled(options, this);
@@ -102,8 +92,8 @@ SymbolDef.prototype = {
 
 AST_Toplevel.DEFMETHOD("figure_out_scope", function(options){
     options = defaults(options, {
+        cache: null,
         screw_ie8: true,
-        cache: null
     });
 
     // pass 1: setup scope chaining and handle definitions
@@ -111,29 +101,15 @@ AST_Toplevel.DEFMETHOD("figure_out_scope", function(options){
     var scope = self.parent_scope = null;
     var labels = new Dictionary();
     var defun = null;
-    var in_destructuring = null;
-    var in_export = false;
-    var in_block = 0;
     var tw = new TreeWalker(function(node, descend){
-        if (node.is_block_scope()) {
+        if (node instanceof AST_Catch) {
             var save_scope = scope;
             scope = new AST_Scope(node);
             scope.init_scope_vars(save_scope);
-            if (!(node instanceof AST_Scope)) {
-                scope.uses_with = save_scope.uses_with;
-                scope.uses_eval = save_scope.uses_eval;
-                scope.directives = save_scope.directives;
-            }
             descend();
             scope = save_scope;
             return true;
         }
-        if (node instanceof AST_Destructuring && node.is_array === false) {
-            in_destructuring = node;  // These don't nest
-            descend();
-            in_destructuring = null;
-            return true;
-        }
         if (node instanceof AST_Scope) {
             node.init_scope_vars(scope);
             var save_scope = scope;
@@ -147,22 +123,6 @@ AST_Toplevel.DEFMETHOD("figure_out_scope", function(options){
             labels = save_labels;
             return true;        // don't descend again in TreeWalker
         }
-        if (node instanceof AST_Export) {
-            in_export = true;
-            descend();
-            in_export = false;
-            return true;
-        }
-        if (node instanceof AST_BlockStatement
-            || node instanceof AST_Switch
-            || node instanceof AST_Try
-            || node instanceof AST_Catch
-            || node instanceof AST_Finally) {
-            in_block++;
-            descend();
-            in_block--;
-            return true;
-        }
         if (node instanceof AST_LabeledStatement) {
             var l = node.label;
             if (labels.has(l.name)) {
@@ -181,15 +141,12 @@ AST_Toplevel.DEFMETHOD("figure_out_scope", function(options){
         if (node instanceof AST_Symbol) {
             node.scope = scope;
         }
-        if (node instanceof AST_SymbolFunarg) {
-            node.object_destructuring_arg = !!in_destructuring;
-        }
         if (node instanceof AST_Label) {
             node.thedef = node;
             node.references = [];
         }
         if (node instanceof AST_SymbolLambda) {
-            defun.def_function(node, in_export, in_block);
+            defun.def_function(node);
         }
         else if (node instanceof AST_SymbolDefun) {
             // Careful here, the scope where this should be defined is
@@ -197,28 +154,11 @@ AST_Toplevel.DEFMETHOD("figure_out_scope", function(options){
             // scope when we encounter the AST_Defun node (which is
             // instanceof AST_Scope) but we get to the symbol a bit
             // later.
-            var parent_lambda = defun.parent_scope;
-            while (parent_lambda.is_block_scope()) {
-                parent_lambda = parent_lambda.parent_scope;
-            }
-            (node.scope = parent_lambda).def_function(node, in_export, in_block);
-        }
-        else if (node instanceof AST_SymbolClass) {
-            defun.def_variable(node, in_export, in_block);
-        }
-        else if (node instanceof AST_SymbolImport) {
-            scope.def_variable(node, in_export, in_block);
-        }
-        else if (node instanceof AST_SymbolDefClass) {
-            // This deals with the name of the class being available
-            // inside the class.
-            (node.scope = defun.parent_scope).def_function(node, in_export, in_block);
+            (node.scope = defun.parent_scope).def_function(node);
         }
         else if (node instanceof AST_SymbolVar
-            || node instanceof AST_SymbolLet
             || node instanceof AST_SymbolConst) {
-            var def = ((node instanceof AST_SymbolBlockDeclaration) ? scope : defun).def_variable(node, in_export, in_block);
-            def.destructuring = in_destructuring;
+            defun.def_variable(node);
             if (defun !== scope) {
                 node.mark_enclosed(options);
                 var def = scope.find_variable(node);
@@ -229,7 +169,7 @@ AST_Toplevel.DEFMETHOD("figure_out_scope", function(options){
             }
         }
         else if (node instanceof AST_SymbolCatch) {
-            scope.def_variable(node, in_export, in_block);
+            scope.def_variable(node).defun = defun;
         }
         else if (node instanceof AST_LabelRef) {
             var sym = labels.get(node.name);
@@ -245,7 +185,6 @@ AST_Toplevel.DEFMETHOD("figure_out_scope", function(options){
 
     // pass 2: find back references and eval
     var func = null;
-    var cls = null;
     var globals = self.globals = new Dictionary();
     var tw = new TreeWalker(function(node, descend){
         if (node instanceof AST_Lambda) {
@@ -255,13 +194,6 @@ AST_Toplevel.DEFMETHOD("figure_out_scope", function(options){
             func = prev_func;
             return true;
         }
-        if (node instanceof AST_Class) {
-            var prev_cls = cls;
-            cls = node;
-            descend();
-            cls = prev_cls;
-            return true;
-        }
         if (node instanceof AST_LoopControl && node.label) {
             node.label.thedef.references.push(node);
             return true;
@@ -293,7 +225,7 @@ AST_Toplevel.DEFMETHOD("figure_out_scope", function(options){
             if (node instanceof AST_SymbolCatch) {
                 var name = node.name;
                 var refs = node.thedef.references;
-                var scope = node.thedef.scope.parent_scope.parent_scope;
+                var scope = node.thedef.defun;
                 var def = scope.find_variable(name) || self.globals.get(name) || scope.def_variable(node);
                 refs.forEach(function(ref) {
                     ref.thedef = def;
@@ -333,23 +265,6 @@ AST_Scope.DEFMETHOD("init_scope_vars", function(parent_scope){
     this.cname = -1;                    // the current index for mangling functions/variables
 });
 
-AST_Node.DEFMETHOD("is_block_scope", function(){
-    return false; // Behaviour will be overridden by AST_Block
-});
-
-AST_Block.DEFMETHOD("is_block_scope", function(){
-    return (
-        !(this instanceof AST_Lambda) &&
-        !(this instanceof AST_Toplevel) &&
-        !(this instanceof AST_Class) &&
-        !(this instanceof AST_SwitchBranch)
-    );
-});
-
-AST_IterationStatement.DEFMETHOD("is_block_scope", function(){
-     return true;
-});
-
 AST_Lambda.DEFMETHOD("init_scope_vars", function(){
     AST_Scope.prototype.init_scope_vars.apply(this, arguments);
     this.uses_arguments = false;
@@ -386,24 +301,16 @@ AST_Scope.DEFMETHOD("find_variable", function(name){
         || (this.parent_scope && this.parent_scope.find_variable(name));
 });
 
-AST_Scope.DEFMETHOD("def_function", function(symbol, in_export, in_block){
-    this.functions.set(symbol.name, this.def_variable(symbol, in_export, in_block));
+AST_Scope.DEFMETHOD("def_function", function(symbol){
+    this.functions.set(symbol.name, this.def_variable(symbol));
 });
 
-AST_Scope.DEFMETHOD("def_variable", function(symbol, in_export, in_block){
+AST_Scope.DEFMETHOD("def_variable", function(symbol){
     var def;
     if (!this.variables.has(symbol.name)) {
         def = new SymbolDef(this, this.variables.size(), symbol);
         this.variables.set(symbol.name, def);
-        def.object_destructuring_arg = symbol.object_destructuring_arg;
-        if (in_export) {
-            def.export = true;
-        }
-        if (in_block && symbol instanceof AST_SymbolBlockDeclaration) {
-            def.global = false;
-        } else {
-            def.global = !this.parent_scope;
-        }
+        def.global = !this.parent_scope;
     } else {
         def = this.variables.get(symbol.name);
         def.orig.push(symbol);
@@ -451,13 +358,7 @@ AST_Function.DEFMETHOD("next_mangled", function(options, def){
 });
 
 AST_Symbol.DEFMETHOD("unmangleable", function(options){
-    var def = this.definition();
-    return def && def.unmangleable(options);
-});
-
-// property accessors are not mangleable
-AST_SymbolAccessor.DEFMETHOD("unmangleable", function(){
-    return true;
+    return this.definition().unmangleable(options);
 });
 
 // labels are always mangleable
@@ -492,13 +393,12 @@ AST_Symbol.DEFMETHOD("global", function(){
 
 AST_Toplevel.DEFMETHOD("_default_mangler_options", function(options){
     return defaults(options, {
-        except      : [],
         eval        : false,
+        except      : [],
+        keep_fnames : false,
+        screw_ie8   : true,
         sort        : false, // Ignored. Flag retained for backwards compatibility.
         toplevel    : false,
-        screw_ie8   : true,
-        keep_fnames : false,
-        keep_classnames : false
     });
 });
 
@@ -547,19 +447,13 @@ AST_Toplevel.DEFMETHOD("mangle_names", function(options){
             node.mangled_name = name;
             return true;
         }
-        var mangle_with_block_scope =
-            (options.screw_ie8 && node instanceof AST_SymbolCatch) ||
-            node instanceof AST_SymbolBlockDeclaration;
-        if (mangle_with_block_scope) {
+        if (options.screw_ie8 && node instanceof AST_SymbolCatch) {
             to_mangle.push(node.definition());
             return;
         }
     });
     this.walk(tw);
-    to_mangle.forEach(function(def){
-        if (def.destructuring && !def.destructuring.is_array) return;
-        def.mangle(options);
-    });
+    to_mangle.forEach(function(def){ def.mangle(options) });
 
     if (options.cache) {
         options.cache.cname = this.cname;
@@ -610,27 +504,21 @@ AST_Toplevel.DEFMETHOD("compute_char_frequency", function(options){
         else if (node instanceof AST_With)
             base54.consider("with");
         else if (node instanceof AST_ObjectSetter)
-            base54.consider("set" + (typeof node.key === "string" ? node.key : ""));
+            base54.consider("set" + node.key);
         else if (node instanceof AST_ObjectGetter)
-            base54.consider("get" + (typeof node.key === "string" ? node.key : ""));
-        else if (node instanceof AST_ObjectKeyVal && typeof node.key === "string")
-            base54.consider(node.key);
-        else if (node instanceof AST_ConciseMethod && typeof node.key === "string")
+            base54.consider("get" + node.key);
+        else if (node instanceof AST_ObjectKeyVal)
             base54.consider(node.key);
         else if (node instanceof AST_New)
             base54.consider("new");
         else if (node instanceof AST_This)
             base54.consider("this");
-        else if (node instanceof AST_Super)
-            base54.consider("super");
         else if (node instanceof AST_Try)
             base54.consider("try");
         else if (node instanceof AST_Catch)
             base54.consider("catch");
         else if (node instanceof AST_Finally)
             base54.consider("finally");
-        else if (node instanceof AST_Yield)
-            base54.consider("yield");
         else if (node instanceof AST_Symbol && node.unmangleable(options))
             base54.consider(node.name);
         else if (node instanceof AST_Unary || node instanceof AST_Binary)
@@ -683,12 +571,12 @@ var base54 = (function() {
 
 AST_Toplevel.DEFMETHOD("scope_warnings", function(options){
     options = defaults(options, {
-        undeclared       : false, // this makes a lot of noise
-        unreferenced     : true,
         assign_to_global : true,
+        eval             : true,
         func_arguments   : true,
         nested_defuns    : true,
-        eval             : true
+        undeclared       : false, // this makes a lot of noise
+        unreferenced     : true,
     });
     var tw = new TreeWalker(function(node){
         if (options.undeclared

lib/transform.js

@@ -163,18 +163,10 @@ TreeTransformer.prototype = new TreeWalker;
         if (self.value) self.value = self.value.transform(tw);
     });
 
-    _(AST_Destructuring, function(self, tw) {
-        self.names = do_list(self.names, tw);
-    });
-
     _(AST_Lambda, function(self, tw){
         if (self.name) self.name = self.name.transform(tw);
         self.argnames = do_list(self.argnames, tw);
-        if (self.body instanceof AST_Node) {
-            self.body = self.body.transform(tw);
-        } else {
-            self.body = do_list(self.body, tw);
-        }
+        self.body = do_list(self.body, tw);
     });
 
     _(AST_Call, function(self, tw){
@@ -196,10 +188,6 @@ TreeTransformer.prototype = new TreeWalker;
         self.property = self.property.transform(tw);
     });
 
-    _(AST_Yield, function(self, tw){
-        if (self.expression) self.expression = self.expression.transform(tw);
-    });
-
     _(AST_Unary, function(self, tw){
         self.expression = self.expression.transform(tw);
     });
@@ -224,32 +212,7 @@ TreeTransformer.prototype = new TreeWalker;
     });
 
     _(AST_ObjectProperty, function(self, tw){
-        if (self.key instanceof AST_Node) {
-            self.key = self.key.transform(tw);
-        }
         self.value = self.value.transform(tw);
     });
 
-    _(AST_Class, function(self, tw){
-        if (self.name) self.name = self.name.transform(tw);
-        if (self.extends) self.extends = self.extends.transform(tw);
-        self.properties = do_list(self.properties, tw);
-    });
-
-    _(AST_Expansion, function(self, tw){
-        self.expression = self.expression.transform(tw);
-    });
-
-    _(AST_TemplateString, function(self, tw) {
-        for (var i = 0; i < self.segments.length; i++) {
-            if (!(self.segments[i] instanceof AST_TemplateSegment)) {
-                self.segments[i] = self.segments[i].transform(tw);
-            }
-        }
-    });
-
-    _(AST_PrefixedTemplateString, function(self, tw) {
-        self.template_string = self.template_string.transform(tw);
-    });
-
 })();

package.json

@@ -4,7 +4,7 @@
   "homepage": "http://lisperator.net/uglifyjs",
   "author": "Mihai Bazon <mihai.bazon@gmail.com> (http://lisperator.net/)",
   "license": "BSD-2-Clause",
-  "version": "2.8.17",
+  "version": "2.8.29",
   "engines": {
     "node": ">=0.8.0"
   },
@@ -33,10 +33,7 @@
     "yargs": "~3.10.0"
   },
   "devDependencies": {
-    "acorn": "~0.6.0",
-    "escodegen": "~1.3.3",
-    "esfuzz": "~0.3.1",
-    "estraverse": "~1.5.1",
+    "acorn": "~5.0.3",
     "mocha": "~2.3.4"
   },
   "optionalDependencies": {

test/benchmark.js

@@ -11,8 +11,8 @@ if (!args.length) {
 }
 args.push("--stats");
 var urls = [
-    "https://code.jquery.com/jquery-3.1.1.js",
-    "https://code.angularjs.org/1.6.1/angular.js",
+    "https://code.jquery.com/jquery-3.2.1.js",
+    "https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.6.4/angular.js",
     "https://cdnjs.cloudflare.com/ajax/libs/mathjs/3.9.0/math.js",
     "https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.js",
     "https://unpkg.com/react@15.3.2/dist/react.js",

test/compress/arrays.js

@@ -1,5 +1,3 @@
-// NOTE trailing comma doesn't contribute to length of an array
-// That also means the array changes length if previous element is a hole too and got cut off
 holes_and_undefined: {
     input: {
         w = [1,,];
@@ -93,79 +91,6 @@ constant_join_2: {
     }
 }
 
-spread_with_variable_as_last_element: {
-    input: {
-        var values = [4, 5, 6];
-        var a = [1, 2, 3, ...values];
-    }
-    expect: {
-        var values = [4, 5, 6];
-        var a = [1, 2, 3, ...values];
-    }
-}
-
-spread_with_variable_in_middle: {
-    input: {
-        var values = [4, 5, 6];
-        var a = [1, 2, 3, ...values, 7,,,];
-    }
-    expect: {
-        var values = [4, 5, 6];
-        var a = [1, 2, 3, ...values, 7,,,];
-    }
-}
-
-spread_with_variable_at_front: {
-    input: {
-        var values = [1, 2, 3];
-        var a = [...values, 4, 5, 6];
-    }
-    expect: {
-        var values = [1, 2, 3];
-        var a = [...values, 4, 5, 6];
-    }
-}
-
-spread_with_variable_at_front_after_elisions: {
-    input: {
-        var values = [1, 2, 3];
-        var a = [,,,...values, 4, 5, 6];
-    }
-    expect: {
-        var values = [1, 2, 3];
-        var a = [,,,...values, 4, 5, 6];
-    }
-}
-
-spread_with_array_at_end: {
-    input: {
-        var a = [1, 2, ...[4, 5, 6]];
-    }
-    expect: {
-        var a = [1, 2, ...[4, 5, 6]];
-    }
-}
-
-spread_with_logical_expression_at_end: {
-    options = { evaluate: true }
-    input: {
-        var a = [1, 2, 3, ...[2+2]]
-    }
-    expect: {
-        var a = [1, 2, 3, ...[4]]
-    }
-}
-
-spread_with_logical_expression_at_middle: {
-    options = { evaluate: true }
-    input: {
-        var a = [1, 1, ...[1+1, 1+2, 2+3], 8]
-    }
-    expect: {
-        var a = [1, 1, ...[2, 3, 5], 8]
-    }
-}
-
 constant_join_3: {
     options = {
         unsafe: true,

test/compress/arrow.js

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

test/compress/block-scope.js

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

test/compress/collapse_vars.js

@@ -1330,7 +1330,6 @@ collapse_vars_regexp: {
 issue_1537: {
     options = {
         collapse_vars: true,
-        toplevel: true,
     }
     input: {
         var k = '';
@@ -1342,104 +1341,6 @@ issue_1537: {
     }
 }
 
-issue_1537_for_of: {
-    options = {
-        collapse_vars: true,
-        toplevel: true,
-    }
-    input: {
-        var k = '';
-        for (k of {prop: 'val'}){}
-    }
-    expect: {
-        var k = '';
-        for (k of {prop: 'val'});
-    }
-}
-
-issue_1537_destructuring_1: {
-    options = {
-        collapse_vars: true,
-        toplevel: true,
-    }
-    input: {
-        var x = 1, y = 2;
-        [x] = [y];
-    }
-    expect: {
-        var x = 1;
-        [x] = [2];
-    }
-}
-
-issue_1537_destructuring_2: {
-    options = {
-        collapse_vars: true,
-        toplevel: true,
-    }
-    input: {
-        var x = foo();
-        [x] = [1];
-    }
-    expect: {
-        var x = foo();
-        [x] = [1];
-    }
-}
-
-issue_1537_destructuring_3: {
-    options = {
-        collapse_vars: true,
-        toplevel: true,
-    }
-    input: {
-        var x = Math.random();
-        ({p: x = 9} = {v: 1});
-    }
-    expect: {
-        var x = Math.random();
-        ({p: x = 9} = {v: 1});
-    }
-}
-
-issue_1537_destructuring_for_in: {
-    options = {
-        collapse_vars: true,
-        toplevel: true,
-    }
-    input: {
-        var x = 1, y = 2;
-        (function() {
-            for ([[x], y] in a);
-        })();
-    }
-    expect: {
-        var x = 1, y = 2;
-        (function() {
-            for ([[x], y] in a);
-        })();
-    }
-}
-
-issue_1537_destructuring_for_of: {
-    options = {
-        collapse_vars: true,
-        toplevel: true,
-    }
-    input: {
-        var x = 1, y = 2;
-        (function() {
-            for ([[x], y] of a);
-        })();
-    }
-    expect: {
-        var x = 1, y = 2;
-        (function() {
-            for ([[x], y] of a);
-        })();
-    }
-}
-
 issue_1562: {
     options = {
         collapse_vars: true,
@@ -1672,6 +1573,7 @@ var_side_effects_3: {
     options = {
         collapse_vars: true,
         pure_getters: true,
+        unsafe: true,
     }
     input: {
         var print = console.log.bind(console);
@@ -1690,3 +1592,49 @@ var_side_effects_3: {
     }
     expect_stdout: true
 }
+
+reassign_const_1: {
+    options = {
+        collapse_vars: true,
+    }
+    input: {
+        function f() {
+            const a = 1;
+            a = 2;
+            return a;
+        }
+        console.log(f());
+    }
+    expect: {
+        function f() {
+            const a = 1;
+            a = 2;
+            return a;
+        }
+        console.log(f());
+    }
+    expect_stdout: true
+}
+
+reassign_const_2: {
+    options = {
+        collapse_vars: true,
+    }
+    input: {
+        function f() {
+            const a = 1;
+            ++a;
+            return a;
+        }
+        console.log(f());
+    }
+    expect: {
+        function f() {
+            const a = 1;
+            ++a;
+            return a;
+        }
+        console.log(f());
+    }
+    expect_stdout: true
+}

test/compress/conditionals.js

@@ -962,3 +962,56 @@ condition_symbol_matches_consequent: {
     }
     expect_stdout: "3 7 true 4"
 }
+
+delete_conditional_1: {
+    options = {
+        booleans: true,
+        conditionals: true,
+        evaluate: true,
+        side_effects: true,
+    }
+    input: {
+        console.log(delete (1 ? undefined : x));
+        console.log(delete (1 ? void 0 : x));
+        console.log(delete (1 ? Infinity : x));
+        console.log(delete (1 ? 1 / 0 : x));
+        console.log(delete (1 ? NaN : x));
+        console.log(delete (1 ? 0 / 0 : x));
+    }
+    expect: {
+        console.log((void 0, !0));
+        console.log((void 0, !0));
+        console.log((1 / 0, !0));
+        console.log((1 / 0, !0));
+        console.log((NaN, !0));
+        console.log((NaN, !0));
+    }
+    expect_stdout: true
+}
+
+delete_conditional_2: {
+    options = {
+        booleans: true,
+        conditionals: true,
+        evaluate: true,
+        keep_infinity: true,
+        side_effects: true,
+    }
+    input: {
+        console.log(delete (0 ? x : undefined));
+        console.log(delete (0 ? x : void 0));
+        console.log(delete (0 ? x : Infinity));
+        console.log(delete (0 ? x : 1 / 0));
+        console.log(delete (0 ? x : NaN));
+        console.log(delete (0 ? x : 0 / 0));
+    }
+    expect: {
+        console.log((void 0, !0));
+        console.log((void 0, !0));
+        console.log((Infinity, !0));
+        console.log((1 / 0, !0));
+        console.log((NaN, !0));
+        console.log((NaN, !0));
+    }
+    expect_stdout: true
+}

test/compress/dead-code.js

@@ -90,28 +90,6 @@ dead_code_constant_boolean_should_warn_more: {
     expect_stdout: true
 }
 
-dead_code_block_decls_die: {
-    options = {
-        dead_code    : true,
-        conditionals : true,
-        booleans     : true,
-        evaluate     : true
-    };
-    input: {
-        if (0) {
-            let foo = 6;
-            const bar = 12;
-            class Baz {};
-            var qux;
-        }
-        console.log(foo, bar, Baz);
-    }
-    expect: {
-        var qux;
-        console.log(foo, bar, Baz);
-    }
-}
-
 dead_code_const_declaration: {
     options = {
         dead_code    : true,
@@ -236,3 +214,61 @@ dead_code_const_annotation_complex_scope: {
     }
     expect_stdout: true
 }
+
+try_catch_finally: {
+    options = {
+        conditionals: true,
+        dead_code: true,
+        evaluate: true,
+    }
+    input: {
+        var a = 1;
+        !function() {
+            try {
+                if (false) throw x;
+            } catch (a) {
+                var a = 2;
+                console.log("FAIL");
+            } finally {
+                a = 3;
+                console.log("PASS");
+            }
+        }();
+        try {
+            console.log(a);
+        } finally {
+        }
+    }
+    expect: {
+        var a = 1;
+        !function() {
+            var a;
+            a = 3;
+            console.log("PASS");
+        }();
+        try {
+            console.log(a);
+        } finally {
+        }
+    }
+    expect_stdout: [
+        "PASS",
+        "1",
+    ]
+}
+
+accessor: {
+    options = {
+        side_effects: true,
+    }
+    input: {
+        ({
+            get a() {},
+            set a(v){
+                this.b = 2;
+            },
+            b: 1
+        });
+    }
+    expect: {}
+}

test/compress/destructuring.js

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

test/compress/directives.js

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

test/compress/drop-unused.js

@@ -164,87 +164,6 @@ used_var_in_catch: {
     }
 }
 
-unused_block_decls_in_catch: {
-    options = { unused: true };
-    input: {
-        function foo() {
-            try {
-                foo();
-            } catch(ex) {
-                let x = 10;
-                const y = 10;
-                class Zee {};
-            }
-        }
-    }
-    expect: {
-        function foo() {
-            try {
-                foo();
-            } catch(ex) {}
-        }
-    }
-}
-
-used_block_decls_in_catch: {
-    options = { unused: true };
-    input: {
-        function foo() {
-            try {
-                foo();
-            } catch(ex) {
-                let x = 10;
-                const y = 10;
-                class Zee {};
-            }
-            console.log(x, y, Zee);
-        }
-    }
-    expect: {
-        function foo() {
-            try {
-                foo();
-            } catch(ex) {}
-            console.log(x, y, Zee);
-        }
-    }
-}
-
-unused_block_decls: {
-    options = { unused: true };
-    input: {
-        function foo() {
-            {
-                const x;
-            }
-            {
-                let y;
-            }
-            console.log(x, y);
-        }
-    }
-    expect: {
-        function foo() {
-            console.log(x, y);
-        }
-    }
-}
-
-unused_keep_harmony_destructuring: {
-    options = { unused: true };
-    input: {
-        function foo() {
-            var {x, y} = foo;
-            var a = foo;
-        }
-    }
-    expect:  {
-        function foo() {
-            var {x, y} = foo;
-        }
-    }
-}
-
 keep_fnames: {
     options = { unused: true, keep_fnames: true, unsafe: true };
     input: {
@@ -934,7 +853,9 @@ issue_1715_1: {
         var a = 1;
         function f() {
             a++;
-            try {} catch (a) {
+            try {
+                x();
+            } catch (a) {
                 var a;
             }
         }
@@ -945,7 +866,9 @@ issue_1715_1: {
         var a = 1;
         function f() {
             a++;
-            try {} catch (a) {
+            try {
+                x();
+            } catch (a) {
                 var a;
             }
         }
@@ -963,7 +886,9 @@ issue_1715_2: {
         var a = 1;
         function f() {
             a++;
-            try {} catch (a) {
+            try {
+                x();
+            } catch (a) {
                 var a = 2;
             }
         }
@@ -974,7 +899,9 @@ issue_1715_2: {
         var a = 1;
         function f() {
             a++;
-            try {} catch (a) {
+            try {
+                x();
+            } catch (a) {
                 var a;
             }
         }
@@ -992,7 +919,9 @@ issue_1715_3: {
         var a = 1;
         function f() {
             a++;
-            try {} catch (a) {
+            try {
+                console;
+            } catch (a) {
                 var a = 2 + x();
             }
         }
@@ -1003,7 +932,9 @@ issue_1715_3: {
         var a = 1;
         function f() {
             a++;
-            try {} catch (a) {
+            try {
+                console;
+            } catch (a) {
                 var a = x();
             }
         }
@@ -1012,3 +943,149 @@ issue_1715_3: {
     }
     expect_stdout: "1"
 }
+
+issue_1715_4: {
+    options = {
+        unused: true,
+    }
+    input: {
+        var a = 1;
+        !function a() {
+            a++;
+            try {
+                x();
+            } catch (a) {
+                var a;
+            }
+        }();
+        console.log(a);
+    }
+    expect: {
+        var a = 1;
+        !function() {
+            a++;
+            try {
+                x();
+            } catch (a) {
+                var a;
+            }
+        }();
+        console.log(a);
+    }
+    expect_stdout: "1"
+}
+
+delete_assign_1: {
+    options = {
+        booleans: true,
+        side_effects: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        var a;
+        console.log(delete (a = undefined));
+        console.log(delete (a = void 0));
+        console.log(delete (a = Infinity));
+        console.log(delete (a = 1 / 0));
+        console.log(delete (a = NaN));
+        console.log(delete (a = 0 / 0));
+    }
+    expect: {
+        console.log((void 0, !0));
+        console.log((void 0, !0));
+        console.log((1 / 0, !0));
+        console.log((1 / 0, !0));
+        console.log((NaN, !0));
+        console.log((0 / 0, !0));
+    }
+    expect_stdout: true
+}
+
+delete_assign_2: {
+    options = {
+        booleans: true,
+        keep_infinity: true,
+        side_effects: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        var a;
+        console.log(delete (a = undefined));
+        console.log(delete (a = void 0));
+        console.log(delete (a = Infinity));
+        console.log(delete (a = 1 / 0));
+        console.log(delete (a = NaN));
+        console.log(delete (a = 0 / 0));
+    }
+    expect: {
+        console.log((void 0, !0));
+        console.log((void 0, !0));
+        console.log((Infinity, !0));
+        console.log((1 / 0, !0));
+        console.log((NaN, !0));
+        console.log((0 / 0, !0));
+    }
+    expect_stdout: true
+}
+
+issue_1830_1: {
+    options = {
+        unused: true,
+    }
+    input: {
+        !function() {
+            L: for (var b = console.log(1); !1;) continue L;
+        }();
+    }
+    expect: {
+        !function() {
+            L: for (console.log(1); !1;) continue L;
+        }();
+    }
+    expect_stdout: "1"
+}
+
+issue_1830_2: {
+    options = {
+        unused: true,
+    }
+    input: {
+        !function() {
+            L: for (var a = 1, b = console.log(a); --a;) continue L;
+        }();
+    }
+    expect: {
+        !function() {
+            var a = 1;
+            L: for (console.log(a); --a;) continue L;
+        }();
+    }
+    expect_stdout: "1"
+}
+
+reassign_const: {
+    options = {
+        cascade: true,
+        sequences: true,
+        side_effects: true,
+        unused: true,
+    }
+    input: {
+        function f() {
+            const a = 1;
+            a = 2;
+            return a;
+        }
+        console.log(f());
+    }
+    expect: {
+        function f() {
+            const a = 1;
+            return a = 2, a;
+        }
+        console.log(f());
+    }
+    expect_stdout: true
+}

test/compress/evaluate.js

@@ -196,8 +196,8 @@ negative_zero: {
         console.log(
             -0,
             0,
-            1 / (-0),
-            1 / (-0)
+            -1/0,
+            -1/0
         );
     }
     expect_stdout: true
@@ -217,107 +217,13 @@ positive_zero: {
         console.log(
             0,
             -0,
-            1 / (0),
-            1 / (0)
+            1/0,
+            1/0
         );
     }
     expect_stdout: true
 }
 
-pow: {
-    options = { evaluate: true }
-    input: {
-        var a = 5 ** 3;
-    }
-    expect: {
-        var a = 125;
-    }
-}
-
-pow_sequence: {
-    options = {
-        evaluate: true
-    }
-    input: {
-        var a = 2 ** 3 ** 2;
-    }
-    expect: {
-        var a = 512;
-    }
-}
-
-pow_mixed: {
-    options = {
-        evaluate: true
-    }
-    input: {
-        var a = 5 + 2 ** 3 + 5;
-        var b = 5 * 3 ** 2;
-        var c = 5 ** 3 * 2;
-        var d = 5 ** +3;
-    }
-    expect: {
-        var a = 18;
-        var b = 45;
-        var c = 250;
-        var d = 125;
-    }
-}
-
-pow_with_right_side_evaluating_to_unary: {
-    options = {
-        evaluate: true
-    }
-    input: {
-        var a = (4 - 7) ** foo;
-        var b = ++bar ** 3;
-        var c = --baz ** 2;
-    }
-    expect_exact: "var a=(-3)**foo;var b=++bar**3;var c=--baz**2;"
-}
-
-pow_with_number_constants: {
-    options = {
-        evaluate: true
-    }
-    input: {
-        var a = 5 ** NaN;
-        /* NaN exponent results to NaN */
-        var b = 42 ** +0;
-        /* +0 exponent results to NaN */
-        var c = 42 ** -0;
-        /* -0 exponent results to NaN */
-        var d = NaN ** 1;
-        /* NaN with non-zero exponent is NaN */
-        var e = 2 ** Infinity;
-        /* abs(base) > 1 with Infinity as exponent is Infinity */
-        var f = 2 ** -Infinity;
-        /* abs(base) > 1 with -Infinity as exponent is +0 */
-        var g = (-7) ** (0.5);
-        var h = 2324334 ** 34343443;
-        var i = (-2324334) ** 34343443;
-        var j = 2 ** (-3);
-        var k = 2.0 ** -3;
-        var l = 2.0 ** (5 - 7);
-        var m = 3 ** -10;  // Result will be 0.000016935087808430286, which is too long
-    }
-    expect: {
-        var a = NaN;
-        var b = 1;
-        var c = 1;
-        var d = NaN;
-        var e = Infinity;
-        var f = 0;
-        var g = NaN;
-        var h = Infinity;
-        var i = -Infinity;
-        var j = .125;
-        var k = .125;
-        var l = .25;
-        var m = 3 ** -10;
-    }
-}
-
 unsafe_constant: {
     options = {
         evaluate  : true,
@@ -896,3 +802,237 @@ issue_1649: {
     }
     expect_stdout: "-2";
 }
+
+issue_1760_1: {
+    options = {
+        evaluate: true,
+    }
+    input: {
+        !function(a) {
+            try {
+                throw 0;
+            } catch (NaN) {
+                a = +"foo";
+            }
+            console.log(a);
+        }();
+    }
+    expect: {
+        !function(a) {
+            try {
+                throw 0;
+            } catch (NaN) {
+                a = 0 / 0;
+            }
+            console.log(a);
+        }();
+    }
+    expect_stdout: "NaN"
+}
+
+issue_1760_2: {
+    options = {
+        evaluate: true,
+        keep_infinity: true,
+    }
+    input: {
+        !function(a) {
+            try {
+                throw 0;
+            } catch (Infinity) {
+                a = 123456789 / 0;
+            }
+            console.log(a);
+        }();
+    }
+    expect: {
+        !function(a) {
+            try {
+                throw 0;
+            } catch (Infinity) {
+                a = 1 / 0;
+            }
+            console.log(a);
+        }();
+    }
+    expect_stdout: "Infinity"
+}
+
+delete_expr_1: {
+    options = {
+        booleans: true,
+        evaluate: true,
+    }
+    input: {
+        console.log(delete undefined);
+        console.log(delete void 0);
+        console.log(delete Infinity);
+        console.log(delete (1 / 0));
+        console.log(delete NaN);
+        console.log(delete (0 / 0));
+    }
+    expect: {
+        console.log(delete undefined);
+        console.log((void 0, !0));
+        console.log(delete Infinity);
+        console.log((1 / 0, !0));
+        console.log(delete NaN);
+        console.log((0 / 0, !0));
+    }
+    expect_stdout: true
+}
+
+delete_expr_2: {
+    options = {
+        booleans: true,
+        evaluate: true,
+        keep_infinity: true,
+    }
+    input: {
+        console.log(delete undefined);
+        console.log(delete void 0);
+        console.log(delete Infinity);
+        console.log(delete (1 / 0));
+        console.log(delete NaN);
+        console.log(delete (0 / 0));
+    }
+    expect: {
+        console.log(delete undefined);
+        console.log((void 0, !0));
+        console.log(delete Infinity);
+        console.log((1 / 0, !0));
+        console.log(delete NaN);
+        console.log((0 / 0, !0));
+    }
+    expect_stdout: true
+}
+
+delete_binary_1: {
+    options = {
+        booleans: true,
+        evaluate: true,
+        side_effects: true,
+    }
+    input: {
+        console.log(delete (true && undefined));
+        console.log(delete (true && void 0));
+        console.log(delete (true && Infinity));
+        console.log(delete (true && (1 / 0)));
+        console.log(delete (true && NaN));
+        console.log(delete (true && (0 / 0)));
+    }
+    expect: {
+        console.log((void 0, !0));
+        console.log((void 0, !0));
+        console.log((1 / 0, !0));
+        console.log((1 / 0, !0));
+        console.log((NaN, !0));
+        console.log((NaN, !0));
+    }
+    expect_stdout: true
+}
+
+delete_binary_2: {
+    options = {
+        booleans: true,
+        evaluate: true,
+        keep_infinity: true,
+        side_effects: true,
+    }
+    input: {
+        console.log(delete (false || undefined));
+        console.log(delete (false || void 0));
+        console.log(delete (false || Infinity));
+        console.log(delete (false || (1 / 0)));
+        console.log(delete (false || NaN));
+        console.log(delete (false || (0 / 0)));
+    }
+    expect: {
+        console.log((void 0, !0));
+        console.log((void 0, !0));
+        console.log((Infinity, !0));
+        console.log((1 / 0, !0));
+        console.log((NaN, !0));
+        console.log((NaN, !0));
+    }
+    expect_stdout: true
+}
+
+Infinity_NaN_undefined_LHS: {
+    beautify = {
+        beautify: true,
+    }
+    input: {
+        function f() {
+            Infinity = Infinity;
+            ++Infinity;
+            Infinity--;
+            NaN *= NaN;
+            ++NaN;
+            NaN--;
+            undefined |= undefined;
+            ++undefined;
+            undefined--;
+        }
+    }
+    expect_exact: [
+        "function f() {",
+        "    Infinity = 1 / 0;",
+        "    ++Infinity;",
+        "    Infinity--;",
+        "    NaN *= NaN;",
+        "    ++NaN;",
+        "    NaN--;",
+        "    undefined |= void 0;",
+        "    ++undefined;",
+        "    undefined--;",
+        "}",
+    ]
+}
+
+issue_1964_1: {
+    options = {
+        evaluate: true,
+        reduce_vars: true,
+        unsafe_regexp: false,
+        unused: true,
+    }
+    input: {
+        function f() {
+            var long_variable_name = /\s/;
+            return "a b c".split(long_variable_name)[1];
+        }
+        console.log(f());
+    }
+    expect: {
+        function f() {
+            var long_variable_name = /\s/;
+            return "a b c".split(long_variable_name)[1];
+        }
+        console.log(f());
+    }
+    expect_stdout: "b"
+}
+
+issue_1964_2: {
+    options = {
+        evaluate: true,
+        reduce_vars: true,
+        unsafe_regexp: true,
+        unused: true,
+    }
+    input: {
+        function f() {
+            var long_variable_name = /\s/;
+            return "a b c".split(long_variable_name)[1];
+        }
+        console.log(f());
+    }
+    expect: {
+        function f() {
+            return "a b c".split(/\s/)[1];
+        }
+        console.log(f());
+    }
+    expect_stdout: "b"
+}

test/compress/expansions.js

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

test/compress/expression.js

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

test/compress/functions.js

@@ -93,3 +93,57 @@ issue_485_crashing_1530: {
         this, void 0;
     }
 }
+
+issue_1841_1: {
+    options = {
+        keep_fargs: false,
+        pure_getters: "strict",
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        var b = 10;
+        !function(arg) {
+            for (var key in "hi")
+                var n = arg.baz, n = [ b = 42 ];
+        }(--b);
+        console.log(b);
+    }
+    expect: {
+        var b = 10;
+        !function() {
+            for (var key in "hi") {
+                b = 42;
+            }
+        }(--b);
+        console.log(b);
+    }
+    expect_exact: "42"
+}
+
+issue_1841_2: {
+    options = {
+        keep_fargs: false,
+        pure_getters: false,
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        var b = 10;
+        !function(arg) {
+            for (var key in "hi")
+                var n = arg.baz, n = [ b = 42 ];
+        }(--b);
+        console.log(b);
+    }
+    expect: {
+        var b = 10;
+        !function(arg) {
+            for (var key in "hi") {
+                arg.baz, b = 42;
+            }
+        }(--b);
+        console.log(b);
+    }
+    expect_exact: "42"
+}

test/compress/global_defs.js

@@ -145,3 +145,18 @@ mixed: {
         'WARN: global_defs CONFIG.VALUE redefined [test/compress/global_defs.js:129,8]',
     ]
 }
+
+issue_1801: {
+    options = {
+        booleans: true,
+        global_defs: {
+            "CONFIG.FOO.BAR": true,
+        },
+    }
+    input: {
+        console.log(CONFIG.FOO.BAR);
+    }
+    expect: {
+        console.log(!0);
+    }
+}

test/compress/harmony.js

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

test/compress/hoist.js

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

test/compress/html_comments.js

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

test/compress/issue-1001.js

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

test/compress/issue-1043.js

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

test/compress/issue-1044.js

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

test/compress/issue-1105.js

@@ -193,13 +193,15 @@ assorted_Infinity_NaN_undefined_in_with_scope: {
         cascade:       true,
         side_effects:  true,
         sequences:     false,
+        keep_infinity: false,
     }
     input: {
+        var f = console.log;
         var o = {
             undefined : 3,
             NaN       : 4,
             Infinity  : 5,
-        }
+        };
         if (o) {
             f(undefined, void 0);
             f(NaN, 0/0);
@@ -216,25 +218,88 @@ assorted_Infinity_NaN_undefined_in_with_scope: {
         }
     }
     expect: {
-        var o = {
+        var f = console.log, o = {
             undefined : 3,
             NaN       : 4,
             Infinity  : 5
-        }
+        };
         if (o) {
             f(void 0, void 0);
             f(NaN, NaN);
             f(1/0, 1/0);
-            f(-(1/0), -(1/0));
+            f(-1/0, -1/0);
             f(NaN, NaN);
         }
         with (o) {
             f(undefined, void 0);
             f(NaN, 0/0);
             f(Infinity, 1/0);
-            f(-Infinity, -(1/0));
+            f(-Infinity, -1/0);
             f(9 + undefined, 9 + void 0);
         }
     }
+    expect_stdout: true
 }
 
+assorted_Infinity_NaN_undefined_in_with_scope_keep_infinity: {
+    options = {
+        unused:        true,
+        evaluate:      true,
+        dead_code:     true,
+        conditionals:  true,
+        comparisons:   true,
+        booleans:      true,
+        hoist_funs:    true,
+        keep_fargs:    true,
+        if_return:     true,
+        join_vars:     true,
+        cascade:       true,
+        side_effects:  true,
+        sequences:     false,
+        keep_infinity: true,
+    }
+    input: {
+        var f = console.log;
+        var o = {
+            undefined : 3,
+            NaN       : 4,
+            Infinity  : 5,
+        };
+        if (o) {
+            f(undefined, void 0);
+            f(NaN, 0/0);
+            f(Infinity, 1/0);
+            f(-Infinity, -(1/0));
+            f(2 + 7 + undefined, 2 + 7 + void 0);
+        }
+        with (o) {
+            f(undefined, void 0);
+            f(NaN, 0/0);
+            f(Infinity, 1/0);
+            f(-Infinity, -(1/0));
+            f(2 + 7 + undefined, 2 + 7 + void 0);
+        }
+    }
+    expect: {
+        var f = console.log, o = {
+            undefined : 3,
+            NaN       : 4,
+            Infinity  : 5
+        };
+        if (o) {
+            f(void 0, void 0);
+            f(NaN, NaN);
+            f(Infinity, 1/0);
+            f(-Infinity, -1/0);
+            f(NaN, NaN);
+        }
+        with (o) {
+            f(undefined, void 0);
+            f(NaN, 0/0);
+            f(Infinity, 1/0);
+            f(-Infinity, -1/0);
+            f(9 + undefined, 9 + void 0);
+        }
+    }
+    expect_stdout: true
+}

test/compress/issue-1212.js

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

test/compress/issue-1261.js

@@ -154,12 +154,12 @@ should_warn: {
         "WARN: Boolean || always true [test/compress/issue-1261.js:129,23]",
         "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:129,23]",
         "WARN: Condition always true [test/compress/issue-1261.js:129,23]",
-        "WARN: Boolean || always true [test/compress/issue-1261.js:130,8]",
+        "WARN: Condition left of || always true [test/compress/issue-1261.js:130,8]",
         "WARN: Condition always true [test/compress/issue-1261.js:130,8]",
         "WARN: Boolean && always false [test/compress/issue-1261.js:131,23]",
         "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:131,23]",
         "WARN: Condition always false [test/compress/issue-1261.js:131,23]",
-        "WARN: Boolean && always false [test/compress/issue-1261.js:132,8]",
+        "WARN: Condition left of && always false [test/compress/issue-1261.js:132,8]",
         "WARN: Condition always false [test/compress/issue-1261.js:132,8]",
         "WARN: + in boolean context always true [test/compress/issue-1261.js:133,23]",
         "WARN: Dropping __PURE__ call [test/compress/issue-1261.js:133,23]",

test/compress/issue-1466.js

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

test/compress/issue-1609.js

@@ -45,11 +45,10 @@ chained_evaluation_2: {
     }
     expect: {
         (function() {
-            var a = "long piece of string";
             (function() {
-                var c;
-                c = f(a);
-                c.bar = a;
+                var c, b = "long piece of string";
+                c = f(b);
+                c.bar = b;
             })();
         })();
     }

test/compress/issue-1656.js

@@ -35,11 +35,11 @@ f7: {
         console.log(a, b);
     }
     expect_exact: [
-        "var a = 100, b = 10;",
+        "var b = 10;",
         "",
         "!function() {",
-        "    for (;b = a, !1; ) ;",
-        "}(), console.log(a, b);",
+        "    for (;b = 100, !1; ) ;",
+        "}(), console.log(100, b);",
     ]
     expect_stdout: true
 }

test/compress/issue-1673.js

@@ -70,6 +70,7 @@ side_effects_finally: {
         function f() {
             function g() {
                 try {
+                    x();
                 } catch (e) {
                 } finally {
                     console.log("PASS");
@@ -83,6 +84,7 @@ side_effects_finally: {
         function f() {
             (function() {
                 try {
+                    x();
                 } catch (e) {
                 } finally {
                     console.log("PASS");

test/compress/issue-1733.js

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

test/compress/issue-1750.js

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

test/compress/issue-1770.js

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

test/compress/issue-1787.js

@@ -0,0 +1,19 @@
+unary_prefix: {
+    options = {
+        evaluate: true,
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        console.log(function() {
+            var x = -(2 / 3);
+            return x;
+        }());
+    }
+    expect: {
+        console.log(function() {
+            return -2 / 3;
+        }());
+    }
+    expect_stdout: true
+}

test/compress/issue-1833.js

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

test/compress/issue-1943.js

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

test/compress/issue-203.js

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

test/compress/issue-597.js

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

test/compress/issue-926.js

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

test/compress/join-vars.js

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

test/compress/loops.js

@@ -215,8 +215,7 @@ evaluate: {
             a();
         for(;;)
             c();
-        // rule disabled due to issue_1532
-        do d(); while (false);
+        d();
     }
 }
 
@@ -458,3 +457,26 @@ issue_1648: {
     }
     expect_exact: "function f(){for(x();1;);}"
 }
+
+do_switch: {
+    options = {
+        evaluate: true,
+        loops: true,
+    }
+    input: {
+        do {
+            switch (a) {
+              case b:
+                continue;
+            }
+        } while (false);
+    }
+    expect: {
+        do {
+            switch (a) {
+              case b:
+                continue;
+            }
+        } while (false);
+    }
+}

test/compress/new.js

@@ -82,19 +82,3 @@ new_with_unary_prefix: {
     }
     expect_exact: 'var bar=(+new Date).toString(32);';
 }
-
-new_with_assignement_expression: {
-    options = {
-        evaluate: true
-    }
-    input: {
-        var a;
-        new x(a = 5 * 2, b = [1, 2, 3], c = {a: "a", b: "b", cd: "c" + "d"});
-        new y([a, b] = [3, 4]);
-    }
-    expect: {
-        var a;
-        new x(a = 10, b = [1, 2, 3], c = {a: "a", b: "b", cd: "cd"});
-        new y([a, b] = [3, 4]);
-    }
-}

test/compress/numbers.js

@@ -168,3 +168,37 @@ issue_1710: {
     }
     expect_stdout: true
 }
+
+unary_binary_parenthesis: {
+    input: {
+        var v = [ 0, 1, NaN, Infinity, null, undefined, true, false, "", "foo", /foo/ ];
+        v.forEach(function(x) {
+            v.forEach(function(y) {
+                console.log(
+                    +(x*y),
+                    +(x/y),
+                    +(x%y),
+                    -(x*y),
+                    -(x/y),
+                    -(x%y)
+                );
+            });
+        });
+    }
+    expect: {
+        var v = [ 0, 1, NaN, 1/0, null, void 0, true, false, "", "foo", /foo/ ];
+        v.forEach(function(x) {
+            v.forEach(function(y) {
+                console.log(
+                    +x*y,
+                    +x/y,
+                    +x%y,
+                    -x*y,
+                    -x/y,
+                    -x%y
+                );
+            });
+        });
+    }
+    expect_stdout: true
+}

test/compress/object.js

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

test/compress/parameters.js

@@ -1,180 +0,0 @@
-arrow_functions: {
-    input: {
-        (a) => b;  // 1 args
-        (a, b) => c;  // n args
-        () => b;  // 0 args
-        (a) => (b) => c;  // func returns func returns func
-        (a) => ((b) => c);  // So these parens are dropped
-        () => (b,c) => d;  // func returns func returns func
-        a=>{return b;}
-        a => 'lel';  // Dropping the parens
-    }
-    expect_exact: "a=>b;(a,b)=>c;()=>b;a=>b=>c;a=>b=>c;()=>(b,c)=>d;a=>b;a=>\"lel\";"
-}
-
-arrow_return: {
-    input: {
-        () => {};
-        () => { return; };
-        a => { return 1; }
-        a => { return -b }
-        a => { return b; var b; }
-        (x, y) => { return x - y; }
-    }
-    expect_exact: "()=>{};()=>{};a=>1;a=>-b;a=>{return b;var b};(x,y)=>x-y;"
-}
-
-regression_arrow_functions_and_hoist: {
-    options = {
-        hoist_vars: true,
-        hoist_funs: true
-    }
-    input: {
-        (a) => b;
-    }
-    expect_exact: "a=>b;"
-}
-
-regression_assign_arrow_functions: {
-    input: {
-        oninstall = e => false;
-        oninstall = () => false;
-    }
-    expect: {
-        oninstall=e=>false;
-        oninstall=()=>false;
-    }
-}
-
-destructuring_arguments_1: {
-    input: {
-        (function ( a ) { });
-        (function ( [ a ] ) { });
-        (function ( [ a, b ] ) { });
-        (function ( [ [ a ] ] ) { });
-        (function ( [ [ a, b ] ] ) { });
-        (function ( [ a, [ b ] ] ) { });
-        (function ( [ [ b ], a ] ) { });
-
-        (function ( { a } ) { });
-        (function ( { a, b } ) { });
-
-        (function ( [ { a } ] ) { });
-        (function ( [ { a, b } ] ) { });
-        (function ( [ a, { b } ] ) { });
-        (function ( [ { b }, a ] ) { });
-
-        ( [ a ] ) => { };
-        ( [ a, b ] ) => { };
-
-        ( { a } ) => { };
-        ( { a, b, c, d, e } ) => { };
-
-        ( [ a ] ) => b;
-        ( [ a, b ] ) => c;
-
-        ( { a } ) => b;
-        ( { a, b } ) => c;
-    }
-    expect: {
-        (function(a){});
-        (function([a]){});
-        (function([a,b]){});
-        (function([[a]]){});
-        (function([[a,b]]){});
-        (function([a,[b]]){});
-        (function([[b],a]){});
-
-        (function({a}){});
-        (function({a,b}){});
-
-        (function([{a}]){});
-        (function([{a,b}]){});
-        (function([a,{b}]){});
-        (function([{b},a]){});
-
-        ([a])=>{};
-        ([a,b])=>{};
-
-        ({a})=>{};
-        ({a,b,c,d,e})=>{};
-
-        ([a])=>b;
-        ([a,b])=>c;
-
-        ({a})=>b;
-        ({a,b})=>c;
-    }
-}
-
-destructuring_arguments_2: {
-    input: {
-        (function([]) {});
-        (function({}) {});
-        (function([,,,,,]) {});
-        (function ([a, {b: c}]) {});
-        (function ([...args]) {});
-        (function ({x,}) {});
-        class a { *method({ [thrower()]: x } = {}) {}};
-        (function(a, b, c, d, [{e: [...f]}]){})(1, 2, 3, 4, [{e: [1, 2, 3]}]);
-    }
-    expect: {
-        (function([]) {});
-        (function({}) {});
-        (function([,,,,,]) {});
-        (function ([a, {b: c}]) {});
-        (function ([...args]) {});
-        (function ({x,}) {});
-        class a { *method({ [thrower()]: x } = {}) {}};
-        (function(a, b, c, d, [{e: [...f]}]){})(1, 2, 3, 4, [{e: [1, 2, 3]}]);
-    }
-}
-
-destructuring_arguments_3: {
-    beautify = {
-        ecma: 6
-    }
-    input: {
-        function fn3({x: {y: {z: {} = 42}}}) {}
-        const { cover = (function () {}), xCover = (0, function() {})  } = {};
-        let { cover = (function () {}), xCover = (0, function() {})  } = {};
-        var { cover = (function () {}), xCover = (0, function() {})  } = {};
-    }
-    expect_exact: "function fn3({x:{y:{z:{}=42}}}){}const{cover=function(){},xCover=(0,function(){})}={};let{cover=function(){},xCover=(0,function(){})}={};var{cover=function(){},xCover=(0,function(){})}={};"
-}
-
-default_arguments: {
-    beautify = {
-        ecma: 6
-    }
-    input: {
-        function x(a = 6) { }
-        function x(a = (6 + 5)) { }
-        function x({ foo } = {}, [ bar ] = [ 1 ]) { }
-    }
-    expect_exact: "function x(a=6){}function x(a=6+5){}function x({foo}={},[bar]=[1]){}"
-}
-
-default_values_in_destructurings: {
-    beautify = {
-        ecma: 6
-    }
-    input: {
-        function x({a=(4), b}) {}
-        function x([b, c=(12)]) {}
-        var { x = (6), y } = x;
-        var [ x, y = (6) ] = x;
-    }
-    expect_exact: "function x({a=4,b}){}function x([b,c=12]){}var{x=6,y}=x;var[x,y=6]=x;"
-}
-
-accept_duplicated_parameters_in_non_strict_without_spread_or_default_assignment: {
-    input: {
-        function a(b, b){}
-        function b({c: test, c: test}){}
-    }
-    expect: {
-        function a(b, b){}
-        function b({c: test, c: test}){}
-    }
-}

test/compress/properties.js

@@ -148,8 +148,7 @@ mangle_unquoted_properties: {
         properties: false
     }
     mangle_props = {
-        ignore_quoted: true,
-        reserved: []
+        ignore_quoted: true
     }
     beautify = {
         beautify: false,
@@ -556,3 +555,105 @@ native_prototype: {
         "".indexOf.call(e, "bar");
     }
 }
+
+accessor_boolean: {
+    input: {
+        var a = 1;
+        var b = {
+            get true() {
+                return a;
+            },
+            set false(c) {
+                a = c;
+            }
+        };
+        console.log(b.true, b.false = 2, b.true);
+    }
+    expect_exact: 'var a=1;var b={get true(){return a},set false(c){a=c}};console.log(b.true,b.false=2,b.true);'
+    expect_stdout: "1 2 2"
+}
+
+accessor_get_set: {
+    input: {
+        var a = 1;
+        var b = {
+            get set() {
+                return a;
+            },
+            set get(c) {
+                a = c;
+            }
+        };
+        console.log(b.set, b.get = 2, b.set);
+    }
+    expect_exact: 'var a=1;var b={get set(){return a},set get(c){a=c}};console.log(b.set,b.get=2,b.set);'
+    expect_stdout: "1 2 2"
+}
+
+accessor_null_undefined: {
+    input: {
+        var a = 1;
+        var b = {
+            get null() {
+                return a;
+            },
+            set undefined(c) {
+                a = c;
+            }
+        };
+        console.log(b.null, b.undefined = 2, b.null);
+    }
+    expect_exact: 'var a=1;var b={get null(){return a},set undefined(c){a=c}};console.log(b.null,b.undefined=2,b.null);'
+    expect_stdout: "1 2 2"
+}
+
+accessor_number: {
+    input: {
+        var a = 1;
+        var b = {
+            get 42() {
+                return a;
+            },
+            set 42(c) {
+                a = c;
+            }
+        };
+        console.log(b[42], b[42] = 2, b[42]);
+    }
+    expect_exact: 'var a=1;var b={get 42(){return a},set 42(c){a=c}};console.log(b[42],b[42]=2,b[42]);'
+    expect_stdout: "1 2 2"
+}
+
+accessor_string: {
+    input: {
+        var a = 1;
+        var b = {
+            get "a-b"() {
+                return a;
+            },
+            set "a-b"(c) {
+                a = c;
+            }
+        };
+        console.log(b["a-b"], b["a-b"] = 2, b["a-b"]);
+    }
+    expect_exact: 'var a=1;var b={get"a-b"(){return a},set"a-b"(c){a=c}};console.log(b["a-b"],b["a-b"]=2,b["a-b"]);'
+    expect_stdout: "1 2 2"
+}
+
+accessor_this: {
+    input: {
+        var a = 1;
+        var b = {
+            get this() {
+                return a;
+            },
+            set this(c) {
+                a = c;
+            }
+        };
+        console.log(b.this, b.this = 2, b.this);
+    }
+    expect_exact: 'var a=1;var b={get this(){return a},set this(c){a=c}};console.log(b.this,b.this=2,b.this);'
+    expect_stdout: "1 2 2"
+}

test/compress/pure_getters.js

@@ -0,0 +1,180 @@
+strict: {
+    options = {
+        pure_getters: "strict",
+        reduce_vars: false,
+        side_effects: true,
+        toplevel: true,
+    }
+    input: {
+        var a, b = null, c = {};
+        a.prop;
+        b.prop;
+        c.prop;
+        d.prop;
+        null.prop;
+        (void 0).prop;
+        undefined.prop;
+    }
+    expect: {
+        var a, b = null, c = {};
+        a.prop;
+        b.prop;
+        c.prop;
+        d.prop;
+        null.prop;
+        (void 0).prop;
+        (void 0).prop;
+    }
+}
+
+strict_reduce_vars: {
+    options = {
+        pure_getters: "strict",
+        reduce_vars: true,
+        side_effects: true,
+        toplevel: true,
+    }
+    input: {
+        var a, b = null, c = {};
+        a.prop;
+        b.prop;
+        c.prop;
+        d.prop;
+        null.prop;
+        (void 0).prop;
+        undefined.prop;
+    }
+    expect: {
+        var a, b = null, c = {};
+        a.prop;
+        b.prop;
+        d.prop;
+        null.prop;
+        (void 0).prop;
+        (void 0).prop;
+    }
+}
+
+unsafe: {
+    options = {
+        pure_getters: true,
+        reduce_vars: false,
+        side_effects: true,
+        toplevel: true,
+    }
+    input: {
+        var a, b = null, c = {};
+        a.prop;
+        b.prop;
+        c.prop;
+        d.prop;
+        null.prop;
+        (void 0).prop;
+        undefined.prop;
+    }
+    expect: {
+        var a, b = null, c = {};
+        d;
+        null.prop;
+        (void 0).prop;
+        (void 0).prop;
+    }
+}
+
+unsafe_reduce_vars: {
+    options = {
+        pure_getters: true,
+        reduce_vars: true,
+        side_effects: true,
+        toplevel: true,
+    }
+    input: {
+        var a, b = null, c = {};
+        a.prop;
+        b.prop;
+        c.prop;
+        d.prop;
+        null.prop;
+        (void 0).prop;
+        undefined.prop;
+    }
+    expect: {
+        var a, b = null, c = {};
+        d;
+        null.prop;
+        (void 0).prop;
+        (void 0).prop;
+    }
+}
+
+chained: {
+    options = {
+        pure_getters: "strict",
+        side_effects: true,
+    }
+    input: {
+        a.b.c;
+    }
+    expect: {
+        a.b.c;
+    }
+}
+
+impure_getter_1: {
+    options = {
+        pure_getters: "strict",
+        side_effects: true,
+    }
+    input: {
+        ({
+            get a() {
+                console.log(1);
+            },
+            b: 1
+        }).a;
+        ({
+            get a() {
+                console.log(1);
+            },
+            b: 1
+        }).b;
+    }
+    expect: {
+        ({
+            get a() {
+                console.log(1);
+            },
+            b: 1
+        }).a;
+        ({
+            get a() {
+                console.log(1);
+            },
+            b: 1
+        }).b;
+    }
+    expect_stdout: "1"
+}
+
+impure_getter_2: {
+    options = {
+        pure_getters: true,
+        side_effects: true,
+    }
+    input: {
+        // will produce incorrect output because getter is not pure
+        ({
+            get a() {
+                console.log(1);
+            },
+            b: 1
+        }).a;
+        ({
+            get a() {
+                console.log(1);
+            },
+            b: 1
+        }).b;
+    }
+    expect: {}
+}

test/compress/reduce_vars.js

@@ -41,22 +41,22 @@ reduce_vars: {
         var A = 1;
         (function() {
             console.log(-3);
-            console.log(-4);
+            console.log(A - 5);
         })();
         (function f1() {
             var a = 2;
-            console.log(-3);
+            console.log(a - 5);
             eval("console.log(a);");
         })();
         (function f2(eval) {
             var a = 2;
-            console.log(-3);
+            console.log(a - 5);
             eval("console.log(a);");
         })(eval);
         (function() {
             return "yes";
         })();
-        console.log(2);
+        console.log(A + 1);
     }
     expect_stdout: true
 }
@@ -300,7 +300,7 @@ unsafe_evaluate_array: {
     }
 }
 
-unsafe_evaluate_equality: {
+unsafe_evaluate_equality_1: {
     options = {
         evaluate     : true,
         reduce_vars  : true,
@@ -308,47 +308,62 @@ unsafe_evaluate_equality: {
         unused       : true
     }
     input: {
-        function f0(){
+        function f0() {
             var a = {};
-            console.log(a === a);
+            return a === a;
         }
-
-        function f1(){
+        function f1() {
             var a = [];
-            console.log(a === a);
+            return a === a;
         }
+        console.log(f0(), f1());
+    }
+    expect: {
+        function f0() {
+            return true;
+        }
+        function f1() {
+            return true;
+        }
+        console.log(f0(), f1());
+    }
+    expect_stdout: true
+}
 
-        function f2(){
+unsafe_evaluate_equality_2: {
+    options = {
+        collapse_vars: true,
+        evaluate     : true,
+        passes       : 2,
+        reduce_vars  : true,
+        unsafe       : true,
+        unused       : true
+    }
+    input: {
+        function f2() {
             var a = {a:1, b:2};
             var b = a;
             var c = a;
-            console.log(b === c);
+            return b === c;
         }
-
-        function f3(){
+        function f3() {
             var a = [1, 2, 3];
             var b = a;
             var c = a;
-            console.log(b === c);
+            return b === c;
         }
+        console.log(f2(), f3());
     }
     expect: {
-        function f0(){
-            console.log(true);
+        function f2() {
+            return true;
         }
-
-        function f1(){
-            console.log(true);
-        }
-
-        function f2(){
-            console.log(true);
-        }
-
-        function f3(){
-            console.log(true);
+        function f3() {
+            return true;
         }
+        console.log(f2(), f3());
     }
+    expect_stdout: true
 }
 
 passes: {
@@ -1399,6 +1414,8 @@ issue_1670_1: {
         evaluate: true,
         dead_code: true,
         reduce_vars: true,
+        side_effects: true,
+        switches: true,
         unused: true,
     }
     input: {
@@ -1429,6 +1446,8 @@ issue_1670_2: {
         dead_code: true,
         passes: 2,
         reduce_vars: true,
+        side_effects: true,
+        switches: true,
         unused: true,
     }
     input: {
@@ -1458,6 +1477,8 @@ issue_1670_3: {
         evaluate: true,
         dead_code: true,
         reduce_vars: true,
+        side_effects: true,
+        switches: true,
         unused: true,
     }
     input: {
@@ -1488,6 +1509,8 @@ issue_1670_4: {
         dead_code: true,
         passes: 2,
         reduce_vars: true,
+        side_effects: true,
+        switches: true,
         unused: true,
     }
     input: {
@@ -1516,6 +1539,8 @@ issue_1670_5: {
         evaluate: true,
         keep_fargs: false,
         reduce_vars: true,
+        side_effects: true,
+        switches: true,
         unused: true,
     }
     input: {
@@ -1544,6 +1569,8 @@ issue_1670_6: {
         evaluate: true,
         keep_fargs: false,
         reduce_vars: true,
+        side_effects: true,
+        switches: true,
         unused: true,
     }
     input: {
@@ -1705,7 +1732,10 @@ redefine_arguments_3: {
         console.log(function() {
             var arguments;
             return typeof arguments;
-        }(), "number", "undefined");
+        }(), "number", function(x) {
+            var arguments = x;
+            return typeof arguments;
+        }());
     }
     expect_stdout: "object number undefined"
 }
@@ -1854,3 +1884,317 @@ delay_def: {
     }
     expect_stdout: true
 }
+
+booleans: {
+    options = {
+        booleans: true,
+        evaluate: true,
+        reduce_vars: true,
+    }
+    input: {
+        console.log(function(a) {
+            if (a != 0);
+            switch (a) {
+              case 0:
+                return "FAIL";
+              case false:
+                return "PASS";
+            }
+        }(false));
+    }
+    expect: {
+        console.log(function(a) {
+            if (!1);
+            switch (!1) {
+              case 0:
+                return "FAIL";
+              case !1:
+                return "PASS";
+            }
+        }(!1));
+    }
+    expect_stdout: "PASS"
+}
+
+side_effects_assign: {
+    options = {
+        evaluate: true,
+        reduce_vars: true,
+        sequences: true,
+        side_effects: true,
+        toplevel: true,
+    }
+    input: {
+        var a = typeof void (a && a.in == 1, 0);
+        console.log(a);
+    }
+    expect: {
+        var a = typeof void (a && a.in);
+        console.log(a);
+    }
+    expect_stdout: "undefined"
+}
+
+pure_getters_1: {
+    options = {
+        pure_getters: "strict",
+        reduce_vars: true,
+        side_effects: true,
+        toplevel: true,
+    }
+    input: {
+        try {
+            var a = (a.b, 2);
+        } catch (e) {}
+        console.log(a);
+    }
+    expect: {
+        try {
+            var a = (a.b, 2);
+        } catch (e) {}
+        console.log(a);
+    }
+    expect_stdout: "undefined"
+}
+
+pure_getters_2: {
+    options = {
+        pure_getters: "strict",
+        reduce_vars: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        var a;
+        var a = a && a.b;
+    }
+    expect: {
+        var a;
+        var a = a && a.b;
+    }
+}
+
+pure_getters_3: {
+    options = {
+        pure_getters: true,
+        reduce_vars: true,
+        toplevel: true,
+        unused: true,
+    }
+    input: {
+        var a;
+        var a = a && a.b;
+    }
+    expect: {
+    }
+}
+
+catch_var: {
+    options = {
+        booleans: true,
+        evaluate: true,
+        reduce_vars: true,
+    }
+    input: {
+        try {
+            throw {};
+        } catch (e) {
+            var e;
+            console.log(!!e);
+        }
+    }
+    expect: {
+        try {
+            throw {};
+        } catch (e) {
+            var e;
+            console.log(!!e);
+        }
+    }
+    expect_stdout: "true"
+}
+
+issue_1814_1: {
+    options = {
+        evaluate: true,
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        const a = 42;
+        !function() {
+            var b = a;
+            !function(a) {
+                console.log(a++, b);
+            }(0);
+        }();
+    }
+    expect: {
+        const a = 42;
+        !function() {
+            !function(a) {
+                console.log(a++, 42);
+            }(0);
+        }();
+    }
+    expect_stdout: "0 42"
+}
+
+issue_1814_2: {
+    options = {
+        evaluate: true,
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        const a = "32";
+        !function() {
+            var b = a + 1;
+            !function(a) {
+                console.log(a++, b);
+            }(0);
+        }();
+    }
+    expect: {
+        const a = "32";
+        !function() {
+            !function(a) {
+                console.log(a++, "321");
+            }(0);
+        }();
+    }
+    expect_stdout: "0 '321'"
+}
+
+try_abort: {
+    options = {
+        evaluate: true,
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        !function() {
+            try {
+                var a = 1;
+                throw "";
+                var b = 2;
+            } catch (e) {
+            }
+            console.log(a, b);
+        }();
+    }
+    expect: {
+        !function() {
+            try {
+                var a = 1;
+                throw "";
+                var b = 2;
+            } catch (e) {
+            }
+            console.log(a, b);
+        }();
+    }
+    expect_stdout: "1 undefined"
+}
+
+issue_1865: {
+    options = {
+        evaluate: true,
+        reduce_vars: true,
+        unsafe: true,
+    }
+    input: {
+        function f(some) {
+            some.thing = false;
+        }
+        console.log(function() {
+            var some = { thing: true };
+            f(some);
+            return some.thing;
+        }());
+    }
+    expect: {
+        function f(some) {
+            some.thing = false;
+        }
+        console.log(function() {
+            var some = { thing: true };
+            f(some);
+            return some.thing;
+        }());
+    }
+    expect_stdout: true
+}
+
+issue_1922_1: {
+    options = {
+        evaluate: true,
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        console.log(function(a) {
+            arguments[0] = 2;
+            return a;
+        }(1));
+    }
+    expect: {
+        console.log(function(a) {
+            arguments[0] = 2;
+            return a;
+        }(1));
+    }
+    expect_stdout: "2"
+}
+
+issue_1922_2: {
+    options = {
+        evaluate: true,
+        reduce_vars: true,
+        unused: true,
+    }
+    input: {
+        console.log(function() {
+            var a;
+            eval("a = 1");
+            return a;
+        }(1));
+    }
+    expect: {
+        console.log(function() {
+            var a;
+            eval("a = 1");
+            return a;
+        }(1));
+    }
+    expect_stdout: "1"
+}
+
+accessor: {
+    options = {
+        evaluate: true,
+        reduce_vars: true,
+        toplevel: true,
+    }
+    input: {
+        var a = 1;
+        console.log({
+            get a() {
+                a = 2;
+                return a;
+            },
+            b: 1
+        }.b, a);
+    }
+    expect: {
+        var a = 1;
+        console.log({
+            get a() {
+                a = 2;
+                return a;
+            },
+            b: 1
+        }.b, a);
+    }
+    expect_stdout: "1 1"
+}

test/compress/screw-ie8.js

@@ -204,13 +204,13 @@ issue_1586_1: {
     input: {
         function f() {
             try {
+                x();
             } catch (err) {
                 console.log(err.message);
             }
         }
     }
-    expect_exact: "function f(){try{}catch(c){console.log(c.message)}}"
-    expect_stdout: true
+    expect_exact: "function f(){try{x()}catch(c){console.log(c.message)}}"
 }
 
 issue_1586_2: {
@@ -223,11 +223,11 @@ issue_1586_2: {
     input: {
         function f() {
             try {
+                x();
             } catch (err) {
                 console.log(err.message);
             }
         }
     }
-    expect_exact: "function f(){try{}catch(c){console.log(c.message)}}"
-    expect_stdout: true
+    expect_exact: "function f(){try{x()}catch(c){console.log(c.message)}}"
 }

test/compress/sequences.js

@@ -440,3 +440,197 @@ func_def_5: {
     }
     expect_stdout: "true"
 }
+
+issue_1758: {
+    options = {
+        sequences: true,
+        side_effects: true,
+    }
+    input: {
+        console.log(function(c) {
+            var undefined = 42;
+            return function() {
+                c--;
+                c--, c.toString();
+                return;
+            }();
+        }());
+    }
+    expect: {
+        console.log(function(c) {
+            var undefined = 42;
+            return function() {
+                return c--, c--, c.toString(), void 0;
+            }();
+        }());
+    }
+    expect_stdout: "undefined"
+}
+
+delete_seq_1: {
+    options = {
+        booleans: true,
+        side_effects: true,
+    }
+    input: {
+        console.log(delete (1, undefined));
+        console.log(delete (1, void 0));
+        console.log(delete (1, Infinity));
+        console.log(delete (1, 1 / 0));
+        console.log(delete (1, NaN));
+        console.log(delete (1, 0 / 0));
+    }
+    expect: {
+        console.log((void 0, !0));
+        console.log((void 0, !0));
+        console.log((1 / 0, !0));
+        console.log((1 / 0, !0));
+        console.log((NaN, !0));
+        console.log((0 / 0, !0));
+    }
+    expect_stdout: true
+}
+
+delete_seq_2: {
+    options = {
+        booleans: true,
+        side_effects: true,
+    }
+    input: {
+        console.log(delete (1, 2, undefined));
+        console.log(delete (1, 2, void 0));
+        console.log(delete (1, 2, Infinity));
+        console.log(delete (1, 2, 1 / 0));
+        console.log(delete (1, 2, NaN));
+        console.log(delete (1, 2, 0 / 0));
+    }
+    expect: {
+        console.log((void 0, !0));
+        console.log((void 0, !0));
+        console.log((1 / 0, !0));
+        console.log((1 / 0, !0));
+        console.log((NaN, !0));
+        console.log((0 / 0, !0));
+    }
+    expect_stdout: true
+}
+
+delete_seq_3: {
+    options = {
+        booleans: true,
+        keep_infinity: true,
+        side_effects: true,
+    }
+    input: {
+        console.log(delete (1, 2, undefined));
+        console.log(delete (1, 2, void 0));
+        console.log(delete (1, 2, Infinity));
+        console.log(delete (1, 2, 1 / 0));
+        console.log(delete (1, 2, NaN));
+        console.log(delete (1, 2, 0 / 0));
+    }
+    expect: {
+        console.log((void 0, !0));
+        console.log((void 0, !0));
+        console.log((Infinity, !0));
+        console.log((1 / 0, !0));
+        console.log((NaN, !0));
+        console.log((0 / 0, !0));
+    }
+    expect_stdout: true
+}
+
+delete_seq_4: {
+    options = {
+        booleans: true,
+        sequences: true,
+        side_effects: true,
+    }
+    input: {
+        function f() {}
+        console.log(delete (f(), undefined));
+        console.log(delete (f(), void 0));
+        console.log(delete (f(), Infinity));
+        console.log(delete (f(), 1 / 0));
+        console.log(delete (f(), NaN));
+        console.log(delete (f(), 0 / 0));
+    }
+    expect: {
+        function f() {}
+        console.log((f(), !0)),
+        console.log((f(), !0)),
+        console.log((f(), !0)),
+        console.log((f(), !0)),
+        console.log((f(), !0)),
+        console.log((f(), !0));
+    }
+    expect_stdout: true
+}
+
+delete_seq_5: {
+    options = {
+        booleans: true,
+        keep_infinity: true,
+        sequences: true,
+        side_effects: true,
+    }
+    input: {
+        function f() {}
+        console.log(delete (f(), undefined));
+        console.log(delete (f(), void 0));
+        console.log(delete (f(), Infinity));
+        console.log(delete (f(), 1 / 0));
+        console.log(delete (f(), NaN));
+        console.log(delete (f(), 0 / 0));
+    }
+    expect: {
+        function f() {}
+        console.log((f(), !0)),
+        console.log((f(), !0)),
+        console.log((f(), !0)),
+        console.log((f(), !0)),
+        console.log((f(), !0)),
+        console.log((f(), !0));
+    }
+    expect_stdout: true
+}
+
+delete_seq_6: {
+    options = {
+        booleans: true,
+        side_effects: true,
+    }
+    input: {
+        var a;
+        console.log(delete (1, a));
+    }
+    expect: {
+        var a;
+        console.log((a, !0));
+    }
+    expect_stdout: true
+}
+
+reassign_const: {
+    options = {
+        cascade: true,
+        sequences: true,
+        side_effects: true,
+    }
+    input: {
+        function f() {
+            const a = 1;
+            a++;
+            return a;
+        }
+        console.log(f());
+    }
+    expect: {
+        function f() {
+            const a = 1;
+            return a++, a;
+        }
+        console.log(f());
+    }
+    expect_stdout: true
+}

test/compress/super.js

@@ -1,9 +0,0 @@
-
-super_can_be_parsed: {
-    input: {
-        super(1,2);
-        super.meth();
-    }
-    expect_exact: "super(1,2);super.meth();"
-}
-

test/compress/switch.js

@@ -1,5 +1,10 @@
 constant_switch_1: {
-    options = { dead_code: true, evaluate: true };
+    options = {
+        dead_code: true,
+        evaluate: true,
+        side_effects: true,
+        switches: true,
+    }
     input: {
         switch (1+1) {
           case 1: foo(); break;
@@ -13,7 +18,12 @@ constant_switch_1: {
 }
 
 constant_switch_2: {
-    options = { dead_code: true, evaluate: true };
+    options = {
+        dead_code: true,
+        evaluate: true,
+        side_effects: true,
+        switches: true,
+    }
     input: {
         switch (1) {
           case 1: foo();
@@ -28,7 +38,12 @@ constant_switch_2: {
 }
 
 constant_switch_3: {
-    options = { dead_code: true, evaluate: true };
+    options = {
+        dead_code: true,
+        evaluate: true,
+        side_effects: true,
+        switches: true,
+    }
     input: {
         switch (10) {
           case 1: foo();
@@ -44,7 +59,12 @@ constant_switch_3: {
 }
 
 constant_switch_4: {
-    options = { dead_code: true, evaluate: true };
+    options = {
+        dead_code: true,
+        evaluate: true,
+        side_effects: true,
+        switches: true,
+    }
     input: {
         switch (2) {
           case 1:
@@ -65,7 +85,12 @@ constant_switch_4: {
 }
 
 constant_switch_5: {
-    options = { dead_code: true, evaluate: true };
+    options = {
+        dead_code: true,
+        evaluate: true,
+        side_effects: true,
+        switches: true,
+    }
     input: {
         switch (1) {
           case 1:
@@ -94,7 +119,12 @@ constant_switch_5: {
 }
 
 constant_switch_6: {
-    options = { dead_code: true, evaluate: true };
+    options = {
+        dead_code: true,
+        evaluate: true,
+        side_effects: true,
+        switches: true,
+    }
     input: {
         OUT: {
             foo();
@@ -123,7 +153,12 @@ constant_switch_6: {
 }
 
 constant_switch_7: {
-    options = { dead_code: true, evaluate: true };
+    options = {
+        dead_code: true,
+        evaluate: true,
+        side_effects: true,
+        switches: true,
+    }
     input: {
         OUT: {
             foo();
@@ -161,7 +196,12 @@ constant_switch_7: {
 }
 
 constant_switch_8: {
-    options = { dead_code: true, evaluate: true };
+    options = {
+        dead_code: true,
+        evaluate: true,
+        side_effects: true,
+        switches: true,
+    }
     input: {
         OUT: switch (1) {
           case 1:
@@ -185,7 +225,12 @@ constant_switch_8: {
 }
 
 constant_switch_9: {
-    options = { dead_code: true, evaluate: true };
+    options = {
+        dead_code: true,
+        evaluate: true,
+        side_effects: true,
+        switches: true,
+    }
     input: {
         OUT: switch (1) {
           case 1:
@@ -210,7 +255,10 @@ constant_switch_9: {
 }
 
 drop_default_1: {
-    options = { dead_code: true };
+    options = {
+        dead_code: true,
+        switches: true,
+    }
     input: {
         switch (foo) {
           case 'bar': baz();
@@ -225,7 +273,10 @@ drop_default_1: {
 }
 
 drop_default_2: {
-    options = { dead_code: true };
+    options = {
+        dead_code: true,
+        switches: true,
+    }
     input: {
         switch (foo) {
           case 'bar': baz(); break;
@@ -241,7 +292,10 @@ drop_default_2: {
 }
 
 keep_default: {
-    options = { dead_code: true };
+    options = {
+        dead_code: true,
+        switches: true,
+    }
     input: {
         switch (foo) {
           case 'bar': baz();
@@ -263,6 +317,8 @@ issue_1663: {
     options = {
         dead_code: true,
         evaluate: true,
+        side_effects: true,
+        switches: true,
     }
     input: {
         var a = 100, b = 10;
@@ -294,6 +350,7 @@ issue_1663: {
 drop_case: {
     options = {
         dead_code: true,
+        switches: true,
     }
     input: {
         switch (foo) {
@@ -312,6 +369,7 @@ drop_case: {
 keep_case: {
     options = {
         dead_code: true,
+        switches: true,
     }
     input: {
         switch (foo) {
@@ -332,6 +390,7 @@ issue_376: {
     options = {
         dead_code: true,
         evaluate: true,
+        switches: true,
     }
     input: {
         switch (true) {
@@ -354,6 +413,7 @@ issue_376: {
 issue_441_1: {
     options = {
         dead_code: true,
+        switches: true,
     }
     input: {
         switch (foo) {
@@ -381,6 +441,7 @@ issue_441_1: {
 issue_441_2: {
     options = {
         dead_code: true,
+        switches: true,
     }
     input: {
         switch (foo) {
@@ -414,6 +475,8 @@ issue_1674: {
     options = {
         dead_code: true,
         evaluate: true,
+        side_effects: true,
+        switches: true,
     }
     input: {
         switch (0) {
@@ -435,6 +498,7 @@ issue_1679: {
     options = {
         dead_code: true,
         evaluate: true,
+        switches: true,
     }
     input: {
         var a = 100, b = 10;
@@ -482,6 +546,7 @@ issue_1680_1: {
     options = {
         dead_code: true,
         evaluate: true,
+        switches: true,
     }
     input: {
         function f(x) {
@@ -522,6 +587,7 @@ issue_1680_1: {
 issue_1680_2: {
     options = {
         dead_code: true,
+        switches: true,
     }
     input: {
         var a = 100, b = 10;
@@ -557,6 +623,7 @@ issue_1680_2: {
 issue_1690_1: {
     options = {
         dead_code: true,
+        switches: true,
     }
     input: {
         switch (console.log("PASS")) {}
@@ -570,6 +637,7 @@ issue_1690_1: {
 issue_1690_2: {
     options = {
         dead_code: false,
+        switches: true,
     }
     input: {
         switch (console.log("PASS")) {}
@@ -585,6 +653,7 @@ if_switch_typeof: {
         conditionals: true,
         dead_code: true,
         side_effects: true,
+        switches: true,
     }
     input: {
         if (a) switch(typeof b) {}
@@ -597,6 +666,7 @@ if_switch_typeof: {
 issue_1698: {
     options = {
         side_effects: true,
+        switches: true,
     }
     input: {
         var a = 1;
@@ -618,6 +688,7 @@ issue_1698: {
 issue_1705_1: {
     options = {
         dead_code: true,
+        switches: true,
     }
     input: {
         var a = 0;
@@ -646,6 +717,7 @@ issue_1705_2: {
         reduce_vars: true,
         sequences: true,
         side_effects: true,
+        switches: true,
         toplevel: true,
         unused: true,
     }
@@ -666,6 +738,7 @@ issue_1705_2: {
 issue_1705_3: {
     options = {
         dead_code: true,
+        switches: true,
     }
     input: {
         switch (a) {
@@ -680,3 +753,66 @@ issue_1705_3: {
     }
     expect_stdout: true
 }
+
+beautify: {
+    beautify = {
+        beautify: true,
+    }
+    input: {
+        switch (a) {
+          case 0:
+          case 1:
+            break;
+          case 2:
+          default:
+        }
+        switch (b) {
+          case 3:
+            foo();
+            bar();
+          default:
+            break;
+        }
+    }
+    expect_exact: [
+        "switch (a) {",
+        "  case 0:",
+        "  case 1:",
+        "    break;",
+        "",
+        "  case 2:",
+        "  default:",
+        "}",
+        "",
+        "switch (b) {",
+        "  case 3:",
+        "    foo();",
+        "    bar();",
+        "",
+        "  default:",
+        "    break;",
+        "}",
+    ]
+}
+
+issue_1758: {
+    options = {
+        dead_code: true,
+        switches: true,
+    }
+    input: {
+        var a = 1, b = 2;
+        switch (a--) {
+          default:
+            b++;
+        }
+        console.log(a, b);
+    }
+    expect: {
+        var a = 1, b = 2;
+        a--;
+        b++;
+        console.log(a, b);
+    }
+    expect_stdout: "0 3"
+}

test/compress/template-string.js

@@ -1,379 +0,0 @@
-template_strings: {
-    beautify = {
-        quote_style: 3
-    }
-    input: {
-        ``;
-        `xx\`x`;
-        `${ foo + 2 }`;
-        ` foo ${ bar + `baz ${ qux }` }`;
-    }
-    expect_exact: "``;`xx\\`x`;`${foo+2}`;` foo ${bar+`baz ${qux}`}`;";
-}
-
-template_string_prefixes: {
-    beautify = {
-        quote_style: 3
-    }
-    input: {
-        String.raw`foo`;
-        foo `bar`;
-    }
-    expect_exact: "String.raw`foo`;foo`bar`;";
-}
-
-template_strings_ascii_only: {
-    beautify = {
-        ascii_only: true,
-        quote_style: 3
-    }
-    input: {
-        var foo = `foo
-        bar
-        ↂωↂ`;
-        var bar = `\``;
-    }
-    expect_exact: "var foo=`foo\\n        bar\\n        \\u2182\\u03c9\\u2182`;var bar=`\\``;"
-}
-
-template_strings_without_ascii_only: {
-    beautify = {
-        quote_style: 3
-    }
-    input: {
-        var foo = `foo
-        bar
-        ↂωↂ`
-    }
-    expect_exact: "var foo=`foo\n        bar\n        ↂωↂ`;"
-}
-
-template_string_with_constant_expression: {
-    options = {
-        evaluate: true
-    }
-    beautify = {
-        quote_style: 3
-    }
-    input: {
-        var foo = `${4 + 4} equals 4 + 4`;
-    }
-    expect: {
-        var foo = `8 equals 4 + 4`;
-    }
-}
-
-template_string_with_predefined_constants: {
-    options = {
-        evaluate: true
-    }
-    beautify = {
-        quote_style: 3
-    }
-    input: {
-        var foo = `This is ${undefined}`;
-        var bar = `This is ${NaN}`;
-        var baz = `This is ${null}`;
-        var foofoo = `This is ${Infinity}`;
-        var foobar = "This is ${1/0}";
-        var foobaz = 'This is ${1/0}';
-        var barfoo = "This is ${NaN}";
-        var bazfoo = "This is ${null}";
-        var bazbaz = `This is ${1/0}`;
-        var barbar = `This is ${0/0}`;
-        var barbar = "This is ${0/0}";
-        var barber = 'This is ${0/0}';
-
-        var a = `${4**11}`; // 8 in template vs 7 chars - 4194304
-        var b = `${4**12}`; // 8 in template vs 8 chars - 16777216
-        var c = `${4**14}`; // 8 in template vs 9 chars - 268435456
-    }
-    expect: {
-        var foo = `This is undefined`;
-        var bar = `This is NaN`;
-        var baz = `This is null`;
-        var foofoo = `This is ${1/0}`;
-        var foobar = "This is ${1/0}";
-        var foobaz = 'This is ${1/0}';
-        var barfoo = "This is ${NaN}";
-        var bazfoo = "This is ${null}";
-        var bazbaz = `This is ${1/0}`;
-        var barbar = `This is NaN`;
-        var barbar = "This is ${0/0}";
-        var barber = 'This is ${0/0}';
-
-        var a = `4194304`;
-        var b = `16777216`; // Potential for further concatentation
-        var c = `${4**14}`; // Not worth converting
-    }
-}
-
-template_string_evaluate_with_many_segments: {
-    options = {
-        evaluate: true
-    }
-    beautify = {
-        quote_style: 3
-    }
-    input: {
-        var foo = `Hello ${guest()}, welcome to ${location()}${"."}`;
-        var bar = `${1}${2}${3}${4}${5}${6}${7}${8}${9}${0}`;
-        var baz = `${foobar()}${foobar()}${foobar()}${foobar()}`;
-        var buzz = `${1}${foobar()}${2}${foobar()}${3}${foobar()}`;
-    }
-    expect: {
-        var foo = `Hello ${guest()}, welcome to ${location()}.`;
-        var bar = `1234567890`;
-        var baz = `${foobar()}${foobar()}${foobar()}${foobar()}`;
-        var buzz = `1${foobar()}2${foobar()}3${foobar()}`;
-    }
-}
-
-template_string_with_many_segments: {
-    beautify = {
-        quote_style: 3
-    }
-    input: {
-        var foo = `Hello ${guest()}, welcome to ${location()}${"."}`;
-        var bar = `${1}${2}${3}${4}${5}${6}${7}${8}${9}${0}`;
-        var baz = `${foobar()}${foobar()}${foobar()}${foobar()}`;
-        var buzz = `${1}${foobar()}${2}${foobar()}${3}${foobar()}`;
-    }
-    expect: {
-        var foo = `Hello ${guest()}, welcome to ${location()}${"."}`;
-        var bar = `${1}${2}${3}${4}${5}${6}${7}${8}${9}${0}`;
-        var baz = `${foobar()}${foobar()}${foobar()}${foobar()}`;
-        var buzz = `${1}${foobar()}${2}${foobar()}${3}${foobar()}`;
-    }
-}
-
-template_string_to_normal_string: {
-    options = {
-        evaluate: true
-    }
-    beautify = {
-        quote_style: 0
-    }
-    input: {
-        var foo = `This is ${undefined}`;
-        var bar = "Decimals " + `${1}${2}${3}${4}${5}${6}${7}${8}${9}${0}`;
-    }
-    expect: {
-        var foo = `This is undefined`;
-        var bar = "Decimals 1234567890";
-    }
-}
-
-template_concattenating_string: {
-    options = {
-        evaluate: true
-    }
-    beautify = {
-        quote_style: 3 // Yes, keep quotes
-    }
-    input: {
-        var foo = "Have a nice " + `day. ${`day. ` + `day.`}`;
-        var bar = "Have a nice " + `${day()}`;
-    }
-    expect: {
-        var foo = "Have a nice day. day. day.";
-        var bar = "Have a nice " + `${day()}`;
-    }
-}
-
-evaluate_nested_templates: {
-    options = {
-        evaluate: true
-    }
-    beautify = {
-        quote_style: 0
-    }
-    input: {
-        var baz = `${`${`${`foo`}`}`}`;
-    }
-    expect: {
-        var baz = `foo`;
-    }
-}
-
-enforce_double_quotes: {
-    beautify = {
-        quote_style: 1
-    }
-    input: {
-        var foo = `Hello world`;
-        var bar = `Hello ${'world'}`;
-        var baz = `Hello ${world()}`;
-    }
-    expect: {
-        var foo = `Hello world`;
-        var bar = `Hello ${"world"}`;
-        var baz = `Hello ${world()}`;
-    }
-}
-
-enforce_single_quotes: {
-    beautify = {
-        quote_style: 2
-    }
-    input: {
-        var foo = `Hello world`;
-        var bar = `Hello ${"world"}`;
-        var baz = `Hello ${world()}`;
-    }
-    expect: {
-        var foo = `Hello world`;
-        var bar = `Hello ${'world'}`;
-        var baz = `Hello ${world()}`;
-    }
-}
-
-enforce_double_quotes_and_evaluate: {
-    beautify = {
-        quote_style: 1
-    }
-    options = {
-        evaluate: true
-    }
-    input: {
-        var foo = `Hello world`;
-        var bar = `Hello ${'world'}`;
-        var baz = `Hello ${world()}`;
-    }
-    expect: {
-        var foo = `Hello world`;
-        var bar = `Hello world`;
-        var baz = `Hello ${world()}`;
-    }
-}
-
-enforce_single_quotes_and_evaluate: {
-    beautify = {
-        quote_style: 2
-    }
-    options = {
-        evaluate: true
-    }
-    input: {
-        var foo = `Hello world`;
-        var bar = `Hello ${"world"}`;
-        var baz = `Hello ${world()}`;
-    }
-    expect: {
-        var foo = `Hello world`;
-        var bar = `Hello world`;
-        var baz = `Hello ${world()}`;
-    }
-}
-
-respect_inline_script: {
-    beautify = {
-        inline_script: true,
-        quote_style: 3
-    }
-    input: {
-        var foo = `</script>${content}`;
-        var bar = `<!--`;
-        var baz = `-->`;
-    }
-    expect_exact: "var foo=`<\\/script>${content}`;var bar=`\\x3c!--`;var baz=`--\\x3e`;";
-}
-
-do_not_optimize_tagged_template_1: {
-    beautify = {
-        quote_style: 0
-    }
-    options = {
-        evaluate: true
-    }
-    input: {
-        var foo = tag`Shall not be optimized. ${"But " + "this " + "is " + "fine."}`;
-        var bar = tag`Don't even mind changing my quotes!`;
-    }
-    expect_exact:
-        'var foo=tag`Shall not be optimized. ${"But this is fine."}`;var bar=tag`Don\'t even mind changing my quotes!`;';
-}
-
-do_not_optimize_tagged_template_2: {
-    options = {
-        evaluate: true
-    }
-    input: {
-        var foo = tag`test` + " something out";
-    }
-    expect_exact: 'var foo=tag`test`+" something out";';
-}
-
-keep_raw_content_in_tagged_template: {
-    options = {
-        evaluate: true
-    }
-    input: {
-        var foo = tag`\u0020\u{20}\u{00020}\x20\40\040 `;
-    }
-    expect_exact: "var foo=tag`\\u0020\\u{20}\\u{00020}\\x20\\40\\040 `;";
-}
-
-allow_chained_templates: {
-    input: {
-        var foo = tag`a``b``c``d`;
-    }
-    expect: {
-        var foo = tag`a``b``c``d`;
-    }
-}
-
-check_escaped_chars: {
-    input: {
-        var foo = `\u0020\u{20}\u{00020}\x20\40\040 `;
-    }
-    expect_exact: "var foo=`       `;";
-}
-
-escape_dollar_curly: {
-    options = {
-        evaluate: true
-    }
-    input: {
-        console.log(`\$\{ beep \}`)
-        console.log(`${1-0}\${2-0}$\{3-0}${4-0}`)
-        console.log(`$${""}{not an expression}`)
-    }
-    expect_exact: "console.log(`\\${ beep }`);console.log(`1\\${2-0}\\${3-0}4`);console.log(`\\${not an expression}`);"
-}
-
-template_starting_with_newline: {
-    options = {
-        dead_code: true
-    }
-    input: {
-        function foo(e) {
-            return `
-this is a template string!`;
-        };
-    } expect_exact: "function foo(e){return`\nthis is a template string!`}"
-}
-
-template_with_newline: {
-    options = {
-        dead_code: true
-    }
-    input: {
-        function foo(e) {
-            return `yep,
-this is a template string!`;
-        };
-    } expect_exact: "function foo(e){return`yep,\nthis is a template string!`}"
-}
-
-template_ending_with_newline: {
-    options = {
-        dead_code: true
-    }
-    input: {
-        function foo(e) {
-            return `this is a template string!
-`;
-        };
-    } expect_exact: "function foo(e){return`this is a template string!\n`}"
-}

test/compress/try-catch.js

@@ -1,12 +0,0 @@
-catch_destructuring_with_sequence: {
-    beautify = {
-        ecma: 6
-    }
-    input: {
-        try {
-            throw {};
-        } catch ({xCover = (0, function() {})} ) {
-        }
-    }
-    expect_exact: "try{throw{}}catch({xCover=(0,function(){})}){}"
-}

test/compress/unicode.js

@@ -15,106 +15,3 @@ unicode_parse_variables: {
         var l০ = 3;
     }
 }
-
-unicode_escaped_identifier: {
-    beautify = {ecma: 6}
-    input: {
-        var \u{61} = "foo";
-        var \u{10000} = "bar";
-    }
-    expect_exact: 'var a="foo";var \u{10000}="bar";';
-}
-
-unicode_identifier_ascii_only: {
-    beautify = {ascii_only: true, ecma: 6}
-    input: {
-        var \u{0061} = "hi";
-        var bar = "h\u{0065}llo";
-        var \u{10000} = "testing \u{101111}";
-    }
-    expect_exact: 'var a="hi";var bar="hello";var \\u{10000}="testing \\u{101111}";'
-}
-
-unicode_string_literals: {
-    beautify = {ascii_only: true, ecma: 6}
-    input: {
-        var a = "6 length unicode character: \u{101111}";
-    }
-    expect_exact: 'var a="6 length unicode character: \\u{101111}";'
-}
-
-// Don't escape identifiers below es6 (or in this case double escaped in expect_exact)
-unicode_output_es5_surrogates: {
-    beautify = {ascii_only: true, ecma: 5}
-    input: {
-        var \u{10000} = "6 length unicode character: \u{10FFFF}";
-    }
-    expect_exact: 'var \u{10000}="6 length unicode character: \\udbff\\udfff";'
-}
-
-check_escape_style: {
-    beautify = {ascii_only: true, ecma: 6}
-    input: {
-        var a = "\x01";
-        var \ua0081 = "\x10"; // \u0081 only in ID_Continue
-        var \u0100 = "\u0100";
-        var \u1000 = "\u1000";
-        var \u{10000} = "\u{10000}";
-        var \u{2f800} = "\u{100000}";
-    }
-    expect_exact: 'var a="\\x01";var \\ua0081="\\x10";var \\u0100="\\u0100";var \\u1000="\\u1000";var \\u{10000}="\\u{10000}";var \\u{2f800}="\\u{100000}";'
-}
-
-// Don't escape identifiers below es6, no escaped identifiers support and no \u{} syntax
-check_escape_style_es5: {
-    beautify = {ascii_only: true, ecma: 5}
-    input: {
-        var a = "\x01";
-        var \ua0081 = "\x10"; // \u0081 only in ID_Continue
-        var \u0100 = "\u0100";
-        var \u1000 = "\u1000";
-        var \u{10000} = "\u{10000}"; // Identifier won't be escaped in es 5.1
-        var \u{2f800} = "\u{100000}"; // Same
-    }
-    expect_exact: 'var a="\\x01";var \\ua0081="\\x10";var \\u0100="\\u0100";var \\u1000="\\u1000";var \ud800\udc00="\\ud800\\udc00";var \ud87e\udc00="\\udbc0\\udc00";'
-}
-
-ID_continue_with_surrogate_pair: {
-    beautify = {ascii_only: true, ecma: 6}
-    input: {
-        var \u{2f800}\u{2f800}\u{2f800}\u{2f800} = "\u{100000}\u{100000}\u{100000}\u{100000}\u{100000}";
-    }
-    expect_exact: 'var \\u{2f800}\\u{2f800}\\u{2f800}\\u{2f800}="\\u{100000}\\u{100000}\\u{100000}\\u{100000}\\u{100000}";'
-}
-
-escape_non_escaped_identifier: {
-    beautify = {ascii_only: true, ecma: 6}
-    input: {
-        var µþ = "µþ";
-    }
-    expect_exact: 'var \\u00b5\\u00fe="\\xb5\\xfe";'
-}
-
-non_escape_2_non_escape: {
-    beautify = {ascii_only: false, ecma: 6}
-    input: {
-        var µþ = "µþ";
-    }
-    expect_exact: 'var µþ="µþ";'
-}
-
-non_escape_2_half_escape1: {
-    beautify = {ascii_only: false, ascii_identifiers: true, ecma: 6}
-    input: {
-        var µþ = "µþ";
-    }
-    expect_exact: 'var \\u00b5\\u00fe="µþ";'
-}
-
-non_escape_2_half_escape2: {
-    beautify = {ascii_only: true, ascii_identifiers: false, ecma: 6}
-    input: {
-        var µþ = "µþ";
-    }
-    expect_exact: 'var µþ="\\xb5\\xfe";'
-}

test/compress/yield.js

@@ -1,192 +0,0 @@
-generators: {
-    input: {
-        function* fn() {};
-    }
-    expect_exact: "function*fn(){}"
-}
-
-generators_yield: {
-    input: {
-      function* fn() {
-        yield remote();
-      }
-    }
-    expect_exact: "function*fn(){yield remote()}"
-}
-
-generators_yield_assign: {
-    input: {
-      function* fn() {
-          var x = {};
-          x.prop = yield 5;
-      }
-    }
-    expect_exact: "function*fn(){var x={};x.prop=yield 5}"
-}
-
-generator_yield_undefined: {
-    input: {
-        function* fn() {
-            yield;
-        }
-    }
-    expect_exact: "function*fn(){yield}"
-}
-
-yield_optimize_expression: {
-    options = {
-    }
-    input: {
-        function* f1() { yield; }
-        function* f2() { yield undefined; }
-        function* f3() { yield null; }
-        function* f4() { yield* undefined; }
-    }
-    expect: {
-        function* f1() { yield }
-        function* f2() { yield; }
-        function* f3() { yield null; }
-        function* f4() { yield* void 0; }
-    }
-}
-
-yield_statements: {
-    input: {
-        function* fn() {
-            var a = (yield 1) + (yield 2);
-            var b = (yield 3) === (yield 4);
-            var c = (yield 5) << (yield 6);
-            var d = yield 7;
-            var e = (yield 8) ? yield 9 : yield 10;
-            var f = -(yield 11);
-        }
-    }
-    expect_exact: "function*fn(){var a=(yield 1)+(yield 2);var b=(yield 3)===(yield 4);var c=(yield 5)<<(yield 6);var d=yield 7;var e=(yield 8)?yield 9:yield 10;var f=-(yield 11)}"
-}
-
-yield_as_identifier_in_function_in_generator: {
-    input: {
-        var g = function*() {
-            function h() {
-                yield = 1;
-            }
-        };
-    }
-    expect: {
-        var g = function*() {
-            function h() {
-                yield = 1;
-            }
-        };
-    }
-}
-
-yield_before_punctuators: {
-    input: {
-        iter = (function*() {
-            assignmentResult = [ x = yield ] = value;
-        })();
-        function* g1() { (yield) }
-        function* g2() { [yield] }
-        function* g3() { return {yield} } // Added return to avoid {} drop
-        function* g4() { yield, yield; }
-        function* g5() { (yield) ? yield : yield; }
-    }
-    expect: {
-        iter = (function*() {
-            assignmentResult = [ x = yield ] = value;
-        })();
-        function* g1() { (yield) }
-        function* g2() { [yield] }
-        function* g3() { return {yield} }
-        function* g4() { yield, yield; }
-        function* g5() { (yield) ? yield : yield; }
-    }
-}
-
-yield_as_identifier_outside_strict_mode: {
-    input: {
-        import yield from "bar";
-        yield = 123;
-        while (true) {
-            yield:
-            for(;;) break yield;
-
-            foo();
-        }
-        while (true)
-            yield: for(;;) continue yield;
-        function yield(){}
-        function foo(...yield){}
-        try { new Error("") } catch (yield) {}
-        var yield = "foo";
-    }
-    expect: {
-        import yield from "bar";
-        yield = 123;
-        while (true) {
-            yield:
-            for(;;) break yield;
-
-            foo();
-        }
-        while (true)
-            yield: for(;;) continue yield;
-        function yield(){}
-        function foo(...yield){}
-        try { new Error("") } catch (yield) {}
-        var yield = "foo";
-    }
-}
-
-empty_generator_as_parameter_with_side_effects: {
-    options = {
-        side_effects: true
-    }
-    input: {
-        var GeneratorPrototype = Object.getPrototypeOf(
-          Object.getPrototypeOf(function*() {}())
-        );
-        evaluate(GeneratorPrototype);
-    }
-    expect_exact: "var GeneratorPrototype=Object.getPrototypeOf(Object.getPrototypeOf(function*(){}()));evaluate(GeneratorPrototype);"
-}
-
-empty_generator_as_parameter_without_side_effects: {
-    options = {
-        side_effects: false
-    }
-    input: {
-        var GeneratorPrototype = Object.getPrototypeOf(
-          Object.getPrototypeOf(function*() {}())
-        );
-        evaluate(GeneratorPrototype);
-    }
-    expect_exact: "var GeneratorPrototype=Object.getPrototypeOf(Object.getPrototypeOf(function*(){}()));evaluate(GeneratorPrototype);"
-}
-
-yield_dot: {
-    options = {
-    }
-    input: {
-        function* foo(){
-            yield x.foo;
-            (yield x).foo;
-            yield (yield obj.foo()).bar();
-        }
-    }
-    expect_exact: "function*foo(){yield x.foo;(yield x).foo;yield(yield obj.foo()).bar()}"
-}
-
-yield_sub: {
-    options = {
-    }
-    input: {
-        function* foo(){
-            yield x['foo'];
-            (yield x)['foo'];
-            yield (yield obj.foo())['bar']();
-        }
-    }
-    expect_exact: 'function*foo(){yield x["foo"];(yield x)["foo"];yield(yield obj.foo())["bar"]()}'
-}

test/input/invalid/assign_4.js

@@ -0,0 +1 @@
+++null

test/input/invalid/dot_1.js

@@ -0,0 +1 @@
+a.=

test/input/invalid/dot_2.js

@@ -0,0 +1 @@
+%.a;

test/input/invalid/dot_3.js

@@ -0,0 +1 @@
+a./();

test/input/invalid/else.js

@@ -0,0 +1 @@
+if (0) else 1;

test/input/invalid/object.js

@@ -0,0 +1 @@
+console.log({%: 1});

test/input/invalid/return.js

@@ -0,0 +1 @@
+return 42;

test/mocha/accessorTokens-1492.js

@@ -16,8 +16,8 @@ describe("Accessor tokens", function() {
                 assert.equal(node.start.pos, 12);
                 assert.equal(node.end.endpos, 46);
 
-                assert(node.key instanceof UglifyJS.AST_SymbolMethod);
-                assert.equal(node.key.start.pos, 12);
+                assert(node.key instanceof UglifyJS.AST_SymbolAccessor);
+                assert.equal(node.key.start.pos, 16);
                 assert.equal(node.key.end.endpos, 22);
 
                 assert(node.value instanceof UglifyJS.AST_Accessor);

test/mocha/arguments.js

@@ -27,253 +27,4 @@ describe("arguments", function() {
         assert.strictEqual(ast.body[0].body[0].uses_arguments, true);
         assert.strictEqual(ast.body[0].body[0].body[0].uses_arguments, false);
     });
-
-    it("Should parse a function containing default assignment correctly", function() {
-        var ast = UglifyJS.parse("function foo(a = 123) {}");
-        assert(ast.body[0] instanceof UglifyJS.AST_Defun);
-        assert.strictEqual(ast.body[0].argnames.length, 1);
-
-        // First argument
-        assert(ast.body[0].argnames[0] instanceof UglifyJS.AST_DefaultAssign);
-        assert(ast.body[0].argnames[0].left instanceof UglifyJS.AST_SymbolFunarg);
-        assert.strictEqual(ast.body[0].argnames[0].operator, "=");
-        assert(ast.body[0].argnames[0].right instanceof UglifyJS.AST_Number);
-
-        ast = UglifyJS.parse("function foo(a = a) {}");
-        assert(ast.body[0] instanceof UglifyJS.AST_Defun);
-        assert.strictEqual(ast.body[0].argnames.length, 1);
-
-        // First argument
-        assert(ast.body[0].argnames[0] instanceof UglifyJS.AST_DefaultAssign);
-        assert(ast.body[0].argnames[0].left instanceof UglifyJS.AST_SymbolFunarg);
-        assert.strictEqual(ast.body[0].argnames[0].operator, "=");
-        assert(ast.body[0].argnames[0].right instanceof UglifyJS.AST_SymbolRef);
-    });
-
-    it("Should parse a function containing default assignments in destructuring correctly", function() {
-        var ast = UglifyJS.parse("function foo([a = 123]) {}");
-        assert(ast.body[0] instanceof UglifyJS.AST_Defun);
-        assert.strictEqual(ast.body[0].argnames.length, 1);
-
-        // First argument
-        assert(ast.body[0].argnames[0] instanceof UglifyJS.AST_Destructuring);
-        assert.strictEqual(ast.body[0].argnames[0].is_array, true);
-        assert.strictEqual(ast.body[0].argnames[0].names.length, 1);
-        assert(ast.body[0].argnames[0].names[0] instanceof UglifyJS.AST_DefaultAssign);
-        assert(ast.body[0].argnames[0].names[0].left instanceof UglifyJS.AST_SymbolFunarg);
-        assert.strictEqual(ast.body[0].argnames[0].names[0].operator, "=");
-        assert(ast.body[0].argnames[0].names[0].right instanceof UglifyJS.AST_Number);
-
-
-        ast = UglifyJS.parse("function foo({a = 123}) {}");
-        assert(ast.body[0] instanceof UglifyJS.AST_Defun);
-        assert.strictEqual(ast.body[0].argnames.length, 1);
-
-        // First argument
-        assert(ast.body[0].argnames[0] instanceof UglifyJS.AST_Destructuring);
-        assert.strictEqual(ast.body[0].argnames[0].is_array, false);
-        assert.strictEqual(ast.body[0].argnames[0].names.length, 1);
-        assert(ast.body[0].argnames[0].names[0] instanceof UglifyJS.AST_ObjectKeyVal);
-        assert.strictEqual(ast.body[0].argnames[0].names[0].key, "a");
-
-        // Property a of first argument
-        assert(ast.body[0].argnames[0].names[0].value instanceof UglifyJS.AST_DefaultAssign);
-        assert(ast.body[0].argnames[0].names[0].value.left instanceof UglifyJS.AST_SymbolFunarg);
-        assert.strictEqual(ast.body[0].argnames[0].names[0].value.operator, "=");
-        assert(ast.body[0].argnames[0].names[0].value.right instanceof UglifyJS.AST_Number);
-
-
-        ast = UglifyJS.parse("function foo({a: a = 123}) {}");
-        assert(ast.body[0] instanceof UglifyJS.AST_Defun);
-        assert.strictEqual(ast.body[0].argnames.length, 1);
-
-        // First argument
-        assert(ast.body[0].argnames[0] instanceof UglifyJS.AST_Destructuring);
-        assert.strictEqual(ast.body[0].argnames[0].is_array, false);
-        assert.strictEqual(ast.body[0].argnames[0].names.length, 1);
-
-        // Content destructuring of first argument
-        assert(ast.body[0].argnames[0].names[0] instanceof UglifyJS.AST_ObjectKeyVal);
-        assert.strictEqual(ast.body[0].argnames[0].names[0].key, "a");
-        assert(ast.body[0].argnames[0].names[0].value instanceof UglifyJS.AST_DefaultAssign);
-
-        // Property a of first argument
-        assert(ast.body[0].argnames[0].names[0].value instanceof UglifyJS.AST_DefaultAssign);
-        assert(ast.body[0].argnames[0].names[0].value.left instanceof UglifyJS.AST_SymbolFunarg);
-        assert.strictEqual(ast.body[0].argnames[0].names[0].value.operator, "=");
-        assert(ast.body[0].argnames[0].names[0].value.right instanceof UglifyJS.AST_Number);
-    });
-
-    it("Should parse a function containing default assignments in complex destructuring correctly", function() {
-        var ast = UglifyJS.parse("function foo([a, [b = 123]]){}");
-        assert(ast.body[0] instanceof UglifyJS.AST_Defun);
-        assert.strictEqual(ast.body[0].argnames.length, 1);
-
-        // Check first argument
-        assert(ast.body[0].argnames[0] instanceof UglifyJS.AST_Destructuring);
-        assert.strictEqual(ast.body[0].argnames[0].is_array, true);
-        assert.strictEqual(ast.body[0].argnames[0].names.length, 2);
-
-        // Check whole destructuring structure of first argument
-        assert(ast.body[0].argnames[0].names[0] instanceof UglifyJS.AST_SymbolFunarg);
-        assert(ast.body[0].argnames[0].names[1] instanceof UglifyJS.AST_Destructuring);
-        assert.strictEqual(ast.body[0].argnames[0].names[1].is_array, true);
-
-        // Check content of second destructuring element (which is the nested destructuring pattern)
-        assert(ast.body[0].argnames[0].names[1].names[0] instanceof UglifyJS.AST_DefaultAssign);
-        assert(ast.body[0].argnames[0].names[1].names[0].left instanceof UglifyJS.AST_SymbolFunarg);
-        assert.strictEqual(ast.body[0].argnames[0].names[1].names[0].operator, "=");
-        assert(ast.body[0].argnames[0].names[1].names[0].right instanceof UglifyJS.AST_Number);
-
-
-        ast = UglifyJS.parse("function foo([a, {b: c = 123}]){}");
-        assert(ast.body[0] instanceof UglifyJS.AST_Defun);
-        assert.strictEqual(ast.body[0].argnames.length, 1);
-
-        // Check first argument
-        assert(ast.body[0].argnames[0] instanceof UglifyJS.AST_Destructuring);
-        assert.strictEqual(ast.body[0].argnames[0].is_array, true);
-        assert.strictEqual(ast.body[0].argnames[0].names.length, 2);
-
-        // Check whole destructuring structure of first argument
-        assert(ast.body[0].argnames[0].names[0] instanceof UglifyJS.AST_SymbolFunarg);
-        assert(ast.body[0].argnames[0].names[1] instanceof UglifyJS.AST_Destructuring);
-        assert.strictEqual(ast.body[0].argnames[0].names[1].is_array, false);
-
-        // Check content of second destructuring element (which is the nested destructuring pattern)
-        assert(ast.body[0].argnames[0].names[1].names[0] instanceof UglifyJS.AST_ObjectKeyVal);
-        assert.strictEqual(ast.body[0].argnames[0].names[1].names[0].key, "b");
-        assert(ast.body[0].argnames[0].names[1].names[0].value instanceof UglifyJS.AST_DefaultAssign);
-
-        // Property b of second argument
-        assert(ast.body[0].argnames[0].names[1].names[0].value instanceof UglifyJS.AST_DefaultAssign);
-        assert(ast.body[0].argnames[0].names[1].names[0].value.left instanceof UglifyJS.AST_SymbolFunarg);
-        assert.strictEqual(ast.body[0].argnames[0].names[1].names[0].value.operator, "=");
-        assert(ast.body[0].argnames[0].names[1].names[0].value.right instanceof UglifyJS.AST_Number);
-
-
-        ast = UglifyJS.parse("function foo({a, b: {b = 123}}){}");
-        assert(ast.body[0] instanceof UglifyJS.AST_Defun);
-        assert.strictEqual(ast.body[0].argnames.length, 1);
-
-        // Check first argument
-        assert(ast.body[0].argnames[0] instanceof UglifyJS.AST_Destructuring);
-        assert.strictEqual(ast.body[0].argnames[0].is_array, false);
-        assert.strictEqual(ast.body[0].argnames[0].names.length, 2);
-
-        // Check whole destructuring structure of first argument
-        assert(ast.body[0].argnames[0].names[0] instanceof UglifyJS.AST_ObjectKeyVal);
-        assert.strictEqual(ast.body[0].argnames[0].names[0].key, "a");
-        assert(ast.body[0].argnames[0].names[0].value instanceof UglifyJS.AST_SymbolFunarg);
-        assert(ast.body[0].argnames[0].names[1] instanceof UglifyJS.AST_ObjectKeyVal);
-        assert.strictEqual(ast.body[0].argnames[0].names[1].key, "b");
-        assert(ast.body[0].argnames[0].names[1].value instanceof UglifyJS.AST_Destructuring);
-
-        // Check content of nested destructuring in first parameter
-        var content = ast.body[0].argnames[0].names[1].value
-        assert.strictEqual(content.is_array, false);
-        assert.strictEqual(content.names.length, 1);
-        assert(content.names[0] instanceof UglifyJS.AST_ObjectKeyVal);
-        assert.strictEqual(content.names[0].key, "b");
-        assert(content.names[0].value instanceof UglifyJS.AST_DefaultAssign);
-        assert(content.names[0].value.left instanceof UglifyJS.AST_SymbolFunarg);
-        assert.strictEqual(content.names[0].value.operator, "=");
-        assert(content.names[0].value.right instanceof UglifyJS.AST_Number);
-
-
-        ast = UglifyJS.parse("function foo({a: {b = 123}}){}");
-        assert(ast.body[0] instanceof UglifyJS.AST_Defun);
-        assert.strictEqual(ast.body[0].argnames.length, 1);
-
-        // Check first argument
-        assert(ast.body[0].argnames[0] instanceof UglifyJS.AST_Destructuring);
-        assert.strictEqual(ast.body[0].argnames[0].is_array, false);
-        assert.strictEqual(ast.body[0].argnames[0].names.length, 1);
-
-        // Check whole destructuring structure of first argument
-        assert(ast.body[0].argnames[0].names[0] instanceof UglifyJS.AST_ObjectKeyVal);
-        assert.strictEqual(ast.body[0].argnames[0].names[0].key, "a");
-        assert(ast.body[0].argnames[0].names[0].value instanceof UglifyJS.AST_Destructuring);
-
-        // Check content of nested destructuring
-        content = ast.body[0].argnames[0].names[0].value
-        assert.strictEqual(content.is_array, false);
-        assert.strictEqual(content.names.length, 1);
-        assert(content.names[0] instanceof UglifyJS.AST_ObjectKeyVal);
-        assert.strictEqual(content.names[0].key, "b");
-        assert(content.names[0].value instanceof UglifyJS.AST_DefaultAssign);
-        assert(content.names[0].value.left instanceof UglifyJS.AST_SymbolFunarg);
-        assert.strictEqual(content.names[0].value.operator, "=");
-        assert(content.names[0].value.right instanceof UglifyJS.AST_Number);
-    });
-
-    it("Should parse spread correctly", function() {
-        var ast = UglifyJS.parse("function foo(a, b, ...c){}");
-        assert(ast.body[0] instanceof UglifyJS.AST_Defun);
-        assert.strictEqual(ast.body[0].argnames.length, 3);
-
-        // Check parameters
-        assert(ast.body[0].argnames[0] instanceof UglifyJS.AST_SymbolFunarg);
-        assert(ast.body[0].argnames[1] instanceof UglifyJS.AST_SymbolFunarg);
-        assert(ast.body[0].argnames[2] instanceof UglifyJS.AST_Expansion);
-        assert(ast.body[0].argnames[2].expression instanceof UglifyJS.AST_SymbolFunarg);
-
-
-        ast = UglifyJS.parse("function foo([a, b, ...c]){}");
-        assert(ast.body[0] instanceof UglifyJS.AST_Defun);
-        assert.strictEqual(ast.body[0].argnames.length, 1);
-
-        // Check first parameter
-        assert(ast.body[0].argnames[0] instanceof UglifyJS.AST_Destructuring);
-        assert.strictEqual(ast.body[0].argnames[0].is_array, true);
-
-        // Check content first parameter
-        assert(ast.body[0].argnames[0].names[0] instanceof UglifyJS.AST_SymbolFunarg);
-        assert(ast.body[0].argnames[0].names[1] instanceof UglifyJS.AST_SymbolFunarg);
-        assert(ast.body[0].argnames[0].names[2] instanceof UglifyJS.AST_Expansion);
-        assert(ast.body[0].argnames[0].names[2].expression instanceof UglifyJS.AST_SymbolFunarg);
-
-
-        ast = UglifyJS.parse("function foo([a, b, [c, ...d]]){}");
-        assert(ast.body[0] instanceof UglifyJS.AST_Defun);
-        assert.strictEqual(ast.body[0].argnames.length, 1);
-
-        // Check first parameter
-        assert(ast.body[0].argnames[0] instanceof UglifyJS.AST_Destructuring);
-        assert.strictEqual(ast.body[0].argnames[0].is_array, true);
-
-        // Check content outer destructuring array
-        assert(ast.body[0].argnames[0].names[0] instanceof UglifyJS.AST_SymbolFunarg);
-        assert(ast.body[0].argnames[0].names[1] instanceof UglifyJS.AST_SymbolFunarg);
-        assert(ast.body[0].argnames[0].names[2] instanceof UglifyJS.AST_Destructuring);
-        assert.strictEqual(ast.body[0].argnames[0].names[2].is_array, true);
-
-        // Check content nested destructuring array
-        assert.strictEqual(ast.body[0].argnames[0].names[2].names.length, 2);
-        assert(ast.body[0].argnames[0].names[2].names[0] instanceof UglifyJS.AST_SymbolFunarg);
-        assert(ast.body[0].argnames[0].names[2].names[1] instanceof UglifyJS.AST_Expansion);
-        assert(ast.body[0].argnames[0].names[2].names[1].expression instanceof UglifyJS.AST_SymbolFunarg);
-
-
-        ast = UglifyJS.parse("function foo({a: [b, ...c]}){}");
-        assert(ast.body[0] instanceof UglifyJS.AST_Defun);
-        assert.strictEqual(ast.body[0].argnames.length, 1);
-
-        // Check first parameter
-        assert(ast.body[0].argnames[0] instanceof UglifyJS.AST_Destructuring);
-        assert.strictEqual(ast.body[0].argnames[0].is_array, false);
-
-        // Check outer destructuring object
-        assert.strictEqual(ast.body[0].argnames[0].names.length, 1);
-        assert(ast.body[0].argnames[0].names[0] instanceof UglifyJS.AST_ObjectKeyVal);
-        assert.strictEqual(ast.body[0].argnames[0].names[0].key, "a");
-        assert(ast.body[0].argnames[0].names[0].value instanceof UglifyJS.AST_Destructuring);
-        assert.strictEqual(ast.body[0].argnames[0].names[0].value.is_array, true);
-
-        // Check content nested destructuring array
-        assert.strictEqual(ast.body[0].argnames[0].names[0].value.names.length, 2);
-        assert(ast.body[0].argnames[0].names[0].value.names[0] instanceof UglifyJS.AST_SymbolFunarg);
-        assert(ast.body[0].argnames[0].names[0].value.names[1] instanceof UglifyJS.AST_Expansion);
-        assert(ast.body[0].argnames[0].names[0].value.names[1].expression instanceof UglifyJS.AST_SymbolFunarg);
-    });
-});
+});

test/mocha/arrow.js

@@ -1,403 +0,0 @@
-var assert = require("assert");
-var uglify = require("../../");
-
-describe("Arrow functions", function() {
-    it("Should not accept spread tokens on non-last parameters or without arguments parentheses", function() {
-        var tests = [
-            "var a = ...a => {return a.join()}",
-            "var b = (a, ...b, c) => { return a + b.join() + c}",
-            "var c = (...a, b) => a.join()"
-        ];
-        var test = function(code) {
-            return function() {
-                uglify.parse(code, {fromString: true});
-            }
-        }
-        var error = function(e) {
-            return e instanceof uglify.JS_Parse_Error &&
-                e.message === "Unexpected token: expand (...)";
-        }
-
-        for (var i = 0; i < tests.length; i++) {
-            assert.throws(test(tests[i]), error);
-        }
-    });
-    it("Should not accept holes in object binding patterns, while still allowing a trailing elision", function() {
-        var tests = [
-            "f = ({, , ...x} = [1, 2]) => {};"
-        ];
-        var test = function(code) {
-            return function() {
-                uglify.parse(code, {fromString: true});
-            }
-        }
-        var error = function(e) {
-            return e instanceof uglify.JS_Parse_Error &&
-                e.message === "Unexpected token: punc (,)";
-        }
-
-        for (var i = 0; i < tests.length; i++) {
-            assert.throws(test(tests[i]), error);
-        }
-    });
-    it("Should not accept newlines before arrow token", function() {
-        var tests = [
-            "f = foo\n=> 'foo';",
-            "f = (foo, bar)\n=> 'foo';",
-            "f = ()\n=> 'foo';",
-            "foo((bar)\n=>'baz';);"
-        ];
-        var test = function(code) {
-            return function() {
-                uglify.parse(code, {fromString: true});
-            }
-        }
-        var error = function(e) {
-            return e instanceof uglify.JS_Parse_Error &&
-                e.message === "Unexpected newline before arrow (=>)";
-        }
-
-        for (var i = 0; i < tests.length; i++) {
-            assert.throws(test(tests[i]), error);
-        }
-    });
-    it("Should not accept arrow functions in the middle or end of an expression", function() {
-        var tests = [
-            "typeof x => 0",
-            "0 + x => 0"
-        ];
-        var test = function(code) {
-            return function() {
-                uglify.parse(code, {fromString: true});
-            }
-        }
-        var error = function(e) {
-            return e instanceof uglify.JS_Parse_Error &&
-                e.message === "Unexpected token: arrow (=>)";
-        }
-
-        for (var i = 0; i < tests.length; i++) {
-            assert.throws(test(tests[i]), error);
-        }
-    });
-
-    it("Should parse a function containing default assignment correctly", function() {
-        var ast = uglify.parse("var a = (a = 123) => {}");
-        assert(ast.body[0] instanceof uglify.AST_Var);
-        assert.strictEqual(ast.body[0].definitions.length, 1);
-        assert(ast.body[0].definitions[0] instanceof uglify.AST_VarDef);
-        assert(ast.body[0].definitions[0].name instanceof uglify.AST_SymbolVar);
-        assert(ast.body[0].definitions[0].value instanceof uglify.AST_Arrow);
-        assert.strictEqual(ast.body[0].definitions[0].value.argnames.length, 1);
-
-        // First argument
-        assert(ast.body[0].definitions[0].value.argnames[0] instanceof uglify.AST_DefaultAssign);
-        assert(ast.body[0].definitions[0].value.argnames[0].left instanceof uglify.AST_SymbolFunarg);
-        assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].operator, "=");
-        assert(ast.body[0].definitions[0].value.argnames[0].right instanceof uglify.AST_Number);
-
-        ast = uglify.parse("var a = (a = a) => {}");
-        assert(ast.body[0] instanceof uglify.AST_Var);
-        assert.strictEqual(ast.body[0].definitions.length, 1);
-        assert(ast.body[0].definitions[0] instanceof uglify.AST_VarDef);
-        assert(ast.body[0].definitions[0].name instanceof uglify.AST_SymbolVar);
-        assert(ast.body[0].definitions[0].value instanceof uglify.AST_Arrow);
-        assert.strictEqual(ast.body[0].definitions[0].value.argnames.length, 1);
-
-        // First argument
-        assert(ast.body[0].definitions[0].value.argnames[0] instanceof uglify.AST_DefaultAssign);
-        assert(ast.body[0].definitions[0].value.argnames[0].left instanceof uglify.AST_SymbolFunarg);
-        assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].operator, "=");
-        assert(ast.body[0].definitions[0].value.argnames[0].right instanceof uglify.AST_SymbolRef);
-    });
-
-    it("Should parse a function containing default assignments in destructuring correctly", function() {
-        var ast = uglify.parse("var a = ([a = 123]) => {}");
-        assert(ast.body[0] instanceof uglify.AST_Var);
-        assert.strictEqual(ast.body[0].definitions.length, 1);
-        assert(ast.body[0].definitions[0] instanceof uglify.AST_VarDef);
-        assert(ast.body[0].definitions[0].name instanceof uglify.AST_SymbolVar);
-        assert(ast.body[0].definitions[0].value instanceof uglify.AST_Arrow);
-        assert.strictEqual(ast.body[0].definitions[0].value.argnames.length, 1);
-
-        // First argument
-        assert(ast.body[0].definitions[0].value.argnames[0] instanceof uglify.AST_Destructuring);
-        assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].is_array, true);
-        assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].names.length, 1);
-        assert(ast.body[0].definitions[0].value.argnames[0].names[0] instanceof uglify.AST_DefaultAssign);
-        assert(ast.body[0].definitions[0].value.argnames[0].names[0].left instanceof uglify.AST_SymbolFunarg);
-        assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].names[0].operator, "=");
-        assert(ast.body[0].definitions[0].value.argnames[0].names[0].right instanceof uglify.AST_Number);
-
-
-        ast = uglify.parse("var a = ({a = 123}) => {}");
-        assert(ast.body[0] instanceof uglify.AST_Var);
-        assert.strictEqual(ast.body[0].definitions.length, 1);
-        assert(ast.body[0].definitions[0] instanceof uglify.AST_VarDef);
-        assert(ast.body[0].definitions[0].name instanceof uglify.AST_SymbolVar);
-        assert(ast.body[0].definitions[0].value instanceof uglify.AST_Arrow);
-        assert.strictEqual(ast.body[0].definitions[0].value.argnames.length, 1);
-
-        // First argument
-        assert(ast.body[0].definitions[0].value.argnames[0] instanceof uglify.AST_Destructuring);
-        assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].is_array, false);
-        assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].names.length, 1);
-        assert(ast.body[0].definitions[0].value.argnames[0].names[0] instanceof uglify.AST_ObjectKeyVal);
-
-        // First object element in first argument
-        assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].names[0].key, "a");
-        assert(ast.body[0].definitions[0].value.argnames[0].names[0].value instanceof uglify.AST_DefaultAssign);
-        assert(ast.body[0].definitions[0].value.argnames[0].names[0].value.left instanceof uglify.AST_SymbolFunarg);
-        assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].names[0].value.operator, "=");
-        assert(ast.body[0].definitions[0].value.argnames[0].names[0].value.right instanceof uglify.AST_Number);
-
-
-        ast = uglify.parse("var a = ({a: a = 123}) => {}");
-        assert(ast.body[0] instanceof uglify.AST_Var);
-        assert.strictEqual(ast.body[0].definitions.length, 1);
-        assert(ast.body[0].definitions[0] instanceof uglify.AST_VarDef);
-        assert(ast.body[0].definitions[0].name instanceof uglify.AST_SymbolVar);
-        assert(ast.body[0].definitions[0].value instanceof uglify.AST_Arrow);
-        assert.strictEqual(ast.body[0].definitions[0].value.argnames.length, 1);
-
-        // First argument
-        assert(ast.body[0].definitions[0].value.argnames[0] instanceof uglify.AST_Destructuring);
-        assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].is_array, false);
-        assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].names.length, 1);
-
-        // Content destructuring of first argument
-        assert(ast.body[0].definitions[0].value.argnames[0].names[0] instanceof uglify.AST_ObjectProperty);
-        assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].names[0].key, "a");
-        assert(ast.body[0].definitions[0].value.argnames[0].names[0].value instanceof uglify.AST_DefaultAssign);
-        assert(ast.body[0].definitions[0].value.argnames[0].names[0].value.left instanceof uglify.AST_SymbolFunarg);
-        assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].names[0].value.operator, "=");
-        assert(ast.body[0].definitions[0].value.argnames[0].names[0].value.right instanceof uglify.AST_Number);
-    });
-
-    it("Should parse a function containing default assignments in complex destructuring correctly", function() {
-        var ast = uglify.parse("var a = ([a, [b = 123]]) => {}");
-        assert(ast.body[0] instanceof uglify.AST_Var);
-        assert.strictEqual(ast.body[0].definitions.length, 1);
-        assert(ast.body[0].definitions[0] instanceof uglify.AST_VarDef);
-        assert(ast.body[0].definitions[0].name instanceof uglify.AST_SymbolVar);
-        assert(ast.body[0].definitions[0].value instanceof uglify.AST_Arrow);
-        assert.strictEqual(ast.body[0].definitions[0].value.argnames.length, 1);
-
-        // Check first argument
-        assert(ast.body[0].definitions[0].value.argnames[0] instanceof uglify.AST_Destructuring);
-        assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].is_array, true);
-        assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].names.length, 2);
-
-        // Check whole destructuring structure of first argument
-        assert(ast.body[0].definitions[0].value.argnames[0].names[0] instanceof uglify.AST_SymbolFunarg);
-        assert(ast.body[0].definitions[0].value.argnames[0].names[1] instanceof uglify.AST_Destructuring);
-        assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].names[1].is_array, true);
-
-        // Check content of second destructuring element (which is the nested destructuring pattern)
-        assert(ast.body[0].definitions[0].value.argnames[0].names[1].names[0] instanceof uglify.AST_DefaultAssign);
-        assert(ast.body[0].definitions[0].value.argnames[0].names[1].names[0].left instanceof uglify.AST_SymbolFunarg);
-        assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].names[1].names[0].operator, "=");
-        assert(ast.body[0].definitions[0].value.argnames[0].names[1].names[0].right instanceof uglify.AST_Number);
-
-
-        ast = uglify.parse("var a = ([a, {b: c = 123}]) => {}");
-        assert(ast.body[0] instanceof uglify.AST_Var);
-        assert.strictEqual(ast.body[0].definitions.length, 1);
-        assert(ast.body[0].definitions[0] instanceof uglify.AST_VarDef);
-        assert(ast.body[0].definitions[0].name instanceof uglify.AST_SymbolVar);
-        assert(ast.body[0].definitions[0].value instanceof uglify.AST_Arrow);
-        assert.strictEqual(ast.body[0].definitions[0].value.argnames.length, 1);
-
-        // Check first argument
-        assert(ast.body[0].definitions[0].value.argnames[0] instanceof uglify.AST_Destructuring);
-        assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].is_array, true);
-        assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].names.length, 2);
-
-        // Check whole destructuring structure of first argument
-        assert(ast.body[0].definitions[0].value.argnames[0].names[0] instanceof uglify.AST_SymbolFunarg);
-        assert(ast.body[0].definitions[0].value.argnames[0].names[1] instanceof uglify.AST_Destructuring);
-        assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].names[1].is_array, false);
-
-        // Check content of second destructuring element (which is the nested destructuring pattern)
-        assert(ast.body[0].definitions[0].value.argnames[0].names[1].names[0] instanceof uglify.AST_ObjectKeyVal);
-        assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].names[1].names[0].key, "b");
-        assert(ast.body[0].definitions[0].value.argnames[0].names[1].names[0].value instanceof uglify.AST_DefaultAssign);
-        assert(ast.body[0].definitions[0].value.argnames[0].names[1].names[0].value.left instanceof uglify.AST_SymbolFunarg);
-        assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].names[1].names[0].value.operator, "=");
-        assert(ast.body[0].definitions[0].value.argnames[0].names[1].names[0].value.right instanceof uglify.AST_Number);
-
-
-        ast = uglify.parse("var a = ({a, b: {b = 123}}) => {}");
-        assert(ast.body[0] instanceof uglify.AST_Var);
-        assert.strictEqual(ast.body[0].definitions.length, 1);
-        assert(ast.body[0].definitions[0] instanceof uglify.AST_VarDef);
-        assert(ast.body[0].definitions[0].name instanceof uglify.AST_SymbolVar);
-        assert(ast.body[0].definitions[0].value instanceof uglify.AST_Arrow);
-        assert.strictEqual(ast.body[0].definitions[0].value.argnames.length, 1);
-
-        // Check first argument
-        assert(ast.body[0].definitions[0].value.argnames[0] instanceof uglify.AST_Destructuring);
-        assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].is_array, false);
-        assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].names.length, 2);
-
-        // First argument, property 1
-        assert(ast.body[0].definitions[0].value.argnames[0].names[0] instanceof uglify.AST_ObjectKeyVal);
-        assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].names[0].key, "a");
-        assert(ast.body[0].definitions[0].value.argnames[0].names[0].value instanceof uglify.AST_SymbolFunarg);
-
-        // First argument, property 2
-        assert(ast.body[0].definitions[0].value.argnames[0].names[1] instanceof uglify.AST_ObjectKeyVal);
-        assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].names[1].key, "b");
-        assert(ast.body[0].definitions[0].value.argnames[0].names[1].value instanceof uglify.AST_Destructuring);
-
-        // Check content of nested destructuring
-        var content = ast.body[0].definitions[0].value.argnames[0].names[1].value
-        assert.strictEqual(content.is_array, false);
-        assert.strictEqual(content.names.length, 1);
-        assert(content.names[0] instanceof uglify.AST_ObjectKeyVal);
-
-        // Content of first property in nested destructuring
-        assert.strictEqual(content.names[0].key, "b");
-        assert(content.names[0].value instanceof uglify.AST_DefaultAssign);
-        assert(content.names[0].value.left instanceof uglify.AST_SymbolFunarg);
-        assert.strictEqual(content.names[0].value.operator, "=");
-        assert(content.names[0].value.right instanceof uglify.AST_Number);
-
-
-        ast = uglify.parse("var a = ({a: {b = 123}}) => {}");
-        assert(ast.body[0] instanceof uglify.AST_Var);
-        assert.strictEqual(ast.body[0].definitions.length, 1);
-        assert(ast.body[0].definitions[0] instanceof uglify.AST_VarDef);
-        assert(ast.body[0].definitions[0].name instanceof uglify.AST_SymbolVar);
-        assert(ast.body[0].definitions[0].value instanceof uglify.AST_Arrow);
-        assert.strictEqual(ast.body[0].definitions[0].value.argnames.length, 1);
-
-        // Check first argument
-        assert(ast.body[0].definitions[0].value.argnames[0] instanceof uglify.AST_Destructuring);
-        assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].is_array, false);
-        assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].names.length, 1);
-
-        // Check whole destructuring structure of first argument
-        assert(ast.body[0].definitions[0].value.argnames[0].names[0] instanceof uglify.AST_ObjectKeyVal);
-        assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].names[0].key, "a");
-        assert(ast.body[0].definitions[0].value.argnames[0].names[0].value instanceof uglify.AST_Destructuring);
-
-        // Check content of nested destructuring
-        content = ast.body[0].definitions[0].value.argnames[0].names[0].value
-        assert.strictEqual(content.is_array, false);
-        assert.strictEqual(content.names.length, 1);
-        assert(content.names[0] instanceof uglify.AST_ObjectKeyVal);
-
-        // Check first property of nested destructuring
-        assert.strictEqual(content.names[0].key, "b");
-        assert(content.names[0].value instanceof uglify.AST_DefaultAssign);
-        assert(content.names[0].value.left instanceof uglify.AST_SymbolFunarg);
-        assert.strictEqual(content.names[0].value.operator, "=");
-        assert(content.names[0].value.right instanceof uglify.AST_Number);
-    });
-
-    it("Should parse spread correctly", function() {
-        var ast = uglify.parse("var a = (a, b, ...c) => {}");
-        assert(ast.body[0] instanceof uglify.AST_Var);
-        assert.strictEqual(ast.body[0].definitions.length, 1);
-        assert(ast.body[0].definitions[0] instanceof uglify.AST_VarDef);
-        assert(ast.body[0].definitions[0].name instanceof uglify.AST_SymbolVar);
-        assert(ast.body[0].definitions[0].value instanceof uglify.AST_Arrow);
-        assert.strictEqual(ast.body[0].definitions[0].value.argnames.length, 3);
-
-        // Check parameters
-        assert(ast.body[0].definitions[0].value.argnames[0] instanceof uglify.AST_SymbolFunarg);
-        assert(ast.body[0].definitions[0].value.argnames[1] instanceof uglify.AST_SymbolFunarg);
-        assert(ast.body[0].definitions[0].value.argnames[2] instanceof uglify.AST_Expansion);
-        assert(ast.body[0].definitions[0].value.argnames[2].expression instanceof uglify.AST_SymbolFunarg);
-
-
-        ast = uglify.parse("var a = ([a, b, ...c]) => {}");
-        assert(ast.body[0] instanceof uglify.AST_Var);
-        assert.strictEqual(ast.body[0].definitions.length, 1);
-        assert(ast.body[0].definitions[0] instanceof uglify.AST_VarDef);
-        assert(ast.body[0].definitions[0].name instanceof uglify.AST_SymbolVar);
-        assert(ast.body[0].definitions[0].value instanceof uglify.AST_Arrow);
-        assert.strictEqual(ast.body[0].definitions[0].value.argnames.length, 1);
-
-        // Check first parameter
-        assert(ast.body[0].definitions[0].value.argnames[0] instanceof uglify.AST_Destructuring);
-        assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].is_array, true);
-
-        // Check content first parameter
-        assert(ast.body[0].definitions[0].value.argnames[0].names[0] instanceof uglify.AST_SymbolFunarg);
-        assert(ast.body[0].definitions[0].value.argnames[0].names[1] instanceof uglify.AST_SymbolFunarg);
-        assert(ast.body[0].definitions[0].value.argnames[0].names[2] instanceof uglify.AST_Expansion);
-        assert(ast.body[0].definitions[0].value.argnames[0].names[2].expression instanceof uglify.AST_SymbolFunarg);
-
-
-        ast = uglify.parse("var a = ([a, b, [c, ...d]]) => {}");
-        assert(ast.body[0] instanceof uglify.AST_Var);
-        assert.strictEqual(ast.body[0].definitions.length, 1);
-        assert(ast.body[0].definitions[0] instanceof uglify.AST_VarDef);
-        assert(ast.body[0].definitions[0].name instanceof uglify.AST_SymbolVar);
-        assert(ast.body[0].definitions[0].value instanceof uglify.AST_Arrow);
-        assert.strictEqual(ast.body[0].definitions[0].value.argnames.length, 1);
-
-        // Check first parameter
-        assert(ast.body[0].definitions[0].value.argnames[0] instanceof uglify.AST_Destructuring);
-        assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].is_array, true);
-
-        // Check content outer destructuring array
-        assert(ast.body[0].definitions[0].value.argnames[0].names[0] instanceof uglify.AST_SymbolFunarg);
-        assert(ast.body[0].definitions[0].value.argnames[0].names[1] instanceof uglify.AST_SymbolFunarg);
-        assert(ast.body[0].definitions[0].value.argnames[0].names[2] instanceof uglify.AST_Destructuring);
-        assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].names[2].is_array, true);
-
-        // Check content nested destructuring array
-        assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].names[2].names.length, 2);
-        assert(ast.body[0].definitions[0].value.argnames[0].names[2].names[0] instanceof uglify.AST_SymbolFunarg);
-        assert(ast.body[0].definitions[0].value.argnames[0].names[2].names[1] instanceof uglify.AST_Expansion);
-        assert(ast.body[0].definitions[0].value.argnames[0].names[2].names[1].expression instanceof uglify.AST_SymbolFunarg);
-
-
-        ast = uglify.parse("var a = ({a: [b, ...c]}) => {}");
-        assert(ast.body[0] instanceof uglify.AST_Var);
-        assert.strictEqual(ast.body[0].definitions.length, 1);
-        assert(ast.body[0].definitions[0] instanceof uglify.AST_VarDef);
-        assert(ast.body[0].definitions[0].name instanceof uglify.AST_SymbolVar);
-        assert(ast.body[0].definitions[0].value instanceof uglify.AST_Arrow);
-        assert.strictEqual(ast.body[0].definitions[0].value.argnames.length, 1);
-
-        // Check first parameter
-        assert(ast.body[0].definitions[0].value.argnames[0] instanceof uglify.AST_Destructuring);
-        assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].is_array, false);
-
-        // Check outer destructuring object
-        assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].names.length, 1);
-        assert(ast.body[0].definitions[0].value.argnames[0].names[0] instanceof uglify.AST_ObjectKeyVal);
-        assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].names[0].key, "a");
-        assert(ast.body[0].definitions[0].value.argnames[0].names[0].value instanceof uglify.AST_Destructuring);
-        assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].names[0].value.is_array, true);
-
-        // Check content nested destructuring array
-        assert.strictEqual(ast.body[0].definitions[0].value.argnames[0].names[0].value.names.length, 2);
-        assert(ast.body[0].definitions[0].value.argnames[0].names[0].value.names[0] instanceof uglify.AST_SymbolFunarg);
-        assert(ast.body[0].definitions[0].value.argnames[0].names[0].value.names[1] instanceof uglify.AST_Expansion);
-        assert(ast.body[0].definitions[0].value.argnames[0].names[0].value.names[1].expression instanceof uglify.AST_SymbolFunarg);
-    });
-
-    it("Should handle arrow function with bind", function() {
-        function minify(code) {
-            return uglify.minify(code, {
-                fromString: true,
-                mangle: false
-            }).code;
-        }
-
-        assert.strictEqual(
-            minify(minify("test(((index) => { console.log(this, index); }).bind(this, 1));")),
-            "test((index=>{console.log(this,index)}).bind(this,1));"
-        );
-        assert.strictEqual(
-            minify(minify('test(((index) => { console.log(this, index); })["bind"](this, 1));')),
-            "test((index=>{console.log(this,index)}).bind(this,1));"
-        );
-    });
-
-});

test/mocha/builtins.js

@@ -1,34 +0,0 @@
-var UglifyJS = require("../../");
-var assert = require("assert");
-
-describe("builtins", function() {
-    it ("Should not mangle builtins", function() {
-        var test = "function foo(something){\n" +
-            "    return [Object,Array,Function,Number,String,Boolean,Error,Math,Date,RegExp,Symbol,Map,Promise,Proxy,Reflect,Set,WeakMap,WeakSet,Float32Array,something];\n" +
-            "};";
-
-        var result = UglifyJS.minify(test, {fromString: true, parse: {bare_returns: true}}).code;
-
-        assert.strictEqual(result.indexOf("something"), -1);
-
-        assert.notEqual(result.indexOf("Object"), -1);
-        assert.notEqual(result.indexOf("Array"), -1);
-        assert.notEqual(result.indexOf("Function"), -1);
-        assert.notEqual(result.indexOf("Number"), -1);
-        assert.notEqual(result.indexOf("String"), -1);
-        assert.notEqual(result.indexOf("Boolean"), -1);
-        assert.notEqual(result.indexOf("Error"), -1);
-        assert.notEqual(result.indexOf("Math"), -1);
-        assert.notEqual(result.indexOf("Date"), -1);
-        assert.notEqual(result.indexOf("RegExp"), -1);
-        assert.notEqual(result.indexOf("Symbol"), -1);
-        assert.notEqual(result.indexOf("Promise"), -1);
-        assert.notEqual(result.indexOf("Proxy"), -1);
-        assert.notEqual(result.indexOf("Reflect"), -1);
-        assert.notEqual(result.indexOf("Set"), -1);
-        assert.notEqual(result.indexOf("WeakMap"), -1);
-        assert.notEqual(result.indexOf("WeakSet"), -1);
-        assert.notEqual(result.indexOf("Map"), -1);
-        assert.notEqual(result.indexOf("Float32Array"), -1);
-    });
-});

test/mocha/class.js

@@ -1,57 +0,0 @@
-var assert = require("assert");
-var uglify = require("../../");
-
-describe("Class", function() {
-    it("Should not accept spread on non-last parameters in methods", function() {
-        var tests = [
-            "class foo { bar(...a, b) { return a.join(b) } }",
-            "class foo { bar(a, b, ...c, d) { return c.join(a + b) + d } }",
-            "class foo { *bar(...a, b) { return a.join(b) } }",
-            "class foo { *bar(a, b, ...c, d) { return c.join(a + b) + d } }"
-        ];
-        var test = function(code) {
-            return function() {
-                uglify.parse(code, {fromString: true});
-            }
-        }
-        var error = function(e) {
-            return e instanceof uglify.JS_Parse_Error &&
-                /^Unexpected token: /.test(e.message);
-        }
-
-        for (var i = 0; i < tests.length; i++) {
-            assert.throws(test(tests[i]), error);
-        }
-    });
-
-    it("Should return the correct token for class methods", function() {
-        var tests = [
-            {
-                code: "class foo{static test(){}}",
-                token_value_start: "static",
-                token_value_end: "}"
-            },
-            {
-                code: "class bar{*procedural(){}}",
-                token_value_start: "*",
-                token_value_end: "}"
-            },
-            {
-                code: "class foobar{aMethod(){}}",
-                token_value_start: "aMethod",
-                token_value_end: "}"
-            },
-            {
-                code: "class foobaz{get something(){}}",
-                token_value_start: "get",
-                token_value_end: "}"
-            }
-        ];
-
-        for (var i = 0; i < tests.length; i++) {
-            var ast = uglify.parse(tests[i].code);
-            assert.strictEqual(ast.body[0].properties[0].start.value, tests[i].token_value_start);
-            assert.strictEqual(ast.body[0].properties[0].end.value, tests[i].token_value_end);
-        }
-    });
-});

test/mocha/cli.js

@@ -51,15 +51,15 @@ describe("bin/uglifyjs", function () {
         });
     });
     it("Should append source map to output when using --source-map-inline", function (done) {
-       var command = uglifyjscmd + ' test/input/issue-1323/sample.js --source-map-inline';
+        var command = uglifyjscmd + ' test/input/issue-1323/sample.js --source-map-inline';
 
-       exec(command, function (err, stdout) {
-           if (err) throw err;
+        exec(command, function (err, stdout) {
+            if (err) throw err;
 
-           assert.strictEqual(stdout, "var bar=function(){function foo(bar){return bar}return foo}();\n" +
-               "//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRlc3QvaW5wdXQvaXNzdWUtMTMyMy9zYW1wbGUuanMiXSwibmFtZXMiOlsiYmFyIiwiZm9vIl0sIm1hcHBpbmdzIjoiQUFBQSxHQUFJQSxLQUFNLFdBQ04sUUFBU0MsS0FBS0QsS0FDVixNQUFPQSxLQUdYLE1BQU9DIn0=\n");
-           done();
-       });
+            assert.strictEqual(stdout, "var bar=function(){function foo(bar){return bar}return foo}();\n" +
+                "//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRlc3QvaW5wdXQvaXNzdWUtMTMyMy9zYW1wbGUuanMiXSwibmFtZXMiOlsiYmFyIiwiZm9vIl0sIm1hcHBpbmdzIjoiQUFBQSxHQUFJQSxLQUFNLFdBQ04sUUFBU0MsS0FBS0QsS0FDVixNQUFPQSxLQUdYLE1BQU9DIn0=\n");
+            done();
+        });
     });
     it("should not append source map to output when not using --source-map-inline", function (done) {
         var command = uglifyjscmd + ' test/input/issue-1323/sample.js';
@@ -72,84 +72,84 @@ describe("bin/uglifyjs", function () {
         });
     });
     it("Should work with --keep-fnames (mangle only)", function (done) {
-       var command = uglifyjscmd + ' test/input/issue-1431/sample.js --keep-fnames -m';
+        var command = uglifyjscmd + ' test/input/issue-1431/sample.js --keep-fnames -m';
 
-       exec(command, function (err, stdout) {
-           if (err) throw err;
+        exec(command, function (err, stdout) {
+            if (err) throw err;
 
-           assert.strictEqual(stdout, "function f(r){return function(){function n(n){return n*n}return r(n)}}function g(n){return n(1)+n(2)}console.log(f(g)()==5);\n");
-           done();
-       });
+            assert.strictEqual(stdout, "function f(r){return function(){function n(n){return n*n}return r(n)}}function g(n){return n(1)+n(2)}console.log(f(g)()==5);\n");
+            done();
+        });
     });
     it("Should work with --keep-fnames (mangle & compress)", function (done) {
-       var command = uglifyjscmd + ' test/input/issue-1431/sample.js --keep-fnames -m -c unused=false';
+        var command = uglifyjscmd + ' test/input/issue-1431/sample.js --keep-fnames -m -c unused=false';
 
-       exec(command, function (err, stdout) {
-           if (err) throw err;
+        exec(command, function (err, stdout) {
+            if (err) throw err;
 
-           assert.strictEqual(stdout, "function f(r){return function(){function n(n){return n*n}return r(n)}}function g(n){return n(1)+n(2)}console.log(5==f(g)());\n");
-           done();
-       });
+            assert.strictEqual(stdout, "function f(r){return function(){function n(n){return n*n}return r(n)}}function g(n){return n(1)+n(2)}console.log(5==f(g)());\n");
+            done();
+        });
     });
     it("Should work with keep_fnames under mangler options", function (done) {
-       var command = uglifyjscmd + ' test/input/issue-1431/sample.js -m keep_fnames=true';
+        var command = uglifyjscmd + ' test/input/issue-1431/sample.js -m keep_fnames=true';
 
-       exec(command, function (err, stdout) {
-           if (err) throw err;
+        exec(command, function (err, stdout) {
+            if (err) throw err;
 
-           assert.strictEqual(stdout, "function f(r){return function(){function n(n){return n*n}return r(n)}}function g(n){return n(1)+n(2)}console.log(f(g)()==5);\n");
-           done();
-       });
+            assert.strictEqual(stdout, "function f(r){return function(){function n(n){return n*n}return r(n)}}function g(n){return n(1)+n(2)}console.log(f(g)()==5);\n");
+            done();
+        });
     });
     it("Should work with --define (simple)", function (done) {
-       var command = uglifyjscmd + ' test/input/global_defs/simple.js --define D=5 -c';
+        var command = uglifyjscmd + ' test/input/global_defs/simple.js --define D=5 -c';
 
-       exec(command, function (err, stdout) {
-           if (err) throw err;
+        exec(command, function (err, stdout) {
+            if (err) throw err;
 
-           assert.strictEqual(stdout, "console.log(5);\n");
-           done();
-       });
+            assert.strictEqual(stdout, "console.log(5);\n");
+            done();
+        });
     });
     it("Should work with --define (nested)", function (done) {
-       var command = uglifyjscmd + ' test/input/global_defs/nested.js --define C.D=5,C.V=3 -c';
+        var command = uglifyjscmd + ' test/input/global_defs/nested.js --define C.D=5,C.V=3 -c';
 
-       exec(command, function (err, stdout) {
-           if (err) throw err;
+        exec(command, function (err, stdout) {
+            if (err) throw err;
 
-           assert.strictEqual(stdout, "console.log(3,5);\n");
-           done();
-       });
+            assert.strictEqual(stdout, "console.log(3,5);\n");
+            done();
+        });
     });
     it("Should work with --define (AST_Node)", function (done) {
-       var command = uglifyjscmd + ' test/input/global_defs/simple.js --define console.log=stdout.println -c';
+        var command = uglifyjscmd + ' test/input/global_defs/simple.js --define console.log=stdout.println -c';
 
-       exec(command, function (err, stdout) {
-           if (err) throw err;
+        exec(command, function (err, stdout) {
+            if (err) throw err;
 
-           assert.strictEqual(stdout, "stdout.println(D);\n");
-           done();
-       });
+            assert.strictEqual(stdout, "stdout.println(D);\n");
+            done();
+        });
     });
     it("Should work with `--beautify`", function (done) {
-       var command = uglifyjscmd + ' test/input/issue-1482/input.js -b';
+        var command = uglifyjscmd + ' test/input/issue-1482/input.js -b';
 
-       exec(command, function (err, stdout) {
-           if (err) throw err;
+        exec(command, function (err, stdout) {
+            if (err) throw err;
 
-           assert.strictEqual(stdout, readFileSync("test/input/issue-1482/default.js", "utf8"));
-           done();
-       });
+            assert.strictEqual(stdout, readFileSync("test/input/issue-1482/default.js", "utf8"));
+            done();
+        });
     });
     it("Should work with `--beautify bracketize`", function (done) {
-       var command = uglifyjscmd + ' test/input/issue-1482/input.js -b bracketize';
+        var command = uglifyjscmd + ' test/input/issue-1482/input.js -b bracketize';
 
-       exec(command, function (err, stdout) {
-           if (err) throw err;
+        exec(command, function (err, stdout) {
+            if (err) throw err;
 
-           assert.strictEqual(stdout, readFileSync("test/input/issue-1482/bracketize.js", "utf8"));
-           done();
-       });
+            assert.strictEqual(stdout, readFileSync("test/input/issue-1482/bracketize.js", "utf8"));
+            done();
+        });
     });
     it("Should process inline source map", function(done) {
         var command = uglifyjscmd + ' test/input/issue-520/input.js -mc toplevel --in-source-map inline --source-map-inline';
@@ -252,58 +252,163 @@ describe("bin/uglifyjs", function () {
         });
     });
     it("Should support hyphen as shorthand", function(done) {
-       var command = uglifyjscmd + ' test/input/issue-1431/sample.js -m keep-fnames=true';
+        var command = uglifyjscmd + ' test/input/issue-1431/sample.js -m keep-fnames=true';
 
-       exec(command, function (err, stdout) {
-           if (err) throw err;
+        exec(command, function (err, stdout) {
+            if (err) throw err;
 
-           assert.strictEqual(stdout, "function f(r){return function(){function n(n){return n*n}return r(n)}}function g(n){return n(1)+n(2)}console.log(f(g)()==5);\n");
-           done();
-       });
+            assert.strictEqual(stdout, "function f(r){return function(){function n(n){return n*n}return r(n)}}function g(n){return n(1)+n(2)}console.log(f(g)()==5);\n");
+            done();
+        });
     });
     it("Should throw syntax error (5--)", function(done) {
-       var command = uglifyjscmd + ' test/input/invalid/assign_1.js';
+        var command = uglifyjscmd + ' test/input/invalid/assign_1.js';
 
-       exec(command, function (err, stdout, stderr) {
-           assert.ok(err);
-           assert.strictEqual(stdout, "");
-           assert.strictEqual(stderr.split(/\n/).slice(0, 4).join("\n"), [
-               "Parse error at test/input/invalid/assign_1.js:1,18",
-               "console.log(1 || 5--);",
-               "                  ^",
-               "SyntaxError: Invalid use of -- operator"
-           ].join("\n"));
-           done();
-       });
+        exec(command, function (err, stdout, stderr) {
+            assert.ok(err);
+            assert.strictEqual(stdout, "");
+            assert.strictEqual(stderr.split(/\n/).slice(0, 4).join("\n"), [
+                "Parse error at test/input/invalid/assign_1.js:1,18",
+                "console.log(1 || 5--);",
+                "                  ^",
+                "SyntaxError: Invalid use of -- operator"
+            ].join("\n"));
+            done();
+        });
     });
     it("Should throw syntax error (Math.random() /= 2)", function(done) {
-       var command = uglifyjscmd + ' test/input/invalid/assign_2.js';
+        var command = uglifyjscmd + ' test/input/invalid/assign_2.js';
 
-       exec(command, function (err, stdout, stderr) {
-           assert.ok(err);
-           assert.strictEqual(stdout, "");
-           assert.strictEqual(stderr.split(/\n/).slice(0, 4).join("\n"), [
-               "Parse error at test/input/invalid/assign_2.js:1,32",
-               "console.log(2 || (Math.random() /= 2));",
-               "                                ^",
-               "SyntaxError: Invalid assignment"
-           ].join("\n"));
-           done();
-       });
+        exec(command, function (err, stdout, stderr) {
+            assert.ok(err);
+            assert.strictEqual(stdout, "");
+            assert.strictEqual(stderr.split(/\n/).slice(0, 4).join("\n"), [
+                "Parse error at test/input/invalid/assign_2.js:1,32",
+                "console.log(2 || (Math.random() /= 2));",
+                "                                ^",
+                "SyntaxError: Invalid assignment"
+            ].join("\n"));
+            done();
+        });
     });
     it("Should throw syntax error (++this)", function(done) {
-       var command = uglifyjscmd + ' test/input/invalid/assign_3.js';
+        var command = uglifyjscmd + ' test/input/invalid/assign_3.js';
 
-       exec(command, function (err, stdout, stderr) {
-           assert.ok(err);
-           assert.strictEqual(stdout, "");
-           assert.strictEqual(stderr.split(/\n/).slice(0, 4).join("\n"), [
-               "Parse error at test/input/invalid/assign_3.js:1,18",
-               "console.log(3 || ++this);",
-               "                  ^",
-               "SyntaxError: Invalid use of ++ operator"
-           ].join("\n"));
-           done();
-       });
+        exec(command, function (err, stdout, stderr) {
+            assert.ok(err);
+            assert.strictEqual(stdout, "");
+            assert.strictEqual(stderr.split(/\n/).slice(0, 4).join("\n"), [
+                "Parse error at test/input/invalid/assign_3.js:1,17",
+                "console.log(3 || ++this);",
+                "                 ^",
+                "SyntaxError: Invalid use of ++ operator"
+            ].join("\n"));
+            done();
+        });
+    });
+    it("Should throw syntax error (++null)", function(done) {
+        var command = uglifyjscmd + ' test/input/invalid/assign_4.js';
+
+        exec(command, function (err, stdout, stderr) {
+            assert.ok(err);
+            assert.strictEqual(stdout, "");
+            assert.strictEqual(stderr.split(/\n/).slice(0, 4).join("\n"), [
+                "Parse error at test/input/invalid/assign_4.js:1,0",
+                "++null",
+                "^",
+                "SyntaxError: Invalid use of ++ operator"
+            ].join("\n"));
+            done();
+        });
+    });
+    it("Should throw syntax error (a.=)", function(done) {
+        var command = uglifyjscmd + ' test/input/invalid/dot_1.js';
+
+        exec(command, function (err, stdout, stderr) {
+            assert.ok(err);
+            assert.strictEqual(stdout, "");
+            assert.strictEqual(stderr.split(/\n/).slice(0, 4).join("\n"), [
+                "Parse error at test/input/invalid/dot_1.js:1,2",
+                "a.=",
+                "  ^",
+                "SyntaxError: Unexpected token: operator (=)"
+            ].join("\n"));
+            done();
+        });
+    });
+    it("Should throw syntax error (%.a)", function(done) {
+        var command = uglifyjscmd + ' test/input/invalid/dot_2.js';
+
+        exec(command, function (err, stdout, stderr) {
+            assert.ok(err);
+            assert.strictEqual(stdout, "");
+            assert.strictEqual(stderr.split(/\n/).slice(0, 4).join("\n"), [
+                "Parse error at test/input/invalid/dot_2.js:1,0",
+                "%.a;",
+                "^",
+                "SyntaxError: Unexpected token: operator (%)"
+            ].join("\n"));
+            done();
+        });
+    });
+    it("Should throw syntax error (a./();)", function(done) {
+        var command = uglifyjscmd + ' test/input/invalid/dot_3.js';
+
+        exec(command, function (err, stdout, stderr) {
+            assert.ok(err);
+            assert.strictEqual(stdout, "");
+            assert.strictEqual(stderr.split(/\n/).slice(0, 4).join("\n"), [
+                "Parse error at test/input/invalid/dot_3.js:1,2",
+                "a./();",
+                "  ^",
+                "SyntaxError: Unexpected token: operator (/)"
+            ].join("\n"));
+            done();
+        });
+    });
+    it("Should throw syntax error ({%: 1})", function(done) {
+        var command = uglifyjscmd + ' test/input/invalid/object.js';
+
+        exec(command, function (err, stdout, stderr) {
+            assert.ok(err);
+            assert.strictEqual(stdout, "");
+            assert.strictEqual(stderr.split(/\n/).slice(0, 4).join("\n"), [
+                "Parse error at test/input/invalid/object.js:1,13",
+                "console.log({%: 1});",
+                "             ^",
+                "SyntaxError: Unexpected token: operator (%)"
+            ].join("\n"));
+            done();
+        });
+    });
+    it("Should throw syntax error (else)", function(done) {
+        var command = uglifyjscmd + ' test/input/invalid/else.js';
+
+        exec(command, function (err, stdout, stderr) {
+            assert.ok(err);
+            assert.strictEqual(stdout, "");
+            assert.strictEqual(stderr.split(/\n/).slice(0, 4).join("\n"), [
+                "Parse error at test/input/invalid/else.js:1,7",
+                "if (0) else 1;",
+                "       ^",
+                "SyntaxError: Unexpected token: keyword (else)"
+            ].join("\n"));
+            done();
+        });
+    });
+    it("Should throw syntax error (return)", function(done) {
+        var command = uglifyjscmd + ' test/input/invalid/return.js';
+
+        exec(command, function (err, stdout, stderr) {
+            assert.ok(err);
+            assert.strictEqual(stdout, "");
+            assert.strictEqual(stderr.split(/\n/).slice(0, 4).join("\n"), [
+                "Parse error at test/input/invalid/return.js:1,0",
+                "return 42;",
+                "^",
+                "SyntaxError: 'return' outside of function"
+            ].join("\n"));
+            done();
+        });
     });
 });

test/mocha/comment-filter.js

@@ -79,5 +79,13 @@ describe("comment filters", function() {
             output: { preamble: "/* Build */" }
         }).code;
         assert.strictEqual(code, "#!/usr/bin/node\n/* Build */\nvar x=10;");
-    })
+    });
+
+    it("Should handle preamble without shebang correctly", function() {
+        var code = UglifyJS.minify("var x = 10;", {
+            fromString: true,
+            output: { preamble: "/* Build */" }
+        }).code;
+        assert.strictEqual(code, "/* Build */\nvar x=10;");
+    });
 });

test/mocha/comment.js

@@ -31,8 +31,7 @@ describe("Comment", function() {
             "/*Some comment 2\r\n\r\n\r\n*/\r\n>\n\n\n\n\n\n",
             "/*Some comment 3\r\r\r*/\r>\n\n\n\n\n\n",
             "/*Some comment 4\u2028\u2028\u2028*/\u2028>\n\n\n\n\n\n",
-            "/*Some comment 5\u2029\u2029\u2029*/\u2029>\n\n\n\n\n\n",
-            "/*Some comment 6\udbff\udfff\udbff\udfff\n\n\n*/\n>\n\n\n\n\n"
+            "/*Some comment 5\u2029\u2029\u2029*/\u2029>\n\n\n\n\n\n"
         ];
 
         var fail = function(e) {
@@ -44,7 +43,7 @@ describe("Comment", function() {
 
         for (var i = 0; i < tests.length; i++) {
             assert.throws(function() {
-                uglify.parse(tests[i], {fromString: true});
+                uglify.parse(tests[i], {fromString: true})
             }, fail, tests[i]);
         }
     });

test/mocha/destructuring.js

@@ -1,138 +0,0 @@
-var assert = require("assert");
-var uglify = require("../../");
-
-describe("Destructuring", function() {
-    it("Should generate similar trees for destructuring in left hand side expressions, definitions, functions and arrow functions", function() {
-        var patterns = [
-            "[]",
-            "{}",
-
-            "[a, b, c]",
-            "{a: b, c: d}",
-            "{a}",
-            "{a, b}",
-
-            "{a: {}}",
-            "{a: []}",
-            "[{}]",
-            "[[]]",
-            "{a: {b}}",
-
-            // Can't do `a = 123` with lhs expression, so only test in destructuring
-            "[foo = bar]",
-            "{a = 123}",
-            "[{foo: abc = 123}]",
-            "{foo: [abc = 123]}",
-
-            "[...foo]",
-            "[...{}]",
-            "[...[]]"
-
-            // Can't do `...` because that is an invalid lhs expression, spread in array destructuring should be fine though
-        ];
-
-        var types = [
-            {
-                name: "lhs",
-                symbolType: uglify.AST_SymbolRef,
-                tree: function (ast) {
-                    return ast.body[0].body.left;
-                },
-                generate: function (code) {
-                    return "(" + code + " = a)";
-                }
-            },
-            {
-                name: "var",
-                symbolType: uglify.AST_SymbolVar,
-                tree: function (ast) {
-                    return ast.body[0].definitions[0].name;
-                },
-                generate: function (code) {
-                    return "var " + code + " = a";
-                }
-            },
-            {
-                name: "function",
-                symbolType: uglify.AST_SymbolFunarg,
-                tree: function (ast) {
-                    return ast.body[0].argnames[0];
-                },
-                generate: function (code) {
-                    return "function a(" + code + ") {}";
-                }
-            },
-            {
-                name: "arrow",
-                symbolType: uglify.AST_SymbolFunarg,
-                tree: function (ast) {
-                    return ast.body[0].definitions[0].value.argnames[0];
-                },
-                generate: function (code) {
-                    return "var a = (" + code + ") => {}";
-                }
-            }
-        ];
-
-        var walker = function(type, ref, code, result) {
-            var w = new uglify.TreeWalker(function(node) {
-                if (w.parent() instanceof uglify.AST_DefaultAssign &&
-                    w.parent().right === node
-                ) {
-                    return true; // Don't check the content of the default assignment
-
-                } else if (node instanceof uglify.AST_Symbol) {
-                    assert(node instanceof type.symbolType,
-                        node.TYPE + " while " + type.symbolType.TYPE + " expected at pos " +
-                        node.start.pos + " in `" + code + "`  (" + ref + ")"
-                    );
-
-                    result.push([
-                        new uglify.AST_Symbol({
-                            start: node.start,
-                            name: node.name,
-                            end: node.end
-                        }),
-                        w.parent()
-                    ]);
-
-                    return;
-                }
-
-                result.push([node, w.parent()]);
-            });
-
-            return w;
-        };
-
-        var getNodeType = function(node) {
-            return node[0].TYPE + (node[1] ? " " + node[1].TYPE : "");
-        }
-
-        for (var i = 0; i < patterns.length; i++) {
-            var results = [];
-
-            for (var j = 0; j < types.length; j++) {
-                var code = types[j].generate(patterns[i])
-                var ast = types[j].tree(
-                    uglify.parse(code)
-                );
-                results.push([]);
-                ast.walk(walker(
-                    types[j],
-                    "`" + patterns[i] + "` on " + types[j].name,
-                    code,
-                    results[j]
-                ));
-
-                if (j > 0) {
-                    assert.deepEqual(
-                        results[0].map(getNodeType),
-                        results[j].map(getNodeType),
-                        "AST disagree on " + patterns[i] + " with " + types[j].name
-                    );
-                }
-            }
-        }
-    });
-});

test/mocha/directives.js

@@ -62,10 +62,10 @@ describe("Directives", function() {
     it("Should know which strings are directive and which ones are not", function() {
         var test_directive = function(tokenizer, test) {
             test.directives.map(function(directive) {
-                assert.strictEqual(tokenizer.has_directive(directive), true, "Didn't found directive `" + directive + "` at the end of `" + test.input + '`');
+                assert.strictEqual(tokenizer.has_directive(directive), true, directive + " in " + test.input);
             });
             test.non_directives.map(function(fake_directive) {
-                assert.strictEqual(tokenizer.has_directive(fake_directive), false, "Unexpectedly found directive `" + fake_directive + "` at the end of `" + test.input + '`');
+                assert.strictEqual(tokenizer.has_directive(fake_directive), false, fake_directive + " in " + test.input);
             });
         }
 
@@ -156,16 +156,6 @@ describe("Directives", function() {
                 input: '"use strict";try{"use asm";',
                 directives: ["use strict"],
                 non_directives: ["use\nstrict", "use \nstrict", "use asm"]
-            },
-            {
-                input: 'class foo {',
-                directives: ["use strict"],
-                non_directives: ["use\nstrict", "use asm"]
-            },
-            {
-                input: 'class foo {}',
-                directives: [],
-                non_directives: ["use strict", "use asm", "use\nstrict"]
             }
         ];
 
@@ -186,7 +176,7 @@ describe("Directives", function() {
     });
 
     it("Should test EXPECT_DIRECTIVE RegExp", function() {
-        var tests = [
+        [
             ["", true],
             ["'test';", true],
             ["'test';;", true],
@@ -195,11 +185,12 @@ describe("Directives", function() {
             ["'tests';   \n\t", true],
             ["'tests';\n\n", true],
             ["\n\n\"use strict\";\n\n", true]
-        ];
-
-        for (var i = 0; i < tests.length; i++) {
-            assert.strictEqual(uglify.EXPECT_DIRECTIVE.test(tests[i][0]), tests[i][1], tests[i][0]);
-        }
+        ].forEach(function(test) {
+            var out = uglify.OutputStream();
+            out.print(test[0]);
+            out.print_string("", null, true);
+            assert.strictEqual(out.get() === test[0] + ';""', test[1], test[0]);
+        });
     });
 
     it("Should only print 2 semicolons spread over 2 lines in beautify mode", function() {
@@ -360,61 +351,31 @@ describe("Directives", function() {
         var tests = [
             [
                 '"use strict";"use strict";"use strict";"use foo";"use strict";;"use sloppy";doSomething("foo");',
-                '"use strict";"use foo";doSomething("foo");'
+                '"use strict";"use foo";doSomething("foo");',
+                'function f(){ "use strict" }',
+                'function f(){ "use asm" }',
+                'function f(){ "use nondirective" }',
+                'function f(){ ;"use strict" }',
+                'function f(){ "use \n"; }',
             ],
             [
                  // Nothing gets optimised in the compressor because "use asm" is the first statement
                 '"use asm";"use\\x20strict";1+1;',
-                '"use asm";;"use strict";1+1;' // Yet, the parser noticed that "use strict" wasn't a directive
+                '"use asm";;"use strict";1+1;', // Yet, the parser noticed that "use strict" wasn't a directive
+                'function f(){"use strict"}',
+                'function f(){"use asm"}',
+                'function f(){"use nondirective"}',
+                'function f(){}',
+                'function f(){}',
             ]
         ];
 
         for (var i = 0; i < tests.length; i++) {
             assert.strictEqual(
-                uglify.minify(tests[i][0], {fromString: true, compress: {collapse_vars: true, side_effects: true}}).code,
+                uglify.minify(tests[i][0], {fromString: true}).code,
                 tests[i][1],
                 tests[i][0]
             );
         }
     });
-    it("Should be detect implicit usages of strict mode from tree walker", function() {
-        var tests = [
-            {
-                input: 'class foo {bar(){_check_}}',
-                directives: ["use strict"],
-                non_directives: ["use bar"]
-            },
-            {
-                input: 'class foo {bar(){}}_check_',
-                directives: [],
-                non_directives: ["use strict", "use bar"]
-            }
-        ];
-
-        var i = 0;
-        var checked;
-        var checkWalker = new uglify.TreeWalker(function(node, descend) {
-            if (node instanceof uglify.AST_Symbol && node.name === "_check_") {
-                checked = true;
-                for (var j = 0; j < tests[i].directives.length; j++) {
-                    assert.ok(checkWalker.has_directive(tests[i].directives[j]),
-                        "Did not found directive '" + tests[i].directives[j] +  "' in test " + tests[i].input)
-                }
-                for (var k = 0; k < tests[i].non_directives.length; k++) {
-                    assert.equal(checkWalker.has_directive(tests[i].non_directives[k]), undefined,
-                        "Found directive '" + tests[i].non_directives[k] +  "' in test " + tests[i].input)
-                }
-            }
-        });
-
-        for (; i < tests.length; i++) {
-            // Do tests - iterate the ast in each test - check only when _check_ occurs - fail when no _check_ has been found
-            checked = false;
-            var ast = uglify.parse(tests[i].input);
-            ast.walk(checkWalker);
-            if (!checked) {
-                throw "No _check_ symbol found in " + tests[i].input;
-            }
-        }
-    });
 });

test/mocha/eof.js

@@ -1,35 +0,0 @@
-var assert = require("assert");
-var uglify = require("../../");
-
-describe("EOF", function() {
-    it("Should test code for at least throwing syntax error when incomplete", function() {
-        var error = function(e) {
-            return e instanceof uglify.JS_Parse_Error;
-        }
-        var parse = function(test) {
-            return function() {
-                uglify.parse(test);
-            }
-        }
-        // Chops off 1 char at a time until limit or start of string is reached
-        // The passed code must still be valid when unchopped
-        var test_eol = function(input, chopLimit) {
-            if (chopLimit === undefined) {
-                chopLimit = input.length - 1;
-            }
-
-            assert.doesNotThrow(parse(input), "Expected valid code for \n" + input);
-
-            for (var i = input.length - 1; chopLimit > 0; chopLimit--, i--) {
-                var code = input.substr(0, i);
-                assert.throws(parse(code), error, code);
-            }
-        }
-
-        test_eol("var \\u1234", 7); // Incomplete identifier
-        test_eol("'Incomplete string'");
-        test_eol("/Unterminated regex/");
-        test_eol("` Unterminated template string`");
-        test_eol("/* Unfinishing multiline comment */");
-    });
-});

test/mocha/export.js

@@ -1,40 +0,0 @@
-var assert = require("assert");
-var uglify = require("../../");
-
-describe("Export", function() {
-    it ("Should parse export directives", function() {
-
-        var inputs = [
-            ['export * from "a.js"', ['*'], "a.js"],
-            ['export {A} from "a.js"', ['A'], "a.js"],
-            ['export {A as X} from "a.js"', ['X'], "a.js"],
-            ['export {A as Foo, B} from "a.js"', ['Foo', 'B'], "a.js"],
-            ['export {A, B} from "a.js"', ['A', 'B'], "a.js"],
-        ];
-
-        var test = function(code) {
-            return uglify.parse(code, {fromString: true});
-        };
-
-        var extractNames = function(symbols) {
-            var ret = [];
-            for (var i = 0; i < symbols.length; i++) {
-                ret.push(symbols[i].name.name)
-            }
-            return ret;
-        };
-
-        for (var i = 0; i < inputs.length; i++) {
-            var ast = test(inputs[i][0]);
-            var names = inputs[i][1];
-            var filename = inputs[i][2];
-            assert(ast instanceof uglify.AST_Toplevel);
-            assert.equal(ast.body.length, 1);
-            var st = ast.body[0];
-            assert(st instanceof uglify.AST_Export);
-            var actualNames = extractNames(st.exported_names);
-            assert.deepEqual(actualNames, names);
-            assert.equal(st.module_name.value, filename)
-        }
-    })
-});

test/mocha/expression.js

@@ -1,32 +0,0 @@
-var assert = require("assert");
-var uglify = require("../../");
-
-describe("Expression", function() {
-    it("Should not allow the first exponentiation operator to be prefixed with an unary operator", function() {
-        var tests = [
-            "+5 ** 3",
-            "-5 ** 3",
-            "~5 ** 3",
-            "!5 ** 3",
-            "void 5 ** 3",
-            "typeof 5 ** 3",
-            "delete 5 ** 3",
-            "var a = -(5) ** 3;"
-        ];
-
-        var fail = function(e) {
-            return e instanceof uglify.JS_Parse_Error &&
-                /^Unexpected token: operator \((?:[!+~-]|void|typeof|delete)\)/.test(e.message);
-        }
-
-        var exec = function(test) {
-            return function() {
-                uglify.parse(test);
-            }
-        }
-
-        for (var i = 0; i < tests.length; i++) {
-            assert.throws(exec(tests[i]), fail, tests[i]);
-        }
-    });
-});

test/mocha/function.js

@@ -1,252 +0,0 @@
-var assert = require("assert");
-var uglify = require("../../");
-
-describe("Function", function() {
-    it ("Should parse binding patterns correctly", function() {
-        // Function argument nodes are correct
-        function get_args(args) {
-            return args.map(function (arg) {
-                return [arg.TYPE, arg.name];
-            });
-        }
-
-        // Destructurings as arguments
-        var destr_fun1 = uglify.parse('(function ({a, b}) {})').body[0].body;
-        var destr_fun2 = uglify.parse('(function ([a, [b]]) {})').body[0].body;
-        var destr_fun3 = uglify.parse('({a, b}) => null').body[0].body;
-        var destr_fun4 = uglify.parse('([a, [b]]) => null').body[0].body;
-
-        assert.equal(destr_fun1.argnames.length, 1);
-        assert.equal(destr_fun2.argnames.length, 1);
-        assert.equal(destr_fun3.argnames.length, 1);
-        assert.equal(destr_fun4.argnames.length, 1);
-
-        var destruct1 = destr_fun1.argnames[0];
-        var destruct2 = destr_fun2.argnames[0];
-        var destruct3 = destr_fun3.argnames[0];
-        var destruct4 = destr_fun4.argnames[0];
-
-        assert(destruct1 instanceof uglify.AST_Destructuring);
-        assert(destruct2 instanceof uglify.AST_Destructuring);
-        assert(destruct3 instanceof uglify.AST_Destructuring);
-        assert(destruct4 instanceof uglify.AST_Destructuring);
-        assert(destruct2.names[1] instanceof uglify.AST_Destructuring);
-        assert(destruct4.names[1] instanceof uglify.AST_Destructuring);
-
-        assert.equal(destruct1.start.value, '{');
-        assert.equal(destruct1.end.value, '}');
-        assert.equal(destruct2.start.value, '[');
-        assert.equal(destruct2.end.value, ']');
-        assert.equal(destruct3.start.value, '{');
-        assert.equal(destruct3.end.value, '}');
-        assert.equal(destruct4.start.value, '[');
-        assert.equal(destruct4.end.value, ']');
-
-        assert.equal(destruct1.is_array, false);
-        assert.equal(destruct2.is_array, true);
-        assert.equal(destruct3.is_array, false);
-        assert.equal(destruct4.is_array, true);
-
-        // destruct 1
-        assert.deepEqual(
-            [
-                destruct1.names[0].TYPE,
-                destruct1.names[0].key,
-                destruct1.names[0].value.name
-            ],
-            ['ObjectKeyVal', 'a', 'a']
-        );
-        assert.deepEqual(
-            [
-                destruct1.names[1].TYPE,
-                destruct1.names[1].key,
-                destruct1.names[1].value.name
-            ],
-            ['ObjectKeyVal', 'b', 'b']
-        );
-
-        // destruct 2
-        assert.deepEqual(
-            [
-                destruct2.names[0].TYPE,
-                destruct2.names[0].name
-            ],
-            ['SymbolFunarg', 'a']
-        );
-        assert.deepEqual(
-            [
-                destruct2.names[1].names[0].TYPE,
-                destruct2.names[1].names[0].name
-            ],
-            ['SymbolFunarg', 'b']
-        );
-
-        // destruct 3
-        assert.strictEqual(typeof destruct3.names[0].key, "string");
-        assert.strictEqual(destruct3.names[0].key, "a");
-        assert.strictEqual(destruct3.names[0].value.TYPE, "SymbolFunarg");
-        assert.strictEqual(destruct3.names[0].value.name, "a");
-        assert.strictEqual(typeof destruct3.names[1].key, "string");
-        assert.strictEqual(destruct3.names[1].key, "b");
-        assert.strictEqual(destruct3.names[1].value.TYPE, "SymbolFunarg");
-        assert.strictEqual(destruct3.names[1].value.name, "b");
-
-        // destruct 4
-        assert.deepEqual(
-            [
-                destruct4.names[0].TYPE,
-                destruct4.names[0].name
-            ],
-            ['SymbolFunarg', 'a']
-        );
-        assert.strictEqual(destruct4.names[1].TYPE, "Destructuring");
-        assert.deepEqual(
-            [
-                destruct4.names[1].names[0].TYPE,
-                destruct4.names[1].names[0].name
-            ],
-            ['SymbolFunarg', 'b']
-        );
-
-        assert.deepEqual(
-            get_args(destr_fun1.args_as_names()),
-            [['SymbolFunarg', 'a'], ['SymbolFunarg', 'b']]
-        );
-        assert.deepEqual(
-            get_args(destr_fun2.args_as_names()),
-            [['SymbolFunarg', 'a'], ['SymbolFunarg', 'b']]
-        );
-        assert.deepEqual(
-            get_args(destr_fun3.args_as_names()),
-            [['SymbolFunarg', 'a'], ['SymbolFunarg', 'b']]
-        );
-        assert.deepEqual(
-            get_args(destr_fun4.args_as_names()),
-            [['SymbolFunarg', 'a'], ['SymbolFunarg', 'b']]
-        );
-
-        // Making sure we don't accidentally accept things which
-        // Aren't argument destructurings
-
-        assert.throws(function () {
-            uglify.parse('(function ( { a, [ b ] } ) { })')
-        });
-
-        assert.throws(function () {
-            uglify.parse('(function (1) { })');
-        }, /Invalid function parameter/);
-
-        assert.throws(function () {
-            uglify.parse('(function (this) { })');
-        });
-
-        assert.throws(function () {
-            uglify.parse('(function ([1]) { })');
-        }, /Invalid function parameter/);
-
-        assert.throws(function () {
-            uglify.parse('(function [a] { })');
-        });
-
-        // generators
-        var generators_def = uglify.parse('function* fn() {}').body[0];
-        assert.equal(generators_def.is_generator, true);
-
-        assert.throws(function () {
-            uglify.parse('function* (){ }');
-        });
-
-        var generators_yield_def = uglify.parse('function* fn() {\nyield remote();\}').body[0].body[0];
-        assert.strictEqual(generators_yield_def.body.is_star, false);
-    });
-    it("Should not accept spread on non-last parameters", function() {
-        var tests = [
-            "var a = function(...a, b) { return a.join(b) }",
-            "var b = function(a, b, ...c, d) { return c.join(a + b) + d }",
-            "function foo(...a, b) { return a.join(b) }",
-            "function bar(a, b, ...c, d) { return c.join(a + b) + d }",
-            "var a = function*(...a, b) { return a.join(b) }",
-            "var b = function*(a, b, ...c, d) { return c.join(a + b) + d }",
-            "function* foo(...a, b) { return a.join(b) }",
-            "function* bar(a, b, ...c, d) { return c.join(a + b) + d }"
-        ];
-        var test = function(code) {
-            return function() {
-                uglify.parse(code, {fromString: true});
-            }
-        }
-        var error = function(e) {
-            return e instanceof uglify.JS_Parse_Error &&
-                /^Unexpected token: /.test(e.message);
-        }
-
-        for (var i = 0; i < tests.length; i++) {
-            assert.throws(test(tests[i]), error);
-        }
-    });
-    it("Should not accept empty parameters after elision", function() {
-        var tests = [
-            "(function(,){})()",
-            "(function(a,){})()",
-        ];
-        var test = function(code) {
-            return function() {
-                uglify.parse(code, {fromString: true});
-            }
-        }
-        var error = function(e) {
-            return e instanceof uglify.JS_Parse_Error &&
-                e.message === "Invalid function parameter";
-        }
-        for (var i = 0; i < tests.length; i++) {
-            assert.throws(test(tests[i]), error);
-        }
-    });
-    it("Should not accept an initializer when parameter is a rest parameter", function() {
-        var tests = [
-            "(function(...a = b){})()",
-            "(function(a, ...b = [c, d]))"
-        ];
-        var test = function(code) {
-            return function () {
-                uglify.parse(code, {fromString: true});
-            }
-        }
-        var error = function (e) {
-            return e instanceof uglify.JS_Parse_Error;
-        }
-        for (var i = 0; i < tests.length; i++) {
-            assert.throws(test(tests[i]), error, tests[i]);
-        }
-    });
-    it("Shoult not accept duplicated identifiers inside parameters in strict mode or when using default assigment or spread", function() {
-        // From: ES2016 9.2.12 FunctionDeclarationInstantiation (func, argumentsList)
-        // NOTE Early errors ensure that duplicate parameter names can only occur
-        // in non-strict functions that do not have parameter default values or
-        // rest parameters.
-        var tests = [
-            "(function(a = 1, a){})()",
-            "(function(a, [a = 3]){})()",
-            "(function(a, b, c, d, [{e: [...a]}]){})()",
-            "'use strict'; (function(a, a){})",
-            "(function({a, a = b}))",
-            "(function(a, [...a]){})",
-            "(function(a, ...a){})",
-            "(function(a, [a, ...b]){})",
-            "(function(a, {b: a, c: [...d]}){})",
-            "(function(a, a, {b: [...c]}){})"
-        ];
-        var test = function(code) {
-            return function () {
-                uglify.parse(code, {fromString: true});
-            }
-        }
-        var error = function (e) {
-            return e instanceof uglify.JS_Parse_Error &&
-                /^Parameter [a-zA-Z]+ was used already$/.test(e.message);
-        }
-        for (var i = 0; i < tests.length; i++) {
-            assert.throws(test(tests[i]), error, tests[i]);
-        }
-    });
-});

test/mocha/getter-setter.js

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

test/mocha/issue1702.js

@@ -1,35 +0,0 @@
-var uglify = require('../../');
-var assert = require("assert");
-
-describe("For statement", function() {
-    it("For variable should list enclosing scope in its references (issue #17022)", function() {
-        var ast = uglify.parse("function f() { for (var a = 0; a < 10; a++) {} }");
-        ast.figure_out_scope();
-
-        var checkWalker = new uglify.TreeWalker(function(node, descend) {
-            if (node instanceof uglify.AST_VarDef) {
-                console.log("AST_VarDef");
-                // one reference should be in the AST_Defun scope - search for it
-
-                var walkNode = function (r) {
-                    console.log(r.CTOR.name);
-                    var walker = new uglify.TreeWalker(function(node, descend){
-                        // do not walk into any other scope, it should be listed if needed
-                        console.log("  " + node.CTOR.name);
-                        if (node instanceof uglify.AST_Scope && node != r.scope) return true;
-                        if (node instanceof uglify.AST_For) {
-                            console.log("Great - we found the for statement referencing the variable")
-                        }
-                        return false;
-                    });
-                    r.scope.walk(walker);
-                    r.walk(walker);
-                };
-
-                node.name.thedef.orig.forEach(walkNode);
-                node.name.thedef.references.forEach(walkNode);
-            }
-        });
-        ast.walk(checkWalker);
-    });
-});

test/mocha/lhs-expressions.js

@@ -1,265 +0,0 @@
-var assert = require("assert");
-var uglify = require("../../");
-
-describe("Left-hand side expressions", function () {
-    it("Should parse destructuring with const/let/var correctly", function () {
-        var decls = uglify.parse('var {a,b} = foo, { c, d } = bar');
-
-        assert.equal(decls.body[0].TYPE, 'Var');
-        assert.equal(decls.body[0].definitions.length, 2);
-
-        // Item 1
-        assert.equal(decls.body[0].definitions[0].name.TYPE, 'Destructuring');
-        assert.equal(decls.body[0].definitions[0].value.TYPE, 'SymbolRef');
-
-        // Item 2
-        assert.equal(decls.body[0].definitions[1].name.TYPE, 'Destructuring');
-        assert.equal(decls.body[0].definitions[1].value.TYPE, 'SymbolRef');
-
-        var nested_def = uglify.parse('var [{x}] = foo').body[0].definitions[0];
-
-        assert.equal(nested_def.name.names[0].names[0].TYPE, 'ObjectKeyVal');
-        assert.equal(nested_def.name.names[0].names[0].value.TYPE, 'SymbolVar');
-        assert.equal(nested_def.name.names[0].names[0].key, 'x');
-        assert.equal(nested_def.name.names[0].names[0].value.name, 'x');
-
-        var holey_def = uglify.parse('const [,,third] = [1,2,3]').body[0].definitions[0];
-
-        assert.equal(holey_def.name.names[0].TYPE, 'Hole');
-        assert.equal(holey_def.name.names[1].TYPE, 'Hole');
-        assert.equal(holey_def.name.names[2].TYPE, 'SymbolConst');
-
-        var expanding_def = uglify.parse('var [first, ...rest] = [1,2,3]').body[0].definitions[0];
-
-        assert.equal(expanding_def.name.names[0].TYPE, 'SymbolVar');
-        assert.equal(expanding_def.name.names[1].TYPE, 'Expansion');
-        assert.equal(expanding_def.name.names[1].expression.TYPE, 'SymbolVar');
-    });
-
-    it("Parser should use AST_Array for array literals", function() {
-        var ast = uglify.parse('["foo", "bar"]');
-        assert(ast.body[0] instanceof uglify.AST_SimpleStatement);
-        assert(ast.body[0].body instanceof uglify.AST_Array);
-
-        ast = uglify.parse('a = ["foo"]');
-        assert(ast.body[0] instanceof uglify.AST_SimpleStatement);
-
-        assert(ast.body[0].body instanceof uglify.AST_Assign);
-        assert(ast.body[0].body.left instanceof uglify.AST_SymbolRef);
-        assert.equal(ast.body[0].body.operator, "=");
-        assert(ast.body[0].body.right instanceof uglify.AST_Array);
-    });
-
-    it("Parser should use AST_Object for object literals", function() {
-        var ast = uglify.parse('({foo: "bar"})');
-        assert(ast.body[0] instanceof uglify.AST_SimpleStatement);
-        assert(ast.body[0].body instanceof uglify.AST_Object);
-
-        // This example should be fine though
-        ast = uglify.parse('a = {foo: "bar"}');
-        assert(ast.body[0] instanceof uglify.AST_SimpleStatement);
-
-        assert(ast.body[0].body instanceof uglify.AST_Assign);
-        assert(ast.body[0].body.left instanceof uglify.AST_SymbolRef);
-        assert.equal(ast.body[0].body.operator, "=");
-        assert(ast.body[0].body.right instanceof uglify.AST_Object);
-    });
-
-    it("Parser should use AST_Destructuring for array assignment patterns", function() {
-        var ast = uglify.parse('[foo, bar] = [1, 2]');
-        assert(ast.body[0] instanceof uglify.AST_SimpleStatement);
-
-        assert(ast.body[0].body instanceof uglify.AST_Assign);
-        assert(ast.body[0].body.left instanceof uglify.AST_Destructuring);
-        assert.strictEqual(ast.body[0].body.left.is_array, true);
-        assert.equal(ast.body[0].body.operator, "=");
-        assert(ast.body[0].body.right instanceof uglify.AST_Array);
-    });
-
-    it("Parser should use AST_Destructuring for object assignment patterns", function() {
-        var ast = uglify.parse('({a: b, b: c} = {b: "c", c: "d"})');
-        assert(ast.body[0] instanceof uglify.AST_SimpleStatement);
-
-        assert(ast.body[0].body instanceof uglify.AST_Assign);
-        assert(ast.body[0].body.left instanceof uglify.AST_Destructuring);
-        assert.strictEqual(ast.body[0].body.left.is_array, false);
-        assert.equal(ast.body[0].body.operator, "=");
-        assert(ast.body[0].body.right instanceof uglify.AST_Object);
-    });
-
-    it("Parser should be able to handle nested destructuring", function() {
-        var ast = uglify.parse('[{a,b},[d, e, f, {g, h}]] = [{a: 1, b: 2}, [3, 4, 5, {g: 6, h: 7}]]');
-        assert(ast.body[0] instanceof uglify.AST_SimpleStatement);
-
-        assert(ast.body[0].body instanceof uglify.AST_Assign);
-        assert(ast.body[0].body.left instanceof uglify.AST_Destructuring);
-        assert.strictEqual(ast.body[0].body.left.is_array, true);
-        assert.equal(ast.body[0].body.operator, "=");
-        assert(ast.body[0].body.right instanceof uglify.AST_Array);
-
-        assert(ast.body[0].body.left.names[0] instanceof uglify.AST_Destructuring);
-        assert.strictEqual(ast.body[0].body.left.names[0].is_array, false);
-
-        assert(ast.body[0].body.left.names[1] instanceof uglify.AST_Destructuring);
-        assert.strictEqual(ast.body[0].body.left.names[1].is_array, true);
-
-        assert(ast.body[0].body.left.names[1].names[3] instanceof uglify.AST_Destructuring);
-        assert.strictEqual(ast.body[0].body.left.names[1].names[3].is_array, false);
-    });
-
-    it("Should handle spread operator in destructuring", function() {
-        var ast = uglify.parse("[a, b, ...c] = [1, 2, 3, 4, 5]");
-        assert(ast.body[0] instanceof uglify.AST_SimpleStatement);
-
-        assert(ast.body[0].body instanceof uglify.AST_Assign);
-        assert(ast.body[0].body.left instanceof uglify.AST_Destructuring);
-        assert.strictEqual(ast.body[0].body.left.is_array, true);
-        assert.equal(ast.body[0].body.operator, "=");
-        assert(ast.body[0].body.right instanceof uglify.AST_Array);
-
-        assert(ast.body[0].body.left.names[0] instanceof uglify.AST_SymbolRef);
-        assert(ast.body[0].body.left.names[1] instanceof uglify.AST_SymbolRef);
-
-        assert(ast.body[0].body.left.names[2] instanceof uglify.AST_Expansion);
-    });
-
-    it("Should handle default assignments in destructuring", function() {
-        var ast = uglify.parse("({x: v, z = z + 5} = obj);");
-        assert(ast.body[0] instanceof uglify.AST_SimpleStatement);
-
-        assert(ast.body[0].body instanceof uglify.AST_Assign);
-        assert(ast.body[0].body.left instanceof uglify.AST_Destructuring);
-        assert.strictEqual(ast.body[0].body.left.is_array, false);
-        assert.equal(ast.body[0].body.operator, "=");
-        assert(ast.body[0].body.right instanceof uglify.AST_SymbolRef);
-
-        assert(ast.body[0].body.left.names[0].value instanceof uglify.AST_SymbolRef);
-        assert.strictEqual(ast.body[0].body.left.names[0].start.value, "x");
-
-        assert(ast.body[0].body.left.names[1].value instanceof uglify.AST_DefaultAssign);
-        assert.strictEqual(ast.body[0].body.left.names[1].start.value, "z");
-        assert(ast.body[0].body.left.names[1].value.left instanceof uglify.AST_SymbolRef);
-        assert.strictEqual(ast.body[0].body.left.names[1].value.operator, "=");
-        assert(ast.body[0].body.left.names[1].value.right instanceof uglify.AST_Binary);
-
-
-        ast = uglify.parse("({x = 123} = obj);");
-        assert(ast.body[0] instanceof uglify.AST_SimpleStatement);
-        assert(ast.body[0].body instanceof uglify.AST_Assign);
-        assert(ast.body[0].body.left instanceof uglify.AST_Destructuring);
-        assert.strictEqual(ast.body[0].body.left.is_array, false);
-        assert.equal(ast.body[0].body.operator, "=");
-        assert(ast.body[0].body.right instanceof uglify.AST_SymbolRef);
-
-        assert(ast.body[0].body.left.names[0].value instanceof uglify.AST_DefaultAssign);
-        assert.strictEqual(ast.body[0].body.left.names[0].value.operator, "=");
-        assert(ast.body[0].body.left.names[0].value.left instanceof uglify.AST_SymbolRef);
-
-
-        ast = uglify.parse("[x, y = 5] = foo");
-        assert(ast.body[0] instanceof uglify.AST_SimpleStatement);
-
-        assert(ast.body[0].body instanceof uglify.AST_Assign);
-        assert(ast.body[0].body.left instanceof uglify.AST_Destructuring);
-        assert.strictEqual(ast.body[0].body.left.is_array, true);
-        assert.equal(ast.body[0].body.operator, "=");
-        assert(ast.body[0].body.right instanceof uglify.AST_SymbolRef);
-
-        assert(ast.body[0].body.left.names[0] instanceof uglify.AST_SymbolRef);
-        assert.strictEqual(ast.body[0].body.left.names[0].start.value, "x");
-
-        assert(ast.body[0].body.left.names[1] instanceof uglify.AST_DefaultAssign);
-        assert(ast.body[0].body.left.names[1].left instanceof uglify.AST_SymbolRef);
-        assert.strictEqual(ast.body[0].body.left.names[1].start.value, "y");
-    });
-
-    it("Should handle default assignments containing assignments in a destructuring", function() {
-        var ast = uglify.parse("[x, y = z = 2] = a;");
-        assert(ast.body[0] instanceof uglify.AST_SimpleStatement);
-
-        assert(ast.body[0].body instanceof uglify.AST_Assign);
-        assert(ast.body[0].body.left instanceof uglify.AST_Destructuring);
-        assert.strictEqual(ast.body[0].body.left.is_array, true);
-        assert.equal(ast.body[0].body.operator, "=");
-        assert(ast.body[0].body.right instanceof uglify.AST_SymbolRef);
-
-        assert(ast.body[0].body.left.names[0] instanceof uglify.AST_SymbolRef);
-
-        assert(ast.body[0].body.left.names[1] instanceof uglify.AST_DefaultAssign);
-        assert(ast.body[0].body.left.names[1].left instanceof uglify.AST_SymbolRef);
-        assert.equal(ast.body[0].body.left.names[1].operator, "=");
-        assert(ast.body[0].body.left.names[1].right instanceof uglify.AST_Assign);
-
-        assert(ast.body[0].body.left.names[1].right.left instanceof uglify.AST_SymbolRef);
-        assert.equal(ast.body[0].body.left.names[1].right.operator, "=");
-        assert(ast.body[0].body.left.names[1].right.right instanceof uglify.AST_Number);
-
-        ast = uglify.parse("({a: a = 123} = obj)");
-        assert(ast.body[0] instanceof uglify.AST_SimpleStatement);
-
-        assert(ast.body[0].body instanceof uglify.AST_Assign);
-        assert(ast.body[0].body.left instanceof uglify.AST_Destructuring);
-        assert.strictEqual(ast.body[0].body.left.is_array, false);
-        assert.equal(ast.body[0].body.operator, "=");
-        assert(ast.body[0].body.right instanceof uglify.AST_SymbolRef);
-
-        assert(ast.body[0].body.left.names[0] instanceof uglify.AST_ObjectProperty);
-        assert.strictEqual(ast.body[0].body.left.names[0].key, "a");
-        assert(ast.body[0].body.left.names[0].value instanceof uglify.AST_DefaultAssign);
-        assert(ast.body[0].body.left.names[0].value.left instanceof uglify.AST_SymbolRef);
-        assert.strictEqual(ast.body[0].body.left.names[0].value.operator, "=");
-        assert(ast.body[0].body.left.names[0].value.right instanceof uglify.AST_Number);
-    });
-
-    it("Should allow multiple spread in array literals", function() {
-        var ast = uglify.parse("var a = [1, 2, 3], b = [4, 5, 6], joined; joined = [...a, ...b]");
-        assert(ast.body[0] instanceof uglify.AST_Var);
-        assert(ast.body[1] instanceof uglify.AST_SimpleStatement);
-
-        // Check statement containing array with spreads
-        assert(ast.body[1].body instanceof uglify.AST_Assign);
-        assert(ast.body[1].body.left instanceof uglify.AST_SymbolRef);
-        assert.equal(ast.body[1].body.operator, "=");
-        assert(ast.body[1].body.right instanceof uglify.AST_Array);
-
-        // Check array content
-        assert.strictEqual(ast.body[1].body.right.elements.length, 2);
-        assert(ast.body[1].body.right.elements[0] instanceof uglify.AST_Expansion);
-        assert(ast.body[1].body.right.elements[0].expression instanceof uglify.AST_SymbolRef);
-        assert(ast.body[1].body.right.elements[0].expression.name, "a");
-        assert(ast.body[1].body.right.elements[1] instanceof uglify.AST_Expansion);
-        assert(ast.body[1].body.right.elements[1].expression instanceof uglify.AST_SymbolRef);
-        assert(ast.body[1].body.right.elements[1].expression.name, "b");
-    });
-
-    it("Should not allow spread on invalid locations", function() {
-        var expect = function(input, expected) {
-            var execute = function(input) {
-                return function() {
-                    uglify.parse(input);
-                }
-            }
-            var check = function(e) {
-                return e instanceof uglify.JS_Parse_Error &&
-                    e.message === expected;
-            }
-
-            assert.throws(execute(input), check);
-        }
-
-        // Spreads are not allowed in destructuring array if it's not the last element
-        expect("[...a, ...b] = [1, 2, 3, 4]", "Spread must the be last element in destructuring array");
-
-        // Multiple spreads are not allowed in destructuring array
-        expect("[...a, ...b] = [1, 2, 3, 4]", "Spread must the be last element in destructuring array");
-
-        // Spread in obvious object pattern
-        expect("({...a} = foo)", "Unexpected token: expand (...)");
-
-        // Spread in block should not be allowed
-        expect("{...a} = foo", "Unexpected token: expand (...)");
-
-        // Not in standard yet
-        expect("let foo = {bar: 42}, bar; bar = {...foo}", "Unexpected token: expand (...)");
-    });
-});

test/mocha/new.js

@@ -85,11 +85,4 @@ describe("New", function() {
             );
         }
     });
-
-    it("Should check target in new.target", function() {
-        assert.throws(function() {uglify.parse("new.blah")}, function(e) {
-            return e instanceof uglify.JS_Parse_Error
-                && e.message === "Unexpected token name «blah», expected name «target»";
-        });
-    });
 });

test/mocha/object.js

@@ -1,131 +0,0 @@
-var Uglify = require("../../");
-var assert = require("assert");
-
-describe("Object", function() {
-    it("Should allow objects to have a methodDefinition as property", function() {
-        var code = "var a = {test() {return true;}}";
-        assert.equal(Uglify.minify(code, {fromString: true}).code, "var a={test(){return!0}};");
-    });
-
-    it("Should not allow objects to use static keywords like in classes", function() {
-        var code = "{static test() {}}";
-        var parse = function() {
-            Uglify.parse(code);
-        }
-        var expect = function(e) {
-            return e instanceof Uglify.JS_Parse_Error;
-        }
-        assert.throws(parse, expect);
-    });
-
-    it("Should not allow objects to have static computed properties like in classes", function() {
-        var code = "var foo = {static [123](){}}";
-        var parse = function() {
-            console.log(Uglify.parse(code).body[0].body[0]);
-        }
-        var expect = function(e) {
-            return e instanceof Uglify.JS_Parse_Error;
-        }
-        assert.throws(parse, expect);
-    });
-    it("Should not accept operator tokens as property/getter/setter name", function() {
-        var illegalOperators = [
-            "++",
-            "--",
-            "+",
-            "-",
-            "!",
-            "~",
-            "&",
-            "|",
-            "^",
-            "*",
-            "/",
-            "%",
-            ">>",
-            "<<",
-            ">>>",
-            "<",
-            ">",
-            "<=",
-            ">=",
-            "==",
-            "===",
-            "!=",
-            "!==",
-            "?",
-            "=",
-            "+=",
-            "-=",
-            "/=",
-            "*=",
-            "%=",
-            ">>=",
-            "<<=",
-            ">>>=",
-            "|=",
-            "^=",
-            "&=",
-            "&&",
-            "||"
-        ];
-        var generator = function() {
-            var results = [];
-
-            for (var i in illegalOperators) {
-                results.push({
-                    code: "var obj = { get " + illegalOperators[i] + "() { return test; }};",
-                    operator: illegalOperators[i],
-                    method: "get"
-                });
-                results.push({
-                    code: "var obj = { set " + illegalOperators[i] + "(value) { test = value}};",
-                    operator: illegalOperators[i],
-                    method: "set"
-                });
-                results.push({
-                    code: "var obj = { " + illegalOperators[i] + ': "123"};',
-                    operator: illegalOperators[i],
-                    method: "key"
-                });
-                results.push({
-                    code: "var obj = { " + illegalOperators[i] + "(){ return test; }};",
-                    operator: illegalOperators[i],
-                    method: "method"
-                });
-            }
-
-            return results;
-        };
-
-        var testCase = function(data) {
-            return function() {
-                Uglify.parse(data.code);
-            };
-        };
-
-        var fail = function(data) {
-            return function (e) {
-                return e instanceof Uglify.JS_Parse_Error && (
-                    e.message === "Unexpected token: operator (" + data.operator + ")" ||
-                    (e.message === "Unterminated regular expression" && data.operator[0] === "/") ||
-                    (e.message === "Unexpected token: punc (()" && data.operator === "*")
-                );
-            };
-        };
-
-        var errorMessage = function(data) {
-            return "Expected but didn't get a syntax error while parsing following line:\n" + data.code;
-        };
-
-        var tests = generator();
-        for (var i = 0; i < tests.length; i++) {
-            var test = tests[i];
-            assert.throws(testCase(test), fail(test), errorMessage(test));
-        }
-    });
-    it("Should be able to use shorthand properties", function() {
-        var ast = Uglify.parse("var foo = 123\nvar obj = {foo: foo}");
-        assert.strictEqual(ast.print_to_string({ecma: 6}), "var foo=123;var obj={foo};");
-    })
-});

test/mocha/template-string.js

@@ -1,33 +0,0 @@
-var assert = require("assert");
-var uglify = require("../../");
-
-describe("Template string", function() {
-    it("Should not accept invalid sequences", function() {
-        var tests = [
-            // Stress invalid expression
-            "var foo = `Hello ${]}`",
-            "var foo = `Test 123 ${>}`",
-            "var foo = `Blah ${;}`",
-
-            // Stress invalid template_substitution after expression
-            "var foo = `Blablabla ${123 456}`",
-            "var foo = `Blub ${123;}`",
-            "var foo = `Bleh ${a b}`"
-        ];
-
-        var exec = function(test) {
-            return function() {
-                uglify.parse(test);
-            }
-        };
-
-        var fail = function(e) {
-            return e instanceof uglify.JS_Parse_Error
-                && /^Unexpected token: /.test(e.message);
-        };
-
-        for (var i = 0; i < tests.length; i++) {
-            assert.throws(exec(tests[i]), fail, tests[i]);
-        }
-    });
-});

test/mocha/try.js

@@ -1,22 +0,0 @@
-var assert = require("assert");
-var uglify = require("../../");
-
-describe("Try", function() {
-    it("Should not allow catch with an empty parameter", function() {
-        var tests = [
-            "try {} catch() {}"
-        ];
-
-        var test = function(code) {
-            return function () {
-                uglify.parse(code, {fromString: true});
-            }
-        }
-        var error = function (e) {
-            return e instanceof uglify.JS_Parse_Error;
-        }
-        for (var i = 0; i < tests.length; i++) {
-            assert.throws(test(tests[i]), error, tests[i]);
-        }
-    });
-});

test/mocha/unicode.js

@@ -1,138 +0,0 @@
-var assert = require("assert");
-var uglify = require("../../");
-
-describe("Unicode", function() {
-    it("Should not accept invalid code ranges in unicode escape", function() {
-        var tests = [
-            "\\u{110000}", // A bit over the unicode range
-            "\\u{100000061} = 'foo'", // 32-bit overflow resulting in "a"
-            "\\u{fffffffffff}", // A bit too much over the unicode range
-        ];
-
-        var exec = function(test) {
-            return function() {
-                uglify.parse(test);
-            }
-        }
-
-        var fail = function(e) {
-            return e instanceof uglify.JS_Parse_Error
-                && e.message === "Unicode reference out of bounce";
-        }
-
-        for (var i = 0; i < tests.length; i++) {
-            assert.throws(exec(tests[i]), fail);
-        }
-    });
-
-    it("Should not accept invalid unicode sequences", function() {
-        var tests = [
-            "var foo = '\\u-111'",
-            "var bar = '\\u{-1}'",
-            "var baz = '\\ugggg'"
-        ];
-
-        var exec = function(test) {
-            return function() {
-                uglify.parse(test);
-            }
-        }
-
-        var fail = function(e) {
-            return e instanceof uglify.JS_Parse_Error
-                && e.message === "Invalid hex-character pattern in string";
-        }
-
-        for (var i = 0; i < tests.length; i++) {
-            assert.throws(exec(tests[i]), fail);
-        }
-    });
-
-    it("Should throw error if escaped first identifier char is not part of ID_start", function() {
-        var tests = [
-            'var \\u{0} = "foo";',
-            'var \\u{10ffff} = "bar";',
-            'var \\u000a = "what\'s up";',
-             // Valid ID_Start, but using up 2 escaped characters and not fitting in IdentifierStart
-            'var \\ud800\\udc00 = "Hello";',
-            'var \\udbff\\udfff = "Unicode";', // Same as previous test
-            'var \\ud800\udc01 = "Weird unicode";', // Same as above, but mixed escaped with unicode chars
-        ];
-
-        var exec = function(test) {
-            return function() {
-                uglify.parse(test);
-            }
-        }
-
-        var fail = function(e) {
-            return e instanceof uglify.JS_Parse_Error
-                && e.message === "First identifier char is an invalid identifier char";
-        }
-
-        for (var i = 0; i < tests.length; i++) {
-            assert.throws(exec(tests[i]), fail);
-        }
-    });
-
-    it("Should throw error if escaped non-first identifier char is not part of ID_start", function() {
-        var tests = [
-            'var a\\u{0} = "foo";',
-            'var a\\u{10ffff} = "bar";',
-            'var z\\u000a = "what\'s up";'
-        ];
-
-        var exec = function(test) {
-            return function() {
-                uglify.parse(test);
-            }
-        }
-
-        var fail = function(e) {
-            return e instanceof uglify.JS_Parse_Error
-                && e.message === "Invalid escaped identifier char";
-        }
-
-        for (var i = 0; i < tests.length; i++) {
-            assert.throws(exec(tests[i]), fail);
-        }
-    });
-
-    it("Should throw error if identifier is a keyword with a escape sequences", function() {
-        var tests = [
-            'var \\u0069\\u006e = "foo"',        // in
-            'var \\u0076\\u0061\\u0072 = "bar"', // var
-            'var \\u{66}\\u{6f}\\u{72} = "baz"', // for
-            'var \\u0069\\u{66} = "foobar"',     // if
-            'var \\u{73}uper'                    // super
-        ];
-
-        var exec = function(test) {
-            return function() {
-                uglify.parse(test);
-            }
-        }
-
-        var fail = function(e) {
-            return e instanceof uglify.JS_Parse_Error
-                && e.message === "Escaped characters are not allowed in keywords";
-        }
-
-        for (var i = 0; i < tests.length; i++) {
-            assert.throws(exec(tests[i]), fail);
-        }
-    });
-
-    it("Should read strings containing surigates correctly", function() {
-        var tests = [
-            ['var a = "\ud800\udc00";', 'var a="\\u{10000}";'],
-            ['var b = "\udbff\udfff";', 'var b="\\u{10ffff}";']
-        ];
-
-        for (var i = 0; i < tests.length; i++) {
-            assert.strictEqual(uglify.minify(tests[i][0], {
-                fromString: true, output: { ascii_only: true, ecma: 6}
-            }).code, tests[i][1]);
-        }
-    });
-});

test/mocha/yield.js

@@ -1,106 +0,0 @@
-var UglifyJS = require("../../");
-var assert = require("assert");
-
-describe("Yield", function() {
-    it("Should not delete statements after yield", function() {
-        var js = 'function *foo(bar) { yield 1; yield 2; return 3; }';
-        var result = UglifyJS.minify(js, {fromString: true});
-        assert.strictEqual(result.code, 'function*foo(e){return yield 1,yield 2,3}');
-    });
-
-    it("Should not allow yield as labelIdentifier within generators", function() {
-        var js = "function* g() {yield: 1}"
-        var test = function() {
-            UglifyJS.parse(js);
-        }
-        var expect = function(e) {
-            return e instanceof UglifyJS.JS_Parse_Error &&
-                e.message === "Yield cannot be used as label inside generators";
-        }
-        assert.throws(test, expect);
-    });
-
-    it("Should not allow yield* followed by a semicolon in generators", function() {
-        var js = "function* test() {yield*\n;}";
-        var test = function() {
-            UglifyJS.parse(js);
-        }
-        var expect = function(e) {
-            return e instanceof UglifyJS.JS_Parse_Error &&
-                e.message === "Unexpected token: punc (;)";
-        }
-        assert.throws(test, expect);
-    });
-
-    it("Should not allow yield with next token star on next line", function() {
-        var js = "function* test() {yield\n*123;}";
-        var test = function() {
-            UglifyJS.parse(js);
-        }
-        var expect = function(e) {
-            return e instanceof UglifyJS.JS_Parse_Error &&
-                e.message === "Unexpected token: operator (*)";
-        }
-        assert.throws(test, expect);
-    });
-
-    it("Should be able to compress its expression", function() {
-        assert.strictEqual(
-            UglifyJS.minify("function *f() { yield 3-4; }", {fromString: true, compress: true}).code,
-            "function*f(){yield-1}"
-        );
-    });
-
-    it("Should keep undefined after yield without compression if found in ast", function() {
-        assert.strictEqual(
-            UglifyJS.minify("function *f() { yield undefined; yield; yield* undefined; yield void 0}", {fromString: true, compress: false}).code,
-            "function*f(){yield undefined;yield;yield*undefined;yield void 0}"
-        );
-    });
-
-    it("Should be able to drop undefined after yield if necessary with compression", function() {
-        assert.strictEqual(
-            UglifyJS.minify("function *f() { yield undefined; yield; yield* undefined; yield void 0}", {fromString: true, compress: true}).code,
-            "function*f(){yield,yield,yield*void 0,yield}"
-        );
-    });
-
-    it("Should not allow yield to be used as symbol, identifier or property outside generators in strict mode", function() {
-        var tests = [
-            // Fail as as_symbol
-            '"use strict"; import yield from "bar";',
-            '"use strict"; yield = 123;',
-            '"use strict"; yield: "123";',
-            '"use strict"; for(;;){break yield;}',
-            '"use strict"; for(;;){continue yield;}',
-            '"use strict"; function yield(){}',
-            '"use strict"; function foo(...yield){}',
-            '"use strict"; try { new Error("")} catch (yield) {}',
-            '"use strict"; var yield = "foo";',
-            '"use strict"; class yield {}',
-
-            // Fail as maybe_assign
-            '"use strict"; var foo = yield;',
-            '"use strict"; var foo = bar = yield',
-
-            // Fail as as_property_name
-            '"use strict"; var foo = {yield};',
-            '"use strict"; var bar = {yield: "foo"};'
-        ];
-
-        var fail = function(e) {
-            return e instanceof UglifyJS.JS_Parse_Error &&
-                /^Unexpected yield identifier (?:as parameter )?inside strict mode/.test(e.message);
-        }
-
-        var test = function(input) {
-            return function() {
-                UglifyJS.parse(input);
-            }
-        }
-
-        for (var i = 0; i < tests.length; i++) {
-            assert.throws(test(tests[i]), fail, tests[i]);
-        }
-    });
-});

test/mozilla-ast.js

@@ -1,103 +1,87 @@
 // Testing UglifyJS <-> SpiderMonkey AST conversion
-// through generative testing.
+"use strict";
 
-var UglifyJS = require(".."),
-    escodegen = require("escodegen"),
-    esfuzz = require("esfuzz"),
-    estraverse = require("estraverse"),
-    prefix = "\r    ";
+var acorn = require("acorn");
+var ufuzz = require("./ufuzz");
+var UglifyJS = require("..");
 
-// Normalizes input AST for UglifyJS in order to get correct comparison.
-
-function normalizeInput(ast) {
-    return estraverse.replace(ast, {
-        enter: function(node, parent) {
-            switch (node.type) {
-                // Internally mark all the properties with semi-standard type "Property".
-                case "ObjectExpression":
-                    node.properties.forEach(function (property) {
-                        property.type = "Property";
-                    });
-                    break;
-
-                // Since UglifyJS doesn"t recognize different types of property keys,
-                // decision on SpiderMonkey node type is based on check whether key
-                // can be valid identifier or not - so we do in input AST.
-                case "Property":
-                    var key = node.key;
-                    if (key.type === "Literal" && typeof key.value === "string" && UglifyJS.is_identifier(key.value)) {
-                        node.key = {
-                            type: "Identifier",
-                            name: key.value
-                        };
-                    } else if (key.type === "Identifier" && !UglifyJS.is_identifier(key.name)) {
-                        node.key = {
-                            type: "Literal",
-                            value: key.name
-                        };
-                    }
-                    break;
-
-                // UglifyJS internally flattens all the expression sequences - either
-                // to one element (if sequence contains only one element) or flat list.
-                case "SequenceExpression":
-                    node.expressions = node.expressions.reduce(function flatten(list, expr) {
-                        return list.concat(expr.type === "SequenceExpression" ? expr.expressions.reduce(flatten, []) : [expr]);
-                    }, []);
-                    if (node.expressions.length === 1) {
-                        return node.expressions[0];
-                    }
-                    break;
-            }
-        }
-    });
-}
-
-module.exports = function(options) {
-    console.log("--- UglifyJS <-> Mozilla AST conversion");
-
-    for (var counter = 0; counter < options.iterations; counter++) {
-        process.stdout.write(prefix + counter + "/" + options.iterations);
-
-        var ast1 = normalizeInput(esfuzz.generate({
-            maxDepth: options.maxDepth
-        }));
-
-        var ast2 =
-            UglifyJS
-            .AST_Node
-            .from_mozilla_ast(ast1)
-            .to_mozilla_ast();
-
-        var astPair = [
-            {name: 'expected', value: ast1},
-            {name: 'actual', value: ast2}
-        ];
-
-        var jsPair = astPair.map(function(item) {
-            return {
-                name: item.name,
-                value: escodegen.generate(item.value)
+function try_beautify(code) {
+    var beautified;
+    try {
+        beautified = UglifyJS.minify(code, {
+            fromString: true,
+            compress: false,
+            mangle: false,
+            output: {
+                beautify: true,
+                bracketize: true
             }
         });
-
-        if (jsPair[0].value !== jsPair[1].value) {
-            var fs = require("fs");
-            var acorn = require("acorn");
-
-            fs.existsSync("tmp") || fs.mkdirSync("tmp");
-
-            jsPair.forEach(function (item) {
-                var fileName = "tmp/dump_" + item.name;
-                var ast = acorn.parse(item.value);
-                fs.writeFileSync(fileName + ".js", item.value);
-                fs.writeFileSync(fileName + ".json", JSON.stringify(ast, null, 2));
-            });
-
-            process.stdout.write("\n");
-            throw new Error("Got different outputs, check out tmp/dump_*.{js,json} for codes and ASTs.");
-        }
+    } catch (ex) {
+        beautified = { error: ex };
     }
+    if (beautified.error) {
+        console.log("// !!! beautify failed !!!");
+        console.log(beautified.error.stack);
+        console.log(code);
+    } else {
+        console.log("// (beautified)");
+        console.log(beautified.code);
+    }
+}
 
-    process.stdout.write(prefix + "Probability of error is less than " + (100 / options.iterations) + "%, stopping.\n");
-};
+function test(original, estree, description) {
+    var transformed;
+    try {
+        transformed = UglifyJS.minify(estree, {
+            fromString: true,
+            compress: false,
+            mangle: false,
+            spidermonkey: true
+        });
+    } catch (ex) {
+        transformed = { error: ex };
+    }
+    if (transformed.error || original !== transformed.code) {
+        console.log("//=============================================================");
+        console.log("// !!!!!! Failed... round", round);
+        console.log("// original code");
+        try_beautify(original);
+        console.log();
+        console.log();
+        console.log("//-------------------------------------------------------------");
+        console.log("//", description);
+        if (transformed.error) {
+            console.log(transformed.error.stack);
+        } else {
+            try_beautify(transformed.code);
+        }
+        console.log("!!!!!! Failed... round", round);
+        process.exit(1);
+    }
+}
+
+var num_iterations = ufuzz.num_iterations;
+for (var round = 1; round <= num_iterations; round++) {
+    process.stdout.write(round + " of " + num_iterations + "\r");
+    var code = ufuzz.createTopLevelCode();
+    var uglified = {
+        ast: UglifyJS.parse(code),
+        code: UglifyJS.minify(code, {
+            fromString: true,
+            compress: false,
+            mangle: false
+        }).code
+    };
+    test(uglified.code, uglified.ast.to_mozilla_ast(), "AST_Node.to_mozilla_ast()");
+    try {
+        test(uglified.code, acorn.parse(code), "acorn.parse()");
+    } catch (e) {
+        console.log("//=============================================================");
+        console.log("// acorn parser failed... round", round);
+        console.log(e);
+        console.log("// original code");
+        console.log(code);
+    }
+}
+console.log();

test/run-tests.js

@@ -1,27 +1,14 @@
 #! /usr/bin/env node
 
-global.UGLIFY_DEBUG = true;
-
 var U = require("../tools/node");
 var path = require("path");
 var fs = require("fs");
 var assert = require("assert");
-var vm = require("vm");
+var sandbox = require("./sandbox");
 
 var tests_dir = path.dirname(module.filename);
 var failures = 0;
 var failed_files = {};
-var same_stdout = ~process.version.lastIndexOf("v0.12.", 0) ? function(expected, actual) {
-    if (typeof expected != typeof actual) return false;
-    if (typeof expected != "string") {
-        if (expected.name != actual.name) return false;
-        expected = expected.message.slice(expected.message.lastIndexOf("\n") + 1);
-        actual = actual.message.slice(actual.message.lastIndexOf("\n") + 1);
-    }
-    return expected == actual;
-} : function(expected, actual) {
-    return typeof expected == typeof actual && expected.toString() == actual.toString();
-};
 
 run_compress_tests();
 if (failures) {
@@ -36,12 +23,6 @@ mocha_tests();
 var run_sourcemaps_tests = require('./sourcemaps');
 run_sourcemaps_tests();
 
-var run_ast_conversion_tests = require("./mozilla-ast");
-
-run_ast_conversion_tests({
-    iterations: 1000
-});
-
 /* -----[ utils ]----- */
 
 function tmpl() {
@@ -184,11 +165,11 @@ function run_compress_tests() {
                     }
                 }
                 if (test.expect_stdout) {
-                    var stdout = run_code(input_code);
+                    var stdout = sandbox.run_code(input_code);
                     if (test.expect_stdout === true) {
                         test.expect_stdout = stdout;
                     }
-                    if (!same_stdout(test.expect_stdout, stdout)) {
+                    if (!sandbox.same_stdout(test.expect_stdout, stdout)) {
                         log("!!! Invalid input or expected stdout\n---INPUT---\n{input}\n---EXPECTED {expected_type}---\n{expected}\n---ACTUAL {actual_type}---\n{actual}\n\n", {
                             input: input_formatted,
                             expected_type: typeof test.expect_stdout == "string" ? "STDOUT" : "ERROR",
@@ -199,8 +180,8 @@ function run_compress_tests() {
                         failures++;
                         failed_files[file] = 1;
                     } else {
-                        stdout = run_code(output);
-                        if (!same_stdout(test.expect_stdout, stdout)) {
+                        stdout = sandbox.run_code(output);
+                        if (!sandbox.same_stdout(test.expect_stdout, stdout)) {
                             log("!!! failed\n---INPUT---\n{input}\n---EXPECTED {expected_type}---\n{expected}\n---ACTUAL {actual_type}---\n{actual}\n\n", {
                                 input: input_formatted,
                                 expected_type: typeof test.expect_stdout == "string" ? "STDOUT" : "ERROR",
@@ -332,19 +313,3 @@ function evaluate(code) {
         code = make_code(code, { beautify: true });
     return new Function("return(" + code + ")")();
 }
-
-function run_code(code) {
-    var stdout = "";
-    var original_write = process.stdout.write;
-    process.stdout.write = function(chunk) {
-        stdout += chunk;
-    };
-    try {
-        new vm.Script(code).runInNewContext({ console: console }, { timeout: 5000 });
-        return stdout;
-    } catch (ex) {
-        return ex;
-    } finally {
-        process.stdout.write = original_write;
-    }
-}

test/sandbox.js

@@ -0,0 +1,76 @@
+var vm = require("vm");
+
+function safe_log(arg, level) {
+    if (arg) switch (typeof arg) {
+      case "function":
+        return arg.toString();
+      case "object":
+        if (/Error$/.test(arg.name)) return arg.toString();
+        arg.constructor.toString();
+        if (level--) for (var key in arg) {
+            if (!Object.getOwnPropertyDescriptor(arg, key).get) {
+                arg[key] = safe_log(arg[key], level);
+            }
+        }
+    }
+    return arg;
+}
+
+var FUNC_TOSTRING = [
+    "Function.prototype.toString = Function.prototype.valueOf = function() {",
+    "    var id = 0;",
+    "    return function() {",
+    '        if (this === Array) return "[Function: Array]";',
+    '        if (this === Object) return "[Function: Object]";',
+    "        var i = this.name;",
+    '        if (typeof i != "number") {',
+    "            i = ++id;",
+    '            Object.defineProperty(this, "name", {',
+    "                get: function() {",
+    "                    return i;",
+    "                }",
+    "            });",
+    "        }",
+    '        return "[Function: " + i + "]";',
+    "    }",
+    "}();",
+].join("\n");
+exports.run_code = function(code) {
+    var stdout = "";
+    var original_write = process.stdout.write;
+    process.stdout.write = function(chunk) {
+        stdout += chunk;
+    };
+    try {
+        vm.runInNewContext([
+            FUNC_TOSTRING,
+            "!function() {",
+            code,
+            "}();",
+        ].join("\n"), {
+            console: {
+                log: function() {
+                    return console.log.apply(console, [].map.call(arguments, function(arg) {
+                        return safe_log(arg, 3);
+                    }));
+                }
+            }
+        }, { timeout: 5000 });
+        return stdout;
+    } catch (ex) {
+        return ex;
+    } finally {
+        process.stdout.write = original_write;
+    }
+};
+exports.same_stdout = ~process.version.lastIndexOf("v0.12.", 0) ? function(expected, actual) {
+    if (typeof expected != typeof actual) return false;
+    if (typeof expected != "string") {
+        if (expected.name != actual.name) return false;
+        expected = expected.message.slice(expected.message.lastIndexOf("\n") + 1);
+        actual = actual.message.slice(actual.message.lastIndexOf("\n") + 1);
+    }
+    return expected == actual;
+} : function(expected, actual) {
+    return typeof expected == typeof actual && expected.toString() == actual.toString();
+};