git.iko.soy/distributed-process
on master help sign in
Add try
49ae85eSimon Marlow
distributed-process/src/Control/Distributed/Process.hs+2
compare with master
unifiedsplit
@@ -96,6 +96,7 @@ module Control.Distributed.Process
96 , RegisterReply(..)
96 , RegisterReply(..)
97 -- * Exception handling
97 -- * Exception handling
98 , catch
98 , catch
99+ , try
99 , mask
100 , mask
100 , onException
101 , onException
101 , bracket
102 , bracket
@@ -226,6 +227,7 @@ import Control.Distributed.Process.Internal.Primitives
226 , unClosure
227 , unClosure
227 -- Exception handling
228 -- Exception handling
228 , catch
229 , catch
230+ , try
229 , mask
231 , mask
230 , onException
232 , onException
231 , bracket
233 , bracket
distributed-process/src/Control/Distributed/Process/Internal/Primitives.hs+9−2
@@ -55,6 +55,7 @@ module Control.Distributed.Process.Internal.Primitives
55 , unStatic
55 , unStatic
56 -- * Exception handling
56 -- * Exception handling
57 , catch
57 , catch
58+ , try
58 , mask
59 , mask
59 , onException
60 , onException
60 , bracket
61 , bracket
@@ -89,7 +90,7 @@ import Control.Monad.Reader (ask)
89import Control.Monad.IO.Class (MonadIO, liftIO)
90import Control.Monad.IO.Class (MonadIO, liftIO)
90import Control.Applicative ((<$>))
91import Control.Applicative ((<$>))
91import Control.Exception (Exception, throwIO, SomeException)
92import Control.Exception (Exception, throwIO, SomeException)
92−import qualified Control.Exception as Ex (catch, mask)
93+import qualified Control.Exception as Ex (catch, mask, try)
93import Control.Distributed.Process.Internal.StrictMVar
94import Control.Distributed.Process.Internal.StrictMVar
94 ( StrictMVar
95 ( StrictMVar
95 , modifyMVar
96 , modifyMVar
@@ -504,7 +505,13 @@ catch p h = do
504 lproc <- ask
505 lproc <- ask
505 liftIO $ Ex.catch (runLocalProcess lproc p) (runLocalProcess lproc . h)
506 liftIO $ Ex.catch (runLocalProcess lproc p) (runLocalProcess lproc . h)
506
507
507−-- | Lift 'Control.Exception.mask'
508+-- | Lift 'Control.Exception.try'
509+try :: Exception e => Process a -> Process (Either e a)
510+try p = do
511+ lproc <- ask
512+ liftIO $ Ex.try (runLocalProcess lproc p)
513+
514+-- | Lift 'Control.Exception.mask'
508mask :: ((forall a. Process a -> Process a) -> Process b) -> Process b
515mask :: ((forall a. Process a -> Process a) -> Process b) -> Process b
509mask p = do
516mask p = do
510 lproc <- ask
517 lproc <- ask