X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Flambda-delta%2Flib%2Fcps.ml;h=10ec62376b6d84a19e0fe5074f8a15bb8cb9fc08;hb=2b1375e4b44e2ef351a6341a5bb0a4823e8daae5;hp=b61fccfa47f148553394d83fb26a5bb369002efc;hpb=4924ddb52a836eea45a593a7f4faccca64bac9e7;p=helm.git

diff --git a/helm/software/lambda-delta/lib/cps.ml b/helm/software/lambda-delta/lib/cps.ml
index b61fccfa4..10ec62376 100644
--- a/helm/software/lambda-delta/lib/cps.ml
+++ b/helm/software/lambda-delta/lib/cps.ml
@@ -9,6 +9,8 @@
      \ /   This software is distributed as is, NO WARRANTY.              
       V_______________________________________________________________ *)
 
+let err _ = assert false
+
 let start x = x
 
 let id f x = f x
@@ -18,18 +20,21 @@ let rec list_sub_strict f l1 l2 = match l1, l2 with
    | _ :: tl1, _ :: tl2 -> list_sub_strict f tl1 tl2
    | _                  -> assert false
 
+(* this is not tail recursive *)
 let rec list_fold_left f map a = function
    | []       -> f a
    | hd :: tl -> 
       let f a = list_fold_left f map a tl in
       map f a hd
 
+(* this is not tail recursive *)
 let rec list_rev_map_append f map ~tail = function
       | []       -> f tail        
       | hd :: tl ->
          let f hd = list_rev_map_append f map ~tail:(hd :: tail) tl in
          map f hd
 
+(* this is not tail recursive *)
 let rec list_forall2 f map l1 l2 = match l1, l2 with
    | [], []                 -> f true
    | hd1 :: tl1, hd2 :: tl2 ->
@@ -46,20 +51,33 @@ let list_rev_map =
 let list_rev =
    list_rev_append ~tail:[]
 
-let list_fold_right f map l a =
-   let map f a m = map f m a in
-   list_rev (list_fold_left f map a) l
-
-let list_map f =
-   list_rev_map (list_rev f)
-   
 let list_iter f map l =
    let map f () x = map f x in
    list_fold_left f map () l
 
+(* this is not tail recursive *)
 let rec list_fold_left2 f map a l1 l2 = match l1, l2 with
    | [], []                 -> f a
    | hd1 :: tl1, hd2 :: tl2 -> 
-      let f a = if a = None then f a else list_fold_left2 f map a tl1 tl2 in
+      let f a = list_fold_left2 f map a tl1 tl2 in
       map f a hd1 hd2
-   | _                      -> f None
+   | _                      -> assert false
+
+let list_iter2 f map l1 l2 =
+   let map f () x1 x2 = map f x1 x2 in
+   list_fold_left2 f map () l1 l2
+
+let rec list_fold_right f map l a = match l with
+   | []       -> f a
+   | hd :: tl -> list_fold_right (map f hd) map tl a
+
+let list_map f map l =
+   let map f hd a = 
+      let f hd = f (hd :: a) in map f hd
+   in
+   list_fold_right f map l []
+
+let rec list_mem ?(eq=(=)) a = function
+   | []                   -> false
+   | hd :: _ when eq a hd -> true
+   | _ :: tl              -> list_mem ~eq a tl