Skip to content

Commit ae19d6c

Browse files
authored
move sexp into ext so that we can do lambda optimization unit test in the future (#1049)
* more string_hashtbl testing and moving sexp parser for lambda to ext * more unit tests for sexp parser
1 parent a8118e0 commit ae19d6c

15 files changed

+2178
-951
lines changed

jscomp/Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ OUNIT_TESTS_SRCS = ounit_tests_util \
137137
ounit_vec_test \
138138
ounit_string_tests\
139139
ounit_topsort_tests\
140+
ounit_sexp_tests\
140141
ounit_tests_main
141142
OUNIT_TESTS_CMXS = $(addprefix ounit_tests/, $(addsuffix .cmx, $(OUNIT_TESTS_SRCS)))
142143

@@ -180,6 +181,7 @@ EXT_SRCS = ext_util\
180181
ext_topsort\
181182
ext_pp_scope\
182183
ext_io\
184+
ext_sexp\
183185
ident_hash_set\
184186
hash_set_poly\
185187
ident_hashtbl\
@@ -224,7 +226,7 @@ CORE_CMXS=$(addprefix core/, $(addsuffix .cmx, $(CORE_SRCS)))
224226
OTHER_CORE_SRCS= bsppx_main bspack_main jsoo_main bspp_main js_cmi_datasets \
225227
js_main
226228
OTHER_CORE_CMXS= $(addprefix core/, $(addsuffix .cmx, $(OTHER_CORE_SRCS)))
227-
BSB_SRCS= bsb_config bsb_build_schemas bsb_build_util bsb_dep_infos bsb_dir bsb_json sexp_lexer sexp_eval bsb_ninja bsb_build_ui bsb_default bsb_gen
229+
BSB_SRCS= bsb_config bsb_build_schemas bsb_build_util bsb_dep_infos bsb_dir bsb_json bsb_ninja bsb_build_ui bsb_default bsb_gen
228230

229231
BSB_CMXS=$(addprefix bsb/, $(addsuffix .cmx, $(BSB_SRCS)))
230232
MAIN_SRCS= jsgen_main jscmj_main bsb/bsb_main bsb/bsb_helper_main
@@ -476,7 +478,7 @@ include all.depend
476478
-include $(SNAPSHOT_DEPS)
477479

478480
clean:
479-
rm -f bsb/bs_json.ml bsb/sexp_lexer.ml core/js_fold.ml core/js_map.ml
481+
rm -f bsb/bs_json.ml ext/sexp_lexer.ml core/js_fold.ml core/js_map.ml
480482
rm -f common/bs_version.ml
481483
rm -rf bin/config_whole_compiler.ml
482484
git clean -dfx stubs ext common syntax depends core bsb

jscomp/all.depend

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ ext/ext_topsort.cmx : ext/set_int.cmx ext/resize_array.cmx ext/int_vec.cmx \
6464
ext/ext_pp_scope.cmx : ext/string_map.cmx ext/int_map.cmx ext/ident_set.cmx \
6565
ext/ext_pp_scope.cmi
6666
ext/ext_io.cmx : ext/ext_pervasives.cmx ext/ext_io.cmi
67+
ext/ext_sexp.cmx : ext/ext_sexp.cmi
6768
ext/ident_hash_set.cmx : ext/hash_set_gen.cmx ext/ext_ident.cmx \
6869
stubs/bs_hash_stubs.cmx ext/ident_hash_set.cmi
6970
ext/hash_set_poly.cmx : ext/hash_set_gen.cmx ext/hash_set_poly.cmi
@@ -116,6 +117,7 @@ ext/ext_scc.cmi : ext/int_vec_vec.cmi ext/int_vec.cmi
116117
ext/ext_topsort.cmi : ext/vec_gen.cmx ext/set_int.cmi ext/int_vec.cmi
117118
ext/ext_pp_scope.cmi : ext/ident_set.cmi
118119
ext/ext_io.cmi :
120+
ext/ext_sexp.cmi :
119121
ext/ident_hash_set.cmi : ext/hash_set_gen.cmx
120122
ext/hash_set_poly.cmi :
121123
ext/ident_hashtbl.cmi : ext/hashtbl_gen.cmx
@@ -586,8 +588,8 @@ ounit_tests/ounit_hash_stubs_test.cmx : ounit_tests/ounit_tests_util.cmx \
586588
ounit_tests/ounit_hash_set_tests.cmx : ext/string_hash_set.cmx \
587589
ext/ordered_hash_set_string.cmx ounit/oUnit.cmx ext/hash_set_poly.cmx \
588590
ext/hash_set.cmx
589-
ounit_tests/ounit_scc_tests.cmx : ounit/oUnit.cmx ext/int_vec_vec.cmx \
590-
ext/int_vec.cmx ext/ext_string.cmx ext/ext_scc.cmx
591+
ounit_tests/ounit_scc_tests.cmx : ext/string_hashtbl.cmx ounit/oUnit.cmx \
592+
ext/int_vec_vec.cmx ext/int_vec.cmx ext/ext_string.cmx ext/ext_scc.cmx
591593
ounit_tests/ounit_hashtbl_tests.cmx : ext/string_hashtbl.cmx ounit/oUnit.cmx
592594
ounit_tests/ounit_json_tests.cmx : ext/string_map.cmx ounit/oUnit.cmx \
593595
bsb/bsb_json.cmx
@@ -599,10 +601,12 @@ ounit_tests/ounit_vec_test.cmx : ext/set_int.cmx ounit/oUnit.cmx \
599601
ounit_tests/ounit_string_tests.cmx : ounit/oUnit.cmx ext/ext_string.cmx
600602
ounit_tests/ounit_topsort_tests.cmx : ext/set_int.cmx ounit/oUnit.cmx \
601603
ext/int_vec.cmx ext/ext_topsort.cmx
604+
ounit_tests/ounit_sexp_tests.cmx : ounit/oUnit.cmx ext/ext_sexp.cmx
602605
ounit_tests/ounit_tests_main.cmx : ext/resize_array.cmx \
603606
ounit_tests/ounit_vec_test.cmx ounit_tests/ounit_union_find_tests.cmx \
604607
ounit_tests/ounit_topsort_tests.cmx ounit_tests/ounit_string_tests.cmx \
605-
ounit_tests/ounit_scc_tests.cmx ounit_tests/ounit_path_tests.cmx \
608+
ounit_tests/ounit_sexp_tests.cmx ounit_tests/ounit_scc_tests.cmx \
609+
ounit_tests/ounit_path_tests.cmx \
606610
ounit_tests/ounit_ordered_hash_set_tests.cmx \
607611
ounit_tests/ounit_map_tests.cmx ounit_tests/ounit_list_test.cmx \
608612
ounit_tests/ounit_json_tests.cmx ounit_tests/ounit_hashtbl_tests.cmx \
@@ -640,9 +644,6 @@ bsb/bsb_main.cmx : ext/string_vec.cmx ext/literals.cmx ext/ext_string.cmx \
640644
bsb/bsb_ninja.cmx : ext/string_set.cmx ext/string_map.cmx ext/literals.cmx \
641645
ext/ext_filename.cmx bsb/bsb_config.cmx bsb/bsb_build_util.cmx \
642646
bsb/bsb_build_ui.cmx common/binary_cache.cmx bsb/bsb_ninja.cmi
643-
bsb/sexp_eval.cmx : ext/string_hashtbl.cmx bsb/sexp_lexer.cmx \
644-
ext/ext_list.cmx
645-
bsb/sexp_lexer.cmx : bsb/sexp_lexer.cmi
646647
bsb/bsb_build_ui.cmi : ext/string_set.cmi ext/string_map.cmi \
647648
ext/ext_file_pp.cmi bsb/bsb_json.cmi common/binary_cache.cmi
648649
bsb/bsb_build_util.cmi : bsb/bsb_json.cmi
@@ -655,7 +656,6 @@ bsb/bsb_helper_main.cmi :
655656
bsb/bsb_json.cmi : ext/string_map.cmi
656657
bsb/bsb_main.cmi :
657658
bsb/bsb_ninja.cmi : bsb/bsb_default.cmi bsb/bsb_build_ui.cmi
658-
bsb/sexp_lexer.cmi :
659659
jscmj_main.cmx : common/js_config.cmx core/js_cmj_format.cmx \
660660
ext/ext_string.cmx ext/ext_pp.cmx ext/ext_pervasives.cmx \
661661
ext/ext_array.cmx jscmj_main.cmi

jscomp/bin/all_ounit_tests.d

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,9 @@ bin/all_ounit_tests.ml : ext/int_vec_vec.mli
7171
bin/all_ounit_tests.ml : ext/ext_scc.ml
7272
bin/all_ounit_tests.ml : ext/ext_scc.mli
7373
bin/all_ounit_tests.ml : ounit_tests/ounit_scc_tests.ml
74+
bin/all_ounit_tests.ml : ext/ext_sexp.ml
75+
bin/all_ounit_tests.ml : ext/ext_sexp.mli
76+
bin/all_ounit_tests.ml : ounit_tests/ounit_sexp_tests.ml
7477
bin/all_ounit_tests.ml : ounit_tests/ounit_string_tests.ml
7578
bin/all_ounit_tests.ml : ext/ext_topsort.ml
7679
bin/all_ounit_tests.ml : ext/ext_topsort.mli

0 commit comments

Comments
 (0)