consolidate types

Author: bobzhang

jscomp/Makefile

@@ -226,15 +226,17 @@ SYNTAX_SRCS= \
 	ast_lift \
 	ast_literal \
 	ast_pat \
+	ast_arg \
 	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_ffi_types\
-	 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
 # not a good name ast_util	 
 SYNTAX_CMXS=$(addprefix syntax/, $(addsuffix .cmx, $(SYNTAX_SRCS)))
 DEPENDS_SRCS= depends_post_process bs_exception ast_extract binary_ast  

jscomp/all.depend

@@ -172,6 +172,7 @@ syntax/ast_external.cmx : syntax/ast_external.cmi
 syntax/ast_lift.cmx : syntax/ast_lift.cmi
 syntax/ast_literal.cmx : syntax/ast_literal.cmi
 syntax/ast_pat.cmx : syntax/ast_pat.cmi
+syntax/ast_arg.cmx : syntax/ast_arg.cmi
 syntax/ast_payload.cmx : ext/string_map.cmx ext/ext_js_regex.cmx \
     syntax/ast_payload.cmi
 syntax/ast_signature.cmx : syntax/ast_signature.cmi
@@ -196,12 +197,12 @@ 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
+    common/bs_version.cmx syntax/ast_arg.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 \
     syntax/bs_syntaxerr.cmx 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_comb.cmx syntax/ast_attributes.cmx syntax/ast_arg.cmx \
     syntax/ast_external_attributes.cmi
 syntax/ast_util.cmx : ext/literals.cmx ext/ext_string.cmx ext/ext_list.cmx \
     syntax/bs_syntaxerr.cmx syntax/ast_payload.cmx syntax/ast_pat.cmx \
@@ -220,6 +221,7 @@ syntax/ast_external.cmi :
 syntax/ast_lift.cmi :
 syntax/ast_literal.cmi :
 syntax/ast_pat.cmi :
+syntax/ast_arg.cmi :
 syntax/ast_payload.cmi : ext/string_map.cmi
 syntax/ast_signature.cmi :
 syntax/ast_structure.cmi : syntax/ast_signature.cmi
@@ -231,7 +233,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_ffi_types.cmi : syntax/ast_arg.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
@@ -256,7 +258,7 @@ core/ocaml_parse.cmi :
 core/lam_module_ident.cmi : core/js_op.cmx common/js_config.cmi core/j.cmx \
     ext/hashtbl_gen.cmx ext/hash_set_gen.cmx
 core/lam.cmi : core/lam_module_ident.cmi ext/ident_set.cmi \
-    syntax/ast_ffi_types.cmi
+    syntax/ast_ffi_types.cmi syntax/ast_arg.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
@@ -326,8 +328,8 @@ core/lam_bounded_vars.cmi : core/lam.cmi ext/ident_hashtbl.cmi
 core/lam_beta_reduce.cmi : core/lam_stats.cmi core/lam_closure.cmi \
     core/lam.cmi ext/ident_map.cmi
 core/lam_compile_external_call.cmi : core/lam_compile_defs.cmi core/j.cmx \
-    syntax/ast_ffi_types.cmi
-core/lam_compile_external_obj.cmi : core/j.cmx syntax/ast_ffi_types.cmi
+    syntax/ast_ffi_types.cmi syntax/ast_arg.cmi
+core/lam_compile_external_obj.cmi : core/j.cmx syntax/ast_arg.cmi
 core/lam_compile_primitive.cmi : core/lam_compile_defs.cmi core/lam.cmi \
     core/j.cmx
 core/lam_compile.cmi : core/lam_compile_defs.cmi core/lam.cmi \
@@ -360,7 +362,8 @@ core/lam.cmx : ext/ordered_hash_map_local_ident.cmx \
     common/js_config.cmx ext/int_vec_vec.cmx ext/int_vec_util.cmx \
     ext/int_vec.cmx ext/ident_set.cmx ext/ident_hashtbl.cmx \
     ext/ident_hash_set.cmx ext/hash_set_ident_mask.cmx ext/ext_string.cmx \
-    ext/ext_scc.cmx ext/ext_list.cmx syntax/ast_ffi_types.cmx core/lam.cmi
+    ext/ext_scc.cmx ext/ext_list.cmx syntax/ast_ffi_types.cmx \
+    syntax/ast_arg.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
@@ -520,10 +523,11 @@ core/lam_compile_external_call.cmx : core/lam_compile_env.cmx \
     core/lam_compile_defs.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_ffi_types.cmx core/lam_compile_external_call.cmi
+    syntax/ast_ffi_types.cmx syntax/ast_arg.cmx \
+    core/lam_compile_external_call.cmi
 core/lam_compile_external_obj.cmx : core/lam_compile_external_call.cmx \
     core/js_op.cmx core/js_exp_make.cmx core/js_analyzer.cmx core/j.cmx \
-    syntax/ast_ffi_types.cmx core/lam_compile_external_obj.cmi
+    syntax/ast_arg.cmx core/lam_compile_external_obj.cmi
 core/lam_compile_primitive.cmx : core/lam_util.cmx \
     core/lam_dispatch_primitive.cmx core/lam_compile_external_obj.cmx \
     core/lam_compile_external_call.cmx core/lam_compile_defs.cmx core/lam.cmx \

jscomp/bin/bsdep.d

@@ -35,6 +35,7 @@ bin/bsdep.ml : common/bs_loc.mli
 bin/bsdep.ml : ext/ext_bytes.mli
 bin/bsdep.ml : ext/ext_string.ml
 bin/bsdep.ml : ext/string_map.ml
+bin/bsdep.ml : syntax/ast_arg.ml
 bin/bsdep.ml : syntax/ast_exp.ml
 bin/bsdep.ml : syntax/ast_pat.ml
 bin/bsdep.ml : ../ocaml/driver/compenv.mli
@@ -45,6 +46,7 @@ bin/bsdep.ml : ../ocaml/utils/warnings.mli
 bin/bsdep.ml : bin/configDummy.ml
 bin/bsdep.ml : ext/ext_string.mli
 bin/bsdep.ml : ext/string_map.mli
+bin/bsdep.ml : syntax/ast_arg.mli
 bin/bsdep.ml : syntax/ast_comb.ml
 bin/bsdep.ml : syntax/ast_exp.mli
 bin/bsdep.ml : syntax/ast_pat.mli