fix ci

Author: bobzhang

jscomp/bin/all_ounit_tests.ml

@@ -4002,10 +4002,10 @@ let merge t1 t2 =
     bal t1 x d (remove_min_binding t2)
 
 
-let rec iter f = function
+let rec iter x f = match x with 
     Empty -> ()
   | Node(l, v, d, r, _) ->
-    iter f l; f v d; iter f r
+    iter l f; f v d; iter r f
 
 let rec map f = function
     Empty ->
@@ -4173,7 +4173,7 @@ module type S =
 
     val equal: ('a -> 'a -> bool) -> 'a t -> 'a t -> bool
 
-    val iter: (key -> 'a -> unit) -> 'a t -> unit
+    val iter: 'a t -> (key -> 'a -> unit) ->  unit
     (** [iter f m] applies [f] to all bindings in map [m].
         The bindings are passed to [f] in increasing order. *)
 
@@ -7285,12 +7285,12 @@ let encode_single (x : Bsb_db.t) (buf : Buffer.t)  (buf2 : Buffer.t) =
   let len = String_map.cardinal x in 
   nl buf ; 
   Buffer.add_string buf (string_of_int len);
-  String_map.iter (fun name module_info ->
+  String_map.iter x (fun name module_info ->
       nl buf; 
       Buffer.add_string buf name; 
       nl buf2; 
       encode_module_info module_info buf2 
-    ) x
+    ) 
 
 let encode (x : Bsb_db.ts) (oc : out_channel)=     
   output_char oc '\n';
@@ -7415,6 +7415,33 @@ let printer_string = fun x -> x
 let (=~) = OUnit.assert_equal  ~printer:printer_string  
 
 
+let parse_data_one = 
+(Bsb_db_io.decode {|4.0.19
+2
+1
+Demo
+src/demo,01
+1
+Test
+examples/test,01
+|} (ref 7))
+
+let parse_data_two = 
+  Bsb_db_io.decode {|4.0.19
+3
+2
+Fib
+Demo
+src/hi/fib,01
+src/demo,01
+0
+0|} (ref 7)
+let data_one : Bsb_db_io.group array = 
+  [| {modules = [|"Demo"|]; meta_info_offset = 16}; {modules = [|"Test"|]; meta_info_offset = 35}|]
+
+let data_two : Bsb_db_io.group array =  
+  [| {modules = [|"Fib"; "Demo"|]; meta_info_offset = 20 }; {modules = [||]; meta_info_offset = 48}; {modules = [||]; meta_info_offset = -1} |]
+
 
 let scope_test s (a,b,c)= 
   match Bsb_pkg_types.extract_pkg_name_and_file s with 
@@ -7469,32 +7496,11 @@ let suites =
     s_test1 "xx/yy/zz" "xx/yy/zz"
   end;
   __LOC__ >:: begin fun _ -> 
-   let u = (Bsb_db_io.decode {|4.0.19
-2
-1
-Demo
-0
-src/demo,0,0
-1
-Test
-0
-examples/test,0,0
-|} (ref 7)) in  
-  OUnit.assert_equal u  [| {modules = [|"Demo"|]; meta_info_offset = 16}; {modules = [|"Test"|]; meta_info_offset = 38}|]
+  OUnit.assert_equal parse_data_one  data_one
   end ;
   __LOC__ >:: begin fun _ -> 
-  let v = Bsb_db_io.decode {|4.0.19
-3
-2
-Fib
-Demo
-0
-src/hi/fib,0,0
-0
-src/demo,0,0
-0
-0|} (ref 7) in 
-  OUnit.assert_equal v [| {modules = [|"Fib"; "Demo"|]; meta_info_offset = 20 }; {modules = [||]; meta_info_offset = 54}; {modules = [||]; meta_info_offset = -1} |]
+  
+  OUnit.assert_equal parse_data_two data_two
   end 
   ]
 
@@ -13982,7 +13988,7 @@ let suites =
           Array.fold_left (fun acc key -> Int_map.adjust acc key (fun v -> match v with None ->  1 | Some v -> succ v)   ) v a  
           end
         in  
-       Int_map.iter (fun _ v -> v =~ 2 ) u   ;
+       Int_map.iter u (fun _ v -> v =~ 2 ) ;
        Int_map.cardinal u =~ count
     end
   ]

jscomp/bin/bsb_native.ml

@@ -1894,10 +1894,10 @@ let merge t1 t2 =
     bal t1 x d (remove_min_binding t2)
 
 
-let rec iter f = function
+let rec iter x f = match x with 
     Empty -> ()
   | Node(l, v, d, r, _) ->
-    iter f l; f v d; iter f r
+    iter l f; f v d; iter r f
 
 let rec map f = function
     Empty ->
@@ -2065,7 +2065,7 @@ module type S =
 
     val equal: ('a -> 'a -> bool) -> 'a t -> 'a t -> bool
 
