projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adjust code from manual merges
[ghc-hetmet.git]
/
compiler
/
deSugar
/
Match.lhs
diff --git
a/compiler/deSugar/Match.lhs
b/compiler/deSugar/Match.lhs
index
d793343
..
9ff1548
100644
(file)
--- a/
compiler/deSugar/Match.lhs
+++ b/
compiler/deSugar/Match.lhs
@@
-254,7
+254,7
@@
match :: [Id] -- Variables rep'ing the exprs we're matching with
-> DsM MatchResult -- Desugared result!
match [] ty eqns
-> DsM MatchResult -- Desugared result!
match [] ty eqns
- = ASSERT( not (null eqns) )
+ = ASSERT2( not (null eqns), ppr ty )
returnDs (foldr1 combineMatchResults match_results)
where
match_results = [ ASSERT( null (eqn_pats eqn) )
returnDs (foldr1 combineMatchResults match_results)
where
match_results = [ ASSERT( null (eqn_pats eqn) )
@@
-715,6
+715,9
@@
data PatGroup
groupEquations :: [EquationInfo] -> [[(PatGroup, EquationInfo)]]
groupEquations :: [EquationInfo] -> [[(PatGroup, EquationInfo)]]
+-- If the result is of form [g1, g2, g3],
+-- (a) all the (pg,eq) pairs in g1 have the same pg
+-- (b) none of the gi are empty
groupEquations eqns
= runs same_gp [(patGroup (firstPat eqn), eqn) | eqn <- eqns]
where
groupEquations eqns
= runs same_gp [(patGroup (firstPat eqn), eqn) | eqn <- eqns]
where