X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FdeSugar%2FDsGRHSs.lhs;h=4e3dd2d15cb7a2170705e18bb0d5e3c7515ac423;hb=a8427a4125e9b78e88a487eeabf018f1c6e8bc08;hp=55b4f572f07dcd2887ed34816b9ca70f2faa5584;hpb=ccaf28d80e40cc2944bdaea3b46b245194cb90ab;p=ghc-hetmet.git

diff --git a/compiler/deSugar/DsGRHSs.lhs b/compiler/deSugar/DsGRHSs.lhs
index 55b4f57..4e3dd2d 100644
--- a/compiler/deSugar/DsGRHSs.lhs
+++ b/compiler/deSugar/DsGRHSs.lhs
@@ -14,14 +14,12 @@ import {-# SOURCE #-} DsExpr  ( dsLExpr, dsLocalBinds )
 import {-# SOURCE #-} Match   ( matchSinglePat )
 
 import HsSyn
-import HsUtils
 import CoreSyn
 import Var
 import Type
 
 import DsMonad
 import DsUtils
-import Unique
 import PrelInfo
 import TysWiredIn
 import PrelNames
@@ -57,21 +55,16 @@ 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 grhssa@(GRHSs grhss binds) rhs_ty =
-   bindLocalsDs binders $ do
+dsGRHSs hs_ctx pats grhssa@(GRHSs grhss binds) rhs_ty = do
     match_results <- mappM (dsGRHS hs_ctx pats rhs_ty) grhss
     let 
 	match_result1 = foldr1 combineMatchResults match_results
 	match_result2 = adjustMatchResultDs 
-                                 (\e -> bindLocalsDs binders $ 
-                                        dsLocalBinds binds e) 
+                                 (\e -> dsLocalBinds binds e) 
                                  match_result1
 		-- NB: nested dsLet inside matchResult
     --
     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
@@ -117,8 +110,7 @@ matchGuards (ExprStmt expr _ _ : stmts) ctx rhs rhs_ty
     returnDs (mkGuardedMatchResult pred_expr match_result)
 
 matchGuards (LetStmt binds : stmts) ctx rhs rhs_ty
-  = bindLocalsDs (map unLoc $ collectLocalBinders binds) $
-    matchGuards stmts ctx rhs rhs_ty	`thenDs` \ match_result ->
+  = matchGuards stmts ctx rhs rhs_ty	`thenDs` \ match_result ->
     returnDs (adjustMatchResultDs (dsLocalBinds binds) match_result)
 	-- NB the dsLet occurs inside the match_result
 	-- Reason: dsLet takes the body expression as its argument
@@ -126,8 +118,7 @@ matchGuards (LetStmt binds : stmts) ctx rhs rhs_ty
 	--	   body expression in hand
 
 matchGuards (BindStmt pat bind_rhs _ _ : stmts) ctx rhs rhs_ty
-  = bindLocalsDs (collectPatBinders pat) $
-    matchGuards stmts ctx rhs rhs_ty	`thenDs` \ match_result ->
+  = matchGuards stmts ctx rhs rhs_ty	`thenDs` \ match_result ->
     dsLExpr bind_rhs			`thenDs` \ core_rhs ->
     matchSinglePat core_rhs ctx pat rhs_ty match_result
 \end{code}