From 01877943a19e63327cbd81dba6bede4751fb34a5 Mon Sep 17 00:00:00 2001
From: Pagwin <dev@pagwin.xyz>
Date: Fri, 12 Dec 2025 13:42:37 -0500
Subject: [PATCH] the infinite loops are over and the debug loop begins

---
 src/Logger.hs           |  9 ++++++---
 src/Markdown.hs         | 29 +++++++++++++++++------------
 tests/Markdown/Parse.hs |  2 +-
 3 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/src/Logger.hs b/src/Logger.hs
index dcabcac..83f539e 100644
--- a/src/Logger.hs
+++ b/src/Logger.hs
@@ -1,22 +1,25 @@
 {-# LANGUAGE OverloadedStrings #-}
 
-module Logger (Logger (logError, logWarning, logInfo, logDebug)) where
+module Logger (Logger (logError, logWarning, logInfo, logDebug, logCallStack)) where
 
 import Control.Monad.Trans.Class (MonadTrans (lift))
 import Control.Monad.Trans.State (StateT, modify)
 import Control.Monad.Trans.Writer (WriterT, tell)
 import Data.Functor.Identity (Identity)
 import qualified Data.Text as T
-import qualified Data.Text.IO as T
+import qualified Data.Text.IO as TIO
+import GHC.Stack (HasCallStack, callStack, popCallStack, prettyCallStack)
 
 class (Monad m) => Logger m where
   logError :: T.Text -> m ()
   logWarning :: T.Text -> m ()
   logInfo :: T.Text -> m ()
   logDebug :: T.Text -> m ()
+  logCallStack :: (HasCallStack) => m ()
+  logCallStack = logDebug . T.pack $ prettyCallStack $ popCallStack $ popCallStack callStack
 
 logIO :: T.Text -> T.Text -> IO ()
-logIO kind msg = T.putStrLn $ kind <> ": " <> msg
+logIO kind msg = TIO.putStrLn $ kind <> ": " <> msg
 
 instance Logger IO where
   logError = logIO "error"
diff --git a/src/Markdown.hs b/src/Markdown.hs
index bc257b3..77cc5ef 100644
--- a/src/Markdown.hs
+++ b/src/Markdown.hs
@@ -16,8 +16,9 @@ import Data.String (IsString)
 import Data.Text (Text)
 import qualified Data.Text as T
 import Data.Void (Void)
+import GHC.Stack (HasCallStack, callStack, prettyCallStack)
 import IR
-import Logger (Logger (logDebug))
+import Logger (Logger (logCallStack, logDebug))
 import Text.Megaparsec (ParsecT, Stream, Token, Tokens, anySingle, anySingleBut, between, choice, chunk, count, eof, lookAhead, manyTill, notFollowedBy, satisfy, sepBy, skipSome, try, (<?>))
 import qualified Text.Megaparsec as MP
 import Text.Megaparsec.Char (alphaNumChar, char, digitChar, newline, space, spaceChar)
@@ -62,34 +63,38 @@ element =
       try htmlBlock <?> "HTML Block",
       paragraphBlock <?> "Paragarph"
     ]
+    <* logDebug "element end"
     <* blockEnding
 
-lineEnding :: (Logger m, Characters s) => Parser s m ()
-lineEnding = (try eof) <|> void newline
+lineEnding :: (Logger m, Characters s, HasCallStack) => Parser s m ()
+lineEnding = {-logCallStack *>-} ((try eof) <|> void newline)
 
 -- we don't need to parse eof, lineEnding does that, eof *> eof works just fine in place of eof
-blockEnding :: (Logger m, Characters s) => Parser s m ()
+blockEnding :: (Logger m, Characters s, HasCallStack) => Parser s m ()
 blockEnding = lineEnding *> lineEnding
 
