Merge pull request #1011 from bloomberg/ordered_hash_set_map

specialize ordered_hash_map

Author: bobzhang

jscomp/Makefile

@@ -64,6 +64,16 @@ ext/ident_map.ml : ext/map.cppo.ml
 # ext/map_poly.ml : ext/map.cppo.ml
 # 	cppo -D TYPE_POLY $< -o $@
 
+ext/ordered_hash_map_make.ml: ext/ordered_hash_map.cppo.ml
+	cppo -D TYPE_FUNCTOR $< -o $@
+ext/ordered_hash_map_local_ident.ml: ext/ordered_hash_map.cppo.ml
+	cppo -D TYPE_LOCAL_IDENT $< -o $@
+
+ext/ordered_hash_set_make.ml : ext/ordered_hash_set.cppo.ml
+	cppo -D TYPE_FUNCTOR $< -o $@
+
+ext/ordered_hash_set_string.ml:ext/ordered_hash_set.cppo.ml
+	cppo -D TYPE_STRING $< -o $@
 ## Stubs 
 .c.o:
 	$(NATIVE) -ccopt -o -ccopt $@ -c $< 
@@ -125,10 +135,14 @@ EXT_SRCS = ext_util\
 	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 \
+	ordered_hash_set_gen\
+	ordered_hash_set_string\
+	ordered_hash_map_gen\
+	union_find \
 	ext_ident\
 	ident_map\
 	ident_set\
+	ordered_hash_map_local_ident\
 	int_map\
 	literals \
 	string_map \

jscomp/all.depend

@@ -34,13 +34,18 @@ ext/string_hash_set.cmx : ext/hash_set_gen.cmx ext/ext_string.cmx \
     stubs/bs_hash_stubs.cmx ext/string_hash_set.cmi
 ext/int_hash_set.cmx : ext/hash_set_gen.cmx ext/ext_int.cmx \
     stubs/bs_hash_stubs.cmx ext/int_hash_set.cmi
-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/ordered_hash_set_gen.cmx : ext/ext_util.cmx
+ext/ordered_hash_set_string.cmx : ext/ordered_hash_set_gen.cmx \
+    ext/ext_string.cmx stubs/bs_hash_stubs.cmx
+ext/ordered_hash_map_gen.cmx : ext/ext_util.cmx
 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/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
 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/map_gen.cmx ext/string_map.cmi
@@ -86,12 +91,11 @@ ext/ext_sys.cmi :
 ext/hash_set.cmi : ext/hash_set_gen.cmx
 ext/string_hash_set.cmi : ext/hash_set_gen.cmx
 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/ordered_hash_map_local_ident.cmi : ext/ordered_hash_map_gen.cmx
 ext/int_map.cmi : ext/map_gen.cmx
 ext/literals.cmi :
 ext/string_map.cmi : ext/map_gen.cmx
@@ -290,9 +294,10 @@ core/bs_conditional_initial.cmx : common/bs_version.cmx \
 core/ocaml_options.cmx : common/bs_version.cmx core/ocaml_options.cmi
 core/ocaml_parse.cmx : syntax/ppx_entry.cmx common/js_config.cmx \
     core/ocaml_parse.cmi
-core/lam.cmx : ext/ordered_hash_map.cmx core/ocaml_stdlib_slots.cmx \
-    ext/literals.cmx common/js_config.cmx ext/int_vec_vec.cmx ext/int_vec.cmx \
-    ext/ident_set.cmx ext/ext_string.cmx ext/ext_scc.cmx core/lam.cmi
+core/lam.cmx : ext/ordered_hash_map_local_ident.cmx \
+    core/ocaml_stdlib_slots.cmx ext/literals.cmx common/js_config.cmx \
+    ext/int_vec_vec.cmx ext/int_vec.cmx ext/ident_set.cmx ext/ext_string.cmx \
+    ext/ext_scc.cmx core/lam.cmi
 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
@@ -543,7 +548,7 @@ ounit_tests/ounit_hash_stubs_test.cmx : ounit_tests/ounit_tests_util.cmx \
     ounit/oUnit.cmx ext/int_hash_set.cmx ext/hash_set_poly.cmx \
     stubs/bs_hash_stubs.cmx
 ounit_tests/ounit_hash_set_tests.cmx : ext/string_hash_set.cmx \
-    ext/ordered_hash_set.cmx ounit/oUnit.cmx ext/hash_set_poly.cmx \
+    ext/ordered_hash_set_string.cmx ounit/oUnit.cmx ext/hash_set_poly.cmx \
     ext/hash_set.cmx
 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

jscomp/bin/all_ounit_tests.d

@@ -26,9 +26,9 @@ bin/all_ounit_tests.ml : ext/hash_set.ml
 bin/all_ounit_tests.ml : ext/hash_set.mli
 bin/all_ounit_tests.ml : ext/hash_set_poly.ml
 bin/all_ounit_tests.ml : ext/hash_set_poly.mli
-bin/all_ounit_tests.ml : ext/ordered_hash_set.ml
-bin/all_ounit_tests.ml : ext/ordered_hash_set.mli
 bin/all_ounit_tests.ml : stubs/bs_hash_stubs.ml
+bin/all_ounit_tests.ml : ext/ordered_hash_set_gen.ml
+bin/all_ounit_tests.ml : ext/ordered_hash_set_string.ml
 bin/all_ounit_tests.ml : ext/string_hash_set.ml
 bin/all_ounit_tests.ml : ext/string_hash_set.mli
 bin/all_ounit_tests.ml : ounit_tests/ounit_hash_set_tests.ml