de5102a · typeable/pandoc

git.iko.soy/typeable/pandoc

on master help sign in

Error: Changed PandocFileReadError to PandocIOError

de5102aJohn MacFarlane10 years ago

src/Text/Pandoc/Error.hs+3−2

@@ -39,10 +39,11 @@ import Data.Generics (Typeable)

39import GHC.Generics (Generic)

40import Control.Exception (Exception)

41import Text.Pandoc.Shared (err)

42+import System.IO.Error (IOError)

43type Input = String

44type Input = String

45−data PandocError = PandocFileReadError FilePath

46+data PandocError = PandocIOError String IOError

46 | PandocShouldNeverHappenError String

47 | PandocShouldNeverHappenError String

47 | PandocSomeError String

48 | PandocSomeError String

48 | PandocParseError String

49 | PandocParseError String

@@ -57,7 +58,7 @@ handleError :: Either PandocError a -> IO a

57handleError (Right r) = return r

58handleError (Right r) = return r

58handleError (Left e) =

59handleError (Left e) =

59 case e of

60 case e of

60− PandocFileReadError fp -> err 61 $ "problem reading " ++ fp

61+ PandocIOError _ err' -> ioError err'

61 PandocShouldNeverHappenError s -> err 62 s

62 PandocShouldNeverHappenError s -> err 62 s

62 PandocSomeError s -> err 63 s

63 PandocSomeError s -> err 63 s

63 PandocParseError s -> err 64 s

64 PandocParseError s -> err 64 s