summaryrefslogtreecommitdiff
path: root/Text/Pandoc/Readers/Gopher.hs
diff options
context:
space:
mode:
authordefanor <defanor@uberspace.net>2017-10-31 15:50:18 +0300
committerdefanor <defanor@uberspace.net>2017-10-31 15:50:18 +0300
commit097ac68877acfa6d35ec3987b80ee1ae8da4ff62 (patch)
tree761975e4e2c45a830db726b687b41bc82483108f /Text/Pandoc/Readers/Gopher.hs
parent964b28e363a4b1f93dd50cb330e2a6440048f4b4 (diff)
Update to pandoc 2
Diffstat (limited to 'Text/Pandoc/Readers/Gopher.hs')
-rw-r--r--Text/Pandoc/Readers/Gopher.hs12
1 files changed, 7 insertions, 5 deletions
diff --git a/Text/Pandoc/Readers/Gopher.hs b/Text/Pandoc/Readers/Gopher.hs
index de346f5..7ece808 100644
--- a/Text/Pandoc/Readers/Gopher.hs
+++ b/Text/Pandoc/Readers/Gopher.hs
@@ -13,10 +13,11 @@ that, there are some adjustments.
module Text.Pandoc.Readers.Gopher ( readGopher ) where
import Text.Pandoc.Definition
-import Text.Pandoc.Error
import Text.Parsec
-import Text.Parsec.String
+import Text.Parsec.Text
import Text.Pandoc.Readers.Plain
+import Text.Pandoc.Class
+import qualified Data.Text as T
-- | UNASCII ::= ASCII - [Tab CR-LF NUL].
@@ -75,9 +76,10 @@ pDirEntries = concat <$> manyTill (choice [pInfo, pLink] <* pEOL) pLastLine
-- | Reads Gopher directory entries, falls back to plain text on
-- failure.
-readGopher :: String -> Either PandocError Pandoc
-readGopher s = Right . Pandoc mempty . pure . Plain $
+readGopher :: PandocMonad m => T.Text -> m Pandoc
+readGopher s = pure . Pandoc mempty . pure . Plain $
case parse pDirEntries "directory entry" s of
-- fallback to plain text
- Left _ -> concatMap (\l -> (lineToInlines l) ++ [LineBreak]) $ lines s
+ Left _ ->
+ concatMap (\l -> (lineToInlines $ T.unpack l) ++ [LineBreak]) $ T.lines s
Right r -> r