Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC
Commits:
-
a4a3a964
by Alan Zimmerman at 2026-10-24T17:30:03-04:00
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:
| ... | ... | @@ -708,13 +708,11 @@ data AnnFamilyDecl |
| 708 | 708 | afd_equal :: EpToken "=",
|
| 709 | 709 | afd_vbar :: EpToken "|",
|
| 710 | 710 | afd_where :: EpToken "where",
|
| 711 | - afd_openc :: EpToken "{",
|
|
| 712 | - afd_dotdot :: EpToken "..",
|
|
| 713 | - afd_closec :: EpToken "}"
|
|
| 711 | + afd_dotdot :: EpToken ".."
|
|
| 714 | 712 | } deriving Data
|
| 715 | 713 | |
| 716 | 714 | instance NoAnn AnnFamilyDecl where
|
| 717 | - noAnn = AnnFamilyDecl noAnn noAnn noAnn noAnn noAnn noAnn noAnn noAnn noAnn noAnn noAnn noAnn
|
|
| 715 | + noAnn = AnnFamilyDecl noAnn noAnn noAnn noAnn noAnn noAnn noAnn noAnn noAnn noAnn
|
|
| 718 | 716 | |
| 719 | 717 | ------------- Functions over FamilyDecls -----------
|
| 720 | 718 | |
| ... | ... | @@ -744,7 +742,7 @@ type instance XXInjectivityAnn (GhcPass _) = DataConCantHappen |
| 744 | 742 | |
| 745 | 743 | type instance XDataFamily (GhcPass _) = NoExtField
|
| 746 | 744 | type instance XOpenTypeFamily (GhcPass _) = NoExtField
|
| 747 | -type instance XClosedTypeFamily (GhcPass _) = NoExtField
|
|
| 745 | +type instance XClosedTypeFamily (GhcPass _) = AnnList
|
|
| 748 | 746 | type instance XXFamilyInfo (GhcPass _) = DataConCantHappen
|
| 749 | 747 | |
| 750 | 748 | instance OutputableBndrId p
|
| ... | ... | @@ -258,14 +258,14 @@ showAstData bs ba a0 = blankLine $$ showAstData' a0 |
| 258 | 258 | showAstData' j, showAstData' k]
|
| 259 | 259 | |
| 260 | 260 | annFamilyDecl :: AnnFamilyDecl -> SDoc
|
| 261 | - annFamilyDecl (AnnFamilyDecl a b c d e f g h i j k l) = case ba of
|
|
| 261 | + annFamilyDecl (AnnFamilyDecl a b c d e f g h i j) = case ba of
|
|
| 262 | 262 | BlankEpAnnotations -> parens $ text "blanked:" <+> text "AnnFamilyDecl"
|
| 263 | 263 | NoBlankEpAnnotations ->
|
| 264 | 264 | parens $ text "AnnFamilyDecl"
|
| 265 | 265 | $$ vcat [showAstData' a, showAstData' b, showAstData' c,
|
| 266 | 266 | showAstData' d, showAstData' e, showAstData' f,
|
| 267 | 267 | showAstData' g, showAstData' h, showAstData' i,
|
| 268 | - showAstData' j, showAstData' k, showAstData' l]
|
|
| 268 | + showAstData' j]
|
|
| 269 | 269 | |
| 270 | 270 | annClsInstDecl :: AnnClsInstDecl -> SDoc
|
| 271 | 271 | annClsInstDecl (AnnClsInstDecl a b c d e) = case ba of
|
| ... | ... | @@ -1355,10 +1355,10 @@ ty_decl :: { LTyClDecl GhcPs } |
| 1355 | 1355 | -- infix type constructors to be declared
|
| 1356 | 1356 | {% do { let { (tdcolon, tequal) = fst $ unLoc $4 }
|
| 1357 | 1357 | ; let { tvbar = fst $ unLoc $5 }
|
| 1358 | - ; let { (twhere, (toc, tdd, tcc)) = fst $ unLoc $6 }
|
|
| 1358 | + ; let { (twhere, tdd) = fst $ unLoc $6 }
|
|
| 1359 | 1359 | ; mkFamDecl (comb5 $1 $3 $4 $5 $6) (snd $ unLoc $6) TopLevel $3
|
| 1360 | 1360 | (snd $ unLoc $4) (snd $ unLoc $5)
|
| 1361 | - (AnnFamilyDecl [] [] (epTok $1) noAnn (epTok $2) tdcolon tequal tvbar twhere toc tdd tcc) }}
|
|
| 1361 | + (AnnFamilyDecl [] [] (epTok $1) noAnn (epTok $2) tdcolon tequal tvbar twhere tdd ) }}
|
|
| 1362 | 1362 | |
| 1363 | 1363 | -- ordinary data type or newtype declaration
|
| 1364 | 1364 | | type_data_or_newtype capi_ctype tycl_hdr constrs maybe_derivings
|
| ... | ... | @@ -1391,7 +1391,7 @@ ty_decl :: { LTyClDecl GhcPs } |
| 1391 | 1391 | {% do { let { tdcolon = fst $ unLoc $4 }
|
| 1392 | 1392 | ; mkFamDecl (comb4 $1 $2 $3 $4) (DataFamily noExtField) TopLevel $3
|
| 1393 | 1393 | (snd $ unLoc $4) Nothing
|
| 1394 | - (AnnFamilyDecl [] [] noAnn (epTok $1) (epTok $2) tdcolon noAnn noAnn noAnn noAnn noAnn noAnn) }}
|
|
| 1394 | + (AnnFamilyDecl [] [] noAnn (epTok $1) (epTok $2) tdcolon noAnn noAnn noAnn noAnn) }}
|
|
| 1395 | 1395 | |
| 1396 | 1396 | -- standalone kind signature
|
| 1397 | 1397 | standalone_kind_sig :: { LStandaloneKindSig GhcPs }
|
| ... | ... | @@ -1522,20 +1522,20 @@ inj_varids :: { Located [LocatedN RdrName] } |
| 1522 | 1522 | |
| 1523 | 1523 | -- Closed type families
|
| 1524 | 1524 | |
| 1525 | -where_type_family :: { Located ((EpToken "where", (EpToken "{", EpToken "..", EpToken "}")),FamilyInfo GhcPs) }
|
|
| 1525 | +where_type_family :: { Located ((EpToken "where", EpToken ".."),FamilyInfo GhcPs) }
|
|
| 1526 | 1526 | : {- empty -} { noLoc (noAnn,OpenTypeFamily noExtField) }
|
| 1527 | 1527 | | 'where' ty_fam_inst_eqn_list
|
| 1528 | - { sLL $1 $> ((epTok $1,(fst $ unLoc $2))
|
|
| 1529 | - , ClosedTypeFamily noExtField (fmap reverse $ snd $ unLoc $2)) }
|
|
| 1528 | + { sLL $1 $> ((epTok $1, (snd $ fst $ unLoc $2))
|
|
| 1529 | + , ClosedTypeFamily (fst $ fst $ unLoc $2) (fmap reverse $ snd $ unLoc $2)) }
|
|
| 1530 | 1530 | |
| 1531 | -ty_fam_inst_eqn_list :: { Located ((EpToken "{", EpToken "..", EpToken "}"),Maybe [LTyFamInstEqn GhcPs]) }
|
|
| 1532 | - : '{' ty_fam_inst_eqns '}' { sLL $1 $> ((epTok $1,noAnn, epTok $3)
|
|
| 1531 | +ty_fam_inst_eqn_list :: { Located ((AnnList, EpToken ".."),Maybe [LTyFamInstEqn GhcPs]) }
|
|
| 1532 | + : '{' ty_fam_inst_eqns '}' { sLL $1 $> ((AnnList AnnListBraces (ListBraces (epTok $1) (epTok $3)) [], noAnn)
|
|
| 1533 | 1533 | ,Just (unLoc $2)) }
|
| 1534 | 1534 | | vocurly ty_fam_inst_eqns close { let (L loc _) = $2 in
|
| 1535 | - L loc (noAnn,Just (unLoc $2)) }
|
|
| 1536 | - | '{' '..' '}' { sLL $1 $> ((epTok $1,epTok $2 ,epTok $3),Nothing) }
|
|
| 1535 | + L loc ((AnnList (AnnListLayout (glR $1)) ListNone [], noAnn),Just (unLoc $2)) }
|
|
| 1536 | + | '{' '..' '}' { sLL $1 $> ((AnnList AnnListBraces (ListBraces (epTok $1) (epTok $3)) [], epTok $2), Nothing) }
|
|
| 1537 | 1537 | | vocurly '..' close { let (L loc _) = $2 in
|
| 1538 | - L loc ((noAnn,epTok $2, noAnn),Nothing) }
|
|
| 1538 | + L loc ((AnnList (AnnListLayout (glR $1)) ListNone [], epTok $2),Nothing) }
|
|
| 1539 | 1539 | |
| 1540 | 1540 | ty_fam_inst_eqns :: { Located [LTyFamInstEqn GhcPs] }
|
| 1541 | 1541 | : ty_fam_inst_eqns ';' ty_fam_inst_eqn
|
| ... | ... | @@ -1580,7 +1580,7 @@ at_decl_cls :: { LHsDecl GhcPs } |
| 1580 | 1580 | {% do { let { tdcolon = fst $ unLoc $4 }
|
| 1581 | 1581 | ; liftM mkTyClD (mkFamDecl (comb3 $1 $3 $4) (DataFamily noExtField) NotTopLevel $3
|
| 1582 | 1582 | (snd $ unLoc $4) Nothing
|
| 1583 | - (AnnFamilyDecl [] [] noAnn (epTok $1) $2 tdcolon noAnn noAnn noAnn noAnn noAnn noAnn)) }}
|
|
| 1583 | + (AnnFamilyDecl [] [] noAnn (epTok $1) $2 tdcolon noAnn noAnn noAnn noAnn)) }}
|
|
| 1584 | 1584 | |
| 1585 | 1585 | -- type family declarations, with optional 'family' keyword
|
| 1586 | 1586 | -- (can't use opt_instance because you get shift/reduce errors
|
| ... | ... | @@ -1590,14 +1590,14 @@ at_decl_cls :: { LHsDecl GhcPs } |
| 1590 | 1590 | (mkFamDecl (comb3 $1 $2 $3) (OpenTypeFamily noExtField) NotTopLevel $2
|
| 1591 | 1591 | (fst . snd $ unLoc $3)
|
| 1592 | 1592 | (snd . snd $ unLoc $3)
|
| 1593 | - (AnnFamilyDecl [] [] (epTok $1) noAnn noAnn tdcolon tequal tvbar noAnn noAnn noAnn noAnn)) }}
|
|
| 1593 | + (AnnFamilyDecl [] [] (epTok $1) noAnn noAnn tdcolon tequal tvbar noAnn noAnn)) }}
|
|
| 1594 | 1594 | | 'type' 'family' type opt_at_kind_inj_sig
|
| 1595 | 1595 | {% do { let { (tdcolon, tequal, tvbar) = fst $ unLoc $4 }
|
| 1596 | 1596 | ; liftM mkTyClD
|
| 1597 | 1597 | (mkFamDecl (comb3 $1 $3 $4) (OpenTypeFamily noExtField) NotTopLevel $3
|
| 1598 | 1598 | (fst . snd $ unLoc $4)
|
| 1599 | 1599 | (snd . snd $ unLoc $4)
|
| 1600 | - (AnnFamilyDecl [] [] (epTok $1) noAnn (epTok $2) tdcolon tequal tvbar noAnn noAnn noAnn noAnn)) }}
|
|
| 1600 | + (AnnFamilyDecl [] [] (epTok $1) noAnn (epTok $2) tdcolon tequal tvbar noAnn noAnn)) }}
|
|
| 1601 | 1601 | -- default type instances, with optional 'instance' keyword
|
| 1602 | 1602 | | 'type' ty_fam_inst_eqn
|
| 1603 | 1603 | {% liftM mkInstD (mkTyFamInst (comb2 $1 $2) (unLoc $2)
|
| ... | ... | @@ -434,7 +434,7 @@ cvtDec (ClosedTypeFamilyD head eqns) |
| 434 | 434 | = do { (tc', tyvars', result', injectivity') <- cvt_tyfam_head head
|
| 435 | 435 | ; eqns' <- mapM cvtTySynEqn eqns
|
| 436 | 436 | ; returnJustLA $ TyClD noExtField $ FamDecl noExtField $
|
| 437 | - FamilyDecl noAnn (ClosedTypeFamily noExtField (Just eqns')) TopLevel tc' tyvars' Prefix
|
|
| 437 | + FamilyDecl noAnn (ClosedTypeFamily noAnn (Just eqns')) TopLevel tc' tyvars' Prefix
|
|
| 438 | 438 | result' injectivity' }
|
| 439 | 439 | |
| 440 | 440 | cvtDec (TH.RoleAnnotD tc roles)
|
| ... | ... | @@ -926,10 +926,8 @@ |
| 926 | 926 | (EpaSpan { <no location info> }))
|
| 927 | 927 | (EpTok
|
| 928 | 928 | (EpaSpan { <no location info> }))
|
| 929 | - (EpTok (EpaSpan { <no location info> }))
|
|
| 930 | 929 | (EpTok
|
| 931 | - (EpaSpan { <no location info> }))
|
|
| 932 | - (EpTok (EpaSpan { <no location info> })))
|
|
| 930 | + (EpaSpan { <no location info> })))
|
|
| 933 | 931 | (DataFamily
|
| 934 | 932 | (NoExtField))
|
| 935 | 933 | (NotTopLevel)
|
| ... | ... | @@ -1322,10 +1320,8 @@ |
| 1322 | 1320 | (EpaSpan { <no location info> }))
|
| 1323 | 1321 | (EpTok
|
| 1324 | 1322 | (EpaSpan { <no location info> }))
|
| 1325 | - (EpTok (EpaSpan { <no location info> }))
|
|
| 1326 | 1323 | (EpTok
|
| 1327 | - (EpaSpan { <no location info> }))
|
|
| 1328 | - (EpTok (EpaSpan { <no location info> })))
|
|
| 1324 | + (EpaSpan { <no location info> })))
|
|
| 1329 | 1325 | (DataFamily
|
| 1330 | 1326 | (NoExtField))
|
| 1331 | 1327 | (NotTopLevel)
|
| ... | ... | @@ -1718,10 +1714,8 @@ |
| 1718 | 1714 | (EpaSpan { <no location info> }))
|
| 1719 | 1715 | (EpTok
|
| 1720 | 1716 | (EpaSpan { <no location info> }))
|
| 1721 | - (EpTok (EpaSpan { <no location info> }))
|
|
| 1722 | 1717 | (EpTok
|
| 1723 | - (EpaSpan { <no location info> }))
|
|
| 1724 | - (EpTok (EpaSpan { <no location info> })))
|
|
| 1718 | + (EpaSpan { <no location info> })))
|
|
| 1725 | 1719 | (DataFamily
|
| 1726 | 1720 | (NoExtField))
|
| 1727 | 1721 | (NotTopLevel)
|
| ... | ... | @@ -2114,10 +2108,8 @@ |
| 2114 | 2108 | (EpaSpan { <no location info> }))
|
| 2115 | 2109 | (EpTok
|
| 2116 | 2110 | (EpaSpan { <no location info> }))
|
| 2117 | - (EpTok (EpaSpan { <no location info> }))
|
|
| 2118 | 2111 | (EpTok
|
| 2119 | - (EpaSpan { <no location info> }))
|
|
| 2120 | - (EpTok (EpaSpan { <no location info> })))
|
|
| 2112 | + (EpaSpan { <no location info> })))
|
|
| 2121 | 2113 | (DataFamily
|
| 2122 | 2114 | (NoExtField))
|
| 2123 | 2115 | (NotTopLevel)
|
| ... | ... | @@ -2510,10 +2502,8 @@ |
| 2510 | 2502 | (EpaSpan { <no location info> }))
|
| 2511 | 2503 | (EpTok
|
| 2512 | 2504 | (EpaSpan { <no location info> }))
|
| 2513 | - (EpTok (EpaSpan { <no location info> }))
|
|
| 2514 | 2505 | (EpTok
|
| 2515 | - (EpaSpan { <no location info> }))
|
|
| 2516 | - (EpTok (EpaSpan { <no location info> })))
|
|
| 2506 | + (EpaSpan { <no location info> })))
|
|
| 2517 | 2507 | (DataFamily
|
| 2518 | 2508 | (NoExtField))
|
| 2519 | 2509 | (NotTopLevel)
|
| ... | ... | @@ -2906,10 +2896,8 @@ |
| 2906 | 2896 | (EpaSpan { <no location info> }))
|
| 2907 | 2897 | (EpTok
|
| 2908 | 2898 | (EpaSpan { <no location info> }))
|
| 2909 | - (EpTok (EpaSpan { <no location info> }))
|
|
| 2910 | 2899 | (EpTok
|
| 2911 | - (EpaSpan { <no location info> }))
|
|
| 2912 | - (EpTok (EpaSpan { <no location info> })))
|
|
| 2900 | + (EpaSpan { <no location info> })))
|
|
| 2913 | 2901 | (DataFamily
|
| 2914 | 2902 | (NoExtField))
|
| 2915 | 2903 | (NotTopLevel)
|
| ... | ... | @@ -359,12 +359,14 @@ |
| 359 | 359 | (EpaSpan { <no location info> }))
|
| 360 | 360 | (EpTok
|
| 361 | 361 | (EpaSpan { DumpParsedAst.hs:10:41-45 }))
|
| 362 | - (EpTok (EpaSpan { <no location info> }))
|
|
| 363 | 362 | (EpTok
|
| 364 | - (EpaSpan { <no location info> }))
|
|
| 365 | - (EpTok (EpaSpan { <no location info> })))
|
|
| 363 | + (EpaSpan { <no location info> })))
|
|
| 366 | 364 | (ClosedTypeFamily
|
| 367 | - (NoExtField)
|
|
| 365 | + (AnnList
|
|
| 366 | + (AnnListLayout
|
|
| 367 | + (EpaSpan { DumpParsedAst.hs:11:3 }))
|
|
| 368 | + (ListNone)
|
|
| 369 | + [])
|
|
| 368 | 370 | (Just
|
| 369 | 371 | [(L
|
| 370 | 372 | (EpAnn
|
| ... | ... | @@ -1144,12 +1146,14 @@ |
| 1144 | 1146 | (EpaSpan { <no location info> }))
|
| 1145 | 1147 | (EpTok
|
| 1146 | 1148 | (EpaSpan { DumpParsedAst.hs:18:50-54 }))
|
| 1147 | - (EpTok (EpaSpan { <no location info> }))
|
|
| 1148 | 1149 | (EpTok
|
| 1149 | - (EpaSpan { <no location info> }))
|
|
| 1150 | - (EpTok (EpaSpan { <no location info> })))
|
|
| 1150 | + (EpaSpan { <no location info> })))
|
|
| 1151 | 1151 | (ClosedTypeFamily
|
| 1152 | - (NoExtField)
|
|
| 1152 | + (AnnList
|
|
| 1153 | + (AnnListLayout
|
|
| 1154 | + (EpaSpan { DumpParsedAst.hs:19:3 }))
|
|
| 1155 | + (ListNone)
|
|
| 1156 | + [])
|
|
| 1153 | 1157 | (Just
|
| 1154 | 1158 | [(L
|
| 1155 | 1159 | (EpAnn
|
| ... | ... | @@ -1543,10 +1547,8 @@ |
| 1543 | 1547 | (EpaSpan { <no location info> }))
|
| 1544 | 1548 | (EpTok
|
| 1545 | 1549 | (EpaSpan { <no location info> }))
|
| 1546 | - (EpTok (EpaSpan { <no location info> }))
|
|
| 1547 | 1550 | (EpTok
|
| 1548 | - (EpaSpan { <no location info> }))
|
|
| 1549 | - (EpTok (EpaSpan { <no location info> })))
|
|
| 1551 | + (EpaSpan { <no location info> })))
|
|
| 1550 | 1552 | (DataFamily
|
| 1551 | 1553 | (NoExtField))
|
| 1552 | 1554 | (TopLevel)
|
| ... | ... | @@ -306,12 +306,14 @@ |
| 306 | 306 | (EpaSpan { <no location info> }))
|
| 307 | 307 | (EpTok
|
| 308 | 308 | (EpaSpan { <no location info> }))
|
| 309 | - (EpTok (EpaSpan { <no location info> }))
|
|
| 310 | 309 | (EpTok
|
| 311 | - (EpaSpan { <no location info> }))
|
|
| 312 | - (EpTok (EpaSpan { <no location info> })))
|
|
| 310 | + (EpaSpan { <no location info> })))
|
|
| 313 | 311 | (ClosedTypeFamily
|
| 314 | - (NoExtField)
|
|
| 312 | + (AnnList
|
|
| 313 | + (AnnListLayout
|
|
| 314 | + (EpaSpan { DumpRenamedAst.hs:13:3 }))
|
|
| 315 | + (ListNone)
|
|
| 316 | + [])
|
|
| 315 | 317 | (Just
|
| 316 | 318 | [(L
|
| 317 | 319 | (EpAnn
|
| ... | ... | @@ -795,10 +797,8 @@ |
| 795 | 797 | (EpaSpan { <no location info> }))
|
| 796 | 798 | (EpTok
|
| 797 | 799 | (EpaSpan { <no location info> }))
|
| 798 | - (EpTok (EpaSpan { <no location info> }))
|
|
| 799 | 800 | (EpTok
|
| 800 | - (EpaSpan { <no location info> }))
|
|
| 801 | - (EpTok (EpaSpan { <no location info> })))
|
|
| 801 | + (EpaSpan { <no location info> })))
|
|
| 802 | 802 | (DataFamily
|
| 803 | 803 | (NoExtField))
|
| 804 | 804 | (TopLevel)
|
| ... | ... | @@ -1180,12 +1180,14 @@ |
| 1180 | 1180 | (EpaSpan { <no location info> }))
|
| 1181 | 1181 | (EpTok
|
| 1182 | 1182 | (EpaSpan { <no location info> }))
|
| 1183 | - (EpTok (EpaSpan { <no location info> }))
|
|
| 1184 | 1183 | (EpTok
|
| 1185 | - (EpaSpan { <no location info> }))
|
|
| 1186 | - (EpTok (EpaSpan { <no location info> })))
|
|
| 1184 | + (EpaSpan { <no location info> })))
|
|
| 1187 | 1185 | (ClosedTypeFamily
|
| 1188 | - (NoExtField)
|
|
| 1186 | + (AnnList
|
|
| 1187 | + (AnnListLayout
|
|
| 1188 | + (EpaSpan { DumpRenamedAst.hs:26:3 }))
|
|
| 1189 | + (ListNone)
|
|
| 1190 | + [])
|
|
| 1189 | 1191 | (Just
|
| 1190 | 1192 | [(L
|
| 1191 | 1193 | (EpAnn
|
| ... | ... | @@ -1765,10 +1767,8 @@ |
| 1765 | 1767 | (EpaSpan { <no location info> }))
|
| 1766 | 1768 | (EpTok
|
| 1767 | 1769 | (EpaSpan { <no location info> }))
|
| 1768 | - (EpTok (EpaSpan { <no location info> }))
|
|
| 1769 | 1770 | (EpTok
|
| 1770 | - (EpaSpan { <no location info> }))
|
|
| 1771 | - (EpTok (EpaSpan { <no location info> })))
|
|
| 1771 | + (EpaSpan { <no location info> })))
|
|
| 1772 | 1772 | (OpenTypeFamily
|
| 1773 | 1773 | (NoExtField))
|
| 1774 | 1774 | (NotTopLevel)
|
| ... | ... | @@ -108,12 +108,14 @@ |
| 108 | 108 | (EpaSpan { <no location info> }))
|
| 109 | 109 | (EpTok
|
| 110 | 110 | (EpaSpan { KindSigs.hs:11:19-23 }))
|
| 111 | - (EpTok (EpaSpan { <no location info> }))
|
|
| 112 | 111 | (EpTok
|
| 113 | - (EpaSpan { <no location info> }))
|
|
| 114 | - (EpTok (EpaSpan { <no location info> })))
|
|
| 112 | + (EpaSpan { <no location info> })))
|
|
| 115 | 113 | (ClosedTypeFamily
|
| 116 | - (NoExtField)
|
|
| 114 | + (AnnList
|
|
| 115 | + (AnnListLayout
|
|
| 116 | + (EpaSpan { KindSigs.hs:12:3 }))
|
|
| 117 | + (ListNone)
|
|
| 118 | + [])
|
|
| 117 | 119 | (Just
|
| 118 | 120 | [(L
|
| 119 | 121 | (EpAnn
|
| ... | ... | @@ -1161,7 +1161,7 @@ limportDeclAnnPackage k annImp = fmap (\new -> annImp { importDeclAnnPackage = n |
| 1161 | 1161 | |
| 1162 | 1162 | -- data AnnList
|
| 1163 | 1163 | -- = AnnList {
|
| 1164 | --- al_anchor :: Maybe Anchor, -- ^ start point of a list having layout
|
|
| 1164 | +-- al_layout :: !AnnListLayout,
|
|
| 1165 | 1165 | -- al_brackets :: !AnnListBrackets,
|
| 1166 | 1166 | -- al_semis :: [EpToken ";"], -- decls
|
| 1167 | 1167 | -- al_trailing :: [TrailingAnn] -- ^ items appearing after the
|
| ... | ... | @@ -3820,7 +3820,7 @@ instance ExactPrint (FamilyDecl GhcPs) where |
| 3820 | 3820 | getAnnotationEntry _ = NoEntryVal
|
| 3821 | 3821 | setAnnotationAnchor a _ _ _ = a
|
| 3822 | 3822 | |
| 3823 | - exact (FamilyDecl { fdExt = AnnFamilyDecl ops cps t d f dc eq vb w oc dd cc
|
|
| 3823 | + exact (FamilyDecl { fdExt = AnnFamilyDecl ops cps t d f dc eq vb w dd
|
|
| 3824 | 3824 | , fdInfo = info
|
| 3825 | 3825 | , fdTopLevel = top_level
|
| 3826 | 3826 | , fdLName = ltycon
|
| ... | ... | @@ -3842,23 +3842,21 @@ instance ExactPrint (FamilyDecl GhcPs) where |
| 3842 | 3842 | vb' <- markEpToken vb
|
| 3843 | 3843 | inj' <- markAnnotated inj
|
| 3844 | 3844 | return (vb', Just inj')
|
| 3845 | - (w', oc', dd', cc', info') <-
|
|
| 3845 | + (w', dd', info') <-
|
|
| 3846 | 3846 | case info of
|
| 3847 | - ClosedTypeFamily x mb_eqns -> do
|
|
| 3847 | + ClosedTypeFamily an mb_eqns -> do
|
|
| 3848 | 3848 | w' <- markEpToken w
|
| 3849 | - oc' <- markEpToken oc
|
|
| 3850 | - (dd', mb_eqns') <-
|
|
| 3849 | + (an', dd', mb_eqns') <-
|
|
| 3851 | 3850 | case mb_eqns of
|
| 3852 | 3851 | Nothing -> do
|
| 3853 | 3852 | dd' <- markEpToken dd
|
| 3854 | - return (dd', mb_eqns)
|
|
| 3853 | + return (an, dd', mb_eqns)
|
|
| 3855 | 3854 | Just eqns -> do
|
| 3856 | - eqns' <- mapM markAnnotated eqns
|
|
| 3857 | - return (dd, Just eqns')
|
|
| 3858 | - cc' <- markEpToken cc
|
|
| 3859 | - return (w',oc',dd',cc', ClosedTypeFamily x mb_eqns')
|
|
| 3860 | - _ -> return (w,oc,dd,cc, info)
|
|
| 3861 | - return (FamilyDecl { fdExt = AnnFamilyDecl [] [] t' d' f' dc' eq' vb' w' oc' dd' cc'
|
|
| 3855 | + (an',eqns') <- markAnnList' an $ setLayoutBoth $ mapM markAnnotated eqns
|
|
| 3856 | + return (an', dd, Just eqns')
|
|
| 3857 | + return (w', dd', ClosedTypeFamily an' mb_eqns')
|
|
| 3858 | + _ -> return (w, dd, info)
|
|
| 3859 | + return (FamilyDecl { fdExt = AnnFamilyDecl [] [] t' d' f' dc' eq' vb' w' dd'
|
|
| 3862 | 3860 | , fdInfo = info'
|
| 3863 | 3861 | , fdTopLevel = top_level
|
| 3864 | 3862 | , fdLName = ltycon'
|
| ... | ... | @@ -313,13 +313,13 @@ synifyTyCon _prr _coax tc |
| 313 | 313 | CTF mb
|
| 314 | 314 | | Just (CoAxiom{co_ax_branches = branches}) <- mb
|
| 315 | 315 | -> mkFamDecl $
|
| 316 | - ClosedTypeFamily noExtField $
|
|
| 316 | + ClosedTypeFamily noAnn $
|
|
| 317 | 317 | Just $
|
| 318 | 318 | map (noLocA . synifyAxBranch tc) (fromBranches branches)
|
| 319 | 319 | | otherwise
|
| 320 | - -> mkFamDecl $ ClosedTypeFamily noExtField $ Just []
|
|
| 321 | - CTF_BuiltIn {} -> mkFamDecl $ ClosedTypeFamily noExtField $ Just []
|
|
| 322 | - CTF_Abstract -> mkFamDecl $ ClosedTypeFamily noExtField Nothing
|
|
| 320 | + -> mkFamDecl $ ClosedTypeFamily noAnn $ Just []
|
|
| 321 | + CTF_BuiltIn {} -> mkFamDecl $ ClosedTypeFamily noAnn $ Just []
|
|
| 322 | + CTF_Abstract -> mkFamDecl $ ClosedTypeFamily noAnn Nothing
|
|
| 323 | 323 | where
|
| 324 | 324 | resultVar = tyConFamilyResVar_maybe tc
|
| 325 | 325 | mkFamDecl i =
|
| ... | ... | @@ -1038,7 +1038,7 @@ type instance XCInjectivityAnn DocNameI = NoExtField |
| 1038 | 1038 | |
| 1039 | 1039 | type instance XDataFamily DocNameI = NoExtField
|
| 1040 | 1040 | type instance XOpenTypeFamily DocNameI = NoExtField
|
| 1041 | -type instance XClosedTypeFamily DocNameI = NoExtField
|
|
| 1041 | +type instance XClosedTypeFamily DocNameI = AnnList
|
|
| 1042 | 1042 | type instance XXFamilyInfo DocNameI = DataConCantHappen
|
| 1043 | 1043 | |
| 1044 | 1044 | type instance XCFunDep DocNameI = NoExtField
|