build clean on GHC 7.10

ekmett · Aug 27, 2015 · f2ca552 · f2ca552
1 parent 5684c1a
commit f2ca552
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 3 deletions.
diff --git a/src/Text/Parser/Char.hs b/src/Text/Parser/Char.hs
@@ -46,7 +46,9 @@ module Text.Parser.Char
   , CharParsing(..)
   ) where
 
+#if __GLASGOW_HASKELL__ < 710
 import Control.Applicative
+#endif
 import Control.Monad.Trans.Class
 import Control.Monad.Trans.State.Lazy as Lazy
 import Control.Monad.Trans.State.Strict as Strict
@@ -62,7 +64,9 @@ import Data.CharSet (CharSet(..))
 import qualified Data.CharSet as CharSet
 import Data.Foldable
 import qualified Data.IntSet as IntSet
+#if __GLASGOW_HASKELL__ < 710
 import Data.Monoid
+#endif
 import Data.Text
 import qualified Text.ParserCombinators.ReadP as ReadP
 import qualified Text.Parsec as Parsec

diff --git a/src/Text/Parser/Combinators.hs b/src/Text/Parser/Combinators.hs
@@ -72,8 +72,10 @@ import Control.Monad.Trans.RWS.Strict as Strict
 import Control.Monad.Trans.Reader
 import Control.Monad.Trans.Identity
 import Data.Foldable (asum)
+#if __GLASGOW_HASKELL__ < 710
 import Data.Monoid
 import Data.Traversable (sequenceA)
+#endif
 import qualified Text.Parsec as Parsec
 import qualified Data.Attoparsec.Types as Att
 import qualified Data.Attoparsec.Combinator as Att

diff --git a/src/Text/Parser/LookAhead.hs b/src/Text/Parser/LookAhead.hs
@@ -36,7 +36,9 @@ import Control.Monad.Trans.RWS.Lazy as Lazy
 import Control.Monad.Trans.RWS.Strict as Strict
 import Control.Monad.Trans.Reader
 import Control.Monad.Trans.Identity
+#if __GLASGOW_HASKELL__ < 710
 import Data.Monoid
+#endif
 import qualified Text.ParserCombinators.ReadP as ReadP
 import qualified Text.Parsec as Parsec
 import Text.Parser.Combinators

diff --git a/src/Text/Parser/Token.hs b/src/Text/Parser/Token.hs
@@ -1,11 +1,11 @@
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
-{-# OPTIONS_GHC -fspec-constr -fspec-constr-count=8 #-}
-{-# LANGUAGE CPP #-}
 #if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ >= 702
 {-# LANGUAGE Trustworthy #-}
 #endif
+{-# OPTIONS_GHC -fspec-constr -fspec-constr-count=8 #-}
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Text.Parser.Token
@@ -98,7 +98,9 @@ import Data.Functor.Identity
 import qualified Data.HashSet as HashSet
 import Data.HashSet (HashSet)
 import Data.List (foldl')
+#if __GLASGOW_HASKELL__ < 710
 import Data.Monoid
+#endif
 import Data.Scientific ( Scientific )
 import qualified Data.Scientific as Sci
 import Data.String

diff --git a/src/Text/Parser/Token/Style.hs b/src/Text/Parser/Token/Style.hs
@@ -1,5 +1,5 @@
-{-# LANGUAGE DeriveDataTypeable #-}
 {-# LANGUAGE CPP #-}
+{-# LANGUAGE DeriveDataTypeable #-}
 #if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ >= 702
 {-# LANGUAGE Trustworthy #-}
 #endif
@@ -42,7 +42,9 @@ module Text.Parser.Token.Style
 import Control.Applicative
 import qualified Data.HashSet as HashSet
 import Data.HashSet (HashSet)
+#if __GLASGOW_HASKELL__ < 710
 import Data.Monoid
+#endif
 import Data.Data
 import Text.Parser.Combinators
 import Text.Parser.Char