From: simonpj <unknown>
Date: Tue, 23 Oct 2001 08:56:50 +0000 (+0000)
Subject: [project @ 2001-10-23 08:56:50 by simonpj]
X-Git-Tag: Approximately_9120_patches~755
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=f8a58611da340c00803fb6ce349074b31b72d438;p=ghc-hetmet.git

[project @ 2001-10-23 08:56:50 by simonpj]
Use elemRdrEnv
---

diff --git a/ghc/compiler/rename/RnEnv.lhs b/ghc/compiler/rename/RnEnv.lhs
index 82ac8c1..f317462 100644
--- a/ghc/compiler/rename/RnEnv.lhs
+++ b/ghc/compiler/rename/RnEnv.lhs
@@ -13,7 +13,8 @@ import {-# SOURCE #-} RnHiFiles
 import HsSyn
 import RdrHsSyn		( RdrNameIE, RdrNameHsType, extractHsTyRdrTyVars )
 import RdrName		( RdrName, rdrNameModule, rdrNameOcc, isQual, isUnqual, isOrig,
-			  mkRdrUnqual, mkRdrQual, lookupRdrEnv, foldRdrEnv, rdrEnvToList,
+			  mkRdrUnqual, mkRdrQual, 
+			  lookupRdrEnv, foldRdrEnv, rdrEnvToList, elemRdrEnv,
 			  unqualifyRdrName
 			)
 import HsTypes		( hsTyVarName, replaceTyVarName )
@@ -492,13 +493,11 @@ bindLocatedLocalsRn doc_str rdr_names_w_loc enclosed_scope
     	-- Warn about shadowing, but only in source modules
     let
       check_shadow (rdr_name,loc)
-	| isJust local || isJust global
+	|  rdr_name `elemRdrEnv` local_env 
+ 	|| rdr_name `elemRdrEnv` global_env 
 	= pushSrcLocRn loc $ addWarnRn (shadowedNameWarn rdr_name)
         | otherwise 
 	= returnRn ()
-	where
-	  local  = lookupRdrEnv local_env rdr_name
-	  global = lookupRdrEnv global_env rdr_name
     in
 
     (case mode of