Merge branch 'upstream' into dfsg_clean20200209+dfsgdfsg_clean

1 files changed, 25 insertions, 1 deletions

diff --git a/lib/ur/listPair.ur b/lib/ur/listPair.ur
index 94b92872..52c73cd8 100644
--- a/lib/ur/listPair.ur
+++ b/lib/ur/listPair.ur
@@ -40,7 +40,31 @@ fun mp [a] [b] [c] (f : a -> b -> c) =
             case (ls1, ls2) of
                 ([], []) => []
               | (x1 :: ls1, x2 :: ls2) => f x1 x2 :: map' ls1 ls2
-              | _ => error <xml>ListPair.map2: Unequal list lengths</xml>
+              | _ => error <xml>ListPair.mp: Unequal list lengths</xml>
     in
         map'
     end
+
+fun mapM [m] (_ : monad m) [a] [b] [c] (f : a -> b -> m c) =
+    let
+        fun mapM' ls1 ls2 =
+            case (ls1, ls2) of
+                ([], []) => return []
+              | (x1 :: ls1, x2 :: ls2) =>
+                y <- f x1 x2;
+                ls <- mapM' ls1 ls2;
+                return (y :: ls)
+              | _ => error <xml>ListPair.mapM: Unequal list lengths</xml>
+    in
+        mapM'
+    end
+
+fun unzip [a] [b] (ls : list (a * b)) : list a * list b =
+    let
+        fun unzip' ls ls1 ls2 =
+            case ls of
+                [] => (List.rev ls1, List.rev ls2)
+              | (x1, x2) :: ls => unzip' ls (x1 :: ls1) (x2 :: ls2)
+    in
+        unzip' ls [] []
+    end