Super-monster patch implementing the new typechecker -- at last

[ghc-hetmet.git] / compiler / deSugar / MatchCon.lhs

diff --git a/compiler/deSugar/MatchCon.lhs b/compiler/deSugar/MatchCon.lhs
index 9ec7f35..03fa325 100644 (file)
--- a/compiler/deSugar/MatchCon.lhs
+++ b/compiler/deSugar/MatchCon.lhs
@@ -23,8 +23,6 @@ import HsSyn
 import DsBinds
 import DataCon
 import TcType
-import CoreSyn
-import MkCore
 import DsMonad
 import DsUtils
 import Util    ( all2, takeList, zipEqual )
@@ -140,10 +138,10 @@ matchOneCon vars ty (eqn1 : eqns) -- All eqns for a single constructor
     shift (_, eqn@(EqnInfo { eqn_pats = ConPatOut{ pat_tvs = tvs, pat_dicts = ds, 
                                                   pat_binds = bind, pat_args = args
                                        } : pats }))
-      = do { prs <- dsLHsBinds bind
+      = do { ds_ev_binds <- dsTcEvBinds bind
           ; return (wrapBinds (tvs `zip` tvs1) 
                    . wrapBinds (ds  `zip` dicts1)
-                   . mkCoreLet (Rec prs),
+                   . wrapDsEvBinds ds_ev_binds,
                    eqn { eqn_pats = conArgPats arg_tys args ++ pats }) }
 
     -- Choose the right arg_vars in the right order for this group