X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Frename%2FRnBinds.lhs;h=9ec3657144e630271ccf069f83c588b6e8c4658b;hb=710e207487929c4a5977b5ee3bc6e539091953db;hp=8cde74fea5e360dfa5588c1912d103f82296b2d3;hpb=402c1716fed6f9888f05a7431eb9ceeeb1e4bc91;p=ghc-hetmet.git diff --git a/ghc/compiler/rename/RnBinds.lhs b/ghc/compiler/rename/RnBinds.lhs index 8cde74f..9ec3657 100644 --- a/ghc/compiler/rename/RnBinds.lhs +++ b/ghc/compiler/rename/RnBinds.lhs @@ -12,7 +12,8 @@ they may be affected by renaming (which isn't fully worked out yet). module RnBinds ( rnTopBinds, rnTopMonoBinds, rnMethodBinds, renameSigs, - rnBinds, rnMonoBinds + rnBinds, + unknownSigErr ) where #include "HsVersions.h" @@ -20,22 +21,23 @@ module RnBinds ( import {-# SOURCE #-} RnSource ( rnHsSigType ) import HsSyn -import HsBinds ( sigsForMe ) +import HsBinds ( eqHsSig, sigName, hsSigDoc ) import RdrHsSyn import RnHsSyn import RnMonad import RnExpr ( rnMatch, rnGRHSs, rnPat, checkPrecMatch ) -import RnEnv ( bindLocatedLocalsRn, lookupBndrRn, lookupOccRn, lookupGlobalOccRn, - isUnboundName, warnUnusedLocalBinds, - FreeVars, emptyFVs, plusFV, plusFVs, unitFV +import RnEnv ( bindLocatedLocalsRn, lookupBndrRn, + lookupGlobalOccRn, lookupSigOccRn, + warnUnusedLocalBinds, mapFvRn, extendTyVarEnvFVRn, + FreeVars, emptyFVs, plusFV, plusFVs, unitFV, addOneFV ) import CmdLineOpts ( opt_WarnMissingSigs ) import Digraph ( stronglyConnComp, SCC(..) ) -import Name ( OccName, Name ) +import Name ( OccName, Name, nameOccName, mkUnboundName, isUnboundName ) import NameSet -import BasicTypes ( RecFlag(..), TopLevelFlag(..) ) -import Util ( thenCmp, removeDups ) -import ListSetOps ( minusList ) +import RdrName ( RdrName, rdrNameOcc ) +import BasicTypes ( RecFlag(..) ) +import List ( partition ) import Bag ( bagToList ) import Outputable \end{code} @@ -147,7 +149,7 @@ it expects the global environment to contain bindings for the binders %************************************************************************ %* * -%* Top-level bindings +\subsubsection{ Top-level bindings} %* * %************************************************************************ @@ -155,24 +157,30 @@ 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, FreeVars) +rnTopBinds :: RdrNameHsBinds -> RnMS (RenamedHsBinds, FreeVars) rnTopBinds EmptyBinds = returnRn (EmptyBinds, emptyFVs) rnTopBinds (MonoBind bind sigs _) = rnTopMonoBinds bind sigs -- The parser doesn't produce other forms -rnTopMonoBinds EmptyMonoBinds sigs - = returnRn (EmptyBinds, emptyFVs) - rnTopMonoBinds mbinds sigs - = mapRn lookupBndrRn binder_rdr_names `thenRn` \ binder_names -> + = mapRn lookupBndrRn binder_rdr_names `thenRn` \ binder_names -> + let + bndr_name_set = mkNameSet binder_names + in + renameSigs (okBindSig bndr_name_set) sigs `thenRn` \ (siglist, sig_fvs) -> let - binder_set = mkNameSet binder_names + type_sig_vars = [n | Sig n _ _ <- siglist] + un_sigd_binders | opt_WarnMissingSigs = nameSetToList (delListFromNameSet bndr_name_set type_sig_vars) + | otherwise = [] in - rn_mono_binds TopLevel binder_set mbinds sigs + mapRn_ (addWarnRn.missingSigWarn) un_sigd_binders `thenRn_` + + 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)) + binder_rdr_names = collectMonoBinders mbinds \end{code} %************************************************************************ @@ -181,97 +189,113 @@ 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 EmptyMonoBinds sigs thing_inside = thing_inside EmptyBinds +rnMonoBinds :: RdrNameMonoBinds + -> [RdrNameSig] + -> (RenamedHsBinds -> RnMS (result, FreeVars)) + -> RnMS (result, FreeVars) 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 "a binding group") mbinders_w_srclocs $ \ new_mbinders -> + bindLocatedLocalsRn (text "a binding group") + mbinders_w_srclocs $ \ new_mbinders -> let binder_set = mkNameSet new_mbinders in - rn_mono_binds NotTopLevel - binder_set mbinds sigs `thenRn` \ (binds,bind_fvs) -> + -- Rename the signatures + renameSigs (okBindSig binder_set) sigs `thenRn` \ (siglist, sig_fvs) -> - -- Now do the "thing inside", and deal with the free-variable calculations - thing_inside binds `thenRn` \ (result,result_fvs) -> + -- Report the fixity declarations in this group that + -- don't refer to any of the group's binders. + -- Then install the fixity declarations that do apply here + -- Notice that they scope over thing_inside too let - all_fvs = result_fvs `plusFV` bind_fvs + fixity_sigs = [(name,sig) | FixSig sig@(FixitySig name _ _) <- siglist ] + in + 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) -> + let + all_fvs = result_fvs `plusFV` bind_fvs `plusFV` sig_fvs unused_binders = nameSetToList (binder_set `minusNameSet` all_fvs) in warnUnusedLocalBinds unused_binders `thenRn_` returnRn (result, delListFromNameSet all_fvs new_mbinders) where - mbinders_w_srclocs = bagToList (collectMonoBinders mbinds) + mbinders_w_srclocs = collectLocatedMonoBinders mbinds \end{code} %************************************************************************ %* * -%* 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 - 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)..]) + let + edges = mkEdges (mbinds_info `zip` [(0::Int)..]) scc_result = stronglyConnComp edges - final_binds = foldr1 ThenBinds (map reconstructCycle scc_result) + final_binds = foldr (ThenBinds . reconstructCycle) EmptyBinds scc_result -- Deal with bound and free-var calculation rhs_fvs = plusFVs [fvs | (_,fvs,_,_) <- mbinds_info] in - returnRn (final_binds, rhs_fvs `plusFV` sig_fvs) + returnRn (final_binds, rhs_fvs) \end{code} @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 [FlatMonoBindsInfo] + -> RnMS [FlatMonoBindsInfo] flattenMonoBinds sigs EmptyMonoBinds = returnRn [] @@ -287,86 +311,97 @@ flattenMonoBinds sigs (PatMonoBind pat grhss locn) -- 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 emptyFVs sigs_for_me - fixity_sigs = [(name,sig) | FixSig sig@(FixitySig name _ _) <- sigs_for_me] in - extendFixityEnv fixity_sigs $ + sigsForMe names_bound_here sigs `thenRn` \ sigs_for_me -> rnGRHSs grhss `thenRn` \ (grhss', fvs) -> returnRn [(names_bound_here, - fvs `plusFV` sigs_fvs `plusFV` pat_fvs, + fvs `plusFV` pat_fvs, PatMonoBind pat' grhss' locn, sigs_for_me )] flattenMonoBinds sigs (FunMonoBind name inf matches locn) = pushSrcLocRn locn $ - lookupBndrRn name `thenRn` \ name' -> + lookupBndrRn name `thenRn` \ new_name -> let - 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] + names_bound_here = unitNameSet new_name in - extendFixityEnv fixity_sigs $ - mapAndUnzipRn rnMatch matches `thenRn` \ (new_matches, fv_lists) -> - mapRn (checkPrecMatch inf name') new_matches `thenRn_` + sigsForMe names_bound_here sigs `thenRn` \ sigs_for_me -> + mapFvRn rnMatch matches `thenRn` \ (new_matches, fvs) -> + mapRn_ (checkPrecMatch inf new_name) new_matches `thenRn_` returnRn - [(unitNameSet name', - plusFVs fv_lists `plusFV` sigs_fvs, - FunMonoBind name' inf new_matches locn, + [(unitNameSet new_name, + fvs, + FunMonoBind new_name inf new_matches locn, sigs_for_me )] + + +sigsForMe names_bound_here sigs + = foldlRn check [] (filter (sigForThisGroup names_bound_here) sigs) + where + check sigs sig = case filter (eqHsSig sig) sigs of + [] -> returnRn (sig:sigs) + other -> dupSigDeclErr sig `thenRn_` + returnRn sigs \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, FreeVars) +rnMethodBinds :: [Name] -- Names for generic type variables + -> RdrNameMonoBinds + -> RnMS (RenamedMonoBinds, FreeVars) -rnMethodBinds EmptyMonoBinds = returnRn (EmptyMonoBinds, emptyFVs) +rnMethodBinds gen_tyvars EmptyMonoBinds = returnRn (EmptyMonoBinds, emptyFVs) -rnMethodBinds (AndMonoBinds mb1 mb2) - = rnMethodBinds mb1 `thenRn` \ (mb1', fvs1) -> - rnMethodBinds mb2 `thenRn` \ (mb2', fvs2) -> +rnMethodBinds gen_tyvars (AndMonoBinds mb1 mb2) + = rnMethodBinds gen_tyvars mb1 `thenRn` \ (mb1', fvs1) -> + rnMethodBinds gen_tyvars mb2 `thenRn` \ (mb2', fvs2) -> returnRn (mb1' `AndMonoBinds` mb2', fvs1 `plusFV` fvs2) -rnMethodBinds (FunMonoBind name inf matches locn) +rnMethodBinds gen_tyvars (FunMonoBind name inf matches locn) = pushSrcLocRn locn $ lookupGlobalOccRn name `thenRn` \ sel_name -> -- We use the selector name as the binder - 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) + mapFvRn rn_match 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) + where + -- Gruesome; bring into scope the correct members of the generic type variables + -- See comments in RnSource.rnDecl(ClassDecl) + rn_match match@(Match _ (TypePatIn ty : _) _ _) + = extendTyVarEnvFVRn gen_tvs (rnMatch match) + where + tvs = map rdrNameOcc (extractHsTyRdrNames ty) + gen_tvs = [tv | tv <- gen_tyvars, nameOccName tv `elem` tvs] -rnMethodBinds (PatMonoBind (VarPatIn name) grhss locn) - = pushSrcLocRn locn $ - lookupGlobalOccRn name `thenRn` \ sel_name -> - rnGRHSs grhss `thenRn` \ (grhss', fvs) -> - returnRn (PatMonoBind (VarPatIn sel_name) grhss' locn, fvs) + rn_match match = rnMatch match + -- Can't handle method pattern-bindings which bind multiple methods. -rnMethodBinds mbind@(PatMonoBind other_pat _ locn) +rnMethodBinds gen_tyvars mbind@(PatMonoBind other_pat _ locn) = pushSrcLocRn locn $ 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 - --- 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} %************************************************************************ %* * @@ -393,7 +428,7 @@ reconstructCycle (CyclicSCC cycle) %************************************************************************ %* * -%* Manipulating FlatMonoBindInfo * +\subsubsection{ Manipulating FlatMonoBindInfo} %* * %************************************************************************ @@ -431,55 +466,41 @@ mkEdges flat_info %* * %************************************************************************ -@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. - +@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 -sigatures. We'd only need this if we wanted to report unused tyvars. +signatures. 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 +renameSigs :: (RenamedSig -> Bool) -- OK-sig predicate -> [RdrNameSig] - -> RnMS s ([RenamedSig], FreeVars) -- List of Sig constructors + -> RnMS ([RenamedSig], FreeVars) + +renameSigs ok_sig [] = returnRn ([], emptyFVs) -- Common shortcut -renameSigs top_lev inst_decl binders sigs +renameSigs ok_sig sigs = -- Rename the signatures - mapAndUnzipRn renameSig sigs `thenRn` \ (sigs', fvs_s) -> + mapFvRn renameSig 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 (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_scope = filter is_in_scope sigs' + is_in_scope sig = case sigName sig of + Just n -> not (isUnboundName n) + Nothing -> True + (goods, bads) = partition ok_sig in_scope in - mapRn dupSigDeclErr dups `thenRn_` - mapRn unknownSigErr not_this_group `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', 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: + mapRn_ unknownSigErr bads `thenRn_` + returnRn (goods, fvs) + +-- 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 = ... @@ -487,70 +508,65 @@ renameSigs top_lev inst_decl binders sigs -- 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 RdrName -> RnMS (Sig Name, FreeVars) +-- ClassOpSig is renamed elsewhere. renameSig (Sig v ty src_loc) = pushSrcLocRn src_loc $ - lookupOccRn v `thenRn` \ new_v -> + lookupSigOccRn v `thenRn` \ new_v -> rnHsSigType (quotes (ppr v)) ty `thenRn` \ (new_ty,fvs) -> - returnRn (Sig new_v new_ty src_loc, 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) -> + 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) +renameSig (SpecSig v ty src_loc) = pushSrcLocRn 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, emptyFVs) - rn_using (Just x) = lookupOccRn x `thenRn` \ new_x -> - returnRn (Just new_x, unitFV new_x) + lookupSigOccRn 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 (InlineSig v src_loc) +renameSig (FixSig (FixitySig v fix src_loc)) = pushSrcLocRn src_loc $ - lookupOccRn v `thenRn` \ new_v -> - returnRn (InlineSig new_v src_loc, emptyFVs) + lookupSigOccRn v `thenRn` \ new_v -> + returnRn (FixSig (FixitySig new_v fix src_loc), unitFV new_v) -renameSig (FixSig (FixitySig v fix src_loc)) +renameSig (InlineSig v p src_loc) = pushSrcLocRn src_loc $ - lookupOccRn v `thenRn` \ new_v -> - returnRn (FixSig (FixitySig new_v fix src_loc), emptyFVs) + lookupSigOccRn v `thenRn` \ new_v -> + returnRn (InlineSig new_v p src_loc, unitFV new_v) -renameSig (NoInlineSig v src_loc) +renameSig (NoInlineSig v p src_loc) = pushSrcLocRn src_loc $ - lookupOccRn v `thenRn` \ new_v -> - returnRn (NoInlineSig new_v src_loc, emptyFVs) + lookupSigOccRn 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 (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) - -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 (NoInlineSig n1 _) = ILIT(4) -sig_tag (SpecInstSig _ _) = ILIT(5) -sig_tag (FixSig _) = ILIT(6) -sig_tag _ = panic# "tag(RnBinds)" +renameIE :: (RdrName -> RnMS Name) -> IE RdrName -> RnMS (IE Name, FreeVars) +renameIE lookup_occ_nm (IEVar v) + = lookup_occ_nm v `thenRn` \ new_v -> + returnRn (IEVar new_v, unitFV new_v) + +renameIE lookup_occ_nm (IEThingAbs v) + = lookup_occ_nm v `thenRn` \ new_v -> + returnRn (IEThingAbs new_v, unitFV new_v) + +renameIE lookup_occ_nm (IEThingAll v) + = lookup_occ_nm v `thenRn` \ new_v -> + returnRn (IEThingAll new_v, unitFV new_v) + +renameIE lookup_occ_nm (IEThingWith v vs) + = lookup_occ_nm v `thenRn` \ new_v -> + mapRn lookup_occ_nm vs `thenRn` \ new_vs -> + returnRn (IEThingWith new_v new_vs, plusFVs [ unitFV x | x <- new_v:new_vs ]) + +renameIE lookup_occ_nm (IEModuleContents m) + = returnRn (IEModuleContents m, emptyFVs) \end{code} + %************************************************************************ %* * \subsection{Error messages} @@ -558,29 +574,19 @@ sig_tag _ = panic# "tag(RnBinds)" %************************************************************************ \begin{code} -dupSigDeclErr (sig:sigs) +dupSigDeclErr sig = pushSrcLocRn loc $ - addErrRn (sep [ptext SLIT("Duplicate"), - ptext what_it_is <> colon, + addErrRn (sep [ptext SLIT("Duplicate") <+> ptext what_it_is <> colon, ppr sig]) where - (what_it_is, loc) = sig_doc sig + (what_it_is, loc) = hsSigDoc sig unknownSigErr sig = pushSrcLocRn loc $ - addErrRn (sep [ptext SLIT("Misplaced"), - ptext what_it_is <> colon, + addErrRn (sep [ptext SLIT("Misplaced") <+> ptext what_it_is <> colon, ppr sig]) 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 (FixSig (FixitySig _ _ loc)) = (SLIT("fixity declaration"), loc) + (what_it_is, loc) = hsSigDoc sig missingSigWarn var = sep [ptext SLIT("definition but no type signature for"), quotes (ppr var)]