git.iko.soy/Idris-dev
on master help sign in
Added Util.System for compatibility

(thanks to Dirk Ullrich)

commit34e87885a6d14618ae42399571a6ce758b51d8ed authorEdwin Brady <eb@cs.st-andrews.ac.uk> dateThu 20 Sep 2012, 15:16 (14 years ago) parentb49000a
3 files changed+3−33
compare with master
unifiedsplit
idris.cabal+1−1 src/IRTS/CodegenC.hs+1−20 src/Idris/REPL.hs+1−12
idris.cabal+1−1
@@ -68,7 +68,7 @@ Executable idris
6868 Idris.Coverage, Idris.IBC, Idris.Unlit,
6969 Idris.DataOpts, Idris.Transforms, Idris.DSL,
7070
71− Util.Pretty,
71+ Util.Pretty, Util.System,
7272
7373 IRTS.Lang, IRTS.LParser, IRTS.Bytecode, IRTS.Simplified,
7474 IRTS.CodegenC, IRTS.Defunctionalise, IRTS.Compiler,
src/IRTS/CodegenC.hs+1−20
@@ -1,5 +1,3 @@
1−{-# LANGUAGE CPP #-}
2−
31module IRTS.CodegenC where
42
53import IRTS.Bytecode
@@ -7,13 +5,13 @@ import IRTS.Lang
75import IRTS.Simplified
86import Core.TT
97import Paths_idris
8+import Util.System
109
1110import Data.Char
1211import System.Process
1312import System.Exit
1413import System.IO
1514import System.Directory
16−import System.Environment
1715import Control.Monad
1816
1917data DbgLevel = NONE | DEBUG | TRACE
@@ -241,20 +239,3 @@ doOp v LStdErr [] = v ++ "MKPTR(vm, stderr)"
241239
242240doOp v LNoOp [x] = ""
243241doOp _ _ _ = "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
1414import Idris.Parser
1515import Idris.Coverage
1616import Paths_idris
17+import Util.System
1718
1819import Core.Evaluate
1920import Core.ProofShell
@@ -351,18 +352,6 @@ showTotalN i n = case lookupTotal n (tt_ctxt i) of
351352 [t] -> showTotal t i
352353 _ -> ""
353354
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−
366355displayHelp = let vstr = showVersion version in
367356 "\nIdris version " ++ vstr ++ "\n" ++
368357 "--------------" ++ map (\x -> '-') vstr ++ "\n\n" ++