Changeset 12905

Timestamp:

08/31/06 14:47:04 (2 years ago)

Author:

audreyt

Message:

* Unbreak GHC 6.5-trunk build by preferring our forM_ and forM

over the now-builtin ones (for now)

Location:

src/Pugs

Files:

• Internals.hs (modified) (4 diffs)
• Monads.hs (modified) (1 diff)

src/Pugs/Internals.hs

@@ -115 +115 @@
 import System.Directory (Permissions(..), getPermissions, getTemporaryDirectory, createDirectory, removeDirectory, removeFile, getDirectoryContents)
 import Control.Exception (catchJust, errorCalls)
-import Control.Monad.RWS
+import Control.Monad.RWS (MonadIO(..), MonadReader(..), MonadState(..), MonadWriter(..), MonadTrans(..), asks, ReaderT(..), WriterT(..), when, join, liftM, filterM, modify, unless, gets, foldM, guard, liftM2, liftM3, fix, mplus, mappend, mzero, mconcat, msum, censor)
 import Control.Monad.Identity (Identity(..))
 import Control.Monad.Error (MonadError(..))
@@ -344 +344 @@
           )
 
+-- On GHC 6.6 we actually want to use the builtin forM and forM_ in Control.Monad
 
 {-|
@@ -352 +353 @@
 (This is just @mapM@ with the arguments reversed.)
 -}
+{-# INLINE forM #-}
 forM :: (Monad m) 
      => [a]        -- ^ List of values to loop over
@@ -365 +367 @@
 (This is just @mapM_@ with the arguments reversed.)
 -}
+{-# INLINE forM_ #-}
 forM_ :: (Monad m) 
       => [a]        -- ^ List of values to loop over

src/Pugs/Monads.hs

@@ -21 +21 @@
     
     MaybeT, runMaybeT,
-
-    module Control.Monad.RWS
 ) where
 import Pugs.Internals