3084369 · typeable/pandoc

git.iko.soy/typeable/pandoc

Use catch from Control.Exception to avoid warnings.

commit308436996e7311caa257000f4c010686c08a58e7 authorJohn MacFarlane <fiddlosopher@gmail.com> dateTue 24 Jul 2012, 19:28 (14 years ago) parente6c7652

6 files changed+28−16

compare with master

unifiedsplit

MakeManPage.hs+2−1 Setup.hs+2−1 src/Text/Pandoc/Readers/LaTeX.hs+4−2 src/Text/Pandoc/Writers/ODT.hs+5−4 src/Text/Pandoc/Writers/RTF.hs+3−1 src/pandoc.hs+12−7

MakeManPage.hs+2−1

@@ -11,6 +11,7 @@ import System.Directory (getModificationTime)

1111import System.IO.Error (isDoesNotExistError)

1212import System.Time (ClockTime(..))

1313import Data.Maybe (catMaybes)

14+import qualified Control.Exception as E

1415

1516main = do

1617 rmContents <- liftM toString $ B.readFile "README"

@@ -47,7 +48,7 @@ writeManPage page templ doc = do

4748-- | Returns a list of 'dependencies' that have been modified after 'file'.

4849modifiedDependencies :: FilePath -> [FilePath] -> IO [FilePath]

4950modifiedDependencies file dependencies = do

50− fileModTime <- catch (getModificationTime file) $

51+ fileModTime <- E.catch (getModificationTime file) $

5152 \e -> if isDoesNotExistError e

5253 then return (TOD 0 0) -- the minimum ClockTime

5354 else ioError e

Setup.hs+2−1

@@ -9,7 +9,8 @@ import Distribution.Verbosity ( Verbosity, silent )

99import Distribution.Simple.GHC (ghcPackageDbOptions)

1010import Distribution.Simple.InstallDirs (mandir, bindir, CopyDest (NoCopyDest))

1111import Distribution.Simple.Utils (installOrdinaryFiles)

12−import Control.Exception ( bracket_ )

12+import Prelude hiding (catch)

13+import Control.Exception ( bracket_, catch )

1314import Control.Monad ( unless )

1415import System.Process ( rawSystem, runCommand, waitForProcess )

1516import System.FilePath ( (</>) )

src/Text/Pandoc/Readers/LaTeX.hs+4−2

@@ -46,6 +46,7 @@ import Data.Monoid

4646import System.FilePath (replaceExtension)

4747import Data.List (intercalate)

4848import qualified Data.Map as M

49+import qualified Control.Exception as E

4950

5051-- | Parse LaTeX from string and return 'Pandoc' document.

5152readLaTeX :: ParserState -- ^ Parser state, including options for parser

@@ -670,8 +671,9 @@ handleIncludes :: String -> IO String

670671handleIncludes [] = return []

671672handleIncludes ('\\':xs) =

672673 case runParser include defaultParserState "input" ('\\':xs) of

673− Right (fs, rest) -> do let getfile f = catch (UTF8.readFile f)

674− (\_ -> return "")

674+ Right (fs, rest) -> do let getfile f = E.catch (UTF8.readFile f)

675+ (\e -> let _ = (e :: E.SomeException)

676+ in return "")

675677 yss <- mapM getfile fs

676678 (intercalate "\n" yss ++) `fmap`

677679 handleIncludes rest

src/Text/Pandoc/Writers/ODT.hs+5−4

@@ -47,6 +47,7 @@ import Control.Monad (liftM)

4747import Network.URI ( unEscapeString )

4848import Text.Pandoc.XML

4949import Text.Pandoc.Pretty

50+import qualified Control.Exception as E

5051

5152-- | Produce an ODT file from a Pandoc document.

5253writeODT :: WriterOptions -- ^ Writer options

@@ -109,9 +110,9 @@ transformPic sourceDir entriesRef (Image lab (src,tit)) = do

109110 Nothing -> tit

110111 entries <- readIORef entriesRef

111112 let newsrc = "Pictures/" ++ show (length entries) ++ takeExtension src'

