Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC
Commits:
-
dccee6fe
by Alan Zimmerman at 2026-07-06T00:25:49-04:00
18 changed files:
- compiler/GHC/Hs/Binds.hs
- compiler/GHC/Hs/Dump.hs
- compiler/GHC/Hs/Expr.hs
- compiler/GHC/Parser.y
- compiler/GHC/Parser/PostProcess.hs
- testsuite/tests/ghc-api/exactprint/T22919.stderr
- testsuite/tests/ghc-api/exactprint/ZeroWidthSemi.stderr
- testsuite/tests/module/mod185.stderr
- testsuite/tests/parser/should_compile/DumpParsedAst.stderr
- testsuite/tests/parser/should_compile/DumpParsedAstComments.stderr
- testsuite/tests/parser/should_compile/DumpRenamedAst.stderr
- testsuite/tests/parser/should_compile/DumpSemis.stderr
- testsuite/tests/parser/should_compile/KindSigs.stderr
- testsuite/tests/parser/should_compile/T20718.stderr
- testsuite/tests/parser/should_compile/T20846.stderr
- testsuite/tests/printer/Test20297.stdout
- testsuite/tests/printer/Test24533.stdout
- utils/check-exact/ExactPrint.hs
Changes:
| ... | ... | @@ -147,11 +147,12 @@ data AnnPSB |
| 147 | 147 | = AnnPSB {
|
| 148 | 148 | ap_pattern :: EpToken "pattern",
|
| 149 | 149 | ap_larrow :: Maybe (EpUniToken "<-" "←"),
|
| 150 | - ap_equal :: Maybe (EpToken "=")
|
|
| 150 | + ap_equal :: Maybe (EpToken "="),
|
|
| 151 | + ap_where :: Maybe (EpToken "where")
|
|
| 151 | 152 | } deriving Data
|
| 152 | 153 | |
| 153 | 154 | instance NoAnn AnnPSB where
|
| 154 | - noAnn = AnnPSB noAnn noAnn noAnn
|
|
| 155 | + noAnn = AnnPSB noAnn noAnn noAnn noAnn
|
|
| 155 | 156 | |
| 156 | 157 | -- ---------------------------------------------------------------------
|
| 157 | 158 |
| ... | ... | @@ -68,7 +68,7 @@ showAstData bs ba a0 = blankLine $$ showAstData' a0 |
| 68 | 68 | `extQ` annotationGrhsAnn
|
| 69 | 69 | `extQ` annotationAnnList
|
| 70 | 70 | `extQ` annotationEpAnnListWhere
|
| 71 | - `extQ` annotationAnnListWhere
|
|
| 71 | + `extQ` annotationAnnListUnit
|
|
| 72 | 72 | `extQ` annotationAnnListCommas
|
| 73 | 73 | `extQ` annotationAnnListEpaLocation
|
| 74 | 74 | `extQ` annotationNoEpAnns
|
| ... | ... | @@ -377,9 +377,9 @@ showAstData bs ba a0 = blankLine $$ showAstData' a0 |
| 377 | 377 | annotationAnnListCommas :: EpAnn (AnnList [EpToken ","]) -> SDoc
|
| 378 | 378 | annotationAnnListCommas = annotation' (text "EpAnn (AnnList [EpToken \",\"])")
|
| 379 | 379 | |
| 380 | - annotationAnnListWhere :: AnnList (EpToken "where") -> SDoc
|
|
| 381 | - annotationAnnListWhere anns = case ba of
|
|
| 382 | - BlankEpAnnotations -> parens (text "blanked:" <+> text "AnnList (EpToken \"where\")")
|
|
| 380 | + annotationAnnListUnit :: AnnList () -> SDoc
|
|
| 381 | + annotationAnnListUnit anns = case ba of
|
|
| 382 | + BlankEpAnnotations -> parens (text "blanked:" <+> text "AnnList ()")
|
|
| 383 | 383 | NoBlankEpAnnotations -> parens $ text (showConstr (toConstr anns))
|
| 384 | 384 | $$ vcat (gmapQ showAstData' anns)
|
| 385 | 385 |
| ... | ... | @@ -1654,7 +1654,7 @@ type instance XMG GhcRn b = (Origin, -- See Note [Generated code and pat |
| 1654 | 1654 | MatchGroupAnn)
|
| 1655 | 1655 | type instance XMG GhcTc b = MatchGroupTc
|
| 1656 | 1656 | |
| 1657 | -type MatchGroupAnn = AnnList (EpToken "where")
|
|
| 1657 | +type MatchGroupAnn = AnnList ()
|
|
| 1658 | 1658 | |
| 1659 | 1659 | data MatchGroupTc
|
| 1660 | 1660 | = MatchGroupTc
|
| ... | ... | @@ -1760,19 +1760,19 @@ pattern_synonym_decl :: { LHsDecl GhcPs } |
| 1760 | 1760 | {% let (name, args) = $2 in
|
| 1761 | 1761 | amsA' (sLL $1 $> . ValD noExtField $ mkPatSynBind name args $4
|
| 1762 | 1762 | ImplicitBidirectional
|
| 1763 | - (AnnPSB (epTok $1) Nothing (Just (epTok $3)))) }
|
|
| 1763 | + (AnnPSB (epTok $1) Nothing (Just (epTok $3)) Nothing)) }
|
|
| 1764 | 1764 | |
| 1765 | 1765 | | 'pattern' pattern_synonym_lhs '<-' pat_syn_pat
|
| 1766 | 1766 | {% let (name, args) = $2 in
|
| 1767 | 1767 | amsA' (sLL $1 $> . ValD noExtField $ mkPatSynBind name args $4 Unidirectional
|
| 1768 | - (AnnPSB (epTok $1) (Just (epUniTok $3)) Nothing)) }
|
|
| 1768 | + (AnnPSB (epTok $1) (Just (epUniTok $3)) Nothing Nothing)) }
|
|
| 1769 | 1769 | |
| 1770 | 1770 | | 'pattern' pattern_synonym_lhs '<-' pat_syn_pat where_decls
|
| 1771 | 1771 | {% do { let (name, args) = $2
|
| 1772 | 1772 | ; mg <- mkPatSynMatchGroup name $5
|
| 1773 | 1773 | ; amsA' (sLL $1 $> . ValD noExtField $
|
| 1774 | 1774 | mkPatSynBind name args $4 (ExplicitBidirectional mg)
|
| 1775 | - (AnnPSB (epTok $1) (Just (epUniTok $3)) Nothing))
|
|
| 1775 | + (AnnPSB (epTok $1) (Just (epUniTok $3)) Nothing (Just (sndOf3 $ unLoc $5)) ))
|
|
| 1776 | 1776 | }}
|
| 1777 | 1777 | |
| 1778 | 1778 | pattern_synonym_lhs :: { (LocatedN RdrName, HsPatSynDetails GhcPs) }
|
| ... | ... | @@ -1789,11 +1789,13 @@ cvars1 :: { [RecordPatSynField GhcPs] } |
| 1789 | 1789 | | var ',' cvars1 {% do { h <- addTrailingCommaN $1 (gl $2)
|
| 1790 | 1790 | ; return ((RecordPatSynField (mkFieldOcc h) h) : $3 )}}
|
| 1791 | 1791 | |
| 1792 | -where_decls :: { LocatedA (OrdList (LHsDecl GhcPs), AnnList (EpToken "where")) }
|
|
| 1792 | +where_decls :: { LocatedA (OrdList (LHsDecl GhcPs), EpToken "where", AnnList ()) }
|
|
| 1793 | 1793 | : 'where' '{' decls '}' {% amsA' (sLL $1 $> (thdOf3 $ unLoc $3,
|
| 1794 | - AnnList (Just (fstOf3 $ unLoc $3)) (ListBraces (epTok $2) (epTok $4)) (sndOf3 $ unLoc $3) (epTok $1) [])) }
|
|
| 1794 | + epTok $1,
|
|
| 1795 | + AnnList (Just (fstOf3 $ unLoc $3)) (ListBraces (epTok $2) (epTok $4)) (sndOf3 $ unLoc $3) () [])) }
|
|
| 1795 | 1796 | | 'where' vocurly decls close {% amsA' (sLL $1 $3 (thdOf3 $ unLoc $3,
|
| 1796 | - AnnList (Just (fstOf3 $ unLoc $3)) ListNone (sndOf3 $ unLoc $3) (epTok $1) [])) }
|
|
| 1797 | + epTok $1,
|
|
| 1798 | + AnnList (Just (fstOf3 $ unLoc $3)) ListNone (sndOf3 $ unLoc $3) () [])) }
|
|
| 1797 | 1799 | |
| 1798 | 1800 | pattern_synonym_sig :: { LSig GhcPs }
|
| 1799 | 1801 | : 'pattern' con_list '::' sigtype
|
| ... | ... | @@ -3535,7 +3537,7 @@ guardquals1 :: { Located [LStmt GhcPs (LHsExpr GhcPs)] } |
| 3535 | 3537 | -----------------------------------------------------------------------------
|
| 3536 | 3538 | -- Case alternatives
|
| 3537 | 3539 | |
| 3538 | -altslist(PATS) :: { forall b. DisambECP b => PV (LocatedA ([LMatch GhcPs (LocatedA b)], AnnList (EpToken "where"))) }
|
|
| 3540 | +altslist(PATS) :: { forall b. DisambECP b => PV (LocatedA ([LMatch GhcPs (LocatedA b)], AnnList ())) }
|
|
| 3539 | 3541 | : '{' alts(PATS) '}' { $2 >>= \ $2 -> amsA'
|
| 3540 | 3542 | (sLL $1 $> (reverse (snd $ unLoc $2),
|
| 3541 | 3543 | (AnnList (Just $ glR $2) (ListBraces (epTok $1) (epTok $3)) (fst $ unLoc $2) noAnn []))) }
|
| ... | ... | @@ -723,9 +723,9 @@ tyConToDataCon (L loc tc) |
| 723 | 723 | occ = rdrNameOcc tc
|
| 724 | 724 | |
| 725 | 725 | mkPatSynMatchGroup :: LocatedN RdrName
|
| 726 | - -> LocatedA (OrdList (LHsDecl GhcPs), AnnList (EpToken "where"))
|
|
| 726 | + -> LocatedA (OrdList (LHsDecl GhcPs), EpToken "where", AnnList ())
|
|
| 727 | 727 | -> P (MatchGroup GhcPs (LHsExpr GhcPs))
|
| 728 | -mkPatSynMatchGroup (L loc patsyn_name) (L ld (decls, ann)) =
|
|
| 728 | +mkPatSynMatchGroup (L loc patsyn_name) (L ld (decls, _, ann)) =
|
|
| 729 | 729 | do { matches <- mapM fromDecl (fromOL decls)
|
| 730 | 730 | ; when (null matches) (wrongNumberErr (locA loc))
|
| 731 | 731 | ; return $ mkMatchGroup FromSource ann (L ld matches) }
|
| ... | ... | @@ -1772,11 +1772,11 @@ class (b ~ (Body b) GhcPs, AnnoBody b) => DisambECP b where |
| 1772 | 1772 | -> PV (LocatedA b)
|
| 1773 | 1773 | -- | Disambiguate "case ... of ..."
|
| 1774 | 1774 | mkHsCasePV :: SrcSpan -> LHsExpr GhcPs
|
| 1775 | - -> LocatedA ([LMatch GhcPs (LocatedA b)], AnnList (EpToken "where"))
|
|
| 1775 | + -> LocatedA ([LMatch GhcPs (LocatedA b)], AnnList ())
|
|
| 1776 | 1776 | -> EpAnnHsCase -> PV (LocatedA b)
|
| 1777 | 1777 | -- | Disambiguate "\... -> ..." (lambda), "\case" and "\cases"
|
| 1778 | 1778 | mkHsLamPV :: SrcSpan -> HsLamVariant
|
| 1779 | - -> LocatedA ([LMatch GhcPs (LocatedA b)], AnnList (EpToken "where"))
|
|
| 1779 | + -> LocatedA ([LMatch GhcPs (LocatedA b)], AnnList ())
|
|
| 1780 | 1780 | -> EpAnnLam
|
| 1781 | 1781 | -> PV (LocatedA b)
|
| 1782 | 1782 | -- | Function argument representation
|
| ... | ... | @@ -74,7 +74,7 @@ |
| 74 | 74 | (Nothing)
|
| 75 | 75 | (ListNone)
|
| 76 | 76 | []
|
| 77 | - (NoEpTok)
|
|
| 77 | + (())
|
|
| 78 | 78 | []))
|
| 79 | 79 | (L
|
| 80 | 80 | (EpAnn
|
| ... | ... | @@ -86,7 +86,7 @@ |
| 86 | 86 | (Nothing)
|
| 87 | 87 | (ListNone)
|
| 88 | 88 | []
|
| 89 | - (NoEpTok)
|
|
| 89 | + (())
|
|
| 90 | 90 | []))
|
| 91 | 91 | (L
|
| 92 | 92 | (EpAnn
|
| ... | ... | @@ -99,7 +99,7 @@ |
| 99 | 99 | (Nothing)
|
| 100 | 100 | (ListNone)
|
| 101 | 101 | []
|
| 102 | - (NoEpTok)
|
|
| 102 | + (())
|
|
| 103 | 103 | []))
|
| 104 | 104 | (L
|
| 105 | 105 | (EpAnn
|
| ... | ... | @@ -2232,7 +2232,7 @@ |
| 2232 | 2232 | (Nothing)
|
| 2233 | 2233 | (ListNone)
|
| 2234 | 2234 | []
|
| 2235 | - (NoEpTok)
|
|
| 2235 | + (())
|
|
| 2236 | 2236 | []))
|
| 2237 | 2237 | (L
|
| 2238 | 2238 | (EpAnn
|
| ... | ... | @@ -94,7 +94,7 @@ |
| 94 | 94 | (Nothing)
|
| 95 | 95 | (ListNone)
|
| 96 | 96 | []
|
| 97 | - (NoEpTok)
|
|
| 97 | + (())
|
|
| 98 | 98 | []))
|
| 99 | 99 | (L
|
| 100 | 100 | (EpAnn
|
| ... | ... | @@ -218,7 +218,7 @@ |
| 218 | 218 | (Nothing)
|
| 219 | 219 | (ListNone)
|
| 220 | 220 | []
|
| 221 | - (NoEpTok)
|
|
| 221 | + (())
|
|
| 222 | 222 | []))
|
| 223 | 223 | (L
|
| 224 | 224 | (EpAnn
|
| ... | ... | @@ -371,7 +371,7 @@ |
| 371 | 371 | (Nothing)
|
| 372 | 372 | (ListNone)
|
| 373 | 373 | []
|
| 374 | - (NoEpTok)
|
|
| 374 | + (())
|
|
| 375 | 375 | []))
|
| 376 | 376 | (L
|
| 377 | 377 | (EpAnn
|
| ... | ... | @@ -34,7 +34,7 @@ |
| 34 | 34 | (Nothing)
|
| 35 | 35 | (ListNone)
|
| 36 | 36 | []
|
| 37 | - (NoEpTok)
|
|
| 37 | + (())
|
|
| 38 | 38 | []))
|
| 39 | 39 | (L
|
| 40 | 40 | (EpAnn
|
| ... | ... | @@ -271,7 +271,7 @@ |
| 271 | 271 | (Nothing)
|
| 272 | 272 | (ListNone)
|
| 273 | 273 | []
|
| 274 | - (NoEpTok)
|
|
| 274 | + (())
|
|
| 275 | 275 | []))
|
| 276 | 276 | (L
|
| 277 | 277 | (EpAnn
|
| ... | ... | @@ -578,7 +578,7 @@ |
| 578 | 578 | (Nothing)
|
| 579 | 579 | (ListNone)
|
| 580 | 580 | []
|
| 581 | - (NoEpTok)
|
|
| 581 | + (())
|
|
| 582 | 582 | []))
|
| 583 | 583 | (L
|
| 584 | 584 | (EpAnn
|
| ... | ... | @@ -840,7 +840,7 @@ |
| 840 | 840 | (Nothing)
|
| 841 | 841 | (ListNone)
|
| 842 | 842 | []
|
| 843 | - (NoEpTok)
|
|
| 843 | + (())
|
|
| 844 | 844 | []))
|
| 845 | 845 | (L
|
| 846 | 846 | (EpAnn
|
| ... | ... | @@ -1056,7 +1056,7 @@ |
| 1056 | 1056 | (Nothing)
|
| 1057 | 1057 | (ListNone)
|
| 1058 | 1058 | []
|
| 1059 | - (NoEpTok)
|
|
| 1059 | + (())
|
|
| 1060 | 1060 | []))
|
| 1061 | 1061 | (L
|
| 1062 | 1062 | (EpAnn
|
| ... | ... | @@ -1162,7 +1162,7 @@ |
| 1162 | 1162 | (Nothing)
|
| 1163 | 1163 | (ListNone)
|
| 1164 | 1164 | []
|
| 1165 | - (NoEpTok)
|
|
| 1165 | + (())
|
|
| 1166 | 1166 | []))
|
| 1167 | 1167 | (L
|
| 1168 | 1168 | (EpAnn
|
| ... | ... | @@ -1270,7 +1270,7 @@ |
| 1270 | 1270 | (Nothing)
|
| 1271 | 1271 | (ListNone)
|
| 1272 | 1272 | []
|
| 1273 | - (NoEpTok)
|
|
| 1273 | + (())
|
|
| 1274 | 1274 | []))
|
| 1275 | 1275 | (L
|
| 1276 | 1276 | (EpAnn
|
| ... | ... | @@ -1786,7 +1786,7 @@ |
| 1786 | 1786 | (Nothing)
|
| 1787 | 1787 | (ListNone)
|
| 1788 | 1788 | []
|
| 1789 | - (NoEpTok)
|
|
| 1789 | + (())
|
|
| 1790 | 1790 | []))
|
| 1791 | 1791 | (L
|
| 1792 | 1792 | (EpAnn
|
| ... | ... | @@ -1914,7 +1914,7 @@ |
| 1914 | 1914 | (Nothing)
|
| 1915 | 1915 | (ListNone)
|
| 1916 | 1916 | []
|
| 1917 | - (NoEpTok)
|
|
| 1917 | + (())
|
|
| 1918 | 1918 | []))
|
| 1919 | 1919 | (L
|
| 1920 | 1920 | (EpAnn
|
| ... | ... | @@ -2040,7 +2040,7 @@ |
| 2040 | 2040 | (Nothing)
|
| 2041 | 2041 | (ListNone)
|
| 2042 | 2042 | []
|
| 2043 | - (NoEpTok)
|
|
| 2043 | + (())
|
|
| 2044 | 2044 | []))
|
| 2045 | 2045 | (L
|
| 2046 | 2046 | (EpAnn
|
| ... | ... | @@ -2153,7 +2153,7 @@ |
| 2153 | 2153 | (Nothing)
|
| 2154 | 2154 | (ListNone)
|
| 2155 | 2155 | []
|
| 2156 | - (NoEpTok)
|
|
| 2156 | + (())
|
|
| 2157 | 2157 | []))
|
| 2158 | 2158 | (L
|
| 2159 | 2159 | (EpAnn
|
| ... | ... | @@ -2281,7 +2281,7 @@ |
| 2281 | 2281 | (Nothing)
|
| 2282 | 2282 | (ListNone)
|
| 2283 | 2283 | []
|
| 2284 | - (NoEpTok)
|
|
| 2284 | + (())
|
|
| 2285 | 2285 | []))
|
| 2286 | 2286 | (L
|
| 2287 | 2287 | (EpAnn
|
| ... | ... | @@ -2402,7 +2402,7 @@ |
| 2402 | 2402 | (EpaSpan { DumpSemis.hs:38:7 }))
|
| 2403 | 2403 | ,(EpTok
|
| 2404 | 2404 | (EpaSpan { DumpSemis.hs:38:8 }))]
|
| 2405 | - (NoEpTok)
|
|
| 2405 | + (())
|
|
| 2406 | 2406 | []))
|
| 2407 | 2407 | (L
|
| 2408 | 2408 | (EpAnn
|
| ... | ... | @@ -1018,7 +1018,7 @@ |
| 1018 | 1018 | (Nothing)
|
| 1019 | 1019 | (ListNone)
|
| 1020 | 1020 | []
|
| 1021 | - (NoEpTok)
|
|
| 1021 | + (())
|
|
| 1022 | 1022 | []))
|
| 1023 | 1023 | (L
|
| 1024 | 1024 | (EpAnn
|
| ... | ... | @@ -1753,7 +1753,7 @@ |
| 1753 | 1753 | (Nothing)
|
| 1754 | 1754 | (ListNone)
|
| 1755 | 1755 | []
|
| 1756 | - (NoEpTok)
|
|
| 1756 | + (())
|
|
| 1757 | 1757 | []))
|
| 1758 | 1758 | (L
|
| 1759 | 1759 | (EpAnn
|
| ... | ... | @@ -108,7 +108,7 @@ |
| 108 | 108 | (Nothing)
|
| 109 | 109 | (ListNone)
|
| 110 | 110 | []
|
| 111 | - (NoEpTok)
|
|
| 111 | + (())
|
|
| 112 | 112 | []))
|
| 113 | 113 | (L
|
| 114 | 114 | (EpAnn
|
| ... | ... | @@ -99,7 +99,7 @@ |
| 99 | 99 | (Nothing)
|
| 100 | 100 | (ListNone)
|
| 101 | 101 | []
|
| 102 | - (NoEpTok)
|
|
| 102 | + (())
|
|
| 103 | 103 | []))
|
| 104 | 104 | (L
|
| 105 | 105 | (EpAnn
|
| ... | ... | @@ -74,7 +74,7 @@ |
| 74 | 74 | (Nothing)
|
| 75 | 75 | (ListNone)
|
| 76 | 76 | []
|
| 77 | - (NoEpTok)
|
|
| 77 | + (())
|
|
| 78 | 78 | []))
|
| 79 | 79 | (L
|
| 80 | 80 | (EpAnn
|
| ... | ... | @@ -207,7 +207,7 @@ |
| 207 | 207 | (Nothing)
|
| 208 | 208 | (ListNone)
|
| 209 | 209 | []
|
| 210 | - (NoEpTok)
|
|
| 210 | + (())
|
|
| 211 | 211 | []))
|
| 212 | 212 | (L
|
| 213 | 213 | (EpAnn
|
| ... | ... | @@ -330,7 +330,7 @@ |
| 330 | 330 | (Nothing)
|
| 331 | 331 | (ListNone)
|
| 332 | 332 | []
|
| 333 | - (NoEpTok)
|
|
| 333 | + (())
|
|
| 334 | 334 | []))
|
| 335 | 335 | (L
|
| 336 | 336 | (EpAnn
|
| ... | ... | @@ -525,7 +525,7 @@ |
| 525 | 525 | (Nothing)
|
| 526 | 526 | (ListNone)
|
| 527 | 527 | []
|
| 528 | - (NoEpTok)
|
|
| 528 | + (())
|
|
| 529 | 529 | []))
|
| 530 | 530 | (L
|
| 531 | 531 | (EpAnn
|
| ... | ... | @@ -646,7 +646,7 @@ |
| 646 | 646 | (Nothing)
|
| 647 | 647 | (ListNone)
|
| 648 | 648 | []
|
| 649 | - (NoEpTok)
|
|
| 649 | + (())
|
|
| 650 | 650 | []))
|
| 651 | 651 | (L
|
| 652 | 652 | (EpAnn
|
| ... | ... | @@ -763,7 +763,7 @@ |
| 763 | 763 | (Nothing)
|
| 764 | 764 | (ListNone)
|
| 765 | 765 | []
|
| 766 | - (NoEpTok)
|
|
| 766 | + (())
|
|
| 767 | 767 | []))
|
| 768 | 768 | (L
|
| 769 | 769 | (EpAnn
|
| ... | ... | @@ -555,7 +555,7 @@ |
| 555 | 555 | (Nothing)
|
| 556 | 556 | (ListNone)
|
| 557 | 557 | []
|
| 558 | - (NoEpTok)
|
|
| 558 | + (())
|
|
| 559 | 559 | []))
|
| 560 | 560 | (L
|
| 561 | 561 | (EpAnn
|
| ... | ... | @@ -1165,7 +1165,7 @@ |
| 1165 | 1165 | (Nothing)
|
| 1166 | 1166 | (ListNone)
|
| 1167 | 1167 | []
|
| 1168 | - (NoEpTok)
|
|
| 1168 | + (())
|
|
| 1169 | 1169 | []))
|
| 1170 | 1170 | (L
|
| 1171 | 1171 | (EpAnn
|
| ... | ... | @@ -2326,7 +2326,7 @@ instance ExactPrint (PatSynBind GhcPs GhcPs) where |
| 2326 | 2326 | getAnnotationEntry _ = NoEntryVal
|
| 2327 | 2327 | setAnnotationAnchor a _ _ _ = a
|
| 2328 | 2328 | |
| 2329 | - exact (PSB{ psb_ext = AnnPSB ap al ae
|
|
| 2329 | + exact (PSB{ psb_ext = AnnPSB ap al ae aw
|
|
| 2330 | 2330 | , psb_id = psyn, psb_args = details
|
| 2331 | 2331 | , psb_def = pat
|
| 2332 | 2332 | , psb_dir = dir }) = do
|
| ... | ... | @@ -2349,23 +2349,24 @@ instance ExactPrint (PatSynBind GhcPs GhcPs) where |
| 2349 | 2349 | ac' <- markEpToken ac
|
| 2350 | 2350 | return (psyn', RecCon (ao',ac') vs')
|
| 2351 | 2351 | |
| 2352 | - (al', ae', pat', dir') <-
|
|
| 2352 | + (al', ae', pat', dir', aw') <-
|
|
| 2353 | 2353 | case dir of
|
| 2354 | 2354 | Unidirectional -> do
|
| 2355 | 2355 | al' <- mapM markEpUniToken al
|
| 2356 | 2356 | pat' <- markAnnotated pat
|
| 2357 | - return (al', ae, pat', dir)
|
|
| 2357 | + return (al', ae, pat', dir, aw)
|
|
| 2358 | 2358 | ImplicitBidirectional -> do
|
| 2359 | 2359 | ae' <- mapM markEpToken ae
|
| 2360 | 2360 | pat' <- markAnnotated pat
|
| 2361 | - return (al, ae', pat', dir)
|
|
| 2361 | + return (al, ae', pat', dir, aw)
|
|
| 2362 | 2362 | ExplicitBidirectional mg -> do
|
| 2363 | 2363 | al' <- mapM markEpUniToken al
|
| 2364 | 2364 | pat' <- markAnnotated pat
|
| 2365 | + aw' <- mapM markEpToken aw
|
|
| 2365 | 2366 | mg' <- markAnnotated mg
|
| 2366 | - return (al', ae, pat', ExplicitBidirectional mg')
|
|
| 2367 | + return (al', ae, pat', ExplicitBidirectional mg', aw')
|
|
| 2367 | 2368 | |
| 2368 | - return (PSB{ psb_ext = AnnPSB ap' al' ae'
|
|
| 2369 | + return (PSB{ psb_ext = AnnPSB ap' al' ae' aw'
|
|
| 2369 | 2370 | , psb_id = psyn', psb_args = details'
|
| 2370 | 2371 | , psb_def = pat'
|
| 2371 | 2372 | , psb_dir = dir' })
|
| ... | ... | @@ -3249,11 +3250,10 @@ instance (Typeable body, |
| 3249 | 3250 | = MG (origin,an) (L (setAnchorEpa l anc ts cs) matches)
|
| 3250 | 3251 | |
| 3251 | 3252 | exact (MG (origin,an) (L l matches)) = do
|
| 3252 | - an0 <- markLensFun an lal_rest markEpToken -- 'where', only for PatSynBind
|
|
| 3253 | - (an1,matches') <- markAnnListA' an0 $ \a -> do
|
|
| 3253 | + (an0,matches') <- markAnnListA' an $ \a -> do
|
|
| 3254 | 3254 | m' <- markAnnotated matches
|
| 3255 | 3255 | return (a,m')
|
| 3256 | - return (MG (origin, an1) (L l matches'))
|
|
| 3256 | + return (MG (origin, an0) (L l matches'))
|
|
| 3257 | 3257 | |
| 3258 | 3258 | -- ---------------------------------------------------------------------
|
| 3259 | 3259 |