summaryrefslogtreecommitdiff
path: root/libraries/base/Control/Exception.hs
diff options
context:
space:
mode:
authorBas van Dijk <v.dijk.bas@gmail.com>2010-10-16 18:53:12 +0000
committerBas van Dijk <v.dijk.bas@gmail.com>2010-10-16 18:53:12 +0000
commita75383cdd46f7bb593639bc6d1628b068b78262a (patch)
treee6f45c5d11a0f24cae7182b52e83e2763ba17b34 /libraries/base/Control/Exception.hs
parent4041be6185f6df8065b84ef10bb664715ca7745d (diff)
downloadhaskell-a75383cdd46f7bb593639bc6d1628b068b78262a.tar.gz
Refer to 'mask' instead of 'block' in documentation of Control.Exception
Diffstat (limited to 'libraries/base/Control/Exception.hs')
-rw-r--r--libraries/base/Control/Exception.hs8
1 files changed, 4 insertions, 4 deletions
diff --git a/libraries/base/Control/Exception.hs b/libraries/base/Control/Exception.hs
index d5d0e4c2cc..c573e3a7fe 100644
--- a/libraries/base/Control/Exception.hs
+++ b/libraries/base/Control/Exception.hs
@@ -122,7 +122,7 @@ module Control.Exception (
unblock,
blocked,
- -- *** Applying @block@ to an exception handler
+ -- *** Applying @mask@ to an exception handler
-- $block_handler
@@ -258,12 +258,12 @@ to one of the 'catch' family of functions. This is because that is
what you want most of the time - it eliminates a common race condition
in starting an exception handler, because there may be no exception
handler on the stack to handle another exception if one arrives
-immediately. If asynchronous exceptions are blocked on entering the
+immediately. If asynchronous exceptions are masked on entering the
handler, though, we have time to install a new exception handler
before being interrupted. If this weren\'t the default, one would have
to write something like
-> block $ \restore ->
+> mask $ \restore ->
> catch (restore (...))
> (\e -> handler)
@@ -279,7 +279,7 @@ recovering from an asynchronous exception.
#interruptible#
Some operations are /interruptible/, which means that they can receive
-asynchronous exceptions even in the scope of a 'block'. Any function
+asynchronous exceptions even in the scope of a 'mask'. Any function
which may itself block is defined as interruptible; this includes
'Control.Concurrent.MVar.takeMVar'
(but not 'Control.Concurrent.MVar.tryTakeMVar'),