aboutsummaryrefslogtreecommitdiff
path: root/src/Text
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2016-12-10 23:41:37 +0100
committerJohn MacFarlane <jgm@berkeley.edu>2017-01-25 17:07:41 +0100
commitb5d15670223ada11a357161f3b057fae6f852554 (patch)
tree4c8d3a98e62a5d6bec1d04cd9598dce8619e220f /src/Text
parent73f373660278d9283499951f7a16c0dc2d79ef08 (diff)
downloadpandoc-b5d15670223ada11a357161f3b057fae6f852554.tar.gz
Class: removed 'fail' from PandocMonad.
Do we need this? I don't see why. There's a name clash which would better be avoided.
Diffstat (limited to 'src/Text')
-rw-r--r--src/Text/Pandoc/Class.hs24
-rw-r--r--src/Text/Pandoc/Writers/Docx.hs2
2 files changed, 13 insertions, 13 deletions
diff --git a/src/Text/Pandoc/Class.hs b/src/Text/Pandoc/Class.hs
index 7f86e27b1..8b94d64a9 100644
--- a/src/Text/Pandoc/Class.hs
+++ b/src/Text/Pandoc/Class.hs
@@ -58,8 +58,7 @@ module Text.Pandoc.Class ( PandocMonad(..)
, withWarningsToStderr
) where
-import Prelude hiding (readFile, fail)
-import qualified Control.Monad as M (fail)
+import Prelude hiding (readFile)
import System.Random (StdGen, next, mkStdGen)
import qualified System.Random as IO (newStdGen)
import Codec.Archive.Zip (Archive, fromArchive, emptyArchive)
@@ -90,11 +89,12 @@ import System.FilePath.Glob (match, compile)
import System.FilePath ((</>))
import qualified System.FilePath.Glob as IO (glob)
import qualified System.Directory as IO (getModificationTime)
-import Control.Monad.State hiding (fail)
+import Control.Monad as M (fail)
import Control.Monad.Reader (ReaderT)
+import Control.Monad.State
+import Control.Monad.Except
import Control.Monad.Writer (WriterT)
import Control.Monad.RWS (RWST)
-import Control.Monad.Except hiding (fail)
import Data.Word (Word8)
import Data.Default
import System.IO.Error
@@ -121,7 +121,7 @@ class (Functor m, Applicative m, Monad m, MonadError PandocError m)
-> Maybe String
-> String
-> m (Either E.SomeException (B.ByteString, Maybe MimeType))
- fail :: String -> m b
+ -- fail :: String -> m b
glob :: String -> m [FilePath]
getModificationTime :: FilePath -> m UTCTime
getCommonState :: m CommonState
@@ -231,7 +231,7 @@ instance PandocMonad PandocIO where
case eitherBS of
Right bs -> return bs
Left _ -> throwError $ PandocFileReadError fname
- fail = M.fail
+ -- fail = M.fail
fetchItem ms s = liftIO $ IO.fetchItem ms s
fetchItem' mb ms s = liftIO $ IO.fetchItem' mb ms s
glob = liftIO . IO.glob
@@ -361,7 +361,7 @@ instance PandocMonad PandocPure where
case infoFileContents <$> (getFileInfo (userDir </> fname) userDirFiles) of
Just bs -> return bs
Nothing -> readDataFile Nothing fname
- fail = M.fail
+ -- fail = M.fail
fetchItem _ fp = do
fps <- getsPureState stFiles
case infoFileContents <$> (getFileInfo fp fps) of
@@ -396,7 +396,7 @@ instance PandocMonad m => PandocMonad (ParserT s st m) where
newUniqueHash = lift newUniqueHash
readFileLazy = lift . readFileLazy
readDataFile mbuserdir = lift . readDataFile mbuserdir
- fail = lift . fail
+ -- fail = lift . fail
fetchItem media = lift . fetchItem media
fetchItem' media sourceUrl = lift . fetchItem' media sourceUrl
glob = lift . glob
@@ -414,7 +414,7 @@ instance PandocMonad m => PandocMonad (ReaderT r m) where
newUniqueHash = lift newUniqueHash
readFileLazy = lift . readFileLazy
readDataFile mbuserdir = lift . readDataFile mbuserdir
- fail = lift . fail
+ -- fail = lift . fail
fetchItem media = lift . fetchItem media
fetchItem' media sourceUrl = lift . fetchItem' media sourceUrl
glob = lift . glob
@@ -432,7 +432,7 @@ instance (PandocMonad m, Monoid w) => PandocMonad (WriterT w m) where
newUniqueHash = lift newUniqueHash
readFileLazy = lift . readFileLazy
readDataFile mbuserdir = lift . readDataFile mbuserdir
- fail = lift . fail
+ -- fail = lift . fail
fetchItem media = lift . fetchItem media
fetchItem' media sourceUrl = lift . fetchItem' media sourceUrl
glob = lift . glob
@@ -450,7 +450,7 @@ instance (PandocMonad m, Monoid w) => PandocMonad (RWST r w st m) where
newUniqueHash = lift newUniqueHash
readFileLazy = lift . readFileLazy
readDataFile mbuserdir = lift . readDataFile mbuserdir
- fail = lift . fail
+ -- fail = lift . fail
fetchItem media = lift . fetchItem media
fetchItem' media sourceUrl = lift . fetchItem' media sourceUrl
glob = lift . glob
@@ -468,7 +468,7 @@ instance PandocMonad m => PandocMonad (StateT st m) where
newUniqueHash = lift newUniqueHash
readFileLazy = lift . readFileLazy
readDataFile mbuserdir = lift . readDataFile mbuserdir
- fail = lift . fail
+ -- fail = lift . fail
fetchItem media = lift . fetchItem media
fetchItem' media sourceUrl = lift . fetchItem' media sourceUrl
glob = lift . glob
diff --git a/src/Text/Pandoc/Writers/Docx.hs b/src/Text/Pandoc/Writers/Docx.hs
index 20320907e..662b4d3bb 100644
--- a/src/Text/Pandoc/Writers/Docx.hs
+++ b/src/Text/Pandoc/Writers/Docx.hs
@@ -1276,7 +1276,7 @@ parseXml refArchive distArchive relpath =
findEntryByPath relpath distArchive of
Nothing -> fail $ relpath ++ " missing in reference docx"
Just e -> case parseXMLDoc . UTF8.toStringLazy . fromEntry $ e of
- Nothing -> P.fail $ relpath ++ " corrupt in reference docx"
+ Nothing -> fail $ relpath ++ " corrupt in reference docx"
Just d -> return d
-- | Scales the image to fit the page