changeset 1885:8297968cf7ef

Rename ListPair.map2 to ListPair.mp
author Adam Chlipala <adam@chlipala.net>
date Mon, 04 Nov 2013 08:38:20 -0500
parents 5c30eea7aa78
children b7cd3c7c7edd
files lib/ur/listPair.ur lib/ur/listPair.urs tests/listpair.ur
diffstat 3 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- 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 <xml>ListPair.map2: Unequal list lengths</xml>
     in
-        map2'
+        map'
     end
--- 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
--- 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 <xml>
-  {[ListPair.map2 plus x y]}
+  {[ListPair.mp plus x y]}
 </xml>