X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FdeSugar%2FDsListComp.lhs;h=bdbe65ee7e7a457b4c772d3735b5a4dcefe345cb;hb=aedb94f5f220b5e442b23ecc445fd38c8d9b6ba0;hp=def08e1f6aa5ab1331b1123f6007ee707fdc4a07;hpb=6084fb5517da34f65034370a3695e2af3b85ce2b;p=ghc-hetmet.git diff --git a/compiler/deSugar/DsListComp.lhs b/compiler/deSugar/DsListComp.lhs index def08e1..bdbe65e 100644 --- a/compiler/deSugar/DsListComp.lhs +++ b/compiler/deSugar/DsListComp.lhs @@ -22,6 +22,7 @@ import {-# SOURCE #-} DsExpr ( dsLExpr, dsLocalBinds ) import HsSyn import TcHsSyn import CoreSyn +import MkCore import DsMonad -- the monadery used in the desugarer import DsUtils @@ -55,7 +56,7 @@ dsListComp lquals body elt_ty = do dflags <- getDOptsDs let quals = map unLoc lquals - if not (dopt Opt_RewriteRules dflags) || dopt Opt_IgnoreInterfacePragmas dflags + if not (dopt Opt_EnableRewriteRules dflags) || dopt Opt_IgnoreInterfacePragmas dflags -- Either rules are switched off, or we are ignoring what there are; -- Either way foldr/build won't happen, so use the more efficient -- Wadler-style desugaring @@ -585,7 +586,7 @@ dePArrComp (LetStmt ds : qs) body pa cea = do v <- newSysLocalDs ty'cea clet <- dsLocalBinds ds (mkCoreTup (map Var xs)) let'v <- newSysLocalDs (exprType clet) - let projBody = mkDsLet (NonRec let'v clet) $ + let projBody = mkCoreLet (NonRec let'v clet) $ mkCoreTup [Var v, Var let'v] errTy = exprType projBody errMsg = "DsListComp.dePArrComp: internal error!"