From 67eee0be14c2966e9dcf6f4127e75da16b9942b7 Mon Sep 17 00:00:00 2001 From: Martin Perner Date: Thu, 3 Nov 2011 15:36:17 +0100 Subject: fix for ghc6 added applicative instance for ReaderT which was added in GHC7 --- src/Plugins/Monitors/CoreCommon.hs | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'src/Plugins/Monitors/CoreCommon.hs') diff --git a/src/Plugins/Monitors/CoreCommon.hs b/src/Plugins/Monitors/CoreCommon.hs index e508f7d..eb3e17f 100644 --- a/src/Plugins/Monitors/CoreCommon.hs +++ b/src/Plugins/Monitors/CoreCommon.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE PatternGuards #-} +{-# LANGUAGE PatternGuards, CPP #-} ----------------------------------------------------------------------------- -- | @@ -25,6 +25,15 @@ import Data.Maybe import Plugins.Monitors.Common import System.Directory +#ifdef GHC6 +import Control.Monad.Reader + +instance (Monad f, Applicative f) => Applicative (ReaderT r f) where + pure a = ReaderT $ const (pure a) + f <*> a = ReaderT $ \r -> + ((runReaderT f r) <*> (runReaderT a r)) +#endif + checkedDataRetrieval :: (Ord a, Num a) => String -> [String] -> Maybe (String, String -> Int) -> (Double -> a) -> (a -> String) -> Monitor String @@ -131,4 +140,4 @@ readFiles (fval, flbl) = (,) <$> either return (\(f, ex) -> liftM ex -- | Function that captures if-then-else ifthen :: a -> a -> Bool -> a -ifthen thn els cnd = if cnd then thn else els \ No newline at end of file +ifthen thn els cnd = if cnd then thn else els -- cgit v1.2.3