X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Frename%2FRnNames.lhs;h=4cdb241d8eee7cdefea308291d06cd95a8ce70b9;hb=9d7da331989abcd1844e9d03b8d1e4163796fa85;hp=62cb2dbb837bf3263f184cf3cae82f6eb178935a;hpb=3721dd37a707d2aacb5cac814410a78096e28a2c;p=ghc-hetmet.git diff --git a/ghc/compiler/rename/RnNames.lhs b/ghc/compiler/rename/RnNames.lhs index 62cb2db..4cdb241 100644 --- a/ghc/compiler/rename/RnNames.lhs +++ b/ghc/compiler/rename/RnNames.lhs @@ -5,56 +5,59 @@ \begin{code} module RnNames ( - rnImports, importsFromLocalDecls, exportsFromAvail, + rnImports, importsFromLocalDecls, + rnExports, + getLocalDeclBinders, extendRdrEnvRn, reportUnusedNames, reportDeprecations, - mkModDeps, exportsToAvails + mkModDeps ) where #include "HsVersions.h" -import CmdLineOpts ( DynFlag(..) ) +import DynFlags ( DynFlag(..), GhcMode(..) ) import HsSyn ( IE(..), ieName, ImportDecl(..), LImportDecl, - ForeignDecl(..), HsGroup(..), - collectGroupBinders, tyClDeclNames + ForeignDecl(..), HsGroup(..), HsValBinds(..), + Sig(..), collectHsBindLocatedBinders, tyClDeclNames ) import RnEnv -import IfaceEnv ( lookupOrig, newGlobalBinder ) +import IfaceEnv ( ifaceExportNames ) import LoadIface ( loadSrcInterface ) import TcRnMonad import FiniteMap -import PrelNames ( pRELUDE_Name, isBuiltInSyntaxName, isUnboundName, - main_RDR_Unqual ) -import Module ( Module, ModuleName, moduleName, mkPackageModule, - moduleNameUserString, isHomeModule, - unitModuleEnvByName, unitModuleEnv, - lookupModuleEnvByName, moduleEnvElts ) -import Name ( Name, nameSrcLoc, nameOccName, nameModuleName, - nameParent, nameParent_maybe, isExternalName, nameModule ) +import PrelNames ( pRELUDE, isUnboundName, main_RDR_Unqual ) +import Module ( Module, moduleString, unitModuleEnv, + lookupModuleEnv, moduleEnvElts, foldModuleEnv ) +import Name ( Name, nameSrcLoc, nameOccName, nameModule, isWiredInName, + nameParent, nameParent_maybe, isExternalName, + isBuiltInSyntax ) import NameSet import NameEnv -import OccName ( srcDataName, isTcOcc, occNameFlavour, OccEnv, - mkOccEnv, lookupOccEnv, emptyOccEnv, extendOccEnv ) -import HscTypes ( GenAvailInfo(..), AvailInfo, Avails, GhciMode(..), - IfaceExport, HomePackageTable, PackageIfaceTable, - availName, availNames, availsToNameSet, unQualInScope, - Deprecs(..), ModIface(..), Dependencies(..), lookupIface, - ExternalPackageState(..) +import OccName ( srcDataName, isTcOcc, pprNonVarNameSpace, + occNameSpace, + OccEnv, mkOccEnv, lookupOccEnv, emptyOccEnv, + extendOccEnv ) +import HscTypes ( GenAvailInfo(..), AvailInfo, + HomePackageTable, PackageIfaceTable, + unQualInScope, + Deprecs(..), ModIface(..), Dependencies(..), + lookupIface, ExternalPackageState(..) ) +import Packages ( PackageIdH(..) ) import RdrName ( RdrName, rdrNameOcc, setRdrNameSpace, GlobalRdrEnv, mkGlobalRdrEnv, GlobalRdrElt(..), emptyGlobalRdrEnv, plusGlobalRdrEnv, globalRdrEnvElts, - unQualOK, lookupGRE_Name, - Provenance(..), ImportSpec(..), - isLocalGRE, pprNameProvenance ) + extendGlobalRdrEnv, lookupGlobalRdrEnv, unQualOK, lookupGRE_Name, + Provenance(..), ImportSpec(..), ImpDeclSpec(..), ImpItemSpec(..), + importSpecLoc, importSpecModule, isLocalGRE, pprNameProvenance ) import Outputable -import Maybes ( isJust, isNothing, catMaybes, mapCatMaybes, seqMaybe ) -import SrcLoc ( noSrcLoc, Located(..), mkGeneralSrcSpan, - unLoc, noLoc ) +import Maybes ( isNothing, catMaybes, mapCatMaybes, seqMaybe, orElse ) +import SrcLoc ( Located(..), mkGeneralSrcSpan, + unLoc, noLoc, srcLocSpan, SrcSpan ) import BasicTypes ( DeprecTxt ) -import ListSetOps ( removeDups ) -import Util ( sortLt, notNull, isSingleton ) -import List ( partition, insert ) +import DriverPhases ( isHsBoot ) +import Util ( notNull ) +import List ( partition ) import IO ( openFile, IOMode(..) ) \end{code} @@ -71,51 +74,51 @@ rnImports :: [LImportDecl RdrName] -> RnM (GlobalRdrEnv, ImportAvails) rnImports imports - = -- PROCESS IMPORT DECLS + = do { -- PROCESS IMPORT DECLS -- Do the non {- SOURCE -} ones first, so that we get a helpful -- warning for {- SOURCE -} ones that are unnecessary - getModule `thenM` \ this_mod -> - doptM Opt_NoImplicitPrelude `thenM` \ opt_no_prelude -> - let - all_imports = mk_prel_imports this_mod opt_no_prelude ++ imports - (source, ordinary) = partition is_source_import all_imports - is_source_import (L _ (ImportDecl _ is_boot _ _ _)) = is_boot - - get_imports = importsFromImportDecl this_mod - in - mappM get_imports ordinary `thenM` \ stuff1 -> - mappM get_imports source `thenM` \ stuff2 -> + this_mod <- getModule + ; implicit_prelude <- doptM Opt_ImplicitPrelude + ; let + all_imports = mk_prel_imports this_mod implicit_prelude ++ imports + (source, ordinary) = partition is_source_import all_imports + is_source_import (L _ (ImportDecl _ is_boot _ _ _)) = is_boot + + get_imports = importsFromImportDecl this_mod + + ; stuff1 <- mappM get_imports ordinary + ; stuff2 <- mappM get_imports source -- COMBINE RESULTS - let + ; let (imp_gbl_envs, imp_avails) = unzip (stuff1 ++ stuff2) gbl_env :: GlobalRdrEnv gbl_env = foldr plusGlobalRdrEnv emptyGlobalRdrEnv imp_gbl_envs all_avails :: ImportAvails all_avails = foldr plusImportAvails emptyImportAvails imp_avails - in + -- ALL DONE - returnM (gbl_env, all_avails) + ; return (gbl_env, all_avails) } where -- 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. - mk_prel_imports this_mod no_prelude - | moduleName this_mod == pRELUDE_Name + mk_prel_imports this_mod implicit_prelude + | this_mod == pRELUDE || explicit_prelude_import - || no_prelude + || not implicit_prelude = [] | otherwise = [preludeImportDecl] explicit_prelude_import = notNull [ () | L _ (ImportDecl mod _ _ _ _) <- imports, - unLoc mod == pRELUDE_Name ] + unLoc mod == pRELUDE ] preludeImportDecl = L loc $ - ImportDecl (L loc pRELUDE_Name) + ImportDecl (L loc pRELUDE) False {- Not a boot interface -} False {- Not qualified -} Nothing {- No "as" -} @@ -132,13 +135,12 @@ importsFromImportDecl :: Module importsFromImportDecl this_mod (L loc (ImportDecl loc_imp_mod_name want_boot qual_only as_mod imp_details)) = - addSrcSpan loc $ + setSrcSpan loc $ -- If there's an error in loadInterface, (e.g. interface -- file not found) we get lots of spurious errors from 'filterImports' let imp_mod_name = unLoc loc_imp_mod_name - this_mod_name = moduleName this_mod doc = ppr imp_mod_name <+> ptext SLIT("is directly imported") in loadSrcInterface doc imp_mod_name want_boot `thenM` \ iface -> @@ -160,7 +162,7 @@ importsFromImportDecl this_mod deps = mi_deps iface filtered_exports = filter not_this_mod (mi_exports iface) - not_this_mod (mod,_) = mod /= this_mod_name + not_this_mod (mod,_) = mod /= this_mod -- 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 @@ -181,52 +183,58 @@ importsFromImportDecl this_mod qual_mod_name = case as_mod of Nothing -> imp_mod_name Just another_name -> another_name - imp_spec = ImportSpec { is_mod = imp_mod_name, is_qual = qual_only, - is_loc = loc, is_as = qual_mod_name } + imp_spec = ImpDeclSpec { is_mod = imp_mod_name, is_qual = qual_only, + is_dloc = loc, is_as = qual_mod_name } in - -- Get the total imports, and filter them according to the import list - exportsToAvails filtered_exports `thenM` \ total_avails -> + ifaceExportNames filtered_exports `thenM` \ total_avails -> filterImports iface imp_spec imp_details total_avails `thenM` \ (avail_env, gbl_env) -> + getDOpts `thenM` \ dflags -> + let -- Compute new transitive dependencies - orphans | is_orph = insert imp_mod_name (dep_orphs deps) + + orphans | is_orph = ASSERT( not (imp_mod_name `elem` dep_orphs deps) ) + imp_mod_name : dep_orphs deps | otherwise = dep_orphs deps (dependent_mods, dependent_pkgs) - | isHomeModule imp_mod - = -- Imported module is from the home package - -- Take its dependent modules and - -- (a) remove this_mod (might be there as a hi-boot) - -- (b) add imp_mod itself + = case mi_package iface of + HomePackage -> + -- Imported module is from the home package + -- Take its dependent modules and add imp_mod itself -- Take its dependent packages unchanged - ((imp_mod_name, want_boot) : filter not_self (dep_mods deps), dep_pkgs deps) - - | otherwise - = -- Imported module is from another package + -- + -- NB: (dep_mods deps) might include a hi-boot file + -- for the module being compiled, CM. Do *not* filter + -- this out (as we used to), because when we've + -- finished dealing with the direct imports we want to + -- know if any of them depended on CM.hi-boot, in + -- which case we should do the hi-boot consistency + -- check. See LoadIface.loadHiBootInterface + ((imp_mod_name, want_boot) : dep_mods deps, dep_pkgs deps) + + ExtPackage pkg -> + -- Imported module is from another package -- Dump the dependent modules -- Add the package imp_mod comes from to the dependent packages - -- from imp_mod - ([], insert (mi_package iface) (dep_pkgs deps)) - - not_self (m, _) = m /= this_mod_name + ASSERT2( not (pkg `elem` dep_pkgs deps), ppr pkg <+> ppr (dep_pkgs deps) ) + ([], pkg : dep_pkgs deps) + -- True <=> import M () import_all = case imp_details of - Just (is_hiding, ls) -- Imports are spec'd explicitly - | not is_hiding -> Just (not (null ls)) - _ -> Nothing -- Everything is imported, - -- (or almost everything [hiding]) + Just (is_hiding, ls) -> not is_hiding && null ls + other -> False -- unqual_avails is the Avails that are visible in *unqualified* form -- We need to know this so we know what to export when we see -- module M ( module P ) where ... -- Then we must export whatever came from P unqualified. imports = ImportAvails { - imp_qual = unitModuleEnvByName qual_mod_name avail_env, - imp_env = avail_env, - imp_mods = unitModuleEnv imp_mod (imp_mod, import_all), + imp_env = unitModuleEnv qual_mod_name avail_env, + imp_mods = unitModuleEnv imp_mod (imp_mod, import_all, loc), imp_orphs = orphans, imp_dep_mods = mkModDeps dependent_mods, imp_dep_pkgs = dependent_pkgs } @@ -241,31 +249,6 @@ importsFromImportDecl this_mod returnM (gbl_env, imports) -exportsToAvails :: [IfaceExport] -> TcRnIf gbl lcl Avails -exportsToAvails exports - = do { avails_by_module <- mappM do_one exports - ; return (concat avails_by_module) } - where - do_one (mod_name, exports) = mapM (do_avail mod_name) exports - do_avail mod_nm (Avail n) = do { n' <- lookupOrig mod_nm n; - ; return (Avail n') } - do_avail mod_nm (AvailTC n ns) = do { n' <- lookupOrig mod_nm n - ; ns' <- mappM (lookup_sub n') ns - ; return (AvailTC n' ns') } - where - mod = mkPackageModule mod_nm -- Not necessarily right yet - lookup_sub parent occ = newGlobalBinder mod occ (Just parent) noSrcLoc - -- Hack alert! Notice the newGlobalBinder. It ensures that the subordinate - -- names record their parent; and that in turn ensures that the GlobalRdrEnv - -- has the correct parent for all the names in its range. - -- For imported things, we only suck in the binding site later, if ever. - -- Reason for all this: - -- Suppose module M exports type A.T, and constructor A.MkT - -- Then, we know that A.MkT is a subordinate name of A.T, - -- even though we aren't at the binding site of A.T - -- And it's important, because we may simply re-export A.T - -- without ever sucking in the declaration itself. - warnRedundantSourceImport mod_name = ptext SLIT("Unnecessary {- SOURCE -} in the import of module") <+> quotes (ppr mod_name) @@ -286,33 +269,14 @@ created by its bindings. Complain about duplicate bindings \begin{code} -importsFromLocalDecls :: HsGroup RdrName - -> RnM (GlobalRdrEnv, ImportAvails) +importsFromLocalDecls :: HsGroup RdrName -> RnM TcGblEnv importsFromLocalDecls group - = getModule `thenM` \ this_mod -> - getLocalDeclBinders this_mod group `thenM` \ avails -> - -- The avails that are returned don't include the "system" names - let - all_names :: [Name] -- All the defns; no dups eliminated - all_names = [name | avail <- avails, name <- availNames avail] + = do { gbl_env <- getGblEnv - dups :: [[Name]] - (_, dups) = removeDups compare all_names - in - -- Check for duplicate definitions - -- The complaint will come out as "Multiple declarations of Foo.f" because - -- since 'f' is in the env twice, the unQualInScope used by the error-msg - -- printer returns False. It seems awkward to fix, unfortunately. - mappM_ (addErr . dupDeclErr) dups `thenM_` - - doptM Opt_NoImplicitPrelude `thenM` \ implicit_prelude -> - let - mod_name = moduleName this_mod - prov = LocalDef mod_name - gbl_env = mkGlobalRdrEnv gres - gres = [ GRE { gre_name = name, gre_prov = prov} - | name <- all_names] + ; names <- getLocalDeclBinders gbl_env group + ; implicit_prelude <- doptM Opt_ImplicitPrelude + ; let { -- Optimisation: filter out names for built-in syntax -- They just clutter up the environment (esp tuples), and the parser -- will generate Exact RdrNames for them, so the cluttered @@ -323,67 +287,80 @@ importsFromLocalDecls group -- It's worth doing because it makes the environment smaller for -- every module that imports the Prelude -- - -- Note: don't filter the gbl_env (hence avails, not avails' in - -- defn of gbl_env above). Stupid reason: when parsing + -- Note: don't filter the gbl_env (hence all_names, not filered_all_names + -- in defn of gres above). Stupid reason: when parsing -- data type decls, the constructors start as Exact tycon-names, -- and then get turned into data con names by zapping the name space; -- but that stops them being Exact, so they get looked up. -- Ditto in fixity decls; e.g. infix 5 : -- Sigh. It doesn't matter because it only affects the Data.Tuple really. -- The important thing is to trim down the exports. - - avails' | implicit_prelude = filter not_built_in_syntax avails - | otherwise = avails - not_built_in_syntax a = not (all isBuiltInSyntaxName (availNames a)) - -- Only filter it if all the names of the avail are built-in - -- In particular, lists have (:) which is not built in syntax - -- so we don't filter it out. [Sept 03: wrong: see isBuiltInSyntaxName] - - avail_env = mkAvailEnv avails' - imports = emptyImportAvails { - imp_qual = unitModuleEnv this_mod avail_env, - imp_env = avail_env - } - in - returnM (gbl_env, imports) + filtered_names + | implicit_prelude = names + | otherwise = filter (not . isBuiltInSyntax) names ; + + ; this_mod = tcg_mod gbl_env + ; imports = emptyImportAvails { + imp_env = unitModuleEnv this_mod $ + mkNameSet filtered_names + } + } + + ; rdr_env' <- extendRdrEnvRn (tcg_rdr_env gbl_env) names + + ; returnM (gbl_env { tcg_rdr_env = rdr_env', + tcg_imports = imports `plusImportAvails` tcg_imports gbl_env }) + } + +extendRdrEnvRn :: GlobalRdrEnv -> [Name] -> RnM GlobalRdrEnv +-- Add the new locally-bound names one by one, checking for duplicates as +-- we do so. Remember that in Template Haskell the duplicates +-- might *already be* in the GlobalRdrEnv from higher up the module +extendRdrEnvRn rdr_env names + = foldlM add_local rdr_env names + where + add_local rdr_env name + | gres <- lookupGlobalRdrEnv rdr_env (nameOccName name) + , (dup_gre:_) <- filter isLocalGRE gres -- Check for existing *local* defns + = do { addDupDeclErr (gre_name dup_gre) name + ; return rdr_env } + | otherwise + = return (extendGlobalRdrEnv rdr_env new_gre) + where + new_gre = GRE {gre_name = name, gre_prov = LocalDef} \end{code} - -%********************************************************* -%* * -\subsection{Getting binders out of a declaration} -%* * -%********************************************************* - @getLocalDeclBinders@ returns the names for an @HsDecl@. It's used for source code. *** See "THE NAMING STORY" in HsDecls **** \begin{code} -getLocalDeclBinders :: Module -> HsGroup RdrName -> RnM [AvailInfo] -getLocalDeclBinders mod (HsGroup {hs_valds = val_decls, - hs_tyclds = tycl_decls, - hs_fords = foreign_decls }) - = -- 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. - - mappM new_tc tycl_decls `thenM` \ tc_avails -> - mappM new_simple (for_hs_bndrs ++ val_hs_bndrs) `thenM` \ simple_avails -> - returnM (tc_avails ++ simple_avails) +getLocalDeclBinders :: TcGblEnv -> HsGroup RdrName -> RnM [Name] +getLocalDeclBinders gbl_env (HsGroup {hs_valds = ValBindsIn val_decls val_sigs, + hs_tyclds = tycl_decls, + hs_fords = foreign_decls }) + = do { tc_names_s <- mappM new_tc tycl_decls + ; val_names <- mappM new_simple val_bndrs + ; return (foldr (++) val_names tc_names_s) } where - new_simple rdr_name = newTopSrcBinder mod Nothing rdr_name `thenM` \ name -> - returnM (Avail name) + mod = tcg_mod gbl_env + is_hs_boot = isHsBoot (tcg_src gbl_env) ; + val_bndrs | is_hs_boot = sig_hs_bndrs + | otherwise = for_hs_bndrs ++ val_hs_bndrs + -- In a hs-boot file, the value binders come from the + -- *signatures*, and there should be no foreign binders + + new_simple rdr_name = newTopSrcBinder mod Nothing rdr_name - val_hs_bndrs = collectGroupBinders val_decls + sig_hs_bndrs = [nm | L _ (TypeSig nm _) <- val_sigs] + val_hs_bndrs = collectHsBindLocatedBinders val_decls for_hs_bndrs = [nm | L _ (ForeignImport nm _ _ _) <- foreign_decls] new_tc tc_decl - = newTopSrcBinder mod Nothing main_rdr `thenM` \ main_name -> - mappM (newTopSrcBinder mod (Just main_name)) sub_rdrs `thenM` \ sub_names -> - returnM (AvailTC main_name (main_name : sub_names)) + = do { main_name <- newTopSrcBinder mod Nothing main_rdr + ; sub_names <- mappM (newTopSrcBinder mod (Just main_name)) sub_rdrs + ; return (main_name : sub_names) } where (main_rdr : sub_rdrs) = tyClDeclNames (unLoc tc_decl) \end{code} @@ -400,61 +377,65 @@ available, and filters it through the import spec (if any). \begin{code} filterImports :: ModIface - -> ImportSpec -- The span for the entire import decl + -> ImpDeclSpec -- The span for the entire import decl -> Maybe (Bool, [Located (IE RdrName)]) -- Import spec; True => hiding - -> [AvailInfo] -- What's available - -> RnM (AvailEnv, -- What's imported - GlobalRdrEnv) -- ...in two forms + -> NameSet -- What's available + -> RnM (NameSet, -- What's imported (qualified or unqualified) + GlobalRdrEnv) -- Same again, but in GRE form -- Complains if import spec mentions things that the module doesn't export -- Warns/informs if import spec contains duplicates. -mkGenericRdrEnv imp_spec avails - = mkGlobalRdrEnv [ GRE { gre_name = name, gre_prov = Imported [imp_spec] False } - | avail <- avails, name <- availNames avail ] -filterImports iface imp_spec Nothing total_avails - = returnM (mkAvailEnv total_avails, mkGenericRdrEnv imp_spec total_avails) +mkGenericRdrEnv decl_spec names + = mkGlobalRdrEnv [ GRE { gre_name = name, gre_prov = Imported [imp_spec] } + | name <- nameSetToList names ] + where + imp_spec = ImpSpec { is_decl = decl_spec, is_item = ImpAll } + +filterImports iface decl_spec Nothing all_names + = returnM (all_names, mkGenericRdrEnv decl_spec all_names) -filterImports iface imp_spec (Just (want_hiding, import_items)) total_avails - = mapAndUnzipM (addLocM get_item) import_items `thenM` \ (avails, gres) -> +filterImports iface decl_spec (Just (want_hiding, import_items)) all_names + = mappM (addLocM get_item) import_items `thenM` \ gres_s -> let - all_avails = foldr plusAvailEnv emptyAvailEnv avails - rdr_env = foldr plusGlobalRdrEnv emptyGlobalRdrEnv gres + gres = concat gres_s + specified_names = mkNameSet (map gre_name gres) in if not want_hiding then - returnM (all_avails, rdr_env) + return (specified_names, mkGlobalRdrEnv gres) else - let -- Hide stuff in all_avails - hidden = availsToNameSet (availEnvElts all_avails) - keep n = not (n `elemNameSet` hidden) - pruned_avails = pruneAvails keep total_avails + let + keep n = not (n `elemNameSet` specified_names) + pruned_avails = filterNameSet keep all_names in - returnM (mkAvailEnv pruned_avails, mkGenericRdrEnv imp_spec pruned_avails) + return (pruned_avails, mkGenericRdrEnv decl_spec pruned_avails) + where - import_fm :: OccEnv AvailInfo - import_fm = mkOccEnv [ (nameOccName name, avail) - | avail <- total_avails, - name <- availNames avail] - -- Even though availNames returns data constructors too, + occ_env :: OccEnv Name -- Maps OccName to corresponding Name + occ_env = mkOccEnv [(nameOccName n, n) | n <- nameSetToList all_names] + -- This env will have entries for data constructors too, -- they won't make any difference because naked entities like T -- in an import list map to TcOccs, not VarOccs. - bale_out item = addErr (badImportItemErr iface imp_spec item) `thenM_` - returnM (emptyAvailEnv, emptyGlobalRdrEnv) + sub_env :: NameEnv [Name] + sub_env = mkSubNameEnv all_names + + bale_out item = addErr (badImportItemErr iface decl_spec item) `thenM_` + returnM [] - succeed_with :: Bool -> AvailInfo -> RnM (AvailEnv, GlobalRdrEnv) - succeed_with all_explicit avail + succeed_with :: Bool -> [Name] -> RnM [GlobalRdrElt] + succeed_with all_explicit names = do { loc <- getSrcSpanM - ; returnM (unitAvailEnv avail, - mkGlobalRdrEnv (map (mk_gre loc) (availNames avail))) } + ; returnM (map (mk_gre loc) names) } where mk_gre loc name = GRE { gre_name = name, - gre_prov = Imported [this_imp_spec loc] (explicit name) } - this_imp_spec loc = imp_spec { is_loc = loc } - explicit name = all_explicit || name == main_name - main_name = availName avail + gre_prov = Imported [imp_spec] } + where + imp_spec = ImpSpec { is_decl = decl_spec, is_item = item_spec } + item_spec = ImpSome { is_explicit = explicit, is_iloc = loc } + explicit = all_explicit || isNothing (nameParent_maybe name) - get_item :: IE RdrName -> RnM (AvailEnv, GlobalRdrEnv) + get_item :: IE RdrName -> RnM [GlobalRdrElt] -- Empty result for a bad item. -- Singleton result is typical case. -- Can have two when we are hiding, and mention C which might be @@ -464,81 +445,36 @@ filterImports iface imp_spec (Just (want_hiding, import_items)) total_avails get_item item@(IEThingAll tc) = case check_item item of - Nothing -> bale_out item - Just avail@(AvailTC _ [n]) -> -- This occurs when you import T(..), but - -- only export T abstractly. The single [n] - -- in the AvailTC is the type or class itself - ifOptM Opt_WarnMisc (addWarn (dodgyImportWarn tc)) `thenM_` - succeed_with False avail - Just avail -> succeed_with False avail + [] -> bale_out item + + [n] -> -- This occurs when you import T(..), but + -- only export T abstractly. The single [n] + -- in the AvailTC is the type or class itself + ifOptM Opt_WarnDodgyImports (addWarn (dodgyImportWarn tc)) `thenM_` + succeed_with False [n] + + names -> succeed_with False names get_item item@(IEThingAbs n) | want_hiding -- hiding( C ) - -- Here the 'C' can be a data constructor *or* a type/class - = case catMaybes [check_item item, check_item (IEVar data_n)] of - [] -> bale_out item - avails -> returnM (mkAvailEnv avails, emptyGlobalRdrEnv) - -- The GlobalRdrEnv result is irrelevant when hiding + -- Here the 'C' can be a data constructor + -- *or* a type/class, or even both + = case concat [check_item item, check_item (IEVar data_n)] of + [] -> bale_out item + names -> succeed_with True names where data_n = setRdrNameSpace n srcDataName get_item item = case check_item item of - Nothing -> bale_out item - Just avail -> succeed_with True avail - - check_item item - | isNothing maybe_in_import_avails || - isNothing maybe_filtered_avail - = Nothing - - | otherwise - = Just filtered_avail - - where - wanted_occ = rdrNameOcc (ieName item) - maybe_in_import_avails = lookupOccEnv import_fm wanted_occ - - Just avail = maybe_in_import_avails - maybe_filtered_avail = filterAvail item avail - Just filtered_avail = maybe_filtered_avail -\end{code} - -\begin{code} -filterAvail :: IE RdrName -- Wanted - -> AvailInfo -- Available - -> Maybe AvailInfo -- Resulting available; - -- Nothing if (any of the) wanted stuff isn't there - -filterAvail ie@(IEThingWith want wants) avail@(AvailTC n ns) - | sub_names_ok = Just (AvailTC n (filter is_wanted ns)) - | otherwise = Nothing - where - is_wanted name = nameOccName name `elem` wanted_occs - sub_names_ok = all (`elem` avail_occs) wanted_occs - avail_occs = map nameOccName ns - wanted_occs = map rdrNameOcc (want:wants) - -filterAvail (IEThingAbs _) (AvailTC n ns) = ASSERT( n `elem` ns ) - Just (AvailTC n [n]) - -filterAvail (IEThingAbs _) avail@(Avail n) = Just avail -- Type synonyms - -filterAvail (IEVar _) avail@(Avail n) = Just avail -filterAvail (IEVar v) avail@(AvailTC n ns) = Just (AvailTC n (filter wanted ns)) - where - wanted n = nameOccName n == occ - occ = rdrNameOcc v - -- The second equation happens if we import a class op, thus - -- import A( op ) - -- where op is a class operation - -filterAvail (IEThingAll _) avail@(AvailTC _ _) = Just avail - -- We don't complain even if the IE says T(..), but - -- no constrs/class ops of T are available - -- Instead that's caught with a warning by the caller - -filterAvail ie avail = Nothing + [] -> bale_out item + names -> succeed_with True names + + check_item :: IE RdrName -> [Name] + check_item item + = case lookupOccEnv occ_env (rdrNameOcc (ieName item)) of + Nothing -> [] + Just name -> filterAvail item name sub_env \end{code} @@ -562,8 +498,8 @@ it re-exports @GHC@, which includes @takeMVar#@, whose type includes \begin{code} type ExportAccum -- The type of the accumulating parameter of - -- the main worker function in exportsFromAvail - = ([ModuleName], -- 'module M's seen so far + -- the main worker function in rnExports + = ([Module], -- 'module M's seen so far ExportOccMap, -- Tracks exported occurrence names NameSet) -- The accumulated exported stuff emptyExportAccum = ([], emptyOccEnv, emptyNameSet) @@ -575,14 +511,14 @@ type ExportOccMap = OccEnv (Name, IE RdrName) -- that have the same occurrence name -exportsFromAvail :: Bool -- False => no 'module M(..) where' header at all - -> Maybe [Located (IE RdrName)] -- Nothing => no explicit export list - -> RnM NameSet +rnExports :: Bool -- False => no 'module M(..) where' header at all + -> Maybe [Located (IE RdrName)] -- Nothing => no explicit export list + -> RnM NameSet -- Complains if two distinct exports have same OccName -- Warns about identical exports. -- Complains about exports items not in scope -exportsFromAvail explicit_mod exports +rnExports explicit_mod exports = do { TcGblEnv { tcg_rdr_env = rdr_env, tcg_imports = imports } <- getGblEnv ; @@ -597,6 +533,7 @@ exportsFromAvail explicit_mod exports | explicit_mod = exports | ghci_mode == Interactive = Nothing | otherwise = Just [noLoc (IEVar main_RDR_Unqual)] } ; + -- ToDo: the 'noLoc' here is unhelpful if 'main' turns out to be out of scope exports_from_avail real_exports rdr_env imports } @@ -608,16 +545,15 @@ exports_from_avail Nothing rdr_env imports | gre <- globalRdrEnvElts rdr_env, isLocalGRE gre ]) -exports_from_avail (Just export_items) rdr_env - (ImportAvails { imp_qual = mod_avail_env, - imp_env = entity_avail_env }) - = foldlM (exports_from_litem) emptyExportAccum - export_items `thenM` \ (_, _, exports) -> +exports_from_avail (Just items) rdr_env (ImportAvails { imp_env = imp_env }) + = foldlM do_litem emptyExportAccum items `thenM` \ (_, _, exports) -> returnM exports - where - exports_from_litem :: ExportAccum -> Located (IE RdrName) -> RnM ExportAccum - exports_from_litem acc = addLocM (exports_from_item acc) + sub_env :: NameEnv [Name] -- Classify each name by its parent + sub_env = mkSubNameEnv (foldModuleEnv unionNameSets emptyNameSet imp_env) + + do_litem :: ExportAccum -> Located (IE RdrName) -> RnM ExportAccum + do_litem acc = addLocM (exports_from_item acc) exports_from_item :: ExportAccum -> IE RdrName -> RnM ExportAccum exports_from_item acc@(mods, occs, exports) ie@(IEModuleContents mod) @@ -627,52 +563,63 @@ exports_from_avail (Just export_items) rdr_env returnM acc } | otherwise - = case lookupModuleEnvByName mod_avail_env mod of + = case lookupModuleEnv imp_env mod of Nothing -> addErr (modExportErr mod) `thenM_` returnM acc - - Just avail_env + Just names -> let - new_exports = [ name | avail <- availEnvElts avail_env, - name <- availNames avail, - inScopeUnqual rdr_env name ] + new_exports = filterNameSet (inScopeUnqual rdr_env) names in -- This check_occs not only finds conflicts between this item -- and others, but also internally within this item. That is, -- if 'M.x' is in scope in several ways, we'll have several -- members of mod_avails with the same OccName. - check_occs ie occs new_exports `thenM` \ occs' -> - returnM (mod:mods, occs', addListToNameSet exports new_exports) + check_occs ie occs (nameSetToList new_exports) `thenM` \ occs' -> + returnM (mod:mods, occs', exports `unionNameSets` new_exports) exports_from_item acc@(mods, occs, exports) ie = lookupGlobalOccRn (ieName ie) `thenM` \ name -> if isUnboundName name then returnM acc -- Avoid error cascade - else - -- Get the AvailInfo for the parent of the specified name - let - parent = nameParent name - avail = lookupAvailEnv entity_avail_env parent + else let + new_exports = filterAvail ie name sub_env in - -- Filter out the bits we want - case filterAvail ie avail of { - Nothing -> -- Not enough availability - addErr (exportItemErr ie) `thenM_` - returnM acc ; - - Just export_avail -> - - -- Phew! It's OK! Now to check the occurrence stuff! - - let - new_exports = availNames export_avail - in - checkForDodgyExport ie new_exports `thenM_` - check_occs ie occs new_exports `thenM` \ occs' -> + checkErr (not (null new_exports)) (exportItemErr ie) `thenM_` + checkForDodgyExport ie new_exports `thenM_` + check_occs ie occs new_exports `thenM` \ occs' -> returnM (mods, occs', addListToNameSet exports new_exports) - } - + +------------------------------- +filterAvail :: IE RdrName -- Wanted + -> Name -- The Name of the ieName of the item + -> NameEnv [Name] -- Maps type/class names to their sub-names + -> [Name] -- Empty if even one thing reqd is missing + +filterAvail (IEVar _) n subs = [n] +filterAvail (IEThingAbs _) n subs = [n] +filterAvail (IEThingAll _) n subs = n : subNames subs n +filterAvail (IEThingWith _ rdrs) n subs + | any isNothing mb_names = [] + | otherwise = n : catMaybes mb_names + where + env = mkOccEnv [(nameOccName s, s) | s <- subNames subs n] + mb_names = map (lookupOccEnv env . rdrNameOcc) rdrs +filterAvail (IEModuleContents _) _ _ = panic "filterAvail" + +subNames :: NameEnv [Name] -> Name -> [Name] +subNames env n = lookupNameEnv env n `orElse` [] + +mkSubNameEnv :: NameSet -> NameEnv [Name] +-- Maps types and classes to their constructors/classops respectively +-- This mapping just makes it easier to deal with A(..) export items +mkSubNameEnv names + = foldNameSet add_name emptyNameEnv names + where + add_name name env + | Just parent <- nameParent_maybe name + = extendNameEnv_C (\ns _ -> name:ns) env parent [name] + | otherwise = env ------------------------------- inScopeUnqual :: GlobalRdrEnv -> Name -> Bool @@ -682,10 +629,13 @@ inScopeUnqual env n = any unQualOK (lookupGRE_Name env n) ------------------------------- checkForDodgyExport :: IE RdrName -> [Name] -> RnM () -checkForDodgyExport (IEThingAll tc) [n] = addWarn (dodgyExportWarn tc) - -- This occurs when you import T(..), but - -- only export T abstractly. The single [n] - -- in the AvailTC is the type or class itself +checkForDodgyExport ie@(IEThingAll tc) [n] + | isTcOcc (nameOccName n) = addWarn (dodgyExportWarn tc) + -- This occurs when you export T(..), but + -- only import T abstractly, or T is a synonym. + -- The single [n] is the type or class itself + | otherwise = addErr (exportItemErr ie) + -- This happes if you export x(..), which is bogus checkForDodgyExport _ _ = return () ------------------------------- @@ -721,25 +671,27 @@ check_occs ie occs names reportDeprecations :: TcGblEnv -> RnM () reportDeprecations tcg_env = ifOptM Opt_WarnDeprecations $ - do { hpt <- getHpt - ; eps <- getEps + do { (eps,hpt) <- getEpsAndHpt + -- By this time, typechecking is complete, + -- so the PIT is fully populated ; mapM_ (check hpt (eps_PIT eps)) all_gres } where - used_names = findUses (tcg_dus tcg_env) emptyNameSet + used_names = allUses (tcg_dus tcg_env) + -- Report on all deprecated uses; hence allUses all_gres = globalRdrEnvElts (tcg_rdr_env tcg_env) - check hpt pit (GRE {gre_name = name, gre_prov = Imported (imp_spec:_) _}) + check hpt pit (GRE {gre_name = name, gre_prov = Imported (imp_spec:_)}) | name `elemNameSet` used_names , Just deprec_txt <- lookupDeprec hpt pit name - = addSrcSpan (is_loc imp_spec) $ + = setSrcSpan (importSpecLoc imp_spec) $ addWarn (sep [ptext SLIT("Deprecated use of") <+> - text (occNameFlavour (nameOccName name)) <+> + pprNonVarNameSpace (occNameSpace (nameOccName name)) <+> quotes (ppr name), - (parens imp_msg), + (parens imp_msg) <> colon, (ppr deprec_txt) ]) where - name_mod = nameModuleName name - imp_mod = is_mod imp_spec + name_mod = nameModule name + imp_mod = importSpecModule imp_spec imp_msg = ptext SLIT("imported from") <+> ppr imp_mod <> extra extra | imp_mod == name_mod = empty | otherwise = ptext SLIT(", but defined in") <+> ppr name_mod @@ -758,7 +710,13 @@ lookupDeprec hpt pit n = case lookupIface hpt pit (nameModule n) of Just iface -> mi_dep_fn iface n `seqMaybe` -- Bleat if the thing, *or mi_dep_fn iface (nameParent n) -- its parent*, is deprec'd - Nothing -> pprPanic "lookupDeprec" (ppr n) + Nothing + | isWiredInName n -> Nothing + -- We have not necessarily loaded the .hi file for a + -- wired-in name (yet), although we *could*. + -- And we never deprecate them + + | otherwise -> pprPanic "lookupDeprec" (ppr n) -- By now all the interfaces should have been loaded gre_is_used :: NameSet -> GlobalRdrElt -> Bool @@ -772,16 +730,21 @@ gre_is_used used_names gre = gre_name gre `elemNameSet` used_names %********************************************************* \begin{code} -reportUnusedNames :: TcGblEnv -> RnM () -reportUnusedNames gbl_env - = do { warnUnusedTopBinds unused_locals +reportUnusedNames :: Maybe [Located (IE RdrName)] -- Export list + -> TcGblEnv -> RnM () +reportUnusedNames export_decls gbl_env + = do { traceRn ((text "RUN") <+> (ppr (tcg_dus gbl_env))) + ; warnUnusedTopBinds unused_locals ; warnUnusedModules unused_imp_mods ; warnUnusedImports unused_imports - ; warnDuplicateImports dup_imps + ; warnDuplicateImports defined_and_used ; printMinimalImports minimal_imports } where used_names, all_used_names :: NameSet used_names = findUses (tcg_dus gbl_env) emptyNameSet + -- NB: currently, if f x = g, we only treat 'g' as used if 'f' is used + -- Hence findUses + all_used_names = used_names `unionNameSets` mkNameSet (mapCatMaybes nameParent_maybe (nameSetToList used_names)) -- A use of C implies a use of T, @@ -798,11 +761,6 @@ reportUnusedNames gbl_env (defined_and_used, defined_but_not_used) = partition (gre_is_used all_used_names) defined_names - -- Find the duplicate imports - dup_imps = filter is_dup defined_and_used - is_dup (GRE {gre_prov = Imported imp_spec True}) = not (isSingleton imp_spec) - is_dup other = False - -- Filter out the ones that are -- (a) defined in this module, and -- (b) not defined by a 'deriving' clause @@ -814,8 +772,9 @@ reportUnusedNames gbl_env unused_imports :: [GlobalRdrElt] unused_imports = filter unused_imp defined_but_not_used - unused_imp (GRE {gre_prov = Imported imp_specs True}) - = not (all (module_unused . is_mod) imp_specs) + unused_imp (GRE {gre_prov = Imported imp_specs}) + = not (all (module_unused . importSpecModule) imp_specs) + && or [exp | ImpSpec { is_item = ImpSome { is_explicit = exp } } <- imp_specs] -- Don't complain about unused imports if we've already said the -- entire import is unused unused_imp other = False @@ -823,8 +782,10 @@ reportUnusedNames gbl_env -- To figure out the minimal set of imports, start with the things -- that are in scope (i.e. in gbl_env). Then just combine them -- into a bunch of avails, so they are properly grouped - minimal_imports :: FiniteMap ModuleName AvailEnv - minimal_imports0 = emptyFM + -- + -- BUG WARNING: this does not deal properly with qualified imports! + minimal_imports :: FiniteMap Module AvailEnv + minimal_imports0 = foldr add_expall emptyFM expall_mods minimal_imports1 = foldr add_name minimal_imports0 defined_and_used minimal_imports = foldr add_inst_mod minimal_imports1 direct_import_mods -- The last line makes sure that we retain all direct imports @@ -845,63 +806,148 @@ reportUnusedNames gbl_env -- We've carefully preserved the provenance so that we can -- construct minimal imports that import the name by (one of) -- the same route(s) as the programmer originally did. - add_name (GRE {gre_name = n, - gre_prov = Imported imp_specs _}) acc - = addToFM_C plusAvailEnv acc (is_mod (head imp_specs)) + add_name (GRE {gre_name = n, gre_prov = Imported imp_specs}) acc + = addToFM_C plusAvailEnv acc (importSpecModule (head imp_specs)) (unitAvailEnv (mk_avail n (nameParent_maybe n))) add_name other acc = acc + -- Modules mentioned as 'module M' in the export list + expall_mods = case export_decls of + Nothing -> [] + Just es -> [m | L _ (IEModuleContents m) <- es] + + -- This is really bogus. The idea is that if we see 'module M' in + -- the export list we must retain the import decls that drive it + -- If we aren't careful we might see + -- module A( module M ) where + -- import M + -- import N + -- and suppose that N exports everything that M does. Then we + -- must not drop the import of M even though N brings it all into + -- scope. + -- + -- BUG WARNING: 'module M' exports aside, what if M.x is mentioned?! + -- + -- The reason that add_expall is bogus is that it doesn't take + -- qualified imports into account. But it's an improvement. + add_expall mod acc = addToFM_C plusAvailEnv acc mod emptyAvailEnv + -- n is the name of the thing, p is the name of its parent mk_avail n (Just p) = AvailTC p [p,n] mk_avail n Nothing | isTcOcc (nameOccName n) = AvailTC n [n] | otherwise = Avail n - add_inst_mod m acc - | m `elemFM` acc = acc -- We import something already - | otherwise = addToFM acc m emptyAvailEnv + add_inst_mod (mod,_,_) acc + | mod `elemFM` acc = acc -- We import something already + | otherwise = addToFM acc mod emptyAvailEnv + where -- Add an empty collection of imports for a module -- from which we have sucked only instance decls imports = tcg_imports gbl_env - direct_import_mods :: [ModuleName] - direct_import_mods = map (moduleName . fst) - (moduleEnvElts (imp_mods imports)) - - hasEmptyImpList :: ModuleName -> Bool - hasEmptyImpList m = - case lookupModuleEnvByName (imp_mods imports) m of - Just (_,Just x) -> not x - _ -> False + direct_import_mods :: [(Module, Bool, SrcSpan)] + -- See the type of the imp_mods for this triple + direct_import_mods = moduleEnvElts (imp_mods imports) -- unused_imp_mods are the directly-imported modules -- that are not mentioned in minimal_imports1 -- [Note: not 'minimal_imports', because that includes directly-imported -- modules even if we use nothing from them; see notes above] - unused_imp_mods = [m | m <- direct_import_mods, - isNothing (lookupFM minimal_imports1 m), - m /= pRELUDE_Name, - not (hasEmptyImpList m)] - -- hasEmptyImpList arranges not to complain about + -- + -- BUG WARNING: does not deal correctly with multiple imports of the same module + -- becuase direct_import_mods has only one entry per module + unused_imp_mods = [(mod,loc) | (mod,no_imp,loc) <- direct_import_mods, + not (mod `elemFM` minimal_imports1), + mod /= pRELUDE, + not no_imp] + -- The not no_imp part is not to complain about -- import M (), which is an idiom for importing -- instance declarations - module_unused :: ModuleName -> Bool - module_unused mod = mod `elem` unused_imp_mods + module_unused :: Module -> Bool + module_unused mod = any (((==) mod) . fst) unused_imp_mods --------------------- warnDuplicateImports :: [GlobalRdrElt] -> RnM () +-- Given the GREs for names that are used, figure out which imports +-- could be omitted without changing the top-level environment. +-- +-- NB: Given import Foo( T ) +-- import qualified Foo +-- we do not report a duplicate import, even though Foo.T is brought +-- into scope by both, because there's nothing you can *omit* without +-- changing the top-level environment. So we complain only if it's +-- explicitly named in both imports or neither. +-- +-- Furthermore, we complain about Foo.T only if +-- there is no complaint about (unqualified) T + warnDuplicateImports gres - = ifOptM Opt_WarnUnusedImports (mapM_ warn gres) + = ifOptM Opt_WarnUnusedImports $ + sequenceM_ [ warn name pr + -- The 'head' picks the first offending group + -- for this particular name + | GRE { gre_name = name, gre_prov = Imported imps } <- gres + , pr <- redundants imps ] where - warn (GRE { gre_name = name, gre_prov = Imported imps _ }) - = addWarn ((quotes (ppr name) <+> ptext SLIT("is imported more than once:")) - $$ nest 2 (vcat (map ppr imps))) - + warn name (red_imp, cov_imp) + = addWarnAt (importSpecLoc red_imp) + (vcat [ptext SLIT("Redundant import of:") <+> quotes pp_name, + ptext SLIT("It is also") <+> ppr cov_imp]) + where + pp_name | is_qual red_decl = ppr (is_as red_decl) <> dot <> ppr occ + | otherwise = ppr occ + occ = nameOccName name + red_decl = is_decl red_imp + + redundants :: [ImportSpec] -> [(ImportSpec,ImportSpec)] + -- The returned pair is (redundant-import, covering-import) + redundants imps + = [ (red_imp, cov_imp) + | red_imp <- imps + , cov_imp <- take 1 (filter (covers red_imp) imps) ] + + -- "red_imp" is a putative redundant import + -- "cov_imp" potentially covers it + -- This test decides whether red_imp could be dropped + -- + -- NOTE: currently the test does not warn about + -- import M( x ) + -- imoprt N( x ) + -- even if the same underlying 'x' is involved, because dropping + -- either import would change the qualified names in scope (M.x, N.x) + -- But if the qualified names aren't used, the import is indeed redundant + -- Sadly we don't know that. Oh well. + covers red_imp@(ImpSpec { is_decl = red_decl, is_item = red_item }) + cov_imp@(ImpSpec { is_decl = cov_decl, is_item = cov_item }) + | red_loc == cov_loc + = False -- Ignore diagonal elements + | not (is_as red_decl == is_as cov_decl) + = False -- They bring into scope different qualified names + | not (is_qual red_decl) && is_qual cov_decl + = False -- Covering one doesn't bring unqualified name into scope + | red_selective + = not cov_selective -- Redundant one is selective and covering one isn't + || red_later -- Both are explicit; tie-break using red_later + | otherwise + = not cov_selective -- Neither import is selective + && (is_mod red_decl == is_mod cov_decl) -- They import the same module + && red_later -- Tie-break + where + red_loc = importSpecLoc red_imp + cov_loc = importSpecLoc cov_imp + red_later = red_loc > cov_loc + cov_selective = selectiveImpItem cov_item + red_selective = selectiveImpItem red_item + +selectiveImpItem :: ImpItemSpec -> Bool +selectiveImpItem ImpAll = False +selectiveImpItem (ImpSome {}) = True -- ToDo: deal with original imports with 'qualified' and 'as M' clauses -printMinimalImports :: FiniteMap ModuleName AvailEnv -- Minimal imports +printMinimalImports :: FiniteMap Module AvailEnv -- Minimal imports -> RnM () printMinimalImports imps = ifOptM Opt_D_dump_minimal_imports $ do { @@ -914,9 +960,9 @@ printMinimalImports imps (vcat (map ppr_mod_ie mod_ies)) }) } where - mkFilename this_mod = moduleNameUserString (moduleName this_mod) ++ ".imports" + mkFilename this_mod = moduleString this_mod ++ ".imports" ppr_mod_ie (mod_name, ies) - | mod_name == pRELUDE_Name + | mod_name == pRELUDE = empty | null ies -- Nothing except instances comes from here = ptext SLIT("import") <+> ppr mod_name <> ptext SLIT("() -- Instances only") @@ -947,7 +993,7 @@ printMinimalImports imps where all_used avail_occs = all (`elem` map nameOccName ns) avail_occs doc = text "Compute minimal imports from" <+> ppr n - n_mod = nameModuleName n + n_mod = nameModule n \end{code} @@ -958,8 +1004,8 @@ printMinimalImports imps %************************************************************************ \begin{code} -badImportItemErr iface imp_spec ie - = sep [ptext SLIT("Module"), quotes (ppr (is_mod imp_spec)), source_import, +badImportItemErr iface decl_spec ie + = sep [ptext SLIT("Module"), quotes (ppr (is_mod decl_spec)), source_import, ptext SLIT("does not export"), quotes (ppr ie)] where source_import | mi_boot iface = ptext SLIT("(hi-boot interface)") @@ -995,12 +1041,16 @@ exportClashErr global_env name1 name2 ie1 ie2 (gre:_) -> gre [] -> pprPanic "exportClashErr" (ppr name) -dupDeclErr (n:ns) - = vcat [ptext SLIT("Multiple declarations of") <+> quotes (ppr n), - nest 4 (vcat (map ppr sorted_locs))] +addDupDeclErr :: Name -> Name -> TcRn () +addDupDeclErr name_a name_b + = addErrAt (srcLocSpan loc2) $ + vcat [ptext SLIT("Multiple declarations of") <+> quotes (ppr name1), + ptext SLIT("Declared at:") <+> vcat [ppr (nameSrcLoc name1), ppr loc2]] where - sorted_locs = sortLt occ'ed_before (map nameSrcLoc (n:ns)) - occ'ed_before a b = LT == compare a b + loc2 = nameSrcLoc name2 + (name1,name2) | nameSrcLoc name_a > nameSrcLoc name_b = (name_b,name_a) + | otherwise = (name_a,name_b) + -- Report the error at the later location dupExportWarn occ_name ie1 ie2 = hsep [quotes (ppr occ_name),