X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Ftypes%2FPprType.lhs;h=4a04bffb5528f5923dabfa47ed0fc0edf17d7071;hb=abbc5a0be1df84a33015470319062ed7a3aa3153;hp=6e4d5d0848c3c6abd837f72c65cac24d1ecd1a05;hpb=788faebb40b51d37e73ed94dfc99460d39a1a811;p=ghc-hetmet.git diff --git a/ghc/compiler/types/PprType.lhs b/ghc/compiler/types/PprType.lhs index 6e4d5d0..4a04bff 100644 --- a/ghc/compiler/types/PprType.lhs +++ b/ghc/compiler/types/PprType.lhs @@ -7,7 +7,7 @@ module PprType( pprKind, pprParendKind, pprType, pprParendType, - pprPred, pprTheta, pprClassPred, + pprSourceType, pprPred, pprTheta, pprClassPred, pprTyVarBndr, pprTyVarBndrs, -- Junk @@ -18,27 +18,26 @@ module PprType( -- friends: -- (PprType can see all the representations it's trying to print) -import TypeRep ( Type(..), TyNote(..), Kind, liftedTypeKind ) -- friend -import Type ( PredType(..), ThetaType, - splitPredTy_maybe, - splitForAllTys, splitSigmaTy, splitRhoTy, - isDictTy, splitTyConApp_maybe, splitFunTy_maybe, - predRepTy, isUTyVar - ) +import TypeRep ( Type(..), TyNote(..), Kind ) -- friend +import Type ( SourceType(..) ) +import TcType ( ThetaType, PredType, TyThing(..), + tcSplitSigmaTy, isPredTy, isDictTy, + tcSplitTyConApp_maybe, tcSplitFunTy_maybe + ) import Var ( TyVar, tyVarKind ) import Class ( Class ) import TyCon ( TyCon, isPrimTyCon, isTupleTyCon, tupleTyConBoxity, - maybeTyConSingleCon, isEnumerationTyCon, - tyConArity, tyConName + maybeTyConSingleCon, isEnumerationTyCon, tyConArity ) -- others: -import CmdLineOpts ( opt_PprStyle_RawTypes ) import Maybes ( maybeToBool ) import Name ( getOccString, getOccName ) +import OccName ( occNameUserString ) import Outputable import Unique ( Uniquable(..) ) -import BasicTypes ( tupleParens ) +import Util ( lengthIs ) +import BasicTypes ( IPName(..), tupleParens, ipNameName ) import PrelNames -- quite a few *Keys \end{code} @@ -63,21 +62,37 @@ pprKind = pprType pprParendKind = pprParendType pprPred :: PredType -> SDoc -pprPred (ClassP clas tys) = pprClassPred clas tys -pprPred (IParam n ty) = hsep [ptext SLIT("?") <> ppr n, - ptext SLIT("::"), ppr ty] +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 <+> 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 -instance Outputable PredType where +instance Outputable SourceType where ppr = pprPred + +instance Outputable name => Outputable (IPName name) where + 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 + +instance Outputable TyThing where + ppr (AnId id) = ptext SLIT("AnId") <+> ppr id + ppr (ATyCon tc) = ptext SLIT("ATyCon") <+> ppr tc + ppr (AClass cl) = ptext SLIT("AClass") <+> ppr cl + ppr (ADataCon dc) = ptext SLIT("ADataCon") <+> ppr dc \end{code} @@ -115,51 +130,38 @@ ppr_ty ctxt_prec (TyVarTy tyvar) ppr_ty ctxt_prec ty@(TyConApp tycon tys) -- KIND CASE; it's of the form (Type x) - | tycon `hasKey` typeConKey && n_tys == 1 + | tycon `hasKey` typeConKey, + [ty] <- tys = -- For kinds, print (Type x) as just x if x is a -- type constructor (must be Boxed, Unboxed, AnyBox) -- Otherwise print as (Type x) - case ty1 of + case ty of TyConApp bx [] -> ppr (getOccName bx) -- Always unqualified other -> maybeParen ctxt_prec tYCON_PREC - (sep [ppr tycon, nest 4 tys_w_spaces]) + (ppr tycon <+> ppr_ty tYCON_PREC ty) - -- USAGE CASE - | (tycon `hasKey` usOnceTyConKey || tycon `hasKey` usManyTyConKey) && n_tys == 0 - = -- For usages (! and .), always print bare OccName, without pkg/mod/uniq - ppr (getOccName (tyConName tycon)) - -- TUPLE CASE (boxed and unboxed) - | isTupleTyCon tycon - && length tys == tyConArity tycon -- no magic if partially applied - = tupleParens (tupleTyConBoxity tycon) tys_w_commas + | isTupleTyCon tycon, + tys `lengthIs` tyConArity tycon -- No magic if partially applied + = tupleParens (tupleTyConBoxity tycon) + (sep (punctuate comma (map (ppr_ty tOP_PREC) tys))) -- LIST CASE - | tycon `hasKey` listTyConKey && n_tys == 1 - = brackets (ppr_ty tOP_PREC ty1) - - -- DICTIONARY CASE, prints {C a} - -- This means that instance decls come out looking right in interfaces - -- and that in turn means they get "gated" correctly when being slurped in - | maybeToBool maybe_pred - = braces (pprPred pred) + | tycon `hasKey` listTyConKey, + [ty] <- tys + = brackets (ppr_ty tOP_PREC ty) - -- NO-ARGUMENT CASE (=> no parens) - | null tys - = ppr tycon + -- PARALLEL ARRAY CASE + | tycon `hasKey` parrTyConKey, + [ty] <- tys + = pabrackets (ppr_ty tOP_PREC ty) -- GENERAL CASE | otherwise - = maybeParen ctxt_prec tYCON_PREC (sep [ppr tycon, nest 4 tys_w_spaces]) + = ppr_tc_app ctxt_prec tycon tys where - n_tys = length tys - (ty1:_) = tys - Just pred = maybe_pred - maybe_pred = splitPredTy_maybe ty -- Checks class and arity - tys_w_commas = sep (punctuate comma (map (ppr_ty tOP_PREC) tys)) - tys_w_spaces = sep (map (ppr_ty tYCON_PREC) tys) - + pabrackets p = ptext SLIT("[:") <> p <> ptext SLIT(":]") ppr_ty ctxt_prec ty@(ForAllTy _ _) @@ -170,15 +172,8 @@ ppr_ty ctxt_prec ty@(ForAllTy _ _) ppr_ty tOP_PREC tau ] where - (tyvars, rho) = splitForAllTys ty - (theta, tau) = splitRhoTy rho - - pp_tyvars sty = hsep (map pprTyVarBndr some_tyvars) - where - some_tyvars | userStyle sty && not opt_PprStyle_RawTypes - = filter (not . isUTyVar) tyvars -- hide uvars from user - | otherwise - = tyvars + (tyvars, theta, tau) = tcSplitSigmaTy ty + pp_tyvars sty = sep (map pprTyVarBndr tyvars) ppr_theta [] = empty ppr_theta theta = pprTheta theta <+> ptext SLIT("=>") @@ -189,26 +184,27 @@ ppr_ty ctxt_prec (FunTy ty1 ty2) -- so we mustn't use splitFunTys here. = maybeParen ctxt_prec fUN_PREC $ sep [ ppr_ty fUN_PREC ty1 - , ptext SLIT("->") <+> ppr_ty tOP_PREC ty2 + , ptext arrow <+> ppr_ty tOP_PREC ty2 ] + where arrow | isPredTy ty1 = SLIT("=>") + | otherwise = SLIT("->") 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 ppr_ty ctxt_prec (NoteTy (FTVNote _) ty) = ppr_ty ctxt_prec ty -ppr_ty ctxt_prec (PredTy p) = braces (pprPred p) +ppr_ty ctxt_prec (SourceTy (NType tc tys)) = ppr_tc_app ctxt_prec tc tys +ppr_ty ctxt_prec (SourceTy pred) = braces (pprPred pred) + +ppr_tc_app ctxt_prec tc [] = ppr tc +ppr_tc_app ctxt_prec tc tys = maybeParen ctxt_prec tYCON_PREC + (sep [ppr tc, nest 4 (sep (map (ppr_ty tYCON_PREC) tys))]) \end{code} @@ -225,7 +221,7 @@ and when in debug mode. pprTyVarBndr :: TyVar -> SDoc pprTyVarBndr tyvar = getPprStyle $ \ sty -> - if (ifaceStyle sty && kind /= liftedTypeKind) || debugStyle sty then + if debugStyle sty then hsep [ppr tyvar, dcolon, pprParendKind kind] -- See comments with ppDcolon in PprCore.lhs else @@ -250,20 +246,24 @@ description for profiling. getTyDescription :: Type -> String getTyDescription ty - = case (splitSigmaTy ty) of { (_, _, tau_ty) -> + = case (tcSplitSigmaTy ty) of { (_, _, tau_ty) -> case tau_ty of - TyVarTy _ -> "*" - AppTy fun _ -> getTyDescription fun - FunTy _ res -> '-' : '>' : fun_result res - TyConApp tycon _ -> getOccString tycon + TyVarTy _ -> "*" + AppTy fun _ -> getTyDescription fun + FunTy _ res -> '-' : '>' : fun_result res + TyConApp tycon _ -> occNameUserString (getOccName tycon) NoteTy (FTVNote _) ty -> getTyDescription ty NoteTy (SynNote ty1) _ -> getTyDescription ty1 - PredTy p -> getTyDescription (predRepTy p) - ForAllTy _ ty -> getTyDescription ty + SourceTy sty -> getSourceTyDescription sty + ForAllTy _ ty -> getTyDescription ty } where fun_result (FunTy _ res) = '>' : fun_result res fun_result other = getTyDescription other + +getSourceTyDescription (ClassP cl tys) = getOccString cl +getSourceTyDescription (NType tc tys) = getOccString tc +getSourceTyDescription (IParam ip ty) = getOccString (ipNameName ip) \end{code} @@ -292,8 +292,8 @@ showTypeCategory ty = if isDictTy ty then '+' else - case splitTyConApp_maybe ty of - Nothing -> if maybeToBool (splitFunTy_maybe ty) + case tcSplitTyConApp_maybe ty of + Nothing -> if maybeToBool (tcSplitFunTy_maybe ty) then '>' else '.' @@ -310,7 +310,7 @@ showTypeCategory ty || utc == addrPrimTyConKey) then 'i' else if utc == floatPrimTyConKey then 'f' else if utc == doublePrimTyConKey then 'd' - else if isPrimTyCon tycon {- array, we hope -} then 'A' + else if isPrimTyCon tycon {- array, we hope -} then 'A' -- Bogus else if isEnumerationTyCon tycon then 'E' else if isTupleTyCon tycon then 'T' else if maybeToBool (maybeTyConSingleCon tycon) then 'S'