34e8788 · Idris-dev · git.iko.soy

idris.cabal+1−1

compare with master

unifiedsplit

@@ -68,7 +68,7 @@ Executable idris

68 Idris.Coverage, Idris.IBC, Idris.Unlit,

69 Idris.DataOpts, Idris.Transforms, Idris.DSL,

70

71− Util.Pretty,

71+ Util.Pretty, Util.System,

72

73 IRTS.Lang, IRTS.LParser, IRTS.Bytecode, IRTS.Simplified,

74 IRTS.CodegenC, IRTS.Defunctionalise, IRTS.Compiler,

src/IRTS/CodegenC.hs+1−20

@@ -1,5 +1,3 @@

1−{-# LANGUAGE CPP #-}

2−

3module IRTS.CodegenC where

1module IRTS.CodegenC where

4

2

5import IRTS.Bytecode

3import IRTS.Bytecode

@@ -7,13 +5,13 @@ import IRTS.Lang

7import IRTS.Simplified

5import IRTS.Simplified

8import Core.TT

6import Core.TT

9import Paths_idris

7import Paths_idris

8+import Util.System

10

9

11import Data.Char

10import Data.Char

12import System.Process

11import System.Process

13import System.Exit

12import System.Exit

14import System.IO

13import System.IO

15import System.Directory

14import System.Directory

16−import System.Environment

17import Control.Monad

15import Control.Monad

18

16

19data DbgLevel = NONE | DEBUG | TRACE

17data DbgLevel = NONE | DEBUG | TRACE

@@ -241,20 +239,3 @@ doOp v LStdErr [] = v ++ "MKPTR(vm, stderr)"

241

239

242doOp v LNoOp [x] = ""

240doOp v LNoOp [x] = ""

243doOp _ _ _ = "FAIL"

241doOp _ _ _ = "FAIL"

244−

245−tempfile :: IO (FilePath, Handle)

246−tempfile = do env <- environment "TMPDIR"

247− let dir = case env of

248− Nothing -> "/tmp"

249− (Just d) -> d

250− openTempFile dir "idris"

251−

252−environment :: String -> IO (Maybe String)

253−environment x = catch (do e <- getEnv x

254− return (Just e))

255−#if MIN_VERSION_base(4,6,0)

256− (\y-> do return (y::SomeException); return Nothing)

257−#endif

258−#if !MIN_VERSION_base(4,6,0)

259− (\_-> return Nothing)

260−#endif

src/Idris/REPL.hs+1−12

@@ -14,6 +14,7 @@ import Idris.Prover

14import Idris.Parser

15import Idris.Coverage

16import Paths_idris

17+import Util.System

17

18

18import Core.Evaluate

19import Core.Evaluate

19import Core.ProofShell

20import Core.ProofShell

@@ -351,18 +352,6 @@ showTotalN i n = case lookupTotal n (tt_ctxt i) of

351 [t] -> showTotal t i

352 [t] -> showTotal t i

352 _ -> ""

353 _ -> ""

353

354

354−tempfile :: IO (FilePath, Handle)

355−tempfile = do env <- environment "TMPDIR"

356− let dir = case env of

357− Nothing -> "/tmp"

358− (Just d) -> d

359− openTempFile dir "esc"

360−

361−environment :: String -> IO (Maybe String)

362−environment x = Prelude.catch (do e <- getEnv x

363− return (Just e))

364− (\_ -> return Nothing)

365−

366displayHelp = let vstr = showVersion version in

355displayHelp = let vstr = showVersion version in

367 "\nIdris version " ++ vstr ++ "\n" ++

356 "\nIdris version " ++ vstr ++ "\n" ++

368 "--------------" ++ map (\x -> '-') vstr ++ "\n\n" ++

357 "--------------" ++ map (\x -> '-') vstr ++ "\n\n" ++