import HsSyn
import HsPragmas
import HsTypes ( hsTyVarNames, pprHsContext )
-import RdrName ( RdrName, isRdrDataCon, rdrNameOcc, isRdrTyVar, mkRdrNameWkr )
+import RdrName ( RdrName, isRdrDataCon, rdrNameOcc, mkRdrNameWkr )
import RdrHsSyn ( RdrNameContext, RdrNameHsType, RdrNameConDecl,
extractRuleBndrsTyVars, extractHsTyRdrTyVars,
- extractHsTysRdrTyVars, extractHsCtxtRdrTyVars
+ extractHsCtxtRdrTyVars
)
import RnHsSyn
import HsCore
-import RnBinds ( rnTopBinds, rnMethodBinds, renameSigs, unknownSigErr )
-import RnEnv ( bindTyVarsRn, lookupBndrRn, lookupOccRn, getIPName,
- lookupImplicitOccRn, lookupImplicitOccsRn,
- bindLocalsRn, bindLocalRn, bindLocalsFVRn, bindUVarRn,
+import RnBinds ( rnTopBinds, rnMethodBinds, renameSigs )
+import RnEnv ( lookupTopBndrRn, lookupOccRn, newIPName,
+ lookupOrigNames, lookupSysBinder,
+ bindLocalsFVRn, bindUVarRn,
bindTyVarsFVRn, bindTyVarsFV2Rn, extendTyVarEnvFVRn,
- bindCoreLocalFVRn, bindCoreLocalsFVRn,
+ bindCoreLocalFVRn, bindCoreLocalsFVRn, bindLocalNames,
checkDupOrQualNames, checkDupNames,
- mkImportedGlobalName, mkImportedGlobalFromRdrName,
- newDFunName, getDFunKey, newImplicitBinder,
FreeVars, emptyFVs, plusFV, plusFVs, unitFV,
addOneFV, mapFvRn
)
import FunDeps ( oclose )
import Class ( FunDep )
-
-import Name ( Name, OccName,
- ExportFlag(..), Provenance(..),
- nameOccName, NamedThing(..)
- )
+import Name ( Name, OccName, nameOccName, NamedThing(..) )
import NameSet
-import OccName ( mkDefaultMethodOcc )
import FiniteMap ( elemFM )
import PrelInfo ( derivableClassKeys, cCallishClassKeys,
deRefStablePtr_RDR, makeStablePtr_RDR,
import Unique ( Uniquable(..) )
import ErrUtils ( Message )
import CStrings ( isCLabelString )
-import Maybes ( maybeToBool, catMaybes )
import Util
\end{code}
rnDecl (SigD (IfaceSig name ty id_infos loc))
= pushSrcLocRn loc $
- mkImportedGlobalFromRdrName name `thenRn` \ name' ->
+ 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)
\begin{code}
rnDecl (TyClD (TyData new_or_data context tycon tyvars condecls nconstrs derivings pragmas src_loc))
= 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_`
rnDecl (TyClD (TySynonym name tyvars ty src_loc))
= pushSrcLocRn src_loc $
- lookupBndrRn name `thenRn` \ name' ->
+ lookupTopBndrRn name `thenRn` \ name' ->
bindTyVarsFVRn syn_doc tyvars $ \ tyvars' ->
rnHsType syn_doc (unquantify ty) `thenRn` \ (ty', ty_fvs) ->
returnRn (TyClD (TySynonym name' tyvars' ty' src_loc), ty_fvs)
tname dname dwname snames 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)
-- 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' ->
+ lookupSysBinder tname `thenRn` \ tname' ->
+ lookupSysBinder dname `thenRn` \ dname' ->
+ lookupSysBinder dwname `thenRn` \ dwname' ->
+ mapRn lookupSysBinder snames `thenRn` \ snames' ->
-- Tyvars scope over bindings and context
bindTyVarsFV2Rn cls_doc tyvars ( \ clas_tyvar_names tyvars' ->
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 (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.
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 clas_fds sig@(ClassOpSig op dm_rdr_name explicit_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) ->
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)
+ (case maybe_dm_stuff of
+ Nothing -> returnRn (Nothing, emptyFVs) -- Source-file class decl
- InterfaceMode
+ Just (dm_rdr_name, explicit_dm)
-> -- 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)
+ lookupSysBinder dm_rdr_name `thenRn` \ dm_name ->
+ returnRn (Just (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) ->
+ ) `thenRn` \ (maybe_dm_stuff', dm_fvs) ->
- returnRn (ClassOpSig op_name dm_name final_explicit_dm new_ty locn, op_ty_fvs `plusFV` dm_fvs)
+ returnRn (ClassOpSig op_name maybe_dm_stuff' new_ty locn, op_ty_fvs `plusFV` dm_fvs)
\end{code}
%*********************************************************
\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
rnMethodBinds mbinds
) `thenRn` \ (mbinds', meth_fvs) ->
let
- binders = mkNameSet (map fst (bagToList (collectMonoBinders mbinds')))
+ binders = map fst (bagToList (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) ->
+ --
+ -- 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"
lookupOccRn name `thenRn` \ name' ->
let
extra_fvs FoExport
- | isDyn =
- lookupImplicitOccsRn [makeStablePtr_RDR, deRefStablePtr_RDR,
- bindIO_RDR, returnIO_RDR]
- | otherwise =
- lookupImplicitOccsRn [bindIO_RDR, returnIO_RDR] `thenRn` \ fvs ->
+ | 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
rnConDecl :: RdrNameConDecl -> RnMS (RenamedConDecl, FreeVars)
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 ->
rnBangTy doc ty2 `thenRn` \ (new_ty2, fvs2) ->
returnRn (InfixCon new_ty1 new_ty2, fvs1 `plusFV` fvs2)
-rnConDetails doc locn (NewCon ty mb_field)
- = rnHsType 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) ->
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)
\end{code}
\begin{code}
--- 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) ->
returnRn (HsPClass clas_name tys', fvs `addOneFV` clas_name)
rnPred doc (HsPIParam n ty)
- = getIPName n `thenRn` \ name ->
+ = newIPName n `thenRn` \ name ->
rnHsType doc ty `thenRn` \ (ty', fvs) ->
returnRn (HsPIParam name ty', fvs)
\end{code}
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)
(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 (ppr constraint)
- <+> ptext SLIT("are already in scope"),
- nest 4 (ptext SLIT("At least one must be universally quantified here"))
- ]
- $$
- (ptext SLIT("In") <+> doc)
-
badRuleLhsErr name lhs
= sep [ptext SLIT("Rule") <+> ptext name <> colon,
nest 4 (ptext SLIT("Illegal left-hand side:") <+> ppr lhs)]
projects / ghc-hetmet.git / blobdiff