X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Frename%2FRnEnv.lhs;h=2ecaf612954c63302e2c74cf2c979ab4a69ce752;hp=6c3567a354200c83d9814ee6595ffcfb41d48b6f;hb=7bb3d1fc79521d591cd9f824893963141a7997b6;hpb=5e09d0886105fdfec4d7e8aaf2115b92ee18cfaa diff --git a/compiler/rename/RnEnv.lhs b/compiler/rename/RnEnv.lhs index 6c3567a..2ecaf61 100644 --- a/compiler/rename/RnEnv.lhs +++ b/compiler/rename/RnEnv.lhs @@ -1,4 +1,4 @@ -\% +% % (c) The GRASP/AQUA Project, Glasgow University, 1992-2006 % \section[RnEnv]{Environment manipulation for the renamer monad} @@ -6,16 +6,16 @@ \begin{code} module RnEnv ( newTopSrcBinder, lookupFamInstDeclBndr, - lookupLocatedBndrRn, lookupBndrRn, lookupBndrRn_maybe, lookupLocatedTopBndrRn, lookupTopBndrRn, lookupLocatedOccRn, lookupOccRn, - lookupLocatedGlobalOccRn, lookupGlobalOccRn, - lookupLocalDataTcNames, lookupSrcOcc_maybe, + lookupLocatedGlobalOccRn, + lookupGlobalOccRn, lookupGlobalOccRn_maybe, + lookupLocalDataTcNames, lookupSigOccRn, lookupFixityRn, lookupTyFixityRn, lookupInstDeclBndr, lookupRecordBndr, lookupConstructorFields, - lookupSyntaxName, lookupSyntaxTable, lookupImportedName, + lookupSyntaxName, lookupSyntaxTable, lookupGreRn, lookupGreLocalRn, lookupGreRn_maybe, - getLookupOccRn, + getLookupOccRn, addUsedRdrNames, newLocalsRn, newIPNameRn, bindLocalNames, bindLocalNamesFV, @@ -30,7 +30,9 @@ module RnEnv ( mapFvRn, mapFvRnCPS, warnUnusedMatches, warnUnusedModules, warnUnusedImports, warnUnusedTopBinds, warnUnusedLocalBinds, - dataTcOccs, unknownNameErr + dataTcOccs, unknownNameErr, kindSigErr, perhapsForallMsg, + + checkM ) where #include "HsVersions.h" @@ -41,8 +43,9 @@ import HsSyn import RdrHsSyn ( extractHsTyRdrTyVars ) import RdrName import HscTypes ( availNames, ModIface(..), FixItem(..), lookupFixity) -import TcEnv ( tcLookupDataCon ) +import TcEnv ( tcLookupDataCon, tcLookupField, isBrackStage ) import TcRnMonad +import Id ( isRecordSelector ) import Name ( Name, nameIsLocalOrFrom, mkInternalName, isWiredInName, nameSrcLoc, nameSrcSpan, nameOccName, nameModule, isExternalName ) import NameSet @@ -55,6 +58,7 @@ import PrelNames ( mkUnboundName, rOOT_MAIN, iNTERACTIVE, consDataConKey, hasKey, forall_tv_RDR ) import UniqSupply import BasicTypes ( IPName, mapIPName, Fixity ) +import ErrUtils ( Message ) import SrcLoc import Outputable import Util @@ -64,6 +68,7 @@ import List ( nubBy ) import DynFlags import FastString import Control.Monad +import qualified Data.Set as Set \end{code} \begin{code} @@ -140,7 +145,16 @@ newTopSrcBinder this_mod (L loc rdr_name) (addErrAt loc (badQualBndrErr rdr_name)) -- Binders should not be qualified; if they are, and with a different -- module name, we we get a confusing "M.T is not in scope" error later - ; newGlobalBinder this_mod (rdrNameOcc rdr_name) loc } + + ; stage <- getStage + ; if isBrackStage stage then + -- We are inside a TH bracket, so make an *Internal* name + -- See Note [Top-level Names in Template Haskell decl quotes] in RnNames + do { uniq <- newUnique + ; return (mkInternalName uniq (rdrNameOcc rdr_name) loc) } + else + -- Normal case + newGlobalBinder this_mod (rdrNameOcc rdr_name) loc } \end{code} %********************************************************* @@ -151,17 +165,19 @@ newTopSrcBinder this_mod (L loc rdr_name) Looking up a name in the RnEnv. -\begin{code} -lookupLocatedBndrRn :: Located RdrName -> RnM (Located Name) -lookupLocatedBndrRn = wrapLocM lookupBndrRn - -lookupBndrRn :: RdrName -> RnM Name -lookupBndrRn n = do nopt <- lookupBndrRn_maybe n - case nopt of - Just n' -> return n' - Nothing -> do traceRn $ text "lookupTopBndrRn" - unboundName n +Note [Type and class operator definitions] +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +We want to reject all of these unless we have -XTypeOperators (Trac #3265) + data a :*: b = ... + class a :*: b where ... + data (:*:) a b = .... + class (:*:) a b where ... +The latter two mean that we are not just looking for a +*syntactically-infix* declaration, but one that uses an operator +OccName. We use OccName.isSymOcc to detect that case, which isn't +terribly efficient, but there seems to be no better way. +\begin{code} lookupTopBndrRn :: RdrName -> RnM Name lookupTopBndrRn n = do nopt <- lookupTopBndrRn_maybe n case nopt of @@ -169,14 +185,6 @@ lookupTopBndrRn n = do nopt <- lookupTopBndrRn_maybe n Nothing -> do traceRn $ text "lookupTopBndrRn" unboundName n -lookupBndrRn_maybe :: RdrName -> RnM (Maybe Name) --- NOTE: assumes that the SrcSpan of the binder has already been setSrcSpan'd -lookupBndrRn_maybe rdr_name - = getLocalRdrEnv `thenM` \ local_env -> - case lookupLocalRdrEnv local_env rdr_name of - Just name -> returnM (Just name) - Nothing -> lookupTopBndrRn_maybe rdr_name - lookupLocatedTopBndrRn :: Located RdrName -> RnM (Located Name) lookupLocatedTopBndrRn = wrapLocM lookupTopBndrRn @@ -210,7 +218,14 @@ lookupTopBndrRn_maybe rdr_name ; return (Just n)} | otherwise - = do { mb_gre <- lookupGreLocalRn rdr_name + = do { -- Check for operators in type or class declarations + -- See Note [Type and class operator definitions] + let occ = rdrNameOcc rdr_name + ; when (isTcOcc occ && isSymOcc occ) + (do { op_ok <- doptM Opt_TypeOperators + ; checkM op_ok (addErr (opDeclErr rdr_name)) }) + + ; mb_gre <- lookupGreLocalRn rdr_name ; case mb_gre of Nothing -> returnM Nothing Just gre -> returnM (Just $ gre_name gre) } @@ -238,9 +253,16 @@ lookupInstDeclBndr cls rdr = lookup_located_sub_bndr is_op doc rdr ----------------------------------------------- lookupRecordBndr :: Maybe (Located Name) -> Located RdrName -> RnM (Located Name) -- Used for record construction and pattern matching --- When the -fdisambiguate-record-fields flag is on, take account of the +-- When the -XDisambiguateRecordFields flag is on, take account of the -- constructor name to disambiguate which field to use; it's just the -- same as for instance decls +-- +-- NB: Consider this: +-- module Foo where { data R = R { fld :: Int } } +-- module Odd where { import Foo; fld x = x { fld = 3 } } +-- Arguably this should work, because the reference to 'fld' is +-- unambiguous because there is only one field id 'fld' in scope. +-- But currently it's rejected. lookupRecordBndr Nothing rdr_name = lookupLocatedGlobalOccRn rdr_name lookupRecordBndr (Just (L _ data_con)) rdr_name @@ -269,7 +291,7 @@ lookupConstructorFields :: Name -> RnM [Name] lookupConstructorFields con_name = do { this_mod <- getModule ; if nameIsLocalOrFrom this_mod con_name then - do { field_env <- getRecFieldEnv + do { RecFields field_env _ <- getRecFieldEnv ; return (lookupNameEnv field_env con_name `orElse` []) } else do { con <- tcLookupDataCon con_name @@ -286,6 +308,7 @@ lookup_sub_bndr :: (GlobalRdrElt -> Bool) -> SDoc -> RdrName -> RnM Name lookup_sub_bndr is_good doc rdr_name | isUnqual rdr_name -- Find all the things the rdr-name maps to = do { -- and pick the one with the right parent name + ; addUsedRdrName rdr_name ; env <- getGlobalRdrEnv ; case filter is_good (lookupGlobalRdrEnv env (rdrNameOcc rdr_name)) of -- NB: lookupGlobalRdrEnv, not lookupGRE_RdrName! @@ -300,30 +323,25 @@ lookup_sub_bndr is_good doc rdr_name } | otherwise -- Occurs in derived instances, where we just - -- refer directly to the right method - = ASSERT2( not (isQual rdr_name), ppr rdr_name ) - -- NB: qualified names are rejected by the parser - lookupImportedName rdr_name + -- refer directly to the right method with an Orig + -- And record fields can be Quals: C { F.f = x } + = lookupGlobalOccRn rdr_name newIPNameRn :: IPName RdrName -> TcRnIf m n (IPName Name) newIPNameRn ip_rdr = newIPName (mapIPName rdrNameOcc ip_rdr) --- Looking up family names in type instances is a subtle affair. The family --- may be imported, in which case we need to lookup the occurence of a global --- name. Alternatively, the family may be in the same binding group (and in --- fact in a declaration processed later), and we need to create a new top --- source binder. --- --- So, also this is strictly speaking an occurence, we cannot raise an error --- message yet for instances without a family declaration. This will happen --- during renaming the type instance declaration in RnSource.rnTyClDecl. +-- If the family is declared locally, it will not yet be in the main +-- environment; hence, we pass in an extra one here, which we check first. +-- See "Note [Looking up family names in family instances]" in 'RnNames'. -- -lookupFamInstDeclBndr :: Module -> Located RdrName -> RnM Name -lookupFamInstDeclBndr mod lrdr_name@(L _ rdr_name) - = do { mb_gre <- lookupGreRn_maybe rdr_name - ; case mb_gre of - Just gre -> returnM (gre_name gre) - Nothing -> newTopSrcBinder mod lrdr_name } +lookupFamInstDeclBndr :: GlobalRdrEnv -> Located RdrName -> RnM Name +lookupFamInstDeclBndr tyclGroupEnv (L loc rdr_name) + = setSrcSpan loc $ + case lookupGRE_RdrName rdr_name tyclGroupEnv of + (gre:_) -> return $ gre_name gre + -- if there is more than one, an error will be raised elsewhere + [] -> lookupOccRn rdr_name + -------------------------------------------------- -- Occurrences @@ -350,55 +368,43 @@ lookupLocatedGlobalOccRn = wrapLocM lookupGlobalOccRn lookupGlobalOccRn :: RdrName -> RnM Name -- lookupGlobalOccRn is like lookupOccRn, except that it looks in the global --- environment. It's used only for --- record field names --- class op names in class and instance decls +-- environment. Adds an error message if the RdrName is not in scope. +-- Also has a special case for GHCi. lookupGlobalOccRn rdr_name - | not (isSrcRdrName rdr_name) - = lookupImportedName rdr_name - - | otherwise - = do - -- First look up the name in the normal environment. - mb_gre <- lookupGreRn_maybe rdr_name - case mb_gre of { - Just gre -> returnM (gre_name gre) ; - Nothing -> do - - -- We allow qualified names on the command line to refer to - -- *any* name exported by any module in scope, just as if - -- there was an "import qualified M" declaration for every - -- module. - allow_qual <- doptM Opt_ImplicitImportQualified - mod <- getModule + = do { -- First look up the name in the normal environment. + mb_name <- lookupGlobalOccRn_maybe rdr_name + ; case mb_name of { + Just n -> return n ; + Nothing -> do + + { -- We allow qualified names on the command line to refer to + -- *any* name exported by any module in scope, just as if there + -- was an "import qualified M" declaration for every module. + allow_qual <- doptM Opt_ImplicitImportQualified + ; mod <- getModule -- This test is not expensive, -- and only happens for failed lookups - if isQual rdr_name && allow_qual && mod == iNTERACTIVE - then lookupQualifiedName rdr_name - else do - traceRn $ text "lookupGlobalOccRn" - unboundName rdr_name - } - -lookupImportedName :: RdrName -> TcRnIf m n Name --- Lookup the occurrence of an imported name --- The RdrName is *always* qualified or Exact --- Treat it as an original name, and conjure up the Name --- Usually it's Exact or Orig, but it can be Qual if it --- comes from an hi-boot file. (This minor infelicity is --- just to reduce duplication in the parser.) -lookupImportedName rdr_name - | Just n <- isExact_maybe rdr_name - -- This happens in derived code - = returnM n - - -- Always Orig, even when reading a .hi-boot file + ; if isQual rdr_name && allow_qual && mod == iNTERACTIVE + then lookupQualifiedName rdr_name + else unboundName rdr_name } } } + +lookupGlobalOccRn_maybe :: RdrName -> RnM (Maybe Name) +-- No filter function; does not report an error on failure + +lookupGlobalOccRn_maybe rdr_name + | Just n <- isExact_maybe rdr_name -- This happens in derived code + = return (Just n) + | Just (rdr_mod, rdr_occ) <- isOrig_maybe rdr_name - = lookupOrig rdr_mod rdr_occ + = do { n <- lookupOrig rdr_mod rdr_occ; return (Just n) } | otherwise - = pprPanic "RnEnv.lookupImportedName" (ppr rdr_name) + = do { mb_gre <- lookupGreRn_maybe rdr_name + ; case mb_gre of + Nothing -> return Nothing + Just gre -> return (Just (gre_name gre)) } + unboundName :: RdrName -> RnM Name unboundName rdr_name @@ -413,19 +419,30 @@ unboundName rdr_name -- Lookup in the Global RdrEnv of the module -------------------------------------------------- -lookupSrcOcc_maybe :: RdrName -> RnM (Maybe Name) --- No filter function; does not report an error on failure -lookupSrcOcc_maybe rdr_name - = do { mb_gre <- lookupGreRn_maybe rdr_name - ; case mb_gre of - Nothing -> returnM Nothing - Just gre -> returnM (Just (gre_name gre)) } - -------------------------- lookupGreRn_maybe :: RdrName -> RnM (Maybe GlobalRdrElt) -- Just look up the RdrName in the GlobalRdrEnv lookupGreRn_maybe rdr_name - = lookupGreRn_help rdr_name (lookupGRE_RdrName rdr_name) + = do { mGre <- lookupGreRn_help rdr_name (lookupGRE_RdrName rdr_name) + ; case mGre of + Just gre -> + case gre_prov gre of + LocalDef -> return () + Imported _ -> addUsedRdrName rdr_name + Nothing -> + return () + ; return mGre } + +addUsedRdrName :: RdrName -> RnM () +addUsedRdrName rdr + = do { env <- getGblEnv + ; updMutVar (tcg_used_rdrnames env) + (\s -> Set.insert rdr s) } + +addUsedRdrNames :: [RdrName] -> RnM () +addUsedRdrNames rdrs + = do { env <- getGblEnv + ; updMutVar (tcg_used_rdrnames env) + (\s -> foldr Set.insert s rdrs) } lookupGreRn :: RdrName -> RnM GlobalRdrElt -- If not found, add error message, and return a fake GRE @@ -487,6 +504,120 @@ lookupQualifiedName rdr_name doc = ptext (sLit "Need to find") <+> ppr rdr_name \end{code} +lookupSigOccRn is used for type signatures and pragmas +Is this valid? + module A + import M( f ) + f :: Int -> Int + f x = x +It's clear that the 'f' in the signature must refer to A.f +The Haskell98 report does not stipulate this, but it will! +So we must treat the 'f' in the signature in the same way +as the binding occurrence of 'f', using lookupBndrRn + +However, consider this case: + import M( f ) + f :: Int -> Int + g x = x +We don't want to say 'f' is out of scope; instead, we want to +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 + -- in the same group + -- Nothing => hs-boot file; signatures without + -- binders are expected + -> Sig RdrName + -> Located RdrName -> RnM (Located Name) +lookupSigOccRn mb_bound_names sig + = wrapLocM $ \ rdr_name -> + do { mb_name <- lookupBindGroupOcc mb_bound_names (hsSigDoc sig) rdr_name + ; case mb_name of + 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 + -> 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 +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 + + { 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 + }} + where + check_local_name name -- The name is in scope, and not imported + = case mb_bound_names of + Just bound_names | not (name `elemNameSet` bound_names) + -> bale_out_with local_msg + _other -> return (Right name) + + bale_out_with msg + = return (Left (sep [ ptext (sLit "The") <+> what + <+> ptext (sLit "for") <+> quotes (ppr rdr_name) + , nest 2 $ ptext (sLit "lacks an accompanying binding")] + $$ nest 2 msg)) + + local_msg = parens $ ptext (sLit "The") <+> what <+> ptext (sLit "must be given where") + <+> quotes (ppr rdr_name) <+> ptext (sLit "is declared") + + import_msg = parens $ ptext (sLit "You cannot give a") <+> what + <+> ptext (sLit "for an imported value") + +--------------- +lookupLocalDataTcNames :: NameSet -> SDoc -> RdrName -> RnM [Name] +-- GHC extension: look up both the tycon and data con +-- for con-like things +-- Complain if neither is in scope +lookupLocalDataTcNames bound_names what rdr_name + | Just n <- isExact_maybe rdr_name + -- Special case for (:), which doesn't get into the GlobalRdrEnv + = return [n] -- For this we don't need to try the tycon too + | otherwise + = do { mb_gres <- mapM (lookupBindGroupOcc (Just bound_names) what) + (dataTcOccs rdr_name) + ; let (errs, names) = splitEithers mb_gres + ; when (null names) (addErr (head errs)) -- Bleat about one only + ; return names } + +dataTcOccs :: RdrName -> [RdrName] +-- If the input is a data constructor, return both it and a type +-- constructor. This is useful when we aren't sure which we are +-- looking at. +dataTcOccs rdr_name + | Just n <- isExact_maybe rdr_name -- Ghastly special case + , n `hasKey` consDataConKey = [rdr_name] -- see note below + | isDataOcc occ = [rdr_name, rdr_name_tc] + | otherwise = [rdr_name] + where + occ = rdrNameOcc rdr_name + rdr_name_tc = setRdrNameSpace rdr_name tcName + +-- If the user typed "[]" or "(,,)", we'll generate an Exact RdrName, +-- and setRdrNameSpace generates an Orig, which is fine +-- But it's not fine for (:), because there *is* no corresponding type +-- constructor. If we generate an Orig tycon for GHC.Base.(:), it'll +-- appear to be in scope (because Orig's simply allocate a new name-cache +-- entry) and then we get an error when we use dataTcOccs in +-- TcRnDriver.tcRnGetInfo. Large sigh. +\end{code} + + %********************************************************* %* * Fixities @@ -593,45 +724,6 @@ lookupFixityRn name lookupTyFixityRn :: Located Name -> RnM Fixity lookupTyFixityRn (L _ n) = lookupFixityRn n ---------------- -lookupLocalDataTcNames :: RdrName -> RnM [Name] --- GHC extension: look up both the tycon and data con --- for con-like things --- Complain if neither is in scope -lookupLocalDataTcNames rdr_name - | Just n <- isExact_maybe rdr_name - -- Special case for (:), which doesn't get into the GlobalRdrEnv - = return [n] -- For this we don't need to try the tycon too - | otherwise - = do { mb_gres <- mapM lookupGreLocalRn (dataTcOccs rdr_name) - ; case [gre_name gre | Just gre <- mb_gres] of - [] -> do { - -- run for error reporting - ; unboundName rdr_name - ; return [] } - names -> return names - } - -dataTcOccs :: RdrName -> [RdrName] --- If the input is a data constructor, return both it and a type --- constructor. This is useful when we aren't sure which we are --- looking at. -dataTcOccs rdr_name - | Just n <- isExact_maybe rdr_name -- Ghastly special case - , n `hasKey` consDataConKey = [rdr_name] -- see note below - | isDataOcc occ = [rdr_name_tc, rdr_name] - | otherwise = [rdr_name] - where - occ = rdrNameOcc rdr_name - rdr_name_tc = setRdrNameSpace rdr_name tcName - --- If the user typed "[]" or "(,,)", we'll generate an Exact RdrName, --- and setRdrNameSpace generates an Orig, which is fine --- But it's not fine for (:), because there *is* no corresponding type --- constructor. If we generate an Orig tycon for GHC.Base.(:), it'll --- appear to be in scope (because Orig's simply allocate a new name-cache --- entry) and then we get an error when we use dataTcOccs in --- TcRnDriver.tcRnGetInfo. Large sigh. \end{code} %************************************************************************ @@ -769,13 +861,15 @@ bindTyVarsRn :: SDoc -> [LHsTyVarBndr RdrName] -> RnM a -- Haskell-98 binding of type variables; e.g. within a data type decl bindTyVarsRn doc_str tyvar_names enclosed_scope - = let - located_tyvars = hsLTyVarLocNames tyvar_names - in - bindLocatedLocalsRn doc_str located_tyvars $ \ names -> - enclosed_scope (zipWith replace tyvar_names names) - where - replace (L loc n1) n2 = L loc (replaceTyVarName n1 n2) + = bindLocatedLocalsRn doc_str located_tyvars $ \ names -> + do { kind_sigs_ok <- doptM Opt_KindSignatures + ; checkM (null kinded_tyvars || kind_sigs_ok) + (mapM_ (addErr . kindSigErr) kinded_tyvars) + ; enclosed_scope (zipWith replace tyvar_names names) } + where + replace (L loc n1) n2 = L loc (replaceTyVarName n1 n2) + located_tyvars = hsLTyVarLocNames tyvar_names + kinded_tyvars = [n | L _ (KindedTyVar n _) <- tyvar_names] bindPatSigTyVars :: [LHsType RdrName] -> ([Name] -> RnM a) -> RnM a -- Find the type variables in the pattern type @@ -847,15 +941,34 @@ checkShadowedNames doc_str (global_env,local_env) loc_rdr_names ; mappM_ check_shadow loc_rdr_names } where check_shadow (loc, occ) + | startsWithUnderscore occ = return () -- Do not report shadowing for "_x" + -- See Trac #3262 | Just n <- mb_local = complain [ptext (sLit "bound at") <+> ppr (nameSrcLoc n)] - | not (null gres) = complain (map pprNameProvenance gres) - | otherwise = return () + | otherwise = do { gres' <- filterM is_shadowed_gre gres + ; complain (map pprNameProvenance gres') } where + complain [] = return () complain pp_locs = addWarnAt loc (shadowedNameWarn doc_str 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 -- we don't find any GREs that are in scope qualified-only + + is_shadowed_gre :: GlobalRdrElt -> RnM Bool + -- Returns False for record selectors that are shadowed, when + -- 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) + then do { is_fld <- is_rec_fld gre; return (not is_fld) } + else return True } + is_shadowed_gre _other = return True + + is_rec_fld gre -- Return True for record selector ids + | isLocalGRE gre = do { RecFields _ fld_set <- getRecFieldEnv + ; return (gre_name gre `elemNameSet` fld_set) } + | otherwise = do { sel_id <- tcLookupField (gre_name gre) + ; return (isRecordSelector sel_id) } \end{code} @@ -868,11 +981,9 @@ checkShadowedNames doc_str (global_env,local_env) loc_rdr_names \begin{code} -- A useful utility mapFvRn :: (a -> RnM (b, FreeVars)) -> [a] -> RnM ([b], FreeVars) -mapFvRn f xs = mappM f xs `thenM` \ stuff -> - let - (ys, fvs_s) = unzip stuff - in - returnM (ys, plusFVs fvs_s) +mapFvRn f xs = do stuff <- mappM f xs + case unzip stuff of + (ys, fvs_s) -> returnM (ys, plusFVs fvs_s) -- because some of the rename functions are CPSed: -- maps the function across the list from left to right; @@ -935,13 +1046,13 @@ warnUnusedBinds names = mappM_ warnUnusedName (filter reportable names) | isWiredInName name = False -- Don't report unused wired-in names -- Otherwise we get a zillion warnings -- from Data.Tuple - | otherwise = reportIfUnused (nameOccName name) + | otherwise = not (startsWithUnderscore (nameOccName name)) ------------------------- warnUnusedName :: (Name, Provenance) -> RnM () warnUnusedName (name, LocalDef) - = addUnusedWarning name (srcLocSpan (nameSrcLoc name)) + = addUnusedWarning name (nameSrcSpan name) (ptext (sLit "Defined but not used")) warnUnusedName (name, Imported is) @@ -986,10 +1097,13 @@ unknownNameErr rdr_name <+> quotes (ppr rdr_name)) , extra ] where - extra | rdr_name == forall_tv_RDR - = vcat [ptext (sLit "Perhaps you intended to use -XRankNTypes or similar flag"), - ptext (sLit "to enable explicit-forall syntax: forall . ?")] - | otherwise = empty + extra | rdr_name == forall_tv_RDR = perhapsForallMsg + | otherwise = empty + +perhapsForallMsg :: SDoc +perhapsForallMsg + = vcat [ ptext (sLit "Perhaps you intended to use -XRankNTypes or similar flag") + , ptext (sLit "to enable explicit-forall syntax: forall . ")] unknownSubordinateErr :: SDoc -> RdrName -> SDoc unknownSubordinateErr doc op -- Doc is "method of class" or @@ -1014,7 +1128,18 @@ dupNamesErr get_loc descriptor names | otherwise = ptext (sLit "Bound at:") <+> vcat (map ppr (sortLe (<=) locs)) +kindSigErr :: Outputable a => a -> SDoc +kindSigErr thing + = hang (ptext (sLit "Illegal kind signature for") <+> quotes (ppr thing)) + 2 (ptext (sLit "Perhaps you intended to use -XKindSignatures")) + + badQualBndrErr :: RdrName -> SDoc badQualBndrErr rdr_name = ptext (sLit "Qualified name in binding position:") <+> ppr rdr_name + +opDeclErr :: RdrName -> SDoc +opDeclErr n + = hang (ptext (sLit "Illegal declaration of a type or class operator") <+> quotes (ppr n)) + 2 (ptext (sLit "Use -XTypeOperators to declare operators in type and declarations")) \end{code}