X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Frename%2FRnSource.lhs;h=b0d5e4669d55b7bb70b81b52d61daf02ccaae728;hb=9bedea20f62a1da832c69833c39dd1d15e6ee9a3;hp=ecc70157515ec3f3dff7bbfaa2af63d9caea472f;hpb=731f53de7930c38b5023a871146bd0ec066edf3a;p=ghc-hetmet.git diff --git a/ghc/compiler/rename/RnSource.lhs b/ghc/compiler/rename/RnSource.lhs index ecc7015..b0d5e46 100644 --- a/ghc/compiler/rename/RnSource.lhs +++ b/ghc/compiler/rename/RnSource.lhs @@ -4,54 +4,54 @@ \section[RnSource]{Main pass of renamer} \begin{code} -module RnSource ( rnDecl, rnSourceDecls, rnHsType, rnHsSigType, rnHsPolyType ) where +module RnSource ( rnDecl, rnSourceDecls, rnHsType, rnHsSigType ) where #include "HsVersions.h" import RnExpr import HsSyn import HsPragmas -import HsTypes ( getTyVarName, pprClassAssertion, cmpHsTypes ) -import RdrName ( RdrName, isRdrDataCon, rdrNameOcc, isRdrTyVar ) +import HsTypes ( hsTyVarNames, pprHsContext ) +import RdrName ( RdrName, isRdrDataCon, rdrNameOcc, mkRdrNameWkr ) import RdrHsSyn ( RdrNameContext, RdrNameHsType, RdrNameConDecl, - extractRuleBndrsTyVars, extractHsTyRdrTyVars, extractHsTysRdrTyVars + extractRuleBndrsTyVars, extractHsTyRdrTyVars, + extractHsCtxtRdrTyVars, extractGenericPatTyVars ) import RnHsSyn import HsCore -import RnBinds ( rnTopBinds, rnMethodBinds, renameSigs, unknownSigErr ) -import RnEnv ( bindTyVarsRn, lookupBndrRn, lookupOccRn, - lookupImplicitOccRn, - bindLocalsRn, bindLocalRn, bindLocalsFVRn, bindUVarRn, +import RnBinds ( rnTopBinds, rnMethodBinds, renameSigs ) +import RnEnv ( lookupTopBndrRn, lookupOccRn, newIPName, + lookupOrigNames, lookupSysBinder, newLocalsRn, + bindLocalsFVRn, bindUVarRn, bindTyVarsFVRn, bindTyVarsFV2Rn, extendTyVarEnvFVRn, - bindCoreLocalFVRn, bindCoreLocalsFVRn, + bindCoreLocalFVRn, bindCoreLocalsFVRn, bindLocalNames, checkDupOrQualNames, checkDupNames, - mkImportedGlobalName, mkImportedGlobalFromRdrName, - newDFunName, getDFunKey, newImplicitBinder, - FreeVars, emptyFVs, plusFV, plusFVs, unitFV, addOneFV, mapFvRn + FreeVars, emptyFVs, plusFV, plusFVs, unitFV, + addOneFV, mapFvRn ) import RnMonad -import Name ( Name, OccName, - ExportFlag(..), Provenance(..), - nameOccName, NamedThing(..) - ) +import FunDeps ( oclose ) +import Class ( FunDep, DefMeth (..) ) +import Name ( Name, OccName, nameOccName, NamedThing(..) ) import NameSet -import OccName ( mkDefaultMethodOcc ) -import BasicTypes ( TopLevelFlag(..) ) +import OccName ( mkDefaultMethodOcc, isTvOcc ) import FiniteMap ( elemFM ) -import PrelInfo ( derivableClassKeys, - deRefStablePtr_NAME, makeStablePtr_NAME, bindIO_NAME +import PrelInfo ( derivableClassKeys, cCallishClassKeys ) +import PrelNames ( deRefStablePtr_RDR, makeStablePtr_RDR, + bindIO_RDR, returnIO_RDR ) import Bag ( bagToList ) import List ( partition, nub ) import Outputable import SrcLoc ( SrcLoc ) -import CmdLineOpts ( opt_WarnUnusedMatches ) -- Warn of unused for-all'd tyvars +import CmdLineOpts ( DynFlags, DynFlag(..) ) + -- Warn of unused for-all'd tyvars import Unique ( Uniquable(..) ) -import UniqFM ( lookupUFM ) -import Maybes ( maybeToBool, catMaybes ) -import Util +import ErrUtils ( Message ) +import CStrings ( isCLabelString ) +import ListSetOps ( minusList, removeDupsEq ) \end{code} @rnDecl@ `renames' declarations. @@ -61,6 +61,8 @@ It also does the following error checks: \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 @@ -81,11 +83,12 @@ rnSourceDecls :: [RdrNameHsDecl] -> RnMS ([RenamedHsDecl], FreeVars) rnSourceDecls decls = 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 + -- 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) = rnDecl d `thenRn` \(d', fvs') -> + go (fvs `plusFV` fvs') (d':ds') ds \end{code} @@ -105,9 +108,9 @@ rnDecl (ValD binds) = rnTopBinds binds `thenRn` \ (new_binds, fvs) -> 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) -> + lookupTopBndrRn name `thenRn` \ name' -> + rnHsType 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) @@ -133,17 +136,19 @@ 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)) +rnDecl (TyClD (TyData new_or_data context tycon tyvars condecls nconstrs derivings pragmas src_loc gen_name1 gen_name2)) = pushSrcLocRn src_loc $ - lookupBndrRn tycon `thenRn` \ tycon' -> + lookupTopBndrRn 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) -> + lookupSysBinder gen_name1 `thenRn` \ name1' -> + lookupSysBinder gen_name2 `thenRn` \ name2' -> rnDerivs derivings `thenRn` \ (derivings', deriv_fvs) -> ASSERT(isNoDataPragmas pragmas) - returnRn (TyClD (TyData new_or_data context' tycon' tyvars' condecls' - derivings' noDataPragmas src_loc), + returnRn (TyClD (TyData new_or_data context' tycon' tyvars' condecls' nconstrs + derivings' noDataPragmas src_loc name1' name2'), cxt_fvs `plusFV` con_fvs `plusFV` deriv_fvs) where data_doc = text "the data type declaration for" <+> quotes (ppr tycon) @@ -151,18 +156,24 @@ rnDecl (TyClD (TyData new_or_data context tycon tyvars condecls derivings pragma rnDecl (TyClD (TySynonym name tyvars ty src_loc)) = pushSrcLocRn src_loc $ - lookupBndrRn name `thenRn` \ name' -> + doptRn Opt_GlasgowExts `thenRn` \ glaExts -> + lookupTopBndrRn name `thenRn` \ name' -> bindTyVarsFVRn syn_doc tyvars $ \ tyvars' -> - rnHsType syn_doc ty `thenRn` \ (ty', ty_fvs) -> + rnHsType syn_doc (unquantify glaExts 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 snames 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 glaExts (HsForAllTy Nothing ctxt ty) | glaExts = ty + unquantify glaExys ty = ty + +rnDecl (TyClD (ClassDecl context cname tyvars fds sigs mbinds pragmas + names src_loc)) = pushSrcLocRn src_loc $ - lookupBndrRn cname `thenRn` \ cname' -> + lookupTopBndrRn cname `thenRn` \ cname' -> -- Deal with the implicit tycon and datacon name -- They aren't in scope (because they aren't visible to the user) @@ -171,9 +182,8 @@ rnDecl (TyClD (ClassDecl context cname tyvars sigs mbinds pragmas -- 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' -> - mapRn mkImportedGlobalFromRdrName snames `thenRn` \ snames' -> + + mapRn lookupSysBinder names `thenRn` \ names' -> -- Tyvars scope over bindings and context bindTyVarsFV2Rn cls_doc tyvars ( \ clas_tyvar_names tyvars' -> @@ -181,26 +191,41 @@ rnDecl (TyClD (ClassDecl context cname tyvars sigs mbinds pragmas -- 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 + -- First process the class op sigs (op_sigs), then the fixity sigs (non_op_sigs). let - -- First process the class op sigs, then the fixity sigs. - (op_sigs, non_op_sigs) = partition isClassOpSig sigs - (fix_sigs, non_sigs) = partition isFixitySig non_op_sigs + (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_` - mapFvRn (rn_op cname' clas_tyvar_names) op_sigs - `thenRn` \ (sigs', sig_fvs) -> - mapRn_ (unknownSigErr) non_sigs `thenRn_` + 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' ] + binders = mkNameSet [ nm | (ClassOpSig nm _ _ _) <- sigs' ] in - renameSigs False binders lookupOccRn fix_sigs - `thenRn` \ (fixs', fix_fvs) -> + renameSigs (okClsDclSig binders) non_op_sigs `thenRn` \ (non_ops', fix_fvs) -> -- Check the methods + -- 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 + 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 `elemFM` name_env)] + in checkDupOrQualNames meth_doc meth_rdr_names_w_locs `thenRn_` - rnMethodBinds mbinds - `thenRn` \ (mbinds', meth_fvs) -> + newLocalsRn mkLocalName gen_rdr_tyvars_w_locs `thenRn` \ gen_tyvars -> + rnMethodBinds gen_tyvars mbinds `thenRn` \ (mbinds', meth_fvs) -> -- Typechecker is responsible for checking that we only -- give default-method bindings for things in this class. @@ -208,11 +233,13 @@ rnDecl (TyClD (ClassDecl context cname tyvars sigs mbinds pragmas -- for instance decls. ASSERT(isNoClassPragmas pragmas) - returnRn (TyClD (ClassDecl context' cname' tyvars' (fixs' ++ sigs') mbinds' - NoClassPragmas tname' dname' snames' src_loc), + returnRn (TyClD (ClassDecl context' cname' tyvars' fds' (non_ops' ++ sigs') mbinds' + NoClassPragmas names' src_loc), sig_fvs `plusFV` + fix_fvs `plusFV` cxt_fvs `plusFV` + fds_fvs `plusFV` meth_fvs ) ) @@ -221,51 +248,38 @@ rnDecl (TyClD (ClassDecl context cname tyvars sigs mbinds pragmas 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 sig@(ClassOpSig op maybe_dm ty locn) + rn_op clas clas_tyvars clas_fds sig@(ClassOpSig op maybe_dm_stuff ty locn) = pushSrcLocRn locn $ - lookupBndrRn op `thenRn` \ op_name -> + lookupTopBndrRn 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) + 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, maybe_dm) of - (SourceMode, _) - | op `elem` meth_rdr_names - -> -- Source class decl with an explicit method decl - newImplicitBinder (mkDefaultMethodOcc (rdrNameOcc op)) locn - `thenRn` \ dm_name -> - returnRn (Just dm_name, emptyFVs) - - | otherwise - -> -- Source class dec, no explicit method decl - returnRn (Nothing, emptyFVs) - - (InterfaceMode, Just dm_rdr_name) + (case maybe_dm_stuff of + Nothing -> returnRn (Nothing, emptyFVs) -- Source-file class decl + + Just (DefMeth dm_rdr_name) -> -- Imported class that has a default method decl -- See comments with tname, snames, above - lookupImplicitOccRn dm_rdr_name `thenRn` \ dm_name -> - returnRn (Just dm_name, unitFV dm_name) - -- An imported class decl mentions, rather than defines, - -- the default method, so we must arrange to pull it in - - (InterfaceMode, Nothing) - -- Imported class with no default metho - -> returnRn (Nothing, emptyFVs) - ) `thenRn` \ (maybe_dm_name, dm_fvs) -> - - returnRn (ClassOpSig op_name maybe_dm_name new_ty locn, op_ty_fvs `plusFV` dm_fvs) + lookupSysBinder dm_rdr_name `thenRn` \ dm_name -> + returnRn (Just (DefMeth dm_name), unitFV 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 + Just GenDefMeth + -> returnRn (Just GenDefMeth, emptyFVs) + Just NoDefMeth + -> returnRn (Just NoDefMeth, emptyFVs) + ) `thenRn` \ (maybe_dm_stuff', dm_fvs) -> + + returnRn (ClassOpSig op_name maybe_dm_stuff' new_ty locn, op_ty_fvs `plusFV` dm_fvs) \end{code} @@ -276,7 +290,7 @@ rnDecl (TyClD (ClassDecl context cname tyvars sigs mbinds pragmas %********************************************************* \begin{code} -rnDecl (InstD (InstDecl inst_ty mbinds uprags dfun_rdr_name src_loc)) +rnDecl (InstD (InstDecl inst_ty mbinds uprags maybe_dfun_rdr_name src_loc)) = pushSrcLocRn src_loc $ rnHsSigType (text "an instance decl") inst_ty `thenRn` \ (inst_ty', inst_fvs) -> let @@ -290,52 +304,37 @@ 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 [] mbinds ) `thenRn` \ (mbinds', meth_fvs) -> let - binders = mkNameSet (map fst (bagToList (collectMonoBinders mbinds'))) - - -- Delete sigs (&report) sigs that aren't allowed inside an - -- instance decl: - -- - -- + type signatures - -- + fixity decls - -- - (ok_sigs, not_ok_idecl_sigs) = partition okInInstDecl uprags - - okInInstDecl (FixSig _) = False - okInInstDecl (Sig _ _ _) = False - okInInstDecl _ = True - + binders = collectMonoBinders mbinds' + binder_set = mkNameSet binders in - -- You can't have fixity decls & type signatures - -- within an instance declaration. - mapRn_ unknownSigErr not_ok_idecl_sigs `thenRn_` - -- 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 False binders lookupOccRn ok_sigs `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) -> + -- + -- But the (unqualified) method names are in scope + bindLocalNames binders ( + renameSigs (okInstDclSig binder_set) uprags + ) `thenRn` \ (new_uprags, prag_fvs) -> + + (case maybe_dfun_rdr_name of + Nothing -> returnRn (Nothing, emptyFVs) + + Just dfun_rdr_name -> lookupSysBinder dfun_rdr_name `thenRn` \ dfun_name -> + returnRn (Just dfun_name, unitFV dfun_name) + ) `thenRn` \ (maybe_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), + returnRn (InstD (InstDecl inst_ty' mbinds' new_uprags maybe_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) + meth_doc = text "the bindings in an instance declaration" + meth_names = collectLocatedMonoBinders mbinds \end{code} %********************************************************* @@ -364,21 +363,28 @@ rnDecl (ForD (ForeignDecl name imp_exp ty ext_nm cconv src_loc)) = pushSrcLocRn src_loc $ lookupOccRn name `thenRn` \ name' -> let - fvs1 = case imp_exp of - FoImport _ | not isDyn -> emptyFVs - FoLabel -> emptyFVs - FoExport | isDyn -> mkNameSet [makeStablePtr_NAME, - deRefStablePtr_NAME, - bindIO_NAME] - | otherwise -> mkNameSet [name'] - _ -> emptyFVs + extra_fvs FoExport + | isDyn = lookupOrigNames [makeStablePtr_RDR, deRefStablePtr_RDR, + bindIO_RDR, returnIO_RDR] + | otherwise = + lookupOrigNames [bindIO_RDR, returnIO_RDR] `thenRn` \ fvs -> + returnRn (addOneFV fvs name') + extra_fvs other = returnRn emptyFVs in - rnHsSigType fo_decl_msg ty `thenRn` \ (ty', fvs2) -> + checkRn (ok_ext_nm ext_nm) (badExtName ext_nm) `thenRn_` + + extra_fvs imp_exp `thenRn` \ fvs1 -> + + 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 + + ok_ext_nm Dynamic = True + ok_ext_nm (ExtName nm (Just mb)) = isCLabelString nm && isCLabelString mb + ok_ext_nm (ExtName nm Nothing) = isCLabelString nm \end{code} %********************************************************* @@ -388,13 +394,23 @@ 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') +rnDecl (RuleD (IfaceRule rule_name vars fn args rhs src_loc)) + = pushSrcLocRn src_loc $ + lookupOccRn fn `thenRn` \ fn' -> + rnCoreBndrs vars $ \ vars' -> + mapFvRn rnCoreExpr args `thenRn` \ (args', fvs1) -> + rnCoreExpr rhs `thenRn` \ (rhs', fvs2) -> + returnRn (RuleD (IfaceRule rule_name vars' fn' args' rhs' src_loc), + (fvs1 `plusFV` fvs2) `addOneFV` fn') + +rnDecl (RuleD (IfaceRuleOut fn rule)) + -- This one is used for BuiltInRules + -- The rule itself is already done, but the thing + -- to attach it to is not. + = lookupOccRn fn `thenRn` \ fn' -> + returnRn (RuleD (IfaceRuleOut fn' rule), unitFV fn') -rnDecl (RuleD (RuleDecl rule_name tvs vars lhs rhs src_loc)) +rnDecl (RuleD (HsRule rule_name tvs vars lhs rhs src_loc)) = ASSERT( null tvs ) pushSrcLocRn src_loc $ @@ -410,7 +426,7 @@ 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 (RuleD (HsRule 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 @@ -420,7 +436,7 @@ rnDecl (RuleD (RuleDecl rule_name tvs vars lhs rhs src_loc)) 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) = rnHsType doc t `thenRn` \ (t', fvs) -> returnRn (RuleBndrSig id t', fvs) \end{code} @@ -449,17 +465,21 @@ rnDerivs (Just clss) \begin{code} conDeclName :: RdrNameConDecl -> (RdrName, SrcLoc) -conDeclName (ConDecl n _ _ _ l) = (n,l) +conDeclName (ConDecl n _ _ _ _ l) = (n,l) rnConDecl :: RdrNameConDecl -> RnMS (RenamedConDecl, FreeVars) -rnConDecl (ConDecl name tvs cxt details locn) +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 -> + + 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_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) @@ -473,16 +493,6 @@ rnConDetails doc locn (InfixCon ty1 ty2) 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) - rnConDetails doc locn (RecCon fields) = checkDupOrQualNames doc field_names `thenRn_` mapFvRn (rnField doc) fields `thenRn` \ (new_fields, fvs) -> @@ -491,20 +501,20 @@ rnConDetails doc locn (RecCon fields) field_names = [(fld, locn) | (flds, _) <- fields, fld <- flds] rnField doc (names, ty) - = mapRn lookupBndrRn names `thenRn` \ new_names -> + = mapRn lookupTopBndrRn 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) -> + = rnHsType doc ty `thenRn` \ (new_ty, fvs) -> returnRn (Banged new_ty, fvs) rnBangTy doc (Unbanged ty) - = rnHsPolyType doc ty `thenRn` \ (new_ty, fvs) -> + = rnHsType doc ty `thenRn` \ (new_ty, fvs) -> returnRn (Unbanged new_ty, fvs) rnBangTy doc (Unpacked ty) - = rnHsPolyType doc ty `thenRn` \ (new_ty, fvs) -> + = rnHsType doc ty `thenRn` \ (new_ty, fvs) -> returnRn (Unpacked new_ty, fvs) -- This data decl will parse OK @@ -534,173 +544,187 @@ 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 + = rnHsType (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. +rnHsType :: SDoc -> RdrNameHsType -> RnMS (RenamedHsType, FreeVars) ---------------------------------------- -rnHsPolyType doc (HsForAllTy Nothing ctxt ty) - -- From source code (no kinds on tyvars) +rnHsType 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 + mentioned_in_tau = extractHsTyRdrTyVars ty + mentioned_in_ctxt = extractHsCtxtRdrTyVars ctxt + mentioned = nub (mentioned_in_tau ++ mentioned_in_ctxt) + forall_tyvars = filter (not . (`elemFM` name_env)) mentioned in - checkConstraints doc forall_tyvars mentioned_in_tau ctxt ty `thenRn` \ ctxt' -> - rnForAll doc (map UserTyVar forall_tyvars) ctxt' ty + rnForAll doc (map UserTyVar forall_tyvars) ctxt ty -rnHsPolyType doc (HsForAllTy (Just forall_tyvars) ctxt tau) +rnHsType 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 + -- Check that the forall'd tyvars are actually + -- mentioned in the type, and produce a warning if not = let - mentioned_in_tau = extractHsTyRdrTyVars tau - mentioned_in_ctxt = nub [tv | (_,tys) <- ctxt, - ty <- tys, - tv <- extractHsTyRdrTyVars 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 + mentioned_in_tau = extractHsTyRdrTyVars tau + mentioned_in_ctxt = extractHsCtxtRdrTyVars ctxt + mentioned = nub (mentioned_in_tau ++ mentioned_in_ctxt) + forall_tyvar_names = hsTyVarNames forall_tyvars + + -- Explicitly quantified but not mentioned in ctxt or tau + warn_guys = filter (`notElem` mentioned) forall_tyvar_names 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 check ctxt `thenRn` \ maybe_ctxt' -> - returnRn (catMaybes maybe_ctxt') - -- Remove problem ones, to avoid duplicate error message. - where - check ct@(_,tys) - | ambiguous = failWithRn Nothing (ambigErr doc ct ty) - | not_univ = failWithRn Nothing (univErr doc ct ty) - | otherwise = returnRn (Just ct) - where - ct_vars = extractHsTysRdrTyVars tys - - ambiguous = -- All the universally-quantified tyvars in the constraint must appear in the tau ty - -- (will change when we get functional dependencies) - not (all (\ct_var -> not (ct_var `elem` forall_tyvars) || ct_var `elem` tau_vars) ct_vars) - - 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) - + mapRn_ (forAllWarn doc tau) warn_guys `thenRn_` + rnForAll doc forall_tyvars ctxt tau -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 (HsTyVar tyvar) + = lookupOccRn tyvar `thenRn` \ tyvar' -> + returnRn (HsTyVar tyvar', unitFV tyvar') ---------------------------------------- -rnHsType doc ty@(HsForAllTy _ _ inner_ty) - = addErrRn (unexpectedForAllTy ty) `thenRn_` - rnHsPolyType doc ty +rnHsType doc (HsOpTy ty1 opname ty2) + = lookupOccRn opname `thenRn` \ name' -> + rnHsType doc ty1 `thenRn` \ (ty1', fvs1) -> + rnHsType doc ty2 `thenRn` \ (ty2',fvs2) -> + returnRn (HsOpTy ty1' name' ty2', fvs1 `plusFV` fvs2 `addOneFV` name') -rnHsType doc (MonoTyVar tyvar) - = lookupOccRn tyvar `thenRn` \ tyvar' -> - returnRn (MonoTyVar tyvar', unitFV tyvar') +rnHsType doc (HsNumTy i) + | i == 1 = returnRn (HsNumTy i, emptyFVs) + | otherwise = failWithRn (HsNumTy i, emptyFVs) + (ptext SLIT("Only unit numeric type pattern is valid")) -rnHsType doc (MonoFunTy ty1 ty2) - = rnHsPolyType doc ty1 `thenRn` \ (ty1', fvs1) -> +rnHsType doc (HsFunTy ty1 ty2) + = rnHsType doc ty1 `thenRn` \ (ty1', fvs1) -> -- Might find a for-all as the arg of a function type - rnHsPolyType doc ty2 `thenRn` \ (ty2', fvs2) -> + rnHsType 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) + returnRn (HsFunTy ty1' ty2', fvs1 `plusFV` fvs2) -rnHsType doc (MonoListTy ty) +rnHsType doc (HsListTy ty) = rnHsType doc ty `thenRn` \ (ty', fvs) -> - returnRn (MonoListTy ty', fvs `addOneFV` listTyCon_name) + returnRn (HsListTy 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) +rnHsType doc (HsTupleTy (HsTupCon _ boxity) tys) + -- Don't do lookupOccRn, because this is built-in syntax + -- so it doesn't need to be in scope + = mapFvRn (rnHsType doc) tys `thenRn` \ (tys', fvs) -> + returnRn (HsTupleTy (HsTupCon n' boxity) tys', fvs `addOneFV` n') where - tup_con_name = tupleTyCon_name boxed (length tys) + n' = tupleTyCon_name boxity (length tys) + -rnHsType doc (MonoTyApp ty1 ty2) +rnHsType doc (HsAppTy ty1 ty2) = rnHsType doc ty1 `thenRn` \ (ty1', fvs1) -> rnHsType doc ty2 `thenRn` \ (ty2', fvs2) -> - returnRn (MonoTyApp ty1' ty2', fvs1 `plusFV` fvs2) + returnRn (HsAppTy ty1' ty2', fvs1 `plusFV` fvs2) -rnHsType doc (MonoDictTy clas tys) - = lookupOccRn clas `thenRn` \ clas' -> - rnHsTypes doc tys `thenRn` \ (tys', fvs) -> - returnRn (MonoDictTy clas' tys', fvs `addOneFV` clas') +rnHsType doc (HsPredTy pred) + = rnPred doc pred `thenRn` \ (pred', fvs) -> + returnRn (HsPredTy pred', fvs) -rnHsType doc (MonoUsgForAllTy uv_rdr ty) +rnHsType doc (HsUsgForAllTy uv_rdr ty) = bindUVarRn doc uv_rdr $ \ uv_name -> rnHsType doc ty `thenRn` \ (ty', fvs) -> - returnRn (MonoUsgForAllTy uv_name ty', + returnRn (HsUsgForAllTy uv_name ty', fvs ) -rnHsType doc (MonoUsgTy usg ty) - = newUsg usg `thenRn` \ (usg', usg_fvs) -> - rnHsType doc ty `thenRn` \ (ty', ty_fvs) -> - returnRn (MonoUsgTy usg' ty', +rnHsType doc (HsUsgTy usg ty) + = newUsg usg `thenRn` \ (usg', usg_fvs) -> + rnHsType doc ty `thenRn` \ (ty', ty_fvs) -> + -- A for-all can occur inside a usage annotation + returnRn (HsUsgTy 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) + HsUsOnce -> returnRn (HsUsOnce, emptyFVs) + HsUsMany -> returnRn (HsUsMany, emptyFVs) + HsUsVar uv_rdr -> lookupOccRn uv_rdr `thenRn` \ uv_name -> + returnRn (HsUsVar uv_name, emptyFVs) rnHsTypes doc tys = mapFvRn (rnHsType doc) tys \end{code} +\begin{code} +-- We use lookupOcc here because this is interface file only stuff +-- and we need the workers... +rnHsTupCon (HsTupCon n boxity) + = lookupOccRn n `thenRn` \ n' -> + returnRn (HsTupCon n' boxity, unitFV n') + +rnHsTupConWkr (HsTupCon n boxity) + -- Tuple construtors are for the *worker* of the tuple + -- Going direct saves needless messing about + = lookupOccRn (mkRdrNameWkr n) `thenRn` \ n' -> + returnRn (HsTupCon n' boxity, unitFV n') +\end{code} + +\begin{code} +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) +\end{code} \begin{code} rnContext :: SDoc -> RdrNameContext -> RnMS (RenamedContext, FreeVars) - rnContext doc ctxt - = mapAndUnzipRn rn_ctxt ctxt `thenRn` \ (theta, fvs_s) -> + = mapAndUnzipRn rn_pred ctxt `thenRn` \ (theta, fvs_s) -> let - (_, dup_asserts) = removeDups cmp_assert theta + (_, dups) = removeDupsEq theta + -- We only have equality, not ordering 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) dups `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) + --Someone discovered that @CCallable@ and @CReturnable@ + -- could be used in contexts such as: + -- foo :: CCallable a => a -> PrimIO Int + -- Doing this utterly wrecks the whole point of introducing these + -- classes so we specifically check that this isn't being done. + rn_pred pred = rnPred doc pred `thenRn` \ (pred', fvs)-> + checkRn (not (bad_pred pred')) + (naughtyCCallContextErr pred') `thenRn_` + returnRn (pred', fvs) + + bad_pred (HsPClass clas _) = getUnique clas `elem` cCallishClassKeys + bad_pred other = False + + +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) - cmp_assert (c1,tys1) (c2,tys2) - = (c1 `compare` c2) `thenCmp` (cmpHsTypes compare tys1 tys2) +rnPred doc (HsPIParam n ty) + = newIPName n `thenRn` \ name -> + rnHsType doc ty `thenRn` \ (ty', fvs) -> + returnRn (HsPIParam name ty', fvs) \end{code} +\begin{code} +rnFds :: SDoc -> [FunDep RdrName] -> RnMS ([FunDep 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} %********************************************************* %* * @@ -715,44 +739,40 @@ rnIdInfo (HsWorker worker) = lookupOccRn worker `thenRn` \ worker' -> returnRn (HsWorker worker', unitFV worker') -rnIdInfo (HsUnfold inline (Just expr)) = rnCoreExpr expr `thenRn` \ (expr', fvs) -> - returnRn (HsUnfold inline (Just expr'), fvs) -rnIdInfo (HsUnfold inline Nothing) = returnRn (HsUnfold inline Nothing, emptyFVs) +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 cpr_info) = returnRn (HsCprInfo cpr_info, 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) +rnIdInfo HsNoCafRefs = returnRn (HsNoCafRefs, emptyFVs) +rnIdInfo HsCprInfo = returnRn (HsCprInfo, emptyFVs) + \end{code} @UfCore@ expressions. \begin{code} rnCoreExpr (UfType ty) - = rnHsPolyType (text "unfolding type") ty `thenRn` \ (ty', fvs) -> + = rnHsType (text "unfolding type") ty `thenRn` \ (ty', fvs) -> returnRn (UfType ty', fvs) rnCoreExpr (UfVar v) = lookupOccRn v `thenRn` \ v' -> returnRn (UfVar v', unitFV v') -rnCoreExpr (UfCon con args) - = rnUfCon con `thenRn` \ (con', fvs1) -> - mapFvRn rnCoreExpr args `thenRn` \ (args', fvs2) -> - returnRn (UfCon con' args', fvs1 `plusFV` fvs2) +rnCoreExpr (UfLit l) + = returnRn (UfLit l, emptyFVs) + +rnCoreExpr (UfLitLit l ty) + = rnHsType (text "litlit") ty `thenRn` \ (ty', fvs) -> + returnRn (UfLitLit l ty', fvs) + +rnCoreExpr (UfCCall cc ty) + = rnHsType (text "ccall") ty `thenRn` \ (ty', fvs) -> + returnRn (UfCCall cc ty', fvs) rnCoreExpr (UfTuple con args) - = lookupOccRn con `thenRn` \ con' -> - mapFvRn rnCoreExpr args `thenRn` \ (args', fvs) -> - returnRn (UfTuple con' args', fvs `addOneFV` con') + = rnHsTupConWkr con `thenRn` \ (con', fvs1) -> + mapFvRn rnCoreExpr args `thenRn` \ (args', fvs2) -> + returnRn (UfTuple con' args', fvs1 `plusFV` fvs2) rnCoreExpr (UfApp fun arg) = rnCoreExpr fun `thenRn` \ (fun', fv1) -> @@ -796,7 +816,7 @@ rnCoreExpr (UfLet (UfRec pairs) body) \begin{code} rnCoreBndr (UfValBinder name ty) thing_inside - = rnHsPolyType doc ty `thenRn` \ (ty', fvs1) -> + = rnHsType doc ty `thenRn` \ (ty', fvs1) -> bindCoreLocalFVRn name ( \ name' -> thing_inside (UfValBinder name' ty') ) `thenRn` \ (result, fvs2) -> @@ -816,7 +836,7 @@ rnCoreBndrs (b:bs) thing_inside = rnCoreBndr b $ \ name' -> \begin{code} rnCoreAlt (con, bndrs, rhs) - = rnUfCon con `thenRn` \ (con', fvs1) -> + = rnUfCon con bndrs `thenRn` \ (con', fvs1) -> bindCoreLocalsFVRn bndrs ( \ bndrs' -> rnCoreExpr rhs `thenRn` \ (rhs', fvs2) -> returnRn ((con', bndrs', rhs'), fvs2) @@ -824,7 +844,7 @@ rnCoreAlt (con, bndrs, rhs) returnRn (result, fvs1 `plusFV` fvs3) rnNote (UfCoerce ty) - = rnHsPolyType (text "unfolding coerce") ty `thenRn` \ (ty', fvs) -> + = rnHsType (text "unfolding coerce") ty `thenRn` \ (ty', fvs) -> returnRn (UfCoerce ty', fvs) rnNote (UfSCC cc) = returnRn (UfSCC cc, emptyFVs) @@ -832,26 +852,24 @@ rnNote UfInlineCall = returnRn (UfInlineCall, emptyFVs) rnNote UfInlineMe = returnRn (UfInlineMe, emptyFVs) -rnUfCon UfDefault +rnUfCon UfDefault _ = returnRn (UfDefault, emptyFVs) -rnUfCon (UfDataCon con) - = lookupOccRn con `thenRn` \ con' -> - returnRn (UfDataCon con', unitFV con') - -rnUfCon (UfLitCon lit) - = returnRn (UfLitCon lit, emptyFVs) +rnUfCon (UfTupleAlt tup_con) bndrs + = rnHsTupCon tup_con `thenRn` \ (HsTupCon con' _, fvs) -> + returnRn (UfDataAlt con', fvs) + -- Makes the type checker a little easier -rnUfCon (UfLitLitCon lit ty) - = rnHsPolyType (text "litlit") ty `thenRn` \ (ty', fvs) -> - returnRn (UfLitLitCon lit ty', fvs) +rnUfCon (UfDataAlt con) _ + = lookupOccRn con `thenRn` \ con' -> + returnRn (UfDataAlt con', unitFV con') -rnUfCon (UfPrimOp op) - = lookupOccRn op `thenRn` \ op' -> - returnRn (UfPrimOp op', emptyFVs) +rnUfCon (UfLitAlt lit) _ + = returnRn (UfLitAlt lit, emptyFVs) -rnUfCon (UfCCallOp str is_dyn casm gc) - = returnRn (UfCCallOp str is_dyn casm gc, emptyFVs) +rnUfCon (UfLitLitAlt lit ty) _ + = rnHsType (text "litlit") ty `thenRn` \ (ty', fvs) -> + returnRn (UfLitLitAlt lit ty', fvs) \end{code} %********************************************************* @@ -890,59 +908,28 @@ classTyVarNotInOpTyErr clas_tyvar sig ptext SLIT("does not appear in method signature")]) 4 (ppr sig) -dupClassAssertWarn ctxt (assertion : dups) - = sep [hsep [ptext SLIT("Duplicate class assertion"), - quotes (pprClassAssertion assertion), - ptext SLIT("in the context:")], - nest 4 (pprContext 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 { + = doptRn Opt_WarnUnusedMatches `thenRn` \ warn_unused -> case () of + () | not warn_unused -> 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 (pprClassAssertion 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 (pprClassAssertion 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 + 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) + ) + } badRuleLhsErr name lhs = sep [ptext SLIT("Rule") <+> ptext name <> colon, @@ -954,4 +941,18 @@ 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")] + +dupClassAssertWarn ctxt (assertion : dups) + = sep [hsep [ptext SLIT("Duplicate class assertion"), + quotes (ppr assertion), + ptext SLIT("in the context:")], + nest 4 (pprHsContext ctxt <+> ptext SLIT("..."))] + +naughtyCCallContextErr (HsPClass clas _) + = sep [ptext SLIT("Can't use class") <+> quotes (ppr clas), + ptext SLIT("in a context")] \end{code}