Skip to content

Commit 61ff53f

Browse files
Indentation (#1623)
1 parent 2ecd762 commit 61ff53f

File tree

2 files changed

+23
-21
lines changed

2 files changed

+23
-21
lines changed

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

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -79,35 +79,37 @@ struct
7979
let to_int x = Option.bind x (IArith.to_int)
8080
let of_interval ?(suppress_ovwarn=false) ik (x,y) = norm ~suppress_ovwarn ik @@ Some (x,y)
8181

82-
let of_bitfield ik x =
83-
let min ik (z,o) =
84-
let signBit = Ints_t.shift_left Ints_t.one ((Size.bit ik) - 1) in
82+
let of_bitfield ik x =
83+
let min ik (z,o) =
84+
let signBit = Ints_t.shift_left Ints_t.one ((Size.bit ik) - 1) in
8585
let signMask = Ints_t.lognot (Ints_t.of_bigint (snd (Size.range ik))) in
8686
let isNegative = Ints_t.logand signBit o <> Ints_t.zero in
87-
if GoblintCil.isSigned ik && isNegative then
87+
if GoblintCil.isSigned ik && isNegative then
8888
Ints_t.logor signMask (Ints_t.lognot z)
89-
else
89+
else
9090
Ints_t.lognot z
91-
in let max ik (z,o) =
92-
let signBit = Ints_t.shift_left Ints_t.one ((Size.bit ik) - 1) in
93-
let signMask = Ints_t.of_bigint (snd (Size.range ik)) in
94-
let isPositive = Ints_t.logand signBit z <> Ints_t.zero in
95-
if GoblintCil.isSigned ik && isPositive
96-
then Ints_t.logand signMask o
97-
else
98-
o
99-
in fst (norm ik (Some (min ik x, max ik x)))
91+
in
92+
let max ik (z,o) =
93+
let signBit = Ints_t.shift_left Ints_t.one ((Size.bit ik) - 1) in
94+
let signMask = Ints_t.of_bigint (snd (Size.range ik)) in
95+
let isPositive = Ints_t.logand signBit z <> Ints_t.zero in
96+
if GoblintCil.isSigned ik && isPositive then
97+
Ints_t.logand signMask o
98+
else
99+
o
100+
in
101+
fst (norm ik (Some (min ik x, max ik x)))
100102

101103
let of_int ik (x: int_t) = of_interval ik (x,x)
102104
let zero = Some IArith.zero
103105
let one = Some IArith.one
104106
let top_bool = Some IArith.top_bool
105107

106-
let to_bitfield ik z =
107-
match z with
108-
| None -> (Ints_t.lognot Ints_t.zero, Ints_t.lognot Ints_t.zero)
108+
let to_bitfield ik z =
109+
match z with
110+
| None -> (Ints_t.lognot Ints_t.zero, Ints_t.lognot Ints_t.zero)
109111
| Some (x,y) ->
110-
let (z,o) = fst(BitfieldDomain.Bitfield.of_interval ik (Ints_t.to_bigint x, Ints_t.to_bigint y)) in
112+
let (z,o) = fst(BitfieldDomain.Bitfield.of_interval ik (Ints_t.to_bigint x, Ints_t.to_bigint y)) in
111113
(Ints_t.of_bigint z, Ints_t.of_bigint o)
112114

113115
let of_bool _ik = function true -> one | false -> zero
@@ -407,8 +409,8 @@ struct
407409
if M.tracing then M.trace "refine" "int_refine_with_congruence %a %a -> %a" pretty x pretty y pretty refn;
408410
refn
409411

410-
let refine_with_bitfield ik a b =
411-
let interv = of_bitfield ik b in
412+
let refine_with_bitfield ik a b =
413+
let interv = of_bitfield ik b in
412414
meet ik a interv
413415

414416
let refine_with_interval ik a b = meet ik a b

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,7 @@ struct
513513
let refine_with_bitfield ik x y =
514514
let interv = of_bitfield ik y in
515515
norm_intvs ik (meet ik x interv) |> fst
516-
516+
517517
let refine_with_incl_list ik intvs = function
518518
| None -> intvs
519519
| Some xs -> meet ik intvs (List.map (fun x -> (x,x)) xs)

0 commit comments

Comments
 (0)