Skip to content

Commit 41e2fd6

Browse files
cristianoccristianoc
committed
Simplfy e?true:false to e
1 parent 7d10374 commit 41e2fd6

22 files changed

+38
-141
lines changed

‎compiler/core/js_exp_make.ml

+1
Original file line numberDiff line numberDiff line change
@@ -977,6 +977,7 @@ let rec econd ?comment (pred : t) (ifso : t) (ifnot : t) : t =
977977
| (Number _ | Array _ | Caml_block _), _, _ when no_side_effect pred ->
978978
ifso (* a block can not be false in OCAML, CF - relies on flow inference*)
979979
| Bool true, _, _ -> ifso
980+
| _, Bool true, Bool false -> pred
980981
| _, Cond (pred1, ifso1, ifnot1), _
981982
when Js_analyzer.eq_expression ifnot1 ifnot ->
982983
(* {[

‎lib/es6/Belt_Result.js

+1-5
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,7 @@ function getWithDefault(opt, $$default) {
5353
}
5454

5555
function isOk(x) {
56-
if (x.TAG === "Ok") {
57-
return true;
58-
} else {
59-
return false;
60-
}
56+
return x.TAG === "Ok";
6157
}
6258

6359
function isError(x) {

‎lib/es6/Result.js

+1-5
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,7 @@ function getOr(opt, $$default) {
4747
}
4848

4949
function isOk(x) {
50-
if (x.TAG === "Ok") {
51-
return true;
52-
} else {
53-
return false;
54-
}
50+
return x.TAG === "Ok";
5551
}
5652

5753
function isError(x) {

‎lib/js/Belt_Result.js

+1-5
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,7 @@ function getWithDefault(opt, $$default) {
5353
}
5454

5555
function isOk(x) {
56-
if (x.TAG === "Ok") {
57-
return true;
58-
} else {
59-
return false;
60-
}
56+
return x.TAG === "Ok";
6157
}
6258

6359
function isError(x) {

‎lib/js/Result.js

+1-5
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,7 @@ function getOr(opt, $$default) {
4747
}
4848

4949
function isOk(x) {
50-
if (x.TAG === "Ok") {
51-
return true;
52-
} else {
53-
return false;
54-
}
50+
return x.TAG === "Ok";
5551
}
5652

5753
function isError(x) {

‎tests/tests/src/bdd.mjs

+2-10
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,7 @@ function $$eval(_bdd, vars) {
77
while (true) {
88
let bdd = _bdd;
99
if (typeof bdd !== "object") {
10-
if (bdd === "One") {
11-
return true;
12-
} else {
13-
return false;
14-
}
10+
return bdd === "One";
1511
}
1612
if (Primitive_array.get(vars, bdd._1)) {
1713
_bdd = bdd._3;
@@ -366,11 +362,7 @@ function random_vars(n) {
366362

367363
function bool_equal(a, b) {
368364
if (a) {
369-
if (b) {
370-
return true;
371-
} else {
372-
return false;
373-
}
365+
return b;
374366
} else if (b) {
375367
return false;
376368
} else {

‎tests/tests/src/caml_compare_test.mjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ try {
1010
function_equal_test = Primitive_object.equal(x => x + 1 | 0, x => x + 2 | 0);
1111
} catch (raw_exn) {
1212
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;
1414
}
1515

1616
let suites = {

‎tests/tests/src/core/Core_JsonTests.mjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ function decodeJsonTest() {
1717
decodedCorrectly = false;
1818
} else {
1919
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;
2121
}
2222
} else {
2323
decodedCorrectly = false;

‎tests/tests/src/core/Core_NullableTests.mjs

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ function shouldHandleNullableValues() {
77
let tUndefined = undefined;
88
let tValue = "hello";
99
let tmp;
10-
tmp = tNull === null ? true : false;
10+
tmp = tNull === null || tNull === undefined ? tNull === null : false;
1111
Test.run([
1212
[
1313
"Core_NullableTests.res",
@@ -18,7 +18,7 @@ function shouldHandleNullableValues() {
1818
"Should handle null"
1919
], tmp, (prim0, prim1) => prim0 === prim1, true);
2020
let tmp$1;
21-
tmp$1 = (tUndefined === null || tUndefined === undefined) && tUndefined !== null ? true : false;
21+
tmp$1 = (tUndefined === null || tUndefined === undefined) && tUndefined !== null;
2222
Test.run([
2323
[
2424
"Core_NullableTests.res",
@@ -29,7 +29,7 @@ function shouldHandleNullableValues() {
2929
"Should handle undefined"
3030
], tmp$1, (prim0, prim1) => prim0 === prim1, true);
3131
let tmp$2;
32-
tmp$2 = tValue === null || tValue === undefined || tValue !== "hello" ? false : true;
32+
tmp$2 = tValue === null || tValue === undefined ? false : tValue === "hello";
3333
Test.run([
3434
[
3535
"Core_NullableTests.res",

‎tests/tests/src/core/Core_PromiseTest.mjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ function testExnThrow() {
171171
Error: new Error()
172172
};
173173
}), 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;
175175
Test.run([
176176
[
177177
"Core_PromiseTest.res",

‎tests/tests/src/gpr496_test.mjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ function ff(x, y) {
6767
return Primitive_bool.min(x, y());
6868
}
6969

70-
eq("File \"gpr496_test.res\", line 40, characters 12-19", true < false ? true : false, false);
70+
eq("File \"gpr496_test.res\", line 40, characters 12-19", true < false, false);
7171

7272
Mt.from_pair_suites("Gpr496_test", suites.contents);
7373

‎tests/tests/src/gpr_1698_test.mjs

+1-5
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,7 @@ function is_number(_expr) {
66
let expr = _expr;
77
switch (expr.TAG) {
88
case "Val" :
9-
if (expr._0.TAG === "Natural") {
10-
return true;
11-
} else {
12-
return false;
13-
}
9+
return expr._0.TAG === "Natural";
1410
case "Neg" :
1511
_expr = expr._0;
1612
continue;

‎tests/tests/src/gpr_4924_test.mjs

+4-4
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ function u(b) {
1919
}
2020

2121
function u1(b) {
22-
if (typeof b !== "object" && b === "A") {
23-
return true;
22+
if (typeof b !== "object") {
23+
return b === "A";
2424
} else {
2525
return false;
2626
}
@@ -65,8 +65,8 @@ function u5(b) {
6565
}
6666

6767
function u6(b) {
68-
if (typeof b !== "object" && b === "A") {
69-
return true;
68+
if (typeof b !== "object") {
69+
return b === "A";
7070
} else {
7171
return false;
7272
}

‎tests/tests/src/inline_map2_test.mjs

+6-32
Original file line numberDiff line numberDiff line change
@@ -81,13 +81,7 @@ function Make(Ord) {
8181
return create(create(l, x, d, rl._0), rl._1, rl._2, create(rl._3, rv, rd, rr));
8282
}
8383
};
84-
let is_empty = x => {
85-
if (typeof x !== "object") {
86-
return true;
87-
} else {
88-
return false;
89-
}
90-
};
84+
let is_empty = x => typeof x !== "object";
9185
let add = (x, data, x_) => {
9286
if (typeof x_ !== "object") {
9387
return {
@@ -523,11 +517,7 @@ function Make(Ord) {
523517
let e2 = _e2;
524518
let e1 = _e1;
525519
if (typeof e1 !== "object") {
526-
if (typeof e2 !== "object") {
527-
return true;
528-
} else {
529-
return false;
530-
}
520+
return typeof e2 !== "object";
531521
}
532522
if (typeof e2 !== "object") {
533523
return false;
@@ -688,11 +678,7 @@ function bal(l, x, d, r) {
688678
}
689679

690680
function is_empty(x) {
691-
if (typeof x !== "object") {
692-
return true;
693-
} else {
694-
return false;
695-
}
681+
return typeof x !== "object";
696682
}
697683

698684
function add(x, data, x_) {
@@ -1154,11 +1140,7 @@ function equal(cmp, m1, m2) {
11541140
let e2 = _e2;
11551141
let e1 = _e1;
11561142
if (typeof e1 !== "object") {
1157-
if (typeof e2 !== "object") {
1158-
return true;
1159-
} else {
1160-
return false;
1161-
}
1143+
return typeof e2 !== "object";
11621144
}
11631145
if (typeof e2 !== "object") {
11641146
return false;
@@ -1350,11 +1332,7 @@ function bal$1(l, x, d, r) {
13501332
}
13511333

13521334
function is_empty$1(x) {
1353-
if (typeof x !== "object") {
1354-
return true;
1355-
} else {
1356-
return false;
1357-
}
1335+
return typeof x !== "object";
13581336
}
13591337

13601338
function add$1(x, data, x_) {
@@ -1816,11 +1794,7 @@ function equal$1(cmp, m1, m2) {
18161794
let e2 = _e2;
18171795
let e1 = _e1;
18181796
if (typeof e1 !== "object") {
1819-
if (typeof e2 !== "object") {
1820-
return true;
1821-
} else {
1822-
return false;
1823-
}
1797+
return typeof e2 !== "object";
18241798
}
18251799
if (typeof e2 !== "object") {
18261800
return false;

‎tests/tests/src/js_bool_test.mjs

+3-15
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,15 @@
33
import * as Mt from "./mt.mjs";
44

55
function f(x) {
6-
if (x) {
7-
return true;
8-
} else {
9-
return false;
10-
}
6+
return x;
117
}
128

139
function f2(x) {
14-
if (x) {
15-
return true;
16-
} else {
17-
return false;
18-
}
10+
return x;
1911
}
2012

2113
function f4(x) {
22-
if (x) {
23-
return true;
24-
} else {
25-
return false;
26-
}
14+
return x;
2715
}
2816

2917
let u = 1;

‎tests/tests/src/mario_game.mjs

+3-11
Original file line numberDiff line numberDiff line change
@@ -928,19 +928,11 @@ function get_obj(x) {
928928
}
929929

930930
function is_player(x) {
931-
if (x.TAG === "Player") {
932-
return true;
933-
} else {
934-
return false;
935-
}
931+
return x.TAG === "Player";
936932
}
937933

938934
function is_enemy(x) {
939-
if (x.TAG === "Enemy") {
940-
return true;
941-
} else {
942-
return false;
943-
}
935+
return x.TAG === "Enemy";
944936
}
945937

946938
function equals(col1, col2) {
@@ -1262,7 +1254,7 @@ function col_bypass(c1, c2) {
12621254
ctypes = c2.TAG === "Enemy" ? c1._2.invuln > 0 : false;
12631255
break;
12641256
case "Enemy" :
1265-
ctypes = c2.TAG === "Item" ? true : false;
1257+
ctypes = c2.TAG === "Item";
12661258
break;
12671259
case "Item" :
12681260
switch (c2.TAG) {

‎tests/tests/src/rbset.mjs

+1-5
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,7 @@ function blackify(x) {
2222
}
2323

2424
function is_empty(x) {
25-
if (typeof x !== "object") {
26-
return true;
27-
} else {
28-
return false;
29-
}
25+
return typeof x !== "object";
3026
}
3127

3228
function mem(x, _x_) {

‎tests/tests/src/reasonReactRouter.mjs

+1-5
Original file line numberDiff line numberDiff line change
@@ -108,11 +108,7 @@ function urlNotEqual(a, b) {
108108
let bList = _bList;
109109
let aList = _aList;
110110
if (!aList) {
111-
if (bList) {
112-
return true;
113-
} else {
114-
return false;
115-
}
111+
return bList;
116112
}
117113
if (!bList) {
118114
return true;

‎tests/tests/src/set_gen.mjs

+1-5
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,7 @@ function max_elt(_x) {
6767
}
6868

6969
function is_empty(x) {
70-
if (typeof x !== "object") {
71-
return true;
72-
} else {
73-
return false;
74-
}
70+
return typeof x !== "object";
7571
}
7672

7773
function cardinal_aux(_acc, _x) {

‎tests/tests/src/test_bool_equal.mjs

+1-5
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,7 @@
33

44
function bool_equal(x, y) {
55
if (x) {
6-
if (y) {
7-
return true;
8-
} else {
9-
return false;
10-
}
6+
return y;
117
} else if (y) {
128
return false;
139
} else {

‎tests/tests/src/test_set.mjs

+1-7
Original file line numberDiff line numberDiff line change
@@ -224,13 +224,7 @@ function Make(Ord) {
224224
match$1[2]
225225
];
226226
};
227-
let is_empty = x => {
228-
if (typeof x !== "object") {
229-
return true;
230-
} else {
231-
return false;
232-
}
233-
};
227+
let is_empty = x => typeof x !== "object";
234228
let mem = (x, _x_) => {
235229
while (true) {
236230
let x_ = _x_;

0 commit comments

Comments
 (0)