terser 3.7.6 → 3.8.1

package/lib/output.js

@@ -66,7 +66,6 @@ function OutputStream(options) {
         keep_quoted_props: false,
         max_line_len     : false,
         preamble         : null,
-        preserve_line    : false,
         quote_keys       : false,
         quote_style      : 0,
         safari10         : false,
@@ -149,7 +148,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 "'";
@@ -175,7 +174,7 @@ function OutputStream(options) {
             return '"' + str.replace(/\x22/g, '\\"') + '"';
         }
         function quote_template() {
-            return '`' + str.replace(/`/g, '\\`') + '`';
+            return "`" + str.replace(/`/g, "\\`") + "`";
         }
         str = to_utf8(str);
         if (quote === "`") return quote_template();
@@ -189,7 +188,7 @@ function OutputStream(options) {
           default:
             return dq > sq ? quote_single() : quote_double();
         }
-    };
+    }
 
     function encode_string(str, quote) {
         var ret = make_string(str, quote);
@@ -199,20 +198,21 @@ function OutputStream(options) {
             ret = ret.replace(/--\x3e/g, "--\\x3e");
         }
         return ret;
-    };
+    }
 
     function make_name(name) {
         name = name.toString();
         name = to_utf8(name, true);
         return name;
-    };
+    }
 
     function make_indent(back) {
         return repeat_string(" ", options.indent_start + indentation - back * options.indent_level);
-    };
+    }
 
     /* -----[ beautification/minification ]----- */
 
+    var has_parens = false;
     var might_need_space = false;
     var might_need_semicolon = false;
     var might_add_newline = 0;
@@ -232,14 +232,14 @@ function OutputStream(options) {
                     !mapping.name && mapping.token.type == "name" ? mapping.token.value : mapping.name
                 );
             } catch(ex) {
-                AST_Node.warn("Couldn't figure out mapping for {file}:{line},{col} → {cline},{ccol} [{name}]", {
+                mapping.token.file != null && AST_Node.warn("Couldn't figure out mapping for {file}:{line},{col} → {cline},{ccol} [{name}]", {
                     file: mapping.token.file,
                     line: mapping.token.line,
                     col: mapping.token.col,
                     cline: mapping.line,
                     ccol: mapping.col,
                     name: mapping.name || ""
-                })
+                });
             }
         });
         mappings = [];
@@ -320,18 +320,6 @@ function OutputStream(options) {
             }
         }
 
-        if (!options.beautify && options.preserve_line && stack[stack.length - 1]) {
-            var target_line = stack[stack.length - 1].start.line;
-            while (current_line < target_line) {
-                ensure_line_len();
-                OUTPUT += "\n";
-                current_pos++;
-                current_line++;
-                current_col = 0;
-                might_need_space = false;
-            }
-        }
-
         if (might_need_space) {
             if ((is_identifier_char(prev)
                     && (is_identifier_char(ch) || ch == "\\"))
@@ -357,6 +345,7 @@ function OutputStream(options) {
         }
 
         OUTPUT += str;
+        has_parens = str[str.length - 1] == "(";
         current_pos += str.length;
         var a = str.split(/\r?\n/), n = a.length - 1;
         current_line += n;
@@ -366,11 +355,11 @@ function OutputStream(options) {
             current_col = a[n].length;
         }
         last = str;
-    };
+    }
 
