Merge pull request #1076 from bloomberg/fix_1072

clean up: branch bs.obj logic handling as early as we can

Author: bobzhang

jscomp/Makefile

@@ -143,7 +143,9 @@ OUNIT_TESTS_SRCS =  ounit_tests_util \
 	ounit_sexp_tests\
 	ounit_int_vec_tests\
 	ounit_ident_mask_tests\
+	ounit_cmd_util\
 	ounit_cmd_tests\
+	ounit_ffi_error_debug_test\
 	ounit_tests_main
 OUNIT_TESTS_CMXS = $(addprefix ounit_tests/, $(addsuffix .cmx, $(OUNIT_TESTS_SRCS)))
 

jscomp/all.depend

@@ -181,9 +181,9 @@ syntax/ast_ffi_types.cmx : ext/ext_string.cmx ext/ext_pervasives.cmx \
     common/bs_version.cmx syntax/ast_core_type.cmx syntax/ast_ffi_types.cmi
 syntax/ast_external_attributes.cmx : common/lam_methname.cmx \
     ext/ext_string.cmx ext/ext_pervasives.cmx common/bs_warnings.cmx \
-    common/bs_loc.cmx syntax/ast_payload.cmx syntax/ast_ffi_types.cmx \
-    syntax/ast_core_type.cmx syntax/ast_comb.cmx syntax/ast_attributes.cmx \
-    syntax/ast_external_attributes.cmi
+    common/bs_loc.cmx syntax/ast_payload.cmx syntax/ast_literal.cmx \
+    syntax/ast_ffi_types.cmx syntax/ast_core_type.cmx syntax/ast_comb.cmx \
+    syntax/ast_attributes.cmx syntax/ast_external_attributes.cmi
 syntax/ast_util.cmx : ext/literals.cmx ext/ext_list.cmx \
     syntax/ast_payload.cmx syntax/ast_pat.cmx syntax/ast_literal.cmx \
     syntax/ast_external_attributes.cmx syntax/ast_external.cmx \
@@ -582,6 +582,7 @@ ounit/oUnitLogger.cmx : ounit/oUnitUtils.cmx ounit/oUnitTypes.cmx
 ounit/oUnitTypes.cmx :
 ounit/oUnitUtils.cmx : ounit/oUnitTypes.cmx
 ounit/oUnitChooser.cmx : ounit/oUnitTypes.cmx
+ounit_tests/ounit_cmd_util.cmi :
 ounit_tests/ounit_tests_main.cmi :
 ounit_tests/ounit_tests_util.cmx :
 ounit_tests/ounit_array_tests.cmx : ounit/oUnit.cmx ext/ext_string.cmx \
@@ -616,8 +617,12 @@ ounit_tests/ounit_int_vec_tests.cmx : ounit/oUnit.cmx ext/int_vec_util.cmx \
     ext/int_vec.cmx
 ounit_tests/ounit_ident_mask_tests.cmx : ounit/oUnit.cmx \
     ext/hash_set_ident_mask.cmx
-ounit_tests/ounit_cmd_tests.cmx : ounit/oUnit.cmx ext/literals.cmx \
-    ext/ext_string.cmx
+ounit_tests/ounit_cmd_util.cmx : ext/literals.cmx \
+    ounit_tests/ounit_cmd_util.cmi
+ounit_tests/ounit_cmd_tests.cmx : ounit_tests/ounit_cmd_util.cmx \
+    ounit/oUnit.cmx ext/literals.cmx ext/ext_string.cmx
+ounit_tests/ounit_ffi_error_debug_test.cmx : ounit_tests/ounit_cmd_util.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_topsort_tests.cmx ounit_tests/ounit_string_tests.cmx \
@@ -628,9 +633,11 @@ ounit_tests/ounit_tests_main.cmx : ext/resize_array.cmx \
     ounit_tests/ounit_json_tests.cmx ounit_tests/ounit_int_vec_tests.cmx \
     ounit_tests/ounit_ident_mask_tests.cmx \
     ounit_tests/ounit_hashtbl_tests.cmx ounit_tests/ounit_hash_stubs_test.cmx \
-    ounit_tests/ounit_hash_set_tests.cmx ounit_tests/ounit_cmd_tests.cmx \
-    ounit_tests/ounit_bal_tree_tests.cmx ounit_tests/ounit_array_tests.cmx \
-    ounit/oUnit.cmx ounit_tests/ounit_tests_main.cmi
+    ounit_tests/ounit_hash_set_tests.cmx \
+    ounit_tests/ounit_ffi_error_debug_test.cmx \
+    ounit_tests/ounit_cmd_tests.cmx ounit_tests/ounit_bal_tree_tests.cmx \
+    ounit_tests/ounit_array_tests.cmx ounit/oUnit.cmx \
+    ounit_tests/ounit_tests_main.cmi
 bsb/bsb_build_schemas.cmx :
 bsb/bsb_build_ui.cmx : ext/string_vec.cmx ext/string_set.cmx \
     ext/string_map.cmx ext/ext_string.cmx ext/ext_json.cmx \

jscomp/bin/all_ounit_tests.d

@@ -22,7 +22,10 @@ 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/literals.ml
 bin/all_ounit_tests.ml : ext/literals.mli
+bin/all_ounit_tests.ml : ounit_tests/ounit_cmd_util.ml
+bin/all_ounit_tests.ml : ounit_tests/ounit_cmd_util.mli
 bin/all_ounit_tests.ml : ounit_tests/ounit_cmd_tests.ml
+bin/all_ounit_tests.ml : ounit_tests/ounit_ffi_error_debug_test.ml
 bin/all_ounit_tests.ml : ext/ext_util.ml
 bin/all_ounit_tests.ml : ext/ext_util.mli
 bin/all_ounit_tests.ml : ext/hash_set_gen.ml