X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FcoreSyn%2FPprCore.lhs;h=36c7df0d0416aa6d5df17daa40371d11a2f4f56b;hb=0b86bc9b022a5965d2b35f143ff4b919f784e676;hp=38aff85b3a17acb111b02cbe784a454efa88fec8;hpb=2763f56de2097a34176aa883dd4f0b3de1cb896c;p=ghc-hetmet.git

diff --git a/compiler/coreSyn/PprCore.lhs b/compiler/coreSyn/PprCore.lhs
index 38aff85..36c7df0 100644
--- a/compiler/coreSyn/PprCore.lhs
+++ b/compiler/coreSyn/PprCore.lhs
@@ -40,6 +40,7 @@ import IdInfo		( cprInfo, ppCprInfo, strictnessInfo, ppStrictnessInfo )
 import DataCon		( dataConTyCon )
 import TyCon		( tupleTyConBoxity, isTupleTyCon )
 import Type		( pprParendType, pprType, pprParendKind )
+import Coercion         ( coercionKindTyConApp )
 import BasicTypes	( tupleParens, isNoOcc, isAlwaysActive )
 import Util             ( lengthIs )
 import Outputable
@@ -122,6 +123,14 @@ 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 add_par (Cast expr co) 
+  = add_par $
+    sep [pprParendExpr expr, 
+	 ptext SLIT("`cast`") <+> parens (pprCo co)]
+  where
+    pprCo co = sep [ppr co, dcolon <+> ppr (coercionKindTyConApp co)]
+	 
+
 ppr_expr add_par expr@(Lam _ _)
   = let
 	(bndrs, body) = collectBinders expr
@@ -214,27 +223,6 @@ ppr_expr add_par (Let bind expr)
 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 add_par (Note InlineCall expr)
-  = add_par (ptext SLIT("__inline_call") <+> pprParendExpr expr)
-
 ppr_expr add_par (Note InlineMe expr)
   = add_par $ ptext SLIT("__inline_me") <+> pprParendExpr expr
 
@@ -324,7 +312,7 @@ pprIdBndrInfo info
 
     doc | no_info = empty
  	| otherwise
-        = brackets $ hcat [ppr prag_info, ppr occ_info, 
+        = brackets $ hsep [ppr prag_info, ppr occ_info, 
 			   ppr dmd_info, ppr lbv_info
 #ifdef OLD_STRICTNESS
 			   , ppr (demandInfo id)