Merge pull request #1004 from bloomberg/specialize_map

specialize map

Author: bobzhang

jscomp/Makefile

@@ -52,6 +52,18 @@ ext/ident_set.ml : ext/set.cppo.ml
 ext/set_poly.ml : ext/set.cppo.ml
 	cppo  -D TYPE_POLY $< -o $@
 
+
+ext/string_map.ml : ext/map.cppo.ml
+	cppo -D TYPE_STRING $< -o $@
+ext/int_map.ml : ext/map.cppo.ml
+	cppo -D TYPE_INT $< -o $@
+ext/map_make.ml : ext/map.cppo.ml
+	cppo -D TYPE_FUNCTOR $< -o $@
+ext/ident_map.ml : ext/map.cppo.ml
+	cppo -D TYPE_IDENT $< -o $@
+# ext/map_poly.ml : ext/map.cppo.ml
+# 	cppo -D TYPE_POLY $< -o $@
+
 ## Stubs 
 .c.o:
 	$(NATIVE) -ccopt -o -ccopt $@ -c $< 
@@ -90,7 +102,7 @@ common/bs_version.ml: build_version.js ../package.json
 STUB_SRCS = bs_hash_stubs
 OUNIT_SRCS = oUnit oUnitDiff oUnitLogger oUnitTypes oUnitUtils oUnitChooser
 OUNIT_CMXS = $(addprefix ounit/, $(addsuffix .cmx, $(OUNIT_SRCS)))
-OUNIT_TESTS_SRCS =  ounit_tests_util ounit_array_tests ounit_list_test ounit_bal_tree_tests ounit_path_tests ounit_union_find_tests ounit_hash_stubs_test ounit_hash_set_tests ounit_scc_tests ounit_json_tests ounit_vec_test ounit_tests_main
+OUNIT_TESTS_SRCS =  ounit_tests_util ounit_array_tests ounit_list_test ounit_bal_tree_tests ounit_path_tests ounit_union_find_tests ounit_hash_stubs_test ounit_hash_set_tests ounit_scc_tests ounit_json_tests ounit_map_tests ounit_vec_test ounit_tests_main
 OUNIT_TESTS_CMXS = $(addprefix ounit_tests/, $(addsuffix .cmx, $(OUNIT_TESTS_SRCS)))
 
 EXT_SRCS = ext_util\
@@ -101,25 +113,30 @@ EXT_SRCS = ext_util\
 	string_vec\
 	int_vec int_vec_vec \
 	set_gen\
-	bal_map_common bal_map\
+	map_gen\
+	map_make\
 	ext_file_pp ext_format \
 	hashtbl_gen \
 	ext_hashtbl \
 	ext_string \
 	string_hashtbl\
-	ext_list ext_map \
+	ext_list \
+	ext_map \
 	ext_marshal ext_option \
 	ext_pervasives ext_pp ext_ref  ext_sys \
 	hash_set_gen hash_set string_hash_set int_hash_set \
 	 ordered_hash_set ordered_hash_map union_find \
+	ext_ident\
+	ident_map\
 	ident_set\
-	int_map literals string_map \
+	int_map\
+	literals \
+	string_map \
 	string_set\
 	set_int\
 	set_poly\
 	ext_scc ext_pp_scope\
 	ext_io\
-	ext_ident\
 	ident_hash_set\
 	hash_set_poly\
 	ident_hashtbl\
@@ -136,7 +153,7 @@ SYNTAX_SRCS=ast_derive_constructor ast_derive_util ast_exp ast_external ast_lift
 SYNTAX_CMXS=$(addprefix syntax/, $(addsuffix .cmx, $(SYNTAX_SRCS)))
 DEPENDS_SRCS= depends_post_process bs_exception ast_extract binary_ast  
 DEPENDS_CMXS=$(addprefix depends/, $(addsuffix .cmx, $(DEPENDS_SRCS)))
-CORE_SRCS= type_int_to_string type_util ident_map ocaml_stdlib_slots ident_util bs_conditional_initial ocaml_options ocaml_parse lam\
+CORE_SRCS= type_int_to_string type_util  ocaml_stdlib_slots ident_util bs_conditional_initial ocaml_options ocaml_parse lam\
 	lam_print lam_beta_reduce_util lam_inline_util lam_analysis js_cmj_format js_fun_env js_call_info js_closure js_op js_number js_cmj_datasets\
 	lam_exit_code j lam_module_ident lam_compile_util lam_stats config_util lam_compile_defs js_map js_fold js_fold_basic js_pass_scope\
 	js_op_util js_analyzer js_shake js_exp_make js_long js_of_lam_exception js_of_lam_module js_of_lam_array js_of_lam_block js_of_lam_string\

