Changeset 619 for Deliverables/D2.2/8051/src/utilities

Timestamp:

Mar 2, 2011, 3:27:41 PM (10 years ago)

Author:

ayache

Message:

Update of D2.2 from Paris.

Location:

Deliverables/D2.2/8051/src/utilities

Files:

• miscPottier.ml (modified) (2 diffs)
• miscPottier.mli (modified) (1 diff)

Deliverables/D2.2/8051/src/utilities/miscPottier.ml

@@ -32 +32 @@
   aux 0 l
 
+let rec last = function
+  | [] -> raise Not_found
+  | [a] -> a
+  | _ :: l -> last l
+
 (* [split a i] splits the list a in two lists: one with the elements
    up until the [i]th (exclusive) and one with the rest. *)
@@ -40 +45 @@
     let (l1, l2) = split (List.tl l) (i-1) in
     ((List.hd l) :: l1, l2)
+
+(* [split_last l] returns the list [l] without its last element and its last
+   element. Raises Invalid_argument "MiscPottier.split_last" if the list is
+   empty. *)
+
+let split_last l = match split l ((List.length l) - 1) with
+  | l', last :: _ -> (l', last)
+  | _ -> raise (Invalid_argument "MiscPottier.split_last")
 
 let rec update_list_assoc a b = function

Deliverables/D2.2/8051/src/utilities/miscPottier.mli

@@ -6 +6 @@
 val index_of : 'a -> 'a list -> int
 
-val foldi: (int -> 'a -> 'b -> 'a) -> 'a -> 'b list -> 'a
+val foldi : (int -> 'a -> 'b -> 'a) -> 'a -> 'b list -> 'a
 
-val iteri: (int -> 'a -> unit) -> 'a list -> unit
+val iteri : (int -> 'a -> unit) -> 'a list -> unit
 
-val mapi: (int -> 'a -> 'b) -> 'a list -> 'b list
+val mapi : (int -> 'a -> 'b) -> 'a list -> 'b list
 
-(* [split a i] splits the list a in two lists: one with the elements
+(* Raises Not_found if the list is empty. *)
+val last : 'a list -> 'a
+
+(* [split l i] splits the list [l] in two lists: one with the elements
    up until the [i]th (exclusive) and one with the rest. *)
 
 val split: 'a list -> int -> ('a list * 'a list)
+
+(* [split_last l] returns the list [l] without its last element and its last
+   element. Raises Invalid_argument "MiscPottier.split_last" if the list is
+   empty. *)
+
+val split_last : 'a list -> ('a list * 'a)
 
 val update_list_assoc: 'a -> 'b -> ('a * 'b) list -> ('a * 'b) list