X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Frename%2FRnSource.lhs;h=b64782dc528bc36fbd6a1b17c897bda6ec304c25;hb=9367b24fde0c3f5efa5934e69571f5834ed43548;hp=fe87cf5babfe8d60d6eb05df756c624403d77c4e;hpb=205b076c00e997ec0bd7a906ba4ef3fa0dbd1898;p=ghc-hetmet.git

diff --git a/compiler/rename/RnSource.lhs b/compiler/rename/RnSource.lhs
index fe87cf5..b64782d 100644
--- a/compiler/rename/RnSource.lhs
+++ b/compiler/rename/RnSource.lhs
@@ -427,9 +427,10 @@ rnSrcInstDecl (InstDecl inst_ty mbinds uprags ats)
 	-- But the (unqualified) method names are in scope
     let 
 	binders = collectHsBindBinders mbinds'
-	ok_sig  = okInstDclSig (mkNameSet binders)
+	bndr_set = mkNameSet binders
     in
-    bindLocalNames binders (renameSigs ok_sig uprags)	`thenM` \ uprags' ->
+    bindLocalNames binders 
+	(renameSigs (Just bndr_set) okInstDclSig uprags)	`thenM` \ uprags' ->
 
     returnM (InstDecl inst_ty' mbinds' uprags' ats',
 	     meth_fvs `plusFV` at_fvs
@@ -544,7 +545,7 @@ lambdas.  So it seems simmpler not to check at all, and that is why
 check_e is commented out.
 	
 \begin{code}
-checkValidRule :: FastString -> [Name] -> LHsExpr Name -> NameSet -> RnM [()]
+checkValidRule :: FastString -> [Name] -> LHsExpr Name -> NameSet -> RnM ()
 checkValidRule rule_name ids lhs' fv_lhs'
   = do 	{ 	-- Check for the form of the LHS
 	  case (validRuleLhs ids lhs') of
@@ -553,7 +554,7 @@ checkValidRule rule_name ids lhs' fv_lhs'
 
 		-- Check that LHS vars are all bound
 	; let bad_vars = [var | var <- ids, not (var `elemNameSet` fv_lhs')]
-	; mappM (addErr . badRuleVar rule_name) bad_vars }
+	; mapM_ (addErr . badRuleVar rule_name) bad_vars }
 
 validRuleLhs :: [Name] -> LHsExpr Name -> Maybe (HsExpr Name)
 -- Nothing => OK
@@ -731,7 +732,7 @@ rnTyClDecl (ClassDecl {tcdCtxt = context, tcdLName = cname,
 	     { context' <- rnContext cls_doc context
 	     ; fds' <- rnFds cls_doc fds
 	     ; (ats', ats_fvs) <- rnATs ats
-	     ; sigs' <- renameSigs okClsDclSig sigs
+	     ; sigs' <- renameSigs Nothing okClsDclSig sigs
 	     ; return   (tyvars', context', fds', ats', ats_fvs, sigs') }
 
 	-- No need to check for duplicate associated type decls