Remove uses of Data.Traversable to fix stage1 on pre ghc-6.6 systems

diff --git a/compiler/ghci/Debugger.hs b/compiler/ghci/Debugger.hs
index 99b14c9..9c7c1f9 100644 (file)
--- a/compiler/ghci/Debugger.hs
+++ b/compiler/ghci/Debugger.hs
@@ -38,12 +38,12 @@ import ErrUtils
 import FastString
 import SrcLoc
 import Util
+import Maybes
 
 import Control.Exception
 import Control.Monad
 import qualified Data.Map as Map
 import Data.Array.Unboxed
-import Data.Traversable ( traverse )
 import Data.Typeable             ( Typeable )
 import Data.Maybe
 import Data.IORef
@@ -77,9 +77,9 @@ pprintClosureCommand bindThings force str = do
 
   -- Give names to suspensions and bind them in the local env
   mb_terms' <- if bindThings
-               then io$ mapM (traverse (bindSuspensions cms)) mb_terms
+               then io$ mapM (fmapMMaybe (bindSuspensions cms)) mb_terms
                else return mb_terms
-  ppr_terms <- io$ mapM (traverse (printTerm cms)) mb_terms' 
+  ppr_terms <- io$ mapM (fmapMMaybe (printTerm cms)) mb_terms' 
   let docs = [ ppr id <+> char '=' <+> t | (Just t,id) <- zip ppr_terms ids]
   unqual  <- io$ GHC.getPrintUnqual cms
   io . putStrLn . showSDocForUser unqual $ Outputable.vcat docs

diff --git a/compiler/ghci/RtClosureInspect.hs b/compiler/ghci/RtClosureInspect.hs
index 9161ae4..a4d853e 100644 (file)
--- a/compiler/ghci/RtClosureInspect.hs
+++ b/compiler/ghci/RtClosureInspect.hs
@@ -76,6 +76,7 @@ import TysWiredIn
 import Constants        ( wORD_SIZE )\r
 import FastString       ( mkFastString )\r
 import Outputable\r
+import Maybes\r
 import Panic\r
 \r
 import GHC.Arr          ( Array(..) )\r
@@ -87,13 +88,10 @@ import GHC.Word         ( Word32(..), Word64(..) )
 import Control.Monad    ( liftM, liftM2, msum )\r
 import Data.Maybe\r
 import Data.List\r
-import Data.Traversable ( mapM )\r
 import Data.Array.Base\r
 import Foreign.Storable\r
 import Foreign          ( unsafePerformIO )\r
 \r
-import Prelude hiding ( mapM )\r
-\r
 ---------------------------------------------\r
 -- * A representation of semi evaluated Terms\r
 ---------------------------------------------\r
@@ -546,7 +544,7 @@ zonkTerm = foldTerm idTermFoldM {
               fTerm = \ty dc v tt -> sequence tt      >>= \tt ->\r
                                      zonkTcType ty    >>= \ty' ->\r
                                      return (Term ty' dc v tt)\r
-             ,fSuspension = \ct ty v b -> mapM zonkTcType ty >>= \ty ->\r
+             ,fSuspension = \ct ty v b -> fmapMMaybe zonkTcType ty >>= \ty ->\r
                                           return (Suspension ct ty v b)}  \r
 \r
 {-\r

diff --git a/compiler/main/GHC.hs b/compiler/main/GHC.hs
index ad52387..966976b 100644 (file)
--- a/compiler/main/GHC.hs
+++ b/compiler/main/GHC.hs
@@ -280,7 +280,6 @@ import System.Exit  ( exitWith, ExitCode(..) )
 import System.Time     ( ClockTime )
 import Control.Exception as Exception hiding (handle)
 import Data.IORef
-import Data.Traversable ( traverse )
 import System.IO
 import System.IO.Error ( isDoesNotExistError )
 import Prelude hiding (init)

diff --git a/compiler/utils/Maybes.lhs b/compiler/utils/Maybes.lhs
index 7d1fa4e..af7d3f6 100644 (file)
--- a/compiler/utils/Maybes.lhs
+++ b/compiler/utils/Maybes.lhs
@@ -17,7 +17,7 @@ module Maybes (
        expectJust,
        maybeToBool,
 
-       thenMaybe, seqMaybe, returnMaybe, failMaybe
+       thenMaybe, seqMaybe, returnMaybe, failMaybe, fmapMMaybe
     ) where
 
 #include "HsVersions.h"
@@ -100,6 +100,11 @@ failMaybe = Nothing
 orElse :: Maybe a -> a -> a
 (Just x) `orElse` y = x
 Nothing  `orElse` y = y
+
+fmapMMaybe :: Monad m => (a -> m b) -> Maybe a -> m (Maybe b)
+fmapMMaybe f Nothing  = return Nothing
+fmapMMaybe f (Just x) = f x >>= \x' -> return (Just x')
+
 \end{code}