Simplfy e?true:false to e

cristianoc · cristianoc · commit 41e2fd64dc16 · 2024-10-31T16:08:55.000+01:00
diff --git a/compiler/core/js_exp_make.ml b/compiler/core/js_exp_make.ml
@@ -977,6 +977,7 @@ let rec econd ?comment (pred : t) (ifso : t) (ifnot : t) : t =
   | (Number _ | Array _ | Caml_block _), _, _ when no_side_effect pred ->
     ifso (* a block can not be false in OCAML, CF - relies on flow inference*)
   | Bool true, _, _ -> ifso
+  | _, Bool true, Bool false -> pred
   | _, Cond (pred1, ifso1, ifnot1), _
     when Js_analyzer.eq_expression ifnot1 ifnot ->
     (* {[
diff --git a/lib/es6/Belt_Result.js b/lib/es6/Belt_Result.js
@@ -53,11 +53,7 @@ function getWithDefault(opt, $$default) {
 }
 
 function isOk(x) {
-  if (x.TAG === "Ok") {
-    return true;
-  } else {
-    return false;
-  }
+  return x.TAG === "Ok";
 }
 
 function isError(x) {
diff --git a/lib/es6/Result.js b/lib/es6/Result.js
@@ -47,11 +47,7 @@ function getOr(opt, $$default) {
 }
 
 function isOk(x) {
-  if (x.TAG === "Ok") {
-    return true;
-  } else {
-    return false;
-  }
+  return x.TAG === "Ok";
 }
 
 function isError(x) {
diff --git a/lib/js/Belt_Result.js b/lib/js/Belt_Result.js
@@ -53,11 +53,7 @@ function getWithDefault(opt, $$default) {
 }
 
 function isOk(x) {
-  if (x.TAG === "Ok") {
-    return true;
-  } else {
-    return false;
-  }
+  return x.TAG === "Ok";
 }
 
 function isError(x) {
diff --git a/lib/js/Result.js b/lib/js/Result.js
@@ -47,11 +47,7 @@ function getOr(opt, $$default) {
 }
 
 function isOk(x) {
-  if (x.TAG === "Ok") {
-    return true;
-  } else {
-    return false;
-  }
+  return x.TAG === "Ok";
 }
 
 function isError(x) {
diff --git a/tests/tests/src/bdd.mjs b/tests/tests/src/bdd.mjs
@@ -7,11 +7,7 @@ function $$eval(_bdd, vars) {
   while (true) {
     let bdd = _bdd;
     if (typeof bdd !== "object") {
-      if (bdd === "One") {
-        return true;
-      } else {
-        return false;
-      }
+      return bdd === "One";
     }
     if (Primitive_array.get(vars, bdd._1)) {
       _bdd = bdd._3;
@@ -366,11 +362,7 @@ function random_vars(n) {
 
 function bool_equal(a, b) {
   if (a) {
-    if (b) {
-      return true;
-    } else {
-      return false;
-    }
+    return b;
   } else if (b) {
     return false;
   } else {
diff --git a/tests/tests/src/caml_compare_test.mjs b/tests/tests/src/caml_compare_test.mjs
@@ -10,7 +10,7 @@ try {
   function_equal_test = Primitive_object.equal(x => x + 1 | 0, x => x + 2 | 0);
 } catch (raw_exn) {
   let exn = Primitive_exceptions.internalToException(raw_exn);
-  function_equal_test = exn.RE_EXN_ID === "Invalid_argument" && exn._1 === "equal: functional value" ? true : false;
+  function_equal_test = exn.RE_EXN_ID === "Invalid_argument" ? exn._1 === "equal: functional value" : false;
 }
 
 let suites = {
diff --git a/tests/tests/src/core/Core_JsonTests.mjs b/tests/tests/src/core/Core_JsonTests.mjs
@@ -17,7 +17,7 @@ function decodeJsonTest() {
           decodedCorrectly = false;
         } else {
           let match$3 = match$1[1];
-          decodedCorrectly = match$3 === null || !(typeof match$3 === "boolean" && !match$3) ? false : true;
+          decodedCorrectly = match$3 === null ? false : typeof match$3 === "boolean" && !match$3;
         }
       } else {
         decodedCorrectly = false;
diff --git a/tests/tests/src/core/Core_NullableTests.mjs b/tests/tests/src/core/Core_NullableTests.mjs
@@ -7,7 +7,7 @@ function shouldHandleNullableValues() {
   let tUndefined = undefined;
   let tValue = "hello";
   let tmp;
-  tmp = tNull === null ? true : false;
+  tmp = tNull === null || tNull === undefined ? tNull === null : false;
   Test.run([
     [
       "Core_NullableTests.res",
@@ -18,7 +18,7 @@ function shouldHandleNullableValues() {
     "Should handle null"
   ], tmp, (prim0, prim1) => prim0 === prim1, true);
   let tmp$1;
-  tmp$1 = (tUndefined === null || tUndefined === undefined) && tUndefined !== null ? true : false;
+  tmp$1 = (tUndefined === null || tUndefined === undefined) && tUndefined !== null;
   Test.run([
     [
       "Core_NullableTests.res",
@@ -29,7 +29,7 @@ function shouldHandleNullableValues() {
     "Should handle undefined"
   ], tmp$1, (prim0, prim1) => prim0 === prim1, true);
   let tmp$2;
-  tmp$2 = tValue === null || tValue === undefined || tValue !== "hello" ? false : true;
+  tmp$2 = tValue === null || tValue === undefined ? false : tValue === "hello";
   Test.run([
     [
       "Core_NullableTests.res",
diff --git a/tests/tests/src/core/Core_PromiseTest.mjs b/tests/tests/src/core/Core_PromiseTest.mjs
@@ -171,7 +171,7 @@ function testExnThrow() {
       Error: new Error()
     };
   }), e => {
-    let isTestErr = e.RE_EXN_ID === TestError && e._1 === "Thrown exn" ? true : false;
+    let isTestErr = e.RE_EXN_ID === TestError ? e._1 === "Thrown exn" : false;
     Test.run([
       [
         "Core_PromiseTest.res",
diff --git a/tests/tests/src/gpr496_test.mjs b/tests/tests/src/gpr496_test.mjs
@@ -67,7 +67,7 @@ function ff(x, y) {
   return Primitive_bool.min(x, y());
 }
 
-eq("File \"gpr496_test.res\", line 40, characters 12-19", true < false ? true : false, false);
+eq("File \"gpr496_test.res\", line 40, characters 12-19", true < false, false);
 
 Mt.from_pair_suites("Gpr496_test", suites.contents);
 
diff --git a/tests/tests/src/gpr_1698_test.mjs b/tests/tests/src/gpr_1698_test.mjs
@@ -6,11 +6,7 @@ function is_number(_expr) {
     let expr = _expr;
     switch (expr.TAG) {
       case "Val" :
-        if (expr._0.TAG === "Natural") {
-          return true;
-        } else {
-          return false;
-        }
+        return expr._0.TAG === "Natural";
       case "Neg" :
         _expr = expr._0;
         continue;
diff --git a/tests/tests/src/gpr_4924_test.mjs b/tests/tests/src/gpr_4924_test.mjs
@@ -19,8 +19,8 @@ function u(b) {
 }
 
 function u1(b) {
-  if (typeof b !== "object" && b === "A") {
-    return true;
+  if (typeof b !== "object") {
+    return b === "A";
   } else {
     return false;
   }
@@ -65,8 +65,8 @@ function u5(b) {
 }
 
 function u6(b) {
-  if (typeof b !== "object" && b === "A") {
-    return true;
+  if (typeof b !== "object") {
+    return b === "A";
   } else {
     return false;
   }
diff --git a/tests/tests/src/inline_map2_test.mjs b/tests/tests/src/inline_map2_test.mjs
@@ -81,13 +81,7 @@ function Make(Ord) {
       return create(create(l, x, d, rl._0), rl._1, rl._2, create(rl._3, rv, rd, rr));
     }
   };
-  let is_empty = x => {
-    if (typeof x !== "object") {
-      return true;
-    } else {
-      return false;
-    }
-  };
+  let is_empty = x => typeof x !== "object";
   let add = (x, data, x_) => {
     if (typeof x_ !== "object") {
       return {
@@ -523,11 +517,7 @@ function Make(Ord) {
       let e2 = _e2;
       let e1 = _e1;
       if (typeof e1 !== "object") {
-        if (typeof e2 !== "object") {
-          return true;
-        } else {
-          return false;
-        }
+        return typeof e2 !== "object";
       }
       if (typeof e2 !== "object") {
         return false;
@@ -688,11 +678,7 @@ function bal(l, x, d, r) {
 }
 
 function is_empty(x) {
-  if (typeof x !== "object") {
-    return true;
-  } else {
-    return false;
-  }
+  return typeof x !== "object";
 }
 
 function add(x, data, x_) {
@@ -1154,11 +1140,7 @@ function equal(cmp, m1, m2) {
     let e2 = _e2;
     let e1 = _e1;
     if (typeof e1 !== "object") {
-      if (typeof e2 !== "object") {
-        return true;
-      } else {
-        return false;
-      }
+      return typeof e2 !== "object";
     }
     if (typeof e2 !== "object") {
       return false;
@@ -1350,11 +1332,7 @@ function bal$1(l, x, d, r) {
 }
 
 function is_empty$1(x) {
-  if (typeof x !== "object") {
-    return true;
-  } else {
-    return false;
-  }
+  return typeof x !== "object";
 }
 
 function add$1(x, data, x_) {
@@ -1816,11 +1794,7 @@ function equal$1(cmp, m1, m2) {
     let e2 = _e2;
     let e1 = _e1;
     if (typeof e1 !== "object") {
-      if (typeof e2 !== "object") {
-        return true;
-      } else {
-        return false;
-      }
+      return typeof e2 !== "object";
     }
     if (typeof e2 !== "object") {
       return false;
diff --git a/tests/tests/src/js_bool_test.mjs b/tests/tests/src/js_bool_test.mjs
@@ -3,27 +3,15 @@
 import * as Mt from "./mt.mjs";
 
 function f(x) {
-  if (x) {
-    return true;
-  } else {
-    return false;
-  }
+  return x;
 }
 
 function f2(x) {
-  if (x) {
-    return true;
-  } else {
-    return false;
-  }
+  return x;
 }
 
 function f4(x) {
-  if (x) {
-    return true;
-  } else {
-    return false;
-  }
+  return x;
 }
 
 let u = 1;
diff --git a/tests/tests/src/mario_game.mjs b/tests/tests/src/mario_game.mjs
@@ -928,19 +928,11 @@ function get_obj(x) {
 }
 
 function is_player(x) {
-  if (x.TAG === "Player") {
-    return true;
-  } else {
-    return false;
-  }
+  return x.TAG === "Player";
 }
 
 function is_enemy(x) {
-  if (x.TAG === "Enemy") {
-    return true;
-  } else {
-    return false;
-  }
+  return x.TAG === "Enemy";
 }
 
 function equals(col1, col2) {
@@ -1262,7 +1254,7 @@ function col_bypass(c1, c2) {
       ctypes = c2.TAG === "Enemy" ? c1._2.invuln > 0 : false;
       break;
     case "Enemy" :
-      ctypes = c2.TAG === "Item" ? true : false;
+      ctypes = c2.TAG === "Item";
       break;
     case "Item" :
       switch (c2.TAG) {
diff --git a/tests/tests/src/rbset.mjs b/tests/tests/src/rbset.mjs
@@ -22,11 +22,7 @@ function blackify(x) {
 }
 
 function is_empty(x) {
-  if (typeof x !== "object") {
-    return true;
-  } else {
-    return false;
-  }
+  return typeof x !== "object";
 }
 
 function mem(x, _x_) {
diff --git a/tests/tests/src/reasonReactRouter.mjs b/tests/tests/src/reasonReactRouter.mjs
@@ -108,11 +108,7 @@ function urlNotEqual(a, b) {
       let bList = _bList;
       let aList = _aList;
       if (!aList) {
-        if (bList) {
-          return true;
-        } else {
-          return false;
-        }
+        return bList;
       }
       if (!bList) {
         return true;
diff --git a/tests/tests/src/set_gen.mjs b/tests/tests/src/set_gen.mjs
@@ -67,11 +67,7 @@ function max_elt(_x) {
 }
 
 function is_empty(x) {
-  if (typeof x !== "object") {
-    return true;
-  } else {
-    return false;
-  }
+  return typeof x !== "object";
 }
 
 function cardinal_aux(_acc, _x) {
diff --git a/tests/tests/src/test_bool_equal.mjs b/tests/tests/src/test_bool_equal.mjs
@@ -3,11 +3,7 @@
 
 function bool_equal(x, y) {
   if (x) {
-    if (y) {
-      return true;
-    } else {
-      return false;
-    }
+    return y;
   } else if (y) {
     return false;
   } else {
diff --git a/tests/tests/src/test_set.mjs b/tests/tests/src/test_set.mjs
@@ -224,13 +224,7 @@ function Make(Ord) {
       match$1[2]
     ];
   };
-  let is_empty = x => {
-    if (typeof x !== "object") {
-      return true;
-    } else {
-      return false;
-    }
-  };
+  let is_empty = x => typeof x !== "object";
   let mem = (x, _x_) => {
     while (true) {
       let x_ = _x_;
diff --git a/tests/tests/src/variantsMatching.mjs b/tests/tests/src/variantsMatching.mjs

Original file line number	Diff line number	Diff line change
`@@ -53,11 +53,7 @@ function getWithDefault(opt, $$default) {`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`function isOk(x) {`
`56`		`- if (x.TAG === "Ok") {`
`57`		`- return true;`
`58`		`- } else {`
`59`		`- return false;`
`60`		`- }`
	`56`	`+ return x.TAG === "Ok";`
`61`	`57`	`}`
`62`	`58`
`63`	`59`	`function isError(x) {`
Original file line number	Diff line number	Diff line change
`@@ -47,11 +47,7 @@ function getOr(opt, $$default) {`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`function isOk(x) {`
`50`		`- if (x.TAG === "Ok") {`
`51`		`- return true;`
`52`		`- } else {`
`53`		`- return false;`
`54`		`- }`
	`50`	`+ return x.TAG === "Ok";`
`55`	`51`	`}`
`56`	`52`
`57`	`53`	`function isError(x) {`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ try {`
`10`	`10`	`function_equal_test = Primitive_object.equal(x => x + 1 \| 0, x => x + 2 \| 0);`
`11`	`11`	`} catch (raw_exn) {`
`12`	`12`	`let exn = Primitive_exceptions.internalToException(raw_exn);`
`13`		`- function_equal_test = exn.RE_EXN_ID === "Invalid_argument" && exn._1 === "equal: functional value" ? true : false;`
	`13`	`+ function_equal_test = exn.RE_EXN_ID === "Invalid_argument" ? exn._1 === "equal: functional value" : false;`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`let suites = {`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ function decodeJsonTest() {`
`17`	`17`	`decodedCorrectly = false;`
`18`	`18`	`} else {`
`19`	`19`	`let match$3 = match$1[1];`
`20`		`- decodedCorrectly = match$3 === null \|\| !(typeof match$3 === "boolean" && !match$3) ? false : true;`
	`20`	`+ decodedCorrectly = match$3 === null ? false : typeof match$3 === "boolean" && !match$3;`
`21`	`21`	`}`
`22`	`22`	`} else {`
`23`	`23`	`decodedCorrectly = false;`
Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,7 @@ function testExnThrow() {`
`171`	`171`	`Error: new Error()`
`172`	`172`	`};`
`173`	`173`	`}), e => {`
`174`		`- let isTestErr = e.RE_EXN_ID === TestError && e._1 === "Thrown exn" ? true : false;`
	`174`	`+ let isTestErr = e.RE_EXN_ID === TestError ? e._1 === "Thrown exn" : false;`
`175`	`175`	`Test.run([`
`176`	`176`	`[`
`177`	`177`	`"Core_PromiseTest.res",`