Skip to content

Commit a5ef3c3

Browse files
authored
Merge pull request #1890 from BuckleScript/no_reduant_warning_when_input_is_via_generator
clean up, remove reduandent warnings about input invalid file
2 parents b2119ae + effb980 commit a5ef3c3

29 files changed

+602
-470
lines changed

jscomp/all.depend

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -802,8 +802,9 @@ bsb/bsb_ninja_file_groups.cmx : ext/string_set.cmx ext/string_map.cmx \
802802
bsb/bsb_dir_index.cmx bsb/bsb_config.cmx bsb/bsb_build_schemas.cmx \
803803
bsb/bsb_build_cache.cmx bsb/bsb_ninja_file_groups.cmi
804804
bsb/bsb_ninja_gen.cmx : ext/string_map.cmx ext/literals.cmx \
805-
ext/ext_string.cmx ext/ext_list.cmx ext/ext_filename.cmx bsb/bsb_rule.cmx \
806-
bsb/bsb_pkg_map_gen.cmx bsb/bsb_parse_sources.cmx bsb/bsb_ninja_util.cmx \
805+
ext/ext_string.cmx ext/ext_package_name.cmx ext/ext_list.cmx \
806+
ext/ext_filename.cmx bsb/bsb_rule.cmx bsb/bsb_pkg_map_gen.cmx \
807+
bsb/bsb_parse_sources.cmx bsb/bsb_ninja_util.cmx \
807808
bsb/bsb_ninja_global_vars.cmx bsb/bsb_ninja_file_groups.cmx \
808809
bsb/bsb_dir_index.cmx bsb/bsb_config_types.cmx bsb/bsb_config.cmx \
809810
bsb/bsb_build_util.cmx bsb/bsb_build_schemas.cmx bsb/bsb_build_cache.cmx \
@@ -845,10 +846,10 @@ bsb/bsb_watcher_gen.cmx : ext/ext_list.cmx ext/ext_json_noloc.cmx \
845846
ext/ext_filename.cmx ext/ext_array.cmx bsb/bsb_parse_sources.cmx \
846847
bsb/bsb_config.cmx bsb/bsb_watcher_gen.cmi
847848
bsb/bsb_world.cmx : ext/string_hash_set.cmx ext/literals.cmx \
848-
ext/ext_string.cmx ext/ext_package_name.cmx ext/ext_filename.cmx \
849-
bsb/bsb_unix.cmx bsb/bsb_ninja_regen.cmx bsb/bsb_file.cmx \
850-
bsb/bsb_config_types.cmx bsb/bsb_config_parse.cmx bsb/bsb_config.cmx \
851-
bsb/bsb_build_util.cmx bsb/bsb_world.cmi
849+
ext/ext_package_name.cmx ext/ext_filename.cmx bsb/bsb_unix.cmx \
850+
bsb/bsb_ninja_regen.cmx bsb/bsb_file.cmx bsb/bsb_config_types.cmx \
851+
bsb/bsb_config_parse.cmx bsb/bsb_config.cmx bsb/bsb_build_util.cmx \
852+
bsb/bsb_world.cmi
852853
bsb/oCamlRes.cmx :
853854
bsb/bsb_bsdeps.cmi :
854855
bsb/bsb_build_cache.cmi : ext/string_map.cmi

jscomp/bin/all_ounit_tests.ml

Lines changed: 31 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1764,7 +1764,6 @@ val is_valid_source_name :
17641764
*)
17651765
val is_valid_npm_package_name : string -> bool
17661766

1767-
val module_name_of_package_name : string -> string
17681767

17691768

17701769
val no_char : string -> char -> int -> int -> bool
@@ -2157,31 +2156,6 @@ let is_valid_npm_package_name (s : string) =
21572156
| _ -> false )
21582157
| _ -> false
21592158

2160-
let module_name_of_package_name (s : string) : string =
2161-
let len = String.length s in
2162-
let buf = Buffer.create len in
2163-
let add capital ch =
2164-
Buffer.add_char buf
2165-
(if capital then
2166-
(Char.uppercase ch)
2167-
else ch) in
2168-
let rec aux capital off len =
2169-
if off >= len then ()
2170-
else
2171-
let ch = String.unsafe_get s off in
2172-
match ch with
2173-
| 'a' .. 'z'
2174-
| 'A' .. 'Z'
2175-
| '0' .. '9'
2176-
->
2177-
add capital ch ;
2178-
aux false (off + 1) len
2179-
| '-' ->
2180-
aux true (off + 1) len
2181-
| _ -> aux capital (off+1) len
2182-
in
2183-
aux true 0 len ;
2184-
Buffer.contents buf
21852159

21862160
type check_result =
21872161
| Good
@@ -13653,6 +13627,9 @@ val remove_package_suffix: string -> string
1365313627
relevant issues: #1609, #913
1365413628
*)
1365513629
val js_name_of_basename : string -> string
13630+
13631+
val module_name_of_package_name : string -> string
13632+
1365613633
end = struct
1365713634
#1 "ext_package_name.ml"
1365813635

@@ -13705,6 +13682,31 @@ let js_name_of_basename s =
1370513682
remove_package_suffix (String.uncapitalize s) ^ Literals.suffix_js
1370613683

1370713684

13685+
let module_name_of_package_name (s : string) : string =
13686+
let len = String.length s in
13687+
let buf = Buffer.create len in
13688+
let add capital ch =
13689+
Buffer.add_char buf
13690+
(if capital then
13691+
(Char.uppercase ch)
13692+
else ch) in
13693+
let rec aux capital off len =
13694+
if off >= len then ()
13695+
else
13696+
let ch = String.unsafe_get s off in
13697+
match ch with
13698+
| 'a' .. 'z'
13699+
| 'A' .. 'Z'
13700+
| '0' .. '9'
13701+
->
13702+
add capital ch ;
13703+
aux false (off + 1) len
13704+
| '-' ->
13705+
aux true (off + 1) len
13706+
| _ -> aux capital (off+1) len
13707+
in
13708+
aux true 0 len ;
13709+
Buffer.contents buf
1370813710

1370913711
end
1371013712
module Ounit_data_random
@@ -14022,14 +14024,14 @@ let suites =
1402214024
end;
1402314025

1402414026
__LOC__ >:: begin fun _ ->
14025-
Ext_string.module_name_of_package_name "bs-json"
14027+
Ext_package_name.module_name_of_package_name "bs-json"
1402614028
=~ "BsJson"
1402714029
end;
1402814030
__LOC__ >:: begin fun _ ->
14029-
Ext_string.module_name_of_package_name
14031+
Ext_package_name.module_name_of_package_name
1403014032
"reason-react"
1403114033
=~ "ReasonReact";
14032-
Ext_string.module_name_of_package_name
14034+
Ext_package_name.module_name_of_package_name
1403314035
"reason"
1403414036
=~ "Reason"
1403514037
end;

0 commit comments

Comments
 (0)