hints polished and fixed to allow recursive inference of ext_carr

[helm.git] / helm / software / lambda-delta / src / complete_rg / crg.ml

diff --git a/helm/software/lambda-delta/src/complete_rg/crg.ml b/helm/software/lambda-delta/src/complete_rg/crg.ml
index 07a4cb3ee4b0ded76b43165c96de04e1a8d90beb..cc93d6dc3fdac485a014a5e046cd698978e18b1c 100644 (file)
--- a/helm/software/lambda-delta/src/complete_rg/crg.ml
+++ b/helm/software/lambda-delta/src/complete_rg/crg.ml
@@ -12,11 +12,11 @@
 (* kernel version: complete, relative, global *)
 (* note          : fragment of complete lambda-delta serving as abstract layer *) 
 
-module Y = Entity
+module E = Entity
 
-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  *)
@@ -34,7 +34,7 @@ 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 ******************************************************************)
 
@@ -58,19 +58,25 @@ let push2 err f lenv attr ?t () = match lenv, t with
 let resolve_lref err f id lenv =
    let rec aux f i k = function
      | ESort                  -> err ()
+     | EBind (tl, _, Abst [])
+     | EBind (tl, _, Abbr [])
+     | EBind (tl, _, Void 0)  -> aux f i k tl
      | EBind (tl, a, _)       ->
         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 +86,18 @@ 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