clean up before gentype tsx support

Author: bobzhang

jscomp/all.depend

@@ -19,7 +19,7 @@ ext/set_gen.cmx :
 ext/map_gen.cmx :
 ext/ext_file_pp.cmx : ext/string_vec.cmx ext/ext_file_pp.cmi
 ext/ext_format.cmx : ext/ext_format.cmi
-ext/hashtbl_gen.cmx : ext/ext_util.cmx
+ext/hashtbl_gen.cmx : ext/ext_util.cmx ext/ext_array.cmx
 ext/ext_string.cmx : ext/ext_char.cmx ext/ext_bytes.cmx ext/ext_string.cmi
 ext/ext_utf8.cmx : ext/ext_utf8.cmi
 ext/ext_js_regex.cmx : ext/ext_utf8.cmx ext/ext_js_regex.cmi
@@ -34,7 +34,7 @@ ext/ext_pervasives.cmx : ext/ext_list.cmx ext/ext_pervasives.cmi
 ext/ext_pp.cmx : ext/ext_pervasives.cmx ext/ext_pp.cmi
 ext/ext_ref.cmx : ext/ext_list.cmx ext/ext_ref.cmi
 ext/ext_sys.cmx : ext/ext_sys.cmi
-ext/hash_set_gen.cmx : ext/ext_util.cmx
+ext/hash_set_gen.cmx : ext/ext_util.cmx ext/ext_array.cmx
 ext/hash_set.cmx : ext/hash_set_gen.cmx ext/hash_set.cmi
 ext/string_hash_set.cmx : ext/hash_set_gen.cmx ext/ext_string.cmx \
     stubs/bs_hash_stubs.cmx ext/string_hash_set.cmi
@@ -44,7 +44,7 @@ ext/int_hash_set.cmx : ext/hash_set_gen.cmx ext/ext_int.cmx \
     stubs/bs_hash_stubs.cmx ext/int_hash_set.cmi
 ext/hash_set_ident_mask.cmx : ext/ext_util.cmx ext/ext_ident.cmx \
     stubs/bs_hash_stubs.cmx ext/hash_set_ident_mask.cmi
-ext/ordered_hash_set_gen.cmx : ext/ext_util.cmx
+ext/ordered_hash_set_gen.cmx : ext/ext_util.cmx ext/ext_array.cmx
 ext/ordered_hash_set_string.cmx : ext/ordered_hash_set_gen.cmx \
     ext/ext_util.cmx ext/ext_string.cmx stubs/bs_hash_stubs.cmx \
     ext/ordered_hash_set_string.cmi
@@ -53,7 +53,7 @@ ext/ordered_hash_set_ident.cmx : ext/ordered_hash_set_gen.cmx \
     ext/ordered_hash_set_ident.cmi
 ext/ordered_hash_set_make.cmx : ext/ordered_hash_set_gen.cmx \
     ext/ext_util.cmx
-ext/ordered_hash_map_gen.cmx : ext/ext_util.cmx
+ext/ordered_hash_map_gen.cmx : ext/ext_util.cmx ext/ext_array.cmx
 ext/union_find.cmx : ext/union_find.cmi
 ext/ident_map.cmx : ext/map_gen.cmx ext/ext_ident.cmx ext/ident_map.cmi
 ext/ident_set.cmx : ext/set_gen.cmx ext/ident_set.cmi
@@ -816,7 +816,7 @@ core/js_main.cmx : super_errors/super_main.cmx \
     common/js_config.cmx ext/ext_string.cmx core/bs_conditional_initial.cmx \
     core/js_main.cmi
 core/cmjdump_main.cmx : ext/string_map.cmx core/lam_arity.cmx \
-    core/js_packages_info.cmx core/js_cmj_format.cmx
+    core/js_packages_info.cmx core/js_cmj_format.cmx ext/ext_array.cmx
 core/astdump_main.cmx : common/ml_binary.cmx ext/ext_path.cmx \
     bsb/bsb_helper_depfile_gen.cmx
 ounit/oUnit.cmi :
