[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

diff --git a/ghc/compiler/prelude/PrelNames.lhs b/ghc/compiler/prelude/PrelNames.lhs
index 2eb29f3..ac46d4e 100644 (file)
--- 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 (file)
--- 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