From ac0086a74521ffce97b6e8bde0bee54feb0c5ec9 Mon Sep 17 00:00:00 2001 From: Matt Basta Date: Thu, 6 Feb 2014 12:39:13 -0800 Subject: [PATCH] Simplify nested conditionals if possible --- lib/compress.js | 13 +++++++++++++ test/compress/conditionals.js | 27 +++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/lib/compress.js b/lib/compress.js index 1b6bedd5..005c606d 100644 --- a/lib/compress.js +++ b/lib/compress.js @@ -2296,6 +2296,19 @@ merge(Compressor.prototype, { return consequent; } } + // x?y?z:a:a --> x&&y?z:a + if (consequent instanceof AST_Conditional + && consequent.alternative.equivalent_to(alternative)) { + return make_node(AST_Conditional, self, { + condition: make_node(AST_Binary, self, { + left: self.condition, + operator: "&&", + right: consequent.condition + }), + consequent: consequent.consequent, + alternative: alternative + }); + } return self; }); diff --git a/test/compress/conditionals.js b/test/compress/conditionals.js index 9ef30ac1..213b246b 100644 --- a/test/compress/conditionals.js +++ b/test/compress/conditionals.js @@ -205,3 +205,30 @@ cond_4: { some_condition(), do_something(); } } + +cond_5: { + options = { + conditionals: true + }; + input: { + if (some_condition()) { + if (some_other_condition()) { + do_something(); + } else { + alternate(); + } + } else { + alternate(); + } + + if (some_condition()) { + if (some_other_condition()) { + do_something(); + } + } + } + expect: { + some_condition() && some_other_condition() ? do_something() : alternate(); + some_condition() && some_other_condition() && do_something(); + } +} -- 2.34.1