ad7d438 · typeable/attoparsec

git.iko.soy/typeable/attoparsec

Merge

commitad7d438d1aead29b41070a3aac00754db53462a0 authorBryan O'Sullivan <bos@serpentine.com> dateMon 28 Nov 2011, 20:44 (15 years ago) parentff22532 c82a770

2 files changed+6

compare with master

unifiedsplit

Data/Attoparsec/Combinator.hs+4 Data/Attoparsec/Internal/Types.hs+2

Data/Attoparsec/Combinator.hs+4

@@ -25,6 +25,10 @@ module Data.Attoparsec.Combinator

2525

2626import Control.Applicative (Alternative(..), Applicative(..), empty, liftA2,

2727 (<|>), (*>), (<$>))

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

29+import Control.Applicative (many)

30+#endif

31+

2832#if __GLASGOW_HASKELL__ >= 700

2933import Data.Attoparsec.Internal.Types (Parser)

3034import qualified Data.Attoparsec.Zepto as Z

Data/Attoparsec/Internal/Types.hs+2

@@ -202,6 +202,7 @@ instance (Monoid t) => Alternative (Parser t) where

202202 (<|>) = plus

203203 {-# INLINE (<|>) #-}

204204

205+#if MIN_VERSION_base(4,2,0)

205206 many v = many_v

206207 where many_v = some_v <|> pure []

207208 some_v = (:) <$> v <*> many_v

@@ -212,6 +213,7 @@ instance (Monoid t) => Alternative (Parser t) where

212213 many_v = some_v <|> pure []

213214 some_v = (:) <$> v <*> many_v

214215 {-# INLINE some #-}

216+#endif

215217

216218failDesc :: String -> Parser t a

217219failDesc err = Parser (\i0 a0 m0 kf _ks -> kf i0 a0 m0 [] msg)