jscomp/all.depend

@@ -11,8 +11,8 @@ ext/int_vec.cmx : ext/vec_gen.cmx ext/int_vec.cmi
 ext/int_vec_vec.cmx : ext/resize_array.cmx ext/int_vec.cmx \
     ext/int_vec_vec.cmi
 ext/set_gen.cmx :
-ext/bal_map_common.cmx :
-ext/bal_map.cmx : ext/bal_map_common.cmx ext/bal_map.cmi
+ext/map_gen.cmx :
+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
@@ -37,19 +37,20 @@ ext/int_hash_set.cmx : ext/hash_set_gen.cmx ext/ext_int.cmx \
 ext/ordered_hash_set.cmx : ext/ext_util.cmx ext/ordered_hash_set.cmi
 ext/ordered_hash_map.cmx : ext/ext_util.cmx ext/ordered_hash_map.cmi
 ext/union_find.cmx : ext/union_find.cmi
+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/int_map.cmx : ext/int_map.cmi
+ext/int_map.cmx : ext/map_gen.cmx ext/ext_int.cmx ext/int_map.cmi
 ext/literals.cmx : ext/literals.cmi
-ext/string_map.cmx : ext/bal_map_common.cmx ext/string_map.cmi
+ext/string_map.cmx : ext/map_gen.cmx ext/string_map.cmi
 ext/string_set.cmx : ext/set_gen.cmx ext/string_set.cmi
 ext/set_int.cmx : ext/set_gen.cmx ext/ext_int.cmx
 ext/set_poly.cmx : ext/set_gen.cmx ext/set_poly.cmi
 ext/ext_scc.cmx : ext/int_vec_vec.cmx ext/int_vec.cmx ext/ext_scc.cmi
 ext/ext_pp_scope.cmx : ext/string_map.cmx ext/int_map.cmx ext/ident_set.cmx \
     ext/ext_pp_scope.cmi
 ext/ext_io.cmx : ext/ext_pervasives.cmx ext/ext_io.cmi
-ext/ext_ident.cmx : ext/string_hashtbl.cmx ext/string_hash_set.cmx \
-    ext/ext_string.cmx ext/ext_ident.cmi
 ext/ident_hash_set.cmx : ext/hash_set_gen.cmx ext/ext_ident.cmx \
     stubs/bs_hash_stubs.cmx ext/ident_hash_set.cmi
 ext/hash_set_poly.cmx : ext/hash_set_gen.cmx ext/hash_set_poly.cmi
@@ -68,7 +69,7 @@ ext/resize_array.cmi : ext/vec_gen.cmx
 ext/string_vec.cmi : ext/vec_gen.cmx
 ext/int_vec.cmi : ext/vec_gen.cmx
 ext/int_vec_vec.cmi : ext/vec_gen.cmx ext/int_vec.cmi
-ext/bal_map.cmi : ext/bal_map_common.cmx
+ext/map_make.cmi : ext/map_gen.cmx
 ext/ext_file_pp.cmi :
 ext/ext_format.cmi :
 ext/ext_hashtbl.cmi :
@@ -88,16 +89,17 @@ ext/int_hash_set.cmi : ext/hash_set_gen.cmx
 ext/ordered_hash_set.cmi :
 ext/ordered_hash_map.cmi :
 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/int_map.cmi :
+ext/int_map.cmi : ext/map_gen.cmx
 ext/literals.cmi :
-ext/string_map.cmi :
+ext/string_map.cmi : ext/map_gen.cmx
 ext/string_set.cmi :
 ext/set_poly.cmi :
 ext/ext_scc.cmi : ext/int_vec_vec.cmi ext/int_vec.cmi
 ext/ext_pp_scope.cmi : ext/ident_set.cmi
 ext/ext_io.cmi :
-ext/ext_ident.cmi :
 ext/ident_hash_set.cmi : ext/hash_set_gen.cmx
 ext/hash_set_poly.cmi :
 ext/ident_hashtbl.cmi : ext/hashtbl_gen.cmx
@@ -199,15 +201,14 @@ depends/ast_extract.cmx : ext/string_map.cmx common/js_config.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/ident_map.cmi :
 core/bs_conditional_initial.cmi :
 core/ocaml_options.cmi :
 core/ocaml_parse.cmi :
 core/lam.cmi : ext/ident_set.cmi
 core/lam_print.cmi : core/lam.cmi
 core/lam_beta_reduce_util.cmi : core/lam.cmi
 core/lam_inline_util.cmi : core/lam.cmi
