projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't import FastString in HsVersions.h
[ghc-hetmet.git]
/
compiler
/
utils
/
Panic.lhs
diff --git
a/compiler/utils/Panic.lhs
b/compiler/utils/Panic.lhs
index
94f01d4
..
f79ffce
100644
(file)
--- a/
compiler/utils/Panic.lhs
+++ b/
compiler/utils/Panic.lhs
@@
-14,7
+14,7
@@
module Panic
GhcException(..), showGhcException, ghcError, progName,
pgmError,
GhcException(..), showGhcException, ghcError, progName,
pgmError,
- panic, panic#, assertPanic, trace,
+ panic, panicFastInt, assertPanic, trace,
Exception.Exception(..), showException, try, tryJust, tryMost, tryUser,
catchJust, ioErrors, throwTo,
Exception.Exception(..), showException, try, tryJust, tryMost, tryUser,
catchJust, ioErrors, throwTo,
@@
-22,8
+22,6
@@
module Panic
installSignalHandlers, interruptTargetThread
) where
installSignalHandlers, interruptTargetThread
) where
--- XXX This define is a bit of a hack, and should be done more nicely
-#define FAST_STRING_NOT_NEEDED 1
#include "HsVersions.h"
import Config
#include "HsVersions.h"
import Config
@@
-89,6
+87,7
@@
showException other_exn = show other_exn
instance Show GhcException where
showsPrec _ e@(ProgramError _) = showGhcException e
instance Show GhcException where
showsPrec _ e@(ProgramError _) = showGhcException e
+ showsPrec _ e@(CmdLineError _) = showString "<command line>: " . showGhcException e
showsPrec _ e = showString progName . showString ": " . showGhcException e
showGhcException :: GhcException -> String -> String
showsPrec _ e = showString progName . showString ": " . showGhcException e
showGhcException :: GhcException -> String -> String
@@
-118,7
+117,7
@@
showGhcException (Panic s)
++ "Please report this as a GHC bug: http://www.haskell.org/ghc/reportabug\n")
myMkTyConApp :: TyCon -> [TypeRep] -> TypeRep
++ "Please report this as a GHC bug: http://www.haskell.org/ghc/reportabug\n")
myMkTyConApp :: TyCon -> [TypeRep] -> TypeRep
-#if __GLASGOW_HASKELL__ < 603
+#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ < 603
myMkTyConApp = mkAppTy
#else
myMkTyConApp = mkTyConApp
myMkTyConApp = mkAppTy
#else
myMkTyConApp = mkTyConApp
@@
-142,8
+141,8
@@
pgmError x = Exception.throwDyn (ProgramError x)
-- what TAG_ is with GHC at the moment. Ugh. (Simon)
-- No, man -- Too Beautiful! (Will)
-- what TAG_ is with GHC at the moment. Ugh. (Simon)
-- No, man -- Too Beautiful! (Will)
-panic# :: String -> FastInt
-panic# s = case (panic s) of () -> _ILIT 0
+panicFastInt :: String -> FastInt
+panicFastInt s = case (panic s) of () -> _ILIT(0)
assertPanic :: String -> Int -> a
assertPanic file line =
assertPanic :: String -> Int -> a
assertPanic file line =