X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Frename%2FRnBinds.lhs;h=291a65e4d80194a4acff0f5b01cc731a63b52e7c;hb=508a505e9853984bfdaa3ad855ae3fcbc6d31787;hp=da97758d84647d875c5f103a305ee74f8aa1bb30;hpb=dbc254c3dcd64761015a3d1c191ac742caafbf4c;p=ghc-hetmet.git diff --git a/ghc/compiler/rename/RnBinds.lhs b/ghc/compiler/rename/RnBinds.lhs index da97758..291a65e 100644 --- a/ghc/compiler/rename/RnBinds.lhs +++ b/ghc/compiler/rename/RnBinds.lhs @@ -10,31 +10,38 @@ they may be affected by renaming (which isn't fully worked out yet). \begin{code} module RnBinds ( - rnTopMonoBinds, rnMonoBinds, rnMonoBindsAndThen, - rnMethodBinds, renameSigs, checkSigs, unknownSigErr + rnTopBinds, rnBinds, rnBindsAndThen, + rnMethodBinds, renameSigs, checkSigs ) where #include "HsVersions.h" import HsSyn -import HsBinds ( eqHsSig, hsSigDoc ) +import HsBinds ( hsSigDoc, eqHsSig ) import RdrHsSyn import RnHsSyn import TcRnMonad -import RnTypes ( rnHsSigType, rnHsType, rnPat ) -import RnExpr ( rnMatch, rnGRHSs, checkPrecMatch ) -import RnEnv ( bindLocatedLocalsRn, lookupBndrRn, lookupInstDeclBndr, - lookupSigOccRn, bindPatSigTyVars, bindLocalFixities, +import RnTypes ( rnHsSigType, rnLHsType, rnLPat ) +import RnExpr ( rnMatchGroup, rnMatch, rnGRHSs, checkPrecMatch ) +import RnEnv ( bindLocatedLocalsRn, lookupLocatedBndrRn, + lookupLocatedInstDeclBndr, + lookupLocatedSigOccRn, bindPatSigTyVars, bindPatSigTyVarsFV, + bindLocalFixities, bindSigTyVarsFV, warnUnusedLocalBinds, mapFvRn, extendTyVarEnvFVRn, ) import CmdLineOpts ( DynFlag(..) ) import Digraph ( SCC(..), stronglyConnComp ) import Name ( Name, nameOccName, nameSrcLoc ) import NameSet +import PrelNames ( isUnboundName ) import RdrName ( RdrName, rdrNameOcc ) -import BasicTypes ( RecFlag(..) ) +import BasicTypes ( RecFlag(..), TopLevelFlag(..), isTopLevel ) +import List ( unzip4 ) +import SrcLoc ( mkSrcSpan, Located(..), unLoc ) +import Bag import Outputable +import Monad ( foldM ) \end{code} -- ToDo: Put the annotations into the monad, so that they arrive in the proper @@ -93,7 +100,7 @@ a set of variables free in @Exp@ is written @fvExp@ %************************************************************************ %* * -%* analysing polymorphic bindings (HsBinds, Bind, MonoBinds) * +%* analysing polymorphic bindings (HsBindGroup, HsBind) %* * %************************************************************************ @@ -147,37 +154,33 @@ it expects the global environment to contain bindings for the binders contains bindings for the binders of this particular binding. \begin{code} -rnTopMonoBinds :: RdrNameMonoBinds - -> [RdrNameSig] - -> RnM (RenamedHsBinds, FreeVars) - --- Assumes the binders of the binding are in scope already --- Very like rnMonoBinds, bu checks for missing signatures too - -rnTopMonoBinds mbinds sigs - = bindPatSigTyVars (collectSigTysFromMonoBinds mbinds) $ - -- Hmm; by analogy with Ids, this doesn't look right - - renameSigs sigs `thenM` \ siglist -> - rn_mono_binds siglist mbinds `thenM` \ (binders, final_binds, bind_fvs) -> - checkSigs okBindSig binders siglist `thenM_` - - -- Warn about missing signatures, but not in interface mode - -- (This is important when renaming bindings from 'deriving' clauses.) - getModeRn `thenM` \ mode -> - doptM Opt_WarnMissingSigs `thenM` \ warn_missing_sigs -> - (if 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_fvs `plusFV` hsSigsFVs siglist) +rnTopBinds :: LHsBinds RdrName + -> [LSig RdrName] + -> RnM ([HsBindGroup Name], DefUses) + +-- The binders of the binding are in scope already; +-- the top level scope resolution does that + +rnTopBinds mbinds sigs + = do { is_boot <- tcIsHsBoot + ; if is_boot then + rnHsBoot mbinds sigs + else 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 } + +rnHsBoot :: LHsBinds RdrName + -> [LSig RdrName] + -> RnM ([HsBindGroup Name], DefUses) +-- A hs-boot file has no bindings. +-- Return a single HsBindGroup with empty binds and renamed signatures +rnHsBoot mbinds sigs + = do { checkErr (isEmptyLHsBinds mbinds) (bindsInHsBootFile mbinds) + ; sigs' <- renameSigs sigs + ; return ([HsBindGroup emptyLHsBinds sigs' NonRecursive], + usesOnly (hsSigsFVs sigs')) } \end{code} @@ -188,156 +191,167 @@ rnTopMonoBinds mbinds sigs %************************************************************************ \begin{code} -rnMonoBindsAndThen :: RdrNameMonoBinds - -> [RdrNameSig] - -> (RenamedHsBinds -> RnM (result, FreeVars)) - -> RnM (result, FreeVars) +rnBindsAndThen :: Bag (LHsBind RdrName) + -> [LSig RdrName] + -> ([HsBindGroup Name] -> RnM (result, FreeVars)) + -> RnM (result, FreeVars) -rnMonoBindsAndThen mbinds sigs thing_inside -- Non-empty monobinds +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) $ + bindLocatedLocalsRn doc mbinders_w_srclocs $ \ _ -> + bindPatSigTyVarsFV (collectSigTysFromHsBinds (bagToList mbinds)) $ -- Then install local fixity declarations -- Notice that they scope over thing_inside too - bindLocalFixities [sig | FixSig sig <- sigs ] $ + bindLocalFixities [sig | L _ (FixSig sig) <- sigs ] $ -- Do the business - rnMonoBinds mbinds sigs `thenM` \ (binds, bind_fvs) -> + rnBinds NotTopLevel mbinds sigs `thenM` \ (binds, bind_dus) -> -- Now do the "thing inside" - thing_inside binds `thenM` \ (result,result_fvs) -> + thing_inside binds `thenM` \ (result,result_fvs) -> -- Final error checking let - all_fvs = result_fvs `plusFV` bind_fvs - unused_binders = filter (not . (`elemNameSet` all_fvs)) new_mbinders + 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 + mbinders_w_srclocs = collectHsBindLocatedBinders mbinds doc = text "In the binding group for:" - <+> pprWithCommas ppr (map fst mbinders_w_srclocs) + <+> pprWithCommas ppr (map unLoc mbinders_w_srclocs) \end{code} -\begin{code} -rnMonoBinds :: RdrNameMonoBinds - -> [RdrNameSig] - -> RnM (RenamedHsBinds, FreeVars) - --- Assumes the binders of the binding are in scope already - -rnMonoBinds mbinds sigs - = renameSigs sigs `thenM` \ siglist -> - rn_mono_binds siglist mbinds `thenM` \ (binders, final_binds, bind_fvs) -> - checkSigs okBindSig binders siglist `thenM_` - returnM (final_binds, bind_fvs `plusFV` hsSigsFVs siglist) -\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 (NameSet, -- Binders - RenamedHsBinds, -- Dependency analysed - FreeVars) -- Free variables - -rn_mono_binds siglist mbinds - = -- Rename the bindings, returning a MonoBindsInfo +rnBinds :: TopLevelFlag + -> LHsBinds 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 scc_result = rnSCC mbinds_info - final_binds = foldr (ThenBinds . reconstructCycle) EmptyBinds scc_result - - -- Deal with bound and free-var calculation - -- Caller removes binders from free-var set - rhs_fvs = plusFVs [fvs | (_,fvs,_) <- mbinds_info] - bndrs = plusFVs [defs | (defs,_,_) <- mbinds_info] + (groups, bind_dus_s) = unzip (map reconstructCycle scc_result) + bind_dus = mkDUs bind_dus_s + binders = duDefs bind_dus in - returnM (bndrs, 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 [FlatMonoBinds] +mkBindVertices :: [LSig Name] -- Signatures + -> LHsBinds 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 ty)) + = setSrcSpan 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) -> + bindSigTyVarsFV 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) - = addSrcLoc locn $ - lookupBndrRn name `thenM` \ new_name -> + (names_bound_here, fvs `plusFV` pat_fvs, + L loc (PatBind pat' grhss' ty), sigs_for_me + ) + +mkBindVertex sigs (L loc (FunBind name inf matches)) + = setSrcSpan 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_` + bindSigTyVarsFV sigs_for_me ( + rnMatchGroup (FunRhs plain_name) matches + ) `thenM` \ (new_matches, fvs) -> + 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: @@ -354,93 +368,88 @@ a binder. \begin{code} rnMethodBinds :: Name -- Class name -> [Name] -- Names for generic type variables - -> RdrNameMonoBinds - -> RnM (RenamedMonoBinds, FreeVars) - -rnMethodBinds cls gen_tyvars EmptyMonoBinds = returnM (EmptyMonoBinds, emptyFVs) - -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 -> + -> LHsBinds RdrName + -> RnM (LHsBinds Name, FreeVars) + +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) + +rnMethodBind cls gen_tyvars (L loc (FunBind name inf (MatchGroup matches _))) + = setSrcSpan 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) -> + let + new_group = MatchGroup new_matches placeHolderType + in + checkPrecMatch inf plain_name new_group `thenM_` + returnM (unitBag (L loc (FunBind sel_name inf new_group)), 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) + -- Truly gruesome; bring into scope the correct members of the generic + -- type variables. See comments in RnSource.rnSourceDecl(ClassDecl) + 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} %************************************************************************ %* * Strongly connected components - %* * %************************************************************************ -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 BindWithSigs = (RenamedMonoBinds, [RenamedSig]) +type BindVertex = (Defs, Uses, LHsBind Name, [LSig Name]) -- Signatures, if any, for this vertex -type FlatMonoBinds = (NameSet, -- Defs - NameSet, -- Uses - BindWithSigs) - -rnSCC :: [FlatMonoBinds] -> [SCC BindWithSigs] +rnSCC :: [BindVertex] -> [SCC BindVertex] rnSCC nodes = stronglyConnComp (mkEdges nodes) type VertexTag = Int -mkEdges :: [FlatMonoBinds] -> [(BindWithSigs, VertexTag, [VertexTag])] +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) - | ((defs, uses, thing), tag) <- tagged_nodes + | (thing@(_, uses, _, _), tag) <- tagged_nodes ] where tagged_nodes = nodes `zip` [0::VertexTag ..] -- An edge (v,v') indicates that v depends on v' dest_vertices uses = [ target_vertex - | ((defs, _, _), target_vertex) <- tagged_nodes, - mentioned_name <- nameSetToList uses, - mentioned_name `elemNameSet` defs + | ((defs, _, _, _), target_vertex) <- tagged_nodes, + defs `intersectsNameSet` uses ] -reconstructCycle :: SCC BindWithSigs -> RenamedHsBinds -reconstructCycle (AcyclicSCC (binds, sigs)) - = MonoBind binds sigs NonRecursive +reconstructCycle :: SCC BindVertex -> (HsBindGroup Name, (Defs,Uses)) +reconstructCycle (AcyclicSCC (defs, uses, bind, sigs)) + = (HsBindGroup (unitBag bind) sigs NonRecursive, (defs, uses)) reconstructCycle (CyclicSCC cycle) - = MonoBind this_gp_binds this_gp_sigs Recursive + = (HsBindGroup this_gp_binds this_gp_sigs Recursive, + (unionManyNameSets defs_s, unionManyNameSets uses_s)) where - (binds,sigs) = unzip cycle - this_gp_binds = foldr1 AndMonoBinds binds - this_gp_sigs = foldr1 (++) sigs + (defs_s, uses_s, binds_s, sigs_s) = unzip4 cycle + this_gp_binds = listToBag binds_s + this_gp_sigs = foldr1 (++) sigs_s \end{code} @@ -461,17 +470,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} -checkSigs :: (NameSet -> RenamedSig -> Bool) -- OK-sig predicbate - -> NameSet -- Binders of this group - -> [RenamedSig] +checkSigs :: (LSig Name -> Bool) -- OK-sig predicbate + -> [LSig Name] -> RnM () -checkSigs ok_sig bndrs sigs +checkSigs ok_sig sigs -- Check for (a) duplicate signatures -- (b) signatures for things not in this group - -- Well, I can't see the check for (b)... ToDo! - = mappM_ unknownSigErr bad_sigs + -- Well, I can't see the check for (a)... ToDo! + = mappM_ unknownSigErr (filter bad sigs) where - bad_sigs = filter (not . ok_sig bndrs) sigs + 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: @@ -482,33 +494,29 @@ checkSigs ok_sig bndrs 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 :: [Sig RdrName] -> RnM [Sig Name] -renameSigs sigs = mappM renameSig (filter (not . isFixitySig) sigs) +renameSigs :: [LSig RdrName] -> RnM [LSig Name] +renameSigs sigs = mappM (wrapLocM renameSig) (filter (not . isFixityLSig) 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 -> +-- 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) + 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} @@ -519,25 +527,31 @@ 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")) - 4 (ppr mbind) + = hang (ptext SLIT("Pattern bindings (except simple variables) not allowed in instance declarations")) + 2 (ppr mbind) + +bindsInHsBootFile mbinds + = hang (ptext SLIT("Bindings in hs-boot files are not allowed")) + 2 (ppr mbinds) \end{code}