[project @ 2004-11-25 11:36:34 by simonpj]

[ghc-hetmet.git] / ghc / compiler / utils / Panic.lhs

diff --git a/ghc/compiler/utils/Panic.lhs b/ghc/compiler/utils/Panic.lhs
index 72eefd4..60393b5 100644 (file)
--- a/ghc/compiler/utils/Panic.lhs
+++ b/ghc/compiler/utils/Panic.lhs
@@ -12,15 +12,16 @@ some unnecessary loops in the module dependency graph.
 module Panic  
    ( 
      GhcException(..), ghcError, progName, 
+     pgmError,
      panic, panic#, assertPanic, trace,
      showException, showGhcException, tryMost,
-     installSignalHandlers,
+     installSignalHandlers, 
 
      catchJust, tryJust, ioErrors, throwTo,
    ) where
 
 #include "HsVersions.h"
-#include "config.h"
+#include "../includes/ghcconfig.h"
 
 import Config
 import FastTypes
@@ -33,13 +34,13 @@ import Posix                ( Handler(Catch), installHandler, sigINT, sigQUIT )
 # endif /* GHC > 504 */
 
 import CONCURRENT      ( myThreadId )
+#endif /* mingw32_HOST_OS */
 
 # if __GLASGOW_HASKELL__ < 500
 import EXCEPTION        ( raiseInThread )
 # else
 import EXCEPTION       ( throwTo )
 # endif /* GHC < 500 */
-#endif /* mingw32_HOST_OS */
 
 #if __GLASGOW_HASKELL__ > 408
 import EXCEPTION       ( catchJust, tryJust, ioErrors )
@@ -121,17 +122,24 @@ showGhcException (Panic s)
                 ++ "to glasgow-haskell-bugs@haskell.org,\n"
                 ++ "or http://sourceforge.net/projects/ghc/.\n\n")
 
+#if __GLASGOW_HASKELL__ < 603
+myMkTyConApp = mkAppTy
+#else 
+myMkTyConApp = mkTyConApp
+#endif
+
 ghcExceptionTc = mkTyCon "GhcException"
 {-# NOINLINE ghcExceptionTc #-}
 instance Typeable GhcException where
-  typeOf _ = mkAppTy ghcExceptionTc []
+  typeOf _ = myMkTyConApp ghcExceptionTc []
 \end{code}
 
 Panics and asserts.
 
 \begin{code}
-panic :: String -> a
-panic x = Exception.throwDyn (Panic x)
+panic, pgmError :: String -> a
+panic    x = Exception.throwDyn (Panic x)
+pgmError x = Exception.throwDyn (ProgramError x)
 
 -- #-versions because panic can't return an unboxed int, and that's
 -- what TAG_ is with GHC at the moment.  Ugh. (Simon)