some renaming and some interfaces improved

[helm.git] / helm / software / lambda-delta / lib / log.ml

diff --git a/helm/software/lambda-delta/lib/log.ml b/helm/software/lambda-delta/lib/log.ml
index 2d3f07517c238bc860375da9b2c336e0fb2b72c8..e50fa254da8a71567804fe080f6f975bb8a68a89 100644 (file)
--- a/helm/software/lambda-delta/lib/log.ml
+++ b/helm/software/lambda-delta/lib/log.ml
@@ -14,7 +14,7 @@ module F = Format
 module C = Cps
 
 type ('a, 'b) item = Term of 'a * 'b
-                   | Context of 'a
+                   | LEnv of 'a
                    | Warn of string
                   | String of string
                    | Loc
@@ -22,8 +22,8 @@ type ('a, 'b) item = Term of 'a * 'b
 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
+   pp_term: 'a -> F.formatter -> 'b -> unit;
+   pp_lenv: F.formatter -> 'a -> unit
 }
 
 let level = ref 0
@@ -39,7 +39,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" (st.pp_term c) t
-      | Context c   -> F.fprintf frm "%a" st.pp_context c
+      | LEnv c      -> F.fprintf frm "%a" st.pp_lenv c
       | Warn s      -> F.fprintf frm "@,%s" s
       | String s    -> F.fprintf frm "%s " s
       | Loc         -> F.fprintf frm " (line %u)" !loc 
@@ -70,23 +70,23 @@ 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 et_items1 sc c st t =
+   [Warn sc; LEnv c; Warn st; Term (c, t)]
 
-let ct_items2 sc1 c1 st1 t1 ?sc2 ?c2 st2 t2 =
+let et_items2 sc1 c1 st1 t1 ?sc2 ?c2 st2 t2 =
    let tl = match sc2, c2 with
-      | Some sc2, Some c2 -> ct_items1 sc2 c2 st2 t2
+      | Some sc2, Some c2 -> et_items1 sc2 c2 st2 t2
       | None, None        -> t_items1 st2 c1 t2
       | _                 -> assert false
    in
-   ct_items1 sc1 c1 st1 t1 @ tl  
+   et_items1 sc1 c1 st1 t1 @ tl  
 
-let ct_items3 sc1 c1 st1 t1 ?sc2 ?c2 st2 t2 ?sc3 ?c3 st3 t3 =
+let et_items3 sc1 c1 st1 t1 ?sc2 ?c2 st2 t2 ?sc3 ?c3 st3 t3 =
    let tl = match sc3, c3 with
-      | Some sc3, Some c3 -> ct_items1 sc3 c3 st3 t3
+      | Some sc3, Some c3 -> et_items1 sc3 c3 st3 t3
       | None, None        -> t_items1 st3 c1 t3 
       | _                 -> assert false
    in   
-   ct_items2 sc1 c1 st1 t1 ?sc2 ?c2 st2 t2 @ tl 
+   et_items2 sc1 c1 st1 t1 ?sc2 ?c2 st2 t2 @ tl 
 
 let warn msg = F.fprintf std "@,%s" msg