Fix various bugs in the pretty-printer (union of atoms not parenthesized, |...

Fix various bugs in the pretty-printer (union of atoms not parenthesized, | instead of & for some toplevel variables)

types/atoms.ml

@@ -62,6 +62,18 @@ let print s = match get s with
 	       Format.fprintf ppf " \\@ (%a)" (print_symbolset ns) s)
 	    l ]
 
+let extract s =
+  let tr l =
+    List.map (fun (ns, ss) -> ns, match ss with
+        SymbolSet.Finite l -> `Finite l
+    | SymbolSet.Cofinite l -> `Cofinite l) l
+  in
+  match get s with
+    `Finite l -> `Finite (tr l)
+  | `Cofinite l -> `Cofinite (tr l)
+
+
+
 type 'a map = 'a Imap.t * 'a Imap.t * 'a option
 
 let map_map f (m1,m2,o) =

types/atoms.mli

@@ -41,3 +41,9 @@ type 'a map
 val mk_map: (t * 'a) list -> 'a map
 val get_map: V.t -> 'a map -> 'a
 val map_map: ('a -> 'b) -> 'a map -> 'b map
+
+
+val extract : t ->
+  [ `Finite of (Ns.Uri.t * [`Finite of V.t list |`Cofinite of V.t list]) list
+  | `Cofinite of (Ns.Uri.t * [`Finite of V.t list |`Cofinite of V.t list]) list
+  ]