-core/lam_analysis.cmi : core/lam.cmi ext/ident_set.cmi core/ident_map.cmi
+core/lam_analysis.cmi : core/lam.cmi ext/ident_set.cmi ext/ident_map.cmi
 core/js_cmj_format.cmi : ext/string_map.cmi core/lam.cmi \
     common/js_config.cmi
 core/js_fun_env.cmi : ext/ident_set.cmi
@@ -221,7 +222,7 @@ 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
 core/config_util.cmi : core/js_cmj_format.cmi
-core/lam_compile_defs.cmi : core/lam_stats.cmi core/j.cmx core/ident_map.cmi
+core/lam_compile_defs.cmi : core/lam_stats.cmi core/j.cmx ext/ident_map.cmi
 core/js_fold_basic.cmi : core/lam_module_ident.cmi core/j.cmx \
     ext/ident_set.cmi ext/hash_set_poly.cmi
 core/js_pass_scope.cmi : core/j.cmx ext/ident_set.cmi
@@ -242,7 +243,7 @@ core/js_arr.cmi : core/j.cmx
 core/lam_compile_const.cmi : core/j.cmx
 core/lam_inner.cmi : core/lam.cmi
 core/lam_util.cmi : core/lam_stats.cmi core/lam.cmi core/j.cmx \
-    ext/ident_set.cmi core/ident_map.cmi
+    ext/ident_set.cmi ext/ident_map.cmi
 core/lam_group.cmi : core/lam.cmi
 core/js_stmt_make.cmi : core/lam.cmi core/js_closure.cmi core/j.cmx
 core/js_pass_flatten.cmi : core/j.cmx
@@ -255,7 +256,7 @@ core/lam_compile_env.cmi : core/lam_module_ident.cmi core/lam.cmi \
     common/js_config.cmi core/js_cmj_format.cmi ext/hash_set_poly.cmi
 core/lam_stats_util.cmi : core/lam_stats.cmi core/lam.cmi
 core/lam_stats_export.cmi : core/lam_stats.cmi core/lam_module_ident.cmi \
-    core/lam.cmi core/js_cmj_format.cmi core/ident_map.cmi
+    core/lam.cmi core/js_cmj_format.cmi ext/ident_map.cmi
 core/lam_pass_alpha_conversion.cmi : core/lam_stats.cmi core/lam.cmi
 core/lam_pass_collect.cmi : core/lam_stats.cmi core/lam.cmi
 core/js_program_loader.cmi : core/lam_module_ident.cmi core/j.cmx
@@ -267,7 +268,7 @@ core/lam_compile_global.cmi : core/lam_compile_env.cmi core/lam.cmi \
     core/j.cmx
 core/lam_dispatch_primitive.cmi : core/j.cmx
 core/lam_beta_reduce.cmi : core/lam_stats.cmi core/lam_analysis.cmi \
-    core/lam.cmi core/ident_map.cmi
+    core/lam.cmi ext/ident_map.cmi
 core/lam_compile_external_call.cmi : core/lam_compile_defs.cmi core/j.cmx
 core/lam_compile_primitive.cmi : core/lam_compile_defs.cmi core/lam.cmi \
     core/j.cmx
@@ -282,8 +283,6 @@ core/ocaml_batch_compile.cmi :
 core/type_int_to_string.cmx :
 core/type_util.cmx : core/type_int_to_string.cmx common/ext_log.cmx \
     core/type_util.cmi
-core/ident_map.cmx : ext/ext_ident.cmx ext/bal_map_common.cmx \
-    core/ident_map.cmi
 core/ocaml_stdlib_slots.cmx :
 core/ident_util.cmx : common/ext_log.cmx
 core/bs_conditional_initial.cmx : common/bs_version.cmx \
@@ -298,7 +297,7 @@ core/lam_print.cmx : core/lam.cmx core/lam_print.cmi
 core/lam_beta_reduce_util.cmx : core/lam.cmx ext/ident_hashtbl.cmx \
     core/lam_beta_reduce_util.cmi
 core/lam_inline_util.cmx : core/lam.cmx core/lam_inline_util.cmi
