X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fextlib%2FhExtlib.ml;h=cccb467674e22415b59de320e72cbbe845812142;hb=571d199acd4e6743a48f8f64f28c62d18182d04d;hp=c2de58f810fe99728b5b13253135c12934e02bec;hpb=ba5c1c83e77e701ef11625687ec27931bc4bb944;p=helm.git

diff --git a/helm/software/components/extlib/hExtlib.ml b/helm/software/components/extlib/hExtlib.ml
index c2de58f81..cccb46767 100644
--- a/helm/software/components/extlib/hExtlib.ml
+++ b/helm/software/components/extlib/hExtlib.ml
@@ -140,6 +140,77 @@ let flatten_map f l =
   List.flatten (List.map f l)
 ;;
 
+let list_mapi f l =
+  let rec aux k = function
+    | [] -> []
+    | h::tl -> f h k :: aux (k+1) tl
+  in
+     aux 0 l
+;;
+
+let list_mapi_acc f a l =
+  let rec aux k a res = function
+    | [] -> a, List.rev res
+    | h::tl -> let a,h = f h k a in aux (k+1) a (h::res) tl
+  in
+   aux 0 a [] l
+;;
+
+let list_index p =
+ let rec aux n =
+  function
+     [] -> None
+   | he::_ when p he -> Some (n,he)
+   | _::tl -> aux (n + 1) tl
+ in
+  aux 0
+;;
+
+let rec list_iter_default2 f l1 def l2 = 
+  match l1,l2 with
+    | [], _ -> ()
+    | a::ta, b::tb -> f a b; list_iter_default2 f ta def tb 
+    | a::ta, [] -> f a def; list_iter_default2 f ta def [] 
+;;
+
+let rec list_forall_default3 f l1 l2 def l3 = 
+  match l1,l2,l3 with
+    | [], [], _ -> true
+    | [], _, _
+    | _, [], _ -> raise (Invalid_argument "list_forall_default3")
+    | a::ta, b::tb, c::tc -> f a b c && list_forall_default3 f ta tb def tc
+    | a::ta, b::tb, [] -> f a b def && list_forall_default3 f ta tb def [] 
+;;
+
+exception FailureAt of int;;
+
+let list_forall_default3_var f l1 l2 def l3 = 
+  let rec aux f l1 l2 def l3 i =
+    match l1,l2,l3 with
+      | [], [], _ -> true
+      | [], _, _
+      | _, [], _ -> raise (Invalid_argument "list_forall_default3")
+      | a::ta, b::tb, c::tc -> 
+      	  if f a b c then aux f ta tb def tc (i+1)
+	  else raise (FailureAt i)
+      | a::ta, b::tb, [] ->
+      	  if f a b def then aux f ta tb def [] (i+1)
+	  else raise (FailureAt i)
+  in aux f l1 l2 def l3 0
+;;
+
+let sharing_map f l =
+  let unchanged = ref true in
+  let rec aux b = function
+    | [] as t -> unchanged := b; t
+    | he::tl ->
+        let he1 = f he in
+        he1 :: aux (b && he1 == he) tl
+  in
+  let l1 = aux true l in
+  if !unchanged then l else l1
+;;
+        
 let rec list_uniq ?(eq=(=)) = function 
   | [] -> []
   | h::[] -> [h]
@@ -154,6 +225,30 @@ let rec filter_map f =
       | None -> filter_map f tl
       | Some v -> v :: filter_map f tl)
 
+let filter_map_acc f acc l =
+  let acc, res = 
+   List.fold_left
+    (fun (acc, res) t ->
+       match f acc t with
+       | None -> acc, res
+       | Some (acc, x) -> acc, x::res)
+    (acc,[]) l
+  in
+   acc, List.rev res
+;;
+
+let filter_map_monad f acc l =
+  let acc, res = 
+   List.fold_left
+    (fun (acc, res) t ->
+       match f acc t with
+       | acc, None -> acc, res
+       | acc, Some x -> acc, x::res)
+    (acc,[]) l
+  in
+   acc, List.rev res
+;;
+
 let list_rev_map_filter f l =
    let rec aux a = function
       | []       -> a
@@ -185,15 +280,24 @@ let list_concat ?(sep = []) =
   in
   aux []
   
+let list_iter_sep ~sep f =
+  let rec aux =
+    function
+    | [] -> ()
+    | [ last ] -> f last
+    | hd :: tl -> f hd; sep (); aux tl
+  in
+  aux
+  
 let rec list_findopt f l = 
-  let rec aux = function 
+  let rec aux k = function 
     | [] -> None 
     | x::tl -> 
-        (match f x with
-        | None -> aux tl
+        (match f x k with
+        | None -> aux (succ k) tl
         | Some _ as rc -> rc)
   in
-  aux l
+  aux 0 l
 
 let split_nth n l =
   let rec aux acc n l =
@@ -207,7 +311,13 @@ let list_last l =
   let l = List.rev l in 
   try List.hd l with exn -> raise (Failure "HExtlib.list_last")
 ;;
-  
+
+let rec list_assoc_all a = function
+   | []                      -> []
+   | (x, y) :: tl when x = a -> y :: list_assoc_all a tl
+   | _ :: tl                 -> list_assoc_all a tl
+;;
+
 (** {2 File predicates} *)
 
 let is_dir fname =
@@ -411,7 +521,7 @@ let loc_of_floc floc = Stdpp.first_pos floc, Stdpp.last_pos floc;;
 let floc_of_loc (loc_begin, loc_end) =
  Stdpp.make_loc (loc_begin, loc_end)
 
-let dummy_floc = floc_of_loc (-1, -1)
+let dummy_floc = floc_of_loc (0, 0)
 
 let raise_localized_exception ~offset floc exn =
  let x, y = loc_of_floc floc in
@@ -479,3 +589,25 @@ let chop_prefix prefix s =
 let touch s =
   try close_out(open_out s) with Sys_error _ -> ()
 ;;
+
+let rec mk_list x = function
+  | 0 -> []
+  | n -> x :: mk_list x (n-1)
+;;
+
+let list_seq start stop =
+  if start > stop then [] else
+  let rec aux pos =
+    if pos = stop then []
+    else pos :: (aux (pos+1))
+  in
+    aux start
+;;
+
+let rec list_skip n l =
+  match n,l with
+  | 0,_ -> l
+  | n,_::l -> list_skip (n-1) l
+  | _, [] -> assert false
+;;
+