X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=ghc%2Fcompiler%2Frename%2FRnBinds.lhs;h=843f28e41c41dc69f7eb68c6331fa2ca543861c5;hb=bb88e732b7383c10496c0f60c3bdea2c22362cc6;hp=d4df584c22784b5511087d02d0e30114a7bd3c66;hpb=8f7ac3fe40d3d55743b824deab655d0797a1c55f;p=ghc-hetmet.git diff --git a/ghc/compiler/rename/RnBinds.lhs b/ghc/compiler/rename/RnBinds.lhs index d4df584..843f28e 100644 --- a/ghc/compiler/rename/RnBinds.lhs +++ b/ghc/compiler/rename/RnBinds.lhs @@ -1,5 +1,5 @@ % -% (c) The GRASP/AQUA Project, Glasgow University, 1992-1996 +% (c) The GRASP/AQUA Project, Glasgow University, 1992-1998 % \section[RnBinds]{Renaming and dependency analysis of bindings} @@ -9,42 +9,42 @@ type-synonym declarations; those cannot be done at this stage because they may be affected by renaming (which isn't fully worked out yet). \begin{code} -#include "HsVersions.h" - module RnBinds ( - rnTopBinds, rnTopMonoBinds, - rnMethodBinds, - rnBinds, rnMonoBinds + rnTopBinds, rnBinds, rnBindsAndThen, + rnMethodBinds, renameSigs, checkSigs ) where -IMP_Ubiq() -IMPORT_DELOOPER(RnLoop) -- break the RnPass/RnExpr/RnBinds loops +#include "HsVersions.h" + import HsSyn -import HsPragmas ( isNoGenPragmas, noGenPragmas ) +import HsBinds ( hsSigDoc, eqHsSig ) import RdrHsSyn import RnHsSyn -import RnMonad -import RnExpr ( rnMatch, rnGRHSsAndBinds, rnPat, checkPrecMatch ) -import RnEnv ( bindLocatedLocalsRn, lookupRn, lookupOccRn, isUnboundName ) - -import CmdLineOpts ( opt_SigsRequired ) -import Digraph ( stronglyConnComp ) -import ErrUtils ( addErrLoc, addShortErrLocLine ) -import Name ( OccName(..), Provenance, - Name {- instance Eq -}, - NameSet(..), emptyNameSet, mkNameSet, unionNameSets, - minusNameSet, unionManyNameSets, elemNameSet, unitNameSet, nameSetToList +import TcRnMonad +import RnTypes ( rnHsSigType, rnLHsType, rnLPat ) +import RnExpr ( rnMatch, rnGRHSs, checkPrecMatch ) +import RnEnv ( bindLocatedLocalsRn, lookupLocatedBndrRn, + lookupLocatedInstDeclBndr, + lookupLocatedSigOccRn, bindPatSigTyVars, bindPatSigTyVarsFV, + bindLocalFixities, + warnUnusedLocalBinds, mapFvRn, extendTyVarEnvFVRn, ) -import Maybes ( catMaybes ) ---import PprStyle--ToDo:rm -import Pretty -import Util ( thenCmp, isIn, removeDups, panic, panic#, assertPanic ) -import UniqSet ( SYN_IE(UniqSet) ) -import ListSetOps ( minusList ) -import Bag ( bagToList ) -import UniqFM ( UniqFM ) -import ErrUtils ( SYN_IE(Error) ) +import CmdLineOpts ( DynFlag(..) ) +import Digraph ( SCC(..), stronglyConnComp ) +import Name ( Name, nameOccName, nameSrcLoc ) +import NameSet +import PrelNames ( isUnboundName ) +import RdrName ( RdrName, rdrNameOcc ) +import BasicTypes ( RecFlag(..), TopLevelFlag(..), isTopLevel ) +import List ( unzip4 ) +import SrcLoc ( mkSrcSpan, Located(..), unLoc ) +import Bag +import Outputable + +import Monad ( foldM ) + +import SrcLoc (getLoc) -- tmp \end{code} -- ToDo: Put the annotations into the monad, so that they arrive in the proper @@ -73,11 +73,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 -type Cycle = [VertexTag] -type Edge = (VertexTag, VertexTag) -\end{code} %************************************************************************ %* * @@ -108,7 +103,7 @@ a set of variables free in @Exp@ is written @fvExp@ %************************************************************************ %* * -%* analysing polymorphic bindings (HsBinds, Bind, MonoBinds) * +%* analysing polymorphic bindings (HsBindGroup, HsBind) %* * %************************************************************************ @@ -120,7 +115,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 @@ -154,311 +149,291 @@ it expects the global environment to contain bindings for the binders %************************************************************************ %* * -%* 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 - -rnTopBinds EmptyBinds = returnRn EmptyBinds -rnTopBinds (SingleBind (RecBind bind)) = rnTopMonoBinds bind [] -rnTopBinds (BindWith (RecBind bind) sigs) = rnTopMonoBinds bind sigs - -- The parser doesn't produce other forms +rnTopBinds :: Bag (LHsBind RdrName) + -> [LSig RdrName] + -> RnM ([HsBindGroup Name], DefUses) +-- The binders of the binding are in scope already; +-- the top level scope resolution does that -rnTopMonoBinds EmptyMonoBinds sigs - = returnRn EmptyBinds +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 -rnTopMonoBinds mbinds sigs - = mapRn lookupRn binder_rdr_names `thenRn` \ binder_names -> - let - binder_set = mkNameSet binder_names - in - rn_mono_binds True {- top level -} - binder_set mbinds sigs `thenRn` \ (new_binds, fv_set) -> - returnRn new_binds - where - binder_rdr_names = map fst (bagToList (collectMonoBinders mbinds)) + rnBinds TopLevel mbinds sigs \end{code} + %************************************************************************ %* * %* Nested binds %* * %************************************************************************ -@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 - \begin{code} -rnBinds :: RdrNameHsBinds - -> (RenamedHsBinds -> RnMS s (result, FreeVars)) - -> RnMS s (result, FreeVars) - -rnBinds EmptyBinds thing_inside = thing_inside EmptyBinds -rnBinds (SingleBind (RecBind bind)) thing_inside = rnMonoBinds bind [] thing_inside -rnBinds (BindWith (RecBind bind) sigs) thing_inside = rnMonoBinds bind sigs thing_inside - -- the parser doesn't produce other forms +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 $ \ _ -> + bindPatSigTyVarsFV (collectSigTysFromHsBinds (bagToList mbinds)) $ + -- Then install local fixity declarations + -- Notice that they scope over thing_inside too + bindLocalFixities [sig | L _ (FixSig sig) <- sigs ] $ -rnMonoBinds :: RdrNameMonoBinds -> [RdrNameSig] - -> (RenamedHsBinds -> RnMS s (result, FreeVars)) - -> RnMS s (result, FreeVars) + -- Do the business + rnBinds NotTopLevel mbinds sigs `thenM` \ (binds, bind_dus) -> -rnMonoBinds EmptyMonoBinds sigs thing_inside = thing_inside EmptyBinds + -- Now do the "thing inside" + thing_inside binds `thenM` \ (result,result_fvs) -> -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 "binding group" mbinders_w_srclocs $ \ new_mbinders -> + -- Final error checking let - binder_set = mkNameSet new_mbinders + all_uses = duUses bind_dus `plusFV` result_fvs + bndrs = duDefs bind_dus + unused_bndrs = nameSetToList (bndrs `minusNameSet` all_uses) in - rn_mono_binds False {- not top level -} - binder_set mbinds sigs `thenRn` \ (binds,bind_fvs) -> - - -- Now do the "thing inside", and deal with the free-variable calculations - thing_inside binds `thenRn` \ (result,result_fvs) -> - returnRn (result, (result_fvs `unionNameSets` bind_fvs) `minusNameSet` binder_set) + 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 = bagToList (collectMonoBinders mbinds) + mbinders_w_srclocs = collectHsBindLocatedBinders mbinds + doc = text "In the binding group for:" + <+> pprWithCommas ppr (map unLoc mbinders_w_srclocs) \end{code} %************************************************************************ %* * -%* MonoBinds -- the main work is done here +\subsubsection{rnBinds -- the main work is done here} %* * %************************************************************************ -@rnMonoBinds@ 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 -@rnNestedMonoBinds@ (for the nested ones). +@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 :: Bool -- True <=> top level - -> NameSet -- Binders of this group - -> RdrNameMonoBinds - -> [RdrNameSig] -- Signatures attached to this group - -> RnMS s (RenamedHsBinds, -- - FreeVars) -- Free variables - -rn_mono_binds is_top_lev binders mbinds sigs - = - -- 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 - rnBindSigs is_top_lev binders sigs `thenRn` \ siglist -> - flattenMonoBinds 0 siglist mbinds `thenRn` \ (_, mbinds_info) -> + mkBindVertices siglist mbinds `thenM` \ mbinds_info -> -- Do the SCC analysis - let vertices = mkVertices mbinds_info - edges = mkEdges mbinds_info - scc_result = stronglyConnComp (==) edges vertices - final_binds = foldr1 ThenBinds (map (reconstructCycle edges mbinds_info) scc_result) - - -- Deal with bound and free-var calculation - rhs_fvs = unionManyNameSets [fvs | (_,_,fvs,_,_) <- mbinds_info] + let + 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 - 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.) + 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. \begin{code} -flattenMonoBinds :: Int -- Next free vertex tag - -> [RenamedSig] -- Signatures - -> RdrNameMonoBinds - -> RnMS s (Int, FlatMonoBindsInfo) - -flattenMonoBinds uniq sigs EmptyMonoBinds = returnRn (uniq, []) - -flattenMonoBinds uniq sigs (AndMonoBinds bs1 bs2) - = flattenMonoBinds uniq sigs bs1 `thenRn` \ (uniq1, flat1) -> - flattenMonoBinds uniq1 sigs bs2 `thenRn` \ (uniq2, flat2) -> - returnRn (uniq2, flat1 ++ flat2) +mkBindVertices :: [LSig Name] -- Signatures + -> Bag (LHsBind RdrName) + -> RnM [BindVertex] +mkBindVertices sigs = mapM (mkBindVertex sigs) . bagToList -flattenMonoBinds uniq sigs (PatMonoBind pat grhss_and_binds locn) - = pushSrcLocRn locn $ - rnPat pat `thenRn` \ pat' -> - rnGRHSsAndBinds grhss_and_binds `thenRn` \ (grhss_and_binds', 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') - sigs_for_me = filter ((`elemNameSet` names_bound_here) . sig_name) sigs - sigs_fvs = foldr sig_fv emptyNameSet sigs_for_me in - returnRn ( - uniq + 1, - [(uniq, - names_bound_here, - fvs `unionNameSets` sigs_fvs, - PatMonoBind pat' grhss_and_binds' locn, - sigs_for_me - )] - ) - -flattenMonoBinds uniq sigs (FunMonoBind name inf matches locn) - = pushSrcLocRn locn $ - mapRn (checkPrecMatch inf name) matches `thenRn_` - lookupRn name `thenRn` \ name' -> - mapAndUnzipRn rnMatch matches `thenRn` \ (new_matches, fv_lists) -> + sigsForMe names_bound_here sigs `thenM` \ sigs_for_me -> + rnGRHSs PatBindRhs grhss `thenM` \ (grhss', fvs) -> + returnM + (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 - fvs = unionManyNameSets fv_lists - sigs_for_me = filter ((name' ==) . sig_name) sigs - sigs_fvs = foldr sig_fv emptyNameSet sigs_for_me + plain_name = unLoc new_name + names_bound_here = unitNameSet plain_name in - returnRn ( - uniq + 1, - [(uniq, - unitNameSet name', - fvs `unionNameSets` sigs_fvs, - FunMonoBind name' inf new_matches locn, - sigs_for_me - )] - ) + sigsForMe names_bound_here sigs `thenM` \ sigs_for_me -> + mapFvRn (rnMatch (FunRhs plain_name)) matches `thenM` \ (new_matches, fvs) -> + mappM_ (checkPrecMatch inf plain_name) new_matches `thenM_` + returnM + (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 + -- 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 other `thenM_` + returnM sigs \end{code} -@rnMethodBinds@ is used for the method bindings of an instance -declaration. like @rnMonoBinds@ but without dependency analysis. - -\begin{code} -rnMethodBinds :: RdrNameMonoBinds -> RnMS s RenamedMonoBinds +@rnMethodBinds@ is used for the method bindings of a class and an instance +declaration. Like @rnBinds@ but without dependency analysis. -rnMethodBinds EmptyMonoBinds = returnRn EmptyMonoBinds +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. -rnMethodBinds (AndMonoBinds mb1 mb2) - = andRn AndMonoBinds (rnMethodBinds mb1) - (rnMethodBinds mb2) +\begin{code} +rnMethodBinds :: Name -- Class name + -> [Name] -- Names for generic type variables + -> (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 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 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 sel_name match@(L _ (Match (L _ (TypePat ty) : _) _ _)) + = extendTyVarEnvFVRn gen_tvs $ + rnMatch (FunRhs sel_name) match + where + tvs = map (rdrNameOcc.unLoc) (extractHsTyRdrTyVars ty) + gen_tvs = [tv | tv <- gen_tyvars, nameOccName tv `elem` tvs] -rnMethodBinds (FunMonoBind occname inf matches locn) - = pushSrcLocRn locn $ - mapRn (checkPrecMatch inf occname) matches `thenRn_` - lookupRn occname `thenRn` \ op_name -> - mapAndUnzipRn rnMatch matches `thenRn` \ (new_matches, _) -> - returnRn (FunMonoBind op_name inf new_matches locn) + rn_match sel_name match = rnMatch (FunRhs sel_name) match -rnMethodBinds (PatMonoBind (VarPatIn occname) grhss_and_binds locn) - = pushSrcLocRn locn $ - lookupRn occname `thenRn` \ op_name -> - rnGRHSsAndBinds grhss_and_binds `thenRn` \ (grhss_and_binds', _) -> - returnRn (PatMonoBind (VarPatIn op_name) grhss_and_binds' locn) -- Can't handle method pattern-bindings which bind multiple methods. -rnMethodBinds mbind@(PatMonoBind other_pat _ locn) - = pushSrcLocRn locn $ - failWithRn EmptyMonoBinds (methodBindErr mbind) +rnMethodBind cls gen_tyvars mbind@(L loc (PatBind other_pat _)) + = addLocErr mbind methodBindErr `thenM_` + returnM (emptyBag, 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 - -sig_fv (SpecSig _ _ (Just blah) _) acc = acc `unionNameSets` (unitNameSet blah) -sig_fv _ acc = acc -\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 :: [Edge] -- Original edges - -> FlatMonoBindsInfo - -> Cycle - -> RenamedHsBinds - -reconstructCycle edges mbi cycle - = mk_binds this_gp_binds this_gp_sigs (isCyclic edges cycle) - where - relevant_binds_and_sigs = [(binds,sigs) | (vertex, _, _, binds, sigs) <- mbi, - vertex `is_elem` cycle] - (binds, sig_lists) = unzip relevant_binds_and_sigs - this_gp_binds = foldr1 AndMonoBinds binds - this_gp_sigs = foldr1 (++) sig_lists - - is_elem = isIn "reconstructRec" - - mk_binds :: RenamedMonoBinds -> [RenamedSig] -> Bool -> RenamedHsBinds - mk_binds bs [] True = SingleBind (RecBind bs) - mk_binds bs ss True = BindWith (RecBind bs) ss - mk_binds bs [] False = SingleBind (NonRecBind bs) - mk_binds bs ss False = BindWith (NonRecBind bs) ss - - -- moved from Digraph, as this is the only use here - -- (avoid overloading cost). We have to use elem - -- (not FiniteMaps or whatever), because there may be - -- many edges out of one vertex. We give it its own - -- "elem" just for speed. - - isCyclic es [] = panic "isCyclic: empty component" - isCyclic es [v] = (v,v) `elem` es - isCyclic es vs = True - - elem _ [] = False - elem x (y:ys) = x==y || elem x ys -\end{code} - -%************************************************************************ -%* * -%* Manipulating FlatMonoBindInfo * -%* * -%************************************************************************ - -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. - \begin{code} -type FlatMonoBindsInfo - = [(VertexTag, -- Identifies the vertex - NameSet, -- Set of names defined in this vertex - NameSet, -- Set of names used in this vertex - RenamedMonoBinds, -- Binding for this vertex (always just one binding, either fun or pat) - [RenamedSig]) -- Signatures, if any, for this vertex - ] +type BindVertex = (Defs, Uses, LHsBind Name, [LSig Name]) + -- Signatures, if any, for this vertex -mkVertices :: FlatMonoBindsInfo -> [VertexTag] -mkEdges :: FlatMonoBindsInfo -> [Edge] +rnSCC :: [BindVertex] -> [SCC BindVertex] +rnSCC nodes = stronglyConnComp (mkEdges nodes) -mkVertices info = [ vertex | (vertex,_,_,_,_) <- info] +type VertexTag = Int -mkEdges flat_info -- An edge (v,v') indicates that v depends on v' - = [ (source_vertex, target_vertex) - | (source_vertex, _, used_names, _, _) <- flat_info, - target_name <- nameSetToList used_names, - target_vertex <- vertices_defining target_name 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 - -- If each name only has one binding in this group, then - -- vertices_defining will always return the empty list, or a - -- singleton. The case when there is more than one binding (an - -- error) needs more thought. - - vertices_defining name flat_info2 - = [ vertex | (vertex, names_defined, _, _, _) <- flat_info2, - name `elemNameSet` names_defined - ] + 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, + 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} @@ -468,101 +443,66 @@ mkEdges flat_info -- An edge (v,v') indicates that v depends on v' %* * %************************************************************************ -@rnBindSigs@ 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} -rnBindSigs :: Bool -- True <=> top-level binders - -> NameSet -- Set of names bound in this group - -> [RdrNameSig] - -> RnMS s [RenamedSig] -- List of Sig constructors - -rnBindSigs is_toplev binders sigs - = -- Rename the signatures - mapRn renameSig sigs `thenRn` \ 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 - -- (c) optionally, bindings with no signature - let - (goodies, dups) = removeDups cmp_sig (filter (not.isUnboundName.sig_name) sigs') - not_this_group = filter (\sig -> not (sig_name sig `elemNameSet` binders)) goodies - type_sig_vars = [n | Sig n _ _ <- goodies] - un_sigd_binders - | is_toplev && opt_SigsRequired = nameSetToList binders `minusList` type_sig_vars - | otherwise = [] - in - mapRn dupSigDeclErr dups `thenRn_` - mapRn unknownSigErr not_this_group `thenRn_` - mapRn (addErrRn.missingSigErr) un_sigd_binders `thenRn_` - - returnRn sigs' -- bad ones and all: - -- we need bindings of *some* sort for every name - - -renameSig (Sig v ty src_loc) - = pushSrcLocRn src_loc $ - lookupRn v `thenRn` \ new_v -> - rnHsType ty `thenRn` \ new_ty -> - returnRn (Sig new_v new_ty src_loc) - -renameSig (SpecSig v ty using src_loc) - = pushSrcLocRn src_loc $ - lookupRn v `thenRn` \ new_v -> - rnHsType ty `thenRn` \ new_ty -> - rn_using using `thenRn` \ new_using -> - returnRn (SpecSig new_v new_ty new_using src_loc) + -- Well, I can't see the check for (a)... ToDo! + = mappM_ unknownSigErr (filter bad sigs) where - rn_using Nothing = returnRn Nothing - rn_using (Just x) = lookupOccRn x `thenRn` \ new_x -> - returnRn (Just new_x) - -renameSig (InlineSig v src_loc) - = pushSrcLocRn src_loc $ - lookupRn v `thenRn` \ new_v -> - returnRn (InlineSig new_v src_loc) - -renameSig (DeforestSig v src_loc) - = pushSrcLocRn src_loc $ - lookupRn v `thenRn` \ new_v -> - returnRn (DeforestSig new_v src_loc) - -renameSig (MagicUnfoldingSig v str src_loc) - = pushSrcLocRn src_loc $ - lookupRn v `thenRn` \ new_v -> - returnRn (MagicUnfoldingSig new_v str src_loc) + 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: +-- instance Foo T where +-- {-# INLINE op #-} +-- Baz.op = ... +-- We'll just rename the INLINE prag to refer to whatever other 'op' +-- 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) +-- 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) + +renameSig (SpecInstSig ty) + = rnLHsType (text "A SPECIALISE instance pragma") ty `thenM` \ new_ty -> + returnM (SpecInstSig new_ty) + +renameSig (SpecSig v ty) + = lookupLocatedSigOccRn v `thenM` \ new_v -> + rnHsSigType (quotes (ppr v)) ty `thenM` \ new_ty -> + returnM (SpecSig new_v new_ty) + +renameSig (InlineSig b v p) + = lookupLocatedSigOccRn v `thenM` \ new_v -> + returnM (InlineSig b new_v p) \end{code} -Checking for distinct signatures; oh, so boring - -\begin{code} -cmp_sig :: RenamedSig -> RenamedSig -> TAG_ -cmp_sig (Sig n1 _ _) (Sig n2 _ _) = n1 `cmp` n2 -cmp_sig (InlineSig n1 _) (InlineSig n2 _) = n1 `cmp` n2 -cmp_sig (MagicUnfoldingSig n1 _ _) (MagicUnfoldingSig n2 _ _) = n1 `cmp` n2 -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 `cmp` n2) (cmpHsType cmp 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 (MagicUnfoldingSig n1 _ _) = ILIT(4) -sig_tag (DeforestSig n1 _) = ILIT(5) -sig_tag _ = panic# "tag(RnBinds)" - -sig_name (Sig n _ _) = n -sig_name (ClassOpSig n _ _ _) = n -sig_name (SpecSig n _ _ _) = n -sig_name (InlineSig n _) = n -sig_name (MagicUnfoldingSig n _ _) = n -\end{code} %************************************************************************ %* * @@ -571,31 +511,27 @@ sig_name (MagicUnfoldingSig n _ _) = n %************************************************************************ \begin{code} -dupSigDeclErr (sig:sigs) - = pushSrcLocRn loc $ - addErrRn (\sty -> ppSep [ppStr "more than one", - ppStr what_it_is, ppStr "given for", - ppQuote (ppr sty (sig_name 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) = sig_doc sig + what_it_is = hsSigDoc sig + ppr_sig (L loc sig) = ppr loc <> colon <+> ppr sig -unknownSigErr sig - = pushSrcLocRn loc $ - addErrRn (\sty -> ppSep [ppStr flavour, ppStr "but no definition for", - ppQuote (ppr sty (sig_name sig))]) +unknownSigErr (L loc sig) + = addErrAt loc $ + sep [ptext SLIT("Misplaced") <+> what_it_is <> colon, ppr sig] where - (flavour, loc) = sig_doc sig - -sig_doc (Sig _ _ loc) = ("type signature",loc) -sig_doc (ClassOpSig _ _ _ loc) = ("class-method type signature", loc) -sig_doc (SpecSig _ _ _ loc) = ("SPECIALIZE pragma",loc) -sig_doc (InlineSig _ loc) = ("INLINE pragma",loc) -sig_doc (MagicUnfoldingSig _ _ loc) = ("MAGIC_UNFOLDING pragma",loc) + what_it_is = hsSigDoc sig -missingSigErr var sty - = ppSep [ppStr "a definition but no type signature for", ppQuote (ppr sty var)] +missingSigWarn 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 sty - = ppHang (ppStr "Can't handle multiple methods defined by one pattern binding") - 4 (ppr sty mbind) +methodBindErr mbind + = hang (ptext SLIT("Can't handle multiple methods defined by one pattern binding")) + 4 (ppr mbind) \end{code}