X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Control%2FOldException.hs;h=f2154326d158e04c4320f66d5ab5c462dbc47b43;hb=62b5fe81ea1f398c4b8d1db5bd25759266f5d74d;hp=dd26167659b218934e2b882031ac24e6b6b03420;hpb=a2bcd1899dea9b266b7c795e391f658985deda2e;p=ghc-base.git diff --git a/Control/OldException.hs b/Control/OldException.hs index dd26167..f215432 100644 --- a/Control/OldException.hs +++ b/Control/OldException.hs @@ -29,7 +29,7 @@ -- ----------------------------------------------------------------------------- -module Control.OldException ( +module Control.OldException {-# DEPRECATED "Future versions of base will not support the old exceptions style. Please switch to extensible exceptions." #-} ( -- * The Exception type Exception(..), -- instance Eq, Ord, Show, Typeable @@ -134,22 +134,24 @@ module Control.OldException ( import GHC.Base import GHC.Num import GHC.Show -import GHC.IOBase ( IO ) -import GHC.IOBase (block, unblock, evaluate, catchException, throwIO) -import qualified GHC.IOBase as ExceptionBase -import qualified GHC.IOBase as New -import GHC.Exception hiding ( Exception ) -import {-# SOURCE #-} GHC.Conc +-- import GHC.IO ( IO ) +import GHC.IO.Handle.FD ( stdout ) +import qualified GHC.IO as New +import qualified GHC.IO.Exception as New +import GHC.Conc hiding (setUncaughtExceptionHandler, + getUncaughtExceptionHandler) import Data.IORef ( IORef, newIORef, readIORef, writeIORef ) import Foreign.C.String ( CString, withCString ) -import {-# SOURCE #-} GHC.Handle ( stdout, hFlush ) +import GHC.IO.Handle ( hFlush ) #endif #ifdef __HUGS__ -import Hugs.Exception as ExceptionBase +import Prelude hiding (catch) +import Hugs.Prelude as New (ExitCode(..)) #endif import qualified Control.Exception as New +import Control.Exception ( toException, fromException, throw, block, unblock, evaluate, throwIO ) import System.IO.Error hiding ( catch, try ) import System.IO.Unsafe (unsafePerformIO) import Data.Dynamic @@ -254,30 +256,9 @@ assert False _ = throw (UserError "" "Assertion failed") catch :: IO a -- ^ The computation to run -> (Exception -> IO a) -- ^ Handler to invoke if an exception is raised -> IO a -catch io handler = - -- We need to catch all the sorts of exceptions that used to be - -- bundled up into the Exception type, and rebundle them for the - -- legacy handler we've been given. - io `New.catches` - [New.Handler (\e -> handler e), - New.Handler (\exc -> handler (ArithException exc)), - New.Handler (\exc -> handler (ArrayException exc)), - New.Handler (\(New.AssertionFailed err) -> handler (AssertionFailed err)), - New.Handler (\exc -> handler (AsyncException exc)), - New.Handler (\New.BlockedOnDeadMVar -> handler BlockedOnDeadMVar), - New.Handler (\New.BlockedIndefinitely -> handler BlockedIndefinitely), - New.Handler (\New.NestedAtomically -> handler NestedAtomically), - New.Handler (\New.Deadlock -> handler Deadlock), - New.Handler (\exc -> handler (DynException exc)), - New.Handler (\(New.ErrorCall err) -> handler (ErrorCall err)), - New.Handler (\exc -> handler (ExitException exc)), - New.Handler (\exc -> handler (IOException exc)), - New.Handler (\(New.NoMethodError err) -> handler (NoMethodError err)), - New.Handler (\New.NonTermination -> handler NonTermination), - New.Handler (\(New.PatternMatchFail err) -> handler (PatternMatchFail err)), - New.Handler (\(New.RecConError err) -> handler (RecConError err)), - New.Handler (\(New.RecSelError err) -> handler (RecSelError err)), - New.Handler (\(New.RecUpdError err) -> handler (RecUpdError err))] +-- note: bundling the exceptions is done in the New.Exception +-- instance of Exception; see below. +catch = New.catch -- | The function 'catchJust' is like 'catch', but it takes an extra -- argument which is an /exception predicate/, a function which @@ -396,8 +377,8 @@ catchDyn :: Typeable exception => IO a -> (exception -> IO a) -> IO a #ifdef __NHC__ catchDyn m k = m -- can't catch dyn exceptions in nhc98 #else -catchDyn m k = catchException m handle - where handle ex = case ex of +catchDyn m k = New.catch m handler + where handler ex = case ex of (DynException dyn) -> case fromDynamic dyn of Just exception -> k exception @@ -475,8 +456,8 @@ bracket before after thing = a <- before r <- catch (unblock (thing a)) - (\e -> do { after a; throw e }) - after a + (\e -> do { _ <- after a; throw e }) + _ <- after a return r ) #endif @@ -492,8 +473,8 @@ a `finally` sequel = block (do r <- catch (unblock a) - (\e -> do { sequel; throw e }) - sequel + (\e -> do { _ <- sequel; throw e }) + _ <- sequel return r ) @@ -514,7 +495,7 @@ bracketOnError before after thing = a <- before catch (unblock (thing a)) - (\e -> do { after a; throw e }) + (\e -> do { _ <- after a; throw e }) ) -- ----------------------------------------------------------------------------- @@ -719,12 +700,67 @@ data Exception -- record update in the source program. INSTANCE_TYPEABLE0(Exception,exceptionTc,"Exception") -nonTermination :: SomeException -nonTermination = toException NonTermination - --- For now at least, make the monolithic Exception type an instance of --- the Exception class -instance ExceptionBase.Exception Exception +-- helper type for simplifying the type casting logic below +data Caster = forall e . New.Exception e => Caster (e -> Exception) + +instance New.Exception Exception where + -- We need to collect all the sorts of exceptions that used to be + -- bundled up into the Exception type, and rebundle them for + -- legacy handlers. + fromException exc0 = foldr tryCast Nothing casters where + tryCast (Caster f) e = case fromException exc0 of + Just exc -> Just (f exc) + _ -> e + casters = + [Caster (\exc -> ArithException exc), + Caster (\exc -> ArrayException exc), + Caster (\(New.AssertionFailed err) -> AssertionFailed err), + Caster (\exc -> AsyncException exc), + Caster (\New.BlockedIndefinitelyOnMVar -> BlockedOnDeadMVar), + Caster (\New.BlockedIndefinitelyOnSTM -> BlockedIndefinitely), + Caster (\New.NestedAtomically -> NestedAtomically), + Caster (\New.Deadlock -> Deadlock), + Caster (\exc -> DynException exc), + Caster (\(New.ErrorCall err) -> ErrorCall err), + Caster (\exc -> ExitException exc), + Caster (\exc -> IOException exc), + Caster (\(New.NoMethodError err) -> NoMethodError err), + Caster (\New.NonTermination -> NonTermination), + Caster (\(New.PatternMatchFail err) -> PatternMatchFail err), + Caster (\(New.RecConError err) -> RecConError err), + Caster (\(New.RecSelError err) -> RecSelError err), + Caster (\(New.RecUpdError err) -> RecUpdError err), + -- Anything else gets taken as a Dynamic exception. It's + -- important that we put all exceptions into the old Exception + -- type somehow, or throwing a new exception wouldn't cause + -- the cleanup code for bracket, finally etc to happen. + Caster (\exc -> DynException (toDyn (exc :: New.SomeException)))] + + -- Unbundle exceptions. + toException (ArithException exc) = toException exc + toException (ArrayException exc) = toException exc + toException (AssertionFailed err) = toException (New.AssertionFailed err) + toException (AsyncException exc) = toException exc + toException BlockedOnDeadMVar = toException New.BlockedIndefinitelyOnMVar + toException BlockedIndefinitely = toException New.BlockedIndefinitelyOnSTM + toException NestedAtomically = toException New.NestedAtomically + toException Deadlock = toException New.Deadlock + -- If a dynamic exception is a SomeException then resurrect it, so + -- that bracket, catch+throw etc rethrow the same exception even + -- when the exception is in the new style. + -- If it's not a SomeException, then just throw the Dynamic. + toException (DynException exc) = case fromDynamic exc of + Just exc' -> exc' + Nothing -> toException exc + toException (ErrorCall err) = toException (New.ErrorCall err) + toException (ExitException exc) = toException exc + toException (IOException exc) = toException exc + toException (NoMethodError err) = toException (New.NoMethodError err) + toException NonTermination = toException New.NonTermination + toException (PatternMatchFail err) = toException (New.PatternMatchFail err) + toException (RecConError err) = toException (New.RecConError err) + toException (RecSelError err) = toException (New.RecSelError err) + toException (RecUpdError err) = toException (New.RecUpdError err) instance Show Exception where showsPrec _ (IOException err) = shows err @@ -740,8 +776,8 @@ instance Show Exception where showsPrec _ (AssertionFailed err) = showString err showsPrec _ (DynException err) = showString "exception :: " . showsTypeRep (dynTypeRep err) showsPrec _ (AsyncException e) = shows e - showsPrec p BlockedOnDeadMVar = showsPrec p New.BlockedOnDeadMVar - showsPrec p BlockedIndefinitely = showsPrec p New.BlockedIndefinitely + showsPrec p BlockedOnDeadMVar = showsPrec p New.BlockedIndefinitelyOnMVar + showsPrec p BlockedIndefinitely = showsPrec p New.BlockedIndefinitelyOnSTM showsPrec p NestedAtomically = showsPrec p New.NestedAtomically showsPrec p NonTermination = showsPrec p New.NonTermination showsPrec p Deadlock = showsPrec p New.Deadlock