X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FErrUtils.lhs;h=d37dba9ecfd9ec4128fd4c8ff5baa55a092f07e6;hb=c0ac8b6b2192d296fc28bfc8eb566123e8d72bf0;hp=7f5914e90486903a38809b7142f70abd27951688;hpb=67ad7f3ba7381ec815faf55be1ca6a4c6a919cb1;p=ghc-hetmet.git

diff --git a/compiler/main/ErrUtils.lhs b/compiler/main/ErrUtils.lhs
index 7f5914e..d37dba9 100644
--- a/compiler/main/ErrUtils.lhs
+++ b/compiler/main/ErrUtils.lhs
@@ -8,7 +8,7 @@ module ErrUtils (
 	Message, mkLocMessage, printError,
 	Severity(..),
 
-	ErrMsg, WarnMsg, throwErrMsg, handleErrMsg,
+	ErrMsg, WarnMsg,
     ErrorMessages, WarningMessages,
 	errMsgSpans, errMsgContext, errMsgShortDoc, errMsgExtraInfo,
 	Messages, errorsFound, emptyMessages,
@@ -42,10 +42,8 @@ import StaticFlags	( opt_ErrorSpans )
 
 import Control.Monad
 import System.Exit	( ExitCode(..), exitWith )
-import Data.Dynamic
 import Data.List
 import System.IO
-import Exception
 
 -- -----------------------------------------------------------------------------
 -- Basic error messages: just render a message with a source location.
@@ -83,34 +81,9 @@ data ErrMsg = ErrMsg {
 	-- NB  Pretty.Doc not SDoc: we deal with the printing style (in ptic 
 	-- whether to qualify an External Name) at the error occurrence
 
-#if __GLASGOW_HASKELL__ >= 609
-instance Exception ErrMsg
-#endif
-
 instance Show ErrMsg where
     show em = showSDoc (errMsgShortDoc em)
 
-throwErrMsg :: ErrMsg -> a
-#if __GLASGOW_HASKELL__ < 609
-throwErrMsg = throwDyn
-#else
-throwErrMsg = throw
-#endif
-
-handleErrMsg :: ExceptionMonad m => (ErrMsg -> m a) -> m a -> m a
-#if __GLASGOW_HASKELL__ < 609
-handleErrMsg = flip gcatchDyn
-#else
-handleErrMsg = ghandle
-#endif
-
--- So we can throw these things as exceptions
-errMsgTc :: TyCon
-errMsgTc = mkTyCon "ErrMsg"
-{-# NOINLINE errMsgTc #-}
-instance Typeable ErrMsg where
-  typeOf _ = mkTyConApp errMsgTc []
-
 type WarnMsg = ErrMsg
 
 -- A short (one-line) error message, with context to tell us whether