X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FcoreSyn%2FPprCore.lhs;h=864f4bdcb021d2d556a182b1d1115326cff96d67;hb=2d4b82a0a94edeaedd9d0c4b3f023ac8d1d59766;hp=2aff67f223293ed973012b21c8b97160b4da877a;hpb=a77abe6a30ea2763cfa1c0ca83cdce9b7200ced2;p=ghc-hetmet.git

diff --git a/ghc/compiler/coreSyn/PprCore.lhs b/ghc/compiler/coreSyn/PprCore.lhs
index 2aff67f..864f4bd 100644
--- a/ghc/compiler/coreSyn/PprCore.lhs
+++ b/ghc/compiler/coreSyn/PprCore.lhs
@@ -1,5 +1,5 @@
 %
-% (c) The AQUA Project, Glasgow University, 1996
+% (c) The AQUA Project, Glasgow University, 1996-1998
 %
 %************************************************************************
 %*									*
@@ -8,41 +8,42 @@
 %************************************************************************
 
 \begin{code}
-#include "HsVersions.h"
-
 module PprCore (
-	pprCoreExpr,
-	pprCoreBinding,
-	pprBigCoreBinder,
-	pprTypedCoreBinder
-	
-	-- these are here to make the instances go in 0.26:
-#if __GLASGOW_HASKELL__ <= 26
-	, GenCoreBinding, GenCoreExpr, GenCoreCaseAlts
-	, GenCoreCaseDefault, GenCoreArg
-#endif
+	pprCoreExpr, pprParendExpr,
+	pprCoreBinding, pprCoreBindings, pprCoreAlt,
+	pprRules
     ) where
 
-import Ubiq{-uitous-}
+#include "HsVersions.h"
 
 import CoreSyn
-import CostCentre	( showCostCentre )
-import Id		( idType, getIdInfo, getIdStrictness, isTupleCon,
-			  nullIdEnv, DataCon(..), GenId{-instances-}
+import CostCentre	( pprCostCentreCore )
+import Var		( Var )
+import Id		( Id, idType, isDataConWorkId_maybe, idArity,
+			  idInfo, globalIdDetails, isGlobalId, isExportedId 
 			)
-import IdInfo		( ppIdInfo, StrictnessInfo(..) )
-import Literal		( Literal{-instances-} )
-import Name		( isSymLexeme )
-import Outputable	-- quite a few things
-import PprEnv
-import PprType		( GenType{-instances-}, GenTyVar{-instance-} )
-import PprStyle		( PprStyle(..) )
-import Pretty
-import PrimOp		( PrimOp{-instances-} )
-import TyVar		( GenTyVar{-instances-} )
-import Unique		( Unique{-instances-} )
-import Usage		( GenUsage{-instances-} )
-import Util		( panic{-ToDo:rm-} )
+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 )
+#ifdef OLD_STRICTNESS
+import Id		( idDemandInfo )
+import IdInfo		( cprInfo, ppCprInfo, strictnessInfo, ppStrictnessInfo ) 
+#endif
+
+import DataCon		( dataConTyCon )
+import TyCon		( tupleTyConBoxity, isTupleTyCon )
+import Type		( pprParendType, pprType, pprParendKind )
+import BasicTypes	( tupleParens, isNoOcc, isAlwaysActive )
+import Util             ( lengthIs )
+import Outputable
+import FastString       ( mkFastString )
 \end{code}
 
 %************************************************************************
@@ -51,323 +52,333 @@ import Util		( panic{-ToDo:rm-} )
 %*									*
 %************************************************************************
 
-@pprCoreBinding@ and @pprCoreExpr@ let you give special printing
-function for ``major'' val_bdrs (those next to equal signs :-),
-``minor'' ones (lambda-bound, case-bound), and bindees.  They would
-usually be called through some intermediary.
-
-The binder/occ printers take the default ``homogenized'' (see
-@PprEnv@...) @Pretty@ and the binder/occ.  They can either use the
-homogenized one, or they can ignore it completely.  In other words,
-the things passed in act as ``hooks'', getting the last word on how to
-print something.
-
 @pprParendCoreExpr@ puts parens around non-atomic Core expressions.
 
 \begin{code}
