\begin{code}
module RnBinds (
- rnTopBinds, rnTopMonoBinds,
- rnMethodBinds, renameSigs,
- rnBinds,
- unknownSigErr
+ rnTopMonoBinds, rnMonoBinds, rnMethodBinds,
+ renameSigs, renameSigsFVs, unknownSigErr
) where
#include "HsVersions.h"
-import {-# SOURCE #-} RnSource ( rnHsSigType )
import HsSyn
-import HsBinds ( sigsForMe )
+import HsBinds ( eqHsSig, sigName, hsSigDoc )
import RdrHsSyn
import RnHsSyn
-import RnMonad
+import TcRnMonad
+import RnTypes ( rnHsSigType, rnHsType )
import RnExpr ( rnMatch, rnGRHSs, rnPat, checkPrecMatch )
-import RnEnv ( bindLocatedLocalsRn, lookupBndrRn, lookupOccRn, lookupGlobalOccRn,
- isUnboundName, warnUnusedLocalBinds,
- FreeVars, emptyFVs, plusFV, plusFVs, unitFV,
- failUnboundNameErrRn
+import RnEnv ( bindLocatedLocalsRn, lookupBndrRn, lookupInstDeclBndr,
+ lookupSigOccRn, bindPatSigTyVars, bindLocalFixities,
+ warnUnusedLocalBinds, mapFvRn, extendTyVarEnvFVRn,
)
-import CmdLineOpts ( opt_WarnMissingSigs )
+import CmdLineOpts ( DynFlag(..) )
import Digraph ( stronglyConnComp, SCC(..) )
-import Name ( OccName, Name, nameOccName )
+import Name ( Name, nameOccName, nameSrcLoc )
import NameSet
-import RdrName ( RdrName, rdrNameOcc )
-import BasicTypes ( RecFlag(..), TopLevelFlag(..) )
-import Util ( thenCmp, removeDups )
+import RdrName ( RdrName, rdrNameOcc )
+import BasicTypes ( RecFlag(..), FixitySig(..) )
import List ( partition )
-import ListSetOps ( minusList )
-import Bag ( bagToList )
-import FiniteMap ( emptyFM, addListToFM, lookupFM )
-import Maybe ( isJust )
import Outputable
+import PrelNames ( isUnboundName )
\end{code}
-- ToDo: Put the annotations into the monad, so that they arrive in the proper
\begin{code}
type VertexTag = Int
-type Cycle = [VertexTag]
-type Edge = (VertexTag, VertexTag)
\end{code}
%************************************************************************
%************************************************************************
%* *
-%* Top-level bindings
+\subsubsection{ Top-level bindings}
%* *
%************************************************************************
-@rnTopBinds@ assumes that the environment already
+@rnTopMonoBinds@ assumes that the environment already
contains bindings for the binders of this particular binding.
\begin{code}
-rnTopBinds :: RdrNameHsBinds -> RnMS s (RenamedHsBinds, FreeVars)
-
-rnTopBinds EmptyBinds = returnRn (EmptyBinds, emptyFVs)
-rnTopBinds (MonoBind bind sigs _) = rnTopMonoBinds bind sigs
- -- The parser doesn't produce other forms
-
-
-rnTopMonoBinds EmptyMonoBinds sigs
- = returnRn (EmptyBinds, emptyFVs)
-
rnTopMonoBinds mbinds sigs
- = mapRn lookupBndrRn binder_rdr_names `thenRn` \ binder_names ->
+ = mappM lookupBndrRn binder_rdr_names `thenM` \ binder_names ->
+ bindPatSigTyVars (collectSigTysFromMonoBinds mbinds) $
let
- binder_set = mkNameSet binder_names
-
- binder_occ_fm = addListToFM emptyFM (map (\ x -> (nameOccName x,x)) binder_names)
-
- -- the names appearing in the sigs have to be bound by
- -- this group's binders.
- lookup_occ_rn_sig rdr_name =
- case lookupFM binder_occ_fm (rdrNameOcc rdr_name) of
- Nothing -> failUnboundNameErrRn rdr_name
- Just x -> returnRn x
+ bndr_name_set = mkNameSet binder_names
in
- renameSigs opt_WarnMissingSigs binder_set lookup_occ_rn_sig sigs
- `thenRn` \ (siglist, sig_fvs) ->
- rn_mono_binds siglist mbinds `thenRn` \ (final_binds, bind_fvs) ->
- returnRn (final_binds, bind_fvs `plusFV` sig_fvs)
+ renameSigsFVs (okBindSig bndr_name_set) sigs `thenM` \ (siglist, sig_fvs) ->
+
+ ifOptM Opt_WarnMissingSigs (
+ let
+ type_sig_vars = [n | Sig n _ _ <- siglist]
+ un_sigd_binders = nameSetToList (delListFromNameSet bndr_name_set type_sig_vars)
+ in
+ mappM_ missingSigWarn un_sigd_binders
+ ) `thenM_`
+
+ rn_mono_binds siglist mbinds `thenM` \ (final_binds, bind_fvs) ->
+ returnM (final_binds, bind_fvs `plusFV` sig_fvs)
where
- binder_rdr_names = map fst (bagToList (collectMonoBinders mbinds))
+ binder_rdr_names = collectMonoBinders mbinds
\end{code}
%************************************************************************
%* *
%************************************************************************
-@rnMonoBinds@
- - collects up the binders for this declaration group,
- - checks that they form a set
- - extends the environment to bind them to new local names
- - calls @rnMonoBinds@ to do the real work
+\subsubsection{Nested binds}
+@rnMonoBinds@
+\begin{itemize}
+\item collects up the binders for this declaration group,
+\item checks that they form a set
+\item extends the environment to bind them to new local names
+\item calls @rnMonoBinds@ to do the real work
+\end{itemize}
+%
\begin{code}
-rnBinds :: RdrNameHsBinds
- -> (RenamedHsBinds -> RnMS s (result, FreeVars))
- -> RnMS s (result, FreeVars)
-
-rnBinds EmptyBinds thing_inside = thing_inside EmptyBinds
-rnBinds (MonoBind bind sigs _) thing_inside = rnMonoBinds bind sigs thing_inside
- -- the parser doesn't produce other forms
-
-
rnMonoBinds :: RdrNameMonoBinds
-> [RdrNameSig]
- -> (RenamedHsBinds -> RnMS s (result, FreeVars))
- -> RnMS s (result, FreeVars)
-
-rnMonoBinds EmptyMonoBinds sigs thing_inside = thing_inside EmptyBinds
+ -> (RenamedHsBinds -> RnM (result, FreeVars))
+ -> RnM (result, FreeVars)
rnMonoBinds mbinds sigs thing_inside -- Non-empty monobinds
= -- Extract all the binders in this group,
-- and extend current scope, inventing new names for the new binders
-- This also checks that the names form a set
- bindLocatedLocalsRn (text "a binding group") mbinders_w_srclocs $ \ new_mbinders ->
+ bindLocatedLocalsRn doc mbinders_w_srclocs $ \ new_mbinders ->
+ bindPatSigTyVars (collectSigTysFromMonoBinds mbinds) $
let
- binder_set = mkNameSet new_mbinders
-
- -- Weed out the fixity declarations that do not
- -- apply to any of the binders in this group.
- (sigs_for_me, fixes_not_for_me) = partition forLocalBind sigs
-
- forLocalBind (FixSig sig@(FixitySig name _ _ )) =
- isJust (lookupFM binder_occ_fm (rdrNameOcc name))
- forLocalBind _ = True
+ binder_set = mkNameSet new_mbinders
+ in
+ -- Rename the signatures
+ renameSigsFVs (okBindSig binder_set) sigs `thenM` \ (siglist, sig_fvs) ->
- binder_occ_fm = addListToFM emptyFM (map (\ x -> (nameOccName x,x)) new_mbinders)
+ -- Report the fixity declarations in this group that
+ -- don't refer to any of the group's binders.
+ -- Then install the fixity declarations that do apply here
+ -- Notice that they scope over thing_inside too
+ bindLocalFixities [sig | FixSig sig <- siglist ] $
- -- the names appearing in the sigs have to be bound by
- -- this group's binders.
- lookup_occ_rn_sig rdr_name =
- case lookupFM binder_occ_fm (rdrNameOcc rdr_name) of
- Nothing -> failUnboundNameErrRn rdr_name
- Just x -> returnRn x
- in
- --
- -- Report the fixity declarations in this group that
- -- don't refer to any of the group's binders.
- --
- mapRn_ (unknownSigErr) fixes_not_for_me `thenRn_`
- renameSigs False binder_set lookup_occ_rn_sig sigs_for_me
- `thenRn` \ (siglist, sig_fvs) ->
- let
- fixity_sigs = [(name,sig) | FixSig sig@(FixitySig name _ _) <- siglist ]
- in
- -- Install the fixity declarations that do apply here and go.
- extendFixityEnv fixity_sigs (
- rn_mono_binds siglist mbinds ) `thenRn` \ (binds, bind_fvs) ->
+ rn_mono_binds siglist mbinds `thenM` \ (binds, bind_fvs) ->
- -- Now do the "thing inside", and deal with the free-variable calculations
- thing_inside binds `thenRn` \ (result,result_fvs) ->
+ -- Now do the "thing inside", and deal with the free-variable calculations
+ thing_inside binds `thenM` \ (result,result_fvs) ->
let
all_fvs = result_fvs `plusFV` bind_fvs `plusFV` sig_fvs
unused_binders = nameSetToList (binder_set `minusNameSet` all_fvs)
in
- warnUnusedLocalBinds unused_binders `thenRn_`
- returnRn (result, delListFromNameSet all_fvs new_mbinders)
+ warnUnusedLocalBinds unused_binders `thenM_`
+ returnM (result, delListFromNameSet all_fvs new_mbinders)
where
- mbinders_w_srclocs = bagToList (collectMonoBinders mbinds)
+ mbinders_w_srclocs = collectLocatedMonoBinders mbinds
+ doc = text "In the binding group for" <+> pp_bndrs mbinders_w_srclocs
+ pp_bndrs [(b,_)] = quotes (ppr b)
+ pp_bndrs bs = fsep (punctuate comma [ppr b | (b,_) <- bs])
\end{code}
%************************************************************************
%* *
-%* MonoBinds -- the main work is done here
+\subsubsection{ MonoBinds -- the main work is done here}
%* *
%************************************************************************
-@rn_mono_binds@ is used by *both* top-level and nested bindings. It
-assumes that all variables bound in this group are already in scope.
-This is done *either* by pass 3 (for the top-level bindings), *or* by
-@rnMonoBinds@ (for the nested ones).
+@rn_mono_binds@ is used by {\em both} top-level and nested bindings.
+It assumes that all variables bound in this group are already in scope.
+This is done {\em either} by pass 3 (for the top-level bindings),
+{\em or} by @rnMonoBinds@ (for the nested ones).
\begin{code}
rn_mono_binds :: [RenamedSig] -- Signatures attached to this group
-> RdrNameMonoBinds
- -> RnMS s (RenamedHsBinds, --
- FreeVars) -- Free variables
+ -> RnM (RenamedHsBinds, -- Dependency analysed
+ FreeVars) -- Free variables
rn_mono_binds siglist mbinds
=
-- Rename the bindings, returning a MonoBindsInfo
-- which is a list of indivisible vertices so far as
-- the strongly-connected-components (SCC) analysis is concerned
- flattenMonoBinds siglist mbinds `thenRn` \ mbinds_info ->
+ flattenMonoBinds siglist mbinds `thenM` \ mbinds_info ->
-- Do the SCC analysis
let
edges = mkEdges (mbinds_info `zip` [(0::Int)..])
scc_result = stronglyConnComp edges
- final_binds = foldr1 ThenBinds (map reconstructCycle scc_result)
+ final_binds = foldr (ThenBinds . reconstructCycle) EmptyBinds scc_result
-- Deal with bound and free-var calculation
rhs_fvs = plusFVs [fvs | (_,fvs,_,_) <- mbinds_info]
in
- returnRn (final_binds, rhs_fvs)
+ returnM (final_binds, rhs_fvs)
\end{code}
@flattenMonoBinds@ is ever-so-slightly magical in that it sticks
unique ``vertex tags'' on its output; minor plumbing required.
-Sigh - need to pass along the signatures for the group of bindings,
-in case any of them
+Sigh --- need to pass along the signatures for the group of bindings,
+in case any of them \fbox{\ ???\ }
\begin{code}
flattenMonoBinds :: [RenamedSig] -- Signatures
-> RdrNameMonoBinds
- -> RnMS s [FlatMonoBindsInfo]
+ -> RnM [FlatMonoBindsInfo]
-flattenMonoBinds sigs EmptyMonoBinds = returnRn []
+flattenMonoBinds sigs EmptyMonoBinds = returnM []
flattenMonoBinds sigs (AndMonoBinds bs1 bs2)
- = flattenMonoBinds sigs bs1 `thenRn` \ flat1 ->
- flattenMonoBinds sigs bs2 `thenRn` \ flat2 ->
- returnRn (flat1 ++ flat2)
+ = flattenMonoBinds sigs bs1 `thenM` \ flat1 ->
+ flattenMonoBinds sigs bs2 `thenM` \ flat2 ->
+ returnM (flat1 ++ flat2)
flattenMonoBinds sigs (PatMonoBind pat grhss locn)
- = pushSrcLocRn locn $
- rnPat pat `thenRn` \ (pat', pat_fvs) ->
+ = addSrcLoc locn $
+ rnPat pat `thenM` \ (pat', pat_fvs) ->
-- Find which things are bound in this group
let
names_bound_here = mkNameSet (collectPatBinders pat')
- sigs_for_me = sigsForMe (`elemNameSet` names_bound_here) sigs
- sigs_fvs = foldr sig_fv emptyFVs sigs_for_me
in
- rnGRHSs grhss `thenRn` \ (grhss', fvs) ->
- returnRn
+ sigsForMe names_bound_here sigs `thenM` \ sigs_for_me ->
+ rnGRHSs grhss `thenM` \ (grhss', fvs) ->
+ returnM
[(names_bound_here,
- fvs `plusFV` sigs_fvs `plusFV` pat_fvs,
+ fvs `plusFV` pat_fvs,
PatMonoBind pat' grhss' locn,
sigs_for_me
)]
flattenMonoBinds sigs (FunMonoBind name inf matches locn)
- = pushSrcLocRn locn $
- lookupBndrRn name `thenRn` \ new_name ->
+ = addSrcLoc locn $
+ lookupBndrRn name `thenM` \ new_name ->
let
- sigs_for_me = sigsForMe (new_name ==) sigs
- sigs_fvs = foldr sig_fv emptyFVs sigs_for_me
+ names_bound_here = unitNameSet new_name
in
- mapAndUnzipRn rnMatch matches `thenRn` \ (new_matches, fv_lists) ->
- mapRn_ (checkPrecMatch inf new_name) new_matches `thenRn_`
- returnRn
+ sigsForMe names_bound_here sigs `thenM` \ sigs_for_me ->
+ mapFvRn (rnMatch (FunRhs name)) matches `thenM` \ (new_matches, fvs) ->
+ mappM_ (checkPrecMatch inf new_name) new_matches `thenM_`
+ returnM
[(unitNameSet new_name,
- plusFVs fv_lists `plusFV` sigs_fvs,
+ fvs,
FunMonoBind new_name inf new_matches locn,
sigs_for_me
)]
+
+
+sigsForMe names_bound_here sigs
+ = foldlM check [] (filter (sigForThisGroup names_bound_here) sigs)
+ where
+ check sigs sig = case filter (eqHsSig sig) sigs of
+ [] -> returnM (sig:sigs)
+ other -> dupSigDeclErr sig `thenM_`
+ returnM sigs
\end{code}
@rnMethodBinds@ is used for the method bindings of a class and an instance
-declaration. like @rnMonoBinds@ but without dependency analysis.
+declaration. Like @rnMonoBinds@ but without dependency analysis.
+
+NOTA BENE: we record each {\em binder} of a method-bind group as a free variable.
+That's crucial when dealing with an instance decl:
+\begin{verbatim}
+ instance Foo (T a) where
+ op x = ...
+\end{verbatim}
+This might be the {\em sole} occurrence of @op@ for an imported class @Foo@,
+and unless @op@ occurs we won't treat the type signature of @op@ in the class
+decl for @Foo@ as a source of instance-decl gates. But we should! Indeed,
+in many ways the @op@ in an instance decl is just like an occurrence, not
+a binder.
\begin{code}
-rnMethodBinds :: RdrNameMonoBinds -> RnMS s (RenamedMonoBinds, FreeVars)
+rnMethodBinds :: Name -- Class name
+ -> [Name] -- Names for generic type variables
+ -> RdrNameMonoBinds
+ -> RnM (RenamedMonoBinds, FreeVars)
-rnMethodBinds EmptyMonoBinds = returnRn (EmptyMonoBinds, emptyFVs)
+rnMethodBinds cls gen_tyvars EmptyMonoBinds = returnM (EmptyMonoBinds, emptyFVs)
-rnMethodBinds (AndMonoBinds mb1 mb2)
- = rnMethodBinds mb1 `thenRn` \ (mb1', fvs1) ->
- rnMethodBinds mb2 `thenRn` \ (mb2', fvs2) ->
- returnRn (mb1' `AndMonoBinds` mb2', fvs1 `plusFV` fvs2)
+rnMethodBinds cls gen_tyvars (AndMonoBinds mb1 mb2)
+ = rnMethodBinds cls gen_tyvars mb1 `thenM` \ (mb1', fvs1) ->
+ rnMethodBinds cls gen_tyvars mb2 `thenM` \ (mb2', fvs2) ->
+ returnM (mb1' `AndMonoBinds` mb2', fvs1 `plusFV` fvs2)
-rnMethodBinds (FunMonoBind name inf matches locn)
- = pushSrcLocRn locn $
+rnMethodBinds cls gen_tyvars (FunMonoBind name inf matches locn)
+ = addSrcLoc locn $
- lookupGlobalOccRn name `thenRn` \ sel_name ->
+ lookupInstDeclBndr cls name `thenM` \ sel_name ->
-- We use the selector name as the binder
- mapAndUnzipRn rnMatch matches `thenRn` \ (new_matches, fvs_s) ->
- mapRn_ (checkPrecMatch inf sel_name) new_matches `thenRn_`
- returnRn (FunMonoBind sel_name inf new_matches locn, plusFVs fvs_s)
+ mapFvRn rn_match matches `thenM` \ (new_matches, fvs) ->
+ mappM_ (checkPrecMatch inf sel_name) new_matches `thenM_`
+ returnM (FunMonoBind sel_name inf new_matches locn, fvs `addOneFV` sel_name)
+ where
+ -- Gruesome; bring into scope the correct members of the generic type variables
+ -- See comments in RnSource.rnSourceDecl(ClassDecl)
+ rn_match match@(Match (TypePat ty : _) _ _)
+ = extendTyVarEnvFVRn gen_tvs (rnMatch (FunRhs name) match)
+ where
+ tvs = map rdrNameOcc (extractHsTyRdrNames ty)
+ gen_tvs = [tv | tv <- gen_tyvars, nameOccName tv `elem` tvs]
-rnMethodBinds (PatMonoBind (VarPatIn name) grhss locn)
- = pushSrcLocRn locn $
- lookupGlobalOccRn name `thenRn` \ sel_name ->
- rnGRHSs grhss `thenRn` \ (grhss', fvs) ->
- returnRn (PatMonoBind (VarPatIn sel_name) grhss' locn, fvs)
+ rn_match match = rnMatch (FunRhs name) match
+
-- Can't handle method pattern-bindings which bind multiple methods.
-rnMethodBinds mbind@(PatMonoBind other_pat _ locn)
- = pushSrcLocRn locn $
- failWithRn (EmptyMonoBinds, emptyFVs) (methodBindErr mbind)
+rnMethodBinds cls gen_tyvars mbind@(PatMonoBind other_pat _ locn)
+ = addSrcLoc locn (addErr (methodBindErr mbind)) `thenM_`
+ returnM (EmptyMonoBinds, emptyFVs)
\end{code}
-\begin{code}
--- If a SPECIALIZE pragma is of the "... = blah" form,
--- then we'd better make sure "blah" is taken into
--- acct in the dependency analysis (or we get an
--- unexpected out-of-scope error)! WDP 95/07
-
--- This is only necessary for the dependency analysis. The free vars
--- of the types in the signatures is gotten from renameSigs
-
-sig_fv (SpecSig _ _ (Just blah) _) acc = acc `plusFV` unitFV blah
-sig_fv _ acc = acc
-\end{code}
%************************************************************************
%* *
%************************************************************************
%* *
-%* Manipulating FlatMonoBindInfo *
+\subsubsection{ Manipulating FlatMonoBindInfo}
%* *
%************************************************************************
%* *
%************************************************************************
-@renameSigs@ checks for: (a)~more than one sig for one thing;
-(b)~signatures given for things not bound here; (c)~with suitably
-flaggery, that all top-level things have type signatures.
-
+@renameSigs@ checks for:
+\begin{enumerate}
+\item more than one sig for one thing;
+\item signatures given for things not bound here;
+\item with suitably flaggery, that all top-level things have type signatures.
+\end{enumerate}
+%
At the moment we don't gather free-var info from the types in
signatures. We'd only need this if we wanted to report unused tyvars.
\begin{code}
-renameSigs :: Bool -- True => warn if (required) type signatures are missing.
- -> NameSet -- Set of names bound in this group
- -> (RdrName -> RnMS s Name)
+renameSigsFVs ok_sig sigs
+ = renameSigs ok_sig sigs `thenM` \ sigs' ->
+ returnM (sigs', hsSigsFVs sigs')
+
+renameSigs :: (RenamedSig -> Bool) -- OK-sig predicate
-> [RdrNameSig]
- -> RnMS s ([RenamedSig], FreeVars) -- List of Sig constructors
+ -> RnM [RenamedSig]
+
+renameSigs ok_sig [] = returnM []
-renameSigs sigs_required binders lookup_occ_nm sigs
+renameSigs ok_sig sigs
= -- Rename the signatures
- mapAndUnzipRn (renameSig lookup_occ_nm) sigs `thenRn` \ (sigs', fvs_s) ->
+ mappM renameSig sigs `thenM` \ sigs' ->
-- Check for (a) duplicate signatures
-- (b) signatures for things not in this group
- -- (c) optionally, bindings with no signature
let
- (goodies, dups) = removeDups cmp_sig (sigsForMe (not . isUnboundName) sigs')
- not_this_group = sigsForMe (not . (`elemNameSet` binders)) goodies
- type_sig_vars = [n | Sig n _ _ <- goodies]
- un_sigd_binders | sigs_required = nameSetToList binders `minusList` type_sig_vars
- | otherwise = []
+ in_scope = filter is_in_scope sigs'
+ is_in_scope sig = case sigName sig of
+ Just n -> not (isUnboundName n)
+ Nothing -> True
+ (goods, bads) = partition ok_sig in_scope
in
- mapRn_ dupSigDeclErr dups `thenRn_`
- mapRn_ unknownSigErr not_this_group `thenRn_`
- mapRn_ (addWarnRn.missingSigWarn) un_sigd_binders `thenRn_`
- returnRn (sigs', plusFVs fvs_s)
- -- bad ones and all:
- -- we need bindings of *some* sort for every name
-
--- We use lookupOccRn in the signatures, which is a little bit unsatisfactory
+ mappM_ unknownSigErr bads `thenM_`
+ returnM goods
+
+-- We use lookupSigOccRn in the signatures, which is a little bit unsatisfactory
-- because this won't work for:
-- instance Foo T where
-- {-# INLINE op #-}
-- is in scope. (I'm assuming that Baz.op isn't in scope unqualified.)
-- Doesn't seem worth much trouble to sort this.
-renameSig lookup_occ_nm (Sig v ty src_loc)
- = pushSrcLocRn src_loc $
- lookup_occ_nm v `thenRn` \ new_v ->
- rnHsSigType (quotes (ppr v)) ty `thenRn` \ (new_ty,fvs) ->
- returnRn (Sig new_v new_ty src_loc, fvs)
-
-renameSig _ (SpecInstSig ty src_loc)
- = pushSrcLocRn src_loc $
- rnHsSigType (text "A SPECIALISE instance pragma") ty `thenRn` \ (new_ty, fvs) ->
- returnRn (SpecInstSig new_ty src_loc, fvs)
-
-renameSig lookup_occ_nm (SpecSig v ty using src_loc)
- = pushSrcLocRn src_loc $
- lookup_occ_nm v `thenRn` \ new_v ->
- rnHsSigType (quotes (ppr v)) ty `thenRn` \ (new_ty,fvs1) ->
- rn_using using `thenRn` \ (new_using,fvs2) ->
- returnRn (SpecSig new_v new_ty new_using src_loc, fvs1 `plusFV` fvs2)
- where
- rn_using Nothing = returnRn (Nothing, emptyFVs)
- rn_using (Just x) = lookupOccRn x `thenRn` \ new_x ->
- returnRn (Just new_x, unitFV new_x)
-
-renameSig lookup_occ_nm (InlineSig v src_loc)
- = pushSrcLocRn src_loc $
- lookup_occ_nm v `thenRn` \ new_v ->
- returnRn (InlineSig new_v src_loc, emptyFVs)
-
-renameSig lookup_occ_nm (FixSig (FixitySig v fix src_loc))
- = pushSrcLocRn src_loc $
- lookup_occ_nm v `thenRn` \ new_v ->
- returnRn (FixSig (FixitySig new_v fix src_loc), emptyFVs)
-
-renameSig lookup_occ_nm (NoInlineSig v src_loc)
- = pushSrcLocRn src_loc $
- lookup_occ_nm v `thenRn` \ new_v ->
- returnRn (NoInlineSig new_v src_loc, emptyFVs)
+renameSig :: Sig RdrName -> RnM (Sig Name)
+-- ClassOpSig is renamed elsewhere.
+renameSig (Sig v ty src_loc)
+ = addSrcLoc src_loc $
+ lookupSigOccRn v `thenM` \ new_v ->
+ rnHsSigType (quotes (ppr v)) ty `thenM` \ new_ty ->
+ returnM (Sig new_v new_ty src_loc)
+
+renameSig (SpecInstSig ty src_loc)
+ = addSrcLoc src_loc $
+ rnHsType (text "A SPECIALISE instance pragma") ty `thenM` \ new_ty ->
+ returnM (SpecInstSig new_ty src_loc)
+
+renameSig (SpecSig v ty src_loc)
+ = addSrcLoc src_loc $
+ lookupSigOccRn v `thenM` \ new_v ->
+ rnHsSigType (quotes (ppr v)) ty `thenM` \ new_ty ->
+ returnM (SpecSig new_v new_ty src_loc)
+
+renameSig (FixSig (FixitySig v fix src_loc))
+ = addSrcLoc src_loc $
+ lookupSigOccRn v `thenM` \ new_v ->
+ returnM (FixSig (FixitySig new_v fix src_loc))
+
+renameSig (InlineSig b v p src_loc)
+ = addSrcLoc src_loc $
+ lookupSigOccRn v `thenM` \ new_v ->
+ returnM (InlineSig b new_v p src_loc)
\end{code}
-Checking for distinct signatures; oh, so boring
-
-\begin{code}
-cmp_sig :: RenamedSig -> RenamedSig -> Ordering
-cmp_sig (Sig n1 _ _) (Sig n2 _ _) = n1 `compare` n2
-cmp_sig (InlineSig n1 _) (InlineSig n2 _) = n1 `compare` n2
-cmp_sig (NoInlineSig n1 _) (NoInlineSig n2 _) = n1 `compare` n2
-cmp_sig (SpecInstSig ty1 _) (SpecInstSig ty2 _) = cmpHsType compare ty1 ty2
-cmp_sig (SpecSig n1 ty1 _ _) (SpecSig n2 ty2 _ _)
- = -- may have many specialisations for one value;
- -- but not ones that are exactly the same...
- thenCmp (n1 `compare` n2) (cmpHsType compare ty1 ty2)
-
-cmp_sig other_1 other_2 -- Tags *must* be different
- | (sig_tag other_1) _LT_ (sig_tag other_2) = LT
- | otherwise = GT
-
-sig_tag (Sig n1 _ _) = (ILIT(1) :: FAST_INT)
-sig_tag (SpecSig n1 _ _ _) = ILIT(2)
-sig_tag (InlineSig n1 _) = ILIT(3)
-sig_tag (NoInlineSig n1 _) = ILIT(4)
-sig_tag (SpecInstSig _ _) = ILIT(5)
-sig_tag (FixSig _) = ILIT(6)
-sig_tag _ = panic# "tag(RnBinds)"
-\end{code}
%************************************************************************
%* *
%************************************************************************
\begin{code}
-dupSigDeclErr (sig:sigs)
- = pushSrcLocRn loc $
- addErrRn (sep [ptext SLIT("Duplicate"),
- ptext what_it_is <> colon,
+dupSigDeclErr sig
+ = addSrcLoc loc $
+ addErr (sep [ptext SLIT("Duplicate") <+> what_it_is <> colon,
ppr sig])
where
- (what_it_is, loc) = sig_doc sig
+ (what_it_is, loc) = hsSigDoc sig
unknownSigErr sig
- = pushSrcLocRn loc $
- addErrRn (sep [ptext SLIT("Misplaced"),
- ptext what_it_is <> colon,
+ = addSrcLoc loc $
+ addErr (sep [ptext SLIT("Misplaced") <+> what_it_is <> colon,
ppr sig])
where
- (what_it_is, loc) = sig_doc sig
-
-sig_doc (Sig _ _ loc) = (SLIT("type signature"),loc)
-sig_doc (ClassOpSig _ _ _ loc) = (SLIT("class-method type signature"), loc)
-sig_doc (SpecSig _ _ _ loc) = (SLIT("SPECIALISE pragma"),loc)
-sig_doc (InlineSig _ loc) = (SLIT("INLINE pragma"),loc)
-sig_doc (NoInlineSig _ loc) = (SLIT("NOINLINE pragma"),loc)
-sig_doc (SpecInstSig _ loc) = (SLIT("SPECIALISE instance pragma"),loc)
-sig_doc (FixSig (FixitySig _ _ loc)) = (SLIT("fixity declaration"), loc)
+ (what_it_is, loc) = hsSigDoc sig
missingSigWarn var
- = sep [ptext SLIT("definition but no type signature for"), quotes (ppr var)]
+ = addSrcLoc (nameSrcLoc var) $
+ addWarn (sep [ptext SLIT("Definition but no type signature for"), quotes (ppr var)])
methodBindErr mbind
= hang (ptext SLIT("Can't handle multiple methods defined by one pattern binding"))
projects / ghc-hetmet.git / blobdiff