Patches from emscripten

Author: sbc100

lib/ast.js

@@ -165,6 +165,21 @@ var AST_SimpleStatement = DEFNODE("SimpleStatement", "body", {
     }
 }, AST_Statement);
 
+// XXX Emscripten localmod: Add a node type for a parenthesized expression so that we can retain
+// Closure annotations that need a form "/**annotation*/(expression)"
+var AST_ParenthesizedExpression = DEFNODE("ParenthesizedExpression", "body", {
+    $documentation: "An explicitly parenthesized expression, i.e. a = (1 + 2)",
+    $propdoc: {
+        body: "[AST_Node] an expression node (should not be instanceof AST_Statement)"
+    },
+    _walk: function(visitor) {
+        return visitor._visit(this, function() {
+            this.body._walk(visitor);
+        });
+    }
+}, AST_Statement);
+// XXX End of Emscripten localmod
+
 function walk_body(node, visitor) {
     const body = node.body;
     for (var i = 0, len = body.length; i < len; i++) {
@@ -1663,6 +1678,7 @@ export {
     AST_ObjectKeyVal,
     AST_ObjectProperty,
     AST_ObjectSetter,
+    AST_ParenthesizedExpression,
     AST_PrefixedTemplateString,
     AST_PropAccess,
     AST_RegExp,
@@ -1723,3 +1739,6 @@ export {
     _NOINLINE,
     _PURE,
 };
+
+// XXX Emscripten: export TreeWalker for walking through AST in acorn-optimizer.js.
+exports.TreeWalker = TreeWalker;

lib/mozilla-ast.js

@@ -105,6 +105,7 @@ import {
     AST_ObjectKeyVal,
     AST_ObjectProperty,
     AST_ObjectSetter,
+    AST_ParenthesizedExpression,
     AST_PrefixedTemplateString,
     AST_PropAccess,
     AST_RegExp,
@@ -295,6 +296,16 @@ import {
                 body: from_moz(M.expression)
             });
         },
+// XXX Emscripten localmod: Add a node type for a parenthesized expression so that we can retain
+// Closure annotations that need a form "/**annotation*/(expression)"
+        ParenthesizedExpression: function(M) {
+            return new AST_ParenthesizedExpression({
+                start: my_start_token(M),
+                end: my_end_token(M),
+                body: from_moz(M.expression)
+            });
+        },
+// XXX End Emscripten localmod
         TryStatement: function(M) {
             var handlers = M.handlers || [M.handler];
             if (handlers.length > 1 || M.guardedHandlers && M.guardedHandlers.length) {
@@ -402,7 +413,14 @@ import {
                         return from_moz(prop);
                     }
                     prop.type = "Property";
-                    return from_moz(prop);
+                    // XXX EMSCRIPTEN preserve quoted properties
+                    // https://github.com/mishoo/UglifyJS2/pull/3323
+                    var ret = from_moz(prop);
+                    if (prop.key.type === "Literal" &&
+                        (prop.key.raw[0] === '"' || prop.key.raw[0] === "'")) {
+                        ret.quote = true;
+                    }
+                    return ret;
                 })
             });
         },
@@ -575,6 +593,19 @@ import {
                 end   : my_end_token(M),
                 value : M.value
             });
+        },
+        ImportExpression: function(M) {
+          let import_token = my_start_token(M);
+          return new AST_Call({
+            start      : import_token,
+            end        : my_end_token(M),
+            expression : new AST_SymbolRef({
+              start    : import_token,
+              end      : import_token,
+              name     : "import"
+            }),
+            args       : [from_moz(M.source)]
+          });
         }
     };
 

lib/output.js

@@ -109,6 +109,7 @@ import {
     AST_ObjectKeyVal,
     AST_ObjectProperty,
     AST_ObjectSetter,
+    AST_ParenthesizedExpression,
     AST_PrefixedTemplateString,
     AST_PropAccess,
     AST_RegExp,
@@ -1168,6 +1169,14 @@ function OutputStream(options) {
         self.body.print(output);
         output.semicolon();
     });
+// XXX Emscripten localmod: Add a node type for a parenthesized expression so that we can retain
+// Closure annotations that need a form "/**annotation*/(expression)"
+    DEFPRINT(AST_ParenthesizedExpression, function(self, output) {
+        output.print('(');
+        self.body.print(output);
+        output.print(')');
+    });
+// XXX End Emscripten localmod
     function print_braced_empty(self, output) {
         output.print("{");
         output.with_indent(output.next_indent(), function() {