-pprCoreBinding :: PprStyle -> CoreBinding -> Pretty
-
-pprGenCoreBinding
-	:: (Eq tyvar, Outputable tyvar,
-	    Eq uvar,  Outputable uvar,
-	    Outputable bndr,
-	    Outputable occ)
-	=> PprStyle
-	-> (bndr -> Pretty)	-- to print "major" val_bdrs
-	-> (bndr -> Pretty)	-- to print "minor" val_bdrs
-	-> (occ  -> Pretty)	-- to print bindees
-	-> GenCoreBinding bndr occ tyvar uvar
-	-> Pretty
-
-pprGenCoreBinding sty pbdr1 pbdr2 pocc bind
-  = ppr_bind (init_ppr_env sty pbdr1 pbdr2 pocc) bind
-
-init_ppr_env sty pbdr1 pbdr2 pocc
-  = initPprEnv sty
-	(Just (ppr sty)) -- literals
-	(Just (ppr sty)) -- data cons
-	(Just (ppr sty)) -- primops
-	(Just (\ cc -> ppStr (showCostCentre sty True cc)))
-	(Just (ppr sty)) -- tyvars
-	(Just (ppr sty)) -- usage vars
-	(Just pbdr1) (Just pbdr2) (Just pocc) -- value vars
-	(Just (ppr sty)) -- types
-	(Just (ppr sty)) -- usages
-
---------------
-pprCoreBinding sty (NonRec binder expr)
-  = ppHang (ppCat [pprBigCoreBinder sty binder, ppEquals])
-    	 4 (pprCoreExpr sty (pprBigCoreBinder sty) (pprBabyCoreBinder sty) (ppr sty) expr)
-
-pprCoreBinding sty (Rec binds)
-  = ppAboves [ifPprDebug sty (ppStr "{- plain Rec -}"),
-	      ppAboves (map ppr_bind binds),
-	      ifPprDebug sty (ppStr "{- end plain Rec -}")]
-  where
-    ppr_bind (binder, expr)
-      = ppHang (ppCat [pprBigCoreBinder sty binder, ppEquals])
-	     4 (pprCoreExpr sty (pprBigCoreBinder sty) (pprBabyCoreBinder sty) (ppr sty) expr)
-\end{code}
-
-\begin{code}
-pprCoreExpr
-	:: PprStyle
-	-> (Id -> Pretty) -- to print "major" val_bdrs
-	-> (Id -> Pretty) -- to print "minor" val_bdrs
-	-> (Id  -> Pretty) -- to print bindees
-	-> CoreExpr
-	-> Pretty
-pprCoreExpr = pprGenCoreExpr
-
-pprGenCoreExpr, pprParendCoreExpr
-	:: (Eq tyvar, Outputable tyvar, Eq uvar, Outputable uvar,
-	    Outputable bndr,
-	    Outputable occ)
-	=> PprStyle
-	-> (bndr -> Pretty) -- to print "major" val_bdrs
-	-> (bndr -> Pretty) -- to print "minor" val_bdrs
-	-> (occ  -> Pretty) -- to print bindees
-	-> GenCoreExpr bndr occ tyvar uvar
-	-> Pretty
-
-pprGenCoreExpr sty pbdr1 pbdr2 pocc expr
-  = ppr_expr (init_ppr_env sty pbdr1 pbdr2 pocc) expr
-
-pprParendCoreExpr sty pbdr1 pbdr2 pocc expr
-  = let
-	parenify
-	  = case expr of
-	      Var _ -> id	-- leave unchanged
-	      Lit _ -> id
-	      _	    -> ppParens	-- wraps in parens
-    in
-    parenify (pprGenCoreExpr sty pbdr1 pbdr2 pocc expr)
+pprCoreBindings :: OutputableBndr b => [Bind b] -> SDoc
+pprCoreBinding  :: OutputableBndr b => Bind b  -> SDoc
+pprCoreExpr     :: OutputableBndr b => Expr b  -> SDoc
+pprParendExpr   :: OutputableBndr b => Expr b  -> SDoc
 
-ppr_core_arg sty pocc arg
-  = ppr_arg (init_ppr_env sty pocc pocc pocc) arg
+pprCoreBindings = pprTopBinds
+pprCoreBinding  = pprTopBind 
 
