From e9d7504bea5add902f95806a2dbac0248899777d Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Sun, 19 Apr 2015 17:02:59 -0700
Subject: Rewrote charsInBalancedBrackets.

This version should be a bit more efficient.

This doesn't help with #1735, however.
---
 src/Text/Pandoc/Readers/Markdown.hs | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

(limited to 'src/Text/Pandoc')

diff --git a/src/Text/Pandoc/Readers/Markdown.hs b/src/Text/Pandoc/Readers/Markdown.hs
index b54b947b4..102c42ab2 100644
--- a/src/Text/Pandoc/Readers/Markdown.hs
+++ b/src/Text/Pandoc/Readers/Markdown.hs
@@ -165,19 +165,22 @@ litChar = escapedChar'
 -- | Parse a sequence of inline elements between square brackets,
 -- including inlines between balanced pairs of square brackets.
 inlinesInBalancedBrackets :: MarkdownParser (F Inlines)
-inlinesInBalancedBrackets = charsInBalancedBrackets >>=
-  parseFromString (trimInlinesF . mconcat <$> many inline)
-
-charsInBalancedBrackets :: MarkdownParser [Char]
-charsInBalancedBrackets = do
+inlinesInBalancedBrackets = do
   char '['
-  result <- manyTill (  many1 (noneOf "`[]\n")
-                    <|> (snd <$> withRaw code)
-                    <|> ((\xs -> '[' : xs ++ "]") <$> charsInBalancedBrackets)
-                    <|> count 1 (satisfy (/='\n'))
-                    <|> (newline >> notFollowedBy blankline >> return "\n")
-                     ) (char ']')
-  return $ concat result
+  (_, raw) <- withRaw $ charsInBalancedBrackets 1
+  guard $ not $ null raw
+  parseFromString (trimInlinesF . mconcat <$> many inline) (init raw)
+
+charsInBalancedBrackets :: Int -> MarkdownParser ()
+charsInBalancedBrackets 0 = return ()
+charsInBalancedBrackets openBrackets =
+      (char '[' >> charsInBalancedBrackets (openBrackets + 1))
+  <|> (char ']' >> charsInBalancedBrackets (openBrackets - 1))
+  <|> ((  (() <$ code)
+     <|> (() <$ escapedChar')
+     <|> (newline >> notFollowedBy blankline)
+     <|> skipMany1 (noneOf "[]`\n\\")
+      ) >> charsInBalancedBrackets openBrackets)
 
 --
 -- document structure
-- 
cgit v1.2.3