Merge pull request #2584 from BuckleScript/clean_up_code

clean up statement handling

Author: bobzhang

jscomp/all.depend

@@ -509,7 +509,8 @@ 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 ext/ext_list.cmx \
     core/lam_pass_deep_flatten.cmi
 core/js_stmt_make.cmx : core/lam_print.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_closure.cmx core/js_analyzer.cmx core/j.cmx ext/ext_list.cmx \
+    core/js_stmt_make.cmi
 core/js_pass_flatten.cmx : core/js_stmt_make.cmx core/js_map.cmx \
     core/js_exp_make.cmx core/js_analyzer.cmx core/j.cmx ext/ext_list.cmx \
     core/js_pass_flatten.cmi
@@ -891,9 +892,9 @@ bsb/bsb_ninja_gen.cmx : ext/string_map.cmx ext/literals.cmx \
     bsb/bsb_rule.cmx bsb/bsb_parse_sources.cmx bsb/bsb_ninja_util.cmx \
     bsb/bsb_ninja_global_vars.cmx bsb/bsb_ninja_file_groups.cmx \
     bsb/bsb_namespace_map_gen.cmx bsb/bsb_log.cmx bsb/bsb_exception.cmx \
-    bsb/bsb_dir_index.cmx bsb/bsb_db.cmx bsb/bsb_config_types.cmx \
-    bsb/bsb_config.cmx bsb/bsb_build_util.cmx bsb/bsb_build_schemas.cmx \
-    bsb/bsb_ninja_gen.cmi
+    bsb/bsb_dir_index.cmx bsb/bsb_default.cmx bsb/bsb_db.cmx \
+    bsb/bsb_config_types.cmx bsb/bsb_config.cmx bsb/bsb_build_util.cmx \
+    bsb/bsb_build_schemas.cmx bsb/bsb_ninja_gen.cmi
 bsb/bsb_ninja_global_vars.cmx :
 bsb/bsb_ninja_regen.cmx : ext/literals.cmx ext/ext_path.cmx \
     bsb/bsb_ninja_gen.cmx bsb/bsb_ninja_check.cmx bsb/bsb_merlin_gen.cmx \

jscomp/bsb/bsb_config_parse.ml

@@ -23,8 +23,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
 let config_file_bak = "bsconfig.json.bak"
