Skip to content

Commit 9a58ae0

Browse files
bobzhangbobzhang
committed
tweak
1 parent fe51419 commit 9a58ae0

15 files changed

+87
-51
lines changed

‎jscomp/core/js_name_of_module_id.ml

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ let get_runtime_module_path
5050
let current_info_query =
5151
Js_packages_info.query_package_infos current_package_info
5252
module_system in
53-
let js_file = Ext_namespace.js_name_of_modulename Little_js dep_module_id.id.name in
53+
let js_file = Ext_namespace.js_name_of_modulename dep_module_id.id.name Little_js in
5454
match current_info_query with
5555
| Package_not_found -> assert false
5656
| Package_script ->
@@ -116,7 +116,7 @@ let string_of_module_id
116116
| None ->
117117
Bs_exception.error (Missing_ml_dependency dep_module_id.id.name)
118118
| Some (cmj_path, dep_package_info, little) ->
119-
let js_file = Ext_namespace.js_name_of_modulename little dep_module_id.id.name in
119+
let js_file = Ext_namespace.js_name_of_modulename dep_module_id.id.name little in
120120
let dep_info_query =
121121
Js_packages_info.query_package_infos dep_package_info module_system
122122
in

‎jscomp/ext/ext_filename.mli

+3-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,9 @@
3939
TODO : this short name will have to change upon renaming the file.
4040
*)
4141

42-
42+
val is_dir_sep :
43+
char -> bool
44+
4345
val maybe_quote:
4446
string ->
4547
string

‎jscomp/ext/ext_namespace.ml

+2-3
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,11 @@ let ns_sep = "-"
3333
let make ~ns cunit =
3434
cunit ^ ns_sep ^ ns
3535

36-
let path_char = Filename.dir_sep.[0]
3736

3837
let rec rindex_rec s i =
3938
if i < 0 then i else
4039
let char = String.unsafe_get s i in
41-
if char = path_char then -1
40+
if Ext_filename.is_dir_sep char then -1
4241
else if char = ns_sep_char then i
4342
else
4443
rindex_rec s (i - 1)
@@ -67,7 +66,7 @@ type file_kind =
6766
change_ext_ns_suffix s
6867
(if bs_suffix then Literals.suffix_bs_js else Literals.suffix_js ) *)
6968

70-
let js_name_of_modulename little s =
69+
let js_name_of_modulename s little =
7170
match little with
7271
| Little_js ->
7372
change_ext_ns_suffix (Ext_string.uncapitalize_ascii s) Literals.suffix_js

‎jscomp/ext/ext_namespace.mli

+4-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,10 @@ type file_kind =
5252
| Little_bs
5353
(** [js_name_of_modulename ~little A-Ns]
5454
*)
55-
val js_name_of_modulename : file_kind -> string -> string
55+
val js_name_of_modulename :
56+
string ->
57+
file_kind ->
58+
string
5659

5760
(* TODO handle cases like
5861
'@angular/core'

‎jscomp/ounit_tests/ounit_string_tests.ml

+3-3
Original file line numberDiff line numberDiff line change
@@ -373,13 +373,13 @@ let suites =
373373
Ext_namespace.change_ext_ns_suffix "AA-b" Literals.suffix_js
374374
=~ "AA.js";
375375
Ext_namespace.js_name_of_modulename
376-
Little_js "AA-b"
376+
"AA-b" Little_js
377377
=~ "aA.js";
378378
Ext_namespace.js_name_of_modulename
379-
Upper_js "AA-b"
379+
"AA-b" Upper_js
380380
=~ "AA.js";
381381
Ext_namespace.js_name_of_modulename
382-
Upper_bs "AA-b"
382+
"AA-b" Upper_bs
383383
=~ "AA.bs.js";
384384
end;
385385
__LOC__ >:: begin fun _ ->

‎lib/4.02.3/bsb.ml

+9-5
Original file line numberDiff line numberDiff line change
@@ -7389,7 +7389,9 @@ module Ext_filename : sig
73897389
TODO : this short name will have to change upon renaming the file.
73907390
*)
73917391

