X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FbasicTypes%2FRdrName.lhs;h=a438c65ddffe3e67a25a9f119d78856a4a825f19;hb=6eca2acf184d4911123193757bdd38e53caa3467;hp=8686f708b4e064d7f7b99eec844d99798a8f53ad;hpb=495ef8bd9ef30bffe50ea399b91e3ba09646b59a;p=ghc-hetmet.git

diff --git a/ghc/compiler/basicTypes/RdrName.lhs b/ghc/compiler/basicTypes/RdrName.lhs
index 8686f70..a438c65 100644
--- a/ghc/compiler/basicTypes/RdrName.lhs
+++ b/ghc/compiler/basicTypes/RdrName.lhs
@@ -1,4 +1,4 @@
-
+%
 % (c) The GRASP/AQUA Project, Glasgow University, 1992-1998
 %
 
@@ -10,7 +10,7 @@ module RdrName (
 
 	-- Construction
 	mkRdrUnqual, mkRdrQual,
-	mkSrcUnqual, mkSrcQual, 
+	mkUnqual, mkQual, 
 	mkSysUnqual, mkSysQual,
 	mkPreludeQual, qualifyRdrName, mkRdrNameWkr,
 	dummyRdrVarName, dummyRdrTcName,
@@ -31,13 +31,13 @@ module RdrName (
 #include "HsVersions.h"
 
 import OccName	( NameSpace, tcName,
-		  OccName,
+		  OccName, UserFS,
 		  mkSysOccFS,
-		  mkSrcOccFS, mkSrcVarOcc,
+		  mkOccFS, mkVarOcc,
 		  isDataOcc, isTvOcc, mkWorkerOcc
 		)
-import Module   ( ModuleName, pprModuleName,
-		  mkSysModuleFS, mkSrcModuleFS
+import Module   ( ModuleName,
+		  mkSysModuleNameFS, mkModuleNameFS
 		)
 import FiniteMap
 import Outputable
@@ -86,11 +86,11 @@ mkRdrQual mod occ = RdrName (Qual mod) occ
 
 	-- These two are used when parsing source files
 	-- They do encode the module and occurrence names
-mkSrcUnqual :: NameSpace -> FAST_STRING -> RdrName
-mkSrcUnqual sp n = RdrName Unqual (mkSrcOccFS sp n)
+mkUnqual :: NameSpace -> FAST_STRING -> RdrName
+mkUnqual sp n = RdrName Unqual (mkOccFS sp n)
 
-mkSrcQual :: NameSpace -> FAST_STRING -> FAST_STRING -> RdrName
-mkSrcQual sp m n = RdrName (Qual (mkSrcModuleFS m)) (mkSrcOccFS sp n)
+mkQual :: NameSpace -> (UserFS, UserFS) -> RdrName
+mkQual sp (m, n) = RdrName (Qual (mkModuleNameFS m)) (mkOccFS sp n)
 
 	-- These two are used when parsing interface files
 	-- They do not encode the module and occurrence name
@@ -98,10 +98,10 @@ mkSysUnqual :: NameSpace -> FAST_STRING -> RdrName
 mkSysUnqual sp n = RdrName Unqual (mkSysOccFS sp n)
 
 mkSysQual :: NameSpace -> (FAST_STRING, FAST_STRING) -> RdrName
-mkSysQual sp (m,n) = RdrName (Qual (mkSysModuleFS m)) (mkSysOccFS sp n)
+mkSysQual sp (m,n) = RdrName (Qual (mkSysModuleNameFS m)) (mkSysOccFS sp n)
 
 mkPreludeQual :: NameSpace -> ModuleName -> FAST_STRING -> RdrName
-mkPreludeQual sp mod n = RdrName (Qual mod) (mkSrcOccFS sp n)
+mkPreludeQual sp mod n = RdrName (Qual mod) (mkOccFS sp n)
 
 qualifyRdrName :: ModuleName -> RdrName -> RdrName
 	-- Sets the module name of a RdrName, even if it has one already
@@ -117,8 +117,8 @@ mkRdrNameWkr (RdrName qual occ) = RdrName qual (mkWorkerOcc occ)
 	-- the renamer.  We can't just put "error..." because
 	-- we sometimes want to print out stuff after reading but
 	-- before renaming
-dummyRdrVarName = RdrName Unqual (mkSrcVarOcc SLIT("V-DUMMY"))
-dummyRdrTcName  = RdrName Unqual (mkSrcOccFS tcName SLIT("TC-DUMMY"))
+dummyRdrVarName = RdrName Unqual (mkVarOcc SLIT("V-DUMMY"))
+dummyRdrTcName  = RdrName Unqual (mkOccFS tcName SLIT("TC-DUMMY"))
 \end{code}
 
 
@@ -144,7 +144,7 @@ instance Outputable RdrName where
     ppr (RdrName qual occ) = pp_qual qual <> ppr occ
 			   where
 			     pp_qual Unqual     = empty
-			     pp_qual (Qual mod) = pprModuleName mod <> dot
+			     pp_qual (Qual mod) = ppr mod <> dot
 
 pprUnqualRdrName (RdrName qual occ) = ppr occ