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

Timestamp:

Dec 2, 2011, 7:49:19 PM (9 years ago)

Author:

tranquil

Message:

fighting with a bug of the translation from RTL to ERTL

Location:

Deliverables/D2.2/8051/src/utilities

Files:

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

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

@@ -4 +4 @@
   List.map f' (List.combine (List.combine al bl) cl)
 
-let fold3_right f al bl cl =
-  let f' ((a, b), c) d = f a b c d in
-  List.fold_right f' (List.combine (List.combine al bl) cl)
+let rec fold3_right f al bl cl d = match al, bl, cl with
+  | a :: al, b :: bl, c :: cl ->
+    f a b c (fold3_right f al bl cl d)
+  | [], [], [] -> d
+  | _ -> invalid_arg "fold3_right: list lengths do not match"
+
+let rec fold3_left f a bl cl dl = match bl, cl, dl with
+  | b :: bl, c :: cl, d :: dl ->
+    fold3_left f (f a b c d) bl cl dl
+  | [], [], [] -> a
+  | _ -> invalid_arg "fold3_left: list lengths do not match"
 
 let rec max_list = function

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

@@ -10 +10 @@
    size. *)
 val map3 : ('a -> 'b -> 'c -> 'd) -> 'a list -> 'b list -> 'c list -> 'd list
+val fold3_left : ('a -> 'b -> 'c -> 'd -> 'a) ->
+  'a -> 'b list -> 'c list -> 'd list -> 'a
 val fold3_right : ('a -> 'b -> 'c -> 'd -> 'd) ->
   'a list -> 'b list -> 'c list -> 'd -> 'd