From 079aaa0d4858cb1ddbd8af9e49e50c63d2ced870 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A1bio=20Santos?= <fabiosantosart@gmail.com>
Date: Fri, 14 Aug 2015 02:19:53 +0100
Subject: [PATCH] Tolerate expansions in vardefs, too!

---
 lib/ast.js     | 10 +++-------
 lib/parse.js   |  9 +++++++++
 test/parser.js | 14 ++++++++++----
 3 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/lib/ast.js b/lib/ast.js
index 2c73b6d3..7e7503ee 100644
--- a/lib/ast.js
+++ b/lib/ast.js
@@ -363,14 +363,10 @@ var AST_Toplevel = DEFNODE("Toplevel", "globals", {
     }
 }, AST_Scope);
 
-// TODO besides parameters and function calls, expansions can go in
-// arrays, array destructuring parameters, and array destructuring
-// assignment. But I'm not adding this right now because I'm trying
-// to do the most minimal and independent changesets.
-var AST_Expansion = DEFNODE("AST_Expansion", "symbol", {
-    $documentation: "An expandible argument, such as ...rest",
+var AST_Expansion = DEFNODE("Expansion", "symbol", {
+    $documentation: "An expandible argument, such as ...rest, a splat, such as [1,2,...all], or an expansion in a variable declaration, such as var [first, ...rest] = list",
     $propdoc: {
-        symbol: "AST_SymbolFunarg the name of the argument as a SymbolFunarg"
+        symbol: "AST_Symbol the thing to be expanded"
     },
     _walk: function(visitor) {
         var self = this;
diff --git a/lib/parse.js b/lib/parse.js
index 8ed7163a..fd870bbb 100644
--- a/lib/parse.js
+++ b/lib/parse.js
@@ -1221,6 +1221,15 @@ function parse($TEXT, options) {
                 children.push(new AST_Hole({ start: S.token, end: S.token }));
             } else if (is("punc", "[") || is("punc", "{")) {
                 children.push(destructuring_(sym_type));
+            } else if (is("expand", "...")) {
+                next();
+                var symbol = _make_symbol(sym_type);
+                children.push(new AST_Expansion({
+                    start: prev(),
+                    symbol: symbol,
+                    end: S.token
+                }));
+                next();
             } else if (is("name")) {
                 children.push(_make_symbol(sym_type));
                 next();
diff --git a/test/parser.js b/test/parser.js
index 125f76c2..66676b9d 100644
--- a/test/parser.js
+++ b/test/parser.js
@@ -105,13 +105,19 @@ module.exports = function () {
 
     var nested_def = UglifyJS.parse('var [{x}] = foo').body[0].definitions[0];
 
-    ok.equal(nested_def.name.names[0].names[0].TYPE, 'SymbolVar')
-    ok.equal(nested_def.name.names[0].names[0].name, 'x')
+    ok.equal(nested_def.name.names[0].names[0].TYPE, 'SymbolVar');
+    ok.equal(nested_def.name.names[0].names[0].name, 'x');
 
     var holey_def = UglifyJS.parse('const [,,third] = [1,2,3]').body[0].definitions[0];
 
-    ok.equal(holey_def.name.names[0].TYPE, 'Hole')
-    ok.equal(holey_def.name.names[2].TYPE, 'SymbolConst')
+    ok.equal(holey_def.name.names[0].TYPE, 'Hole');
+    ok.equal(holey_def.name.names[2].TYPE, 'SymbolConst');
+
+    var expanding_def = UglifyJS.parse('var [first, ...rest] = [1,2,3]').body[0].definitions[0];
+
+    ok.equal(expanding_def.name.names[0].TYPE, 'SymbolVar');
+    ok.equal(expanding_def.name.names[1].TYPE, 'Expansion');
+    ok.equal(expanding_def.name.names[1].symbol.TYPE, 'SymbolVar');
 
     ok.throws(function () {
         // Note: this *is* a valid destructuring, but before we implement