X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Frename%2FRnBinds.lhs;h=af0f98253a59e81031679caafd122f433c4f2428;hb=ef2b170c6298b4826d3b56465a3c1438b5be7307;hp=defbee53201f35672ed5f82734516a36902f3e38;hpb=48eec5685167006e5e0932d334f8bd2017d7f5d3;p=ghc-hetmet.git diff --git a/ghc/compiler/rename/RnBinds.lhs b/ghc/compiler/rename/RnBinds.lhs index defbee5..af0f982 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 HsSyn -import HsBinds ( sigsForMe ) +import HsBinds ( eqHsSig, sigName, hsSigDoc ) import RdrHsSyn import RnHsSyn import RnMonad +import RnTypes ( rnHsSigType, rnHsType ) import RnExpr ( rnMatch, rnGRHSs, rnPat, checkPrecMatch ) -import RnEnv ( bindLocatedLocalsRn, lookupBndrRn, lookupGlobalOccRn, - warnUnusedLocalBinds, mapFvRn, - FreeVars, emptyFVs, plusFV, plusFVs, unitFV, addOneFV, - unknownNameErr +import RnEnv ( bindLocatedLocalsRn, lookupBndrRn, lookupInstDeclBndr, + lookupSigOccRn, bindPatSigTyVars, extendNestedFixityEnv, + warnUnusedLocalBinds, mapFvRn, extendTyVarEnvFVRn, ) -import CmdLineOpts ( opt_WarnMissingSigs ) +import CmdLineOpts ( DynFlag(..) ) import Digraph ( stronglyConnComp, SCC(..) ) -import Name ( OccName, Name, nameOccName ) +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,29 +161,26 @@ 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 -> + bindPatSigTyVars (collectSigTysFromMonoBinds mbinds) $ let - binder_set = mkNameSet binder_names - binder_occ_fm = listToFM [(nameOccName x,x) | x <- binder_names] + bndr_name_set = mkNameSet binder_names in - renameSigs opt_WarnMissingSigs binder_set - (lookupSigOccRn binder_occ_fm) sigs `thenRn` \ (siglist, sig_fvs) -> - rn_mono_binds siglist mbinds `thenRn` \ (final_binds, bind_fvs) -> + renameSigsFVs (okBindSig bndr_name_set) sigs `thenRn` \ (siglist, sig_fvs) -> + + ifOptRn Opt_WarnMissingSigs ( + let + type_sig_vars = [n | Sig n _ _ <- siglist] + un_sigd_binders = nameSetToList (delListFromNameSet bndr_name_set type_sig_vars) + in + 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)) - --- 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 + binder_rdr_names = collectMonoBinders mbinds \end{code} %************************************************************************ @@ -224,44 +214,31 @@ 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 doc mbinders_w_srclocs $ \ new_mbinders -> + bindPatSigTyVars (collectSigTysFromMonoBinds mbinds) $ 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] - + binder_set = mkNameSet 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) -> + -- Rename the signatures + 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. + -- Then install the fixity declarations that do apply here + -- Notice that they scope over thing_inside too let fixity_sigs = [(name,sig) | FixSig sig@(FixitySig name _ _) <- siglist ] in - -- Install the fixity declarations that do apply here and go. - extendFixityEnv fixity_sigs ( - rn_mono_binds siglist mbinds - ) `thenRn` \ (binds, bind_fvs) -> + extendNestedFixityEnv 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) -> + 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) @@ -269,7 +246,10 @@ 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 + doc = text "In the binding group for" <+> pp_bndrs mbinders_w_srclocs + pp_bndrs [(b,_)] = quotes (ppr b) + pp_bndrs bs = fsep (punctuate comma [ppr b | (b,_) <- bs]) \end{code} @@ -287,8 +267,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 = @@ -301,7 +281,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] @@ -334,8 +314,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, @@ -348,9 +328,10 @@ 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 - mapFvRn rnMatch matches `thenRn` \ (new_matches, fvs) -> + sigsForMe names_bound_here sigs `thenRn` \ sigs_for_me -> + mapFvRn (rnMatch (FunRhs name)) matches `thenRn` \ (new_matches, fvs) -> mapRn_ (checkPrecMatch inf new_name) new_matches `thenRn_` returnRn [(unitNameSet new_name, @@ -358,6 +339,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} @@ -377,33 +367,41 @@ 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 -- Class name + -> [Name] -- Names for generic type variables + -> RdrNameMonoBinds + -> RnMS (RenamedMonoBinds, FreeVars) -rnMethodBinds EmptyMonoBinds = returnRn (EmptyMonoBinds, emptyFVs) +rnMethodBinds cls gen_tyvars EmptyMonoBinds = returnRn (EmptyMonoBinds, emptyFVs) -rnMethodBinds (AndMonoBinds mb1 mb2) - = rnMethodBinds mb1 `thenRn` \ (mb1', fvs1) -> - rnMethodBinds mb2 `thenRn` \ (mb2', fvs2) -> +rnMethodBinds cls gen_tyvars (AndMonoBinds mb1 mb2) + = rnMethodBinds cls gen_tyvars mb1 `thenRn` \ (mb1', fvs1) -> + rnMethodBinds cls gen_tyvars mb2 `thenRn` \ (mb2', fvs2) -> returnRn (mb1' `AndMonoBinds` mb2', fvs1 `plusFV` fvs2) -rnMethodBinds (FunMonoBind name inf matches locn) +rnMethodBinds cls gen_tyvars (FunMonoBind name inf matches locn) = pushSrcLocRn locn $ - lookupGlobalOccRn name `thenRn` \ sel_name -> + lookupInstDeclBndr cls 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 (FunRhs name) 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 (FunRhs name) match + -- Can't handle method pattern-bindings which bind multiple methods. -rnMethodBinds mbind@(PatMonoBind other_pat _ locn) +rnMethodBinds cls gen_tyvars mbind@(PatMonoBind other_pat _ locn) = pushSrcLocRn locn $ failWithRn (EmptyMonoBinds, emptyFVs) (methodBindErr mbind) \end{code} @@ -483,34 +481,33 @@ 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} -renameSigs :: Bool -- True => warn if (required) type signatures are missing. - -> NameSet -- Set of names bound in this group - -> (RdrName -> RnMS Name) +renameSigsFVs ok_sig sigs + = renameSigs ok_sig sigs `thenRn` \ sigs' -> + returnRn (sigs', hsSigsFVs sigs') + +renameSigs :: (RenamedSig -> Bool) -- OK-sig predicate -> [RdrNameSig] - -> RnMS ([RenamedSig], FreeVars) -- List of Sig constructors + -> RnMS [RenamedSig] + +renameSigs ok_sig [] = returnRn [] -renameSigs sigs_required binders lookup_occ_nm sigs +renameSigs ok_sig sigs = -- Rename the signatures - mapFvRn (renameSig lookup_occ_nm) sigs `thenRn` \ (sigs', fvs) -> + mapRn renameSig sigs `thenRn` \ sigs' -> -- 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 - type_sig_vars = [n | Sig n _ _ <- goodies] - 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_` - 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 + mapRn_ unknownSigErr bads `thenRn_` + returnRn goods + +-- We use lookupSigOccRn in the signatures, which is a little bit unsatisfactory -- because this won't work for: -- instance Foo T where -- {-# INLINE op #-} @@ -519,71 +516,36 @@ renameSigs sigs_required binders lookup_occ_nm 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 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) +renameSig :: Sig RdrName -> RnMS (Sig Name) +-- ClassOpSig is renamed elsewhere. +renameSig (Sig v ty src_loc) = pushSrcLocRn src_loc $ - rnHsSigType (text "A SPECIALISE instance pragma") ty `thenRn` \ (new_ty, fvs) -> - returnRn (SpecInstSig new_ty src_loc, fvs) + lookupSigOccRn v `thenRn` \ new_v -> + rnHsSigType (quotes (ppr v)) ty `thenRn` \ new_ty -> + returnRn (Sig new_v new_ty src_loc) -renameSig lookup_occ_nm (SpecSig v ty src_loc) +renameSig (SpecInstSig ty src_loc) = pushSrcLocRn 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) + rnHsType (text "A SPECIALISE instance pragma") ty `thenRn` \ new_ty -> + returnRn (SpecInstSig new_ty src_loc) -renameSig lookup_occ_nm (FixSig (FixitySig v fix src_loc)) +renameSig (SpecSig v ty src_loc) = pushSrcLocRn src_loc $ - lookup_occ_nm v `thenRn` \ new_v -> - returnRn (FixSig (FixitySig new_v fix src_loc), unitFV new_v) + lookupSigOccRn v `thenRn` \ new_v -> + rnHsSigType (quotes (ppr v)) ty `thenRn` \ new_ty -> + returnRn (SpecSig new_v new_ty src_loc) -renameSig lookup_occ_nm (DeprecSig v txt src_loc) +renameSig (FixSig (FixitySig v fix src_loc)) = pushSrcLocRn src_loc $ - lookup_occ_nm v `thenRn` \ new_v -> - returnRn (DeprecSig new_v txt src_loc, unitFV new_v) + lookupSigOccRn v `thenRn` \ new_v -> + returnRn (FixSig (FixitySig new_v fix src_loc)) -renameSig lookup_occ_nm (InlineSig v p src_loc) +renameSig (InlineSig b v p src_loc) = pushSrcLocRn src_loc $ - lookup_occ_nm v `thenRn` \ new_v -> - returnRn (InlineSig new_v p src_loc, unitFV new_v) - -renameSig lookup_occ_nm (NoInlineSig v p src_loc) - = pushSrcLocRn src_loc $ - lookup_occ_nm v `thenRn` \ new_v -> - returnRn (NoInlineSig new_v p src_loc, unitFV new_v) + lookupSigOccRn v `thenRn` \ new_v -> + returnRn (InlineSig b new_v p 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 (DeprecSig n1 _ _) (DeprecSig 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 (DeprecSig _ _ _) = ILIT(7) -sig_tag _ = panic# "tag(RnBinds)" -\end{code} %************************************************************************ %* * @@ -592,32 +554,23 @@ 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") <+> 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") <+> 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) -sig_doc (DeprecSig _ _ loc) = (SLIT("DEPRECATED pragma"), loc) + (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"))