X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Frename%2FRnBinds.lhs;h=ecd3b3d04a239fffdbbe8466912c42760ffde370;hp=13035e72e2831185bc58ee74c632c381ac49b151;hb=9da4639011348fb6c318e3cba4b08622f811d9c4;hpb=0065d5ab628975892cea1ec7303f968c3338cbe1

diff --git a/compiler/rename/RnBinds.lhs b/compiler/rename/RnBinds.lhs
index 13035e7..ecd3b3d 100644
--- a/compiler/rename/RnBinds.lhs
+++ b/compiler/rename/RnBinds.lhs
@@ -12,7 +12,7 @@ they may be affected by renaming (which isn't fully worked out yet).
 module RnBinds (
 	rnTopBinds, 
 	rnLocalBindsAndThen, rnValBindsAndThen, rnValBinds, trimWith,
-	rnMethodBinds, renameSigs, 
+	rnMethodBinds, renameSigs, mkSigTvFn,
 	rnMatchGroup, rnGRHSs
    ) where
 
@@ -28,7 +28,7 @@ import RnTypes		( rnHsSigType, rnLHsType, rnHsTypeFVs,
 			  rnLPat, rnPatsAndThen, patSigErr, checkPrecMatch )
 import RnEnv		( bindLocatedLocalsRn, lookupLocatedBndrRn, 
 			  lookupLocatedInstDeclBndr, newIPNameRn,
-			  lookupLocatedSigOccRn, bindPatSigTyVars, bindPatSigTyVarsFV,
+			  lookupLocatedSigOccRn, bindPatSigTyVarsFV,
 			  bindLocalFixities, bindSigTyVarsFV, 
 			  warnUnusedLocalBinds, mapFvRn, extendTyVarEnvFVRn,
 			)
@@ -44,7 +44,7 @@ import BasicTypes	( RecFlag(..) )
 import Digraph		( SCC(..), stronglyConnComp )
 import Bag
 import Outputable
-import Maybes		( orElse, isJust )
+import Maybes		( orElse )
 import Util		( filterOut )
 import Monad		( foldM )
 \end{code}
@@ -379,8 +379,8 @@ rnBind sig_fn trim (L loc (PatBind { pat_lhs = pat, pat_rhs = grhss }))
 
 	; let bndrs = collectPatBinders pat'
 
-	; (grhss', fvs) <- bindSigTyVarsFV (concatMap sig_fn bndrs) $
-			   rnGRHSs PatBindRhs grhss
+	; (grhss', fvs) <- rnGRHSs PatBindRhs grhss
+		-- No scoped type variables for pattern bindings
 
 	; return (L loc (PatBind { pat_lhs = pat', pat_rhs = grhss', 
 				   pat_rhs_ty = placeHolderType, bind_fvs = trim fvs }), 
@@ -392,12 +392,13 @@ rnBind sig_fn trim (L loc (FunBind { fun_id = name, fun_infix = inf, fun_matches
 	; let plain_name = unLoc new_name
 
 	; (matches', fvs) <- bindSigTyVarsFV (sig_fn plain_name) $
+				-- bindSigTyVars tests for Opt_ScopedTyVars
 			     rnMatchGroup (FunRhs plain_name) matches
 
 	; checkPrecMatch inf plain_name matches'
 
 	; return (L loc (FunBind { fun_id = new_name, fun_infix = inf, fun_matches = matches',
-				   bind_fvs = trim fvs, fun_co_fn = idCoercion }), 
+				   bind_fvs = trim fvs, fun_co_fn = idHsWrapper }), 
 		  [plain_name], fvs)
       }
 \end{code}
@@ -420,30 +421,32 @@ a binder.
 
 \begin{code}
 rnMethodBinds :: Name			-- Class name
+	      -> (Name -> [Name])	-- Signature tyvar function
 	      -> [Name]			-- Names for generic type variables
 	      -> LHsBinds RdrName
 	      -> RnM (LHsBinds Name, FreeVars)
 
-rnMethodBinds cls gen_tyvars binds
+rnMethodBinds cls sig_fn gen_tyvars binds
   = foldM do_one (emptyBag,emptyFVs) (bagToList binds)
   where do_one (binds,fvs) bind = do
-	   (bind', fvs_bind) <- rnMethodBind cls gen_tyvars bind
+	   (bind', fvs_bind) <- rnMethodBind cls sig_fn gen_tyvars bind
 	   return (bind' `unionBags` binds, fvs_bind `plusFV` fvs)
 
-rnMethodBind cls gen_tyvars (L loc (FunBind { fun_id = name, fun_infix = inf, 
-					      fun_matches = MatchGroup matches _ }))
-  =  setSrcSpan loc $ 
-     lookupLocatedInstDeclBndr cls name			`thenM` \ sel_name -> 
-     let plain_name = unLoc sel_name in
+rnMethodBind cls sig_fn gen_tyvars (L loc (FunBind { fun_id = name, fun_infix = inf, 
+					             fun_matches = MatchGroup matches _ }))
+  = setSrcSpan loc $ 
+    lookupLocatedInstDeclBndr cls name			`thenM` \ sel_name -> 
+    let plain_name = unLoc sel_name in
 	-- We use the selector name as the binder
 
+    bindSigTyVarsFV (sig_fn plain_name)			$
     mapFvRn (rn_match plain_name) matches		`thenM` \ (new_matches, fvs) ->
     let 
 	new_group = MatchGroup new_matches placeHolderType
     in
     checkPrecMatch inf plain_name new_group		`thenM_`
     returnM (unitBag (L loc (FunBind { fun_id = sel_name, fun_infix = inf, fun_matches = new_group,
-				       bind_fvs = fvs, fun_co_fn = idCoercion })), 
+				       bind_fvs = fvs, fun_co_fn = idHsWrapper })), 
 	     fvs `addOneFV` plain_name)
 	-- The 'fvs' field isn't used for method binds
   where
@@ -460,12 +463,13 @@ rnMethodBind cls gen_tyvars (L loc (FunBind { fun_id = name, fun_infix = inf,
 
 
 -- Can't handle method pattern-bindings which bind multiple methods.
-rnMethodBind cls gen_tyvars mbind@(L loc (PatBind other_pat _ _ _))
+rnMethodBind cls sig_fn gen_tyvars mbind@(L loc (PatBind other_pat _ _ _))
   = addLocErr mbind methodBindErr	`thenM_`
     returnM (emptyBag, emptyFVs) 
 \end{code}
 
 
+
 %************************************************************************
 %*									*
 \subsubsection[dep-Sigs]{Signatures (and user-pragmas for values)}