Merge
commit6bfb2eee8c260fcc87c8464abf0694f933ba39dd
authorBryan O'Sullivan <bos@serpentine.com>
dateFri 1 Apr 2011, 15:56 (16 years ago)
parentba6330dcbf445d
Data/Attoparsec/Char8.hs+8−3
@@ -24,9 +24,14 @@ module Data.Attoparsec.Char8
2424
2525 -- * Running parsers
2626 , A.parse
27+ , A.feed
28+ , A.parseOnly
2729 , A.parseTest
2830 , A.parseWith
29− , A.feed
31+
32+ -- ** Result conversion
33+ , A.maybeResult
34+ , A.eitherResult
3035
3136 -- * Combinators
3237 , (I.<?>)
@@ -34,11 +39,11 @@ module Data.Attoparsec.Char8
3439 , module Data.Attoparsec.Combinator
3540
3641 -- * Parsing individual characters
37− , satisfy
3842 , char
39− , anyChar
4043 , char8
44+ , anyChar
4145 , notChar
46+ , satisfy
4247
4348 -- ** Special character parsers
4449 , digit