git.iko.soy/typeable/pandoc
on master help sign in
Better algorithm for oneOfStrings.
fbd3d2bJohn MacFarlane
src/Text/Pandoc/Parsing.hs+9−2
@@ -173,9 +173,16 @@ notFollowedBy' p = try $ join $ do a <- try p
173 return (return ())
173 return (return ())
174-- (This version due to Andrew Pimlott on the Haskell mailing list.)
174-- (This version due to Andrew Pimlott on the Haskell mailing list.)
175
175
176−-- | Parses one of a list of strings (tried in order).
176+-- | Parses one of a list of strings (tried in order).
177oneOfStrings :: [String] -> Parsec [Char] st String
177oneOfStrings :: [String] -> Parsec [Char] st String
178−oneOfStrings listOfStrings = choice $ map (try . string) listOfStrings
178+oneOfStrings [] = fail "no strings"
179+oneOfStrings strs = do
180+ c <- anyChar
181+ let strs' = [xs | (x:xs) <- strs, x == c]
182+ case strs' of
183+ [] -> fail "not found"
184+ z | "" `elem` z -> return [c]
185+ | otherwise -> (c:) `fmap` oneOfStrings strs'
179
186
180-- | Parses a space or tab.
187-- | Parses a space or tab.
181spaceChar :: Parsec [Char] st Char
188spaceChar :: Parsec [Char] st Char