[project @ 2003-08-19 22:09:09 by krc]

[ghc-hetmet.git] / ghc / compiler / prelude / PrelNames.lhs

diff --git a/ghc/compiler/prelude/PrelNames.lhs b/ghc/compiler/prelude/PrelNames.lhs
index a77a4db..bacb0ec 100644 (file)
--- a/ghc/compiler/prelude/PrelNames.lhs
+++ b/ghc/compiler/prelude/PrelNames.lhs
@@ -267,8 +267,8 @@ pREL_FLOAT_Name   = mkModuleName "GHC.Float"
 pREL_TOP_HANDLER_Name = mkModuleName "GHC.TopHandler"
 sYSTEM_IO_Name   = mkModuleName "System.IO"
 dYNAMIC_Name     = mkModuleName "Data.Dynamic"
-tRAVERSE_Name    = mkModuleName "Data.Traverse"
-gENERICS_Name    = mkModuleName "Data.Generics"
+tYPEABLE_Name    = mkModuleName "Data.Typeable"
+gENERICS_Name    = mkModuleName "Data.Generics.Basics"
 dOTNET_Name       = mkModuleName "GHC.Dotnet"
 
 rEAD_PREC_Name = mkModuleName "Text.ParserCombinators.ReadPrec"
@@ -324,7 +324,8 @@ mkTupNameStr Boxed 3 = (pREL_TUP_Name, mkFastString "(,,)")  -- ditto
 mkTupNameStr Boxed 4 = (pREL_TUP_Name, mkFastString "(,,,)") -- ditto
 mkTupNameStr Boxed n = (pREL_TUP_Name, mkFastString ("(" ++ nOfThem (n-1) ',' ++ ")"))
 
-mkTupNameStr Unboxed 0 = panic "Name.mkUbxTupNameStr: 0 ???"
+mkTupNameStr Unboxed 0 = (gHC_PRIM_Name, mkFastString "(# #)") -- 1 and 0 both make sense!!!
+--panic "Name.mkUbxTupNameStr: 0 ???"
 mkTupNameStr Unboxed 1 = (gHC_PRIM_Name, mkFastString "(# #)") -- 1 and 0 both make sense!!!
 mkTupNameStr Unboxed 2 = (gHC_PRIM_Name, mkFastString "(#,#)")
 mkTupNameStr Unboxed 3 = (gHC_PRIM_Name, mkFastString "(#,,#)")
@@ -445,19 +446,9 @@ showString_RDR          = varQual_RDR pREL_SHOW_Name FSLIT("showString")
 showSpace_RDR           = varQual_RDR pREL_SHOW_Name FSLIT("showSpace") 
 showParen_RDR           = varQual_RDR pREL_SHOW_Name FSLIT("showParen") 
 
-typeOf_RDR     = varQual_RDR dYNAMIC_Name FSLIT("typeOf")
-mkTypeRep_RDR  = varQual_RDR dYNAMIC_Name FSLIT("mkAppTy")
-mkTyConRep_RDR = varQual_RDR dYNAMIC_Name FSLIT("mkTyCon")
-
-constr_RDR  = dataQual_RDR gENERICS_Name FSLIT("Constr")
-gfoldl_RDR  = varQual_RDR gENERICS_Name FSLIT("gfoldl")
-gfoldr_RDR  = varQual_RDR gENERICS_Name FSLIT("gfoldr")
-gunfold_RDR = varQual_RDR gENERICS_Name FSLIT("gunfold")
-gmapT_RDR   = varQual_RDR gENERICS_Name FSLIT("gmapT")
-gmapQ_RDR   = varQual_RDR gENERICS_Name FSLIT("gmapQ")
-gmapM_RDR   = varQual_RDR gENERICS_Name FSLIT("gmapM")
-conOf_RDR   = varQual_RDR gENERICS_Name FSLIT("conOf")
-consOf_RDR  = varQual_RDR gENERICS_Name FSLIT("consOf")
+typeOf_RDR     = varQual_RDR tYPEABLE_Name FSLIT("typeOf")
+mkTypeRep_RDR  = varQual_RDR tYPEABLE_Name FSLIT("mkAppTy")
+mkTyConRep_RDR = varQual_RDR tYPEABLE_Name FSLIT("mkTyCon")
 
 undefined_RDR = varQual_RDR pREL_ERR_Name FSLIT("undefined")
 \end{code}
@@ -618,7 +609,7 @@ realFloatClassName = clsQual  pREL_FLOAT_Name FSLIT("RealFloat") realFloatClassK
 ixClassName       = clsQual pREL_ARR_Name FSLIT("Ix") ixClassKey
 
 -- Class Typeable and Data
-typeableClassName = clsQual dYNAMIC_Name  FSLIT("Typeable") typeableClassKey
+typeableClassName = clsQual tYPEABLE_Name FSLIT("Typeable") typeableClassKey
 dataClassName     = clsQual gENERICS_Name FSLIT("Data")     dataClassKey
 
 -- Enum module (Enum, Bounded)