Merge pull request #1074 from bloomberg/fix_1072

clean up

Author: bobzhang

jscomp/Makefile

@@ -206,8 +206,11 @@ COMMON_SRCS= bs_version js_config bs_pkg ext_log bs_loc  bs_warnings  lam_methna
 COMMON_CMXS= $(addprefix common/, $(addsuffix .cmx, $(COMMON_SRCS)))
 SYNTAX_SRCS=ast_derive_constructor ast_derive_util ast_exp ast_external ast_lift \
 	ast_literal ast_pat ast_payload ast_signature ast_structure bs_ast_iterator bs_ast_invariant \
-	ast_derive ast_comb ast_attributes ast_core_type ast_derive_dyn ast_derive_projector \
-	ast_external_attributes ast_util ppx_entry
+	ast_derive ast_comb ast_attributes ast_core_type ast_derive_dyn\
+	 ast_derive_projector \
+	 ast_ffi_types\
+	ast_external_attributes \
+	ast_util ppx_entry
 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)))

jscomp/all.depend

@@ -177,9 +177,11 @@ syntax/ast_derive_dyn.cmx : syntax/ast_structure.cmx \
 syntax/ast_derive_projector.cmx : ext/ext_list.cmx \
     syntax/ast_derive_util.cmx syntax/ast_derive.cmx \
     syntax/ast_derive_projector.cmi
+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_version.cmx common/bs_loc.cmx syntax/ast_payload.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
 syntax/ast_util.cmx : ext/literals.cmx ext/ext_list.cmx \
@@ -210,6 +212,7 @@ syntax/ast_attributes.cmi : syntax/ast_payload.cmi
 syntax/ast_core_type.cmi :
 syntax/ast_derive_dyn.cmi :
 syntax/ast_derive_projector.cmi :
+syntax/ast_ffi_types.cmi : syntax/ast_core_type.cmi
 syntax/ast_external_attributes.cmi : common/bs_loc.cmi \
     syntax/ast_core_type.cmi syntax/ast_attributes.cmi
 syntax/ast_util.cmi : syntax/ast_payload.cmi
@@ -486,8 +489,8 @@ 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 \
     core/js_of_lam_variant.cmx core/js_of_lam_option.cmx core/js_exp_make.cmx \
     core/js_arr.cmx core/js_analyzer.cmx core/j.cmx ext/ext_list.cmx \
-    ext/ext_ident.cmx syntax/ast_external_attributes.cmx \
-    syntax/ast_core_type.cmx core/lam_compile_external_call.cmi
+    ext/ext_ident.cmx syntax/ast_ffi_types.cmx syntax/ast_core_type.cmx \
+    core/lam_compile_external_call.cmi
 core/lam_compile_primitive.cmx : core/lam_util.cmx \
     core/lam_compile_global.cmx core/lam_compile_external_call.cmx \
     core/lam_compile_defs.cmx core/lam.cmx core/js_op_util.cmx \

jscomp/bin/bsdep.d

@@ -70,10 +70,12 @@ bin/bsdep.ml : syntax/ast_derive_projector.ml
 bin/bsdep.ml : syntax/ast_derive_projector.mli
 bin/bsdep.ml : syntax/ast_core_type.ml
 bin/bsdep.ml : syntax/ast_core_type.mli
-bin/bsdep.ml : common/bs_loc.ml
-bin/bsdep.ml : common/bs_loc.mli
 bin/bsdep.ml : ext/ext_pervasives.ml
 bin/bsdep.ml : ext/ext_pervasives.mli
+bin/bsdep.ml : syntax/ast_ffi_types.ml
+bin/bsdep.ml : syntax/ast_ffi_types.mli
+bin/bsdep.ml : common/bs_loc.ml
+bin/bsdep.ml : common/bs_loc.mli
 bin/bsdep.ml : ext/ext_filename.ml
 bin/bsdep.ml : ext/ext_filename.mli
 bin/bsdep.ml : common/js_config.ml