projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 1999-12-09 12:30:56 by simonpj]
[ghc-hetmet.git]
/
ghc
/
compiler
/
rename
/
RnNames.lhs
diff --git
a/ghc/compiler/rename/RnNames.lhs
b/ghc/compiler/rename/RnNames.lhs
index
fa5b376
..
d98dc2a
100644
(file)
--- a/
ghc/compiler/rename/RnNames.lhs
+++ b/
ghc/compiler/rename/RnNames.lhs
@@
-142,8
+142,7
@@
getGlobalNames (HsModule this_mod _ exports imports decls mod_loc)
isQual rdr_name]) `thenRn_`
-- PROCESS EXPORT LISTS
isQual rdr_name]) `thenRn_`
-- PROCESS EXPORT LISTS
- exportsFromAvail this_mod exports all_avails gbl_env
- `thenRn` \ exported_avails ->
+ exportsFromAvail this_mod exports all_avails gbl_env `thenRn` \ exported_avails ->
-- DONE
returnRn (gbl_env, exported_avails, Just all_avails)
-- DONE
returnRn (gbl_env, exported_avails, Just all_avails)
@@
-164,14
+163,17
@@
getGlobalNames (HsModule this_mod _ exports imports decls mod_loc)
| FixitySig name fixity _ <- nameEnvElts local_fixity_env,
isLocallyDefined name
]
| FixitySig name fixity _ <- nameEnvElts local_fixity_env,
isLocallyDefined name
]
- in
- traceRn (text "fixity env" <+> vcat (map ppr (nameEnvElts local_fixity_env))) `thenRn_`
- --- TIDY UP
- let
- export_env = ExportEnv exported_avails exported_fixities
+ -- CONSTRUCT RESULTS
+ export_mods = case exports of
+ Nothing -> []
+ Just es -> [mod | IEModuleContents mod <- es, mod /= this_mod]
+
+ export_env = ExportEnv exported_avails exported_fixities export_mods
(_, global_avail_env) = all_avails
in
(_, global_avail_env) = all_avails
in
+ traceRn (text "fixity env" <+> vcat (map ppr (nameEnvElts local_fixity_env))) `thenRn_`
+
returnRn (Just (export_env, gbl_env, local_fixity_env, global_avail_env))
}
where
returnRn (Just (export_env, gbl_env, local_fixity_env, global_avail_env))
}
where