X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Futils%2FMonadUtils.hs;h=733eda17005dbac5ba482493241ca368735915d1;hb=296058a1cafa80dec0b3f998348bce7c65f668b0;hp=3c4e3861e3cd8cd9bd4ef37dc9dad0cc416ebc06;hpb=f9fa73dd0f96280ddc73800ca8d247aa788561b5;p=ghc-hetmet.git

diff --git a/compiler/utils/MonadUtils.hs b/compiler/utils/MonadUtils.hs
index 3c4e386..733eda1 100644
--- a/compiler/utils/MonadUtils.hs
+++ b/compiler/utils/MonadUtils.hs
@@ -10,7 +10,8 @@ module MonadUtils
         , MonadIO(..)
         
         , liftIO1, liftIO2, liftIO3, liftIO4
-        
+
+        , zipWith3M        
         , mapAndUnzipM, mapAndUnzip3M, mapAndUnzip4M
         , mapAccumLM
         , mapSndM
@@ -18,6 +19,7 @@ module MonadUtils
         , mapMaybeM
         , anyM, allM
         , foldlM, foldrM
+        , maybeMapM
         ) where
 
 ----------------------------------------------------------------------------------------
@@ -78,6 +80,16 @@ liftIO4 = (((.).(.)).((.).(.))) liftIO
 --  These are used throughout the compiler
 ----------------------------------------------------------------------------------------
 
+zipWith3M :: Monad m => (a -> b -> c -> m d) -> [a] -> [b] -> [c] -> m [d]
+zipWith3M _ []     _      _      = return []
+zipWith3M _ _      []     _      = return []
+zipWith3M _ _      _      []     = return []
+zipWith3M f (x:xs) (y:ys) (z:zs) 
+  = do { r  <- f x y z
+       ; rs <- zipWith3M f xs ys zs
+       ; return $ r:rs
+       }
+
 -- | mapAndUnzipM for triples
 mapAndUnzip3M :: Monad m => (a -> m (b,c,d)) -> [a] -> m ([b],[c],[d])
 mapAndUnzip3M _ []     = return ([],[],[])
@@ -137,4 +149,9 @@ foldlM = foldM
 -- | Monadic version of foldr
 foldrM        :: (Monad m) => (b -> a -> m a) -> a -> [b] -> m a
 foldrM _ z []     = return z
-foldrM k z (x:xs) = do { r <- foldrM k z xs; k x r }
\ No newline at end of file
+foldrM k z (x:xs) = do { r <- foldrM k z xs; k x r }
+
+-- | Monadic version of fmap specialised for Maybe
+maybeMapM :: Monad m => (a -> m b) -> (Maybe a -> m (Maybe b))
+maybeMapM _ Nothing  = return Nothing
+maybeMapM m (Just x) = liftM Just $ m x