projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use UserInterrupt rather than our own Interrupted exception (#4100)
[ghc-hetmet.git]
/
compiler
/
main
/
InteractiveEval.hs
diff --git
a/compiler/main/InteractiveEval.hs
b/compiler/main/InteractiveEval.hs
index
352fbf0
..
38f0998
100644
(file)
--- a/
compiler/main/InteractiveEval.hs
+++ b/
compiler/main/InteractiveEval.hs
@@
-42,9
+42,9
@@
module InteractiveEval (
import HscMain hiding (compileExpr)
import HscTypes
import TcRnDriver
import HscMain hiding (compileExpr)
import HscTypes
import TcRnDriver
-import Type hiding (typeKind)
-import TcType hiding (typeKind)
import InstEnv
import InstEnv
+import Type
+import TcType hiding( typeKind )
import Var
import Id
import Name hiding ( varName )
import Var
import Id
import Name hiding ( varName )
@@
-59,7
+59,7
@@
import Unique
import UniqSupply
import Module
import Panic
import UniqSupply
import Module
import Panic
-import LazyUniqFM
+import UniqFM
import Maybes
import ErrUtils
import Util
import Maybes
import ErrUtils
import Util
@@
-380,9
+380,9
@@
rethrow dflags io = Exception.catch io $ \se -> do
not (dopt Opt_BreakOnException dflags)
then poke exceptionFlag 1
else case fromException se of
not (dopt Opt_BreakOnException dflags)
then poke exceptionFlag 1
else case fromException se of
- -- If it is an "Interrupted" exception, we allow
+ -- If it is a "UserInterrupt" exception, we allow
-- a possible break by way of -fbreak-on-exception
-- a possible break by way of -fbreak-on-exception
- Just Interrupted -> return ()
+ Just UserInterrupt -> return ()
-- In any other case, we don't want to break
_ -> poke exceptionFlag 0
-- In any other case, we don't want to break
_ -> poke exceptionFlag 0