From f8daa233ecde216b4b4ba3e2a22679406774a942 Mon Sep 17 00:00:00 2001 From: ralf Date: Sun, 21 Mar 2004 19:06:03 +0000 Subject: [PATCH] [project @ 2004-03-21 19:06:01 by ralf] Implemented renaming for Data.Typeable as far as deriving mechanism is involved. See http://www.haskell.org//pipermail/libraries/2004-March/001846.html --- ghc/compiler/prelude/PrelNames.lhs | 2 +- ghc/compiler/typecheck/TcGenDeriv.lhs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ghc/compiler/prelude/PrelNames.lhs b/ghc/compiler/prelude/PrelNames.lhs index 2eb29f3..ac46d4e 100644 --- a/ghc/compiler/prelude/PrelNames.lhs +++ b/ghc/compiler/prelude/PrelNames.lhs @@ -447,7 +447,7 @@ showSpace_RDR = varQual_RDR pREL_SHOW_Name FSLIT("showSpace") showParen_RDR = varQual_RDR pREL_SHOW_Name FSLIT("showParen") typeOf_RDR = varQual_RDR tYPEABLE_Name FSLIT("typeOf") -mkTypeRep_RDR = varQual_RDR tYPEABLE_Name FSLIT("mkAppTy") +mkTypeRep_RDR = varQual_RDR tYPEABLE_Name FSLIT("mkTyConApp") mkTyConRep_RDR = varQual_RDR tYPEABLE_Name FSLIT("mkTyCon") undefined_RDR = varQual_RDR pREL_ERR_Name FSLIT("undefined") diff --git a/ghc/compiler/typecheck/TcGenDeriv.lhs b/ghc/compiler/typecheck/TcGenDeriv.lhs index 9796387..b9b9ae1 100644 --- a/ghc/compiler/typecheck/TcGenDeriv.lhs +++ b/ghc/compiler/typecheck/TcGenDeriv.lhs @@ -994,7 +994,7 @@ From the data type we generate instance Typeable2 T where - typeOf2 _ = mkAppTy (mkTyConRep "T") [] + typeOf2 _ = mkTyConApp (mkTyConRep "T") [] We are passed the Typeable2 class as well as T -- 1.7.10.4