528cc11 · Idris-dev · git.iko.soy

git.iko.soy/Idris-dev

Replace some uses of system with rawSystem

commit528cc113fe4e4dc957dff97aea1ff75300a7eb31 authorMelvar Chen <Melvar.Chen@googlemail.com> dateWed 5 Nov 2014, 18:38 (12 years ago) parentefd6f8a

3 files changed+12−12

compare with master

unifiedsplit

src/IRTS/Compiler.hs+4−4 src/Idris/REPL.hs+5−5 src/Pkg/Package.hs+3−3

src/IRTS/Compiler.hs+4−4

@@ -121,11 +121,11 @@ generate codegen mainmod ir

121121 -- Built-in code generators (FIXME: lift these out!)

122122 Via "c" -> codegenC ir

123123 -- Any external code generator

124− Via cg -> do let cmd = "idris-" ++ cg ++ " " ++ mainmod ++

125− " -o " ++ outputFile ir

126− exit <- system cmd

124+ Via cg -> do let cmd = "idris-" ++ cg

125+ args = [mainmod, "-o", outputFile ir]

126+ exit <- rawSystem cmd args

127127 when (exit /= ExitSuccess) $

128− putStrLn ("FAILURE: " ++ show cmd)

128+ putStrLn ("FAILURE: " ++ show cmd ++ " " ++ show args)

129129 Bytecode -> dumpBC (simpleDecls ir) (outputFile ir)

130130

131131irMain :: TT Name -> Idris LDecl

src/Idris/REPL.hs+5−5

@@ -669,10 +669,10 @@ edit f orig

669669 env <- runIO $ getEnvironment

670670 let editor = getEditor env

671671 let line = case errSpan i of

672− Just l -> " +" ++ show (fst (fc_start l)) ++ " "

673− Nothing -> " "

674− let cmd = editor ++ line ++ fixName f

675− runIO $ system cmd

672+ Just l -> ['+' : show (fst (fc_start l))]

673+ Nothing -> []

674+ let args = line ++ [fixName f]

675+ runIO $ rawSystem editor args

676676 clearErr

677677 putIState $ orig { idris_options = idris_options i

678678 , idris_colourTheme = idris_colourTheme i

@@ -1069,7 +1069,7 @@ process fn Execute

10691069 ir <- compile t tmpn m

10701070 runIO $ generate t (head (idris_imported ist)) ir

10711071 case idris_outputmode ist of

1072− RawOutput h -> do runIO $ system tmpn

1072+ RawOutput h -> do runIO $ rawSystem tmpn []

10731073 return ()

10741074 IdeSlave n h -> runIO . hPutStrLn h $

10751075 IdeSlave.convSExp "run-program" tmpn n)

src/Pkg/Package.hs+3−3

@@ -184,7 +184,7 @@ testPkg fp

184184 (tmpn', tmph') <- tempfile

185185 hClose tmph'

186186 m_ist <- idris (Filename tmpn : NoREPL : Verbose : Output tmpn' : idris_opts pkgdesc)

187− system tmpn'

187+ rawSystem tmpn' []

188188 setCurrentDirectory dir

189189 case m_ist of

190190 Nothing -> exitWith (ExitFailure 1)

@@ -269,13 +269,13 @@ mkDirCmd = "mkdir -p "

269269-- | Invoke a Makefile's default target.

270270make :: Maybe String -> IO ()

271271make Nothing = return ()

272−make (Just s) = do system $ "make -f " ++ s

272+make (Just s) = do rawSystem "make" ["-f", s]

273273 return ()

274274

275275-- | Invoke a Makefile's clean target.

276276clean :: Maybe String -> IO ()

277277clean Nothing = return ()

278−clean (Just s) = do system $ "make -f " ++ s ++ " clean"

278+clean (Just s) = do rawSystem "make" ["-f", s, "clean"]

279279 return ()

280280

281281-- --------------------------------------------------------------------- [ EOF ]