projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2004-08-13 13:04:50 by simonmar]
[ghc-hetmet.git]
/
ghc
/
compiler
/
utils
/
Panic.lhs
diff --git
a/ghc/compiler/utils/Panic.lhs
b/ghc/compiler/utils/Panic.lhs
index
efb3c6a
..
2a5d3a4
100644
(file)
--- a/
ghc/compiler/utils/Panic.lhs
+++ b/
ghc/compiler/utils/Panic.lhs
@@
-16,30
+16,33
@@
module Panic
showException, showGhcException, tryMost,
installSignalHandlers,
showException, showGhcException, tryMost,
installSignalHandlers,
-#if __GLASGOW_HASKELL__ <= 408
- catchJust, ioErrors, throwTo,
-#endif
+ catchJust, tryJust, ioErrors, throwTo,
) where
#include "HsVersions.h"
) where
#include "HsVersions.h"
+#include "../includes/ghcconfig.h"
import Config
import FastTypes
import Config
import FastTypes
-#if __GLASGOW_HASKELL__ > 504
+#ifndef mingw32_HOST_OS
+# if __GLASGOW_HASKELL__ > 504
import System.Posix.Signals
import System.Posix.Signals
-#else
+# else
import Posix ( Handler(Catch), installHandler, sigINT, sigQUIT )
import Posix ( Handler(Catch), installHandler, sigINT, sigQUIT )
-#endif
+# endif /* GHC > 504 */
-#ifndef mingw32_HOST_OS
import CONCURRENT ( myThreadId )
import CONCURRENT ( myThreadId )
+#endif /* mingw32_HOST_OS */
# if __GLASGOW_HASKELL__ < 500
import EXCEPTION ( raiseInThread )
# else
import EXCEPTION ( throwTo )
# if __GLASGOW_HASKELL__ < 500
import EXCEPTION ( raiseInThread )
# else
import EXCEPTION ( throwTo )
-# endif
+# endif /* GHC < 500 */
+
+#if __GLASGOW_HASKELL__ > 408
+import EXCEPTION ( catchJust, tryJust, ioErrors )
#endif
import DYNAMIC
#endif
import DYNAMIC
@@
-118,10
+121,16
@@
showGhcException (Panic s)
++ "to glasgow-haskell-bugs@haskell.org,\n"
++ "or http://sourceforge.net/projects/ghc/.\n\n")
++ "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
ghcExceptionTc = mkTyCon "GhcException"
{-# NOINLINE ghcExceptionTc #-}
instance Typeable GhcException where
- typeOf _ = mkAppTy ghcExceptionTc []
+ typeOf _ = myMkTyConApp ghcExceptionTc []
\end{code}
Panics and asserts.
\end{code}
Panics and asserts.
@@
-172,6
+181,7
@@
Compatibility stuff:
\begin{code}
#if __GLASGOW_HASKELL__ <= 408
catchJust = Exception.catchIO
\begin{code}
#if __GLASGOW_HASKELL__ <= 408
catchJust = Exception.catchIO
+tryJust = Exception.tryIO
ioErrors = Exception.justIoErrors
throwTo = Exception.raiseInThread
#endif
ioErrors = Exception.justIoErrors
throwTo = Exception.raiseInThread
#endif