X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FbasicTypes%2FRdrName.lhs;h=030aa1f609aa83d31d32811f110be05d66dd4fe3;hb=9d7da331989abcd1844e9d03b8d1e4163796fa85;hp=41369140198ec3545e0ac0196f2bbb53182ea233;hpb=adc9d5cc47ff2d0afbebd70119e2950bfa38042d;p=ghc-hetmet.git

diff --git a/ghc/compiler/basicTypes/RdrName.lhs b/ghc/compiler/basicTypes/RdrName.lhs
index 4136914..030aa1f 100644
--- a/ghc/compiler/basicTypes/RdrName.lhs
+++ b/ghc/compiler/basicTypes/RdrName.lhs
@@ -40,25 +40,17 @@ module RdrName (
 
 #include "HsVersions.h"
 
-import OccName	( NameSpace, varName,
-		  OccName, UserFS, 
-		  setOccNameSpace,
-		  mkOccFS, occNameFlavour,
-		  isDataOcc, isTvOcc, isTcOcc,
-		  OccEnv, emptyOccEnv, extendOccEnvList, lookupOccEnv, 
-		  elemOccEnv, plusOccEnv_C, extendOccEnv_C, foldOccEnv,
-		  occEnvElts
-		)
+import OccName
 import Module   ( Module, mkModuleFS )
 import Name	( Name, NamedThing(getName), nameModule, nameParent_maybe,
 		  nameOccName, isExternalName, nameSrcLoc )
 import Maybes	( mapCatMaybes )
 import SrcLoc	( isGoodSrcLoc, SrcSpan )
+import FastString ( FastString )
 import Outputable
 import Util	( thenCmp )
 \end{code}
 
-
 %************************************************************************
 %*									*
 \subsection{The main data type}
@@ -147,14 +139,14 @@ mkDerivedRdrName parent mk_occ
 ---------------
 	-- These two are used when parsing source files
 	-- They do encode the module and occurrence names
-mkUnqual :: NameSpace -> UserFS -> RdrName
-mkUnqual sp n = Unqual (mkOccFS sp n)
+mkUnqual :: NameSpace -> FastString -> RdrName
+mkUnqual sp n = Unqual (mkOccNameFS sp n)
 
-mkVarUnqual :: UserFS -> RdrName
-mkVarUnqual n = Unqual (mkOccFS varName n)
+mkVarUnqual :: FastString -> RdrName
+mkVarUnqual n = Unqual (mkVarOccFS n)
 
-mkQual :: NameSpace -> (UserFS, UserFS) -> RdrName
-mkQual sp (m, n) = Qual (mkModuleFS m) (mkOccFS sp n)
+mkQual :: NameSpace -> (FastString, FastString) -> RdrName
+mkQual sp (m, n) = Qual (mkModuleFS m) (mkOccNameFS sp n)
 
 getRdrName :: NamedThing thing => thing -> RdrName
 getRdrName name = nameRdrName (getName name)
@@ -213,7 +205,7 @@ instance Outputable RdrName where
     ppr (Qual mod occ) = ppr mod <> dot <> ppr occ <+> ppr_name_space occ
     ppr (Orig mod occ) = ppr mod <> dot <> ppr occ <+> ppr_name_space occ
 
-ppr_name_space occ = ifPprDebug (parens (occNameFlavour occ))
+ppr_name_space occ = ifPprDebug (parens (pprNonVarNameSpace (occNameSpace occ)))
 
 instance OutputableBndr RdrName where
     pprBndr _ n 
@@ -386,13 +378,14 @@ pickGREs rdr_name gres
     mod	      = rdrNameModule rdr_name
 
     pick :: GlobalRdrElt -> Maybe GlobalRdrElt
-    pick gre@(GRE {gre_prov = LocalDef m}) 	-- Local def
-	| is_unqual || m == mod = Just gre
-	| otherwise		= Nothing
+    pick gre@(GRE {gre_prov = LocalDef, gre_name = n}) 	-- Local def
+	| is_unqual || nameModule n == mod = Just gre
+	| otherwise			   = Nothing
     pick gre@(GRE {gre_prov = Imported [is]})	-- Single import (efficiency)
-	| is_unqual && not (is_qual (is_decl is)) = Just gre
-	| mod == is_as (is_decl is)		  = Just gre
-	| otherwise				  = Nothing
+	| is_unqual     = if not (is_qual (is_decl is)) then Just gre
+						        else Nothing
+	| otherwise     = if mod == is_as (is_decl is)  then Just gre
+						        else Nothing
     pick gre@(GRE {gre_prov = Imported is})	-- Multiple import
 	| null filtered_is = Nothing
 	| otherwise	   = Just (gre {gre_prov = Imported filtered_is})
@@ -401,12 +394,12 @@ pickGREs rdr_name gres
 		      | otherwise = filter ((== mod) . is_as . is_decl) is
 
 isLocalGRE :: GlobalRdrElt -> Bool
-isLocalGRE (GRE {gre_prov = LocalDef _}) = True
-isLocalGRE other    		         = False
+isLocalGRE (GRE {gre_prov = LocalDef}) = True
+isLocalGRE other    		       = False
 
 unQualOK :: GlobalRdrElt -> Bool
 -- An unqualifed version of this thing is in scope
-unQualOK (GRE {gre_prov = LocalDef _})  = True
+unQualOK (GRE {gre_prov = LocalDef})    = True
 unQualOK (GRE {gre_prov = Imported is}) = not (all (is_qual . is_decl) is)
 
 plusGlobalRdrEnv :: GlobalRdrEnv -> GlobalRdrEnv -> GlobalRdrEnv
@@ -448,9 +441,7 @@ It's quite elaborate so that we can give accurate unused-name warnings.
 \begin{code}
 data Provenance
   = LocalDef		-- Defined locally
-	Module
-
-  | Imported 				-- Imported
+  | Imported 		-- Imported
 	[ImportSpec]	-- INVARIANT: non-empty
 
 data ImportSpec = ImpSpec { is_decl :: ImpDeclSpec,
@@ -503,9 +494,9 @@ instance Eq ImpItemSpec where
   p1 == p2 = case p1 `compare` p2 of EQ -> True; _ -> False
 
 instance Ord Provenance where
-   compare (LocalDef _) (LocalDef _)   	 = EQ
-   compare (LocalDef _) (Imported _) 	 = LT
-   compare (Imported _ ) (LocalDef _)    = GT
+   compare LocalDef      LocalDef   	 = EQ
+   compare LocalDef      (Imported _) 	 = LT
+   compare (Imported _ ) LocalDef	 = GT
    compare (Imported is1) (Imported is2) = compare (head is1) 
 	{- See Note [Comparing provenance] -}	   (head is2)
 
@@ -525,14 +516,14 @@ plusProv :: Provenance -> Provenance -> Provenance
 -- defined, and one might refer to it with a qualified name from
 -- the import -- but I'm going to ignore that because it makes
 -- the isLocalGRE predicate so much nicer this way
-plusProv (LocalDef m1) (LocalDef m2)     = pprPanic "plusProv" (ppr m1 <+> ppr m2)
-plusProv p1@(LocalDef _) p2		 = p1
-plusProv p1 		 p2@(LocalDef _) = p2
+plusProv LocalDef 	 LocalDef        = panic "plusProv"
+plusProv LocalDef	 p2		 = LocalDef
+plusProv p1 		 LocalDef 	 = LocalDef
 plusProv (Imported is1)  (Imported is2)  = Imported (is1++is2)
 
 pprNameProvenance :: GlobalRdrElt -> SDoc
 -- Print out the place where the name was imported
-pprNameProvenance (GRE {gre_name = name, gre_prov = LocalDef _})
+pprNameProvenance (GRE {gre_name = name, gre_prov = LocalDef})
   = ptext SLIT("defined at") <+> ppr (nameSrcLoc name)
 pprNameProvenance (GRE {gre_name = name, gre_prov = Imported (why:whys)})
   = sep [ppr why, nest 2 (ppr_defn (nameSrcLoc name))]