Move parseHeader up in the chain - parseDocument can either parse
headers or a paragraph
This commit is contained in:
@@ -166,7 +166,7 @@ parsePara = do
|
|||||||
-- string "\n\n" <|> (eof >> return "") -- Consume the next double-newline or EOF.
|
-- string "\n\n" <|> (eof >> return "") -- Consume the next double-newline or EOF.
|
||||||
text <- (manyTill get ((string "\n\n") <|> (eof >> return "")))
|
text <- (manyTill get ((string "\n\n") <|> (eof >> return "")))
|
||||||
when (null text) pfail
|
when (null text) pfail
|
||||||
let parsedText = fst $ leftmostLongestParse (parseHeader <|> parseLine) text -- Parse either a line or a header.
|
let parsedText = fst $ leftmostLongestParse parseLine text -- Parse either a line or a header.
|
||||||
-- If the paragraph is a header, return a Header token. Otheriwse return a Para token.
|
-- If the paragraph is a header, return a Header token. Otheriwse return a Para token.
|
||||||
case parsedText of
|
case parsedText of
|
||||||
Header level token -> return (Header level token)
|
Header level token -> return (Header level token)
|
||||||
@@ -174,4 +174,6 @@ parsePara = do
|
|||||||
|
|
||||||
-- Parse a document, which is multiple paragraphs.
|
-- Parse a document, which is multiple paragraphs.
|
||||||
parseDocument :: ReadP MdToken
|
parseDocument :: ReadP MdToken
|
||||||
parseDocument = (many1 parsePara) >>= (\res -> return (Document (res)))
|
parseDocument = do
|
||||||
|
res <- manyTill (parseHeader <++ parsePara) (eof)
|
||||||
|
return (Document res)
|
||||||
|
Reference in New Issue
Block a user