projects
/
ghc-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
34816f6
)
use New.catch instead of catchException in OldException
author
Ross Paterson
<ross@soi.city.ac.uk>
Wed, 13 Aug 2008 07:13:07 +0000
(07:13 +0000)
committer
Ross Paterson
<ross@soi.city.ac.uk>
Wed, 13 Aug 2008 07:13:07 +0000
(07:13 +0000)
Control/OldException.hs
patch
|
blob
|
history
diff --git
a/Control/OldException.hs
b/Control/OldException.hs
index
00b1cf4
..
afa4492
100644
(file)
--- a/
Control/OldException.hs
+++ b/
Control/OldException.hs
@@
-135,7
+135,6
@@
import GHC.Base
import GHC.Num
import GHC.Show
import GHC.IOBase ( IO )
import GHC.Num
import GHC.Show
import GHC.IOBase ( IO )
-import GHC.IOBase (catchException)
import qualified GHC.IOBase as ExceptionBase
import qualified GHC.IOBase as New
import GHC.Conc hiding (setUncaughtExceptionHandler,
import qualified GHC.IOBase as ExceptionBase
import qualified GHC.IOBase as New
import GHC.Conc hiding (setUncaughtExceptionHandler,
@@
-398,7
+397,7
@@
catchDyn :: Typeable exception => IO a -> (exception -> IO a) -> IO a
#ifdef __NHC__
catchDyn m k = m -- can't catch dyn exceptions in nhc98
#else
#ifdef __NHC__
catchDyn m k = m -- can't catch dyn exceptions in nhc98
#else
-catchDyn m k = catchException m handle
+catchDyn m k = New.catch m handle
where handle ex = case ex of
(DynException dyn) ->
case fromDynamic dyn of
where handle ex = case ex of
(DynException dyn) ->
case fromDynamic dyn of