projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b8341ac
)
[project @ 2001-10-23 08:56:50 by simonpj]
author
simonpj
<unknown>
Tue, 23 Oct 2001 08:56:50 +0000
(08:56 +0000)
committer
simonpj
<unknown>
Tue, 23 Oct 2001 08:56:50 +0000
(08:56 +0000)
Use elemRdrEnv
ghc/compiler/rename/RnEnv.lhs
patch
|
blob
|
history
diff --git
a/ghc/compiler/rename/RnEnv.lhs
b/ghc/compiler/rename/RnEnv.lhs
index
82ac8c1
..
f317462
100644
(file)
--- 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,
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 )
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)
-- 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 ()
= 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
in
(case mode of