X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Frename%2FRnNames.lhs;h=a66c4510bf98562de42874e1f9f44a23f80c9585;hb=cd241c73f2b03a48d905e0db50c796eb0de45dec;hp=eb83ac51eacc97ac4f06758868dfdec51c64ec79;hpb=a237946da277f10bd3d223e5926d118044d24194;p=ghc-hetmet.git diff --git a/ghc/compiler/rename/RnNames.lhs b/ghc/compiler/rename/RnNames.lhs index eb83ac5..a66c451 100644 --- a/ghc/compiler/rename/RnNames.lhs +++ b/ghc/compiler/rename/RnNames.lhs @@ -10,40 +10,39 @@ module RnNames ( #include "HsVersions.h" -import CmdLineOpts ( opt_NoImplicitPrelude, opt_WarnDuplicateExports ) - -import HsSyn ( HsModule(..), HsDecl(..), IE(..), ieName, ImportDecl(..), - collectTopBinders - ) -import RdrHsSyn ( RdrNameIE, RdrNameImportDecl, - RdrNameHsModule, RdrNameHsDecl - ) -import RnIfaces ( getInterfaceExports, getDeclBinders, - recordLocalSlurps, checkModUsage, findAndReadIface, outOfDate - ) +import CmdLineOpts ( DynFlag(..) ) + +import HsSyn ( HsModule(..), HsDecl(..), IE(..), ieName, ImportDecl(..), + ForeignDecl(..), ForKind(..), isDynamicExtName, + collectTopBinders + ) +import RdrHsSyn ( RdrNameIE, RdrNameImportDecl, + RdrNameHsModule, RdrNameHsDecl + ) +import RnIfaces ( getInterfaceExports, recordLocalSlurps ) +import RnHiFiles ( getTyClDeclBinders ) import RnEnv import RnMonad import FiniteMap -import PrelNames ( pRELUDE_Name, mAIN_Name, main_RDR ) -import UniqFM ( lookupUFM ) -import Bag ( bagToList ) -import Module ( ModuleName, mkThisModule, pprModuleName, WhereFrom(..) ) +import PrelNames ( pRELUDE_Name, mAIN_Name, main_RDR ) +import UniqFM ( lookupUFM ) +import Bag ( bagToList ) +import Module ( ModuleName, moduleName, WhereFrom(..) ) import NameSet -import Name ( Name, ExportFlag(..), ImportReason(..), Provenance(..), - setNameProvenance, - nameOccName, getSrcLoc, pprProvenance, getNameProvenance, - nameEnvElts - ) -import RdrName ( RdrName, rdrNameOcc, setRdrNameOcc, mkRdrQual, mkRdrUnqual, isQual, isUnqual ) -import OccName ( setOccNameSpace, dataName ) -import NameSet ( elemNameSet, emptyNameSet ) +import Name ( Name, nameSrcLoc, + setLocalNameSort, nameOccName, nameEnvElts ) +import HscTypes ( Provenance(..), ImportReason(..), GlobalRdrEnv, + GenAvailInfo(..), AvailInfo, Avails, AvailEnv ) +import RdrName ( RdrName, rdrNameOcc, setRdrNameOcc, mkRdrQual, mkRdrUnqual ) +import OccName ( setOccNameSpace, dataName ) +import NameSet ( elemNameSet, emptyNameSet ) import Outputable -import Maybes ( maybeToBool, catMaybes, mapMaybe ) -import UniqFM ( emptyUFM, listToUFM ) -import ListSetOps ( removeDups ) -import Util ( sortLt ) -import List ( partition ) +import Maybes ( maybeToBool, catMaybes, mapMaybe ) +import UniqFM ( emptyUFM, listToUFM ) +import ListSetOps ( removeDups ) +import Util ( sortLt ) +import List ( partition ) \end{code} @@ -55,47 +54,45 @@ import List ( partition ) %************************************************************************ \begin{code} -getGlobalNames :: RdrNameHsModule - -> RnMG (Maybe (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 - Maybe ParsedIface -- The old interface file, if any - )) - -- Nothing => no need to recompile - -getGlobalNames (HsModule this_mod _ exports imports decls _ mod_loc) +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 + +getGlobalNames this_mod (HsModule _ _ exports imports decls _ mod_loc) = -- These two fix-loops are to get the right -- provenance information into a Name - fixRn ( \ ~(Just (rec_gbl_env, _, rec_export_avails, _, _)) -> + 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 -> ExportFlag + rec_exp_fn :: Name -> Bool rec_exp_fn = mk_export_fn (availsToNameSet rec_export_avails) in -- 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 rec_exp_fn decls `thenRn` \ (local_gbl_env, local_mod_avails) -> -- PROCESS IMPORT DECLS -- Do the non {- SOURCE -} ones first, so that we get a helpful -- warning for {- SOURCE -} ones that are unnecessary + doptRn Opt_NoImplicitPrelude `thenRn` \ opt_no_prelude -> let + all_imports = mk_prel_imports opt_no_prelude ++ imports (source, ordinary) = partition is_source_import all_imports is_source_import (ImportDecl _ ImportByUserSource _ _ _ _) = True is_source_import other = False + + get_imports = importsFromImportDecl this_mod_name rec_unqual_fn in - mapAndUnzipRn (importsFromImportDecl rec_unqual_fn) ordinary - `thenRn` \ (imp_gbl_envs1, imp_avails_s1) -> - mapAndUnzipRn (importsFromImportDecl rec_unqual_fn) source - `thenRn` \ (imp_gbl_envs2, imp_avails_s2) -> + mapAndUnzipRn get_imports ordinary `thenRn` \ (imp_gbl_envs1, imp_avails_s1) -> + mapAndUnzipRn get_imports source `thenRn` \ (imp_gbl_envs2, imp_avails_s2) -> -- COMBINE RESULTS -- We put the local env second, so that a local provenance @@ -107,149 +104,102 @@ getGlobalNames (HsModule this_mod _ 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 - -- TRY FOR EARLY EXIT - -- We can't go for an early exit before this because we have to check - -- for name clashes. Consider: - -- - -- module A where module B where - -- import B h = True - -- f = h - -- - -- Suppose I've compiled everything up, and then I add a - -- new definition to module B, that defines "f". - -- - -- Then I must detect the name clash in A before going for an early - -- exit. The early-exit code checks what's actually needed from B - -- to compile A, and of course that doesn't include B.f. That's - -- why we wait till after the plusEnv stuff to do the early-exit. - - -- Check For eacly exit - checkErrsRn `thenRn` \ no_errs_so_far -> - if not no_errs_so_far then - -- Found errors already, so exit now - returnRn Nothing - else - checkEarlyExit this_mod `thenRn` \ (up_to_date, old_iface) -> - if up_to_date then - -- Interface files are sufficiently unchanged - putDocRn (text "Compilation IS NOT required") `thenRn_` - returnRn Nothing - else - - -- RECORD BETTER PROVENANCES IN THE CACHE - -- The names in the envirnoment have better provenances (e.g. imported on line x) - -- than the names in the name cache. We update the latter now, so that we - -- we start renaming declarations we'll get the good names - -- The isQual is because the qualified name is always in scope - updateProvenances (concat [names | (rdr_name, names) <- rdrEnvToList gbl_env, - isQual rdr_name]) `thenRn_` - - -- PROCESS EXPORT LISTS - exportsFromAvail this_mod exports all_avails gbl_env `thenRn` \ export_avails -> - + -- 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 (Just (gbl_env, local_gbl_env, export_avails, global_avail_env, old_iface)) + returnRn (gbl_env, local_gbl_env, export_avails, global_avail_env) ) where - all_imports = prel_imports ++ imports + this_mod_name = moduleName this_mod -- NB: opt_NoImplicitPrelude is slightly different to import Prelude (); -- because the former doesn't even look at Prelude.hi for instance declarations, -- whereas the latter does. - prel_imports | this_mod == pRELUDE_Name || - explicit_prelude_import || - opt_NoImplicitPrelude - = [] - - | otherwise = [ImportDecl pRELUDE_Name - ImportByUser - False {- Not qualified -} - Nothing {- No "as" -} - Nothing {- No import list -} - mod_loc] + mk_prel_imports no_prelude + | this_mod_name == pRELUDE_Name || + explicit_prelude_import || + no_prelude + = [] + + | otherwise = [ImportDecl pRELUDE_Name + ImportByUser + False {- Not qualified -} + Nothing {- No "as" -} + Nothing {- No import list -} + mod_loc] explicit_prelude_import = not (null [ () | (ImportDecl mod _ _ _ _ _) <- imports, mod == pRELUDE_Name ]) \end{code} \begin{code} -checkEarlyExit mod_name - = traceRn (text "Considering whether compilation is required...") `thenRn_` - - -- Read the old interface file, if any, for the module being compiled - findAndReadIface doc_str mod_name False {- Not hi-boot -} `thenRn` \ maybe_iface -> - - -- CHECK WHETHER WE HAVE IT ALREADY - case maybe_iface of - Left err -> -- Old interface file not found, so we'd better bail out - traceRn (vcat [ptext SLIT("No old interface file for") <+> pprModuleName mod_name, - err]) `thenRn_` - returnRn (outOfDate, Nothing) - - Right iface - | panic "checkEarlyExit: ???: not opt_SourceUnchanged" - -> -- Source code changed - traceRn (nest 4 (text "source file changed or recompilation check turned off")) `thenRn_` - returnRn (False, Just iface) - - | otherwise - -> -- Source code unchanged and no errors yet... carry on - checkModUsage (pi_usages iface) `thenRn` \ up_to_date -> - returnRn (up_to_date, Just iface) - where - -- Only look in current directory, with suffix .hi - doc_str = sep [ptext SLIT("need usage info from"), pprModuleName mod_name] -\end{code} - -\begin{code} -importsFromImportDecl :: (Name -> Bool) -- OK to omit qualifier +importsFromImportDecl :: ModuleName + -> (Name -> Bool) -- OK to omit qualifier -> RdrNameImportDecl -> RnMG (GlobalRdrEnv, ExportAvails) -importsFromImportDecl is_unqual (ImportDecl imp_mod_name from qual_only as_mod import_spec iloc) +importsFromImportDecl this_mod_name is_unqual (ImportDecl imp_mod_name from qual_only as_mod import_spec iloc) = pushSrcLocRn iloc $ - getInterfaceExports imp_mod_name from `thenRn` \ (imp_mod, avails) -> + getInterfaceExports imp_mod_name from `thenRn` \ (imp_mod, avails_by_module) -> - if null avails then + if null avails_by_module then -- If there's an error in getInterfaceExports, (e.g. interface -- file not found) we get lots of spurious errors from 'filterImports' returnRn (emptyRdrEnv, mkEmptyExportAvails imp_mod_name) else - filterImports imp_mod_name import_spec avails `thenRn` \ (filtered_avails, hides, explicits) -> + let + avails :: Avails + avails = [ avail | (mod_name, avails) <- avails_by_module, + mod_name /= this_mod_name, + avail <- avails ] + -- If the module exports anything defined in this module, just ignore it. + -- Reason: otherwise it looks as if there are two local definition sites + -- for the thing, and an error gets reported. Easiest thing is just to + -- filter them out up front. This situation only arises if a module + -- imports itself, or another module that imported it. (Necessarily, + -- this invoves a loop.) + -- + -- Tiresome consequence: if you say + -- module A where + -- import B( AType ) + -- type AType = ... + -- + -- module B( AType ) where + -- import {-# SOURCE #-} A( AType ) + -- + -- 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) -> + + let + mk_provenance name = NonLocalDef (UserImport imp_mod iloc (name `elemNameSet` explicits)) + (is_unqual name) + in qualifyImports imp_mod_name (not qual_only) -- Maybe want unqualified names as_mod hides - (improveAvails imp_mod iloc explicits - is_unqual filtered_avails) - - -improveAvails imp_mod iloc explicits is_unqual avails - -- We 'improve' the provenance by setting - -- (a) the import-reason field, so that the Name says how it came into scope - -- including whether it's explicitly imported - -- (b) the print-unqualified field - = map improve_avail avails - where - improve_avail (Avail n) = Avail (improve n) - improve_avail (AvailTC n ns) = AvailTC (improve n) (map improve ns) - - improve name = setNameProvenance name - (NonLocalDef (UserImport imp_mod iloc (is_explicit name)) - (is_unqual name)) - is_explicit name = name `elemNameSet` explicits + mk_provenance + filtered_avails \end{code} \begin{code} -importsFromLocalDecls mod_name rec_exp_fn decls - = mapRn (getLocalDeclBinders mod rec_exp_fn) decls `thenRn` \ avails_s -> +importsFromLocalDecls this_mod rec_exp_fn decls + = mapRn (getLocalDeclBinders this_mod rec_exp_fn) decls `thenRn` \ avails_s -> let avails = concat avails_s @@ -267,40 +217,52 @@ importsFromLocalDecls mod_name rec_exp_fn decls recordLocalSlurps avails `thenRn_` -- Build the environment - qualifyImports mod_name - True -- Want unqualified names - Nothing -- no 'as M' - [] -- Hide nothing + qualifyImports (moduleName this_mod) + True -- Want unqualified names + Nothing -- no 'as M' + [] -- Hide nothing + (\n -> LocalDef) -- Provenance is local avails - where - mod = mkThisModule mod_name - -getLocalDeclBinders :: Module -> (Name -> ExportFlag) +--------------------------- +getLocalDeclBinders :: Module + -> (Name -> Bool) -- Whether exported -> RdrNameHsDecl -> RnMG Avails +getLocalDeclBinders mod rec_exp_fn (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 + -- an export indicator because they are all implicitly exported. + getTyClDeclBinders mod tycl_decl `thenRn` \ avail -> + returnRn [avail] + getLocalDeclBinders mod rec_exp_fn (ValD binds) - = mapRn do_one (bagToList (collectTopBinders binds)) - where - do_one (rdr_name, loc) = newLocalName mod rec_exp_fn rdr_name loc `thenRn` \ name -> - returnRn (Avail name) - -getLocalDeclBinders mod rec_exp_fn decl - = getDeclBinders (newLocalName mod rec_exp_fn) decl `thenRn` \ maybe_avail -> - case maybe_avail of - Nothing -> returnRn [] -- Instance decls and suchlike - Just avail -> returnRn [avail] - -newLocalName mod rec_exp_fn rdr_name loc - = check_unqual rdr_name loc `thenRn_` - newTopBinder mod (rdrNameOcc rdr_name) `thenRn` \ name -> - returnRn (setNameProvenance name (LocalDef loc (rec_exp_fn name))) + = mapRn (newLocalBinder mod rec_exp_fn) + (bagToList (collectTopBinders binds)) + +getLocalDeclBinders mod rec_exp_fn (ForD (ForeignDecl nm kind _ ext_nm _ loc)) + | binds_haskell_name kind + = newLocalBinder mod rec_exp_fn (nm, loc) `thenRn` \ avail -> + returnRn [avail] + + | otherwise -- a foreign export + = returnRn [] where - -- There should never be a qualified name in a binding position (except in instance decls) - -- The parser doesn't check this because the same parser parses instance decls - check_unqual rdr_name loc - | isUnqual rdr_name = returnRn () - | otherwise = qualNameErr (text "the binding for" <+> quotes (ppr rdr_name)) - (rdr_name,loc) + binds_haskell_name (FoImport _) = True + 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))) \end{code} @@ -330,7 +292,7 @@ filterImports :: ModuleName -- The module being imported filterImports mod Nothing imports = returnRn (imports, [], emptyNameSet) -filterImports mod (Just (want_hiding, import_items)) avails +filterImports mod (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 @@ -339,14 +301,14 @@ filterImports mod (Just (want_hiding, import_items)) avails if want_hiding then -- All imported; item_avails to be hidden - returnRn (avails, item_avails, emptyNameSet) + returnRn (total_avails, item_avails, emptyNameSet) else -- Just item_avails imported; nothing to be hidden returnRn (item_avails, [], explicits) where import_fm :: FiniteMap OccName AvailInfo import_fm = listToFM [ (nameOccName name, avail) - | avail <- avails, + | avail <- total_avails, name <- availNames avail] -- Even though availNames returns data constructors too, -- they won't make any difference because naked entities like T @@ -417,10 +379,11 @@ 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 avails +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. @@ -450,9 +413,10 @@ qualifyImports this_mod unqual_imp as_mod hides avails | unqual_imp = env2 | otherwise = env1 where - env1 = addOneToGlobalRdrEnv env (mkRdrQual qual_mod occ) name - env2 = addOneToGlobalRdrEnv env1 (mkRdrUnqual occ) name + 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 @@ -549,8 +513,10 @@ exportsFromAvail this_mod Nothing export_avails global_name_env exportsFromAvail this_mod (Just export_items) (mod_avail_env, entity_avail_env) global_name_env - = foldlRn exports_from_item - ([], emptyFM, emptyAvailEnv) export_items `thenRn` \ (_, _, export_avail_map) -> + = doptRn Opt_WarnDuplicateExports `thenRn` \ warn_dup_exports -> + foldlRn (exports_from_item warn_dup_exports) + ([], emptyFM, emptyAvailEnv) export_items + `thenRn` \ (_, _, export_avail_map) -> let export_avails :: [AvailInfo] export_avails = nameEnvElts export_avail_map @@ -558,12 +524,11 @@ exportsFromAvail this_mod (Just export_items) returnRn export_avails where - exports_from_item :: ExportAccum -> RdrNameIE -> RnMG ExportAccum + exports_from_item :: Bool -> ExportAccum -> RdrNameIE -> RnMG ExportAccum - exports_from_item acc@(mods, occs, avails) ie@(IEModuleContents mod) + exports_from_item warn_dups acc@(mods, occs, avails) ie@(IEModuleContents mod) | mod `elem` mods -- Duplicate export of M - = warnCheckRn opt_WarnDuplicateExports - (dupModuleExport mod) `thenRn_` + = warnCheckRn warn_dups (dupModuleExport mod) `thenRn_` returnRn acc | otherwise @@ -576,58 +541,50 @@ exportsFromAvail this_mod (Just export_items) in returnRn (mod:mods, occs', avails') - exports_from_item acc@(mods, occs, avails) ie - | not (maybeToBool maybe_in_scope) - = failWithRn acc (unknownNameErr (ieName ie)) - - | not (null dup_names) - = addNameClashErrRn rdr_name (name:dup_names) `thenRn_` - returnRn acc + exports_from_item warn_dups acc@(mods, occs, avails) ie + = lookupSrcName global_name_env (ieName ie) `thenRn` \ name -> -#ifdef DEBUG - -- I can't see why this should ever happen; if the thing is in scope - -- at all it ought to have some availability - | not (maybeToBool maybe_avail) - = pprTrace "exportsFromAvail: curious Nothing:" (ppr name) - returnRn acc -#endif + -- 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) + returnRn acc ; - | not enough_avail - = failWithRn acc (exportItemErr ie) + Just avail -> - | otherwise -- Phew! It's OK! Now to check the occurrence stuff! + -- Filter out the bits we want + case filterAvail ie avail of { + Nothing -> -- Not enough availability + failWithRn acc (exportItemErr ie) ; + Just export_avail -> - = warnCheckRn (ok_item ie avail) (dodgyExportWarn ie) `thenRn_` + -- Phew! It's OK! Now to check the occurrence stuff! + warnCheckRn (ok_item ie avail) (dodgyExportWarn ie) `thenRn_` check_occs ie occs export_avail `thenRn` \ occs' -> returnRn (mods, occs', addAvail avails export_avail) + }} - where - rdr_name = ieName ie - maybe_in_scope = lookupFM global_name_env rdr_name - Just (name:dup_names) = maybe_in_scope - maybe_avail = lookupUFM entity_avail_env name - Just avail = maybe_avail - maybe_export_avail = filterAvail ie avail - enough_avail = maybeToBool maybe_export_avail - Just export_avail = maybe_export_avail - - ok_item (IEThingAll _) (AvailTC _ [n]) = False - -- This occurs when you import T(..), but - -- only export T abstractly. The single [n] - -- in the AvailTC is the type or class itself - ok_item _ _ = True + + +ok_item (IEThingAll _) (AvailTC _ [n]) = False + -- This occurs when you import T(..), but + -- only export T abstractly. The single [n] + -- in the AvailTC is the type or class itself +ok_item _ _ = True check_occs :: RdrNameIE -> ExportOccMap -> AvailInfo -> RnMG ExportOccMap check_occs ie occs avail - = foldlRn check occs (availNames avail) + = doptRn Opt_WarnDuplicateExports `thenRn` \ warn_dup_exports -> + foldlRn (check warn_dup_exports) occs (availNames avail) where - check occs name + check warn_dup occs name = case lookupFM occs name_occ of Nothing -> returnRn (addToFM occs name_occ (name, ie)) Just (name', ie') | name == name' -> -- Duplicate export - warnCheckRn opt_WarnDuplicateExports + warnCheckRn warn_dup (dupExportWarn name_occ ie ie') `thenRn_` returnRn occs @@ -636,11 +593,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} %************************************************************************ @@ -651,7 +605,7 @@ mk_export_fn exported_names \begin{code} badImportItemErr mod ie - = sep [ptext SLIT("Module"), quotes (pprModuleName mod), + = sep [ptext SLIT("Module"), quotes (ppr mod), ptext SLIT("does not export"), quotes (ppr ie)] dodgyImportWarn mod item = dodgyMsg (ptext SLIT("import")) item @@ -663,7 +617,7 @@ dodgyMsg kind item@(IEThingAll tc) ptext SLIT("but it has none; it is a type synonym or abstract type or class") ] modExportErr mod - = hsep [ ptext SLIT("Unknown module in export list: module"), quotes (pprModuleName mod)] + = hsep [ ptext SLIT("Unknown module in export list: module"), quotes (ppr mod)] exportItemErr export_item = sep [ ptext SLIT("The export item") <+> quotes (ppr export_item), @@ -676,13 +630,10 @@ exportClashErr occ_name ie1 ie2 dupDeclErr (n:ns) = vcat [ptext SLIT("Multiple declarations of") <+> quotes (ppr n), - nest 4 (vcat (map pp sorted_ns))] + nest 4 (vcat (map ppr sorted_locs))] where - sorted_ns = sortLt occ'ed_before (n:ns) - - occ'ed_before a b = LT == compare (getSrcLoc a) (getSrcLoc b) - - pp n = pprProvenance (getNameProvenance n) + sorted_locs = sortLt occ'ed_before (map nameSrcLoc (n:ns)) + occ'ed_before a b = LT == compare a b dupExportWarn occ_name ie1 ie2 = hsep [quotes (ppr occ_name), @@ -691,6 +642,6 @@ dupExportWarn occ_name ie1 ie2 dupModuleExport mod = hsep [ptext SLIT("Duplicate"), - quotes (ptext SLIT("Module") <+> pprModuleName mod), + quotes (ptext SLIT("Module") <+> ppr mod), ptext SLIT("in export list")] \end{code}