aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Lam S.L <alexlamsl@gmail.com>2017-03-19 11:59:42 +0800
committerGitHub <noreply@github.com>2017-03-19 11:59:42 +0800
commit96f8befdd7dbc3be9f5991f805ad8d60dfb3e6d6 (patch)
treee0e9f00e92a5aac39b088287f791c1476287c95e
parentcd58635dcc8f74aafa842c2015b294ff4097ba08 (diff)
downloadtracifyjs-96f8befdd7dbc3be9f5991f805ad8d60dfb3e6d6.tar.gz
tracifyjs-96f8befdd7dbc3be9f5991f805ad8d60dfb3e6d6.zip
fix commit 88fb83a (#1622)
The following is wrong: `a == (b ? a : c)` => `b` Because: - `b` may not be boolean - `a` might have side effects - `a == a` is not always `true` (think `NaN`) - `a == c` is not always `false`
-rw-r--r--lib/compress.js26
-rw-r--r--test/compress/conditionals.js96
2 files changed, 96 insertions, 26 deletions
diff --git a/lib/compress.js b/lib/compress.js
index 53412a3f..41612ad7 100644
--- a/lib/compress.js
+++ b/lib/compress.js
@@ -3057,32 +3057,6 @@ merge(Compressor.prototype, {
reverse();
}
}
- if (/^[!=]==?$/.test(self.operator)) {
- if (self.left instanceof AST_SymbolRef && self.right instanceof AST_Conditional) {
- if (self.right.consequent instanceof AST_SymbolRef
- && self.right.consequent.definition() === self.left.definition()) {
- if (/^==/.test(self.operator)) return self.right.condition;
- if (/^!=/.test(self.operator)) return self.right.condition.negate(compressor);
- }
- if (self.right.alternative instanceof AST_SymbolRef
- && self.right.alternative.definition() === self.left.definition()) {
- if (/^==/.test(self.operator)) return self.right.condition.negate(compressor);
- if (/^!=/.test(self.operator)) return self.right.condition;
- }
- }
- if (self.right instanceof AST_SymbolRef && self.left instanceof AST_Conditional) {
- if (self.left.consequent instanceof AST_SymbolRef
- && self.left.consequent.definition() === self.right.definition()) {
- if (/^==/.test(self.operator)) return self.left.condition;
- if (/^!=/.test(self.operator)) return self.left.condition.negate(compressor);
- }
- if (self.left.alternative instanceof AST_SymbolRef
- && self.left.alternative.definition() === self.right.definition()) {
- if (/^==/.test(self.operator)) return self.left.condition.negate(compressor);
- if (/^!=/.test(self.operator)) return self.left.condition;
- }
- }
- }
}
self = self.lift_sequences(compressor);
if (compressor.option("comparisons")) switch (self.operator) {
diff --git a/test/compress/conditionals.js b/test/compress/conditionals.js
index 074d2a65..7c81cc80 100644
--- a/test/compress/conditionals.js
+++ b/test/compress/conditionals.js
@@ -797,3 +797,99 @@ no_evaluate: {
}
}
}
+
+equality_conditionals_false: {
+ options = {
+ conditionals: false,
+ sequences: true,
+ }
+ input: {
+ function f(a, b, c) {
+ console.log(
+ a == (b ? a : a),
+ a == (b ? a : c),
+ a != (b ? a : a),
+ a != (b ? a : c),
+ a === (b ? a : a),
+ a === (b ? a : c),
+ a !== (b ? a : a),
+ a !== (b ? a : c)
+ );
+ }
+ f(0, 0, 0);
+ f(0, true, 0);
+ f(1, 2, 3);
+ f(1, null, 3);
+ f(NaN);
+ f(NaN, "foo");
+ }
+ expect: {
+ function f(a, b, c) {
+ console.log(
+ a == (b ? a : a),
+ a == (b ? a : c),
+ a != (b ? a : a),
+ a != (b ? a : c),
+ a === (b ? a : a),
+ a === (b ? a : c),
+ a !== (b ? a : a),
+ a !== (b ? a : c)
+ );
+ }
+ f(0, 0, 0),
+ f(0, true, 0),
+ f(1, 2, 3),
+ f(1, null, 3),
+ f(NaN),
+ f(NaN, "foo");
+ }
+ expect_stdout: true
+}
+
+equality_conditionals_true: {
+ options = {
+ conditionals: true,
+ sequences: true,
+ }
+ input: {
+ function f(a, b, c) {
+ console.log(
+ a == (b ? a : a),
+ a == (b ? a : c),
+ a != (b ? a : a),
+ a != (b ? a : c),
+ a === (b ? a : a),
+ a === (b ? a : c),
+ a !== (b ? a : a),
+ a !== (b ? a : c)
+ );
+ }
+ f(0, 0, 0);
+ f(0, true, 0);
+ f(1, 2, 3);
+ f(1, null, 3);
+ f(NaN);
+ f(NaN, "foo");
+ }
+ expect: {
+ function f(a, b, c) {
+ console.log(
+ (b, a == a),
+ a == (b ? a : c),
+ (b, a != a),
+ a != (b ? a : c),
+ (b, a === a),
+ a === (b ? a : c),
+ (b, a !== a),
+ a !== (b ? a : c)
+ );
+ }
+ f(0, 0, 0),
+ f(0, true, 0),
+ f(1, 2, 3),
+ f(1, null, 3),
+ f(NaN),
+ f(NaN, "foo");
+ }
+ expect_stdout: true
+}