X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Frename%2FRnBinds.lhs;h=ed835ca5ebc942a6b1c5a74a562ad48e1399c57b;hb=550421384b8364cdaf3135f7859c9f7d7ee1fff1;hp=7a0c19ea45c2fc1b4622b67a84ae8365f95a3baa;hpb=9af77fa423926fbda946b31e174173d0ec5ebac8;p=ghc-hetmet.git diff --git a/ghc/compiler/rename/RnBinds.lhs b/ghc/compiler/rename/RnBinds.lhs index 7a0c19e..ed835ca 100644 --- a/ghc/compiler/rename/RnBinds.lhs +++ b/ghc/compiler/rename/RnBinds.lhs @@ -10,33 +10,39 @@ they may be affected by renaming (which isn't fully worked out yet). \begin{code} module RnBinds ( - rnTopMonoBinds, rnMonoBinds, rnMethodBinds, - renameSigs, renameSigsFVs, unknownSigErr + rnTopBinds, rnBinds, rnBindsAndThen, + rnMethodBinds, renameSigs, checkSigs ) where #include "HsVersions.h" import HsSyn -import HsBinds ( eqHsSig, sigName, hsSigDoc ) +import HsBinds ( hsSigDoc, eqHsSig ) import RdrHsSyn import RnHsSyn import TcRnMonad -import RnTypes ( rnHsSigType, rnHsType ) -import RnExpr ( rnMatch, rnGRHSs, rnPat, checkPrecMatch ) -import RnEnv ( bindLocatedLocalsRn, lookupBndrRn, lookupInstDeclBndr, - lookupSigOccRn, bindPatSigTyVars, bindLocalFixities, +import RnTypes ( rnHsSigType, rnLHsType, rnLPat ) +import RnExpr ( rnMatch, rnGRHSs, checkPrecMatch ) +import RnEnv ( bindLocatedLocalsRn, lookupLocatedBndrRn, + lookupLocatedInstDeclBndr, + lookupLocatedSigOccRn, bindPatSigTyVars, bindPatSigTyVarsFV, + bindLocalFixities, warnUnusedLocalBinds, mapFvRn, extendTyVarEnvFVRn, ) import CmdLineOpts ( DynFlag(..) ) -import Digraph ( stronglyConnComp, SCC(..) ) +import Digraph ( SCC(..), stronglyConnComp ) import Name ( Name, nameOccName, nameSrcLoc ) import NameSet +import PrelNames ( isUnboundName ) import RdrName ( RdrName, rdrNameOcc ) -import BasicTypes ( RecFlag(..), FixitySig(..) ) -import List ( partition ) +import BasicTypes ( RecFlag(..), TopLevelFlag(..), isTopLevel ) +import List ( unzip4 ) +import SrcLoc ( mkSrcSpan, Located(..), unLoc ) +import Bag import Outputable -import PrelNames ( isUnboundName ) + +import Monad ( foldM ) \end{code} -- ToDo: Put the annotations into the monad, so that they arrive in the proper @@ -65,9 +71,6 @@ The vertag tag is a unique @Int@; the tags only need to be unique within one @MonoBinds@, so that unique-Int plumbing is done explicitly (heavy monad machinery not needed). -\begin{code} -type VertexTag = Int -\end{code} %************************************************************************ %* * @@ -98,7 +101,7 @@ a set of variables free in @Exp@ is written @fvExp@ %************************************************************************ %* * -%* analysing polymorphic bindings (HsBinds, Bind, MonoBinds) * +%* analysing polymorphic bindings (HsBindGroup, HsBind) %* * %************************************************************************ @@ -110,7 +113,7 @@ However, non-recursive expressions are currently not expected as \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 @@ -152,186 +155,187 @@ it expects the global environment to contain bindings for the binders contains bindings for the binders of this particular binding. \begin{code} -rnTopMonoBinds mbinds sigs - = mappM lookupBndrRn binder_rdr_names `thenM` \ binder_names -> - bindPatSigTyVars (collectSigTysFromMonoBinds mbinds) $ - let - bndr_name_set = mkNameSet binder_names - in - 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_` +rnTopBinds :: Bag (LHsBind RdrName) + -> [LSig RdrName] + -> RnM ([HsBindGroup Name], DefUses) - rn_mono_binds siglist mbinds `thenM` \ (final_binds, bind_fvs) -> - returnM (final_binds, bind_fvs `plusFV` sig_fvs) - where - binder_rdr_names = collectMonoBinders mbinds +-- The binders of the binding are in scope already; +-- the top level scope resolution does that + +rnTopBinds mbinds sigs + = bindPatSigTyVars (collectSigTysFromHsBinds (bagToList 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 + + rnBinds 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} -rnMonoBinds :: RdrNameMonoBinds - -> [RdrNameSig] - -> (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 +rnBindsAndThen :: Bag (LHsBind RdrName) + -> [LSig RdrName] + -> ([HsBindGroup Name] -> RnM (result, FreeVars)) + -> RnM (result, FreeVars) + +rnBindsAndThen mbinds sigs thing_inside + = -- 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 doc mbinders_w_srclocs $ \ new_mbinders -> - bindPatSigTyVars (collectSigTysFromMonoBinds mbinds) $ - let - binder_set = mkNameSet new_mbinders - in - -- Rename the signatures - renameSigsFVs (okBindSig binder_set) sigs `thenM` \ (siglist, sig_fvs) -> + bindLocatedLocalsRn doc mbinders_w_srclocs $ \ _ -> + bindPatSigTyVarsFV (collectSigTysFromHsBinds (bagToList mbinds)) $ - -- 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 + -- Then install local fixity declarations -- Notice that they scope over thing_inside too - bindLocalFixities [sig | FixSig sig <- siglist ] $ + bindLocalFixities [sig | L _ (FixSig sig) <- sigs ] $ - rn_mono_binds siglist mbinds `thenM` \ (binds, bind_fvs) -> + -- Do the business + rnBinds NotTopLevel mbinds sigs `thenM` \ (binds, bind_dus) -> - -- Now do the "thing inside", and deal with the free-variable calculations - thing_inside binds `thenM` \ (result,result_fvs) -> + -- Now do the "thing inside" + thing_inside binds `thenM` \ (result,result_fvs) -> + + -- Final error checking let - all_fvs = result_fvs `plusFV` bind_fvs `plusFV` sig_fvs - unused_binders = nameSetToList (binder_set `minusNameSet` all_fvs) + all_uses = duUses bind_dus `plusFV` result_fvs + bndrs = duDefs bind_dus + unused_bndrs = nameSetToList (bndrs `minusNameSet` all_uses) in - warnUnusedLocalBinds unused_binders `thenM_` - returnM (result, delListFromNameSet all_fvs new_mbinders) + warnUnusedLocalBinds unused_bndrs `thenM_` + + returnM (result, all_uses `minusNameSet` bndrs) + -- duUses: It's important to return all the uses, not the 'real uses' used for + -- warning about unused bindings. Otherwise consider: + -- x = 3 + -- y = let p = x in 'x' -- NB: p not used + -- If we don't "see" the dependency of 'y' on 'x', we may put the + -- bindings in the wrong order, and the type checker will complain + -- that x isn't in scope where - 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]) + mbinders_w_srclocs = collectHsBindLocatedBinders mbinds + doc = text "In the binding group for:" + <+> pprWithCommas ppr (map unLoc mbinders_w_srclocs) \end{code} %************************************************************************ %* * -\subsubsection{ MonoBinds -- the main work is done here} +\subsubsection{rnBinds -- the main work is done here} %* * %************************************************************************ -@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 - -> RnM (RenamedHsBinds, -- Dependency analysed - FreeVars) -- Free variables - -rn_mono_binds siglist mbinds - = - -- Rename the bindings, returning a MonoBindsInfo +rnBinds :: TopLevelFlag + -> Bag (LHsBind RdrName) + -> [LSig RdrName] + -> RnM ([HsBindGroup Name], DefUses) + +-- Assumes the binders of the binding are in scope already + +rnBinds top_lvl mbinds sigs + = renameSigs sigs `thenM` \ siglist -> + + -- Rename the bindings, returning a [HsBindVertex] -- which is a list of indivisible vertices so far as -- the strongly-connected-components (SCC) analysis is concerned - flattenMonoBinds siglist mbinds `thenM` \ mbinds_info -> + mkBindVertices siglist mbinds `thenM` \ mbinds_info -> -- Do the SCC analysis let - edges = mkEdges (mbinds_info `zip` [(0::Int)..]) - scc_result = stronglyConnComp edges - final_binds = foldr (ThenBinds . reconstructCycle) EmptyBinds scc_result - - -- Deal with bound and free-var calculation - rhs_fvs = plusFVs [fvs | (_,fvs,_,_) <- mbinds_info] + scc_result = rnSCC mbinds_info + (groups, bind_dus_s) = unzip (map reconstructCycle scc_result) + bind_dus = mkDUs bind_dus_s + binders = duDefs bind_dus in - returnM (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.) + doptM Opt_WarnMissingSigs `thenM` \ warn_missing_sigs -> + (if isTopLevel top_lvl && + warn_missing_sigs + then let + type_sig_vars = [ unLoc n | L _ (Sig n _) <- siglist] + un_sigd_binders = filter (not . (`elem` type_sig_vars)) + (nameSetToList binders) + in + mappM_ missingSigWarn un_sigd_binders + else + returnM () + ) `thenM_` + + returnM (groups, bind_dus `plusDU` usesOnly (hsSigsFVs siglist)) \end{code} -@flattenMonoBinds@ is ever-so-slightly magical in that it sticks +@mkBindVertices@ 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 - -> RnM [FlatMonoBindsInfo] +mkBindVertices :: [LSig Name] -- Signatures + -> Bag (LHsBind RdrName) + -> RnM [BindVertex] +mkBindVertices sigs = mapM (mkBindVertex sigs) . bagToList -flattenMonoBinds sigs EmptyMonoBinds = returnM [] - -flattenMonoBinds sigs (AndMonoBinds bs1 bs2) - = flattenMonoBinds sigs bs1 `thenM` \ flat1 -> - flattenMonoBinds sigs bs2 `thenM` \ flat2 -> - returnM (flat1 ++ flat2) - -flattenMonoBinds sigs (PatMonoBind pat grhss locn) - = addSrcLoc locn $ - rnPat pat `thenM` \ (pat', pat_fvs) -> +mkBindVertex :: [LSig Name] -> LHsBind RdrName -> RnM BindVertex +mkBindVertex sigs (L loc (PatBind pat grhss)) + = addSrcSpan loc $ + rnLPat pat `thenM` \ (pat', pat_fvs) -> -- Find which things are bound in this group let names_bound_here = mkNameSet (collectPatBinders pat') in sigsForMe names_bound_here sigs `thenM` \ sigs_for_me -> - rnGRHSs grhss `thenM` \ (grhss', fvs) -> + 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) - = addSrcLoc locn $ - lookupBndrRn name `thenM` \ new_name -> + (names_bound_here, fvs `plusFV` pat_fvs, + L loc (PatBind pat' grhss'), sigs_for_me + ) + +mkBindVertex sigs (L loc (FunBind name inf matches)) + = addSrcSpan loc $ + lookupLocatedBndrRn name `thenM` \ new_name -> let - names_bound_here = unitNameSet new_name + plain_name = unLoc new_name + names_bound_here = unitNameSet plain_name in 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_` + mapFvRn (rnMatch (FunRhs plain_name)) matches `thenM` \ (new_matches, fvs) -> + mappM_ (checkPrecMatch inf plain_name) new_matches `thenM_` returnM - [(unitNameSet new_name, - fvs, - FunMonoBind new_name inf new_matches locn, - sigs_for_me - )] - + (unitNameSet plain_name, fvs, + L loc (FunBind new_name inf new_matches), 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 + -- sigForThisGroup only returns signatures for + -- which sigName returns a Just + eq sig1 sig2 = eqHsSig (unLoc sig1) (unLoc sig2) + + check sigs sig = case filter (eq sig) sigs of [] -> returnM (sig:sigs) - other -> dupSigDeclErr sig `thenM_` + other -> dupSigDeclErr sig other `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 @rnBinds@ 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: @@ -348,98 +352,86 @@ a binder. \begin{code} rnMethodBinds :: Name -- Class name -> [Name] -- Names for generic type variables - -> RdrNameMonoBinds - -> RnM (RenamedMonoBinds, FreeVars) + -> (LHsBinds RdrName) + -> RnM (LHsBinds Name, FreeVars) -rnMethodBinds cls gen_tyvars EmptyMonoBinds = returnM (EmptyMonoBinds, emptyFVs) +rnMethodBinds cls gen_tyvars binds + = foldM do_one (emptyBag,emptyFVs) (bagToList binds) + where do_one (binds,fvs) bind = do + (bind', fvs_bind) <- rnMethodBind cls gen_tyvars bind + return (bind' `unionBags` binds, fvs_bind `plusFV` fvs) -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 cls gen_tyvars (FunMonoBind name inf matches locn) - = addSrcLoc locn $ - - lookupInstDeclBndr cls name `thenM` \ sel_name -> +rnMethodBind cls gen_tyvars (L loc (FunBind name inf matches)) + = addSrcSpan loc $ + lookupLocatedInstDeclBndr cls name `thenM` \ sel_name -> + let plain_name = unLoc sel_name in -- We use the selector name as the binder - 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) + mapFvRn (rn_match plain_name) matches `thenM` \ (new_matches, fvs) -> + mappM_ (checkPrecMatch inf plain_name) new_matches `thenM_` + returnM (unitBag (L loc (FunBind sel_name inf new_matches)), fvs `addOneFV` plain_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) + rn_match sel_name match@(L _ (Match (L _ (TypePat ty) : _) _ _)) + = extendTyVarEnvFVRn gen_tvs $ + rnMatch (FunRhs sel_name) match where - tvs = map rdrNameOcc (extractHsTyRdrNames ty) + tvs = map (rdrNameOcc.unLoc) (extractHsTyRdrTyVars ty) gen_tvs = [tv | tv <- gen_tyvars, nameOccName tv `elem` tvs] - rn_match match = rnMatch (FunRhs name) match - + rn_match sel_name match = rnMatch (FunRhs sel_name) match + -- Can't handle method pattern-bindings which bind multiple methods. -rnMethodBinds cls gen_tyvars mbind@(PatMonoBind other_pat _ locn) - = addSrcLoc locn (addErr (methodBindErr mbind)) `thenM_` - returnM (EmptyMonoBinds, emptyFVs) +rnMethodBind cls gen_tyvars mbind@(L loc (PatBind other_pat _)) + = addLocErr mbind methodBindErr `thenM_` + returnM (emptyBag, emptyFVs) \end{code} %************************************************************************ %* * -\subsection[reconstruct-deps]{Reconstructing dependencies} + Strongly connected components %* * %************************************************************************ -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} - -%************************************************************************ -%* * -\subsubsection{ Manipulating FlatMonoBindInfo} -%* * -%************************************************************************ +type BindVertex = (Defs, Uses, LHsBind Name, [LSig Name]) + -- Signatures, if any, for this vertex -During analysis a @MonoBinds@ is flattened to a @FlatMonoBindsInfo@. -The @RenamedMonoBinds@ is always an empty bind, a pattern binding or -a function binding, and has itself been dependency-analysed and -renamed. +rnSCC :: [BindVertex] -> [SCC BindVertex] +rnSCC nodes = stronglyConnComp (mkEdges nodes) -\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 - -mkEdges :: [(FlatMonoBindsInfo, VertexTag)] -> [(FlatMonoBindsInfo, VertexTag, [VertexTag])] +type VertexTag = Int -mkEdges flat_info - = [ (info, tag, dest_vertices (nameSetToList names_used)) - | (info@(names_defined, names_used, mbind, sigs), tag) <- flat_info +mkEdges :: [BindVertex] -> [(BindVertex, 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 BindVertex -> (HsBindGroup Name, (Defs,Uses)) +reconstructCycle (AcyclicSCC (defs, uses, bind, sigs)) + = (HsBindGroup (unitBag bind) sigs NonRecursive, (defs, uses)) +reconstructCycle (CyclicSCC cycle) + = (HsBindGroup 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 = listToBag binds_s + this_gp_sigs = foldr1 (++) sigs_s \end{code} @@ -460,31 +452,20 @@ 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} -renameSigsFVs ok_sig sigs - = renameSigs ok_sig sigs `thenM` \ sigs' -> - returnM (sigs', hsSigsFVs sigs') - -renameSigs :: (RenamedSig -> Bool) -- OK-sig predicate - -> [RdrNameSig] - -> RnM [RenamedSig] - -renameSigs ok_sig [] = returnM [] - -renameSigs ok_sig sigs - = -- Rename the signatures - mappM renameSig sigs `thenM` \ sigs' -> - +checkSigs :: (LSig Name -> Bool) -- OK-sig predicbate + -> [LSig Name] + -> RnM () +checkSigs ok_sig sigs -- Check for (a) duplicate signatures -- (b) signatures for things not in this group - let - 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 - mappM_ unknownSigErr bads `thenM_` - returnM goods + -- Well, I can't see the check for (a)... ToDo! + = mappM_ unknownSigErr (filter bad sigs) + where + bad sig = not (ok_sig sig) && + case sigName sig of + Just n | isUnboundName n -> False + -- Don't complain about an unbound name again + other -> True -- We use lookupSigOccRn in the signatures, which is a little bit unsatisfactory -- because this won't work for: @@ -495,34 +476,29 @@ renameSigs ok_sig sigs -- is in scope. (I'm assuming that Baz.op isn't in scope unqualified.) -- Doesn't seem worth much trouble to sort this. +renameSigs :: [LSig RdrName] -> RnM [LSig Name] +renameSigs sigs = mappM (wrapLocM renameSig) (filter (not . isFixitySig . unLoc) sigs) + -- Remove fixity sigs which have been dealt with already + renameSig :: Sig RdrName -> RnM (Sig Name) --- ClassOpSig is renamed elsewhere. -renameSig (Sig v ty src_loc) - = addSrcLoc src_loc $ - lookupSigOccRn v `thenM` \ new_v -> +-- FixitSig is renamed elsewhere. +renameSig (Sig v ty) + = lookupLocatedSigOccRn v `thenM` \ new_v -> rnHsSigType (quotes (ppr v)) ty `thenM` \ new_ty -> - returnM (Sig new_v new_ty src_loc) + returnM (Sig new_v new_ty) -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 (SpecInstSig ty) + = rnLHsType (text "A SPECIALISE instance pragma") ty `thenM` \ new_ty -> + returnM (SpecInstSig new_ty) -renameSig (SpecSig v ty src_loc) - = addSrcLoc src_loc $ - lookupSigOccRn v `thenM` \ new_v -> +renameSig (SpecSig v ty) + = lookupLocatedSigOccRn 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)) + returnM (SpecSig new_v new_ty) -renameSig (InlineSig b v p src_loc) - = addSrcLoc src_loc $ - lookupSigOccRn v `thenM` \ new_v -> - returnM (InlineSig b new_v p src_loc) +renameSig (InlineSig b v p) + = lookupLocatedSigOccRn v `thenM` \ new_v -> + returnM (InlineSig b new_v p) \end{code} @@ -533,23 +509,25 @@ renameSig (InlineSig b v p src_loc) %************************************************************************ \begin{code} -dupSigDeclErr sig - = addSrcLoc loc $ - addErr (sep [ptext SLIT("Duplicate") <+> what_it_is <> colon, - ppr sig]) +dupSigDeclErr (L loc sig) sigs + = addErrAt loc $ + vcat [ptext SLIT("Duplicate") <+> what_it_is <> colon, + nest 2 (vcat (map ppr_sig (L loc sig:sigs)))] where - (what_it_is, loc) = hsSigDoc sig + what_it_is = hsSigDoc sig + ppr_sig (L loc sig) = ppr loc <> colon <+> ppr sig -unknownSigErr sig - = addSrcLoc loc $ - addErr (sep [ptext SLIT("Misplaced") <+> what_it_is <> colon, - ppr sig]) +unknownSigErr (L loc sig) + = addErrAt loc $ + sep [ptext SLIT("Misplaced") <+> what_it_is <> colon, ppr sig] where - (what_it_is, loc) = hsSigDoc sig + what_it_is = hsSigDoc sig missingSigWarn var - = addSrcLoc (nameSrcLoc var) $ - addWarn (sep [ptext SLIT("Definition but no type signature for"), quotes (ppr var)]) + = addWarnAt (mkSrcSpan loc loc) $ + sep [ptext SLIT("Definition but no type signature for"), quotes (ppr var)] + where + loc = nameSrcLoc var -- TODO: make a proper span methodBindErr mbind = hang (ptext SLIT("Can't handle multiple methods defined by one pattern binding"))