[project @ 2002-09-25 11:09:11 by simonpj]

[ghc-hetmet.git] / ghc / compiler / types / PprType.lhs

diff --git a/ghc/compiler/types/PprType.lhs b/ghc/compiler/types/PprType.lhs
index 24cbb40..6755b0c 100644 (file)
--- a/ghc/compiler/types/PprType.lhs
+++ b/ghc/compiler/types/PprType.lhs
@@ -18,10 +18,9 @@ module PprType(
 
 -- friends:
 -- (PprType can see all the representations it's trying to print)
-import TypeRep         ( Type(..), TyNote(..), IPName(..), 
-                         Kind, liftedTypeKind ) -- friend
-import Type            ( SourceType(..), isUTyVar, eqKind )
-import TcType          ( ThetaType, PredType, ipNameName,
+import TypeRep         ( Type(..), TyNote(..), Kind  ) -- friend
+import Type            ( SourceType(..) )
+import TcType          ( ThetaType, PredType,
                          tcSplitSigmaTy, isPredTy, isDictTy,
                          tcSplitTyConApp_maybe, tcSplitFunTy_maybe
                        ) 
@@ -33,13 +32,13 @@ import TyCon                ( TyCon, isPrimTyCon, isTupleTyCon, tupleTyConBoxity,
                        )
 
 -- others:
-import CmdLineOpts     ( opt_PprStyle_RawTypes )
 import Maybes          ( maybeToBool )
 import Name            ( getOccString, getOccName )
+import OccName         ( occNameUserString )
 import Outputable
 import Unique          ( Uniquable(..) )
 import Util             ( lengthIs )
-import BasicTypes      ( tupleParens )
+import BasicTypes      ( IPName(..), tupleParens, ipNameName )
 import PrelNames               -- quite a few *Keys
 \end{code}
 
@@ -69,13 +68,13 @@ pprPred = pprSourceType
 pprSourceType :: SourceType -> SDoc
 pprSourceType (ClassP clas tys) = pprClassPred clas tys
 pprSourceType (IParam n ty)     = hsep [ppr n, dcolon, ppr ty]
-pprSourceType (NType tc tys)    = ppr tc <+> hsep (map pprParendType tys)
+pprSourceType (NType tc tys)    = ppr tc <+> sep (map pprParendType tys)
 
 pprClassPred :: Class -> [Type] -> SDoc
-pprClassPred clas tys = ppr clas <+> hsep (map pprParendType tys)
+pprClassPred clas tys = ppr clas <+> sep (map pprParendType tys)
 
 pprTheta :: ThetaType -> SDoc
-pprTheta theta = parens (hsep (punctuate comma (map pprPred theta)))
+pprTheta theta = parens (sep (punctuate comma (map pprPred theta)))
 
 instance Outputable Type where
     ppr ty = pprType ty
@@ -84,8 +83,11 @@ instance Outputable SourceType where
     ppr = pprPred
 
 instance Outputable name => Outputable (IPName name) where
-    ppr (Dupable n)   = char '?' <> ppr n -- Ordinary implicit parameters
-    ppr (MustSplit n) = char '%' <> ppr n -- Splittable implicit parameters
+    ppr (Dupable n) = char '?' <> ppr n -- Ordinary implicit parameters
+    ppr (Linear  n) = char '%' <> ppr n -- Splittable implicit parameters
+
+instance Outputable name => OutputableBndr (IPName name) where
+    pprBndr _ n = ppr n        -- Simple for now
 \end{code}
 
 
@@ -150,10 +152,18 @@ ppr_ty ctxt_prec ty@(TyConApp tycon tys)
     [ty] <- tys
   = brackets (ppr_ty tOP_PREC ty)
 
+       -- PARALLEL ARRAY CASE
+  | tycon `hasKey` parrTyConKey,
+    [ty] <- tys
+  = pabrackets (ppr_ty tOP_PREC ty)
+
        -- GENERAL CASE
   | otherwise
   = ppr_tc_app ctxt_prec tycon tys
 
+  where
+    pabrackets p = ptext SLIT("[:") <> p <> ptext SLIT(":]")
+
 
 ppr_ty ctxt_prec ty@(ForAllTy _ _)
   = getPprStyle $ \ sty -> 
@@ -164,13 +174,7 @@ ppr_ty ctxt_prec ty@(ForAllTy _ _)
     ]
  where         
     (tyvars, theta, tau) = tcSplitSigmaTy ty
-    
-    pp_tyvars sty = sep (map pprTyVarBndr some_tyvars)
-      where
-        some_tyvars | userStyle sty && not opt_PprStyle_RawTypes
-                    = filter (not . isUTyVar) tyvars  -- hide uvars from user
-                    | otherwise
-                    = tyvars
+    pp_tyvars sty       = sep (map pprTyVarBndr tyvars)
     
     ppr_theta []     = empty
     ppr_theta theta  = pprTheta theta <+> ptext SLIT("=>")
@@ -190,12 +194,6 @@ ppr_ty ctxt_prec (AppTy ty1 ty2)
   = maybeParen ctxt_prec tYCON_PREC $
     ppr_ty fUN_PREC ty1 <+> ppr_ty tYCON_PREC ty2
 
-ppr_ty ctxt_prec (UsageTy u ty)
-  = maybeParen ctxt_prec tYCON_PREC $
-    ptext SLIT("__u") <+> ppr_ty tYCON_PREC u
-                      <+> ppr_ty tYCON_PREC ty
-    -- fUN_PREC would be logical for u, but it yields a reduce/reduce conflict with AppTy
-
 ppr_ty ctxt_prec (NoteTy (SynNote ty) expansion)
   = ppr_ty ctxt_prec ty
 --  = ppr_ty ctxt_prec expansion -- if we don't want to see syntys
@@ -224,7 +222,7 @@ and when in debug mode.
 pprTyVarBndr :: TyVar -> SDoc
 pprTyVarBndr tyvar
   = getPprStyle $ \ sty ->
-    if (ifaceStyle sty  && not (kind `eqKind` liftedTypeKind)) || debugStyle sty then
+    if debugStyle sty then
         hsep [ppr tyvar, dcolon, pprParendKind kind]
                -- See comments with ppDcolon in PprCore.lhs
     else
@@ -254,7 +252,7 @@ getTyDescription ty
       TyVarTy _                     -> "*"
       AppTy fun _                   -> getTyDescription fun
       FunTy _ res                   -> '-' : '>' : fun_result res
-      TyConApp tycon _              -> getOccString tycon
+      TyConApp tycon _              -> occNameUserString (getOccName tycon)
       NoteTy (FTVNote _) ty  -> getTyDescription ty
       NoteTy (SynNote ty1) _ -> getTyDescription ty1
       SourceTy sty          -> getSourceTyDescription sty