[project @ 2004-02-13 12:13:00 by simonmar]

uncatched -> uncaught

diff --git a/Control/Exception.hs b/Control/Exception.hs
index a8e9dd6..e4e037e 100644 (file)
--- a/Control/Exception.hs
+++ b/Control/Exception.hs
@@ -107,8 +107,8 @@ module Control.Exception (
        finally,        -- :: IO a -> IO b -> IO a
        
 #ifdef __GLASGOW_HASKELL__
-       setUncatchedExceptionHandler,      -- :: (Exception -> IO ()) -> IO ()
-       getUncatchedExceptionHandler       -- :: IO (Exception -> IO ())
+       setUncaughtExceptionHandler,      -- :: (Exception -> IO ()) -> IO ()
+       getUncaughtExceptionHandler       -- :: IO (Exception -> IO ())
 #endif
   ) where
 
@@ -515,9 +515,9 @@ assert False _ = throw (AssertionFailed "")
 
 
 #ifdef __GLASGOW_HASKELL__
-{-# NOINLINE uncatchedExceptionHandler #-}
-uncatchedExceptionHandler :: IORef (Exception -> IO ())
-uncatchedExceptionHandler = unsafePerformIO (newIORef defaultHandler)
+{-# NOINLINE uncaughtExceptionHandler #-}
+uncaughtExceptionHandler :: IORef (Exception -> IO ())
+uncaughtExceptionHandler = unsafePerformIO (newIORef defaultHandler)
    where
       defaultHandler :: Exception -> IO ()
       defaultHandler ex = do
@@ -531,9 +531,9 @@ uncatchedExceptionHandler = unsafePerformIO (newIORef defaultHandler)
 foreign import ccall unsafe "writeErrString__"
        writeErrString :: CString -> Int -> IO ()
 
-setUncatchedExceptionHandler :: (Exception -> IO ()) -> IO ()
-setUncatchedExceptionHandler = writeIORef uncatchedExceptionHandler
+setUncaughtExceptionHandler :: (Exception -> IO ()) -> IO ()
+setUncaughtExceptionHandler = writeIORef uncaughtExceptionHandler
 
-getUncatchedExceptionHandler :: IO (Exception -> IO ())
-getUncatchedExceptionHandler = readIORef uncatchedExceptionHandler
-#endif
\ No newline at end of file
+getUncaughtExceptionHandler :: IO (Exception -> IO ())
+getUncaughtExceptionHandler = readIORef uncaughtExceptionHandler
+#endif

diff --git a/GHC/TopHandler.lhs b/GHC/TopHandler.lhs
index 884fcf1..8c123a2 100644 (file)
--- a/GHC/TopHandler.lhs
+++ b/GHC/TopHandler.lhs
@@ -74,7 +74,7 @@ reportStackOverflow bombOut = do
 
 reportError :: Bool -> Exception -> IO a
 reportError bombOut ex = do
-   handler <- getUncatchedExceptionHandler
+   handler <- getUncaughtExceptionHandler
    handler ex
    if bombOut
       then exit 1