112− catch (readEntry [] (sourceDir </> src') >>= \entry ->

113− modifyIORef entriesRef (entry{ eRelativePath = newsrc } :) >>

114− return (Image lab (newsrc, tit')))

115− (\_ -> return (Emph lab))

113+ E.catch (readEntry [] (sourceDir </> src') >>= \entry ->

114+ modifyIORef entriesRef (entry{ eRelativePath = newsrc } :) >>

115+ return (Image lab (newsrc, tit')))

116+ (\e -> let _ = (e :: E.SomeException) in return (Emph lab))

116117transformPic _ _ x = return x

117118

src/Text/Pandoc/Writers/RTF.hs+3−1

@@ -38,6 +38,7 @@ import System.FilePath ( takeExtension )

3838import qualified Data.ByteString as B

3939import Text.Printf ( printf )

4040import Network.URI ( isAbsoluteURI, unEscapeString )

41+import qualified Control.Exception as E

4142

4243-- | Convert Image inlines into a raw RTF embedded image, read from a file.

4344-- If file not found or filetype not jpeg or png, leave the inline unchanged.

@@ -47,7 +48,8 @@ rtfEmbedImage x@(Image _ (src,_)) = do

4748 if ext `elem` [".jpg",".jpeg",".png"] && not (isAbsoluteURI src)

4849 then do

4950 let src' = unEscapeString src

50− imgdata <- catch (B.readFile src') (\_ -> return B.empty)

51+ imgdata <- E.catch (B.readFile src')

52+ (\e -> let _ = (e :: E.SomeException) in return B.empty)

5153 let bytes = map (printf "%02x") $ B.unpack imgdata

5254 let filetype = case ext of

5355 ".jpg" -> "\\jpegblip"

src/pandoc.hs+12−7

@@ -48,6 +48,7 @@ import Data.List ( intercalate, isSuffixOf, isPrefixOf )

4848import System.Directory ( getAppUserDataDirectory, doesFileExist, findExecutable )

4949import System.IO ( stdout )

5050import System.IO.Error ( isDoesNotExistError )

51+import qualified Control.Exception as E

5152import Control.Exception.Extensible ( throwIO )

5253import qualified Text.Pandoc.UTF8 as UTF8

5354import qualified Text.CSL as CSL

@@ -840,9 +841,10 @@ main = do

840841 let sources = if ignoreArgs then [] else args

841842

842843 datadir <- case mbDataDir of

843− Nothing -> catch

844+ Nothing -> E.catch

844845 (liftM Just $ getAppUserDataDirectory "pandoc")

845− (const $ return Nothing)

846+ (\e -> let _ = (e :: E.SomeException)

847+ in return Nothing)

846848 Just _ -> return mbDataDir

847849

848850 -- assign reader and writer based on options and filenames

@@ -893,12 +895,13 @@ main = do

893895 let tp' = case takeExtension tp of

894896 "" -> tp <.> format

895897 _ -> tp

896− catch (UTF8.readFile tp')

898+ E.catch (UTF8.readFile tp')

897899 (\e -> if isDoesNotExistError e

898− then catch

900+ then E.catch

899901 (readDataFile datadir $

900902 "templates" </> tp')

901− (\_ -> throwIO e)

903+ (\e' -> let _ = (e' :: E.SomeException)

904+ in throwIO e')

902905 else throwIO e)

903906

904907 variables' <- case mathMethod of

@@ -922,8 +925,10 @@ main = do

922925 -- that we can do lookups with regular string equality

923926 let unescapeRefId ref = ref{ refId = fromEntities (refId ref) }

924927

925− refs <- mapM (\f -> catch (CSL.readBiblioFile f) $ \e ->

926− err 23 $ "Error reading bibliography `" ++ f ++ "'" ++ "\n" ++ show e)

928+ refs <- mapM (\f -> E.catch (CSL.readBiblioFile f)

929+ (\e -> let _ = (e :: E.SomeException)

930+ in err 23 $ "Error reading bibliography `" ++ f ++

931+ "'" ++ "\n" ++ show e))

927932 reffiles >>=

928933 return . map unescapeRefId . concat

929934