-core/lam_analysis.cmx : core/lam.cmx ext/ident_set.cmx core/ident_map.cmx \
+core/lam_analysis.cmx : core/lam.cmx ext/ident_set.cmx ext/ident_map.cmx \
     core/lam_analysis.cmi
 core/js_cmj_format.cmx : ext/string_map.cmx core/lam.cmx \
     common/js_config.cmx ext/ext_pervasives.cmx core/js_cmj_format.cmi
@@ -320,7 +319,7 @@ core/lam_stats.cmx : core/lam_module_ident.cmx core/lam.cmx \
     core/lam_stats.cmi
 core/config_util.cmx : core/js_cmj_format.cmx depends/bs_exception.cmx \
     core/config_util.cmi
-core/lam_compile_defs.cmx : core/lam_stats.cmx core/j.cmx core/ident_map.cmx \
+core/lam_compile_defs.cmx : core/lam_stats.cmx core/j.cmx ext/ident_map.cmx \
     core/lam_compile_defs.cmi
 core/js_map.cmx : core/j.cmx
 core/js_fold.cmx : core/j.cmx
@@ -364,7 +363,7 @@ core/lam_inner.cmx : core/lam.cmx core/lam_inner.cmi
 core/lam_util.cmx : ext/literals.cmx core/lam_stats.cmx core/lam_print.cmx \
     core/lam_module_ident.cmx core/lam_analysis.cmx core/lam.cmx \
     core/js_fold_basic.cmx common/js_config.cmx ext/ident_set.cmx \
-    core/ident_map.cmx ext/ident_hashtbl.cmx ext/ext_list.cmx \
+    ext/ident_map.cmx ext/ident_hashtbl.cmx ext/ext_list.cmx \
     ext/ext_filename.cmx core/lam_util.cmi
 core/lam_group.cmx : core/lam_util.cmx core/lam_print.cmx core/lam.cmx \
     core/js_number.cmx ext/ident_set.cmx core/lam_group.cmi
@@ -402,7 +401,7 @@ core/lam_stats_export.cmx : ext/string_map.cmx core/lam_stats_util.cmx \
     core/lam_stats.cmx core/lam_module_ident.cmx core/lam_inline_util.cmx \
     core/lam_compile_env.cmx core/lam_analysis.cmx core/lam.cmx \
     common/js_config.cmx core/js_cmj_format.cmx ext/ident_set.cmx \
-    core/ident_map.cmx ext/ext_string.cmx ext/ext_pervasives.cmx \
+    ext/ident_map.cmx ext/ext_string.cmx ext/ext_pervasives.cmx \
     ext/ext_option.cmx common/ext_log.cmx ext/ext_list.cmx ext/ext_ident.cmx \
     ext/ext_filename.cmx core/lam_stats_export.cmi
 core/lam_pass_alpha_conversion.cmx : core/lam_util.cmx \
@@ -439,7 +438,7 @@ core/lam_dispatch_primitive.cmx : core/js_stmt_make.cmx \
     common/ext_log.cmx ext/ext_list.cmx core/lam_dispatch_primitive.cmi
 core/lam_beta_reduce.cmx : core/lam_util.cmx core/lam_stats.cmx \
     core/lam_compile_global.cmx core/lam_beta_reduce_util.cmx \
-    core/lam_analysis.cmx core/lam.cmx core/ident_map.cmx \
+    core/lam_analysis.cmx core/lam.cmx ext/ident_map.cmx \
     ext/ident_hashtbl.cmx core/lam_beta_reduce.cmi
 core/lam_compile_external_call.cmx : core/lam_dispatch_primitive.cmx \
     core/lam_compile_env.cmx core/lam_compile_defs.cmx core/js_op.cmx \
@@ -464,13 +463,13 @@ core/lam_compile.cmx : ext/literals.cmx core/lam_util.cmx \
     core/js_of_lam_record.cmx core/js_of_lam_array.cmx core/js_exp_make.cmx \
     common/js_config.cmx core/js_call_info.cmx core/js_ast_util.cmx \
     core/js_arr.cmx core/js_analyzer.cmx core/j.cmx ext/ident_set.cmx \
-    core/ident_map.cmx ext/ext_string.cmx ext/ext_list.cmx ext/ext_ident.cmx \
+    ext/ident_map.cmx ext/ext_string.cmx ext/ext_list.cmx ext/ext_ident.cmx \
     core/lam_compile.cmi
 core/lam_pass_exits.cmx : core/lam_util.cmx core/lam_beta_reduce.cmx \