-    val iter: (key -> 'a -> unit) -> 'a t -> unit
+    val iter: 'a t -> (key -> 'a -> unit) ->  unit
     (** [iter f m] applies [f] to all bindings in map [m].
         The bindings are passed to [f] in increasing order. *)
 
@@ -12473,12 +12473,12 @@ let encode_single (x : Bsb_db.t) (buf : Buffer.t)  (buf2 : Buffer.t) =
   let len = String_map.cardinal x in 
   nl buf ; 
   Buffer.add_string buf (string_of_int len);
-  String_map.iter (fun name module_info ->
+  String_map.iter x (fun name module_info ->
       nl buf; 
       Buffer.add_string buf name; 
       nl buf2; 
       encode_module_info module_info buf2 
-    ) x
+    ) 
 
 let encode (x : Bsb_db.ts) (oc : out_channel)=     
   output_char oc '\n';
@@ -12666,10 +12666,10 @@ let output ~dir namespace
   let oc = open_out_bin (dir// fname ) in 
   List.iter
     (fun  (x : Bsb_file_groups.file_group) ->
-      String_map.iter (fun k _ -> 
+      String_map.iter x.sources (fun k _ -> 
         output_string oc k ;
         output_string oc "\n"
-      ) x.sources 
+      ) 
      )  file_groups ;
   close_out oc 
 end
@@ -13850,7 +13850,7 @@ let output_ninja_and_namespace_map
       for i = 1 to number_of_dev_groups  do
         let c = bs_groups.(i) in
         has_reason_files :=  Bsb_db.sanity_check c || !has_reason_files ;
-        String_map.iter (fun k _ -> if String_map.mem k lib then failwith ("conflict files found:" ^ k)) c ;
+        String_map.iter c (fun k _ -> if String_map.mem k lib then failwith ("conflict files found:" ^ k)) ;
         Bsb_ninja_util.output_kv 
           (Bsb_dir_index.(string_of_bsb_dev_include (of_int i)))
           (Bsb_build_util.include_dirs @@ source_dirs.(i)) oc

jscomp/bin/bspack.ml

@@ -8544,10 +8544,10 @@ let merge t1 t2 =
     bal t1 x d (remove_min_binding t2)
 
 
-let rec iter f = function
+let rec iter x f = match x with 
     Empty -> ()
   | Node(l, v, d, r, _) ->
-    iter f l; f v d; iter f r
+    iter l f; f v d; iter r f
 
 let rec map f = function
     Empty ->
@@ -8715,7 +8715,7 @@ module type S =
 
     val equal: ('a -> 'a -> bool) -> 'a t -> 'a t -> bool
 
-    val iter: (key -> 'a -> unit) -> 'a t -> unit
+    val iter: 'a t -> (key -> 'a -> unit) ->  unit
     (** [iter f m] applies [f] to all bindings in map [m].
         The bindings are passed to [f] in increasing order. *)
 

jscomp/bsb/bsb_db_io.ml

@@ -98,12 +98,12 @@ let encode_single (x : Bsb_db.t) (buf : Buffer.t)  (buf2 : Buffer.t) =
   let len = String_map.cardinal x in 
   nl buf ; 
   Buffer.add_string buf (string_of_int len);
-  String_map.iter (fun name module_info ->
+  String_map.iter x (fun name module_info ->
       nl buf; 
       Buffer.add_string buf name; 
       nl buf2; 
       encode_module_info module_info buf2 
-    ) x
+    ) 
 
 let encode (x : Bsb_db.ts) (oc : out_channel)=     
   output_char oc '\n';

jscomp/bsb/bsb_namespace_map_gen.ml

@@ -36,9 +36,9 @@ let output ~dir namespace
   let oc = open_out_bin (dir// fname ) in 
   List.iter
     (fun  (x : Bsb_file_groups.file_group) ->
-      String_map.iter (fun k _ -> 
+      String_map.iter x.sources (fun k _ -> 
         output_string oc k ;
         output_string oc "\n"
-      ) x.sources 
+      ) 
      )  file_groups ;
   close_out oc 

jscomp/bsb/bsb_ninja_gen.ml

@@ -206,7 +206,7 @@ let output_ninja_and_namespace_map
       for i = 1 to number_of_dev_groups  do
         let c = bs_groups.(i) in
         has_reason_files :=  Bsb_db.sanity_check c || !has_reason_files ;
-        String_map.iter (fun k _ -> if String_map.mem k lib then failwith ("conflict files found:" ^ k)) c ;
+        String_map.iter c (fun k _ -> if String_map.mem k lib then failwith ("conflict files found:" ^ k)) ;
         Bsb_ninja_util.output_kv 
           (Bsb_dir_index.(string_of_bsb_dev_include (of_int i)))
           (Bsb_build_util.include_dirs @@ source_dirs.(i)) oc

jscomp/ext/ext_pp_scope.ml

@@ -39,14 +39,14 @@ let empty =
 
 let rec print fmt v = 
   Format.fprintf fmt "@[<v>{"  ;
-  String_map.iter (fun k m -> 
+  String_map.iter v (fun k m -> 
       Format.fprintf fmt "%s: @[%a@],@ " k print_int_map m       
-    )  v;
+    )  ;
   Format.fprintf fmt "}@]"  
 and print_int_map fmt m = 
-  Int_map.iter (fun k v -> 
+  Int_map.iter m (fun k v -> 
       Format.fprintf fmt "%d - %d" k v       
-    ) m    
+    )    
 
 let add_ident ~mangled:name stamp (cxt : t) : int * t = 
   match String_map.find_opt name cxt with 

jscomp/ext/map_gen.ml

@@ -137,10 +137,10 @@ let merge t1 t2 =
     bal t1 x d (remove_min_binding t2)
 
 
-let rec iter f = function
+let rec iter x f = match x with 
     Empty -> ()
   | Node(l, v, d, r, _) ->
-    iter f l; f v d; iter f r
+    iter l f; f v d; iter r f
 
 let rec map f = function
     Empty ->
@@ -308,7 +308,7 @@ module type S =
 
     val equal: ('a -> 'a -> bool) -> 'a t -> 'a t -> bool
 
-    val iter: (key -> 'a -> unit) -> 'a t -> unit
+    val iter: 'a t -> (key -> 'a -> unit) ->  unit
     (** [iter f m] applies [f] to all bindings in map [m].
         The bindings are passed to [f] in increasing order. *)
 

jscomp/ounit_tests/ounit_bsb_pkg_tests.ml

@@ -7,7 +7,40 @@ let printer_string = fun x -> x
 let (=~) = OUnit.assert_equal  ~printer:printer_string  
 
 
+let parse_data_one = 
+(Bsb_db_io.decode {|4.0.19
+2
+1
+Demo
+src/demo,01
+1
+Test
+examples/test,01
+|} (ref 7))
+
+let parse_data_two = 
+  Bsb_db_io.decode {|4.0.19
+3
+2
+Fib
+Demo
+src/hi/fib,01
+src/demo,01
+0
+0|} (ref 7)
+let data_one : Bsb_db_io.group array = 
+  [| {modules = [|"Demo"|]; meta_info_offset = 16}; {modules = [|"Test"|]; meta_info_offset = 35}|]
 
+let data_two : Bsb_db_io.group array =  
+  [| {modules = [|"Fib"; "Demo"|]; meta_info_offset = 20 }; {modules = [||]; meta_info_offset = 48}; {modules = [||]; meta_info_offset = -1} |]
+
+#if 0 then  
+let () = 
+  Format.fprintf Format.err_formatter
+  "hi\n%a@.%a\n@."
+   Ext_obj.pp_any parse_data_one  
+   Ext_obj.pp_any parse_data_two
+#end
 let scope_test s (a,b,c)= 
   match Bsb_pkg_types.extract_pkg_name_and_file s with 
   | Scope(a0,b0),c0 -> 
@@ -61,32 +94,11 @@ let suites =
     s_test1 "xx/yy/zz" "xx/yy/zz"
   end;
   __LOC__ >:: begin fun _ -> 
-   let u = (Bsb_db_io.decode {|4.0.19
-2
-1
-Demo
-0
-src/demo,0,0
-1
-Test
-0
-examples/test,0,0
-|} (ref 7)) in  
-  OUnit.assert_equal u  [| {modules = [|"Demo"|]; meta_info_offset = 16}; {modules = [|"Test"|]; meta_info_offset = 38}|]
+  OUnit.assert_equal parse_data_one  data_one
   end ;
   __LOC__ >:: begin fun _ -> 
-  let v = Bsb_db_io.decode {|4.0.19
-3
-2
-Fib
-Demo
-0
-src/hi/fib,0,0
-0
-src/demo,0,0
-0
-0|} (ref 7) in 
-  OUnit.assert_equal v [| {modules = [|"Fib"; "Demo"|]; meta_info_offset = 20 }; {modules = [||]; meta_info_offset = 54}; {modules = [||]; meta_info_offset = -1} |]
+  
+  OUnit.assert_equal parse_data_two data_two
   end 
   ]
 

jscomp/ounit_tests/ounit_map_tests.ml

@@ -53,7 +53,7 @@ let suites =
           Array.fold_left (fun acc key -> Int_map.adjust acc key (fun v -> match v with None ->  1 | Some v -> succ v)   ) v a  
           end
         in  
-       Int_map.iter (fun _ v -> v =~ 2 ) u   ;
+       Int_map.iter u (fun _ v -> v =~ 2 ) ;
        Int_map.cardinal u =~ count
     end
   ]