summaryrefslogtreecommitdiff
path: root/compiler/ghci
diff options
context:
space:
mode:
authorPeter Hercek <phercek@gmail.com>2009-02-22 20:10:02 +0000
committerPeter Hercek <phercek@gmail.com>2009-02-22 20:10:02 +0000
commit8f0034600a8a5fa507994646f96e63e2933a5330 (patch)
tree212e2e67dde28c819728a37ac7197b5b4bbd96dd /compiler/ghci
parent47b550ecf0edcada00034925830a52603f3a87df (diff)
downloadhaskell-8f0034600a8a5fa507994646f96e63e2933a5330.tar.gz
:steplocal and :stepmodule should not polute trace history
Diffstat (limited to 'compiler/ghci')
-rw-r--r--compiler/ghci/GhciMonad.hs4
-rw-r--r--compiler/ghci/InteractiveUI.hs4
2 files changed, 4 insertions, 4 deletions
diff --git a/compiler/ghci/GhciMonad.hs b/compiler/ghci/GhciMonad.hs
index 8374491891..d5e491bbf5 100644
--- a/compiler/ghci/GhciMonad.hs
+++ b/compiler/ghci/GhciMonad.hs
@@ -248,8 +248,8 @@ runStmt expr step = do
return GHC.RunFailed) $ do
GHC.runStmt expr step
-resume :: GHC.SingleStep -> GHCi GHC.RunResult
-resume step = GHC.resume step
+resume :: (SrcSpan -> Bool) -> GHC.SingleStep -> GHCi GHC.RunResult
+resume canLogSpan step = GHC.resume canLogSpan step
-- --------------------------------------------------------------------------
-- timing & statistics
diff --git a/compiler/ghci/InteractiveUI.hs b/compiler/ghci/InteractiveUI.hs
index 12a1713dde..9feae0e977 100644
--- a/compiler/ghci/InteractiveUI.hs
+++ b/compiler/ghci/InteractiveUI.hs
@@ -742,7 +742,7 @@ afterRunStmt step_here run_result = do
st <- getGHCiState
enqueueCommands [stop st]
return ()
- | otherwise -> resume GHC.SingleStep >>=
+ | otherwise -> resume step_here GHC.SingleStep >>=
afterRunStmt step_here >> return ()
_ -> return ()
@@ -1978,7 +1978,7 @@ continueCmd = noArgs $ doContinue (const True) GHC.RunToCompletion
-- doContinue :: SingleStep -> GHCi ()
doContinue :: (SrcSpan -> Bool) -> SingleStep -> GHCi ()
doContinue pred step = do
- runResult <- resume step
+ runResult <- resume pred step
afterRunStmt pred runResult
return ()