Code simplified.

[helm.git] / helm / software / lambda-delta / common / entity.ml

diff --git a/helm/software/lambda-delta/common/entity.ml b/helm/software/lambda-delta/common/entity.ml
index 292b1e921fc6bc349cc4d28aea170e5de03b228c..7b8dab9508c23c6351445d4f0d5b56c88693d992 100644 (file)
--- a/helm/software/lambda-delta/common/entity.ml
+++ b/helm/software/lambda-delta/common/entity.ml
@@ -24,15 +24,38 @@ type 'term bind = Abst of 'term (* declaration: domain *)
 
 type 'term entity = attrs * uri * 'term bind (* attrs, name, binder *)
 
-type 'a uri_generator = (string -> 'a) -> string -> 'a 
+type uri_generator = string -> string (* this could be in CPS *) 
 
 (* helpers ******************************************************************)
 
+let common f (a, u, _) = f a u
+
 let rec name err f = function
    | Name (n, r) :: _ -> f n r
    | _ :: tl          -> name err f tl
    | []               -> err ()
 
+let names f map l a =
+   let rec aux f i a = function   
+      | []                -> f a
+      | Name (n, r) :: tl -> aux (map f i n r) false a tl
+      | _ :: tl           -> aux f i a tl
+   in
+   aux f true a l
+
+let rec get_name err f j = function
+   | []                          -> err ()
+   | Name (n, r) :: _ when j = 0 -> f n r
+   | Name _ :: tl                -> get_name err f (pred j) tl
+   | _ :: tl                     -> get_name err f j tl
+
+let rec get_names f = function
+   | []                -> f [] []
+   | Name _ as n :: tl ->
+      let f a ns = f a (n :: ns) in get_names f tl
+   | e :: tl           ->
+      let f a = f (e :: a) in get_names f tl
+
 let rec apix err f = function
    | Apix i :: _ -> f i
    | _ :: tl     -> apix err f tl