diff options
| author | Simon Peyton Jones <simonpj@microsoft.com> | 2015-01-09 10:53:26 +0000 |
|---|---|---|
| committer | Simon Peyton Jones <simonpj@microsoft.com> | 2015-01-09 11:52:14 +0000 |
| commit | ee4ced43437391a6532a74211c8cab5ed27f2230 (patch) | |
| tree | 2a55c80f3a02c540f5049ecb33a88f63f02c6955 | |
| parent | 6f818e083c8390b0c039bcebb6ec21b336d4173b (diff) | |
| download | haskell-ee4ced43437391a6532a74211c8cab5ed27f2230.tar.gz | |
Comments only
| -rw-r--r-- | compiler/main/GHC.hs | 1 | ||||
| -rw-r--r-- | compiler/main/GhcMonad.hs | 2 | ||||
| -rw-r--r-- | compiler/utils/Maybes.hs | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/compiler/main/GHC.hs b/compiler/main/GHC.hs index 2557ec4fee..877ae74448 100644 --- a/compiler/main/GHC.hs +++ b/compiler/main/GHC.hs @@ -433,6 +433,7 @@ runGhc mb_top_dir ghc = do -- several threads. #if __GLASGOW_HASKELL__ < 710 +-- Pre-AMP change runGhcT :: (ExceptionMonad m, Functor m) => #else runGhcT :: (ExceptionMonad m) => diff --git a/compiler/main/GhcMonad.hs b/compiler/main/GhcMonad.hs index 6a3e107801..5b2e4228bb 100644 --- a/compiler/main/GhcMonad.hs +++ b/compiler/main/GhcMonad.hs @@ -185,6 +185,7 @@ instance ExceptionMonad m => ExceptionMonad (GhcT m) where unGhcT (f g_restore) s #if __GLASGOW_HASKELL__ < 710 +-- Pre-AMP change instance (ExceptionMonad m, Functor m) => HasDynFlags (GhcT m) where #else instance (ExceptionMonad m) => HasDynFlags (GhcT m) where @@ -192,6 +193,7 @@ instance (ExceptionMonad m) => HasDynFlags (GhcT m) where getDynFlags = getSessionDynFlags #if __GLASGOW_HASKELL__ < 710 +-- Pre-AMP change instance (ExceptionMonad m, Functor m) => GhcMonad (GhcT m) where #else instance (ExceptionMonad m) => GhcMonad (GhcT m) where diff --git a/compiler/utils/Maybes.hs b/compiler/utils/Maybes.hs index f5083fdab5..a2ddbdf15d 100644 --- a/compiler/utils/Maybes.hs +++ b/compiler/utils/Maybes.hs @@ -68,6 +68,7 @@ instance Functor m => Functor (MaybeT m) where fmap f x = MaybeT $ fmap (fmap f) $ runMaybeT x #if __GLASGOW_HASKELL__ < 710 +-- Pre-AMP change instance (Monad m, Functor m) => Applicative (MaybeT m) where #else instance (Monad m) => Applicative (MaybeT m) where |