projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix Trace #1494
[ghc-hetmet.git]
/
compiler
/
deSugar
/
DsGRHSs.lhs
diff --git
a/compiler/deSugar/DsGRHSs.lhs
b/compiler/deSugar/DsGRHSs.lhs
index
93f4ead
..
4e3dd2d
100644
(file)
--- a/
compiler/deSugar/DsGRHSs.lhs
+++ b/
compiler/deSugar/DsGRHSs.lhs
@@
-20,12
+20,12
@@
import Type
import DsMonad
import DsUtils
import DsMonad
import DsUtils
-import Unique
import PrelInfo
import TysWiredIn
import PrelNames
import Name
import SrcLoc
import PrelInfo
import TysWiredIn
import PrelNames
import Name
import SrcLoc
+
\end{code}
@dsGuarded@ is used for both @case@ expressions and pattern bindings.
\end{code}
@dsGuarded@ is used for both @case@ expressions and pattern bindings.
@@
-55,14
+55,15
@@
dsGRHSs :: HsMatchContext Name -> [Pat Id] -- These are to build a MatchContext
-> GRHSs Id -- Guarded RHSs
-> Type -- Type of RHS
-> DsM MatchResult
-> 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
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
-- NB: nested dsLet inside matchResult
- in
+ --
returnDs match_result2
dsGRHS hs_ctx pats rhs_ty (L loc (GRHS guards rhs))
returnDs match_result2
dsGRHS hs_ctx pats rhs_ty (L loc (GRHS guards rhs))