4caf7f5 · typeable/attoparsec

git.iko.soy/typeable/attoparsec

Merge

--HG-- rename : Data/Attoparsec/Internal.hs => Data/Attoparsec/ByteString/Internal.hs rename : Data/Attoparsec/Internal.hs => Data/Attoparsec/Text/Internal.hs

commit4caf7f570530b45016feb23c7ce65f7db026bdd0 authorBryan O'Sullivan <bos@serpentine.com> dateMon 21 Nov 2011, 15:37 (15 years ago) parentc9801a4 f103285

2 files changed+2−2

compare with master

unifiedsplit

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

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

@@ -425,7 +425,7 @@ atEnd = not <$> wantInput

425425endOfLine :: Parser ()

426426endOfLine = (word8 10 >> return ()) <|> (string "\r\n" >> return ())

427427

428−--- | Name the parser, in case failure occurs.

428+-- | Name the parser, in case failure occurs.

429429(<?>) :: Parser a

430430 -> String -- ^ the name to use if parsing fails

431431 -> Parser a

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

@@ -407,7 +407,7 @@ atEnd = not <$> wantInput

407407endOfLine :: Parser ()

408408endOfLine = (char '\n' >> return ()) <|> (string "\r\n" >> return ())

409409

410−--- | Name the parser, in case failure occurs.

410+-- | Name the parser, in case failure occurs.

411411(<?>) :: Parser a

412412 -> String -- ^ the name to use if parsing fails

413413 -> Parser a