Merge pull request #1039 from bloomberg/clean_up

clean up the logic of coercion handling and export identifiers calculation

Author: bobzhang

jscomp/.merlin

@@ -24,4 +24,4 @@ S depends
 B depends
 PKG compiler-libs.common
 B +compiler-libs
-FLG -w -40-30+6
+FLG -w -40-30+6-23

jscomp/Makefile

@@ -10,7 +10,7 @@ BYTE=ocamlc.opt$(EXE)
 OCAMLLEX=ocamllex.opt$(EXE)
 CAMLP4OF=camlp4of
 CAMLDEP=ocamldep.opt$(EXE)
-COMPFLAGS= -g -w +6-40-30 -warn-error +a-40-30-23
+COMPFLAGS= -g -w +6-40-30-23 -warn-error +a-40-30-23
 
 
 .SUFFIXES: .mli .ml .cmi .cmx .mll .c .o

jscomp/all.depend

@@ -511,25 +511,24 @@ core/lam_pass_remove_alias.cmx : core/lam_util.cmx core/lam_stats.cmx \
     core/lam_compile_env.cmx core/lam_closure.cmx core/lam_beta_reduce.cmx \
     core/lam_analysis.cmx core/lam.cmx ext/ident_set.cmx \
     ext/ident_hashtbl.cmx ext/ext_list.cmx core/lam_pass_remove_alias.cmi
-core/lam_coercion.cmx : core/lam_group.cmx core/lam_dce.cmx core/lam.cmx \
-    ext/ident_set.cmx ext/ident_map.cmx core/lam_coercion.cmi
-core/lam_compile_group.cmx : ext/string_hash_set.cmx core/lam_util.cmx \
-    core/lam_stats_export.cmx core/lam_stats.cmx \
-    core/lam_pass_remove_alias.cmx core/lam_pass_lets_dce.cmx \
-    core/lam_pass_exits.cmx core/lam_pass_deep_flatten.cmx \
-    core/lam_pass_collect.cmx core/lam_pass_alpha_conversion.cmx \
-    core/lam_module_ident.cmx core/lam_group.cmx core/lam_compile_env.cmx \
-    core/lam_compile_defs.cmx core/lam_compile.cmx core/lam_coercion.cmx \
-    core/lam_analysis.cmx core/lam.cmx core/js_stmt_make.cmx \
-    core/js_shake.cmx core/js_program_loader.cmx \
-    core/js_pass_tailcall_inline.cmx core/js_pass_scope.cmx \
-    core/js_pass_flatten_and_mark_dead.cmx core/js_pass_flatten.cmx \
-    core/js_pass_debug.cmx core/js_output.cmx core/js_fold_basic.cmx \
-    core/js_exp_make.cmx core/js_dump.cmx common/js_config.cmx \
-    core/js_cmj_format.cmx core/j.cmx ext/ident_set.cmx \
+core/lam_coercion.cmx : ext/string_hash_set.cmx core/lam_group.cmx \
+    core/lam_dce.cmx core/lam.cmx ext/ident_set.cmx ext/ident_map.cmx \
+    depends/bs_exception.cmx core/lam_coercion.cmi
+core/lam_compile_group.cmx : core/lam_util.cmx core/lam_stats_export.cmx \
+    core/lam_stats.cmx core/lam_pass_remove_alias.cmx \
+    core/lam_pass_lets_dce.cmx core/lam_pass_exits.cmx \
+    core/lam_pass_deep_flatten.cmx core/lam_pass_collect.cmx \
+    core/lam_pass_alpha_conversion.cmx core/lam_module_ident.cmx \
+    core/lam_group.cmx core/lam_compile_env.cmx core/lam_compile_defs.cmx \
+    core/lam_compile.cmx core/lam_coercion.cmx core/lam_analysis.cmx \
+    core/lam.cmx core/js_stmt_make.cmx core/js_shake.cmx \
+    core/js_program_loader.cmx core/js_pass_tailcall_inline.cmx \
+    core/js_pass_scope.cmx core/js_pass_flatten_and_mark_dead.cmx \
+    core/js_pass_flatten.cmx core/js_pass_debug.cmx core/js_output.cmx \
+    core/js_fold_basic.cmx core/js_exp_make.cmx core/js_dump.cmx \
+    common/js_config.cmx core/js_cmj_format.cmx core/j.cmx ext/ident_set.cmx \
     ext/ext_pervasives.cmx common/ext_log.cmx ext/ext_list.cmx \
-    ext/ext_ident.cmx ext/ext_filename.cmx depends/bs_exception.cmx \
-    core/lam_compile_group.cmi
+    ext/ext_ident.cmx ext/ext_filename.cmx core/lam_compile_group.cmi
 core/js_implementation.cmx : core/ocaml_parse.cmx ext/literals.cmx \
     core/lam_compile_group.cmx core/lam_compile_env.cmx common/js_config.cmx \
     ext/ext_pervasives.cmx common/ext_log.cmx syntax/bs_ast_invariant.cmx \