JoBoEVD/UglifyJS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tolerate expansions in vardefs, too!

Browse Source
This commit is contained in:
Fábio Santos
2015-08-14 02:19:53 +01:00
committed by Richard van Velzen
parent d4f17f29ae
commit 079aaa0d48
3 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/ast.js
View File

@@ -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;

9
lib/parse.js
View File

@@ -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();