X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Frename%2FRnBinds.lhs;h=0036a5303b0a2cfbb70d07f1b1cee66973bf1a42;hb=e1a4f2a5be6e4cd06d96b601fefd519c2569ba99;hp=8780058bc478e1b80f6f56db65f474c3044eac18;hpb=d3e697b8d842bd43329d470f2bc424a6dcb88d89;p=ghc-hetmet.git diff --git a/ghc/compiler/rename/RnBinds.lhs b/ghc/compiler/rename/RnBinds.lhs index 8780058..0036a53 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} @@ -11,8 +11,9 @@ they may be affected by renaming (which isn't fully worked out yet). \begin{code} module RnBinds ( rnTopBinds, rnTopMonoBinds, - rnMethodBinds, - rnBinds, rnMonoBinds + rnMethodBinds, renameSigs, + rnBinds, + unknownSigErr ) where #include "HsVersions.h" @@ -20,26 +21,28 @@ module RnBinds ( import {-# SOURCE #-} RnSource ( rnHsSigType ) import HsSyn +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, lookupGlobalOccRn, + warnUnusedLocalBinds, mapFvRn, + FreeVars, emptyFVs, plusFV, plusFVs, unitFV, addOneFV, + unknownNameErr ) -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, nameOccName ) +import NameSet +import RdrName ( RdrName, rdrNameOcc ) import BasicTypes ( RecFlag(..), TopLevelFlag(..) ) -import Util ( thenCmp, removeDups, panic, panic#, assertPanic ) -import UniqSet ( UniqSet ) +import Util ( thenCmp, removeDups ) +import List ( partition ) import ListSetOps ( minusList ) import Bag ( bagToList ) -import UniqFM ( UniqFM ) +import FiniteMap ( lookupFM, listToFM ) +import Maybe ( isJust ) import Outputable \end{code} @@ -150,7 +153,7 @@ it expects the global environment to contain bindings for the binders %************************************************************************ %* * -%* Top-level bindings +\subsubsection{ Top-level bindings} %* * %************************************************************************ @@ -158,31 +161,36 @@ it expects the global environment to contain bindings for the binders contains bindings for the binders of this particular binding. \begin{code} -rnTopBinds :: RdrNameHsBinds -> RnMS s RenamedHsBinds +rnTopBinds :: RdrNameHsBinds -> RnMS (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 + binder_occ_fm = listToFM [(nameOccName x,x) | x <- binder_names] in - warnUnusedBinds unused_binders `thenRn_` - returnRn new_binds + renameSigs opt_WarnMissingSigs binder_set + (lookupSigOccRn binder_occ_fm) sigs `thenRn` \ (siglist, sig_fvs) -> + rn_mono_binds siglist mbinds `thenRn` \ (final_binds, bind_fvs) -> + returnRn (final_binds, bind_fvs `plusFV` sig_fvs) where binder_rdr_names = map fst (bagToList (collectMonoBinders mbinds)) + +-- the names appearing in the sigs have to be bound by +-- this group's binders. +lookupSigOccRn binder_occ_fm rdr_name + = case lookupFM binder_occ_fm (rdrNameOcc rdr_name) of + Nothing -> failWithRn (mkUnboundName rdr_name) + (unknownNameErr rdr_name) + Just x -> returnRn x \end{code} %************************************************************************ @@ -191,25 +199,30 @@ rnTopMonoBinds mbinds sigs %* * %************************************************************************ -@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 +\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} rnBinds :: RdrNameHsBinds - -> (RenamedHsBinds -> RnMS s (result, FreeVars)) - -> RnMS s (result, FreeVars) + -> (RenamedHsBinds -> RnMS (result, FreeVars)) + -> RnMS (result, FreeVars) rnBinds EmptyBinds thing_inside = thing_inside EmptyBinds rnBinds (MonoBind bind sigs _) thing_inside = rnMonoBinds bind sigs thing_inside -- the parser doesn't produce other forms -rnMonoBinds :: RdrNameMonoBinds -> [RdrNameSig] - -> (RenamedHsBinds -> RnMS s (result, FreeVars)) - -> RnMS s (result, FreeVars) +rnMonoBinds :: RdrNameMonoBinds + -> [RdrNameSig] + -> (RenamedHsBinds -> RnMS (result, FreeVars)) + -> RnMS (result, FreeVars) rnMonoBinds EmptyMonoBinds sigs thing_inside = thing_inside EmptyBinds @@ -217,22 +230,44 @@ 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 (text "binding group") mbinders_w_srclocs $ \ new_mbinders -> + bindLocatedLocalsRn (text "a binding group") mbinders_w_srclocs + $ \ new_mbinders -> + let + binder_set = mkNameSet new_mbinders + + -- Weed out the fixity declarations that do not + -- apply to any of the binders in this group. + (sigs_for_me, fixes_not_for_me) = partition forLocalBind sigs + + forLocalBind (FixSig sig@(FixitySig name _ _ )) = + isJust (lookupFM binder_occ_fm (rdrNameOcc name)) + forLocalBind _ = True + + binder_occ_fm = listToFM [(nameOccName x,x) | x <- new_mbinders] + + in + -- Report the fixity declarations in this group that + -- don't refer to any of the group's binders. + -- + mapRn_ (unknownSigErr) fixes_not_for_me `thenRn_` + renameSigs False binder_set + (lookupSigOccRn binder_occ_fm) sigs_for_me `thenRn` \ (siglist, sig_fvs) -> let - binder_set = mkNameSet new_mbinders + fixity_sigs = [(name,sig) | FixSig sig@(FixitySig name _ _) <- siglist ] in - rn_mono_binds NotTopLevel - binder_set mbinds sigs `thenRn` \ (binds,bind_fvs) -> + -- Install the fixity declarations that do apply here and go. + extendFixityEnv fixity_sigs ( + rn_mono_binds siglist mbinds + ) `thenRn` \ (binds, bind_fvs) -> - -- Now do the "thing inside", and deal with the free-variable calculations - thing_inside binds `thenRn` \ (result,result_fvs) -> + -- 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 `plusFV` sig_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} @@ -240,38 +275,36 @@ rnMonoBinds mbinds sigs thing_inside -- Non-empty monobinds %************************************************************************ %* * -%* MonoBinds -- the main work is done here +\subsubsection{ MonoBinds -- 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). +@rn_mono_binds@ 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 :: TopLevelFlag - -> NameSet -- Binders of this group +rn_mono_binds :: [RenamedSig] -- Signatures attached to this group -> RdrNameMonoBinds - -> [RdrNameSig] -- Signatures attached to this group - -> RnMS s (RenamedHsBinds, -- + -> RnMS (RenamedHsBinds, -- FreeVars) -- Free variables -rn_mono_binds top_lev binders mbinds sigs +rn_mono_binds siglist mbinds = -- 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 siglist mbinds `thenRn` \ mbinds_info -> + flattenMonoBinds siglist mbinds `thenRn` \ mbinds_info -> -- Do the SCC analysis - let edges = mkEdges (mbinds_info `zip` [0..]) + 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} @@ -279,10 +312,13 @@ rn_mono_binds top_lev binders mbinds sigs @flattenMonoBinds@ 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 - -> RnMS s (Int, [FlatMonoBindsInfo]) + -> RnMS [FlatMonoBindsInfo] flattenMonoBinds sigs EmptyMonoBinds = returnRn [] @@ -291,88 +327,87 @@ flattenMonoBinds sigs (AndMonoBinds bs1 bs2) 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 = 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 in + rnGRHSs grhss `thenRn` \ (grhss', fvs) -> returnRn [(names_bound_here, - fvs `unionNameSets` sigs_fvs, - PatMonoBind pat' grhss_and_binds' locn, + 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` \ new_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 (new_name ==) sigs in + mapFvRn rnMatch matches `thenRn` \ (new_matches, fvs) -> + mapRn_ (checkPrecMatch inf new_name) new_matches `thenRn_` returnRn - [(unitNameSet name', - fvs `unionNameSets` sigs_fvs, - FunMonoBind name' inf new_matches locn, + [(unitNameSet new_name, + fvs, + FunMonoBind new_name inf new_matches locn, sigs_for_me )] \end{code} -@rnMethodBinds@ is used for the method bindings of an instance -declaration. like @rnMonoBinds@ but without dependency analysis. +@rnMethodBinds@ is used for the method bindings of a class and an instance +declaration. Like @rnMonoBinds@ 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: +\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. \begin{code} -rnMethodBinds :: RdrNameMonoBinds -> RnMS s RenamedMonoBinds +rnMethodBinds :: RdrNameMonoBinds -> RnMS (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) + mapFvRn rnMatch matches `thenRn` \ (new_matches, fvs) -> + mapRn_ (checkPrecMatch inf sel_name) new_matches `thenRn_` + returnRn (FunMonoBind sel_name inf new_matches locn, fvs `addOneFV` sel_name) -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 `addOneFV` sel_name) -- 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} --- 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} %************************************************************************ %* * @@ -387,19 +422,19 @@ as the two cases are similar. 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} %************************************************************************ %* * -%* Manipulating FlatMonoBindInfo * +\subsubsection{ Manipulating FlatMonoBindInfo} %* * %************************************************************************ @@ -437,77 +472,97 @@ mkEdges flat_info %* * %************************************************************************ -@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 :: TopLevelFlag - -> NameSet -- Set of names bound in this group - -> [RdrNameSig] - -> RnMS s [RenamedSig] -- List of Sig constructors +renameSigs :: Bool -- True => warn if (required) type signatures are missing. + -> NameSet -- Set of names bound in this group + -> (RdrName -> RnMS Name) + -> [RdrNameSig] + -> RnMS ([RenamedSig], FreeVars) -- List of Sig constructors -rnBindSigs top_lev binders sigs +renameSigs sigs_required binders lookup_occ_nm sigs = -- Rename the signatures - mapRn renameSig sigs `thenRn` \ sigs' -> + mapFvRn (renameSig lookup_occ_nm) sigs `thenRn` \ (sigs', fvs) -> -- 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] - 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 + type_sig_vars = [n | Sig n _ _ <- goodies] 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_` - - returnRn sigs' -- bad ones and all: - -- we need bindings of *some* sort for every name + mapRn_ dupSigDeclErr dups `thenRn_` + mapRn_ unknownSigErr not_this_group `thenRn_` + mapRn_ (addWarnRn.missingSigWarn) un_sigd_binders `thenRn_` + returnRn (sigs', fvs) + -- 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 +-- 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. + +renameSig lookup_occ_nm (Sig v ty src_loc) + = pushSrcLocRn src_loc $ + lookup_occ_nm v `thenRn` \ new_v -> + rnHsSigType (quotes (ppr v)) ty `thenRn` \ (new_ty,fvs) -> + returnRn (Sig new_v new_ty src_loc, fvs `addOneFV` new_v) +renameSig _ (SpecInstSig ty src_loc) + = pushSrcLocRn src_loc $ + rnHsSigType (text "A SPECIALISE instance pragma") ty `thenRn` \ (new_ty, fvs) -> + returnRn (SpecInstSig new_ty src_loc, fvs) -renameSig (Sig v ty src_loc) +renameSig lookup_occ_nm (SpecSig 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) + lookup_occ_nm v `thenRn` \ new_v -> + rnHsSigType (quotes (ppr v)) ty `thenRn` \ (new_ty,fvs) -> + returnRn (SpecSig new_v new_ty src_loc, fvs `addOneFV` new_v) -renameSig (SpecSig v ty using src_loc) +renameSig lookup_occ_nm (FixSig (FixitySig v fix 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) - where - rn_using Nothing = returnRn Nothing - rn_using (Just x) = lookupOccRn x `thenRn` \ new_x -> - returnRn (Just new_x) + lookup_occ_nm v `thenRn` \ new_v -> + returnRn (FixSig (FixitySig new_v fix src_loc), unitFV new_v) -renameSig (InlineSig v src_loc) +renameSig lookup_occ_nm (InlineSig v p src_loc) = pushSrcLocRn src_loc $ - lookupBndrRn v `thenRn` \ new_v -> - returnRn (InlineSig new_v src_loc) + lookup_occ_nm v `thenRn` \ new_v -> + returnRn (InlineSig new_v p src_loc, unitFV new_v) -renameSig (MagicUnfoldingSig v str src_loc) +renameSig lookup_occ_nm (NoInlineSig v p src_loc) = pushSrcLocRn src_loc $ - lookupBndrRn v `thenRn` \ new_v -> - returnRn (MagicUnfoldingSig new_v str src_loc) + lookup_occ_nm v `thenRn` \ new_v -> + returnRn (NoInlineSig new_v p src_loc, unitFV new_v) \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... + -- but not ones that are exactly the same... thenCmp (n1 `compare` n2) (cmpHsType compare ty1 ty2) cmp_sig other_1 other_2 -- Tags *must* be different @@ -515,16 +570,12 @@ cmp_sig other_1 other_2 -- Tags *must* be different | 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 (SpecSig n1 _ _) = ILIT(2) +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)" - -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} %************************************************************************ @@ -536,27 +587,29 @@ sig_name (MagicUnfoldingSig n _ _) = n \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"))