- lambda-delta: some fixes: now the grundlagen type-checkes through dual_rg

[helm.git] / helm / software / lambda-delta / dual_rg / drg.ml

diff --git a/helm/software/lambda-delta/dual_rg/drg.ml b/helm/software/lambda-delta/dual_rg/drg.ml
index d4402961545511105cbbc3c7aa11af45ffd10f3a..b20bdb3d387468fccf6c7436ec34ea3c0cdcb403 100644 (file)
--- a/helm/software/lambda-delta/dual_rg/drg.ml
+++ b/helm/software/lambda-delta/dual_rg/drg.ml
@@ -41,7 +41,15 @@ let mk_uri root s =
 
 let empty_lenv = ESort
 
-let push f lenv a b = f (EBind (lenv, a, b))
+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 ()
 
 (* this id not tail recursive *)
 let resolve_lref err f id lenv =
@@ -49,8 +57,22 @@ let resolve_lref err f id lenv =
      | ESort            -> err ()
      | EBind (tl, a, _) ->
         let err kk = aux f (succ i) (k + kk) tl in
-       let f j = f i j k in
+       let f j = f i j (k + j) in
        Entity.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, a, Abst [])     -> get_name err f i j tl
+   | EBind (tl, a, Abbr [])     -> get_name err f i j tl
+   | EBind (tl, a, Void 0)      -> get_name err f i j tl
+   | EBind (_, a, _) when i = 0 -> 
+      let err () = err i in
+      Entity.get_name err f j a
+   | EBind (tl, _, _)           -> 
+      get_name err f (pred i) j tl
+   | EProj (tl, _, e)           ->
+      let err i = get_name err f i j tl in 
+      get_name err f i j e