-    var star = function(){
+    var star = function() {
         print("*");
-    }
+    };
 
     var space = options.beautify ? function() {
         print(" ");
@@ -391,7 +380,7 @@ function OutputStream(options) {
         var ret = cont();
         indentation = save_indentation;
         return ret;
-    } : function(col, cont) { return cont() };
+    } : function(col, cont) { return cont(); };
 
     var newline = options.beautify ? function() {
         if (newline_insert < 0) return print("\n");
@@ -415,23 +404,23 @@ function OutputStream(options) {
     function force_semicolon() {
         might_need_semicolon = false;
         print(";");
-    };
+    }
 
     function next_indent() {
         return indentation + options.indent_level;
-    };
+    }
 
     function with_block(cont) {
         var ret;
         print("{");
         newline();
-        with_indent(next_indent(), function(){
+        with_indent(next_indent(), function() {
             ret = cont();
         });
         indent();
         print("}");
         return ret;
-    };
+    }
 
     function with_parens(cont) {
         print("(");
@@ -440,7 +429,7 @@ function OutputStream(options) {
         var ret = cont();
         print(")");
         return ret;
-    };
+    }
 
     function with_square(cont) {
         print("[");
@@ -448,17 +437,17 @@ function OutputStream(options) {
         var ret = cont();
         print("]");
         return ret;
-    };
+    }
 
     function comma() {
         print(",");
         space();
-    };
+    }
 
     function colon() {
         print(":");
         space();
-    };
+    }
 
     var add_mapping = mappings ? function(token, name) {
         mapping_token = token;
@@ -470,7 +459,7 @@ function OutputStream(options) {
             ensure_line_len();
         }
         return OUTPUT;
-    };
+    }
 
     function has_nlb() {
         var index = OUTPUT.lastIndexOf("\n");
@@ -538,11 +527,11 @@ function OutputStream(options) {
                 }
             }
             if (/comment[134]/.test(c.type)) {
-                print("//" + c.value.replace(/[@#]__PURE__/g, ' ') + "\n");
+                print("//" + c.value.replace(/[@#]__PURE__/g, " ") + "\n");
                 indent();
                 last_nlb = true;
             } else if (c.type == "comment2") {
-                print("/*" + c.value.replace(/[@#]__PURE__/g, ' ') + "*/");
+                print("/*" + c.value.replace(/[@#]__PURE__/g, " ") + "*/");
                 last_nlb = false;
             }
         });
@@ -580,10 +569,10 @@ function OutputStream(options) {
                 space();
             }
             if (/comment[134]/.test(c.type)) {
-                print("//" + c.value.replace(/[@#]__PURE__/g, ' '));
+                print("//" + c.value.replace(/[@#]__PURE__/g, " "));
                 need_newline_indented = true;
             } else if (c.type == "comment2") {
-                print("/*" + c.value.replace(/[@#]__PURE__/g, ' ') + "*/");
+                print("/*" + c.value.replace(/[@#]__PURE__/g, " ") + "*/");
                 need_space = true;
             }
         });
@@ -595,20 +584,21 @@ function OutputStream(options) {
         get             : get,
         toString        : get,
         indent          : indent,
-        indentation     : function() { return indentation },
-        current_width   : function() { return current_col - indentation },
-        should_break    : function() { return options.width && this.current_width() >= options.width },
+        indentation     : function() { return indentation; },
+        current_width   : function() { return current_col - indentation; },
+        should_break    : function() { return options.width && this.current_width() >= options.width; },
+        has_parens      : function() { return has_parens; },
         newline         : newline,
         print           : print,
         star            : star,
         space           : space,
         comma           : comma,
         colon           : colon,
-        last            : function() { return last },
+        last            : function() { return last; },
         semicolon       : semicolon,
         force_semicolon : force_semicolon,
         to_utf8         : to_utf8,
-        print_name      : function(name) { print(make_name(name)) },
+        print_name      : function(name) { print(make_name(name)); },
         print_string    : function(str, quote, escape_directive) {
             var encoded = encode_string(str, quote);
             if (escape_directive === true && encoded.indexOf("\\") === -1) {
@@ -621,7 +611,7 @@ function OutputStream(options) {
             print(encoded);
         },
         print_template_string_chars: function(str) {
-            var encoded = encode_string(str, '`').replace(/\${/g, "\\${");
+            var encoded = encode_string(str, "`").replace(/\${/g, "\\${");
             return print(encoded.substr(1, encoded.length - 2));
         },
         encode_string   : encode_string,
@@ -631,36 +621,36 @@ function OutputStream(options) {
         with_parens     : with_parens,
         with_square     : with_square,
         add_mapping     : add_mapping,
-        option          : function(opt) { return options[opt] },
+        option          : function(opt) { return options[opt]; },
         prepend_comments: readonly ? noop : prepend_comments,
         append_comments : readonly || comment_filter === return_false ? noop : append_comments,
-        line            : function() { return current_line },
-        col             : function() { return current_col },
-        pos             : function() { return current_pos },
-        push_node       : function(node) { stack.push(node) },
-        pop_node        : function() { return stack.pop() },
+        line            : function() { return current_line; },
+        col             : function() { return current_col; },
+        pos             : function() { return current_pos; },
+        push_node       : function(node) { stack.push(node); },
+        pop_node        : function() { return stack.pop(); },
         parent          : function(n) {
             return stack[stack.length - 2 - (n || 0)];
         }
     };
 
-};
+}
 
 /* -----[ code generators ]----- */
 
-(function(){
+(function() {
 
     /* -----[ utils ]----- */
 
     function DEFPRINT(nodetype, generator) {
         nodetype.DEFMETHOD("_codegen", generator);
-    };
+    }
 
     var in_directive = false;
     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;
@@ -687,7 +677,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();
@@ -697,31 +687,31 @@ function OutputStream(options) {
 
     function PARENS(nodetype, func) {
         if (Array.isArray(nodetype)) {
-            nodetype.forEach(function(nodetype){
+            nodetype.forEach(function(nodetype) {
                 PARENS(nodetype, func);
             });
         } else {
             nodetype.DEFMETHOD("needs_parens", func);
         }
-    };
+    }
 
     PARENS(AST_Node, return_false);
 
     // a function expression needs parens around it when it's provably
     // the first token to appear in a statement.
-    PARENS(AST_Function, function(output){
-        if (first_in_statement(output)) {
+    PARENS(AST_Function, function(output) {
+        if (!output.has_parens() && first_in_statement(output)) {
             return true;
         }
 
-        if (output.option('webkit')) {
+        if (output.option("webkit")) {
             var p = output.parent();
             if (p instanceof AST_PropAccess && p.expression === this) {
                 return true;
             }
         }
 
-        if (output.option('wrap_iife')) {
+        if (output.option("wrap_iife")) {
             var p = output.parent();
             return p instanceof AST_Call && p.expression === this;
         }
@@ -729,16 +719,20 @@ function OutputStream(options) {
         return false;
     });
 
-    PARENS(AST_Arrow, function(output){
+    PARENS(AST_Arrow, function(output) {
         var p = output.parent();
         return p instanceof AST_PropAccess && p.expression === this;
     });
 
     // same goes for an object literal, because otherwise it would be
     // interpreted as a block of code.
-    PARENS([ AST_ClassExpression, AST_Object ], first_in_statement);
+    PARENS(AST_Object, function(output) {
+        return !output.has_parens() && first_in_statement(output);
+    });
+
+    PARENS(AST_ClassExpression, first_in_statement);
 
-    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
@@ -750,14 +744,14 @@ function OutputStream(options) {
                 && this.operator !== "--";
     });
 
-    PARENS(AST_Await, function(output){
+    PARENS(AST_Await, function(output) {
         var p = output.parent();
         return p instanceof AST_PropAccess && p.expression === this
             || p instanceof AST_Call && p.expression === this
             || output.option("safari10") && p instanceof AST_UnaryPrefix;
     });
 
-    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)
@@ -777,7 +771,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)
@@ -800,7 +794,7 @@ function OutputStream(options) {
         }
     });
 
-    PARENS(AST_Yield, function(output){
+    PARENS(AST_Yield, function(output) {
         var p = output.parent();
         // (yield 1) + (yield 2)
         // a = yield 3
@@ -822,7 +816,7 @@ function OutputStream(options) {
             return true;
     });
 
-    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)
@@ -843,7 +837,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
             || p instanceof AST_Export && p.is_default && this.expression instanceof AST_Function)
@@ -858,7 +852,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"]()
@@ -866,7 +860,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();
@@ -876,7 +870,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)
@@ -900,13 +894,13 @@ 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_Expansion, function (self, output) {
-        output.print('...');
+        output.print("...");
         self.expression.print(output);
     });
 
@@ -924,7 +918,7 @@ function OutputStream(options) {
         output.print(self.is_array ? "]" : "}");
     });
 
-    DEFPRINT(AST_Debugger, function(self, output){
+    DEFPRINT(AST_Debugger, function(self, output) {
         output.print("debugger");
         output.semicolon();
     });
@@ -934,7 +928,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)
@@ -957,26 +951,26 @@ 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();
     });
@@ -993,38 +987,38 @@ function OutputStream(options) {
                 display_body(self.body, false, output, allow_directives);
             });
         } 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);
@@ -1050,10 +1044,14 @@ 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");
+        if (self.await) {
+            output.space();
+            output.print("await");
+        }
         output.space();
-        output.with_parens(function(){
+        output.with_parens(function() {
             self.init.print(output);
             output.space();
             output.print(self instanceof AST_ForOf ? "of" : "in");
@@ -1063,10 +1061,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();
@@ -1074,7 +1072,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) {
             if (self.async) {
@@ -1096,8 +1094,8 @@ function OutputStream(options) {
                 self.name.print(output); // Computed method name
             });
         }
-        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);
             });
@@ -1105,7 +1103,7 @@ 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);
     });
 
@@ -1131,13 +1129,13 @@ function OutputStream(options) {
         output.print("`");
     });
 
-    AST_Arrow.DEFMETHOD("_do_print", function(output){
+    AST_Arrow.DEFMETHOD("_do_print", function(output) {
         var self = this;
         var parent = output.parent();
         var needs_parens = parent instanceof AST_Binary ||
             parent instanceof AST_Unary ||
             (parent instanceof AST_Call && self === parent.expression);
-        if (needs_parens) { output.print("(") }
+        if (needs_parens) { output.print("("); }
         if (self.async) {
             output.print("async");
             output.space();
@@ -1145,26 +1143,26 @@ function OutputStream(options) {
         if (self.argnames.length === 1 && self.argnames[0] instanceof AST_Symbol) {
             self.argnames[0].print(output);
         } else {
-            output.with_parens(function(){
-                self.argnames.forEach(function(arg, i){
+            output.with_parens(function() {
+                self.argnames.forEach(function(arg, i) {
                     if (i) output.comma();
                     arg.print(output);
                 });
             });
         }
         output.space();
-        output.print('=>');
+        output.print("=>");
         output.space();
         if (self.body instanceof AST_Node) {
             self.body.print(output);
         } else {
             print_braced(self, output);
         }
-        if (needs_parens) { output.print(")") }
+        if (needs_parens) { output.print(")"); }
     });
 
     /* -----[ exits ]----- */
-    AST_Exit.DEFMETHOD("_do_print", function(output, kind){
+    AST_Exit.DEFMETHOD("_do_print", function(output, kind) {
         output.print(kind);
         if (this.value) {
             output.space();
@@ -1172,16 +1170,16 @@ function OutputStream(options) {
         }
         output.semicolon();
     });
-    DEFPRINT(AST_Return, function(self, output){
+    DEFPRINT(AST_Return, function(self, output) {
         self._do_print(output, "return");
     });
-    DEFPRINT(AST_Throw, function(self, output){
+    DEFPRINT(AST_Throw, function(self, output) {
         self._do_print(output, "throw");
     });
 
     /* -----[ yield ]----- */
 
-    DEFPRINT(AST_Yield, function(self, output){
+    DEFPRINT(AST_Yield, function(self, output) {
         var star = self.is_star ? "*" : "";
         output.print("yield" + star);
         if (self.expression) {
@@ -1190,7 +1188,7 @@ function OutputStream(options) {
         }
     });
 
-    DEFPRINT(AST_Await, function(self, output){
+    DEFPRINT(AST_Await, function(self, output) {
         output.print("await");
         output.space();
         var e = self.expression;
@@ -1207,7 +1205,7 @@ function OutputStream(options) {
     });
 
     /* -----[ loop control ]----- */
-    AST_LoopControl.DEFMETHOD("_do_print", function(output, kind){
+    AST_LoopControl.DEFMETHOD("_do_print", function(output, kind) {
         output.print(kind);
         if (this.label) {
             output.space();
@@ -1215,10 +1213,10 @@ function OutputStream(options) {
         }
         output.semicolon();
     });
-    DEFPRINT(AST_Break, function(self, output){
+    DEFPRINT(AST_Break, function(self, output) {
         self._do_print(output, "break");
     });
-    DEFPRINT(AST_Continue, function(self, output){
+    DEFPRINT(AST_Continue, function(self, output) {
         self._do_print(output, "continue");
     });
 
@@ -1250,11 +1248,11 @@ function OutputStream(options) {
             else break;
         }
         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();
@@ -1273,17 +1271,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)
@@ -1291,19 +1289,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);
@@ -1312,7 +1310,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);
@@ -1325,26 +1323,26 @@ 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){
+    AST_Definitions.DEFMETHOD("_do_print", function(output, kind) {
         output.print(kind);
         output.space();
-        this.definitions.forEach(function(def, i){
+        this.definitions.forEach(function(def, i) {
             if (i) output.comma();
             def.print(output);
         });
@@ -1354,13 +1352,13 @@ function OutputStream(options) {
         if (!avoid_semicolon)
             output.semicolon();
     });
-    DEFPRINT(AST_Let, function(self, output){
+    DEFPRINT(AST_Let, function(self, output) {
         self._do_print(output, "let");
     });
-    DEFPRINT(AST_Var, function(self, output){
+    DEFPRINT(AST_Var, function(self, output) {
         self._do_print(output, "var");
     });
-    DEFPRINT(AST_Const, function(self, output){
+    DEFPRINT(AST_Const, function(self, output) {
         self._do_print(output, "const");
     });
     DEFPRINT(AST_Import, function(self, output) {
@@ -1391,7 +1389,7 @@ function OutputStream(options) {
         }
         if (self.imported_name || self.imported_names) {
             output.space();
-            output.print("from")
+            output.print("from");
             output.space();
         }
         self.module_name.print(output);
@@ -1481,9 +1479,9 @@ 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();
@@ -1496,27 +1494,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){
+    AST_Sequence.DEFMETHOD("_do_print", function(output) {
         this.expressions.forEach(function(node, index) {
             if (index > 0) {
                 output.comma();
@@ -1528,7 +1526,7 @@ function OutputStream(options) {
             node.print(output);
         });
     });
-    DEFPRINT(AST_Sequence, function(self, output){
+    DEFPRINT(AST_Sequence, function(self, output) {
         self._do_print(output);
         // var p = output.parent();
         // if (p instanceof AST_Statement) {
@@ -1539,7 +1537,7 @@ function OutputStream(options) {
         //     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;
@@ -1560,13 +1558,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)
@@ -1577,11 +1575,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] == ">" /* ">>" ">>>" ">" ">=" */
@@ -1607,7 +1605,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("?");
@@ -1619,11 +1617,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
@@ -1635,9 +1633,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();
@@ -1649,7 +1647,7 @@ function OutputStream(options) {
         });
         else print_braced_empty(self, output);
     });
-    DEFPRINT(AST_Class, function(self, output){
+    DEFPRINT(AST_Class, function(self, output) {
         output.print("class");
         output.space();
         if (self.name) {
@@ -1676,8 +1674,8 @@ function OutputStream(options) {
                 output.space();
             }
         }
-        if (self.properties.length > 0) output.with_block(function(){
-            self.properties.forEach(function(prop, i){
+        if (self.properties.length > 0) output.with_block(function() {
+            self.properties.forEach(function(prop, i) {
                 if (i) {
                     output.newline();
                 }
@@ -1708,7 +1706,7 @@ function OutputStream(options) {
         }
     }
 
-    DEFPRINT(AST_ObjectKeyVal, function(self, output){
+    DEFPRINT(AST_ObjectKeyVal, function(self, output) {
         function get_name(self) {
             var def = self.definition();
             return def ? def.mangled_name || def.name : self.name;
@@ -1765,16 +1763,16 @@ function OutputStream(options) {
         }
         self.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_ConciseMethod, function(self, output){
+    DEFPRINT(AST_ConciseMethod, function(self, output) {
         self._print_getter_setter(self.is_generator && "*" || self.async && "async", output);
     });
-    AST_Symbol.DEFMETHOD("_do_print", function(output){
+    AST_Symbol.DEFMETHOD("_do_print", function(output) {
         var def = this.definition();
         output.print_name(def ? def.mangled_name || def.name : this.name);
     });
@@ -1782,19 +1780,19 @@ function OutputStream(options) {
         self._do_print(output);
     });
     DEFPRINT(AST_Hole, noop);
-    DEFPRINT(AST_This, function(self, output){
+    DEFPRINT(AST_This, function(self, output) {
         output.print("this");
     });
-    DEFPRINT(AST_Super, function(self, output){
+    DEFPRINT(AST_Super, function(self, output) {
         output.print("super");
     });
-    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 {
@@ -1802,7 +1800,7 @@ function OutputStream(options) {
         }
     });
 
-    DEFPRINT(AST_RegExp, function(self, output){
+    DEFPRINT(AST_RegExp, function(self, output) {
         var regexp = self.getValue();
         var str = regexp.toString();
         str = output.to_utf8(str);
@@ -1821,7 +1819,7 @@ function OutputStream(options) {
             else
                 stat.print(output);
         }
-    };
+    }
 
     // self should be AST_New.  decide if we want to show parens or not.
     function need_constructor_parens(self, output) {
@@ -1829,7 +1827,7 @@ function OutputStream(options) {
         if (self.args.length > 0) return true;
 
         return output.option("beautify");
-    };
+    }
 
     function best_of(a) {
         var best = a[0], len = best.length;
@@ -1840,10 +1838,10 @@ function OutputStream(options) {
             }
         }
         return best;
-    };
+    }
 
     function make_num(num) {
-        var str = num.toString(10), a = [ str.replace(/^0\./, ".").replace('e+', 'e') ], m;
+        var str = num.toString(10), a = [ str.replace(/^0\./, ".").replace("e+", "e") ], m;
         if (Math.floor(num) === num) {
             if (num >= 0) {
                 a.push("0x" + num.toString(16).toLowerCase(), // probably pointless
@@ -1860,64 +1858,70 @@ function OutputStream(options) {
                    str.substr(str.indexOf(".")));
         }
         return best_of(a);
-    };
+    }
 
     function make_block(stmt, output) {
         if (!stmt || stmt instanceof AST_EmptyStatement)
             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();
         });
-    };
+    }
 
     /* -----[ source map generators ]----- */
 
     function DEFMAP(nodetype, generator) {
-        nodetype.DEFMETHOD("add_source_map", function(stream){
-            generator(this, stream);
+        nodetype.forEach(function(nodetype) {
+            nodetype.DEFMETHOD("add_source_map", generator);
         });
-    };
-
-    // We could easily add info for ALL nodes, but it seems to me that
-    // would be quite wasteful, hence this noop in the base class.
-    DEFMAP(AST_Node, noop);
+    }
 
-    function basic_sourcemap_gen(self, output) {
-        output.add_mapping(self.start);
-    };
+    DEFMAP([
+        // We could easily add info for ALL nodes, but it seems to me that
+        // would be quite wasteful, hence this noop in the base class.
+        AST_Node,
+        // since the label symbol will mark it
+        AST_LabeledStatement,
+        AST_Toplevel,
+    ], noop);
 
     // XXX: I'm not exactly sure if we need it for all of these nodes,
     // or if we should add even more.
-
-    DEFMAP(AST_Directive, basic_sourcemap_gen);
-    DEFMAP(AST_Debugger, basic_sourcemap_gen);
-    DEFMAP(AST_Symbol, basic_sourcemap_gen);
-    DEFMAP(AST_Jump, basic_sourcemap_gen);
-    DEFMAP(AST_StatementWithBody, basic_sourcemap_gen);
-    DEFMAP(AST_LabeledStatement, noop); // since the label symbol will mark it
-    DEFMAP(AST_Lambda, basic_sourcemap_gen);
-    DEFMAP(AST_Switch, basic_sourcemap_gen);
-    DEFMAP(AST_SwitchBranch, basic_sourcemap_gen);
-    DEFMAP(AST_BlockStatement, basic_sourcemap_gen);
-    DEFMAP(AST_Toplevel, noop);
-    DEFMAP(AST_New, basic_sourcemap_gen);
-    DEFMAP(AST_Try, basic_sourcemap_gen);
-    DEFMAP(AST_Catch, basic_sourcemap_gen);
-    DEFMAP(AST_Finally, basic_sourcemap_gen);
-    DEFMAP(AST_Definitions, basic_sourcemap_gen);
-    DEFMAP(AST_Constant, basic_sourcemap_gen);
-    DEFMAP(AST_ObjectSetter, function(self, output){
-        output.add_mapping(self.start, self.key.name);
-    });
-    DEFMAP(AST_ObjectGetter, function(self, output){
-        output.add_mapping(self.start, self.key.name);
-    });
-    DEFMAP(AST_ObjectProperty, function(self, output){
-        output.add_mapping(self.start, self.key);
+    DEFMAP([
+        AST_Array,
+        AST_BlockStatement,
+        AST_Catch,
+        AST_Class,
+        AST_Constant,
+        AST_Debugger,
+        AST_Definitions,
+        AST_Directive,
+        AST_Finally,
+        AST_Jump,
+        AST_Lambda,
+        AST_New,
+        AST_Object,
+        AST_StatementWithBody,
+        AST_Symbol,
+        AST_Switch,
+        AST_SwitchBranch,
+        AST_Try,
+    ], function(output) {
+        output.add_mapping(this.start);
+    });
+
+    DEFMAP([
+        AST_ObjectGetter,
+        AST_ObjectSetter,
+    ], function(output) {
+        output.add_mapping(this.start, this.key.name);
+    });
+
+    DEFMAP([ AST_ObjectProperty ], function(output) {
+        output.add_mapping(this.start, this.key);
     });
-
 })();