X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Frename%2FRnBinds.lhs;h=bb6f9eac464d4868df879abb07b4f93c91f12f47;hb=c43a63d313214dbe0e1fe1d3fd2d982edff66cb1;hp=17284cedc3a77fc96e144929d0e0a578e7a4672a;hpb=495ef8bd9ef30bffe50ea399b91e3ba09646b59a;p=ghc-hetmet.git diff --git a/ghc/compiler/rename/RnBinds.lhs b/ghc/compiler/rename/RnBinds.lhs index 17284ce..bb6f9ea 100644 --- a/ghc/compiler/rename/RnBinds.lhs +++ b/ghc/compiler/rename/RnBinds.lhs @@ -11,40 +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 ( eqHsSig, sigName, hsSigDoc ) import RdrHsSyn import RnHsSyn import RnMonad +import RnTypes ( rnHsSigType, rnHsType ) import RnExpr ( rnMatch, rnGRHSs, rnPat, checkPrecMatch ) -import RnEnv ( bindLocatedLocalsRn, lookupBndrRn, - lookupGlobalOccRn, lookupOccRn, lookupSigOccRn, - warnUnusedLocalBinds, mapFvRn, - FreeVars, emptyFVs, plusFV, plusFVs, unitFV, addOneFV, - unknownNameErr +import RnEnv ( bindLocatedLocalsRn, lookupBndrRn, lookupInstDeclBndr, + lookupSigOccRn, bindPatSigTyVars, + 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 @@ -75,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} %************************************************************************ @@ -169,26 +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 bndr_name_set = mkNameSet binder_names in - renameSigs (okBindSig bndr_name_set) sigs `thenRn` \ (siglist, sig_fvs) -> - let - type_sig_vars = [n | Sig n _ _ <- siglist] - un_sigd_binders | opt_WarnMissingSigs = nameSetToList (delListFromNameSet bndr_name_set type_sig_vars) - | otherwise = [] - in - mapRn_ (addWarnRn.missingSigWarn) un_sigd_binders `thenRn_` + 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) -> + 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} %************************************************************************ @@ -222,19 +214,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 doc mbinders_w_srclocs $ \ new_mbinders -> + bindPatSigTyVars (collectSigTysFromMonoBinds mbinds) $ 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. @@ -248,7 +238,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) @@ -256,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} @@ -274,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 = @@ -288,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] @@ -338,7 +331,7 @@ flattenMonoBinds sigs (FunMonoBind name inf matches locn) names_bound_here = unitNameSet new_name in sigsForMe names_bound_here sigs `thenRn` \ sigs_for_me -> - mapFvRn rnMatch matches `thenRn` \ (new_matches, fvs) -> + mapFvRn (rnMatch (FunRhs name)) matches `thenRn` \ (new_matches, fvs) -> mapRn_ (checkPrecMatch inf new_name) new_matches `thenRn_` returnRn [(unitNameSet new_name, @@ -374,27 +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] + + 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} @@ -474,15 +481,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 @@ -494,7 +505,7 @@ renameSigs ok_sig sigs (goods, bads) = partition ok_sig in_scope in mapRn_ unknownSigErr bads `thenRn_` - returnRn (goods, fvs) + returnRn goods -- We use lookupSigOccRn in the signatures, which is a little bit unsatisfactory -- because this won't work for: @@ -505,62 +516,34 @@ 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 $ lookupSigOccRn 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) + 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 (SpecSig v ty src_loc) = pushSrcLocRn src_loc $ 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) + 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 $ lookupSigOccRn v `thenRn` \ new_v -> - returnRn (FixSig (FixitySig new_v fix src_loc), unitFV new_v) - -renameSig (InlineSig v p src_loc) - = pushSrcLocRn src_loc $ - lookupSigOccRn v `thenRn` \ new_v -> - returnRn (InlineSig new_v p src_loc, unitFV new_v) + returnRn (FixSig (FixitySig new_v fix src_loc)) -renameSig (NoInlineSig v p src_loc) +renameSig (InlineSig b v p src_loc) = pushSrcLocRn src_loc $ lookupSigOccRn v `thenRn` \ new_v -> - returnRn (NoInlineSig new_v p src_loc, unitFV new_v) -\end{code} - -\begin{code} -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) + returnRn (InlineSig b new_v p src_loc) \end{code} @@ -586,7 +569,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"))