-ppr_core_alts sty pbdr1 pbdr2 pocc alts
-  = ppr_alts (init_ppr_env sty pbdr1 pbdr2 pocc) alts
+instance OutputableBndr b => Outputable (Bind b) where
+    ppr bind = ppr_bind bind
 
-ppr_core_default sty pbdr1 pbdr2 pocc deflt
-  = ppr_default (init_ppr_env sty pbdr1 pbdr2 pocc) deflt
+instance OutputableBndr b => Outputable (Expr b) where
+    ppr expr = pprCoreExpr expr
 \end{code}
 
+
 %************************************************************************
 %*									*
-\subsection{Instance declarations for Core printing}
+\subsection{The guts}
 %*									*
 %************************************************************************
 
 \begin{code}
-instance
-  (Outputable bndr, Outputable occ, Eq tyvar, Outputable tyvar,
-   Eq uvar, Outputable uvar)
- =>
-  Outputable (GenCoreBinding bndr occ tyvar uvar) where
-    ppr sty bind = pprGenCoreBinding sty (ppr sty) (ppr sty) (ppr sty) bind
-
-instance
-  (Outputable bndr, Outputable occ, Eq tyvar, Outputable tyvar,
-   Eq uvar, Outputable uvar)
- =>
-  Outputable (GenCoreExpr bndr occ tyvar uvar) where
-    ppr sty expr = pprGenCoreExpr sty (ppr sty) (ppr sty) (ppr sty) expr
-
-instance
-  (Outputable occ, Eq tyvar, Outputable tyvar, Eq uvar, Outputable uvar)
- =>
-  Outputable (GenCoreArg occ tyvar uvar) where
-    ppr sty arg = ppr_core_arg sty (ppr sty) arg
-
-instance
-  (Outputable bndr, Outputable occ, Eq tyvar, Outputable tyvar,
-   Eq uvar, Outputable uvar)
- =>
-  Outputable (GenCoreCaseAlts bndr occ tyvar uvar) where
-    ppr sty alts = ppr_core_alts sty (ppr sty) (ppr sty) (ppr sty) alts
-
-instance
-  (Outputable bndr, Outputable occ, Eq tyvar, Outputable tyvar,
-   Eq uvar, Outputable uvar)
- =>
-  Outputable (GenCoreCaseDefault bndr occ tyvar uvar) where
-    ppr sty deflt  = ppr_core_default sty (ppr sty) (ppr sty) (ppr sty) deflt
-\end{code}
+pprTopBinds binds = vcat (map pprTopBind binds)
 
-%************************************************************************
-%*									*
-\subsection{Workhorse routines (...????...)}
-%*									*
-%************************************************************************
+pprTopBind (NonRec binder expr)
+ = ppr_binding (binder,expr) $$ text ""
 
-\begin{code}
-ppr_bind pe (NonRec val_bdr expr)
-  = ppHang (ppCat [pMajBndr pe val_bdr, ppEquals])
-	 4 (ppr_expr pe expr)
-
-ppr_bind pe (Rec binds)
-  = ppAboves [ ppStr "{- Rec -}",
-	       ppAboves (map ppr_pair binds),
-	       ppStr "{- end Rec -}" ]
-  where
-    ppr_pair (val_bdr, expr)
-      = ppHang (ppCat [pMajBndr pe val_bdr, ppEquals])
-	     4 (ppr_expr pe expr)
+pprTopBind (Rec binds)
+  = vcat [ptext SLIT("Rec {"),
+	  vcat (map ppr_binding binds),
+	  ptext SLIT("end Rec }"),
+	  text ""]
 \end{code}
 
 \begin{code}
-ppr_parend_expr pe expr
-  = let
-	parenify
-	  = case expr of
-	      Var _ -> id	-- leave unchanged
-	      Lit _ -> id
-	      _	    -> ppParens	-- wraps in parens
-    in
-    parenify (ppr_expr pe expr)
+ppr_bind :: OutputableBndr b => Bind b -> SDoc
+
+ppr_bind (NonRec val_bdr expr) = ppr_binding (val_bdr, expr)
+ppr_bind (Rec binds)  	       = vcat (map pp binds)
+			       where
+				 pp bind = ppr_binding bind <> semi
+
+ppr_binding :: OutputableBndr b => (b, Expr b) -> SDoc
+ppr_binding (val_bdr, expr)
+  = pprBndr LetBind val_bdr $$ 
+    hang (ppr val_bdr <+> equals) 2 (pprCoreExpr expr)
 \end{code}
 
 \begin{code}
