From 5967e856c4acfce8e2264f4cf897bc49d9f3f188 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20B=C3=BChler?= <david.buhler@cea.fr>
Date: Fri, 22 Apr 2022 11:19:38 +0200
Subject: [PATCH] [Eva] In multidim, replaces [open Pretty_memory] with
explicit calls.
---
src/plugins/value/domains/multidim/abstract_structure.ml | 6 +++---
src/plugins/value/domains/multidim/segmentation.ml | 3 +--
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/plugins/value/domains/multidim/abstract_structure.ml b/src/plugins/value/domains/multidim/abstract_structure.ml
index 1146926b0e8..39540bf0c84 100644
--- a/src/plugins/value/domains/multidim/abstract_structure.ml
+++ b/src/plugins/value/domains/multidim/abstract_structure.ml
@@ -22,7 +22,6 @@
open Lattice_bounds
open Abstract_memory
-open Pretty_memory
let no_oracle = fun _exp -> Int_val.top
@@ -92,7 +91,7 @@ struct
type submemory = M.t
let pretty fmt m =
- pp_iter2 ~format:"@[<hv>.%a%a@]"
+ Pretty_memory.pp_iter2 ~format:"@[<hv>.%a%a@]"
FieldMap.iter Field.pretty M.pretty fmt m.fields
let hash m =
@@ -266,7 +265,8 @@ struct
| [(_,s)] -> S.pretty fmt s
| bindings ->
let l = List.map snd bindings in
- pp_iter ~format:"@[<hv>%a@]" ~sep:" or @;<1 2>" List.iter S.pretty fmt l
+ Pretty_memory.pp_iter ~format:"@[<hv>%a@]" ~sep:" or @;<1 2>"
+ List.iter S.pretty fmt l
let hash (m : t) =
Hashtbl.hash (Map.fold (fun _ s acc -> s :: acc) m [])
diff --git a/src/plugins/value/domains/multidim/segmentation.ml b/src/plugins/value/domains/multidim/segmentation.ml
index 8004473f5c9..f8781b9f2f5 100644
--- a/src/plugins/value/domains/multidim/segmentation.ml
+++ b/src/plugins/value/domains/multidim/segmentation.ml
@@ -22,7 +22,6 @@
open Lattice_bounds
open Abstract_memory
-open Pretty_memory
exception Not_implemented
@@ -456,7 +455,7 @@ struct
(* fold the previous upper bound = the current lower bound *)
ignore (List.fold_left (fun l (v,u) -> f (l,v,u) ; u) l segments)
in
- pp_iter (iter l) pp fmt s
+ Pretty_memory.pp_iter (iter l) pp fmt s
let pretty fmt (m : t) : unit =
pretty_segments fmt (m.start,m.segments)
--
GitLab