Merge pull request #424 from mattbasta/simplify_conditionals

Simplify nested conditionals if possible

2 files changed, 40 insertions, 0 deletions

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();
+    }
+}