X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Flambda-delta%2Fsrc%2Fcomplete_rg%2Fcrg.ml;h=07305e9c124630eac45bbad21c6de59b2683c006;hb=e7f64fe2cc67f3514131c8831f87311ff600d005;hp=07a4cb3ee4b0ded76b43165c96de04e1a8d90beb;hpb=ab13cfa248f0ee58d239ceeddfb50ec49a6b5c6d;p=helm.git

diff --git a/helm/software/lambda-delta/src/complete_rg/crg.ml b/helm/software/lambda-delta/src/complete_rg/crg.ml
index 07a4cb3ee..07305e9c1 100644
--- a/helm/software/lambda-delta/src/complete_rg/crg.ml
+++ b/helm/software/lambda-delta/src/complete_rg/crg.ml
@@ -12,15 +12,16 @@
 (* kernel version: complete, relative, global *)
 (* note          : fragment of complete lambda-delta serving as abstract layer *) 
 
-module Y = Entity
+module E = Entity
+module N = Level
 
-type uri = Y.uri
-type id = Y.id
-type attrs = Y.attrs
+type uri = E.uri
+type id = E.id
+type attrs = E.attrs
 
-type bind = Abst of term list (* domains *)
-          | Abbr of term list (* bodies  *)
-          | Void of int       (* number of exclusions *)
+type bind = Abst of N.level * term list (* level, domains *)
+          | Abbr of term list           (* bodies *)
+          | Void of int                 (* number of exclusions *)
 
 and term = TSort of attrs * int              (* attrs, hierarchy index *)
          | TLRef of attrs * int * int        (* attrs, position indexes *)
@@ -34,43 +35,54 @@ and lenv = ESort                        (* top *)
          | EProj of lenv * attrs * lenv (* environment, attrs, closure *) 
          | EBind of lenv * attrs * bind (* environment, attrs, binder *)
 
-type entity = term Y.entity
+type entity = term E.entity
 
 (* helpers ******************************************************************)
 
-let mk_uri si root s =
-   let kernel = if si then "crg-si" else "crg" in
-   String.concat "/" ["ld:"; kernel; root; s ^ ".ld"]
-
 let empty_lenv = ESort
 
 let push_bind f lenv a b = f (EBind (lenv, a, b))
 
 let push_proj f lenv a e = f (EProj (lenv, a, e))
 
-let push2 err f lenv attr ?t () = match lenv, t with
-   | EBind (e, a, Abst ws), Some t -> f (EBind (e, (attr :: a), Abst (t :: ws)))
-   | EBind (e, a, Abbr vs), Some t -> f (EBind (e, (attr :: a), Abbr (t :: vs)))
-   | EBind (e, a, Void n), None    -> f (EBind (e, (attr :: a), Void (succ n)))
-   | _                             -> err ()
+let push2 err f lenv ?attr ?t () = match lenv, attr, t with
+   | EBind (e, a, Abst (n, ws)), Some attr, Some t -> 
+      f (EBind (e, (attr :: a), Abst (n, t :: ws)))
+   | EBind (e, a, Abst (n, ws)), None, Some t      -> 
+      f (EBind (e, a, Abst (n, t :: ws)))
+   | EBind (e, a, Abbr vs), Some attr, Some t      ->
+      f (EBind (e, (attr :: a), Abbr (t :: vs)))
+   | EBind (e, a, Abbr vs), None, Some t           ->
+      f (EBind (e, a, Abbr (t :: vs)))
+   | EBind (e, a, Void n), Some attr, None         ->
+      f (EBind (e, (attr :: a), Void (succ n)))
+   | EBind (e, a, Void n), None, None              ->
+      f (EBind (e, a, Void (succ n)))
+   | _                                             -> err ()
 
 (* this id not tail recursive *)
 let resolve_lref err f id lenv =
    let rec aux f i k = function
      | ESort                  -> err ()
-     | EBind (tl, a, _)       ->
-        let err kk = aux f (succ i) (k + kk) tl in
+     | EBind (tl, _, Abst (_, []))
+     | EBind (tl, _, Abbr [])
+     | EBind (tl, _, Void 0)  -> aux f i k tl
+     | EBind (tl, a, b)       ->
+	let err kk = aux f (succ i) (k + kk) tl in
 	let f j = f i j (k + j) in
-	Y.resolve err f id a
+	E.resolve err f id a
      | EProj _                -> assert false (* TODO *)
    in
    aux f 0 0 lenv
 
 let rec get_name err f i j = function
    | ESort                      -> err i
+   | EBind (tl, _, Abst (_, []))
+   | EBind (tl, _, Abbr [])
+   | EBind (tl, _, Void 0)      -> get_name err f i j tl
    | EBind (_, a, _) when i = 0 -> 
       let err () = err i in
-      Y.get_name err f j a
+      E.get_name err f j a
    | EBind (tl, _, _)           -> 
       get_name err f (pred i) j tl
    | EProj (tl, _, e)           ->
@@ -80,15 +92,29 @@ let rec get_name err f i j = function
 let get_index err f i j lenv =
    let rec aux f i k = function
       | ESort                      -> err i
+      | EBind (tl, _, Abst (_, []))
+      | EBind (tl, _, Abbr [])
+      | EBind (tl, _, Void 0)      -> aux f i k tl
       | EBind (_, a, _) when i = 0 ->
-	 if Y.count_names a > j then f (k + j) else err i
+	 if E.count_names a > j then f (k + j) else err i
       | EBind (tl, a, _)           -> 
-         aux f (pred i) (k + Y.count_names a) tl
+         aux f (pred i) (k + E.count_names a) tl
       | EProj _                    -> assert false (* TODO *)
    in
    aux f i 0 lenv
 
 let rec names_of_lenv ns = function
    | ESort            -> ns
-   | EBind (tl, a, _) -> names_of_lenv (Y.rev_append_names ns a) tl
+   | EBind (tl, a, _) -> names_of_lenv (E.rev_append_names ns a) tl
    | EProj (tl, _, e) -> names_of_lenv (names_of_lenv ns e) tl
+
+let rec get i = function
+   | ESort                      -> ESort, [], Void 0 
+   | EBind (e, _, Abst (_, []))
+   | EBind (e, _, Abbr [])
+   | EBind (e, _, Void 0)       -> get i e
+   | EBind (e, a, b) when i = 0 -> e, a, b
+   | EBind (e, _, _)            -> get (pred i) e
+   | EProj _                    -> assert false (* TODO *)
+ 
+let get e i = get i e