7392-
7392+
val is_dir_sep :
7393+
char -> bool
7394+
73937395
val maybe_quote:
73947396
string ->
73957397
string
@@ -10443,7 +10445,10 @@ type file_kind =
1044310445
| Little_bs
1044410446
(** [js_name_of_modulename ~little A-Ns]
1044510447
*)
10446-
val js_name_of_modulename : file_kind -> string -> string
10448+
val js_name_of_modulename :
10449+
string ->
10450+
file_kind ->
10451+
string
1044710452

1044810453
(* TODO handle cases like
1044910454
'@angular/core'
@@ -10494,12 +10499,11 @@ let ns_sep = "-"
1049410499
let make ~ns cunit =
1049510500
cunit ^ ns_sep ^ ns
1049610501

10497-
let path_char = Filename.dir_sep.[0]
1049810502

1049910503
let rec rindex_rec s i =
1050010504
if i < 0 then i else
1050110505
let char = String.unsafe_get s i in
10502-
if char = path_char then -1
10506+
if Ext_filename.is_dir_sep char then -1
1050310507
else if char = ns_sep_char then i
1050410508
else
1050510509
rindex_rec s (i - 1)
@@ -10528,7 +10532,7 @@ type file_kind =
1052810532
change_ext_ns_suffix s
1052910533
(if bs_suffix then Literals.suffix_bs_js else Literals.suffix_js ) *)
1053010534

10531-
let js_name_of_modulename little s =
10535+
let js_name_of_modulename s little =
1053210536
match little with
1053310537
| Little_js ->
1053410538
change_ext_ns_suffix (Ext_string.uncapitalize_ascii s) Literals.suffix_js

‎lib/4.02.3/bsb_helper.ml

+9-5
Original file line numberDiff line numberDiff line change
@@ -4491,7 +4491,9 @@ module Ext_filename : sig
44914491
TODO : this short name will have to change upon renaming the file.
44924492
*)
44934493

4494-
4494+
val is_dir_sep :
4495+
char -> bool
4496+
44954497
val maybe_quote:
44964498
string ->
44974499
string
@@ -4700,7 +4702,10 @@ type file_kind =
47004702
| Little_bs
47014703
(** [js_name_of_modulename ~little A-Ns]
47024704
*)
4703-
val js_name_of_modulename : file_kind -> string -> string
4705+
val js_name_of_modulename :
4706+
string ->
4707+
file_kind ->
4708+
string
47044709

47054710
(* TODO handle cases like
47064711
'@angular/core'
@@ -4751,12 +4756,11 @@ let ns_sep = "-"
47514756
let make ~ns cunit =
47524757
cunit ^ ns_sep ^ ns
47534758

4754-
let path_char = Filename.dir_sep.[0]
47554759

47564760
let rec rindex_rec s i =
47574761
if i < 0 then i else
47584762
let char = String.unsafe_get s i in
4759-
if char = path_char then -1
4763+
if Ext_filename.is_dir_sep char then -1
47604764
else if char = ns_sep_char then i
47614765
else
47624766
rindex_rec s (i - 1)
@@ -4785,7 +4789,7 @@ type file_kind =
47854789
change_ext_ns_suffix s
47864790
(if bs_suffix then Literals.suffix_bs_js else Literals.suffix_js ) *)
47874791

4788-
let js_name_of_modulename little s =
4792+
let js_name_of_modulename s little =
47894793
match little with
47904794
| Little_js ->
47914795
change_ext_ns_suffix (Ext_string.uncapitalize_ascii s) Literals.suffix_js

‎lib/4.02.3/bsdep.ml

+3-1
Original file line numberDiff line numberDiff line change
@@ -33871,7 +33871,9 @@ module Ext_filename : sig
3387133871
TODO : this short name will have to change upon renaming the file.
3387233872
*)
3387333873

33874-
33874+
val is_dir_sep :
33875+
char -> bool
33876+
3387533877
val maybe_quote:
3387633878
string ->
3387733879
string

‎lib/4.02.3/bsppx.ml

+3-1
Original file line numberDiff line numberDiff line change
@@ -15924,7 +15924,9 @@ module Ext_filename : sig
1592415924
TODO : this short name will have to change upon renaming the file.
1592515925
*)
1592615926

15927-
15927+
val is_dir_sep :
15928+
char -> bool
15929+
1592815930
val maybe_quote:
1592915931
string ->
1593015932
string

‎lib/4.02.3/unstable/all_ounit_tests.ml

