Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

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

Browse source 
'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
This commit is contained in:
fiddlosopher 2007-08-28 05:58:21 +00:00
parent a6da87f484
commit f04df62db1
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Text/Pandoc/Readers/LaTeX.hs
View file

@ -551,7 +551,7 @@ singleQuoteEnd = try $ char '\'' >> notFollowedBy alphaNum
doubleQuoteStart = string "``" doubleQuoteStart = string "``"
doubleQuoteEnd = string "''" doubleQuoteEnd = try $ string "''"
ellipses = try $ string "\\ldots" >> optional (try (string "{}")) >> ellipses = try $ string "\\ldots" >> optional (try (string "{}")) >>
return Ellipses return Ellipses

6
src/Text/Pandoc/Readers/Markdown.hs
View file

@ -684,11 +684,11 @@ emph = ((enclosed (char '*') (char '*') inline) <|>
(enclosed (char '_') (char '_') inline)) >>= (enclosed (char '_') (char '_') inline)) >>=
return . Emph . normalizeSpaces return . Emph . normalizeSpaces
strong = ((enclosed (string "**") (string "**") inline) <|> strong = ((enclosed (string "**") (try $ string "**") inline) <|>
(enclosed (string "__") (string "__") inline)) >>= (enclosed (string "__") (try $ string "__") inline)) >>=
return . Strong . normalizeSpaces return . Strong . normalizeSpaces
strikeout = failIfStrict >> enclosed (string "~~") (string "~~") inline >>= strikeout = failIfStrict >> enclosed (string "~~") (try $ string "~~") inline >>=
return . Strikeout . normalizeSpaces return . Strikeout . normalizeSpaces
superscript = failIfStrict >> enclosed (char '^') (char '^') superscript = failIfStrict >> enclosed (char '^') (char '^')

2
src/Text/Pandoc/Readers/RST.hs
View file

@ -514,7 +514,7 @@ code = try $ do
emph = enclosed (char '*') (char '*') inline >>= emph = enclosed (char '*') (char '*') inline >>=
return . Emph . normalizeSpaces return . Emph . normalizeSpaces
strong = enclosed (string "**") (string "**") inline >>= strong = enclosed (string "**") (try $ string "**") inline >>=
return . Strong . normalizeSpaces return . Strong . normalizeSpaces
interpreted role = try $ do interpreted role = try $ do

2
src/Text/Pandoc/Shared.hs
View file

@ -287,7 +287,7 @@ enclosed :: GenParser Char st t -- ^ start parser
-> GenParser Char st a -- ^ content parser (to be used repeatedly) -> GenParser Char st a -- ^ content parser (to be used repeatedly)
-> GenParser Char st [a] -> GenParser Char st [a]
enclosed start end parser = try $ enclosed start end parser = try $
start >> notFollowedBy space >> many1Till parser (try end) start >> notFollowedBy space >> many1Till parser end
-- | Parse string, case insensitive. -- | Parse string, case insensitive.
stringAnyCase :: [Char] -> CharParser st String stringAnyCase :: [Char] -> CharParser st String