-    core/lam_analysis.cmx core/lam.cmx ext/int_hashtbl.cmx core/ident_map.cmx \
+    core/lam_analysis.cmx core/lam.cmx ext/int_hashtbl.cmx ext/ident_map.cmx \
     core/lam_pass_exits.cmi
 core/lam_pass_lets_dce.cmx : core/lam_util.cmx core/lam_beta_reduce.cmx \
-    core/lam_analysis.cmx core/lam.cmx ext/ident_set.cmx core/ident_map.cmx \
+    core/lam_analysis.cmx core/lam.cmx ext/ident_set.cmx ext/ident_map.cmx \
     ext/ident_hashtbl.cmx ext/ext_list.cmx core/lam_pass_lets_dce.cmi
 core/lam_pass_remove_alias.cmx : core/lam_util.cmx core/lam_stats.cmx \
     core/lam_module_ident.cmx core/lam_inline_util.cmx \
@@ -490,7 +489,7 @@ core/lam_compile_group.cmx : ext/string_hash_set.cmx core/lam_util.cmx \
     core/js_pass_flatten.cmx core/js_pass_debug.cmx core/js_output.cmx \
     core/js_fold_basic.cmx core/js_exp_make.cmx core/js_dump.cmx \
     common/js_config.cmx core/js_cmj_format.cmx core/j.cmx ext/ident_set.cmx \
-    core/ident_map.cmx ext/ext_pervasives.cmx common/ext_log.cmx \
+    ext/ident_map.cmx ext/ext_pervasives.cmx common/ext_log.cmx \
     ext/ext_list.cmx ext/ext_ident.cmx ext/ext_filename.cmx \
     depends/bs_exception.cmx core/lam_compile_group.cmi
 core/js_implementation.cmx : core/ocaml_parse.cmx ext/literals.cmx \
@@ -550,13 +549,14 @@ ounit_tests/ounit_scc_tests.cmx : ounit/oUnit.cmx ext/int_vec_vec.cmx \
     ext/int_vec.cmx ext/ext_string.cmx ext/ext_scc.cmx
 ounit_tests/ounit_json_tests.cmx : ext/string_map.cmx ounit/oUnit.cmx \
     bsb/bsb_json.cmx
+ounit_tests/ounit_map_tests.cmx : ounit/oUnit.cmx ext/int_map.cmx
 ounit_tests/ounit_vec_test.cmx : ounit/oUnit.cmx ext/int_vec.cmx \
     bsb/bsb_json.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_list_test.cmx ounit_tests/ounit_json_tests.cmx \
-    ounit_tests/ounit_hash_stubs_test.cmx \
+    ounit_tests/ounit_map_tests.cmx ounit_tests/ounit_list_test.cmx \
+    ounit_tests/ounit_json_tests.cmx ounit_tests/ounit_hash_stubs_test.cmx \
     ounit_tests/ounit_hash_set_tests.cmx ounit_tests/ounit_bal_tree_tests.cmx \
     ounit_tests/ounit_array_tests.cmx ounit/oUnit.cmx \
     ounit_tests/ounit_tests_main.cmi

jscomp/bin/all_ounit_tests.d

@@ -35,7 +35,7 @@ bin/all_ounit_tests.ml : ounit_tests/ounit_hash_set_tests.ml
 bin/all_ounit_tests.ml : ext/int_hash_set.ml
 bin/all_ounit_tests.ml : ext/int_hash_set.mli
 bin/all_ounit_tests.ml : ounit_tests/ounit_hash_stubs_test.ml
-bin/all_ounit_tests.ml : ext/bal_map_common.ml
+bin/all_ounit_tests.ml : ext/map_gen.ml
 bin/all_ounit_tests.ml : ext/string_map.ml
 bin/all_ounit_tests.ml : ext/string_map.mli
 bin/all_ounit_tests.ml : bsb/bsb_json.ml
@@ -44,6 +44,9 @@ bin/all_ounit_tests.ml : ounit_tests/ounit_json_tests.ml
 bin/all_ounit_tests.ml : ext/ext_list.ml
 bin/all_ounit_tests.ml : ext/ext_list.mli
 bin/all_ounit_tests.ml : ounit_tests/ounit_list_test.ml
+bin/all_ounit_tests.ml : ext/int_map.ml
+bin/all_ounit_tests.ml : ext/int_map.mli
+bin/all_ounit_tests.ml : ounit_tests/ounit_map_tests.ml
 bin/all_ounit_tests.ml : ext/ext_pervasives.ml
 bin/all_ounit_tests.ml : ext/ext_pervasives.mli
 bin/all_ounit_tests.ml : ext/literals.ml