X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Flambda-delta%2Flib%2Flog.ml;h=4cea12cda89eef2d4e0c5d45bae5ebd9b9c8797b;hb=c40f28fe5bfa74fc1fcef986c03fc960793902a5;hp=fd99db2d2c24d1b85d721cd990839d947f9a4ca6;hpb=426005acf6fb05116de5bae20591eefe55a4df00;p=helm.git diff --git a/helm/software/lambda-delta/lib/log.ml b/helm/software/lambda-delta/lib/log.ml index fd99db2d2..4cea12cda 100644 --- a/helm/software/lambda-delta/lib/log.ml +++ b/helm/software/lambda-delta/lib/log.ml @@ -33,7 +33,7 @@ let err = F.err_formatter let pp_items frm st l items = let pp_item frm = function - | Term (c, t) -> F.fprintf frm "%a@,%a" st.pp_context c (st.pp_term c) t + | 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 @@ -61,10 +61,16 @@ 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_items2 s1 c1 t1 s2 c2 t2 = - [Warn s1; Term (c1, t1); Warn s2; Term (c2, t2)] +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 warn msg = F.fprintf std "@,%s" msg