X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Frename%2FRnSource.lhs;h=40be2b7287d7ea0f0df0be83efa2db76a311482d;hb=e77791e6e846695667804565875b4305f4ff5b0e;hp=8e2e6608bdd9839e49c41691ccd4e49dd9a4eaa0;hpb=30b5b5cceb167a87907d4cf122e77ce333fc5066;p=ghc-hetmet.git diff --git a/ghc/compiler/rename/RnSource.lhs b/ghc/compiler/rename/RnSource.lhs index 8e2e660..40be2b7 100644 --- a/ghc/compiler/rename/RnSource.lhs +++ b/ghc/compiler/rename/RnSource.lhs @@ -4,70 +4,73 @@ \section[RnSource]{Main pass of renamer} \begin{code} -module RnSource ( rnIfaceDecl, rnSourceDecls, rnHsType, rnHsSigType ) where +module RnSource ( rnDecl, rnSourceDecls, rnHsType, rnHsSigType, rnHsPolyType ) where #include "HsVersions.h" import RnExpr import HsSyn -import HsDecls ( HsIdInfo(..), HsStrictnessInfo(..) ) import HsPragmas -import HsTypes ( getTyVarName, pprClassAssertion, cmpHsTypes ) -import RdrName ( RdrName, isRdrDataCon, rdrNameOcc ) +import HsTypes ( getTyVarName, pprHsPred, cmpHsTypes ) +import RdrName ( RdrName, isRdrDataCon, rdrNameOcc, isRdrTyVar ) import RdrHsSyn ( RdrNameContext, RdrNameHsType, RdrNameConDecl, - extractHsTyVars + extractRuleBndrsTyVars, extractHsTyRdrTyVars, extractHsTysRdrTyVars ) import RnHsSyn import HsCore -import RnBinds ( rnTopBinds, rnMethodBinds, renameSigs ) -import RnEnv ( bindTyVarsRn, lookupBndrRn, lookupOccRn, - lookupImplicitOccRn, addImplicitOccRn, - bindLocalsRn, +import RnBinds ( rnTopBinds, rnMethodBinds, renameSigs, unknownSigErr ) +import RnEnv ( bindTyVarsRn, lookupBndrRn, lookupOccRn, getIPName, + lookupImplicitOccRn, + bindLocalsRn, bindLocalRn, bindLocalsFVRn, bindUVarRn, bindTyVarsFVRn, bindTyVarsFV2Rn, extendTyVarEnvFVRn, + bindCoreLocalFVRn, bindCoreLocalsFVRn, checkDupOrQualNames, checkDupNames, - newLocallyDefinedGlobalName, newImportedGlobalName, - newImportedGlobalFromRdrName, - newDFunName, - FreeVars, emptyFVs, plusFV, plusFVs, unitFV, addOneFV + mkImportedGlobalName, mkImportedGlobalFromRdrName, + newDFunName, getDFunKey, newImplicitBinder, + FreeVars, emptyFVs, plusFV, plusFVs, unitFV, addOneFV, mapFvRn ) import RnMonad +import FunDeps ( oclose ) + import Name ( Name, OccName, ExportFlag(..), Provenance(..), - nameOccName, NamedThing(..), - mkDefaultMethodOcc, mkDFunOcc + nameOccName, NamedThing(..) ) import NameSet +import OccName ( mkDefaultMethodOcc ) import BasicTypes ( TopLevelFlag(..) ) -import TysWiredIn ( tupleTyCon, unboxedTupleTyCon, listTyCon ) -import Type ( funTyCon ) import FiniteMap ( elemFM ) -import PrelInfo ( derivingOccurrences, numClass_RDR, - deRefStablePtr_NAME, makeStablePtr_NAME, - bindIO_NAME +import PrelInfo ( derivableClassKeys, + deRefStablePtr_NAME, makeStablePtr_NAME, bindIO_NAME, returnIO_NAME ) import Bag ( bagToList ) -import List ( partition ) +import List ( partition, nub ) import Outputable import SrcLoc ( SrcLoc ) -import CmdLineOpts ( opt_WarnUnusedMatches ) -- Warn of unused for-all'd tyvars +import CmdLineOpts ( opt_GlasgowExts, opt_WarnUnusedMatches ) -- 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 \end{code} -rnDecl `renames' declarations. +@rnDecl@ `renames' declarations. It simultaneously performs dependency analysis and precedence parsing. It also does the following error checks: \begin{enumerate} \item Checks that tyvars are used properly. This includes checking for undefined tyvars, and tyvars in contexts that are ambiguous. +(Some of this checking has now been moved to module @TcMonoType@, +since we don't have functional dependency information at this point.) \item Checks that all variable occurences are defined. \item -Checks the (..) etc constraints in the export list. +Checks the @(..)@ etc constraints in the export list. \end{enumerate} @@ -78,7 +81,7 @@ Checks the (..) etc constraints in the export list. %********************************************************* \begin{code} -rnSourceDecls :: [RdrNameHsDecl] -> RnMS s ([RenamedHsDecl], FreeVars) +rnSourceDecls :: [RdrNameHsDecl] -> RnMS ([RenamedHsDecl], FreeVars) -- The decls get reversed, but that's ok rnSourceDecls decls @@ -89,11 +92,6 @@ rnSourceDecls decls 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 - -rnIfaceDecl :: RdrNameHsDecl -> RnMS s RenamedHsDecl -rnIfaceDecl d - = rnDecl d `thenRn` \ (d', fvs) -> - returnRn d' \end{code} @@ -105,7 +103,7 @@ rnIfaceDecl d \begin{code} -- rnDecl does all the work -rnDecl :: RdrNameHsDecl -> RnMS s (RenamedHsDecl, FreeVars) +rnDecl :: RdrNameHsDecl -> RnMS (RenamedHsDecl, FreeVars) rnDecl (ValD binds) = rnTopBinds binds `thenRn` \ (new_binds, fvs) -> returnRn (ValD new_binds, fvs) @@ -114,15 +112,9 @@ rnDecl (ValD binds) = rnTopBinds binds `thenRn` \ (new_binds, fvs) -> rnDecl (SigD (IfaceSig name ty id_infos loc)) = pushSrcLocRn loc $ lookupBndrRn name `thenRn` \ name' -> - rnIfaceType doc_str ty `thenRn` \ ty' -> - - -- Get the pragma info (if any). - setModeRn (InterfaceMode Optional) $ - -- In all the rest of the signature we read in optional mode, - -- so that (a) we don't die - mapRn rnIdInfo id_infos `thenRn` \ id_infos' -> - returnRn (SigD (IfaceSig name' ty' id_infos' loc), emptyFVs) - -- Don't need free-var info for iface binds + 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) where doc_str = text "the interface signature for" <+> quotes (ppr name) \end{code} @@ -139,24 +131,26 @@ 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. +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_` - mapAndUnzipRn rnConDecl condecls `thenRn` \ (condecls', con_fvs_s) -> - rnDerivs derivings `thenRn` \ (derivings', deriv_fvs) -> + 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` plusFVs con_fvs_s `plusFV` deriv_fvs) + returnRn (TyClD (TyData new_or_data context' tycon' tyvars' condecls' + derivings' noDataPragmas src_loc), + cxt_fvs `plusFV` con_fvs `plusFV` deriv_fvs) where data_doc = text "the data type declaration for" <+> quotes (ppr tycon) con_names = map conDeclName condecls @@ -165,12 +159,18 @@ rnDecl (TyClD (TySynonym name tyvars ty src_loc)) = pushSrcLocRn src_loc $ lookupBndrRn name `thenRn` \ name' -> bindTyVarsFVRn syn_doc tyvars $ \ tyvars' -> - rnHsType syn_doc ty `thenRn` \ (ty', ty_fvs) -> + 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) -rnDecl (TyClD (ClassDecl context cname tyvars sigs mbinds pragmas tname dname src_loc)) + -- 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' -> @@ -182,27 +182,36 @@ rnDecl (TyClD (ClassDecl context cname tyvars sigs mbinds pragmas tname dname sr -- 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 - newImportedGlobalFromRdrName tname `thenRn` \ tname' -> - newImportedGlobalFromRdrName dname `thenRn` \ dname' -> + 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' -> + bindTyVarsFV2Rn cls_doc tyvars ( \ clas_tyvar_names tyvars' -> -- Check the superclasses - rnContext cls_doc context `thenRn` \ (context', cxt_fvs) -> + rnContext cls_doc context `thenRn` \ (context', cxt_fvs) -> + + -- Check the functional dependencies + rnFds cls_doc fds `thenRn` \ (fds', fds_fvs) -> -- Check the signatures let - -- Filter out fixity signatures; - -- they are done at top level - nofix_sigs = nonFixitySigs sigs + -- 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_` - mapAndUnzipRn (rn_op cname' clas_tyvar_names) nofix_sigs `thenRn` \ (sigs', sig_fvs_s) -> + 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) -> + rnMethodBinds mbinds + `thenRn` \ (mbinds', meth_fvs) -> -- Typechecker is responsible for checking that we only -- give default-method bindings for things in this class. @@ -210,54 +219,55 @@ rnDecl (TyClD (ClassDecl context cname tyvars sigs mbinds pragmas tname dname sr -- for instance decls. ASSERT(isNoClassPragmas pragmas) - returnRn (TyClD (ClassDecl context' cname' tyvars' sigs' mbinds' NoClassPragmas tname' dname' src_loc), - plusFVs sig_fvs_s `plusFV` cxt_fvs `plusFV` meth_fvs) + 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] + 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 sig@(ClassOpSig op maybe_dm ty locn) + 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` op_ty_fvs) - (classTyVarNotInOpTyErr clas_tyvar sig) + 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_` + mapRn_ check_in_op_ty clas_tyvars `thenRn_` -- Make the default-method name - let - dm_occ = mkDefaultMethodOcc (rdrNameOcc op) - in - getModuleRn `thenRn` \ mod_name -> - getModeRn `thenRn` \ mode -> - (case (mode, maybe_dm) of - (SourceMode, _) | op `elem` meth_rdr_names - -> -- There's an explicit method decl - newLocallyDefinedGlobalName mod_name dm_occ - (\_ -> Exported) locn `thenRn` \ dm_name -> - returnRn (Just dm_name) - - (InterfaceMode _, Just _) - -> -- Imported class that has a default method decl - newImportedGlobalName mod_name dm_occ `thenRn` \ dm_name -> - addOccurrenceName dm_name `thenRn_` - returnRn (Just dm_name) - - other -> returnRn Nothing - ) `thenRn` \ maybe_dm_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) - returnRn (ClassOpSig op_name maybe_dm_name new_ty locn, op_ty_fvs) + 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) \end{code} @@ -268,9 +278,9 @@ rnDecl (TyClD (ClassDecl context cname tyvars sigs mbinds pragmas tname dname sr %********************************************************* \begin{code} -rnDecl (InstD (InstDecl inst_ty mbinds uprags maybe_dfun src_loc)) +rnDecl (InstD (InstDecl inst_ty mbinds uprags dfun_rdr_name src_loc)) = 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', inst_fvs) -> let inst_tyvars = case inst_ty' of HsForAllTy (Just inst_tyvars) _ _ -> inst_tyvars @@ -278,24 +288,36 @@ rnDecl (InstD (InstDecl inst_ty mbinds uprags maybe_dfun src_loc)) -- (Slightly strangely) the forall-d tyvars scope over -- the method bindings too in - extendTyVarEnvFVRn inst_tyvars $ -- Rename the bindings -- NB meth_names can be qualified! checkDupNames meth_doc meth_names `thenRn_` - rnMethodBinds mbinds `thenRn` \ (mbinds', meth_fvs) -> + extendTyVarEnvFVRn inst_tyvars ( + rnMethodBinds mbinds + ) `thenRn` \ (mbinds', meth_fvs) -> let binders = mkNameSet (map fst (bagToList (collectMonoBinders mbinds'))) in - renameSigs NotTopLevel True binders uprags `thenRn` \ (new_uprags, prag_fvs) -> - mkDFunName inst_ty' maybe_dfun src_loc `thenRn` \ dfun_name -> - addOccurrenceName dfun_name `thenRn_` - -- The dfun is not optional, because we use its version number - -- to identify the version of the instance declaration - - -- The typechecker checks that all the bindings are for the right class. - returnRn (InstD (InstDecl inst_ty' mbinds' new_uprags (Just dfun_name) src_loc), - inst_fvs `plusFV` meth_fvs `plusFV` prag_fvs) + -- 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) @@ -311,7 +333,6 @@ rnDecl (InstD (InstDecl inst_ty mbinds uprags maybe_dfun src_loc)) rnDecl (DefD (DefaultDecl tys src_loc)) = pushSrcLocRn src_loc $ rnHsTypes doc_str tys `thenRn` \ (tys', fvs) -> - lookupImplicitOccRn numClass_RDR `thenRn_` returnRn (DefD (DefaultDecl tys' src_loc), fvs) where doc_str = text "a `default' declaration" @@ -326,24 +347,74 @@ rnDecl (DefD (DefaultDecl tys src_loc)) \begin{code} rnDecl (ForD (ForeignDecl name imp_exp ty ext_nm cconv src_loc)) = pushSrcLocRn src_loc $ - lookupBndrRn name `thenRn` \ name' -> - (case imp_exp of - FoImport _ | not isDyn -> addImplicitOccRn name' - FoLabel -> addImplicitOccRn name' - FoExport | isDyn -> - addImplicitOccRn makeStablePtr_NAME `thenRn_` - addImplicitOccRn deRefStablePtr_NAME `thenRn_` - addImplicitOccRn bindIO_NAME `thenRn_` - returnRn name' - _ -> returnRn name') `thenRn_` - rnHsSigType fo_decl_msg ty `thenRn` \ (ty', fvs) -> - returnRn (ForD (ForeignDecl name' imp_exp ty' ext_nm cconv src_loc), fvs) + 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, returnIO_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 = isDynamic ext_nm + isDyn = isDynamicExtName ext_nm +\end{code} + +%********************************************************* +%* * +\subsection{Rules} +%* * +%********************************************************* +\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') + +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) -> + + rnExpr lhs `thenRn` \ (lhs', fv_lhs) -> + rnExpr rhs `thenRn` \ (rhs', fv_rhs) -> + checkRn (validRuleLhs ids lhs') + (badRuleLhsErr rule_name lhs') `thenRn_` + let + 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), + fv_vars `plusFV` fv_lhs `plusFV` fv_rhs) + where + doc = text "the transformation rule" <+> ptext rule_name + sig_tvs = extractRuleBndrsTyVars vars + + 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) -> + returnRn (RuleBndrSig id t', fvs) \end{code} + %********************************************************* %* * \subsection{Support code for type/data declarations} @@ -351,50 +422,45 @@ rnDecl (ForD (ForeignDecl name imp_exp ty ext_nm cconv src_loc)) %********************************************************* \begin{code} -rnDerivs :: Maybe [RdrName] -> RnMS s (Maybe [Name], FreeVars) +rnDerivs :: Maybe [RdrName] -> RnMS (Maybe [Name], FreeVars) rnDerivs Nothing -- derivs not specified = returnRn (Nothing, emptyFVs) -rnDerivs (Just ds) - = mapRn rn_deriv ds `thenRn` \ derivs -> - returnRn (Just derivs, foldl addOneFV emptyFVs derivs) +rnDerivs (Just clss) + = mapRn do_one clss `thenRn` \ clss' -> + returnRn (Just clss', mkNameSet clss') where - rn_deriv clas - = lookupOccRn clas `thenRn` \ clas_name -> - - -- Now add extra "occurrences" for things that - -- the deriving mechanism will later need in order to - -- generate code for this class. - case lookupUFM derivingOccurrences clas_name of - Nothing -> addErrRn (derivingNonStdClassErr clas_name) `thenRn_` - returnRn clas_name - - Just occs -> mapRn lookupImplicitOccRn occs `thenRn_` - returnRn clas_name - + do_one cls = lookupOccRn cls `thenRn` \ clas_name -> + checkRn (getUnique clas_name `elem` derivableClassKeys) + (derivingNonStdClassErr clas_name) `thenRn_` + returnRn clas_name \end{code} \begin{code} conDeclName :: RdrNameConDecl -> (RdrName, SrcLoc) -conDeclName (ConDecl n _ _ _ l) = (n,l) +conDeclName (ConDecl n _ _ _ _ l) = (n,l) -rnConDecl :: RdrNameConDecl -> RnMS s (RenamedConDecl, FreeVars) -rnConDecl (ConDecl name tvs cxt details locn) +rnConDecl :: RdrNameConDecl -> RnMS (RenamedConDecl, FreeVars) +rnConDecl (ConDecl name wkr tvs cxt details locn) = pushSrcLocRn locn $ checkConName name `thenRn_` lookupBndrRn name `thenRn` \ new_name -> + + mkImportedGlobalFromRdrName 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_tyvars new_context new_details locn, + returnRn (ConDecl new_name new_wkr new_tyvars new_context new_details locn, cxt_fvs `plusFV` det_fvs) where doc = text "the definition of data constructor" <+> quotes (ppr name) rnConDetails doc locn (VanillaCon tys) - = mapAndUnzipRn (rnBangTy doc) tys `thenRn` \ (new_tys, fvs_s) -> - returnRn (VanillaCon new_tys, plusFVs fvs_s) + = mapFvRn (rnBangTy doc) tys `thenRn` \ (new_tys, fvs) -> + returnRn (VanillaCon new_tys, fvs) rnConDetails doc locn (InfixCon ty1 ty2) = rnBangTy doc ty1 `thenRn` \ (new_ty1, fvs1) -> @@ -402,7 +468,7 @@ rnConDetails doc locn (InfixCon ty1 ty2) returnRn (InfixCon new_ty1 new_ty2, fvs1 `plusFV` fvs2) rnConDetails doc locn (NewCon ty mb_field) - = rnHsType doc ty `thenRn` \ (new_ty, fvs) -> + = rnHsPolyType doc ty `thenRn` \ (new_ty, fvs) -> rn_field mb_field `thenRn` \ new_mb_field -> returnRn (NewCon new_ty new_mb_field, fvs) where @@ -413,8 +479,8 @@ rnConDetails doc locn (NewCon ty mb_field) rnConDetails doc locn (RecCon fields) = checkDupOrQualNames doc field_names `thenRn_` - mapAndUnzipRn (rnField doc) fields `thenRn` \ (new_fields, fvs_s) -> - returnRn (RecCon new_fields, plusFVs fvs_s) + mapFvRn (rnField doc) fields `thenRn` \ (new_fields, fvs) -> + returnRn (RecCon new_fields, fvs) where field_names = [(fld, locn) | (flds, _) <- fields, fld <- flds] @@ -424,15 +490,15 @@ rnField doc (names, ty) returnRn ((new_names, new_ty), fvs) rnBangTy doc (Banged ty) - = rnHsType doc ty `thenRn` \ (new_ty, fvs) -> + = rnHsPolyType doc ty `thenRn` \ (new_ty, fvs) -> returnRn (Banged new_ty, fvs) rnBangTy doc (Unbanged ty) - = rnHsType doc ty `thenRn` \ (new_ty, fvs) -> + = rnHsPolyType doc ty `thenRn` \ (new_ty, fvs) -> returnRn (Unbanged new_ty, fvs) rnBangTy doc (Unpacked ty) - = rnHsType doc ty `thenRn` \ (new_ty, fvs) -> + = rnHsPolyType doc ty `thenRn` \ (new_ty, fvs) -> returnRn (Unpacked new_ty, fvs) -- This data decl will parse OK @@ -453,133 +519,121 @@ checkConName name %********************************************************* %* * -\subsection{Naming a dfun} -%* * -%********************************************************* - -Make a name for the dict fun for an instance decl - -\begin{code} -mkDFunName :: RenamedHsType -- Instance type - -> Maybe RdrName -- Dfun thing from decl; Nothing <=> source - -> SrcLoc - -> RnMS s Name - -mkDFunName inst_ty maybe_df src_loc - = newDFunName cl_occ tycon_occ maybe_df src_loc - where - (cl_occ, tycon_occ) = get_key inst_ty - - get_key (HsForAllTy _ _ ty) = get_key ty - get_key (MonoFunTy _ ty) = get_key ty - get_key (MonoDictTy cls (ty:_)) = (nameOccName cls, get_tycon_key ty) - - get_tycon_key (MonoTyVar tv) = nameOccName (getName tv) - get_tycon_key (MonoTyApp ty _) = get_tycon_key ty - get_tycon_key (MonoTupleTy tys True) = getOccName (tupleTyCon (length tys)) - get_tycon_key (MonoTupleTy tys False) = getOccName (unboxedTupleTyCon (length tys)) - get_tycon_key (MonoListTy _) = getOccName listTyCon - get_tycon_key (MonoFunTy _ _) = getOccName funTyCon -\end{code} - - -%********************************************************* -%* * \subsection{Support code to rename types} %* * %********************************************************* \begin{code} -rnHsSigType :: SDoc -> RdrNameHsType -> RnMS s (RenamedHsType, FreeVars) +rnHsSigType :: SDoc -> RdrNameHsType -> RnMS (RenamedHsType, FreeVars) -- rnHsSigType is used for source-language type signatures, -- which use *implicit* universal quantification. rnHsSigType doc_str ty - = rnHsType (text "the type signature for" <+> doc_str) ty + = rnHsPolyType (text "the type signature for" <+> doc_str) ty -rnIfaceType :: SDoc -> RdrNameHsType -> RnMS s RenamedHsType -rnIfaceType doc ty - = rnHsType doc ty `thenRn` \ (ty,_) -> - returnRn ty - - -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 new_tyvars new_ctxt new_ty, - cxt_fvs `plusFV` ty_fvs) - --- 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 explicit_forall doc forall_tyvars ctxt ty - = mapRn check ctxt `thenRn` \ maybe_ctxt' -> - returnRn (catMaybes maybe_ctxt') - -- Remove problem ones, to avoid duplicate error message. - where - check ct@(_,tys) - | forall_mentioned = returnRn (Just ct) - | otherwise = addErrRn (ctxtErr explicit_forall doc forall_tyvars ct ty) `thenRn_` - returnRn Nothing - where - forall_mentioned = foldr ((||) . any (`elem` forall_tyvars) . extractHsTyVars) - False - tys - - -rnHsType :: SDoc -> RdrNameHsType -> RnMS s (RenamedHsType, FreeVars) - -rnHsType doc (HsForAllTy Nothing ctxt ty) - -- From source code (no kinds on tyvars) +--------------------------------------- +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_tyvars = extractHsTyVars ty - forall_tyvars = filter (not . (`elemFM` name_env)) mentioned_tyvars + mentioned_in_tau = extractHsTyRdrTyVars ty + forall_tyvars = filter (not . (`elemFM` name_env)) mentioned_in_tau in - checkConstraints False doc forall_tyvars ctxt ty `thenRn` \ ctxt' -> + checkConstraints doc forall_tyvars mentioned_in_tau ctxt ty `thenRn` \ ctxt' -> rnForAll doc (map UserTyVar forall_tyvars) ctxt' ty -rnHsType doc (HsForAllTy (Just 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_tyvars = extractHsTyVars ty - constrained_tyvars = [tv | (_,tys) <- ctxt, - ty <- tys, - tv <- extractHsTyVars ty] - dubious_guys = filter (`notElem` mentioned_tyvars) forall_tyvar_names - (bad_guys, warn_guys) = partition (`elem` constrained_tyvars) dubious_guys + 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 ty) bad_guys `thenRn_` - mapRn (forAllWarn doc ty) warn_guys `thenRn_` - checkConstraints True doc forall_tyvar_names ctxt ty `thenRn` \ ctxt' -> - rnForAll doc forall_tyvars ctxt' ty + -- 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) - = rnHsType doc ty1 `thenRn` \ (ty1', fvs1) -> - rnHsType doc ty2 `thenRn` \ (ty2', fvs2) -> + = 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) - = addImplicitOccRn listTyCon_name `thenRn_` - rnHsType doc ty `thenRn` \ (ty', fvs) -> + = 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) - = addImplicitOccRn tup_con_name `thenRn_` - rnHsTypes doc tys `thenRn` \ (tys', fvs) -> - returnRn (MonoTupleTy tys' boxed, fvs `addOneFV` tup_con_name) + = (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) @@ -588,202 +642,255 @@ rnHsType doc (MonoTyApp ty1 ty2) 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') -rnHsTypes doc tys - = mapAndUnzipRn (rnHsType doc) tys `thenRn` \ (tys, fvs_s) -> - returnRn (tys, plusFVs fvs_s) +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 s (RenamedContext, FreeVars) +rnContext :: SDoc -> RdrNameContext -> RnMS (RenamedContext, FreeVars) rnContext doc ctxt - = mapAndUnzipRn rn_ctxt ctxt `thenRn` \ (theta, fvs_s) -> + = mapAndUnzipRn (rnPred doc) ctxt `thenRn` \ (theta, fvs_s) -> let - (_, dup_asserts) = removeDups cmp_assert theta + (_, 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_` + mapRn_ (addWarnRn . dupClassAssertWarn theta) dup_asserts `thenRn_` returnRn (theta, plusFVs fvs_s) - where - rn_ctxt (clas, tys) - = lookupOccRn clas `thenRn` \ clas_name -> - rnHsTypes doc tys `thenRn` \ (tys', fvs) -> - returnRn ((clas_name, tys'), fvs `addOneFV` clas_name) - cmp_assert (c1,tys1) (c2,tys2) - = (c1 `compare` c2) `thenCmp` (cmpHsTypes compare tys1 tys2) +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 doc fds + = mapAndUnzipRn rn_fds fds `thenRn` \ (theta, fvs_s) -> + returnRn (theta, plusFVs fvs_s) + 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') +\end{code} %********************************************************* -%* * +%* * \subsection{IdInfo} -%* * +%* * %********************************************************* \begin{code} -rnIdInfo (HsStrictness strict) - = rnStrict strict `thenRn` \ strict' -> - returnRn (HsStrictness strict') - -rnIdInfo (HsUnfold inline (Just expr)) = rnCoreExpr expr `thenRn` \ expr' -> - returnRn (HsUnfold inline (Just expr')) -rnIdInfo (HsUnfold inline Nothing) = returnRn (HsUnfold inline Nothing) -rnIdInfo (HsArity arity) = returnRn (HsArity arity) -rnIdInfo (HsUpdate update) = returnRn (HsUpdate update) -rnIdInfo (HsNoCafRefs) = returnRn (HsNoCafRefs) -rnIdInfo (HsCprInfo cpr_info) = returnRn (HsCprInfo cpr_info) -rnIdInfo (HsSpecialise tyvars tys expr) - = bindTyVarsRn doc tyvars $ \ tyvars' -> - rnCoreExpr expr `thenRn` \ expr' -> - mapRn (rnIfaceType doc) tys `thenRn` \ tys' -> - returnRn (HsSpecialise tyvars' tys' expr') - where - doc = text "Specialise in interface pragma" - +rnIdInfo (HsStrictness str) = returnRn (HsStrictness str, emptyFVs) -rnStrict (HsStrictnessInfo demands (Just (worker,cons))) - -- The sole purpose of the "cons" field is so that we can mark the constructors - -- needed to build the wrapper as "needed", so that their data type decl will be - -- slurped in. After that their usefulness is o'er, so we just put in the empty list. +rnIdInfo (HsWorker worker) = lookupOccRn worker `thenRn` \ worker' -> - mapRn lookupOccRn cons `thenRn_` - returnRn (HsStrictnessInfo demands (Just (worker',[]))) - --- Boring, but necessary for the type checker. -rnStrict (HsStrictnessInfo demands Nothing) = returnRn (HsStrictnessInfo demands Nothing) -rnStrict HsBottom = returnRn HsBottom + 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) \end{code} -UfCore expressions. +@UfCore@ expressions. \begin{code} rnCoreExpr (UfType ty) - = rnIfaceType (text "unfolding type") ty `thenRn` \ ty' -> - returnRn (UfType ty') + = rnHsPolyType (text "unfolding type") ty `thenRn` \ (ty', fvs) -> + returnRn (UfType ty', fvs) rnCoreExpr (UfVar v) = lookupOccRn v `thenRn` \ v' -> - returnRn (UfVar v') + returnRn (UfVar v', unitFV v') + +rnCoreExpr (UfLit l) + = returnRn (UfLit l, emptyFVs) + +rnCoreExpr (UfLitLit l ty) + = rnHsType (text "litlit") ty `thenRn` \ (ty', fvs) -> + returnRn (UfLitLit l ty', fvs) -rnCoreExpr (UfCon con args) - = rnUfCon con `thenRn` \ con' -> - mapRn rnCoreExpr args `thenRn` \ args' -> - returnRn (UfCon con' args') +rnCoreExpr (UfCCall cc ty) + = rnHsPolyType (text "ccall") ty `thenRn` \ (ty', fvs) -> + returnRn (UfCCall cc ty', fvs) rnCoreExpr (UfTuple con args) = lookupOccRn con `thenRn` \ con' -> - mapRn rnCoreExpr args `thenRn` \ args' -> - returnRn (UfTuple con' args') + mapFvRn rnCoreExpr args `thenRn` \ (args', fvs) -> + returnRn (UfTuple con' args', fvs `addOneFV` con') rnCoreExpr (UfApp fun arg) - = rnCoreExpr fun `thenRn` \ fun' -> - rnCoreExpr arg `thenRn` \ arg' -> - returnRn (UfApp fun' arg') - -rnCoreExpr (UfCase scrut bndr alts) - = rnCoreExpr scrut `thenRn` \ scrut' -> - bindLocalsRn "a UfCase" [bndr] $ \ [bndr'] -> - mapRn rnCoreAlt alts `thenRn` \ alts' -> - returnRn (UfCase scrut' bndr' alts') + = rnCoreExpr fun `thenRn` \ (fun', fv1) -> + rnCoreExpr arg `thenRn` \ (arg', fv2) -> + returnRn (UfApp fun' arg', fv1 `plusFV` fv2) + +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 (UfNote note expr) - = rnNote note `thenRn` \ note' -> - rnCoreExpr expr `thenRn` \ expr' -> - returnRn (UfNote note' expr') + = rnNote note `thenRn` \ (note', fvs1) -> + rnCoreExpr expr `thenRn` \ (expr', fvs2) -> + returnRn (UfNote note' expr', fvs1 `plusFV` fvs2) rnCoreExpr (UfLam bndr body) = rnCoreBndr bndr $ \ bndr' -> - rnCoreExpr body `thenRn` \ body' -> - returnRn (UfLam bndr' body') + rnCoreExpr body `thenRn` \ (body', fvs) -> + returnRn (UfLam bndr' body', fvs) rnCoreExpr (UfLet (UfNonRec bndr rhs) body) - = rnCoreExpr rhs `thenRn` \ rhs' -> - rnCoreBndr bndr $ \ bndr' -> - rnCoreExpr body `thenRn` \ body' -> - returnRn (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 (UfLet (UfRec pairs) body) = rnCoreBndrs bndrs $ \ bndrs' -> - mapRn rnCoreExpr rhss `thenRn` \ rhss' -> - rnCoreExpr body `thenRn` \ body' -> - returnRn (UfLet (UfRec (bndrs' `zip` rhss')) body') + mapFvRn rnCoreExpr rhss `thenRn` \ (rhss', fvs1) -> + rnCoreExpr body `thenRn` \ (body', fvs2) -> + returnRn (UfLet (UfRec (bndrs' `zip` rhss')) body', fvs1 `plusFV` fvs2) where (bndrs, rhss) = unzip pairs \end{code} \begin{code} rnCoreBndr (UfValBinder name ty) thing_inside - = rnIfaceType (text str) ty `thenRn` \ ty' -> - bindLocalsRn str [name] $ \ [name'] -> - thing_inside (UfValBinder name' ty') + = rnHsPolyType doc ty `thenRn` \ (ty', fvs1) -> + bindCoreLocalFVRn name ( \ name' -> + thing_inside (UfValBinder name' ty') + ) `thenRn` \ (result, fvs2) -> + returnRn (result, fvs1 `plusFV` fvs2) where - str = "unfolding id" + doc = text "unfolding id" rnCoreBndr (UfTyBinder name kind) thing_inside - = bindLocalsRn "an unfolding tyvar" [name] $ \ [name'] -> + = bindCoreLocalFVRn name $ \ name' -> thing_inside (UfTyBinder name' kind) -rnCoreBndrs bndrs thing_inside -- Expect them all to be ValBinders - = mapRn (rnIfaceType (text str)) tys `thenRn` \ tys' -> - bindLocalsRn str names $ \ names' -> - thing_inside (zipWith UfValBinder names' tys') - where - str = "unfolding id" - names = map (\ (UfValBinder name _ ) -> name) bndrs - tys = map (\ (UfValBinder _ ty) -> ty) bndrs +rnCoreBndrs [] thing_inside = thing_inside [] +rnCoreBndrs (b:bs) thing_inside = rnCoreBndr b $ \ name' -> + rnCoreBndrs bs $ \ names' -> + thing_inside (name':names') \end{code} \begin{code} rnCoreAlt (con, bndrs, rhs) - = rnUfCon con `thenRn` \ con' -> - bindLocalsRn "an unfolding alt" bndrs $ \ bndrs' -> - rnCoreExpr rhs `thenRn` \ rhs' -> - returnRn (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) rnNote (UfCoerce ty) - = rnIfaceType (text "unfolding coerce") ty `thenRn` \ ty' -> - returnRn (UfCoerce ty') + = rnHsPolyType (text "unfolding coerce") ty `thenRn` \ (ty', fvs) -> + returnRn (UfCoerce ty', fvs) -rnNote (UfSCC cc) = returnRn (UfSCC cc) -rnNote UfInlineCall = returnRn UfInlineCall +rnNote (UfSCC cc) = returnRn (UfSCC cc, emptyFVs) +rnNote UfInlineCall = returnRn (UfInlineCall, emptyFVs) +rnNote UfInlineMe = returnRn (UfInlineMe, emptyFVs) rnUfCon UfDefault - = returnRn UfDefault + = returnRn (UfDefault, emptyFVs) -rnUfCon (UfDataCon con) +rnUfCon (UfDataAlt con) = lookupOccRn con `thenRn` \ con' -> - returnRn (UfDataCon con') + returnRn (UfDataAlt con', unitFV con') -rnUfCon (UfLitCon lit) - = returnRn (UfLitCon lit) +rnUfCon (UfLitAlt lit) + = returnRn (UfLitAlt lit, emptyFVs) -rnUfCon (UfLitLitCon lit ty) - = rnIfaceType (text "litlit") ty `thenRn` \ ty' -> - returnRn (UfLitLitCon lit ty') +rnUfCon (UfLitLitAlt lit ty) + = rnHsPolyType (text "litlit") ty `thenRn` \ (ty', fvs) -> + returnRn (UfLitLitAlt lit ty', fvs) +\end{code} + +%********************************************************* +%* * +\subsection{Rule shapes} +%* * +%********************************************************* -rnUfCon (UfPrimOp op) - = lookupOccRn op `thenRn` \ op' -> - returnRn (UfPrimOp op') +Check the shape of a transformation rule LHS. Currently +we only allow LHSs of the form @(f e1 .. en)@, where @f@ is +not one of the @forall@'d variables. -rnUfCon (UfCCallOp str is_dyn casm gc) - = returnRn (UfCCallOp str is_dyn casm gc) +\begin{code} +validRuleLhs foralls lhs + = check lhs + where + check (HsApp e1 e2) = check e1 + check (HsVar v) | v `notElem` foralls = True + check other = False \end{code} + %********************************************************* -%* * +%* * \subsection{Errors} -%* * +%* * %********************************************************* \begin{code} @@ -798,9 +905,9 @@ classTyVarNotInOpTyErr clas_tyvar sig dupClassAssertWarn ctxt (assertion : dups) = sep [hsep [ptext SLIT("Duplicate class assertion"), - quotes (pprClassAssertion assertion), + quotes (pprHsPred assertion), ptext SLIT("in the context:")], - nest 4 (pprContext ctxt <+> ptext SLIT("..."))] + nest 4 (pprHsContext ctxt <+> ptext SLIT("..."))] badDataCon name = hsep [ptext SLIT("Illegal data constructor name"), quotes (ppr name)] @@ -808,11 +915,21 @@ badDataCon name forAllWarn doc ty tyvar | not opt_WarnUnusedMatches = returnRn () | otherwise - = addWarnRn ( + = 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 ( @@ -821,14 +938,37 @@ forAllErr doc ty tyvar $$ (ptext SLIT("In") <+> doc)) -ctxtErr explicit_forall doc tyvars constraint ty - = sep [ptext SLIT("The constraint") <+> quotes (pprClassAssertion constraint) <+> - ptext SLIT("does not mention any of"), - if explicit_forall then - nest 4 (ptext SLIT("the universally quantified type variables") <+> braces (interpp'SP tyvars)) - else - nest 4 (ptext SLIT("the type variables in the type") <+> quotes (ppr ty)) +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)] + $$ + 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, + 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")] \end{code}