\begin{code}
module RnBinds (
- rnTopBinds, rnTopMonoBinds,
- rnMethodBinds, renameSigs,
- rnBinds,
- unknownSigErr
+ rnTopMonoBinds, rnMonoBinds, rnMonoBindsAndThen,
+ rnMethodBinds, renameSigs, checkSigs, unknownSigErr
) where
#include "HsVersions.h"
-import {-# SOURCE #-} RnSource ( rnHsSigType )
import HsSyn
-import HsBinds ( sigsForMe )
+import HsBinds ( eqHsSig, hsSigDoc )
import RdrHsSyn
import RnHsSyn
-import RnMonad
-import RnExpr ( rnMatch, rnGRHSs, rnPat, checkPrecMatch )
-import RnEnv ( bindLocatedLocalsRn, lookupBndrRn, lookupGlobalOccRn,
- warnUnusedLocalBinds, mapFvRn,
- FreeVars, emptyFVs, plusFV, plusFVs, unitFV, addOneFV,
- unknownNameErr
+import TcRnMonad
+import RnTypes ( rnHsSigType, rnHsType, rnPat )
+import RnExpr ( rnMatch, rnGRHSs, checkPrecMatch )
+import RnEnv ( bindLocatedLocalsRn, lookupBndrRn, lookupInstDeclBndr,
+ lookupSigOccRn, bindPatSigTyVars, bindPatSigTyVarsFV,
+ bindLocalFixities,
+ warnUnusedLocalBinds, mapFvRn, extendTyVarEnvFVRn,
)
-import CmdLineOpts ( opt_WarnMissingSigs )
-import Digraph ( stronglyConnComp, SCC(..) )
-import Name ( OccName, Name, nameOccName )
+import CmdLineOpts ( DynFlag(..) )
+import Digraph ( SCC(..), stronglyConnComp )
+import Name ( Name, nameOccName, nameSrcLoc )
import NameSet
-import RdrName ( RdrName, rdrNameOcc )
-import BasicTypes ( RecFlag(..), TopLevelFlag(..) )
-import Util ( thenCmp, removeDups )
-import List ( partition )
-import ListSetOps ( minusList )
-import Bag ( bagToList )
-import FiniteMap ( lookupFM, listToFM )
-import Maybe ( isJust )
+import RdrName ( RdrName, rdrNameOcc )
+import BasicTypes ( RecFlag(..), TopLevelFlag(..), isTopLevel )
+import List ( unzip4 )
import Outputable
\end{code}
within one @MonoBinds@, so that unique-Int plumbing is done explicitly
(heavy monad machinery not needed).
-\begin{code}
-type VertexTag = Int
-type Cycle = [VertexTag]
-type Edge = (VertexTag, VertexTag)
-\end{code}
%************************************************************************
%* *
\Haskell{} programs, and this code should not be executed.
Monomorphic bindings contain information that is returned in a tuple
-(a @FlatMonoBindsInfo@) containing:
+(a @FlatMonoBinds@) containing:
\begin{enumerate}
\item
%* *
%************************************************************************
-@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 (RenamedHsBinds, FreeVars)
-
-rnTopBinds EmptyBinds = returnRn (EmptyBinds, emptyFVs)
-rnTopBinds (MonoBind bind sigs _) = rnTopMonoBinds bind sigs
- -- The parser doesn't produce other forms
-
+rnTopMonoBinds :: RdrNameMonoBinds
+ -> [RdrNameSig]
+ -> RnM (RenamedHsBinds, DefUses)
-rnTopMonoBinds EmptyMonoBinds sigs
- = returnRn (EmptyBinds, emptyFVs)
+-- The binders of the binding are in scope already;
+-- the top level scope resoluttion does that
rnTopMonoBinds mbinds sigs
- = mapRn lookupBndrRn binder_rdr_names `thenRn` \ binder_names ->
- let
- binder_set = mkNameSet binder_names
- binder_occ_fm = listToFM [(nameOccName x,x) | x <- binder_names]
- in
- renameSigs opt_WarnMissingSigs binder_set
- (lookupSigOccRn binder_occ_fm) sigs `thenRn` \ (siglist, sig_fvs) ->
- rn_mono_binds siglist mbinds `thenRn` \ (final_binds, bind_fvs) ->
- returnRn (final_binds, bind_fvs `plusFV` sig_fvs)
- where
- binder_rdr_names = map fst (bagToList (collectMonoBinders mbinds))
-
--- the names appearing in the sigs have to be bound by
--- this group's binders.
-lookupSigOccRn binder_occ_fm rdr_name
- = case lookupFM binder_occ_fm (rdrNameOcc rdr_name) of
- Nothing -> failWithRn (mkUnboundName rdr_name)
- (unknownNameErr rdr_name)
- Just x -> returnRn x
+ = bindPatSigTyVars (collectSigTysFromMonoBinds mbinds) $ \ _ ->
+ -- Hmm; by analogy with Ids, this doesn't look right
+ -- Top-level bound type vars should really scope over
+ -- everything, but we only scope them over the other bindings
+
+ rnMonoBinds TopLevel mbinds sigs
\end{code}
+
%************************************************************************
%* *
%* Nested binds
%* *
%************************************************************************
-\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 (result, FreeVars))
- -> RnMS (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 (result, FreeVars))
- -> RnMS (result, FreeVars)
-
-rnMonoBinds EmptyMonoBinds sigs thing_inside = thing_inside EmptyBinds
-
-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
+rnMonoBindsAndThen :: RdrNameMonoBinds
+ -> [RdrNameSig]
+ -> (RenamedHsBinds -> RnM (result, FreeVars))
+ -> RnM (result, FreeVars)
+
+rnMonoBindsAndThen mbinds sigs thing_inside -- Non-empty monobinds
+ = -- Extract all the binders in this group, and extend the
+ -- 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 ->
- let
- binder_set = mkNameSet new_mbinders
+ bindLocatedLocalsRn doc mbinders_w_srclocs $ \ _ ->
+ bindPatSigTyVarsFV (collectSigTysFromMonoBinds mbinds) $
- -- 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
+ -- Then install local fixity declarations
+ -- Notice that they scope over thing_inside too
+ bindLocalFixities [sig | FixSig sig <- sigs ] $
- forLocalBind (FixSig sig@(FixitySig name _ _ )) =
- isJust (lookupFM binder_occ_fm (rdrNameOcc name))
- forLocalBind _ = True
+ -- Do the business
+ rnMonoBinds NotTopLevel mbinds sigs `thenM` \ (binds, bind_dus) ->
- binder_occ_fm = listToFM [(nameOccName x,x) | x <- new_mbinders]
+ -- Now do the "thing inside"
+ thing_inside binds `thenM` \ (result,result_fvs) ->
- 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
- (lookupSigOccRn binder_occ_fm) sigs_for_me `thenRn` \ (siglist, sig_fvs) ->
+ -- Final error checking
let
- fixity_sigs = [(name,sig) | FixSig sig@(FixitySig name _ _) <- siglist ]
+ bndrs = duDefs bind_dus
+ all_uses = findUses bind_dus result_fvs
+ unused_bndrs = nameSetToList (bndrs `minusNameSet` all_uses)
in
- -- Install the fixity declarations that do apply here and go.
- extendFixityEnv fixity_sigs (
- rn_mono_binds siglist mbinds
- ) `thenRn` \ (binds, bind_fvs) ->
+ warnUnusedLocalBinds unused_bndrs `thenM_`
- -- Now do the "thing inside", and deal with the free-variable calculations
- thing_inside binds `thenRn` \ (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)
+ returnM (result, all_uses `minusNameSet` bndrs)
where
- mbinders_w_srclocs = bagToList (collectMonoBinders mbinds)
+ mbinders_w_srclocs = collectLocatedMonoBinders mbinds
+ doc = text "In the binding group for:"
+ <+> pprWithCommas ppr (map fst mbinders_w_srclocs)
\end{code}
%* *
%************************************************************************
-@rn_mono_binds@ is used by {\em both} top-level and nested bindings.
+@rnMonoBinds@ 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 (RenamedHsBinds, --
- FreeVars) -- Free variables
-
-rn_mono_binds siglist mbinds
- =
- -- Rename the bindings, returning a MonoBindsInfo
+rnMonoBinds :: TopLevelFlag
+ -> RdrNameMonoBinds
+ -> [RdrNameSig]
+ -> RnM (RenamedHsBinds, DefUses)
+
+-- Assumes the binders of the binding are in scope already
+
+rnMonoBinds top_lvl mbinds sigs
+ = renameSigs sigs `thenM` \ siglist ->
+
+ -- 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)
-
- -- Deal with bound and free-var calculation
- rhs_fvs = plusFVs [fvs | (_,fvs,_,_) <- mbinds_info]
+ scc_result = rnSCC mbinds_info
+ (binds_s, bind_dus_s) = unzip (map reconstructCycle scc_result)
+ bind_dus = mkDUs bind_dus_s
+ final_binds = foldr ThenBinds EmptyBinds binds_s
+ binders = duDefs bind_dus
in
- returnRn (final_binds, rhs_fvs)
+
+ -- Check for duplicate or mis-placed signatures
+ checkSigs (okBindSig binders) siglist `thenM_`
+
+ -- Warn about missing signatures,
+ -- but only at top level, and not in interface mode
+ -- (The latter is important when renaming bindings from 'deriving' clauses.)
+ getModeRn `thenM` \ mode ->
+ doptM Opt_WarnMissingSigs `thenM` \ warn_missing_sigs ->
+ (if isTopLevel top_lvl &&
+ warn_missing_sigs &&
+ not (isInterfaceMode mode)
+ then let
+ type_sig_vars = [n | Sig n _ _ <- siglist]
+ un_sigd_binders = filter (not . (`elem` type_sig_vars))
+ (nameSetToList binders)
+ in
+ mappM_ missingSigWarn un_sigd_binders
+ else
+ returnM ()
+ ) `thenM_`
+
+ returnM (final_binds, bind_dus `plusDU` usesOnly (hsSigsFVs siglist))
\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 \fbox{\ ???\ }
-
\begin{code}
flattenMonoBinds :: [RenamedSig] -- Signatures
-> RdrNameMonoBinds
- -> RnMS [FlatMonoBindsInfo]
+ -> RnM [FlatMonoBinds]
-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
in
- rnGRHSs grhss `thenRn` \ (grhss', fvs) ->
- returnRn
- [(names_bound_here,
- fvs `plusFV` pat_fvs,
- PatMonoBind pat' grhss' locn,
- sigs_for_me
- )]
+ sigsForMe names_bound_here sigs `thenM` \ sigs_for_me ->
+ rnGRHSs PatBindRhs grhss `thenM` \ (grhss', fvs) ->
+ returnM
+ [(names_bound_here, 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
+ names_bound_here = unitNameSet new_name
in
- mapFvRn rnMatch matches `thenRn` \ (new_matches, fvs) ->
- mapRn_ (checkPrecMatch inf new_name) new_matches `thenRn_`
- returnRn
- [(unitNameSet new_name,
- fvs,
- FunMonoBind new_name inf new_matches locn,
- sigs_for_me
- )]
+ sigsForMe names_bound_here sigs `thenM` \ sigs_for_me ->
+ mapFvRn (rnMatch (FunRhs new_name)) matches `thenM` \ (new_matches, fvs) ->
+ mappM_ (checkPrecMatch inf new_name) new_matches `thenM_`
+ returnM
+ [(unitNameSet new_name, 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}
a binder.
\begin{code}
-rnMethodBinds :: RdrNameMonoBinds -> RnMS (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
- mapFvRn rnMatch matches `thenRn` \ (new_matches, fvs) ->
- mapRn_ (checkPrecMatch inf sel_name) new_matches `thenRn_`
- returnRn (FunMonoBind sel_name inf new_matches locn, fvs `addOneFV` sel_name)
-
-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 `addOneFV` sel_name)
+ mapFvRn (rn_match sel_name) 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 sel_name match@(Match (TypePat ty : _) _ _)
+ = extendTyVarEnvFVRn gen_tvs $
+ rnMatch (FunRhs sel_name) match
+ where
+ tvs = map rdrNameOcc (extractHsTyRdrNames ty)
+ gen_tvs = [tv | tv <- gen_tyvars, nameOccName tv `elem` tvs]
+
+ rn_match sel_name match = rnMatch (FunRhs sel_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}
%************************************************************************
%* *
-\subsection[reconstruct-deps]{Reconstructing dependencies}
-%* *
-%************************************************************************
-
-This @MonoBinds@- and @ClassDecls@-specific code is segregated here,
-as the two cases are similar.
-
-\begin{code}
-reconstructCycle :: SCC FlatMonoBindsInfo
- -> RenamedHsBinds
-
-reconstructCycle (AcyclicSCC (_, _, binds, sigs))
- = MonoBind binds sigs NonRecursive
-
-reconstructCycle (CyclicSCC cycle)
- = MonoBind this_gp_binds this_gp_sigs Recursive
- where
- this_gp_binds = foldr1 AndMonoBinds [binds | (_, _, binds, _) <- cycle]
- this_gp_sigs = foldr1 (++) [sigs | (_, _, _, sigs) <- cycle]
-\end{code}
+ Strongly connected components
-%************************************************************************
-%* *
-\subsubsection{ Manipulating FlatMonoBindInfo}
%* *
%************************************************************************
-During analysis a @MonoBinds@ is flattened to a @FlatMonoBindsInfo@.
+During analysis a @MonoBinds@ is flattened to a @FlatMonoBinds@.
The @RenamedMonoBinds@ is always an empty bind, a pattern binding or
a function binding, and has itself been dependency-analysed and
renamed.
\begin{code}
-type FlatMonoBindsInfo
- = (NameSet, -- Set of names defined in this vertex
- NameSet, -- Set of names used in this vertex
- RenamedMonoBinds,
- [RenamedSig]) -- Signatures, if any, for this vertex
+type FlatMonoBinds = (Defs, Uses, RenamedMonoBinds, [RenamedSig])
+ -- Signatures, if any, for this vertex
-mkEdges :: [(FlatMonoBindsInfo, VertexTag)] -> [(FlatMonoBindsInfo, VertexTag, [VertexTag])]
+rnSCC :: [FlatMonoBinds] -> [SCC FlatMonoBinds]
+rnSCC nodes = stronglyConnComp (mkEdges nodes)
-mkEdges flat_info
- = [ (info, tag, dest_vertices (nameSetToList names_used))
- | (info@(names_defined, names_used, mbind, sigs), tag) <- flat_info
+type VertexTag = Int
+
+mkEdges :: [FlatMonoBinds] -> [(FlatMonoBinds, VertexTag, [VertexTag])]
+ -- We keep the uses with the binding,
+ -- so we can track unused bindings better
+mkEdges nodes
+ = [ (thing, tag, dest_vertices uses)
+ | (thing@(_, uses, _, _), tag) <- tagged_nodes
]
where
+ tagged_nodes = nodes `zip` [0::VertexTag ..]
+
-- An edge (v,v') indicates that v depends on v'
- dest_vertices src_mentions = [ target_vertex
- | ((names_defined, _, _, _), target_vertex) <- flat_info,
- mentioned_name <- src_mentions,
- mentioned_name `elemNameSet` names_defined
- ]
+ dest_vertices uses = [ target_vertex
+ | ((defs, _, _, _), target_vertex) <- tagged_nodes,
+ defs `intersectsNameSet` uses
+ ]
+
+reconstructCycle :: SCC FlatMonoBinds -> (RenamedHsBinds, (Defs,Uses))
+reconstructCycle (AcyclicSCC (defs, uses, binds, sigs))
+ = (MonoBind binds sigs NonRecursive, (defs, uses))
+reconstructCycle (CyclicSCC cycle)
+ = (MonoBind this_gp_binds this_gp_sigs Recursive,
+ (unionManyNameSets defs_s, unionManyNameSets uses_s))
+ where
+ (defs_s, uses_s, binds_s, sigs_s) = unzip4 cycle
+ this_gp_binds = foldr1 AndMonoBinds binds_s
+ this_gp_sigs = foldr1 (++) sigs_s
\end{code}
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 Name)
- -> [RdrNameSig]
- -> RnMS ([RenamedSig], FreeVars) -- List of Sig constructors
-
-renameSigs sigs_required binders lookup_occ_nm sigs
- = -- Rename the signatures
- mapFvRn (renameSig lookup_occ_nm) sigs `thenRn` \ (sigs', fvs) ->
-
+checkSigs :: (RenamedSig -> Bool) -- OK-sig predicbate
+ -> [RenamedSig]
+ -> RnM ()
+checkSigs ok_sig 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
- mapRn_ dupSigDeclErr dups `thenRn_`
- mapRn_ unknownSigErr not_this_group `thenRn_`
- mapRn_ (addWarnRn.missingSigWarn) un_sigd_binders `thenRn_`
- returnRn (sigs', fvs)
- -- 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
+ -- Well, I can't see the check for (a)... ToDo!
+ = mappM_ unknownSigErr bad_sigs
+ where
+ bad_sigs = filter (not . ok_sig) sigs
+
+-- 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 `addOneFV` new_v)
-
-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 src_loc)
- = pushSrcLocRn src_loc $
- lookup_occ_nm v `thenRn` \ new_v ->
- rnHsSigType (quotes (ppr v)) ty `thenRn` \ (new_ty,fvs) ->
- returnRn (SpecSig new_v new_ty src_loc, fvs `addOneFV` new_v)
-
-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), unitFV new_v)
-
-renameSig lookup_occ_nm (DeprecSig v txt src_loc)
- = pushSrcLocRn src_loc $
- lookup_occ_nm v `thenRn` \ new_v ->
- returnRn (DeprecSig new_v txt src_loc, unitFV new_v)
-
-renameSig lookup_occ_nm (InlineSig v p src_loc)
- = pushSrcLocRn src_loc $
- lookup_occ_nm v `thenRn` \ new_v ->
- returnRn (InlineSig new_v p src_loc, unitFV new_v)
-
-renameSig lookup_occ_nm (NoInlineSig v p src_loc)
- = pushSrcLocRn src_loc $
- lookup_occ_nm v `thenRn` \ new_v ->
- returnRn (NoInlineSig new_v p src_loc, unitFV new_v)
+renameSigs :: [Sig RdrName] -> RnM [Sig Name]
+renameSigs sigs = mappM renameSig (filter (not . isFixitySig) sigs)
+ -- Remove fixity sigs which have been dealt with already
+
+renameSig :: Sig RdrName -> RnM (Sig Name)
+-- ClassOpSig, FixitSig 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 (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 (DeprecSig n1 _ _) (DeprecSig 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 (DeprecSig _ _ _) = ILIT(7)
-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)
-sig_doc (DeprecSig _ _ loc) = (SLIT("DEPRECATED pragma"), 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"))