Skip to content

Commit f999db2

Browse files
committed
wip: everything seems to work, more tests (+2 squashed commits)
Squashed commits: [454398f] wip: allow multiple dev groups [eb83371] wip
1 parent c1d2292 commit f999db2

29 files changed

+700
-283
lines changed

.merlin

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
####{BSB GENERATED: NO EDIT
2+
S /Users/hzhang295/git/bucklescript/jscomp/bin/../lib/ocaml
3+
B /Users/hzhang295/git/bucklescript/jscomp/bin/../lib/ocaml
4+
FLG -ppx /Users/hzhang295/git/bucklescript/jscomp/bin/bsppx.exe
5+
6+
FLG -w -40-30 -w +a
7+
S jscomp/test/
8+
B lib/bs/jscomp/test/
9+
10+
S jscomp/test/glob
11+
B lib/bs/jscomp/test/glob
12+
13+
S jscomp/test/acyc
14+
B lib/bs/jscomp/test/acyc
15+
####BSB GENERATED: NO EDIT}

jscomp/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ BSB_SRCS= bsb_config bsb_build_schemas bsb_build_util \
255255

256256
BSB_CMXS=$(addprefix bsb/, $(addsuffix .cmx, $(BSB_SRCS)))
257257
MAIN_SRCS= jsgen_main jscmj_main bsb/bsb_main bsb/bsb_helper_main
258-
MAINS_CMXS=$(addsuffix .cmx, $(MAIN_SRCS))
258+
MAIN_CMXS=$(addsuffix .cmx, $(MAIN_SRCS))
259259

260260
ounit.cmxa: $(OUNIT_CMXS)
261261
ocamlopt.opt -a $^ -o $@

jscomp/all.depend

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -642,9 +642,9 @@ ounit_tests/ounit_tests_main.cmx : ext/resize_array.cmx \
642642
bsb/bsb_build_schemas.cmx :
643643
bsb/bsb_build_ui.cmx : ext/string_vec.cmx ext/string_set.cmx \
644644
ext/string_map.cmx ext/ext_string.cmx ext/ext_json.cmx \
645-
ext/ext_filename.cmx ext/ext_file_pp.cmx bsb/bsb_dir.cmx \
646-
bsb/bsb_build_util.cmx bsb/bsb_build_schemas.cmx common/binary_cache.cmx \
647-
bsb/bsb_build_ui.cmi
645+
ext/ext_filename.cmx ext/ext_file_pp.cmx ext/ext_array.cmx \
646+
bsb/bsb_dir.cmx bsb/bsb_config.cmx bsb/bsb_build_util.cmx \
647+
bsb/bsb_build_schemas.cmx common/binary_cache.cmx bsb/bsb_build_ui.cmi
648648
bsb/bsb_build_util.cmx : ext/ext_string.cmx ext/ext_list.cmx \
649649
ext/ext_json.cmx ext/ext_filename.cmx ext/ext_array.cmx \
650650
bsb/bsb_config.cmx bsb/bsb_build_util.cmi
@@ -657,7 +657,8 @@ bsb/bsb_dep_infos.cmx : bsb/bsb_dep_infos.cmi
657657
bsb/bsb_dir.cmx : bsb/bsb_dir.cmi
658658
bsb/bsb_gen.cmx : ext/string_map.cmx ext/literals.cmx ext/ext_filename.cmx \
659659
bsb/bsb_ninja.cmx bsb/bsb_config.cmx bsb/bsb_build_util.cmx \
660-
bsb/bsb_build_ui.cmx common/binary_cache.cmx bsb/bsb_gen.cmi
660+
bsb/bsb_build_ui.cmx bsb/bsb_build_schemas.cmx common/binary_cache.cmx \
661+
bsb/bsb_gen.cmi
661662
bsb/bsb_helper_main.cmx : depends/depends_post_process.cmx \
662663
bsb/bsb_helper_main.cmi
663664
bsb/bsb_main.cmx : ext/string_vec.cmx ext/literals.cmx ext/ext_string.cmx \
@@ -667,7 +668,8 @@ bsb/bsb_main.cmx : ext/string_vec.cmx ext/literals.cmx ext/ext_string.cmx \
667668
bsb/bsb_build_ui.cmx bsb/bsb_build_schemas.cmx bsb/bsb_main.cmi
668669
bsb/bsb_ninja.cmx : ext/string_set.cmx ext/string_map.cmx ext/literals.cmx \
669670
ext/ext_filename.cmx bsb/bsb_config.cmx bsb/bsb_build_util.cmx \
670-
bsb/bsb_build_ui.cmx common/binary_cache.cmx bsb/bsb_ninja.cmi
671+
bsb/bsb_build_ui.cmx bsb/bsb_build_schemas.cmx common/binary_cache.cmx \
672+
bsb/bsb_ninja.cmi
671673
bsb/bsb_unix.cmx : bsb/bsb_unix.cmi
672674
bsb/bsb_build_ui.cmi : ext/string_set.cmi ext/string_map.cmi \
673675
ext/ext_json.cmi ext/ext_file_pp.cmi common/binary_cache.cmi

jscomp/bin/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ifndef EXE
66
endif
77
NATIVE=ocamlopt.opt$(EXE)
88

9-
OCAMLOPT_FLAGS= -g -inline 1000 -w -a ../stubs/ext_basic_hash_stubs.c
9+
OCAMLOPT_FLAGS= -inline 1000 -g -w -a ../stubs/ext_basic_hash_stubs.c
1010

1111
bsppx.exe: config_bsppx.mli config_bsppx.ml bsppx.mli bsppx.ml
1212
$(NATIVE) $(OCAMLOPT_FLAGS) $^ -o $@

jscomp/bin/all_ounit_tests.ml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1313,6 +1313,7 @@ val find_and_split :
13131313

13141314
val exists : ('a -> bool) -> 'a array -> bool
13151315

1316+
val is_empty : 'a array -> bool
13161317
end = struct
13171318
#1 "ext_array.ml"
13181319
(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -1493,6 +1494,9 @@ let exists p a =
14931494
else loop (succ i) in
14941495
loop 0
14951496

1497+
1498+
let is_empty arr =
1499+
Array.length arr = 0
14961500
end
14971501
module Ext_bytes : sig
14981502
#1 "ext_bytes.mli"

0 commit comments

Comments
 (0)