some stuff on re

[helm.git] / helm / software / lambda-delta / common / entity.ml

diff --git a/helm/software/lambda-delta/common/entity.ml b/helm/software/lambda-delta/common/entity.ml
index 5bef9ff3347524351d62eac91e5cd4c340a5afa1..de06f2924717613014f29960bc3af294526636de 100644 (file)
--- a/helm/software/lambda-delta/common/entity.ml
+++ b/helm/software/lambda-delta/common/entity.ml
@@ -9,12 +9,15 @@
      \ /   This software is distributed as is, NO WARRANTY.              
       V_______________________________________________________________ *)
 
+module O = Options
+
 type uri = NUri.uri
 type id = Aut.id
 
 type attr = Name of id * bool (* name, real? *)
           | Apix of int       (* additional position index *)
          | Mark of int       (* node marker *)
+         | Meta of string    (* metaliguistic annotation *)
          | Priv              (* private global definition *)
 
 type attrs = attr list (* attributes *)
@@ -25,12 +28,11 @@ type 'term bind = Abst of 'term (* declaration: domain *)
 
 type 'term entity = attrs * uri * 'term bind (* attrs, name, binder *)
 
-type uri_generator = string -> string
-
 type status = {
-   delta: bool; (* global delta-expansion *)
-   rt: bool;    (* reference typing *)
-   si: bool     (* sort inclusion *)
+   delta: bool;        (* global delta-expansion *)
+   rt: bool;           (* reference typing *)
+   si: bool;           (* sort inclusion *)
+   expand: bool        (* always expand global definitions *)
 }
 
 (* helpers ******************************************************************)
@@ -63,6 +65,14 @@ let rec get_names f = function
    | e :: tl           ->
       let f a = f (e :: a) in get_names f tl
 
+let count_names a =
+   let rec aux k = function
+      | []           -> k
+      | Name _ :: tl -> aux (succ k) tl
+      | _ :: tl      -> aux k tl
+   in
+   aux 0 a
+
 let rec apix err f = function
    | Apix i :: _ -> f i
    | _ :: tl     -> apix err f tl
@@ -94,6 +104,10 @@ let xlate f xlate_term = function
    | _, _, Void   ->
       assert false
 
-let initial_status si = {
-   delta = false; rt = false; si = si
+let initial_status () = {
+   delta = false; rt = false; si = !O.si; expand = !O.expand
+}
+
+let refresh_status st = {st with
+   si = !O.si; expand = !O.expand
 }