git.iko.soy/typeable/pandoc
on master help sign in
Fix benchmarks so they compile again.
commitebea74dc35ec39c9fdbba8b100edd7b25a0f1ddc authorJohn MacFarlane <jgm@berkeley.edu> dateSun 29 Sep 2019, 18:29 (7 years ago) parent0b2dc48
1 file changed+15−13
benchmark/benchmark-pandoc.hs+15−13
benchmark/benchmark-pandoc.hs+15−13
@@ -41,16 +41,17 @@ readerBench doc name =
4141 $ nf (\i -> either (error . show) id $ runPure (readerFun i))
4242 inp
4343 Left _ -> Nothing
44− where res = runPure $
45− case (getReader name, getWriter name) of
46− (Right (TextReader r, rexts),
47− Right (TextWriter w, wexts)) -> do
48− setResourcePath ["../test"]
49− inp <- w def{ writerWrapText = WrapAuto
50− , writerExtensions = wexts } doc
51− return $ (r def{ readerExtensions = rexts }, inp)
52− _ -> throwError $ PandocSomeError
53− $ "could not get text reader and writer for " ++ name
44+ where res = runPure $ do
45+ (rdr, rexts) <- getReader name
46+ (wtr, wexts) <- getWriter name
47+ case (rdr, wtr) of
48+ (TextReader r, TextWriter w) -> do
49+ setResourcePath ["../test"]
50+ inp <- w def{ writerWrapText = WrapAuto
51+ , writerExtensions = wexts } doc
52+ return $ (r def{ readerExtensions = rexts }, inp)
53+ _ -> throwError $ PandocSomeError $ "not a text format: "
54+ ++ name
5455
5556getImages :: IO [(FilePath, MimeType, BL.ByteString)]
5657getImages = do
@@ -75,11 +76,12 @@ writerBench doc name =
7576 writerFun d)) doc
7677 Left _ -> Nothing
7778 where res = runPure $ do
78− case (getWriter name) of
79− Right (TextWriter w, wexts) ->
79+ (wtr, wexts) <- getWriter name
80+ case wtr of
81+ TextWriter w ->
8082 return $ w def{ writerExtensions = wexts }
8183 _ -> throwError $ PandocSomeError
82− $ "could not get text reader and writer for " ++ name
84+ $ "could not get text writer for " ++ name
8385
8486main :: IO ()
8587main = do