-ppr_expr pe (Var name)   = pOcc pe name
-ppr_expr pe (Lit lit)    = pLit pe lit
-ppr_expr pe (Con con []) = pCon pe con
+pprParendExpr   expr = ppr_expr parens expr
+pprCoreExpr expr = ppr_expr noParens expr
 
-ppr_expr pe (Con con args)
-  = ppHang (ppBesides [pCon pe con, ppChar '!'])
-	 4 (ppSep (map (ppr_arg pe) args))
+noParens :: SDoc -> SDoc
+noParens pp = pp
+\end{code}
 
-ppr_expr pe (Prim prim args)
-  = ppHang (ppBesides [pPrim pe prim, ppChar '!'])
-	 4 (ppSep (map (ppr_arg pe) args))
+\begin{code}
+ppr_expr :: OutputableBndr b => (SDoc -> SDoc) -> Expr b -> SDoc
+	-- The function adds parens in context that need
+	-- an atomic value (e.g. function args)
 
-ppr_expr pe expr@(Lam _ _)
-  = let
-	(uvars, tyvars, vars, body) = collectBinders expr
-    in
-    ppHang (ppCat [pp_vars SLIT("_/u\\_") (pUVar    pe) uvars,
-		   pp_vars SLIT("_/\\_")  (pTyVar   pe) tyvars,
-		   pp_vars SLIT("\\")     (pMinBndr pe) vars])
-	 4 (ppr_expr pe body)
-  where
-    pp_vars lam pp [] = ppNil
-    pp_vars lam pp vs
-      = ppCat [ppPStr lam, ppInterleave ppSP (map pp vs), ppStr "->"]
+ppr_expr add_par (Type ty)  = add_par (ptext SLIT("TYPE") <+> ppr ty)	-- Wierd
+	           
+ppr_expr add_par (Var name) = ppr name
+ppr_expr add_par (Lit lit)  = ppr lit
 
-ppr_expr pe expr@(App _ _)
+ppr_expr add_par expr@(Lam _ _)
   = let
-	(fun, uargs, targs, vargs) = collectArgs expr
+	(bndrs, body) = collectBinders expr
+    in
+    add_par $
+    hang (ptext SLIT("\\") <+> sep (map (pprBndr LambdaBind) bndrs) <+> arrow)
+	 2 (pprCoreExpr body)
+
+ppr_expr add_par expr@(App fun arg)
+  = case collectArgs expr of { (fun, args) -> 
+    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))
     in
-    ppHang (ppr_parend_expr pe fun)
-	 4 (ppSep [ ppInterleave ppNil (map (pUse    pe) uargs)
-		  , ppInterleave ppNil (map (pTy     pe) targs)
-		  , ppInterleave ppNil (map (ppr_arg pe) vargs)
-	          ])
-
-ppr_expr pe (Case expr alts)
-  = ppSep
-    [ppSep [ppPStr SLIT("case"), ppNest 4 (ppr_parend_expr pe expr), ppStr "of {"],
-     ppNest 2 (ppr_alts pe alts),
-     ppStr "}"]
+    case fun of
+	Var f -> case isDataConWorkId_maybe f of
+			-- Notice that we print the *worker*
+			-- for tuples in paren'd format.
+		   Just dc | saturated && isTupleTyCon tc
+			   -> tupleParens (tupleTyConBoxity tc) pp_tup_args
+			   where
+			     tc	       = dataConTyCon dc
+			     saturated = val_args `lengthIs` idArity f
+
+		   other -> add_par (hang (ppr f) 2 pp_args)
+
+	other -> add_par (hang (pprParendExpr fun) 2 pp_args)
+    }
+
+ppr_expr add_par (Case expr var ty [(con,args,rhs)])
+  = add_par $
+    sep [sep [ptext SLIT("case") <+> pprCoreExpr expr,
+	      ifPprDebug (braces (ppr ty)),
+	      hsep [ptext SLIT("of"),
+		    ppr_bndr var, 
+		    char '{',
+		    ppr_case_pat con args
+	  ]],
+	 pprCoreExpr rhs,
+	 char '}'
+    ]
+  where
+    ppr_bndr = pprBndr CaseBind
+
+ppr_expr add_par (Case expr var ty alts)
+  = add_par $
+    sep [sep [ptext SLIT("case")
+		<+> pprCoreExpr expr
+		<+> ifPprDebug (braces (ppr ty)),
+	      ptext SLIT("of") <+> ppr_bndr var <+> char '{'],
+	 nest 2 (sep (punctuate semi (map pprCoreAlt alts))),
+	 char '}'
+    ]
+  where
+    ppr_bndr = pprBndr CaseBind
+ 
 
 -- special cases: let ... in let ...
 -- ("disgusting" SLPJ)
 
