X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Frename%2FRnEnv.lhs;h=825ed19fc230bc100e637db880a9da54459073a0;hb=edc0bafd3fcd01b85a2e8894e5dfe149eb0e0857;hp=ad7709a9367b9e9a2c1a6bcf76e174087f37b7eb;hpb=cec00a4113d5b3079308b11f5e257c25908f9b37;p=ghc-hetmet.git diff --git a/compiler/rename/RnEnv.lhs b/compiler/rename/RnEnv.lhs index ad7709a..825ed19 100644 --- a/compiler/rename/RnEnv.lhs +++ b/compiler/rename/RnEnv.lhs @@ -28,7 +28,7 @@ module RnEnv ( checkDupRdrNames, checkDupAndShadowedRdrNames, checkDupNames, checkDupAndShadowedNames, addFvRn, mapFvRn, mapMaybeFvRn, mapFvRnCPS, - warnUnusedMatches, warnUnusedModules, warnUnusedImports, + warnUnusedMatches, warnUnusedTopBinds, warnUnusedLocalBinds, dataTcOccs, unknownNameErr, kindSigErr, perhapsForallMsg ) where @@ -51,7 +51,6 @@ import NameEnv import UniqFM import DataCon ( dataConFieldLabels ) import OccName -import Module ( ModuleName ) import PrelNames ( mkUnboundName, rOOT_MAIN, iNTERACTIVE, consDataConKey, forall_tv_RDR ) import Unique @@ -208,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 @@ -506,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 @@ -526,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 @@ -539,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 @@ -726,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 @@ -765,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 -> @@ -777,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 -> @@ -867,7 +871,7 @@ bindTyVarsRn :: [LHsTyVarBndr RdrName] -- Haskell-98 binding of type variables; e.g. within a data type decl bindTyVarsRn tyvar_names enclosed_scope = bindLocatedLocalsRn located_tyvars $ \ names -> - do { kind_sigs_ok <- doptM Opt_KindSignatures + 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) } @@ -880,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 @@ -907,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 @@ -951,7 +955,7 @@ checkDupAndShadowedNames envs names ------------------------------------- checkShadowedOccs :: (GlobalRdrEnv, LocalRdrEnv) -> [(SrcSpan,OccName)] -> RnM () checkShadowedOccs (global_env,local_env) loc_occs - = ifOptM Opt_WarnNameShadowing $ + = ifDOptM Opt_WarnNameShadowing $ do { traceRn (text "shadow" <+> ppr loc_occs) ; mapM_ check_shadow loc_occs } where @@ -974,7 +978,7 @@ checkShadowedOccs (global_env,local_env) loc_occs -- 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 @@ -1028,23 +1032,9 @@ 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 :: [GlobalRdrElt] -> RnM () warnUnusedTopBinds gres - = ifOptM Opt_WarnUnusedBinds + = ifDOptM Opt_WarnUnusedBinds $ do isBoot <- tcIsHsBoot let noParent gre = case gre_par gre of NoParent -> True @@ -1062,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 @@ -1115,7 +1105,7 @@ 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 :: OccName -> [SDoc] -> SDoc shadowedNameWarn occ shadowed_locs