Remove GHC's haskell98 dependency

compiler/basicTypes/Literal.lhs

@@ -49,9 +49,9 @@ import FastTypes
 import FastString
 import BasicTypes
 import Binary
-import Ratio
 
 import Data.Int
+import Data.Ratio
 import Data.Word
 import Data.Char
 \end{code}

compiler/cmm/CmmBrokenBlock.hs

@@ -23,7 +23,7 @@ import CgUtils (callerSaveVolatileRegs)
 import ClosureInfo
 
 import Maybes
-import List
+import Data.List
 import Panic
 import Unique
 

compiler/cmm/CmmBuildInfoTables.hs

@@ -27,11 +27,11 @@ import FastString
 import FiniteMap
 import ForeignCall
 import IdInfo
-import List (sortBy)
+import Data.List
 import Maybes
 import MkZipCfg
 import MkZipCfgCmm hiding (CmmAGraph, CmmBlock, CmmTopZ, CmmZ, CmmGraph)
-import Monad
+import Control.Monad
 import Name
 import Outputable
 import SMRep

compiler/cmm/CmmCPS.hs

@@ -31,7 +31,7 @@ import UniqSupply
 import UniqSet
 import Unique
 
-import Monad
+import Control.Monad
 
 -----------------------------------------------------------------------------
 -- |Top level driver for the CPS pass

compiler/cmm/CmmCPSGen.hs

@@ -23,7 +23,7 @@ import ForeignCall
 import Constants
 import StaticFlags
 import Unique
-import Maybe
+import Data.Maybe
 import FastString
 
 import Panic

compiler/cmm/CmmCPSZ.hs

@@ -20,8 +20,8 @@ import DynFlags
 import ErrUtils
 import FiniteMap
 import HscTypes
-import Maybe
-import Monad
+import Data.Maybe
+import Control.Monad
 import Outputable
 import StaticFlags
 

compiler/cmm/CmmCommonBlockElimZ.hs

@@ -11,10 +11,10 @@ import ZipCfg
 import ZipCfgCmmRep
 
 import Data.Bits
+import qualified Data.List as List
 import Data.Word
 import FastString
-import List hiding (iterate)
-import Monad
+import Control.Monad
 import Outputable
 import UniqFM
 import Unique
@@ -56,7 +56,7 @@ type State  = (UniqFM [CmmBlock], BidMap)
 common_block :: (Outputable h, Uniquable h) =>  State -> (h, CmmBlock) -> (Bool, State)
 common_block (bmap, subst) (hash, b) =
   case lookupUFM bmap hash of
-    Just bs -> case (find (eqBlockBodyWith (eqBid subst) b) bs,
+    Just bs -> case (List.find (eqBlockBodyWith (eqBid subst) b) bs,
                      lookupBlockEnv subst bid) of
                  (Just b', Nothing)                      -> addSubst b'
                  (Just b', Just b'') | blockId b' /= b'' -> addSubst b'

compiler/cmm/CmmContFlowOpt.hs

@@ -14,7 +14,7 @@ import ZipCfg
 import ZipCfgCmmRep
 
 import Maybes
-import Monad
+import Control.Monad
 import Outputable
 import Prelude hiding (unzip, zip)
 import Util

compiler/cmm/CmmCvt.hs

@@ -13,7 +13,7 @@ import PprCmm()
 import qualified ZipCfg as G
 
 import FastString
-import Monad
+import Control.Monad
 import Outputable
 import UniqSupply
 

compiler/cmm/CmmLint.hs

@@ -19,13 +19,13 @@ module CmmLint (
 import BlockId
 import Cmm
 import CLabel
-import Maybe
 import Outputable
 import PprCmm
 import Constants
 import FastString
 
 import Control.Monad
+import Data.Maybe
 
 -- -----------------------------------------------------------------------------
 -- Exported entry points:

compiler/cmm/CmmLiveZ.hs

@@ -11,7 +11,7 @@ import BlockId
 import CmmExpr
 import CmmTx
 import DFMonad
-import Monad
+import Control.Monad
 import PprCmm()
 import PprCmmZ()
 import ZipCfg

compiler/cmm/CmmProcPointZ.hs

@@ -16,11 +16,11 @@ import CmmLiveZ
 import CmmTx
 import DFMonad
 import FiniteMap
-import List (sortBy)
+import Data.List (sortBy)
 import Maybes
 import MkZipCfg
 import MkZipCfgCmm hiding (CmmBlock, CmmGraph, CmmTopZ)
-import Monad
+import Control.Monad
 import Outputable
 import UniqSet
 import UniqSupply

compiler/cmm/CmmSpillReload.hs

@@ -23,12 +23,12 @@ import ZipCfg
 import ZipCfgCmmRep
 import ZipDataflow
 
-import Monad
+import Control.Monad
 import Outputable hiding (empty)
 import qualified Outputable as PP
 import UniqSet
 
-import Maybe
+import Data.Maybe
 import Prelude hiding (zip)
 
 -- The point of this module is to insert spills and reloads to

compiler/cmm/CmmStackLayout.hs

@@ -16,7 +16,7 @@ import FiniteMap
 import Maybes
 import MkZipCfg
 import MkZipCfgCmm hiding (CmmBlock, CmmGraph)
-import Monad
+import Control.Monad
 import Outputable
 import SMRep (ByteOff)
 import ZipCfg

compiler/cmm/OptimizationFuel.hs

@@ -17,7 +17,7 @@ import ZipCfg
 --import GHC.Exts (State#)
 import Panic
 import Data.IORef
-import Monad
+import Control.Monad
 import StaticFlags (opt_Fuel)
 import UniqSupply
 

compiler/cmm/PprCmmZ.hs

@@ -12,7 +12,7 @@ import qualified ZipCfgCmmRep as G
 import qualified ZipCfg as Z
 import CmmZipUtil
 
-import Maybe
+import Data.Maybe
 import FastString
 
 ----------------------------------------------------------------

compiler/cmm/ZipCfg.hs

@@ -45,7 +45,7 @@ import PprCmm()
 
 import Outputable hiding (empty)
 
-import Maybe
+import Data.Maybe
 import Prelude hiding (zip, unzip, last)
 
 -------------------------------------------------------------------------

compiler/cmm/ZipCfgCmmRep.hs

@@ -36,7 +36,7 @@ import Util
 
 import BasicTypes
 import Maybes
-import Monad
+import Control.Monad
 import Outputable
 import Prelude hiding (zip, unzip, last)
 import SMRep (ByteOff)

compiler/codeGen/CgHpc.hs

@@ -20,9 +20,9 @@ import ClosureInfo
 import FastString
 import HscTypes
 import Panic
-import Char
 import BasicTypes
 
+import Data.Char
 import Data.Word
 
 cgTickBox :: Module -> Int -> Code

compiler/codeGen/StgCmmBind.hs

@@ -36,7 +36,7 @@ import CLabel
 import StgSyn
 import CostCentre	
 import Id
-import Monad (foldM, liftM)
+import Control.Monad
 import Name
 import Module
 import ListSetOps