X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fmain%2FPprTyThing.hs;h=4d7fd8ec52fb97d6e789a348a4719688bb690070;hp=63549841596b2fdb7494fd11a215833fa2580cb7;hb=e8a591c1a3dbdeccec2dd2aacccd7435004b0d51;hpb=202ac08f3e2afde0620e889cc81a95b2fd0ad9e1 diff --git a/compiler/main/PprTyThing.hs b/compiler/main/PprTyThing.hs index 6354984..4d7fd8e 100644 --- a/compiler/main/PprTyThing.hs +++ b/compiler/main/PprTyThing.hs @@ -67,7 +67,7 @@ pprTyThingHdr exts (ATyCon tyCon) = pprTyConHdr exts tyCon pprTyThingHdr exts (AClass cls) = pprClassHdr exts cls pprTyConHdr exts tyCon = - ptext keyword <+> ppr_bndr tyCon <+> hsep (map ppr vars) + addFamily (ptext keyword) <+> ppr_bndr tyCon <+> hsep (map ppr vars) where vars | GHC.isPrimTyCon tyCon || GHC.isFunTyCon tyCon = take (GHC.tyConArity tyCon) GHC.alphaTyVars @@ -77,6 +77,10 @@ pprTyConHdr exts tyCon = | GHC.isNewTyCon tyCon = SLIT("newtype") | otherwise = SLIT("data") + addFamily keytext + | GHC.isOpenTyCon tyCon = keytext <> ptext SLIT(" family") + | otherwise = keytext + pprDataConSig exts dataCon = ppr_bndr dataCon <+> dcolon <+> pprType exts (GHC.dataConType dataCon) @@ -109,8 +113,12 @@ pprType False ty = ppr (GHC.dropForAlls ty) pprTyCon exts tyCon | GHC.isSynTyCon tyCon - = let rhs_type = GHC.synTyConRhs tyCon - in hang (pprTyConHdr exts tyCon <+> equals) 2 (pprType exts rhs_type) + = if GHC.isOpenTyCon tyCon + then pprTyConHdr exts tyCon <+> dcolon <+> + pprType exts (GHC.synTyConResKind tyCon) + else + let rhs_type = GHC.synTyConType tyCon + in hang (pprTyConHdr exts tyCon <+> equals) 2 (pprType exts rhs_type) | otherwise = pprAlgTyCon exts tyCon (const True) (const True)