X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FcoreSyn%2FPprCore.lhs;h=9d6f0bdfa454f0a29cb134ffa8aee9f7f0b160fa;hb=6c3eae5d5e88117cf80b4b35c9bae4ba3ebbe94c;hp=f671f073e8ce2c421557c02370f0ea4f8bae01de;hpb=17b297d97d327620ed6bfab942f8992b2446f1bf;p=ghc-hetmet.git diff --git a/compiler/coreSyn/PprCore.lhs b/compiler/coreSyn/PprCore.lhs index f671f07..9d6f0bd 100644 --- a/compiler/coreSyn/PprCore.lhs +++ b/compiler/coreSyn/PprCore.lhs @@ -6,11 +6,11 @@ Printing of Core syntax \begin{code} -{-# OPTIONS_GHC -w #-} +{-# OPTIONS -w #-} -- The above warning supression flag is a temporary kludge. -- While working on this module you are encouraged to remove it and fix -- any warnings in the module. See --- http://hackage.haskell.org/trac/ghc/wiki/WorkingConventions#Warnings +-- http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#Warnings -- for details module PprCore ( @@ -193,7 +193,6 @@ ppr_expr add_par (Let bind@(NonRec val_bdr rhs@(Let _ _)) body) nest 2 (pprCoreExpr rhs), ptext SLIT("} in"), pprCoreExpr body ] --} ppr_expr add_par (Let bind@(NonRec val_bdr rhs) expr@(Let _ _)) = add_par @@ -202,15 +201,16 @@ ppr_expr add_par (Let bind@(NonRec val_bdr rhs) expr@(Let _ _)) ptext SLIT("} in")]) $$ pprCoreExpr expr) +-} --- general case (recursive case, too) +-- General case (recursive case, too) ppr_expr add_par (Let bind expr) = add_par $ - sep [hang (ptext keyword) 2 (ppr_bind bind), - hang (ptext SLIT("} in ")) 2 (pprCoreExpr expr)] + sep [hang (ptext keyword) 2 (ppr_bind bind <+> ptext SLIT("} in")), + pprCoreExpr expr] where keyword = case bind of - Rec _ -> SLIT("__letrec {") + Rec _ -> SLIT("letrec {") NonRec _ _ -> SLIT("let {") ppr_expr add_par (Note (SCC cc) expr) @@ -292,7 +292,7 @@ pprTyVarBndr tyvar pprIdBndr id = ppr id <+> pprIdBndrInfo (idInfo id) pprIdBndrInfo info - = megaSeqIdInfo `seq` doc -- The seq is useful for poking on black holes + = megaSeqIdInfo info `seq` doc -- The seq is useful for poking on black holes where prag_info = inlinePragInfo info occ_info = occInfo info