diff options
Diffstat (limited to 'ghc')
| -rw-r--r-- | ghc/GhciMonad.hs | 7 | ||||
| -rw-r--r-- | ghc/InteractiveUI.hs | 3 |
2 files changed, 7 insertions, 3 deletions
diff --git a/ghc/GhciMonad.hs b/ghc/GhciMonad.hs index 22109c428d..89c2028960 100644 --- a/ghc/GhciMonad.hs +++ b/ghc/GhciMonad.hs @@ -48,7 +48,6 @@ import Data.IORef import System.CPUTime import System.Environment import System.IO -import Control.Applicative (Applicative(..)) import Control.Monad import GHC.Exts @@ -57,6 +56,10 @@ import qualified System.Console.Haskeline as Haskeline import Control.Monad.Trans.Class import Control.Monad.IO.Class +#if __GLASGOW_HASKELL__ < 709 +import Control.Applicative (Applicative(..)) +#endif + ----------------------------------------------------------------------------- -- GHCi monad @@ -138,7 +141,7 @@ prettyLocations locs = vcat $ map (\(i, loc) -> brackets (int i) <+> ppr loc) $ instance Outputable BreakLocation where ppr loc = (ppr $ breakModule loc) <+> ppr (breakLoc loc) <+> if null (onBreakCmd loc) - then empty + then Outputable.empty else doubleQuotes (text (onBreakCmd loc)) recordBreak :: BreakLocation -> GHCi (Bool{- was already present -}, Int) diff --git a/ghc/InteractiveUI.hs b/ghc/InteractiveUI.hs index 070932cefc..ea90280b06 100644 --- a/ghc/InteractiveUI.hs +++ b/ghc/InteractiveUI.hs @@ -63,8 +63,9 @@ import Util -- Haskell Libraries import System.Console.Haskeline as Haskeline +import Control.Monad as Monad hiding (empty) + import Control.Applicative hiding (empty) -import Control.Monad as Monad import Control.Monad.Trans.Class import Control.Monad.IO.Class |