X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Frename%2FRnExpr.lhs;h=490faec5d698fda1882352fa1b66585e07fb673b;hp=d1984f88ceff1553cdb11e0050a36441639c8657;hb=302e2e29f2e1074bfba561e077a484dc4e1d15f6;hpb=4d4c860c6e82118f760d0debdece55114543158f

diff --git a/compiler/rename/RnExpr.lhs b/compiler/rename/RnExpr.lhs
index d1984f8..490faec 100644
--- a/compiler/rename/RnExpr.lhs
+++ b/compiler/rename/RnExpr.lhs
@@ -605,7 +605,7 @@ rnBracket (DecBrL decls)
   = do { (group, mb_splice) <- findSplice decls
        ; case mb_splice of
            Nothing -> return ()
-           Just (SpliceDecl (L loc _), _)  
+           Just (SpliceDecl (L loc _) _, _)  
               -> setSrcSpan loc $
                  addErr (ptext (sLit "Declaration splices are not permitted inside declaration brackets"))
 		-- Why not?  See Section 7.3 of the TH paper.  
@@ -886,7 +886,8 @@ rn_rec_stmts_and_then s cont
 
 	  --    ...bring them and their fixities into scope
 	; let bound_names = collectLStmtsBinders (map fst new_lhs_and_fv)
-	; bindLocalNamesFV_WithFixities bound_names fix_env $ do
+	; bindLocalNamesFV bound_names $
+          addLocalFixities fix_env bound_names $ do
 
 	  -- (C) do the right-hand-sides and thing-inside
 	{ segs <- rn_rec_stmts bound_names new_lhs_and_fv