X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Frename%2FRnNames.lhs;h=a51c1d509e7837038b0fc5959b7389bc6ae7bf5e;hb=8d1cd3a8731f96df28e22c1d19adc12bfd21282f;hp=16fca3fb0c0b156a6c43283a02bc82ba98905f80;hpb=1343291ca4aa89e703b4f99f727d5c110cb2f9ed;p=ghc-hetmet.git diff --git a/ghc/compiler/rename/RnNames.lhs b/ghc/compiler/rename/RnNames.lhs index 16fca3f..a51c1d5 100644 --- a/ghc/compiler/rename/RnNames.lhs +++ b/ghc/compiler/rename/RnNames.lhs @@ -30,7 +30,7 @@ import UniqFM ( lookupUFM ) import Bag ( bagToList ) import Module ( ModuleName, mkThisModule, pprModuleName, WhereFrom(..) ) import NameSet -import Name ( Name, ExportFlag(..), ImportReason(..), Provenance(..), +import Name ( Name, ImportReason(..), Provenance(..), setLocalNameSort, nameOccName, nameEnvElts ) import RdrName ( RdrName, rdrNameOcc, setRdrNameOcc, mkRdrQual, mkRdrUnqual, isQual, isUnqual ) @@ -72,7 +72,7 @@ getGlobalNames (HsModule this_mod _ exports imports decls _ mod_loc) rec_unqual_fn :: Name -> Bool -- Is this chap in scope unqualified? rec_unqual_fn = unQualInScope rec_gbl_env - rec_exp_fn :: Name -> ExportFlag + rec_exp_fn :: Name -> Bool rec_exp_fn = mk_export_fn (availsToNameSet rec_export_avails) in @@ -618,11 +618,8 @@ check_occs ie occs avail where name_occ = nameOccName name -mk_export_fn :: NameSet -> (Name -> ExportFlag) -mk_export_fn exported_names - = \name -> if name `elemNameSet` exported_names - then Exported - else NotExported +mk_export_fn :: NameSet -> (Name -> Bool) -- True => exported +mk_export_fn exported_names = \name -> name `elemNameSet` exported_names \end{code} %************************************************************************