-let refmt3_exe = "refmt3.exe"
-let refmt2_exe = "refmt.exe"
 let get_list_string = Bsb_build_util.get_list_string
 let (//) = Ext_path.combine
 

jscomp/bsb/bsb_default.ml

@@ -53,6 +53,7 @@ let bsc_flags =
 
 let refmt_flags = ["--print"; "binary"]
 
-
+let refmt_v3 = "refmt.exe"
+let refmt_none = "refmt.exe"
 
 let main_entries = [Bsb_config_types.JsTarget "Index"]

jscomp/bsb/bsb_default.mli

@@ -28,6 +28,8 @@ val bsc_flags : string list
 
 val refmt_flags : string list  
 
+val refmt_v3 : string
 
+val refmt_none : string
 
 val main_entries : Bsb_config_types.entries_t list

jscomp/bsb/bsb_ninja_gen.ml

@@ -126,9 +126,9 @@ let output_ninja_and_namespace_map
             (match refmt with 
             | Refmt_none -> 
               Bsb_log.warn "@{<warning>Warning:@} refmt version missing. Please set it explicitly, since we may change the default in the future.@.";
-              bsc_dir // "refmt.exe"
+              bsc_dir // Bsb_default.refmt_none
             | Refmt_v3 -> 
-              bsc_dir // "refmt3.exe"
+              bsc_dir // Bsb_default.refmt_v3
             | Refmt_custom x -> x );
           Bsb_ninja_global_vars.reason_react_jsx, reason_react_jsx_flag; 
           Bsb_ninja_global_vars.refmt_flags, refmt_flags;

jscomp/core/js_ast_util.ml

@@ -39,6 +39,6 @@ let rec named_expression (e : J.expression)
   else 
     let obj = Ext_ident.create_tmp () in 
     let obj_code = 
-      S.define
+      S.define_variable
         ~kind:Strict obj e in 
     Some (obj_code, obj)

jscomp/core/js_of_lam_variant.ml

@@ -41,7 +41,7 @@ let eval (arg : J.expression) (dispatches : (int * string) list ) : E.t =
       [(S.int_switch arg
       (Ext_list.map (fun (i,r) -> 
               {J.case = i ; 
-               body = [S.return (E.str r)],
+               body = [S.return_stmt (E.str r)],
                       false (* FIXME: if true, still print break*)
               }) dispatches))]
 
@@ -60,7 +60,7 @@ let eval_as_event (arg : J.expression) (dispatches : (int * string) list ) =
       [(S.int_switch arg
       (Ext_list.map (fun (i,r) -> 
               {J.case = i ; 
-               body = [S.return (E.index (E.var event) 0l)],
+               body = [S.return_stmt (E.index (E.var event) 0l)],
                       false (* FIXME: if true, still print break*)
               }) dispatches))]
       , (* TODO: improve, one dispatch later, 
@@ -71,7 +71,7 @@ let eval_as_event (arg : J.expression) (dispatches : (int * string) list ) =
       [(S.int_switch arg
       (Ext_list.map (fun (i,r) -> 
               {J.case = i ; 
-               body = [S.return (E.index (E.var event) 1l)],
+               body = [S.return_stmt (E.index (E.var event) 1l)],
                       false (* FIXME: if true, still print break*)
               }) dispatches))]
       )
@@ -87,7 +87,7 @@ let eval_as_int (arg : J.expression) (dispatches : (int * int) list ) : E.t  =
       [(S.int_switch arg
       (Ext_list.map (fun (i,r) -> 
               {J.case = i ; 
-               body = [S.return (E.int (Int32.of_int  r))],
+               body = [S.return_stmt (E.int (Int32.of_int  r))],
                       false (* FIXME: if true, still print break*)
               }) dispatches))]
 

jscomp/core/js_output.ml

@@ -67,9 +67,9 @@ let handle_name_tail
       then dummy
       else {block = []; value  = Some exp ; finished = False}
   | EffectCall, ReturnTrue _ ->
-      make [S.return  exp] ~finished:True
+      make [S.return_stmt  exp] ~finished:True
   | Declare (kind, n), ReturnFalse -> 
-      make [ S.define ~kind n  exp]
+      make [ S.define_variable ~kind n  exp]
   | Assign n ,ReturnFalse -> 
       make [S.assign n exp ]
   | (Declare _ | Assign _ ), ReturnTrue _ -> 
@@ -83,17 +83,18 @@ let handle_block_return
     (lam : Lam.t) (block : J.block) exp : t = 
   match st, should_return with 
   | Declare (kind,n), ReturnFalse -> 
-    make (block @ [ S.define ~kind  n exp])
+    make (block @ [ S.define_variable ~kind  n exp])
   | Assign n, ReturnFalse -> make (block @ [S.assign n exp])
   | (Declare _ | Assign _), ReturnTrue _ -> make [S.unknown_lambda lam] ~finished:True
   | EffectCall, ReturnFalse -> make block ~value:exp
-  | EffectCall, ReturnTrue _ -> make (block @ [S.return exp]) ~finished:True
+  | EffectCall, ReturnTrue _ -> make (block @ [S.return_stmt exp]) ~finished:True
   | NeedValue, _ ->  make block ~value:exp
 
 let statement_of_opt_expr (x : J.expression option) : J.statement =
   match x with 
-  | None -> S.empty ()
-  | Some x when Js_analyzer.no_side_effect_expression x -> S.empty ()
+  | None -> S.empty_stmt
+  | Some x when Js_analyzer.no_side_effect_expression x -> 
+    S.empty_stmt 
         (* TODO, pure analysis in lambda instead *)
   | Some x -> S.exp x 
 

jscomp/core/js_pass_flatten.ml

@@ -64,16 +64,16 @@ let flatten_map =
           end
       | Return ( {return_value = {expression_desc = Cond (a,b,c);  comment}}) 
         -> 
-          { statement_desc = If (a, [self#statement (S.return b)],  
-                                 Some [ self#statement (S.return c)]); comment}
+          { statement_desc = If (a, [self#statement (S.return_stmt b)],  
+                                 Some [ self#statement (S.return_stmt c)]); comment}
 
       | Return ({return_value = {expression_desc = Seq _; _} as v}) ->
           let block = Js_analyzer.rev_flatten_seq v  in
           begin match block with
           | {statement_desc = Exp last_one ; _} :: rest_rev
             ->  
               super#statement 
-                (S.block (Ext_list.rev_map_append (self#statement) rest_rev [S.return last_one]))
+                (S.block (Ext_list.rev_map_append (self#statement) rest_rev [S.return_stmt last_one]))
           | _ -> assert false
           end
       | Block [x]

jscomp/core/js_pass_flatten_and_mark_dead.ml

@@ -49,7 +49,8 @@ class rewrite_return ?return_value ()=
   let mk_return  = 
     match return_value with 
     | None -> fun e -> S.exp e 
-    | Some ident -> fun e -> S.define ~kind:Variable ident e in
+    | Some ident -> fun e -> 
+      S.define_variable ~kind:Variable ident e in
   object (self : 'self)
     inherit Js_map.map as super
     method! statement x =
@@ -229,8 +230,9 @@ let subst_map name = object (self)
         | _ ->  
           (* self#add_substitue ident e ; *)
           S.block @@
-          (Ext_list.rev_map_append  (fun (id,v) -> 
-               S.define ~kind:Strict id v)  bindings [original_statement] )
+          (Ext_list.rev_map_append  
+            (fun (id,v) -> 
+               S.define_variable ~kind:Strict id v)  bindings [original_statement] )
       end
     | _ -> super#statement v 
 

jscomp/core/js_pass_tailcall_inline.ml

@@ -211,7 +211,9 @@ let subst name export_set stats  =
             (*   (Js_dump.string_of_block [st]); *)
             Js_op_util.update_used_stats v.ident_info Dead_pure;
             let block  = 
-              Ext_list.fold_right2 (fun param arg acc ->  S.define ~kind:Variable param arg :: acc)
+              Ext_list.fold_right2 
+              (fun param arg acc ->  
+                S.define_variable ~kind:Variable param arg :: acc)
                 params args  ( self#block block) (* see #278 before changes*)
 
             in