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

Rewrote charsInBalanced and charsInBalanced'.

Browse source 
- Documented restriction: open and close must be distinct characters.
- Rearranged options for greater efficiency.
- Changed inner call to charsInBalanced inside charsInBalanced' to
  charsInBalanced'.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@951 788f1e2b-df1e-0410-8736-df70ead52e1b
This commit is contained in:
fiddlosopher 2007-08-29 01:50:36 +00:00
parent 64023d8ba8
commit 86cc8c8bf2
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -293,28 +293,28 @@ lineClump = do
-- | Parse a string of characters between an open character -- | Parse a string of characters between an open character
-- and a close character, including text between balanced -- and a close character, including text between balanced
-- pairs of open and close. For example, -- pairs of open and close, which must be different. For example,
-- @charsInBalanced '(' ')'@ will parse "(hello (there))" -- @charsInBalanced '(' ')'@ will parse "(hello (there))"
-- and return "hello (there)". Stop if a blank line is -- and return "hello (there)". Stop if a blank line is
-- encountered. -- encountered.
charsInBalanced :: Char -> Char -> GenParser Char st String charsInBalanced :: Char -> Char -> GenParser Char st String
charsInBalanced open close = try $ do charsInBalanced open close = try $ do
char open char open
raw <- manyTill ( (do res <- charsInBalanced open close raw <- many $ (many1 (noneOf [open, close, '\n']))
return $ [open] ++ res ++ [close]) <|> (do res <- charsInBalanced open close
<|> (do notFollowedBy (blankline >> blanklines >> return '\n') return $ [open] ++ res ++ [close])
count 1 anyChar)) <|> try (string "\n" >>~ notFollowedBy' blanklines)
(char close) char close
return $ concat raw return $ concat raw
-- | Like @charsInBalanced@, but allow blank lines in the content. -- | Like @charsInBalanced@, but allow blank lines in the content.
charsInBalanced' :: Char -> Char -> GenParser Char st String charsInBalanced' :: Char -> Char -> GenParser Char st String
charsInBalanced' open close = try $ do charsInBalanced' open close = try $ do
char open char open
raw <- manyTill ( (do res <- charsInBalanced open close raw <- many $ (many1 (noneOf [open, close]))
<|> (do res <- charsInBalanced' open close
return $ [open] ++ res ++ [close]) return $ [open] ++ res ++ [close])
<|> count 1 anyChar) char close
(char close)
return $ concat raw return $ concat raw
-- | Parses a roman numeral (uppercase or lowercase), returns number. -- | Parses a roman numeral (uppercase or lowercase), returns number.