X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FdeSugar%2FDsGRHSs.lhs;h=e0bb5f2dbb2154b3e53a317b69b78b7a45ec913e;hb=ad94d40948668032189ad22a0ad741ac1f645f50;hp=07907bd300eed9e46487841d38385e4ae8e74f85;hpb=03d60379b5b3d4c2ee8669e8e026084f3b402479;p=ghc-hetmet.git

diff --git a/compiler/deSugar/DsGRHSs.lhs b/compiler/deSugar/DsGRHSs.lhs
index 07907bd..e0bb5f2 100644
--- a/compiler/deSugar/DsGRHSs.lhs
+++ b/compiler/deSugar/DsGRHSs.lhs
@@ -6,6 +6,13 @@
 Matching guarded right-hand-sides (GRHSs)
 
 \begin{code}
+{-# OPTIONS -w #-}
+-- The above warning supression flag is a temporary kludge.
+-- While working on this module you are encouraged to remove it and fix
+-- any warnings in the module. See
+--     http://hackage.haskell.org/trac/ghc/wiki/CodingStyle#Warnings
+-- for details
+
 module DsGRHSs ( dsGuarded, dsGRHSs ) where
 
 #include "HsVersions.h"
@@ -14,14 +21,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 +62,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 patsBinders $ 
-                                        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 +117,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 +125,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}