[commit: ghc] master: Comments only (ee4ced4)
git at git.haskell.org
git at git.haskell.org
Fri Jan 9 11:50:56 UTC 2015
Repository : ssh://git@git.haskell.org/ghc
On branch : master
Link : http://ghc.haskell.org/trac/ghc/changeset/ee4ced43437391a6532a74211c8cab5ed27f2230/ghc
>---------------------------------------------------------------
commit ee4ced43437391a6532a74211c8cab5ed27f2230
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date: Fri Jan 9 10:53:26 2015 +0000
Comments only
>---------------------------------------------------------------
ee4ced43437391a6532a74211c8cab5ed27f2230
compiler/main/GHC.hs | 1 +
compiler/main/GhcMonad.hs | 2 ++
compiler/utils/Maybes.hs | 1 +
3 files changed, 4 insertions(+)
diff --git a/compiler/main/GHC.hs b/compiler/main/GHC.hs
index 2557ec4..877ae74 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 6a3e107..5b2e422 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 f5083fd..a2ddbdf 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
More information about the ghc-commits
mailing list