X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Frename%2FRnNames.lhs;h=5dc31005df766ba886550a05c64937b72f4e1213;hb=4166dff80e8ec94022a040318ff2759913fbbe06;hp=cccffc3ef17fedb23a99eacc6b91de601b258112;hpb=f23ba2b294429ccbdeb80f0344ec08f6abf61bb7;p=ghc-hetmet.git diff --git a/ghc/compiler/rename/RnNames.lhs b/ghc/compiler/rename/RnNames.lhs index cccffc3..5dc3100 100644 --- a/ghc/compiler/rename/RnNames.lhs +++ b/ghc/compiler/rename/RnNames.lhs @@ -5,7 +5,7 @@ \begin{code} module RnNames ( - getGlobalNames + getGlobalNames, exportsFromAvail ) where #include "HsVersions.h" @@ -30,11 +30,10 @@ import UniqFM ( lookupUFM ) import Bag ( bagToList ) import Module ( ModuleName, moduleName, WhereFrom(..) ) import NameSet -import Name ( Name, nameSrcLoc, - setLocalNameSort, nameOccName, nameEnvElts ) +import Name ( Name, nameSrcLoc, nameOccName, nameEnvElts ) import HscTypes ( Provenance(..), ImportReason(..), GlobalRdrEnv, GenAvailInfo(..), AvailInfo, Avails, AvailEnv ) -import RdrName ( RdrName, rdrNameOcc, setRdrNameOcc, mkRdrQual, mkRdrUnqual ) +import RdrName ( RdrName, rdrNameOcc, setRdrNameOcc ) import OccName ( setOccNameSpace, dataName ) import NameSet ( elemNameSet, emptyNameSet ) import Outputable @@ -57,24 +56,13 @@ import List ( partition ) getGlobalNames :: Module -> RdrNameHsModule -> RnMG (GlobalRdrEnv, -- Maps all in-scope things GlobalRdrEnv, -- Maps just *local* things - Avails, -- The exported stuff - AvailEnv) -- Maps a name to its parent AvailInfo - -- Just for in-scope things only + ExportAvails) -- The exported stuff -getGlobalNames this_mod (HsModule _ _ exports imports decls _ mod_loc) - = -- These two fix-loops are to get the right - -- provenance information into a Name - fixRn ( \ ~(rec_gbl_env, _, rec_export_avails, _) -> - - let - rec_exp_fn :: Name -> Bool - rec_exp_fn = mk_export_fn (availsToNameSet rec_export_avails) - in - - -- PROCESS LOCAL DECLS +getGlobalNames this_mod (HsModule _ _ _ imports decls _ mod_loc) + = -- PROCESS LOCAL DECLS -- Do these *first* so that the correct provenance gets -- into the global name cache. - importsFromLocalDecls this_mod rec_exp_fn decls `thenRn` \ (local_gbl_env, local_mod_avails) -> + importsFromLocalDecls this_mod decls `thenRn` \ (local_gbl_env, local_mod_avails) -> -- PROCESS IMPORT DECLS -- Do the non {- SOURCE -} ones first, so that we get a helpful @@ -101,21 +89,10 @@ getGlobalNames this_mod (HsModule _ _ exports imports decls _ mod_loc) all_avails :: ExportAvails all_avails = foldr plusExportAvails local_mod_avails (imp_avails_s2 ++ imp_avails_s1) - - (_, global_avail_env) = all_avails in - -- PROCESS EXPORT LIST (but not if we've had errors already) - checkErrsRn `thenRn` \ no_errs_so_far -> - (if no_errs_so_far then - exportsFromAvail this_mod_name exports all_avails gbl_env - else - returnRn [] - ) `thenRn` \ export_avails -> - -- ALL DONE - returnRn (gbl_env, local_gbl_env, export_avails, global_avail_env) - ) + returnRn (gbl_env, local_gbl_env, all_avails) where this_mod_name = moduleName this_mod @@ -181,20 +158,22 @@ importsFromImportDecl this_mod_name (ImportDecl imp_mod_name from qual_only as_m filterImports imp_mod_name from import_spec avails `thenRn` \ (filtered_avails, hides, explicits) -> let - mk_provenance name = NonLocalDef (UserImport imp_mod iloc (name `elemNameSet` explicits)) + unqual_imp = not qual_only -- Maybe want unqualified names + qual_mod = case as_mod of + Nothing -> imp_mod_name + Just another_name -> another_name + + mk_prov name = NonLocalDef (UserImport imp_mod iloc (name `elemNameSet` explicits)) + gbl_env = mkGlobalRdrEnv qual_mod unqual_imp hides mk_prov filtered_avails + exports = mkExportAvails qual_mod unqual_imp gbl_env filtered_avails in - - qualifyImports imp_mod_name - (not qual_only) -- Maybe want unqualified names - as_mod hides - mk_provenance - filtered_avails + returnRn (gbl_env, exports) \end{code} \begin{code} -importsFromLocalDecls this_mod rec_exp_fn decls - = mapRn (getLocalDeclBinders this_mod rec_exp_fn) decls `thenRn` \ avails_s -> +importsFromLocalDecls this_mod decls + = mapRn (getLocalDeclBinders this_mod) decls `thenRn` \ avails_s -> let avails = concat avails_s @@ -206,24 +185,25 @@ importsFromLocalDecls this_mod rec_exp_fn decls (_, dups) = removeDups compare all_names in -- Check for duplicate definitions - mapRn_ (addErrRn . dupDeclErr) dups `thenRn_` + mapRn_ (addErrRn . dupDeclErr) dups `thenRn_` -- Record that locally-defined things are available - recordLocalSlurps avails `thenRn_` + recordLocalSlurps (availsToNameSet avails) `thenRn_` - -- Build the environment - qualifyImports (moduleName this_mod) - True -- Want unqualified names - Nothing -- no 'as M' - [] -- Hide nothing - (\n -> LocalDef) -- Provenance is local - avails + let + mod_name = moduleName this_mod + unqual_imp = True -- Want unqualified names + mk_prov n = LocalDef -- Provenance is local + hides = [] -- Hide nothing + gbl_env = mkGlobalRdrEnv mod_name unqual_imp hides mk_prov avails + exports = mkExportAvails mod_name unqual_imp gbl_env avails + in + returnRn (gbl_env, exports) --------------------------- getLocalDeclBinders :: Module - -> (Name -> Bool) -- Whether exported -> RdrNameHsDecl -> RnMG Avails -getLocalDeclBinders mod rec_exp_fn (TyClD tycl_decl) +getLocalDeclBinders mod (TyClD tycl_decl) = -- For type and class decls, we generate Global names, with -- no export indicator. They need to be global because they get -- permanently bound into the TyCons and Classes. They don't need @@ -231,14 +211,16 @@ getLocalDeclBinders mod rec_exp_fn (TyClD tycl_decl) getTyClDeclBinders mod tycl_decl `thenRn` \ avail -> returnRn [avail] -getLocalDeclBinders mod rec_exp_fn (ValD binds) - = mapRn (newLocalBinder mod rec_exp_fn) - (bagToList (collectTopBinders binds)) +getLocalDeclBinders mod (ValD binds) + = mapRn new (bagToList (collectTopBinders binds)) + where + new (rdr_name, loc) = newTopBinder mod rdr_name loc `thenRn` \ name -> + returnRn (Avail name) -getLocalDeclBinders mod rec_exp_fn (ForD (ForeignDecl nm kind _ ext_nm _ loc)) +getLocalDeclBinders mod (ForD (ForeignDecl nm kind _ ext_nm _ loc)) | binds_haskell_name kind - = newLocalBinder mod rec_exp_fn (nm, loc) `thenRn` \ avail -> - returnRn [avail] + = newTopBinder mod nm loc `thenRn` \ name -> + returnRn [Avail name] | otherwise -- a foreign export = returnRn [] @@ -247,17 +229,11 @@ getLocalDeclBinders mod rec_exp_fn (ForD (ForeignDecl nm kind _ ext_nm _ loc)) binds_haskell_name FoLabel = True binds_haskell_name FoExport = isDynamicExtName ext_nm -getLocalDeclBinders mod rec_exp_fn (FixD _) = returnRn [] -getLocalDeclBinders mod rec_exp_fn (DeprecD _) = returnRn [] -getLocalDeclBinders mod rec_exp_fn (DefD _) = returnRn [] -getLocalDeclBinders mod rec_exp_fn (InstD _) = returnRn [] -getLocalDeclBinders mod rec_exp_fn (RuleD _) = returnRn [] - ---------------------------- -newLocalBinder mod rec_exp_fn (rdr_name, loc) - = -- Generate a local name, and with a suitable export indicator - newTopBinder mod rdr_name loc `thenRn` \ name -> - returnRn (Avail (setLocalNameSort name (rec_exp_fn name))) +getLocalDeclBinders mod (FixD _) = returnRn [] +getLocalDeclBinders mod (DeprecD _) = returnRn [] +getLocalDeclBinders mod (DefD _) = returnRn [] +getLocalDeclBinders mod (InstD _) = returnRn [] +getLocalDeclBinders mod (RuleD _) = returnRn [] \end{code} @@ -365,65 +341,12 @@ filterImports mod from (Just (want_hiding, import_items)) total_avails %* * %************************************************************************ -@qualifyImports@ takes the @ExportEnv@ after filtering through the import spec -of an import decl, and deals with producing an @RnEnv@ with the -right qualified names. It also turns the @Names@ in the @ExportEnv@ into -fully fledged @Names@. - \begin{code} -qualifyImports :: ModuleName -- Imported module - -> Bool -- True <=> want unqualified import - -> Maybe ModuleName -- Optional "as M" part - -> [AvailInfo] -- What's to be hidden - -> (Name -> Provenance) - -> Avails -- Whats imported and how - -> RnMG (GlobalRdrEnv, ExportAvails) - -qualifyImports this_mod unqual_imp as_mod hides mk_provenance avails - = - -- Make the name environment. We're talking about a - -- single module here, so there must be no name clashes. - -- In practice there only ever will be if it's the module - -- being compiled. - let - -- Add the things that are available - name_env1 = foldl add_avail emptyRdrEnv avails - - -- Delete things that are hidden - name_env2 = foldl del_avail name_env1 hides - - -- Create the export-availability info - export_avails = mkExportAvails qual_mod unqual_imp name_env2 avails - in - returnRn (name_env2, export_avails) - - where - qual_mod = case as_mod of - Nothing -> this_mod - Just another_name -> another_name - - add_avail :: GlobalRdrEnv -> AvailInfo -> GlobalRdrEnv - add_avail env avail = foldl add_name env (availNames avail) - - add_name env name - | unqual_imp = env2 - | otherwise = env1 - where - env1 = addOneToGlobalRdrEnv env (mkRdrQual qual_mod occ) (name,prov) - env2 = addOneToGlobalRdrEnv env1 (mkRdrUnqual occ) (name,prov) - occ = nameOccName name - prov = mk_provenance name - - del_avail env avail = foldl delOneFromGlobalRdrEnv env rdr_names - where - rdr_names = map (mkRdrUnqual . nameOccName) (availNames avail) - - mkEmptyExportAvails :: ModuleName -> ExportAvails mkEmptyExportAvails mod_name = (unitFM mod_name [], emptyUFM) mkExportAvails :: ModuleName -> Bool -> GlobalRdrEnv -> [AvailInfo] -> ExportAvails -mkExportAvails mod_name unqual_imp name_env avails +mkExportAvails mod_name unqual_imp gbl_env avails = (mod_avail_env, entity_avail_env) where mod_avail_env = unitFM mod_name unqual_avails @@ -444,7 +367,7 @@ mkExportAvails mod_name unqual_imp name_env avails where uqs = filter unqual_in_scope ns - unqual_in_scope n = unQualInScope name_env n + unqual_in_scope n = unQualInScope gbl_env n entity_avail_env = listToUFM [ (name,avail) | avail <- avails, name <- availNames avail] @@ -589,9 +512,6 @@ check_occs ie occs avail failWithRn occs (exportClashErr name_occ ie ie') where name_occ = nameOccName name - -mk_export_fn :: NameSet -> (Name -> Bool) -- True => exported -mk_export_fn exported_names = \name -> name `elemNameSet` exported_names \end{code} %************************************************************************