Fix CodingStyle#Warnings URLs

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

diff --git a/compiler/coreSyn/PprCore.lhs b/compiler/coreSyn/PprCore.lhs
index 36c7df0..d13fdad 100644 (file)
--- 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         ( coercionKindTyConApp )
-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}
 
 %************************************************************************
@@ -128,7 +123,7 @@ ppr_expr add_par (Cast expr co)
     sep [pprParendExpr expr, 
         ptext SLIT("`cast`") <+> parens (pprCo co)]
   where
-    pprCo co = sep [ppr co, dcolon <+> ppr (coercionKindTyConApp co)]
+    pprCo co = sep [ppr co, dcolon <+> ppr (coercionKindPredTy co)]
         
 
 ppr_expr add_par expr@(Lam _ _)
@@ -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
@@ -165,11 +160,9 @@ 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
-         ]],
+             sep [ptext SLIT("of") <+> ppr_bndr var, 
+                  char '{' <+> ppr_case_pat con args]
+         ],
         pprCoreExpr rhs,
         char '}'
     ]
@@ -242,7 +235,7 @@ ppr_case_pat con@(DataAlt dc) args
     tc = dataConTyCon dc
 
 ppr_case_pat con args
-  = ppr con <+> hsep (map ppr_bndr args) <+> arrow
+  = ppr con <+> sep (map ppr_bndr args) <+> arrow
   where
     ppr_bndr = pprBndr CaseBind
 
@@ -368,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}