on master help sign in
Moved show commands from main to Idris.Info.Show
commite9faa69ad9f28eeb9794e4a7191d050bac4520b3 authorJan de Muijnck-Hughes <jfdm@st-andrews.ac.uk> dateSun 7 Aug 2016, 20:38 (10 years ago) parentc866814
2 files changed+30−11
main/Main.hs+5−5 src/Idris/Info/Show.hs+25−6
main/Main.hs+5−5
@@ -29,11 +29,11 @@ main = do opts <- runArgParser
2929runIdris :: [Opt] -> Idris ()
3030runIdris opts = do
3131 runIO setupBundledCC
32− when (ShowLoggingCats `elem` opts) $ runIO showIdrisLoggingCategories
33− when (ShowIncs `elem` opts) $ runIO showIdrisFlagsInc
34− when (ShowLibs `elem` opts) $ runIO showIdrisFlagsLibs
35− when (ShowLibdir `elem` opts) $ runIO showIdrisLibDir
36− when (ShowPkgs `elem` opts) $ runIO showIdrisInstalledPackages
32+ when (ShowLoggingCats `elem` opts) $ runIO showExitIdrisLoggingCategories
33+ when (ShowIncs `elem` opts) $ runIO showExitIdrisFlagsInc
34+ when (ShowLibs `elem` opts) $ runIO showExitIdrisFlagsLibs
35+ when (ShowLibdir `elem` opts) $ runIO showExitIdrisLibDir
36+ when (ShowPkgs `elem` opts) $ runIO showExitIdrisInstalledPackages
3737 case opt getClient opts of
3838 [] -> return ()
3939 (c:_) -> do setVerbose False
src/Idris/Info/Show.hs+25−6
@@ -4,34 +4,53 @@ import System.Exit
44
55import Idris.Info
66
7−
8−showIdrisFlagsLibs :: IO b
7+showIdrisFlagsLibs :: IO ()
98showIdrisFlagsLibs = do
109 libFlags <- getIdrisFlagsLib
1110 putStrLn $ unwords libFlags
11+
12+showExitIdrisFlagsLibs :: IO ()
13+showExitIdrisFlagsLibs = do
14+ showIdrisFlagsLibs
1215 exitSuccess
1316
14−showIdrisLibDir :: IO b
17+showIdrisLibDir :: IO ()
1518showIdrisLibDir = do
1619 ldir <- getIdrisLibDir
1720 putStrLn ldir
21+
22+showExitIdrisLibDir :: IO ()
23+showExitIdrisLibDir = do
24+ showIdrisLibDir
1825 exitSuccess
1926
20−showIdrisFlagsInc :: IO b
27+showIdrisFlagsInc :: IO ()
2128showIdrisFlagsInc = do
2229 incFlags <- getIdrisFlagsInc
2330 putStrLn $ unwords incFlags
31+
32+showExitIdrisFlagsInc :: IO ()
33+showExitIdrisFlagsInc = do
34+ showIdrisFlagsInc
2435 exitSuccess
2536
2637-- | List idris packages installed
27−showIdrisInstalledPackages :: IO b
38+showIdrisInstalledPackages :: IO ()
2839showIdrisInstalledPackages = do
2940 ipkgs <- getIdrisInstalledPackages
3041 mapM_ putStrLn ipkgs
42+
43+showExitIdrisInstalledPackages :: IO ()
44+showExitIdrisInstalledPackages = do
45+ showIdrisInstalledPackages
3146 exitSuccess
3247
33−showIdrisLoggingCategories :: IO b
48+showIdrisLoggingCategories :: IO ()
3449showIdrisLoggingCategories = do
3550 cs <- getIdrisLoggingCategories
3651 mapM_ putStrLn cs
52+
53+showExitIdrisLoggingCategories :: IO ()
54+showExitIdrisLoggingCategories = do
55+ showIdrisLoggingCategories
3756 exitSuccess