Changed parsing of header to consume optional newline; removed debug statements
This commit is contained in:
@@ -86,23 +86,21 @@ lineToList (Line tokens) = tokens
|
|||||||
-- Parse a markdown header, denoted by 1-6 #'s followed by some text, followed by EOL.
|
-- Parse a markdown header, denoted by 1-6 #'s followed by some text, followed by EOL.
|
||||||
parseHeader :: ReadP MdToken
|
parseHeader :: ReadP MdToken
|
||||||
parseHeader = do
|
parseHeader = do
|
||||||
traceM "Reached parseHeader"
|
|
||||||
skipSpaces
|
skipSpaces
|
||||||
headers <- many1 mustBeHash
|
headers <- many1 mustBeHash
|
||||||
when
|
when
|
||||||
((length headers) > 6)
|
((length headers) > 6)
|
||||||
pfail
|
pfail
|
||||||
_ <- string " "
|
_ <- string " "
|
||||||
text <- munch1 (\x -> x /= '\n') -- Parse until EOL
|
-- text <- manyTill (get) ((string "\n") <|> (eof >> return ""))-- Parse until EOL or EOF
|
||||||
|
text <- munch1 (/= '\n')
|
||||||
|
Text.ParserCombinators.ReadP.optional (char '\n')
|
||||||
let parsedText = fst $ leftmostLongestParse parseLine text
|
let parsedText = fst $ leftmostLongestParse parseLine text
|
||||||
traceM (show parsedText)
|
|
||||||
traceM (show (length headers))
|
|
||||||
return (Header (length headers) parsedText)
|
return (Header (length headers) parsedText)
|
||||||
|
|
||||||
-- Parse bold text
|
-- Parse bold text
|
||||||
parseBold :: ReadP MdToken
|
parseBold :: ReadP MdToken
|
||||||
parseBold = do
|
parseBold = do
|
||||||
traceM "Reached parseBold"
|
|
||||||
text <-
|
text <-
|
||||||
choice
|
choice
|
||||||
[ between (string "__") (string "__") (many1 (lookaheadParse (/= "__"))),
|
[ between (string "__") (string "__") (many1 (lookaheadParse (/= "__"))),
|
||||||
@@ -114,7 +112,6 @@ parseBold = do
|
|||||||
-- Parse italic text
|
-- Parse italic text
|
||||||
parseItalic :: ReadP MdToken
|
parseItalic :: ReadP MdToken
|
||||||
parseItalic = do
|
parseItalic = do
|
||||||
traceM "Reached parseItalic"
|
|
||||||
text <-
|
text <-
|
||||||
choice
|
choice
|
||||||
[ (between (string "_") (string "_") (munch1 (/= '_'))),
|
[ (between (string "_") (string "_") (munch1 (/= '_'))),
|
||||||
@@ -126,7 +123,6 @@ parseItalic = do
|
|||||||
-- Parse a linebreak character
|
-- Parse a linebreak character
|
||||||
parseLinebreak :: ReadP MdToken
|
parseLinebreak :: ReadP MdToken
|
||||||
parseLinebreak = do
|
parseLinebreak = do
|
||||||
traceM "Reached parseLinebreak"
|
|
||||||
char ' '
|
char ' '
|
||||||
many1 (char ' ')
|
many1 (char ' ')
|
||||||
char '\n'
|
char '\n'
|
||||||
@@ -135,7 +131,6 @@ parseLinebreak = do
|
|||||||
-- Parse a regular string as a Unit.
|
-- Parse a regular string as a Unit.
|
||||||
parseString :: ReadP MdToken
|
parseString :: ReadP MdToken
|
||||||
parseString = do
|
parseString = do
|
||||||
traceM "Reached parseString"
|
|
||||||
firstChar <- get -- Must parse at least one character here
|
firstChar <- get -- Must parse at least one character here
|
||||||
text <- munch (\x -> not (elem x "#*_[\n "))
|
text <- munch (\x -> not (elem x "#*_[\n "))
|
||||||
return (Unit (firstChar : text))
|
return (Unit (firstChar : text))
|
||||||
@@ -154,7 +149,6 @@ parseLineToken = choice lineParsers
|
|||||||
-- Parse a line, consisting of one or more tokens.
|
-- Parse a line, consisting of one or more tokens.
|
||||||
parseLine :: ReadP MdToken
|
parseLine :: ReadP MdToken
|
||||||
parseLine = do
|
parseLine = do
|
||||||
traceM "Reached parseLine"
|
|
||||||
skipSpaces
|
skipSpaces
|
||||||
-- Fail if we have reached the end of the document.
|
-- Fail if we have reached the end of the document.
|
||||||
remaining <- look
|
remaining <- look
|
||||||
@@ -167,14 +161,12 @@ parseLine = do
|
|||||||
-- As a weird special case, a 'Paragraph' can also be a 'Header'.
|
-- As a weird special case, a 'Paragraph' can also be a 'Header'.
|
||||||
parsePara :: ReadP MdToken
|
parsePara :: ReadP MdToken
|
||||||
parsePara = do
|
parsePara = do
|
||||||
traceM "Reached parsePara"
|
|
||||||
parseMany (char '\n')
|
parseMany (char '\n')
|
||||||
-- text <- many1 (lookaheadParse (\x -> ((length x) < 2) || (take 2 x) /= "\n\n")) -- Parse until a double-newline.
|
-- text <- many1 (lookaheadParse (\x -> ((length x) < 2) || (take 2 x) /= "\n\n")) -- Parse until a double-newline.
|
||||||
-- 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 (parseHeader <|> parseLine) text -- Parse either a line or a header.
|
||||||
traceM (show parsedText)
|
|
||||||
-- 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)
|
||||||
|
Reference in New Issue
Block a user