fix cascade on multi-branch evaluations (#2067)

Partially reverts #2059 as this has better coverage and performance.

fixes #2062
This commit is contained in:
Alex Lam S.L
2017-06-07 19:52:01 +08:00
committed by GitHub
parent f2af093402
commit 9db0695b10
2 changed files with 24 additions and 4 deletions

View File

@@ -3187,17 +3187,16 @@ merge(Compressor.prototype, {
if (exp.argnames.length > 0) { if (exp.argnames.length > 0) {
fn.body.push(make_node(AST_Var, self, { fn.body.push(make_node(AST_Var, self, {
definitions: exp.argnames.map(function(sym, i) { definitions: exp.argnames.map(function(sym, i) {
var arg = self.args[i];
return make_node(AST_VarDef, sym, { return make_node(AST_VarDef, sym, {
name: sym, name: sym,
value: arg ? arg.clone(true) : make_node(AST_Undefined, self) value: self.args[i] || make_node(AST_Undefined, self)
}); });
}) })
})); }));
} }
if (self.args.length > exp.argnames.length) { if (self.args.length > exp.argnames.length) {
fn.body.push(make_node(AST_SimpleStatement, self, { fn.body.push(make_node(AST_SimpleStatement, self, {
body: make_sequence(self, self.args.slice(exp.argnames.length)).clone(true) body: make_sequence(self, self.args.slice(exp.argnames.length))
})); }));
} }
fn.body.push(make_node(AST_Return, self, { fn.body.push(make_node(AST_Return, self, {
@@ -3316,6 +3315,7 @@ merge(Compressor.prototype, {
continue; continue;
} }
var parent = null, field; var parent = null, field;
expressions[j] = cdr = cdr.clone();
while (true) { while (true) {
if (cdr.equivalent_to(left)) { if (cdr.equivalent_to(left)) {
var car = expressions[i]; var car = expressions[i];
@@ -3352,7 +3352,7 @@ merge(Compressor.prototype, {
break; break;
} }
parent = cdr; parent = cdr;
cdr = cdr[field]; cdr = cdr[field] = cdr[field].clone();
} }
} }
end = i; end = i;

View File

@@ -710,3 +710,23 @@ issue_27: {
})(jQuery); })(jQuery);
} }
} }
issue_2062: {
options = {
booleans: true,
cascade: true,
conditionals: true,
side_effects: true,
}
input: {
var a = 1;
if ([ a || a++ + a--, a++ + a--, a && a.var ]);
console.log(a);
}
expect: {
var a = 1;
a || (a++, a--), a++, --a && a.var;
console.log(a);
}
expect_stdout: "1"
}