-ppr_expr pe (Let bind@(NonRec val_bdr rhs@(Let _ _)) body)
-  = ppAboves [
-      ppCat [ppStr "let {", pMajBndr pe val_bdr, ppEquals],
-      ppNest 2 (ppr_expr pe rhs),
-      ppStr "} in",
-      ppr_expr pe body ]
-
-ppr_expr pe (Let bind@(NonRec val_bdr rhs) expr@(Let _ _))
-  = ppAbove
-      (ppHang (ppStr "let {")
-	    2 (ppCat [ppHang (ppCat [pMajBndr pe val_bdr, ppEquals])
-			   4 (ppr_expr pe rhs),
-       ppStr "} in"]))
-      (ppr_expr pe expr)
+{-
+ppr_expr add_par (Let bind@(NonRec val_bdr rhs@(Let _ _)) body)
+  = add_par $
+    vcat [
+      hsep [ptext SLIT("let {"), (pprBndr LetBind val_bdr $$ ppr val_bndr), equals],
+      nest 2 (pprCoreExpr rhs),
+      ptext SLIT("} in"),
+      pprCoreExpr body ]
+-}
+
+ppr_expr add_par (Let bind@(NonRec val_bdr rhs) expr@(Let _ _))
+  = add_par
+    (hang (ptext SLIT("let {"))
+	  2 (hsep [ppr_binding (val_bdr,rhs),
+		   ptext SLIT("} in")])
+     $$
+     pprCoreExpr expr)
 
 -- general case (recursive case, too)
-ppr_expr pe (Let bind expr)
-  = ppSep [ppHang (ppStr "let {") 2 (ppr_bind pe bind),
-	   ppHang (ppStr "} in ") 2 (ppr_expr pe expr)]
+ppr_expr add_par (Let bind expr)
+  = add_par $
+    sep [hang (ptext keyword) 2 (ppr_bind bind),
+	 hang (ptext SLIT("} in ")) 2 (pprCoreExpr expr)]
+  where
+    keyword = case bind of
+		Rec _      -> SLIT("__letrec {")
+		NonRec _ _ -> SLIT("let {")
+
+ppr_expr add_par (Note (SCC cc) expr)
+  = add_par (sep [pprCostCentreCore cc, pprCoreExpr expr])
+
+#ifdef DEBUG
+ppr_expr add_par (Note (Coerce to_ty from_ty) expr)
+ = add_par $
+   getPprStyle $ \ sty ->
+   if debugStyle sty then
+      sep [ptext SLIT("__coerce") <+> 
+		sep [pprParendType to_ty, pprParendType from_ty],
+	   pprParendExpr expr]
+   else
+      sep [hsep [ptext SLIT("__coerce"), pprParendType to_ty],
+	          pprParendExpr expr]
+#else
+ppr_expr add_par (Note (Coerce to_ty from_ty) expr)
+  = add_par $
+    sep [sep [ptext SLIT("__coerce"), nest 2 (pprParendType to_ty)],
+	 pprParendExpr expr]
+#endif
 
-ppr_expr pe (SCC cc expr)
-  = ppSep [ppCat [ppPStr SLIT("_scc_"), pSCC pe cc],
-	   ppr_parend_expr pe expr ]
-\end{code}
+ppr_expr add_par (Note InlineCall expr)
+  = add_par (ptext SLIT("__inline_call") <+> pprParendExpr expr)
 
