Skip to content

remove generic hashtbl #1016

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 19, 2016
Merged

remove generic hashtbl #1016

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f1e213b
no raise for Ext_string.rindex
bobzhang Dec 19, 2016
2c816aa
remove generic hashtbl completely, clean up
bobzhang Dec 19, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions jscomp/.merlin
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,8 @@ B ounit
S ounit_tests
B ounit_tests

S depends
B depends
PKG compiler-libs.common
B +compiler-libs
FLG -w -40-30
5 changes: 4 additions & 1 deletion jscomp/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,8 @@ ext/int_hashtbl.ml: ext/hashtbl.cppo.ml
cppo -D TYPE_INT $< -o $@
ext/ident_hashtbl.ml: ext/hashtbl.cppo.ml
cppo -D TYPE_IDENT $< -o $@
ext/hashtbl_make.ml: ext/hashtbl.cppo.ml
cppo -D TYPE_FUNCTOR $< -o $@
## Stubs
.c.o:
$(NATIVE) -ccopt -o -ccopt $@ -c $<
Expand Down Expand Up @@ -128,6 +130,7 @@ OUNIT_TESTS_SRCS = ounit_tests_util \
ounit_json_tests ounit_map_tests \
ounit_ordered_hash_set_tests \
ounit_vec_test \
ounit_string_tests\
ounit_tests_main
OUNIT_TESTS_CMXS = $(addprefix ounit_tests/, $(addsuffix .cmx, $(OUNIT_TESTS_SRCS)))

