[project @ 2000-04-10 12:12:27 by simonpj]

[ghc-hetmet.git] / ghc / lib / std / Monad.lhs

diff --git a/ghc/lib/std/Monad.lhs b/ghc/lib/std/Monad.lhs
index f95e1cb..2c4c0ef 100644 (file)
--- a/ghc/lib/std/Monad.lhs
+++ b/ghc/lib/std/Monad.lhs
@@ -4,15 +4,13 @@
 \section[Monad]{Module @Monad@}
 
 \begin{code}
-{-# OPTIONS -fno-implicit-prelude #-}
-
 module Monad 
     ( MonadPlus (   -- class context: Monad
          mzero     -- :: (MonadPlus m) => m a
        , mplus     -- :: (MonadPlus m) => m a -> m a -> m a
        )
     , join          -- :: (Monad m) => m (m a) -> m a
-    , guard        -- :: (Monad m) => Bool -> m ()
+    , guard        -- :: (MonadPlus m) => Bool -> m ()
     , when          -- :: (Monad m) => Bool -> m () -> m ()
     , unless        -- :: (Monad m) => Bool -> m () -> m ()
     , ap           -- :: (Monad m) => (m (a -> b)) -> (m a) -> m b
@@ -39,12 +37,7 @@ module Monad
     , (=<<)         -- :: (Monad m) => (a -> m b) -> m a -> m b
     ) where
 
-import PrelList
-import PrelTup
-import PrelBase
-import PrelMaybe ( Maybe(..) )
-
-infixr 1 =<<
+import Prelude
 \end{code}
 
 %*********************************************************
@@ -78,22 +71,6 @@ instance MonadPlus Maybe where
 %*********************************************************
 
 \begin{code}
-sequence       :: Monad m => [m a] -> m [a] 
-sequence []     = return []
-sequence (m:ms) = do { x <- m; xs <- sequence ms; return (x:xs) }
-
-sequence_        :: Monad m => [m a] -> m () 
-{-# INLINE sequence_ #-}
-sequence_        =  foldr (>>) (return ())
-
-mapM            :: Monad m => (a -> m b) -> [a] -> m [b]
-{-# INLINE mapM #-}
-mapM f as       =  sequence (map f as)
-
-mapM_           :: Monad m => (a -> m b) -> [a] -> m ()
-{-# INLINE mapM_ #-}
-mapM_ f as      =  sequence_ (map f as)
-
 guard           :: MonadPlus m => Bool -> m ()
 guard pred
  | pred      = return ()
@@ -113,10 +90,6 @@ filterM  predM (x:xs) = do
 msum        :: MonadPlus m => [m a] -> m a
 {-# INLINE msum #-}
 msum        =  foldr mplus mzero
- 
-{-# SPECIALISE (=<<) :: (a -> [b]) -> [a] -> [b] #-}
-(=<<)           :: Monad m => (a -> m b) -> m a -> m b
-f =<< x                = x >>= f
 \end{code}