aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Lam S.L <alexlamsl@gmail.com>2017-06-07 19:52:01 +0800
committerGitHub <noreply@github.com>2017-06-07 19:52:01 +0800
commit9db0695b10799349c005fc14ab1268c2478c25fd (patch)
treeb55efd0fb46d3bb2d94ca924a14cd8943bf4ff4a
parentf2af0934021a83b781f207432d10380cc4c5f396 (diff)
downloadtracifyjs-9db0695b10799349c005fc14ab1268c2478c25fd.tar.gz
tracifyjs-9db0695b10799349c005fc14ab1268c2478c25fd.zip
fix `cascade` on multi-branch evaluations (#2067)
Partially reverts #2059 as this has better coverage and performance. fixes #2062
-rw-r--r--lib/compress.js8
-rw-r--r--test/compress/sequences.js20
2 files changed, 24 insertions, 4 deletions
diff --git a/lib/compress.js b/lib/compress.js
index e3846c31..81b9ccac 100644
--- a/lib/compress.js
+++ b/lib/compress.js
@@ -3187,17 +3187,16 @@ merge(Compressor.prototype, {
if (exp.argnames.length > 0) {
fn.body.push(make_node(AST_Var, self, {
definitions: exp.argnames.map(function(sym, i) {
- var arg = self.args[i];
return make_node(AST_VarDef, 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) {
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, {
@@ -3316,6 +3315,7 @@ merge(Compressor.prototype, {
continue;
}
var parent = null, field;
+ expressions[j] = cdr = cdr.clone();
while (true) {
if (cdr.equivalent_to(left)) {
var car = expressions[i];
@@ -3352,7 +3352,7 @@ merge(Compressor.prototype, {
break;
}
parent = cdr;
- cdr = cdr[field];
+ cdr = cdr[field] = cdr[field].clone();
}
}
end = i;
diff --git a/test/compress/sequences.js b/test/compress/sequences.js
index 10492565..f41b603f 100644
--- a/test/compress/sequences.js
+++ b/test/compress/sequences.js
@@ -710,3 +710,23 @@ issue_27: {
})(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"
+}