5fa1182 · typeable/attoparsec

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

compare with master

unifiedsplit

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

1−{-# LANGUAGE BangPatterns #-}

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

2-- |

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

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

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

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

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

59import Data.List (foldl1')

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

60import Data.Monoid (Monoid(..))

61import Data.Monoid (Monoid(..))

62+#endif

61import Data.Word (Word8)

63import Data.Word (Word8)

62import Foreign.ForeignPtr (ForeignPtr, withForeignPtr)

64import Foreign.ForeignPtr (ForeignPtr, withForeignPtr)

63import Foreign.Ptr (castPtr, plusPtr)

65import 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,

2 TypeSynonymInstances, GADTs #-}

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

4

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

124 , I.atEnd

125 ) where

126

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

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

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

129+import Data.Word (Word)

130+#endif

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

128import Control.Monad (void, when)

132import Control.Monad (void, when)

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

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

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

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

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

136import Data.String (IsString(..))

140import Data.String (IsString(..))

137import Data.Scientific (Scientific)

141import Data.Scientific (Scientific)

138import qualified Data.Scientific as Sci

142import qualified Data.Scientific as Sci

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

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

140import Prelude hiding (takeWhile)

144import Prelude hiding (takeWhile)

141import qualified Data.Attoparsec.ByteString as A

145import qualified Data.Attoparsec.ByteString as A

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

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

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

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

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

137 hack dummy = do

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

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

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

140 peek (castPtr $ p `plusPtr` o)

141

142-- | 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 #-}

2-- |

3-- Module : Data.Attoparsec.Combinator

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

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

35 , atEnd

36 ) where

37

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

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

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

41+#endif

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

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

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

43+ (<$>))

40import Control.Monad (MonadPlus(..))

44import Control.Monad (MonadPlus(..))

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

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

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

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

43import Data.ByteString (ByteString)

47import Data.ByteString (ByteString)

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

45import Data.Text (Text)

48import Data.Text (Text)

46import qualified Data.Attoparsec.Zepto as Z

49import qualified Data.Attoparsec.Zepto as Z

47import Prelude hiding (succ)

50import 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,

2 Rank2Types, RecordWildCards, TypeFamilies #-}

3-- |

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

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

25 , Chunk(..)

26 ) where

27

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

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

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

31+#endif

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

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

29import Control.DeepSeq (NFData(rnf))

33import Control.DeepSeq (NFData(rnf))

30import Control.Monad (MonadPlus(..))

34import Control.Monad (MonadPlus(..))

31import Data.Word (Word8)

35import Data.Word (Word8)

32import Data.ByteString (ByteString)

36import Data.ByteString (ByteString)

33import qualified Data.ByteString as BS

37import qualified Data.ByteString as BS

34import Data.ByteString.Internal (w2c)

38import Data.ByteString.Internal (w2c)

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

36import Data.Text (Text)

39import Data.Text (Text)

37import qualified Data.Text as Text

40import qualified Data.Text as Text

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

41import 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 #-}

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

3

4-- |

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

122 , I.atEnd

123 ) where

124

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

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

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

127+import Data.Word (Word)

128+#endif

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

126import Data.Attoparsec.Combinator

130import Data.Attoparsec.Combinator

127import Data.Attoparsec.Number (Number(..))

131import Data.Attoparsec.Number (Number(..))

128import Data.Scientific (Scientific)

132import Data.Scientific (Scientific)

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

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

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

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

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

134import Data.Text (Text)

138import Data.Text (Text)

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

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

136import qualified Data.Attoparsec.Internal as I

140import qualified Data.Attoparsec.Internal as I

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

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

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

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