Merge pull request #1038 from bloomberg/clean_up_refactoring

Clean up refactoring

Author: bobzhang

jscomp/.merlin

@@ -24,4 +24,4 @@ S depends
 B depends
 PKG compiler-libs.common
 B +compiler-libs
-FLG -w -40-30
+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
@@ -198,14 +198,20 @@ CORE_SRCS= type_int_to_string type_util  ocaml_stdlib_slots bs_conditional_initi
 	lam_exit_code j lam_module_ident lam_compile_util lam_stats config_util lam_compile_defs js_map js_fold js_fold_basic js_pass_scope\
 	js_op_util js_analyzer js_shake js_exp_make js_long js_of_lam_exception js_of_lam_module js_of_lam_array js_of_lam_block js_of_lam_string\
 	js_of_lam_tuple js_of_lam_record js_of_lam_float_record js_arr lam_compile_const \
-	lam_inner lam_util lam_group js_stmt_make js_pass_flatten\
+	lam_inner lam_util \
+	lam_group \
+	lam_pass_deep_flatten\
+	js_stmt_make js_pass_flatten\
 	js_pass_tailcall_inline js_of_lam_variant js_pass_flatten_and_mark_dead js_ast_util lam_dce lam_group_pass lam_compile_env lam_stats_util\
 	lam_stats_export lam_pass_alpha_conversion lam_pass_collect js_program_loader js_dump js_pass_debug\
 	js_of_lam_option js_output lam_compile_global lam_dispatch_primitive lam_beta_reduce\
 	lam_compile_external_call lam_compile_primitive lam_compile lam_pass_exits\
 	lam_pass_count\
+	lam_pass_eliminate_ref\
 	lam_pass_lets_dce \
-	lam_pass_remove_alias lam_compile_group\
+	lam_pass_remove_alias \
+	lam_coercion \
+	lam_compile_group\
 	js_implementation ocaml_batch_compile
 CORE_CMXS=$(addprefix core/, $(addsuffix .cmx, $(CORE_SRCS)))
 

jscomp/all.depend

@@ -260,6 +260,7 @@ core/lam_inner.cmi : core/lam.cmi
 core/lam_util.cmi : core/lam_stats.cmi core/lam.cmi core/j.cmx \
     ext/ident_set.cmi ext/ident_map.cmi
 core/lam_group.cmi : core/lam.cmi
+core/lam_pass_deep_flatten.cmi : core/lam.cmi
 core/js_stmt_make.cmi : core/lam.cmi core/js_closure.cmi core/j.cmx
 core/js_pass_flatten.cmi : core/j.cmx
 core/js_pass_tailcall_inline.cmi : core/j.cmx
@@ -292,8 +293,11 @@ core/lam_compile.cmi : core/lam_compile_defs.cmi core/lam.cmi \
     core/js_output.cmi core/j.cmx
 core/lam_pass_exits.cmi : core/lam.cmi ext/int_hashtbl.cmi
 core/lam_pass_count.cmi : core/lam.cmi ext/ident_hashtbl.cmi
+core/lam_pass_eliminate_ref.cmi : core/lam.cmi
 core/lam_pass_lets_dce.cmi : core/lam.cmi
 core/lam_pass_remove_alias.cmi : core/lam_stats.cmi core/lam.cmi
+core/lam_coercion.cmi : core/lam_group.cmi core/lam.cmi ext/ident_set.cmi \
+    ext/ident_map.cmi
 core/lam_compile_group.cmi : core/j.cmx
 core/js_implementation.cmi :
 core/ocaml_batch_compile.cmi :
@@ -387,6 +391,9 @@ core/lam_util.cmx : ext/literals.cmx core/lam_stats.cmx core/lam_print.cmx \
     core/lam_util.cmi
 core/lam_group.cmx : core/lam_util.cmx core/lam_print.cmx core/lam.cmx \
     core/js_number.cmx ext/ident_set.cmx core/lam_group.cmi
+core/lam_pass_deep_flatten.cmx : core/lam_util.cmx core/lam_group.cmx \
+    core/lam.cmx core/js_number.cmx ext/ident_set.cmx \
+    core/lam_pass_deep_flatten.cmi
 core/js_stmt_make.cmx : core/lam_util.cmx core/lam.cmx core/js_exp_make.cmx \
     core/js_closure.cmx core/js_analyzer.cmx core/j.cmx core/js_stmt_make.cmi
 core/js_pass_flatten.cmx : core/js_stmt_make.cmx core/js_map.cmx \
