From d94de87252d0fe2ae97341d186b03a2fbe136b04 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Tue, 22 Apr 2014 06:09:40 -0500 Subject: Make Applicative a superclass of Monad Summary: This includes pretty much all the changes needed to make `Applicative` a superclass of `Monad` finally. There's mostly reshuffling in the interests of avoid orphans and boot files, but luckily we can resolve all of them, pretty much. The only catch was that Alternative/MonadPlus also had to go into Prelude to avoid this. As a result, we must update the hsc2hs and haddock submodules. Signed-off-by: Austin Seipp Test Plan: Build things, they might not explode horribly. Reviewers: hvr, simonmar Subscribers: simonmar Differential Revision: https://phabricator.haskell.org/D13 --- compiler/nativeGen/NCGMonad.hs | 2 ++ 1 file changed, 2 insertions(+) (limited to 'compiler/nativeGen/NCGMonad.hs') diff --git a/compiler/nativeGen/NCGMonad.hs b/compiler/nativeGen/NCGMonad.hs index a4c9f74df7..f47a1ab434 100644 --- a/compiler/nativeGen/NCGMonad.hs +++ b/compiler/nativeGen/NCGMonad.hs @@ -44,7 +44,9 @@ import DynFlags import Module import Control.Monad ( liftM, ap ) +#if __GLASGOW_HASKELL__ < 709 import Control.Applicative ( Applicative(..) ) +#endif data NatM_State = NatM_State { -- cgit v1.2.1