git.iko.soy/Idris-dev
on master help sign in
Added new items to Idris.Info
757b76fJan de Muijnck-Hughes
main/Main.hs+3−3
compare with master
unifiedsplit
@@ -6,7 +6,7 @@ import Control.Monad ( when )
6
6
7import Idris.AbsSyntax
7import Idris.AbsSyntax
8import Idris.REPL
8import Idris.REPL
9−import Idris.Imports
9+-- import Idris.Imports
10import Idris.Error
10import Idris.Error
11import Idris.CmdOptions
11import Idris.CmdOptions
12import Idris.Info
12import Idris.Info
@@ -78,10 +78,10 @@ showIncs = do incFlags <- getIdrisFlagsInc
78
78
79-- | List idris packages installed
79-- | List idris packages installed
80showPkgs :: IO b
80showPkgs :: IO b
81−showPkgs = do mapM_ putStrLn =<< installedPackages
81+showPkgs = do mapM_ putStrLn =<< getIdrisInstalledPackages
82 exitSuccess
82 exitSuccess
83
83
84showLoggingCats :: IO b
84showLoggingCats :: IO b
85showLoggingCats = do
85showLoggingCats = do
86− putStrLn loggingCatsStr
86+ mapM_ putStrLn =<< getIdrisLoggingCategories
87 exitSuccess
87 exitSuccess
src/Idris/Info.hs+11
@@ -16,12 +16,17 @@ module Idris.Info
16 , getIdrisUserDataDir
16 , getIdrisUserDataDir
17 , getIdrisInitScript
17 , getIdrisInitScript
18 , getIdrisHistoryFile
18 , getIdrisHistoryFile
19+ , getIdrisInstalledPackages
20+ , getIdrisLoggingCategories
19 ) where
21 ) where
20
22
21import System.FilePath
23import System.FilePath
22import System.Directory
24import System.Directory
23import Data.Version
25import Data.Version
24
26
27+import Idris.Imports (installedPackages)
28+import Idris.AbsSyntax (loggingCatsStr)
29+
25import qualified IRTS.System as S
30import qualified IRTS.System as S
26
31
27import Version_idris (gitHash)
32import Version_idris (gitHash)
@@ -64,3 +69,9 @@ getIdrisHistoryFile :: IO FilePath
64getIdrisHistoryFile = do
69getIdrisHistoryFile = do
65 udir <- getIdrisUserDataDir
70 udir <- getIdrisUserDataDir
66 return (udir </> "repl" </> "history")
71 return (udir </> "repl" </> "history")
72+
73+getIdrisInstalledPackages :: IO [String]
74+getIdrisInstalledPackages = installedPackages
75+
76+getIdrisLoggingCategories :: IO [String]
77+getIdrisLoggingCategories = pure $ words loggingCatsStr
src/Idris/REPL.hs−1
@@ -73,7 +73,6 @@ import Idris.Core.Constraints
73import IRTS.Compiler
73import IRTS.Compiler
74import IRTS.CodegenCommon
74import IRTS.CodegenCommon
75import IRTS.Exports
75import IRTS.Exports
76−--import IRTS.System
77
76
78import Control.Category
77import Control.Category
79import qualified Control.Exception as X
78import qualified Control.Exception as X