-\begin{code}
-ppr_alts pe (AlgAlts alts deflt)
-  = ppAboves [ ppAboves (map ppr_alt alts), ppr_default pe deflt ]
+ppr_expr add_par (Note InlineMe expr)
+  = add_par $ ptext SLIT("__inline_me") <+> pprParendExpr expr
+
+ppr_expr add_par (Note (CoreNote s) expr)
+  = add_par $ 
+    sep [sep [ptext SLIT("__core_note"), pprHsString (mkFastString s)],
+         pprParendExpr expr]
+
+pprCoreAlt (con, args, rhs) 
+  = hang (ppr_case_pat con args) 2 (pprCoreExpr rhs)
+
+ppr_case_pat con@(DataAlt dc) args
+  | isTupleTyCon tc
+  = tupleParens (tupleTyConBoxity tc) (hsep (punctuate comma (map ppr_bndr args))) <+> arrow
   where
-    ppr_alt (con, params, expr)
-      = ppHang (if isTupleCon con then
-		    ppCat [ppParens (ppInterleave ppComma (map (pMinBndr pe) params)),
-			   ppStr "->"]
-		else
-		    ppCat [ppr_con con (pCon pe con),
-			   ppInterleave ppSP (map (pMinBndr pe) params),
-			   ppStr "->"]
-	       )
-	     4 (ppr_expr pe expr)
-      where
-    	ppr_con con pp_con
-    	  = if isSymLexeme con then ppParens pp_con else pp_con
-
-ppr_alts pe (PrimAlts alts deflt)
-  = ppAboves [ ppAboves (map ppr_alt alts), ppr_default pe deflt ]
+    ppr_bndr = pprBndr CaseBind
+    tc = dataConTyCon dc
+
+ppr_case_pat con args
+  = ppr con <+> hsep (map ppr_bndr args) <+> arrow
   where
-    ppr_alt (lit, expr)
-      = ppHang (ppCat [pLit pe lit, ppStr "->"])
-	     4 (ppr_expr pe expr)
+    ppr_bndr = pprBndr CaseBind
+
+pprArg (Type ty) = ptext SLIT("@") <+> pprParendType ty
+pprArg expr      = pprParendExpr expr
 \end{code}
 
+Other printing bits-and-bobs used with the general @pprCoreBinding@
+and @pprCoreExpr@ functions.
+
 \begin{code}
-ppr_default pe NoDefault = ppNil
+instance OutputableBndr Var where
+  pprBndr = pprCoreBinder
 
-ppr_default pe (BindDefault val_bdr expr)
-  = ppHang (ppCat [pMinBndr pe val_bdr, ppStr "->"])
-	 4 (ppr_expr pe expr)
-\end{code}
+pprCoreBinder :: BindingSite -> Var -> SDoc
+pprCoreBinder LetBind binder
+  = vcat [sig, pprIdDetails binder, pragmas]
+  where
+    sig     = pprTypedBinder binder
+    pragmas = ppIdInfo binder (idInfo binder)
+
+-- Lambda bound type variables are preceded by "@"
+pprCoreBinder LambdaBind bndr = parens (pprTypedBinder bndr)
+
+-- Case bound things don't get a signature or a herald
+pprCoreBinder CaseBind bndr = pprUntypedBinder bndr
+
+pprUntypedBinder binder
+  | isTyVar binder = ptext SLIT("@") <+> ppr binder	-- NB: don't print kind
+  | otherwise      = pprIdBndr binder
+
+pprTypedBinder binder
+  | isTyVar binder  = ptext SLIT("@") <+> pprTyVarBndr binder
+  | otherwise	    = pprIdBndr binder <+> dcolon <+> pprType (idType binder)
+
+pprTyVarBndr :: TyVar -> SDoc
+pprTyVarBndr tyvar
+  = getPprStyle $ \ sty ->
+    if debugStyle sty then
+        hsep [ppr tyvar, dcolon, pprParendKind kind]
+		-- See comments with ppDcolon in PprCore.lhs
+    else
+        ppr tyvar
+  where
+    kind = tyVarKind tyvar
 
