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

diff --git a/compiler/deSugar/DsGRHSs.lhs b/compiler/deSugar/DsGRHSs.lhs
index eea61ba..4e3dd2d 100644
--- a/compiler/deSugar/DsGRHSs.lhs
+++ b/compiler/deSugar/DsGRHSs.lhs
@@ -1,7 +1,9 @@
 %
+% (c) The University of Glasgow 2006
 % (c) The GRASP/AQUA Project, Glasgow University, 1992-1998
 %
-\section[DsGRHSs]{Matching guarded right-hand-sides (GRHSs)}
+
+Matching guarded right-hand-sides (GRHSs)
 
 \begin{code}
 module DsGRHSs ( dsGuarded, dsGRHSs ) where
@@ -11,20 +13,19 @@ module DsGRHSs ( dsGuarded, dsGRHSs ) where
 import {-# SOURCE #-} DsExpr  ( dsLExpr, dsLocalBinds )
 import {-# SOURCE #-} Match   ( matchSinglePat )
 
-import HsSyn		( Stmt(..), HsExpr(..), GRHSs(..), GRHS(..), 
-			  LHsExpr, HsMatchContext(..), Pat(..) )
-import CoreSyn		( CoreExpr )
-import Var		( Id )
-import Type		( Type )
+import HsSyn
+import CoreSyn
+import Var
+import Type
 
 import DsMonad
 import DsUtils
-import Unique		( Uniquable(..) )
-import PrelInfo		( nON_EXHAUSTIVE_GUARDS_ERROR_ID )
-import TysWiredIn	( trueDataConId )
-import PrelNames	( otherwiseIdKey, hasKey )
-import Name		( Name )
-import SrcLoc		( unLoc, Located(..) )
+import PrelInfo
+import TysWiredIn
+import PrelNames
+import Name
+import SrcLoc
+
 \end{code}
 
 @dsGuarded@ is used for both @case@ expressions and pattern bindings.
@@ -54,14 +55,15 @@ 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
-  = mappM (dsGRHS hs_ctx pats rhs_ty) grhss	`thenDs` \ match_results ->
+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 (dsLocalBinds binds) match_result1
+	match_result2 = adjustMatchResultDs 
+                                 (\e -> dsLocalBinds binds e) 
+                                 match_result1
 		-- NB: nested dsLet inside matchResult
-    in
+    --
     returnDs match_result2
 
 dsGRHS hs_ctx pats rhs_ty (L loc (GRHS guards rhs))
@@ -94,7 +96,7 @@ matchGuards [] ctx rhs rhs_ty
 	-- you don't get a "non-exhaustive eqns" message when the guards 
 	-- finish in "otherwise".
 	-- NB:	The success of this clause depends on the typechecker not
-	-- 	wrapping the 'otherwise' in empty HsTyApp or HsCoerce constructors
+	-- 	wrapping the 'otherwise' in empty HsTyApp or HsWrap constructors
 	--	If it does, you'll get bogus overlap warnings
 matchGuards (ExprStmt (L _ (HsVar v)) _ _ : stmts) ctx rhs rhs_ty
   |  v `hasKey` otherwiseIdKey