Expand All @@ -143,7 +146,6 @@ EXT_SRCS = ext_util\
map_make\
ext_file_pp ext_format \
hashtbl_gen \
ext_hashtbl \
ext_string \
string_hashtbl\
ext_list \
Expand All @@ -159,6 +161,7 @@ EXT_SRCS = ext_util\
ext_ident\
ident_map\
ident_set\
hashtbl_make\
ordered_hash_map_local_ident\
int_map\
literals \
Expand Down
25 changes: 16 additions & 9 deletions jscomp/all.depend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ ext/map_make.cmx : ext/map_gen.cmx ext/map_make.cmi
ext/ext_file_pp.cmx : ext/ext_file_pp.cmi
ext/ext_format.cmx : ext/ext_format.cmi
ext/hashtbl_gen.cmx : ext/ext_util.cmx
ext/ext_hashtbl.cmx : ext/ext_hashtbl.cmi
ext/ext_string.cmx : ext/ext_bytes.cmx ext/ext_string.cmi
ext/string_hashtbl.cmx : ext/hashtbl_gen.cmx ext/ext_string.cmx \
stubs/bs_hash_stubs.cmx ext/string_hashtbl.cmi
Expand Down Expand Up @@ -45,6 +44,7 @@ ext/ext_ident.cmx : ext/string_hashtbl.cmx ext/string_hash_set.cmx \
ext/ext_string.cmx ext/ext_ident.cmi
ext/ident_map.cmx : ext/map_gen.cmx ext/ext_ident.cmx ext/ident_map.cmi
ext/ident_set.cmx : ext/set_gen.cmx ext/ident_set.cmi
ext/hashtbl_make.cmx : ext/hashtbl_gen.cmx ext/hashtbl_make.cmi
ext/ordered_hash_map_local_ident.cmx : ext/ordered_hash_map_gen.cmx \
ext/ext_ident.cmx stubs/bs_hash_stubs.cmx \
ext/ordered_hash_map_local_ident.cmi
Expand Down Expand Up @@ -79,7 +79,6 @@ ext/int_vec_vec.cmi : ext/vec_gen.cmx ext/int_vec.cmi
ext/map_make.cmi : ext/map_gen.cmx
ext/ext_file_pp.cmi :
ext/ext_format.cmi :
ext/ext_hashtbl.cmi :
ext/ext_string.cmi :
ext/string_hashtbl.cmi : ext/hashtbl_gen.cmx
ext/ext_list.cmi :
Expand All @@ -98,6 +97,7 @@ ext/union_find.cmi :
ext/ext_ident.cmi :
ext/ident_map.cmi : ext/map_gen.cmx
ext/ident_set.cmi : ext/set_gen.cmx
ext/hashtbl_make.cmi : ext/hashtbl_gen.cmx
ext/ordered_hash_map_local_ident.cmi : ext/ordered_hash_map_gen.cmx
ext/int_map.cmi : ext/map_gen.cmx
ext/literals.cmi :
Expand Down Expand Up @@ -203,9 +203,10 @@ depends/depends_post_process.cmx : ext/string_map.cmx ext/literals.cmx \
ext/ext_string.cmx ext/ext_pervasives.cmx common/binary_cache.cmx \
depends/depends_post_process.cmi
depends/bs_exception.cmx : depends/bs_exception.cmi
depends/ast_extract.cmx : ext/string_map.cmx common/js_config.cmx \
ext/ext_string.cmx ext/ext_list.cmx ext/ext_format.cmx \
ext/ext_filename.cmx depends/bs_exception.cmx depends/ast_extract.cmi
depends/ast_extract.cmx : ext/string_map.cmx ext/string_hashtbl.cmx \
common/js_config.cmx ext/ext_string.cmx ext/ext_list.cmx \
ext/ext_format.cmx ext/ext_filename.cmx depends/bs_exception.cmx \
depends/ast_extract.cmi
depends/binary_ast.cmx : depends/ast_extract.cmx depends/binary_ast.cmi
core/type_util.cmi :
core/bs_conditional_initial.cmi :
Expand All @@ -224,7 +225,8 @@ core/js_closure.cmi : ext/ident_set.cmi
core/js_number.cmi :
core/js_cmj_datasets.cmi : ext/string_map.cmi core/js_cmj_format.cmi
core/lam_exit_code.cmi : core/lam.cmi
core/lam_module_ident.cmi : core/js_op.cmx common/js_config.cmi core/j.cmx
core/lam_module_ident.cmi : core/js_op.cmx common/js_config.cmi core/j.cmx \
ext/hashtbl_gen.cmx
core/lam_compile_util.cmi : core/js_op.cmx
core/lam_stats.cmi : core/lam_module_ident.cmi core/lam.cmi \
ext/int_hash_set.cmi ext/ident_set.cmi ext/ident_hashtbl.cmi
Expand Down Expand Up @@ -320,6 +322,7 @@ core/lam_exit_code.cmx : core/lam.cmx core/lam_exit_code.cmi
core/j.cmx : core/js_op.cmx core/js_fun_env.cmx core/js_closure.cmx \
core/js_call_info.cmx ext/ident_set.cmx
core/lam_module_ident.cmx : core/js_op.cmx common/js_config.cmx core/j.cmx \
ext/hashtbl_make.cmx ext/ext_ident.cmx stubs/bs_hash_stubs.cmx \
core/lam_module_ident.cmi
core/lam_compile_util.cmx : core/js_op.cmx core/lam_compile_util.cmi
core/lam_stats.cmx : core/lam_module_ident.cmx core/lam.cmx \
Expand Down Expand Up @@ -421,7 +424,8 @@ core/lam_pass_collect.cmx : core/lam_util.cmx core/lam_stats_util.cmx \
core/js_program_loader.cmx : core/lam_module_ident.cmx \
core/lam_compile_env.cmx core/js_stmt_make.cmx core/js_exp_make.cmx \
common/js_config.cmx core/j.cmx ext/ident_set.cmx ext/ext_pervasives.cmx \
ext/ext_filename.cmx core/config_util.cmx core/js_program_loader.cmi
ext/ext_filename.cmx core/config_util.cmx depends/bs_exception.cmx \
core/js_program_loader.cmi
core/js_dump.cmx : ext/literals.cmx core/lam_module_ident.cmx \
core/js_stmt_make.cmx core/js_program_loader.cmx core/js_op_util.cmx \
core/js_op.cmx core/js_number.cmx core/js_fun_env.cmx \
Expand Down Expand Up @@ -563,9 +567,11 @@ ounit_tests/ounit_ordered_hash_set_tests.cmx : \
ext/ordered_hash_set_string.cmx ounit/oUnit.cmx ext/ext_util.cmx
ounit_tests/ounit_vec_test.cmx : ounit/oUnit.cmx ext/int_vec.cmx \
bsb/bsb_json.cmx
ounit_tests/ounit_string_tests.cmx : ounit/oUnit.cmx ext/ext_string.cmx
ounit_tests/ounit_tests_main.cmx : ext/resize_array.cmx \
ounit_tests/ounit_vec_test.cmx ounit_tests/ounit_union_find_tests.cmx \
ounit_tests/ounit_scc_tests.cmx ounit_tests/ounit_path_tests.cmx \
ounit_tests/ounit_string_tests.cmx ounit_tests/ounit_scc_tests.cmx \
ounit_tests/ounit_path_tests.cmx \
ounit_tests/ounit_ordered_hash_set_tests.cmx \
ounit_tests/ounit_map_tests.cmx ounit_tests/ounit_list_test.cmx \
ounit_tests/ounit_json_tests.cmx ounit_tests/ounit_hashtbl_tests.cmx \
Expand Down Expand Up @@ -602,7 +608,8 @@ bsb/bsb_main.cmx : ext/string_vec.cmx ext/literals.cmx ext/ext_string.cmx \
bsb/bsb_ninja.cmx : ext/string_set.cmx ext/string_map.cmx ext/literals.cmx \
ext/ext_filename.cmx bsb/bsb_config.cmx bsb/bsb_build_util.cmx \
bsb/bsb_build_ui.cmx common/binary_cache.cmx bsb/bsb_ninja.cmi
bsb/sexp_eval.cmx : bsb/sexp_lexer.cmx ext/ext_list.cmx
bsb/sexp_eval.cmx : ext/string_hashtbl.cmx bsb/sexp_lexer.cmx \
ext/ext_list.cmx
bsb/sexp_lexer.cmx : bsb/sexp_lexer.cmi
bsb/bsb_build_ui.cmi : ext/string_set.cmi ext/string_map.cmi \
ext/ext_file_pp.cmi bsb/bsb_json.cmi common/binary_cache.cmi
Expand Down
1 change: 1 addition & 0 deletions jscomp/bin/all_ounit_tests.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ bin/all_ounit_tests.ml : ext/int_vec_vec.mli
bin/all_ounit_tests.ml : ext/ext_scc.ml
bin/all_ounit_tests.ml : ext/ext_scc.mli
bin/all_ounit_tests.ml : ounit_tests/ounit_scc_tests.ml
bin/all_ounit_tests.ml : ounit_tests/ounit_string_tests.ml
bin/all_ounit_tests.ml : ext/union_find.ml
bin/all_ounit_tests.ml : ext/union_find.mli
bin/all_ounit_tests.ml : ounit_tests/ounit_union_find_tests.ml
Expand Down
Loading