v3.4.1

fix corner cases in properties (#3189 )
fixes #3188
2018-06-19 18:35:48 +00:00 · 2018-06-19 18:20:11 +08:00 · 2018-06-06 17:50:56 +08:00 · 2018-06-02 05:57:10 +00:00 · 2018-06-01 16:47:11 +08:00 · 2018-05-31 20:21:39 +08:00
34 changed files with 1074 additions and 989 deletions
--- a/README.md
+++ b/README.md
@@ -104,6 +104,8 @@ a double dash to prevent input files being used as option arguments:
                                sequences.
    --config-file <file>        Read `minify()` options from JSON file.
    -d, --define <expr>[=value] Global definitions.
+    -e, --enclose [arg[:value]] Embed everything in a big function, with configurable
+                                argument(s) & value(s).
    --ie8                       Support non-standard Internet Explorer 8.
                                Equivalent to setting `ie8: true` in `minify()`
                                for `compress`, `mangle` and `output` options.
--- a/bin/uglifyjs
+++ b/bin/uglifyjs
@@ -40,6 +40,7 @@ program.option("-o, --output <file>", "Output file (default STDOUT).");
 program.option("--comments [filter]", "Preserve copyright comments in the output.");
 program.option("--config-file <file>", "Read minify() options from JSON file.");
 program.option("-d, --define <expr>[=value]", "Global definitions.", parse_js("define"));
+program.option("-e, --enclose [arg[,...][:value[,...]]]", "Embed everything in a big function, with configurable argument(s) & value(s).");
 program.option("--ie8", "Support non-standard Internet Explorer 8.");
 program.option("--keep-fnames", "Do not mangle/drop function names. Useful for code relying on Function.prototype.name.");
 program.option("--name-cache <file>", "File to hold mangled name mappings.");
@@ -47,7 +48,7 @@ program.option("--rename", "Force symbol expansion.");
 program.option("--no-rename", "Disable symbol expansion.");
 program.option("--self", "Build UglifyJS as a library (implies --wrap UglifyJS)");
 program.option("--source-map [options]", "Enable source map/specify source map options.", parse_js());
-program.option("--timings", "Display operations run time on STDERR.")
+program.option("--timings", "Display operations run time on STDERR.");
 program.option("--toplevel", "Compress and/or mangle variables in toplevel scope.");
 program.option("--verbose", "Print diagnostic messages.");
 program.option("--warn", "Print warning messages.");
@@ -61,6 +62,7 @@ if (!program.output && program.sourceMap && program.sourceMap.url != "inline") {
 }
 [
    "compress",
+    "enclose",
    "ie8",
    "mangle",
    "sourceMap",
--- a/lib/ast.js
+++ b/lib/ast.js
@@ -44,21 +44,21 @@
 "use strict";

 function DEFNODE(type, props, methods, base) {
-    if (arguments.length < 4) base = AST_Node;
-    if (!props) props = [];
-    else props = props.split(/\s+/);
+    if (typeof base === "undefined") base = AST_Node;
+    props = props ? props.split(/\s+/) : [];
    var self_props = props;
-    if (base && base.PROPS)
-        props = props.concat(base.PROPS);
-    var code = "return function AST_" + type + "(props){ if (props) { ";
-    for (var i = props.length; --i >= 0;) {
-        code += "this." + props[i] + " = props." + props[i] + ";";
-    }
+    if (base && base.PROPS) props = props.concat(base.PROPS);
+    var code = [
+        "return function AST_", type, "(props){",
+        "if(props){",
+    ];
+    props.forEach(function(prop) {
+        code.push("this.", prop, "=props.", prop, ";");
+    });
    var proto = base && new base;
-    if (proto && proto.initialize || (methods && methods.initialize))
-        code += "this.initialize();";
-    code += "}}";
-    var ctor = new Function(code)();
+    if (proto && proto.initialize || methods && methods.initialize) code.push("this.initialize();");
+    code.push("}}");
+    var ctor = new Function(code.join(""))();
    if (proto) {
        ctor.prototype = proto;
        ctor.BASE = base;
@@ -71,11 +71,11 @@ function DEFNODE(type, props, methods, base) {
    if (type) {
        ctor.prototype.TYPE = ctor.TYPE = type;
    }
-    if (methods) for (i in methods) if (HOP(methods, i)) {
-        if (/^\$/.test(i)) {
-            ctor[i.substr(1)] = methods[i];
+    if (methods) for (var name in methods) if (HOP(methods, name)) {
+        if (/^\$/.test(name)) {
+            ctor[name.substr(1)] = methods[name];
        } else {
-            ctor.prototype[i] = methods[i];
+            ctor.prototype[name] = methods[name];
        }
    }
    ctor.DEFMETHOD = function(name, method) {
@@ -85,7 +85,7 @@ function DEFNODE(type, props, methods, base) {
        exports["AST_" + type] = ctor;
    }
    return ctor;
-};
+}

 var AST_Token = DEFNODE("Token", "type value line col pos endline endcol endpos nlb comments_before comments_after file raw", {
 }, null);
@@ -148,7 +148,7 @@ var AST_SimpleStatement = DEFNODE("SimpleStatement", "body", {
        body: "[AST_Node] an expression node (should not be instanceof AST_Statement)"
    },
    _walk: function(visitor) {
-        return visitor._visit(this, function(){
+        return visitor._visit(this, function() {
            this.body._walk(visitor);
        });
    }
@@ -158,11 +158,10 @@ function walk_body(node, visitor) {
    var body = node.body;
    if (body instanceof AST_Statement) {
        body._walk(visitor);
-    }
-    else for (var i = 0, len = body.length; i < len; i++) {
-        body[i]._walk(visitor);
-    }
-};
+    } else body.forEach(function(node) {
+        node._walk(visitor);
+    });
+}

 var AST_Block = DEFNODE("Block", "body", {
    $documentation: "A body of statements (usually braced)",
@@ -170,7 +169,7 @@ var AST_Block = DEFNODE("Block", "body", {
        body: "[AST_Statement*] an array of statements"
    },
    _walk: function(visitor) {
-        return visitor._visit(this, function(){
+        return visitor._visit(this, function() {
            walk_body(this, visitor);
        });
    }
@@ -197,7 +196,7 @@ var AST_LabeledStatement = DEFNODE("LabeledStatement", "label", {
        label: "[AST_Label] a label definition"
    },
    _walk: function(visitor) {
-        return visitor._visit(this, function(){
+        return visitor._visit(this, function() {
            this.label._walk(visitor);
            this.body._walk(visitor);
        });
@@ -233,7 +232,7 @@ var AST_DWLoop = DEFNODE("DWLoop", "condition", {
 var AST_Do = DEFNODE("Do", null, {
    $documentation: "A `do` statement",
    _walk: function(visitor) {
-        return visitor._visit(this, function(){
+        return visitor._visit(this, function() {
            this.body._walk(visitor);
            this.condition._walk(visitor);
        });
@@ -243,7 +242,7 @@ var AST_Do = DEFNODE("Do", null, {
 var AST_While = DEFNODE("While", null, {
    $documentation: "A `while` statement",
    _walk: function(visitor) {
-        return visitor._visit(this, function(){
+        return visitor._visit(this, function() {
            this.condition._walk(visitor);
            this.body._walk(visitor);
        });
@@ -258,7 +257,7 @@ var AST_For = DEFNODE("For", "init condition step", {
        step: "[AST_Node?] the `for` update clause, or null if empty"
    },
    _walk: function(visitor) {
-        return visitor._visit(this, function(){
+        return visitor._visit(this, function() {
            if (this.init) this.init._walk(visitor);
            if (this.condition) this.condition._walk(visitor);
            if (this.step) this.step._walk(visitor);
@@ -274,7 +273,7 @@ var AST_ForIn = DEFNODE("ForIn", "init object", {
        object: "[AST_Node] the object that we're looping through"
    },
    _walk: function(visitor) {
-        return visitor._visit(this, function(){
+        return visitor._visit(this, function() {
            this.init._walk(visitor);
            this.object._walk(visitor);
            this.body._walk(visitor);
@@ -288,7 +287,7 @@ var AST_With = DEFNODE("With", "expression", {
        expression: "[AST_Node] the `with` expression"
    },
    _walk: function(visitor) {
-        return visitor._visit(this, function(){
+        return visitor._visit(this, function() {
            this.expression._walk(visitor);
            this.body._walk(visitor);
        });
@@ -329,12 +328,29 @@ var AST_Toplevel = DEFNODE("Toplevel", "globals", {
        var body = this.body;
        var wrapped_tl = "(function(exports){'$ORIG';})(typeof " + name + "=='undefined'?(" + name + "={}):" + name + ");";
        wrapped_tl = parse(wrapped_tl);
-        wrapped_tl = wrapped_tl.transform(new TreeTransformer(function before(node){
+        wrapped_tl = wrapped_tl.transform(new TreeTransformer(function before(node) {
            if (node instanceof AST_Directive && node.value == "$ORIG") {
                return MAP.splice(body);
            }
        }));
        return wrapped_tl;
+    },
+    wrap_enclose: function(args_values) {
+        if (typeof args_values != "string") args_values = "";
+        var index = args_values.indexOf(":");
+        if (index < 0) index = args_values.length;
+        var body = this.body;
+        return parse([
+            "(function(",
+            args_values.slice(0, index),
+            '){"$ORIG"})(',
+            args_values.slice(index + 1),
+            ")"
+        ].join("")).transform(new TreeTransformer(function(node) {
+            if (node instanceof AST_Directive && node.value == "$ORIG") {
+                return MAP.splice(body);
+            }
+        }));
    }
 }, AST_Scope);

@@ -346,12 +362,11 @@ var AST_Lambda = DEFNODE("Lambda", "name argnames uses_arguments", {
        uses_arguments: "[boolean/S] tells whether this function accesses the arguments array"
    },
    _walk: function(visitor) {
-        return visitor._visit(this, function(){
+        return visitor._visit(this, function() {
            if (this.name) this.name._walk(visitor);
-            var argnames = this.argnames;
-            for (var i = 0, len = argnames.length; i < len; i++) {
-                argnames[i]._walk(visitor);
-            }
+            this.argnames.forEach(function(argname) {
+                argname._walk(visitor);
+            });
            walk_body(this, visitor);
        });
    }
@@ -381,7 +396,7 @@ var AST_Exit = DEFNODE("Exit", "value", {
        value: "[AST_Node?] the value returned or thrown by this statement; could be null for AST_Return"
    },
    _walk: function(visitor) {
-        return visitor._visit(this, this.value && function(){
+        return visitor._visit(this, this.value && function() {
            this.value._walk(visitor);
        });
    }
@@ -401,7 +416,7 @@ var AST_LoopControl = DEFNODE("LoopControl", "label", {
        label: "[AST_LabelRef?] the label, or null if none",
    },
    _walk: function(visitor) {
-        return visitor._visit(this, this.label && function(){
+        return visitor._visit(this, this.label && function() {
            this.label._walk(visitor);
        });
    }
@@ -424,7 +439,7 @@ var AST_If = DEFNODE("If", "condition alternative", {
        alternative: "[AST_Statement?] the `else` part, or null if not present"
    },
    _walk: function(visitor) {
-        return visitor._visit(this, function(){
+        return visitor._visit(this, function() {
            this.condition._walk(visitor);
            this.body._walk(visitor);
            if (this.alternative) this.alternative._walk(visitor);
@@ -440,7 +455,7 @@ var AST_Switch = DEFNODE("Switch", "expression", {
        expression: "[AST_Node] the `switch` “discriminant”"
    },
    _walk: function(visitor) {
-        return visitor._visit(this, function(){
+        return visitor._visit(this, function() {
            this.expression._walk(visitor);
            walk_body(this, visitor);
        });
@@ -461,7 +476,7 @@ var AST_Case = DEFNODE("Case", "expression", {
        expression: "[AST_Node] the `case` expression"
    },
    _walk: function(visitor) {
-        return visitor._visit(this, function(){
+        return visitor._visit(this, function() {
            this.expression._walk(visitor);
            walk_body(this, visitor);
        });
@@ -477,7 +492,7 @@ var AST_Try = DEFNODE("Try", "bcatch bfinally", {
        bfinally: "[AST_Finally?] the finally block, or null if not present"
    },
    _walk: function(visitor) {
-        return visitor._visit(this, function(){
+        return visitor._visit(this, function() {
            walk_body(this, visitor);
            if (this.bcatch) this.bcatch._walk(visitor);
            if (this.bfinally) this.bfinally._walk(visitor);
@@ -491,7 +506,7 @@ var AST_Catch = DEFNODE("Catch", "argname", {
        argname: "[AST_SymbolCatch] symbol for the exception"
    },
    _walk: function(visitor) {
-        return visitor._visit(this, function(){
+        return visitor._visit(this, function() {
            this.argname._walk(visitor);
            walk_body(this, visitor);
        });
@@ -510,11 +525,10 @@ var AST_Definitions = DEFNODE("Definitions", "definitions", {
        definitions: "[AST_VarDef*] array of variable definitions"
    },
    _walk: function(visitor) {
-        return visitor._visit(this, function(){
-            var definitions = this.definitions;
-            for (var i = 0, len = definitions.length; i < len; i++) {
-                definitions[i]._walk(visitor);
-            }
+        return visitor._visit(this, function() {
+            this.definitions.forEach(function(defn) {
+                defn._walk(visitor);
+            });
        });
    }
 }, AST_Statement);
@@ -530,7 +544,7 @@ var AST_VarDef = DEFNODE("VarDef", "name value", {
        value: "[AST_Node?] initializer, or null of there's no initializer"
    },
    _walk: function(visitor) {
-        return visitor._visit(this, function(){
+        return visitor._visit(this, function() {
            this.name._walk(visitor);
            if (this.value) this.value._walk(visitor);
        });
@@ -565,7 +579,7 @@ var AST_Sequence = DEFNODE("Sequence", "expressions", {
        expressions: "[AST_Node*] array of expressions (at least two)"
    },
    _walk: function(visitor) {
-        return visitor._visit(this, function(){
+        return visitor._visit(this, function() {
            this.expressions.forEach(function(node) {
                node._walk(visitor);
            });
@@ -584,7 +598,7 @@ var AST_PropAccess = DEFNODE("PropAccess", "expression property", {
 var AST_Dot = DEFNODE("Dot", null, {
    $documentation: "A dotted property access expression",
    _walk: function(visitor) {
-        return visitor._visit(this, function(){
+        return visitor._visit(this, function() {
            this.expression._walk(visitor);
        });
    }
@@ -593,7 +607,7 @@ var AST_Dot = DEFNODE("Dot", null, {
 var AST_Sub = DEFNODE("Sub", null, {
    $documentation: "Index-style property access, i.e. `a[\"foo\"]`",
    _walk: function(visitor) {
-        return visitor._visit(this, function(){
+        return visitor._visit(this, function() {
            this.expression._walk(visitor);
            this.property._walk(visitor);
        });
@@ -607,7 +621,7 @@ var AST_Unary = DEFNODE("Unary", "operator expression", {
        expression: "[AST_Node] expression that this unary operator applies to"
    },
    _walk: function(visitor) {
-        return visitor._visit(this, function(){
+        return visitor._visit(this, function() {
            this.expression._walk(visitor);
        });
    }
@@ -629,7 +643,7 @@ var AST_Binary = DEFNODE("Binary", "operator left right", {
        right: "[AST_Node] right-hand side expression"
    },
    _walk: function(visitor) {
-        return visitor._visit(this, function(){
+        return visitor._visit(this, function() {
            this.left._walk(visitor);
            this.right._walk(visitor);
        });
@@ -644,7 +658,7 @@ var AST_Conditional = DEFNODE("Conditional", "condition consequent alternative",
        alternative: "[AST_Node]"
    },
    _walk: function(visitor) {
-        return visitor._visit(this, function(){
+        return visitor._visit(this, function() {
            this.condition._walk(visitor);
            this.consequent._walk(visitor);
            this.alternative._walk(visitor);
@@ -664,11 +678,10 @@ var AST_Array = DEFNODE("Array", "elements", {
        elements: "[AST_Node*] array of elements"
    },
    _walk: function(visitor) {
-        return visitor._visit(this, function(){
-            var elements = this.elements;
-            for (var i = 0, len = elements.length; i < len; i++) {
-                elements[i]._walk(visitor);
-            }
+        return visitor._visit(this, function() {
+            this.elements.forEach(function(element) {
+                element._walk(visitor);
+            });
        });
    }
 });
@@ -679,11 +692,10 @@ var AST_Object = DEFNODE("Object", "properties", {
        properties: "[AST_ObjectProperty*] array of properties"
    },
    _walk: function(visitor) {
-        return visitor._visit(this, function(){
-            var properties = this.properties;
-            for (var i = 0, len = properties.length; i < len; i++) {
-                properties[i]._walk(visitor);
-            }
+        return visitor._visit(this, function() {
+            this.properties.forEach(function(prop) {
+                prop._walk(visitor);
+            });
        });
    }
 });
@@ -695,7 +707,7 @@ var AST_ObjectProperty = DEFNODE("ObjectProperty", "key value", {
        value: "[AST_Node] property value.  For getters and setters this is an AST_Accessor."
    },
    _walk: function(visitor) {
-        return visitor._visit(this, function(){
+        return visitor._visit(this, function() {
            this.value._walk(visitor);
        });
    }
@@ -822,12 +834,12 @@ var AST_NaN = DEFNODE("NaN", null, {

 var AST_Undefined = DEFNODE("Undefined", null, {
    $documentation: "The `undefined` value",
-    value: (function(){}())
+    value: function(){}()
 }, AST_Atom);

 var AST_Hole = DEFNODE("Hole", null, {
    $documentation: "A hole in an array",
-    value: (function(){}())
+    value: function(){}()
 }, AST_Atom);

 var AST_Infinity = DEFNODE("Infinity", null, {
@@ -855,11 +867,11 @@ function TreeWalker(callback) {
    this.visit = callback;
    this.stack = [];
    this.directives = Object.create(null);
-};
+}
 TreeWalker.prototype = {
    _visit: function(node, descend) {
        this.push(node);
-        var ret = this.visit(node, descend ? function(){
+        var ret = this.visit(node, descend ? function() {
            descend.call(node);
        } : noop);
        if (!ret && descend) {
--- a/lib/compress.js
+++ b/lib/compress.js
--- a/lib/minify.js
+++ b/lib/minify.js
@@ -55,6 +55,7 @@ function minify(files, options) {
    try {
        options = defaults(options, {
            compress: {},
+            enclose: false,
            ie8: false,
            keep_fnames: false,
            mangle: {},
@@ -157,6 +158,9 @@ function minify(files, options) {
        if (options.wrap) {
            toplevel = toplevel.wrap_commonjs(options.wrap);
        }
+        if (options.enclose) {
+            toplevel = toplevel.wrap_enclose(options.enclose);
+        }
        if (timings) timings.rename = Date.now();
        if (options.rename) {
            toplevel.figure_out_scope(options.mangle);
--- a/lib/mozilla-ast.js
+++ b/lib/mozilla-ast.js
@@ -43,11 +43,9 @@

 "use strict";

-(function(){
-
-    var normalize_directives = function(body) {
+(function() {
+    function normalize_directives(body) {
        var in_directive = true;
-
        for (var i = 0; i < body.length; i++) {
            if (in_directive && body[i] instanceof AST_Statement && body[i].body instanceof AST_String) {
                body[i] = new AST_Directive({
@@ -59,9 +57,8 @@
                in_directive = false;
            }
        }
-
        return body;
-    };
+    }

    var MOZ_TO_ME = {
        Program: function(M) {
@@ -129,7 +126,7 @@
            return new AST_Array({
                start    : my_start_token(M),
                end      : my_end_token(M),
-                elements : M.elements.map(function(elem){
+                elements : M.elements.map(function(elem) {
                    return elem === null ? new AST_Hole() : from_moz(elem);
                })
            });
@@ -138,7 +135,7 @@
            return new AST_Object({
                start      : my_start_token(M),
                end        : my_end_token(M),
-                properties : M.properties.map(function(prop){
+                properties : M.properties.map(function(prop) {
                    prop.type = "Property";
                    return from_moz(prop)
                })
@@ -480,7 +477,7 @@
            endpos  : range ? range[0] : moznode.start,
            raw     : raw_token(moznode),
        });
-    };
+    }

    function my_end_token(moznode) {
        var loc = moznode.loc, end = loc && loc.end;
@@ -495,7 +492,7 @@
            endpos  : range ? range[1] : moznode.end,
            raw     : raw_token(moznode),
        });
-    };
+    }

    function map(moztype, mytype, propmap) {
        var moz_to_me = "function From_Moz_" + moztype + "(M){\n";
@@ -507,7 +504,7 @@
        me_to_moz += "return {\n" +
            "type: " + JSON.stringify(moztype);

-        if (propmap) propmap.split(/\s*,\s*/).forEach(function(prop){
+        if (propmap) propmap.split(/\s*,\s*/).forEach(function(prop) {
            var m = /([a-z0-9$_]+)(=|@|>|%)([a-z0-9$_]+)/i.exec(prop);
            if (!m) throw new Error("Can't understand property map: " + prop);
            var moz = m[1], how = m[2], my = m[3];
@@ -550,7 +547,7 @@
        );
        MOZ_TO_ME[moztype] = moz_to_me;
        def_to_moz(mytype, me_to_moz);
-    };
+    }

    var FROM_MOZ_STACK = null;

@@ -559,9 +556,9 @@
        var ret = node != null ? MOZ_TO_ME[node.type](node) : null;
        FROM_MOZ_STACK.pop();
        return ret;
-    };
+    }

-    AST_Node.from_mozilla_ast = function(node){
+    AST_Node.from_mozilla_ast = function(node) {
        var save_stack = FROM_MOZ_STACK;
        FROM_MOZ_STACK = [];
        var ast = from_moz(node);
@@ -600,24 +597,24 @@
            }
        }
        return moznode;
-    };
+    }

    function def_to_moz(mytype, handler) {
        mytype.DEFMETHOD("to_mozilla_ast", function() {
            return set_moz_loc(this, handler(this));
        });
-    };
+    }

    function to_moz(node) {
        return node != null ? node.to_mozilla_ast() : null;
-    };
+    }

    function to_moz_block(node) {
        return {
            type: "BlockStatement",
            body: node.body.map(to_moz)
        };
-    };
+    }

    function to_moz_scope(type, node) {
        var body = node.body.map(to_moz);
@@ -628,5 +625,5 @@
            type: type,
            body: body
        };
-    };
+    }
 })();
--- a/lib/output.js
+++ b/lib/output.js
@@ -137,7 +137,7 @@ function OutputStream(options) {
    function make_string(str, quote) {
        var dq = 0, sq = 0;
        str = str.replace(/[\\\b\f\n\r\v\t\x22\x27\u2028\u2029\0\ufeff]/g,
-          function(s, i){
+          function(s, i) {
            switch (s) {
              case '"': ++dq; return '"';
              case "'": ++sq; return "'";
@@ -408,7 +408,7 @@ function OutputStream(options) {
        var ret;
        print("{");
        newline();
-        with_indent(next_indent(), function(){
+        with_indent(next_indent(), function() {
            ret = cont();
        });
        indent();
@@ -631,7 +631,7 @@ function OutputStream(options) {

 /* -----[ code generators ]----- */

-(function(){
+(function() {

    /* -----[ utils ]----- */

@@ -643,7 +643,7 @@ function OutputStream(options) {
    var active_scope = null;
    var use_asm = null;

-    AST_Node.DEFMETHOD("print", function(stream, force_parens){
+    AST_Node.DEFMETHOD("print", function(stream, force_parens) {
        var self = this, generator = self._codegen;
        if (self instanceof AST_Scope) {
            active_scope = self;
@@ -670,7 +670,7 @@ function OutputStream(options) {
    });
    AST_Node.DEFMETHOD("_print", AST_Node.prototype.print);

-    AST_Node.DEFMETHOD("print_to_string", function(options){
+    AST_Node.DEFMETHOD("print_to_string", function(options) {
        var s = OutputStream(options);
        this.print(s);
        return s.get();
@@ -680,7 +680,7 @@ function OutputStream(options) {

    function PARENS(nodetype, func) {
        if (Array.isArray(nodetype)) {
-            nodetype.forEach(function(nodetype){
+            nodetype.forEach(function(nodetype) {
                PARENS(nodetype, func);
            });
        } else {
@@ -692,7 +692,7 @@ function OutputStream(options) {

    // a function expression needs parens around it when it's provably
    // the first token to appear in a statement.
-    PARENS(AST_Function, function(output){
+    PARENS(AST_Function, function(output) {
        if (!output.has_parens() && first_in_statement(output)) {
            return true;
        }
@@ -714,17 +714,17 @@ function OutputStream(options) {

    // same goes for an object literal, because otherwise it would be
    // interpreted as a block of code.
-    PARENS(AST_Object, function(output){
+    PARENS(AST_Object, function(output) {
        return !output.has_parens() && first_in_statement(output);
    });

-    PARENS(AST_Unary, 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;
    });

-    PARENS(AST_Sequence, function(output){
+    PARENS(AST_Sequence, function(output) {
        var p = output.parent();
        return p instanceof AST_Call             // (foo, bar)() or foo(1, (2, 3), 4)
            || p instanceof AST_Unary            // !(foo, bar, baz)
@@ -738,7 +738,7 @@ function OutputStream(options) {
        ;
    });

-    PARENS(AST_Binary, function(output){
+    PARENS(AST_Binary, function(output) {
        var p = output.parent();
        // (foo && bar)()
        if (p instanceof AST_Call && p.expression === this)
@@ -761,7 +761,7 @@ function OutputStream(options) {
        }
    });

-    PARENS(AST_PropAccess, function(output){
+    PARENS(AST_PropAccess, function(output) {
        var p = output.parent();
        if (p instanceof AST_New && p.expression === this) {
            // i.e. new (foo.bar().baz)
@@ -782,7 +782,7 @@ function OutputStream(options) {
        }
    });

-    PARENS(AST_Call, function(output){
+    PARENS(AST_Call, function(output) {
        var p = output.parent(), p1;
        if (p instanceof AST_New && p.expression === this)
            return true;
@@ -796,7 +796,7 @@ function OutputStream(options) {
            && p1.left === p;
    });

-    PARENS(AST_New, function(output){
+    PARENS(AST_New, function(output) {
        var p = output.parent();
        if (!need_constructor_parens(this, output)
            && (p instanceof AST_PropAccess // (new Date).getTime(), (new Date)["getTime"]()
@@ -804,7 +804,7 @@ function OutputStream(options) {
            return true;
    });

-    PARENS(AST_Number, function(output){
+    PARENS(AST_Number, function(output) {
        var p = output.parent();
        if (p instanceof AST_PropAccess && p.expression === this) {
            var value = this.getValue();
@@ -814,7 +814,7 @@ function OutputStream(options) {
        }
    });

-    PARENS([ AST_Assign, AST_Conditional ], function(output){
+    PARENS([ AST_Assign, AST_Conditional ], function(output) {
        var p = output.parent();
        // !(a = false) → true
        if (p instanceof AST_Unary)
@@ -835,11 +835,11 @@ function OutputStream(options) {

    /* -----[ PRINTERS ]----- */

-    DEFPRINT(AST_Directive, function(self, output){
+    DEFPRINT(AST_Directive, function(self, output) {
        output.print_string(self.value, self.quote);
        output.semicolon();
    });
-    DEFPRINT(AST_Debugger, function(self, output){
+    DEFPRINT(AST_Debugger, function(self, output) {
        output.print("debugger");
        output.semicolon();
    });
@@ -849,7 +849,7 @@ function OutputStream(options) {
    function display_body(body, is_toplevel, output, allow_directives) {
        var last = body.length - 1;
        in_directive = allow_directives;
-        body.forEach(function(stmt, i){
+        body.forEach(function(stmt, i) {
            if (in_directive === true && !(stmt instanceof AST_Directive ||
                stmt instanceof AST_EmptyStatement ||
                (stmt instanceof AST_SimpleStatement && stmt.body instanceof AST_String)
@@ -874,24 +874,24 @@ function OutputStream(options) {
        in_directive = false;
    }

-    AST_StatementWithBody.DEFMETHOD("_do_print_body", function(output){
+    AST_StatementWithBody.DEFMETHOD("_do_print_body", function(output) {
        force_statement(this.body, output);
    });

-    DEFPRINT(AST_Statement, function(self, output){
+    DEFPRINT(AST_Statement, function(self, output) {
        self.body.print(output);
        output.semicolon();
    });
-    DEFPRINT(AST_Toplevel, function(self, output){
+    DEFPRINT(AST_Toplevel, function(self, output) {
        display_body(self.body, true, output, true);
        output.print("");
    });
-    DEFPRINT(AST_LabeledStatement, function(self, output){
+    DEFPRINT(AST_LabeledStatement, function(self, output) {
        self.label.print(output);
        output.colon();
        self.body.print(output);
    });
-    DEFPRINT(AST_SimpleStatement, function(self, output){
+    DEFPRINT(AST_SimpleStatement, function(self, output) {
        self.body.print(output);
        output.semicolon();
    });
@@ -909,37 +909,37 @@ function OutputStream(options) {
            });
        } else print_braced_empty(self, output);
    }
-    DEFPRINT(AST_BlockStatement, function(self, output){
+    DEFPRINT(AST_BlockStatement, function(self, output) {
        print_braced(self, output);
    });
-    DEFPRINT(AST_EmptyStatement, function(self, output){
+    DEFPRINT(AST_EmptyStatement, function(self, output) {
        output.semicolon();
    });
-    DEFPRINT(AST_Do, function(self, output){
+    DEFPRINT(AST_Do, function(self, output) {
        output.print("do");
        output.space();
        make_block(self.body, output);
        output.space();
        output.print("while");
        output.space();
-        output.with_parens(function(){
+        output.with_parens(function() {
            self.condition.print(output);
        });
        output.semicolon();
    });
-    DEFPRINT(AST_While, function(self, output){
+    DEFPRINT(AST_While, function(self, output) {
        output.print("while");
        output.space();
-        output.with_parens(function(){
+        output.with_parens(function() {
            self.condition.print(output);
        });
        output.space();
        self._do_print_body(output);
    });
-    DEFPRINT(AST_For, function(self, output){
+    DEFPRINT(AST_For, function(self, output) {
        output.print("for");
        output.space();
-        output.with_parens(function(){
+        output.with_parens(function() {
            if (self.init) {
                if (self.init instanceof AST_Definitions) {
                    self.init.print(output);
@@ -965,10 +965,10 @@ function OutputStream(options) {
        output.space();
        self._do_print_body(output);
    });
-    DEFPRINT(AST_ForIn, function(self, output){
+    DEFPRINT(AST_ForIn, function(self, output) {
        output.print("for");
        output.space();
-        output.with_parens(function(){
+        output.with_parens(function() {
            self.init.print(output);
            output.space();
            output.print("in");
@@ -978,10 +978,10 @@ function OutputStream(options) {
        output.space();
        self._do_print_body(output);
    });
-    DEFPRINT(AST_With, function(self, output){
+    DEFPRINT(AST_With, function(self, output) {
        output.print("with");
        output.space();
-        output.with_parens(function(){
+        output.with_parens(function() {
            self.expression.print(output);
        });
        output.space();
@@ -989,7 +989,7 @@ function OutputStream(options) {
    });

    /* -----[ functions ]----- */
-    AST_Lambda.DEFMETHOD("_do_print", function(output, nokeyword){
+    AST_Lambda.DEFMETHOD("_do_print", function(output, nokeyword) {
        var self = this;
        if (!nokeyword) {
            output.print("function");
@@ -998,8 +998,8 @@ function OutputStream(options) {
            output.space();
            self.name.print(output);
        }
-        output.with_parens(function(){
-            self.argnames.forEach(function(arg, i){
+        output.with_parens(function() {
+            self.argnames.forEach(function(arg, i) {
                if (i) output.comma();
                arg.print(output);
            });
@@ -1007,40 +1007,31 @@ function OutputStream(options) {
        output.space();
        print_braced(self, output, true);
    });
-    DEFPRINT(AST_Lambda, function(self, output){
+    DEFPRINT(AST_Lambda, function(self, output) {
        self._do_print(output);
    });

-    /* -----[ exits ]----- */
-    AST_Exit.DEFMETHOD("_do_print", function(output, kind){
+    /* -----[ jumps ]----- */
+    function print_jump(output, kind, target) {
        output.print(kind);
-        if (this.value) {
+        if (target) {
            output.space();
-            this.value.print(output);
+            target.print(output);
        }
        output.semicolon();
-    });
-    DEFPRINT(AST_Return, function(self, output){
-        self._do_print(output, "return");
-    });
-    DEFPRINT(AST_Throw, function(self, output){
-        self._do_print(output, "throw");
-    });
+    }

-    /* -----[ loop control ]----- */
-    AST_LoopControl.DEFMETHOD("_do_print", function(output, kind){
-        output.print(kind);
-        if (this.label) {
-            output.space();
-            this.label.print(output);
-        }
-        output.semicolon();
+    DEFPRINT(AST_Return, function(self, output) {
+        print_jump(output, "return", self.value);
    });
-    DEFPRINT(AST_Break, function(self, output){
-        self._do_print(output, "break");
+    DEFPRINT(AST_Throw, function(self, output) {
+        print_jump(output, "throw", self.value);
    });
-    DEFPRINT(AST_Continue, function(self, output){
-        self._do_print(output, "continue");
+    DEFPRINT(AST_Break, function(self, output) {
+        print_jump(output, "break", self.label);
+    });
+    DEFPRINT(AST_Continue, function(self, output) {
+        print_jump(output, "continue", self.label);
    });

    /* -----[ if ]----- */
@@ -1072,10 +1063,10 @@ function OutputStream(options) {
        }
        force_statement(self.body, output);
    }
-    DEFPRINT(AST_If, function(self, output){
+    DEFPRINT(AST_If, function(self, output) {
        output.print("if");
        output.space();
-        output.with_parens(function(){
+        output.with_parens(function() {
            self.condition.print(output);
        });
        output.space();
@@ -1094,17 +1085,17 @@ function OutputStream(options) {
    });

    /* -----[ switch ]----- */
-    DEFPRINT(AST_Switch, function(self, output){
+    DEFPRINT(AST_Switch, function(self, output) {
        output.print("switch");
        output.space();
-        output.with_parens(function(){
+        output.with_parens(function() {
            self.expression.print(output);
        });
        output.space();
        var last = self.body.length - 1;
        if (last < 0) print_braced_empty(self, output);
-        else output.with_block(function(){
-            self.body.forEach(function(branch, i){
+        else output.with_block(function() {
+            self.body.forEach(function(branch, i) {
                output.indent(true);
                branch.print(output);
                if (i < last && branch.body.length > 0)
@@ -1112,19 +1103,19 @@ function OutputStream(options) {
            });
        });
    });
-    AST_SwitchBranch.DEFMETHOD("_do_print_body", function(output){
+    AST_SwitchBranch.DEFMETHOD("_do_print_body", function(output) {
        output.newline();
-        this.body.forEach(function(stmt){
+        this.body.forEach(function(stmt) {
            output.indent();
            stmt.print(output);
            output.newline();
        });
    });
-    DEFPRINT(AST_Default, function(self, output){
+    DEFPRINT(AST_Default, function(self, output) {
        output.print("default:");
        self._do_print_body(output);
    });
-    DEFPRINT(AST_Case, function(self, output){
+    DEFPRINT(AST_Case, function(self, output) {
        output.print("case");
        output.space();
        self.expression.print(output);
@@ -1133,7 +1124,7 @@ function OutputStream(options) {
    });

    /* -----[ exceptions ]----- */
-    DEFPRINT(AST_Try, function(self, output){
+    DEFPRINT(AST_Try, function(self, output) {
        output.print("try");
        output.space();
        print_braced(self, output);
@@ -1146,37 +1137,30 @@ function OutputStream(options) {
            self.bfinally.print(output);
        }
    });
-    DEFPRINT(AST_Catch, function(self, output){
+    DEFPRINT(AST_Catch, function(self, output) {
        output.print("catch");
        output.space();
-        output.with_parens(function(){
+        output.with_parens(function() {
            self.argname.print(output);
        });
        output.space();
        print_braced(self, output);
    });
-    DEFPRINT(AST_Finally, function(self, output){
+    DEFPRINT(AST_Finally, function(self, output) {
        output.print("finally");
        output.space();
        print_braced(self, output);
    });

-    /* -----[ var/const ]----- */
-    AST_Definitions.DEFMETHOD("_do_print", function(output, kind){
-        output.print(kind);
+    DEFPRINT(AST_Var, function(self, output) {
+        output.print("var");
        output.space();
-        this.definitions.forEach(function(def, i){
+        self.definitions.forEach(function(def, i) {
            if (i) output.comma();
            def.print(output);
        });
        var p = output.parent();
-        var in_for = p instanceof AST_For || p instanceof AST_ForIn;
-        var avoid_semicolon = in_for && p.init === this;
-        if (!avoid_semicolon)
-            output.semicolon();
-    });
-    DEFPRINT(AST_Var, function(self, output){
-        self._do_print(output, "var");
+        if (p.init !== self || !(p instanceof AST_For || p instanceof AST_ForIn)) output.semicolon();
    });

    function parenthesize_for_noin(node, output, noin) {
@@ -1193,7 +1177,7 @@ function OutputStream(options) {
        node.print(output, parens);
    }

-    DEFPRINT(AST_VarDef, function(self, output){
+    DEFPRINT(AST_VarDef, function(self, output) {
        self.name.print(output);
        if (self.value) {
            output.space();
@@ -1206,28 +1190,27 @@ function OutputStream(options) {
    });

    /* -----[ other expressions ]----- */
-    DEFPRINT(AST_Call, function(self, output){
+    DEFPRINT(AST_Call, function(self, output) {
        self.expression.print(output);
        if (self instanceof AST_New && !need_constructor_parens(self, output))
            return;
        if (self.expression instanceof AST_Call || self.expression instanceof AST_Lambda) {
            output.add_mapping(self.start);
        }
-        output.with_parens(function(){
-            self.args.forEach(function(expr, i){
+        output.with_parens(function() {
+            self.args.forEach(function(expr, i) {
                if (i) output.comma();
                expr.print(output);
            });
        });
    });
-    DEFPRINT(AST_New, function(self, output){
+    DEFPRINT(AST_New, function(self, output) {
        output.print("new");
        output.space();
        AST_Call.prototype._codegen(self, output);
    });
-
-    AST_Sequence.DEFMETHOD("_do_print", function(output){
-        this.expressions.forEach(function(node, index) {
+    DEFPRINT(AST_Sequence, function(self, output) {
+        self.expressions.forEach(function(node, index) {
            if (index > 0) {
                output.comma();
                if (output.should_break()) {
@@ -1238,18 +1221,7 @@ function OutputStream(options) {
            node.print(output);
        });
    });
-    DEFPRINT(AST_Sequence, function(self, output){
-        self._do_print(output);
-        // var p = output.parent();
-        // if (p instanceof AST_Statement) {
-        //     output.with_indent(output.next_indent(), function(){
-        //         self._do_print(output);
-        //     });
-        // } else {
-        //     self._do_print(output);
-        // }
-    });
-    DEFPRINT(AST_Dot, function(self, output){
+    DEFPRINT(AST_Dot, function(self, output) {
        var expr = self.expression;
        expr.print(output);
        var prop = self.property;
@@ -1270,13 +1242,13 @@ function OutputStream(options) {
            output.print_name(prop);
        }
    });
-    DEFPRINT(AST_Sub, function(self, output){
+    DEFPRINT(AST_Sub, function(self, output) {
        self.expression.print(output);
        output.print("[");
        self.property.print(output);
        output.print("]");
    });
-    DEFPRINT(AST_UnaryPrefix, function(self, output){
+    DEFPRINT(AST_UnaryPrefix, function(self, output) {
        var op = self.operator;
        output.print(op);
        if (/^[a-z]/i.test(op)
@@ -1287,11 +1259,11 @@ function OutputStream(options) {
        }
        self.expression.print(output);
    });
-    DEFPRINT(AST_UnaryPostfix, function(self, output){
+    DEFPRINT(AST_UnaryPostfix, function(self, output) {
        self.expression.print(output);
        output.print(self.operator);
    });
-    DEFPRINT(AST_Binary, function(self, output){
+    DEFPRINT(AST_Binary, function(self, output) {
        var op = self.operator;
        self.left.print(output);
        if (op[0] == ">" /* ">>" ">>>" ">" ">=" */
@@ -1317,7 +1289,7 @@ function OutputStream(options) {
        }
        self.right.print(output);
    });
-    DEFPRINT(AST_Conditional, function(self, output){
+    DEFPRINT(AST_Conditional, function(self, output) {
        self.condition.print(output);
        output.space();
        output.print("?");
@@ -1329,11 +1301,11 @@ function OutputStream(options) {
    });

    /* -----[ literals ]----- */
-    DEFPRINT(AST_Array, function(self, output){
-        output.with_square(function(){
+    DEFPRINT(AST_Array, function(self, output) {
+        output.with_square(function() {
            var a = self.elements, len = a.length;
            if (len > 0) output.space();
-            a.forEach(function(exp, i){
+            a.forEach(function(exp, i) {
                if (i) output.comma();
                exp.print(output);
                // If the final element is a hole, we need to make sure it
@@ -1345,9 +1317,9 @@ function OutputStream(options) {
            if (len > 0) output.space();
        });
    });
-    DEFPRINT(AST_Object, function(self, output){
-        if (self.properties.length > 0) output.with_block(function(){
-            self.properties.forEach(function(prop, i){
+    DEFPRINT(AST_Object, function(self, output) {
+        if (self.properties.length > 0) output.with_block(function() {
+            self.properties.forEach(function(prop, i) {
                if (i) {
                    output.print(",");
                    output.newline();
@@ -1376,7 +1348,7 @@ function OutputStream(options) {
        }
    }

-    DEFPRINT(AST_ObjectKeyVal, function(self, output){
+    DEFPRINT(AST_ObjectKeyVal, function(self, output) {
        print_property_name(self.key, self.quote, output);
        output.colon();
        self.value.print(output);
@@ -1387,27 +1359,27 @@ function OutputStream(options) {
        print_property_name(this.key.name, this.quote, output);
        this.value._do_print(output, true);
    });
-    DEFPRINT(AST_ObjectSetter, function(self, output){
+    DEFPRINT(AST_ObjectSetter, function(self, output) {
        self._print_getter_setter("set", output);
    });
-    DEFPRINT(AST_ObjectGetter, function(self, output){
+    DEFPRINT(AST_ObjectGetter, function(self, output) {
        self._print_getter_setter("get", output);
    });
-    DEFPRINT(AST_Symbol, function(self, output){
+    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_This, function(self, output){
+    DEFPRINT(AST_This, function(self, output) {
        output.print("this");
    });
-    DEFPRINT(AST_Constant, function(self, output){
+    DEFPRINT(AST_Constant, function(self, output) {
        output.print(self.getValue());
    });
-    DEFPRINT(AST_String, function(self, output){
+    DEFPRINT(AST_String, function(self, output) {
        output.print_string(self.getValue(), self.quote, in_directive);
    });
-    DEFPRINT(AST_Number, function(self, output){
+    DEFPRINT(AST_Number, function(self, output) {
        if (use_asm && self.start && self.start.raw != null) {
            output.print(self.start.raw);
        } else {
@@ -1415,7 +1387,7 @@ function OutputStream(options) {
        }
    });

-    DEFPRINT(AST_RegExp, function(self, output){
+    DEFPRINT(AST_RegExp, function(self, output) {
        var regexp = self.getValue();
        var str = regexp.toString();
        if (regexp.raw_source) {
@@ -1487,7 +1459,7 @@ function OutputStream(options) {
            output.print("{}");
        else if (stmt instanceof AST_BlockStatement)
            stmt.print(output);
-        else output.with_block(function(){
+        else output.with_block(function() {
            output.indent();
            stmt.print(output);
            output.newline();
--- a/lib/parse.js
+++ b/lib/parse.js
@@ -130,7 +130,7 @@ function is_letter(code) {
    return (code >= 97 && code <= 122)
        || (code >= 65 && code <= 90)
        || (code >= 0xaa && UNICODE.letter.test(String.fromCharCode(code)));
-};
+}

 function is_surrogate_pair_head(code) {
    if (typeof code == "string")
@@ -146,11 +146,11 @@ function is_surrogate_pair_tail(code) {

 function is_digit(code) {
    return code >= 48 && code <= 57;
-};
+}

 function is_alphanumeric_char(code) {
    return is_digit(code) || is_letter(code);
-};
+}

 function is_unicode_digit(code) {
    return UNICODE.digit.test(String.fromCharCode(code));
@@ -158,19 +158,19 @@ function is_unicode_digit(code) {

 function is_unicode_combining_mark(ch) {
    return UNICODE.non_spacing_mark.test(ch) || UNICODE.space_combining_mark.test(ch);
-};
+}

 function is_unicode_connector_punctuation(ch) {
    return UNICODE.connector_punctuation.test(ch);
-};
+}

 function is_identifier(name) {
    return !RESERVED_WORDS[name] && /^[a-z_$][a-z0-9_$]*$/i.test(name);
-};
+}

 function is_identifier_start(code) {
    return code == 36 || code == 95 || is_letter(code);
-};
+}

 function is_identifier_char(ch) {
    var code = ch.charCodeAt(0);
@@ -182,11 +182,11 @@ function is_identifier_char(ch) {
        || is_unicode_connector_punctuation(ch)
        || is_unicode_digit(code)
    ;
-};
+}

-function is_identifier_string(str){
+function is_identifier_string(str) {
    return /^[a-z_$][a-z0-9_$]*$/i.test(str);
-};
+}

 function parse_js_number(num) {
    if (RE_HEX_NUMBER.test(num)) {
@@ -197,7 +197,7 @@ function parse_js_number(num) {
        var val = parseFloat(num);
        if (val == num) return val;
    }
-};
+}

 function JS_Parse_Error(message, filename, line, col, pos) {
    this.message = message;
@@ -205,7 +205,7 @@ function JS_Parse_Error(message, filename, line, col, pos) {
    this.line = line;
    this.col = col;
    this.pos = pos;
-};
+}
 JS_Parse_Error.prototype = Object.create(Error.prototype);
 JS_Parse_Error.prototype.constructor = JS_Parse_Error;
 JS_Parse_Error.prototype.name = "SyntaxError";
@@ -213,11 +213,11 @@ configure_error_stack(JS_Parse_Error);

 function js_error(message, filename, line, col, pos) {
    throw new JS_Parse_Error(message, filename, line, col, pos);
-};
+}

 function is_token(token, type, val) {
    return token.type == type && (val == null || token.value == val);
-};
+}

 var EX_EOF = {};

@@ -239,7 +239,9 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
        directive_stack : []
    };

-    function peek() { return S.text.charAt(S.pos); };
+    function peek() {
+        return S.text.charAt(S.pos);
+    }

    function next(signal_eof, in_string) {
        var ch = S.text.charAt(S.pos++);
@@ -258,15 +260,15 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
            ++S.col;
        }
        return ch;
-    };
+    }

    function forward(i) {
        while (i-- > 0) next();
-    };
+    }

    function looking_at(str) {
        return S.text.substr(S.pos, str.length) == str;
-    };
+    }

    function find_eol() {
        var text = S.text;
@@ -276,19 +278,19 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
                return i;
        }
        return -1;
-    };
+    }

    function find(what, signal_eof) {
        var pos = S.text.indexOf(what, S.pos);
        if (signal_eof && pos == -1) throw EX_EOF;
        return pos;
-    };
+    }

    function start_token() {
        S.tokline = S.line;
        S.tokcol = S.col;
        S.tokpos = S.pos;
-    };
+    }

    var prev_was_dot = false;
    function token(type, value, is_comment) {
@@ -321,27 +323,27 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
        }
        S.newline_before = false;
        return new AST_Token(ret);
-    };
+    }

    function skip_whitespace() {
        while (WHITESPACE_CHARS[peek()])
            next();
-    };
+    }

    function read_while(pred) {
        var ret = "", ch, i = 0;
        while ((ch = peek()) && pred(ch, i++))
            ret += next();
        return ret;
-    };
+    }

    function parse_error(err) {
        js_error(err, filename, S.tokline, S.tokcol, S.tokpos);
-    };
+    }

    function read_num(prefix) {
        var has_e = false, after_e = false, has_x = false, has_dot = prefix == ".";
-        var num = read_while(function(ch, i){
+        var num = read_while(function(ch, i) {
            var code = ch.charCodeAt(0);
            switch (code) {
              case 120: case 88: // xX
@@ -367,7 +369,7 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
        } else {
            parse_error("Invalid syntax: " + num);
        }
-    };
+    }

    function read_escaped_char(in_string) {
        var ch = next(true, in_string);
@@ -390,7 +392,7 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
        if (ch >= "0" && ch <= "7")
            return read_octal_escape_sequence(ch);
        return ch;
-    };
+    }

    function read_octal_escape_sequence(ch) {
        // Read
@@ -417,9 +419,9 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
            num = (num << 4) | digit;
        }
        return num;
-    };
+    }

-    var read_string = with_eof_error("Unterminated string constant", function(quote_char){
+    var read_string = with_eof_error("Unterminated string constant", function(quote_char) {
        var quote = next(), ret = "";
        for (;;) {
            var ch = next(true, true);
@@ -447,9 +449,9 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
        S.comments_before.push(token(type, ret, true));
        S.regex_allowed = regex_allowed;
        return next_token;
-    };
+    }

-    var skip_multiline_comment = with_eof_error("Unterminated multiline comment", function(){
+    var skip_multiline_comment = with_eof_error("Unterminated multiline comment", function() {
        var regex_allowed = S.regex_allowed;
        var i = find("*/", true);
        var text = S.text.substring(S.pos, i).replace(/\r\n|\r|\u2028|\u2029/g, '\n');
@@ -481,7 +483,7 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
            name = "\\u" + "0000".substr(hex.length) + hex + name.slice(1);
        }
        return name;
-    };
+    }

    var read_regexp = with_eof_error("Unterminated regular expression", function(source) {
        var prev_backslash = false, ch, in_class = false;
@@ -523,9 +525,9 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
            } else {
                return op;
            }
-        };
+        }
        return token("operator", grow(prefix || next()));
-    };
+    }

    function handle_slash() {
        next();
@@ -538,14 +540,14 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
            return skip_multiline_comment();
        }
        return S.regex_allowed ? read_regexp("") : read_operator("/");
-    };
+    }

    function handle_dot() {
        next();
        return is_digit(peek().charCodeAt(0))
            ? read_num(".")
            : token("punc", ".");
-    };
+    }

    function read_word() {
        var word = read_name();
@@ -554,7 +556,7 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
            : !KEYWORDS[word] ? token("name", word)
            : OPERATORS[word] ? token("operator", word)
            : token("keyword", word);
-    };
+    }

    function with_eof_error(eof_error, cont) {
        return function(x) {
@@ -565,7 +567,7 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
                else throw ex;
            }
        };
-    };
+    }

    function next_token(force_regexp) {
        if (force_regexp != null)
@@ -609,7 +611,7 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
            break;
        }
        parse_error("Unexpected character '" + ch + "'");
-    };
+    }

    next_token.context = function(nc) {
        if (nc) S = nc;
@@ -645,8 +647,7 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
    }

    return next_token;
-
-};
+}

 /* -----[ Parser (constants) ]----- */

@@ -666,7 +667,7 @@ var UNARY_POSTFIX = makePredicate([ "--", "++" ]);

 var ASSIGNMENT = makePredicate([ "=", "+=", "-=", "/=", "*=", "%=", ">>=", "<<=", ">>>=", "|=", "^=", "&=" ]);

-var PRECEDENCE = (function(a, ret){
+var PRECEDENCE = function(a, ret) {
    for (var i = 0; i < a.length; ++i) {
        var b = a[i];
        for (var j = 0; j < b.length; ++j) {
@@ -674,28 +675,24 @@ var PRECEDENCE = (function(a, ret){
        }
    }
    return ret;
-})(
-    [
-        ["||"],
-        ["&&"],
-        ["|"],
-        ["^"],
-        ["&"],
-        ["==", "===", "!=", "!=="],
-        ["<", ">", "<=", ">=", "in", "instanceof"],
-        [">>", "<<", ">>>"],
-        ["+", "-"],
-        ["*", "/", "%"]
-    ],
-    {}
-);
+}([
+    ["||"],
+    ["&&"],
+    ["|"],
+    ["^"],
+    ["&"],
+    ["==", "===", "!=", "!=="],
+    ["<", ">", "<=", ">=", "in", "instanceof"],
+    [">>", "<<", ">>>"],
+    ["+", "-"],
+    ["*", "/", "%"]
+], {});

 var ATOMIC_START_TOKEN = makePredicate([ "atom", "num", "string", "regexp", "name" ]);

 /* -----[ Parser ]----- */

 function parse($TEXT, options) {
-
    options = defaults(options, {
        bare_returns   : false,
        expression     : false,
@@ -724,9 +721,11 @@ function parse($TEXT, options) {

    function is(type, value) {
        return is_token(S.token, type, value);
-    };
+    }

-    function peek() { return S.peeked || (S.peeked = S.input()); };
+    function peek() {
+        return S.peeked || (S.peeked = S.input());
+    }

    function next() {
        S.prev = S.token;
@@ -740,11 +739,11 @@ function parse($TEXT, options) {
            S.token.type == "string" || is("punc", ";")
        );
        return S.token;
-    };
+    }

    function prev() {
        return S.prev;
-    };
+    }

    function croak(msg, line, col, pos) {
        var ctx = S.input.context();
@@ -753,26 +752,28 @@ function parse($TEXT, options) {
                 line != null ? line : ctx.tokline,
                 col != null ? col : ctx.tokcol,
                 pos != null ? pos : ctx.tokpos);
-    };
+    }

    function token_error(token, msg) {
        croak(msg, token.line, token.col);
-    };
+    }

    function unexpected(token) {
        if (token == null)
            token = S.token;
        token_error(token, "Unexpected token: " + token.type + " (" + token.value + ")");
-    };
+    }

    function expect_token(type, val) {
        if (is(type, val)) {
            return next();
        }
        token_error(S.token, "Unexpected token " + S.token.type + " «" + S.token.value + "»" + ", expected " + type + " «" + val + "»");
-    };
+    }

-    function expect(punc) { return expect_token("punc", punc); };
+    function expect(punc) {
+        return expect_token("punc", punc);
+    }

    function has_newline_before(token) {
        return token.nlb || !all(token.comments_before, function(comment) {
@@ -783,19 +784,19 @@ function parse($TEXT, options) {
    function can_insert_semicolon() {
        return !options.strict
            && (is("eof") || is("punc", "}") || has_newline_before(S.token));
-    };
+    }

    function semicolon(optional) {
        if (is("punc", ";")) next();
        else if (!optional && !can_insert_semicolon()) unexpected();
-    };
+    }

    function parenthesised() {
        expect("(");
        var exp = expression(true);
        expect(")");
        return exp;
-    };
+    }

    function embed_tokens(parser) {
        return function() {
@@ -806,14 +807,14 @@ function parse($TEXT, options) {
            expr.end = end;
            return expr;
        };
-    };
+    }

    function handle_regexp() {
        if (is("operator", "/") || is("operator", "/=")) {
            S.peeked = null;
            S.token = S.input(S.token.value.substr(1)); // force regexp
        }
-    };
+    }

    var statement = embed_tokens(function(strict_defun) {
        handle_regexp();
@@ -986,7 +987,7 @@ function parse($TEXT, options) {
            // check for `continue` that refers to this label.
            // those should be reported as syntax errors.
            // https://github.com/mishoo/UglifyJS2/issues/287
-            label.references.forEach(function(ref){
+            label.references.forEach(function(ref) {
                if (ref instanceof AST_Continue) {
                    ref = ref.label.start;
                    croak("Continue label `" + label.name + "` refers to non-IterationStatement.",
@@ -995,11 +996,11 @@ function parse($TEXT, options) {
            });
        }
        return new AST_LabeledStatement({ body: stat, label: label });
-    };
+    }

    function simple_statement(tmp) {
        return new AST_SimpleStatement({ body: (tmp = expression(true), semicolon(), tmp) });
-    };
+    }

    function break_cont(type) {
        var label = null, ldef;
@@ -1007,18 +1008,17 @@ function parse($TEXT, options) {
            label = as_symbol(AST_LabelRef, true);
        }
        if (label != null) {
-            ldef = find_if(function(l){ return l.name == label.name }, S.labels);
-            if (!ldef)
-                croak("Undefined label " + label.name);
+            ldef = find_if(function(l) {
+                return l.name == label.name;
+            }, S.labels);
+            if (!ldef) croak("Undefined label " + label.name);
            label.thedef = ldef;
-        }
-        else if (S.in_loop == 0)
-            croak(type.TYPE + " not inside a loop or switch");
+        } else if (S.in_loop == 0) croak(type.TYPE + " not inside a loop or switch");
        semicolon();
        var stat = new type({ label: label });
        if (ldef) ldef.references.push(stat);
        return stat;
-    };
+    }

    function for_() {
        expect("(");
@@ -1039,7 +1039,7 @@ function parse($TEXT, options) {
            }
        }
        return regular_for(init);
-    };
+    }

    function regular_for(init) {
        expect(";");
@@ -1053,7 +1053,7 @@ function parse($TEXT, options) {
            step      : step,
            body      : in_loop(statement)
        });
-    };
+    }

    function for_in(init) {
        var obj = expression(true);
@@ -1063,7 +1063,7 @@ function parse($TEXT, options) {
            object : obj,
            body   : in_loop(statement)
        });
-    };
+    }

    var function_ = function(ctor) {
        var in_statement = ctor === AST_Defun;
@@ -1113,7 +1113,7 @@ function parse($TEXT, options) {
            body        : body,
            alternative : belse
        });
-    };
+    }

    function block_(strict_defun) {
        expect("{");
@@ -1124,7 +1124,7 @@ function parse($TEXT, options) {
        }
        next();
        return a;
-    };
+    }

    function switch_body_() {
        expect("{");
@@ -1159,7 +1159,7 @@ function parse($TEXT, options) {
        if (branch) branch.end = prev();
        next();
        return a;
-    };
+    }

    function try_() {
        var body = block_(), bcatch = null, bfinally = null;
@@ -1192,7 +1192,7 @@ function parse($TEXT, options) {
            bcatch   : bcatch,
            bfinally : bfinally
        });
-    };
+    }

    function vardefs(no_in) {
        var a = [];
@@ -1208,7 +1208,7 @@ function parse($TEXT, options) {
            next();
        }
        return a;
-    };
+    }

    var var_ = function(no_in) {
        return new AST_Var({
@@ -1274,7 +1274,7 @@ function parse($TEXT, options) {
        }
        next();
        return ret;
-    };
+    }

    var expr_atom = function(allow_calls) {
        if (is("operator", "new")) {
@@ -1340,7 +1340,7 @@ function parse($TEXT, options) {
        }
        next();
        return a;
-    };
+    }

    var array_ = embed_tokens(function() {
        expect("[");
@@ -1417,14 +1417,14 @@ function parse($TEXT, options) {
          default:
            unexpected();
        }
-    };
+    }

    function as_name() {
        var tmp = S.token;
        if (tmp.type != "name") unexpected();
        next();
        return tmp.value;
-    };
+    }

    function _make_symbol(type) {
        var name = S.token.value;
@@ -1433,7 +1433,7 @@ function parse($TEXT, options) {
            start : S.token,
            end   : S.token
        });
-    };
+    }

    function strict_verify_symbol(sym) {
        if (sym.name == "arguments" || sym.name == "eval")
@@ -1451,7 +1451,7 @@ function parse($TEXT, options) {
        }
        next();
        return sym;
-    };
+    }

    function mark_pure(call) {
        var start = call.start;
@@ -1536,7 +1536,7 @@ function parse($TEXT, options) {
            break;
        }
        return new ctor({ operator: op, expression: expr });
-    };
+    }

    var expr_op = function(left, min_prec, no_in) {
        var op = is("operator") ? S.token.value : null;
@@ -1558,7 +1558,7 @@ function parse($TEXT, options) {

    function expr_ops(no_in) {
        return expr_op(maybe_unary(true), 0, no_in);
-    };
+    }

    var maybe_conditional = function(no_in) {
        var start = S.token;
@@ -1580,7 +1580,7 @@ function parse($TEXT, options) {

    function is_assignable(expr) {
        return expr instanceof AST_PropAccess || expr instanceof AST_SymbolRef;
-    };
+    }

    var maybe_assign = function(no_in) {
        var start = S.token;
@@ -1622,13 +1622,13 @@ function parse($TEXT, options) {
        var ret = cont();
        --S.in_loop;
        return ret;
-    };
+    }

    if (options.expression) {
        return expression(true);
    }

-    return (function(){
+    return function() {
        var start = S.token;
        var body = [];
        S.input.push_directives_stack();
@@ -1644,6 +1644,5 @@ function parse($TEXT, options) {
            toplevel = new AST_Toplevel({ start: start, body: body, end: end });
        }
        return toplevel;
-    })();
-
-};
+    }();
+}
--- a/lib/propmangle.js
+++ b/lib/propmangle.js
@@ -56,7 +56,7 @@ function find_builtins(reserved) {
    [ Object, Array, Function, Number,
      String, Boolean, Error, Math,
      Date, RegExp
-    ].forEach(function(ctor){
+    ].forEach(function(ctor) {
        Object.getOwnPropertyNames(ctor).map(add);
        if (ctor.prototype) {
            Object.getOwnPropertyNames(ctor.prototype).map(add);
@@ -136,7 +136,7 @@ function mangle_properties(ast, options) {
    var unmangleable = [];

    // step 1: find candidates to mangle
-    ast.walk(new TreeWalker(function(node){
+    ast.walk(new TreeWalker(function(node) {
        if (node instanceof AST_ObjectKeyVal) {
            add(node.key);
        }
@@ -157,7 +157,7 @@ function mangle_properties(ast, options) {
    }));

    // step 2: transform the tree, renaming properties
-    return ast.transform(new TreeTransformer(function(node){
+    return ast.transform(new TreeTransformer(function(node) {
        if (node instanceof AST_ObjectKeyVal) {
            node.key = mangle(node.key);
        }
@@ -234,7 +234,7 @@ function mangle_properties(ast, options) {
    }

    function mangleStrings(node) {
-        return node.transform(new TreeTransformer(function(node){
+        return node.transform(new TreeTransformer(function(node) {
            if (node instanceof AST_Sequence) {
                var last = node.expressions.length - 1;
                node.expressions[last] = mangleStrings(node.expressions[last]);
--- a/lib/scope.js
+++ b/lib/scope.js
@@ -91,7 +91,7 @@ SymbolDef.prototype = {
    }
 };

-AST_Toplevel.DEFMETHOD("figure_out_scope", function(options){
+AST_Toplevel.DEFMETHOD("figure_out_scope", function(options) {
    options = defaults(options, {
        cache: null,
        ie8: false,
@@ -101,7 +101,7 @@ AST_Toplevel.DEFMETHOD("figure_out_scope", function(options){
    var self = this;
    var scope = self.parent_scope = null;
    var defun = null;
-    var tw = new TreeWalker(function(node, descend){
+    var tw = new TreeWalker(function(node, descend) {
        if (node instanceof AST_Catch) {
            var save_scope = scope;
            scope = new AST_Scope(node);
@@ -162,7 +162,7 @@ AST_Toplevel.DEFMETHOD("figure_out_scope", function(options){

    // pass 2: find back references and eval
    self.globals = new Dictionary();
-    var tw = new TreeWalker(function(node, descend){
+    var tw = new TreeWalker(function(node, descend) {
        if (node instanceof AST_LoopControl && node.label) {
            node.label.thedef.references.push(node);
            return true;
@@ -217,7 +217,7 @@ AST_Toplevel.DEFMETHOD("figure_out_scope", function(options){
    }
 });

-AST_Toplevel.DEFMETHOD("def_global", function(node){
+AST_Toplevel.DEFMETHOD("def_global", function(node) {
    var globals = this.globals, name = node.name;
    if (globals.has(name)) {
        return globals.get(name);
@@ -230,7 +230,7 @@ AST_Toplevel.DEFMETHOD("def_global", function(node){
    }
 });

-AST_Scope.DEFMETHOD("init_scope_vars", function(parent_scope){
+AST_Scope.DEFMETHOD("init_scope_vars", function(parent_scope) {
    this.variables = new Dictionary();  // map name to AST_SymbolVar (variables defined in this scope; includes functions)
    this.functions = new Dictionary();  // map name to AST_SymbolDefun (functions defined in this scope)
    this.uses_with = false;             // will be set to true if this or some nested scope uses the `with` statement
@@ -240,7 +240,7 @@ AST_Scope.DEFMETHOD("init_scope_vars", function(parent_scope){
    this.cname = -1;                    // the current index for mangling functions/variables
 });

-AST_Lambda.DEFMETHOD("init_scope_vars", function(){
+AST_Lambda.DEFMETHOD("init_scope_vars", function() {
    AST_Scope.prototype.init_scope_vars.apply(this, arguments);
    this.uses_arguments = false;
    this.def_variable(new AST_SymbolFunarg({
@@ -270,20 +270,20 @@ AST_Symbol.DEFMETHOD("reference", function(options) {
    this.mark_enclosed(options);
 });

-AST_Scope.DEFMETHOD("find_variable", function(name){
+AST_Scope.DEFMETHOD("find_variable", function(name) {
    if (name instanceof AST_Symbol) name = name.name;
    return this.variables.get(name)
        || (this.parent_scope && this.parent_scope.find_variable(name));
 });

-AST_Scope.DEFMETHOD("def_function", function(symbol, init){
+AST_Scope.DEFMETHOD("def_function", function(symbol, init) {
    var def = this.def_variable(symbol, init);
    if (!def.init || def.init instanceof AST_Defun) def.init = init;
    this.functions.set(symbol.name, def);
    return def;
 });

-AST_Scope.DEFMETHOD("def_variable", function(symbol, init){
+AST_Scope.DEFMETHOD("def_variable", function(symbol, init) {
    var def = this.variables.get(symbol.name);
    if (def) {
        def.orig.push(symbol);
@@ -390,7 +390,7 @@ function _default_mangler_options(options) {
    return options;
 }

-AST_Toplevel.DEFMETHOD("mangle_names", function(options){
+AST_Toplevel.DEFMETHOD("mangle_names", function(options) {
    options = _default_mangler_options(options);

    // We only need to mangle declaration nodes.  Special logic wired
@@ -407,7 +407,7 @@ AST_Toplevel.DEFMETHOD("mangle_names", function(options){
    }

    var redefined = [];
-    var tw = new TreeWalker(function(node, descend){
+    var tw = new TreeWalker(function(node, descend) {
        if (node instanceof AST_LabeledStatement) {
            // lname is incremented when we get to the AST_Label
            var save_nesting = lname;
@@ -520,7 +520,7 @@ AST_Sequence.DEFMETHOD("tail_node", function() {
    return this.expressions[this.expressions.length - 1];
 });

-AST_Toplevel.DEFMETHOD("compute_char_frequency", function(options){
+AST_Toplevel.DEFMETHOD("compute_char_frequency", function(options) {
    options = _default_mangler_options(options);
    base54.reset();
    try {
--- a/lib/sourcemap.js
+++ b/lib/sourcemap.js
@@ -46,16 +46,15 @@
 // a small wrapper around fitzgen's source-map library
 function SourceMap(options) {
    options = defaults(options, {
-        file : null,
-        root : null,
-        orig : null,
-
-        orig_line_diff : 0,
-        dest_line_diff : 0,
-    });
+        file: null,
+        root: null,
+        orig: null,
+        orig_line_diff: 0,
+        dest_line_diff: 0,
+    }, true);
    var generator = new MOZ_SourceMap.SourceMapGenerator({
-        file       : options.file,
-        sourceRoot : options.root
+        file: options.file,
+        sourceRoot: options.root
    });
    var maps = options.orig && Object.create(null);
    if (maps) for (var source in options.orig) {
@@ -68,30 +67,38 @@ function SourceMap(options) {
        }
        maps[source] = map;
    }
-
-    function add(source, gen_line, gen_col, orig_line, orig_col, name) {
-        var map = maps && maps[source];
-        if (map) {
-            var info = map.originalPositionFor({
-                line: orig_line,
-                column: orig_col
-            });
-            if (info.source === null) return;
-            source = info.source;
-            orig_line = info.line;
-            orig_col = info.column;
-            name = info.name || name;
-        }
-        generator.addMapping({
-            generated : { line: gen_line + options.dest_line_diff, column: gen_col },
-            original  : { line: orig_line + options.orig_line_diff, column: orig_col },
-            source    : source,
-            name      : name
-        });
-    };
    return {
-        add        : add,
-        get        : function() { return generator },
-        toString   : function() { return JSON.stringify(generator.toJSON()); }
+        add: function(source, gen_line, gen_col, orig_line, orig_col, name) {
+            var map = maps && maps[source];
+            if (map) {
+                var info = map.originalPositionFor({
+                    line: orig_line,
+                    column: orig_col
+                });
+                if (info.source === null) return;
+                source = info.source;
+                orig_line = info.line;
+                orig_col = info.column;
+                name = info.name || name;
+            }
+            generator.addMapping({
+                name: name,
+                source: source,
+                generated: {
+                    line: gen_line + options.dest_line_diff,
+                    column: gen_col
+                },
+                original: {
+                    line: orig_line + options.orig_line_diff,
+                    column: orig_col
+                }
+            });
+        },
+        get: function() {
+            return generator;
+        },
+        toString: function() {
+            return JSON.stringify(generator.toJSON());
+        }
    };
-};
+}
--- a/lib/transform.js
+++ b/lib/transform.js
@@ -43,8 +43,6 @@

 "use strict";

-// Tree transformer helpers.
-
 function TreeTransformer(before, after) {
    TreeWalker.call(this);
    this.before = before;
@@ -52,168 +50,136 @@ function TreeTransformer(before, after) {
 }
 TreeTransformer.prototype = new TreeWalker;

-(function(undefined){
-
-    function _(node, descend) {
-        node.DEFMETHOD("transform", function(tw, in_list){
-            var x, y;
-            tw.push(this);
-            if (tw.before) x = tw.before(this, descend, in_list);
-            if (x === undefined) {
-                x = this;
-                descend(x, tw);
-                if (tw.after) {
-                    y = tw.after(x, in_list);
-                    if (y !== undefined) x = y;
-                }
-            }
-            tw.pop();
-            return x;
-        });
-    };
-
+(function(DEF) {
    function do_list(list, tw) {
-        return MAP(list, function(node){
+        return MAP(list, function(node) {
            return node.transform(tw, true);
        });
-    };
+    }

-    _(AST_Node, noop);
-
-    _(AST_LabeledStatement, function(self, tw){
+    DEF(AST_Node, noop);
+    DEF(AST_LabeledStatement, function(self, tw) {
        self.label = self.label.transform(tw);
        self.body = self.body.transform(tw);
    });
-
-    _(AST_SimpleStatement, function(self, tw){
+    DEF(AST_SimpleStatement, function(self, tw) {
        self.body = self.body.transform(tw);
    });
-
-    _(AST_Block, function(self, tw){
+    DEF(AST_Block, function(self, tw) {
        self.body = do_list(self.body, tw);
    });
-
-    _(AST_Do, function(self, tw){
+    DEF(AST_Do, function(self, tw) {
        self.body = self.body.transform(tw);
        self.condition = self.condition.transform(tw);
    });
-
-    _(AST_While, function(self, tw){
+    DEF(AST_While, function(self, tw) {
        self.condition = self.condition.transform(tw);
        self.body = self.body.transform(tw);
    });
-
-    _(AST_For, function(self, tw){
+    DEF(AST_For, function(self, tw) {
        if (self.init) self.init = self.init.transform(tw);
        if (self.condition) self.condition = self.condition.transform(tw);
        if (self.step) self.step = self.step.transform(tw);
        self.body = self.body.transform(tw);
    });
-
-    _(AST_ForIn, function(self, tw){
+    DEF(AST_ForIn, function(self, tw) {
        self.init = self.init.transform(tw);
        self.object = self.object.transform(tw);
        self.body = self.body.transform(tw);
    });
-
-    _(AST_With, function(self, tw){
+    DEF(AST_With, function(self, tw) {
        self.expression = self.expression.transform(tw);
        self.body = self.body.transform(tw);
    });
-
-    _(AST_Exit, function(self, tw){
+    DEF(AST_Exit, function(self, tw) {
        if (self.value) self.value = self.value.transform(tw);
    });
-
-    _(AST_LoopControl, function(self, tw){
+    DEF(AST_LoopControl, function(self, tw) {
        if (self.label) self.label = self.label.transform(tw);
    });
-
-    _(AST_If, function(self, tw){
+    DEF(AST_If, function(self, tw) {
        self.condition = self.condition.transform(tw);
        self.body = self.body.transform(tw);
        if (self.alternative) self.alternative = self.alternative.transform(tw);
    });
-
-    _(AST_Switch, function(self, tw){
+    DEF(AST_Switch, function(self, tw) {
        self.expression = self.expression.transform(tw);
        self.body = do_list(self.body, tw);
    });
-
-    _(AST_Case, function(self, tw){
+    DEF(AST_Case, function(self, tw) {
        self.expression = self.expression.transform(tw);
        self.body = do_list(self.body, tw);
    });
-
-    _(AST_Try, function(self, tw){
+    DEF(AST_Try, function(self, tw) {
        self.body = do_list(self.body, tw);
        if (self.bcatch) self.bcatch = self.bcatch.transform(tw);
        if (self.bfinally) self.bfinally = self.bfinally.transform(tw);
    });
-
-    _(AST_Catch, function(self, tw){
+    DEF(AST_Catch, function(self, tw) {
        self.argname = self.argname.transform(tw);
        self.body = do_list(self.body, tw);
    });
-
-    _(AST_Definitions, function(self, tw){
+    DEF(AST_Definitions, function(self, tw) {
        self.definitions = do_list(self.definitions, tw);
    });
-
-    _(AST_VarDef, function(self, tw){
+    DEF(AST_VarDef, function(self, tw) {
        self.name = self.name.transform(tw);
        if (self.value) self.value = self.value.transform(tw);
    });
-
-    _(AST_Lambda, function(self, tw){
+    DEF(AST_Lambda, function(self, tw) {
        if (self.name) self.name = self.name.transform(tw);
        self.argnames = do_list(self.argnames, tw);
        self.body = do_list(self.body, tw);
    });
-
-    _(AST_Call, function(self, tw){
+    DEF(AST_Call, function(self, tw) {
        self.expression = self.expression.transform(tw);
        self.args = do_list(self.args, tw);
    });
-
-    _(AST_Sequence, function(self, tw){
+    DEF(AST_Sequence, function(self, tw) {
        self.expressions = do_list(self.expressions, tw);
    });
-
-    _(AST_Dot, function(self, tw){
+    DEF(AST_Dot, function(self, tw) {
        self.expression = self.expression.transform(tw);
    });
-
-    _(AST_Sub, function(self, tw){
+    DEF(AST_Sub, function(self, tw) {
        self.expression = self.expression.transform(tw);
        self.property = self.property.transform(tw);
    });
-
-    _(AST_Unary, function(self, tw){
+    DEF(AST_Unary, function(self, tw) {
        self.expression = self.expression.transform(tw);
    });
-
-    _(AST_Binary, function(self, tw){
+    DEF(AST_Binary, function(self, tw) {
        self.left = self.left.transform(tw);
        self.right = self.right.transform(tw);
    });
-
-    _(AST_Conditional, function(self, tw){
+    DEF(AST_Conditional, function(self, tw) {
        self.condition = self.condition.transform(tw);
        self.consequent = self.consequent.transform(tw);
        self.alternative = self.alternative.transform(tw);
    });
-
-    _(AST_Array, function(self, tw){
+    DEF(AST_Array, function(self, tw) {
        self.elements = do_list(self.elements, tw);
    });
-
-    _(AST_Object, function(self, tw){
+    DEF(AST_Object, function(self, tw) {
        self.properties = do_list(self.properties, tw);
    });
-
-    _(AST_ObjectProperty, function(self, tw){
+    DEF(AST_ObjectProperty, function(self, tw) {
        self.value = self.value.transform(tw);
    });
-
-})();
+})(function(node, descend) {
+    node.DEFMETHOD("transform", function(tw, in_list) {
+        var x, y;
+        tw.push(this);
+        if (tw.before) x = tw.before(this, descend, in_list);
+        if (typeof x === "undefined") {
+            x = this;
+            descend(x, tw);
+            if (tw.after) {
+                y = tw.after(x, in_list);
+                if (typeof y !== "undefined") x = y;
+            }
+        }
+        tw.pop();
+        return x;
+    });
+});
--- a/lib/utils.js
+++ b/lib/utils.js
@@ -115,7 +115,7 @@ function return_true() { return true; }
 function return_this() { return this; }
 function return_null() { return null; }

-var MAP = (function(){
+var MAP = (function() {
    function MAP(a, f, backwards) {
        var ret = [], top = [], i;
        function doit() {
@@ -138,7 +138,7 @@ var MAP = (function(){
                }
            }
            return is_last;
-        };
+        }
        if (Array.isArray(a)) {
            if (backwards) {
                for (i = a.length; --i >= 0;) if (doit()) break;
@@ -152,14 +152,14 @@ var MAP = (function(){
            for (i in a) if (HOP(a, i)) if (doit()) break;
        }
        return top.concat(ret);
-    };
+    }
    MAP.at_top = function(val) { return new AtTop(val) };
    MAP.splice = function(val) { return new Splice(val) };
    MAP.last = function(val) { return new Last(val) };
    var skip = MAP.skip = {};
-    function AtTop(val) { this.v = val };
-    function Splice(val) { this.v = val };
-    function Last(val) { this.v = val };
+    function AtTop(val) { this.v = val }
+    function Splice(val) { this.v = val }
+    function Last(val) { this.v = val }
    return MAP;
 })();

@@ -169,7 +169,7 @@ function push_uniq(array, el) {
 }

 function string_template(text, props) {
-    return text.replace(/\{(.+?)\}/g, function(str, p){
+    return text.replace(/\{(.+?)\}/g, function(str, p) {
        return props && props[p];
    });
 }
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
  "description": "JavaScript parser, mangler/compressor and beautifier toolkit",
  "author": "Mihai Bazon <mihai.bazon@gmail.com> (http://lisperator.net/)",
  "license": "BSD-2-Clause",
-  "version": "3.3.28",
+  "version": "3.4.1",
  "engines": {
    "node": ">=0.8.0"
  },
--- a/test/compress/collapse_vars.js
+++ b/test/compress/collapse_vars.js
@@ -150,36 +150,36 @@ collapse_vars_issue_721: {
        reduce_funcs: true, reduce_vars:true, passes:2
    }
    input: {
-        define(["require", "exports", 'handlebars'], function (require, exports, hb) {
+        define(["require", "exports", 'handlebars'], function(require, exports, hb) {
            var win = window;
            var _hb = win.Handlebars = hb;
            return _hb;
        });
-        def(function (hb) {
+        def(function(hb) {
            var win = window;
            var prop = 'Handlebars';
            var _hb = win[prop] = hb;
            return _hb;
        });
-        def(function (hb) {
+        def(function(hb) {
            var prop = 'Handlebars';
            var win = window;
            var _hb = win[prop] = hb;
            return _hb;
        });
-        def(function (hb) {
+        def(function(hb) {
            var prop = 'Handlebars';
            var win = g();
            var _hb = win[prop] = hb;
            return _hb;
        });
-        def(function (hb) {
+        def(function(hb) {
            var prop = g1();
            var win = g2();
            var _hb = win[prop] = hb;
            return _hb;
        });
-        def(function (hb) {
+        def(function(hb) {
            var win = g2();
            var prop = g1();
            var _hb = win[prop] = hb;
@@ -196,14 +196,14 @@ collapse_vars_issue_721: {
        def(function(hb) {
            return window.Handlebars = hb;
        }),
-        def(function (hb) {
+        def(function(hb) {
            return g().Handlebars = hb;
        }),
-        def(function (hb) {
+        def(function(hb) {
            var prop = g1();
            return g2()[prop] = hb;
        }),
-        def(function (hb) {
+        def(function(hb) {
            return g2()[g1()] = hb;
        });
    }
@@ -3150,7 +3150,7 @@ issue_2437_1: {
                return result;
            } else {
                var req = new XMLHttpRequest();
-                var detectFunc = function () {};
+                var detectFunc = function(){};
                req.onreadystatechange = detectFunc;
                var result = req[SYMBOL_FAKE_ONREADYSTATECHANGE_1] === detectFunc;
                req.onreadystatechange = null;
@@ -3166,7 +3166,7 @@ issue_2437_1: {
                return Object.defineProperty(XMLHttpRequest.prototype, "onreadystatechange", xhrDesc || {}),
                    result;
            }
-            var req, detectFunc = function() {};
+            var req, detectFunc = function(){};
            (req = new XMLHttpRequest()).onreadystatechange = detectFunc;
            result = req[SYMBOL_FAKE_ONREADYSTATECHANGE_1] === detectFunc;
            return req.onreadystatechange = null, result;
@@ -3200,7 +3200,7 @@ issue_2437_2: {
                return result;
            } else {
                var req = new XMLHttpRequest();
-                var detectFunc = function () {};
+                var detectFunc = function(){};
                req.onreadystatechange = detectFunc;
                var result = req[SYMBOL_FAKE_ONREADYSTATECHANGE_1] === detectFunc;
                req.onreadystatechange = null;
@@ -4513,7 +4513,7 @@ issue_2878: {
    }
    input: {
        var c = 0;
-        (function (a, b) {
+        (function(a, b) {
            function f2() {
                if (a) c++;
            }
@@ -4526,7 +4526,7 @@ issue_2878: {
    }
    expect: {
        var c = 0;
-        (function (a, b) {
+        (function(a, b) {
            function f2() {
                if (a) c++;
            }
--- a/test/compress/functions.js
+++ b/test/compress/functions.js
@@ -1533,7 +1533,7 @@ issue_2663_3: {
        unused: true,
    }
    input: {
-        (function () {
+        (function() {
            var outputs = [
                { type: 0, target: null, eventName: "ngSubmit", propName: null },
                { type: 0, target: null, eventName: "submit", propName: null },
@@ -1550,11 +1550,11 @@ issue_2663_3: {
                return handlers;
            }
            function renderEventHandlerClosure(eventName) {
-                return function () {
+                return function() {
                    return console.log(eventName);
                };
            }
-            listenToElementOutputs(outputs).forEach(function (handler) {
+            listenToElementOutputs(outputs).forEach(function(handler) {
                return handler()
            });
        })();
@@ -1634,7 +1634,7 @@ loop_init_arg: {
    }
    input: {
        var a = "PASS";
-        for (var k in "12") (function (b) {
+        for (var k in "12") (function(b) {
            (b >>= 1) && (a = "FAIL"), b = 2;
        })();
        console.log(a);
--- a/test/compress/issue-281.js
+++ b/test/compress/issue-281.js
@@ -399,7 +399,7 @@ wrap_iife_in_expression: {
        wrap_iife: true,
    }
    input: {
-        foo = (function () {
+        foo = (function() {
            return bar();
        })();
    }
--- a/test/compress/properties.js
+++ b/test/compress/properties.js
@@ -1729,3 +1729,106 @@ issue_869_2: {
    }
    expect_stdout: "PASS"
 }
+
+issue_3188_1: {
+    options = {
+        collapse_vars: true,
+        inline: true,
+        properties: true,
+        reduce_vars: true,
+        side_effects: true,
+    }
+    input: {
+        (function() {
+            function f() {
+                console.log(this.p);
+            }
+            (function() {
+                var o = {
+                    p: "PASS",
+                    f: f
+                };
+                o.f();
+            })();
+        })();
+    }
+    expect: {
+        (function() {
+            function f() {
+                console.log(this.p);
+            }
+            ({
+                p: "PASS",
+                f: f
+            }).f();
+            var o;
+        })();
+    }
+    expect_stdout: "PASS"
+}
+
+issue_3188_2: {
+    options = {
+        collapse_vars: true,
+        inline: true,
+        properties: true,
+        reduce_vars: true,
+        side_effects: true,
+        unused: true,
+    }
+    input: {
+        (function() {
+            var f = function() {
+                console.log(this.p);
+            };
+            function g() {
+                var o = {
+                    p: "PASS",
+                    f: f
+                };
+                o.f();
+            }
+            g();
+        })();
+    }
+    expect: {
+        ({
+            p: "PASS",
+            f: function() {
+                console.log(this.p);
+            }
+        }).f();
+    }
+    expect_stdout: "PASS"
+}
+
+issue_3188_3: {
+    options = {
+        collapse_vars: true,
+        inline: true,
+        properties: true,
+        reduce_vars: true,
+        side_effects: true,
+    }
+    input: {
+        (function() {
+            function f() {
+                console.log(this[0]);
+            }
+            (function() {
+                var o = ["PASS", f];
+                o[1]();
+            })();
+        })();
+    }
+    expect: {
+        (function() {
+            function f() {
+                console.log(this[0]);
+            }
+            ["PASS", f][1]();
+            var o;
+        })();
+    }
+    expect_stdout: "PASS"
+}
--- a/test/compress/reduce_vars.js
+++ b/test/compress/reduce_vars.js
@@ -4887,7 +4887,7 @@ inverted_var: {
        }(), function(c) {
            c = 4;
            return c;
-        }(), function (c) {
+        }(), function(c) {
            c = 5;
            return c;
            var c;
--- a/test/compress/wrap_iife.js
+++ b/test/compress/wrap_iife.js
@@ -23,7 +23,7 @@ wrap_iife_in_expression: {
        wrap_iife: true,
    }
    input: {
-        foo = (function () {
+        foo = (function() {
            return bar();
        })();
    }
--- a/test/fetch.js
+++ b/test/fetch.js
@@ -1,4 +1,5 @@
 var fs = require("fs");
+var parse = require("url").parse;
 var path = require("path");

 try {
@@ -19,7 +20,9 @@ module.exports = function(url, callback) {
    var result = read(url);
    result.on("error", function(e) {
        if (e.code != "ENOENT") return callback(e);
-        require(url.slice(0, url.indexOf(":"))).get(url, function(res) {
+        var options = parse(url);
+        options.rejectUnauthorized = false;
+        require(options.protocol.slice(0, -1)).get(options, function(res) {
            if (res.statusCode !== 200) return callback(res);
            res.pipe(fs.createWriteStream(local(url)).on("close", function() {
                callback(null, read(url));
--- a/test/input/enclose/input.js
+++ b/test/input/enclose/input.js
@@ -0,0 +1,4 @@
+function enclose() {
+    console.log("test enclose");
+}
+enclose();
--- a/test/input/issue-1323/sample.js
+++ b/test/input/issue-1323/sample.js
@@ -1,4 +1,4 @@
-var bar = (function () {
+var bar = (function() {
    function foo (bar) {
        return bar;
    }
--- a/test/jetstream.js
+++ b/test/jetstream.js
@@ -3,7 +3,7 @@

 "use strict";

-var site = "http://browserbench.org/JetStream";
+var site = "https://browserbench.org/JetStream";
 if (typeof phantom == "undefined") {
    require("../tools/exit");
    var args = process.argv.slice(2);
--- a/test/mocha.js
+++ b/test/mocha.js
@@ -55,8 +55,7 @@ process.nextTick(function run() {
        var elapsed = Date.now();
        var timer;
        var done = function() {
-            clearTimeout(timer);
-            done = function() {};
+            reset();
            elapsed = Date.now() - elapsed;
            if (elapsed > task.limit) {
                throw new Error("Timed out: " + elapsed + "ms > " + task.limit + "ms");
@@ -73,6 +72,7 @@ process.nextTick(function run() {
                }, limit);
            };
            task.timeout(task.limit);
+            process.on("uncaughtException", raise);
            task.call(task, done);
        } else {
            task.timeout = config.timeout;
@@ -99,11 +99,16 @@ process.nextTick(function run() {
    }

    function raise(err) {
-        clearTimeout(timer);
-        done = function() {};
+        reset();
        task.titles.error = err;
        errors.push(task.titles);
        log_titles(console.log, task.titles, red('\u00D7 '));
        process.nextTick(run);
    }
+
+    function reset() {
+        clearTimeout(timer);
+        done = function() {};
+        process.removeListener("uncaughtException", raise);
+    }
 });
--- a/test/mocha/cli.js
+++ b/test/mocha/cli.js
@@ -6,60 +6,48 @@ function read(path) {
    return fs.readFileSync(path, "utf8");
 }

-describe("bin/uglifyjs", function () {
+describe("bin/uglifyjs", function() {
    var uglifyjscmd = '"' + process.argv[0] + '" bin/uglifyjs';
-    it("should produce a functional build when using --self", function (done) {
+    it("should produce a functional build when using --self", function(done) {
        this.timeout(30000);
-
        var command = uglifyjscmd + ' --self -cm --wrap WrappedUglifyJS';
-
-        exec(command, function (err, stdout) {
+        exec(command, function(err, stdout) {
            if (err) throw err;
-
            eval(stdout);
-
-            assert.strictEqual(typeof WrappedUglifyJS, 'object');
+            assert.strictEqual(typeof WrappedUglifyJS, "object");
            var result = WrappedUglifyJS.minify("foo([true,,2+3]);");
            assert.strictEqual(result.error, undefined);
            assert.strictEqual(result.code, "foo([!0,,5]);");
-
            done();
        });
    });
-    it("Should be able to filter comments correctly with `--comments all`", function (done) {
+    it("Should be able to filter comments correctly with `--comments all`", function(done) {
        var command = uglifyjscmd + ' test/input/comments/filter.js --comments all';
-
-        exec(command, function (err, stdout) {
+        exec(command, function(err, stdout) {
            if (err) throw err;
-
            assert.strictEqual(stdout, "// foo\n/*@preserve*/\n// bar\n\n");
            done();
        });
    });
-    it("Should be able to filter comments correctly with `--comment <RegExp>`", function (done) {
+    it("Should be able to filter comments correctly with `--comment <RegExp>`", function(done) {
        var command = uglifyjscmd + ' test/input/comments/filter.js --comments /r/';
-
-        exec(command, function (err, stdout) {
+        exec(command, function(err, stdout) {
            if (err) throw err;
-
            assert.strictEqual(stdout, "/*@preserve*/\n// bar\n\n");
            done();
        });
    });
-    it("Should be able to filter comments correctly with just `--comment`", function (done) {
+    it("Should be able to filter comments correctly with just `--comment`", function(done) {
        var command = uglifyjscmd + ' test/input/comments/filter.js --comments';
-
-        exec(command, function (err, stdout) {
+        exec(command, function(err, stdout) {
            if (err) throw err;
-
            assert.strictEqual(stdout, "/*@preserve*/\n\n");
            done();
        });
    });
    it("Should give sensible error against invalid input source map", function(done) {
        var command = uglifyjscmd + " test/mocha.js --source-map content=blah,url=inline";
-
-        exec(command, function (err, stdout, stderr) {
+        exec(command, function(err, stdout, stderr) {
            assert.ok(err);
            assert.deepEqual(stderr.split(/\n/).slice(0, 2), [
                "INFO: Using input source map: blah",
@@ -68,38 +56,35 @@ describe("bin/uglifyjs", function () {
            done();
        });
    });
-    it("Should append source map to output when using --source-map url=inline", function (done) {
+    it("Should append source map to output when using --source-map url=inline", function(done) {
        var command = uglifyjscmd + " test/input/issue-1323/sample.js --source-map url=inline";
-
-        exec(command, function (err, stdout) {
+        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,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRlc3QvaW5wdXQvaXNzdWUtMTMyMy9zYW1wbGUuanMiXSwibmFtZXMiOlsiYmFyIiwiZm9vIl0sIm1hcHBpbmdzIjoiQUFBQSxJQUFJQSxJQUFNLFdBQ04sU0FBU0MsSUFBS0QsS0FDVixPQUFPQSxJQUdYLE9BQU9DLElBTEQifQ==\n");
+            assert.strictEqual(stdout, [
+                "var bar=function(){function foo(bar){return bar}return foo}();",
+                "//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRlc3QvaW5wdXQvaXNzdWUtMTMyMy9zYW1wbGUuanMiXSwibmFtZXMiOlsiYmFyIiwiZm9vIl0sIm1hcHBpbmdzIjoiQUFBQSxJQUFJQSxJQUFNLFdBQ04sU0FBU0MsSUFBS0QsS0FDVixPQUFPQSxJQUdYLE9BQU9DLElBTEQifQ==",
+                "",
+            ].join("\n"));
            done();
        });
    });
-    it("should not append source map to output when not using --source-map url=inline", function (done) {
+    it("should not append source map to output when not using --source-map url=inline", function(done) {
        var command = uglifyjscmd + ' test/input/issue-1323/sample.js';
-
-        exec(command, function (err, stdout) {
+        exec(command, function(err, stdout) {
            if (err) throw err;
-
            assert.strictEqual(stdout, "var bar=function(){function foo(bar){return bar}return foo}();\n");
            done();
        });
    });
-    it("should not consider source map file content as source map file name (issue #2082)", function (done) {
+    it("should not consider source map file content as source map file name (issue #2082)", function(done) {
        var command = [
            uglifyjscmd,
            "test/input/issue-2082/sample.js",
            "--source-map", "content=test/input/issue-2082/sample.js.map",
            "--source-map", "url=inline",
        ].join(" ");
-
-        exec(command, function (err, stdout, stderr) {
+        exec(command, function(err, stdout, stderr) {
            if (err) throw err;
-
            var stderrLines = stderr.split("\n");
            assert.strictEqual(stderrLines[0], "INFO: Using input source map: test/input/issue-2082/sample.js.map");
            assert.notStrictEqual(stderrLines[1], 'INFO: Using input source map: {"version": 3,"sources": ["index.js"],"mappings": ";"}');
@@ -136,82 +121,66 @@ describe("bin/uglifyjs", function () {
            child.stdin.end(read("test/input/pr-3040/input.js"));
        }, 1000);
    });
-    it("Should work with --keep-fnames (mangle only)", function (done) {
+    it("Should work with --keep-fnames (mangle only)", function(done) {
        var command = uglifyjscmd + ' test/input/issue-1431/sample.js --keep-fnames -m';
-
-        exec(command, function (err, stdout) {
+        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();
        });
    });
-    it("Should work with --keep-fnames (mangle & compress)", function (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';
-
-        exec(command, function (err, stdout) {
+        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();
        });
    });
-    it("Should work with keep_fnames under mangler options", function (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';
-
-        exec(command, function (err, stdout) {
+        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();
        });
    });
-    it("Should work with --define (simple)", function (done) {
+    it("Should work with --define (simple)", function(done) {
        var command = uglifyjscmd + ' test/input/global_defs/simple.js --define D=5 -c';
-
-        exec(command, function (err, stdout) {
+        exec(command, function(err, stdout) {
            if (err) throw err;
-
            assert.strictEqual(stdout, "console.log(5);\n");
            done();
        });
    });
-    it("Should work with --define (nested)", function (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';
-
-        exec(command, function (err, stdout) {
+        exec(command, function(err, stdout) {
            if (err) throw err;
-
            assert.strictEqual(stdout, "console.log(3,5);\n");
            done();
        });
    });
-    it("Should work with --define (AST_Node)", function (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';
-
-        exec(command, function (err, stdout) {
+        exec(command, function(err, stdout) {
            if (err) throw err;
-
            assert.strictEqual(stdout, "stdout.println(D);\n");
            done();
        });
    });
-    it("Should work with `--beautify`", function (done) {
+    it("Should work with `--beautify`", function(done) {
        var command = uglifyjscmd + ' test/input/issue-1482/input.js -b';
-
-        exec(command, function (err, stdout) {
+        exec(command, function(err, stdout) {
            if (err) throw err;
-
            assert.strictEqual(stdout, read("test/input/issue-1482/default.js"));
            done();
        });
    });
-    it("Should work with `--beautify braces`", function (done) {
+    it("Should work with `--beautify braces`", function(done) {
        var command = uglifyjscmd + ' test/input/issue-1482/input.js -b braces';
-
-        exec(command, function (err, stdout) {
+        exec(command, function(err, stdout) {
            if (err) throw err;
-
            assert.strictEqual(stdout, read("test/input/issue-1482/braces.js"));
            done();
        });
@@ -225,20 +194,16 @@ describe("bin/uglifyjs", function () {
            "--source-map", "includeSources=true",
            "--source-map", "url=inline",
        ].join(" ");
-
-        exec(command, function (err, stdout) {
+        exec(command, function(err, stdout) {
            if (err) throw err;
-
            assert.strictEqual(stdout, read("test/input/issue-520/output.js"));
            done();
        });
    });
    it("Should warn for missing inline source map", function(done) {
        var command = uglifyjscmd + " test/input/issue-1323/sample.js --source-map content=inline,url=inline";
-
-        exec(command, function (err, stdout, stderr) {
+        exec(command, function(err, stdout, stderr) {
            if (err) throw err;
-
            assert.strictEqual(stdout, [
                "var bar=function(){function foo(bar){return bar}return foo}();",
                "//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRlc3QvaW5wdXQvaXNzdWUtMTMyMy9zYW1wbGUuanMiXSwibmFtZXMiOlsiYmFyIiwiZm9vIl0sIm1hcHBpbmdzIjoiQUFBQSxJQUFJQSxJQUFNLFdBQ04sU0FBU0MsSUFBS0QsS0FDVixPQUFPQSxJQUdYLE9BQU9DLElBTEQifQ==",
@@ -256,10 +221,8 @@ describe("bin/uglifyjs", function () {
            "test/input/issue-1323/sample.js",
            "--source-map", "content=inline,url=inline",
        ].join(" ");
-
-        exec(command, function (err, stdout, stderr) {
+        exec(command, function(err, stdout, stderr) {
            if (err) throw err;
-
            assert.strictEqual(stdout, [
                "var Foo=function Foo(){console.log(1+2)};new Foo;var bar=function(){function foo(bar){return bar}return foo}();",
                "//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInN0ZGluIiwidGVzdC9pbnB1dC9pc3N1ZS0xMzIzL3NhbXBsZS5qcyJdLCJuYW1lcyI6WyJGb28iLCJjb25zb2xlIiwibG9nIiwiYmFyIiwiZm9vIl0sIm1hcHBpbmdzIjoiQUFBQSxJQUFNQSxJQUFJLFNBQUFBLE1BQWdCQyxRQUFRQyxJQUFJLEVBQUUsSUFBTyxJQUFJRixJQ0FuRCxJQUFJRyxJQUFNLFdBQ04sU0FBU0MsSUFBS0QsS0FDVixPQUFPQSxJQUdYLE9BQU9DLElBTEQifQ==",
@@ -272,8 +235,7 @@ describe("bin/uglifyjs", function () {
    });
    it("Should fail with acorn and inline source map", function(done) {
        var command = uglifyjscmd + " test/input/issue-520/input.js --source-map content=inline,url=inline -p acorn";
-
-        exec(command, function (err, stdout, stderr) {
+        exec(command, function(err, stdout, stderr) {
            assert.ok(err);
            assert.strictEqual(stderr, "ERROR: inline source map only works with built-in parser\n");
            done();
@@ -281,8 +243,7 @@ describe("bin/uglifyjs", function () {
    });
    it("Should fail with SpiderMonkey and inline source map", function(done) {
        var command = uglifyjscmd + " test/input/issue-520/input.js --source-map content=inline,url=inline -p spidermonkey";
-
-        exec(command, function (err, stdout, stderr) {
+        exec(command, function(err, stdout, stderr) {
            assert.ok(err);
            assert.strictEqual(stderr, "ERROR: inline source map only works with built-in parser\n");
            done();
@@ -290,8 +251,7 @@ describe("bin/uglifyjs", function () {
    });
    it("Should fail with invalid syntax", function(done) {
        var command = uglifyjscmd + ' test/input/invalid/simple.js';
-
-        exec(command, function (err, stdout, stderr) {
+        exec(command, function(err, stdout, stderr) {
            assert.ok(err);
            var lines = stderr.split(/\n/);
            assert.strictEqual(lines[0], "Parse error at test/input/invalid/simple.js:1,12");
@@ -303,8 +263,7 @@ describe("bin/uglifyjs", function () {
    });
    it("Should fail with correct marking of tabs", function(done) {
        var command = uglifyjscmd + ' test/input/invalid/tab.js';
-
-        exec(command, function (err, stdout, stderr) {
+        exec(command, function(err, stdout, stderr) {
            assert.ok(err);
            var lines = stderr.split(/\n/);
            assert.strictEqual(lines[0], "Parse error at test/input/invalid/tab.js:1,12");
@@ -316,8 +275,7 @@ describe("bin/uglifyjs", function () {
    });
    it("Should fail with correct marking at start of line", function(done) {
        var command = uglifyjscmd + ' test/input/invalid/eof.js';
-
-        exec(command, function (err, stdout, stderr) {
+        exec(command, function(err, stdout, stderr) {
            assert.ok(err);
            var lines = stderr.split(/\n/);
            assert.strictEqual(lines[0], "Parse error at test/input/invalid/eof.js:2,0");
@@ -329,8 +287,7 @@ describe("bin/uglifyjs", function () {
    });
    it("Should fail with a missing loop body", function(done) {
        var command = uglifyjscmd + ' test/input/invalid/loop-no-body.js';
-
-        exec(command, function (err, stdout, stderr) {
+        exec(command, function(err, stdout, stderr) {
            assert.ok(err);
            var lines = stderr.split(/\n/);
            assert.strictEqual(lines[0], "Parse error at test/input/invalid/loop-no-body.js:2,0");
@@ -342,8 +299,7 @@ describe("bin/uglifyjs", function () {
    });
    it("Should throw syntax error (5--)", function(done) {
        var command = uglifyjscmd + ' test/input/invalid/assign_1.js';
-
-        exec(command, function (err, stdout, stderr) {
+        exec(command, function(err, stdout, stderr) {
            assert.ok(err);
            assert.strictEqual(stdout, "");
            assert.strictEqual(stderr.split(/\n/).slice(0, 4).join("\n"), [
@@ -357,8 +313,7 @@ describe("bin/uglifyjs", function () {
    });
    it("Should throw syntax error (Math.random() /= 2)", function(done) {
        var command = uglifyjscmd + ' test/input/invalid/assign_2.js';
-
-        exec(command, function (err, stdout, stderr) {
+        exec(command, function(err, stdout, stderr) {
            assert.ok(err);
            assert.strictEqual(stdout, "");
            assert.strictEqual(stderr.split(/\n/).slice(0, 4).join("\n"), [
@@ -372,8 +327,7 @@ describe("bin/uglifyjs", function () {
    });
    it("Should throw syntax error (++this)", function(done) {
        var command = uglifyjscmd + ' test/input/invalid/assign_3.js';
-
-        exec(command, function (err, stdout, stderr) {
+        exec(command, function(err, stdout, stderr) {
            assert.ok(err);
            assert.strictEqual(stdout, "");
            assert.strictEqual(stderr.split(/\n/).slice(0, 4).join("\n"), [
@@ -387,8 +341,7 @@ describe("bin/uglifyjs", function () {
    });
    it("Should throw syntax error (++null)", function(done) {
        var command = uglifyjscmd + ' test/input/invalid/assign_4.js';
-
-        exec(command, function (err, stdout, stderr) {
+        exec(command, function(err, stdout, stderr) {
            assert.ok(err);
            assert.strictEqual(stdout, "");
            assert.strictEqual(stderr.split(/\n/).slice(0, 4).join("\n"), [
@@ -402,8 +355,7 @@ describe("bin/uglifyjs", function () {
    });
    it("Should throw syntax error (a.=)", function(done) {
        var command = uglifyjscmd + ' test/input/invalid/dot_1.js';
-
-        exec(command, function (err, stdout, stderr) {
+        exec(command, function(err, stdout, stderr) {
            assert.ok(err);
            assert.strictEqual(stdout, "");
            assert.strictEqual(stderr.split(/\n/).slice(0, 4).join("\n"), [
@@ -417,8 +369,7 @@ describe("bin/uglifyjs", function () {
    });
    it("Should throw syntax error (%.a)", function(done) {
        var command = uglifyjscmd + ' test/input/invalid/dot_2.js';
-
-        exec(command, function (err, stdout, stderr) {
+        exec(command, function(err, stdout, stderr) {
            assert.ok(err);
            assert.strictEqual(stdout, "");
            assert.strictEqual(stderr.split(/\n/).slice(0, 4).join("\n"), [
@@ -432,8 +383,7 @@ describe("bin/uglifyjs", function () {
    });
    it("Should throw syntax error (a./();)", function(done) {
        var command = uglifyjscmd + ' test/input/invalid/dot_3.js';
-
-        exec(command, function (err, stdout, stderr) {
+        exec(command, function(err, stdout, stderr) {
            assert.ok(err);
            assert.strictEqual(stdout, "");
            assert.strictEqual(stderr.split(/\n/).slice(0, 4).join("\n"), [
@@ -447,8 +397,7 @@ describe("bin/uglifyjs", function () {
    });
    it("Should throw syntax error ({%: 1})", function(done) {
        var command = uglifyjscmd + ' test/input/invalid/object.js';
-
-        exec(command, function (err, stdout, stderr) {
+        exec(command, function(err, stdout, stderr) {
            assert.ok(err);
            assert.strictEqual(stdout, "");
            assert.strictEqual(stderr.split(/\n/).slice(0, 4).join("\n"), [
@@ -462,8 +411,7 @@ describe("bin/uglifyjs", function () {
    });
    it("Should throw syntax error (delete x)", function(done) {
        var command = uglifyjscmd + ' test/input/invalid/delete.js';
-
-        exec(command, function (err, stdout, stderr) {
+        exec(command, function(err, stdout, stderr) {
            assert.ok(err);
            assert.strictEqual(stdout, "");
            assert.strictEqual(stderr.split(/\n/).slice(0, 4).join("\n"), [
@@ -477,8 +425,7 @@ describe("bin/uglifyjs", function () {
    });
    it("Should throw syntax error (function g(arguments))", function(done) {
        var command = uglifyjscmd + ' test/input/invalid/function_1.js';
-
-        exec(command, function (err, stdout, stderr) {
+        exec(command, function(err, stdout, stderr) {
            assert.ok(err);
            assert.strictEqual(stdout, "");
            assert.strictEqual(stderr.split(/\n/).slice(0, 4).join("\n"), [
@@ -492,8 +439,7 @@ describe("bin/uglifyjs", function () {
    });
    it("Should throw syntax error (function eval())", function(done) {
        var command = uglifyjscmd + ' test/input/invalid/function_2.js';
-
-        exec(command, function (err, stdout, stderr) {
+        exec(command, function(err, stdout, stderr) {
            assert.ok(err);
            assert.strictEqual(stdout, "");
            assert.strictEqual(stderr.split(/\n/).slice(0, 4).join("\n"), [
@@ -507,8 +453,7 @@ describe("bin/uglifyjs", function () {
    });
    it("Should throw syntax error (iife arguments())", function(done) {
        var command = uglifyjscmd + ' test/input/invalid/function_3.js';
-
-        exec(command, function (err, stdout, stderr) {
+        exec(command, function(err, stdout, stderr) {
            assert.ok(err);
            assert.strictEqual(stdout, "");
            assert.strictEqual(stderr.split(/\n/).slice(0, 4).join("\n"), [
@@ -522,8 +467,7 @@ describe("bin/uglifyjs", function () {
    });
    it("Should throw syntax error (catch(eval))", function(done) {
        var command = uglifyjscmd + ' test/input/invalid/try.js';
-
-        exec(command, function (err, stdout, stderr) {
+        exec(command, function(err, stdout, stderr) {
            assert.ok(err);
            assert.strictEqual(stdout, "");
            assert.strictEqual(stderr.split(/\n/).slice(0, 4).join("\n"), [
@@ -537,8 +481,7 @@ describe("bin/uglifyjs", function () {
    });
    it("Should throw syntax error (var eval)", function(done) {
        var command = uglifyjscmd + ' test/input/invalid/var.js';
-
-        exec(command, function (err, stdout, stderr) {
+        exec(command, function(err, stdout, stderr) {
            assert.ok(err);
            assert.strictEqual(stdout, "");
            assert.strictEqual(stderr.split(/\n/).slice(0, 4).join("\n"), [
@@ -552,8 +495,7 @@ describe("bin/uglifyjs", function () {
    });
    it("Should throw syntax error (else)", function(done) {
        var command = uglifyjscmd + ' test/input/invalid/else.js';
-
-        exec(command, function (err, stdout, stderr) {
+        exec(command, function(err, stdout, stderr) {
            assert.ok(err);
            assert.strictEqual(stdout, "");
            assert.strictEqual(stderr.split(/\n/).slice(0, 4).join("\n"), [
@@ -567,8 +509,7 @@ describe("bin/uglifyjs", function () {
    });
    it("Should throw syntax error (return)", function(done) {
        var command = uglifyjscmd + ' test/input/invalid/return.js';
-
-        exec(command, function (err, stdout, stderr) {
+        exec(command, function(err, stdout, stderr) {
            assert.ok(err);
            assert.strictEqual(stdout, "");
            assert.strictEqual(stderr.split(/\n/).slice(0, 4).join("\n"), [
@@ -582,8 +523,7 @@ describe("bin/uglifyjs", function () {
    });
    it("Should throw syntax error (for-in init)", function(done) {
        var command = uglifyjscmd + ' test/input/invalid/for-in_1.js';
-
-        exec(command, function (err, stdout, stderr) {
+        exec(command, function(err, stdout, stderr) {
            assert.ok(err);
            assert.strictEqual(stdout, "");
            assert.strictEqual(stderr.split(/\n/).slice(0, 4).join("\n"), [
@@ -597,8 +537,7 @@ describe("bin/uglifyjs", function () {
    });
    it("Should throw syntax error (for-in var)", function(done) {
        var command = uglifyjscmd + ' test/input/invalid/for-in_2.js';
-
-        exec(command, function (err, stdout, stderr) {
+        exec(command, function(err, stdout, stderr) {
            assert.ok(err);
            assert.strictEqual(stdout, "");
            assert.strictEqual(stderr.split(/\n/).slice(0, 4).join("\n"), [
@@ -617,10 +556,8 @@ describe("bin/uglifyjs", function () {
            "--source-map",
            'content="' + read_map() + '",url=inline'
        ].join(" ");
-
-        exec(command, function (err, stdout) {
+        exec(command, function(err, stdout) {
            if (err) throw err;
-
            assert.strictEqual(stdout, [
                '"use strict";var foo=function foo(x){return"foo "+x};console.log(foo("bar"));',
                "//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImluZGV4LmpzIl0sIm5hbWVzIjpbImZvbyIsIngiLCJjb25zb2xlIiwibG9nIl0sIm1hcHBpbmdzIjoiYUFBQSxJQUFJQSxJQUFNLFNBQU5BLElBQU1DLEdBQUEsTUFBSyxPQUFTQSxHQUN4QkMsUUFBUUMsSUFBSUgsSUFBSSJ9",
@@ -642,10 +579,8 @@ describe("bin/uglifyjs", function () {
            "-c",
            "--source-map", "url=inline",
        ].join(" ");
-
        exec(command, function(err, stdout, stderr) {
            if (err) throw err;
-
            assert.strictEqual(stdout, [
                'function foo(){return function(){console.log("PASS")}}foo()();',
                "//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRlc3QvaW5wdXQvaXNzdWUtMjMxMC9pbnB1dC5qcyJdLCJuYW1lcyI6WyJmb28iLCJjb25zb2xlIiwibG9nIiwiZiJdLCJtYXBwaW5ncyI6IkFBQUEsU0FBU0EsTUFDTCxPQUFPLFdBQ0hDLFFBQVFDLElBQUksU0FLUkYsS0FDUkcifQ==",
@@ -656,9 +591,8 @@ describe("bin/uglifyjs", function () {
    });
    it("Should dump AST as JSON", function(done) {
        var command = uglifyjscmd + " test/input/global_defs/simple.js -mco ast";
-        exec(command, function (err, stdout) {
+        exec(command, function(err, stdout) {
            if (err) throw err;
-
            var ast = JSON.parse(stdout);
            assert.strictEqual(ast._class, "AST_Toplevel");
            assert.ok(Array.isArray(ast.body));
@@ -667,7 +601,7 @@ describe("bin/uglifyjs", function () {
    });
    it("Should print supported options on invalid option syntax", function(done) {
        var command = uglifyjscmd + " test/input/comments/filter.js -b ascii-only";
-        exec(command, function (err, stdout, stderr) {
+        exec(command, function(err, stdout, stderr) {
            assert.ok(err);
            assert.strictEqual(stdout, "");
            assert.ok(/^Supported options:\n[\s\S]*?\nERROR: `ascii-only` is not a supported option/.test(stderr), stderr);
@@ -676,27 +610,23 @@ describe("bin/uglifyjs", function () {
    });
    it("Should work with --mangle reserved=[]", function(done) {
        var command = uglifyjscmd + " test/input/issue-505/input.js -m reserved=[callback]";
-
-        exec(command, function (err, stdout) {
+        exec(command, function(err, stdout) {
            if (err) throw err;
-
            assert.strictEqual(stdout, 'function test(callback){"aaaaaaaaaaaaaaaa";callback(err,data);callback(err,data)}\n');
            done();
        });
    });
    it("Should work with --mangle reserved=false", function(done) {
        var command = uglifyjscmd + " test/input/issue-505/input.js -m reserved=false";
-
-        exec(command, function (err, stdout) {
+        exec(command, function(err, stdout) {
            if (err) throw err;
-
            assert.strictEqual(stdout, 'function test(a){"aaaaaaaaaaaaaaaa";a(err,data);a(err,data)}\n');
            done();
        });
    });
    it("Should fail with --mangle-props reserved=[in]", function(done) {
        var command = uglifyjscmd + " test/input/issue-505/input.js --mangle-props reserved=[in]";
-        exec(command, function (err, stdout, stderr) {
+        exec(command, function(err, stdout, stderr) {
            assert.ok(err);
            assert.strictEqual(stdout, "");
            assert.ok(/^Supported options:\n[\s\S]*?\nERROR: `reserved=\[in]` is not a supported option/.test(stderr), stderr);
@@ -705,7 +635,7 @@ describe("bin/uglifyjs", function () {
    });
    it("Should fail with --define a-b", function(done) {
        var command = uglifyjscmd + " test/input/issue-505/input.js --define a-b";
-        exec(command, function (err, stdout, stderr) {
+        exec(command, function(err, stdout, stderr) {
            assert.ok(err);
            assert.strictEqual(stdout, "");
            assert.strictEqual(stderr, "Error parsing arguments for 'define': a-b\n");
@@ -744,4 +674,36 @@ describe("bin/uglifyjs", function () {
            done();
        });
    });
+    it("Should work with --enclose", function(done) {
+        var command = uglifyjscmd + " test/input/enclose/input.js --enclose";
+        exec(command, function(err, stdout, stderr) {
+            if (err) throw err;
+            assert.strictEqual(stdout, '(function(){function enclose(){console.log("test enclose")}enclose()})();\n');
+            done();
+        });
+    });
+    it("Should work with --enclose arg", function(done) {
+        var command = uglifyjscmd + " test/input/enclose/input.js --enclose undefined";
+        exec(command, function(err, stdout, stderr) {
+            if (err) throw err;
+            assert.strictEqual(stdout, '(function(undefined){function enclose(){console.log("test enclose")}enclose()})();\n');
+            done();
+        });
+    });
+    it("Should work with --enclose arg:value", function(done) {
+        var command = uglifyjscmd + " test/input/enclose/input.js --enclose window,undefined:window";
+        exec(command, function(err, stdout, stderr) {
+            if (err) throw err;
+            assert.strictEqual(stdout, '(function(window,undefined){function enclose(){console.log("test enclose")}enclose()})(window);\n');
+            done();
+        });
+    });
+    it("Should work with --enclose & --wrap", function(done) {
+        var command = uglifyjscmd + " test/input/enclose/input.js --enclose window,undefined:window --wrap exports";
+        exec(command, function(err, stdout, stderr) {
+            if (err) throw err;
+            assert.strictEqual(stdout, '(function(window,undefined){(function(exports){function enclose(){console.log("test enclose")}enclose()})(typeof exports=="undefined"?exports={}:exports)})(window);\n');
+            done();
+        });
+    });
 });
--- a/test/mocha/getter-setter.js
+++ b/test/mocha/getter-setter.js
@@ -61,29 +61,24 @@ describe("Getters and setters", function() {

            return results;
        };
-
        var testCase = function(data) {
            return function() {
                UglifyJS.parse(data.code);
            };
        };
-
        var fail = function(data) {
-            return function (e) {
-                return e instanceof UglifyJS.JS_Parse_Error &&
-                    e.message === "Unexpected token: operator (" + data.operator + ")";
+            return function(e) {
+                return e instanceof UglifyJS.JS_Parse_Error
+                    && e.message === "Unexpected token: operator (" + 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));
        }
    });
-
 });
--- a/test/mocha/ie8.js
+++ b/test/mocha/ie8.js
@@ -0,0 +1,21 @@
+var assert = require("assert");
+var uglify = require("../../");
+
+describe("ie8", function() {
+    it("Should be able to minify() with undefined as catch parameter in a try...catch statement", function() {
+        assert.strictEqual(
+            uglify.minify([
+                "function a(b){",
+                "    try {",
+                "        throw 'Stuff';",
+                "    } catch (undefined) {",
+                "        console.log('caught: ' + undefined);",
+                "    }",
+                "    console.log('undefined is ' + undefined);",
+                "    return b === undefined;",
+                "};",
+            ].join("\n")).code,
+            'function a(o){try{throw"Stuff"}catch(o){console.log("caught: "+o)}return console.log("undefined is "+void 0),void 0===o}'
+        );
+    });
+});
--- a/test/mocha/minify.js
+++ b/test/mocha/minify.js
@@ -303,4 +303,45 @@ describe("minify", function() {
            }
        });
    });
+
+    describe("enclose", function() {
+        var code = read("test/input/enclose/input.js");
+        it("Should work with true", function() {
+            var result = Uglify.minify(code, {
+                compress: false,
+                enclose: true,
+                mangle: false,
+            });
+            if (result.error) throw result.error;
+            assert.strictEqual(result.code, '(function(){function enclose(){console.log("test enclose")}enclose()})();');
+        });
+        it("Should work with arg", function() {
+            var result = Uglify.minify(code, {
+                compress: false,
+                enclose: 'undefined',
+                mangle: false,
+            });
+            if (result.error) throw result.error;
+            assert.strictEqual(result.code, '(function(undefined){function enclose(){console.log("test enclose")}enclose()})();');
+        });
+        it("Should work with arg:value", function() {
+            var result = Uglify.minify(code, {
+                compress: false,
+                enclose: 'window,undefined:window',
+                mangle: false,
+            });
+            if (result.error) throw result.error;
+            assert.strictEqual(result.code, '(function(window,undefined){function enclose(){console.log("test enclose")}enclose()})(window);');
+        });
+        it("Should work alongside wrap", function() {
+            var result = Uglify.minify(code, {
+                compress: false,
+                enclose: 'window,undefined:window',
+                mangle: false,
+                wrap: 'exports',
+            });
+            if (result.error) throw result.error;
+            assert.strictEqual(result.code, '(function(window,undefined){(function(exports){function enclose(){console.log("test enclose")}enclose()})(typeof exports=="undefined"?exports={}:exports)})(window);');
+        });
+    });
 });
--- a/test/mocha/number-literal.js
+++ b/test/mocha/number-literal.js
@@ -1,24 +1,23 @@
 var assert = require("assert");
 var uglify = require("../node");

-describe("Number literals", function () {
+describe("Number literals", function() {
    it("Should not allow legacy octal literals in strict mode", function() {
        var inputs = [
            '"use strict";00;',
            '"use strict"; var foo = 00;'
        ];
-
        var test = function(input) {
            return function() {
                uglify.parse(input);
            }
-        }
+        };
        var error = function(e) {
-            return e instanceof uglify.JS_Parse_Error &&
-                e.message === "Legacy octal literals are not allowed in strict mode";
-        }
+            return e instanceof uglify.JS_Parse_Error
+                && e.message === "Legacy octal literals are not allowed in strict mode";
+        };
        for (var i = 0; i < inputs.length; i++) {
            assert.throws(test(inputs[i]), error, inputs[i]);
        }
    });
-});
+});
--- a/test/mocha/screw-ie8.js
+++ b/test/mocha/screw-ie8.js
@@ -1,21 +0,0 @@
-var assert = require("assert");
-var uglify = require("../../");
-
-describe("screw-ie8", function () {
-    it("Should be able to minify() with undefined as catch parameter in a try...catch statement", function () {
-        assert.strictEqual(
-            uglify.minify(
-                "function a(b){\
-                    try {\
-                        throw 'Stuff';\
-                    } catch (undefined) {\
-                        console.log('caught: ' + undefined);\
-                    }\
-                    console.log('undefined is ' + undefined);\
-                    return b === undefined;\
-                };"
-            ).code,
-            'function a(o){try{throw"Stuff"}catch(o){console.log("caught: "+o)}return console.log("undefined is "+void 0),void 0===o}'
-        );
-    });
-});
--- a/test/mocha/sourcemaps.js
+++ b/test/mocha/sourcemaps.js
@@ -48,6 +48,18 @@ describe("sourcemaps", function() {
        assert.strictEqual(result.map, '{"version":3,"sources":["0"],"names":["wat"],"mappings":"CAAU,IACNA,IAAI"}');
    });

+    it("Should give correct sourceRoot", function() {
+        var code = "console.log(42);";
+        var result = Uglify.minify(code, {
+            sourceMap: {
+                root: "//foo.bar/",
+            },
+        });
+        if (result.error) throw result.error;
+        assert.strictEqual(result.code, code);
+        assert.strictEqual(result.map, '{"version":3,"sources":["0"],"names":["console","log"],"mappings":"AAAAA,QAAQC,IAAI","sourceRoot":"//foo.bar/"}');
+    });
+
    describe("inSourceMap", function() {
        it("Should read the given string filename correctly when sourceMapIncludeSources is enabled (#1236)", function() {
            var result = Uglify.minify(read("./test/input/issue-1236/simple.js"), {
--- a/test/run-tests.js
+++ b/test/run-tests.js
@@ -210,7 +210,7 @@ function run_compress_tests() {
            }
        }
    }
-    files.forEach(function(file){
+    files.forEach(function(file) {
        test_file(file);
    });
 }
@@ -228,7 +228,7 @@ function parse_test(file) {
        throw e;
    }
    var tests = {};
-    var tw = new U.TreeWalker(function(node, descend){
+    var tw = new U.TreeWalker(function(node, descend) {
        if (node instanceof U.AST_LabeledStatement
            && tw.parent() instanceof U.AST_Toplevel) {
            var name = node.label.name;
@@ -271,7 +271,7 @@ function parse_test(file) {

    function get_one_test(name, block) {
        var test = { name: name, options: {} };
-        var tw = new U.TreeWalker(function(node, descend){
+        var tw = new U.TreeWalker(function(node, descend) {
            if (node instanceof U.AST_Assign) {
                if (!(node.left instanceof U.AST_SymbolRef)) {
                    croak(node);
--- a/tools/node.js
+++ b/tools/node.js
@@ -14,7 +14,7 @@ var FILES = UglifyJS.FILES = [
    "../lib/propmangle.js",
    "../lib/minify.js",
    "./exports.js",
-].map(function(file){
+].map(function(file) {
    return require.resolve(file);
 });

@@ -33,13 +33,13 @@ function describe_ast() {
    var out = OutputStream({ beautify: true });
    function doitem(ctor) {
        out.print("AST_" + ctor.TYPE);
-        var props = ctor.SELF_PROPS.filter(function(prop){
+        var props = ctor.SELF_PROPS.filter(function(prop) {
            return !/^\$/.test(prop);
        });
        if (props.length > 0) {
            out.space();
-            out.with_parens(function(){
-                props.forEach(function(prop, i){
+            out.with_parens(function() {
+                props.forEach(function(prop, i) {
                    if (i) out.space();
                    out.print(prop);
                });
@@ -51,8 +51,8 @@ function describe_ast() {
        }
        if (ctor.SUBCLASSES.length > 0) {
            out.space();
-            out.with_block(function(){
-                ctor.SUBCLASSES.forEach(function(ctor, i){
+            out.with_block(function() {
+                ctor.SUBCLASSES.forEach(function(ctor, i) {
                    out.indent();
                    doitem(ctor);
                    out.newline();
Author	SHA1	Message	Date
Alex Lam S.L	915c7e234d	v3.4.1	2018-06-19 18:35:48 +00:00
Alex Lam S.L	e54ddcbb8a	fix corner cases in `properties` (#3189 ) fixes #3188	2018-06-19 18:20:11 +08:00
Alex Lam S.L	9e19e63551	general clean-ups (#3175 )	2018-06-06 17:50:56 +08:00
Alex Lam S.L	bce7ee5f6a	v3.4.0	2018-06-02 05:57:10 +00:00
Jiavan	b39043f3ab	re-introduce `enclose` (#3163 ) fixes #2443	2018-06-01 16:47:11 +08:00
Alex Lam S.L	caf96acb08	handle asynchronous test failures (#3164 )	2018-05-31 20:21:39 +08:00
Alex Lam S.L	c76749084b	update JetStream URL (#3165 )	2018-05-31 16:23:49 +08:00