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

Merge pull request #949 from kzc/collapse_vars_conditions

Browse Source 
collapse_vars: fix if/else and ternary operator side effects
This commit is contained in:
Mihai Bazon
2016-01-29 18:05:39 +02:00
parent af2472d85e 7c3fee9e31
commit 601780acc1
2 changed files with 53 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/compress.js
View File

@@ -320,7 +320,10 @@ merge(Compressor.prototype, {
if (node instanceof AST_Lambda if (node instanceof AST_Lambda
|| node instanceof AST_Try || node instanceof AST_Try
|| node instanceof AST_With || node instanceof AST_With
|| node instanceof AST_Case
|| node instanceof AST_IterationStatement || node instanceof AST_IterationStatement
|| (parent instanceof AST_If && node !== parent.condition)
|| (parent instanceof AST_Conditional && node !== parent.condition)
|| (parent instanceof AST_Binary || (parent instanceof AST_Binary
&& (parent.operator == "&&" || parent.operator == "||") && (parent.operator == "&&" || parent.operator == "||")
&& node === parent.right) && node === parent.right)

50
test/compress/collapse_vars.js
View File

@@ -1103,3 +1103,53 @@ collapse_vars_short_circuit: {
} }
} }
collapse_vars_short_circuited_conditions: {
options = {
collapse_vars: true,
sequences: false,
dead_code: true,
conditionals: false,
comparisons: false,
evaluate: true,
booleans: true,
loops: true,
unused: true,
hoist_funs: true,
keep_fargs: true,
if_return: false,
join_vars: true,
cascade: true,
side_effects: true,
}
input: {
function c1(x) { var a = foo(), b = bar(), c = baz(); return a ? b : c; }
function c2(x) { var a = foo(), b = bar(), c = baz(); return a ? c : b; }
function c3(x) { var a = foo(), b = bar(), c = baz(); return b ? a : c; }
function c4(x) { var a = foo(), b = bar(), c = baz(); return b ? c : a; }
function c5(x) { var a = foo(), b = bar(), c = baz(); return c ? a : b; }
function c6(x) { var a = foo(), b = bar(), c = baz(); return c ? b : a; }
function i1(x) { var a = foo(), b = bar(), c = baz(); if (a) return b; else return c; }
function i2(x) { var a = foo(), b = bar(), c = baz(); if (a) return c; else return b; }
function i3(x) { var a = foo(), b = bar(), c = baz(); if (b) return a; else return c; }
function i4(x) { var a = foo(), b = bar(), c = baz(); if (b) return c; else return a; }
function i5(x) { var a = foo(), b = bar(), c = baz(); if (c) return a; else return b; }
function i6(x) { var a = foo(), b = bar(), c = baz(); if (c) return b; else return a; }
}
expect: {
function c1(x) { var a = foo(), b = bar(), c = baz(); return a ? b : c; }
function c2(x) { var a = foo(), b = bar(), c = baz(); return a ? c : b; }
function c3(x) { var a = foo(), b = bar(), c = baz(); return b ? a : c; }
function c4(x) { var a = foo(), b = bar(), c = baz(); return b ? c : a; }
function c5(x) { var a = foo(), b = bar(); return baz() ? a : b; }
function c6(x) { var a = foo(), b = bar(); return baz() ? b : a; }
function i1(x) { var a = foo(), b = bar(), c = baz(); if (a) return b; else return c; }
function i2(x) { var a = foo(), b = bar(), c = baz(); if (a) return c; else return b; }
function i3(x) { var a = foo(), b = bar(), c = baz(); if (b) return a; else return c; }
function i4(x) { var a = foo(), b = bar(), c = baz(); if (b) return c; else return a; }
function i5(x) { var a = foo(), b = bar(); if (baz()) return a; else return b; }
function i6(x) { var a = foo(), b = bar(); if (baz()) return b; else return a; }
}
}