@@ -22,14 +22,15 @@ import Data.Maybe (mapMaybe)
2222import Debug.Trace (trace)
2323
2424readerBench :: Pandoc
25− -> (String, ReaderOptions -> String -> IO (Either PandocError Pandoc))
25+ -> (String, ReaderOptions -> String -> Pandoc)
2626 -> Maybe Benchmark
2727readerBench doc (name, reader) =
2828 case lookup name writers of
29− Just (PureStringWriter writer) ->
30− let inp = writer def{ writerWrapText = WrapAuto} doc
31− in return $ bench (name ++ " reader") $ nfIO $
32− (fmap handleError <$> reader def{ readerSmart = True }) inp
29+ Just (StringWriter writer) ->
30+ let inp = either (error . show) id $ runPure
31+ $ writer def{ writerWrapText = WrapAuto} doc
32+ in return $ bench (name ++ " reader") $ nf
33+ (reader def{ readerSmart = True }) inp
3334 _ -> trace ("\nCould not find writer for " ++ name ++ "\n") Nothing
3435
3536writerBench :: Pandoc
@@ -42,11 +43,13 @@ main :: IO ()
4243main = do
4344 inp <- readFile "tests/testsuite.txt"
4445 let opts = def{ readerSmart = True }
45− let doc = handleError $ readMarkdown opts inp
46− let readers' = [(n,r) | (n, StringReader r) <- readers]
46+ let doc = either (error . show) id $ runPure $ readMarkdown opts inp
47+ let readers' = [(n, \o -> either (error . show) id . runPure . r o)
48+ | (n, StringReader r) <- readers]
4749 let readerBs = mapMaybe (readerBench doc)
4850 $ filter (\(n,_) -> n /="haddock") readers'
49− let writers' = [(n,w) | (n, PureStringWriter w) <- writers]
51+ let writers' = [(n, \o -> either (error . show) id . runPure . w o)
52+ | (n, StringWriter w) <- writers]
5053 let writerBs = map (writerBench doc)
5154 $ writers'
5255 defaultMainWith defaultConfig{ timeLimit = 6.0 }