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

Add holes in destructuring defs, also make them nestable

Browse Source
This commit is contained in:
Fábio Santos
2015-08-14 01:16:54 +01:00
committed by Richard van Velzen
parent c44c2d6c21
commit 025d34bfa2
3 changed files with 42 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
lib/parse.js
View File

@@ -753,7 +753,7 @@ function parse($TEXT, options) {
function embed_tokens(parser) {
return function() {
var start = S.token;
var expr = parser();
var expr = parser.apply(null, arguments);
var end = prev();
expr.start = start;
expr.end = end;
@@ -1182,17 +1182,18 @@ function parse($TEXT, options) {
var a = [];
var def;
for (;;) {
var sym_type = in_const ? AST_SymbolConst : AST_SymbolVar;
if (is("punc", "{") || is("punc", "[")) {
def = new AST_VarDef({
start: S.token,
name: destructuring_(),
name: destructuring_(sym_type),
value: (expect_token("operator", "="), expression(false, no_in)),
end: prev()
});
} else {
def = new AST_VarDef({
start : S.token,
name : as_symbol(in_const ? AST_SymbolConst : AST_SymbolVar),
name : as_symbol(sym_type),
value : is("operator", "=") ? (next(), expression(false, no_in)) : null,
end : prev()
})
@@ -1205,12 +1206,31 @@ function parse($TEXT, options) {
return a;
};
var destructuring_ = embed_tokens(function () {
var destructuring_ = embed_tokens(function (sym_type) {
var is_array = is("punc", "[");
var closing = is_array ? ']' : '}';
var sym_type = sym_type || AST_SymbolRef;
next();
var first = true, children = [];
while (!is("punc", closing)) {
if (first) first = false; else expect(",");
if (is("punc", closing)) break;
if (is("punc", ",")) {
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("name")) {
children.push(_make_symbol(sym_type));
next();
} else {
children.push(expression());
}
}
next()
return new AST_Destructuring({
names: expr_list(closing),
names: children,
is_array: is_array
})
});