# HG changeset patch # User Adam Chlipala # Date 1383572300 18000 # Node ID 8297968cf7ef62783d7198999f31926d346b020a # Parent 5c30eea7aa787b21f089df327fbdaf8a30fe2bca Rename ListPair.map2 to ListPair.mp diff -r 5c30eea7aa78 -r 8297968cf7ef lib/ur/listPair.ur --- a/lib/ur/listPair.ur Sun Nov 03 19:27:30 2013 -0500 +++ b/lib/ur/listPair.ur Mon Nov 04 08:38:20 2013 -0500 @@ -34,13 +34,13 @@ all' end -fun map2 [a] [b] [c] (f : a -> b -> c) = +fun mp [a] [b] [c] (f : a -> b -> c) = let - fun map2' ls1 ls2 = + fun map' ls1 ls2 = case (ls1, ls2) of ([], []) => [] - | (x1 :: ls1, x2 :: ls2) => f x1 x2 :: map2' ls1 ls2 + | (x1 :: ls1, x2 :: ls2) => f x1 x2 :: map' ls1 ls2 | _ => error ListPair.map2: Unequal list lengths in - map2' + map' end diff -r 5c30eea7aa78 -r 8297968cf7ef lib/ur/listPair.urs --- a/lib/ur/listPair.urs Sun Nov 03 19:27:30 2013 -0500 +++ b/lib/ur/listPair.urs Mon Nov 04 08:38:20 2013 -0500 @@ -6,5 +6,5 @@ val all : a ::: Type -> b ::: Type -> (a -> b -> bool) -> list a -> list b -> bool -val map2 : a ::: Type -> b ::: Type -> c ::: Type - -> (a -> b -> c) -> list a -> list b -> list c +val mp : a ::: Type -> b ::: Type -> c ::: Type + -> (a -> b -> c) -> list a -> list b -> list c diff -r 5c30eea7aa78 -r 8297968cf7ef tests/listpair.ur --- a/tests/listpair.ur Sun Nov 03 19:27:30 2013 -0500 +++ b/tests/listpair.ur Mon Nov 04 08:38:20 2013 -0500 @@ -2,5 +2,5 @@ val y = 3 :: 4 :: [] fun main () : transaction page = return - {[ListPair.map2 plus x y]} + {[ListPair.mp plus x y]}