X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Frename%2FRnSource.lhs;h=b5386a3d1ab543975eaed852020c52c31e23cb12;hb=0299e1a135c5805e09ed8e2271b3b17fc8a04869;hp=9897fd830762eec28d4942bb07d0d905ca6d3617;hpb=e4b0fab5a594c4ea29ddecdf216b4887420f26a4;p=ghc-hetmet.git diff --git a/ghc/compiler/rename/RnSource.lhs b/ghc/compiler/rename/RnSource.lhs index 9897fd8..b5386a3 100644 --- a/ghc/compiler/rename/RnSource.lhs +++ b/ghc/compiler/rename/RnSource.lhs @@ -4,61 +4,52 @@ \section[RnSource]{Main pass of renamer} \begin{code} -module RnSource ( rnDecl, rnSourceDecls, rnHsType, rnHsSigType, rnHsPolyType ) where +module RnSource ( rnTyClDecl, rnIfaceRuleDecl, rnInstDecl, rnSourceDecls, + ) where #include "HsVersions.h" import RnExpr import HsSyn -import HsPragmas -import HsTypes ( getTyVarName, pprHsPred, cmpHsTypes ) -import RdrName ( RdrName, isRdrDataCon, rdrNameOcc, isRdrTyVar ) -import RdrHsSyn ( RdrNameContext, RdrNameHsType, RdrNameConDecl, - extractRuleBndrsTyVars, extractHsTyRdrTyVars, extractHsTysRdrTyVars +import HscTypes ( GlobalRdrEnv, AvailEnv ) +import RdrName ( RdrName, isRdrDataCon, elemRdrEnv ) +import RdrHsSyn ( RdrNameConDecl, RdrNameTyClDecl, + extractGenericPatTyVars ) import RnHsSyn import HsCore -import RnBinds ( rnTopBinds, rnMethodBinds, renameSigs, unknownSigErr ) -import RnEnv ( bindTyVarsRn, lookupBndrRn, lookupOccRn, getIPName, - lookupImplicitOccRn, - bindLocalsRn, bindLocalRn, bindLocalsFVRn, bindUVarRn, - bindTyVarsFVRn, bindTyVarsFV2Rn, extendTyVarEnvFVRn, - bindCoreLocalFVRn, bindCoreLocalsFVRn, - checkDupOrQualNames, checkDupNames, - mkImportedGlobalName, mkImportedGlobalFromRdrName, - newDFunName, getDFunKey, newImplicitBinder, - FreeVars, emptyFVs, plusFV, plusFVs, unitFV, addOneFV, mapFvRn +import RnTypes ( rnHsType, rnHsSigType, rnHsTypeFVs, rnContext ) + +import RnBinds ( rnTopBinds, rnMethodBinds, renameSigs, renameSigsFVs ) +import RnEnv ( lookupTopBndrRn, lookupOccRn, lookupIfaceName, + lookupOrigNames, lookupSysBinder, newLocalsRn, + bindLocalsFVRn, bindPatSigTyVars, + bindTyVarsRn, extendTyVarEnvFVRn, + bindCoreLocalRn, bindCoreLocalsRn, bindLocalNames, + checkDupOrQualNames, checkDupNames, mapFvRn ) import RnMonad -import FunDeps ( oclose ) - -import Name ( Name, OccName, - ExportFlag(..), Provenance(..), - nameOccName, NamedThing(..) - ) +import Class ( FunDep, DefMeth (..) ) +import DataCon ( dataConId ) +import Name ( Name, NamedThing(..) ) import NameSet -import OccName ( mkDefaultMethodOcc ) -import BasicTypes ( TopLevelFlag(..) ) -import FiniteMap ( elemFM ) -import PrelInfo ( derivableClassKeys, - deRefStablePtr_NAME, makeStablePtr_NAME, bindIO_NAME +import PrelInfo ( derivableClassKeys ) +import PrelNames ( deRefStablePtrName, newStablePtrName, + bindIOName, returnIOName ) -import Bag ( bagToList ) -import List ( partition, nub ) +import TysWiredIn ( tupleCon ) +import List ( partition ) import Outputable import SrcLoc ( SrcLoc ) -import CmdLineOpts ( opt_GlasgowExts, opt_WarnUnusedMatches ) -- Warn of unused for-all'd tyvars +import CmdLineOpts ( DynFlag(..) ) + -- Warn of unused for-all'd tyvars import Unique ( Uniquable(..) ) -import UniqFM ( lookupUFM ) -import ErrUtils ( Message ) -import CStrings ( isCLabelString ) -import Maybes ( maybeToBool, catMaybes ) -import Util +import Maybes ( maybeToBool ) \end{code} -@rnDecl@ `renames' declarations. +@rnSourceDecl@ `renames' declarations. It simultaneously performs dependency analysis and precedence parsing. It also does the following error checks: \begin{enumerate} @@ -76,198 +67,86 @@ Checks the @(..)@ etc constraints in the export list. %********************************************************* %* * -\subsection{Value declarations} +\subsection{Source code declarations} %* * %********************************************************* \begin{code} -rnSourceDecls :: [RdrNameHsDecl] -> RnMS ([RenamedHsDecl], FreeVars) +rnSourceDecls :: GlobalRdrEnv -> AvailEnv -> LocalFixityEnv + -> [RdrNameHsDecl] + -> RnMG ([RenamedHsDecl], FreeVars) -- The decls get reversed, but that's ok -rnSourceDecls decls - = go emptyFVs [] decls +rnSourceDecls gbl_env avails local_fixity_env decls + = initRnMS gbl_env avails emptyRdrEnv local_fixity_env SourceMode (go emptyFVs [] decls) where - -- Fixity decls have been dealt with already; ignore them - go fvs ds' [] = returnRn (ds', fvs) - go fvs ds' (FixD _:ds) = go fvs ds' ds - go fvs ds' (d:ds) = rnDecl d `thenRn` \(d', fvs') -> - go (fvs `plusFV` fvs') (d':ds') ds -\end{code} + -- Fixity and deprecations have been dealt with already; ignore them + go fvs ds' [] = returnRn (ds', fvs) + go fvs ds' (FixD _:ds) = go fvs ds' ds + go fvs ds' (DeprecD _:ds) = go fvs ds' ds + go fvs ds' (d:ds) = rnSourceDecl d `thenRn` \(d', fvs') -> + go (fvs `plusFV` fvs') (d':ds') ds -%********************************************************* -%* * -\subsection{Value declarations} -%* * -%********************************************************* +rnSourceDecl :: RdrNameHsDecl -> RnMS (RenamedHsDecl, FreeVars) -\begin{code} --- rnDecl does all the work -rnDecl :: RdrNameHsDecl -> RnMS (RenamedHsDecl, FreeVars) +rnSourceDecl (ValD binds) = rnTopBinds binds `thenRn` \ (new_binds, fvs) -> + returnRn (ValD new_binds, fvs) -rnDecl (ValD binds) = rnTopBinds binds `thenRn` \ (new_binds, fvs) -> - returnRn (ValD new_binds, fvs) +rnSourceDecl (TyClD tycl_decl) + = rnTyClDecl tycl_decl `thenRn` \ new_decl -> + finishSourceTyClDecl tycl_decl new_decl `thenRn` \ (new_decl', fvs) -> + returnRn (TyClD new_decl', fvs `plusFV` tyClDeclFVs new_decl') +rnSourceDecl (InstD inst) + = rnInstDecl inst `thenRn` \ new_inst -> + finishSourceInstDecl inst new_inst `thenRn` \ (new_inst', fvs) -> + returnRn (InstD new_inst', fvs `plusFV` instDeclFVs new_inst') -rnDecl (SigD (IfaceSig name ty id_infos loc)) - = pushSrcLocRn loc $ - lookupBndrRn name `thenRn` \ name' -> - rnHsPolyType doc_str ty `thenRn` \ (ty',fvs1) -> - mapFvRn rnIdInfo id_infos `thenRn` \ (id_infos', fvs2) -> - returnRn (SigD (IfaceSig name' ty' id_infos' loc), fvs1 `plusFV` fvs2) +rnSourceDecl (RuleD rule) + = rnHsRuleDecl rule `thenRn` \ (new_rule, fvs) -> + returnRn (RuleD new_rule, fvs) + +rnSourceDecl (ForD ford) + = rnHsForeignDecl ford `thenRn` \ (new_ford, fvs) -> + returnRn (ForD new_ford, fvs) + +rnSourceDecl (DefD (DefaultDecl tys src_loc)) + = pushSrcLocRn src_loc $ + mapFvRn (rnHsTypeFVs doc_str) tys `thenRn` \ (tys', fvs) -> + returnRn (DefD (DefaultDecl tys' src_loc), fvs) where - doc_str = text "the interface signature for" <+> quotes (ppr name) + doc_str = text "In a `default' declaration" \end{code} + %********************************************************* %* * -\subsection{Type declarations} +\subsection{Foreign declarations} %* * %********************************************************* -@rnTyDecl@ uses the `global name function' to create a new type -declaration in which local names have been replaced by their original -names, reporting any unknown names. - -Renaming type variables is a pain. Because they now contain uniques, -it is necessary to pass in an association list which maps a parsed -tyvar to its @Name@ representation. -In some cases (type signatures of values), -it is even necessary to go over the type first -in order to get the set of tyvars used by it, make an assoc list, -and then go over it again to rename the tyvars! -However, we can also do some scoping checks at the same time. - \begin{code} -rnDecl (TyClD (TyData new_or_data context tycon tyvars condecls derivings pragmas src_loc)) - = pushSrcLocRn src_loc $ - lookupBndrRn tycon `thenRn` \ tycon' -> - bindTyVarsFVRn data_doc tyvars $ \ tyvars' -> - rnContext data_doc context `thenRn` \ (context', cxt_fvs) -> - checkDupOrQualNames data_doc con_names `thenRn_` - mapFvRn rnConDecl condecls `thenRn` \ (condecls', con_fvs) -> - rnDerivs derivings `thenRn` \ (derivings', deriv_fvs) -> - ASSERT(isNoDataPragmas pragmas) - returnRn (TyClD (TyData new_or_data context' tycon' tyvars' condecls' - derivings' noDataPragmas src_loc), - cxt_fvs `plusFV` con_fvs `plusFV` deriv_fvs) +rnHsForeignDecl (ForeignImport name ty spec isDeprec src_loc) + = pushSrcLocRn src_loc $ + lookupTopBndrRn name `thenRn` \ name' -> + rnHsTypeFVs (fo_decl_msg name) ty `thenRn` \ (ty', fvs) -> + returnRn (ForeignImport name' ty' spec isDeprec src_loc, + fvs `plusFV` extras spec) where - data_doc = text "the data type declaration for" <+> quotes (ppr tycon) - con_names = map conDeclName condecls - -rnDecl (TyClD (TySynonym name tyvars ty src_loc)) - = pushSrcLocRn src_loc $ - lookupBndrRn name `thenRn` \ name' -> - bindTyVarsFVRn syn_doc tyvars $ \ tyvars' -> - rnHsPolyType syn_doc (unquantify ty) `thenRn` \ (ty', ty_fvs) -> - returnRn (TyClD (TySynonym name' tyvars' ty' src_loc), ty_fvs) - where - syn_doc = text "the declaration for type synonym" <+> quotes (ppr name) - - -- For H98 we do *not* universally quantify on the RHS of a synonym - -- Silently discard context... but the tyvars in the rest won't be in scope - unquantify (HsForAllTy Nothing ctxt ty) | not opt_GlasgowExts = ty - unquantify ty = ty - -rnDecl (TyClD (ClassDecl context cname tyvars fds sigs mbinds pragmas - tname dname dwname snames src_loc)) - = pushSrcLocRn src_loc $ - - lookupBndrRn cname `thenRn` \ cname' -> - - -- Deal with the implicit tycon and datacon name - -- They aren't in scope (because they aren't visible to the user) - -- and what we want to do is simply look them up in the cache; - -- we jolly well ought to get a 'hit' there! - -- So the 'Imported' part of this call is not relevant. - -- Unclean; but since these two are the only place this happens - -- I can't work up the energy to do it more beautifully - mkImportedGlobalFromRdrName tname `thenRn` \ tname' -> - mkImportedGlobalFromRdrName dname `thenRn` \ dname' -> - mkImportedGlobalFromRdrName dwname `thenRn` \ dwname' -> - mapRn mkImportedGlobalFromRdrName snames `thenRn` \ snames' -> - - -- Tyvars scope over bindings and context - bindTyVarsFV2Rn cls_doc tyvars ( \ clas_tyvar_names tyvars' -> - - -- Check the superclasses - rnContext cls_doc context `thenRn` \ (context', cxt_fvs) -> - - -- Check the functional dependencies - rnFds cls_doc fds `thenRn` \ (fds', fds_fvs) -> - - -- Check the signatures - let - -- First process the class op sigs, then the fixity sigs. - (op_sigs, non_op_sigs) = partition isClassOpSig sigs - in - checkDupOrQualNames sig_doc sig_rdr_names_w_locs `thenRn_` - mapFvRn (rn_op cname' clas_tyvar_names fds') op_sigs `thenRn` \ (sigs', sig_fvs) -> - let - binders = mkNameSet [ nm | (ClassOpSig nm _ _ _ _) <- sigs' ] - in - renameSigs (okClsDclSig binders) non_op_sigs `thenRn` \ (non_ops', fix_fvs) -> - - -- Check the methods - checkDupOrQualNames meth_doc meth_rdr_names_w_locs `thenRn_` - rnMethodBinds mbinds - `thenRn` \ (mbinds', meth_fvs) -> - - -- Typechecker is responsible for checking that we only - -- give default-method bindings for things in this class. - -- The renamer *could* check this for class decls, but can't - -- for instance decls. - - ASSERT(isNoClassPragmas pragmas) - returnRn (TyClD (ClassDecl context' cname' tyvars' fds' (non_ops' ++ sigs') mbinds' - NoClassPragmas tname' dname' dwname' snames' src_loc), - sig_fvs `plusFV` - fix_fvs `plusFV` - cxt_fvs `plusFV` - fds_fvs `plusFV` - meth_fvs - ) - ) - where - cls_doc = text "the declaration for class" <+> ppr cname - sig_doc = text "the signatures for class" <+> ppr cname - meth_doc = text "the default-methods for class" <+> ppr cname - - sig_rdr_names_w_locs = [(op,locn) | ClassOpSig op _ _ _ locn <- sigs] - meth_rdr_names_w_locs = bagToList (collectMonoBinders mbinds) - meth_rdr_names = map fst meth_rdr_names_w_locs - - rn_op clas clas_tyvars clas_fds sig@(ClassOpSig op dm_rdr_name explicit_dm ty locn) - = pushSrcLocRn locn $ - lookupBndrRn op `thenRn` \ op_name -> - - -- Check the signature - rnHsSigType (quotes (ppr op)) ty `thenRn` \ (new_ty, op_ty_fvs) -> - let - check_in_op_ty clas_tyvar = - checkRn (clas_tyvar `elemNameSet` oclose clas_fds op_ty_fvs) - (classTyVarNotInOpTyErr clas_tyvar sig) - in - mapRn_ check_in_op_ty clas_tyvars `thenRn_` - - -- Make the default-method name - getModeRn `thenRn` \ mode -> - (case mode of - SourceMode -> -- Source class decl - newImplicitBinder (mkDefaultMethodOcc (rdrNameOcc op)) locn `thenRn` \ dm_name -> - returnRn (dm_name, op `elem` meth_rdr_names, emptyFVs) - - InterfaceMode - -> -- Imported class that has a default method decl - -- See comments with tname, snames, above - lookupImplicitOccRn dm_rdr_name `thenRn` \ dm_name -> - returnRn (dm_name, explicit_dm, if explicit_dm then unitFV dm_name else emptyFVs) - -- An imported class decl for a class decl that had an explicit default - -- method, mentions, rather than defines, - -- the default method, so we must arrange to pull it in - ) `thenRn` \ (dm_name, final_explicit_dm, dm_fvs) -> - - returnRn (ClassOpSig op_name dm_name final_explicit_dm new_ty locn, op_ty_fvs `plusFV` dm_fvs) + extras (CImport _ _ _ _ CWrapper) = mkFVs [newStablePtrName, + deRefStablePtrName, + bindIOName, returnIOName] + extras _ = emptyFVs + +rnHsForeignDecl (ForeignExport name ty spec isDeprec src_loc) + = pushSrcLocRn src_loc $ + lookupOccRn name `thenRn` \ name' -> + rnHsTypeFVs (fo_decl_msg name) ty `thenRn` \ (ty', fvs) -> + returnRn (ForeignExport name' ty' spec isDeprec src_loc, + mkFVs [bindIOName, returnIOName] `plusFV` fvs) + +fo_decl_msg name = ptext SLIT("The foreign declaration for") <+> ppr name \end{code} @@ -278,13 +157,29 @@ rnDecl (TyClD (ClassDecl context cname tyvars fds sigs mbinds pragmas %********************************************************* \begin{code} -rnDecl (InstD (InstDecl inst_ty mbinds uprags dfun_rdr_name src_loc)) +rnInstDecl (InstDecl inst_ty mbinds uprags maybe_dfun_rdr_name src_loc) + -- Used for both source and interface file decls = pushSrcLocRn src_loc $ - rnHsSigType (text "an instance decl") inst_ty `thenRn` \ (inst_ty', inst_fvs) -> + rnHsSigType (text "an instance decl") inst_ty `thenRn` \ inst_ty' -> + + (case maybe_dfun_rdr_name of + Nothing -> returnRn Nothing + Just dfun_rdr_name -> lookupIfaceName dfun_rdr_name `thenRn` \ dfun_name -> + returnRn (Just dfun_name) + ) `thenRn` \ maybe_dfun_name -> + + -- The typechecker checks that all the bindings are for the right class. + returnRn (InstDecl inst_ty' EmptyMonoBinds [] maybe_dfun_name src_loc) + +-- Compare finishSourceTyClDecl +finishSourceInstDecl (InstDecl _ mbinds uprags _ _ ) + (InstDecl inst_ty _ _ maybe_dfun_name src_loc) + -- Used for both source decls only + = ASSERT( not (maybeToBool maybe_dfun_name) ) -- Source decl! let - inst_tyvars = case inst_ty' of - HsForAllTy (Just inst_tyvars) _ _ -> inst_tyvars - other -> [] + meth_doc = text "In the bindings in an instance declaration" + meth_names = collectLocatedMonoBinders mbinds + (inst_tyvars, (cls,_)) = getHsInstHead inst_ty -- (Slightly strangely) the forall-d tyvars scope over -- the method bindings too in @@ -292,83 +187,26 @@ rnDecl (InstD (InstDecl inst_ty mbinds uprags dfun_rdr_name src_loc)) -- Rename the bindings -- NB meth_names can be qualified! checkDupNames meth_doc meth_names `thenRn_` - extendTyVarEnvFVRn inst_tyvars ( - rnMethodBinds mbinds + extendTyVarEnvFVRn (map hsTyVarName inst_tyvars) ( + rnMethodBinds cls [] mbinds ) `thenRn` \ (mbinds', meth_fvs) -> let - binders = mkNameSet (map fst (bagToList (collectMonoBinders mbinds'))) + binders = collectMonoBinders mbinds' + binder_set = mkNameSet binders in -- Rename the prags and signatures. -- Note that the type variables are not in scope here, -- so that instance Eq a => Eq (T a) where -- {-# SPECIALISE instance Eq a => Eq (T [a]) #-} -- works OK. - renameSigs (okInstDclSig binders) uprags `thenRn` \ (new_uprags, prag_fvs) -> - - getModeRn `thenRn` \ mode -> - (case mode of - InterfaceMode -> lookupImplicitOccRn dfun_rdr_name `thenRn` \ dfun_name -> - returnRn (dfun_name, unitFV dfun_name) - SourceMode -> newDFunName (getDFunKey inst_ty') src_loc - `thenRn` \ dfun_name -> - returnRn (dfun_name, emptyFVs) - ) - `thenRn` \ (dfun_name, dfun_fv) -> - - -- The typechecker checks that all the bindings are for the right class. - returnRn (InstD (InstDecl inst_ty' mbinds' new_uprags dfun_name src_loc), - inst_fvs `plusFV` meth_fvs `plusFV` prag_fvs `plusFV` dfun_fv) - where - meth_doc = text "the bindings in an instance declaration" - meth_names = bagToList (collectMonoBinders mbinds) -\end{code} - -%********************************************************* -%* * -\subsection{Default declarations} -%* * -%********************************************************* - -\begin{code} -rnDecl (DefD (DefaultDecl tys src_loc)) - = pushSrcLocRn src_loc $ - rnHsTypes doc_str tys `thenRn` \ (tys', fvs) -> - returnRn (DefD (DefaultDecl tys' src_loc), fvs) - where - doc_str = text "a `default' declaration" -\end{code} - -%********************************************************* -%* * -\subsection{Foreign declarations} -%* * -%********************************************************* - -\begin{code} -rnDecl (ForD (ForeignDecl name imp_exp ty ext_nm cconv src_loc)) - = pushSrcLocRn src_loc $ - lookupOccRn name `thenRn` \ name' -> - let - ok_ext_nm Dynamic = True - ok_ext_nm (ExtName nm (Just mb)) = isCLabelString nm && isCLabelString mb - ok_ext_nm (ExtName nm Nothing) = isCLabelString nm - - fvs1 = case imp_exp of - FoImport _ | not isDyn -> emptyFVs - FoLabel -> emptyFVs - FoExport | isDyn -> mkNameSet [makeStablePtr_NAME, - deRefStablePtr_NAME, - bindIO_NAME] - | otherwise -> mkNameSet [name'] - _ -> emptyFVs - in - checkRn (ok_ext_nm ext_nm) (badExtName ext_nm) `thenRn_` - rnHsSigType fo_decl_msg ty `thenRn` \ (ty', fvs2) -> - returnRn (ForD (ForeignDecl name' imp_exp ty' ext_nm cconv src_loc), - fvs1 `plusFV` fvs2) - where - fo_decl_msg = ptext SLIT("a foreign declaration") - isDyn = isDynamicExtName ext_nm + -- + -- But the (unqualified) method names are in scope + bindLocalNames binders ( + renameSigsFVs (okInstDclSig binder_set) uprags + ) `thenRn` \ (uprags', prag_fvs) -> + + returnRn (InstDecl inst_ty mbinds' uprags' maybe_dfun_name src_loc, + meth_fvs `plusFV` prag_fvs) \end{code} %********************************************************* @@ -378,17 +216,22 @@ rnDecl (ForD (ForeignDecl name imp_exp ty ext_nm cconv src_loc)) %********************************************************* \begin{code} -rnDecl (RuleD (IfaceRuleDecl var body src_loc)) - = pushSrcLocRn src_loc $ - lookupOccRn var `thenRn` \ var' -> - rnRuleBody body `thenRn` \ (body', fvs) -> - returnRn (RuleD (IfaceRuleDecl var' body' src_loc), fvs `addOneFV` var') +rnIfaceRuleDecl (IfaceRule rule_name act vars fn args rhs src_loc) + = pushSrcLocRn src_loc $ + lookupOccRn fn `thenRn` \ fn' -> + rnCoreBndrs vars $ \ vars' -> + mapRn rnCoreExpr args `thenRn` \ args' -> + rnCoreExpr rhs `thenRn` \ rhs' -> + returnRn (IfaceRule rule_name act vars' fn' args' rhs' src_loc) + +rnIfaceRuleDecl (IfaceRuleOut fn rule) -- Builtin rules come this way + = lookupOccRn fn `thenRn` \ fn' -> + returnRn (IfaceRuleOut fn' rule) + +rnHsRuleDecl (HsRule rule_name act vars lhs rhs src_loc) + = pushSrcLocRn src_loc $ + bindPatSigTyVars (collectRuleBndrSigTys vars) $ -rnDecl (RuleD (RuleDecl rule_name tvs vars lhs rhs src_loc)) - = ASSERT( null tvs ) - pushSrcLocRn src_loc $ - - bindTyVarsFV2Rn doc (map UserTyVar sig_tvs) $ \ sig_tvs' _ -> bindLocalsFVRn doc (map get_var vars) $ \ ids -> mapFvRn rn_var (vars `zip` ids) `thenRn` \ (vars', fv_vars) -> @@ -400,106 +243,253 @@ rnDecl (RuleD (RuleDecl rule_name tvs vars lhs rhs src_loc)) bad_vars = [var | var <- ids, not (var `elemNameSet` fv_lhs)] in mapRn (addErrRn . badRuleVar rule_name) bad_vars `thenRn_` - returnRn (RuleD (RuleDecl rule_name sig_tvs' vars' lhs' rhs' src_loc), + returnRn (HsRule rule_name act vars' lhs' rhs' src_loc, fv_vars `plusFV` fv_lhs `plusFV` fv_rhs) where - doc = text "the transformation rule" <+> ptext rule_name - sig_tvs = extractRuleBndrsTyVars vars + doc = text "In the transformation rule" <+> ptext rule_name get_var (RuleBndr v) = v get_var (RuleBndrSig v _) = v rn_var (RuleBndr v, id) = returnRn (RuleBndr id, emptyFVs) - rn_var (RuleBndrSig v t, id) = rnHsPolyType doc t `thenRn` \ (t', fvs) -> + rn_var (RuleBndrSig v t, id) = rnHsTypeFVs doc t `thenRn` \ (t', fvs) -> returnRn (RuleBndrSig id t', fvs) \end{code} %********************************************************* %* * -\subsection{Support code for type/data declarations} +\subsection{Type, class and iface sig declarations} %* * %********************************************************* +@rnTyDecl@ uses the `global name function' to create a new type +declaration in which local names have been replaced by their original +names, reporting any unknown names. + +Renaming type variables is a pain. Because they now contain uniques, +it is necessary to pass in an association list which maps a parsed +tyvar to its @Name@ representation. +In some cases (type signatures of values), +it is even necessary to go over the type first +in order to get the set of tyvars used by it, make an assoc list, +and then go over it again to rename the tyvars! +However, we can also do some scoping checks at the same time. + \begin{code} -rnDerivs :: Maybe [RdrName] -> RnMS (Maybe [Name], FreeVars) +rnTyClDecl (IfaceSig {tcdName = name, tcdType = ty, tcdIdInfo = id_infos, tcdLoc = loc}) + = pushSrcLocRn loc $ + lookupTopBndrRn name `thenRn` \ name' -> + rnHsType doc_str ty `thenRn` \ ty' -> + mapRn rnIdInfo id_infos `thenRn` \ id_infos' -> + returnRn (IfaceSig {tcdName = name', tcdType = ty', tcdIdInfo = id_infos', tcdLoc = loc}) + where + doc_str = text "In the interface signature for" <+> quotes (ppr name) + +rnTyClDecl (ForeignType {tcdName = name, tcdFoType = fo_type, tcdExtName = ext_name, tcdLoc = loc}) + = pushSrcLocRn loc $ + lookupTopBndrRn name `thenRn` \ name' -> + returnRn (ForeignType {tcdName = name', tcdFoType = fo_type, tcdExtName = ext_name, tcdLoc = loc}) + +rnTyClDecl (TyData {tcdND = new_or_data, tcdCtxt = context, tcdName = tycon, + tcdTyVars = tyvars, tcdCons = condecls, tcdNCons = nconstrs, + tcdDerivs = derivs, tcdLoc = src_loc, tcdSysNames = sys_names}) + = pushSrcLocRn src_loc $ + lookupTopBndrRn tycon `thenRn` \ tycon' -> + bindTyVarsRn data_doc tyvars $ \ tyvars' -> + rnContext data_doc context `thenRn` \ context' -> + rn_derivs derivs `thenRn` \ derivs' -> + checkDupOrQualNames data_doc con_names `thenRn_` + + -- Check that there's at least one condecl, + -- or else we're reading an interface file, or -fglasgow-exts + (if null condecls then + doptRn Opt_GlasgowExts `thenRn` \ glaExts -> + getModeRn `thenRn` \ mode -> + checkRn (glaExts || isInterfaceMode mode) + (emptyConDeclsErr tycon) + else returnRn () + ) `thenRn_` + + mapRn rnConDecl condecls `thenRn` \ condecls' -> + mapRn lookupSysBinder sys_names `thenRn` \ sys_names' -> + returnRn (TyData {tcdND = new_or_data, tcdCtxt = context', tcdName = tycon', + tcdTyVars = tyvars', tcdCons = condecls', tcdNCons = nconstrs, + tcdDerivs = derivs', tcdLoc = src_loc, tcdSysNames = sys_names'}) + where + data_doc = text "In the data type declaration for" <+> quotes (ppr tycon) + con_names = map conDeclName condecls + + rn_derivs Nothing = returnRn Nothing + rn_derivs (Just ds) = rnContext data_doc ds `thenRn` \ ds' -> returnRn (Just ds') + +rnTyClDecl (TySynonym {tcdName = name, tcdTyVars = tyvars, tcdSynRhs = ty, tcdLoc = src_loc}) + = pushSrcLocRn src_loc $ + lookupTopBndrRn name `thenRn` \ name' -> + bindTyVarsRn syn_doc tyvars $ \ tyvars' -> + rnHsType syn_doc ty `thenRn` \ ty' -> + returnRn (TySynonym {tcdName = name', tcdTyVars = tyvars', tcdSynRhs = ty', tcdLoc = src_loc}) + where + syn_doc = text "In the declaration for type synonym" <+> quotes (ppr name) + +rnTyClDecl (ClassDecl {tcdCtxt = context, tcdName = cname, + tcdTyVars = tyvars, tcdFDs = fds, tcdSigs = sigs, + tcdSysNames = names, tcdLoc = src_loc}) + -- Used for both source and interface file decls + = pushSrcLocRn src_loc $ + + lookupTopBndrRn cname `thenRn` \ cname' -> -rnDerivs Nothing -- derivs not specified - = returnRn (Nothing, emptyFVs) + -- Deal with the implicit tycon and datacon name + -- They aren't in scope (because they aren't visible to the user) + -- and what we want to do is simply look them up in the cache; + -- we jolly well ought to get a 'hit' there! + mapRn lookupSysBinder names `thenRn` \ names' -> -rnDerivs (Just clss) - = mapRn do_one clss `thenRn` \ clss' -> - returnRn (Just clss', mkNameSet clss') + -- Tyvars scope over bindings and context + bindTyVarsRn cls_doc tyvars $ \ tyvars' -> + + -- Check the superclasses + rnContext cls_doc context `thenRn` \ context' -> + + -- Check the functional dependencies + rnFds cls_doc fds `thenRn` \ fds' -> + + -- Check the signatures + -- First process the class op sigs (op_sigs), then the fixity sigs (non_op_sigs). + let + (op_sigs, non_op_sigs) = partition isClassOpSig sigs + sig_rdr_names_w_locs = [(op,locn) | ClassOpSig op _ _ locn <- sigs] + in + checkDupOrQualNames sig_doc sig_rdr_names_w_locs `thenRn_` + mapRn (rnClassOp cname' fds') op_sigs `thenRn` \ sigs' -> + let + binders = mkNameSet [ nm | (ClassOpSig nm _ _ _) <- sigs' ] + in + renameSigs (okClsDclSig binders) non_op_sigs `thenRn` \ non_ops' -> + + -- Typechecker is responsible for checking that we only + -- give default-method bindings for things in this class. + -- The renamer *could* check this for class decls, but can't + -- for instance decls. + + returnRn (ClassDecl { tcdCtxt = context', tcdName = cname', tcdTyVars = tyvars', + tcdFDs = fds', tcdSigs = non_ops' ++ sigs', tcdMeths = Nothing, + tcdSysNames = names', tcdLoc = src_loc}) + where + cls_doc = text "In the declaration for class" <+> ppr cname + sig_doc = text "In the signatures for class" <+> ppr cname + +rnClassOp clas clas_fds sig@(ClassOpSig op dm_stuff ty locn) + = pushSrcLocRn locn $ + lookupTopBndrRn op `thenRn` \ op_name -> + + -- Check the signature + rnHsSigType (quotes (ppr op)) ty `thenRn` \ new_ty -> + + -- Make the default-method name + (case dm_stuff of + DefMeth dm_rdr_name + -> -- Imported class that has a default method decl + -- See comments with tname, snames, above + lookupSysBinder dm_rdr_name `thenRn` \ dm_name -> + returnRn (DefMeth dm_name) + -- An imported class decl for a class decl that had an explicit default + -- method, mentions, rather than defines, + -- the default method, so we must arrange to pull it in + + GenDefMeth -> returnRn GenDefMeth + NoDefMeth -> returnRn NoDefMeth + ) `thenRn` \ dm_stuff' -> + + returnRn (ClassOpSig op_name dm_stuff' new_ty locn) + +finishSourceTyClDecl :: RdrNameTyClDecl -> RenamedTyClDecl -> RnMS (RenamedTyClDecl, FreeVars) + -- Used for source file decls only + -- Renames the default-bindings of a class decl +finishSourceTyClDecl (ClassDecl {tcdMeths = Just mbinds, tcdLoc = src_loc}) -- Get mbinds from here + rn_cls_decl@(ClassDecl {tcdName = cls, tcdTyVars = tyvars}) -- Everything else is here + -- There are some default-method bindings (abeit possibly empty) so + -- this is a source-code class declaration + = -- The newLocals call is tiresome: given a generic class decl + -- class C a where + -- op :: a -> a + -- op {| x+y |} (Inl a) = ... + -- op {| x+y |} (Inr b) = ... + -- op {| a*b |} (a*b) = ... + -- we want to name both "x" tyvars with the same unique, so that they are + -- easy to group together in the typechecker. + -- Hence the + pushSrcLocRn src_loc $ + extendTyVarEnvFVRn (map hsTyVarName tyvars) $ + getLocalNameEnv `thenRn` \ name_env -> + let + meth_rdr_names_w_locs = collectLocatedMonoBinders mbinds + gen_rdr_tyvars_w_locs = [(tv,src_loc) | tv <- extractGenericPatTyVars mbinds, + not (tv `elemRdrEnv` name_env)] + in + checkDupOrQualNames meth_doc meth_rdr_names_w_locs `thenRn_` + newLocalsRn gen_rdr_tyvars_w_locs `thenRn` \ gen_tyvars -> + rnMethodBinds cls gen_tyvars mbinds `thenRn` \ (mbinds', meth_fvs) -> + returnRn (rn_cls_decl {tcdMeths = Just mbinds'}, meth_fvs) where - do_one cls = lookupOccRn cls `thenRn` \ clas_name -> - checkRn (getUnique clas_name `elem` derivableClassKeys) - (derivingNonStdClassErr clas_name) `thenRn_` - returnRn clas_name + meth_doc = text "In the default-methods for class" <+> ppr (tcdName rn_cls_decl) + +finishSourceTyClDecl _ tycl_decl = returnRn (tycl_decl, emptyFVs) + -- Not a class declaration \end{code} + +%********************************************************* +%* * +\subsection{Support code for type/data declarations} +%* * +%********************************************************* + \begin{code} conDeclName :: RdrNameConDecl -> (RdrName, SrcLoc) conDeclName (ConDecl n _ _ _ _ l) = (n,l) -rnConDecl :: RdrNameConDecl -> RnMS (RenamedConDecl, FreeVars) +rnConDecl :: RdrNameConDecl -> RnMS RenamedConDecl rnConDecl (ConDecl name wkr tvs cxt details locn) = pushSrcLocRn locn $ - checkConName name `thenRn_` - lookupBndrRn name `thenRn` \ new_name -> + checkConName name `thenRn_` + lookupTopBndrRn name `thenRn` \ new_name -> - mkImportedGlobalFromRdrName wkr `thenRn` \ new_wkr -> + lookupSysBinder wkr `thenRn` \ new_wkr -> -- See comments with ClassDecl - bindTyVarsFVRn doc tvs $ \ new_tyvars -> - rnContext doc cxt `thenRn` \ (new_context, cxt_fvs) -> - rnConDetails doc locn details `thenRn` \ (new_details, det_fvs) -> - returnRn (ConDecl new_name new_wkr new_tyvars new_context new_details locn, - cxt_fvs `plusFV` det_fvs) + bindTyVarsRn doc tvs $ \ new_tyvars -> + rnContext doc cxt `thenRn` \ new_context -> + rnConDetails doc locn details `thenRn` \ new_details -> + returnRn (ConDecl new_name new_wkr new_tyvars new_context new_details locn) where - doc = text "the definition of data constructor" <+> quotes (ppr name) + doc = text "In the definition of data constructor" <+> quotes (ppr name) rnConDetails doc locn (VanillaCon tys) - = mapFvRn (rnBangTy doc) tys `thenRn` \ (new_tys, fvs) -> - returnRn (VanillaCon new_tys, fvs) + = mapRn (rnBangTy doc) tys `thenRn` \ new_tys -> + returnRn (VanillaCon new_tys) rnConDetails doc locn (InfixCon ty1 ty2) - = rnBangTy doc ty1 `thenRn` \ (new_ty1, fvs1) -> - rnBangTy doc ty2 `thenRn` \ (new_ty2, fvs2) -> - returnRn (InfixCon new_ty1 new_ty2, fvs1 `plusFV` fvs2) - -rnConDetails doc locn (NewCon ty mb_field) - = rnHsPolyType doc ty `thenRn` \ (new_ty, fvs) -> - rn_field mb_field `thenRn` \ new_mb_field -> - returnRn (NewCon new_ty new_mb_field, fvs) - where - rn_field Nothing = returnRn Nothing - rn_field (Just f) = - lookupBndrRn f `thenRn` \ new_f -> - returnRn (Just new_f) + = rnBangTy doc ty1 `thenRn` \ new_ty1 -> + rnBangTy doc ty2 `thenRn` \ new_ty2 -> + returnRn (InfixCon new_ty1 new_ty2) rnConDetails doc locn (RecCon fields) = checkDupOrQualNames doc field_names `thenRn_` - mapFvRn (rnField doc) fields `thenRn` \ (new_fields, fvs) -> - returnRn (RecCon new_fields, fvs) + mapRn (rnField doc) fields `thenRn` \ new_fields -> + returnRn (RecCon new_fields) where field_names = [(fld, locn) | (flds, _) <- fields, fld <- flds] rnField doc (names, ty) - = mapRn lookupBndrRn names `thenRn` \ new_names -> - rnBangTy doc ty `thenRn` \ (new_ty, fvs) -> - returnRn ((new_names, new_ty), fvs) - -rnBangTy doc (Banged ty) - = rnHsPolyType doc ty `thenRn` \ (new_ty, fvs) -> - returnRn (Banged new_ty, fvs) - -rnBangTy doc (Unbanged ty) - = rnHsPolyType doc ty `thenRn` \ (new_ty, fvs) -> - returnRn (Unbanged new_ty, fvs) + = mapRn lookupTopBndrRn names `thenRn` \ new_names -> + rnBangTy doc ty `thenRn` \ new_ty -> + returnRn (new_names, new_ty) -rnBangTy doc (Unpacked ty) - = rnHsPolyType doc ty `thenRn` \ (new_ty, fvs) -> - returnRn (Unpacked new_ty, fvs) +rnBangTy doc (BangType s ty) + = rnHsType doc ty `thenRn` \ new_ty -> + returnRn (BangType s new_ty) -- This data decl will parse OK -- data T = a Int @@ -524,197 +514,18 @@ checkConName name %********************************************************* \begin{code} -rnHsSigType :: SDoc -> RdrNameHsType -> RnMS (RenamedHsType, FreeVars) - -- rnHsSigType is used for source-language type signatures, - -- which use *implicit* universal quantification. -rnHsSigType doc_str ty - = rnHsPolyType (text "the type signature for" <+> doc_str) ty - ---------------------------------------- -rnHsPolyType, rnHsType :: SDoc -> RdrNameHsType -> RnMS (RenamedHsType, FreeVars) --- rnHsPolyType is prepared to see a for-all; rnHsType is not --- The former is called for the top level of type sigs and function args. - ---------------------------------------- -rnHsPolyType doc (HsForAllTy Nothing ctxt ty) - -- Implicit quantifiction in source code (no kinds on tyvars) - -- Given the signature C => T we universally quantify - -- over FV(T) \ {in-scope-tyvars} - = getLocalNameEnv `thenRn` \ name_env -> - let - mentioned_in_tau = extractHsTyRdrTyVars ty - forall_tyvars = filter (not . (`elemFM` name_env)) mentioned_in_tau - in - checkConstraints doc forall_tyvars mentioned_in_tau ctxt ty `thenRn` \ ctxt' -> - rnForAll doc (map UserTyVar forall_tyvars) ctxt' ty - -rnHsPolyType doc (HsForAllTy (Just forall_tyvars) ctxt tau) - -- Explicit quantification. - -- Check that the forall'd tyvars are a subset of the - -- free tyvars in the tau-type part - -- That's only a warning... unless the tyvar is constrained by a - -- context in which case it's an error - = let - mentioned_in_tau = extractHsTyRdrTyVars tau - mentioned_in_ctxt = nub [tv | p <- ctxt, - ty <- tys_of_pred p, - tv <- extractHsTyRdrTyVars ty] - tys_of_pred (HsPClass clas tys) = tys - tys_of_pred (HsPIParam n ty) = [ty] - - dubious_guys = filter (`notElem` mentioned_in_tau) forall_tyvar_names - -- dubious = explicitly quantified but not mentioned in tau type - - (bad_guys, warn_guys) = partition (`elem` mentioned_in_ctxt) dubious_guys - -- bad = explicitly quantified and constrained, but not mentioned in tau - -- warn = explicitly quantified but not mentioned in ctxt or tau - - forall_tyvar_names = map getTyVarName forall_tyvars - in - -- mapRn_ (forAllErr doc tau) bad_guys `thenRn_` - mapRn_ (forAllWarn doc tau) warn_guys `thenRn_` - checkConstraints doc forall_tyvar_names mentioned_in_tau ctxt tau `thenRn` \ ctxt' -> - rnForAll doc forall_tyvars ctxt' tau - -rnHsPolyType doc other_ty = rnHsType doc other_ty - - --- Check that each constraint mentions at least one of the forall'd type variables --- Since the forall'd type variables are a subset of the free tyvars --- of the tau-type part, this guarantees that every constraint mentions --- at least one of the free tyvars in ty -checkConstraints doc forall_tyvars tau_vars ctxt ty - = mapRn (checkPred doc forall_tyvars ty) ctxt `thenRn` \ maybe_ctxt' -> - returnRn (catMaybes maybe_ctxt') - -- Remove problem ones, to avoid duplicate error message. - -checkPred doc forall_tyvars ty p@(HsPClass clas tys) - | not_univ = failWithRn Nothing (univErr doc p ty) - | otherwise = returnRn (Just p) - where - ct_vars = extractHsTysRdrTyVars tys - not_univ = -- At least one of the tyvars in each constraint must - -- be universally quantified. This restriction isn't in Hugs - not (any (`elem` forall_tyvars) ct_vars) -checkPred doc forall_tyvars ty p@(HsPIParam _ _) - = returnRn (Just p) - -rnForAll doc forall_tyvars ctxt ty - = bindTyVarsFVRn doc forall_tyvars $ \ new_tyvars -> - rnContext doc ctxt `thenRn` \ (new_ctxt, cxt_fvs) -> - rnHsType doc ty `thenRn` \ (new_ty, ty_fvs) -> - returnRn (mkHsForAllTy (Just new_tyvars) new_ctxt new_ty, - cxt_fvs `plusFV` ty_fvs) - ---------------------------------------- -rnHsType doc ty@(HsForAllTy _ _ inner_ty) - = addWarnRn (unexpectedForAllTy ty) `thenRn_` - rnHsPolyType doc ty - -rnHsType doc (MonoTyVar tyvar) - = lookupOccRn tyvar `thenRn` \ tyvar' -> - returnRn (MonoTyVar tyvar', unitFV tyvar') - -rnHsType doc (MonoFunTy ty1 ty2) - = rnHsPolyType doc ty1 `thenRn` \ (ty1', fvs1) -> - -- Might find a for-all as the arg of a function type - rnHsPolyType doc ty2 `thenRn` \ (ty2', fvs2) -> - -- Or as the result. This happens when reading Prelude.hi - -- when we find return :: forall m. Monad m -> forall a. a -> m a - returnRn (MonoFunTy ty1' ty2', fvs1 `plusFV` fvs2) - -rnHsType doc (MonoListTy ty) - = rnHsType doc ty `thenRn` \ (ty', fvs) -> - returnRn (MonoListTy ty', fvs `addOneFV` listTyCon_name) - --- Unboxed tuples are allowed to have poly-typed arguments. These --- sometimes crop up as a result of CPR worker-wrappering dictionaries. -rnHsType doc (MonoTupleTy tys boxed) - = (if boxed - then mapFvRn (rnHsType doc) tys - else mapFvRn (rnHsPolyType doc) tys) `thenRn` \ (tys', fvs) -> - returnRn (MonoTupleTy tys' boxed, fvs `addOneFV` tup_con_name) - where - tup_con_name = tupleTyCon_name boxed (length tys) - -rnHsType doc (MonoTyApp ty1 ty2) - = rnHsType doc ty1 `thenRn` \ (ty1', fvs1) -> - rnHsType doc ty2 `thenRn` \ (ty2', fvs2) -> - returnRn (MonoTyApp ty1' ty2', fvs1 `plusFV` fvs2) - -rnHsType doc (MonoIParamTy n ty) - = getIPName n `thenRn` \ name -> - rnHsType doc ty `thenRn` \ (ty', fvs) -> - returnRn (MonoIParamTy name ty', fvs) - -rnHsType doc (MonoDictTy clas tys) - = lookupOccRn clas `thenRn` \ clas' -> - rnHsTypes doc tys `thenRn` \ (tys', fvs) -> - returnRn (MonoDictTy clas' tys', fvs `addOneFV` clas') - -rnHsType doc (MonoUsgForAllTy uv_rdr ty) - = bindUVarRn doc uv_rdr $ \ uv_name -> - rnHsType doc ty `thenRn` \ (ty', fvs) -> - returnRn (MonoUsgForAllTy uv_name ty', - fvs ) - -rnHsType doc (MonoUsgTy usg ty) - = newUsg usg `thenRn` \ (usg', usg_fvs) -> - rnHsPolyType doc ty `thenRn` \ (ty', ty_fvs) -> - -- A for-all can occur inside a usage annotation - returnRn (MonoUsgTy usg' ty', - usg_fvs `plusFV` ty_fvs) - where - newUsg usg = case usg of - MonoUsOnce -> returnRn (MonoUsOnce, emptyFVs) - MonoUsMany -> returnRn (MonoUsMany, emptyFVs) - MonoUsVar uv_rdr -> lookupOccRn uv_rdr `thenRn` \ uv_name -> - returnRn (MonoUsVar uv_name, emptyFVs) - -rnHsTypes doc tys = mapFvRn (rnHsType doc) tys -\end{code} - - -\begin{code} -rnContext :: SDoc -> RdrNameContext -> RnMS (RenamedContext, FreeVars) - -rnContext doc ctxt - = mapAndUnzipRn (rnPred doc) ctxt `thenRn` \ (theta, fvs_s) -> - let - (_, dup_asserts) = removeDups (cmpHsPred compare) theta - in - -- Check for duplicate assertions - -- If this isn't an error, then it ought to be: - mapRn_ (addWarnRn . dupClassAssertWarn theta) dup_asserts `thenRn_` - - returnRn (theta, plusFVs fvs_s) - -rnPred doc (HsPClass clas tys) - = lookupOccRn clas `thenRn` \ clas_name -> - rnHsTypes doc tys `thenRn` \ (tys', fvs) -> - returnRn (HsPClass clas_name tys', fvs `addOneFV` clas_name) -rnPred doc (HsPIParam n ty) - = getIPName n `thenRn` \ name -> - rnHsType doc ty `thenRn` \ (ty', fvs) -> - returnRn (HsPIParam name ty', fvs) -\end{code} - -\begin{code} -rnFds :: SDoc -> [([RdrName],[RdrName])] -> RnMS ([([Name],[Name])], FreeVars) +rnFds :: SDoc -> [FunDep RdrName] -> RnMS [FunDep Name] rnFds doc fds - = mapAndUnzipRn rn_fds fds `thenRn` \ (theta, fvs_s) -> - returnRn (theta, plusFVs fvs_s) + = mapRn rn_fds fds where rn_fds (tys1, tys2) - = rnHsTyVars doc tys1 `thenRn` \ (tys1', fvs1) -> - rnHsTyVars doc tys2 `thenRn` \ (tys2', fvs2) -> - returnRn ((tys1', tys2'), fvs1 `plusFV` fvs2) - -rnHsTyVars doc tvs = mapFvRn (rnHsTyvar doc) tvs -rnHsTyvar doc tyvar - = lookupOccRn tyvar `thenRn` \ tyvar' -> - returnRn (tyvar', unitFV tyvar') + = rnHsTyVars doc tys1 `thenRn` \ tys1' -> + rnHsTyVars doc tys2 `thenRn` \ tys2' -> + returnRn (tys1', tys2') + +rnHsTyVars doc tvs = mapRn (rnHsTyvar doc) tvs +rnHsTyvar doc tyvar = lookupOccRn tyvar \end{code} %********************************************************* @@ -724,108 +535,92 @@ rnHsTyvar doc tyvar %********************************************************* \begin{code} -rnIdInfo (HsStrictness str) = returnRn (HsStrictness str, emptyFVs) - -rnIdInfo (HsWorker worker) +rnIdInfo (HsWorker worker arity) = lookupOccRn worker `thenRn` \ worker' -> - returnRn (HsWorker worker', unitFV worker') - -rnIdInfo (HsUnfold inline expr) = rnCoreExpr expr `thenRn` \ (expr', fvs) -> - returnRn (HsUnfold inline expr', fvs) -rnIdInfo (HsArity arity) = returnRn (HsArity arity, emptyFVs) -rnIdInfo (HsUpdate update) = returnRn (HsUpdate update, emptyFVs) -rnIdInfo HsNoCafRefs = returnRn (HsNoCafRefs, emptyFVs) -rnIdInfo HsCprInfo = returnRn (HsCprInfo, emptyFVs) -rnIdInfo (HsSpecialise rule_body) = rnRuleBody rule_body - `thenRn` \ (rule_body', fvs) -> - returnRn (HsSpecialise rule_body', fvs) - -rnRuleBody (UfRuleBody str vars args rhs) - = rnCoreBndrs vars $ \ vars' -> - mapFvRn rnCoreExpr args `thenRn` \ (args', fvs1) -> - rnCoreExpr rhs `thenRn` \ (rhs', fvs2) -> - returnRn (UfRuleBody str vars' args' rhs', fvs1 `plusFV` fvs2) + returnRn (HsWorker worker' arity) + +rnIdInfo (HsUnfold inline expr) = rnCoreExpr expr `thenRn` \ expr' -> + returnRn (HsUnfold inline expr') +rnIdInfo (HsStrictness str) = returnRn (HsStrictness str) +rnIdInfo (HsArity arity) = returnRn (HsArity arity) +rnIdInfo HsNoCafRefs = returnRn HsNoCafRefs \end{code} @UfCore@ expressions. \begin{code} rnCoreExpr (UfType ty) - = rnHsPolyType (text "unfolding type") ty `thenRn` \ (ty', fvs) -> - returnRn (UfType ty', fvs) + = rnHsType (text "unfolding type") ty `thenRn` \ ty' -> + returnRn (UfType ty') rnCoreExpr (UfVar v) = lookupOccRn v `thenRn` \ v' -> - returnRn (UfVar v', unitFV v') + returnRn (UfVar v') rnCoreExpr (UfLit l) - = returnRn (UfLit l, emptyFVs) + = returnRn (UfLit l) rnCoreExpr (UfLitLit l ty) - = rnHsType (text "litlit") ty `thenRn` \ (ty', fvs) -> - returnRn (UfLitLit l ty', fvs) + = rnHsType (text "litlit") ty `thenRn` \ ty' -> + returnRn (UfLitLit l ty') -rnCoreExpr (UfCCall cc ty) - = rnHsPolyType (text "ccall") ty `thenRn` \ (ty', fvs) -> - returnRn (UfCCall cc ty', fvs) +rnCoreExpr (UfFCall cc ty) + = rnHsType (text "ccall") ty `thenRn` \ ty' -> + returnRn (UfFCall cc ty') -rnCoreExpr (UfTuple con args) - = lookupOccRn con `thenRn` \ con' -> - mapFvRn rnCoreExpr args `thenRn` \ (args', fvs) -> - returnRn (UfTuple con' args', fvs `addOneFV` con') +rnCoreExpr (UfTuple (HsTupCon _ boxity arity) args) + = mapRn rnCoreExpr args `thenRn` \ args' -> + returnRn (UfTuple (HsTupCon tup_name boxity arity) args') + where + tup_name = getName (dataConId (tupleCon boxity arity)) + -- Get the *worker* name and use that rnCoreExpr (UfApp fun arg) - = rnCoreExpr fun `thenRn` \ (fun', fv1) -> - rnCoreExpr arg `thenRn` \ (arg', fv2) -> - returnRn (UfApp fun' arg', fv1 `plusFV` fv2) + = rnCoreExpr fun `thenRn` \ fun' -> + rnCoreExpr arg `thenRn` \ arg' -> + returnRn (UfApp fun' arg') rnCoreExpr (UfCase scrut bndr alts) - = rnCoreExpr scrut `thenRn` \ (scrut', fvs1) -> - bindCoreLocalFVRn bndr ( \ bndr' -> - mapFvRn rnCoreAlt alts `thenRn` \ (alts', fvs2) -> - returnRn (UfCase scrut' bndr' alts', fvs2) - ) `thenRn` \ (case', fvs3) -> - returnRn (case', fvs1 `plusFV` fvs3) + = rnCoreExpr scrut `thenRn` \ scrut' -> + bindCoreLocalRn bndr $ \ bndr' -> + mapRn rnCoreAlt alts `thenRn` \ alts' -> + returnRn (UfCase scrut' bndr' alts') rnCoreExpr (UfNote note expr) - = rnNote note `thenRn` \ (note', fvs1) -> - rnCoreExpr expr `thenRn` \ (expr', fvs2) -> - returnRn (UfNote note' expr', fvs1 `plusFV` fvs2) + = rnNote note `thenRn` \ note' -> + rnCoreExpr expr `thenRn` \ expr' -> + returnRn (UfNote note' expr') rnCoreExpr (UfLam bndr body) = rnCoreBndr bndr $ \ bndr' -> - rnCoreExpr body `thenRn` \ (body', fvs) -> - returnRn (UfLam bndr' body', fvs) + rnCoreExpr body `thenRn` \ body' -> + returnRn (UfLam bndr' body') rnCoreExpr (UfLet (UfNonRec bndr rhs) body) - = rnCoreExpr rhs `thenRn` \ (rhs', fvs1) -> - rnCoreBndr bndr ( \ bndr' -> - rnCoreExpr body `thenRn` \ (body', fvs2) -> - returnRn (UfLet (UfNonRec bndr' rhs') body', fvs2) - ) `thenRn` \ (result, fvs3) -> - returnRn (result, fvs1 `plusFV` fvs3) + = rnCoreExpr rhs `thenRn` \ rhs' -> + rnCoreBndr bndr $ \ bndr' -> + rnCoreExpr body `thenRn` \ body' -> + returnRn (UfLet (UfNonRec bndr' rhs') body') rnCoreExpr (UfLet (UfRec pairs) body) = rnCoreBndrs bndrs $ \ bndrs' -> - mapFvRn rnCoreExpr rhss `thenRn` \ (rhss', fvs1) -> - rnCoreExpr body `thenRn` \ (body', fvs2) -> - returnRn (UfLet (UfRec (bndrs' `zip` rhss')) body', fvs1 `plusFV` fvs2) + mapRn rnCoreExpr rhss `thenRn` \ rhss' -> + rnCoreExpr body `thenRn` \ body' -> + returnRn (UfLet (UfRec (bndrs' `zip` rhss')) body') where (bndrs, rhss) = unzip pairs \end{code} \begin{code} rnCoreBndr (UfValBinder name ty) thing_inside - = rnHsPolyType doc ty `thenRn` \ (ty', fvs1) -> - bindCoreLocalFVRn name ( \ name' -> - thing_inside (UfValBinder name' ty') - ) `thenRn` \ (result, fvs2) -> - returnRn (result, fvs1 `plusFV` fvs2) + = rnHsType doc ty `thenRn` \ ty' -> + bindCoreLocalRn name $ \ name' -> + thing_inside (UfValBinder name' ty') where doc = text "unfolding id" rnCoreBndr (UfTyBinder name kind) thing_inside - = bindCoreLocalFVRn name $ \ name' -> + = bindCoreLocalRn name $ \ name' -> thing_inside (UfTyBinder name' kind) rnCoreBndrs [] thing_inside = thing_inside [] @@ -836,35 +631,38 @@ rnCoreBndrs (b:bs) thing_inside = rnCoreBndr b $ \ name' -> \begin{code} rnCoreAlt (con, bndrs, rhs) - = rnUfCon con `thenRn` \ (con', fvs1) -> - bindCoreLocalsFVRn bndrs ( \ bndrs' -> - rnCoreExpr rhs `thenRn` \ (rhs', fvs2) -> - returnRn ((con', bndrs', rhs'), fvs2) - ) `thenRn` \ (result, fvs3) -> - returnRn (result, fvs1 `plusFV` fvs3) + = rnUfCon con `thenRn` \ con' -> + bindCoreLocalsRn bndrs $ \ bndrs' -> + rnCoreExpr rhs `thenRn` \ rhs' -> + returnRn (con', bndrs', rhs') rnNote (UfCoerce ty) - = rnHsPolyType (text "unfolding coerce") ty `thenRn` \ (ty', fvs) -> - returnRn (UfCoerce ty', fvs) + = rnHsType (text "unfolding coerce") ty `thenRn` \ ty' -> + returnRn (UfCoerce ty') -rnNote (UfSCC cc) = returnRn (UfSCC cc, emptyFVs) -rnNote UfInlineCall = returnRn (UfInlineCall, emptyFVs) -rnNote UfInlineMe = returnRn (UfInlineMe, emptyFVs) +rnNote (UfSCC cc) = returnRn (UfSCC cc) +rnNote UfInlineCall = returnRn UfInlineCall +rnNote UfInlineMe = returnRn UfInlineMe rnUfCon UfDefault - = returnRn (UfDefault, emptyFVs) + = returnRn UfDefault + +rnUfCon (UfTupleAlt (HsTupCon _ boxity arity)) + = returnRn (UfTupleAlt (HsTupCon tup_name boxity arity)) + where + tup_name = getName (tupleCon boxity arity) rnUfCon (UfDataAlt con) = lookupOccRn con `thenRn` \ con' -> - returnRn (UfDataAlt con', unitFV con') + returnRn (UfDataAlt con') rnUfCon (UfLitAlt lit) - = returnRn (UfLitAlt lit, emptyFVs) + = returnRn (UfLitAlt lit) rnUfCon (UfLitLitAlt lit ty) - = rnHsPolyType (text "litlit") ty `thenRn` \ (ty', fvs) -> - returnRn (UfLitLitAlt lit ty', fvs) + = rnHsType (text "litlit") ty `thenRn` \ ty' -> + returnRn (UfLitLitAlt lit ty') \end{code} %********************************************************* @@ -881,6 +679,7 @@ not one of the @forall@'d variables. validRuleLhs foralls lhs = check lhs where + check (OpApp _ op _ _) = check op check (HsApp e1 e2) = check e1 check (HsVar v) | v `notElem` foralls = True check other = False @@ -894,69 +693,9 @@ validRuleLhs foralls lhs %********************************************************* \begin{code} -derivingNonStdClassErr clas - = hsep [ptext SLIT("non-standard class"), ppr clas, ptext SLIT("in deriving clause")] - -classTyVarNotInOpTyErr clas_tyvar sig - = hang (hsep [ptext SLIT("Class type variable"), - quotes (ppr clas_tyvar), - ptext SLIT("does not appear in method signature")]) - 4 (ppr sig) - -dupClassAssertWarn ctxt (assertion : dups) - = sep [hsep [ptext SLIT("Duplicate class assertion"), - quotes (pprHsPred assertion), - ptext SLIT("in the context:")], - nest 4 (pprHsContext ctxt <+> ptext SLIT("..."))] - badDataCon name = hsep [ptext SLIT("Illegal data constructor name"), quotes (ppr name)] -forAllWarn doc ty tyvar - | not opt_WarnUnusedMatches = returnRn () - | otherwise - = getModeRn `thenRn` \ mode -> - case mode of { -#ifndef DEBUG - InterfaceMode -> returnRn () ; -- Don't warn of unused tyvars in interface files - -- unless DEBUG is on, in which case it is slightly - -- informative. They can arise from mkRhsTyLam, -#endif -- leading to (say) f :: forall a b. [b] -> [b] - other -> - - addWarnRn ( - sep [ptext SLIT("The universally quantified type variable") <+> quotes (ppr tyvar), - nest 4 (ptext SLIT("does not appear in the type") <+> quotes (ppr ty))] - $$ - (ptext SLIT("In") <+> doc)) - } - -forAllErr doc ty tyvar - = addErrRn ( - sep [ptext SLIT("The constrained type variable") <+> quotes (ppr tyvar), - nest 4 (ptext SLIT("does not appear in the type") <+> quotes (ppr ty))] - $$ - (ptext SLIT("In") <+> doc)) - -univErr doc constraint ty - = sep [ptext SLIT("All of the type variable(s) in the constraint") - <+> quotes (pprHsPred constraint) - <+> ptext SLIT("are already in scope"), - nest 4 (ptext SLIT("At least one must be universally quantified here")) - ] - $$ - (ptext SLIT("In") <+> doc) - -ambigErr doc constraint ty - = sep [ptext SLIT("Ambiguous constraint") <+> quotes (pprHsPred constraint), - nest 4 (ptext SLIT("in the type:") <+> ppr ty), - nest 4 (ptext SLIT("Each forall-d type variable mentioned by the constraint must appear after the =>."))] - $$ - (ptext SLIT("In") <+> doc) - -unexpectedForAllTy ty - = ptext SLIT("Unexpected forall type:") <+> ppr ty - badRuleLhsErr name lhs = sep [ptext SLIT("Rule") <+> ptext name <> colon, nest 4 (ptext SLIT("Illegal left-hand side:") <+> ppr lhs)] @@ -964,11 +703,11 @@ badRuleLhsErr name lhs ptext SLIT("LHS must be of form (f e1 .. en) where f is not forall'd") badRuleVar name var - = sep [ptext SLIT("Rule") <+> ptext name <> colon, + = sep [ptext SLIT("Rule") <+> doubleQuotes (ptext name) <> colon, ptext SLIT("Forall'd variable") <+> quotes (ppr var) <+> ptext SLIT("does not appear on left hand side")] -badExtName :: ExtName -> Message -badExtName ext_nm - = sep [quotes (ppr ext_nm) <+> ptext SLIT("is not a valid C identifier")] +emptyConDeclsErr tycon + = sep [quotes (ppr tycon) <+> ptext SLIT("has no constructors"), + nest 4 (ptext SLIT("(-fglasgow-exts permits this)"))] \end{code}