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 | |
| 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')
9 files changed, 293 insertions, 293 deletions
diff --git a/testsuite/tests/haddock/should_compile_flag_haddock/T17544.stderr b/testsuite/tests/haddock/should_compile_flag_haddock/T17544.stderr index 7e34424807..db88734005 100644 --- a/testsuite/tests/haddock/should_compile_flag_haddock/T17544.stderr +++ b/testsuite/tests/haddock/should_compile_flag_haddock/T17544.stderr @@ -9,8 +9,8 @@ { T17544.hs:1:1 } (UnchangedAnchor)) (AnnsModule - [(AddEpAnn AnnModule (AR { T17544.hs:3:1-6 })) - ,(AddEpAnn AnnWhere (AR { T17544.hs:3:15-19 }))] + [(AddEpAnn AnnModule (EpaSpan { T17544.hs:3:1-6 })) + ,(AddEpAnn AnnWhere (EpaSpan { T17544.hs:3:15-19 }))] (AnnList (Nothing) (Nothing) @@ -51,8 +51,8 @@ (Anchor { T17544.hs:(5,1)-(6,16) } (UnchangedAnchor)) - [(AddEpAnn AnnClass (AR { T17544.hs:5:1-5 })) - ,(AddEpAnn AnnWhere (AR { T17544.hs:5:12-16 }))] + [(AddEpAnn AnnClass (EpaSpan { T17544.hs:5:1-5 })) + ,(AddEpAnn AnnWhere (EpaSpan { T17544.hs:5:12-16 }))] (EpaComments [])) (NoAnnSortKey) @@ -90,7 +90,7 @@ { T17544.hs:6:3-4 } (UnchangedAnchor)) (AnnSig - (AddEpAnn AnnDcolon (AR { T17544.hs:6:6-7 })) + (AddEpAnn AnnDcolon (EpaSpan { T17544.hs:6:6-7 })) []) (EpaComments [])) @@ -113,7 +113,7 @@ { T17544.hs:6:9 } (UnchangedAnchor)) (AddRarrowAnn - (AR { T17544.hs:6:11-12 })) + (EpaSpan { T17544.hs:6:11-12 })) (EpaComments [])) (HsUnrestrictedArrow @@ -178,8 +178,8 @@ (Anchor { T17544.hs:(9,1)-(10,16) } (UnchangedAnchor)) - [(AddEpAnn AnnClass (AR { T17544.hs:9:1-5 })) - ,(AddEpAnn AnnWhere (AR { T17544.hs:9:12-16 }))] + [(AddEpAnn AnnClass (EpaSpan { T17544.hs:9:1-5 })) + ,(AddEpAnn AnnWhere (EpaSpan { T17544.hs:9:12-16 }))] (EpaComments [])) (NoAnnSortKey) @@ -217,7 +217,7 @@ { T17544.hs:10:3-4 } (UnchangedAnchor)) (AnnSig - (AddEpAnn AnnDcolon (AR { T17544.hs:10:6-7 })) + (AddEpAnn AnnDcolon (EpaSpan { T17544.hs:10:6-7 })) []) (EpaComments [])) @@ -240,7 +240,7 @@ { T17544.hs:10:9 } (UnchangedAnchor)) (AddRarrowAnn - (AR { T17544.hs:10:11-12 })) + (EpaSpan { T17544.hs:10:11-12 })) (EpaComments [])) (HsUnrestrictedArrow @@ -301,8 +301,8 @@ (Anchor { T17544.hs:(13,1)-(14,16) } (UnchangedAnchor)) - [(AddEpAnn AnnClass (AR { T17544.hs:13:1-5 })) - ,(AddEpAnn AnnWhere (AR { T17544.hs:13:12-16 }))] + [(AddEpAnn AnnClass (EpaSpan { T17544.hs:13:1-5 })) + ,(AddEpAnn AnnWhere (EpaSpan { T17544.hs:13:12-16 }))] (EpaComments [])) (NoAnnSortKey) @@ -340,7 +340,7 @@ { T17544.hs:14:3-4 } (UnchangedAnchor)) (AnnSig - (AddEpAnn AnnDcolon (AR { T17544.hs:14:6-7 })) + (AddEpAnn AnnDcolon (EpaSpan { T17544.hs:14:6-7 })) []) (EpaComments [])) @@ -363,7 +363,7 @@ { T17544.hs:14:9 } (UnchangedAnchor)) (AddRarrowAnn - (AR { T17544.hs:14:11-12 })) + (EpaSpan { T17544.hs:14:11-12 })) (EpaComments [])) (HsUnrestrictedArrow @@ -427,8 +427,8 @@ (Anchor { T17544.hs:(17,1)-(20,16) } (UnchangedAnchor)) - [(AddEpAnn AnnClass (AR { T17544.hs:17:1-5 })) - ,(AddEpAnn AnnWhere (AR { T17544.hs:17:12-16 }))] + [(AddEpAnn AnnClass (EpaSpan { T17544.hs:17:1-5 })) + ,(AddEpAnn AnnWhere (EpaSpan { T17544.hs:17:12-16 }))] (EpaComments [])) (NoAnnSortKey) @@ -466,7 +466,7 @@ { T17544.hs:18:3-4 } (UnchangedAnchor)) (AnnSig - (AddEpAnn AnnDcolon (AR { T17544.hs:18:6-7 })) + (AddEpAnn AnnDcolon (EpaSpan { T17544.hs:18:6-7 })) []) (EpaComments [])) @@ -489,7 +489,7 @@ { T17544.hs:18:9 } (UnchangedAnchor)) (AddRarrowAnn - (AR { T17544.hs:18:11-12 })) + (EpaSpan { T17544.hs:18:11-12 })) (EpaComments [])) (HsUnrestrictedArrow @@ -532,7 +532,7 @@ { T17544.hs:20:3-4 } (UnchangedAnchor)) (AnnSig - (AddEpAnn AnnDcolon (AR { T17544.hs:20:6-7 })) + (AddEpAnn AnnDcolon (EpaSpan { T17544.hs:20:6-7 })) []) (EpaComments [])) @@ -555,7 +555,7 @@ { T17544.hs:20:9 } (UnchangedAnchor)) (AddRarrowAnn - (AR { T17544.hs:20:11-12 })) + (EpaSpan { T17544.hs:20:11-12 })) (EpaComments [])) (HsUnrestrictedArrow @@ -612,10 +612,10 @@ (Anchor { T17544.hs:22:1-30 } (UnchangedAnchor)) - [(AddEpAnn AnnClass (AR { T17544.hs:22:1-5 })) - ,(AddEpAnn AnnWhere (AR { T17544.hs:22:12-16 })) - ,(AddEpAnn AnnOpenC (AR { T17544.hs:22:18 })) - ,(AddEpAnn AnnCloseC (AR { T17544.hs:22:30 }))] + [(AddEpAnn AnnClass (EpaSpan { T17544.hs:22:1-5 })) + ,(AddEpAnn AnnWhere (EpaSpan { T17544.hs:22:12-16 })) + ,(AddEpAnn AnnOpenC (EpaSpan { T17544.hs:22:18 })) + ,(AddEpAnn AnnCloseC (EpaSpan { T17544.hs:22:30 }))] (EpaComments [])) (NoAnnSortKey) @@ -654,7 +654,7 @@ (Anchor { T17544.hs:22:20-28 } (UnchangedAnchor)) - [(AddEpAnn AnnData (AR { T17544.hs:22:20-23 }))] + [(AddEpAnn AnnData (EpaSpan { T17544.hs:22:20-23 }))] (EpaComments [])) (DataFamily) @@ -707,8 +707,8 @@ (Anchor { T17544.hs:23:1-8 } (UnchangedAnchor)) - [(AddEpAnn AnnInstance (AR { T17544.hs:23:1-8 })) - ,(AddEpAnn AnnWhere (AR { T17544.hs:23:17-21 }))] + [(AddEpAnn AnnInstance (EpaSpan { T17544.hs:23:1-8 })) + ,(AddEpAnn AnnWhere (EpaSpan { T17544.hs:23:17-21 }))] (EpaComments [])) (NoAnnSortKey)) @@ -789,8 +789,8 @@ (Anchor { T17544.hs:(24,3)-(25,18) } (UnchangedAnchor)) - [(AddEpAnn AnnData (AR { T17544.hs:24:3-6 })) - ,(AddEpAnn AnnWhere (AR { T17544.hs:24:15-19 }))] + [(AddEpAnn AnnData (EpaSpan { T17544.hs:24:3-6 })) + ,(AddEpAnn AnnWhere (EpaSpan { T17544.hs:24:15-19 }))] (EpaComments [])) (DataType) @@ -804,7 +804,7 @@ (Anchor { T17544.hs:25:5-18 } (UnchangedAnchor)) - [(AddEpAnn AnnDcolon (AR { T17544.hs:25:10-11 }))] + [(AddEpAnn AnnDcolon (EpaSpan { T17544.hs:25:10-11 }))] (EpaComments [])) [(L @@ -872,10 +872,10 @@ (Anchor { T17544.hs:28:1-30 } (UnchangedAnchor)) - [(AddEpAnn AnnClass (AR { T17544.hs:28:1-5 })) - ,(AddEpAnn AnnWhere (AR { T17544.hs:28:12-16 })) - ,(AddEpAnn AnnOpenC (AR { T17544.hs:28:18 })) - ,(AddEpAnn AnnCloseC (AR { T17544.hs:28:30 }))] + [(AddEpAnn AnnClass (EpaSpan { T17544.hs:28:1-5 })) + ,(AddEpAnn AnnWhere (EpaSpan { T17544.hs:28:12-16 })) + ,(AddEpAnn AnnOpenC (EpaSpan { T17544.hs:28:18 })) + ,(AddEpAnn AnnCloseC (EpaSpan { T17544.hs:28:30 }))] (EpaComments [])) (NoAnnSortKey) @@ -914,7 +914,7 @@ (Anchor { T17544.hs:28:20-28 } (UnchangedAnchor)) - [(AddEpAnn AnnData (AR { T17544.hs:28:20-23 }))] + [(AddEpAnn AnnData (EpaSpan { T17544.hs:28:20-23 }))] (EpaComments [])) (DataFamily) @@ -967,8 +967,8 @@ (Anchor { T17544.hs:29:1-8 } (UnchangedAnchor)) - [(AddEpAnn AnnInstance (AR { T17544.hs:29:1-8 })) - ,(AddEpAnn AnnWhere (AR { T17544.hs:29:17-21 }))] + [(AddEpAnn AnnInstance (EpaSpan { T17544.hs:29:1-8 })) + ,(AddEpAnn AnnWhere (EpaSpan { T17544.hs:29:17-21 }))] (EpaComments [])) (NoAnnSortKey)) @@ -1049,8 +1049,8 @@ (Anchor { T17544.hs:(30,3)-(31,18) } (UnchangedAnchor)) - [(AddEpAnn AnnData (AR { T17544.hs:30:3-6 })) - ,(AddEpAnn AnnWhere (AR { T17544.hs:30:15-19 }))] + [(AddEpAnn AnnData (EpaSpan { T17544.hs:30:3-6 })) + ,(AddEpAnn AnnWhere (EpaSpan { T17544.hs:30:15-19 }))] (EpaComments [])) (DataType) @@ -1064,7 +1064,7 @@ (Anchor { T17544.hs:31:5-18 } (UnchangedAnchor)) - [(AddEpAnn AnnDcolon (AR { T17544.hs:31:10-11 }))] + [(AddEpAnn AnnDcolon (EpaSpan { T17544.hs:31:10-11 }))] (EpaComments [])) [(L @@ -1132,10 +1132,10 @@ (Anchor { T17544.hs:34:1-30 } (UnchangedAnchor)) - [(AddEpAnn AnnClass (AR { T17544.hs:34:1-5 })) - ,(AddEpAnn AnnWhere (AR { T17544.hs:34:12-16 })) - ,(AddEpAnn AnnOpenC (AR { T17544.hs:34:18 })) - ,(AddEpAnn AnnCloseC (AR { T17544.hs:34:30 }))] + [(AddEpAnn AnnClass (EpaSpan { T17544.hs:34:1-5 })) + ,(AddEpAnn AnnWhere (EpaSpan { T17544.hs:34:12-16 })) + ,(AddEpAnn AnnOpenC (EpaSpan { T17544.hs:34:18 })) + ,(AddEpAnn AnnCloseC (EpaSpan { T17544.hs:34:30 }))] (EpaComments [])) (NoAnnSortKey) @@ -1174,7 +1174,7 @@ (Anchor { T17544.hs:34:20-28 } (UnchangedAnchor)) - [(AddEpAnn AnnData (AR { T17544.hs:34:20-23 }))] + [(AddEpAnn AnnData (EpaSpan { T17544.hs:34:20-23 }))] (EpaComments [])) (DataFamily) @@ -1227,8 +1227,8 @@ (Anchor { T17544.hs:35:1-8 } (UnchangedAnchor)) - [(AddEpAnn AnnInstance (AR { T17544.hs:35:1-8 })) - ,(AddEpAnn AnnWhere (AR { T17544.hs:35:17-21 }))] + [(AddEpAnn AnnInstance (EpaSpan { T17544.hs:35:1-8 })) + ,(AddEpAnn AnnWhere (EpaSpan { T17544.hs:35:17-21 }))] (EpaComments [])) (NoAnnSortKey)) @@ -1309,8 +1309,8 @@ (Anchor { T17544.hs:(36,3)-(37,18) } (UnchangedAnchor)) - [(AddEpAnn AnnData (AR { T17544.hs:36:3-6 })) - ,(AddEpAnn AnnWhere (AR { T17544.hs:36:15-19 }))] + [(AddEpAnn AnnData (EpaSpan { T17544.hs:36:3-6 })) + ,(AddEpAnn AnnWhere (EpaSpan { T17544.hs:36:15-19 }))] (EpaComments [])) (DataType) @@ -1324,7 +1324,7 @@ (Anchor { T17544.hs:37:5-18 } (UnchangedAnchor)) - [(AddEpAnn AnnDcolon (AR { T17544.hs:37:10-11 }))] + [(AddEpAnn AnnDcolon (EpaSpan { T17544.hs:37:10-11 }))] (EpaComments [])) [(L @@ -1392,10 +1392,10 @@ (Anchor { T17544.hs:40:1-30 } (UnchangedAnchor)) - [(AddEpAnn AnnClass (AR { T17544.hs:40:1-5 })) - ,(AddEpAnn AnnWhere (AR { T17544.hs:40:12-16 })) - ,(AddEpAnn AnnOpenC (AR { T17544.hs:40:18 })) - ,(AddEpAnn AnnCloseC (AR { T17544.hs:40:30 }))] + [(AddEpAnn AnnClass (EpaSpan { T17544.hs:40:1-5 })) + ,(AddEpAnn AnnWhere (EpaSpan { T17544.hs:40:12-16 })) + ,(AddEpAnn AnnOpenC (EpaSpan { T17544.hs:40:18 })) + ,(AddEpAnn AnnCloseC (EpaSpan { T17544.hs:40:30 }))] (EpaComments [])) (NoAnnSortKey) @@ -1434,7 +1434,7 @@ (Anchor { T17544.hs:40:20-28 } (UnchangedAnchor)) - [(AddEpAnn AnnData (AR { T17544.hs:40:20-23 }))] + [(AddEpAnn AnnData (EpaSpan { T17544.hs:40:20-23 }))] (EpaComments [])) (DataFamily) @@ -1487,8 +1487,8 @@ (Anchor { T17544.hs:41:1-8 } (UnchangedAnchor)) - [(AddEpAnn AnnInstance (AR { T17544.hs:41:1-8 })) - ,(AddEpAnn AnnWhere (AR { T17544.hs:41:17-21 }))] + [(AddEpAnn AnnInstance (EpaSpan { T17544.hs:41:1-8 })) + ,(AddEpAnn AnnWhere (EpaSpan { T17544.hs:41:17-21 }))] (EpaComments [])) (NoAnnSortKey)) @@ -1569,8 +1569,8 @@ (Anchor { T17544.hs:(42,3)-(43,18) } (UnchangedAnchor)) - [(AddEpAnn AnnData (AR { T17544.hs:42:3-6 })) - ,(AddEpAnn AnnWhere (AR { T17544.hs:42:15-19 }))] + [(AddEpAnn AnnData (EpaSpan { T17544.hs:42:3-6 })) + ,(AddEpAnn AnnWhere (EpaSpan { T17544.hs:42:15-19 }))] (EpaComments [])) (DataType) @@ -1584,7 +1584,7 @@ (Anchor { T17544.hs:43:5-18 } (UnchangedAnchor)) - [(AddEpAnn AnnDcolon (AR { T17544.hs:43:10-11 }))] + [(AddEpAnn AnnDcolon (EpaSpan { T17544.hs:43:10-11 }))] (EpaComments [])) [(L @@ -1652,10 +1652,10 @@ (Anchor { T17544.hs:46:1-30 } (UnchangedAnchor)) - [(AddEpAnn AnnClass (AR { T17544.hs:46:1-5 })) - ,(AddEpAnn AnnWhere (AR { T17544.hs:46:12-16 })) - ,(AddEpAnn AnnOpenC (AR { T17544.hs:46:18 })) - ,(AddEpAnn AnnCloseC (AR { T17544.hs:46:30 }))] + [(AddEpAnn AnnClass (EpaSpan { T17544.hs:46:1-5 })) + ,(AddEpAnn AnnWhere (EpaSpan { T17544.hs:46:12-16 })) + ,(AddEpAnn AnnOpenC (EpaSpan { T17544.hs:46:18 })) + ,(AddEpAnn AnnCloseC (EpaSpan { T17544.hs:46:30 }))] (EpaComments [])) (NoAnnSortKey) @@ -1694,7 +1694,7 @@ (Anchor { T17544.hs:46:20-28 } (UnchangedAnchor)) - [(AddEpAnn AnnData (AR { T17544.hs:46:20-23 }))] + [(AddEpAnn AnnData (EpaSpan { T17544.hs:46:20-23 }))] (EpaComments [])) (DataFamily) @@ -1747,8 +1747,8 @@ (Anchor { T17544.hs:47:1-8 } (UnchangedAnchor)) - [(AddEpAnn AnnInstance (AR { T17544.hs:47:1-8 })) - ,(AddEpAnn AnnWhere (AR { T17544.hs:47:17-21 }))] + [(AddEpAnn AnnInstance (EpaSpan { T17544.hs:47:1-8 })) + ,(AddEpAnn AnnWhere (EpaSpan { T17544.hs:47:17-21 }))] (EpaComments [])) (NoAnnSortKey)) @@ -1829,8 +1829,8 @@ (Anchor { T17544.hs:(48,3)-(49,18) } (UnchangedAnchor)) - [(AddEpAnn AnnData (AR { T17544.hs:48:3-6 })) - ,(AddEpAnn AnnWhere (AR { T17544.hs:48:15-19 }))] + [(AddEpAnn AnnData (EpaSpan { T17544.hs:48:3-6 })) + ,(AddEpAnn AnnWhere (EpaSpan { T17544.hs:48:15-19 }))] (EpaComments [])) (DataType) @@ -1844,7 +1844,7 @@ (Anchor { T17544.hs:49:5-18 } (UnchangedAnchor)) - [(AddEpAnn AnnDcolon (AR { T17544.hs:49:10-11 }))] + [(AddEpAnn AnnDcolon (EpaSpan { T17544.hs:49:10-11 }))] (EpaComments [])) [(L @@ -1912,10 +1912,10 @@ (Anchor { T17544.hs:52:1-32 } (UnchangedAnchor)) - [(AddEpAnn AnnClass (AR { T17544.hs:52:1-5 })) - ,(AddEpAnn AnnWhere (AR { T17544.hs:52:13-17 })) - ,(AddEpAnn AnnOpenC (AR { T17544.hs:52:19 })) - ,(AddEpAnn AnnCloseC (AR { T17544.hs:52:32 }))] + [(AddEpAnn AnnClass (EpaSpan { T17544.hs:52:1-5 })) + ,(AddEpAnn AnnWhere (EpaSpan { T17544.hs:52:13-17 })) + ,(AddEpAnn AnnOpenC (EpaSpan { T17544.hs:52:19 })) + ,(AddEpAnn AnnCloseC (EpaSpan { T17544.hs:52:32 }))] (EpaComments [])) (NoAnnSortKey) @@ -1954,7 +1954,7 @@ (Anchor { T17544.hs:52:21-30 } (UnchangedAnchor)) - [(AddEpAnn AnnData (AR { T17544.hs:52:21-24 }))] + [(AddEpAnn AnnData (EpaSpan { T17544.hs:52:21-24 }))] (EpaComments [])) (DataFamily) @@ -2007,8 +2007,8 @@ (Anchor { T17544.hs:53:1-8 } (UnchangedAnchor)) - [(AddEpAnn AnnInstance (AR { T17544.hs:53:1-8 })) - ,(AddEpAnn AnnWhere (AR { T17544.hs:53:18-22 }))] + [(AddEpAnn AnnInstance (EpaSpan { T17544.hs:53:1-8 })) + ,(AddEpAnn AnnWhere (EpaSpan { T17544.hs:53:18-22 }))] (EpaComments [])) (NoAnnSortKey)) @@ -2089,8 +2089,8 @@ (Anchor { T17544.hs:(54,3)-(55,20) } (UnchangedAnchor)) - [(AddEpAnn AnnData (AR { T17544.hs:54:3-6 })) - ,(AddEpAnn AnnWhere (AR { T17544.hs:54:16-20 }))] + [(AddEpAnn AnnData (EpaSpan { T17544.hs:54:3-6 })) + ,(AddEpAnn AnnWhere (EpaSpan { T17544.hs:54:16-20 }))] (EpaComments [])) (DataType) @@ -2104,7 +2104,7 @@ (Anchor { T17544.hs:55:5-20 } (UnchangedAnchor)) - [(AddEpAnn AnnDcolon (AR { T17544.hs:55:11-12 }))] + [(AddEpAnn AnnDcolon (EpaSpan { T17544.hs:55:11-12 }))] (EpaComments [])) [(L diff --git a/testsuite/tests/haddock/should_compile_flag_haddock/T17544_kw.stderr b/testsuite/tests/haddock/should_compile_flag_haddock/T17544_kw.stderr index b00f2efdeb..6d58a727af 100644 --- a/testsuite/tests/haddock/should_compile_flag_haddock/T17544_kw.stderr +++ b/testsuite/tests/haddock/should_compile_flag_haddock/T17544_kw.stderr @@ -9,8 +9,8 @@ { T17544_kw.hs:1:1 } (UnchangedAnchor)) (AnnsModule - [(AddEpAnn AnnModule (AR { T17544_kw.hs:11:1-6 })) - ,(AddEpAnn AnnWhere (AR { T17544_kw.hs:13:13-17 }))] + [(AddEpAnn AnnModule (EpaSpan { T17544_kw.hs:11:1-6 })) + ,(AddEpAnn AnnWhere (EpaSpan { T17544_kw.hs:13:13-17 }))] (AnnList (Nothing) (Nothing) @@ -50,8 +50,8 @@ (Anchor { T17544_kw.hs:(15,1)-(16,20) } (UnchangedAnchor)) - [(AddEpAnn AnnData (AR { T17544_kw.hs:15:1-4 })) - ,(AddEpAnn AnnWhere (AR { T17544_kw.hs:16:3-7 }))] + [(AddEpAnn AnnData (EpaSpan { T17544_kw.hs:15:1-4 })) + ,(AddEpAnn AnnWhere (EpaSpan { T17544_kw.hs:16:3-7 }))] (EpaComments [])) (L @@ -67,8 +67,8 @@ (Anchor { T17544_kw.hs:(15,1)-(16,20) } (UnchangedAnchor)) - [(AddEpAnn AnnData (AR { T17544_kw.hs:15:1-4 })) - ,(AddEpAnn AnnWhere (AR { T17544_kw.hs:16:3-7 }))] + [(AddEpAnn AnnData (EpaSpan { T17544_kw.hs:15:1-4 })) + ,(AddEpAnn AnnWhere (EpaSpan { T17544_kw.hs:16:3-7 }))] (EpaComments [])) (DataType) @@ -82,7 +82,7 @@ (Anchor { T17544_kw.hs:16:9-20 } (UnchangedAnchor)) - [(AddEpAnn AnnDcolon (AR { T17544_kw.hs:16:15-16 }))] + [(AddEpAnn AnnDcolon (EpaSpan { T17544_kw.hs:16:15-16 }))] (EpaComments [])) [(L @@ -133,8 +133,8 @@ (Anchor { T17544_kw.hs:(18,1)-(19,26) } (UnchangedAnchor)) - [(AddEpAnn AnnNewtype (AR { T17544_kw.hs:18:1-7 })) - ,(AddEpAnn AnnWhere (AR { T17544_kw.hs:19:3-7 }))] + [(AddEpAnn AnnNewtype (EpaSpan { T17544_kw.hs:18:1-7 })) + ,(AddEpAnn AnnWhere (EpaSpan { T17544_kw.hs:19:3-7 }))] (EpaComments [])) (L @@ -150,8 +150,8 @@ (Anchor { T17544_kw.hs:(18,1)-(19,26) } (UnchangedAnchor)) - [(AddEpAnn AnnNewtype (AR { T17544_kw.hs:18:1-7 })) - ,(AddEpAnn AnnWhere (AR { T17544_kw.hs:19:3-7 }))] + [(AddEpAnn AnnNewtype (EpaSpan { T17544_kw.hs:18:1-7 })) + ,(AddEpAnn AnnWhere (EpaSpan { T17544_kw.hs:19:3-7 }))] (EpaComments [])) (NewType) @@ -165,7 +165,7 @@ (Anchor { T17544_kw.hs:19:9-26 } (UnchangedAnchor)) - [(AddEpAnn AnnDcolon (AR { T17544_kw.hs:19:15-16 }))] + [(AddEpAnn AnnDcolon (EpaSpan { T17544_kw.hs:19:15-16 }))] (EpaComments [])) [(L @@ -188,7 +188,7 @@ (UnchangedAnchor)) (AnnListItem [(AddRarrowAnn - (AR { T17544_kw.hs:19:21-22 }))]) + (EpaSpan { T17544_kw.hs:19:21-22 }))]) (EpaComments [])) { T17544_kw.hs:19:18-19 }) (HsTupleTy @@ -198,8 +198,8 @@ (UnchangedAnchor)) (AnnParen (AnnParens) - (AR { T17544_kw.hs:19:18 }) - (AR { T17544_kw.hs:19:19 })) + (EpaSpan { T17544_kw.hs:19:18 }) + (EpaSpan { T17544_kw.hs:19:19 })) (EpaComments [])) (HsBoxedOrConstraintTuple) @@ -242,8 +242,8 @@ (Anchor { T17544_kw.hs:(21,1)-(24,18) } (UnchangedAnchor)) - [(AddEpAnn AnnClass (AR { T17544_kw.hs:21:1-5 })) - ,(AddEpAnn AnnWhere (AR { T17544_kw.hs:23:3-7 }))] + [(AddEpAnn AnnClass (EpaSpan { T17544_kw.hs:21:1-5 })) + ,(AddEpAnn AnnWhere (EpaSpan { T17544_kw.hs:23:3-7 }))] (EpaComments [])) (NoAnnSortKey) @@ -281,7 +281,7 @@ { T17544_kw.hs:24:5-13 } (UnchangedAnchor)) (AnnSig - (AddEpAnn AnnDcolon (AR { T17544_kw.hs:24:15-16 })) + (AddEpAnn AnnDcolon (EpaSpan { T17544_kw.hs:24:15-16 })) []) (EpaComments [])) diff --git a/testsuite/tests/module/mod185.stderr b/testsuite/tests/module/mod185.stderr index bc428b5d0b..62427a5746 100644 --- a/testsuite/tests/module/mod185.stderr +++ b/testsuite/tests/module/mod185.stderr @@ -37,11 +37,11 @@ { mod185.hs:3:1-6 } (UnchangedAnchor)) (EpAnnImportDecl - (AR { mod185.hs:3:1-6 }) + (EpaSpan { mod185.hs:3:1-6 }) (Nothing) (Nothing) (Just - (AR { mod185.hs:3:16-24 })) + (EpaSpan { mod185.hs:3:16-24 })) (Nothing) (Nothing)) (EpaComments @@ -107,7 +107,7 @@ (UnchangedAnchor)) (GrhsAnn (Nothing) - (AddEpAnn AnnEqual (AR { mod185.hs:5:6 }))) + (AddEpAnn AnnEqual (EpaSpan { mod185.hs:5:6 }))) (EpaComments [])) [] diff --git a/testsuite/tests/parser/should_compile/DumpParsedAst.stderr b/testsuite/tests/parser/should_compile/DumpParsedAst.stderr index 332e6e4822..d4956a81e4 100644 --- a/testsuite/tests/parser/should_compile/DumpParsedAst.stderr +++ b/testsuite/tests/parser/should_compile/DumpParsedAst.stderr @@ -9,8 +9,8 @@ { DumpParsedAst.hs:1:1 } (UnchangedAnchor)) (AnnsModule - [(AddEpAnn AnnModule (AR { DumpParsedAst.hs:5:1-6 })) - ,(AddEpAnn AnnWhere (AR { DumpParsedAst.hs:5:22-26 }))] + [(AddEpAnn AnnModule (EpaSpan { DumpParsedAst.hs:5:1-6 })) + ,(AddEpAnn AnnWhere (EpaSpan { DumpParsedAst.hs:5:22-26 }))] (AnnList (Nothing) (Nothing) @@ -41,7 +41,7 @@ { DumpParsedAst.hs:6:1-6 } (UnchangedAnchor)) (EpAnnImportDecl - (AR { DumpParsedAst.hs:6:1-6 }) + (EpaSpan { DumpParsedAst.hs:6:1-6 }) (Nothing) (Nothing) (Nothing) @@ -76,8 +76,8 @@ (Anchor { DumpParsedAst.hs:8:1-30 } (UnchangedAnchor)) - [(AddEpAnn AnnData (AR { DumpParsedAst.hs:8:1-4 })) - ,(AddEpAnn AnnEqual (AR { DumpParsedAst.hs:8:12 }))] + [(AddEpAnn AnnData (EpaSpan { DumpParsedAst.hs:8:1-4 })) + ,(AddEpAnn AnnEqual (EpaSpan { DumpParsedAst.hs:8:12 }))] (EpaComments [])) (L @@ -93,8 +93,8 @@ (Anchor { DumpParsedAst.hs:8:1-30 } (UnchangedAnchor)) - [(AddEpAnn AnnData (AR { DumpParsedAst.hs:8:1-4 })) - ,(AddEpAnn AnnEqual (AR { DumpParsedAst.hs:8:12 }))] + [(AddEpAnn AnnData (EpaSpan { DumpParsedAst.hs:8:1-4 })) + ,(AddEpAnn AnnEqual (EpaSpan { DumpParsedAst.hs:8:12 }))] (EpaComments [])) (DataType) @@ -108,7 +108,7 @@ (UnchangedAnchor)) (AnnListItem [(AddVbarAnn - (AR { DumpParsedAst.hs:8:19 }))]) + (EpaSpan { DumpParsedAst.hs:8:19 }))]) (EpaComments [])) { DumpParsedAst.hs:8:14-17 }) (ConDeclH98 @@ -188,12 +188,12 @@ (Anchor { DumpParsedAst.hs:10:1-45 } (UnchangedAnchor)) - [(AddEpAnn AnnType (AR { DumpParsedAst.hs:10:1-4 })) - ,(AddEpAnn AnnFamily (AR { DumpParsedAst.hs:10:6-11 })) - ,(AddEpAnn AnnDcolon (AR { DumpParsedAst.hs:10:32-33 })) - ,(AddEpAnn AnnWhere (AR { DumpParsedAst.hs:10:41-45 })) - ,(AddEpAnn AnnCloseP (AR { DumpParsedAst.hs:10:30 })) - ,(AddEpAnn AnnOpenP (AR { DumpParsedAst.hs:10:20 }))] + [(AddEpAnn AnnType (EpaSpan { DumpParsedAst.hs:10:1-4 })) + ,(AddEpAnn AnnFamily (EpaSpan { DumpParsedAst.hs:10:6-11 })) + ,(AddEpAnn AnnDcolon (EpaSpan { DumpParsedAst.hs:10:32-33 })) + ,(AddEpAnn AnnWhere (EpaSpan { DumpParsedAst.hs:10:41-45 })) + ,(AddEpAnn AnnCloseP (EpaSpan { DumpParsedAst.hs:10:30 })) + ,(AddEpAnn AnnOpenP (EpaSpan { DumpParsedAst.hs:10:20 }))] (EpaComments [])) (ClosedTypeFamily @@ -205,7 +205,7 @@ (Anchor { DumpParsedAst.hs:11:3-36 } (UnchangedAnchor)) - [(AddEpAnn AnnEqual (AR { DumpParsedAst.hs:11:19 }))] + [(AddEpAnn AnnEqual (EpaSpan { DumpParsedAst.hs:11:19 }))] (EpaComments [])) (L @@ -224,8 +224,8 @@ (UnchangedAnchor)) (AnnParen (AnnParens) - (AR { DumpParsedAst.hs:11:10 }) - (AR { DumpParsedAst.hs:11:17 })) + (EpaSpan { DumpParsedAst.hs:11:10 }) + (EpaSpan { DumpParsedAst.hs:11:17 })) (EpaComments [])) (L @@ -295,8 +295,8 @@ (UnchangedAnchor)) (AnnParen (AnnParens) - (AR { DumpParsedAst.hs:11:26 }) - (AR { DumpParsedAst.hs:11:36 })) + (EpaSpan { DumpParsedAst.hs:11:26 }) + (EpaSpan { DumpParsedAst.hs:11:36 })) (EpaComments [])) (L @@ -340,7 +340,7 @@ (Anchor { DumpParsedAst.hs:12:3-24 } (UnchangedAnchor)) - [(AddEpAnn AnnEqual (AR { DumpParsedAst.hs:12:19 }))] + [(AddEpAnn AnnEqual (EpaSpan { DumpParsedAst.hs:12:19 }))] (EpaComments [])) (L @@ -357,9 +357,9 @@ (Anchor { DumpParsedAst.hs:12:10 } (UnchangedAnchor)) - [(AddEpAnn AnnSimpleQuote (AR { DumpParsedAst.hs:12:10 })) - ,(AddEpAnn AnnOpenS (AR { DumpParsedAst.hs:12:11 })) - ,(AddEpAnn AnnCloseS (AR { DumpParsedAst.hs:12:12 }))] + [(AddEpAnn AnnSimpleQuote (EpaSpan { DumpParsedAst.hs:12:10 })) + ,(AddEpAnn AnnOpenS (EpaSpan { DumpParsedAst.hs:12:11 })) + ,(AddEpAnn AnnCloseS (EpaSpan { DumpParsedAst.hs:12:12 }))] (EpaComments [])) (IsPromoted) @@ -394,9 +394,9 @@ (Anchor { DumpParsedAst.hs:10:20-30 } (UnchangedAnchor)) - [(AddEpAnn AnnDcolon (AR { DumpParsedAst.hs:10:24-25 })) - ,(AddEpAnn AnnOpenP (AR { DumpParsedAst.hs:10:20 })) - ,(AddEpAnn AnnCloseP (AR { DumpParsedAst.hs:10:30 }))] + [(AddEpAnn AnnDcolon (EpaSpan { DumpParsedAst.hs:10:24-25 })) + ,(AddEpAnn AnnOpenP (EpaSpan { DumpParsedAst.hs:10:20 })) + ,(AddEpAnn AnnCloseP (EpaSpan { DumpParsedAst.hs:10:30 }))] (EpaComments [])) (()) @@ -413,8 +413,8 @@ (UnchangedAnchor)) (AnnParen (AnnParensSquare) - (AR { DumpParsedAst.hs:10:27 }) - (AR { DumpParsedAst.hs:10:29 })) + (EpaSpan { DumpParsedAst.hs:10:27 }) + (EpaSpan { DumpParsedAst.hs:10:29 })) (EpaComments [])) (L @@ -469,10 +469,10 @@ (Anchor { DumpParsedAst.hs:15:1-29 } (UnchangedAnchor)) - [(AddEpAnn AnnData (AR { DumpParsedAst.hs:15:1-4 })) - ,(AddEpAnn AnnEqual (AR { DumpParsedAst.hs:15:19 })) - ,(AddEpAnn AnnCloseP (AR { DumpParsedAst.hs:15:17 })) - ,(AddEpAnn AnnOpenP (AR { DumpParsedAst.hs:15:10 }))] + [(AddEpAnn AnnData (EpaSpan { DumpParsedAst.hs:15:1-4 })) + ,(AddEpAnn AnnEqual (EpaSpan { DumpParsedAst.hs:15:19 })) + ,(AddEpAnn AnnCloseP (EpaSpan { DumpParsedAst.hs:15:17 })) + ,(AddEpAnn AnnOpenP (EpaSpan { DumpParsedAst.hs:15:10 }))] (EpaComments [])) (L @@ -503,9 +503,9 @@ (Anchor { DumpParsedAst.hs:15:10-17 } (UnchangedAnchor)) - [(AddEpAnn AnnDcolon (AR { DumpParsedAst.hs:15:13-14 })) - ,(AddEpAnn AnnOpenP (AR { DumpParsedAst.hs:15:10 })) - ,(AddEpAnn AnnCloseP (AR { DumpParsedAst.hs:15:17 }))] + [(AddEpAnn AnnDcolon (EpaSpan { DumpParsedAst.hs:15:13-14 })) + ,(AddEpAnn AnnOpenP (EpaSpan { DumpParsedAst.hs:15:10 })) + ,(AddEpAnn AnnCloseP (EpaSpan { DumpParsedAst.hs:15:17 }))] (EpaComments [])) (()) @@ -534,10 +534,10 @@ (Anchor { DumpParsedAst.hs:15:1-29 } (UnchangedAnchor)) - [(AddEpAnn AnnData (AR { DumpParsedAst.hs:15:1-4 })) - ,(AddEpAnn AnnEqual (AR { DumpParsedAst.hs:15:19 })) - ,(AddEpAnn AnnCloseP (AR { DumpParsedAst.hs:15:17 })) - ,(AddEpAnn AnnOpenP (AR { DumpParsedAst.hs:15:10 }))] + [(AddEpAnn AnnData (EpaSpan { DumpParsedAst.hs:15:1-4 })) + ,(AddEpAnn AnnEqual (EpaSpan { DumpParsedAst.hs:15:19 })) + ,(AddEpAnn AnnCloseP (EpaSpan { DumpParsedAst.hs:15:17 })) + ,(AddEpAnn AnnOpenP (EpaSpan { DumpParsedAst.hs:15:10 }))] (EpaComments [])) (DataType) @@ -576,8 +576,8 @@ (UnchangedAnchor)) (AnnParen (AnnParens) - (AR { DumpParsedAst.hs:15:25 }) - (AR { DumpParsedAst.hs:15:29 })) + (EpaSpan { DumpParsedAst.hs:15:25 }) + (EpaSpan { DumpParsedAst.hs:15:29 })) (EpaComments [])) (L @@ -634,14 +634,14 @@ (Anchor { DumpParsedAst.hs:17:1-54 } (UnchangedAnchor)) - [(AddEpAnn AnnType (AR { DumpParsedAst.hs:17:1-4 })) - ,(AddEpAnn AnnFamily (AR { DumpParsedAst.hs:17:6-11 })) - ,(AddEpAnn AnnDcolon (AR { DumpParsedAst.hs:17:42-43 })) - ,(AddEpAnn AnnWhere (AR { DumpParsedAst.hs:17:50-54 })) - ,(AddEpAnn AnnCloseP (AR { DumpParsedAst.hs:17:23 })) - ,(AddEpAnn AnnOpenP (AR { DumpParsedAst.hs:17:16 })) - ,(AddEpAnn AnnCloseP (AR { DumpParsedAst.hs:17:40 })) - ,(AddEpAnn AnnOpenP (AR { DumpParsedAst.hs:17:25 }))] + [(AddEpAnn AnnType (EpaSpan { DumpParsedAst.hs:17:1-4 })) + ,(AddEpAnn AnnFamily (EpaSpan { DumpParsedAst.hs:17:6-11 })) + ,(AddEpAnn AnnDcolon (EpaSpan { DumpParsedAst.hs:17:42-43 })) + ,(AddEpAnn AnnWhere (EpaSpan { DumpParsedAst.hs:17:50-54 })) + ,(AddEpAnn AnnCloseP (EpaSpan { DumpParsedAst.hs:17:23 })) + ,(AddEpAnn AnnOpenP (EpaSpan { DumpParsedAst.hs:17:16 })) + ,(AddEpAnn AnnCloseP (EpaSpan { DumpParsedAst.hs:17:40 })) + ,(AddEpAnn AnnOpenP (EpaSpan { DumpParsedAst.hs:17:25 }))] (EpaComments [])) (ClosedTypeFamily @@ -653,7 +653,7 @@ (Anchor { DumpParsedAst.hs:18:3-30 } (UnchangedAnchor)) - [(AddEpAnn AnnEqual (AR { DumpParsedAst.hs:18:17 }))] + [(AddEpAnn AnnEqual (EpaSpan { DumpParsedAst.hs:18:17 }))] (EpaComments [])) (L @@ -798,9 +798,9 @@ (Anchor { DumpParsedAst.hs:17:16-23 } (UnchangedAnchor)) - [(AddEpAnn AnnDcolon (AR { DumpParsedAst.hs:17:19-20 })) - ,(AddEpAnn AnnOpenP (AR { DumpParsedAst.hs:17:16 })) - ,(AddEpAnn AnnCloseP (AR { DumpParsedAst.hs:17:23 }))] + [(AddEpAnn AnnDcolon (EpaSpan { DumpParsedAst.hs:17:19-20 })) + ,(AddEpAnn AnnOpenP (EpaSpan { DumpParsedAst.hs:17:16 })) + ,(AddEpAnn AnnCloseP (EpaSpan { DumpParsedAst.hs:17:23 }))] (EpaComments [])) (()) @@ -830,9 +830,9 @@ (Anchor { DumpParsedAst.hs:17:25-40 } (UnchangedAnchor)) - [(AddEpAnn AnnDcolon (AR { DumpParsedAst.hs:17:28-29 })) - ,(AddEpAnn AnnOpenP (AR { DumpParsedAst.hs:17:25 })) - ,(AddEpAnn AnnCloseP (AR { DumpParsedAst.hs:17:40 }))] + [(AddEpAnn AnnDcolon (EpaSpan { DumpParsedAst.hs:17:28-29 })) + ,(AddEpAnn AnnOpenP (EpaSpan { DumpParsedAst.hs:17:25 })) + ,(AddEpAnn AnnCloseP (EpaSpan { DumpParsedAst.hs:17:40 }))] (EpaComments [])) (()) @@ -848,7 +848,7 @@ { DumpParsedAst.hs:17:31 } (UnchangedAnchor)) (AddRarrowAnn - (AR { DumpParsedAst.hs:17:33-34 })) + (EpaSpan { DumpParsedAst.hs:17:33-34 })) (EpaComments [])) (HsUnrestrictedArrow @@ -954,7 +954,7 @@ (UnchangedAnchor)) (GrhsAnn (Nothing) - (AddEpAnn AnnEqual (AR { DumpParsedAst.hs:20:6 }))) + (AddEpAnn AnnEqual (EpaSpan { DumpParsedAst.hs:20:6 }))) (EpaComments [])) [] @@ -994,4 +994,4 @@ (FromSource)) [])))] (Nothing) - (Nothing))) + (Nothing)))
\ No newline at end of file diff --git a/testsuite/tests/parser/should_compile/DumpRenamedAst.stderr b/testsuite/tests/parser/should_compile/DumpRenamedAst.stderr index f131c08880..c41d01d452 100644 --- a/testsuite/tests/parser/should_compile/DumpRenamedAst.stderr +++ b/testsuite/tests/parser/should_compile/DumpRenamedAst.stderr @@ -119,7 +119,7 @@ (UnchangedAnchor)) (AnnListItem [(AddVbarAnn - (AR { DumpRenamedAst.hs:10:19 }))]) + (EpaSpan { DumpRenamedAst.hs:10:19 }))]) (EpaComments [])) { DumpRenamedAst.hs:10:14-17 }) (ConDeclH98 @@ -293,9 +293,9 @@ (Anchor { DumpRenamedAst.hs:12:20-30 } (UnchangedAnchor)) - [(AddEpAnn AnnDcolon (AR { DumpRenamedAst.hs:12:24-25 })) - ,(AddEpAnn AnnOpenP (AR { DumpRenamedAst.hs:12:20 })) - ,(AddEpAnn AnnCloseP (AR { DumpRenamedAst.hs:12:30 }))] + [(AddEpAnn AnnDcolon (EpaSpan { DumpRenamedAst.hs:12:24-25 })) + ,(AddEpAnn AnnOpenP (EpaSpan { DumpRenamedAst.hs:12:20 })) + ,(AddEpAnn AnnCloseP (EpaSpan { DumpRenamedAst.hs:12:30 }))] (EpaComments [])) (()) @@ -311,8 +311,8 @@ (UnchangedAnchor)) (AnnParen (AnnParensSquare) - (AR { DumpRenamedAst.hs:12:27 }) - (AR { DumpRenamedAst.hs:12:29 })) + (EpaSpan { DumpRenamedAst.hs:12:27 }) + (EpaSpan { DumpRenamedAst.hs:12:29 })) (EpaComments [])) (L @@ -376,7 +376,7 @@ { DumpRenamedAst.hs:16:20 } (UnchangedAnchor)) (AddRarrowAnn - (AR { DumpRenamedAst.hs:16:22-23 })) + (EpaSpan { DumpRenamedAst.hs:16:22-23 })) (EpaComments [])) (HsUnrestrictedArrow @@ -397,7 +397,7 @@ { DumpRenamedAst.hs:16:25 } (UnchangedAnchor)) (AddRarrowAnn - (AR { DumpRenamedAst.hs:16:27-28 })) + (EpaSpan { DumpRenamedAst.hs:16:27-28 })) (EpaComments [])) (HsUnrestrictedArrow @@ -453,7 +453,7 @@ (Anchor { DumpRenamedAst.hs:19:23 } (UnchangedAnchor)) - [(AddEpAnn AnnDcolon (AR { DumpRenamedAst.hs:19:25-26 }))] + [(AddEpAnn AnnDcolon (EpaSpan { DumpRenamedAst.hs:19:25-26 }))] (EpaComments [])) (L @@ -472,7 +472,7 @@ { DumpRenamedAst.hs:19:28 } (UnchangedAnchor)) (AddRarrowAnn - (AR { DumpRenamedAst.hs:19:30-31 })) + (EpaSpan { DumpRenamedAst.hs:19:30-31 })) (EpaComments [])) (HsUnrestrictedArrow @@ -508,7 +508,7 @@ { DumpRenamedAst.hs:19:42-52 } (UnchangedAnchor)) (AddRarrowAnn - (AR { DumpRenamedAst.hs:19:54-55 })) + (EpaSpan { DumpRenamedAst.hs:19:54-55 })) (EpaComments [])) (HsUnrestrictedArrow @@ -525,7 +525,7 @@ { DumpRenamedAst.hs:19:43 } (UnchangedAnchor)) (AddRarrowAnn - (AR { DumpRenamedAst.hs:19:45-46 })) + (EpaSpan { DumpRenamedAst.hs:19:45-46 })) (EpaComments [])) (HsUnrestrictedArrow @@ -578,7 +578,7 @@ (UnchangedAnchor)) (AnnListItem [(AddRarrowAnn - (AR { DumpRenamedAst.hs:20:36-37 }))]) + (EpaSpan { DumpRenamedAst.hs:20:36-37 }))]) (EpaComments [])) { DumpRenamedAst.hs:20:10-34 }) (HsParTy @@ -611,7 +611,7 @@ { DumpRenamedAst.hs:20:22-25 } (UnchangedAnchor)) (AddRarrowAnn - (AR { DumpRenamedAst.hs:20:27-28 })) + (EpaSpan { DumpRenamedAst.hs:20:27-28 })) (EpaComments [])) (HsUnrestrictedArrow @@ -733,9 +733,9 @@ (Anchor { DumpRenamedAst.hs:22:10-17 } (UnchangedAnchor)) - [(AddEpAnn AnnDcolon (AR { DumpRenamedAst.hs:22:13-14 })) - ,(AddEpAnn AnnOpenP (AR { DumpRenamedAst.hs:22:10 })) - ,(AddEpAnn AnnCloseP (AR { DumpRenamedAst.hs:22:17 }))] + [(AddEpAnn AnnDcolon (EpaSpan { DumpRenamedAst.hs:22:13-14 })) + ,(AddEpAnn AnnOpenP (EpaSpan { DumpRenamedAst.hs:22:10 })) + ,(AddEpAnn AnnCloseP (EpaSpan { DumpRenamedAst.hs:22:17 }))] (EpaComments [])) (()) @@ -915,9 +915,9 @@ (Anchor { DumpRenamedAst.hs:24:16-23 } (UnchangedAnchor)) - [(AddEpAnn AnnDcolon (AR { DumpRenamedAst.hs:24:19-20 })) - ,(AddEpAnn AnnOpenP (AR { DumpRenamedAst.hs:24:16 })) - ,(AddEpAnn AnnCloseP (AR { DumpRenamedAst.hs:24:23 }))] + [(AddEpAnn AnnDcolon (EpaSpan { DumpRenamedAst.hs:24:19-20 })) + ,(AddEpAnn AnnOpenP (EpaSpan { DumpRenamedAst.hs:24:16 })) + ,(AddEpAnn AnnCloseP (EpaSpan { DumpRenamedAst.hs:24:23 }))] (EpaComments [])) (()) @@ -939,9 +939,9 @@ (Anchor { DumpRenamedAst.hs:24:25-40 } (UnchangedAnchor)) - [(AddEpAnn AnnDcolon (AR { DumpRenamedAst.hs:24:28-29 })) - ,(AddEpAnn AnnOpenP (AR { DumpRenamedAst.hs:24:25 })) - ,(AddEpAnn AnnCloseP (AR { DumpRenamedAst.hs:24:40 }))] + [(AddEpAnn AnnDcolon (EpaSpan { DumpRenamedAst.hs:24:28-29 })) + ,(AddEpAnn AnnOpenP (EpaSpan { DumpRenamedAst.hs:24:25 })) + ,(AddEpAnn AnnCloseP (EpaSpan { DumpRenamedAst.hs:24:40 }))] (EpaComments [])) (()) @@ -956,7 +956,7 @@ { DumpRenamedAst.hs:24:31 } (UnchangedAnchor)) (AddRarrowAnn - (AR { DumpRenamedAst.hs:24:33-34 })) + (EpaSpan { DumpRenamedAst.hs:24:33-34 })) (EpaComments [])) (HsUnrestrictedArrow @@ -1122,8 +1122,8 @@ (UnchangedAnchor)) (AnnParen (AnnParensSquare) - (AR { DumpRenamedAst.hs:30:12 }) - (AR { DumpRenamedAst.hs:30:14 })) + (EpaSpan { DumpRenamedAst.hs:30:12 }) + (EpaSpan { DumpRenamedAst.hs:30:14 })) (EpaComments [])) (L @@ -1144,7 +1144,7 @@ (Anchor { DumpRenamedAst.hs:31:3-27 } (UnchangedAnchor)) - [(AddEpAnn AnnType (AR { DumpRenamedAst.hs:31:3-6 }))] + [(AddEpAnn AnnType (EpaSpan { DumpRenamedAst.hs:31:3-6 }))] (EpaComments [])) (FamEqn @@ -1164,8 +1164,8 @@ (UnchangedAnchor)) (AnnParen (AnnParensSquare) - (AR { DumpRenamedAst.hs:31:10 }) - (AR { DumpRenamedAst.hs:31:12 })) + (EpaSpan { DumpRenamedAst.hs:31:10 }) + (EpaSpan { DumpRenamedAst.hs:31:12 })) (EpaComments [])) (L @@ -1283,9 +1283,9 @@ (AnnList (Nothing) (Just - (AddEpAnn AnnOpenP (AR { DumpRenamedAst.hs:8:18 }))) + (AddEpAnn AnnOpenP (EpaSpan { DumpRenamedAst.hs:8:18 }))) (Just - (AddEpAnn AnnCloseP (AR { DumpRenamedAst.hs:8:23 }))) + (AddEpAnn AnnCloseP (EpaSpan { DumpRenamedAst.hs:8:23 }))) [] []) (EpaComments @@ -1302,5 +1302,3 @@ {Name: GHC.Types.Type})))))])))))] (Nothing) (Nothing))) - - diff --git a/testsuite/tests/parser/should_compile/KindSigs.stderr b/testsuite/tests/parser/should_compile/KindSigs.stderr index 3f477a4bec..f33f08312d 100644 --- a/testsuite/tests/parser/should_compile/KindSigs.stderr +++ b/testsuite/tests/parser/should_compile/KindSigs.stderr @@ -9,8 +9,8 @@ { KindSigs.hs:1:1 } (UnchangedAnchor)) (AnnsModule - [(AddEpAnn AnnModule (AR { KindSigs.hs:6:1-6 })) - ,(AddEpAnn AnnWhere (AR { KindSigs.hs:6:17-21 }))] + [(AddEpAnn AnnModule (EpaSpan { KindSigs.hs:6:1-6 })) + ,(AddEpAnn AnnWhere (EpaSpan { KindSigs.hs:6:17-21 }))] (AnnList (Nothing) (Nothing) @@ -41,7 +41,7 @@ { KindSigs.hs:8:1-6 } (UnchangedAnchor)) (EpAnnImportDecl - (AR { KindSigs.hs:8:1-6 }) + (EpaSpan { KindSigs.hs:8:1-6 }) (Nothing) (Nothing) (Nothing) @@ -78,9 +78,9 @@ (Anchor { KindSigs.hs:11:1-23 } (UnchangedAnchor)) - [(AddEpAnn AnnType (AR { KindSigs.hs:11:1-4 })) - ,(AddEpAnn AnnFamily (AR { KindSigs.hs:11:6-11 })) - ,(AddEpAnn AnnWhere (AR { KindSigs.hs:11:19-23 }))] + [(AddEpAnn AnnType (EpaSpan { KindSigs.hs:11:1-4 })) + ,(AddEpAnn AnnFamily (EpaSpan { KindSigs.hs:11:6-11 })) + ,(AddEpAnn AnnWhere (EpaSpan { KindSigs.hs:11:19-23 }))] (EpaComments [])) (ClosedTypeFamily @@ -92,7 +92,7 @@ (Anchor { KindSigs.hs:12:3-21 } (UnchangedAnchor)) - [(AddEpAnn AnnEqual (AR { KindSigs.hs:12:9 }))] + [(AddEpAnn AnnEqual (EpaSpan { KindSigs.hs:12:9 }))] (EpaComments [])) (L @@ -125,7 +125,7 @@ (Anchor { KindSigs.hs:12:11-13 } (UnchangedAnchor)) - [(AddEpAnn AnnDcolon (AR { KindSigs.hs:12:15-16 }))] + [(AddEpAnn AnnDcolon (EpaSpan { KindSigs.hs:12:15-16 }))] (EpaComments [])) (L @@ -202,8 +202,8 @@ (Anchor { KindSigs.hs:15:1-51 } (UnchangedAnchor)) - [(AddEpAnn AnnType (AR { KindSigs.hs:15:1-4 })) - ,(AddEpAnn AnnEqual (AR { KindSigs.hs:15:12 }))] + [(AddEpAnn AnnType (EpaSpan { KindSigs.hs:15:1-4 })) + ,(AddEpAnn AnnEqual (EpaSpan { KindSigs.hs:15:12 }))] (EpaComments [])) (L @@ -237,8 +237,8 @@ (UnchangedAnchor)) (AnnParen (AnnParens) - (AR { KindSigs.hs:15:14 }) - (AR { KindSigs.hs:15:51 })) + (EpaSpan { KindSigs.hs:15:14 }) + (EpaSpan { KindSigs.hs:15:51 })) (EpaComments [])) (HsBoxedOrConstraintTuple) @@ -249,7 +249,7 @@ (UnchangedAnchor)) (AnnListItem [(AddCommaAnn - (AR { KindSigs.hs:15:27 }))]) + (EpaSpan { KindSigs.hs:15:27 }))]) (EpaComments [])) { KindSigs.hs:15:16-26 }) (HsKindSig @@ -257,7 +257,7 @@ (Anchor { KindSigs.hs:15:16-18 } (UnchangedAnchor)) - [(AddEpAnn AnnDcolon (AR { KindSigs.hs:15:20-21 }))] + [(AddEpAnn AnnDcolon (EpaSpan { KindSigs.hs:15:20-21 }))] (EpaComments [])) (L @@ -297,7 +297,7 @@ (UnchangedAnchor)) (AnnListItem [(AddCommaAnn - (AR { KindSigs.hs:15:33 }))]) + (EpaSpan { KindSigs.hs:15:33 }))]) (EpaComments [])) { KindSigs.hs:15:29-32 }) (HsTyVar @@ -320,7 +320,7 @@ (Anchor { KindSigs.hs:15:35-41 } (UnchangedAnchor)) - [(AddEpAnn AnnDcolon (AR { KindSigs.hs:15:43-44 }))] + [(AddEpAnn AnnDcolon (EpaSpan { KindSigs.hs:15:43-44 }))] (EpaComments [])) (L @@ -388,8 +388,8 @@ (Anchor { KindSigs.hs:16:1-54 } (UnchangedAnchor)) - [(AddEpAnn AnnType (AR { KindSigs.hs:16:1-4 })) - ,(AddEpAnn AnnEqual (AR { KindSigs.hs:16:13 }))] + [(AddEpAnn AnnType (EpaSpan { KindSigs.hs:16:1-4 })) + ,(AddEpAnn AnnEqual (EpaSpan { KindSigs.hs:16:13 }))] (EpaComments [])) (L @@ -423,8 +423,8 @@ (UnchangedAnchor)) (AnnParen (AnnParensHash) - (AR { KindSigs.hs:16:15-16 }) - (AR { KindSigs.hs:16:53-54 })) + (EpaSpan { KindSigs.hs:16:15-16 }) + (EpaSpan { KindSigs.hs:16:53-54 })) (EpaComments [])) (HsUnboxedTuple) @@ -435,7 +435,7 @@ (UnchangedAnchor)) (AnnListItem [(AddCommaAnn - (AR { KindSigs.hs:16:29 }))]) + (EpaSpan { KindSigs.hs:16:29 }))]) (EpaComments [])) { KindSigs.hs:16:18-28 }) (HsKindSig @@ -443,7 +443,7 @@ (Anchor { KindSigs.hs:16:18-20 } (UnchangedAnchor)) - [(AddEpAnn AnnDcolon (AR { KindSigs.hs:16:22-23 }))] + [(AddEpAnn AnnDcolon (EpaSpan { KindSigs.hs:16:22-23 }))] (EpaComments [])) (L @@ -483,7 +483,7 @@ (UnchangedAnchor)) (AnnListItem [(AddCommaAnn - (AR { KindSigs.hs:16:35 }))]) + (EpaSpan { KindSigs.hs:16:35 }))]) (EpaComments [])) { KindSigs.hs:16:31-34 }) (HsTyVar @@ -506,7 +506,7 @@ (Anchor { KindSigs.hs:16:37-43 } (UnchangedAnchor)) - [(AddEpAnn AnnDcolon (AR { KindSigs.hs:16:45-46 }))] + [(AddEpAnn AnnDcolon (EpaSpan { KindSigs.hs:16:45-46 }))] (EpaComments [])) (L @@ -574,8 +574,8 @@ (Anchor { KindSigs.hs:19:1-26 } (UnchangedAnchor)) - [(AddEpAnn AnnType (AR { KindSigs.hs:19:1-4 })) - ,(AddEpAnn AnnEqual (AR { KindSigs.hs:19:10 }))] + [(AddEpAnn AnnType (EpaSpan { KindSigs.hs:19:1-4 })) + ,(AddEpAnn AnnEqual (EpaSpan { KindSigs.hs:19:10 }))] (EpaComments [])) (L @@ -595,8 +595,8 @@ (UnchangedAnchor)) (AnnParen (AnnParensSquare) - (AR { KindSigs.hs:19:12 }) - (AR { KindSigs.hs:19:26 })) + (EpaSpan { KindSigs.hs:19:12 }) + (EpaSpan { KindSigs.hs:19:26 })) (EpaComments [])) (L @@ -606,7 +606,7 @@ (Anchor { KindSigs.hs:19:14-16 } (UnchangedAnchor)) - [(AddEpAnn AnnDcolon (AR { KindSigs.hs:19:18-19 }))] + [(AddEpAnn AnnDcolon (EpaSpan { KindSigs.hs:19:18-19 }))] (EpaComments [])) (L @@ -656,7 +656,7 @@ { KindSigs.hs:22:1-3 } (UnchangedAnchor)) (AnnSig - (AddEpAnn AnnDcolon (AR { KindSigs.hs:22:5-6 })) + (AddEpAnn AnnDcolon (EpaSpan { KindSigs.hs:22:5-6 })) []) (EpaComments [])) @@ -680,7 +680,7 @@ { KindSigs.hs:22:8-20 } (UnchangedAnchor)) (AddRarrowAnn - (AR { KindSigs.hs:22:22-23 })) + (EpaSpan { KindSigs.hs:22:22-23 })) (EpaComments [])) (HsUnrestrictedArrow @@ -694,8 +694,8 @@ (UnchangedAnchor)) (AnnParen (AnnParens) - (AR { KindSigs.hs:22:8 }) - (AR { KindSigs.hs:22:20 })) + (EpaSpan { KindSigs.hs:22:8 }) + (EpaSpan { KindSigs.hs:22:20 })) (EpaComments [])) (L @@ -705,7 +705,7 @@ (Anchor { KindSigs.hs:22:9-11 } (UnchangedAnchor)) - [(AddEpAnn AnnDcolon (AR { KindSigs.hs:22:13-14 }))] + [(AddEpAnn AnnDcolon (EpaSpan { KindSigs.hs:22:13-14 }))] (EpaComments [])) (L @@ -746,7 +746,7 @@ { KindSigs.hs:22:25-28 } (UnchangedAnchor)) (AddRarrowAnn - (AR { KindSigs.hs:22:30-31 })) + (EpaSpan { KindSigs.hs:22:30-31 })) (EpaComments [])) (HsUnrestrictedArrow @@ -775,8 +775,8 @@ (UnchangedAnchor)) (AnnParen (AnnParens) - (AR { KindSigs.hs:22:33 }) - (AR { KindSigs.hs:22:44 })) + (EpaSpan { KindSigs.hs:22:33 }) + (EpaSpan { KindSigs.hs:22:44 })) (EpaComments [])) (L @@ -786,7 +786,7 @@ (Anchor { KindSigs.hs:22:34-35 } (UnchangedAnchor)) - [(AddEpAnn AnnDcolon (AR { KindSigs.hs:22:37-38 }))] + [(AddEpAnn AnnDcolon (EpaSpan { KindSigs.hs:22:37-38 }))] (EpaComments [])) (L @@ -798,8 +798,8 @@ (UnchangedAnchor)) (AnnParen (AnnParens) - (AR { KindSigs.hs:22:34 }) - (AR { KindSigs.hs:22:35 })) + (EpaSpan { KindSigs.hs:22:34 }) + (EpaSpan { KindSigs.hs:22:35 })) (EpaComments [])) (HsBoxedOrConstraintTuple) @@ -876,7 +876,7 @@ (UnchangedAnchor)) (GrhsAnn (Nothing) - (AddEpAnn AnnEqual (AR { KindSigs.hs:23:9 }))) + (AddEpAnn AnnEqual (EpaSpan { KindSigs.hs:23:9 }))) (EpaComments [])) [] @@ -891,8 +891,8 @@ (UnchangedAnchor)) (NameAnnOnly (NameParens) - (AR { KindSigs.hs:23:11 }) - (AR { KindSigs.hs:23:12 }) + (EpaSpan { KindSigs.hs:23:11 }) + (EpaSpan { KindSigs.hs:23:12 }) []) (EpaComments [])) { KindSigs.hs:23:11-12 }) @@ -918,8 +918,8 @@ (Anchor { KindSigs.hs:26:1-29 } (UnchangedAnchor)) - [(AddEpAnn AnnType (AR { KindSigs.hs:26:1-4 })) - ,(AddEpAnn AnnEqual (AR { KindSigs.hs:26:11 }))] + [(AddEpAnn AnnType (EpaSpan { KindSigs.hs:26:1-4 })) + ,(AddEpAnn AnnEqual (EpaSpan { KindSigs.hs:26:11 }))] (EpaComments [])) (L @@ -937,9 +937,9 @@ (Anchor { KindSigs.hs:26:13 } (UnchangedAnchor)) - [(AddEpAnn AnnSimpleQuote (AR { KindSigs.hs:26:13 })) - ,(AddEpAnn AnnOpenS (AR { KindSigs.hs:26:14 })) - ,(AddEpAnn AnnCloseS (AR { KindSigs.hs:26:29 }))] + [(AddEpAnn AnnSimpleQuote (EpaSpan { KindSigs.hs:26:13 })) + ,(AddEpAnn AnnOpenS (EpaSpan { KindSigs.hs:26:14 })) + ,(AddEpAnn AnnCloseS (EpaSpan { KindSigs.hs:26:29 }))] (EpaComments [])) (IsPromoted) @@ -950,7 +950,7 @@ (Anchor { KindSigs.hs:26:16-19 } (UnchangedAnchor)) - [(AddEpAnn AnnDcolon (AR { KindSigs.hs:26:21-22 }))] + [(AddEpAnn AnnDcolon (EpaSpan { KindSigs.hs:26:21-22 }))] (EpaComments [])) (L @@ -999,8 +999,8 @@ (Anchor { KindSigs.hs:27:1-45 } (UnchangedAnchor)) - [(AddEpAnn AnnType (AR { KindSigs.hs:27:1-4 })) - ,(AddEpAnn AnnEqual (AR { KindSigs.hs:27:12 }))] + [(AddEpAnn AnnType (EpaSpan { KindSigs.hs:27:1-4 })) + ,(AddEpAnn AnnEqual (EpaSpan { KindSigs.hs:27:12 }))] (EpaComments [])) (L @@ -1018,8 +1018,8 @@ (Anchor { KindSigs.hs:27:14 } (UnchangedAnchor)) - [(AddEpAnn AnnOpenS (AR { KindSigs.hs:27:14 })) - ,(AddEpAnn AnnCloseS (AR { KindSigs.hs:27:45 }))] + [(AddEpAnn AnnOpenS (EpaSpan { KindSigs.hs:27:14 })) + ,(AddEpAnn AnnCloseS (EpaSpan { KindSigs.hs:27:45 }))] (EpaComments [])) (NotPromoted) @@ -1030,7 +1030,7 @@ (UnchangedAnchor)) (AnnListItem [(AddCommaAnn - (AR { KindSigs.hs:27:28 }))]) + (EpaSpan { KindSigs.hs:27:28 }))]) (EpaComments [])) { KindSigs.hs:27:16-27 }) (HsKindSig @@ -1038,7 +1038,7 @@ (Anchor { KindSigs.hs:27:16-19 } (UnchangedAnchor)) - [(AddEpAnn AnnDcolon (AR { KindSigs.hs:27:21-22 }))] + [(AddEpAnn AnnDcolon (EpaSpan { KindSigs.hs:27:21-22 }))] (EpaComments [])) (L @@ -1078,7 +1078,7 @@ (Anchor { KindSigs.hs:27:30-34 } (UnchangedAnchor)) - [(AddEpAnn AnnDcolon (AR { KindSigs.hs:27:36-37 }))] + [(AddEpAnn AnnDcolon (EpaSpan { KindSigs.hs:27:36-37 }))] (EpaComments [])) (L @@ -1127,8 +1127,8 @@ (Anchor { KindSigs.hs:28:1-44 } (UnchangedAnchor)) - [(AddEpAnn AnnType (AR { KindSigs.hs:28:1-4 })) - ,(AddEpAnn AnnEqual (AR { KindSigs.hs:28:14 }))] + [(AddEpAnn AnnType (EpaSpan { KindSigs.hs:28:1-4 })) + ,(AddEpAnn AnnEqual (EpaSpan { KindSigs.hs:28:14 }))] (EpaComments [])) (L @@ -1160,9 +1160,9 @@ (Anchor { KindSigs.hs:28:16 } (UnchangedAnchor)) - [(AddEpAnn AnnSimpleQuote (AR { KindSigs.hs:28:16 })) - ,(AddEpAnn AnnOpenP (AR { KindSigs.hs:28:17 })) - ,(AddEpAnn AnnCloseP (AR { KindSigs.hs:28:44 }))] + [(AddEpAnn AnnSimpleQuote (EpaSpan { KindSigs.hs:28:16 })) + ,(AddEpAnn AnnOpenP (EpaSpan { KindSigs.hs:28:17 })) + ,(AddEpAnn AnnCloseP (EpaSpan { KindSigs.hs:28:44 }))] (EpaComments [])) [(L @@ -1172,7 +1172,7 @@ (UnchangedAnchor)) (AnnListItem [(AddCommaAnn - (AR { KindSigs.hs:28:40 }))]) + (EpaSpan { KindSigs.hs:28:40 }))]) (EpaComments [])) { KindSigs.hs:28:19-39 }) (HsKindSig @@ -1180,7 +1180,7 @@ (Anchor { KindSigs.hs:28:19-29 } (UnchangedAnchor)) - [(AddEpAnn AnnDcolon (AR { KindSigs.hs:28:31-32 }))] + [(AddEpAnn AnnDcolon (EpaSpan { KindSigs.hs:28:31-32 }))] (EpaComments [])) (L @@ -1190,8 +1190,8 @@ (Anchor { KindSigs.hs:28:19 } (UnchangedAnchor)) - [(AddEpAnn AnnOpenS (AR { KindSigs.hs:28:19 })) - ,(AddEpAnn AnnCloseS (AR { KindSigs.hs:28:29 }))] + [(AddEpAnn AnnOpenS (EpaSpan { KindSigs.hs:28:19 })) + ,(AddEpAnn AnnCloseS (EpaSpan { KindSigs.hs:28:29 }))] (EpaComments [])) (NotPromoted) @@ -1202,7 +1202,7 @@ (UnchangedAnchor)) (AnnListItem [(AddCommaAnn - (AR { KindSigs.hs:28:23 }))]) + (EpaSpan { KindSigs.hs:28:23 }))]) (EpaComments [])) { KindSigs.hs:28:20-22 }) (HsTyVar @@ -1242,8 +1242,8 @@ (UnchangedAnchor)) (AnnParen (AnnParensSquare) - (AR { KindSigs.hs:28:34 }) - (AR { KindSigs.hs:28:39 })) + (EpaSpan { KindSigs.hs:28:34 }) + (EpaSpan { KindSigs.hs:28:39 })) (EpaComments [])) (L @@ -1292,8 +1292,8 @@ (Anchor { KindSigs.hs:31:1-31 } (UnchangedAnchor)) - [(AddEpAnn AnnType (AR { KindSigs.hs:31:1-4 })) - ,(AddEpAnn AnnEqual (AR { KindSigs.hs:31:19 }))] + [(AddEpAnn AnnType (EpaSpan { KindSigs.hs:31:1-4 })) + ,(AddEpAnn AnnEqual (EpaSpan { KindSigs.hs:31:19 }))] (EpaComments [])) (L @@ -1311,7 +1311,7 @@ (Anchor { KindSigs.hs:31:21-23 } (UnchangedAnchor)) - [(AddEpAnn AnnDcolon (AR { KindSigs.hs:31:25-26 }))] + [(AddEpAnn AnnDcolon (EpaSpan { KindSigs.hs:31:25-26 }))] (EpaComments [])) (L @@ -1361,7 +1361,7 @@ { KindSigs.hs:34:1-4 } (UnchangedAnchor)) (AnnSig - (AddEpAnn AnnDcolon (AR { KindSigs.hs:34:6-7 })) + (AddEpAnn AnnDcolon (EpaSpan { KindSigs.hs:34:6-7 })) []) (EpaComments [])) @@ -1386,8 +1386,8 @@ (UnchangedAnchor)) (AnnParen (AnnParens) - (AR { KindSigs.hs:34:9 }) - (AR { KindSigs.hs:34:22 })) + (EpaSpan { KindSigs.hs:34:9 }) + (EpaSpan { KindSigs.hs:34:22 })) (EpaComments [])) (L @@ -1397,7 +1397,7 @@ (Anchor { KindSigs.hs:34:10-13 } (UnchangedAnchor)) - [(AddEpAnn AnnDcolon (AR { KindSigs.hs:34:15-16 }))] + [(AddEpAnn AnnDcolon (EpaSpan { KindSigs.hs:34:15-16 }))] (EpaComments [])) (L @@ -1480,7 +1480,7 @@ (UnchangedAnchor)) (GrhsAnn (Nothing) - (AddEpAnn AnnEqual (AR { KindSigs.hs:35:6 }))) + (AddEpAnn AnnEqual (EpaSpan { KindSigs.hs:35:6 }))) (EpaComments [])) [] diff --git a/testsuite/tests/parser/should_compile/T14189.stderr b/testsuite/tests/parser/should_compile/T14189.stderr index c1ebd053ac..5871c41b1c 100644 --- a/testsuite/tests/parser/should_compile/T14189.stderr +++ b/testsuite/tests/parser/should_compile/T14189.stderr @@ -46,7 +46,7 @@ (UnchangedAnchor)) (AnnListItem [(AddVbarAnn - (AR { T14189.hs:6:22 }))]) + (EpaSpan { T14189.hs:6:22 }))]) (EpaComments [])) { T14189.hs:6:15-20 }) (ConDeclH98 @@ -79,7 +79,7 @@ (UnchangedAnchor)) (AnnListItem [(AddVbarAnn - (AR { T14189.hs:6:27 }))]) + (EpaSpan { T14189.hs:6:27 }))]) (EpaComments [])) { T14189.hs:6:24-25 }) (ConDeclH98 @@ -116,9 +116,9 @@ { T14189.hs:6:33-40 } (UnchangedAnchor))) (Just - (AddEpAnn AnnOpenC (AR { T14189.hs:6:31 }))) + (AddEpAnn AnnOpenC (EpaSpan { T14189.hs:6:31 }))) (Just - (AddEpAnn AnnCloseC (AR { T14189.hs:6:42 }))) + (AddEpAnn AnnCloseC (EpaSpan { T14189.hs:6:42 }))) [] []) (EpaComments @@ -210,3 +210,4 @@ (FieldSelectors) {Name: T14189.f}))])])]) (Nothing))) + diff --git a/testsuite/tests/parser/should_compile/T15323.stderr b/testsuite/tests/parser/should_compile/T15323.stderr index e91ff5b3f4..987a5b88a6 100644 --- a/testsuite/tests/parser/should_compile/T15323.stderr +++ b/testsuite/tests/parser/should_compile/T15323.stderr @@ -9,8 +9,8 @@ { T15323.hs:1:1 } (UnchangedAnchor)) (AnnsModule - [(AddEpAnn AnnModule (AR { T15323.hs:3:1-6 })) - ,(AddEpAnn AnnWhere (AR { T15323.hs:3:15-19 }))] + [(AddEpAnn AnnModule (EpaSpan { T15323.hs:3:1-6 })) + ,(AddEpAnn AnnWhere (EpaSpan { T15323.hs:3:15-19 }))] (AnnList (Nothing) (Nothing) @@ -50,8 +50,8 @@ (Anchor { T15323.hs:(5,1)-(6,54) } (UnchangedAnchor)) - [(AddEpAnn AnnData (AR { T15323.hs:5:1-4 })) - ,(AddEpAnn AnnWhere (AR { T15323.hs:5:21-25 }))] + [(AddEpAnn AnnData (EpaSpan { T15323.hs:5:1-4 })) + ,(AddEpAnn AnnWhere (EpaSpan { T15323.hs:5:21-25 }))] (EpaComments [])) (L @@ -81,8 +81,8 @@ (Anchor { T15323.hs:(5,1)-(6,54) } (UnchangedAnchor)) - [(AddEpAnn AnnData (AR { T15323.hs:5:1-4 })) - ,(AddEpAnn AnnWhere (AR { T15323.hs:5:21-25 }))] + [(AddEpAnn AnnData (EpaSpan { T15323.hs:5:1-4 })) + ,(AddEpAnn AnnWhere (EpaSpan { T15323.hs:5:21-25 }))] (EpaComments [])) (DataType) @@ -96,7 +96,7 @@ (Anchor { T15323.hs:6:5-54 } (UnchangedAnchor)) - [(AddEpAnn AnnDcolon (AR { T15323.hs:6:17-18 }))] + [(AddEpAnn AnnDcolon (EpaSpan { T15323.hs:6:17-18 }))] (EpaComments [])) [(L @@ -111,8 +111,8 @@ { T15323.hs:6:20-25 } (UnchangedAnchor)) ((,) - (AddEpAnn AnnForall (AR { T15323.hs:6:20-25 })) - (AddEpAnn AnnDot (AR { T15323.hs:6:29 }))) + (AddEpAnn AnnForall (EpaSpan { T15323.hs:6:20-25 })) + (AddEpAnn AnnDot (EpaSpan { T15323.hs:6:29 }))) (EpaComments [])) [(L @@ -140,7 +140,7 @@ (Just ((,) (NormalSyntax) - (AR { T15323.hs:6:38-39 }))) + (EpaSpan { T15323.hs:6:38-39 }))) [] []) (EpaComments @@ -154,8 +154,8 @@ (UnchangedAnchor)) (AnnParen (AnnParens) - (AR { T15323.hs:6:31 }) - (AR { T15323.hs:6:36 })) + (EpaSpan { T15323.hs:6:31 }) + (EpaSpan { T15323.hs:6:36 })) (EpaComments [])) (L 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 |