X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fprelude%2FPrelNames.lhs;h=4d834dfaacf99d7be12d94c00c9352121451a9f1;hb=ba2843abdfe6f055777e4e66e8add769fce31d29;hp=2ecfaa57dd6ec4f2def493d08fbf3fd433f10361;hpb=16e4ce4c0c02650082f2e11982017c903c549ad5;p=ghc-hetmet.git

diff --git a/ghc/compiler/prelude/PrelNames.lhs b/ghc/compiler/prelude/PrelNames.lhs
index 2ecfaa5..4d834df 100644
--- a/ghc/compiler/prelude/PrelNames.lhs
+++ b/ghc/compiler/prelude/PrelNames.lhs
@@ -267,7 +267,7 @@ 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"
+tYPEABLE_Name	  = mkModuleName "Data.Typeable"
 gENERICS_Name	  = mkModuleName "Data.Generics"
 dOTNET_Name       = mkModuleName "GHC.Dotnet"
 
@@ -299,9 +299,13 @@ pRELUDE		= mkBasePkgModule pRELUDE_Name
 -- MetaHaskell Extension  text2 from Meta/work/gen.hs
 mETA_META_Name   = mkModuleName "Language.Haskell.THSyntax"
 
-dOLLAR_MAIN_Name = mkModuleName "$Main"		-- Root module for initialisation 
-dOLLAR_MAIN	 = mkHomeModule dOLLAR_MAIN_Name
-iNTERACTIVE      = mkHomeModule (mkModuleName "$Interactive")
+rOOT_MAIN_Name = mkModuleName ":Main"		-- Root module for initialisation 
+rOOT_MAIN      = mkHomeModule rOOT_MAIN_Name	
+	-- The ':xxx' makes a moudle name that the user can never
+	-- use himself.  The z-encoding for ':' is "ZC", so the z-encoded
+	-- module name still starts with a capital letter, which keeps
+	-- the z-encoded version consistent.
+iNTERACTIVE    = mkHomeModule (mkModuleName ":Interactive")
 \end{code}
 
 %************************************************************************
@@ -441,9 +445,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")
+typeOf_RDR     = varQual_RDR tYPEABLE_Name FSLIT("typeOf")
+mkTypeRep_RDR  = varQual_RDR tYPEABLE_Name FSLIT("mkAppTy")
+mkTyConRep_RDR = varQual_RDR tYPEABLE_Name FSLIT("mkTyCon")
 
 constr_RDR  = dataQual_RDR gENERICS_Name FSLIT("Constr")
 gfoldl_RDR  = varQual_RDR gENERICS_Name FSLIT("gfoldl")
@@ -474,8 +478,8 @@ and it's convenient to write them all down in one place.
 
 
 \begin{code}
-dollarMainName = varQual dOLLAR_MAIN_Name FSLIT("main") dollarMainKey
-runIOName      = varQual pREL_TOP_HANDLER_Name FSLIT("runIO") runMainKey
+rootMainName = varQual rOOT_MAIN_Name FSLIT("main") rootMainKey
+runIOName    = varQual pREL_TOP_HANDLER_Name FSLIT("runIO") runMainKey
 
 -- Stuff from GHC.Prim
 superKindName    = kindQual FSLIT("KX") kindConKey
@@ -614,7 +618,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)
@@ -978,7 +982,7 @@ otherwiseIdKey		      = mkPreludeMiscIdUnique 51
 assertIdKey		      = mkPreludeMiscIdUnique 53
 runSTRepIdKey		      = mkPreludeMiscIdUnique 54
 
-dollarMainKey		      = mkPreludeMiscIdUnique 55
+rootMainKey		      = mkPreludeMiscIdUnique 55
 runMainKey		      = mkPreludeMiscIdUnique 56
 
 andIdKey		      = mkPreludeMiscIdUnique 57