X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Frename%2FRnEnv.lhs;h=825ed19fc230bc100e637db880a9da54459073a0;hb=edc0bafd3fcd01b85a2e8894e5dfe149eb0e0857;hp=64e299e876f79a8f2a46cdb8190afa1733570bd7;hpb=18b8ff4f3fae282f544b2fdc216acad67392ca8f;p=ghc-hetmet.git diff --git a/compiler/rename/RnEnv.lhs b/compiler/rename/RnEnv.lhs index 64e299e..825ed19 100644 --- a/compiler/rename/RnEnv.lhs +++ b/compiler/rename/RnEnv.lhs @@ -20,15 +20,15 @@ module RnEnv ( newLocalBndrRn, newLocalBndrsRn, newIPNameRn, bindLocalName, bindLocalNames, bindLocalNamesFV, MiniFixityEnv, emptyFsEnv, extendFsEnv, lookupFsEnv, - bindLocalNamesFV_WithFixities, + addLocalFixities, bindLocatedLocalsFV, bindLocatedLocalsRn, bindSigTyVarsFV, bindPatSigTyVars, bindPatSigTyVarsFV, - bindTyVarsRn, extendTyVarEnvFVRn, + bindTyVarsRn, bindTyVarsFV, extendTyVarEnvFVRn, - checkDupRdrNames, checkDupNames, checkShadowedNames, - checkDupAndShadowedRdrNames, - mapFvRn, mapFvRnCPS, - warnUnusedMatches, warnUnusedModules, warnUnusedImports, + checkDupRdrNames, checkDupAndShadowedRdrNames, + checkDupNames, checkDupAndShadowedNames, + addFvRn, mapFvRn, mapMaybeFvRn, mapFvRnCPS, + warnUnusedMatches, warnUnusedTopBinds, warnUnusedLocalBinds, dataTcOccs, unknownNameErr, kindSigErr, perhapsForallMsg ) where @@ -48,10 +48,9 @@ import Name ( Name, nameIsLocalOrFrom, mkInternalName, isWiredInName, nameSrcLoc, nameSrcSpan, nameOccName, nameModule, isExternalName ) import NameSet import NameEnv -import LazyUniqFM +import UniqFM import DataCon ( dataConFieldLabels ) import OccName -import Module ( Module, ModuleName ) import PrelNames ( mkUnboundName, rOOT_MAIN, iNTERACTIVE, consDataConKey, forall_tv_RDR ) import Unique @@ -82,8 +81,8 @@ thenM = (>>=) %********************************************************* \begin{code} -newTopSrcBinder :: Module -> Located RdrName -> RnM Name -newTopSrcBinder this_mod (L loc rdr_name) +newTopSrcBinder :: Located RdrName -> RnM Name +newTopSrcBinder (L loc rdr_name) | Just name <- isExact_maybe rdr_name = -- This is here to catch -- (a) Exact-name binders created by Template Haskell @@ -95,13 +94,15 @@ newTopSrcBinder this_mod (L loc rdr_name) -- data T = (,) Int Int -- unless we are in GHC.Tup ASSERT2( isExternalName name, ppr name ) - do { unless (this_mod == nameModule name) + do { this_mod <- getModule + ; unless (this_mod == nameModule name) (addErrAt loc (badOrigBinding rdr_name)) ; return name } | Just (rdr_mod, rdr_occ) <- isOrig_maybe rdr_name - = do { unless (rdr_mod == this_mod || rdr_mod == rOOT_MAIN) + = do { this_mod <- getModule + ; unless (rdr_mod == this_mod || rdr_mod == rOOT_MAIN) (addErrAt loc (badOrigBinding rdr_name)) -- When reading External Core we get Orig names as binders, -- but they should agree with the module gotten from the monad @@ -137,7 +138,8 @@ newTopSrcBinder this_mod (L loc rdr_name) ; return (mkInternalName uniq (rdrNameOcc rdr_name) loc) } else -- Normal case - newGlobalBinder this_mod (rdrNameOcc rdr_name) loc } + do { this_mod <- getModule + ; newGlobalBinder this_mod (rdrNameOcc rdr_name) loc } } \end{code} %********************************************************* @@ -205,7 +207,7 @@ lookupTopBndrRn_maybe rdr_name -- See Note [Type and class operator definitions] let occ = rdrNameOcc rdr_name ; when (isTcOcc occ && isSymOcc occ) - (do { op_ok <- doptM Opt_TypeOperators + (do { op_ok <- xoptM Opt_TypeOperators ; unless op_ok (addErr (opDeclErr rdr_name)) }) ; mb_gre <- lookupGreLocalRn rdr_name @@ -284,12 +286,12 @@ lookupSubBndr parent doc rdr_name | otherwise -- Find all the things the rdr-name maps to = do { -- and pick the one with the right parent name ; env <- getGlobalRdrEnv - ; let gres = (lookupGlobalRdrEnv env (rdrNameOcc rdr_name)) + ; let gres = lookupGlobalRdrEnv env (rdrNameOcc rdr_name) ; case pick parent gres of -- NB: lookupGlobalRdrEnv, not lookupGRE_RdrName! -- The latter does pickGREs, but we want to allow 'x' -- even if only 'M.x' is in scope - [gre] -> do { addUsedRdrName gre rdr_name + [gre] -> do { addUsedRdrNames (used_rdr_names gre) ; return (gre_name gre) } [] -> do { addErr (unknownSubordinateErr doc rdr_name) ; traceRn (text "RnEnv.lookup_sub_bndr" <+> (ppr rdr_name $$ ppr gres)) @@ -306,6 +308,15 @@ lookupSubBndr parent doc rdr_name right_parent p (GRE { gre_par = ParentIs p' }) = p==p' right_parent _ _ = False + -- Note [Usage for sub-bndrs] + used_rdr_names gre + | isQual rdr_name = [rdr_name] + | otherwise = case gre_prov gre of + LocalDef -> [rdr_name] + Imported is -> map mk_qual_rdr is + mk_qual_rdr imp_spec = mkRdrQual (is_as (is_decl imp_spec)) rdr_occ + rdr_occ = rdrNameOcc rdr_name + newIPNameRn :: IPName RdrName -> TcRnIf m n (IPName Name) newIPNameRn ip_rdr = newIPName (mapIPName rdrNameOcc ip_rdr) @@ -320,12 +331,25 @@ lookupFamInstDeclBndr tyclGroupEnv (L loc rdr_name) (gre:_) -> return $ gre_name gre -- if there is more than one, an error will be raised elsewhere [] -> lookupOccRn rdr_name +\end{code} +Note [Usage for sub-bndrs] +~~~~~~~~~~~~~~~~~~~~~~~~~~ +If you have this + import qualified M( C( f ) ) + intance M.C T where + f x = x +then is the qualified import M.f used? Obviously yes. +But the RdrName used in the instance decl is unqualified. In effect, +we fill in the qualification by looking for f's whose class is M.C +But when adding to the UsedRdrNames we must make that qualification +explicit, otherwise we get "Redundant import of M.C". -------------------------------------------------- -- Occurrences -------------------------------------------------- +\begin{code} getLookupOccRn :: RnM (Name -> Maybe Name) getLookupOccRn = getLocalRdrEnv `thenM` \ local_env -> @@ -481,6 +505,8 @@ lookupQualifiedName rdr_name doc = ptext (sLit "Need to find") <+> ppr rdr_name \end{code} +Note [Looking up signature names] +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ lookupSigOccRn is used for type signatures and pragmas Is this valid? module A @@ -501,10 +527,13 @@ return the imported 'f', so that later on the reanamer will correctly report "misplaced type sig". \begin{code} -lookupSigOccRn :: Maybe NameSet -- Just ns => source file; these are the binders +lookupSigOccRn :: Maybe NameSet -- Just ns => these are the binders -- in the same group - -- Nothing => hs-boot file; signatures without + -- Nothing => signatures without -- binders are expected + -- (a) top-level (SPECIALISE prags) + -- (b) class decls + -- (c) hs-boot files -> Sig RdrName -> Located RdrName -> RnM (Located Name) lookupSigOccRn mb_bound_names sig @@ -514,29 +543,29 @@ lookupSigOccRn mb_bound_names sig Left err -> do { addErr err; return (mkUnboundName rdr_name) } Right name -> return name } -lookupBindGroupOcc :: Maybe NameSet -- Just ns => source file; these are the binders - -- in the same group - -- Nothing => hs-boot file; signatures without - -- binders are expected - -> SDoc +lookupBindGroupOcc :: Maybe NameSet -- See notes on the (Maybe NameSet) + -> SDoc -- in lookupSigOccRn -> RdrName -> RnM (Either Message Name) -- Looks up the RdrName, expecting it to resolve to one of the -- bound names passed in. If not, return an appropriate error message +-- +-- See Note [Looking up signature names] lookupBindGroupOcc mb_bound_names what rdr_name - = do { local_env <- getLocalRdrEnv - ; case lookupLocalRdrEnv local_env rdr_name of - Just n -> check_local_name n - Nothing -> do -- Not defined in a nested scope + = do { local_env <- getLocalRdrEnv + ; case lookupLocalRdrEnv local_env rdr_name of { + Just n -> check_local_name n; + Nothing -> do -- Not defined in a nested scope { env <- getGlobalRdrEnv - ; let gres = lookupGlobalRdrEnv env (rdrNameOcc rdr_name) - ; case (filter isLocalGRE gres) of - (gre:_) -> check_local_name (gre_name gre) - -- If there is more than one local GRE for the - -- same OccName, that will be reported separately - [] | null gres -> bale_out_with empty - | otherwise -> bale_out_with import_msg - }} + ; let gres = lookupGlobalRdrEnv env (rdrNameOcc rdr_name) + ; case (filter isLocalGRE gres) of + (gre:_) -> check_local_name (gre_name gre) + -- If there is more than one local GRE for the + -- same OccName 'f', that will be reported separately + -- as a duplicate top-level binding for 'f' + [] | null gres -> bale_out_with empty + | otherwise -> bale_out_with import_msg + }}} where check_local_name name -- The name is in scope, and not imported = case mb_bound_names of @@ -629,23 +658,17 @@ type MiniFixityEnv = FastStringEnv (Located Fixity) -------------------------------- -- Used for nested fixity decls to bind names along with their fixities. -- the fixities are given as a UFM from an OccName's FastString to a fixity decl --- Also check for unused binders -bindLocalNamesFV_WithFixities :: [Name] - -> MiniFixityEnv - -> RnM (a, FreeVars) -> RnM (a, FreeVars) -bindLocalNamesFV_WithFixities names fixities thing_inside - = bindLocalNamesFV names $ - extendFixityEnv boundFixities $ - thing_inside + +addLocalFixities :: MiniFixityEnv -> [Name] -> RnM a -> RnM a +addLocalFixities mini_fix_env names thing_inside + = extendFixityEnv (mapCatMaybes find_fixity names) thing_inside where - -- find the names that have fixity decls - boundFixities = foldr - (\ name -> \ acc -> - -- check whether this name has a fixity decl - case lookupFsEnv fixities (occNameFS (nameOccName name)) of - Just (L _ fix) -> (name, FixItem (nameOccName name) fix) : acc - Nothing -> acc) [] names - -- bind the names; extend the fixity env; do the thing inside + find_fixity name + = case lookupFsEnv mini_fix_env (occNameFS occ) of + Just (L _ fix) -> Just (name, FixItem occ fix) + Nothing -> Nothing + where + occ = nameOccName name \end{code} -------------------------------- @@ -707,7 +730,7 @@ lookupTyFixityRn (L _ n) = lookupFixityRn n %* * Rebindable names Dealing with rebindable syntax is driven by the - Opt_NoImplicitPrelude dynamic flag. + Opt_RebindableSyntax dynamic flag. In "deriving" code we don't want to use rebindable syntax so we switch off the flag locally @@ -746,8 +769,8 @@ checks the type of the user thing against the type of the standard thing. lookupSyntaxName :: Name -- The standard name -> RnM (SyntaxExpr Name, FreeVars) -- Possibly a non-standard name lookupSyntaxName std_name - = doptM Opt_ImplicitPrelude `thenM` \ implicit_prelude -> - if implicit_prelude then normal_case + = xoptM Opt_RebindableSyntax `thenM` \ rebindable_on -> + if not rebindable_on then normal_case else -- Get the similarly named thing from the local environment lookupOccRn (mkRdrUnqual (nameOccName std_name)) `thenM` \ usr_name -> @@ -758,8 +781,8 @@ lookupSyntaxName std_name lookupSyntaxTable :: [Name] -- Standard names -> RnM (SyntaxTable Name, FreeVars) -- See comments with HsExpr.ReboundNames lookupSyntaxTable std_names - = doptM Opt_ImplicitPrelude `thenM` \ implicit_prelude -> - if implicit_prelude then normal_case + = xoptM Opt_RebindableSyntax `thenM` \ rebindable_on -> + if not rebindable_on then normal_case else -- Get the similarly named thing from the local environment mapM (lookupOccRn . mkRdrUnqual . nameOccName) std_names `thenM` \ usr_names -> @@ -795,20 +818,11 @@ newLocalBndrsRn :: [Located RdrName] -> RnM [Name] newLocalBndrsRn = mapM newLocalBndrRn --------------------- -checkDupAndShadowedRdrNames :: SDoc -> [Located RdrName] -> RnM () -checkDupAndShadowedRdrNames doc loc_rdr_names - = do { checkDupRdrNames doc loc_rdr_names - ; envs <- getRdrEnvs - ; checkShadowedNames doc envs - [(loc,rdrNameOcc rdr) | L loc rdr <- loc_rdr_names] } - ---------------------- -bindLocatedLocalsRn :: SDoc -- Documentation string for error message - -> [Located RdrName] +bindLocatedLocalsRn :: [Located RdrName] -> ([Name] -> RnM a) -> RnM a -bindLocatedLocalsRn doc_str rdr_names_w_loc enclosed_scope - = do { checkDupAndShadowedRdrNames doc_str rdr_names_w_loc +bindLocatedLocalsRn rdr_names_w_loc enclosed_scope + = do { checkDupAndShadowedRdrNames rdr_names_w_loc -- Make fresh Names and extend the environment ; names <- newLocalBndrsRn rdr_names_w_loc @@ -829,27 +843,35 @@ bindLocalName name enclosed_scope bindLocalNamesFV :: [Name] -> RnM (a, FreeVars) -> RnM (a, FreeVars) bindLocalNamesFV names enclosed_scope = do { (result, fvs) <- bindLocalNames names enclosed_scope - ; return (result, delListFromNameSet fvs names) } + ; return (result, delFVs names fvs) } ------------------------------------- -- binLocalsFVRn is the same as bindLocalsRn -- except that it deals with free vars -bindLocatedLocalsFV :: SDoc -> [Located RdrName] +bindLocatedLocalsFV :: [Located RdrName] -> ([Name] -> RnM (a,FreeVars)) -> RnM (a, FreeVars) -bindLocatedLocalsFV doc rdr_names enclosed_scope - = bindLocatedLocalsRn doc rdr_names $ \ names -> +bindLocatedLocalsFV rdr_names enclosed_scope + = bindLocatedLocalsRn rdr_names $ \ names -> enclosed_scope names `thenM` \ (thing, fvs) -> - return (thing, delListFromNameSet fvs names) + return (thing, delFVs names fvs) ------------------------------------- -bindTyVarsRn :: SDoc -> [LHsTyVarBndr RdrName] +bindTyVarsFV :: [LHsTyVarBndr RdrName] + -> ([LHsTyVarBndr Name] -> RnM (a, FreeVars)) + -> RnM (a, FreeVars) +bindTyVarsFV tyvars thing_inside + = bindTyVarsRn tyvars $ \ tyvars' -> + do { (res, fvs) <- thing_inside tyvars' + ; return (res, delFVs (map hsLTyVarName tyvars') fvs) } + +bindTyVarsRn :: [LHsTyVarBndr RdrName] -> ([LHsTyVarBndr Name] -> RnM a) -> RnM a -- Haskell-98 binding of type variables; e.g. within a data type decl -bindTyVarsRn doc_str tyvar_names enclosed_scope - = bindLocatedLocalsRn doc_str located_tyvars $ \ names -> - do { kind_sigs_ok <- doptM Opt_KindSignatures +bindTyVarsRn tyvar_names enclosed_scope + = bindLocatedLocalsRn located_tyvars $ \ names -> + do { kind_sigs_ok <- xoptM Opt_KindSignatures ; unless (null kinded_tyvars || kind_sigs_ok) (mapM_ (addErr . kindSigErr) kinded_tyvars) ; enclosed_scope (zipWith replace tyvar_names names) } @@ -862,7 +884,7 @@ bindPatSigTyVars :: [LHsType RdrName] -> ([Name] -> RnM a) -> RnM a -- Find the type variables in the pattern type -- signatures that must be brought into scope bindPatSigTyVars tys thing_inside - = do { scoped_tyvars <- doptM Opt_ScopedTypeVariables + = do { scoped_tyvars <- xoptM Opt_ScopedTypeVariables ; if not scoped_tyvars then thing_inside [] else @@ -875,9 +897,7 @@ bindPatSigTyVars tys thing_inside -- f (x :: t) (y :: t) = .... -- We don't want to complain about binding t twice! - ; bindLocatedLocalsRn doc_sig nubbed_tvs thing_inside }} - where - doc_sig = text "In a pattern type-signature" + ; bindLocatedLocalsRn nubbed_tvs thing_inside }} bindPatSigTyVarsFV :: [LHsType RdrName] -> RnM (a, FreeVars) @@ -891,7 +911,7 @@ bindSigTyVarsFV :: [Name] -> RnM (a, FreeVars) -> RnM (a, FreeVars) bindSigTyVarsFV tvs thing_inside - = do { scoped_tyvars <- doptM Opt_ScopedTypeVariables + = do { scoped_tyvars <- xoptM Opt_ScopedTypeVariables ; if not scoped_tyvars then thing_inside else @@ -902,30 +922,42 @@ extendTyVarEnvFVRn :: [Name] -> RnM (a, FreeVars) -> RnM (a, FreeVars) extendTyVarEnvFVRn tyvars thing_inside = bindLocalNamesFV tyvars thing_inside ------------------------------------- -checkDupRdrNames :: SDoc - -> [Located RdrName] - -> RnM () -checkDupRdrNames doc_str rdr_names_w_loc +checkDupRdrNames :: [Located RdrName] -> RnM () +checkDupRdrNames rdr_names_w_loc = -- Check for duplicated names in a binding group - mapM_ (dupNamesErr getLoc doc_str) dups + mapM_ (dupNamesErr getLoc) dups where (_, dups) = removeDups (\n1 n2 -> unLoc n1 `compare` unLoc n2) rdr_names_w_loc -checkDupNames :: SDoc - -> [Name] - -> RnM () -checkDupNames doc_str names +checkDupNames :: [Name] -> RnM () +checkDupNames names = -- Check for duplicated names in a binding group - mapM_ (dupNamesErr nameSrcSpan doc_str) dups + mapM_ (dupNamesErr nameSrcSpan) dups where (_, dups) = removeDups (\n1 n2 -> nameOccName n1 `compare` nameOccName n2) names +--------------------- +checkDupAndShadowedRdrNames :: [Located RdrName] -> RnM () +checkDupAndShadowedRdrNames loc_rdr_names + = do { checkDupRdrNames loc_rdr_names + ; envs <- getRdrEnvs + ; checkShadowedOccs envs loc_occs } + where + loc_occs = [(loc,rdrNameOcc rdr) | L loc rdr <- loc_rdr_names] + +checkDupAndShadowedNames :: (GlobalRdrEnv, LocalRdrEnv) -> [Name] -> RnM () +checkDupAndShadowedNames envs names + = do { checkDupNames names + ; checkShadowedOccs envs loc_occs } + where + loc_occs = [(nameSrcSpan name, nameOccName name) | name <- names] + ------------------------------------- -checkShadowedNames :: SDoc -> (GlobalRdrEnv, LocalRdrEnv) -> [(SrcSpan,OccName)] -> RnM () -checkShadowedNames doc_str (global_env,local_env) loc_rdr_names - = ifOptM Opt_WarnNameShadowing $ - do { traceRn (text "shadow" <+> ppr loc_rdr_names) - ; mapM_ check_shadow loc_rdr_names } +checkShadowedOccs :: (GlobalRdrEnv, LocalRdrEnv) -> [(SrcSpan,OccName)] -> RnM () +checkShadowedOccs (global_env,local_env) loc_occs + = ifDOptM Opt_WarnNameShadowing $ + do { traceRn (text "shadow" <+> ppr loc_occs) + ; mapM_ check_shadow loc_occs } where check_shadow (loc, occ) | startsWithUnderscore occ = return () -- Do not report shadowing for "_x" @@ -935,7 +967,7 @@ checkShadowedNames doc_str (global_env,local_env) loc_rdr_names ; complain (map pprNameProvenance gres') } where complain [] = return () - complain pp_locs = addWarnAt loc (shadowedNameWarn doc_str occ pp_locs) + complain pp_locs = addWarnAt loc (shadowedNameWarn occ pp_locs) mb_local = lookupLocalRdrOcc local_env occ gres = lookupGRE_RdrName (mkRdrUnqual occ) global_env -- Make an Unqualified RdrName and look that up, so that @@ -946,7 +978,7 @@ checkShadowedNames doc_str (global_env,local_env) loc_rdr_names -- punning or wild-cards are on (cf Trac #2723) is_shadowed_gre gre@(GRE { gre_par = ParentIs _ }) = do { dflags <- getDOpts - ; if (dopt Opt_RecordPuns dflags || dopt Opt_RecordWildCards dflags) + ; if (xopt Opt_RecordPuns dflags || xopt Opt_RecordWildCards dflags) then do { is_fld <- is_rec_fld gre; return (not is_fld) } else return True } is_shadowed_gre _other = return True @@ -967,11 +999,19 @@ checkShadowedNames doc_str (global_env,local_env) loc_rdr_names \begin{code} -- A useful utility +addFvRn :: FreeVars -> RnM (thing, FreeVars) -> RnM (thing, FreeVars) +addFvRn fvs1 thing_inside = do { (res, fvs2) <- thing_inside + ; return (res, fvs1 `plusFV` fvs2) } + mapFvRn :: (a -> RnM (b, FreeVars)) -> [a] -> RnM ([b], FreeVars) mapFvRn f xs = do stuff <- mapM f xs case unzip stuff of (ys, fvs_s) -> return (ys, plusFVs fvs_s) +mapMaybeFvRn :: (a -> RnM (b, FreeVars)) -> Maybe a -> RnM (Maybe b, FreeVars) +mapMaybeFvRn _ Nothing = return (Nothing, emptyFVs) +mapMaybeFvRn f (Just x) = do { (y, fvs) <- f x; return (Just y, fvs) } + -- because some of the rename functions are CPSed: -- maps the function across the list from left to right; -- collects all the free vars into one set @@ -992,22 +1032,19 @@ mapFvRnCPS f (x:xs) cont = f x $ \ x' -> %************************************************************************ \begin{code} -warnUnusedModules :: [(ModuleName,SrcSpan)] -> RnM () -warnUnusedModules mods - = ifOptM Opt_WarnUnusedImports (mapM_ bleat mods) - where - bleat (mod,loc) = addWarnAt loc (mk_warn mod) - mk_warn m = vcat [ptext (sLit "Module") <+> quotes (ppr m) - <+> text "is imported, but nothing from it is used,", - nest 2 (ptext (sLit "except perhaps instances visible in") - <+> quotes (ppr m)), - ptext (sLit "To suppress this warning, use:") - <+> ptext (sLit "import") <+> ppr m <> parens empty ] - - -warnUnusedImports, warnUnusedTopBinds :: [GlobalRdrElt] -> RnM () -warnUnusedImports gres = ifOptM Opt_WarnUnusedImports (warnUnusedGREs gres) -warnUnusedTopBinds gres = ifOptM Opt_WarnUnusedBinds (warnUnusedGREs gres) +warnUnusedTopBinds :: [GlobalRdrElt] -> RnM () +warnUnusedTopBinds gres + = ifDOptM Opt_WarnUnusedBinds + $ do isBoot <- tcIsHsBoot + let noParent gre = case gre_par gre of + NoParent -> True + ParentIs _ -> False + -- Don't warn about unused bindings with parents in + -- .hs-boot files, as you are sometimes required to give + -- unused bindings (trac #3449). + gres' = if isBoot then filter noParent gres + else gres + warnUnusedGREs gres' warnUnusedLocalBinds, warnUnusedMatches :: [Name] -> FreeVars -> RnM () warnUnusedLocalBinds = check_unused Opt_WarnUnusedBinds @@ -1015,7 +1052,7 @@ warnUnusedMatches = check_unused Opt_WarnUnusedMatches check_unused :: DynFlag -> [Name] -> FreeVars -> RnM () check_unused flag bound_names used_names - = ifOptM flag (warnUnusedLocals (filterOut (`elemNameSet` used_names) bound_names)) + = ifDOptM flag (warnUnusedLocals (filterOut (`elemNameSet` used_names) bound_names)) ------------------------- -- Helpers @@ -1068,14 +1105,13 @@ addNameClashErrRn rdr_name names (np1:nps) = names msg1 = ptext (sLit "either") <+> mk_ref np1 msgs = [ptext (sLit " or") <+> mk_ref np | np <- nps] - mk_ref gre = quotes (ppr (gre_name gre)) <> comma <+> pprNameProvenance gre + mk_ref gre = sep [quotes (ppr (gre_name gre)) <> comma, pprNameProvenance gre] -shadowedNameWarn :: SDoc -> OccName -> [SDoc] -> SDoc -shadowedNameWarn doc occ shadowed_locs +shadowedNameWarn :: OccName -> [SDoc] -> SDoc +shadowedNameWarn occ shadowed_locs = sep [ptext (sLit "This binding for") <+> quotes (ppr occ) <+> ptext (sLit "shadows the existing binding") <> plural shadowed_locs, nest 2 (vcat shadowed_locs)] - $$ doc unknownNameErr :: RdrName -> SDoc unknownNameErr rdr_name @@ -1089,7 +1125,7 @@ unknownNameErr rdr_name perhapsForallMsg :: SDoc perhapsForallMsg - = vcat [ ptext (sLit "Perhaps you intended to use -XRankNTypes or similar flag") + = vcat [ ptext (sLit "Perhaps you intended to use -XExplicitForAll or similar flag") , ptext (sLit "to enable explicit-forall syntax: forall . ")] unknownSubordinateErr :: SDoc -> RdrName -> SDoc @@ -1102,18 +1138,15 @@ badOrigBinding name = ptext (sLit "Illegal binding of built-in syntax:") <+> ppr (rdrNameOcc name) -- The rdrNameOcc is because we don't want to print Prelude.(,) -dupNamesErr :: Outputable n => (n -> SrcSpan) -> SDoc -> [n] -> RnM () -dupNamesErr get_loc descriptor names +dupNamesErr :: Outputable n => (n -> SrcSpan) -> [n] -> RnM () +dupNamesErr get_loc names = addErrAt big_loc $ vcat [ptext (sLit "Conflicting definitions for") <+> quotes (ppr (head names)), - locations, descriptor] + locations] where locs = map get_loc names big_loc = foldr1 combineSrcSpans locs - one_line = isOneLineSpan big_loc - locations | one_line = empty - | otherwise = ptext (sLit "Bound at:") <+> - vcat (map ppr (sortLe (<=) locs)) + locations = ptext (sLit "Bound at:") <+> vcat (map ppr (sortLe (<=) locs)) kindSigErr :: Outputable a => a -> SDoc kindSigErr thing