Merge branch 'topic/seven_eight' into 'master'

CPP around differences in 7.8 vs 7.10



See merge request !7
This commit is contained in:
Allele Dev 2016-09-07 08:41:59 +00:00
commit 3e2fcd3ef0
6 changed files with 32 additions and 3 deletions

View File

@ -5,8 +5,16 @@
{-# LANGUAGE DataKinds #-}
{-# LANGUAGE TypeOperators #-}
{-# LANGUAGE DeriveFunctor #-}
{-# LANGUAGE CPP #-}
module Main where
#if __GLASGOW_HASKELL__ <= 708
import Control.Applicative
import qualified Control.Monad.Error as MTL
#else
import qualified Control.Monad.Except as MTL
#endif
import Control.Monad
import Control.Monad.Freer
import Control.Monad.Freer.Internal
@ -17,7 +25,6 @@ import Control.Monad.Freer.StateRW
import Criterion
import Criterion.Main
import qualified Control.Monad.State as MTL
import qualified Control.Monad.Except as MTL
import qualified Control.Monad.Free as Free
--------------------------------------------------------------------------------

View File

@ -2,7 +2,7 @@
{-# LANGUAGE TypeOperators #-}
{-# LANGUAGE FlexibleContexts #-}
{-# LANGUAGE DataKinds #-}
{-# LANGUAGE CPP #-}
{-|
Module : Control.Monad.Freer.Writer
Description : Composable Writer effects -
@ -24,6 +24,10 @@ module Control.Monad.Freer.Writer (
runWriter
) where
#if __GLASGOW_HASKELL__ <= 708
import Data.Monoid
#endif
import Control.Monad.Freer.Internal
-- | Writer effects - send outputs to an effect environment

View File

@ -1,5 +1,10 @@
{-# LANGUAGE CPP #-}
module Main where
#if __GLASGOW_HASKELL__ <= 708
import Control.Applicative
#endif
import Control.Monad.Freer
import Test.Tasty

View File

@ -1,10 +1,15 @@
{-# LANGUAGE FlexibleContexts #-}
{-# LANGUAGE DataKinds #-}
{-# LANGUAGE ConstraintKinds #-}
{-# LANGUAGE CPP #-}
module Tests.Coroutine (
runTestCoroutine
) where
#if __GLASGOW_HASKELL__ <= 708
import Control.Applicative
#endif
import Control.Monad
import Control.Monad.Freer
import Control.Monad.Freer.Coroutine

View File

@ -1,6 +1,8 @@
{-# LANGUAGE TypeOperators #-}
{-# LANGUAGE DataKinds #-}
{-# LANGUAGE FlexibleContexts #-}
{-# LANGUAGE ConstraintKinds #-}
module Tests.Exception (
TooBig(..),

View File

@ -1,10 +1,16 @@
{-# LANGUAGE FlexibleContexts #-}
{-# LANGUAGE ConstraintKinds #-}
{-# LANGUAGE CPP #-}
module Tests.Reader (
testReader,
testMultiReader,
testLocal
) where
#if __GLASGOW_HASKELL__ <= 708
import Control.Applicative
#endif
import Control.Monad.Freer
import Control.Monad.Freer.Reader