From 857d35fce4e364039092a9da37b93b67bd566bb6 Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Tue, 7 Feb 2017 22:33:05 +0100
Subject: Refactored some files formerly in LaTeX reader.

* Export readFileFromDirs from Class.
* Export insertIncludedFile from Parsing.

Simplified code in LaTeX/RST readers.
---
 src/Text/Pandoc/Class.hs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/Text/Pandoc/Class.hs')

diff --git a/src/Text/Pandoc/Class.hs b/src/Text/Pandoc/Class.hs
index f75db4b3a..e6913566f 100644
--- a/src/Text/Pandoc/Class.hs
+++ b/src/Text/Pandoc/Class.hs
@@ -40,11 +40,11 @@ module Text.Pandoc.Class ( PandocMonad(..)
                          , modifyPureState
                          , getPOSIXTime
                          , getZonedTime
+                         , readFileFromDirs
                          , warning
                          , warningWithPos
                          , report
                          , getLog
-                         , readFileFromDirs
                          , setVerbosity
                          , getMediaBag
                          , setMediaBag
@@ -74,7 +74,7 @@ import qualified Text.Pandoc.Shared as IO ( readDataFile
 import qualified Text.Pandoc.UTF8 as UTF8
 import Text.Pandoc.Compat.Time (UTCTime)
 import Text.Pandoc.Options (Verbosity(..))
-import Text.Pandoc.Parsing (ParserT, SourcePos)
+import Text.Parsec (ParsecT, SourcePos)
 import qualified Text.Pandoc.Compat.Time as IO (getCurrentTime)
 import Text.Pandoc.MIME (MimeType, getMimeType)
 import Data.Time.Clock.POSIX ( utcTimeToPOSIXSeconds
@@ -151,7 +151,7 @@ warning msg = report WARNING msg
 warningWithPos :: PandocMonad m
                => SourcePos
                -> String
-               -> ParserT s st m ()
+               -> ParsecT s st m ()
 warningWithPos pos msg = lift $ warning $ msg ++ " " ++ show pos
 
 report :: PandocMonad m => Verbosity -> String -> m ()
@@ -513,7 +513,7 @@ instance PandocMonad PandocPure where
 
   logOutput _level _msg = return ()
 
-instance PandocMonad m => PandocMonad (ParserT s st m) where
+instance PandocMonad m => PandocMonad (ParsecT s st m) where
   lookupEnv = lift . lookupEnv
   getCurrentTime = lift getCurrentTime
   getCurrentTimeZone = lift getCurrentTimeZone
-- 
cgit v1.2.3