X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Frename%2FRnExpr.lhs;h=be0970c1061d89e9e61e1fe8044f715893649968;hp=54ed7ba8324017f6393159ae9b37f956e64f19ac;hb=76ca9b9e7926e0c3f5b7c607116431c07e689813;hpb=e944b32b8e8a88a52e22cb4daa0bdb4ebbb7793f

diff --git a/compiler/rename/RnExpr.lhs b/compiler/rename/RnExpr.lhs
index 54ed7ba..be0970c 100644
--- a/compiler/rename/RnExpr.lhs
+++ b/compiler/rename/RnExpr.lhs
@@ -43,7 +43,7 @@ import Name             ( isTyVarName )
 #endif
 import Name		( Name, nameOccName, nameIsLocalOrFrom )
 import NameSet
-import RdrName		( RdrName, emptyGlobalRdrEnv, extendLocalRdrEnv, lookupLocalRdrEnv )
+import RdrName		( RdrName, emptyGlobalRdrEnv, extendLocalRdrEnv, lookupLocalRdrEnv, hideSomeUnquals )
 import LoadIface	( loadInterfaceForName )
 import UniqFM		( isNullUFM )
 import UniqSet		( emptyUniqSet )
@@ -330,7 +330,7 @@ rnExpr (HsArrForm op fixity cmds)
     returnM (HsArrForm op' fixity cmds', fvOp `plusFV` fvCmds)
 
 rnExpr other = pprPanic "rnExpr: unexpected expression" (ppr other)
-	-- DictApp, DictLam, TyApp, TyLam
+	-- HsCoerce
 \end{code}
 
 
@@ -573,25 +573,26 @@ rnBracket (DecBr group)
 	-- confuse the Names for the current module.  
 	-- By using a pretend module, thFAKE, we keep them safely out of the way.
 
-	; names    <- getLocalDeclBinders gbl_env1 group
-	; rdr_env' <- extendRdrEnvRn emptyGlobalRdrEnv names
-	-- Furthermore, the names in the bracket shouldn't conflict with
-	-- existing top-level names E.g.
+	; names <- getLocalDeclBinders gbl_env1 group
+
+	; let new_occs = map nameOccName names
+	      trimmed_rdr_env = hideSomeUnquals (tcg_rdr_env gbl_env) new_occs
+
+	; rdr_env' <- extendRdrEnvRn trimmed_rdr_env names
+	-- In this situation we want to *shadow* top-level bindings.
 	--	foo = 1
 	--	bar = [d| foo = 1|]
-	-- But both 'foo's get a LocalDef provenance, so we'd get a complaint unless
-	-- we start with an emptyGlobalRdrEnv
-
-	; setGblEnv (gbl_env { tcg_rdr_env = tcg_rdr_env gbl_env1 `plusOccEnv` rdr_env',
+	-- If we don't shadow, we'll get an ambiguity complaint when we do 
+	-- a lookupTopBndrRn (which uses lookupGreLocalRn) on the binder of the 'foo'
+	--
+	-- Furthermore, arguably if the splice does define foo, that should hide
+	-- any foo's further out
+	--
+	-- The shadowing is acheived by the call to hideSomeUnquals, which removes
+	-- the unqualified bindings of things defined by the bracket
+
+	; setGblEnv (gbl_env { tcg_rdr_env = rdr_env',
 			       tcg_dus = emptyDUs }) $ do
-		-- Notice plusOccEnv, not plusGlobalRdrEnv.  In this situation we want
-		-- to *shadow* top-level bindings.  (See the 'foo' example above.)
-		-- If we don't shadow, we'll get an ambiguity complaint when we do 
-		-- a lookupTopBndrRn (which uses lookupGreLocalRn) on the binder of the 'foo'
-		--
-		-- Furthermore, arguably if the splice does define foo, that should hide
-		-- any foo's further out
-		--
 		-- The emptyDUs is so that we just collect uses for this group alone
 
 	{ (tcg_env, group') <- rnSrcDecls group
@@ -971,6 +972,9 @@ mkBreakpointExpr' breakpointFunc scope
 
 srcSpanLit :: SrcSpan -> HsExpr Name
 srcSpanLit span = HsLit (HsString (mkFastString (showSDoc (ppr span))))
+
+srcSpanPrimLit :: SrcSpan -> HsExpr Name
+srcSpanPrimLit span = HsLit (HsStringPrim (mkFastString (showSDoc (ppr span))))
 \end{code}
 
 %************************************************************************
@@ -986,7 +990,7 @@ mkAssertErrorExpr
   = getSrcSpanM    			`thenM` \ sloc ->
     let
 	expr = HsApp (L sloc (HsVar assertErrorName)) 
-		     (L sloc (srcSpanLit sloc))
+		     (L sloc (srcSpanPrimLit sloc))
     in
     returnM (expr, emptyFVs)
 \end{code}