Use GobList.cartesian_map more

Author: sim642

src/analyses/extractPthread.ml

@@ -1197,16 +1197,15 @@ module Spec : Analyses.MCPSpec = struct
       | Wait {cond = cond_var; mutex = mutex}, _, _ ->
         let cond_vars = ExprEval.eval_ptr man cond_var in
         let mutex_vars = ExprEval.eval_ptr man mutex in
-        let cond_var_action (v, m) =
+        let cond_var_action v m =
           let open Action in
           CondVarWait
             { cond_var_id = Tbls.CondVarIdTbl.get @@ Variable.show v
             ; mid = Tbls.MutexMidTbl.get @@ Variable.show m
             }
         in
         add_actions
-        @@ List.map cond_var_action
-        @@ List.cartesian_product cond_vars mutex_vars
+        @@ GobList.cartesian_map cond_var_action cond_vars mutex_vars
       | _ -> man.local
 
   let startstate v =

src/cdomain/value/cdomains/int/intervalSetDomain.ml

@@ -185,18 +185,18 @@ struct
   let binary_op_with_norm op (ik:ikind) (x: t) (y: t) : t*overflow_info = match x, y with
     | [], _ -> ([],{overflow=false; underflow=false})
     | _, [] -> ([],{overflow=false; underflow=false})
-    | _, _ -> norm_intvs ik @@ List.map (fun (x,y) -> op x y) (BatList.cartesian_product x y)
+    | _, _ -> norm_intvs ik @@ GobList.cartesian_map op x y
 
   let binary_op_concat_with_norm op (ik:ikind) (x: t) (y: t) : t*overflow_info = match x, y with
     | [], _ -> ([],{overflow=false; underflow=false})
     | _, [] -> ([],{overflow=false; underflow=false})
-    | _, _ -> norm_intvs ik @@ List.concat_map (fun (x,y) -> op x y) (BatList.cartesian_product x y)
+    | _, _ -> norm_intvs ik @@ List.concat_map (fun (x,y) -> op x y) (BatList.cartesian_product x y) (* TODO: GobList.cartesian_concat_map? *)
 
   let binary_op_with_ovc (x: t) (y: t) op : t*overflow_info = match x, y with
     | [], _ -> ([],{overflow=false; underflow=false})
     | _, [] -> ([],{overflow=false; underflow=false})
     | _, _ ->
-      let res = List.map op (BatList.cartesian_product x y) in
+      let res = GobList.cartesian_map (Batteries.curry op) x y in
       let intvs = List.concat_map fst res in
       let underflow = List.exists (fun (_,{underflow; _}) -> underflow) res in
       let overflow = List.exists (fun (_,{overflow; _}) -> underflow) res in

src/cdomains/congruenceClosure.ml

@@ -379,10 +379,10 @@ module Disequalities = struct
     let comp_closure (r1,r2,z) =
       let eq_class1 = LMap.comp_t_cmap_repr cmap r1 in
       let eq_class2 = LMap.comp_t_cmap_repr cmap r2 in
-      let to_diseq ((z1, nt1), (z2, nt2)) =
+      let to_diseq (z1, nt1) (z2, nt2) =
         (nt1, nt2, Z.(-z2+z+z1))
       in
-      List.map to_diseq (BatList.cartesian_product eq_class1 eq_class2)
+      GobList.cartesian_map to_diseq eq_class1 eq_class2
     in
     List.concat_map comp_closure diseqs
 end

src/domains/intDomainProperties.ml

@@ -92,7 +92,7 @@ struct
   let name () = "integerset"
 
   let lift1 = map
-  let lift2 f x y = BatList.cartesian_product (elements x) (elements y) |> List.map (Batteries.uncurry f) |> of_list
+  let lift2 f x y = GobList.cartesian_map f (elements x) (elements y) |> of_list
 
   let neg  = lift1 Base.neg
   let add  = lift2 Base.add

tests/unit/cdomains/intDomainTest.ml

@@ -483,7 +483,6 @@ struct
     assert_bool "-5 ?= not (4 | 12)" (I.equal_to (of_int (-5)) (I.lognot ik b12) = `Top)
 
   let of_list ik is = List.fold_left (fun acc x -> I.join ik acc (I.of_int ik x)) (I.bot ()) is
-  let cart_op op a b = List.map (BatTuple.Tuple2.uncurry op) (BatList.cartesian_product a b)
 
   let precision ik = snd @@ IntDomain.Size.bits ik
   let over_precision ik = Int.succ @@ precision ik
@@ -546,7 +545,7 @@ struct
     Test.make ~name:name ~print:shift_test_printer
       test_case_gen
       (fun (a,b) ->
-         let expected_subset = cart_op c_op a b |> of_list ik in
+         let expected_subset = GobList.cartesian_map c_op a b |> of_list ik in
          let result = a_op ik (of_list ik a) (of_list ik b) in
          I.leq expected_subset result
       )

tests/unit/dune

@@ -11,7 +11,7 @@
     )
   )
   (preprocess (pps ppx_deriving.std ppx_deriving_hash ppx_deriving_yojson))
-  (flags :standard -linkall))
+  (flags :standard -open Goblint_std -linkall))
 
 (env
   (dev

tests/unit/maindomaintest.ml

@@ -88,12 +88,11 @@ let nonAssocTestsuite =
     )
 
 let old_intdomains intDomains =
-  BatList.cartesian_product intDomains ikinds
-  |> List.map (fun (d, ik) ->
+  GobList.cartesian_map (fun d ik ->
       let module D = (val d: IntDomainProperties.S2) in
       let module Ikind = struct let ikind () = ik end in
       (module IntDomainProperties.WithIkind (D) (Ikind): IntDomainProperties.OldSWithIkind)
-    )
+    ) intDomains ikinds
 let intTestsuite =
   old_intdomains intDomains
   |> List.concat_map (fun d ->