@@ -874,7 +874,7 @@ ounit_tests/ounit_hash_stubs_test.cmx : ounit_tests/ounit_tests_util.cmx \
     stubs/bs_hash_stubs.cmx
 ounit_tests/ounit_hash_set_tests.cmx : ext/string_hash_set.cmx \
     ext/ordered_hash_set_string.cmx ounit/oUnit.cmx ext/hash_set_poly.cmx \
-    ext/hash_set.cmx
+    ext/hash_set.cmx ext/ext_array.cmx
 ounit_tests/ounit_scc_tests.cmx : ext/string_hashtbl.cmx ounit/oUnit.cmx \
     ext/int_vec_vec.cmx ext/int_vec.cmx ext/ext_string.cmx ext/ext_scc.cmx
 ounit_tests/ounit_hashtbl_tests.cmx : ext/string_hashtbl.cmx ounit/oUnit.cmx
@@ -1010,20 +1010,21 @@ 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 \
     bsb/bsb_log.cmx bsb/bsb_config_parse.cmx bsb/bsb_config.cmx \
     bsb/bsb_clean.cmx bsb/bsb_build_util.cmx bsb/bsb_ninja_regen.cmi
-bsb/bsb_ninja_util.cmx : ext/ext_string.cmx bsb/bsb_rule.cmx \
-    bsb/bsb_ninja_util.cmi
+bsb/bsb_ninja_util.cmx : ext/ext_string.cmx ext/ext_array.cmx \
+    bsb/bsb_rule.cmx bsb/bsb_ninja_util.cmi
 bsb/bsb_package_specs.cmx : ext/string_map.cmx ext/literals.cmx \
     ext/ext_string.cmx ext/ext_path.cmx ext/ext_namespace.cmx \
-    ext/ext_json_types.cmx ext/ext_json.cmx bsb/bsb_exception.cmx \
-    bsb/bsb_config.cmx bsb/bsb_build_schemas.cmx bsb/bsb_package_specs.cmi
+    ext/ext_json_types.cmx ext/ext_json.cmx ext/ext_array.cmx \
+    bsb/bsb_exception.cmx bsb/bsb_config.cmx bsb/bsb_build_schemas.cmx \
+    bsb/bsb_package_specs.cmi
 bsb/bsb_parse_sources.cmx : ext/string_vec.cmx ext/string_set.cmx \
     ext/string_map.cmx ext/literals.cmx ext/ext_string.cmx \
-    ext/ext_position.cmx ext/ext_path.cmx ext/ext_namespace.cmx \
-    ext/ext_json_types.cmx ext/ext_json_parse.cmx ext/ext_json.cmx \
-    ext/ext_filename.cmx ext/ext_file_pp.cmx ext/ext_array.cmx \
-    bsb/bsb_log.cmx bsb/bsb_file_groups.cmx bsb/bsb_exception.cmx \
-    bsb/bsb_dir_index.cmx bsb/bsb_db.cmx bsb/bsb_config.cmx \
-    bsb/bsb_build_util.cmx bsb/bsb_build_schemas.cmx \
+    ext/ext_position.cmx ext/ext_pervasives.cmx ext/ext_path.cmx \
+    ext/ext_namespace.cmx ext/ext_json_types.cmx ext/ext_json_parse.cmx \
+    ext/ext_json.cmx ext/ext_filename.cmx ext/ext_file_pp.cmx \
+    ext/ext_array.cmx bsb/bsb_log.cmx bsb/bsb_file_groups.cmx \
+    bsb/bsb_exception.cmx bsb/bsb_dir_index.cmx bsb/bsb_db.cmx \
+    bsb/bsb_config.cmx bsb/bsb_build_util.cmx bsb/bsb_build_schemas.cmx \
     bsb/bsb_parse_sources.cmi
 bsb/bsb_pkg.cmx : ext/string_hashtbl.cmx ext/literals.cmx bsb/bsb_log.cmx \
     bsb/bsb_exception.cmx bsb/bsb_pkg.cmi

jscomp/bin/all_ounit_tests.ml

@@ -1335,6 +1335,11 @@ val map :
   'a array -> 
   ('a -> 'b) -> 
   'b array
