mirrors/IHaskell
1
0
Fork 0
mirror of https://github.com/IHaskell/IHaskell.git synced 2025-04-16 03:16:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

src/IHaskell/Eval/Evaluate.hs: capture stderr

Browse Source
This commit is contained in:
Vaibhav Sagar 2019-06-28 11:18:44 -04:00
parent ac478079dc
commit 555a650132
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/IHaskell/Eval/Evaluate.hs
View File

@ -1104,7 +1104,10 @@ capturedEval output stmt = do
writeVariable = var "file_write_var_"
-- Variable where to store old stdout.
oldVariable = var "old_var_"
oldVariableStdout = var "old_var_stdout_"
-- Variable where to store old stderr.
oldVariableStderr = var "old_var_stderr_"
-- Variable used to store true `it` value.
itVariable = var "it_var_"
@ -1115,9 +1118,12 @@ capturedEval output stmt = do
initStmts =
[ printf "let %s = it" itVariable
, printf "(%s, %s) <- IHaskellIO.createPipe" readVariable writeVariable
, printf "%s <- IHaskellIO.dup IHaskellIO.stdOutput" oldVariable
, printf "%s <- IHaskellIO.dup IHaskellIO.stdOutput" oldVariableStdout
, printf "%s <- IHaskellIO.dup IHaskellIO.stdError" oldVariableStderr
, voidpf "IHaskellIO.dupTo %s IHaskellIO.stdOutput" writeVariable
, voidpf "IHaskellIO.dupTo %s IHaskellIO.stdError" writeVariable
, voidpf "IHaskellSysIO.hSetBuffering IHaskellSysIO.stdout IHaskellSysIO.NoBuffering"
, voidpf "IHaskellSysIO.hSetBuffering IHaskellSysIO.stderr IHaskellSysIO.NoBuffering"
, printf "let it = %s" itVariable
]
@ -1125,7 +1131,9 @@ capturedEval output stmt = do
postStmts =
[ printf "let %s = it" itVariable
, voidpf "IHaskellSysIO.hFlush IHaskellSysIO.stdout"
, voidpf "IHaskellIO.dupTo %s IHaskellIO.stdOutput" oldVariable
, voidpf "IHaskellSysIO.hFlush IHaskellSysIO.stderr"
, voidpf "IHaskellIO.dupTo %s IHaskellIO.stdOutput" oldVariableStdout
, voidpf "IHaskellIO.dupTo %s IHaskellIO.stdError" oldVariableStderr
, voidpf "IHaskellIO.closeFd %s" writeVariable
, printf "let it = %s" itVariable
]

6
src/tests/IHaskell/Test/Eval.hs
View File

@ -169,3 +169,9 @@ testEval =
#endif
":k Maybe" `becomes` ["Maybe :: * -> *"]
":in String" `pages` ["type String = [Char] \t-- Defined in \8216GHC.Base\8217"]
it "captures stderr" $ do
[hereLit|
import Debug.Trace
trace "test" 5
|] `becomes` ["test\n5"]