src/MdToHTML.hs

@@ -59,6 +59,9 @@ instance Show MdToken where
 
 -- ---------------
 -- Helpers
+mustBeHash :: ReadP Char
+mustBeHash = satisfy (\x -> x == '#')
+
 leftmostLongest :: (Foldable t) => [(a, t b)] -> (a, t b)
 leftmostLongest xs =
   let lastElem = (last xs)
@@ -112,8 +115,8 @@ parseItalic :: ReadP MdToken
 parseItalic = do
   text <-
     choice
-      [ between (string "_") (string "_") (munch1 (/= '_')),
-        between (string "*") (string "*") (munch1 (/= '*'))
+      [ (between (string "_") (string "_") (munch1 (/= '_'))),
+        (between (string "*") (string "*") (munch1 (/= '*')))
       ]
   let parsedText = fst $ leftmostLongestParse parseLine text
   return (Italic parsedText)
@@ -140,6 +143,7 @@ parseString = do
 
 lineParsers :: [ReadP MdToken]
 lineParsers = [parseLinebreak, parseSingleNewline, parseBold, parseItalic, parseString] -- A 'line' doesn't include a 'header'
+--lineParsers = [parseSingleNewline, parseString]
 
 -- List of all parsers
 allParsers :: [ReadP MdToken]
@@ -154,7 +158,9 @@ parseLine :: ReadP MdToken
 parseLine = do
   skipSpaces
   -- Fail if we have reached the end of the document.
-  parsed <- manyTill parseLineToken eof
+  remaining <- look
+  when (null remaining) pfail
+  parsed <- parseMany parseLineToken
   return (Line parsed)
 
 -- Parse a paragraph, which is a 'Line' (can span multiple actual lines), separated by double-newlines.
@@ -166,7 +172,7 @@ parsePara = do
   --  string "\n\n" <|> (eof >> return "") -- Consume the next double-newline or EOF.
   text <- (manyTill get ((string "\n\n") <|> (eof >> return "")))
   when (null text) pfail
-  let parsedText = fst $ leftmostLongestParse parseLine text -- Parse either a line or a header.
+  let parsedText = fst $ leftmostLongestParse (parseHeader <|> parseLine) text -- Parse either a line or a header.
   -- If the paragraph is a header, return a Header token. Otheriwse return a Para token.
   case parsedText of
     Header level token -> return (Header level token)
@@ -174,6 +180,4 @@ parsePara = do
 
 -- Parse a document, which is multiple paragraphs.
 parseDocument :: ReadP MdToken
-parseDocument = do
-  res <- manyTill (parseHeader <++ parsePara) (eof)
-  return (Document res)
+parseDocument = (many1 parsePara) >>= (\res -> return (Document (res)))