Trying to get recursive parsing working better

master
Aadhavan Srinivasan 1 week ago
parent 1a838e343e
commit 8e07a5ed0e

@ -69,35 +69,51 @@ parseHeader = do
text <- munch1 (\x -> x /= '\n') -- Parse until EOL text <- munch1 (\x -> x /= '\n') -- Parse until EOL
-- traceM text -- traceM text
let allParsedText = readP_to_S parsePara text let allParsedText = readP_to_S parsePara text
traceM (show allParsedText)
let parsedText = fst . last $ allParsedText let parsedText = fst . last $ allParsedText
return (Header (length headers) parsedText) return (Header (length headers) parsedText)
parseBold :: ReadP MdToken parseBold :: ReadP MdToken
parseBold = do parseBold = do
_ <- string "__" <|> string "**" text <- choice[
text <- munch1 (\x -> x /= '_' && x /= '*') -- Parse until first asterisk/underscore (between (string "__") (string "__") (munch1 (/= '_'))),
(between (string "**") (string "**") (munch1 (/= '*')))
]
-- text <- munch1 (\x -> x /= '_' && x /= '*') -- Parse until first asterisk/underscore
-- traceM text -- traceM text
_ <- char '_' <|> char '*' -- Throw away the second asterisk/underscore -- _ <- char '_' <|> char '*' -- Throw away the second asterisk/underscore
let parsedText = fst . last $ readP_to_S parsePara text let parsedText = fst . last $ readP_to_S parsePara text
return (Bold parsedText) return (Bold parsedText)
parseItalic :: ReadP MdToken
parseItalic = do
text <- choice[
(between (string "_") (string "_") (munch1 (/= '_'))),
(between (string "*") (string "*") (munch1 (/= '*')))
]
let parsedText = fst . last $ readP_to_S parsePara text
return (Italic parsedText)
parseString :: ReadP MdToken parseString :: ReadP MdToken
parseString = do parseString = do
text <- munch1 (\x -> not (elem x "#*_[")) firstChar <- get -- Must parse at least one character here
-- traceM text text <- munch (\x -> not (elem x "#*_["))
return (Unit text) return (Unit (firstChar:text))
--return (Unit text)
parseLine :: ReadP MdToken parseLine :: ReadP MdToken
parseLine = choice [parseHeader,parseBold,parseString] parseLine = choice [parseHeader, parseBold, parseItalic, parseString]
parsePara :: ReadP MdToken parsePara :: ReadP MdToken
parsePara = do parsePara =
parsed <- parseMany parseLine ------ parsePara :: ReadP MdToken
-- traceM $ show parsed ------ parsePara = do
return (Para parsed) ------ parsed <- parseMany parseLine
------ -- traceM $ show parsed
------ return (Para parsed)
main :: IO () main :: IO ()
main = do main = do
let res = readP_to_S parsePara "## Hello **world**" let res = readP_to_S parsePara "## Hello __world_*"
putStrLn (show res) putStrLn (show res)

Loading…
Cancel
Save