From cfd7a0d5daf0c2e2bc6526e941c1e0817432f3b5 Mon Sep 17 00:00:00 2001 From: ralf Date: Mon, 22 Mar 2004 09:00:28 +0000 Subject: [PATCH] [project @ 2004-03-22 09:00:28 by ralf] Boot-strapping ghc revealed an issue related to yesterday's renaming of Data.Typeable. I can now build a stage1 compiler again. Let me try a stage2 one as well. ralf 2004/03/21 11:06:04 PST Modified files: ghc/compiler/prelude PrelNames.lhs ghc/compiler/typecheck TcGenDeriv.lhs Log: Implemented renaming for Data.Typeable as far as deriving mechanism is involved. See http://www.haskell.org//pipermail/libraries/2004-March/001846.html Revision Changes Path 1.88 +1 -1 fptools/ghc/compiler/prelude/PrelNames.lhs 1.107 +1 -1 fptools/ghc/compiler/typecheck/TcGenDeriv.lhs --- ghc/compiler/utils/Panic.lhs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ghc/compiler/utils/Panic.lhs b/ghc/compiler/utils/Panic.lhs index 170a7a7..ed6d796 100644 --- a/ghc/compiler/utils/Panic.lhs +++ b/ghc/compiler/utils/Panic.lhs @@ -121,10 +121,16 @@ showGhcException (Panic s) ++ "to glasgow-haskell-bugs@haskell.org,\n" ++ "or http://sourceforge.net/projects/ghc/.\n\n") +#if __GLASGOW_HASKELL__ < 630 +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. -- 1.7.10.4