diff options
author | Alan Zimmerman <alan.zimm@gmail.com> | 2021-04-15 20:57:54 +0100 |
---|---|---|
committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2021-04-19 15:41:00 -0400 |
commit | 0619fb0fb14a98f04aac5f031f6566419fd27495 (patch) | |
tree | 912a13457224565a3e5d98ccb2fce33eacdec0b7 /testsuite/tests/printer | |
parent | 8b5e5b0524f614679a20ffaebab731c54dc6dee9 (diff) | |
download | haskell-0619fb0fb14a98f04aac5f031f6566419fd27495.tar.gz |
EPA: cleanups after the merge
Remove EpaAnn type synonym, rename EpaAnn' to EpaAnn.
Closes #19705
Updates haddock submodule
--
Change
data EpaAnchor = AR RealSrcSpan
| AD DeltaPos
To instead be
data EpaAnchor = AnchorReal RealSrcSpan
| AnchorDelta DeltaPos
Closes #19699
--
Change
data DeltaPos =
DP
{ deltaLine :: !Int,
deltaColumn :: !Int
}
To instead be
data DeltaPos
= SameLine { deltaColumn :: !Int }
| DifferentLine { deltaLine :: !Int, startColumn :: !Int }
Closes #19698
--
Also some clean-ups of unused parts of check-exact.
Diffstat (limited to 'testsuite/tests/printer')
-rw-r--r-- | testsuite/tests/printer/T18791.stderr | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/testsuite/tests/printer/T18791.stderr b/testsuite/tests/printer/T18791.stderr index 4787c0b8db..3ff58cc17e 100644 --- a/testsuite/tests/printer/T18791.stderr +++ b/testsuite/tests/printer/T18791.stderr @@ -1,6 +1,7 @@ ==================== Parser AST ==================== + (L { T18791.hs:1:1 } (HsModule @@ -9,8 +10,8 @@ { T18791.hs:1:1 } (UnchangedAnchor)) (AnnsModule - [(AddEpAnn AnnModule (AR { T18791.hs:2:1-6 })) - ,(AddEpAnn AnnWhere (AR { T18791.hs:2:15-19 }))] + [(AddEpAnn AnnModule (EpaSpan { T18791.hs:2:1-6 })) + ,(AddEpAnn AnnWhere (EpaSpan { T18791.hs:2:15-19 }))] (AnnList (Nothing) (Nothing) @@ -50,8 +51,8 @@ (Anchor { T18791.hs:(4,1)-(5,17) } (UnchangedAnchor)) - [(AddEpAnn AnnData (AR { T18791.hs:4:1-4 })) - ,(AddEpAnn AnnWhere (AR { T18791.hs:4:8-12 }))] + [(AddEpAnn AnnData (EpaSpan { T18791.hs:4:1-4 })) + ,(AddEpAnn AnnWhere (EpaSpan { T18791.hs:4:8-12 }))] (EpaComments [])) (L @@ -67,8 +68,8 @@ (Anchor { T18791.hs:(4,1)-(5,17) } (UnchangedAnchor)) - [(AddEpAnn AnnData (AR { T18791.hs:4:1-4 })) - ,(AddEpAnn AnnWhere (AR { T18791.hs:4:8-12 }))] + [(AddEpAnn AnnData (EpaSpan { T18791.hs:4:1-4 })) + ,(AddEpAnn AnnWhere (EpaSpan { T18791.hs:4:8-12 }))] (EpaComments [])) (DataType) @@ -82,7 +83,7 @@ (Anchor { T18791.hs:5:3-17 } (UnchangedAnchor)) - [(AddEpAnn AnnDcolon (AR { T18791.hs:5:7-8 }))] + [(AddEpAnn AnnDcolon (EpaSpan { T18791.hs:5:7-8 }))] (EpaComments [])) [(L @@ -105,7 +106,7 @@ (UnchangedAnchor)) (AnnListItem [(AddRarrowAnn - (AR { T18791.hs:5:14-15 }))]) + (EpaSpan { T18791.hs:5:14-15 }))]) (EpaComments [])) { T18791.hs:5:10-12 }) (HsTyVar |