+12-8
Original file line numberDiff line numberDiff line change
@@ -5184,7 +5184,9 @@ module Ext_filename : sig
51845184
TODO : this short name will have to change upon renaming the file.
51855185
*)
51865186

5187-
5187+
val is_dir_sep :
5188+
char -> bool
5189+
51885190
val maybe_quote:
51895191
string ->
51905192
string
@@ -16828,7 +16830,10 @@ type file_kind =
1682816830
| Little_bs
1682916831
(** [js_name_of_modulename ~little A-Ns]
1683016832
*)
16831-
val js_name_of_modulename : file_kind -> string -> string
16833+
val js_name_of_modulename :
16834+
string ->
16835+
file_kind ->
16836+
string
1683216837

1683316838
(* TODO handle cases like
1683416839
'@angular/core'
@@ -16879,12 +16884,11 @@ let ns_sep = "-"
1687916884
let make ~ns cunit =
1688016885
cunit ^ ns_sep ^ ns
1688116886

16882-
let path_char = Filename.dir_sep.[0]
1688316887

1688416888
let rec rindex_rec s i =
1688516889
if i < 0 then i else
1688616890
let char = String.unsafe_get s i in
16887-
if char = path_char then -1
16891+
if Ext_filename.is_dir_sep char then -1
1688816892
else if char = ns_sep_char then i
1688916893
else
1689016894
rindex_rec s (i - 1)
@@ -16913,7 +16917,7 @@ type file_kind =
1691316917
change_ext_ns_suffix s
1691416918
(if bs_suffix then Literals.suffix_bs_js else Literals.suffix_js ) *)
1691516919

16916-
let js_name_of_modulename little s =
16920+
let js_name_of_modulename s little =
1691716921
match little with
1691816922
| Little_js ->
1691916923
change_ext_ns_suffix (Ext_string.uncapitalize_ascii s) Literals.suffix_js
@@ -17364,13 +17368,13 @@ let suites =
1736417368
Ext_namespace.change_ext_ns_suffix "AA-b" Literals.suffix_js
1736517369
=~ "AA.js";
1736617370
Ext_namespace.js_name_of_modulename
17367-
Little_js "AA-b"
17371+
"AA-b" Little_js
1736817372
=~ "aA.js";
1736917373
Ext_namespace.js_name_of_modulename
17370-
Upper_js "AA-b"
17374+
"AA-b" Upper_js
1737117375
=~ "AA.js";
1737217376
Ext_namespace.js_name_of_modulename
17373-
Upper_bs "AA-b"
17377+
"AA-b" Upper_bs
1737417378
=~ "AA.bs.js";
1737517379
end;
1737617380
__LOC__ >:: begin fun _ ->

‎lib/4.02.3/unstable/bsb_native.ml

+9-5
Original file line numberDiff line numberDiff line change
@@ -7389,7 +7389,9 @@ module Ext_filename : sig
73897389
TODO : this short name will have to change upon renaming the file.
73907390
*)
73917391

7392-
7392+
val is_dir_sep :
7393+
char -> bool
7394+
73937395
val maybe_quote:
73947396
string ->
73957397
string
@@ -10443,7 +10445,10 @@ type file_kind =
1044310445
| Little_bs
1044410446
(** [js_name_of_modulename ~little A-Ns]
1044510447
*)
10446-
val js_name_of_modulename : file_kind -> string -> string
10448+
val js_name_of_modulename :
10449+
string ->
10450+
file_kind ->
10451+
string
1044710452

1044810453
(* TODO handle cases like
1044910454
'@angular/core'
@@ -10494,12 +10499,11 @@ let ns_sep = "-"
1049410499
let make ~ns cunit =
1049510500
cunit ^ ns_sep ^ ns
1049610501

10497-
let path_char = Filename.dir_sep.[0]
1049810502

1049910503
let rec rindex_rec s i =
1050010504
if i < 0 then i else
1050110505
let char = String.unsafe_get s i in
10502-
if char = path_char then -1
10506+
if Ext_filename.is_dir_sep char then -1
1050310507
else if char = ns_sep_char then i
1050410508
else
1050510509
rindex_rec s (i - 1)
@@ -10528,7 +10532,7 @@ type file_kind =
1052810532
change_ext_ns_suffix s
1052910533
(if bs_suffix then Literals.suffix_bs_js else Literals.suffix_js ) *)
1053010534

