@@ -32,8 +32,8 @@ Typeclass for pandoc readers and writers, allowing both IO and pure instances.
34module Text.Pandoc.Class ( PandocMonad(..)
34module Text.Pandoc.Class ( PandocMonad(..)
35− , TestState(..)
35+ , PureState(..)
36− , TestEnv(..)
36+ , PureEnv(..)
37 , getPOSIXTime
37 , getPOSIXTime
38 , PandocIO(..)
38 , PandocIO(..)
39 , PandocPure(..)
39 , PandocPure(..)
@@ -170,7 +170,7 @@ instance PandocMonad PandocIO where
170 insertMedia fp mime bs =
170 insertMedia fp mime bs =
171 modify $ \st -> st{ioStMediaBag = MB.insertMedia fp mime bs (ioStMediaBag st) }
171 modify $ \st -> st{ioStMediaBag = MB.insertMedia fp mime bs (ioStMediaBag st) }
173−data TestState = TestState { stStdGen :: StdGen
173+data PureState = PureState { stStdGen :: StdGen
174 , stWord8Store :: [Word8] -- should be
174 , stWord8Store :: [Word8] -- should be
175 -- inifinite,
175 -- inifinite,
176 -- i.e. [1..]
176 -- i.e. [1..]
@@ -183,15 +183,15 @@ data TestState = TestState { stStdGen :: StdGen
183 , stMediaBag :: MediaBag
183 , stMediaBag :: MediaBag
186−instance Default TestState where
186+instance Default PureState where
187− def = TestState { stStdGen = mkStdGen 1848
187+ def = PureState { stStdGen = mkStdGen 1848
188 , stWord8Store = [1..]
188 , stWord8Store = [1..]
189 , stWarnings = []
189 , stWarnings = []
190 , stUniqStore = [1..]
190 , stUniqStore = [1..]
191 , stMediaBag = mempty
191 , stMediaBag = mempty
194−data TestEnv = TestEnv { envEnv :: [(String, String)]
194+data PureEnv = PureEnv { envEnv :: [(String, String)]
195 , envTime :: UTCTime
195 , envTime :: UTCTime
196 , envReferenceDocx :: Archive
196 , envReferenceDocx :: Archive
197 , envReferenceODT :: Archive
197 , envReferenceODT :: Archive
@@ -203,8 +203,8 @@ data TestEnv = TestEnv { envEnv :: [(String, String)]
204-- We have to figure this out a bit more. But let's put some empty
204-- We have to figure this out a bit more. But let's put some empty
205-- values in for the time being.
205-- values in for the time being.
206−instance Default TestEnv where
206+instance Default PureEnv where
207− def = TestEnv { envEnv = [("USER", "pandoc-user")]
207+ def = PureEnv { envEnv = [("USER", "pandoc-user")]
208 , envTime = posixSecondsToUTCTime 0
208 , envTime = posixSecondsToUTCTime 0
209 , envReferenceDocx = emptyArchive
209 , envReferenceDocx = emptyArchive
210 , envReferenceODT = emptyArchive
210 , envReferenceODT = emptyArchive
@@ -218,8 +218,8 @@ instance E.Exception PandocExecutionError
219newtype PandocPure a = PandocPure {
219newtype PandocPure a = PandocPure {
220 unPandocPure :: ExceptT PandocExecutionError
220 unPandocPure :: ExceptT PandocExecutionError
221− (ReaderT TestEnv (State TestState)) a
221+ (ReaderT PureEnv (State PureState)) a
222− } deriving (Functor, Applicative, Monad, MonadReader TestEnv, MonadState TestState, MonadError PandocExecutionError)
222+ } deriving (Functor, Applicative, Monad, MonadReader PureEnv, MonadState PureState, MonadError PandocExecutionError)
224runPure :: PandocPure a -> Either PandocExecutionError a
224runPure :: PandocPure a -> Either PandocExecutionError a
225runPure x = flip evalState def $ flip runReaderT def $ runExceptT $ unPandocPure x
225runPure x = flip evalState def $ flip runReaderT def $ runExceptT $ unPandocPure x