diff options
author | Austin Seipp <austin@well-typed.com> | 2014-04-22 06:09:40 -0500 |
---|---|---|
committer | Austin Seipp <austin@well-typed.com> | 2014-04-22 06:09:40 -0500 |
commit | 88c9403264950326e39a05f262bbbb069cf12977 (patch) | |
tree | 84821fe0ccac02131a7685eeb9224e366a638763 /compiler/utils | |
parent | 33e585d6eacae19e83862a05b650373b536095fa (diff) | |
download | haskell-wip/amp.tar.gz |
Make Applicative a superclass of Monadwip/amp
Signed-off-by: Austin Seipp <austin@well-typed.com>
Diffstat (limited to 'compiler/utils')
-rw-r--r-- | compiler/utils/Maybes.lhs | 3 | ||||
-rw-r--r-- | compiler/utils/Stream.hs | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/compiler/utils/Maybes.lhs b/compiler/utils/Maybes.lhs index d9e1762a2f..e1bba86382 100644 --- a/compiler/utils/Maybes.lhs +++ b/compiler/utils/Maybes.lhs @@ -1,3 +1,4 @@ +{-# LANGUAGE CPP #-} % % (c) The University of Glasgow 2006 % (c) The GRASP/AQUA Project, Glasgow University, 1992-1998 @@ -17,7 +18,9 @@ module Maybes ( MaybeT(..) ) where +#if __GLASGOW_HASKELL__ < 709 import Control.Applicative +#endif import Control.Monad import Data.Maybe diff --git a/compiler/utils/Stream.hs b/compiler/utils/Stream.hs index 47cdee0789..2353a8177d 100644 --- a/compiler/utils/Stream.hs +++ b/compiler/utils/Stream.hs @@ -12,7 +12,10 @@ module Stream ( Stream.map, Stream.mapM, Stream.mapAccumL ) where import Control.Monad +#if __GLASGOW_HASKELL__ < 709 import Control.Applicative +#endif + -- | -- @Stream m a b@ is a computation in some Monad @m@ that delivers a sequence |