X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FdeSugar%2FDsExpr.lhs;h=51e01bd8fc818feb32440cd6c5d2f3da49cd6ad8;hb=dcb182ad063e95c9075bf2c8e34e7215fc38ef3d;hp=0350843905f89f1f29320bcce3c97066dce532c5;hpb=cb2be98ac73ffcc2e2cd631de403e83569a12b4d;p=ghc-hetmet.git diff --git a/ghc/compiler/deSugar/DsExpr.lhs b/ghc/compiler/deSugar/DsExpr.lhs index 0350843..51e01bd 100644 --- a/ghc/compiler/deSugar/DsExpr.lhs +++ b/ghc/compiler/deSugar/DsExpr.lhs @@ -156,7 +156,8 @@ dsLExpr (L loc e) = putSrcSpanDs loc $ dsExpr e dsExpr :: HsExpr Id -> DsM CoreExpr -dsExpr (HsPar x) = dsLExpr x +dsExpr (HsPar e) = dsLExpr e +dsExpr (ExprWithTySigOut e _) = dsLExpr e dsExpr (HsVar var) = returnDs (Var var) dsExpr (HsIPVar ip) = returnDs (Var (ipNameName ip)) dsExpr (HsLit lit) = dsLit lit @@ -665,7 +666,7 @@ dsRecStmt m_ty ds_meths stmts later_vars rec_vars rec_rets | otherwise = noLoc $ LazyPat (noLoc $ TuplePat (map nlVarPat vars) Boxed) body = noLoc $ HsDo DoExpr (stmts ++ [return_stmt]) - [(n, nlHsVar id) | (n,id) <- ds_meths] -- A bit of a hack + [(n, HsVar id) | (n,id) <- ds_meths] -- A bit of a hack (mkAppTy m_ty tup_ty) Var return_id = lookupReboundName ds_meths returnMName