TODO.md

@@ -1,5 +1,4 @@
 - [ ] add rst support and convert markdown handling to custom parser instead of pandoc
-  - [ ] Get megaparsec pretty error message in bin build (errorBundlePretty)
 
 - [ ] process source code blocks with tree sitter https://hackage.haskell.org/package/tree-sitter
     - Alternatively consider skylighting https://hackage.haskell.org/package/skylighting

app/Markdown.hs

@@ -10,37 +10,12 @@ import Control.Monad (guard, void)
 import Data.Char (isAlpha)
 import Data.Text (Text)
 import qualified Data.Text as T
-import Data.Void (Void)
 import IR
-import Text.Megaparsec (Parsec, anySingle, anySingleBut, between, choice, count, eof, manyTill, notFollowedBy, satisfy, skipSome, try)
-import qualified Text.Megaparsec as MP
-import Text.Megaparsec.Char (alphaNumChar, char, digitChar, string)
-
-type Parser = Parsec Void String
-
-anyChar :: Parser Char
-anyChar = anySingle
-
-alphaNum :: Parser Char
-alphaNum = alphaNumChar
-
-digit :: Parser Char
-digit = digitChar
-
-noneOf :: [Char] -> Parser Char
-noneOf = MP.noneOf
-
-oneOf :: [Char] -> Parser Char
-oneOf = MP.oneOf
-
-optionMaybe :: Parser a -> Parser (Maybe a)
-optionMaybe = optional
-
-skipMany1 :: Parser a -> Parser ()
-skipMany1 = skipSome
+import Text.Parsec hiding (Line, many, optional, (<|>))
+import Text.Parsec.String (Parser)
 
 metadata :: Parser Text
-metadata = bound *> fmap T.pack (many $ try (char '-' <* notFollowedBy (string "--")) <|> anySingleBut '-') <* bound
+metadata = bound *> fmap T.pack (many $ try (char '-' <* notFollowedBy (string "--")) <|> noneOf "-") <* bound
   where
     bound = string "---"
 
@@ -94,11 +69,11 @@ fencedCodeBlock = do
   pure $ Code $ C lang (T.pack $ unlines codeLines)
 
 languageInfo :: Parser Text
-languageInfo = T.pack <$> some (alphaNum <|> char '-' <|> char '+' <|> char '.')
+languageInfo = T.pack <$> many1 (alphaNum <|> char '-' <|> char '+' <|> char '.')
 
 codeLine :: Parser String
 codeLine = do
-  line <- many $ noneOf "\n\r"
+  line <- many (noneOf "\n\r")
   lineEnding
   pure line
 
@@ -110,7 +85,7 @@ indentedCodeBlock = do
   where
     indentedLine = do
       count 4 (char ' ' <|> char '\t')
-      line <- many $ noneOf "\n\r"
+      line <- many (noneOf "\n\r")
       lineEnding
       pure line
 
@@ -230,9 +205,9 @@ attributeName = do
 attributeValue :: Parser String
 attributeValue =
   choice
