X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Frename%2FRnNames.lhs;h=e95e4917dbe68aa906e1aff4e5f8a228c945a0ef;hb=db95d6e8d319b0c5cee1ccc23751e8190152ade3;hp=a66c4510bf98562de42874e1f9f44a23f80c9585;hpb=cd241c73f2b03a48d905e0db50c796eb0de45dec;p=ghc-hetmet.git diff --git a/ghc/compiler/rename/RnNames.lhs b/ghc/compiler/rename/RnNames.lhs index a66c451..e95e491 100644 --- a/ghc/compiler/rename/RnNames.lhs +++ b/ghc/compiler/rename/RnNames.lhs @@ -25,13 +25,12 @@ import RnEnv import RnMonad import FiniteMap -import PrelNames ( pRELUDE_Name, mAIN_Name, main_RDR ) +import PrelNames ( pRELUDE_Name, mAIN_Name, main_RDR_Unqual, isUnboundName ) 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 ) @@ -57,27 +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_unqual_fn :: Name -> Bool -- Is this chap in scope unqualified? - rec_unqual_fn = unQualInScope rec_gbl_env - - rec_exp_fn :: Name -> Bool - rec_exp_fn = mk_export_fn (availsToNameSet rec_export_avails) - in - - -- PROCESS LOCAL DECLS + = -- 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 @@ -89,7 +74,7 @@ getGlobalNames this_mod (HsModule _ _ exports imports decls _ mod_loc) is_source_import (ImportDecl _ ImportByUserSource _ _ _ _) = True is_source_import other = False - get_imports = importsFromImportDecl this_mod_name rec_unqual_fn + get_imports = importsFromImportDecl this_mod_name in mapAndUnzipRn get_imports ordinary `thenRn` \ (imp_gbl_envs1, imp_avails_s1) -> mapAndUnzipRn get_imports source `thenRn` \ (imp_gbl_envs2, imp_avails_s2) -> @@ -104,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 @@ -144,12 +118,11 @@ getGlobalNames this_mod (HsModule _ _ exports imports decls _ mod_loc) \begin{code} importsFromImportDecl :: ModuleName - -> (Name -> Bool) -- OK to omit qualifier -> RdrNameImportDecl -> RnMG (GlobalRdrEnv, ExportAvails) -importsFromImportDecl this_mod_name is_unqual (ImportDecl imp_mod_name from qual_only as_mod import_spec iloc) +importsFromImportDecl this_mod_name (ImportDecl imp_mod_name from qual_only as_mod import_spec iloc) = pushSrcLocRn iloc $ getInterfaceExports imp_mod_name from `thenRn` \ (imp_mod, avails_by_module) -> @@ -182,11 +155,10 @@ importsFromImportDecl this_mod_name is_unqual (ImportDecl imp_mod_name from qual -- then you'll get a 'B does not export AType' message. Oh well. in - filterImports imp_mod_name import_spec avails `thenRn` \ (filtered_avails, hides, explicits) -> + 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)) - (is_unqual name) in qualifyImports imp_mod_name @@ -198,8 +170,8 @@ importsFromImportDecl this_mod_name is_unqual (ImportDecl imp_mod_name from qual \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 @@ -226,9 +198,8 @@ importsFromLocalDecls this_mod rec_exp_fn decls --------------------------- 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 @@ -236,14 +207,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 [] @@ -252,17 +225,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} @@ -277,6 +244,7 @@ available, and filters it through the import spec (if any). \begin{code} filterImports :: ModuleName -- The module being imported + -> WhereFrom -- Tells whether it's a {-# SOURCE #-} import -> Maybe (Bool, [RdrNameIE]) -- Import spec; True => hiding -> [AvailInfo] -- What's available -> RnMG ([AvailInfo], -- What's actually imported @@ -289,10 +257,10 @@ filterImports :: ModuleName -- The module being imported -- Complains if import spec mentions things that the module doesn't export -- Warns/informs if import spec contains duplicates. -filterImports mod Nothing imports +filterImports mod from Nothing imports = returnRn (imports, [], emptyNameSet) -filterImports mod (Just (want_hiding, import_items)) total_avails +filterImports mod from (Just (want_hiding, import_items)) total_avails = flatMapRn get_item import_items `thenRn` \ avails_w_explicits -> let (item_avails, explicits_s) = unzip avails_w_explicits @@ -314,7 +282,7 @@ filterImports mod (Just (want_hiding, import_items)) total_avails -- they won't make any difference because naked entities like T -- in an import list map to TcOccs, not VarOccs. - bale_out item = addErrRn (badImportItemErr mod item) `thenRn_` + bale_out item = addErrRn (badImportItemErr mod from item) `thenRn_` returnRn [] get_item item@(IEModuleContents _) = bale_out item @@ -505,7 +473,7 @@ exportsFromAvail this_mod Nothing export_avails global_name_env = exportsFromAvail this_mod true_exports export_avails global_name_env where true_exports = Just $ if this_mod == mAIN_Name - then [IEVar main_RDR] + then [IEVar main_RDR_Unqual] -- export Main.main *only* unless otherwise specified, else [IEModuleContents this_mod] -- but for all other modules export everything. @@ -546,9 +514,10 @@ exportsFromAvail this_mod (Just export_items) -- See what's available in the current environment case lookupUFM entity_avail_env name of { - Nothing -> -- I can't see why this should ever happen; if the thing - -- is in scope at all it ought to have some availability - pprTrace "exportsFromAvail: curious Nothing:" (ppr name) + Nothing -> -- Presumably this happens because lookupSrcName didn't find + -- the name and returned an unboundName, which won't be in + -- the entity_avail_env, of course + WARN( not (isUnboundName name), ppr name ) returnRn acc ; Just avail -> @@ -592,9 +561,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} %************************************************************************ @@ -604,9 +570,13 @@ mk_export_fn exported_names = \name -> name `elemNameSet` exported_names %************************************************************************ \begin{code} -badImportItemErr mod ie - = sep [ptext SLIT("Module"), quotes (ppr mod), +badImportItemErr mod from ie + = sep [ptext SLIT("Module"), quotes (ppr mod), source_import, ptext SLIT("does not export"), quotes (ppr ie)] + where + source_import = case from of + ImportByUserSource -> ptext SLIT("(hi-boot interface)") + other -> empty dodgyImportWarn mod item = dodgyMsg (ptext SLIT("import")) item dodgyExportWarn item = dodgyMsg (ptext SLIT("export")) item