git.iko.soy/Idris-dev
on master help sign in
Cleanup main warnings (#3123)
3ce13cbLeif Warner
main/Main.hs+3−20
compare with master
unifiedsplit
@@ -1,38 +1,21 @@
1module Main where
1module Main where
2
2
3−import System.Console.Haskeline
3+import System.Exit ( exitSuccess )
4−import System.IO
5−import System.Environment
6−import System.Exit
7−import System.Directory
8
4
9−import Data.Maybe
10−import Data.Version
11import Control.Monad ( when )
5import Control.Monad ( when )
12
6
13−import Idris.Core.TT
14−import Idris.Core.Typecheck
15−import Idris.Core.Evaluate
16−import Idris.Core.Constraints
17−
18import Idris.AbsSyntax
7import Idris.AbsSyntax
19−import Idris.Parser
20import Idris.REPL
8import Idris.REPL
21−import Idris.ElabDecls
22−import Idris.Primitives
23import Idris.Imports
9import Idris.Imports
24import Idris.Error
10import Idris.Error
25import Idris.CmdOptions
11import Idris.CmdOptions
26
12
27import IRTS.System ( getLibFlags, getIdrisLibDir, getIncFlags )
13import IRTS.System ( getLibFlags, getIdrisLibDir, getIncFlags )
28
14
29−import Util.DynamicLinker
15+import Util.System ( setupBundledCC )
30−import Util.System
31
16
32import Pkg.Package
17import Pkg.Package
33
18
34−import Paths_idris
35−
36-- Main program reads command line options, parses the main program, and gets
19-- Main program reads command line options, parses the main program, and gets
37-- on with the REPL.
20-- on with the REPL.
38
21
@@ -97,7 +80,7 @@ showIncs = do incFlags <- getIncFlags
97
80
98-- | List idris packages installed
81-- | List idris packages installed
99showPkgs :: IO b
82showPkgs :: IO b
100−showPkgs = do mapM putStrLn =<< installedPackages
83+showPkgs = do mapM_ putStrLn =<< installedPackages
101 exitSuccess
84 exitSuccess
102
85
103showLoggingCats :: IO b
86showLoggingCats :: IO b
src/IRTS/System.hs+2−5
@@ -31,8 +31,10 @@ getTargetDir = overrideDataDirWith "TARGET"
31
31
32#if defined(FREEBSD) || defined(DRAGONFLY)
32#if defined(FREEBSD) || defined(DRAGONFLY)
33extraLib = ["-L/usr/local/lib"]
33extraLib = ["-L/usr/local/lib"]
34+extraInclude = ["-I/usr/local/include"]
34#else
35#else
35extraLib = []
36extraLib = []
37+extraInclude = []
36#endif
38#endif
37
39
38#ifdef IDRIS_GMP
40#ifdef IDRIS_GMP
@@ -47,10 +49,5 @@ getLibFlags = do dir <- getDataDir
47
49
48getIdrisLibDir = addTrailingPathSeparator <$> overrideDataDirWith "IDRIS_LIBRARY_PATH"
50getIdrisLibDir = addTrailingPathSeparator <$> overrideDataDirWith "IDRIS_LIBRARY_PATH"
49
51
50−#if defined(FREEBSD) || defined(DRAGONFLY)
51−extraInclude = ["-I/usr/local/include"]
52−#else
53−extraInclude = []
54−#endif
55getIncFlags = do dir <- getDataDir
52getIncFlags = do dir <- getDataDir
56 return $ ("-I" ++ dir </> "rts") : extraInclude
53 return $ ("-I" ++ dir </> "rts") : extraInclude