-\begin{code}
-ppr_arg pe (LitArg   lit) = pLit pe lit
-ppr_arg pe (VarArg   v)	  = pOcc pe v
-ppr_arg pe (TyArg    ty)  = pTy  pe ty
-ppr_arg pe (UsageArg use) = pUse pe use
+-- pprIdBndr does *not* print the type
+-- When printing any Id binder in debug mode, we print its inline pragma and one-shot-ness
+pprIdBndr id = ppr id <+> pprIdBndrInfo (idInfo id)
+
+pprIdBndrInfo info 
+  = megaSeqIdInfo `seq` doc -- The seq is useful for poking on black holes
+  where
+    prag_info = inlinePragInfo info
+    occ_info  = occInfo info
+    dmd_info  = newDemandInfo info
+    lbv_info  = lbvarInfo info
+
+    no_info = isAlwaysActive prag_info && isNoOcc occ_info && 
+	      (case dmd_info of { Nothing -> True; Just d -> isTop d }) &&
+	      hasNoLBVarInfo lbv_info
+
+    doc | no_info = empty
+ 	| otherwise
+        = brackets $ hcat [ppr prag_info, ppr occ_info, 
+			   ppr dmd_info, ppr lbv_info
+#ifdef OLD_STRICTNESS
+			   , ppr (demandInfo id)
+#endif
+			  ]
 \end{code}
 
-Other printing bits-and-bobs used with the general @pprCoreBinding@
-and @pprCoreExpr@ functions.
 
 \begin{code}
-pprBigCoreBinder sty binder
-  = ppAboves [sig, pragmas, ppr sty binder]
+pprIdDetails :: Id -> SDoc
+pprIdDetails id | isGlobalId id     = ppr (globalIdDetails id)
+		| isExportedId id   = ptext SLIT("[Exported]")
+		| otherwise	    = empty
+
+ppIdInfo :: Id -> IdInfo -> SDoc
+ppIdInfo b info
+  = brackets $
+    vcat [  ppArityInfo a,
+	    ppWorkerInfo (workerInfo info),
+	    ppCafInfo (cafInfo info),
+#ifdef OLD_STRICTNESS
+	    ppStrictnessInfo s,
+            ppCprInfo m,
+#endif
+	    pprNewStrictness (newStrictnessInfo info),
+	    if null rules then empty
+	    else ptext SLIT("RULES:") <+> vcat (map pprRule rules)
+	-- Inline pragma, occ, demand, lbvar info
+	-- printed out with all binders (when debug is on); 
+	-- see PprCore.pprIdBndr
+	]
   where
-    sig = ifnotPprShowAll sty (
-	    ppHang (ppCat [ppr sty binder, ppStr "::"])
-		 4 (ppr sty (idType binder)))
+    a = arityInfo info
+#ifdef OLD_STRICTNESS
+    s = strictnessInfo info
+    m = cprInfo info
+#endif
+    rules = specInfoRules (specInfo info)
+\end{code}
 
-    pragmas =
-	ifnotPprForUser sty
-	 (ppIdInfo sty binder True{-specs, please-} id nullIdEnv
-	  (getIdInfo binder))
 
-pprBabyCoreBinder sty binder
-  = ppCat [ppr sty binder, pp_strictness]
-  where
-    pp_strictness
-      = case (getIdStrictness binder) of
-	  NoStrictnessInfo    -> ppNil
-	  BottomGuaranteed    -> ppStr "{- _!_ -}"
-	  StrictnessInfo xx _ ->
-		panic "PprCore:pp_strictness:StrictnessInfo:ToDo"
-		-- ppStr ("{- " ++ (showList xx "") ++ " -}")
-
-pprTypedCoreBinder sty binder
-  = ppBesides [ppLparen, ppCat [ppr sty binder,
-	ppStr "::", ppr sty (idType binder)],
-	ppRparen]
+\begin{code}
+instance Outputable CoreRule where
+   ppr = pprRule
+
+pprRules :: [CoreRule] -> SDoc
+pprRules rules = vcat (map pprRule rules)
+
+pprRule :: CoreRule -> SDoc
+pprRule (BuiltinRule { ru_fn = fn, ru_name = name})
+  = ptext SLIT("Built in rule for") <+> ppr fn <> colon <+> doubleQuotes (ftext 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
 \end{code}