[Git][ghc/ghc][master] EPA: Use AnnList for XClosedTypeFamily
Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: a4a3a964 by Alan Zimmerman at 2026-10-24T17:30:03-04:00 EPA: Use AnnList for XClosedTypeFamily We now have TTG annotations for FamilyInfo. Make use of it to store the AnnList annotations for a closed type family. - - - - - 11 changed files: - compiler/GHC/Hs/Decls.hs - compiler/GHC/Hs/Dump.hs - compiler/GHC/Parser.y - compiler/GHC/ThToHs.hs - testsuite/tests/haddock/should_compile_flag_haddock/T17544.stderr - testsuite/tests/parser/should_compile/DumpParsedAst.stderr - testsuite/tests/parser/should_compile/DumpRenamedAst.stderr - testsuite/tests/parser/should_compile/KindSigs.stderr - utils/check-exact/ExactPrint.hs - utils/haddock/haddock-api/src/Haddock/Convert.hs - utils/haddock/haddock-api/src/Haddock/Types.hs Changes: ===================================== compiler/GHC/Hs/Decls.hs ===================================== @@ -708,13 +708,11 @@ data AnnFamilyDecl afd_equal :: EpToken "=", afd_vbar :: EpToken "|", afd_where :: EpToken "where", - afd_openc :: EpToken "{", - afd_dotdot :: EpToken "..", - afd_closec :: EpToken "}" + afd_dotdot :: EpToken ".." } deriving Data instance NoAnn AnnFamilyDecl where - noAnn = AnnFamilyDecl noAnn noAnn noAnn noAnn noAnn noAnn noAnn noAnn noAnn noAnn noAnn noAnn + noAnn = AnnFamilyDecl noAnn noAnn noAnn noAnn noAnn noAnn noAnn noAnn noAnn noAnn ------------- Functions over FamilyDecls ----------- @@ -744,7 +742,7 @@ type instance XXInjectivityAnn (GhcPass _) = DataConCantHappen type instance XDataFamily (GhcPass _) = NoExtField type instance XOpenTypeFamily (GhcPass _) = NoExtField -type instance XClosedTypeFamily (GhcPass _) = NoExtField +type instance XClosedTypeFamily (GhcPass _) = AnnList type instance XXFamilyInfo (GhcPass _) = DataConCantHappen instance OutputableBndrId p ===================================== compiler/GHC/Hs/Dump.hs ===================================== @@ -258,14 +258,14 @@ showAstData bs ba a0 = blankLine $$ showAstData' a0 showAstData' j, showAstData' k] annFamilyDecl :: AnnFamilyDecl -> SDoc - annFamilyDecl (AnnFamilyDecl a b c d e f g h i j k l) = case ba of + annFamilyDecl (AnnFamilyDecl a b c d e f g h i j) = case ba of BlankEpAnnotations -> parens $ text "blanked:" <+> text "AnnFamilyDecl" NoBlankEpAnnotations -> parens $ text "AnnFamilyDecl" $$ vcat [showAstData' a, showAstData' b, showAstData' c, showAstData' d, showAstData' e, showAstData' f, showAstData' g, showAstData' h, showAstData' i, - showAstData' j, showAstData' k, showAstData' l] + showAstData' j] annClsInstDecl :: AnnClsInstDecl -> SDoc annClsInstDecl (AnnClsInstDecl a b c d e) = case ba of ===================================== compiler/GHC/Parser.y ===================================== @@ -1355,10 +1355,10 @@ ty_decl :: { LTyClDecl GhcPs } -- infix type constructors to be declared {% do { let { (tdcolon, tequal) = fst $ unLoc $4 } ; let { tvbar = fst $ unLoc $5 } - ; let { (twhere, (toc, tdd, tcc)) = fst $ unLoc $6 } + ; let { (twhere, tdd) = fst $ unLoc $6 } ; mkFamDecl (comb5 $1 $3 $4 $5 $6) (snd $ unLoc $6) TopLevel $3 (snd $ unLoc $4) (snd $ unLoc $5) - (AnnFamilyDecl [] [] (epTok $1) noAnn (epTok $2) tdcolon tequal tvbar twhere toc tdd tcc) }} + (AnnFamilyDecl [] [] (epTok $1) noAnn (epTok $2) tdcolon tequal tvbar twhere tdd ) }} -- ordinary data type or newtype declaration | type_data_or_newtype capi_ctype tycl_hdr constrs maybe_derivings @@ -1391,7 +1391,7 @@ ty_decl :: { LTyClDecl GhcPs } {% do { let { tdcolon = fst $ unLoc $4 } ; mkFamDecl (comb4 $1 $2 $3 $4) (DataFamily noExtField) TopLevel $3 (snd $ unLoc $4) Nothing - (AnnFamilyDecl [] [] noAnn (epTok $1) (epTok $2) tdcolon noAnn noAnn noAnn noAnn noAnn noAnn) }} + (AnnFamilyDecl [] [] noAnn (epTok $1) (epTok $2) tdcolon noAnn noAnn noAnn noAnn) }} -- standalone kind signature standalone_kind_sig :: { LStandaloneKindSig GhcPs } @@ -1522,20 +1522,20 @@ inj_varids :: { Located [LocatedN RdrName] } -- Closed type families -where_type_family :: { Located ((EpToken "where", (EpToken "{", EpToken "..", EpToken "}")),FamilyInfo GhcPs) } +where_type_family :: { Located ((EpToken "where", EpToken ".."),FamilyInfo GhcPs) } : {- empty -} { noLoc (noAnn,OpenTypeFamily noExtField) } | 'where' ty_fam_inst_eqn_list - { sLL $1 $> ((epTok $1,(fst $ unLoc $2)) - , ClosedTypeFamily noExtField (fmap reverse $ snd $ unLoc $2)) } + { sLL $1 $> ((epTok $1, (snd $ fst $ unLoc $2)) + , ClosedTypeFamily (fst $ fst $ unLoc $2) (fmap reverse $ snd $ unLoc $2)) } -ty_fam_inst_eqn_list :: { Located ((EpToken "{", EpToken "..", EpToken "}"),Maybe [LTyFamInstEqn GhcPs]) } - : '{' ty_fam_inst_eqns '}' { sLL $1 $> ((epTok $1,noAnn, epTok $3) +ty_fam_inst_eqn_list :: { Located ((AnnList, EpToken ".."),Maybe [LTyFamInstEqn GhcPs]) } + : '{' ty_fam_inst_eqns '}' { sLL $1 $> ((AnnList AnnListBraces (ListBraces (epTok $1) (epTok $3)) [], noAnn) ,Just (unLoc $2)) } | vocurly ty_fam_inst_eqns close { let (L loc _) = $2 in - L loc (noAnn,Just (unLoc $2)) } - | '{' '..' '}' { sLL $1 $> ((epTok $1,epTok $2 ,epTok $3),Nothing) } + L loc ((AnnList (AnnListLayout (glR $1)) ListNone [], noAnn),Just (unLoc $2)) } + | '{' '..' '}' { sLL $1 $> ((AnnList AnnListBraces (ListBraces (epTok $1) (epTok $3)) [], epTok $2), Nothing) } | vocurly '..' close { let (L loc _) = $2 in - L loc ((noAnn,epTok $2, noAnn),Nothing) } + L loc ((AnnList (AnnListLayout (glR $1)) ListNone [], epTok $2),Nothing) } ty_fam_inst_eqns :: { Located [LTyFamInstEqn GhcPs] } : ty_fam_inst_eqns ';' ty_fam_inst_eqn @@ -1580,7 +1580,7 @@ at_decl_cls :: { LHsDecl GhcPs } {% do { let { tdcolon = fst $ unLoc $4 } ; liftM mkTyClD (mkFamDecl (comb3 $1 $3 $4) (DataFamily noExtField) NotTopLevel $3 (snd $ unLoc $4) Nothing - (AnnFamilyDecl [] [] noAnn (epTok $1) $2 tdcolon noAnn noAnn noAnn noAnn noAnn noAnn)) }} + (AnnFamilyDecl [] [] noAnn (epTok $1) $2 tdcolon noAnn noAnn noAnn noAnn)) }} -- type family declarations, with optional 'family' keyword -- (can't use opt_instance because you get shift/reduce errors @@ -1590,14 +1590,14 @@ at_decl_cls :: { LHsDecl GhcPs } (mkFamDecl (comb3 $1 $2 $3) (OpenTypeFamily noExtField) NotTopLevel $2 (fst . snd $ unLoc $3) (snd . snd $ unLoc $3) - (AnnFamilyDecl [] [] (epTok $1) noAnn noAnn tdcolon tequal tvbar noAnn noAnn noAnn noAnn)) }} + (AnnFamilyDecl [] [] (epTok $1) noAnn noAnn tdcolon tequal tvbar noAnn noAnn)) }} | 'type' 'family' type opt_at_kind_inj_sig {% do { let { (tdcolon, tequal, tvbar) = fst $ unLoc $4 } ; liftM mkTyClD (mkFamDecl (comb3 $1 $3 $4) (OpenTypeFamily noExtField) NotTopLevel $3 (fst . snd $ unLoc $4) (snd . snd $ unLoc $4) - (AnnFamilyDecl [] [] (epTok $1) noAnn (epTok $2) tdcolon tequal tvbar noAnn noAnn noAnn noAnn)) }} + (AnnFamilyDecl [] [] (epTok $1) noAnn (epTok $2) tdcolon tequal tvbar noAnn noAnn)) }} -- default type instances, with optional 'instance' keyword | 'type' ty_fam_inst_eqn {% liftM mkInstD (mkTyFamInst (comb2 $1 $2) (unLoc $2) ===================================== compiler/GHC/ThToHs.hs ===================================== @@ -434,7 +434,7 @@ cvtDec (ClosedTypeFamilyD head eqns) = do { (tc', tyvars', result', injectivity') <- cvt_tyfam_head head ; eqns' <- mapM cvtTySynEqn eqns ; returnJustLA $ TyClD noExtField $ FamDecl noExtField $ - FamilyDecl noAnn (ClosedTypeFamily noExtField (Just eqns')) TopLevel tc' tyvars' Prefix + FamilyDecl noAnn (ClosedTypeFamily noAnn (Just eqns')) TopLevel tc' tyvars' Prefix result' injectivity' } cvtDec (TH.RoleAnnotD tc roles) ===================================== testsuite/tests/haddock/should_compile_flag_haddock/T17544.stderr ===================================== @@ -926,10 +926,8 @@ (EpaSpan { <no location info> })) (EpTok (EpaSpan { <no location info> })) - (EpTok (EpaSpan { <no location info> })) (EpTok - (EpaSpan { <no location info> })) - (EpTok (EpaSpan { <no location info> }))) + (EpaSpan { <no location info> }))) (DataFamily (NoExtField)) (NotTopLevel) @@ -1322,10 +1320,8 @@ (EpaSpan { <no location info> })) (EpTok (EpaSpan { <no location info> })) - (EpTok (EpaSpan { <no location info> })) (EpTok - (EpaSpan { <no location info> })) - (EpTok (EpaSpan { <no location info> }))) + (EpaSpan { <no location info> }))) (DataFamily (NoExtField)) (NotTopLevel) @@ -1718,10 +1714,8 @@ (EpaSpan { <no location info> })) (EpTok (EpaSpan { <no location info> })) - (EpTok (EpaSpan { <no location info> })) (EpTok - (EpaSpan { <no location info> })) - (EpTok (EpaSpan { <no location info> }))) + (EpaSpan { <no location info> }))) (DataFamily (NoExtField)) (NotTopLevel) @@ -2114,10 +2108,8 @@ (EpaSpan { <no location info> })) (EpTok (EpaSpan { <no location info> })) - (EpTok (EpaSpan { <no location info> })) (EpTok - (EpaSpan { <no location info> })) - (EpTok (EpaSpan { <no location info> }))) + (EpaSpan { <no location info> }))) (DataFamily (NoExtField)) (NotTopLevel) @@ -2510,10 +2502,8 @@ (EpaSpan { <no location info> })) (EpTok (EpaSpan { <no location info> })) - (EpTok (EpaSpan { <no location info> })) (EpTok - (EpaSpan { <no location info> })) - (EpTok (EpaSpan { <no location info> }))) + (EpaSpan { <no location info> }))) (DataFamily (NoExtField)) (NotTopLevel) @@ -2906,10 +2896,8 @@ (EpaSpan { <no location info> })) (EpTok (EpaSpan { <no location info> })) - (EpTok (EpaSpan { <no location info> })) (EpTok - (EpaSpan { <no location info> })) - (EpTok (EpaSpan { <no location info> }))) + (EpaSpan { <no location info> }))) (DataFamily (NoExtField)) (NotTopLevel) ===================================== testsuite/tests/parser/should_compile/DumpParsedAst.stderr ===================================== @@ -359,12 +359,14 @@ (EpaSpan { <no location info> })) (EpTok (EpaSpan { DumpParsedAst.hs:10:41-45 })) - (EpTok (EpaSpan { <no location info> })) (EpTok - (EpaSpan { <no location info> })) - (EpTok (EpaSpan { <no location info> }))) + (EpaSpan { <no location info> }))) (ClosedTypeFamily - (NoExtField) + (AnnList + (AnnListLayout + (EpaSpan { DumpParsedAst.hs:11:3 })) + (ListNone) + []) (Just [(L (EpAnn @@ -1144,12 +1146,14 @@ (EpaSpan { <no location info> })) (EpTok (EpaSpan { DumpParsedAst.hs:18:50-54 })) - (EpTok (EpaSpan { <no location info> })) (EpTok - (EpaSpan { <no location info> })) - (EpTok (EpaSpan { <no location info> }))) + (EpaSpan { <no location info> }))) (ClosedTypeFamily - (NoExtField) + (AnnList + (AnnListLayout + (EpaSpan { DumpParsedAst.hs:19:3 })) + (ListNone) + []) (Just [(L (EpAnn @@ -1543,10 +1547,8 @@ (EpaSpan { <no location info> })) (EpTok (EpaSpan { <no location info> })) - (EpTok (EpaSpan { <no location info> })) (EpTok - (EpaSpan { <no location info> })) - (EpTok (EpaSpan { <no location info> }))) + (EpaSpan { <no location info> }))) (DataFamily (NoExtField)) (TopLevel) ===================================== testsuite/tests/parser/should_compile/DumpRenamedAst.stderr ===================================== @@ -306,12 +306,14 @@ (EpaSpan { <no location info> })) (EpTok (EpaSpan { <no location info> })) - (EpTok (EpaSpan { <no location info> })) (EpTok - (EpaSpan { <no location info> })) - (EpTok (EpaSpan { <no location info> }))) + (EpaSpan { <no location info> }))) (ClosedTypeFamily - (NoExtField) + (AnnList + (AnnListLayout + (EpaSpan { DumpRenamedAst.hs:13:3 })) + (ListNone) + []) (Just [(L (EpAnn @@ -795,10 +797,8 @@ (EpaSpan { <no location info> })) (EpTok (EpaSpan { <no location info> })) - (EpTok (EpaSpan { <no location info> })) (EpTok - (EpaSpan { <no location info> })) - (EpTok (EpaSpan { <no location info> }))) + (EpaSpan { <no location info> }))) (DataFamily (NoExtField)) (TopLevel) @@ -1180,12 +1180,14 @@ (EpaSpan { <no location info> })) (EpTok (EpaSpan { <no location info> })) - (EpTok (EpaSpan { <no location info> })) (EpTok - (EpaSpan { <no location info> })) - (EpTok (EpaSpan { <no location info> }))) + (EpaSpan { <no location info> }))) (ClosedTypeFamily - (NoExtField) + (AnnList + (AnnListLayout + (EpaSpan { DumpRenamedAst.hs:26:3 })) + (ListNone) + []) (Just [(L (EpAnn @@ -1765,10 +1767,8 @@ (EpaSpan { <no location info> })) (EpTok (EpaSpan { <no location info> })) - (EpTok (EpaSpan { <no location info> })) (EpTok - (EpaSpan { <no location info> })) - (EpTok (EpaSpan { <no location info> }))) + (EpaSpan { <no location info> }))) (OpenTypeFamily (NoExtField)) (NotTopLevel) ===================================== testsuite/tests/parser/should_compile/KindSigs.stderr ===================================== @@ -108,12 +108,14 @@ (EpaSpan { <no location info> })) (EpTok (EpaSpan { KindSigs.hs:11:19-23 })) - (EpTok (EpaSpan { <no location info> })) (EpTok - (EpaSpan { <no location info> })) - (EpTok (EpaSpan { <no location info> }))) + (EpaSpan { <no location info> }))) (ClosedTypeFamily - (NoExtField) + (AnnList + (AnnListLayout + (EpaSpan { KindSigs.hs:12:3 })) + (ListNone) + []) (Just [(L (EpAnn ===================================== utils/check-exact/ExactPrint.hs ===================================== @@ -1161,7 +1161,7 @@ limportDeclAnnPackage k annImp = fmap (\new -> annImp { importDeclAnnPackage = n -- data AnnList -- = AnnList { --- al_anchor :: Maybe Anchor, -- ^ start point of a list having layout +-- al_layout :: !AnnListLayout, -- al_brackets :: !AnnListBrackets, -- al_semis :: [EpToken ";"], -- decls -- al_trailing :: [TrailingAnn] -- ^ items appearing after the @@ -3820,7 +3820,7 @@ instance ExactPrint (FamilyDecl GhcPs) where getAnnotationEntry _ = NoEntryVal setAnnotationAnchor a _ _ _ = a - exact (FamilyDecl { fdExt = AnnFamilyDecl ops cps t d f dc eq vb w oc dd cc + exact (FamilyDecl { fdExt = AnnFamilyDecl ops cps t d f dc eq vb w dd , fdInfo = info , fdTopLevel = top_level , fdLName = ltycon @@ -3842,23 +3842,21 @@ instance ExactPrint (FamilyDecl GhcPs) where vb' <- markEpToken vb inj' <- markAnnotated inj return (vb', Just inj') - (w', oc', dd', cc', info') <- + (w', dd', info') <- case info of - ClosedTypeFamily x mb_eqns -> do + ClosedTypeFamily an mb_eqns -> do w' <- markEpToken w - oc' <- markEpToken oc - (dd', mb_eqns') <- + (an', dd', mb_eqns') <- case mb_eqns of Nothing -> do dd' <- markEpToken dd - return (dd', mb_eqns) + return (an, dd', mb_eqns) Just eqns -> do - eqns' <- mapM markAnnotated eqns - return (dd, Just eqns') - cc' <- markEpToken cc - return (w',oc',dd',cc', ClosedTypeFamily x mb_eqns') - _ -> return (w,oc,dd,cc, info) - return (FamilyDecl { fdExt = AnnFamilyDecl [] [] t' d' f' dc' eq' vb' w' oc' dd' cc' + (an',eqns') <- markAnnList' an $ setLayoutBoth $ mapM markAnnotated eqns + return (an', dd, Just eqns') + return (w', dd', ClosedTypeFamily an' mb_eqns') + _ -> return (w, dd, info) + return (FamilyDecl { fdExt = AnnFamilyDecl [] [] t' d' f' dc' eq' vb' w' dd' , fdInfo = info' , fdTopLevel = top_level , fdLName = ltycon' ===================================== utils/haddock/haddock-api/src/Haddock/Convert.hs ===================================== @@ -313,13 +313,13 @@ synifyTyCon _prr _coax tc CTF mb | Just (CoAxiom{co_ax_branches = branches}) <- mb -> mkFamDecl $ - ClosedTypeFamily noExtField $ + ClosedTypeFamily noAnn $ Just $ map (noLocA . synifyAxBranch tc) (fromBranches branches) | otherwise - -> mkFamDecl $ ClosedTypeFamily noExtField $ Just [] - CTF_BuiltIn {} -> mkFamDecl $ ClosedTypeFamily noExtField $ Just [] - CTF_Abstract -> mkFamDecl $ ClosedTypeFamily noExtField Nothing + -> mkFamDecl $ ClosedTypeFamily noAnn $ Just [] + CTF_BuiltIn {} -> mkFamDecl $ ClosedTypeFamily noAnn $ Just [] + CTF_Abstract -> mkFamDecl $ ClosedTypeFamily noAnn Nothing where resultVar = tyConFamilyResVar_maybe tc mkFamDecl i = ===================================== utils/haddock/haddock-api/src/Haddock/Types.hs ===================================== @@ -1038,7 +1038,7 @@ type instance XCInjectivityAnn DocNameI = NoExtField type instance XDataFamily DocNameI = NoExtField type instance XOpenTypeFamily DocNameI = NoExtField -type instance XClosedTypeFamily DocNameI = NoExtField +type instance XClosedTypeFamily DocNameI = AnnList type instance XXFamilyInfo DocNameI = DataConCantHappen type instance XCFunDep DocNameI = NoExtField View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/a4a3a964b00f2e73b71592161fe7e2a1... -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/a4a3a964b00f2e73b71592161fe7e2a1... You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help
participants (1)
-
Marge Bot (@marge-bot)