X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2FbasicTypes%2FRdrName.lhs;h=2f7f7a8b50977d52d7294c78a4ca52819ca4175c;hp=3c6cd77c53ad2f03fd3a36d2ac8d179be79459d8;hb=b00b5bc04ff36a551552470060064f0b7d84ca30;hpb=61d2625ae2e6a4cdae2ffc92df828905e81c24cc

diff --git a/compiler/basicTypes/RdrName.lhs b/compiler/basicTypes/RdrName.lhs
index 3c6cd77..2f7f7a8 100644
--- a/compiler/basicTypes/RdrName.lhs
+++ b/compiler/basicTypes/RdrName.lhs
@@ -29,7 +29,7 @@ module RdrName (
 	GlobalRdrEnv, emptyGlobalRdrEnv, mkGlobalRdrEnv, plusGlobalRdrEnv, 
 	lookupGlobalRdrEnv, extendGlobalRdrEnv,
 	pprGlobalRdrEnv, globalRdrEnvElts,
-	lookupGRE_RdrName, lookupGRE_Name,
+	lookupGRE_RdrName, lookupGRE_Name, hideSomeUnquals,
 
 	-- GlobalRdrElt, Provenance, ImportSpec
 	GlobalRdrElt(..), isLocalGRE, unQualOK, 
@@ -42,10 +42,10 @@ module RdrName (
 
 import OccName
 import Module   ( ModuleName, mkModuleNameFS, Module, moduleName )
-import Name	( Name, NamedThing(getName), nameModule, nameParent_maybe,
+import Name	( Name, NamedThing(getName), nameModule,
 		  nameOccName, isExternalName, nameSrcLoc )
 import Maybes	( mapCatMaybes )
-import SrcLoc	( isGoodSrcLoc, SrcSpan )
+import SrcLoc	( isGoodSrcLoc, isGoodSrcSpan, srcLocSpan, SrcSpan )
 import FastString ( FastString )
 import Outputable
 import Util	( thenCmp )
@@ -78,10 +78,7 @@ data RdrName
 	-- We know exactly the Name. This is used 
 	--  (a) when the parser parses built-in syntax like "[]" 
 	--	and "(,)", but wants a RdrName from it
-	--  (b) when converting names to the RdrNames in IfaceTypes
-	--	Here an Exact RdrName always contains an External Name
-	--	(Internal Names are converted to simple Unquals)
-	--  (c) by Template Haskell, when TH has generated a unique name
+	--  (b) by Template Haskell, when TH has generated a unique name
 \end{code}
 
 
@@ -311,8 +308,7 @@ data GlobalRdrElt
     }
 
 instance Outputable GlobalRdrElt where
-  ppr gre = ppr name <+> pp_parent (nameParent_maybe name)
-		<+> parens (pprNameProvenance gre)
+  ppr gre = ppr name <+> parens (pprNameProvenance gre)
 	  where
 	    name = gre_name gre
 	    pp_parent (Just p) = brackets (text "parent:" <+> ppr p)
@@ -428,6 +424,35 @@ plusGRE :: GlobalRdrElt -> GlobalRdrElt -> GlobalRdrElt
 plusGRE g1 g2
   = GRE { gre_name = gre_name g1,
 	  gre_prov = gre_prov g1 `plusProv` gre_prov g2 }
+
+hideSomeUnquals :: GlobalRdrEnv -> [OccName] -> GlobalRdrEnv
+-- Hide any unqualified bindings for the specified OccNames
+-- This is used in TH, when renaming a declaration bracket
+--	[d| foo = ... |]
+-- We want unqualified 'foo' in "..." to mean this foo, not
+-- the one from the enclosing module.  But the *qualified* name
+-- from the enclosing moudule must certainly still be avaialable
+-- 	Seems like 5 times as much work as it deserves!
+hideSomeUnquals rdr_env occs
+  = foldr hide rdr_env occs
+  where
+    hide occ env 
+	| Just gres <- lookupOccEnv env occ = extendOccEnv env occ (map qual_gre gres)
+	| otherwise			    = env
+    qual_gre gre@(GRE { gre_name = name, gre_prov = LocalDef })
+	= GRE { gre_name = name, gre_prov = Imported [imp_spec] }
+	where	-- Local defs get transfomed to (fake) imported things
+	  mod = moduleName (nameModule name)
+	  imp_spec = ImpSpec { is_item = ImpAll, is_decl = decl_spec }
+	  decl_spec = ImpDeclSpec { is_mod = mod, is_as = mod, 
+				    is_qual = True, 
+				    is_dloc = srcLocSpan (nameSrcLoc name) }
+
+    qual_gre gre@(GRE { gre_prov = Imported specs })
+	= gre { gre_prov = Imported (map qual_spec specs) }
+
+    qual_spec spec@(ImpSpec { is_decl = decl_spec })
+  	= spec { is_decl = decl_spec { is_qual = True } }
 \end{code}
 
 
@@ -529,8 +554,10 @@ pprNameProvenance :: GlobalRdrElt -> SDoc
 -- Print out the place where the name was imported
 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))]
+pprNameProvenance (GRE {gre_name = name, gre_prov = Imported whys})
+  = case whys of
+	(why:whys) -> sep [ppr why, nest 2 (ppr_defn (nameSrcLoc name))]
+	[] -> panic "pprNameProvenance"
 
 -- If we know the exact definition point (which we may do with GHCi)
 -- then show that too.  But not if it's just "imported from X".
@@ -538,7 +565,10 @@ ppr_defn loc | isGoodSrcLoc loc = parens (ptext SLIT("defined at") <+> ppr loc)
 	     | otherwise	= empty
 
 instance Outputable ImportSpec where
-   ppr imp_spec@(ImpSpec imp_decl _)
-     = ptext SLIT("imported from") <+> ppr (is_mod imp_decl) 
-	<+> ptext SLIT("at") <+> ppr (importSpecLoc imp_spec)
+   ppr imp_spec
+     = ptext SLIT("imported from") <+> ppr (importSpecModule imp_spec) 
+	<+> if isGoodSrcSpan loc then ptext SLIT("at") <+> ppr loc
+				 else empty
+     where
+       loc = importSpecLoc imp_spec
 \end{code}