Add Ext_array.fold_left

Author: bobzhang

Diff for: jscomp/bin/all_ounit_tests.ml

@@ -1340,6 +1340,12 @@ val iter :
   'a array -> 
   ('a -> unit) -> 
   unit
+
+val fold_left :   
+  'b array -> 
+  'a -> 
+  ('a -> 'b -> 'a) ->   
+  'a
 end = struct
 #1 "ext_array.ml"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -1600,6 +1606,15 @@ let iter a f =
   let open Array in 
   for i = 0 to length a - 1 do f(unsafe_get a i) done
 
+
+  let fold_left a x f =
+    let open Array in 
+    let r = ref x in    
+    for i = 0 to length a - 1 do
+      r := f !r (unsafe_get a i)
+    done;
+    !r
+  
 end
 module Ext_bytes : sig 
 #1 "ext_bytes.mli"
@@ -3480,7 +3495,7 @@ let of_list l =
   | _ -> of_sorted_list (List.sort_uniq compare_elt l)
 
 let of_array l = 
-  Array.fold_left (fun  acc x -> add acc x ) empty l
+  Ext_array.fold_left l empty (fun  acc x -> add acc x ) 
 
 (* also check order *)
 let invariant t =
@@ -5475,7 +5490,7 @@ let add_list (xs : _ list ) init =
 let of_list xs = add_list xs empty
 
 let of_array xs = 
-  Array.fold_left (fun acc (k,v) -> add acc k v ) empty xs
+  Ext_array.fold_left xs empty (fun acc (k,v) -> add acc k v ) 
 
 end
 module Ext_json_types
@@ -8496,7 +8511,7 @@ let elements set =
 
 let stats h =
   let mbl =
-    Array.fold_left (fun m b -> max m (List.length b)) 0 h.data in
+    Ext_array.fold_left h.data 0 (fun m b -> max m (List.length b)) in
   let histo = Array.make (mbl + 1) 0 in
   Ext_array.iter h.data
     (fun b ->
@@ -9070,7 +9085,7 @@ let rec bucket_length acc (x : _ bucket) =
 
 let stats h =
   let mbl =
-    Array.fold_left (fun m (b : _ bucket) -> max m (bucket_length 0 b)) 0 h.data in
+    Ext_array.fold_left h.data 0 (fun m (b : _ bucket) -> max m (bucket_length 0 b)) in
   let histo = Array.make (mbl + 1) 0 in
   Ext_array.iter h.data
     (fun b ->
@@ -9831,7 +9846,7 @@ let rec bucket_length accu = function
 
 let stats h =
   let mbl =
-    Array.fold_left (fun m b -> max m (bucket_length 0 b)) 0 h.data in
+    Ext_array.fold_left h.data 0 (fun m b -> max m (bucket_length 0 b)) in
   let histo = Array.make (mbl + 1) 0 in
   Ext_array.iter h.data
     (fun b ->
@@ -13988,7 +14003,7 @@ let add_list (xs : _ list ) init =
 let of_list xs = add_list xs empty
 
 let of_array xs = 
-  Array.fold_left (fun acc (k,v) -> add acc k v ) empty xs
+  Ext_array.fold_left xs empty (fun acc (k,v) -> add acc k v ) 
 
 end
 module Ounit_map_tests

Diff for: jscomp/bin/bsb_native.ml

@@ -1491,6 +1491,12 @@ val iter :
   'a array -> 
   ('a -> unit) -> 
   unit
+
+val fold_left :   
+  'b array -> 
+  'a -> 
+  ('a -> 'b -> 'a) ->   
+  'a
 end = struct
 #1 "ext_array.ml"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -1751,6 +1757,15 @@ let iter a f =
   let open Array in 
   for i = 0 to length a - 1 do f(unsafe_get a i) done
 
+
+  let fold_left a x f =
+    let open Array in 
+    let r = ref x in    
+    for i = 0 to length a - 1 do
+      r := f !r (unsafe_get a i)
+    done;
+    !r
+  
 end
 module Ext_list : sig 
 #1 "ext_list.mli"
@@ -3367,7 +3382,7 @@ let add_list (xs : _ list ) init =
 let of_list xs = add_list xs empty
 
 let of_array xs = 
-  Array.fold_left (fun acc (k,v) -> add acc k v ) empty xs
+  Ext_array.fold_left xs empty (fun acc (k,v) -> add acc k v ) 
 
 end
 module Ext_json_types
@@ -4411,7 +4426,7 @@ let rec bucket_length accu = function
 
 let stats h =
   let mbl =
-    Array.fold_left (fun m b -> max m (bucket_length 0 b)) 0 h.data in
+    Ext_array.fold_left h.data 0 (fun m b -> max m (bucket_length 0 b)) in
   let histo = Array.make (mbl + 1) 0 in
   Ext_array.iter h.data
     (fun b ->
@@ -8954,7 +8969,7 @@ let of_list l =
   | _ -> of_sorted_list (List.sort_uniq compare_elt l)
 
 let of_array l = 
-  Array.fold_left (fun  acc x -> add acc x ) empty l
+  Ext_array.fold_left l empty (fun  acc x -> add acc x ) 
 
 (* also check order *)
 let invariant t =
@@ -9660,7 +9675,7 @@ let  handle_empty_sources
   let files_array = Lazy.force file_array in 
   let dyn_file_array = String_vec.make (Array.length files_array) in 
   let files  =
-    Array.fold_left (fun acc name -> 
+    Ext_array.fold_left files_array !cur_sources (fun acc name -> 
         if is_input_or_output generators name then acc 
         else
           match Ext_string.is_valid_source_name name with 
@@ -9674,7 +9689,7 @@ let  handle_empty_sources
               warning_unused_file name dir ;
             acc 
           | Suffix_mismatch -> acc 
-      ) !cur_sources files_array in 
+      ) in 
   cur_sources := files ;    
   [ Ext_file_pp.patch_action dyn_file_array 
       loc_start loc_end
@@ -9830,7 +9845,7 @@ let rec
     | None ->  (* No setting on [!files]*)
       (** We should avoid temporary files *)
       cur_sources := 
-        Array.fold_left (fun acc name -> 
+        Ext_array.fold_left (Lazy.force file_array) !cur_sources (fun acc name -> 
             if is_input_or_output generators name then 
               acc 
             else 
@@ -9844,7 +9859,7 @@ let rec
                 ; 
                 acc 
               | Suffix_mismatch ->  acc
-          ) !cur_sources (Lazy.force file_array);
+          ) ;
       cur_globbed_dirs :=  [dir]  
     | Some (Arr ({content = [||] }as empty_json_array)) -> 
       (* [ ] populatd by scanning the dir (just once) *)         
@@ -9858,12 +9873,12 @@ let rec
          TODO: still need check?
       *)      
       cur_sources := 
-        Array.fold_left (fun acc (s : Ext_json_types.t) ->
+        Ext_array.fold_left sx !cur_sources (fun acc s ->
             match s with 
             | Str {str = s} -> 
               Bsb_db.collect_module_by_filename ~dir acc s
             | _ -> acc
-          ) !cur_sources sx    
+          ) 
     | Some (Obj {map = m; loc} ) -> (* { excludes : [], slow_re : "" }*)
       cur_globbed_dirs := [dir];  
       let excludes = 
@@ -9882,11 +9897,11 @@ let rec
           fun name -> Str.string_match re name 0 && not (List.mem name excludes)
         | Some x, _ -> Bsb_exception.errorf ~loc "slow-re expect a string literal"
         | None , _ -> Bsb_exception.errorf ~loc  "missing field: slow-re"  in 
-      cur_sources := Array.fold_left (fun acc name -> 
+      cur_sources := Ext_array.fold_left (Lazy.force file_array) !cur_sources (fun acc name -> 
           if is_input_or_output generators name || not (predicate name) then acc 
           else 
             Bsb_db.collect_module_by_filename  ~dir acc name 
-        ) !cur_sources (Lazy.force file_array)      
+        ) 
     | Some x -> Bsb_exception.config_error x "files field expect array or object "
   end;
   let cur_sources = !cur_sources in 
@@ -9900,7 +9915,7 @@ let rec
     | Some (True _), _ -> 
       let root = cxt.root in 
       let parent = Filename.concat root dir in
-      Array.fold_left (fun origin x -> 
+      Ext_array.fold_left (Lazy.force file_array) Bsb_file_groups.empty (fun origin x -> 
             if Sys.is_directory (Filename.concat parent x) then 
               Bsb_file_groups.merge
               (
@@ -9911,7 +9926,7 @@ let rec
                    traverse = true
                   } String_map.empty)  origin               
             else origin  
-          ) Bsb_file_groups.empty (Lazy.force file_array) 
+          ) 
         (* readdir parent avoiding scanning twice *)        
     | None, false  
     | Some (False _), _  -> Bsb_file_groups.empty
@@ -9971,10 +9986,9 @@ and parsing_single_source ({not_dev; dir_index ; cwd} as cxt ) (x : Ext_json_typ
                   cwd= Ext_path.concat cwd dir} map
   | _ -> Bsb_file_groups.empty
 and  parsing_arr_sources cxt (file_groups : Ext_json_types.t array)  = 
-  Array.fold_left (fun  origin x ->
+  Ext_array.fold_left file_groups Bsb_file_groups.empty (fun  origin x ->
       Bsb_file_groups.merge (parsing_single_source cxt x) origin 
-    ) Bsb_file_groups.empty  file_groups 
-
+    ) 
 and  parse_sources ( cxt : cxt) (sources : Ext_json_types.t )  = 
   match sources with   
   | Arr file_groups -> 
@@ -10833,7 +10847,7 @@ let elements set =
 
 let stats h =
   let mbl =
-    Array.fold_left (fun m b -> max m (List.length b)) 0 h.data in
+    Ext_array.fold_left h.data 0 (fun m b -> max m (List.length b)) in
   let histo = Array.make (mbl + 1) 0 in
   Ext_array.iter h.data
     (fun b ->
@@ -11809,8 +11823,8 @@ let interpret_json
     |? (Bsb_build_schemas.cut_generators, `Bool (fun b -> cut_generators := b))
     |? (Bsb_build_schemas.generators, `Arr (fun s ->
         generators :=
-          Array.fold_left (fun acc json -> 
-              match (json : Ext_json_types.t) with 
+          Ext_array.fold_left s String_map.empty (fun acc json -> 
+              match json with 
               | Obj {map = m ; loc}  -> 
                 begin match String_map.find_opt  m Bsb_build_schemas.name,
                             String_map.find_opt  m Bsb_build_schemas.command with 
@@ -11819,7 +11833,7 @@ let interpret_json
                 | _, _ -> 
                   Bsb_exception.errorf ~loc {| generators exepect format like { "name" : "cppo",  "command"  : "cppo $in -o $out"} |}
                 end
-              | _ -> acc ) String_map.empty  s  ))
+              | _ -> acc ) ))
     |? (Bsb_build_schemas.refmt_flags, `Arr (fun s -> refmt_flags := get_list_string s))
     |? (Bsb_build_schemas.entries, `Arr (fun s -> entries := parse_entries s))
     |> ignore ;