Merge pull request #998 from bloomberg/continue_specialization

finish set -- map,hashtbl to be done

Author: bobzhang

jscomp/Makefile

@@ -43,6 +43,15 @@ ext/int_vec.ml: ext/vec.cppo.ml
 	cppo -D TYPE_INT $< -o $@
 ext/resize_array.ml: ext/vec.cppo.ml
 	cppo -D TYPE_FUNCTOR $< -o $@
+ext/string_set.ml : ext/set.cppo.ml
+	cppo -D TYPE_STRING $< -o $@
+ext/set_int.ml : ext/set.cppo.ml
+	cppo -D TYPE_INT $< -o $@
+ext/ident_set.ml : ext/set.cppo.ml
+	cppo -D TYPE_IDENT $< -o $@
+ext/set_poly.ml : ext/set.cppo.ml
+	cppo  -D TYPE_POLY $< -o $@
+
 ## Stubs 
 .c.o:
 	$(NATIVE) -ccopt -o -ccopt $@ -c $< 
@@ -90,8 +99,9 @@ EXT_SRCS = ext_util\
 	vec_gen \
 	resize_array \
 	string_vec\
-	int_vec int_vec_vec bal_set_common\
-	bal_tree  bal_map_common bal_map\
+	int_vec int_vec_vec \
+	set_gen\
+	bal_map_common bal_map\
 	ext_file_pp ext_format \
 	hashtbl_gen \
 	ext_hashtbl \
@@ -104,7 +114,10 @@ EXT_SRCS = ext_util\
 	 ordered_hash_set ordered_hash_map union_find \
 	ident_set\
 	int_map literals string_map \
-	string_set ext_scc ext_pp_scope\
+	string_set\
+	set_int\
+	set_poly\
+	ext_scc ext_pp_scope\
 	ext_io\
 	ext_ident\
 	ident_hash_set\

jscomp/all.depend

@@ -10,8 +10,7 @@ ext/string_vec.cmx : ext/resize_array.cmx ext/string_vec.cmi
 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/bal_set_common.cmx :
-ext/bal_tree.cmx : ext/bal_set_common.cmx ext/bal_tree.cmi
+ext/set_gen.cmx :
 ext/bal_map_common.cmx :
 ext/bal_map.cmx : ext/bal_map_common.cmx ext/bal_map.cmi
 ext/ext_file_pp.cmx : ext/ext_file_pp.cmi
@@ -38,12 +37,13 @@ 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/ident_set.cmx : ext/ext_format.cmx ext/bal_set_common.cmx \
-    ext/ident_set.cmi
+ext/ident_set.cmx : ext/set_gen.cmx ext/ident_set.cmi
 ext/int_map.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_set.cmx : ext/bal_set_common.cmx ext/string_set.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
@@ -68,7 +68,6 @@ 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_tree.cmi : ext/bal_set_common.cmx
 ext/bal_map.cmi : ext/bal_map_common.cmx
 ext/ext_file_pp.cmi :
 ext/ext_format.cmi :
@@ -89,11 +88,12 @@ 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/ident_set.cmi : ext/ext_format.cmi
+ext/ident_set.cmi : ext/set_gen.cmx
 ext/int_map.cmi :
 ext/literals.cmi :
 ext/string_map.cmi :
 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 :
@@ -535,8 +535,8 @@ ounit_tests/ounit_tests_util.cmx :
 ounit_tests/ounit_array_tests.cmx : ounit/oUnit.cmx ext/ext_string.cmx \
     ext/ext_array.cmx
 ounit_tests/ounit_list_test.cmx : ounit/oUnit.cmx ext/ext_list.cmx
-ounit_tests/ounit_bal_tree_tests.cmx : ounit_tests/ounit_tests_util.cmx \
-    ounit/oUnit.cmx ext/ext_int.cmx ext/bal_tree.cmx ext/bal_set_common.cmx
+ounit_tests/ounit_bal_tree_tests.cmx : ext/set_poly.cmx ext/set_int.cmx \
+    ext/set_gen.cmx ounit_tests/ounit_tests_util.cmx ounit/oUnit.cmx
 ounit_tests/ounit_path_tests.cmx : ounit/oUnit.cmx ext/ext_filename.cmx
 ounit_tests/ounit_union_find_tests.cmx : ext/union_find.cmx ounit/oUnit.cmx \
     ext/int_vec_vec.cmx ext/int_vec.cmx ext/ext_string.cmx

jscomp/bin/all_ounit_tests.d

@@ -11,12 +11,13 @@ bin/all_ounit_tests.ml : ext/ext_bytes.mli
 bin/all_ounit_tests.ml : ext/ext_string.ml
 bin/all_ounit_tests.ml : ext/ext_string.mli
 bin/all_ounit_tests.ml : ounit_tests/ounit_array_tests.ml
-bin/all_ounit_tests.ml : ext/bal_set_common.ml
-bin/all_ounit_tests.ml : ext/bal_tree.ml
-bin/all_ounit_tests.ml : ext/bal_tree.mli
+bin/all_ounit_tests.ml : ounit_tests/ounit_tests_util.ml
+bin/all_ounit_tests.ml : ext/set_gen.ml
 bin/all_ounit_tests.ml : ext/ext_int.ml
 bin/all_ounit_tests.ml : ext/ext_int.mli
-bin/all_ounit_tests.ml : ounit_tests/ounit_tests_util.ml
+bin/all_ounit_tests.ml : ext/set_int.ml
+bin/all_ounit_tests.ml : ext/set_poly.ml
+bin/all_ounit_tests.ml : ext/set_poly.mli
 bin/all_ounit_tests.ml : ounit_tests/ounit_bal_tree_tests.ml
 bin/all_ounit_tests.ml : ext/ext_util.ml
 bin/all_ounit_tests.ml : ext/ext_util.mli