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
#ifdef GHCI /* Only if bootstrapping */
dsExpr (HsBracketOut x ps) = dsBracket x ps
-dsExpr (HsSplice n e) = pprPanic "dsExpr:splice" (ppr e)
+dsExpr (HsSpliceE s) = pprPanic "dsExpr:splice" (ppr s)
#endif
-- Arrow notation extension
| 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