Skip to content

Commit 7aa7c23

Browse files
committed
finish hash_set and vector, set continue
1 parent eb1544c commit 7aa7c23

16 files changed

+1487
-922
lines changed

jscomp/Makefile

+8-1
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@ ext/hash_set.ml: ext/hash_set.cppo.ml
3939
ext/hash_set_poly.ml: ext/hash_set.cppo.ml
4040
cppo $< -o $@
4141

42+
ext/int_vec.ml: ext/vec.cppo.ml
43+
cppo -D TYPE_INT $< -o $@
44+
ext/resize_array.ml: ext/vec.cppo.ml
45+
cppo -D TYPE_FUNCTOR $< -o $@
4246
## Stubs
4347
.c.o:
4448
$(NATIVE) -ccopt -o -ccopt $@ -c $<
@@ -82,7 +86,10 @@ OUNIT_TESTS_CMXS = $(addprefix ounit_tests/, $(addsuffix .cmx, $(OUNIT_TESTS_SRC
8286

8387
EXT_SRCS = ext_util\
8488
ext_int\
85-
ext_array ext_bytes ext_char resize_array string_vec\
89+
ext_array ext_bytes ext_char\
90+
vec_gen \
91+
resize_array \
92+
string_vec\
8693
int_vec int_vec_vec bal_set_common\
8794
bal_tree bal_map_common bal_map\
8895
ext_file_pp ext_format \

jscomp/all.depend

+7-6
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@ ext/ext_int.cmx : ext/ext_int.cmi
44
ext/ext_array.cmx : ext/ext_array.cmi
55
ext/ext_bytes.cmx : ext/ext_bytes.cmi
66
ext/ext_char.cmx : ext/ext_char.cmi
7-
ext/resize_array.cmx : ext/ext_array.cmx ext/resize_array.cmi
7+
ext/vec_gen.cmx : ext/ext_array.cmx
8+
ext/resize_array.cmx : ext/vec_gen.cmx ext/resize_array.cmi
89
ext/string_vec.cmx : ext/resize_array.cmx ext/string_vec.cmi
9-
ext/int_vec.cmx : ext/resize_array.cmx ext/int_vec.cmi
10+
ext/int_vec.cmx : ext/vec_gen.cmx ext/int_vec.cmi
1011
ext/int_vec_vec.cmx : ext/resize_array.cmx ext/int_vec.cmx \
1112
ext/int_vec_vec.cmi
1213
ext/bal_set_common.cmx :
@@ -63,10 +64,10 @@ ext/ext_int.cmi :
6364
ext/ext_array.cmi :
6465
ext/ext_bytes.cmi :
6566
ext/ext_char.cmi :
66-
ext/resize_array.cmi :
67-
ext/string_vec.cmi : ext/resize_array.cmi
68-
ext/int_vec.cmi : ext/resize_array.cmi
69-
ext/int_vec_vec.cmi : ext/resize_array.cmi ext/int_vec.cmi
67+
ext/resize_array.cmi : ext/vec_gen.cmx
68+
ext/string_vec.cmi : ext/vec_gen.cmx
69+
ext/int_vec.cmi : ext/vec_gen.cmx
70+
ext/int_vec_vec.cmi : ext/vec_gen.cmx ext/int_vec.cmi
7071
ext/bal_tree.cmi : ext/bal_set_common.cmx
7172
ext/bal_map.cmi : ext/bal_map_common.cmx
7273
ext/ext_file_pp.cmi :

jscomp/bin/all_ounit_tests.d

+3-2
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,11 @@ bin/all_ounit_tests.ml : ext/literals.mli
5050
bin/all_ounit_tests.ml : ext/ext_filename.ml
5151
bin/all_ounit_tests.ml : ext/ext_filename.mli
5252
bin/all_ounit_tests.ml : ounit_tests/ounit_path_tests.ml
53-
bin/all_ounit_tests.ml : ext/resize_array.ml
54-
bin/all_ounit_tests.ml : ext/resize_array.mli
53+
bin/all_ounit_tests.ml : ext/vec_gen.ml
5554
bin/all_ounit_tests.ml : ext/int_vec.ml
5655
bin/all_ounit_tests.ml : ext/int_vec.mli
56+
bin/all_ounit_tests.ml : ext/resize_array.ml
57+
bin/all_ounit_tests.ml : ext/resize_array.mli
5758
bin/all_ounit_tests.ml : ext/int_vec_vec.ml
5859
bin/all_ounit_tests.ml : ext/int_vec_vec.mli
5960
bin/all_ounit_tests.ml : ext/ext_scc.ml

0 commit comments

Comments
 (0)