f04df62 · typeable/pandoc

git.iko.soy/typeable/pandoc

Changed definition of 'enclosed' in Text.Pandoc.Shared so that

'try' is not automatically applied to the 'end' parser. Added 'try' in calls to 'enclosed' where needed. Slight speed increase. git-svn-id: https://pandoc.googlecode.com/svn/trunk@926 788f1e2b-df1e-0410-8736-df70ead52e1b

commitf04df62db11448da41d7b8daa280ac32459e1176 authorfiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b> dateTue 28 Aug 2007, 05:58 (19 years ago) parenta6da87f

4 files changed+7−7

compare with master

unifiedsplit

src/Text/Pandoc/Readers/LaTeX.hs+1−1 src/Text/Pandoc/Readers/Markdown.hs+3−3 src/Text/Pandoc/Readers/RST.hs+1−1 src/Text/Pandoc/Shared.hs+2−2

src/Text/Pandoc/Readers/LaTeX.hs+1−1

@@ -551,7 +551,7 @@ singleQuoteEnd = try $ char '\'' >> notFollowedBy alphaNum

551551

552552doubleQuoteStart = string "``"

553553

554−doubleQuoteEnd = string "''"

554+doubleQuoteEnd = try $ string "''"

555555

556556ellipses = try $ string "\\ldots" >> optional (try (string "{}")) >>

557557 return Ellipses

src/Text/Pandoc/Readers/Markdown.hs+3−3

@@ -684,11 +684,11 @@ emph = ((enclosed (char '*') (char '*') inline) <|>

684684 (enclosed (char '_') (char '_') inline)) >>=

685685 return . Emph . normalizeSpaces

686686

687−strong = ((enclosed (string "**") (string "**") inline) <|>

688− (enclosed (string "__") (string "__") inline)) >>=

687+strong = ((enclosed (string "**") (try $ string "**") inline) <|>

688+ (enclosed (string "__") (try $ string "__") inline)) >>=

689689 return . Strong . normalizeSpaces

690690

691−strikeout = failIfStrict >> enclosed (string "~~") (string "~~") inline >>=

691+strikeout = failIfStrict >> enclosed (string "~~") (try $ string "~~") inline >>=

692692 return . Strikeout . normalizeSpaces

693693

694694superscript = failIfStrict >> enclosed (char '^') (char '^')

src/Text/Pandoc/Readers/RST.hs+1−1

@@ -514,7 +514,7 @@ code = try $ do

514514emph = enclosed (char '*') (char '*') inline >>=

515515 return . Emph . normalizeSpaces

516516

517−strong = enclosed (string "**") (string "**") inline >>=

517+strong = enclosed (string "**") (try $ string "**") inline >>=

518518 return . Strong . normalizeSpaces

519519

520520interpreted role = try $ do

src/Text/Pandoc/Shared.hs+2−2

@@ -287,8 +287,8 @@ enclosed :: GenParser Char st t -- ^ start parser

287287 -> GenParser Char st a -- ^ content parser (to be used repeatedly)

288288 -> GenParser Char st [a]

289289enclosed start end parser = try $

290− start >> notFollowedBy space >> many1Till parser (try end)

291−

290+ start >> notFollowedBy space >> many1Till parser end

291+

292292-- | Parse string, case insensitive.

293293stringAnyCase :: [Char] -> CharParser st String

294294stringAnyCase [] = string ""