X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FcoreSyn%2FPprCore.lhs;h=a3c1f6f4235e67ccd9d475cf05356abdd34758be;hb=8226f00b071ea156753324dc9f2967dabc3cc571;hp=cb79cb449d7c98ff70c988c701e6f0f95ed9be9b;hpb=d5934bbb856aa0aa620c9b2e0fa51c90a1a5a048;p=ghc-hetmet.git

diff --git a/compiler/coreSyn/PprCore.lhs b/compiler/coreSyn/PprCore.lhs
index cb79cb4..a3c1f6f 100644
--- a/compiler/coreSyn/PprCore.lhs
+++ b/compiler/coreSyn/PprCore.lhs
@@ -33,7 +33,6 @@ import BasicTypes
 import Util
 import Outputable
 import FastString
-import Module
 \end{code}
 
 %************************************************************************
@@ -133,7 +132,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
@@ -213,21 +212,6 @@ ppr_expr add_par (Note (SCC cc) expr)
 ppr_expr add_par (Note InlineMe expr)
   = add_par $ ptext SLIT("__inline_me") <+> pprParendExpr expr
 
-ppr_expr add_par (Note (TickBox mod n) expr)
-  = add_par $
-    sep [sep [ptext SLIT("__tick_box"),
-               pprModule mod,
-              text (show n)],
-         pprParendExpr expr]
-
-ppr_expr add_par (Note (BinaryTickBox mod t e) expr)
-  = add_par $
-    sep [sep [ptext SLIT("__binary_tick_box"),
-               pprModule mod,
-              text (show t),
-              text (show e)],
-         pprParendExpr expr]
-
 ppr_expr add_par (Note (CoreNote s) expr)
   = add_par $ 
     sep [sep [ptext SLIT("__core_note"), pprHsString (mkFastString s)],
@@ -371,7 +355,7 @@ pprRule (Rule { ru_name = name, ru_act = act, ru_fn = fn,
 		ru_bndrs = tpl_vars, ru_args = tpl_args,
 		ru_rhs = rhs })
   = hang (doubleQuotes (ftext name) <+> ppr act)
-       4 (sep [ptext SLIT("__forall") <+> braces (sep (map pprTypedBinder tpl_vars)),
+       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)
 	    ])