From: Simon Marlow <simonmar@microsoft.com>
Date: Fri, 20 Apr 2007 14:53:54 +0000 (+0000)
Subject: breakpoints: fix the in-scope set for 'where' clauses
X-Git-Tag: 2007-05-06~140
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=ccaf28d80e40cc2944bdaea3b46b245194cb90ab;hp=d5f23f7844b0d27021767bd2f31c63af2fe3a09f

breakpoints: fix the in-scope set for 'where' clauses
---

diff --git a/compiler/deSugar/DsGRHSs.lhs b/compiler/deSugar/DsGRHSs.lhs
index 31d48b6..55b4f57 100644
--- a/compiler/deSugar/DsGRHSs.lhs
+++ b/compiler/deSugar/DsGRHSs.lhs
@@ -57,19 +57,21 @@ dsGRHSs :: HsMatchContext Name -> [Pat Id]	-- These are to build a MatchContext
 	-> GRHSs Id				-- Guarded RHSs
 	-> Type					-- Type of RHS
 	-> DsM MatchResult
-dsGRHSs hs_ctx pats (GRHSs grhss binds) rhs_ty =
-   bindLocalsDs (bindsBinders ++ patsBinders) $
-    mappM (dsGRHS hs_ctx pats rhs_ty) grhss	`thenDs` \ match_results ->
+dsGRHSs hs_ctx pats grhssa@(GRHSs grhss binds) rhs_ty =
+   bindLocalsDs binders $ do
+    match_results <- mappM (dsGRHS hs_ctx pats rhs_ty) grhss
     let 
 	match_result1 = foldr1 combineMatchResults match_results
 	match_result2 = adjustMatchResultDs 
-                                 (\e -> bindLocalsDs patsBinders $ dsLocalBinds binds e) 
+                                 (\e -> bindLocalsDs binders $ 
+                                        dsLocalBinds binds e) 
                                  match_result1
 		-- NB: nested dsLet inside matchResult
-    in
+    --
     returnDs match_result2
         where bindsBinders = map unLoc (collectLocalBinders binds)
               patsBinders  = collectPatsBinders (map (L undefined) pats) 
+              binders = bindsBinders ++ patsBinders
 
 dsGRHS hs_ctx pats rhs_ty (L loc (GRHS guards rhs))
   = matchGuards (map unLoc guards) hs_ctx rhs rhs_ty