%
-% (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}
import RdrHsSyn
import RnHsSyn
import RnMonad
-import RnExpr ( rnMatch, rnGRHSsAndBinds, rnPat, checkPrecMatch )
+import RnExpr ( rnMatch, rnGRHSs, rnPat, checkPrecMatch )
import RnEnv ( bindLocatedLocalsRn, lookupBndrRn, lookupOccRn, lookupGlobalOccRn,
- isUnboundName, warnUnusedBinds
+ isUnboundName, warnUnusedLocalBinds,
+ 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 Util ( thenCmp, removeDups, panic, panic#, assertPanic )
-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)
+ warnUnusedLocalBinds unused_binders `thenRn_`
+ 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
- renameSigs top_lev False binders sigs `thenRn` \ siglist ->
- flattenMonoBinds siglist mbinds `thenRn` \ mbinds_info ->
+ renameSigs top_lev False binders sigs `thenRn` \ (siglist, sig_fvs) ->
+ flattenMonoBinds siglist mbinds `thenRn` \ mbinds_info ->
-- Do the SCC analysis
let edges = mkEdges (mbinds_info `zip` [(0::Int)..])
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)
+ returnRn (final_binds, rhs_fvs `plusFV` sig_fvs)
\end{code}
@flattenMonoBinds@ is ever-so-slightly magical in that it sticks
flattenMonoBinds sigs bs2 `thenRn` \ flat2 ->
returnRn (flat1 ++ flat2)
-flattenMonoBinds 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 = sigsForMe (`elemNameSet` names_bound_here) sigs
- sigs_fvs = foldr sig_fv emptyNameSet sigs_for_me
+ sigs_fvs = foldr sig_fv emptyFVs sigs_for_me
+ fixity_sigs = [(name,sig) | FixSig sig@(FixitySig name _ _) <- sigs_for_me]
in
+ extendFixityEnv fixity_sigs $
+ rnGRHSs grhss `thenRn` \ (grhss', fvs) ->
returnRn
[(names_bound_here,
- fvs `unionNameSets` sigs_fvs,
- PatMonoBind pat' grhss_and_binds' locn,
+ fvs `plusFV` sigs_fvs `plusFV` pat_fvs,
+ PatMonoBind pat' grhss' locn,
sigs_for_me
)]
flattenMonoBinds 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) ->
+ = pushSrcLocRn locn $
+ lookupBndrRn name `thenRn` \ name' ->
let
- fvs = unionManyNameSets fv_lists
sigs_for_me = sigsForMe (name' ==) sigs
- sigs_fvs = foldr sig_fv emptyNameSet sigs_for_me
+ sigs_fvs = foldr sig_fv emptyFVs sigs_for_me
+ fixity_sigs = [(name,sig) | FixSig sig@(FixitySig name _ _) <- sigs_for_me]
in
+ extendFixityEnv fixity_sigs $
+ mapAndUnzipRn rnMatch matches `thenRn` \ (new_matches, fv_lists) ->
+ mapRn (checkPrecMatch inf name') new_matches `thenRn_`
returnRn
[(unitNameSet name',
- fvs `unionNameSets` sigs_fvs,
+ plusFVs fv_lists `plusFV` sigs_fvs,
FunMonoBind name' inf new_matches locn,
sigs_for_me
)]
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 name inf matches locn)
- = pushSrcLocRn locn $
- mapRn (checkPrecMatch inf name) matches `thenRn_`
+ = pushSrcLocRn locn $
- lookupGlobalOccRn name `thenRn` \ sel_name ->
+ lookupGlobalOccRn name `thenRn` \ sel_name ->
-- We use the selector name as the binder
- mapAndUnzipRn rnMatch matches `thenRn` \ (new_matches, _) ->
- returnRn (FunMonoBind sel_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 name) grhss_and_binds locn)
+rnMethodBinds (PatMonoBind (VarPatIn name) grhss locn)
= pushSrcLocRn locn $
lookupGlobalOccRn name `thenRn` \ sel_name ->
- rnGRHSsAndBinds grhss_and_binds `thenRn` \ (grhss_and_binds', _) ->
- returnRn (PatMonoBind (VarPatIn sel_name) grhss_and_binds' locn)
+ 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)
+-- This is only necessary for the dependency analysis. The free vars
+-- of the types in the signatures is gotten from renameSigs
+
+sig_fv (SpecSig _ _ (Just blah) _) acc = acc `plusFV` unitFV blah
sig_fv _ acc = acc
\end{code}
(b)~signatures given for things not bound here; (c)~with suitably
flaggery, that all top-level things have type signatures.
+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.
+
\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
+ -> RnMS s ([RenamedSig], FreeVars) -- List of Sig constructors
renameSigs top_lev inst_decl binders sigs
= -- Rename the signatures
- mapRn renameSig sigs `thenRn` \ sigs' ->
+ mapAndUnzipRn renameSig sigs `thenRn` \ (sigs', fvs_s) ->
-- Check for (a) duplicate signatures
-- (b) signatures for things not in this group
(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]
- sigs_required = case top_lev of {TopLevel -> opt_SigsRequired; NotTopLevel -> False}
+ 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
(if not inst_decl then
mapRn unknownSigErr spec_inst_sigs
else
- returnRn []
+ -- We're being strict here, outlawing the presence
+ -- of type signatures within an instance declaration.
+ mapRn unknownSigErr (fixes ++ idecl_type_sigs)
) `thenRn_`
- mapRn (addErrRn.missingSigErr) un_sigd_binders `thenRn_`
+ mapRn (addWarnRn.missingSigWarn) un_sigd_binders `thenRn_`
- returnRn sigs' -- bad ones and all:
- -- we need bindings of *some* sort for every name
+ returnRn (sigs', plusFVs fvs_s) -- bad ones and all:
+ -- we need bindings of *some* sort for every name
+-- We use lookupOccRn in the signatures, which is a little bit unsatisfactory
+-- becuase 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.
renameSig (Sig v ty src_loc)
= pushSrcLocRn src_loc $
- lookupBndrRn v `thenRn` \ new_v ->
- rnHsSigType (quotes (ppr v)) ty `thenRn` \ new_ty ->
- returnRn (Sig new_v new_ty src_loc)
+ lookupOccRn v `thenRn` \ new_v ->
+ rnHsSigType (quotes (ppr v)) ty `thenRn` \ (new_ty,fvs) ->
+ returnRn (Sig new_v new_ty src_loc, fvs)
renameSig (SpecInstSig ty src_loc)
= pushSrcLocRn src_loc $
- rnHsSigType (text "A SPECIALISE instance pragma") ty `thenRn` \ new_ty ->
- returnRn (SpecInstSig new_ty src_loc)
+ rnHsSigType (text "A SPECIALISE instance pragma") ty `thenRn` \ (new_ty, fvs) ->
+ returnRn (SpecInstSig new_ty src_loc, fvs)
renameSig (SpecSig v ty using src_loc)
= pushSrcLocRn src_loc $
- lookupBndrRn v `thenRn` \ new_v ->
- rnHsSigType (quotes (ppr v)) ty `thenRn` \ new_ty ->
- rn_using using `thenRn` \ new_using ->
- returnRn (SpecSig new_v new_ty new_using src_loc)
+ lookupOccRn v `thenRn` \ new_v ->
+ rnHsSigType (quotes (ppr v)) ty `thenRn` \ (new_ty,fvs1) ->
+ rn_using using `thenRn` \ (new_using,fvs2) ->
+ returnRn (SpecSig new_v new_ty new_using src_loc, fvs1 `plusFV` fvs2)
where
- rn_using Nothing = returnRn Nothing
+ rn_using Nothing = returnRn (Nothing, emptyFVs)
rn_using (Just x) = lookupOccRn x `thenRn` \ new_x ->
- returnRn (Just new_x)
+ returnRn (Just new_x, unitFV new_x)
renameSig (InlineSig v src_loc)
= pushSrcLocRn src_loc $
- lookupBndrRn v `thenRn` \ new_v ->
- returnRn (InlineSig new_v src_loc)
+ lookupOccRn v `thenRn` \ new_v ->
+ returnRn (InlineSig new_v src_loc, emptyFVs)
+
+renameSig (FixSig (FixitySig v fix src_loc))
+ = pushSrcLocRn src_loc $
+ lookupOccRn v `thenRn` \ new_v ->
+ returnRn (FixSig (FixitySig new_v fix src_loc), emptyFVs)
renameSig (NoInlineSig v src_loc)
= pushSrcLocRn src_loc $
- lookupBndrRn v `thenRn` \ new_v ->
- returnRn (NoInlineSig new_v src_loc)
+ lookupOccRn v `thenRn` \ new_v ->
+ returnRn (NoInlineSig new_v src_loc, emptyFVs)
\end{code}
Checking for distinct signatures; oh, so boring
sig_tag (InlineSig n1 _) = ILIT(3)
sig_tag (NoInlineSig n1 _) = ILIT(4)
sig_tag (SpecInstSig _ _) = ILIT(5)
+sig_tag (FixSig _) = ILIT(6)
sig_tag _ = panic# "tag(RnBinds)"
\end{code}
where
(what_it_is, loc) = sig_doc sig
-sig_doc (Sig _ _ loc) = (SLIT("type signature"),loc)
-sig_doc (ClassOpSig _ _ _ loc) = (SLIT("class-method type signature"), loc)
-sig_doc (SpecSig _ _ _ loc) = (SLIT("SPECIALISE pragma"),loc)
-sig_doc (InlineSig _ loc) = (SLIT("INLINE pragma"),loc)
-sig_doc (NoInlineSig _ loc) = (SLIT("NOINLINE pragma"),loc)
-sig_doc (SpecInstSig _ loc) = (SLIT("SPECIALISE instance pragma"),loc)
+sig_doc (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