Skip to content

Commit b7fee9e

Browse files
bobzhangbobzhang
committed
remove trailing return undefined
1 parent f23a8d8 commit b7fee9e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+153
-222
lines changed

Diff for: ‎jscomp/core/js_dump.ml

+22-2
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ and pp_function method_
251251
else
252252
cxt
253253
in
254-
statement_list false cxt f b
254+
function_body cxt f b
255255
);
256256

257257
end
@@ -260,7 +260,7 @@ and pp_function method_
260260
formal_parameter_list inner_cxt f method_ l env )
261261
in
262262
P.space f ;
263-
ignore @@ P.brace_vgroup f 1 (fun _ -> statement_list false cxt f b );
263+
ignore @@ P.brace_vgroup f 1 (fun _ -> function_body cxt f b );
264264
end
265265
in
266266
let lexical : Ident_set.t = Js_fun_env.get_lexical_scope env in
@@ -1447,6 +1447,26 @@ and statement_desc top cxt f (s : J.statement_desc) : Ext_pp_scope.t =
14471447
P.space f;
14481448
block cxt f b
14491449
end
1450+
and function_body cxt f b =
1451+
match b with
1452+
| [] -> cxt
1453+
| [s] ->
1454+
begin match s.statement_desc with
1455+
| If (bool,
1456+
then_,
1457+
Some [{
1458+
statement_desc =
1459+
Return {return_value = {expression_desc = Undefined}} }])
1460+
->
1461+
statement false cxt f {s with statement_desc = If(bool,then_,None)}
1462+
| _ ->
1463+
statement false cxt f s
1464+
end
1465+
| s :: r ->
1466+
let cxt = statement false cxt f s in
1467+
P.newline f;
1468+
function_body cxt f r
1469+
14501470
(* similar to [block] but no braces *)
14511471
and statement_list top cxt f b =
14521472
match b with

