Skip to content

Commit e8bc689

Browse files
committed
snapshotml
1 parent 0bfe51d commit e8bc689

File tree

8 files changed

+449
-198
lines changed

8 files changed

+449
-198
lines changed

jscomp/all.depend

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,8 @@ core/lam_analysis.cmx : core/lam.cmx core/lam_analysis.cmi
346346
core/lam_closure.cmx : core/lam_analysis.cmx core/lam.cmx ext/ident_set.cmx \
347347
ext/ident_map.cmx core/lam_closure.cmi
348348
core/js_cmj_format.cmx : ext/string_map.cmx core/lam.cmx \
349-
common/js_config.cmx ext/ext_pervasives.cmx core/js_cmj_format.cmi
349+
common/js_config.cmx ext/ext_string.cmx ext/ext_pervasives.cmx \
350+
core/js_cmj_format.cmi
350351
core/js_fun_env.cmx : ext/ident_set.cmx ext/ext_list.cmx core/js_fun_env.cmi
351352
core/js_call_info.cmx : core/js_call_info.cmi
352353
core/js_closure.cmx : ext/ident_set.cmx core/js_closure.cmi
@@ -654,17 +655,17 @@ bsb/bsb_build_util.cmx : ext/literals.cmx ext/ext_sys.cmx ext/ext_string.cmx \
654655
bsb/bsb_build_util.cmi
655656
bsb/bsb_config.cmx : ext/string_set.cmx ext/literals.cmx ext/ext_string.cmx \
656657
ext/ext_filename.cmx bsb/bsb_config.cmi
657-
bsb/bsb_config_parse.cmx : ext/string_hash_set.cmx ext/literals.cmx \
658-
ext/ext_string.cmx ext/ext_json.cmx ext/ext_filename.cmx \
658+
bsb/bsb_config_parse.cmx : ext/string_map.cmx ext/string_hash_set.cmx \
659+
ext/literals.cmx ext/ext_string.cmx ext/ext_json.cmx ext/ext_filename.cmx \
659660
ext/ext_file_pp.cmx bsb/bsb_default.cmx bsb/bsb_config_types.cmx \
660661
bsb/bsb_config.cmx bsb/bsb_build_util.cmx bsb/bsb_build_ui.cmx \
661662
bsb/bsb_build_schemas.cmx bsb/bsb_config_parse.cmi
662663
bsb/bsb_config_types.cmx : ext/string_hash_set.cmx bsb/bsb_config.cmx \
663664
bsb/bsb_build_ui.cmx
664665
bsb/bsb_default.cmx : ext/string_set.cmx ext/literals.cmx \
665666
ext/ext_pervasives.cmx ext/ext_filename.cmx bsb/bsb_config_types.cmx \
666-
bsb/bsb_config.cmx bsb/bsb_build_util.cmx common/bs_pkg.cmx \
667-
bsb/bsb_default.cmi
667+
bsb/bsb_config.cmx bsb/bsb_build_util.cmx common/bs_version.cmx \
668+
common/bs_pkg.cmx bsb/bsb_default.cmi
668669
bsb/bsb_dep_infos.cmx : bsb/bsb_dep_infos.cmi
669670
bsb/bsb_dir.cmx : bsb/bsb_dir.cmi
670671
bsb/bsb_file.cmx : bsb/bsb_file.cmi

jscomp/bin/all_ounit_tests.ml

