X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Flambda-delta%2Fcommon%2Fentity.ml;h=de06f2924717613014f29960bc3af294526636de;hb=5dcae34c6e44a40e236db641f59ddb096d1a16ec;hp=4a16c77e73c68dcf849637c35c8eb669442d9e21;hpb=ece36f3adcdf55739b4686168b49506439bff2ba;p=helm.git

diff --git a/helm/software/lambda-delta/common/entity.ml b/helm/software/lambda-delta/common/entity.ml
index 4a16c77e7..de06f2924 100644
--- a/helm/software/lambda-delta/common/entity.ml
+++ b/helm/software/lambda-delta/common/entity.ml
@@ -9,30 +9,70 @@
      \ /   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 *)
 
 type 'term bind = Abst of 'term (* declaration: domain *)
                 | Abbr of 'term (* definition: body *)
+		| Void          (* exclusion *)
 
 type 'term entity = attrs * uri * 'term bind (* attrs, name, binder *)
 
-type uri_generator = string -> string (* this could be in CPS *) 
+type status = {
+   delta: bool;        (* global delta-expansion *)
+   rt: bool;           (* reference typing *)
+   si: bool;           (* sort inclusion *)
+   expand: bool        (* always expand global definitions *)
+}
 
 (* helpers ******************************************************************)
 
+let common f (a, u, _) = f a u
+
 let rec name err f = function
    | Name (n, r) :: _ -> f n r
    | _ :: tl          -> name err f tl
    | []               -> err ()
 
+let names f map l a =
+   let rec aux f i a = function   
+      | []                -> f a
+      | Name (n, r) :: tl -> aux (map f i n r) false a tl
+      | _ :: tl           -> aux f i a tl
+   in
+   aux f true a l
+
+let rec get_name err f j = function
+   | []                          -> err ()
+   | Name (n, r) :: _ when j = 0 -> f n r
+   | Name _ :: tl                -> get_name err f (pred j) tl
+   | _ :: tl                     -> get_name err f j tl
+
+let rec get_names f = function
+   | []                -> f [] []
+   | Name _ as n :: tl ->
+      let f a ns = f a (n :: ns) in get_names f tl
+   | 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
@@ -61,3 +101,13 @@ let xlate f xlate_term = function
       let f t = f (a, uri, Abst t) in xlate_term f t
    | a, uri, Abbr t ->
       let f t = f (a, uri, Abbr t) in xlate_term f t
+   | _, _, Void   ->
+      assert false
+
+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
+}