+
+val iter :
+  'a array -> 
+  ('a -> unit) -> 
+  unit
 end = struct
 #1 "ext_array.ml"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -1591,6 +1596,10 @@ let map a f =
     r
   end
 
+let iter a f =
+  let open Array in 
+  for i = 0 to length a - 1 do f(unsafe_get a i) done
+
 end
 module Ext_bytes : sig 
 #1 "ext_bytes.mli"
@@ -4619,11 +4628,11 @@ let stats h =
   let mbl =
     Array.fold_left (fun m b -> max m (List.length b)) 0 h.data in
   let histo = Array.make (mbl + 1) 0 in
-  Array.iter
+  Ext_array.iter h.data
     (fun b ->
        let l = List.length b in
        histo.(l) <- histo.(l) + 1)
-    h.data;
+    ;
   {Hashtbl.num_bindings = h.size;
    num_buckets = Array.length h.data;
    max_bucket_length = mbl;
@@ -5193,11 +5202,11 @@ let stats h =
   let mbl =
     Array.fold_left (fun m (b : _ bucket) -> max m (bucket_length 0 b)) 0 h.data in
   let histo = Array.make (mbl + 1) 0 in
-  Array.iter
+  Ext_array.iter h.data
     (fun b ->
        let l = bucket_length 0 b in
        histo.(l) <- histo.(l) + 1)
-    h.data;
+    ;
   { Hashtbl.num_bindings = h.size;
     num_buckets = h.data_mask + 1 ;
     max_bucket_length = mbl;
@@ -5598,7 +5607,7 @@ let suites =
       let of_array lst =
         let len = Array.length lst in 
         let tbl = String_hash_set.create len in 
-        Array.iter (String_hash_set.add tbl ) lst; tbl  in 
+        Ext_array.iter lst (String_hash_set.add tbl) ; tbl  in 
       let hash = of_array const_tbl  in 
       let len = String_hash_set.length hash in 
       String_hash_set.remove hash "x";
@@ -5954,11 +5963,11 @@ let stats h =
   let mbl =
     Array.fold_left (fun m b -> max m (bucket_length 0 b)) 0 h.data in
   let histo = Array.make (mbl + 1) 0 in
-  Array.iter
+  Ext_array.iter h.data
     (fun b ->
        let l = bucket_length 0 b in
        histo.(l) <- histo.(l) + 1)
-    h.data;
+    ;
   {Hashtbl.
     num_bindings = h.size;
     num_buckets = Array.length h.data;
@@ -10803,6 +10812,8 @@ external reraise: exn -> 'a = "%reraise"
 
 val finally : 'a -> ('a -> 'c) -> ('a -> 'b) -> 'b
 
+val try_it : (unit -> unit) ->  unit 
+
 val with_file_as_chan : string -> (out_channel -> 'a) -> 'a
 
 val with_file_as_pp : string -> (Format.formatter -> 'a) -> 'a
@@ -10866,6 +10877,9 @@ let finally v action f   =
       reraise e 
   | e ->  action v ; e 
 
+let try_it f  =   
+  try f () with _ -> ()
+
 let with_file_as_chan filename f = 
   finally (open_out_bin filename) close_out f 
 

jscomp/bsb/bsb_build_util.ml

@@ -199,9 +199,8 @@ let rec walk_all_deps_aux visited paths top dir cb =
         map
         |?
         (Bsb_build_schemas.bs_dependencies,
-         `Arr (fun (new_packages : Ext_json_types.t array) ->
-             new_packages
-             |> Array.iter (fun (js : Ext_json_types.t) ->
+         `Arr (fun (new_packages : Ext_json_types.t array) ->             
+             Ext_array.iter new_packages(fun js ->
                  begin match js with
                    | Str {str = new_package} ->
                      let package_dir = 
@@ -218,9 +217,8 @@ let rec walk_all_deps_aux visited paths top dir cb =
           map
           |?
           (Bsb_build_schemas.bs_dev_dependencies,
-           `Arr (fun (new_packages : Ext_json_types.t array) ->
-               new_packages
-               |> Array.iter (fun (js : Ext_json_types.t) ->
+           `Arr (fun (new_packages : Ext_json_types.t array) ->               
+               Ext_array.iter new_packages (fun (js : Ext_json_types.t) ->
                    match js with
                    | Str {str = new_package} ->
                      let package_dir = 

jscomp/bsb/bsb_ninja_util.ml

@@ -166,6 +166,6 @@ let output_kv key value oc  =
   output_string oc "\n"
 
 let output_kvs kvs oc =
-  Array.iter (fun (k,v) -> output_kv k v oc) kvs
+  Ext_array.iter kvs (fun (k,v) -> output_kv k v oc) 
 
 

jscomp/bsb/bsb_package_specs.ml

@@ -63,9 +63,7 @@ let bad_module_format_message_exn ~loc format =
 let rec from_array (arr : Ext_json_types.t array) : Spec_set.t =
   let spec = ref Spec_set.empty in
   let has_in_source = ref false in
-  arr
-  |> Array.iter (fun (x : Ext_json_types.t) ->
-
+  Ext_array.iter arr (fun x ->
       let result = from_json_single x  in
       if result.in_source then 
         (

jscomp/bsb/bsb_parse_sources.ml

@@ -174,7 +174,7 @@ let extract_generators
   begin match String_map.find_opt Bsb_build_schemas.generators input with
     | Some (Arr { content ; loc_start}) ->
       (* Need check is dev build or not *)
-      Array.iter begin fun (x : Ext_json_types.t) ->
+      Ext_array.iter content (fun x ->
         match x with
         | Obj { map = generator; loc} ->
           begin match String_map.find_opt Bsb_build_schemas.name generator,
@@ -201,7 +201,7 @@ let extract_generators
               Bsb_exception.errorf ~loc "Invalid generator format"
           end
         | _ -> Bsb_exception.errorf ~loc:(Ext_json.loc_of x) "Invalid generator format"
-      end  content 
+      )  
     | Some x  -> Bsb_exception.errorf ~loc:(Ext_json.loc_of x ) "Invalid generator format"
     | None -> ()
   end ;
@@ -225,7 +225,7 @@ let clean_staled_bs_js_files
     (context : cxt) 
     (cur_sources : _ String_map.t ) 
     (files : string array)  =     
-  Array.iter begin fun current_file -> 
+  Ext_array.iter files (fun current_file -> 
     match Ext_namespace.ends_with_bs_suffix_then_chop current_file  with
     | None -> ()
     | Some basename -> (* Found [.bs.js] files *)
@@ -260,9 +260,10 @@ let clean_staled_bs_js_files
                 Literals.suffix_cmt; Literals.suffix_cmti ; 
                 Literals.suffix_mlast; Literals.suffix_mlastd;
                 Literals.suffix_mliast; Literals.suffix_mliastd
+                (*TODO: GenType*)
              ];
            end           
-  end files
+  )
 
 let rec 
   parsing_source_dir_map 
@@ -461,7 +462,7 @@ type walk_cxt = {
 let rec walk_sources (cxt : walk_cxt) (sources : Ext_json_types.t) = 
   match sources with 
   | Arr {content =  file_groups} -> 
-    Array.iter (fun x -> walk_single_source cxt x) file_groups
+    Ext_array.iter file_groups (fun x -> walk_single_source cxt x) 
   | x -> walk_single_source  cxt x    
 and walk_single_source cxt (x : Ext_json_types.t) =      
   match x with 
@@ -488,7 +489,7 @@ and walk_source_dir_map (cxt : walk_cxt) (input : Ext_json_types.t String_map.t)
     let file_array = Sys.readdir working_dir in 
     (* Format.fprintf Format.err_formatter 
       "@[Walking %s@]@." working_dir; *)
-    file_array |> Array.iter begin fun file -> 
+    Ext_array.iter file_array begin fun file -> 
         if Ext_string.ends_with file Literals.suffix_re_js then 
           Sys.remove (Filename.concat working_dir file)
     end; 
@@ -498,7 +499,7 @@ and walk_source_dir_map (cxt : walk_cxt) (input : Ext_json_types.t String_map.t)
     match sub_dirs_field, cxt_traverse with     
     | None, true 
     | Some(True _), _ -> 
-      file_array |> Array.iter begin fun f -> 
+      Ext_array.iter file_array begin fun f -> 
       if Sys.is_directory (Filename.concat working_dir f ) then 
         walk_source_dir_map 
         {cxt with 
@@ -512,18 +513,19 @@ and walk_source_dir_map (cxt : walk_cxt) (input : Ext_json_types.t String_map.t)
     | Some (False _), _ -> ()      
     | Some s, _ -> walk_sources cxt s 
 
+(* It makes use of the side effect when [walk_sources], removing suffix_re_js,
+   TODO: make it configurable
+ *)
 let clean_re_js root =     
   match Ext_json_parse.parse_json_from_file 
       (Filename.concat root Literals.bsconfig_json) with 
   | Obj {map ; loc} -> 
-    begin match String_map.find_opt Bsb_build_schemas.sources map with 
+    (match String_map.find_opt Bsb_build_schemas.sources map with 
     | Some config -> 
-      (try 
-        walk_sources 
-        { root ; traverse = true; cwd = Filename.current_dir_name} config
-      with _ -> ())
-    | None  -> ()
-    end  
+      Ext_pervasives.try_it (fun () -> 
+           walk_sources { root ; traverse = true; cwd = Filename.current_dir_name} config
+        )      
+    | None  -> ())
   | _  -> () 
   | exception _ -> ()    
 

jscomp/core/cmjdump_main.ml

@@ -64,8 +64,8 @@ let pp_cmj fmt
                 k 
                 (not non_saved)
                 (fun fmt xs ->
-                   Array.iter (fun arity -> p fmt "@[%a@]@ ;" Lam_arity.print arity ) 
-                     xs) xs 
+                   Ext_array.iter xs (fun arity -> p fmt "@[%a@]@ ;" Lam_arity.print arity ) 
+                     ) xs 
 
          )) values
 

jscomp/ext/ext_array.ml

@@ -251,3 +251,7 @@ let map a f =
     done;
     r
   end
+
+let iter a f =
+  let open Array in 
+  for i = 0 to length a - 1 do f(unsafe_get a i) done

jscomp/ext/ext_array.mli

@@ -83,4 +83,9 @@ val for_all2_no_exn :
 val map :   
   'a array -> 
   ('a -> 'b) -> 
-  'b array
+  'b array
+
+val iter :
+  'a array -> 
+  ('a -> unit) -> 
+  unit

jscomp/ext/ext_pervasives.ml

@@ -36,6 +36,9 @@ let finally v action f   =
       reraise e 
   | e ->  action v ; e 
 
+let try_it f  =   
+  try f () with _ -> ()
+
 let with_file_as_chan filename f = 
   finally (open_out_bin filename) close_out f 
 

jscomp/ext/ext_pervasives.mli

@@ -36,6 +36,8 @@ external reraise: exn -> 'a = "%reraise"
 
 val finally : 'a -> ('a -> 'c) -> ('a -> 'b) -> 'b
 
+val try_it : (unit -> unit) ->  unit 
+
 val with_file_as_chan : string -> (out_channel -> 'a) -> 'a
 
 val with_file_as_pp : string -> (Format.formatter -> 'a) -> 'a

jscomp/ext/hash_set_gen.ml

@@ -109,11 +109,11 @@ let stats h =
   let mbl =
     Array.fold_left (fun m b -> max m (List.length b)) 0 h.data in
   let histo = Array.make (mbl + 1) 0 in
-  Array.iter
+  Ext_array.iter h.data
     (fun b ->
        let l = List.length b in
        histo.(l) <- histo.(l) + 1)
-    h.data;
+    ;
   {Hashtbl.num_bindings = h.size;
    num_buckets = Array.length h.data;
    max_bucket_length = mbl;

jscomp/ext/hashtbl_gen.ml

@@ -135,11 +135,11 @@ let stats h =
   let mbl =
     Array.fold_left (fun m b -> max m (bucket_length 0 b)) 0 h.data in
   let histo = Array.make (mbl + 1) 0 in
-  Array.iter
+  Ext_array.iter h.data
     (fun b ->
        let l = bucket_length 0 b in
        histo.(l) <- histo.(l) + 1)
-    h.data;
+    ;
   {Hashtbl.
     num_bindings = h.size;
     num_buckets = Array.length h.data;