diff options
| author | Ross Paterson <R.Paterson@city.ac.uk> | 2022-09-25 15:33:25 +0100 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2022-09-27 14:12:01 -0400 |
| commit | 9b1595c87f0c2406bb340c5e27a4a45dfcde0e2c (patch) | |
| tree | 5058b79fa0484c7bb55bfc5515094dff50ae93b2 /compiler/GHC/Hs | |
| parent | aeafdba5503b8d26a62dc7bc7078caef170d4154 (diff) | |
| download | haskell-9b1595c87f0c2406bb340c5e27a4a45dfcde0e2c.tar.gz | |
implement proposal 106 (Define Kinds Without Promotion) (fixes #6024)
includes corresponding changes to haddock submodule
Diffstat (limited to 'compiler/GHC/Hs')
| -rw-r--r-- | compiler/GHC/Hs/Decls.hs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/compiler/GHC/Hs/Decls.hs b/compiler/GHC/Hs/Decls.hs index 1db54bfc4b..c4a79f25a7 100644 --- a/compiler/GHC/Hs/Decls.hs +++ b/compiler/GHC/Hs/Decls.hs @@ -401,7 +401,7 @@ countTyClDecls decls count isNewTy decls, -- ...instances count isFamilyDecl decls) where - isDataTy DataDecl{ tcdDataDefn = HsDataDefn { dd_cons = DataTypeCons _ } } = True + isDataTy DataDecl{ tcdDataDefn = HsDataDefn { dd_cons = DataTypeCons _ _ } } = True isDataTy _ = False isNewTy DataDecl{ tcdDataDefn = HsDataDefn { dd_cons = NewTypeCon _ } } = True @@ -698,8 +698,11 @@ ppDataDefnHeader pp_hdr HsDataDefn , dd_cType = mb_ct , dd_kindSig = mb_sig , dd_cons = condecls } - = ppr (dataDefnConsNewOrData condecls) <+> pp_ct <+> pp_hdr context <+> pp_sig + = pp_type <+> ppr (dataDefnConsNewOrData condecls) <+> pp_ct <+> pp_hdr context <+> pp_sig where + pp_type + | isTypeDataDefnCons condecls = text "type" + | otherwise = empty pp_ct = case mb_ct of Nothing -> empty Just ct -> ppr ct |