X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Flambda-delta%2Flib%2Flog.ml;h=39cc5837ac3fd105a02099426b23e85d41c921d1;hb=de66af7241ad8ab71d5857d14570e4662f2488dc;hp=667fef534253c4a0894eb5f74af7a2a08e8e1d9e;hpb=c45c77de154323feaf5bf6aee98c86b95361b9ae;p=helm.git

diff --git a/helm/software/lambda-delta/lib/log.ml b/helm/software/lambda-delta/lib/log.ml
index 667fef534..39cc5837a 100644
--- a/helm/software/lambda-delta/lib/log.ml
+++ b/helm/software/lambda-delta/lib/log.ml
@@ -10,12 +10,73 @@
       V_______________________________________________________________ *)
 
 module P = Printf
+module F = Format
+module C = Cps
 
-let init =
-   let started = ref false in
-   fun () ->
-      if !started then () else 
-      begin P.printf "\n"; started := true end
+type ('a, 'b) item = Term of 'a * 'b
+                   | Context of 'a
+                   | Warn of string
+		   | String of string
+                   | Loc
 
-let warn msg = 
-   init (); P.printf " %s\n" msg; flush stdout
+type ('a, 'b) message = ('a, 'b) item list
+
+type ('a, 'b) specs = {
+   pp_term   : 'a -> F.formatter -> 'b -> unit;
+   pp_context: F.formatter -> 'a -> unit
+}
+
+let level = ref 0
+
+let loc = ref 0
+
+(* Internal functions *******************************************************)
+
+let std = F.std_formatter
+
+let err = F.err_formatter
+
+let pp_items frm st l items =   
+   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
+   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 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 flush_err () = F.fprintf err "@]@."
+
+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 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 sc1 c1 st1 t1 sc2 c2 st2 t2 =
+   ct_items1 sc1 c1 st1 t1 @ ct_items1 sc2 c2 st2 t2 
+
+let ct_items3 sc c st1 t1 st2 t2 st3 t3 =
+   ct_items1 sc c st1 t1 @ [Warn st2; Term (c, t2); Warn st3; Term (c, t3)]
+
+let warn msg = F.fprintf std "@,%s" msg