txtLexer: bug fix in parsing the string tokens

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

diff --git a/helm/software/lambda-delta/complete_rg/crg.ml b/helm/software/lambda-delta/complete_rg/crg.ml
index 0b02f1c48f51baa9ad4eddb5419f2c5bca9e7c4e..07a4cb3ee4b0ded76b43165c96de04e1a8d90beb 100644 (file)
--- a/helm/software/lambda-delta/complete_rg/crg.ml
+++ b/helm/software/lambda-delta/complete_rg/crg.ml
@@ -12,9 +12,11 @@
 (* kernel version: complete, relative, global *)
 (* note          : fragment of complete lambda-delta serving as abstract layer *) 
 
-type uri = Entity.uri
-type id = Entity.id
-type attrs = Entity.attrs
+module Y = Entity
+
+type uri = Y.uri
+type id = Y.id
+type attrs = Y.attrs
 
 type bind = Abst of term list (* domains *)
           | Abbr of term list (* bodies  *)
@@ -32,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 Entity.entity
+type entity = term Y.entity
 
 (* helpers ******************************************************************)
 
@@ -59,7 +61,7 @@ let resolve_lref err f id lenv =
      | EBind (tl, a, _)       ->
         let err kk = aux f (succ i) (k + kk) tl in
        let f j = f i j (k + j) in
-       Entity.resolve err f id a
+       Y.resolve err f id a
      | EProj _                -> assert false (* TODO *)
    in
    aux f 0 0 lenv
@@ -68,7 +70,7 @@ let rec get_name err f i j = function
    | ESort                      -> err i
    | EBind (_, a, _) when i = 0 -> 
       let err () = err i in
-      Entity.get_name err f j a
+      Y.get_name err f j a
    | EBind (tl, _, _)           -> 
       get_name err f (pred i) j tl
    | EProj (tl, _, e)           ->
@@ -79,9 +81,14 @@ let get_index err f i j lenv =
    let rec aux f i k = function
       | ESort                      -> err i
       | EBind (_, a, _) when i = 0 ->
-        if Entity.count_names a > j then f (k + j) else err i
+        if Y.count_names a > j then f (k + j) else err i
       | EBind (tl, a, _)           -> 
-         aux f (pred i) (k + Entity.count_names a) tl
+         aux f (pred i) (k + Y.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
+   | EProj (tl, _, e) -> names_of_lenv (names_of_lenv ns e) tl