Mon Nov 20 20:53:07 UTC 2017

Repository : ssh://git@git.haskell.org/haddock

On branches: 2.17.3.1-spanfix,alexbiehl-patch-1,ghc-8.0,ghc-8.0-facebook,ghc-head,ghc-head1,haddock-quick,headdock-library-1.4.5,ie_avails,issue-303,issue-475,master,pr-filter-maps,pr/cabal-desc,travis,v2.17,v2.17.3,v2.18,wip-located-module-as,wip/D2418,wip/T11080-open-data-kinds,wip/T11430,wip/T12105,wip/T12105-2,wip/T12942,wip/T13163,wip/T3384,wip/embelleshed-rdr,wip/new-tree-one-param,wip/rae,wip/remove-frames,wip/remove-frames1,wip/revert-ttg-2017-11-20,wip/ttg-2017-10-13,wip/ttg-2017-10-31,wip/ttg-2017-11-06,wip/ttg2-2017-11-10,wip/ttg3-2017-11-12,wip/ttg4-constraints-2017-11-13
Link       : http://git.haskell.org/haddock.git/commitdiff/17be133c363d161cff0a0e21968784afd2f7058a

>---------------------------------------------------------------

commit 17be133c363d161cff0a0e21968784afd2f7058a
Author: Łukasz Hanuszczak <lukasz.hanuszczak at gmail.com>
Date:   Tue Aug 4 14:21:22 2015 +0200

    Refactor test runner and create stub functions.


>---------------------------------------------------------------

17be133c363d161cff0a0e21968784afd2f7058a
 html-test/run.hs | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/html-test/run.hs b/html-test/run.hs
index 3a421be..a9fe8bb 100755
--- a/html-test/run.hs
+++ b/html-test/run.hs
@@ -48,15 +48,25 @@ data Config = Config
 
 main :: IO ()
 main = do
-    cfg <- loadConfig =<< getArgs
+    cfg <- uncurry loadConfig =<< checkOpt =<< getArgs
     putStrLn $ show cfg
+    runHaddock cfg
+    checkOutput cfg
 
 
-loadConfig :: [String] -> IO Config
-loadConfig args = do
+checkOutput :: Config -> IO ()
+checkOutput _ = return () -- TODO.
+
+
+runHaddock :: Config -> IO ()
+runHaddock _ = return () -- TODO.
+
+
+checkOpt :: [String] -> IO ([Flag], [String])
+checkOpt args = do
     let (flags, files, errors) = getOpt Permute options args
 
-    when (not $ null errors) $ do
+    unless (null errors) $ do
         hPutStr stderr $ concat errors
         exitFailure
 
@@ -64,6 +74,11 @@ loadConfig args = do
         hPutStrLn stderr $ usageInfo "" options
         exitSuccess
 
+    return (flags, files)
+
+
+loadConfig :: [Flag] -> [String] -> IO Config
+loadConfig flags files = do
     env <- Just . (:) ("haddock_datadir", resDir) <$> getEnvironment
 
     cfgHaddockPath <- pure $ flip fromMaybe (flagsHaddockPath flags) $

