projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use an extensible-exceptions package when bootstrapping
[ghc-hetmet.git]
/
compiler
/
utils
/
Exception.hs
diff --git
a/compiler/utils/Exception.hs
b/compiler/utils/Exception.hs
index
8d5d438
..
3242292
100644
(file)
--- a/
compiler/utils/Exception.hs
+++ b/
compiler/utils/Exception.hs
@@
-7,40
+7,21
@@
module Exception
where
import Prelude hiding (catch)
where
import Prelude hiding (catch)
-import Control.Exception
#if __GLASGOW_HASKELL__ < 609
#if __GLASGOW_HASKELL__ < 609
-import Data.Typeable ( Typeable )
-
-type SomeException = Exception
-
-onException :: IO a -> IO () -> IO a
-onException io what = io `catch` \e -> do what
- throw e
+import Control.Exception.Extensible as Control.Exception
+#else
+import Control.Exception
#endif
catchIO :: IO a -> (IOException -> IO a) -> IO a
#endif
catchIO :: IO a -> (IOException -> IO a) -> IO a
-#if __GLASGOW_HASKELL__ >= 609
catchIO = catch
catchIO = catch
-#else
-catchIO io handler = io `catch` handler'
- where handler' (IOException ioe) = handler ioe
- handler' e = throw e
-#endif
handleIO :: (IOException -> IO a) -> IO a -> IO a
handleIO = flip catchIO
tryIO :: IO a -> IO (Either IOException a)
handleIO :: (IOException -> IO a) -> IO a -> IO a
handleIO = flip catchIO
tryIO :: IO a -> IO (Either IOException a)
-#if __GLASGOW_HASKELL__ >= 609
tryIO = try
tryIO = try
-#else
-tryIO io = do ei <- try io
- case ei of
- Right v -> return (Right v)
- Left (IOException ioe) -> return (Left ioe)
- Left e -> throwIO e
-#endif
-- | A monad that can catch exceptions. A minimal definition
-- requires a definition of 'gcatch'.
-- | A monad that can catch exceptions. A minimal definition
-- requires a definition of 'gcatch'.
@@
-51,12
+32,7
@@
tryIO io = do ei <- try io
class Monad m => ExceptionMonad m where
-- | Generalised version of 'Control.Exception.catch', allowing an arbitrary
-- exception handling monad instead of just 'IO'.
class Monad m => ExceptionMonad m where
-- | Generalised version of 'Control.Exception.catch', allowing an arbitrary
-- exception handling monad instead of just 'IO'.
-#if __GLASGOW_HASKELL__ >= 609
gcatch :: Exception e => m a -> (e -> m a) -> m a
gcatch :: Exception e => m a -> (e -> m a) -> m a
-#else
- gcatch :: m a -> (Exception -> m a) -> m a
- gcatchDyn :: Typeable e => m a -> (e -> m a) -> m a
-#endif
-- | Generalised version of 'Control.Exception.bracket', allowing an arbitrary
-- exception handling monad instead of just 'IO'.
-- | Generalised version of 'Control.Exception.bracket', allowing an arbitrary
-- exception handling monad instead of just 'IO'.
@@
-79,28
+55,17
@@
class Monad m => ExceptionMonad m where
instance ExceptionMonad IO where
gcatch = catch
instance ExceptionMonad IO where
gcatch = catch
-#if __GLASGOW_HASKELL__ < 609
- gcatchDyn = catchDyn
-#endif
gbracket = bracket
gfinally = finally
gbracket = bracket
gfinally = finally
-#if __GLASGOW_HASKELL__ >= 609
gtry :: (ExceptionMonad m, Exception e) => m a -> m (Either e a)
gtry :: (ExceptionMonad m, Exception e) => m a -> m (Either e a)
-#else
-gtry :: (ExceptionMonad m) => m a -> m (Either Exception a)
-#endif
gtry act = gcatch (act >>= \a -> return (Right a))
(\e -> return (Left e))
-- | Generalised version of 'Control.Exception.handle', allowing an arbitrary
-- exception handling monad instead of just 'IO'.
gtry act = gcatch (act >>= \a -> return (Right a))
(\e -> return (Left e))
-- | Generalised version of 'Control.Exception.handle', allowing an arbitrary
-- exception handling monad instead of just 'IO'.
-#if __GLASGOW_HASKELL__ >= 609
ghandle :: (ExceptionMonad m, Exception e) => (e -> m a) -> m a -> m a
ghandle :: (ExceptionMonad m, Exception e) => (e -> m a) -> m a -> m a
-#else
-ghandle :: (ExceptionMonad m) => (Exception -> m a) -> m a -> m a
-#endif
ghandle = flip gcatch
-- | Always executes the first argument. If this throws an exception the
ghandle = flip gcatch
-- | Always executes the first argument. If this throws an exception the
@@
-108,8
+73,5
@@
ghandle = flip gcatch
gonException :: (ExceptionMonad m) => m a -> m b -> m a
gonException ioA cleanup = ioA `gcatch` \e ->
do cleanup
gonException :: (ExceptionMonad m) => m a -> m b -> m a
gonException ioA cleanup = ioA `gcatch` \e ->
do cleanup
-#if __GLASGOW_HASKELL__ >= 609
throw (e :: SomeException)
throw (e :: SomeException)
-#else
- throw e
-#endif
+