X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FhsSyn%2FHsExpr.lhs;h=44d9b436c3bd8adca739a2ea071cb68410e7dd1f;hb=74b27e20425336403d80e942ee3faf00f8c36ef8;hp=23b6b137dda867cfcec6f1736e4eb027ac4edb7e;hpb=74794eb854913b670cd8c06befee2c7b88342b42;p=ghc-hetmet.git

diff --git a/compiler/hsSyn/HsExpr.lhs b/compiler/hsSyn/HsExpr.lhs
index 23b6b13..44d9b43 100644
--- a/compiler/hsSyn/HsExpr.lhs
+++ b/compiler/hsSyn/HsExpr.lhs
@@ -483,17 +483,19 @@ pprParendExpr expr
 	-- I think that is usually (always?) right
     in
     case unLoc expr of
-      HsLit l		-> pp_as_was
-      HsOverLit l 	-> pp_as_was
-      HsVar _		-> pp_as_was
-      HsIPVar _		-> pp_as_was
-      ExplicitList _ _  -> pp_as_was
-      ExplicitPArr _ _  -> pp_as_was
-      ExplicitTuple _ _	-> pp_as_was
-      HsPar _		-> pp_as_was
-      HsBracket _	-> pp_as_was
-      HsBracketOut _ []	-> pp_as_was
-      _			-> parens pp_as_was
+      HsLit l		   -> pp_as_was
+      HsOverLit l 	   -> pp_as_was
+      HsVar _		   -> pp_as_was
+      HsIPVar _		   -> pp_as_was
+      ExplicitList _ _     -> pp_as_was
+      ExplicitPArr _ _     -> pp_as_was
+      ExplicitTuple _ _	   -> pp_as_was
+      HsPar _		   -> pp_as_was
+      HsBracket _	   -> pp_as_was
+      HsBracketOut _ []	   -> pp_as_was
+      HsDo sc _ _ _
+       | isListCompExpr sc -> pp_as_was
+      _			   -> parens pp_as_was
 
 isAtomicHsExpr :: HsExpr id -> Bool	-- A single token
 isAtomicHsExpr (HsVar {})     = True
@@ -694,11 +696,9 @@ pprMatch ctxt (Match pats maybe_ty grhss)
 
 pprGRHSs :: OutputableBndr id => HsMatchContext id -> GRHSs id -> SDoc
 pprGRHSs ctxt (GRHSs grhss binds)
-  = pprDeeper
-    (vcat (map (pprGRHS ctxt . unLoc) grhss)
-      $$
-     if isEmptyLocalBinds binds then empty
-     else text "where" $$ nest 4 (pprBinds binds))
+  = vcat (map (pprGRHS ctxt . unLoc) grhss)
+ $$ if isEmptyLocalBinds binds then empty
+                               else text "where" $$ nest 4 (pprBinds binds)
 
 pprGRHS :: OutputableBndr id => HsMatchContext id -> GRHS id -> SDoc
 
@@ -938,7 +938,12 @@ data HsStmtContext id
 isDoExpr :: HsStmtContext id -> Bool
 isDoExpr DoExpr      = True
 isDoExpr (MDoExpr _) = True
-isDoExpr other       = False
+isDoExpr _           = False
+
+isListCompExpr :: HsStmtContext id -> Bool
+isListCompExpr ListComp = True
+isListCompExpr PArrComp = True
+isListCompExpr _        = False
 \end{code}
 
 \begin{code}