X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Flambda-delta%2Flib%2Flog.ml;h=9c2ecefa2721f90b8365651527a0314c93951a5e;hb=bbb2b03fee9f7c7595870d997118d51c1ce469f2;hp=78e57fdfaf9433a115cf262fd5baa2172e803f73;hpb=8659e85d49be1ad72622d4d3a73d384b744c3c08;p=helm.git

diff --git a/helm/software/lambda-delta/lib/log.ml b/helm/software/lambda-delta/lib/log.ml
index 78e57fdfa..9c2ecefa2 100644
--- a/helm/software/lambda-delta/lib/log.ml
+++ b/helm/software/lambda-delta/lib/log.ml
@@ -17,44 +17,64 @@ type ('a, 'b) item = Term of 'a * 'b
                    | Context of 'a
                    | Warn of string
 		   | String of string
+                   | Loc
 
 type ('a, 'b) specs = {
-   pp_term   : F.formatter -> 'a -> 'b -> unit;
+   pp_term   : 'a -> F.formatter -> 'b -> unit;
    pp_context: F.formatter -> 'a -> unit
 }
 
 let level = ref 0
 
+let loc = ref 0
+
 (* Internal functions *******************************************************)
 
-let init =
-   let started = ref false in
-   fun () ->
-      if !started then () else 
-      begin P.printf "\n"; started := true end
+let std = F.std_formatter
+
+let err = F.err_formatter
 
 let pp_items frm st l items =   
-   let pp_item = function
-      | Term (c, t) -> st.pp_context frm c; st.pp_term frm c t
-      | Context c   -> st.pp_context frm c
-      | Warn s      -> F.fprintf frm "@[%s\n@]" s
-      | String s    -> F.fprintf frm "@[%s @]" s
+   let pp_item frm = function
+      | Term (c, t) -> F.fprintf frm "@,%a" (st.pp_term c) t
+      | Context c   -> F.fprintf frm "%a" st.pp_context c
+      | Warn s      -> F.fprintf frm "@,%s" s
+      | String s    -> F.fprintf frm "%s " s
+      | Loc         -> F.fprintf frm " (line %u)" !loc 
    in
-   if !level >= l then List.iter pp_item items
+   let iter map frm l = List.iter (map frm) l in
+   if !level >= l then F.fprintf frm "%a" (iter pp_item) items
 
 (* Interface functions ******************************************************)
 
-let warn msg = 
-   init (); P.printf " %s\n" msg; flush stdout
+let box l = 
+   if !level >= l then
+   begin F.fprintf std "@,@[<v 2>%s" "  "; F.pp_print_if_newline std () end
+
+let unbox l = if !level >= l then F.fprintf std "@]"
+
+let flush l = if !level >= l then F.fprintf std "@]@."
+
+let box_err () = F.fprintf err "@[<v>"
 
-let log st l items = pp_items F.std_formatter st l items
+let flush_err () = F.fprintf err "@]@."
 
-let error st items = pp_items F.err_formatter st 0 items
+let log st l items = pp_items std st l items
+
+let error st items = pp_items err st 0 items
 
 let items1 s = [Warn s]
 
-let ct_items1 s c t =
-   [Warn s; Term (c, t)]
+let t_items1 st c t =
+   [Warn st; Term (c, t)]
+
+let ct_items1 sc c st t =
+   [Warn sc; Context c; Warn st; Term (c, t)]
+
+let ct_items2 sc c st1 t1 st2 t2 =
+   ct_items1 sc c st1 t1 @ [Warn st2; Term (c, t2)]
+
+let ct_items3 sc c st1 t1 st2 t2 st3 t3 =
+   ct_items2 sc c st1 t1 st2 t2 @ [Warn st3; Term (c, t3)]
 
-let ct_items2 s1 c1 t1 s2 c2 t2 =
-   [Warn s1; Term (c1, t1); Warn s2; Term (c2, t2)]
+let warn msg = F.fprintf std "@,%s" msg