@@ -493,31 +500,35 @@ core/lam_pass_exits.cmx : core/lam_util.cmx core/lam_beta_reduce.cmx \
 core/lam_pass_count.cmx : core/lam_beta_reduce.cmx core/lam.cmx \
     ext/ident_map.cmx ext/ident_hashtbl.cmx ext/ext_list.cmx \
     core/lam_pass_count.cmi
-core/lam_pass_lets_dce.cmx : core/lam_util.cmx core/lam_pass_count.cmx \
+core/lam_pass_eliminate_ref.cmx : core/lam.cmx ext/ident_set.cmx \
+    core/lam_pass_eliminate_ref.cmi
+core/lam_pass_lets_dce.cmx : core/lam_util.cmx \
+    core/lam_pass_eliminate_ref.cmx core/lam_pass_count.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_lets_dce.cmi
+    ext/ident_hashtbl.cmx ext/ext_list.cmx core/lam_pass_lets_dce.cmi
 core/lam_pass_remove_alias.cmx : core/lam_util.cmx core/lam_stats.cmx \
     core/lam_module_ident.cmx core/lam_inline_util.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_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_collect.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_dce.cmx core/lam_compile_env.cmx \
-    core/lam_compile_defs.cmx core/lam_compile.cmx core/lam_analysis.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/ident_map.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_pervasives.cmx common/ext_log.cmx ext/ext_list.cmx \
+    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 \

jscomp/bin/whole_compiler.d

@@ -262,6 +262,12 @@ bin/whole_compiler.ml : core/js_pass_tailcall_inline.ml
 bin/whole_compiler.ml : core/js_pass_tailcall_inline.mli
 bin/whole_compiler.ml : core/js_shake.ml
 bin/whole_compiler.ml : core/js_shake.mli
+bin/whole_compiler.ml : core/lam_group.ml
+bin/whole_compiler.ml : core/lam_group.mli
+bin/whole_compiler.ml : core/lam_dce.ml
+bin/whole_compiler.ml : core/lam_dce.mli
+bin/whole_compiler.ml : core/lam_coercion.ml
+bin/whole_compiler.ml : core/lam_coercion.mli
 bin/whole_compiler.ml : core/js_arr.ml
 bin/whole_compiler.ml : core/js_arr.mli
 bin/whole_compiler.ml : core/js_ast_util.ml
@@ -324,22 +330,22 @@ bin/whole_compiler.ml : core/lam_exit_code.ml
 bin/whole_compiler.ml : core/lam_exit_code.mli
 bin/whole_compiler.ml : core/lam_compile.ml
 bin/whole_compiler.ml : core/lam_compile.mli
-bin/whole_compiler.ml : core/lam_group.ml
-bin/whole_compiler.ml : core/lam_group.mli
-bin/whole_compiler.ml : core/lam_dce.ml
-bin/whole_compiler.ml : core/lam_dce.mli
 bin/whole_compiler.ml : core/lam_stats_util.ml
 bin/whole_compiler.ml : core/lam_stats_util.mli
 bin/whole_compiler.ml : core/lam_pass_alpha_conversion.ml
 bin/whole_compiler.ml : core/lam_pass_alpha_conversion.mli
 bin/whole_compiler.ml : core/lam_pass_collect.ml
 bin/whole_compiler.ml : core/lam_pass_collect.mli
+bin/whole_compiler.ml : core/lam_pass_deep_flatten.ml
+bin/whole_compiler.ml : core/lam_pass_deep_flatten.mli
 bin/whole_compiler.ml : ext/int_hashtbl.ml
 bin/whole_compiler.ml : ext/int_hashtbl.mli
 bin/whole_compiler.ml : core/lam_pass_exits.ml
 bin/whole_compiler.ml : core/lam_pass_exits.mli
 bin/whole_compiler.ml : core/lam_pass_count.ml
 bin/whole_compiler.ml : core/lam_pass_count.mli
+bin/whole_compiler.ml : core/lam_pass_eliminate_ref.ml
+bin/whole_compiler.ml : core/lam_pass_eliminate_ref.mli
 bin/whole_compiler.ml : core/lam_pass_lets_dce.ml
 bin/whole_compiler.ml : core/lam_pass_lets_dce.mli
 bin/whole_compiler.ml : core/lam_inline_util.ml