allow build settings to be overriden by adding mk/validate.mk

[ghc-hetmet.git] / compiler / coreSyn / PprCore.lhs

diff --git a/compiler/coreSyn/PprCore.lhs b/compiler/coreSyn/PprCore.lhs
index 8023b98..a3c1f6f 100644 (file)
--- a/compiler/coreSyn/PprCore.lhs
+++ b/compiler/coreSyn/PprCore.lhs
@@ -132,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
@@ -354,10 +354,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}