Add catMaybesM and concatM helper functions.

[matthijs/master-project/cλash.git] / cλash / CLasH / Utils.hs

diff --git a/cλash/CLasH/Utils.hs b/cλash/CLasH/Utils.hs
index 705a46603b42f3f4e4ab16dbbffecae7cd512dd2..731de270b56ccb9764d589bc18102dea6d90705e 100644 (file)
--- a/cλash/CLasH/Utils.hs
+++ b/cλash/CLasH/Utils.hs
@@ -1,13 +1,10 @@
-module CLasH.Utils
-  ( listBindings
-  , listBind
-  , makeCached
-  ) where
+module CLasH.Utils where
 
 -- Standard Imports
 import qualified Maybe
 import Data.Accessor
 import qualified Data.Map as Map
+import qualified Control.Monad as Monad
 import qualified Control.Monad.Trans.State as State
 
 -- GHC API
@@ -69,3 +66,19 @@ makeCached key accessor create = do
       value <- create
       modA accessor (Map.insert key value)
       return value
+
+unzipM :: (Monad m) =>
+  m [(a, b)]
+  -> m ([a], [b])
+unzipM = Monad.liftM unzip
+
+catMaybesM :: (Monad m) =>
+  m [Maybe a]
+  -> m [a]
+catMaybesM = Monad.liftM Maybe.catMaybes
+
+concatM :: (Monad m) =>
+  m [[a]]
+  -> m [a]
+concatM = Monad.liftM concat
+