%
-% (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}
\begin{code}
module RnBinds (
rnTopBinds, rnTopMonoBinds,
- rnMethodBinds,
+ rnMethodBinds, renameSigs,
rnBinds, rnMonoBinds
) where
import {-# SOURCE #-} RnSource ( rnHsSigType )
import HsSyn
-import HsPragmas ( isNoGenPragmas, noGenPragmas )
+import HsBinds ( sigsForMe )
import RdrHsSyn
import RnHsSyn
import RnMonad
-import RnExpr ( rnMatch, rnGRHSsAndBinds, rnPat, checkPrecMatch )
-import RnEnv ( bindLocatedLocalsRn, lookupBndrRn, lookupOccRn,
- newLocalNames, isUnboundName, warnUnusedBinds
+import RnExpr ( rnMatch, rnGRHSs, rnPat, checkPrecMatch )
+import RnEnv ( bindLocatedLocalsRn, lookupBndrRn, lookupOccRn, lookupGlobalOccRn,
+ isUnboundName, warnUnusedBinds,
+ FreeVars, emptyFVs, plusFV, plusFVs, unitFV
)
-import CmdLineOpts ( opt_SigsRequired )
+import CmdLineOpts ( opt_WarnMissingSigs )
import Digraph ( stronglyConnComp, SCC(..) )
-import Name ( OccName(..), Provenance,
- Name, isExportedName,
- NameSet(..), emptyNameSet, mkNameSet, unionNameSets,
- minusNameSet, unionManyNameSets, elemNameSet, unitNameSet, nameSetToList
- )
+import Name ( OccName, Name )
+import NameSet
import BasicTypes ( RecFlag(..), TopLevelFlag(..) )
-import Maybes ( catMaybes )
-import Util ( thenCmp, isIn, removeDups, panic, panic#, assertPanic, assocDefault )
-import UniqSet ( UniqSet )
+import Util ( thenCmp, removeDups )
import ListSetOps ( minusList )
import Bag ( bagToList )
-import UniqFM ( UniqFM )
import Outputable
\end{code}
contains bindings for the binders of this particular binding.
\begin{code}
-rnTopBinds :: RdrNameHsBinds -> RnMS s RenamedHsBinds
+rnTopBinds :: RdrNameHsBinds -> RnMS s (RenamedHsBinds, FreeVars)
-rnTopBinds EmptyBinds = returnRn EmptyBinds
+rnTopBinds EmptyBinds = returnRn (EmptyBinds, emptyFVs)
rnTopBinds (MonoBind bind sigs _) = rnTopMonoBinds bind sigs
-- The parser doesn't produce other forms
rnTopMonoBinds EmptyMonoBinds sigs
- = returnRn EmptyBinds
+ = returnRn (EmptyBinds, emptyFVs)
rnTopMonoBinds mbinds sigs
= mapRn lookupBndrRn binder_rdr_names `thenRn` \ binder_names ->
let
- binder_set = mkNameSet binder_names
- exported_binders = mkNameSet (filter isExportedName binder_names)
- in
- rn_mono_binds TopLevel
- binder_set mbinds sigs `thenRn` \ (new_binds, fv_set) ->
- let
- unused_binders = binder_set `minusNameSet` (fv_set `unionNameSets` exported_binders)
+ binder_set = mkNameSet binder_names
in
- warnUnusedBinds unused_binders `thenRn_`
- returnRn new_binds
+ rn_mono_binds TopLevel binder_set mbinds sigs
where
binder_rdr_names = map fst (bagToList (collectMonoBinders mbinds))
\end{code}
-- Now do the "thing inside", and deal with the free-variable calculations
thing_inside binds `thenRn` \ (result,result_fvs) ->
let
- all_fvs = result_fvs `unionNameSets` bind_fvs
- net_fvs = all_fvs `minusNameSet` binder_set
- unused_binders = binder_set `minusNameSet` all_fvs
+ all_fvs = result_fvs `plusFV` bind_fvs
+ unused_binders = nameSetToList (binder_set `minusNameSet` all_fvs)
in
warnUnusedBinds unused_binders `thenRn_`
- returnRn (result, net_fvs)
+ returnRn (result, delListFromNameSet all_fvs new_mbinders)
where
mbinders_w_srclocs = bagToList (collectMonoBinders mbinds)
\end{code}
-- Rename the bindings, returning a MonoBindsInfo
-- which is a list of indivisible vertices so far as
-- the strongly-connected-components (SCC) analysis is concerned
- rnBindSigs top_lev binders sigs `thenRn` \ siglist ->
- flattenMonoBinds 0 siglist mbinds `thenRn` \ (_, mbinds_info) ->
+ renameSigs top_lev False binders sigs `thenRn` \ siglist ->
+ flattenMonoBinds siglist mbinds `thenRn` \ mbinds_info ->
-- Do the SCC analysis
- let edges = mkEdges mbinds_info
+ 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 = unionManyNameSets [fvs | (_,_,fvs,_,_) <- mbinds_info]
+ rhs_fvs = plusFVs [fvs | (_,fvs,_,_) <- mbinds_info]
in
returnRn (final_binds, rhs_fvs)
\end{code}
unique ``vertex tags'' on its output; minor plumbing required.
\begin{code}
-flattenMonoBinds :: Int -- Next free vertex tag
- -> [RenamedSig] -- Signatures
+flattenMonoBinds :: [RenamedSig] -- Signatures
-> RdrNameMonoBinds
- -> RnMS s (Int, [FlatMonoBindsInfo])
+ -> RnMS s [FlatMonoBindsInfo]
-flattenMonoBinds uniq sigs EmptyMonoBinds = returnRn (uniq, [])
+flattenMonoBinds sigs EmptyMonoBinds = returnRn []
-flattenMonoBinds uniq sigs (AndMonoBinds bs1 bs2)
- = flattenMonoBinds uniq sigs bs1 `thenRn` \ (uniq1, flat1) ->
- flattenMonoBinds uniq1 sigs bs2 `thenRn` \ (uniq2, flat2) ->
- returnRn (uniq2, flat1 ++ flat2)
+flattenMonoBinds sigs (AndMonoBinds bs1 bs2)
+ = flattenMonoBinds sigs bs1 `thenRn` \ flat1 ->
+ flattenMonoBinds sigs bs2 `thenRn` \ flat2 ->
+ returnRn (flat1 ++ flat2)
-flattenMonoBinds uniq sigs (PatMonoBind pat grhss_and_binds locn)
+flattenMonoBinds sigs (PatMonoBind pat grhss locn)
= pushSrcLocRn locn $
- rnPat pat `thenRn` \ pat' ->
- rnGRHSsAndBinds grhss_and_binds `thenRn` \ (grhss_and_binds', fvs) ->
+ rnPat pat `thenRn` \ (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
+ sigs_for_me = sigsForMe (`elemNameSet` names_bound_here) sigs
+ sigs_fvs = foldr sig_fv emptyFVs sigs_for_me
+ fixity_sigs = [(name,sig) | FixSig sig@(FixitySig name _ _) <- sigs_for_me]
in
- returnRn (
- uniq + 1,
- [(uniq,
- names_bound_here,
- fvs `unionNameSets` sigs_fvs,
- PatMonoBind pat' grhss_and_binds' locn,
+ extendFixityEnv fixity_sigs $
+ rnGRHSs grhss `thenRn` \ (grhss', fvs) ->
+ returnRn
+ [(names_bound_here,
+ fvs `plusFV` sigs_fvs `plusFV` pat_fvs,
+ PatMonoBind pat' grhss' locn,
sigs_for_me
)]
- )
-flattenMonoBinds uniq sigs (FunMonoBind name inf matches locn)
- = pushSrcLocRn locn $
- mapRn (checkPrecMatch inf name) matches `thenRn_`
- lookupBndrRn name `thenRn` \ name' ->
- mapAndUnzipRn rnMatch matches `thenRn` \ (new_matches, fv_lists) ->
+flattenMonoBinds sigs (FunMonoBind name inf matches locn)
+ = pushSrcLocRn locn $
+ lookupBndrRn name `thenRn` \ name' ->
let
- fvs = unionManyNameSets fv_lists
- sigs_for_me = filter ((name' ==) . sig_name) sigs
- sigs_fvs = foldr sig_fv emptyNameSet sigs_for_me
+ sigs_for_me = sigsForMe (name' ==) sigs
+ sigs_fvs = foldr sig_fv emptyFVs sigs_for_me
+ fixity_sigs = [(name,sig) | FixSig sig@(FixitySig name _ _) <- sigs_for_me]
in
- returnRn (
- uniq + 1,
- [(uniq,
- unitNameSet name',
- fvs `unionNameSets` sigs_fvs,
+ extendFixityEnv fixity_sigs $
+ mapAndUnzipRn rnMatch matches `thenRn` \ (new_matches, fv_lists) ->
+ mapRn (checkPrecMatch inf name') new_matches `thenRn_`
+ returnRn
+ [(unitNameSet name',
+ plusFVs fv_lists `plusFV` sigs_fvs,
FunMonoBind name' inf new_matches locn,
sigs_for_me
)]
- )
\end{code}
declaration. like @rnMonoBinds@ but without dependency analysis.
\begin{code}
-rnMethodBinds :: RdrNameMonoBinds -> RnMS s RenamedMonoBinds
+rnMethodBinds :: RdrNameMonoBinds -> RnMS s (RenamedMonoBinds, FreeVars)
-rnMethodBinds EmptyMonoBinds = returnRn EmptyMonoBinds
+rnMethodBinds EmptyMonoBinds = returnRn (EmptyMonoBinds, emptyFVs)
rnMethodBinds (AndMonoBinds mb1 mb2)
- = andRn AndMonoBinds (rnMethodBinds mb1)
- (rnMethodBinds mb2)
+ = rnMethodBinds mb1 `thenRn` \ (mb1', fvs1) ->
+ rnMethodBinds mb2 `thenRn` \ (mb2', fvs2) ->
+ returnRn (mb1' `AndMonoBinds` mb2', fvs1 `plusFV` fvs2)
-rnMethodBinds (FunMonoBind occname inf matches locn)
- = pushSrcLocRn locn $
- mapRn (checkPrecMatch inf occname) matches `thenRn_`
+rnMethodBinds (FunMonoBind name inf matches locn)
+ = pushSrcLocRn locn $
- newLocalNames [(occname, locn)] `thenRn` \ [op_name] ->
- -- Make a fresh local for the bound variable; it must be different
- -- to occurrences of the same thing on the LHS, which refer to the global
- -- selectors.
+ lookupGlobalOccRn name `thenRn` \ sel_name ->
+ -- We use the selector name as the binder
- mapAndUnzipRn rnMatch matches `thenRn` \ (new_matches, _) ->
- returnRn (FunMonoBind op_name inf new_matches locn)
+ mapAndUnzipRn rnMatch matches `thenRn` \ (new_matches, fvs_s) ->
+ mapRn (checkPrecMatch inf sel_name) new_matches `thenRn_`
+ returnRn (FunMonoBind sel_name inf new_matches locn, plusFVs fvs_s)
-rnMethodBinds (PatMonoBind (VarPatIn occname) grhss_and_binds locn)
+rnMethodBinds (PatMonoBind (VarPatIn name) grhss locn)
= pushSrcLocRn locn $
- newLocalNames [(occname, locn)] `thenRn` \ [op_name] ->
- rnGRHSsAndBinds grhss_and_binds `thenRn` \ (grhss_and_binds', _) ->
- returnRn (PatMonoBind (VarPatIn op_name) grhss_and_binds' locn)
+ lookupGlobalOccRn name `thenRn` \ sel_name ->
+ rnGRHSs grhss `thenRn` \ (grhss', fvs) ->
+ returnRn (PatMonoBind (VarPatIn sel_name) grhss' locn, fvs)
-- Can't handle method pattern-bindings which bind multiple methods.
rnMethodBinds mbind@(PatMonoBind other_pat _ locn)
= pushSrcLocRn locn $
- failWithRn EmptyMonoBinds (methodBindErr mbind)
+ failWithRn (EmptyMonoBinds, emptyFVs) (methodBindErr mbind)
\end{code}
\begin{code}
-- 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 (SpecSig _ _ (Just blah) _) acc = acc `plusFV` unitFV blah
sig_fv _ acc = acc
\end{code}
reconstructCycle :: SCC FlatMonoBindsInfo
-> RenamedHsBinds
-reconstructCycle (AcyclicSCC (_, _, _, binds, sigs))
+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]
+ this_gp_binds = foldr1 AndMonoBinds [binds | (_, _, binds, _) <- cycle]
+ this_gp_sigs = foldr1 (++) [sigs | (_, _, _, sigs) <- cycle]
\end{code}
%************************************************************************
\begin{code}
type FlatMonoBindsInfo
- = (VertexTag, -- Identifies the vertex
- NameSet, -- Set of names defined in this 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)
+ RenamedMonoBinds,
[RenamedSig]) -- Signatures, if any, for this vertex
-
-mkEdges :: [FlatMonoBindsInfo] -> [(FlatMonoBindsInfo, VertexTag, [VertexTag])]
+mkEdges :: [(FlatMonoBindsInfo, VertexTag)] -> [(FlatMonoBindsInfo, VertexTag, [VertexTag])]
mkEdges flat_info
= [ (info, tag, dest_vertices (nameSetToList names_used))
- | info@(tag, names_defined, names_used, mbind, sigs) <- flat_info
+ | (info@(names_defined, names_used, mbind, sigs), tag) <- flat_info
]
where
-- An edge (v,v') indicates that v depends on v'
dest_vertices src_mentions = [ target_vertex
- | (target_vertex, names_defined, _, _, _) <- flat_info,
+ | ((names_defined, _, _, _), target_vertex) <- flat_info,
mentioned_name <- src_mentions,
mentioned_name `elemNameSet` names_defined
]
%* *
%************************************************************************
-@rnBindSigs@ checks for: (a)~more than one sig for one thing;
+@renameSigs@ checks for: (a)~more than one sig for one thing;
(b)~signatures given for things not bound here; (c)~with suitably
flaggery, that all top-level things have type signatures.
-\begin{code}
-rnBindSigs :: TopLevelFlag
- -> NameSet -- Set of names bound in this group
- -> [RdrNameSig]
- -> RnMS s [RenamedSig] -- List of Sig constructors
+At the moment we don't gather free-var info from the types in
+sigatures. We'd only need this if we wanted to report unused tyvars.
-rnBindSigs top_lev binders sigs
+\begin{code}
+renameSigs :: TopLevelFlag
+ -> Bool -- True <-> sigs for an instance decl
+ -- hence SPECIALISE instance prags ok
+ -> NameSet -- Set of names bound in this group
+ -> [RdrNameSig]
+ -> RnMS s [RenamedSig] -- List of Sig constructors
+
+renameSigs top_lev inst_decl binders sigs
= -- Rename the signatures
mapRn renameSig sigs `thenRn` \ sigs' ->
-- (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]
- sigs_required = case top_lev of {TopLevel -> opt_SigsRequired; NotTopLevel -> False}
+ (goodies, dups) = removeDups cmp_sig (sigsForMe (not . isUnboundName) sigs')
+ not_this_group = sigsForMe (not . (`elemNameSet` binders)) goodies
+ spec_inst_sigs = [s | s@(SpecInstSig _ _) <- goodies]
+ type_sig_vars = [n | Sig n _ _ <- goodies]
+ fixes = [f | f@(FixSig _) <- goodies]
+ idecl_type_sigs = [s | s@(Sig _ _ _) <- goodies]
+ sigs_required = case top_lev of {TopLevel -> opt_WarnMissingSigs; NotTopLevel -> False}
un_sigd_binders | sigs_required = 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_`
+ (if not inst_decl then
+ mapRn unknownSigErr spec_inst_sigs
+ else
+ -- We're being strict here, outlawing the presence
+ -- of type signatures within an instance declaration.
+ mapRn unknownSigErr (fixes ++ idecl_type_sigs)
+ ) `thenRn_`
+ mapRn (addWarnRn.missingSigWarn) 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 $
lookupBndrRn v `thenRn` \ new_v ->
- rnHsSigType (quotes (ppr v)) ty `thenRn` \ new_ty ->
+ rnHsSigType (quotes (ppr v)) ty `thenRn` \ (new_ty,_) ->
returnRn (Sig new_v new_ty src_loc)
+renameSig (SpecInstSig ty src_loc)
+ = pushSrcLocRn src_loc $
+ rnHsSigType (text "A SPECIALISE instance pragma") ty `thenRn` \ (new_ty, _) ->
+ returnRn (SpecInstSig new_ty src_loc)
+
renameSig (SpecSig v ty using src_loc)
= pushSrcLocRn src_loc $
lookupBndrRn v `thenRn` \ new_v ->
- rnHsSigType (quotes (ppr v)) ty `thenRn` \ new_ty ->
+ rnHsSigType (quotes (ppr v)) ty `thenRn` \ (new_ty,_) ->
rn_using using `thenRn` \ new_using ->
returnRn (SpecSig new_v new_ty new_using src_loc)
where
lookupBndrRn v `thenRn` \ new_v ->
returnRn (InlineSig new_v src_loc)
-renameSig (MagicUnfoldingSig v str src_loc)
+renameSig (FixSig (FixitySig v fix src_loc))
= pushSrcLocRn src_loc $
lookupBndrRn v `thenRn` \ new_v ->
- returnRn (MagicUnfoldingSig new_v str src_loc)
+ returnRn (FixSig (FixitySig new_v fix src_loc))
+
+renameSig (NoInlineSig v src_loc)
+ = pushSrcLocRn src_loc $
+ lookupBndrRn v `thenRn` \ new_v ->
+ returnRn (NoInlineSig new_v src_loc)
\end{code}
Checking for distinct signatures; oh, so boring
\begin{code}
cmp_sig :: RenamedSig -> RenamedSig -> Ordering
-cmp_sig (Sig n1 _ _) (Sig n2 _ _) = n1 `compare` n2
-cmp_sig (InlineSig n1 _) (InlineSig n2 _) = n1 `compare` n2
-cmp_sig (MagicUnfoldingSig n1 _ _) (MagicUnfoldingSig n2 _ _) = n1 `compare` n2
-cmp_sig (SpecSig n1 ty1 _ _) (SpecSig n2 ty2 _ _)
+cmp_sig (Sig n1 _ _) (Sig n2 _ _) = n1 `compare` n2
+cmp_sig (InlineSig n1 _) (InlineSig n2 _) = n1 `compare` n2
+cmp_sig (NoInlineSig n1 _) (NoInlineSig n2 _) = n1 `compare` n2
+cmp_sig (SpecInstSig ty1 _) (SpecInstSig ty2 _) = cmpHsType compare ty1 ty2
+cmp_sig (SpecSig n1 ty1 _ _) (SpecSig n2 ty2 _ _)
= -- may have many specialisations for one value;
-- but not ones that are exactly the same...
thenCmp (n1 `compare` n2) (cmpHsType compare ty1 ty2)
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 (NoInlineSig n1 _) = ILIT(4)
+sig_tag (SpecInstSig _ _) = ILIT(5)
+sig_tag (FixSig _) = ILIT(6)
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}
%************************************************************************
\begin{code}
dupSigDeclErr (sig:sigs)
= pushSrcLocRn loc $
- addErrRn (sep [ptext SLIT("more than one"),
- ptext what_it_is, ptext SLIT("given for"),
- quotes (ppr (sig_name sig))])
+ addErrRn (sep [ptext SLIT("Duplicate"),
+ ptext what_it_is <> colon,
+ ppr sig])
where
(what_it_is, loc) = sig_doc sig
unknownSigErr sig
= pushSrcLocRn loc $
- addErrRn (sep [ptext flavour, ptext SLIT("but no definition for"),
- quotes (ppr (sig_name sig))])
+ addErrRn (sep [ptext SLIT("Misplaced"),
+ ptext what_it_is <> colon,
+ ppr sig])
where
- (flavour, loc) = sig_doc sig
+ (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("SPECIALIZE pragma"),loc)
-sig_doc (InlineSig _ loc) = (SLIT("INLINE pragma"),loc)
-sig_doc (MagicUnfoldingSig _ _ loc) = (SLIT("MAGIC_UNFOLDING pragma"),loc)
+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)
-missingSigErr var
- = sep [ptext SLIT("Definition but no type signature for"), quotes (ppr var)]
+missingSigWarn var
+ = sep [ptext SLIT("definition but no type signature for"), quotes (ppr var)]
methodBindErr mbind
= hang (ptext SLIT("Can't handle multiple methods defined by one pattern binding"))
projects / ghc-hetmet.git / blobdiff