[project @ 2003-12-23 13:58:17 by simonmar]

[ghc-base.git] / GHC / Weak.lhs

diff --git a/GHC/Weak.lhs b/GHC/Weak.lhs
index 3ce0467..1af4b77 100644 (file)
--- a/GHC/Weak.lhs
+++ b/GHC/Weak.lhs
@@ -71,24 +71,27 @@ mkWeak key val Nothing = IO $ \s ->
    case mkWeak# key val (unsafeCoerce# 0#) s of { (# s1, w #) -> (# s1, Weak w #) }
 
 {-|
-  A specialised version of 'mkWeak', where the key and the value are the
-  same object:
+Dereferences a weak pointer.  If the key is still alive, then
+@'Just' v@ is returned (where @v@ is the /value/ in the weak pointer), otherwise
+'Nothing' is returned.
 
-  > mkWeakPtr key finalizer = mkWeak key key finalizer
+The return value of 'deRefWeak' depends on when the garbage collector
+runs, hence it is in the 'IO' monad.
 -}
-mkWeakPtr :: k -> Maybe (IO ()) -> IO (Weak k)
-mkWeakPtr key finalizer = mkWeak key key finalizer
-
-{-|
-  A specialised version of 'mkWeakPtr', where the 'Weak' object
-  returned is simply thrown away (however the finalizer will be
-  remembered by the garbage collector, and will still be run
-  when the key becomes unreachable).
--}
-addFinalizer :: key -> IO () -> IO ()
-addFinalizer key finalizer = do
-   mkWeakPtr key (Just finalizer)      -- throw it away
-   return ()
+deRefWeak :: Weak v -> IO (Maybe v)
+deRefWeak (Weak w) = IO $ \s ->
+   case deRefWeak# w s of
+       (# s1, flag, p #) -> case flag of
+                               0# -> (# s1, Nothing #)
+                               _  -> (# s1, Just p #)
+
+-- | Causes a the finalizer associated with a weak pointer to be run
+-- immediately.
+finalize :: Weak v -> IO ()
+finalize (Weak w) = IO $ \s ->
+   case finalizeWeak# w s of
+       (# s1, 0#, _ #) -> (# s1, () #) -- already dead, or no finaliser
+       (# s1, _,  f #) -> f s1
 
 {-
 Instance Eq (Weak v) where