git.iko.soy/Idris-dev
on master help sign in
Moved show commands from main to Idris.Info.Show
e9faa69Jan de Muijnck-Hughes
main/Main.hs+5−5
compare with master
unifiedsplit
@@ -29,11 +29,11 @@ main = do opts <- runArgParser
29runIdris :: [Opt] -> Idris ()
29runIdris :: [Opt] -> Idris ()
30runIdris opts = do
30runIdris opts = do
31 runIO setupBundledCC
31 runIO setupBundledCC
32− when (ShowLoggingCats `elem` opts) $ runIO showIdrisLoggingCategories
32+ when (ShowLoggingCats `elem` opts) $ runIO showExitIdrisLoggingCategories
33− when (ShowIncs `elem` opts) $ runIO showIdrisFlagsInc
33+ when (ShowIncs `elem` opts) $ runIO showExitIdrisFlagsInc
34− when (ShowLibs `elem` opts) $ runIO showIdrisFlagsLibs
34+ when (ShowLibs `elem` opts) $ runIO showExitIdrisFlagsLibs
35− when (ShowLibdir `elem` opts) $ runIO showIdrisLibDir
35+ when (ShowLibdir `elem` opts) $ runIO showExitIdrisLibDir
36− when (ShowPkgs `elem` opts) $ runIO showIdrisInstalledPackages
36+ when (ShowPkgs `elem` opts) $ runIO showExitIdrisInstalledPackages
37 case opt getClient opts of
37 case opt getClient opts of
38 [] -> return ()
38 [] -> return ()
39 (c:_) -> do setVerbose False
39 (c:_) -> do setVerbose False
src/Idris/Info/Show.hs+25−6
@@ -4,34 +4,53 @@ import System.Exit
4
4
5import Idris.Info
5import Idris.Info
6
6
7−
8−showIdrisFlagsLibs :: IO b
7+showIdrisFlagsLibs :: IO ()
9showIdrisFlagsLibs = do
8showIdrisFlagsLibs = do
10 libFlags <- getIdrisFlagsLib
9 libFlags <- getIdrisFlagsLib
11 putStrLn $ unwords libFlags
10 putStrLn $ unwords libFlags
11+
12+showExitIdrisFlagsLibs :: IO ()
13+showExitIdrisFlagsLibs = do
14+ showIdrisFlagsLibs
12 exitSuccess
15 exitSuccess
13
16
14−showIdrisLibDir :: IO b
17+showIdrisLibDir :: IO ()
15showIdrisLibDir = do
18showIdrisLibDir = do
16 ldir <- getIdrisLibDir
19 ldir <- getIdrisLibDir
17 putStrLn ldir
20 putStrLn ldir
21+
22+showExitIdrisLibDir :: IO ()
23+showExitIdrisLibDir = do
24+ showIdrisLibDir
18 exitSuccess
25 exitSuccess
19
26
20−showIdrisFlagsInc :: IO b
27+showIdrisFlagsInc :: IO ()
21showIdrisFlagsInc = do
28showIdrisFlagsInc = do
22 incFlags <- getIdrisFlagsInc
29 incFlags <- getIdrisFlagsInc
23 putStrLn $ unwords incFlags
30 putStrLn $ unwords incFlags
31+
32+showExitIdrisFlagsInc :: IO ()
33+showExitIdrisFlagsInc = do
34+ showIdrisFlagsInc
24 exitSuccess
35 exitSuccess
25
36
26-- | List idris packages installed
37-- | List idris packages installed
27−showIdrisInstalledPackages :: IO b
38+showIdrisInstalledPackages :: IO ()
28showIdrisInstalledPackages = do
39showIdrisInstalledPackages = do
29 ipkgs <- getIdrisInstalledPackages
40 ipkgs <- getIdrisInstalledPackages
30 mapM_ putStrLn ipkgs
41 mapM_ putStrLn ipkgs
42+
43+showExitIdrisInstalledPackages :: IO ()
44+showExitIdrisInstalledPackages = do
45+ showIdrisInstalledPackages
31 exitSuccess
46 exitSuccess
32
47
33−showIdrisLoggingCategories :: IO b
48+showIdrisLoggingCategories :: IO ()
34showIdrisLoggingCategories = do
49showIdrisLoggingCategories = do
35 cs <- getIdrisLoggingCategories
50 cs <- getIdrisLoggingCategories
36 mapM_ putStrLn cs
51 mapM_ putStrLn cs
52+
53+showExitIdrisLoggingCategories :: IO ()
54+showExitIdrisLoggingCategories = do
55+ showIdrisLoggingCategories
37 exitSuccess
56 exitSuccess