10531-
let js_name_of_modulename little s =
10535+
let js_name_of_modulename s little =
1053210536
match little with
1053310537
| Little_js ->
1053410538
change_ext_ns_suffix (Ext_string.uncapitalize_ascii s) Literals.suffix_js

‎lib/4.02.3/unstable/bspack.ml

+3-1
Original file line numberDiff line numberDiff line change
@@ -5677,7 +5677,9 @@ module Ext_filename : sig
56775677
TODO : this short name will have to change upon renaming the file.
56785678
*)
56795679

5680-
5680+
val is_dir_sep :
5681+
char -> bool
5682+
56815683
val maybe_quote:
56825684
string ->
56835685
string

‎lib/4.02.3/unstable/js_compiler.ml

+11-7
Original file line numberDiff line numberDiff line change
@@ -15831,7 +15831,9 @@ module Ext_filename : sig
1583115831
TODO : this short name will have to change upon renaming the file.
1583215832
*)
1583315833

15834-
15834+
val is_dir_sep :
15835+
char -> bool
15836+
1583515837
val maybe_quote:
1583615838
string ->
1583715839
string
@@ -71172,7 +71174,10 @@ type file_kind =
7117271174
| Little_bs
7117371175
(** [js_name_of_modulename ~little A-Ns]
7117471176
*)
71175-
val js_name_of_modulename : file_kind -> string -> string
71177+
val js_name_of_modulename :
71178+
string ->
71179+
file_kind ->
71180+
string
7117671181

7117771182
(* TODO handle cases like
7117871183
'@angular/core'
@@ -71223,12 +71228,11 @@ let ns_sep = "-"
7122371228
let make ~ns cunit =
7122471229
cunit ^ ns_sep ^ ns
7122571230

71226-
let path_char = Filename.dir_sep.[0]
7122771231

7122871232
let rec rindex_rec s i =
7122971233
if i < 0 then i else
7123071234
let char = String.unsafe_get s i in
71231-
if char = path_char then -1
71235+
if Ext_filename.is_dir_sep char then -1
7123271236
else if char = ns_sep_char then i
7123371237
else
7123471238
rindex_rec s (i - 1)
@@ -71257,7 +71261,7 @@ type file_kind =
7125771261
change_ext_ns_suffix s
7125871262
(if bs_suffix then Literals.suffix_bs_js else Literals.suffix_js ) *)
7125971263

71260-
let js_name_of_modulename little s =
71264+
let js_name_of_modulename s little =
7126171265
match little with
7126271266
| Little_js ->
7126371267
change_ext_ns_suffix (Ext_string.uncapitalize_ascii s) Literals.suffix_js
@@ -96628,7 +96632,7 @@ let get_runtime_module_path
9662896632
let current_info_query =
9662996633
Js_packages_info.query_package_infos current_package_info
9663096634
module_system in
96631-
let js_file = Ext_namespace.js_name_of_modulename Little_js dep_module_id.id.name in
96635+
let js_file = Ext_namespace.js_name_of_modulename dep_module_id.id.name Little_js in
9663296636
match current_info_query with
9663396637
| Package_not_found -> assert false
9663496638
| Package_script ->
@@ -96694,7 +96698,7 @@ let string_of_module_id
9669496698
| None ->
9669596699
Bs_exception.error (Missing_ml_dependency dep_module_id.id.name)
9669696700
| Some (cmj_path, dep_package_info, little) ->
96697-
let js_file = Ext_namespace.js_name_of_modulename little dep_module_id.id.name in
96701+
let js_file = Ext_namespace.js_name_of_modulename dep_module_id.id.name little in
9669896702
let dep_info_query =
9669996703
Js_packages_info.query_package_infos dep_package_info module_system
9670096704
in

‎lib/4.02.3/unstable/native_ppx.ml

+3-1
Original file line numberDiff line numberDiff line change
@@ -15044,7 +15044,9 @@ module Ext_filename : sig
1504415044
TODO : this short name will have to change upon renaming the file.
1504515045
*)
1504615046

15047-
15047+
val is_dir_sep :
15048+
char -> bool
15049+
1504815050
val maybe_quote:
1504915051
string ->
1505015052
string

0 commit comments

Comments
 (0)