Merge pull request #129 from fhaust/monadzip

Add MonadZip Vector instance

Author: dolio

Data/Vector.hs

@@ -173,6 +173,11 @@ import Control.Monad ( MonadPlus(..), liftM, ap )
 import Control.Monad.ST ( ST )
 import Control.Monad.Primitive
 
+
+#if MIN_VERSION_base(4,4,0)
+import Control.Monad.Zip
+#endif
+
 import Prelude hiding ( length, null,
                         replicate, (++), concat,
                         head, last,
@@ -327,6 +332,20 @@ instance MonadPlus Vector where
   {-# INLINE mplus #-}
   mplus = (++)
 
+-- MonadZip was added in base-4.4.0
+#if MIN_VERSION_base(4,4,0)
+instance MonadZip Vector where
+  {-# INLINE mzip #-}
+  mzip = zip
+
+  {-# INLINE mzipWith #-}
+  mzipWith = zipWith
+
+  {-# INLINE munzip #-}
+  munzip = unzip
+#endif
+
+
 instance Applicative.Applicative Vector where
   {-# INLINE pure #-}
   pure = singleton

tests/Tests/Vector.hs

@@ -27,6 +27,10 @@ import System.Random       (Random)
 import Data.Functor.Identity
 import Control.Monad.Trans.Writer
 
+#if MIN_VERSION_base(4,4,0)
+import Control.Monad.Zip
+#endif
+
 #define COMMON_CONTEXT(a, v) \
  VANILLA_CONTEXT(a, v), VECTOR_CONTEXT(a, v)
 
@@ -452,12 +456,23 @@ testPolymorphicFunctions _ = $(testProperties [
         constructrN xs n f = constructrN (f xs : xs) (n-1) f
 
 testTuplyFunctions:: forall a v. (COMMON_CONTEXT(a, v), VECTOR_CONTEXT((a, a), v), VECTOR_CONTEXT((a, a, a), v)) => v a -> [Test]
-testTuplyFunctions _ = $(testProperties ['prop_zip, 'prop_zip3, 'prop_unzip, 'prop_unzip3])
+testTuplyFunctions _ = $(testProperties [ 'prop_zip, 'prop_zip3
+                                        , 'prop_unzip, 'prop_unzip3
+#if MIN_VERSION_base(4,4,0)
+                                        , 'prop_mzip, 'prop_munzip
+#endif
+                                        ])
   where
     prop_zip    :: P (v a -> v a -> v (a, a))           = V.zip `eq` zip
     prop_zip3   :: P (v a -> v a -> v a -> v (a, a, a)) = V.zip3 `eq` zip3
     prop_unzip  :: P (v (a, a) -> (v a, v a))           = V.unzip `eq` unzip
     prop_unzip3 :: P (v (a, a, a) -> (v a, v a, v a))   = V.unzip3 `eq` unzip3
+#if MIN_VERSION_base(4,4,0)
+    prop_mzip   :: P (Data.Vector.Vector a -> Data.Vector.Vector a -> Data.Vector.Vector (a, a))
+        = mzip `eq` zip
+    prop_munzip :: P (Data.Vector.Vector (a, a) -> (Data.Vector.Vector a, Data.Vector.Vector a))
+        = munzip `eq` unzip
+#endif
 
 testOrdFunctions :: forall a v. (COMMON_CONTEXT(a, v), Ord a, Ord (v a)) => v a -> [Test]
 testOrdFunctions _ = $(testProperties