projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add ASSERTs to all calls of nameModule
[ghc-hetmet.git]
/
compiler
/
rename
/
RnNames.lhs
diff --git
a/compiler/rename/RnNames.lhs
b/compiler/rename/RnNames.lhs
index
e629dac
..
68286b7
100644
(file)
--- a/
compiler/rename/RnNames.lhs
+++ b/
compiler/rename/RnNames.lhs
@@
-1006,7
+1006,7
@@
finishWarnings dflags mod_warn tcg_env
(parens imp_msg) <> colon,
(ppr deprec_txt) ])
where
(parens imp_msg) <> colon,
(ppr deprec_txt) ])
where
- name_mod = nameModule name
+ name_mod = ASSERT2( isExternalName name, ppr name ) nameModule name
imp_mod = importSpecModule imp_spec
imp_msg = ptext (sLit "imported from") <+> ppr imp_mod <> extra
extra | imp_mod == moduleName name_mod = empty
imp_mod = importSpecModule imp_spec
imp_msg = ptext (sLit "imported from") <+> ppr imp_mod <> extra
extra | imp_mod == moduleName name_mod = empty
@@
-1024,7
+1024,7
@@
lookupImpDeprec :: DynFlags -> HomePackageTable -> PackageIfaceTable
-> GlobalRdrElt -> Maybe WarningTxt
-- The name is definitely imported, so look in HPT, PIT
lookupImpDeprec dflags hpt pit gre
-> GlobalRdrElt -> Maybe WarningTxt
-- The name is definitely imported, so look in HPT, PIT
lookupImpDeprec dflags hpt pit gre
- = case lookupIfaceByModule dflags hpt pit (nameModule name) of
+ = case lookupIfaceByModule dflags hpt pit mod of
Just iface -> mi_warn_fn iface name `mplus` -- Bleat if the thing, *or
case gre_par gre of
ParentIs p -> mi_warn_fn iface p -- its parent*, is warn'd
Just iface -> mi_warn_fn iface name `mplus` -- Bleat if the thing, *or
case gre_par gre of
ParentIs p -> mi_warn_fn iface p -- its parent*, is warn'd
@@
-1032,7
+1032,8
@@
lookupImpDeprec dflags hpt pit gre
Nothing -> Nothing -- See Note [Used names with interface not loaded]
where
Nothing -> Nothing -- See Note [Used names with interface not loaded]
where
- name = gre_name gre
+ name = gre_name gre
+ mod = ASSERT2( isExternalName name, ppr name ) nameModule name
\end{code}
Note [Used names with interface not loaded]
\end{code}
Note [Used names with interface not loaded]
@@
-1198,7
+1199,10
@@
reportUnusedNames export_decls gbl_env
(_, no_imp, loc) <- xs,
let mod_name = moduleName mod,
not (mod_name `elemFM` minimal_imports1),
(_, no_imp, loc) <- xs,
let mod_name = moduleName mod,
not (mod_name `elemFM` minimal_imports1),
- mod /= pRELUDE,
+ moduleName mod /= pRELUDE_NAME,
+ -- XXX not really correct, but we don't want
+ -- to generate warnings when compiling against
+ -- a compat version of base.
not no_imp]
-- The not no_imp part is not to complain about
-- import M (), which is an idiom for importing
not no_imp]
-- The not no_imp part is not to complain about
-- import M (), which is an idiom for importing
@@
-1340,7
+1344,7
@@
printMinimalImports imps
where
all_used avail_occs = all (`elem` map nameOccName ns) avail_occs
doc = text "Compute minimal imports from" <+> ppr n
where
all_used avail_occs = all (`elem` map nameOccName ns) avail_occs
doc = text "Compute minimal imports from" <+> ppr n
- n_mod = nameModule n
+ n_mod = ASSERT( isExternalName n ) nameModule n
\end{code}
\end{code}