Skip to content

Commit 0018aa3

Browse files
cknittcknitt
committed
Clean up literals.ml
1 parent 3e4edc7 commit 0018aa3

13 files changed

+6
-56
lines changed

‎jscomp/bsb/bsb_db_util.ml

-4
Original file line numberDiff line numberDiff line change
@@ -81,14 +81,10 @@ let add_basename ~(dir : string) (map : t) ?error_on_invalid_suffix basename : t
8181
(match () with
8282
| _ when file_suffix = Literals.suffix_ml -> ()
8383
| _ when file_suffix = Literals.suffix_res -> syntax_kind := Res
84-
| _ when file_suffix = Literals.suffix_re -> syntax_kind := Reason
8584
| _ when file_suffix = Literals.suffix_mli -> info := Intf
8685
| _ when file_suffix = Literals.suffix_resi ->
8786
info := Intf;
8887
syntax_kind := Res
89-
| _ when file_suffix = Literals.suffix_rei ->
90-
info := Intf;
91-
syntax_kind := Reason
9288
| _ -> invalid_suffix := true);
9389
let info = !info in
9490
let syntax_kind = !syntax_kind in

‎jscomp/bsb/bsb_ninja_file_groups.ml

-3
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ let handle_generators oc (group : Bsb_file_groups.file_group) custom_rules =
4040

4141
type suffixes = { impl : string; intf : string }
4242

43-
let re_suffixes = { impl = Literals.suffix_re; intf = Literals.suffix_rei }
44-
4543
let ml_suffixes = { impl = Literals.suffix_ml; intf = Literals.suffix_mli }
4644

4745
let res_suffixes = { impl = Literals.suffix_res; intf = Literals.suffix_resi }
@@ -52,7 +50,6 @@ let emit_module_build (rules : Bsb_ninja_rule.builtin)
5250
let has_intf_file = module_info.info = Impl_intf in
5351
let config, ast_rule =
5452
match module_info.syntax_kind with
55-
| Reason -> (re_suffixes, rules.build_ast_from_re)
5653
| Ml -> (ml_suffixes, rules.build_ast)
5754
| Res -> (res_suffixes, rules.build_ast_from_re)
5855
(* FIXME: better names *)

‎jscomp/bsb/bsb_ninja_gen.ml

