5fa1182 · typeable/attoparsec

git.iko.soy/typeable/attoparsec

Fix more GCH 7.10 warnings

commit5fa1182e8580dd7a7e8dbb8830724c2c6aedfb56 authorBryan O'Sullivan <bos@serpentine.com> dateTue 20 Jan 2015, 13:48 (12 years ago) parentbf0853e

6 files changed+31−15

compare with master

unifiedsplit

Data/Attoparsec/ByteString/Buffer.hs+3−1 Data/Attoparsec/ByteString/Char8.hs+7−3 Data/Attoparsec/ByteString/Internal.hs+1−1 Data/Attoparsec/Combinator.hs+7−4 Data/Attoparsec/Internal/Types.hs+6−3 Data/Attoparsec/Text.hs+7−3

Data/Attoparsec/ByteString/Buffer.hs+3−1

@@ -1,4 +1,4 @@

1−{-# LANGUAGE BangPatterns #-}

1+{-# LANGUAGE BangPatterns, CPP #-}

22-- |

33-- Module : Data.Attoparsec.ByteString.Buffer

44-- Copyright : Bryan O'Sullivan 2007-2014

@@ -57,7 +57,9 @@ import Control.Exception (assert)

5757import Data.ByteString.Internal (ByteString(..), memcpy, nullForeignPtr)

5858import Data.Attoparsec.Internal.Fhthagn (inlinePerformIO)

5959import Data.List (foldl1')

60+#if !MIN_VERSION_base(4,8,0)

6061import Data.Monoid (Monoid(..))

62+#endif

6163import Data.Word (Word8)

6264import Foreign.ForeignPtr (ForeignPtr, withForeignPtr)

6365import Foreign.Ptr (castPtr, plusPtr)

Data/Attoparsec/ByteString/Char8.hs+7−3

@@ -1,4 +1,4 @@

1−{-# LANGUAGE BangPatterns, FlexibleInstances, TypeFamilies,

1+{-# LANGUAGE BangPatterns, CPP, FlexibleInstances, TypeFamilies,

22 TypeSynonymInstances, GADTs #-}

33{-# OPTIONS_GHC -fno-warn-orphans -fno-warn-warnings-deprecations #-}

@@ -124,7 +124,11 @@ module Data.Attoparsec.ByteString.Char8

124124 , I.atEnd

125125 ) where

126126

127−import Control.Applicative (pure, (*>), (<*), (<$>), (<|>))

127+#if !MIN_VERSION_base(4,8,0)

128+import Control.Applicative (pure, (*>), (<*))

129+import Data.Word (Word)

130+#endif

131+import Control.Applicative ((<$>), (<|>))

128132import Control.Monad (void, when)

129133import Data.Attoparsec.ByteString.FastSet (charClass, memberChar)

130134import Data.Attoparsec.ByteString.Internal (Parser)

@@ -136,7 +140,7 @@ import Data.Int (Int8, Int16, Int32, Int64)

136140import Data.String (IsString(..))

137141import Data.Scientific (Scientific)

138142import qualified Data.Scientific as Sci

139−import Data.Word (Word8, Word16, Word32, Word64, Word)

143+import Data.Word (Word8, Word16, Word32, Word64)

140144import Prelude hiding (takeWhile)

141145import qualified Data.Attoparsec.ByteString as A

142146import qualified Data.Attoparsec.ByteString.Internal as I

Data/Attoparsec/ByteString/Internal.hs+1−1

@@ -136,7 +136,7 @@ storable = hack undefined

136136 hack :: Storable b => b -> Parser b

137137 hack dummy = do

138138 (fp,o,_) <- B.toForeignPtr `fmap` take (sizeOf dummy)

139− return . B.inlinePerformIO . withForeignPtr fp $ \p ->

139+ return . inlinePerformIO . withForeignPtr fp $ \p ->

140140 peek (castPtr $ p `plusPtr` o)

141141

142142-- | Consume @n@ bytes of input, but succeed only if the predicate

Data/Attoparsec/Combinator.hs+7−4

@@ -1,4 +1,4 @@

1−{-# LANGUAGE BangPatterns #-}

1+{-# LANGUAGE BangPatterns, CPP #-}

22-- |

33-- Module : Data.Attoparsec.Combinator

44-- Copyright : Daan Leijen 1999-2001, Bryan O'Sullivan 2007-2014

@@ -35,13 +35,16 @@ module Data.Attoparsec.Combinator

3535 , atEnd

3636 ) where

3737

38−import Control.Applicative (Alternative(..), Applicative(..), empty, liftA2,

39− many, (<|>), (*>), (<$>))

38+#if !MIN_VERSION_base(4,8,0)

39+import Control.Applicative (Applicative(..))

40+import Data.Monoid (Monoid(mappend))

41+#endif

42+import Control.Applicative (Alternative(..), empty, liftA2, many, (<|>),

43+ (<$>))

4044import Control.Monad (MonadPlus(..))

4145import Data.Attoparsec.Internal.Types (Parser(..), IResult(..))

4246import Data.Attoparsec.Internal (endOfInput, atEnd, satisfyElem)

4347import Data.ByteString (ByteString)

44−import Data.Monoid (Monoid(mappend))

4548import Data.Text (Text)

4649import qualified Data.Attoparsec.Zepto as Z

4750import Prelude hiding (succ)

Data/Attoparsec/Internal/Types.hs+6−3

@@ -1,4 +1,4 @@

1−{-# LANGUAGE BangPatterns, GeneralizedNewtypeDeriving, OverloadedStrings,

1+{-# LANGUAGE BangPatterns, CPP, GeneralizedNewtypeDeriving, OverloadedStrings,

22 Rank2Types, RecordWildCards, TypeFamilies #-}

33-- |

44-- Module : Data.Attoparsec.Internal.Types

@@ -25,14 +25,17 @@ module Data.Attoparsec.Internal.Types

2525 , Chunk(..)

2626 ) where

2727

28−import Control.Applicative (Alternative(..), Applicative(..), (<$>))

28+#if !MIN_VERSION_base(4,8,0)

29+import Control.Applicative (Applicative(..))

30+import Data.Monoid (Monoid(..))

31+#endif

32+import Control.Applicative (Alternative(..), (<$>))

2933import Control.DeepSeq (NFData(rnf))

3034import Control.Monad (MonadPlus(..))

3135import Data.Word (Word8)

3236import Data.ByteString (ByteString)

3337import qualified Data.ByteString as BS

3438import Data.ByteString.Internal (w2c)

35−import Data.Monoid (Monoid(..))

3639import Data.Text (Text)

3740import qualified Data.Text as Text

3841import Data.Text.Unsafe (Iter(..))

Data/Attoparsec/Text.hs+7−3

@@ -1,4 +1,4 @@

1−{-# LANGUAGE BangPatterns, FlexibleInstances, TypeSynonymInstances #-}

1+{-# LANGUAGE BangPatterns, CPP, FlexibleInstances, TypeSynonymInstances #-}

22{-# OPTIONS_GHC -fno-warn-warnings-deprecations #-}

44-- |

@@ -122,7 +122,11 @@ module Data.Attoparsec.Text

122122 , I.atEnd

123123 ) where

124124

125−import Control.Applicative (pure, (<$>), (*>), (<*), (<|>))

125+#if !MIN_VERSION_base(4,8,0)

126+import Control.Applicative (pure, (*>), (<*))

127+import Data.Word (Word)

128+#endif

129+import Control.Applicative ((<$>), (<|>))

126130import Data.Attoparsec.Combinator

127131import Data.Attoparsec.Number (Number(..))

128132import Data.Scientific (Scientific)

@@ -132,7 +136,7 @@ import Data.Bits (Bits, (.|.), shiftL)

132136import Data.Char (isAlpha, isDigit, isSpace, ord)

133137import Data.Int (Int8, Int16, Int32, Int64)

134138import Data.Text (Text)

135−import Data.Word (Word8, Word16, Word32, Word64, Word)

139+import Data.Word (Word8, Word16, Word32, Word64)

136140import qualified Data.Attoparsec.Internal as I

137141import qualified Data.Attoparsec.Internal.Types as T

138142import qualified Data.Attoparsec.Text.Internal as I