X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Frename%2FRnBinds.lhs;h=32e37cd8e1e959d4319b738c711830303a757081;hb=1b9312bd044db58b430d3612c1a67264f3d23d36;hp=abd60a07455f2b125f5ac8bc4c720670b074923b;hpb=e4b0fab5a594c4ea29ddecdf216b4887420f26a4;p=ghc-hetmet.git diff --git a/ghc/compiler/rename/RnBinds.lhs b/ghc/compiler/rename/RnBinds.lhs index abd60a0..32e37cd 100644 --- a/ghc/compiler/rename/RnBinds.lhs +++ b/ghc/compiler/rename/RnBinds.lhs @@ -11,39 +11,34 @@ they may be affected by renaming (which isn't fully worked out yet). \begin{code} module RnBinds ( rnTopBinds, rnTopMonoBinds, - rnMethodBinds, renameSigs, + rnMethodBinds, renameSigs, renameSigsFVs, rnBinds, unknownSigErr ) where #include "HsVersions.h" -import {-# SOURCE #-} RnSource ( rnHsSigType ) +import {-# SOURCE #-} RnSource ( rnHsSigType, rnHsType ) import HsSyn -import HsBinds ( sigsForMe, cmpHsSig, sigName, hsSigDoc ) +import HsBinds ( eqHsSig, sigName, hsSigDoc ) import RdrHsSyn import RnHsSyn import RnMonad import RnExpr ( rnMatch, rnGRHSs, rnPat, checkPrecMatch ) -import RnEnv ( bindLocatedLocalsRn, lookupBndrRn, lookupGlobalOccRn, lookupOccRn, - warnUnusedLocalBinds, mapFvRn, - FreeVars, emptyFVs, plusFV, plusFVs, unitFV, addOneFV, - unknownNameErr +import RnEnv ( bindLocatedLocalsRn, lookupBndrRn, + lookupGlobalOccRn, lookupSigOccRn, + warnUnusedLocalBinds, mapFvRn, extendTyVarEnvFVRn, ) -import CmdLineOpts ( opt_WarnMissingSigs ) +import CmdLineOpts ( DynFlag(..) ) import Digraph ( stronglyConnComp, SCC(..) ) -import Name ( OccName, Name, nameOccName, mkUnboundName, isUnboundName ) +import Name ( Name, nameOccName, nameSrcLoc ) import NameSet -import RdrName ( RdrName, rdrNameOcc ) -import BasicTypes ( RecFlag(..), TopLevelFlag(..) ) -import Util ( thenCmp, removeDups ) +import RdrName ( RdrName, rdrNameOcc ) +import BasicTypes ( RecFlag(..) ) import List ( partition ) -import ListSetOps ( minusList ) -import Bag ( bagToList ) -import FiniteMap ( lookupFM, listToFM ) -import Maybe ( isJust ) import Outputable +import PrelNames ( isUnboundName ) \end{code} -- ToDo: Put the annotations into the monad, so that they arrive in the proper @@ -74,8 +69,6 @@ within one @MonoBinds@, so that unique-Int plumbing is done explicitly \begin{code} type VertexTag = Int -type Cycle = [VertexTag] -type Edge = (VertexTag, VertexTag) \end{code} %************************************************************************ @@ -168,23 +161,25 @@ 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 -> - renameSigs (okBindSig (mkNameSet binder_names)) sigs `thenRn` \ (siglist, sig_fvs) -> + = mapRn lookupBndrRn binder_rdr_names `thenRn` \ binder_names -> + let + bndr_name_set = mkNameSet binder_names + in + renameSigsFVs (okBindSig bndr_name_set) sigs `thenRn` \ (siglist, sig_fvs) -> + doptRn Opt_WarnMissingSigs `thenRn` \ warnMissing -> let type_sig_vars = [n | Sig n _ _ <- siglist] - un_sigd_binders | opt_WarnMissingSigs = binder_names `minusList` type_sig_vars - | otherwise = [] + un_sigd_binders | warnMissing = nameSetToList (delListFromNameSet + bndr_name_set type_sig_vars) + | otherwise = [] in - mapRn_ (addWarnRn.missingSigWarn) un_sigd_binders `thenRn_` + mapRn_ 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} %************************************************************************ @@ -218,19 +213,17 @@ rnMonoBinds :: RdrNameMonoBinds -> (RenamedHsBinds -> RnMS (result, FreeVars)) -> RnMS (result, FreeVars) -rnMonoBinds EmptyMonoBinds sigs thing_inside = thing_inside EmptyBinds - 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 -- Rename the signatures - renameSigs (okBindSig binder_set) sigs `thenRn` \ (siglist, sig_fvs) -> + renameSigsFVs (okBindSig binder_set) sigs `thenRn` \ (siglist, sig_fvs) -> -- Report the fixity declarations in this group that -- don't refer to any of the group's binders. @@ -244,7 +237,7 @@ rnMonoBinds mbinds sigs thing_inside -- Non-empty monobinds 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) -> + 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) @@ -252,7 +245,7 @@ rnMonoBinds mbinds sigs thing_inside -- Non-empty monobinds 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} @@ -270,8 +263,8 @@ This is done {\em either} by pass 3 (for the top-level bindings), \begin{code} rn_mono_binds :: [RenamedSig] -- Signatures attached to this group -> RdrNameMonoBinds - -> RnMS (RenamedHsBinds, -- - FreeVars) -- Free variables + -> RnMS (RenamedHsBinds, -- Dependency analysed + FreeVars) -- Free variables rn_mono_binds siglist mbinds = @@ -284,7 +277,7 @@ rn_mono_binds siglist mbinds 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] @@ -317,8 +310,8 @@ 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 in + sigsForMe names_bound_here sigs `thenRn` \ sigs_for_me -> rnGRHSs grhss `thenRn` \ (grhss', fvs) -> returnRn [(names_bound_here, @@ -331,8 +324,9 @@ flattenMonoBinds sigs (FunMonoBind name inf matches locn) = pushSrcLocRn locn $ lookupBndrRn name `thenRn` \ new_name -> let - sigs_for_me = sigsForMe (new_name ==) sigs + names_bound_here = unitNameSet new_name in + 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 @@ -341,6 +335,15 @@ flattenMonoBinds sigs (FunMonoBind name inf matches locn) 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} @@ -360,33 +363,40 @@ in many ways the @op@ in an instance decl is just like an occurrence, not a binder. \begin{code} -rnMethodBinds :: RdrNameMonoBinds -> RnMS (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 - mapFvRn rnMatch matches `thenRn` \ (new_matches, fvs) -> + 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.rnSourceDecl(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 `addOneFV` sel_name) + 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} @@ -466,15 +476,19 @@ 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} +renameSigsFVs ok_sig sigs + = renameSigs ok_sig sigs `thenRn` \ sigs' -> + returnRn (sigs', hsSigsFVs sigs') + renameSigs :: (RenamedSig -> Bool) -- OK-sig predicate -> [RdrNameSig] - -> RnMS ([RenamedSig], FreeVars) + -> RnMS [RenamedSig] -renameSigs ok_sig [] = returnRn ([], emptyFVs) -- Common shortcut +renameSigs ok_sig [] = returnRn [] renameSigs ok_sig sigs = -- Rename the signatures - mapFvRn renameSig sigs `thenRn` \ (sigs', fvs) -> + mapRn renameSig sigs `thenRn` \ sigs' -> -- Check for (a) duplicate signatures -- (b) signatures for things not in this group @@ -483,14 +497,12 @@ renameSigs ok_sig sigs is_in_scope sig = case sigName sig of Just n -> not (isUnboundName n) Nothing -> True - (not_dups, dups) = removeDups cmpHsSig in_scope - (goods, bads) = partition ok_sig not_dups + (goods, bads) = partition ok_sig in_scope in mapRn_ unknownSigErr bads `thenRn_` - mapRn_ dupSigDeclErr dups `thenRn_` - returnRn (goods, fvs) + returnRn goods --- We use lookupOccRn in the signatures, which is a little bit unsatisfactory +-- We use lookupSigOccRn in the signatures, which is a little bit unsatisfactory -- because this won't work for: -- instance Foo T where -- {-# INLINE op #-} @@ -499,44 +511,42 @@ renameSigs ok_sig 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) - +renameSig :: Sig RdrName -> RnMS (Sig Name) +-- ClassOpSig is renamed elsewhere. renameSig (Sig v ty src_loc) = pushSrcLocRn 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 `addOneFV` new_v) + lookupSigOccRn v `thenRn` \ new_v -> + 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, fvs) -> - returnRn (SpecInstSig new_ty src_loc, fvs) + rnHsType (text "A SPECIALISE instance pragma") ty `thenRn` \ new_ty -> + returnRn (SpecInstSig new_ty src_loc) + +renameSig (InlineInstSig p src_loc) + = returnRn (InlineInstSig p src_loc) renameSig (SpecSig v ty src_loc) = pushSrcLocRn src_loc $ - lookupOccRn 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) + lookupSigOccRn v `thenRn` \ new_v -> + rnHsSigType (quotes (ppr v)) ty `thenRn` \ new_ty -> + returnRn (SpecSig new_v new_ty src_loc) renameSig (FixSig (FixitySig v fix src_loc)) = pushSrcLocRn src_loc $ - lookupOccRn v `thenRn` \ new_v -> - returnRn (FixSig (FixitySig new_v fix src_loc), unitFV new_v) - -renameSig (DeprecSig (Deprecation ie txt) src_loc) - = pushSrcLocRn src_loc $ - renameIE lookupOccRn ie `thenRn` \ (new_ie, fvs) -> - returnRn (DeprecSig (Deprecation new_ie txt) src_loc, fvs) + lookupSigOccRn v `thenRn` \ new_v -> + returnRn (FixSig (FixitySig new_v fix src_loc)) renameSig (InlineSig v p src_loc) = pushSrcLocRn src_loc $ - lookupOccRn v `thenRn` \ new_v -> - returnRn (InlineSig new_v p src_loc, unitFV new_v) + lookupSigOccRn v `thenRn` \ new_v -> + returnRn (InlineSig new_v p src_loc) renameSig (NoInlineSig v p src_loc) = pushSrcLocRn src_loc $ - lookupOccRn v `thenRn` \ new_v -> - returnRn (NoInlineSig new_v p src_loc, unitFV new_v) + lookupSigOccRn v `thenRn` \ new_v -> + returnRn (NoInlineSig new_v p src_loc) \end{code} \begin{code} @@ -570,7 +580,7 @@ renameIE lookup_occ_nm (IEModuleContents m) %************************************************************************ \begin{code} -dupSigDeclErr (sig:sigs) +dupSigDeclErr sig = pushSrcLocRn loc $ addErrRn (sep [ptext SLIT("Duplicate") <+> ptext what_it_is <> colon, ppr sig]) @@ -585,7 +595,8 @@ unknownSigErr sig (what_it_is, loc) = hsSigDoc sig missingSigWarn var - = sep [ptext SLIT("definition but no type signature for"), quotes (ppr var)] + = pushSrcLocRn (nameSrcLoc var) $ + addWarnRn (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"))