Comments and an import-trim

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

diff --git a/compiler/deSugar/DsBinds.lhs b/compiler/deSugar/DsBinds.lhs
index 58e42fd..697ab48 100644 (file)
--- a/compiler/deSugar/DsBinds.lhs
+++ b/compiler/deSugar/DsBinds.lhs
@@ -107,7 +107,7 @@ dsHsBind auto_scc rest (PatBind { pat_lhs = pat, pat_rhs = grhss, pat_rhs_ty = t
 --     M.f = f_lcl             -- Generated from "exports"
 -- But we don't want that, because if M.f isn't exported,
 -- it'll be inlined unconditionally at every call site (its rhs is 
--- trivial).  That woudl be ok unless it has RULES, which would 
+-- trivial).  That would be ok unless it has RULES, which would 
 -- thereby be completely lost.  Bad, bad, bad.
 --
 -- Instead we want to generate
@@ -419,20 +419,20 @@ addDictScc var rhs = returnDs rhs
 
 
 \begin{code}
-dsCoercion :: ExprCoFn -> DsM CoreExpr -> DsM CoreExpr
-dsCoercion CoHole           thing_inside = thing_inside
-dsCoercion (CoCompose c1 c2) thing_inside = dsCoercion c1 (dsCoercion c2 thing_inside)
-dsCoercion (ExprCoFn co)     thing_inside = do { expr <- thing_inside
+dsCoercion :: HsWrapper -> DsM CoreExpr -> DsM CoreExpr
+dsCoercion WpHole           thing_inside = thing_inside
+dsCoercion (WpCompose c1 c2) thing_inside = dsCoercion c1 (dsCoercion c2 thing_inside)
+dsCoercion (WpCo co)     thing_inside = do { expr <- thing_inside
                                               ; return (Cast expr co) }
-dsCoercion (CoLam id)        thing_inside = do { expr <- thing_inside
+dsCoercion (WpLam id)        thing_inside = do { expr <- thing_inside
                                               ; return (Lam id expr) }
-dsCoercion (CoTyLam tv)      thing_inside = do { expr <- thing_inside
+dsCoercion (WpTyLam tv)      thing_inside = do { expr <- thing_inside
                                               ; return (Lam tv expr) }
-dsCoercion (CoApp id)        thing_inside = do { expr <- thing_inside
+dsCoercion (WpApp id)        thing_inside = do { expr <- thing_inside
                                               ; return (App expr (Var id)) }
-dsCoercion (CoTyApp ty)      thing_inside = do { expr <- thing_inside
+dsCoercion (WpTyApp ty)      thing_inside = do { expr <- thing_inside
                                               ; return (App expr (Type ty)) }
-dsCoercion (CoLet bs)        thing_inside = do { prs <- dsLHsBinds bs
+dsCoercion (WpLet bs)        thing_inside = do { prs <- dsLHsBinds bs
                                               ; expr <- thing_inside
                                               ; return (Let (Rec prs) expr) }
 \end{code}