X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FcoreSyn%2FPprCore.lhs;h=9d6f0bdfa454f0a29cb134ffa8aee9f7f0b160fa;hb=6c3eae5d5e88117cf80b4b35c9bae4ba3ebbe94c;hp=8713e74411363f7942c45e1ec5cce568c4afd657;hpb=f80b81f8b56ebd0fa0f7f82494a5090e9ab64256;p=ghc-hetmet.git

diff --git a/compiler/coreSyn/PprCore.lhs b/compiler/coreSyn/PprCore.lhs
index 8713e74..9d6f0bd 100644
--- a/compiler/coreSyn/PprCore.lhs
+++ b/compiler/coreSyn/PprCore.lhs
@@ -1,13 +1,18 @@
 %
+% (c) The University of Glasgow 2006
 % (c) The AQUA Project, Glasgow University, 1996-1998
 %
-%************************************************************************
-%*									*
-\section[PprCore]{Printing of Core syntax, including for interfaces}
-%*									*
-%************************************************************************
+
+Printing of Core syntax
 
 \begin{code}
+{-# 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/Commentary/CodingStyle#Warnings
+-- for details
+
 module PprCore (
 	pprCoreExpr, pprParendExpr,
 	pprCoreBinding, pprCoreBindings, pprCoreAlt,
@@ -17,34 +22,24 @@ module PprCore (
 #include "HsVersions.h"
 
 import CoreSyn
-import CostCentre	( pprCostCentreCore )
-import Var		( Var )
-import Id		( Id, idType, isDataConWorkId_maybe, idArity,
-			  idInfo, globalIdDetails, isGlobalId, isExportedId 
-			)
-import Var		( TyVar, isTyVar, tyVarKind )
-import IdInfo		( IdInfo, megaSeqIdInfo, 
-			  inlinePragInfo, occInfo, newDemandInfo, 
-			  lbvarInfo, hasNoLBVarInfo,
-			  arityInfo, ppArityInfo, 
-			  specInfo, pprNewStrictness,
-			  workerInfo, ppWorkerInfo,
-			  newStrictnessInfo, cafInfo, ppCafInfo, specInfoRules
-			)
-import NewDemand	( isTop )
+import CostCentre
+import Var
+import Id
+import IdInfo
+import NewDemand
 #ifdef OLD_STRICTNESS
-import Id		( idDemandInfo )
-import IdInfo		( cprInfo, ppCprInfo, strictnessInfo, ppStrictnessInfo ) 
+import Id
+import IdInfo
 #endif
 
-import DataCon		( dataConTyCon )
-import TyCon		( tupleTyConBoxity, isTupleTyCon )
-import Type		( pprParendType, pprType, pprParendKind )
-import Coercion         ( coercionKindPredTy )
-import BasicTypes	( tupleParens, isNoOcc, isAlwaysActive )
-import Util             ( lengthIs )
+import DataCon
+import TyCon
+import Type
+import Coercion
+import BasicTypes
+import Util
 import Outputable
-import FastString       ( mkFastString )
+import FastString
 \end{code}
 
 %************************************************************************
@@ -144,7 +139,7 @@ ppr_expr add_par expr@(App fun arg)
     let
 	pp_args     = sep (map pprArg args)
 	val_args    = dropWhile isTypeArg args	 -- Drop the type arguments for tuples
-	pp_tup_args = sep (punctuate comma (map pprArg val_args))
+	pp_tup_args = sep (punctuate comma (map pprCoreExpr val_args))
     in
     case fun of
 	Var f -> case isDataConWorkId_maybe f of
@@ -198,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
@@ -207,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)
@@ -297,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
@@ -366,10 +361,9 @@ pprRule (BuiltinRule { ru_fn = fn, ru_name = name})
 pprRule (Rule { ru_name = name, ru_act = act, ru_fn = fn,
 		ru_bndrs = tpl_vars, ru_args = tpl_args,
 		ru_rhs = rhs })
-  = doubleQuotes (ftext name) <+> ppr act <+>
-    sep [
-	  ptext SLIT("__forall") <+> braces (sep (map pprTypedBinder tpl_vars)),
-	  nest 2 (ppr fn <+> sep (map pprArg tpl_args)),
-	  nest 2 (ptext SLIT("=") <+> pprCoreExpr rhs)
-    ] <+> semi
+  = hang (doubleQuotes (ftext name) <+> ppr act)
+       4 (sep [ptext SLIT("forall") <+> braces (sep (map pprTypedBinder tpl_vars)),
+	       nest 2 (ppr fn <+> sep (map pprArg tpl_args)),
+	       nest 2 (ptext SLIT("=") <+> pprCoreExpr rhs)
+	    ])
 \end{code}