according to camlp5 sources, the dummy loc should be 0,0 and not -1,-1

[helm.git] / helm / software / components / extlib / hExtlib.ml

diff --git a/helm/software/components/extlib/hExtlib.ml b/helm/software/components/extlib/hExtlib.ml
index c16b11159c38ccde56621da9d3b9c97c611419c9..3fe5c0a7d40762ba0340a82ddad0dc685ee1c44c 100644 (file)
--- a/helm/software/components/extlib/hExtlib.ml
+++ b/helm/software/components/extlib/hExtlib.ml
@@ -164,6 +164,23 @@ let rec list_forall_default3 f l1 l2 def l3 =
     | 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
@@ -447,7 +464,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
@@ -520,3 +537,20 @@ 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
+;;
+