X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2FhsSyn%2FHsTypes.lhs;h=d5b674be34946373b5554b4363c6734547abddc2;hp=ad7facb11eca767f365fe2725ab1c85fe681875e;hb=432b9c9322181a3644083e3c19b7e240d90659e7;hpb=190f24892156953d73b55401d0467a6f1a88ce5d diff --git a/compiler/hsSyn/HsTypes.lhs b/compiler/hsSyn/HsTypes.lhs index ad7facb..d5b674b 100644 --- a/compiler/hsSyn/HsTypes.lhs +++ b/compiler/hsSyn/HsTypes.lhs @@ -1,7 +1,9 @@ % +% (c) The University of Glasgow 2006 % (c) The GRASP/AQUA Project, Glasgow University, 1992-1998 % -\section[HsTypes]{Abstract syntax: user-defined types} + +HsTypes: Abstract syntax: user-defined types \begin{code} module HsTypes ( @@ -13,6 +15,8 @@ module HsTypes ( LBangType, BangType, HsBang(..), getBangType, getBangStrictness, + + ConDeclField(..), pprConDeclFields, mkExplicitHsForAllTy, mkImplicitHsForAllTy, hsExplicitTvs, hsTyVarName, hsTyVarNames, replaceTyVarName, @@ -26,19 +30,15 @@ module HsTypes ( pprParendHsType, pprHsForAll, pprHsContext, ppr_hs_context, pprHsTyVarBndr ) where -#include "HsVersions.h" - import {-# SOURCE #-} HsExpr ( HsSplice, pprSplice ) -import Type ( Type ) -import {- Kind parts of -} - Type ( {- instance Outputable Kind -} Kind, - pprParendKind, pprKind, isLiftedTypeKind ) -import HsDoc ( LHsDoc, HsDoc ) -import BasicTypes ( IPName, Boxity, tupleParens ) -import SrcLoc ( Located(..), unLoc, noSrcSpan ) -import StaticFlags ( opt_PprStyle_Debug ) +import Type +import HsDoc +import BasicTypes +import SrcLoc +import StaticFlags import Outputable +import FastString \end{code} @@ -76,7 +76,7 @@ data HsBang = HsNoBang -- Only used as a return value for getBangStrictness, instance Outputable HsBang where ppr (HsNoBang) = empty ppr (HsStrict) = char '!' - ppr (HsUnbox) = ptext SLIT("!!") + ppr (HsUnbox) = ptext (sLit "!!") getBangType :: LHsType a -> LHsType a getBangType (L _ (HsBangTy _ ty)) = ty @@ -103,7 +103,8 @@ type HsContext name = [LHsPred name] type LHsPred name = Located (HsPred name) -data HsPred name = HsClassP name [LHsType name] +data HsPred name = HsClassP name [LHsType name] -- class constraint + | HsEqualP (LHsType name) (LHsType name)-- equality constraint | HsIParam (IPName name) (LHsType name) type LHsType name = Located (HsType name) @@ -119,8 +120,6 @@ data HsType name | HsTyVar name -- Type variable or type constructor - | HsBangTy HsBang (LHsType name) -- Bang-style type annotations - | HsAppTy (LHsType name) (LHsType name) @@ -160,8 +159,19 @@ data HsType name | HsDocTy (LHsType name) (LHsDoc name) -- A documented type + | HsBangTy HsBang (LHsType name) -- Bang-style type annotations + | HsRecTy [ConDeclField name] -- Only in data type declarations + data HsExplicitForAll = Explicit | Implicit + + +data ConDeclField name -- Record fields have Haddoc docs on them + = ConDeclField { cd_fld_name :: Located name, + cd_fld_type :: LBangType name, + cd_fld_doc :: Maybe (LHsDoc name) } + + ----------------------- -- Combine adjacent for-alls. -- The following awkward situation can happen otherwise: @@ -172,6 +182,8 @@ data HsExplicitForAll = Explicit | Implicit -- -- A valid type must have one for-all at the top of the type, or of the fn arg types +mkImplicitHsForAllTy :: LHsContext name -> LHsType name -> HsType name +mkExplicitHsForAllTy :: [LHsTyVarBndr name] -> LHsContext name -> LHsType name -> HsType name mkImplicitHsForAllTy ctxt ty = mkHsForAllTy Implicit [] ctxt ty mkExplicitHsForAllTy tvs ctxt ty = mkHsForAllTy Explicit tvs ctxt ty @@ -181,6 +193,7 @@ mkHsForAllTy exp tvs (L _ []) ty = mk_forall_ty exp tvs ty mkHsForAllTy exp tvs ctxt ty = HsForAllTy exp tvs ctxt ty -- mk_forall_ty makes a pure for-all type (no context) +mk_forall_ty :: HsExplicitForAll -> [LHsTyVarBndr name] -> LHsType name -> HsType name mk_forall_ty exp tvs (L _ (HsParTy ty)) = mk_forall_ty exp tvs ty mk_forall_ty exp1 tvs1 (L _ (HsForAllTy exp2 tvs2 ctxt ty)) = mkHsForAllTy (exp1 `plus` exp2) (tvs1 ++ tvs2) ctxt ty mk_forall_ty exp tvs ty = HsForAllTy exp tvs (L noSrcSpan []) ty @@ -190,13 +203,14 @@ mk_forall_ty exp tvs ty = HsForAllTy exp tvs (L noSrcSpan []) ty -- (see the sigtype production in Parser.y.pp) -- so that (forall. ty) isn't implicitly quantified +plus :: HsExplicitForAll -> HsExplicitForAll -> HsExplicitForAll Implicit `plus` Implicit = Implicit -exp1 `plus` exp2 = Explicit +_ `plus` _ = Explicit hsExplicitTvs :: LHsType name -> [name] -- The explicitly-given forall'd type variables of a HsType hsExplicitTvs (L _ (HsForAllTy Explicit tvs _ _)) = hsLTyVarNames tvs -hsExplicitTvs other = [] +hsExplicitTvs _ = [] --------------------- type LHsTyVarBndr name = Located (HsTyVarBndr name) @@ -228,8 +242,8 @@ hsLTyVarLocNames :: [LHsTyVarBndr name] -> [Located name] hsLTyVarLocNames = map hsLTyVarLocName replaceTyVarName :: HsTyVarBndr name1 -> name2 -> HsTyVarBndr name2 -replaceTyVarName (UserTyVar n) n' = UserTyVar n' -replaceTyVarName (KindedTyVar n k) n' = KindedTyVar n' k +replaceTyVarName (UserTyVar _) n' = UserTyVar n' +replaceTyVarName (KindedTyVar _ k) n' = KindedTyVar n' k \end{code} @@ -249,13 +263,13 @@ splitHsInstDeclTy inst_ty where split_tau tvs cxt (HsPredTy (HsClassP cls tys)) = (tvs, cxt, cls, tys) split_tau tvs cxt (HsParTy (L _ ty)) = split_tau tvs cxt ty - split_tau _ _ other = pprPanic "splitHsInstDeclTy" (ppr inst_ty) + split_tau _ _ _ = pprPanic "splitHsInstDeclTy" (ppr inst_ty) -- Splits HsType into the (init, last) parts -- Breaks up any parens in the result type: -- splitHsFunType (a -> (b -> c)) = ([a,b], c) splitHsFunType :: LHsType name -> ([LHsType name], LHsType name) -splitHsFunType (L l (HsFunTy x y)) = (x:args, res) +splitHsFunType (L _ (HsFunTy x y)) = (x:args, res) where (args, res) = splitHsFunType y splitHsFunType (L _ (HsParTy ty)) = splitHsFunType ty @@ -269,9 +283,6 @@ splitHsFunType other = ([], other) %* * %************************************************************************ -NB: these types get printed into interface files, so - don't change the printing format lightly - \begin{code} instance (OutputableBndr name) => Outputable (HsType name) where ppr ty = pprHsType ty @@ -281,13 +292,19 @@ instance (Outputable name) => Outputable (HsTyVarBndr name) where ppr (KindedTyVar name kind) = pprHsTyVarBndr name kind instance OutputableBndr name => Outputable (HsPred name) where - ppr (HsClassP clas tys) = ppr clas <+> hsep (map (pprParendHsType.unLoc) tys) - ppr (HsIParam n ty) = hsep [ppr n, dcolon, ppr ty] + ppr (HsClassP clas tys) = ppr clas <+> hsep (map pprLHsType tys) + ppr (HsEqualP t1 t2) = hsep [pprLHsType t1, ptext (sLit "~"), + pprLHsType t2] + ppr (HsIParam n ty) = hsep [ppr n, dcolon, ppr ty] + +pprLHsType :: OutputableBndr name => LHsType name -> SDoc +pprLHsType = pprParendHsType . unLoc pprHsTyVarBndr :: Outputable name => name -> Kind -> SDoc pprHsTyVarBndr name kind | isLiftedTypeKind kind = ppr name | otherwise = hsep [ppr name, dcolon, pprParendKind kind] +pprHsForAll :: OutputableBndr name => HsExplicitForAll -> [LHsTyVarBndr name] -> LHsContext name -> SDoc pprHsForAll exp tvs cxt | show_forall = forall_part <+> pprHsContext (unLoc cxt) | otherwise = pprHsContext (unLoc cxt) @@ -295,24 +312,33 @@ pprHsForAll exp tvs cxt show_forall = opt_PprStyle_Debug || (not (null tvs) && is_explicit) is_explicit = case exp of {Explicit -> True; Implicit -> False} - forall_part = ptext SLIT("forall") <+> interppSP tvs <> dot + forall_part = ptext (sLit "forall") <+> interppSP tvs <> dot pprHsContext :: (OutputableBndr name) => HsContext name -> SDoc pprHsContext [] = empty -pprHsContext cxt = ppr_hs_context cxt <+> ptext SLIT("=>") +pprHsContext cxt = ppr_hs_context cxt <+> ptext (sLit "=>") +ppr_hs_context :: (OutputableBndr name) => HsContext name -> SDoc ppr_hs_context [] = empty ppr_hs_context cxt = parens (interpp'SP cxt) + +pprConDeclFields :: OutputableBndr name => [ConDeclField name] -> SDoc +pprConDeclFields fields = braces (sep (punctuate comma (map ppr_fld fields))) + where + ppr_fld (ConDeclField { cd_fld_name = n, cd_fld_type = ty, + cd_fld_doc = doc }) + = ppr n <+> dcolon <+> ppr ty <+> ppr_mbDoc doc \end{code} \begin{code} -pREC_TOP = (0 :: Int) -- type in ParseIface.y -pREC_FUN = (1 :: Int) -- btype in ParseIface.y - -- Used for LH arg of (->) -pREC_OP = (2 :: Int) -- Used for arg of any infix operator - -- (we don't keep their fixities around) -pREC_CON = (3 :: Int) -- Used for arg of type applicn: - -- always parenthesise unless atomic +pREC_TOP, pREC_FUN, pREC_OP, pREC_CON :: Int +pREC_TOP = 0 -- type in ParseIface.y +pREC_FUN = 1 -- btype in ParseIface.y + -- Used for LH arg of (->) +pREC_OP = 2 -- Used for arg of any infix operator + -- (we don't keep their fixities around) +pREC_CON = 3 -- Used for arg of type applicn: + -- always parenthesise unless atomic maybeParen :: Int -- Precedence of context -> Int -- Precedence of top-level operator @@ -331,26 +357,29 @@ pprParendHsType ty = ppr_mono_ty pREC_CON ty -- (a) Remove outermost HsParTy parens -- (b) Drop top-level for-all type variables in user style -- since they are implicit in Haskell +prepare :: PprStyle -> HsType name -> HsType name prepare sty (HsParTy ty) = prepare sty (unLoc ty) -prepare sty ty = ty +prepare _ ty = ty +ppr_mono_lty :: (OutputableBndr name) => Int -> LHsType name -> SDoc ppr_mono_lty ctxt_prec ty = ppr_mono_ty ctxt_prec (unLoc ty) +ppr_mono_ty :: (OutputableBndr name) => Int -> HsType name -> SDoc ppr_mono_ty ctxt_prec (HsForAllTy exp tvs ctxt ty) = maybeParen ctxt_prec pREC_FUN $ sep [pprHsForAll exp tvs ctxt, ppr_mono_lty pREC_TOP ty] --- gaw 2004 -ppr_mono_ty ctxt_prec (HsBangTy b ty) = ppr b <> ppr ty -ppr_mono_ty ctxt_prec (HsTyVar name) = ppr name +ppr_mono_ty _ (HsBangTy b ty) = ppr b <> ppr ty +ppr_mono_ty _ (HsRecTy flds) = pprConDeclFields flds +ppr_mono_ty _ (HsTyVar name) = ppr name ppr_mono_ty ctxt_prec (HsFunTy ty1 ty2) = ppr_fun_ty ctxt_prec ty1 ty2 -ppr_mono_ty ctxt_prec (HsTupleTy con tys) = tupleParens con (interpp'SP tys) -ppr_mono_ty ctxt_prec (HsKindSig ty kind) = parens (ppr_mono_lty pREC_TOP ty <+> dcolon <+> pprKind kind) -ppr_mono_ty ctxt_prec (HsListTy ty) = brackets (ppr_mono_lty pREC_TOP ty) -ppr_mono_ty ctxt_prec (HsPArrTy ty) = pabrackets (ppr_mono_lty pREC_TOP ty) -ppr_mono_ty ctxt_prec (HsPredTy pred) = braces (ppr pred) -ppr_mono_ty ctxt_prec (HsNumTy n) = integer n -- generics only -ppr_mono_ty ctxt_prec (HsSpliceTy s) = pprSplice s +ppr_mono_ty _ (HsTupleTy con tys) = tupleParens con (interpp'SP tys) +ppr_mono_ty _ (HsKindSig ty kind) = parens (ppr_mono_lty pREC_TOP ty <+> dcolon <+> pprKind kind) +ppr_mono_ty _ (HsListTy ty) = brackets (ppr_mono_lty pREC_TOP ty) +ppr_mono_ty _ (HsPArrTy ty) = pabrackets (ppr_mono_lty pREC_TOP ty) +ppr_mono_ty _ (HsPredTy pred) = ppr pred +ppr_mono_ty _ (HsNumTy n) = integer n -- generics only +ppr_mono_ty _ (HsSpliceTy s) = pprSplice s ppr_mono_ty ctxt_prec (HsAppTy fun_ty arg_ty) = maybeParen ctxt_prec pREC_CON $ @@ -360,25 +389,30 @@ ppr_mono_ty ctxt_prec (HsOpTy ty1 op ty2) = maybeParen ctxt_prec pREC_OP $ ppr_mono_lty pREC_OP ty1 <+> ppr op <+> ppr_mono_lty pREC_OP ty2 -ppr_mono_ty ctxt_prec (HsParTy ty) +ppr_mono_ty _ (HsParTy ty) = parens (ppr_mono_lty pREC_TOP ty) -- Put the parens in where the user did -- But we still use the precedence stuff to add parens because -- toHsType doesn't put in any HsParTys, so we may still need them -ppr_mono_ty ctxt_prec (HsDocTy ty doc) - = ppr ty <+> ppr (unLoc doc) +ppr_mono_ty ctxt_prec (HsDocTy ty doc) + = maybeParen ctxt_prec pREC_OP $ + ppr_mono_lty pREC_OP ty <+> ppr (unLoc doc) + -- we pretty print Haddock comments on types as if they were + -- postfix operators -------------------------- +ppr_fun_ty :: (OutputableBndr name) => Int -> LHsType name -> LHsType name -> SDoc ppr_fun_ty ctxt_prec ty1 ty2 = let p1 = ppr_mono_lty pREC_FUN ty1 p2 = ppr_mono_lty pREC_TOP ty2 in maybeParen ctxt_prec pREC_FUN $ - sep [p1, ptext SLIT("->") <+> p2] + sep [p1, ptext (sLit "->") <+> p2] -------------------------- -pabrackets p = ptext SLIT("[:") <> p <> ptext SLIT(":]") +pabrackets :: SDoc -> SDoc +pabrackets p = ptext (sLit "[:") <> p <> ptext (sLit ":]") \end{code}