Diff for: ‎jscomp/test/ast_abstract_test.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -188,9 +188,8 @@ function zToJs(param) {
188188
function zFromJs(param) {
189189
if (param <= 2 && 0 <= param) {
190190
return param - 0 | 0;
191-
} else {
192-
return undefined;
193191
}
192+
194193
}
195194

196195
Mt.from_pair_suites("ast_abstract_test.ml", suites[0]);

Diff for: ‎jscomp/test/ast_js_mapper_poly_test.js

+2-4
Original file line numberDiff line numberDiff line change
@@ -165,9 +165,8 @@ function v1ToJs(param) {
165165
function v1FromJs(param) {
166166
if (param <= 5 && 0 <= param) {
167167
return param - 0 | 0;
168-
} else {
169-
return undefined;
170168
}
169+
171170
}
172171

173172
eq("File \"ast_js_mapper_poly_test.ml\", line 68, characters 5-12", $$Array.map(v1ToJs, /* array */[
@@ -213,9 +212,8 @@ function v2ToJs(param) {
213212
function v2FromJs(param) {
214213
if (param <= 7 && 2 <= param) {
215214
return param - 2 | 0;
216-
} else {
217-
return undefined;
218215
}
216+
219217
}
220218

221219
eq("File \"ast_js_mapper_poly_test.ml\", line 86, characters 5-12", $$Array.map(v2ToJs, /* array */[

Diff for: ‎jscomp/test/bs_array_test.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -532,9 +532,8 @@ var v1 = Belt_Array.keep(v$6, (function (x) {
532532
var v2 = Belt_Array.keepMap(v$6, (function (x) {
533533
if (x % 2 === 0) {
534534
return x + 1 | 0;
535-
} else {
536-
return undefined;
537535
}
536+
538537
}));
539538

540539
eq("File \"bs_array_test.ml\", line 146, characters 5-12", v0, /* array */[

Diff for: ‎jscomp/test/bs_list_test.js

+3-6
Original file line numberDiff line numberDiff line change
@@ -2336,9 +2336,8 @@ var u0 = Belt_List.makeBy(20, (function (x) {
23362336
var u1 = Belt_List.keepMap(u0, (function (x) {
23372337
if (x % 7 === 0) {
23382338
return x + 1 | 0;
2339-
} else {
2340-
return undefined;
23412339
}
2340+
23422341
}));
23432342

23442343
eq("File \"bs_list_test.ml\", line 333, characters 5-12", u1, /* :: */[
@@ -2367,9 +2366,8 @@ b("File \"bs_list_test.ml\", line 334, characters 4-11", Caml_obj.caml_equal(Bel
23672366
], (function (x) {
23682367
if (x % 2 === 0) {
23692368
return -x | 0;
2370-
} else {
2371-
return undefined;
23722369
}
2370+
23732371
})), /* :: */[
23742372
-2,
23752373
/* :: */[
@@ -2393,9 +2391,8 @@ b("File \"bs_list_test.ml\", line 338, characters 4-11", Belt_List.keepMap(/* ::
23932391
], (function (x) {
23942392
if (x % 5 === 0) {
23952393
return x;
2396-
} else {
2397-
return undefined;
23982394
}
2395+
23992396
})) === /* [] */0);
24002397

24012398
Mt.from_pair_suites("bs_list_test.ml", suites[0]);

Diff for: ‎jscomp/test/bs_poly_map_test.js

+4-8
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,8 @@ function mergeInter(s1, s2) {
4343
var m = Belt_Map.merge(s1, s2, (function (_, v1, v2) {
4444
if (v1 !== undefined && v2 !== undefined) {
4545
return /* () */0;
46-
} else {
47-
return undefined;
4846
}
47+
4948
}));
5049
var x = Belt_MapDict.keysToArray(m.data);
5150
return Belt_Set.fromArray(x, Icmp);
@@ -55,9 +54,8 @@ function mergeUnion(s1, s2) {
5554
var m = Belt_Map.merge(s1, s2, (function (_, v1, v2) {
5655
if (v1 !== undefined || v2 !== undefined) {
5756
return /* () */0;
58-
} else {
59-
return undefined;
6057
}
58+
6159
}));
6260
var x = Belt_MapDict.keysToArray(m.data);
6361
return Belt_Set.fromArray(x, Icmp);
@@ -67,9 +65,8 @@ function mergeDiff(s1, s2) {
6765
var m = Belt_Map.merge(s1, s2, (function (_, v1, v2) {
6866
if (v1 !== undefined && v2 === undefined) {
6967
return /* () */0;
70-
} else {
71-
return undefined;
7268
}
69+
7370
}));
7471
var x = Belt_MapDict.keysToArray(m.data);
7572
return Belt_Set.fromArray(x, Icmp);
@@ -127,9 +124,8 @@ var a3 = Belt_Map.update(a2, 3, (function (k) {
127124
var a4 = Belt_Map.update(a2, 3, (function (k) {
128125
if (k !== undefined) {
129126
return k + 1 | 0;
130-
} else {
131-
return undefined;
132127
}
128+
133129
}));
134130

135131
var a5 = Belt_Map.remove(a0, 3);

Diff for: ‎jscomp/test/exception_def.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,8 @@ var XXX = Caml_exceptions.create("Exception_def.XXX");
2020
Printexc.register_printer((function (param) {
2121
if (param[0] === A) {
2222
return "A";
23-
} else {
24-
return undefined;
2523
}
24+
2625
}));
2726

2827
var a = 3;

Diff for: ‎jscomp/test/exn_error_pattern.js

+2-4
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,8 @@ function f(match) {
1414
} else {
1515
return undefined;
1616
}
17-
} else {
18-
return undefined;
1917
}
18+
2019
}
2120

2221
var A = Caml_exceptions.create("Exn_error_pattern.A");
@@ -34,9 +33,8 @@ function g(match) {
3433
} else {
3534
return undefined;
3635
}
37-
} else {
38-
return undefined;
3936
}
37+
4038
}
4139

4240
exports.f = f;

Diff for: ‎jscomp/test/ext_string_test.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -145,9 +145,8 @@ function ends_with_then_chop(s, beg) {
145145
var i = ends_with_index(s, beg);
146146
if (i >= 0) {
147147
return $$String.sub(s, 0, i);
148-
} else {
149-
return undefined;
150148
}
149+
151150
}
152151

153152
function check_any_suffix_case(s, suffixes) {

Diff for: ‎jscomp/test/flow_parser_reg_test.js

+9-18
Original file line numberDiff line numberDiff line change
@@ -4510,9 +4510,8 @@ function grow(t, n) {
45104510
var filler = function (i) {
45114511
if (i < t[/* la_results */0].length) {
45124512
return Caml_array.caml_array_get(t[/* la_results */0], i);
4513-
} else {
4514-
return undefined;
45154513
}
4514+
45164515
};
45174516
var new_arr = $$Array.init(new_size, filler);
45184517
t[/* la_results */0] = new_arr;
@@ -4900,9 +4899,8 @@ function semicolon_loc($staropt$star, env) {
49004899
var i = $staropt$star !== undefined ? $staropt$star : 0;
49014900
if (token$2(i, env) === /* T_SEMICOLON */7) {
49024901
return loc(i, env);
4903-
} else {
4904-
return undefined;
49054902
}
4903+
49064904
}
49074905

49084906
function is_identifier($staropt$star, env) {
@@ -5759,9 +5757,8 @@ function primitive(param) {
57595757
} else {
57605758
return /* Null */2;
57615759
}
5762-
} else {
5763-
return undefined;
57645760
}
5761+
57655762
}
57665763

57675764
function function_param_or_generic_type(env) {
@@ -6119,9 +6116,8 @@ function type_parameter_instantiation(env) {
61196116
loc,
61206117
/* record */[/* params */params$1]
61216118
];
6122-
} else {
6123-
return undefined;
61246119
}
6120+
61256121
}
61266122

61276123
function param(env) {
@@ -6265,9 +6261,8 @@ function type_parameter_declaration(allow_default, env) {
62656261
loc,
62666262
/* record */[/* params */params$2]
62676263
];
6268-
} else {
6269-
return undefined;
62706264
}
6265+
62716266
}
62726267

62736268
function intersection_with(env, left) {
@@ -6702,9 +6697,8 @@ function annotation_opt(env) {
67026697
var match = Curry._2(Parser_env_048[/* token */0], undefined, env);
67036698
if (typeof match === "number" && match === 77) {
67046699
return annotation(env);
6705-
} else {
6706-
return undefined;
67076700
}
6701+
67086702
}
67096703

67106704
function wrap(f, env) {
@@ -7390,9 +7384,8 @@ function peek_unary_op(env) {
73907384
} else {
73917385
return undefined;
73927386
}
7393-
} else {
7394-
return undefined;
73957387
}
7388+
73967389
}
73977390

73987391
function unary(env) {
@@ -11215,9 +11208,8 @@ function from_expr(env, param) {
1121511208
match$2[1]
1121611209
])]);
1121711210
}
11218-
} else {
11219-
return undefined;
1122011211
}
11212+
1122111213
}), param$1[1][/* elements */0]);
1122211214
return /* tuple */[
1122311215
param$1[0],
@@ -13607,9 +13599,8 @@ function predicate(env) {
1360713599
/* Inferred */0
1360813600
];
1360913601
}
13610-
} else {
13611-
return undefined;
1361213602
}
13603+
1361313604
}
1361413605

1361513606
Caml_module.update_mod([[

Diff for: ‎jscomp/test/gpr_1409_test.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,8 @@ var b = {
3737
function map(f, x) {
3838
if (x !== undefined) {
3939
return Js_primitive.some(Curry._1(f, Js_primitive.valFromOption(x)));
40-
} else {
41-
return undefined;
4240
}
41+
4342
}
4443

4544
function make(foo) {

Diff for: ‎jscomp/test/js_list_test.js

+2-4
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,8 @@ eq("File \"js_list_test.ml\", line 11, characters 7-14", Js_list.flatten(/* :: *
8080
eq("File \"js_list_test.ml\", line 14, characters 7-14", Js_list.filterMap((function (x) {
8181
if (x % 2 === 0) {
8282
return x;
83-
} else {
84-
return undefined;
8583
}
84+
8685
}), /* :: */[
8786
1,
8887
/* :: */[
@@ -118,9 +117,8 @@ eq("File \"js_list_test.ml\", line 14, characters 7-14", Js_list.filterMap((func
118117
eq("File \"js_list_test.ml\", line 17, characters 7-14", Js_list.filterMap((function (x) {
119118
if (x % 2 === 0) {
120119
return x;
121-
} else {
122-
return undefined;
123120
}
121+
124122
}), /* :: */[
125123
1,
126124
/* :: */[

Diff for: ‎jscomp/test/js_re_test.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,8 @@ var suites_001 = /* :: */[
3737
var param = new RegExp("<" + (tag + (">(.*?)<\\/" + (tag + ">")))).exec(xmlString);
3838
if (param !== null) {
3939
return Js_primitive.nullable_to_opt(Caml_array.caml_array_get(param, 1));
40-
} else {
41-
return undefined;
4240
}
41+
4342
};
4443
return /* Eq */Block.__(0, [
4544
contentOf("div", "<div>Hi</div>"),

Diff for: ‎jscomp/test/ocaml_parsetree_test.js

+3-6
Original file line numberDiff line numberDiff line change
@@ -1792,9 +1792,8 @@ var $$Error = Caml_exceptions.create("Ocaml_parsetree_test.Location.Error");
17921792
register_error_of_exn((function (param) {
17931793
if (param[0] === $$Error) {
17941794
return param[1];
1795-
} else {
1796-
return undefined;
17971795
}
1796+
17981797
}));
17991798

18001799
function last(param) {
@@ -3347,9 +3346,8 @@ function prepare_error(param) {
33473346
register_error_of_exn((function (param) {
33483347
if (param[0] === $$Error$1) {
33493348
return prepare_error(param[1]);
3350-
} else {
3351-
return undefined;
33523349
}
3350+
33533351
}));
33543352

33553353
function mktyp(d) {
@@ -10748,9 +10746,8 @@ function report_error(ppf, param) {
1074810746
register_error_of_exn((function (param) {
1074910747
if (param[0] === $$Error$2) {
1075010748
return error_of_printer(param[2], report_error, param[1]);
10751-
} else {
10752-
return undefined;
1075310749
}
10750+
1075410751
}));
1075510752

1075610753
var __ocaml_lex_tables = /* record */[

0 commit comments

Comments
 (0)