--- TODO: check if inlineHTML needs to be handled in any markdown posts
-inlineText :: forall m s. (Logger m, Characters s) => Parser s m InlineText
+inlineText :: forall m s. (HasCallStack, Logger m, Characters s) => Parser s m InlineText
 inlineText = inlineText' $ fail "noop on notFollowedBy"
   where
+    inlineText' :: (HasCallStack) => Parser s m () -> Parser s m InlineText
     inlineText' disallow = choice [try $ strikethrough disallow, try $ bold disallow, try $ italic disallow, try $ underlined disallow, try code, try $ link disallow, try $ image disallow, try inline_html, plain_text disallow]
-    between' start end middle_piece = between start end $ many ((notFollowedBy end) *> middle_piece)
+
+    between' start end middle_piece = between start end $ many ((notFollowedBy ((try $ void end) <|> blockEnding)) *> middle_piece)
 
     strikethrough disallow = Crossed <$> (between' (string "~~") (disallow <|> (void $ string "~~")) (inlineText' (disallow <|> (void $ string "~~"))))
 
+    -- TODO: bold and italic eat a lineEnding that they shouldn't for some reason
     bold disallow = Bold <$> (between' (string "**") (disallow <|> (void $ string "**")) (inlineText' (disallow <|> (void $ string "**"))))
 
+    italic :: (HasCallStack) => Parser s m () -> Parser s m InlineText
     italic disallow = Italic <$> (between' (char '*') ((void $ char '*') <|> disallow) (inlineText' (disallow <|> (void $ char '*'))))
 
     underlined disallow = Underlined <$> (between' (string "__") ((void $ string "__") <|> disallow) (inlineText' (disallow <|> (void $ string "__"))))
 
-    code = InlineCode . T.pack <$> (between' (char '`') (char '`') (notFollowedBy lineEnding *> anySingle))
-
+    code = InlineCode . T.pack <$> (between' (char '`') (char '`') ((notFollowedBy lineEnding) *> anySingle))
+    link :: (HasCallStack) => Parser s m () -> Parser s m InlineText
     link disallow = do
-      linkText <- between' (char '[') ((void $ char ']') <|> disallow) (logDebug "hmm" *> inlineText' (disallow <|> (void $ char ']')))
+      linkText <- between' (char '[') ((void $ char ']') <|> disallow) (inlineText' (disallow <|> (void $ char ']')))
       (url, title) <- do
         char '('
         -- might fail on newline char situation
@@ -123,7 +128,7 @@ inlineText = inlineText' $ fail "noop on notFollowedBy"
 headingBlock :: (Logger m, Characters s) => Parser s m Element
 headingBlock = do
   heading_level <- length <$> (some $ char '#')
-  optional $ char ' '
+  optional spaceChar
   text <- many ((notFollowedBy blockEnding) *> inlineText)
   pure $ Heading $ H {level = heading_level, text}
 
@@ -159,7 +164,7 @@ listBlock list_type prefix child_parser_factory nest_level = do
     listItem = do
       count nest_level ((try $ void $ char '\t') <|> (void $ string "    "))
       prefix
-      content <- many inlineText
+      content <- many ((notFollowedBy lineEnding) *> inlineText)
       child <- optional $ child_parser_factory $ nest_level + 1
       pure $ LI {content, child}
 
diff --git a/tests/Markdown/Parse.hs b/tests/Markdown/Parse.hs
index 60878fc..45548f3 100644
--- a/tests/Markdown/Parse.hs
+++ b/tests/Markdown/Parse.hs
@@ -52,7 +52,7 @@ generic_parse inp = lift $ timeout 1000000 $ evaluate $ parse (Markdown.document
 
 all_compiles :: Property
 all_compiles = property $ do
-  xs <- forAll $ Gen.text (Range.linear 0 10) Gen.ascii
+  xs <- forAll $ Gen.text (Range.linear 0 100) Gen.ascii
   parsed <- generic_parse xs
   case parsed of
     Nothing -> fail $ "Hit Timeout"