-2
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ let output_installation_file cwd_lib_bs namespace files_to_install =
113113
let suffix =
114114
match syntax_kind with
115115
| Ml -> Literals.suffix_ml
116-
| Reason -> Literals.suffix_re
117116
| Res -> Literals.suffix_res
118117
in
119118
oo suffix ~dest:base ~src:(sb // name_sans_extension);
@@ -124,7 +123,6 @@ let output_installation_file cwd_lib_bs namespace files_to_install =
124123
let suffix_b =
125124
match syntax_kind with
126125
| Ml -> Literals.suffix_mli
127-
| Reason -> Literals.suffix_rei
128126
| Res -> Literals.suffix_resi
129127
in
130128
oo suffix_b ~dest:base ~src:(sb // name_sans_extension);

‎jscomp/ext/bsb_db.ml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ type info =
3131
| Impl
3232
| Impl_intf
3333

34-
type syntax_kind = Ml | Reason | Res
34+
type syntax_kind = Ml | Res
3535

3636
type module_info = {
3737
mutable info : info;

‎jscomp/ext/bsb_db.mli

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ type info =
3737
| Impl
3838
| Impl_intf
3939

40-
type syntax_kind = Ml | Reason | Res
40+
type syntax_kind = Ml | Res
4141

4242
type module_info = {
4343
mutable info : info;

‎jscomp/ext/literals.ml

-4
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,6 @@ let suffix_ml = ".ml"
101101

102102
let suffix_mli = ".mli"
103103

104-
let suffix_re = ".re"
105-
106-
let suffix_rei = ".rei"
107-
108104
let suffix_res = ".res"
109105

110106
let suffix_resi = ".resi"

‎jscomp/main/rescript_main.ml

-2
Original file line numberDiff line numberDiff line change
@@ -209,8 +209,6 @@ let info_subcommand ~start argv =
209209
let extensions =
210210
match (syntax_kind, info) with
211211
| _, Intf -> assert false
212-
| Reason, Impl -> [ ".re" ]
213-
| Reason, Impl_intf -> [ ".re"; ".rei" ]
214212
| Ml, Impl -> [ ".ml" ]
215213
| Ml, Impl_intf -> [ ".ml"; ".mli" ]
216214
| Res, Impl -> [ ".res" ]

‎lib/4.06.1/bsb_helper.ml

-4
Original file line numberDiff line numberDiff line change
@@ -1289,10 +1289,6 @@ let suffix_ml = ".ml"
12891289

12901290
let suffix_mli = ".mli"
12911291

1292-
let suffix_re = ".re"
1293-
1294-
let suffix_rei = ".rei"
1295-
12961292
let suffix_res = ".res"
12971293

12981294
let suffix_resi = ".resi"

‎lib/4.06.1/rescript.ml

+2-17
Original file line numberDiff line numberDiff line change
@@ -3542,7 +3542,7 @@ type info =
35423542
| Impl
35433543
| Impl_intf
35443544

3545-
type syntax_kind = Ml | Reason | Res
3545+
type syntax_kind = Ml | Res
35463546

35473547
type module_info = {
35483548
mutable info : info;
@@ -3606,7 +3606,7 @@ type info =
36063606
| Impl
36073607
| Impl_intf
36083608

3609-
type syntax_kind = Ml | Reason | Res
3609+
type syntax_kind = Ml | Res
36103610

36113611
type module_info = {
36123612
mutable info : info;
@@ -5567,10 +5567,6 @@ let suffix_ml = ".ml"
55675567
55685568
let suffix_mli = ".mli"
55695569
5570-
let suffix_re = ".re"
5571-
5572-
let suffix_rei = ".rei"
5573-
55745570
let suffix_res = ".res"
55755571
55765572
let suffix_resi = ".resi"
@@ -9668,14 +9664,10 @@ let add_basename ~(dir : string) (map : t) ?error_on_invalid_suffix basename : t
96689664
(match () with
96699665
| _ when file_suffix = Literals.suffix_ml -> ()
96709666
| _ when file_suffix = Literals.suffix_res -> syntax_kind := Res
9671-
| _ when file_suffix = Literals.suffix_re -> syntax_kind := Reason
96729667
| _ when file_suffix = Literals.suffix_mli -> info := Intf
96739668
| _ when file_suffix = Literals.suffix_resi ->
96749669
info := Intf;
96759670
syntax_kind := Res
9676-
| _ when file_suffix = Literals.suffix_rei ->
9677-
info := Intf;
9678-
syntax_kind := Reason
96799671
| _ -> invalid_suffix := true);
96809672
let info = !info in
96819673
let syntax_kind = !syntax_kind in
@@ -12088,8 +12080,6 @@ let handle_generators oc (group : Bsb_file_groups.file_group) custom_rules =
1208812080
1208912081
type suffixes = { impl : string; intf : string }
1209012082
12091-
let re_suffixes = { impl = Literals.suffix_re; intf = Literals.suffix_rei }
12092-
1209312083
let ml_suffixes = { impl = Literals.suffix_ml; intf = Literals.suffix_mli }
1209412084
1209512085
let res_suffixes = { impl = Literals.suffix_res; intf = Literals.suffix_resi }
@@ -12100,7 +12090,6 @@ let emit_module_build (rules : Bsb_ninja_rule.builtin)
1210012090
let has_intf_file = module_info.info = Impl_intf in
1210112091
let config, ast_rule =
1210212092
match module_info.syntax_kind with
12103-
| Reason -> (re_suffixes, rules.build_ast_from_re)
1210412093
| Ml -> (ml_suffixes, rules.build_ast)
1210512094
| Res -> (res_suffixes, rules.build_ast_from_re)
1210612095
(* FIXME: better names *)
@@ -12330,7 +12319,6 @@ let output_installation_file cwd_lib_bs namespace files_to_install =
1233012319
let suffix =
1233112320
match syntax_kind with
1233212321
| Ml -> Literals.suffix_ml
12333-
| Reason -> Literals.suffix_re
1233412322
| Res -> Literals.suffix_res
1233512323
in
1233612324
oo suffix ~dest:base ~src:(sb // name_sans_extension);
@@ -12341,7 +12329,6 @@ let output_installation_file cwd_lib_bs namespace files_to_install =
1234112329
let suffix_b =
1234212330
match syntax_kind with
1234312331
| Ml -> Literals.suffix_mli
12344-
| Reason -> Literals.suffix_rei
1234512332
| Res -> Literals.suffix_resi
1234612333
in
1234712334
oo suffix_b ~dest:base ~src:(sb // name_sans_extension);
@@ -13246,8 +13233,6 @@ let info_subcommand ~start argv =
1324613233
let extensions =
1324713234
match (syntax_kind, info) with
1324813235
| _, Intf -> assert false
13249-
| Reason, Impl -> [ ".re" ]
13250-
| Reason, Impl_intf -> [ ".re"; ".rei" ]
1325113236
| Ml, Impl -> [ ".ml" ]
1325213237
| Ml, Impl_intf -> [ ".ml"; ".mli" ]
1325313238
| Res, Impl -> [ ".res" ]

‎lib/4.06.1/unstable/all_ounit_tests.ml

+2-6
Original file line numberDiff line numberDiff line change
@@ -5228,7 +5228,7 @@ type info =
52285228
| Impl
52295229
| Impl_intf
52305230

5231-
type syntax_kind = Ml | Reason | Res
5231+
type syntax_kind = Ml | Res
52325232

52335233
type module_info = {
52345234
mutable info : info;
@@ -5292,7 +5292,7 @@ type info =
52925292
| Impl
52935293
| Impl_intf
52945294

5295-
type syntax_kind = Ml | Reason | Res
5295+
type syntax_kind = Ml | Res
52965296

52975297
type module_info = {
52985298
mutable info : info;
@@ -5782,10 +5782,6 @@ let suffix_ml = ".ml"
57825782

57835783
let suffix_mli = ".mli"
57845784

5785-
let suffix_re = ".re"
5786-
5787-
let suffix_rei = ".rei"
5788-
57895785
let suffix_res = ".res"
57905786

57915787
let suffix_resi = ".resi"

‎lib/4.06.1/unstable/js_compiler.ml

-4
Original file line numberDiff line numberDiff line change
@@ -6478,10 +6478,6 @@ let suffix_ml = ".ml"
64786478

64796479
let suffix_mli = ".mli"
64806480

6481-
let suffix_re = ".re"
6482-
6483-
let suffix_rei = ".rei"
6484-
64856481
let suffix_res = ".res"
64866482

64876483
let suffix_resi = ".resi"

‎lib/4.06.1/unstable/js_playground_compiler.ml

-4
Original file line numberDiff line numberDiff line change
@@ -6478,10 +6478,6 @@ let suffix_ml = ".ml"
64786478

64796479
let suffix_mli = ".mli"
64806480

6481-
let suffix_re = ".re"
6482-
6483-
let suffix_rei = ".rei"
6484-
64856481
let suffix_res = ".res"
64866482

64876483
let suffix_resi = ".resi"

‎lib/4.06.1/whole_compiler.ml

-4
Original file line numberDiff line numberDiff line change
@@ -180942,10 +180942,6 @@ let suffix_ml = ".ml"
180942180942

180943180943
let suffix_mli = ".mli"
180944180944

180945-
let suffix_re = ".re"
180946-
180947-
let suffix_rei = ".rei"
180948-
180949180945
let suffix_res = ".res"
180950180946

180951180947
let suffix_resi = ".resi"

0 commit comments

Comments
 (0)