Lines changed: 35 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1294,6 +1294,12 @@ val map2i : (int -> 'a -> 'b -> 'c ) -> 'a array -> 'b array -> 'c array
12941294

12951295
val to_list_map : ('a -> 'b option) -> 'a array -> 'b list
12961296

1297+
val to_list_map_acc :
1298+
('a -> 'b option) ->
1299+
'a array ->
1300+
'b list ->
1301+
'b list
1302+
12971303
val of_list_map : ('a -> 'b) -> 'a list -> 'b array
12981304

12991305
val rfind_with_index : 'a array -> ('a -> 'b -> bool) -> 'b -> int
@@ -1414,15 +1420,20 @@ let map2i f a b =
14141420
else
14151421
Array.mapi (fun i a -> f i a ( Array.unsafe_get b i )) a
14161422

1417-
let to_list_map f a =
1418-
let rec tolist i res =
1423+
1424+
let rec tolist_aux a f i res =
14191425
if i < 0 then res else
14201426
let v = Array.unsafe_get a i in
1421-
tolist (i - 1)
1427+
tolist_aux a f (i - 1)
14221428
(match f v with
14231429
| Some v -> v :: res
1424-
| None -> res) in
1425-
tolist (Array.length a - 1) []
1430+
| None -> res)
1431+
1432+
let to_list_map f a =
1433+
tolist_aux a f (Array.length a - 1) []
1434+
1435+
let to_list_map_acc f a acc =
1436+
tolist_aux a f (Array.length a - 1) acc
14261437

14271438

14281439
(* TODO: What would happen if [f] raise, memory leak? *)
@@ -2262,7 +2273,19 @@ let suites =
22622273
Ext_array.of_list_map succ [] =~ [||];
22632274
Ext_array.of_list_map succ [1] =~ [|2|];
22642275
Ext_array.of_list_map succ [1;2;3] =~ [|2;3;4|];
2265-
end
2276+
end;
2277+
__LOC__ >:: begin fun _ ->
2278+
Ext_array.to_list_map_acc
2279+
(fun x -> if x mod 2 = 0 then Some x else None )
2280+
[|1;2;3;4;5;6|] [1;2;3]
2281+
=~ [2;4;6;1;2;3]
2282+
end;
2283+
__LOC__ >:: begin fun _ ->
2284+
Ext_array.to_list_map_acc
2285+
(fun x -> if x mod 2 = 0 then Some x else None )
2286+
[|1;2;3;4;5;6|] []
2287+
=~ [2;4;6]
2288+
end;
22662289
]
22672290
end
22682291
module Ounit_tests_util
@@ -3539,7 +3562,10 @@ val commonjs : string
35393562
val amdjs : string
35403563
val goog : string
35413564
val es6 : string
3565+
val es6_global : string
3566+
val amdjs_global : string
35423567
val unused_attribute : string
3568+
val dash_nostdlib : string
35433569
end = struct
35443570
#1 "literals.ml"
35453571
(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -3639,8 +3665,10 @@ let commonjs = "commonjs"
36393665
let amdjs = "amdjs"
36403666
let goog = "goog"
36413667
let es6 = "es6"
3642-
3668+
let es6_global = "es6-global"
3669+
let amdjs_global = "amdjs-global"
36433670
let unused_attribute = "Unused attribute "
3671+
let dash_nostdlib = "-nostdlib"
36443672
end
36453673
module Ounit_cmd_util : sig
36463674
#1 "ounit_cmd_util.mli"

jscomp/bin/bsb.d

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,12 @@ bin/bsb.ml : ext/hash_set_gen.ml
4949
bin/bsb.ml : ext/resize_array.ml
5050
bin/bsb.ml : bsb/bsb_build_ui.mli
5151
bin/bsb.ml : bsb/bsb_dep_infos.ml
52+
bin/bsb.ml : common/bs_version.ml
5253
bin/bsb.ml : ext/ext_filename.mli
5354
bin/bsb.ml : ext/resize_array.mli
5455
bin/bsb.ml : bsb/bsb_build_util.ml
5556
bin/bsb.ml : bsb/bsb_dep_infos.mli
57+
bin/bsb.ml : common/bs_version.mli
5658
bin/bsb.ml : ext/ext_pervasives.ml
5759
bin/bsb.ml : bsb/bsb_build_util.mli
5860
bin/bsb.ml : common/binary_cache.ml

0 commit comments

Comments
 (0)