Trim trailing whitespace in other int domains

Author: sim642

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

@@ -64,7 +64,7 @@ module IntDomTupleImpl = struct
     | Some(_, {underflow; overflow}) -> not (underflow || overflow)
     | _ -> false
 
-  let check_ov ?(suppress_ovwarn = false) ~cast ik intv intv_set bf = 
+  let check_ov ?(suppress_ovwarn = false) ~cast ik intv intv_set bf =
     let no_ov = (no_overflow ik intv) || (no_overflow ik intv_set) || (no_overflow ik bf) in
     if not no_ov && not suppress_ovwarn && ( BatOption.is_some intv || BatOption.is_some intv_set || BatOption.is_some bf) then (
       let (_,{underflow=underflow_intv; overflow=overflow_intv}) = match intv with None -> (I2.bot (), {underflow= true; overflow = true}) | Some x -> x in
@@ -100,16 +100,16 @@ module IntDomTupleImpl = struct
     | (_, Some true, _, _, _,_)
     | (_, _, Some true, _, _,_)
     | (_, _, _, Some true, _,_)
-    | (_, _, _, _, Some true,_) 
-    | (_, _, _, _, _, Some true) -> true 
+    | (_, _, _, _, Some true,_)
+    | (_, _, _, _, _, Some true) -> true
     | _ -> false
 
   let for_all = function
     | (Some false, _, _, _, _,_)
     | (_, Some false, _, _, _,_)
     | (_, _, Some false, _, _,_)
     | (_, _, _, Some false, _,_)
-    | (_, _, _, _, Some false,_) 
+    | (_, _, _, _, Some false,_)
     | (_, _, _, _, _, Some false) -> false
     | _ -> true
 
@@ -136,7 +136,7 @@ module IntDomTupleImpl = struct
     , opt I3.refine_with_congruence ik c cong
     , opt I4.refine_with_congruence ik d cong
     , opt I5.refine_with_congruence ik e cong
-    , opt I6.refine_with_congruence ik f cong 
+    , opt I6.refine_with_congruence ik f cong
     )
 
   let refine_with_interval ik (a, b, c, d, e,f) intv =
@@ -147,7 +147,7 @@ module IntDomTupleImpl = struct
     , opt I2.refine_with_interval ik b intv
     , opt I3.refine_with_interval ik c intv
     , opt I4.refine_with_interval ik d intv
-    , opt I5.refine_with_interval ik e intv 
+    , opt I5.refine_with_interval ik e intv
     , opt I6.refine_with_interval ik f intv )
 
   let refine_with_bitfield ik (a, b, c, d, e,f) bf =
@@ -158,7 +158,7 @@ module IntDomTupleImpl = struct
     , opt I2.refine_with_bitfield ik b bf
     , opt I3.refine_with_bitfield ik c bf
     , opt I4.refine_with_bitfield ik d bf
-    , opt I5.refine_with_bitfield ik e bf 
+    , opt I5.refine_with_bitfield ik e bf
     , opt I6.refine_with_bitfield ik f bf )
 
   let refine_with_excl_list ik (a, b, c, d, e,f) excl =
@@ -244,9 +244,9 @@ module IntDomTupleImpl = struct
     in
     mapp2 { fp2 = fun (type a) (module I:SOverflow with type t = a and type int_t = int_t) -> I.to_incl_list } x |> flat merge
 
-  let to_bitfield ik x = 
-    let bf_meet (z1,o1) (z2,o2) = (Z.logand z1 z2, Z.logand o1 o2) in 
-    let bf_top = (Z.lognot Z.zero, Z.lognot Z.zero) in 
+  let to_bitfield ik x =
+    let bf_meet (z1,o1) (z2,o2) = (Z.logand z1 z2, Z.logand o1 o2) in
+    let bf_top = (Z.lognot Z.zero, Z.lognot Z.zero) in
     let res_tup = mapp2 { fp2 = fun (type a) (module I:SOverflow with type t = a and type int_t = int_t) -> I.to_bitfield ik } x
     in List.fold bf_meet bf_top (to_list res_tup)
 
@@ -314,7 +314,7 @@ module IntDomTupleImpl = struct
       , BatOption.map fst intv
       , map (fun ?no_ov x -> r.f1_ovc ?no_ov (module I3) x |> fst) c
       , map (fun ?no_ov x -> r.f1_ovc ?no_ov (module I4) x |> fst) ~no_ov d
-      , BatOption.map fst intv_set 
+      , BatOption.map fst intv_set
       , BatOption.map fst bf)
 
   (* map2 with overflow check *)
@@ -329,7 +329,7 @@ module IntDomTupleImpl = struct
       , BatOption.map fst intv
       , opt_map2 (fun ?no_ov x y -> r.f2_ovc ?no_ov (module I3) x y |> fst) xc yc
       , opt_map2 (fun ?no_ov x y -> r.f2_ovc ?no_ov (module I4) x y |> fst) ~no_ov:no_ov xd yd
-      , BatOption.map fst intv_set 
+      , BatOption.map fst intv_set
       , BatOption.map fst bf)
 
   let map ik r (a, b, c, d, e, f) =
@@ -372,7 +372,7 @@ module IntDomTupleImpl = struct
     let xs = mapp2 { fp2 = fun (type a) (module I:SOverflow with type t = a and type int_t = int_t) -> I.equal_to i } x |> GobTuple.Tuple6.enum |> List.of_enum |> List.filter_map identity in
     if List.mem `Eq xs then `Eq else
     if List.mem `Neq xs then `Neq else
-      `Top 
+      `Top
 
   let to_bool = same string_of_bool % mapp { fp = fun (type a) (module I:SOverflow with type t = a) -> I.to_bool }
   let minimal = flat (List.max ~cmp:Z.compare) % mapp2 { fp2 = fun (type a) (module I:SOverflow with type t = a and type int_t = int_t) -> I.minimal }

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

@@ -236,13 +236,13 @@ struct
 
   let of_interval ?(suppress_ovwarn=false) ik (x,y) =  norm_interval  ~suppress_ovwarn ~cast:false ik (x,y)
 
-  let of_bitfield ik x = 
-    match Interval.of_bitfield ik x with 
+  let of_bitfield ik x =
+    match Interval.of_bitfield ik x with
     | None -> []
     | Some (a,b) -> norm_interval ik (a,b) |> fst
 
-  let to_bitfield ik x = 
-    let joinbf (z1,o1) (z2,o2) = (Ints_t.logor z1 z2, Ints_t.logor o1 o2) in 
+  let to_bitfield ik x =
+    let joinbf (z1,o1) (z2,o2) = (Ints_t.logor z1 z2, Ints_t.logor o1 o2) in
     List.fold_left (fun acc i -> joinbf acc (Interval.to_bitfield ik (Some i))) (Ints_t.zero, Ints_t.zero) x
 
   let of_int ik (x: int_t) = of_interval ik (x, x)
@@ -510,8 +510,8 @@ struct
 
   let refine_with_interval ik xs = function None -> [] | Some (a,b) -> meet ik xs [(a,b)]
 
-  let refine_with_bitfield ik x y = 
-    let interv = of_bitfield ik y in 
+  let refine_with_bitfield ik x y =
+    let interv = of_bitfield ik y in
     norm_intvs ik (meet ik x interv) |> fst
 
   let refine_with_incl_list ik intvs  = function