-    [ between (char '"') (char '"') (many $ anySingleBut '"'),
-      between (char '\'') (char '\'') (many $ anySingleBut '\''),
-      some $ noneOf " \t\n\r>\"'=<`"
+    [ between (char '"') (char '"') (many $ noneOf "\""),
+      between (char '\'') (char '\'') (many $ noneOf "'"),
+      some (noneOf " \t\n\r>\"'=<`")
     ]
 
 -- Paragraph Block
@@ -338,7 +313,7 @@ codeSpan =
   where
     singleBacktick = do
       char '`'
-      content <- many $ noneOf "`\n\r"
+      content <- many (noneOf "`\n\r")
       char '`'
       pure $ InlineCode (T.pack content)
     doubleBacktick = do
@@ -385,7 +360,7 @@ linkDestination = directLink <|> referenceLink
   where
     directLink = do
       char '('
-      url <- many $ noneOf " \t\n\r)"
+      url <- many (noneOf " \t\n\r)")
       title <- optionMaybe (try $ some (char ' ' <|> char '\t') >> titleParser)
       char ')'
       pure (T.pack url, title)
@@ -401,9 +376,9 @@ titleParser :: Parser Text
 titleParser =
   T.pack
     <$> choice
-      [ between (char '"') (char '"') (many $ anySingleBut '"'),
-        between (char '\'') (char '\'') (many $ anySingleBut '\''),
-        between (char '(') (char ')') (many $ anySingleBut ')')
+      [ between (char '"') (char '"') (many $ noneOf "\""),
+        between (char '\'') (char '\'') (many $ noneOf "'"),
+        between (char '(') (char ')') (many $ noneOf ")")
       ]
 
 -- HTML Inline

app/Restruct.hs

@@ -5,31 +5,31 @@ module Restruct where
 
 -- https://hackage.haskell.org/package/parsec-3.1.18.0/docs/doc-index-All.html
 
---import Data.Text (Text)
---import Data.Void (Void)
---import Text.Parsec as P
---
---data RestElement
---  = RBody RestBody
---  | RTransition
---  | -- list of integers is the location in the section heirachy it is, Text is the title
---    -- NOTE: future me don't bother with proper restext convention do header depth via #n prefix to the title
---    RSection [Int] Text RestBody
---
---data RestBody
---  = RParagraph [RInlineText]
---  | RBulletList Void
---  | REnumList Void
---  | RDefinitionList Void
---  | RFieldList Void
---  | ROptionList Void
---  | RLiteralBlock Void
---  | RLineBlock Void
---  | RBlockQuote Void
---  | -- skipping doctest blocks because no I'll just use a literal block thanks
---    RTable Void
---  | RExplicit Void
---
---data MarkupModifier = Underline | Bold | Italic
---
---data RInlineText = RInLineText {text :: Text, modifiers :: [MarkupModifier]}
+import Data.Text (Text)
+import Data.Void (Void)
+import Text.Parsec as P
+
+data RestElement
+  = RBody RestBody
+  | RTransition
+  | -- list of integers is the location in the section heirachy it is, Text is the title
+    -- NOTE: future me don't bother with proper restext convention do header depth via #n prefix to the title
+    RSection [Int] Text RestBody
+
+data RestBody
+  = RParagraph [RInlineText]
+  | RBulletList Void
+  | REnumList Void
+  | RDefinitionList Void
+  | RFieldList Void
+  | ROptionList Void
+  | RLiteralBlock Void
+  | RLineBlock Void
+  | RBlockQuote Void
+  | -- skipping doctest blocks because no I'll just use a literal block thanks
+    RTable Void
+  | RExplicit Void
+
+data MarkupModifier = Underline | Bold | Italic
+
+data RInlineText = RInLineText {text :: Text, modifiers :: [MarkupModifier]}

app/Utilities.hs

@@ -15,7 +15,7 @@ import Development.Shake.FilePath ((<.>), (</>))
 import qualified Development.Shake.FilePath as FP
 import HTML
 import Markdown
-import Text.Megaparsec (parse)
+import Text.Parsec hiding (Error)
 import Types
 
 indexHtmlOutputPath :: FilePath -> FilePath

psb.cabal

@@ -35,8 +35,7 @@ executable psb
 
     -- Other library packages from which modules are imported.
     -- https://hackage.haskell.org/package/texmath
-    build-depends:    base >=4.17.2.1, mustache >=2.4.2,  shake >= 0.19.8, deriving-aeson >= 0.2.9, aeson, text, time, unordered-containers, yaml, megaparsec >= 9.7.0
-    --parsec >= 3.1.18.0
+    build-depends:    base >=4.17.2.1, mustache >=2.4.2,  shake >= 0.19.8, deriving-aeson >= 0.2.9, aeson, text, time, unordered-containers, yaml, parsec >= 3.1.18.0
 
     -- Directories containing source files.
     hs-source-dirs:   app