X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Flambda-delta%2Fbasic_rg%2Fbrg.ml;h=baa83afed3741ca6f94637fec132262d7294a851;hb=f7bb626faf6b9d89c0ee5ac48b1d97c69d189f8a;hp=eaaeb6e6054c8c3fc426b74cd776f0256e89985d;hpb=c45c77de154323feaf5bf6aee98c86b95361b9ae;p=helm.git

diff --git a/helm/software/lambda-delta/basic_rg/brg.ml b/helm/software/lambda-delta/basic_rg/brg.ml
index eaaeb6e60..baa83afed 100644
--- a/helm/software/lambda-delta/basic_rg/brg.ml
+++ b/helm/software/lambda-delta/basic_rg/brg.ml
@@ -9,18 +9,78 @@
      \ /   This software is distributed as is, NO WARRANTY.              
       V_______________________________________________________________ *)
 
-type uri = NUri.uri
-type id = Aut.id
+(* kernel version: basic, relative, global *)
+(* note          : ufficial basic lambda-delta *) 
 
-type bind = Abst | Abbr (* abstraction, abbreviation *)
+type uri = Entity.uri
+type id = Entity.id
+type attrs = Entity.attrs
 
-type term = Sort of int                     (* hierarchy index *)
-          | LRef of int                     (* reverse de Bruijn index *)
-	  | GRef of uri                     (* reference *)
-	  | Cast of term * term             (* type, term *)
-	  | Appl of term * term             (* argument, function *)
-	  | Bind of id * bind * term * term (* name, binder, content, scope *)
+type bind = Void of attrs        (* attrs       *)
+          | Abst of attrs * term (* attrs, type *)
+          | Abbr of attrs * term (* attrs, body *)
 
-type obj = bind * term (* binder, contents *)
+and term = Sort of attrs * int         (* attrs, hierarchy index *)
+         | LRef of attrs * int         (* attrs, position index *)
+         | GRef of attrs * uri         (* attrs, reference *)
+         | Cast of attrs * term * term (* attrs, type, term *)
+         | Appl of attrs * term * term (* attrs, argument, function *)
+         | Bind of bind * term         (* binder, scope *)
 
-type item = (obj * uri) option (* uri, object *)
+type entity = term Entity.entity (* attrs, uri, binder *)
+
+type lenv = Null
+(* Cons: tail, relative local environment, binder *) 
+             | Cons of lenv * lenv option * bind 
+
+(* helpers ******************************************************************)
+
+let mk_uri root s =
+   String.concat "/" ["ld:"; "brg"; root; s ^ ".ld"]
+
+(* Currified constructors ***************************************************)
+
+let abst a w = Abst (a, w)
+
+let abbr a v = Abbr (a, v)
+
+let lref a i = LRef (a, i)
+
+let cast a u t = Cast (a, u, t)
+
+let appl a u t = Appl (a, u, t)
+
+let bind b t = Bind (b, t)
+
+let bind_abst a u t = Bind (Abst (a, u), t)
+
+let bind_abbr a v t = Bind (Abbr (a, v), t)
+
+(* local environment handling functions *************************************)
+
+let empty_lenv = Null
+
+let push f es ?c b =
+   let es = Cons (es, c, b) in f es
+
+let get err f es i =
+   let rec aux j = function
+      | Null                            -> err ()
+      | Cons (tl, None, b)   when j = 0 -> f tl b
+      | Cons (_, Some c, b) when j = 0  -> f c b
+      | Cons (tl, _, _)                 -> aux (pred j) tl
+   in
+   aux i es
+
+let rec rev_iter f map = function   
+   | Null                 -> f ()
+   | Cons (tl, None, b)   -> 
+      let f _ = map f tl b in rev_iter f map tl
+   | Cons (tl, Some c, b) -> 
+      let f _ = map f c b in rev_iter f map tl
+
+let rec fold_left f map x = function
+   | Null            -> f x
+   | Cons (tl, _, b) ->
+      let f x = fold_left f map x tl in
+      map f x b