diff options
| author |  Adam Chlipala <adam@chlipala.net> | 2013-11-04 08:38:20 -0500 |
|---|---|---|
| committer | Adam Chlipala <adam@chlipala.net> | 2013-11-04 08:38:20 -0500 |
| commit | d3b74d23b672068e7f9e375b885292726f754f59 (patch) | |
| tree | 147be549cbfaa9efd93aa20c61b2cd76db6b7914 | |
| parent | d2196dbd5c4379bdbc307d2035c8a07ef09b592d (diff) | |
Rename ListPair.map2 to ListPair.mp
| -rw-r--r-- | lib/ur/listPair.ur | 8 | ||||
| -rw-r--r-- | lib/ur/listPair.urs | 4 | ||||
| -rw-r--r-- | tests/listpair.ur | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/lib/ur/listPair.ur b/lib/ur/listPair.ur index d69993f9..94b92872 100644 --- a/lib/ur/listPair.ur +++ b/lib/ur/listPair.ur @@ -34,13 +34,13 @@ fun all [a] [b] f = 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 diff --git a/lib/ur/listPair.urs b/lib/ur/listPair.urs index 218b9420..b473e226 100644 --- a/lib/ur/listPair.urs +++ b/lib/ur/listPair.urs @@ -6,5 +6,5 @@ val mapX : a ::: Type -> b ::: Type -> ctx ::: {Unit} 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 --git a/tests/listpair.ur b/tests/listpair.ur index 4ecacfd3..641b7a04 100644 --- a/tests/listpair.ur +++ b/tests/listpair.ur @@ -2,5 +2,5 @@ val x = 1 :: 2 :: [] val y = 3 :: 4 :: [] fun main () : transaction page = return <xml> - {[ListPair.map2 plus x y]} + {[ListPair.mp plus x y]} </xml> |