git.iko.soy/Idris-dev
on master help sign in
Moved info show functions to library.
c866814Jan de Muijnck-Hughes
idris.cabal+1
compare with master
unifiedsplit
@@ -189,6 +189,7 @@ Library
189 , Idris.IdrisDoc
189 , Idris.IdrisDoc
190 , Idris.Imports
190 , Idris.Imports
191 , Idris.Info
191 , Idris.Info
192+ , Idris.Info.Show
192 , Idris.Inliner
193 , Idris.Inliner
193 , Idris.Interactive
194 , Idris.Interactive
194 , Idris.Output
195 , Idris.Output
main/Main.hs+6−29
@@ -10,6 +10,7 @@ import Idris.REPL
10import Idris.Error
10import Idris.Error
11import Idris.CmdOptions
11import Idris.CmdOptions
12import Idris.Info
12import Idris.Info
13+import Idris.Info.Show
13import Idris.Package
14import Idris.Package
14
15
15
16
@@ -28,11 +29,11 @@ main = do opts <- runArgParser
28runIdris :: [Opt] -> Idris ()
29runIdris :: [Opt] -> Idris ()
29runIdris opts = do
30runIdris opts = do
30 runIO setupBundledCC
31 runIO setupBundledCC
31− when (ShowLoggingCats `elem` opts) $ runIO showLoggingCats
32+ when (ShowLoggingCats `elem` opts) $ runIO showIdrisLoggingCategories
32− when (ShowIncs `elem` opts) $ runIO showIncs
33+ when (ShowIncs `elem` opts) $ runIO showIdrisFlagsInc
33− when (ShowLibs `elem` opts) $ runIO showLibs
34+ when (ShowLibs `elem` opts) $ runIO showIdrisFlagsLibs
34− when (ShowLibdir `elem` opts) $ runIO showLibdir
35+ when (ShowLibdir `elem` opts) $ runIO showIdrisLibDir
35− when (ShowPkgs `elem` opts) $ runIO showPkgs
36+ when (ShowPkgs `elem` opts) $ runIO showIdrisInstalledPackages
36 case opt getClient opts of
37 case opt getClient opts of
37 [] -> return ()
38 [] -> return ()
38 (c:_) -> do setVerbose False
39 (c:_) -> do setVerbose False
@@ -61,27 +62,3 @@ runIdris opts = do
61 [f] -> replPkg opts f
62 [f] -> replPkg opts f
62 _ -> ifail "Too many packages"
63 _ -> ifail "Too many packages"
63 fs -> runIO $ mapM_ (buildPkg opts (WarnOnly `elem` opts)) fs
64 fs -> runIO $ mapM_ (buildPkg opts (WarnOnly `elem` opts)) fs
64−
65−showLibs :: IO b
66−showLibs = do libFlags <- getIdrisFlagsLib
67− putStrLn $ unwords libFlags
68− exitSuccess
69−
70−showLibdir :: IO b
71−showLibdir = do putStrLn =<< getIdrisLibDir
72− exitSuccess
73−
74−showIncs :: IO b
75−showIncs = do incFlags <- getIdrisFlagsInc
76− putStrLn $ unwords incFlags
77− exitSuccess
78−
79−-- | List idris packages installed
80−showPkgs :: IO b
81−showPkgs = do mapM_ putStrLn =<< getIdrisInstalledPackages
82− exitSuccess
83−
84−showLoggingCats :: IO b
85−showLoggingCats = do
86− mapM_ putStrLn =<< getIdrisLoggingCategories
87− exitSuccess
src/Idris/Info/Show.hsnew file+37
@@ -0,0 +1,37 @@
1+module Idris.Info.Show where
2+
3+import System.Exit
4+
5+import Idris.Info
6+
7+
8+showIdrisFlagsLibs :: IO b
9+showIdrisFlagsLibs = do
10+ libFlags <- getIdrisFlagsLib
11+ putStrLn $ unwords libFlags
12+ exitSuccess
13+
14+showIdrisLibDir :: IO b
15+showIdrisLibDir = do
16+ ldir <- getIdrisLibDir
17+ putStrLn ldir
18+ exitSuccess
19+
20+showIdrisFlagsInc :: IO b
21+showIdrisFlagsInc = do
22+ incFlags <- getIdrisFlagsInc
23+ putStrLn $ unwords incFlags
24+ exitSuccess
25+
26+-- | List idris packages installed
27+showIdrisInstalledPackages :: IO b
28+showIdrisInstalledPackages = do
29+ ipkgs <- getIdrisInstalledPackages
30+ mapM_ putStrLn ipkgs
31+ exitSuccess
32+
33+showIdrisLoggingCategories :: IO b
34+showIdrisLoggingCategories = do
35+ cs <- getIdrisLoggingCategories
36+ mapM_ putStrLn cs
37+ exitSuccess