X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FdeSugar%2FDsExpr.lhs;h=51e01bd8fc818feb32440cd6c5d2f3da49cd6ad8;hb=252abd9e355fe12e8f6f1e0192542a0df6ddccac;hp=4bcc2c98020b851861f9f48b181484af34510036;hpb=550421384b8364cdaf3135f7859c9f7d7ee1fff1;p=ghc-hetmet.git

diff --git a/ghc/compiler/deSugar/DsExpr.lhs b/ghc/compiler/deSugar/DsExpr.lhs
index 4bcc2c9..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
@@ -546,7 +547,7 @@ Here is where we desugar the Template Haskell brackets and escapes
 
 #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
@@ -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