fix

[helm.git] / helm / ocaml / cic_transformations / boxPp.ml

diff --git a/helm/ocaml/cic_transformations/boxPp.ml b/helm/ocaml/cic_transformations/boxPp.ml
index fd06a42039835bc936cf478273b03aaad2b927c0..fcc91342170aefeeacbf76f1799790588df8e451 100644 (file)
--- a/helm/ocaml/cic_transformations/boxPp.ml
+++ b/helm/ocaml/cic_transformations/boxPp.ml
@@ -29,19 +29,27 @@ let to_string object_to_string b =
     function
        [] -> layout := current_s::!layout
       | Box.Text (_,s)::tl -> aux_h (current_s ^ s) tl
-      | (Box.Space _)::_ -> assert false
+      | (Box.Space _)::tl -> aux_h (current_s ^ " ") tl
       | Box.H (_,bl)::tl -> aux_h current_s (bl@tl)
       | Box.V (_,[])::tl -> aux_h current_s tl
       | Box.V (_,[b])::tl -> aux_h current_s (b::tl)
       | Box.V (_,b::bl')::tl ->
          aux_h current_s [b] ; 
          aux_h (String.make (String.length current_s) ' ') (Box.V([],bl')::tl)
+      | Box.HV _ :: _ | Box.HOV _ :: _ -> assert false (* not implemented *)
       | Box.Object (_,obj)::tl -> aux_h (current_s ^ (object_to_string obj)) tl
       | (Box.Action _)::tl -> assert false
+      | (Box.Ink _)::tl -> aux_h (current_s ^ "----------") tl
   in
     aux_h "" [b] ;
     List.rev !layout
 
-let pp_term t =
-  String.concat "\n" (to_string CicAstPp.pp_term (Ast2pres.ast2box t))
+let pp_term ?ids_to_uris t =
+  let ids_to_uris =
+    match ids_to_uris with
+    | None -> Hashtbl.create 0
+    | Some tbl -> tbl
+  in
+  String.concat "\n" (to_string CicAstPp.pp_term
+    (Ast2pres.ast2astBox (t, ids_to_uris)))