- common/entity: new format for kernel entities

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

diff --git a/helm/software/lambda-delta/lib/log.mli b/helm/software/lambda-delta/lib/log.mli
index 241247c188d69ff345ef1bd194299c707933aa6f..956f91fd8a00207e4475b713cd32ca787f3f20b2 100644 (file)
--- a/helm/software/lambda-delta/lib/log.mli
+++ b/helm/software/lambda-delta/lib/log.mli
@@ -10,17 +10,19 @@
       V_______________________________________________________________ *)
 
 type ('a, 'b) item = Term of 'a * 'b
-                   | Context of 'a
+                   | LEnv of 'a
                    | Warn of string
                   | String of string
                   | Loc
 
+type ('a, 'b) message = ('a, 'b) item list
+
 type ('a, 'b) specs = {
-   pp_term   : 'a -> Format.formatter -> 'b -> unit;
-   pp_context: Format.formatter -> 'a -> unit
+   pp_term: 'a -> Format.formatter -> 'b -> unit;
+   pp_lenv: Format.formatter -> 'a -> unit
 }
 
-val loc: int ref
+val loc: string ref
 
 val level: int ref
 
@@ -36,20 +38,24 @@ val box_err: unit -> unit
 
 val flush_err: unit -> unit
 
-val log: ('a, 'b) specs -> int -> ('a, 'b) item list -> unit
+val log: ('a, 'b) specs -> int -> ('a, 'b) message -> unit
 
-val error: ('a, 'b) specs -> ('a, 'b) item list -> unit
+val error: ('a, 'b) specs -> ('a, 'b) message -> unit
 
-val items1: string -> ('a, 'b) item list
+val items1: string -> ('a, 'b) message
 
-val t_items1: string -> 'a -> 'b -> ('a, 'b) item list
+val t_items1: string -> 'a -> 'b -> ('a, 'b) message
 
-val ct_items1:
-   string -> 'a -> string -> 'b -> ('a, 'b) item list
+val et_items1:
+   string -> 'a -> string -> 'b -> ('a, 'b) message
 
-val ct_items2:
-   string -> 'a -> string -> 'b -> string -> 'b -> ('a, 'b) item list
+val et_items2:
+   string -> 'a -> string -> 'b -> 
+   ?sc2:string -> ?c2:'a -> string -> 'b -> 
+   ('a, 'b) message
 
-val ct_items3:
-   string -> 'a -> string -> 'b -> string -> 'b -> string -> 'b -> 
-   ('a, 'b) item list
+val et_items3:
+   string -> 'a -> string -> 'b -> 
+   ?sc2:string -> ?c2:'a -> string -> 'b -> 
+   ?sc3:string -> ?c3:'a -> string -> 'b ->
+   ('a, 'b) message