summaryrefslogtreecommitdiff
path: root/testsuite
diff options
context:
space:
mode:
authorM Farkas-Dyck <strake888@gmail.com>2022-03-13 16:10:21 -0800
committerMarge Bot <ben+marge-bot@smart-cactus.org>2022-09-19 09:07:05 -0400
commitc1f81b38625a5fea7fb8160a3a62ae6be078a7b1 (patch)
tree7c151bc71e83e587df97265fd58c7a1b45574f8d /testsuite
parent7574659452a864e762fa812cb38cf15f70d85617 (diff)
downloadhaskell-c1f81b38625a5fea7fb8160a3a62ae6be078a7b1.tar.gz
Scrub partiality about `NewOrData`.
Rather than a list of constructors and a `NewOrData` flag, we define `data DataDefnCons a = NewTypeCon a | DataTypeCons [a]`, which enforces a newtype to have exactly one constructor. Closes #22070. Bump haddock submodule.
Diffstat (limited to 'testsuite')
-rw-r--r--testsuite/tests/ghc-api/exactprint/Test20239.stderr414
-rw-r--r--testsuite/tests/haddock/should_compile_flag_haddock/T17544.stderr732
-rw-r--r--testsuite/tests/haddock/should_compile_flag_haddock/T17544_kw.stderr114
-rw-r--r--testsuite/tests/parser/should_compile/DumpParsedAst.stderr310
-rw-r--r--testsuite/tests/parser/should_compile/DumpRenamedAst.stderr206
-rw-r--r--testsuite/tests/parser/should_compile/T14189.stderr218
-rw-r--r--testsuite/tests/parser/should_compile/T15323.stderr264
-rw-r--r--testsuite/tests/parser/should_compile/T20452.stderr84
-rw-r--r--testsuite/tests/parser/should_fail/T22070.hs3
-rw-r--r--testsuite/tests/parser/should_fail/T22070.stderr4
-rw-r--r--testsuite/tests/parser/should_fail/all.T1
-rw-r--r--testsuite/tests/printer/T18791.stderr136
-rw-r--r--testsuite/tests/typecheck/should_fail/T2126.stderr2
13 files changed, 1261 insertions, 1227 deletions
diff --git a/testsuite/tests/ghc-api/exactprint/Test20239.stderr b/testsuite/tests/ghc-api/exactprint/Test20239.stderr
index 8ecb791c49..60ff0ec324 100644
--- a/testsuite/tests/ghc-api/exactprint/Test20239.stderr
+++ b/testsuite/tests/ghc-api/exactprint/Test20239.stderr
@@ -107,219 +107,219 @@
(Prefix)
(HsDataDefn
(NoExtField)
- (DataType)
(Nothing)
(Nothing)
(Nothing)
- [(L
- (SrcSpanAnn (EpAnn
- (Anchor
- { Test20239.hs:4:36-55 }
- (UnchangedAnchor))
- (AnnListItem
- [(AddVbarAnn
- (EpaSpan { Test20239.hs:6:34 }))])
- (EpaComments
- [])) { Test20239.hs:4:36-55 })
- (ConDeclH98
- (EpAnn
- (Anchor
- { Test20239.hs:4:36-55 }
- (UnchangedAnchor))
- []
- (EpaComments
- []))
- (L
- (SrcSpanAnn (EpAnnNotUsed) { Test20239.hs:4:36-49 })
- (Unqual
- {OccName: MigrationQuery}))
- (False)
- []
- (Nothing)
- (PrefixCon
- []
- [(HsScaled
- (HsLinearArrow
- (HsPct1
- (L
- (NoTokenLoc)
- (HsTok))
- (L
- (NoTokenLoc)
- (HsNormalTok))))
- (L
- (SrcSpanAnn (EpAnnNotUsed) { Test20239.hs:4:51-55 })
- (HsTyVar
- (EpAnn
- (Anchor
- { Test20239.hs:4:51-55 }
- (UnchangedAnchor))
- []
- (EpaComments
- []))
- (NotPromoted)
- (L
- (SrcSpanAnn (EpAnnNotUsed) { Test20239.hs:4:51-55 })
- (Unqual
- {OccName: Query})))))])
- (Nothing)))
- ,(L
- (SrcSpanAnn (EpAnnNotUsed) { Test20239.hs:6:36-86 })
- (ConDeclH98
- (EpAnn
- (Anchor
- { Test20239.hs:6:36-86 }
- (UnchangedAnchor))
+ (DataTypeCons
+ [(L
+ (SrcSpanAnn (EpAnn
+ (Anchor
+ { Test20239.hs:4:36-55 }
+ (UnchangedAnchor))
+ (AnnListItem
+ [(AddVbarAnn
+ (EpaSpan { Test20239.hs:6:34 }))])
+ (EpaComments
+ [])) { Test20239.hs:4:36-55 })
+ (ConDeclH98
+ (EpAnn
+ (Anchor
+ { Test20239.hs:4:36-55 }
+ (UnchangedAnchor))
+ []
+ (EpaComments
+ []))
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { Test20239.hs:4:36-49 })
+ (Unqual
+ {OccName: MigrationQuery}))
+ (False)
[]
- (EpaComments
- []))
- (L
- (SrcSpanAnn (EpAnnNotUsed) { Test20239.hs:6:36-48 })
- (Unqual
- {OccName: MigrationCode}))
- (False)
- []
- (Nothing)
- (PrefixCon
+ (Nothing)
+ (PrefixCon
+ []
+ [(HsScaled
+ (HsLinearArrow
+ (HsPct1
+ (L
+ (NoTokenLoc)
+ (HsTok))
+ (L
+ (NoTokenLoc)
+ (HsNormalTok))))
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { Test20239.hs:4:51-55 })
+ (HsTyVar
+ (EpAnn
+ (Anchor
+ { Test20239.hs:4:51-55 }
+ (UnchangedAnchor))
+ []
+ (EpaComments
+ []))
+ (NotPromoted)
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { Test20239.hs:4:51-55 })
+ (Unqual
+ {OccName: Query})))))])
+ (Nothing)))
+ ,(L
+ (SrcSpanAnn (EpAnnNotUsed) { Test20239.hs:6:36-86 })
+ (ConDeclH98
+ (EpAnn
+ (Anchor
+ { Test20239.hs:6:36-86 }
+ (UnchangedAnchor))
+ []
+ (EpaComments
+ []))
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { Test20239.hs:6:36-48 })
+ (Unqual
+ {OccName: MigrationCode}))
+ (False)
[]
- [(HsScaled
- (HsLinearArrow
- (HsPct1
- (L
- (NoTokenLoc)
- (HsTok))
- (L
- (NoTokenLoc)
- (HsNormalTok))))
- (L
- (SrcSpanAnn (EpAnnNotUsed) { Test20239.hs:6:50-86 })
- (HsParTy
- (EpAnn
- (Anchor
- { Test20239.hs:6:50 }
- (UnchangedAnchor))
- (AnnParen
- (AnnParens)
- (EpaSpan { Test20239.hs:6:50 })
- (EpaSpan { Test20239.hs:6:86 }))
- (EpaComments
- []))
- (L
- (SrcSpanAnn (EpAnnNotUsed) { Test20239.hs:6:51-85 })
- (HsFunTy
- (EpAnn
- (Anchor
- { Test20239.hs:6:51-60 }
- (UnchangedAnchor))
- (NoEpAnns)
- (EpaComments
- []))
- (HsUnrestrictedArrow
- (L
- (TokenLoc
- (EpaSpan { Test20239.hs:6:62-63 }))
- (HsNormalTok)))
- (L
- (SrcSpanAnn (EpAnnNotUsed) { Test20239.hs:6:51-60 })
- (HsTyVar
- (EpAnn
- (Anchor
- { Test20239.hs:6:51-60 }
- (UnchangedAnchor))
- []
- (EpaComments
- []))
- (NotPromoted)
- (L
- (SrcSpanAnn (EpAnnNotUsed) { Test20239.hs:6:51-60 })
- (Unqual
- {OccName: Connection}))))
- (L
- (SrcSpanAnn (EpAnnNotUsed) { Test20239.hs:6:65-85 })
- (HsAppTy
- (NoExtField)
+ (Nothing)
+ (PrefixCon
+ []
+ [(HsScaled
+ (HsLinearArrow
+ (HsPct1
+ (L
+ (NoTokenLoc)
+ (HsTok))
+ (L
+ (NoTokenLoc)
+ (HsNormalTok))))
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { Test20239.hs:6:50-86 })
+ (HsParTy
+ (EpAnn
+ (Anchor
+ { Test20239.hs:6:50 }
+ (UnchangedAnchor))
+ (AnnParen
+ (AnnParens)
+ (EpaSpan { Test20239.hs:6:50 })
+ (EpaSpan { Test20239.hs:6:86 }))
+ (EpaComments
+ []))
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { Test20239.hs:6:51-85 })
+ (HsFunTy
+ (EpAnn
+ (Anchor
+ { Test20239.hs:6:51-60 }
+ (UnchangedAnchor))
+ (NoEpAnns)
+ (EpaComments
+ []))
+ (HsUnrestrictedArrow
(L
- (SrcSpanAnn (EpAnnNotUsed) { Test20239.hs:6:65-66 })
- (HsTyVar
- (EpAnn
- (Anchor
- { Test20239.hs:6:65-66 }
- (UnchangedAnchor))
- []
- (EpaComments
- []))
- (NotPromoted)
- (L
- (SrcSpanAnn (EpAnnNotUsed) { Test20239.hs:6:65-66 })
- (Unqual
- {OccName: IO}))))
- (L
- (SrcSpanAnn (EpAnnNotUsed) { Test20239.hs:6:68-85 })
- (HsParTy
- (EpAnn
- (Anchor
- { Test20239.hs:6:68 }
- (UnchangedAnchor))
- (AnnParen
- (AnnParens)
- (EpaSpan { Test20239.hs:6:68 })
- (EpaSpan { Test20239.hs:6:85 }))
- (EpaComments
- []))
- (L
- (SrcSpanAnn (EpAnnNotUsed) { Test20239.hs:6:69-84 })
- (HsAppTy
- (NoExtField)
- (L
- (SrcSpanAnn (EpAnnNotUsed) { Test20239.hs:6:69-81 })
- (HsAppTy
- (NoExtField)
- (L
- (SrcSpanAnn (EpAnnNotUsed) { Test20239.hs:6:69-74 })
- (HsTyVar
- (EpAnn
- (Anchor
- { Test20239.hs:6:69-74 }
- (UnchangedAnchor))
- []
- (EpaComments
- []))
- (NotPromoted)
- (L
- (SrcSpanAnn (EpAnnNotUsed) { Test20239.hs:6:69-74 })
- (Unqual
- {OccName: Either}))))
- (L
- (SrcSpanAnn (EpAnnNotUsed) { Test20239.hs:6:76-81 })
- (HsTyVar
- (EpAnn
- (Anchor
- { Test20239.hs:6:76-81 }
- (UnchangedAnchor))
- []
- (EpaComments
- []))
- (NotPromoted)
- (L
- (SrcSpanAnn (EpAnnNotUsed) { Test20239.hs:6:76-81 })
- (Unqual
- {OccName: String}))))))
- (L
- (SrcSpanAnn (EpAnnNotUsed) { Test20239.hs:6:83-84 })
- (HsTupleTy
- (EpAnn
- (Anchor
- { Test20239.hs:6:83 }
- (UnchangedAnchor))
- (AnnParen
- (AnnParens)
- (EpaSpan { Test20239.hs:6:83 })
- (EpaSpan { Test20239.hs:6:84 }))
- (EpaComments
- []))
- (HsBoxedOrConstraintTuple)
- [])))))))))))))])
- (Nothing)))]
+ (TokenLoc
+ (EpaSpan { Test20239.hs:6:62-63 }))
+ (HsNormalTok)))
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { Test20239.hs:6:51-60 })
+ (HsTyVar
+ (EpAnn
+ (Anchor
+ { Test20239.hs:6:51-60 }
+ (UnchangedAnchor))
+ []
+ (EpaComments
+ []))
+ (NotPromoted)
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { Test20239.hs:6:51-60 })
+ (Unqual
+ {OccName: Connection}))))
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { Test20239.hs:6:65-85 })
+ (HsAppTy
+ (NoExtField)
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { Test20239.hs:6:65-66 })
+ (HsTyVar
+ (EpAnn
+ (Anchor
+ { Test20239.hs:6:65-66 }
+ (UnchangedAnchor))
+ []
+ (EpaComments
+ []))
+ (NotPromoted)
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { Test20239.hs:6:65-66 })
+ (Unqual
+ {OccName: IO}))))
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { Test20239.hs:6:68-85 })
+ (HsParTy
+ (EpAnn
+ (Anchor
+ { Test20239.hs:6:68 }
+ (UnchangedAnchor))
+ (AnnParen
+ (AnnParens)
+ (EpaSpan { Test20239.hs:6:68 })
+ (EpaSpan { Test20239.hs:6:85 }))
+ (EpaComments
+ []))
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { Test20239.hs:6:69-84 })
+ (HsAppTy
+ (NoExtField)
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { Test20239.hs:6:69-81 })
+ (HsAppTy
+ (NoExtField)
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { Test20239.hs:6:69-74 })
+ (HsTyVar
+ (EpAnn
+ (Anchor
+ { Test20239.hs:6:69-74 }
+ (UnchangedAnchor))
+ []
+ (EpaComments
+ []))
+ (NotPromoted)
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { Test20239.hs:6:69-74 })
+ (Unqual
+ {OccName: Either}))))
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { Test20239.hs:6:76-81 })
+ (HsTyVar
+ (EpAnn
+ (Anchor
+ { Test20239.hs:6:76-81 }
+ (UnchangedAnchor))
+ []
+ (EpaComments
+ []))
+ (NotPromoted)
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { Test20239.hs:6:76-81 })
+ (Unqual
+ {OccName: String}))))))
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { Test20239.hs:6:83-84 })
+ (HsTupleTy
+ (EpAnn
+ (Anchor
+ { Test20239.hs:6:83 }
+ (UnchangedAnchor))
+ (AnnParen
+ (AnnParens)
+ (EpaSpan { Test20239.hs:6:83 })
+ (EpaSpan { Test20239.hs:6:84 }))
+ (EpaComments
+ []))
+ (HsBoxedOrConstraintTuple)
+ [])))))))))))))])
+ (Nothing)))])
[]))))))]))
diff --git a/testsuite/tests/haddock/should_compile_flag_haddock/T17544.stderr b/testsuite/tests/haddock/should_compile_flag_haddock/T17544.stderr
index 82a2640f34..de2f98d899 100644
--- a/testsuite/tests/haddock/should_compile_flag_haddock/T17544.stderr
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/T17544.stderr
@@ -836,70 +836,72 @@
(Prefix)
(HsDataDefn
(NoExtField)
- (DataType)
(Nothing)
(Nothing)
(Nothing)
- [(L
- (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:25:5-18 })
- (ConDeclGADT
- (EpAnn
- (Anchor
- { T17544.hs:25:5-18 }
- (UnchangedAnchor))
- []
- (EpaComments
- []))
- [(L
- (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:25:5-8 })
- (Unqual
- {OccName: MkD5}))]
- (L
- (TokenLoc
- (EpaSpan { T17544.hs:25:10-11 }))
- (HsNormalTok))
- (L
- (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:25:13-18 })
- (HsOuterImplicit
- (NoExtField)))
- (Nothing)
- (PrefixConGADT
- [])
- (L
- (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:25:13-18 })
- (HsAppTy
- (NoExtField)
- (L
- (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:25:13-14 })
- (HsTyVar
- (EpAnn
- (Anchor
- { T17544.hs:25:13-14 }
- (UnchangedAnchor))
- []
- (EpaComments
- []))
- (NotPromoted)
- (L
- (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:25:13-14 })
- (Unqual
- {OccName: D5}))))
+ (DataTypeCons
+ [(L
+ (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:25:5-18 })
+ (ConDeclGADT
+ (EpAnn
+ (Anchor
+ { T17544.hs:25:5-18 }
+ (UnchangedAnchor))
+ []
+ (EpaComments
+ []))
+ (:|
(L
- (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:25:16-18 })
- (HsTyVar
- (EpAnn
- (Anchor
- { T17544.hs:25:16-18 }
- (UnchangedAnchor))
- []
- (EpaComments
- []))
- (NotPromoted)
- (L
- (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:25:16-18 })
- (Unqual
- {OccName: Int}))))))
- (Nothing)))]
+ (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:25:5-8 })
+ (Unqual
+ {OccName: MkD5}))
+ [])
+ (L
+ (TokenLoc
+ (EpaSpan { T17544.hs:25:10-11 }))
+ (HsNormalTok))
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:25:13-18 })
+ (HsOuterImplicit
+ (NoExtField)))
+ (Nothing)
+ (PrefixConGADT
+ [])
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:25:13-18 })
+ (HsAppTy
+ (NoExtField)
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:25:13-14 })
+ (HsTyVar
+ (EpAnn
+ (Anchor
+ { T17544.hs:25:13-14 }
+ (UnchangedAnchor))
+ []
+ (EpaComments
+ []))
+ (NotPromoted)
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:25:13-14 })
+ (Unqual
+ {OccName: D5}))))
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:25:16-18 })
+ (HsTyVar
+ (EpAnn
+ (Anchor
+ { T17544.hs:25:16-18 }
+ (UnchangedAnchor))
+ []
+ (EpaComments
+ []))
+ (NotPromoted)
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:25:16-18 })
+ (Unqual
+ {OccName: Int}))))))
+ (Nothing)))])
[]))))]
(Nothing)))))
,(L
@@ -1102,70 +1104,72 @@
(Prefix)
(HsDataDefn
(NoExtField)
- (DataType)
(Nothing)
(Nothing)
(Nothing)
- [(L
- (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:31:5-18 })
- (ConDeclGADT
- (EpAnn
- (Anchor
- { T17544.hs:31:5-18 }
- (UnchangedAnchor))
- []
- (EpaComments
- []))
- [(L
- (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:31:5-8 })
- (Unqual
- {OccName: MkD6}))]
- (L
- (TokenLoc
- (EpaSpan { T17544.hs:31:10-11 }))
- (HsNormalTok))
- (L
- (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:31:13-18 })
- (HsOuterImplicit
- (NoExtField)))
- (Nothing)
- (PrefixConGADT
- [])
- (L
- (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:31:13-18 })
- (HsAppTy
- (NoExtField)
- (L
- (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:31:13-14 })
- (HsTyVar
- (EpAnn
- (Anchor
- { T17544.hs:31:13-14 }
- (UnchangedAnchor))
- []
- (EpaComments
- []))
- (NotPromoted)
- (L
- (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:31:13-14 })
- (Unqual
- {OccName: D6}))))
+ (DataTypeCons
+ [(L
+ (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:31:5-18 })
+ (ConDeclGADT
+ (EpAnn
+ (Anchor
+ { T17544.hs:31:5-18 }
+ (UnchangedAnchor))
+ []
+ (EpaComments
+ []))
+ (:|
(L
- (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:31:16-18 })
- (HsTyVar
- (EpAnn
- (Anchor
- { T17544.hs:31:16-18 }
- (UnchangedAnchor))
- []
- (EpaComments
- []))
- (NotPromoted)
- (L
- (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:31:16-18 })
- (Unqual
- {OccName: Int}))))))
- (Nothing)))]
+ (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:31:5-8 })
+ (Unqual
+ {OccName: MkD6}))
+ [])
+ (L
+ (TokenLoc
+ (EpaSpan { T17544.hs:31:10-11 }))
+ (HsNormalTok))
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:31:13-18 })
+ (HsOuterImplicit
+ (NoExtField)))
+ (Nothing)
+ (PrefixConGADT
+ [])
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:31:13-18 })
+ (HsAppTy
+ (NoExtField)
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:31:13-14 })
+ (HsTyVar
+ (EpAnn
+ (Anchor
+ { T17544.hs:31:13-14 }
+ (UnchangedAnchor))
+ []
+ (EpaComments
+ []))
+ (NotPromoted)
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:31:13-14 })
+ (Unqual
+ {OccName: D6}))))
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:31:16-18 })
+ (HsTyVar
+ (EpAnn
+ (Anchor
+ { T17544.hs:31:16-18 }
+ (UnchangedAnchor))
+ []
+ (EpaComments
+ []))
+ (NotPromoted)
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:31:16-18 })
+ (Unqual
+ {OccName: Int}))))))
+ (Nothing)))])
[]))))]
(Nothing)))))
,(L
@@ -1368,70 +1372,72 @@
(Prefix)
(HsDataDefn
(NoExtField)
- (DataType)
(Nothing)
(Nothing)
(Nothing)
- [(L
- (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:37:5-18 })
- (ConDeclGADT
- (EpAnn
- (Anchor
- { T17544.hs:37:5-18 }
- (UnchangedAnchor))
- []
- (EpaComments
- []))
- [(L
- (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:37:5-8 })
- (Unqual
- {OccName: MkD7}))]
- (L
- (TokenLoc
- (EpaSpan { T17544.hs:37:10-11 }))
- (HsNormalTok))
- (L
- (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:37:13-18 })
- (HsOuterImplicit
- (NoExtField)))
- (Nothing)
- (PrefixConGADT
- [])
- (L
- (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:37:13-18 })
- (HsAppTy
- (NoExtField)
- (L
- (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:37:13-14 })
- (HsTyVar
- (EpAnn
- (Anchor
- { T17544.hs:37:13-14 }
- (UnchangedAnchor))
- []
- (EpaComments
- []))
- (NotPromoted)
- (L
- (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:37:13-14 })
- (Unqual
- {OccName: D7}))))
+ (DataTypeCons
+ [(L
+ (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:37:5-18 })
+ (ConDeclGADT
+ (EpAnn
+ (Anchor
+ { T17544.hs:37:5-18 }
+ (UnchangedAnchor))
+ []
+ (EpaComments
+ []))
+ (:|
(L
- (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:37:16-18 })
- (HsTyVar
- (EpAnn
- (Anchor
- { T17544.hs:37:16-18 }
- (UnchangedAnchor))
- []
- (EpaComments
- []))
- (NotPromoted)
- (L
- (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:37:16-18 })
- (Unqual
- {OccName: Int}))))))
- (Nothing)))]
+ (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:37:5-8 })
+ (Unqual
+ {OccName: MkD7}))
+ [])
+ (L
+ (TokenLoc
+ (EpaSpan { T17544.hs:37:10-11 }))
+ (HsNormalTok))
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:37:13-18 })
+ (HsOuterImplicit
+ (NoExtField)))
+ (Nothing)
+ (PrefixConGADT
+ [])
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:37:13-18 })
+ (HsAppTy
+ (NoExtField)
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:37:13-14 })
+ (HsTyVar
+ (EpAnn
+ (Anchor
+ { T17544.hs:37:13-14 }
+ (UnchangedAnchor))
+ []
+ (EpaComments
+ []))
+ (NotPromoted)
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:37:13-14 })
+ (Unqual
+ {OccName: D7}))))
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:37:16-18 })
+ (HsTyVar
+ (EpAnn
+ (Anchor
+ { T17544.hs:37:16-18 }
+ (UnchangedAnchor))
+ []
+ (EpaComments
+ []))
+ (NotPromoted)
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:37:16-18 })
+ (Unqual
+ {OccName: Int}))))))
+ (Nothing)))])
[]))))]
(Nothing)))))
,(L
@@ -1634,70 +1640,72 @@
(Prefix)
(HsDataDefn
(NoExtField)
- (DataType)
(Nothing)
(Nothing)
(Nothing)
- [(L
- (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:43:5-18 })
- (ConDeclGADT
- (EpAnn
- (Anchor
- { T17544.hs:43:5-18 }
- (UnchangedAnchor))
- []
- (EpaComments
- []))
- [(L
- (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:43:5-8 })
- (Unqual
- {OccName: MkD8}))]
- (L
- (TokenLoc
- (EpaSpan { T17544.hs:43:10-11 }))
- (HsNormalTok))
- (L
- (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:43:13-18 })
- (HsOuterImplicit
- (NoExtField)))
- (Nothing)
- (PrefixConGADT
- [])
- (L
- (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:43:13-18 })
- (HsAppTy
- (NoExtField)
- (L
- (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:43:13-14 })
- (HsTyVar
- (EpAnn
- (Anchor
- { T17544.hs:43:13-14 }
- (UnchangedAnchor))
- []
- (EpaComments
- []))
- (NotPromoted)
- (L
- (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:43:13-14 })
- (Unqual
- {OccName: D8}))))
+ (DataTypeCons
+ [(L
+ (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:43:5-18 })
+ (ConDeclGADT
+ (EpAnn
+ (Anchor
+ { T17544.hs:43:5-18 }
+ (UnchangedAnchor))
+ []
+ (EpaComments
+ []))
+ (:|
(L
- (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:43:16-18 })
- (HsTyVar
- (EpAnn
- (Anchor
- { T17544.hs:43:16-18 }
- (UnchangedAnchor))
- []
- (EpaComments
- []))
- (NotPromoted)
- (L
- (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:43:16-18 })
- (Unqual
- {OccName: Int}))))))
- (Nothing)))]
+ (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:43:5-8 })
+ (Unqual
+ {OccName: MkD8}))
+ [])
+ (L
+ (TokenLoc
+ (EpaSpan { T17544.hs:43:10-11 }))
+ (HsNormalTok))
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:43:13-18 })
+ (HsOuterImplicit
+ (NoExtField)))
+ (Nothing)
+ (PrefixConGADT
+ [])
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:43:13-18 })
+ (HsAppTy
+ (NoExtField)
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:43:13-14 })
+ (HsTyVar
+ (EpAnn
+ (Anchor
+ { T17544.hs:43:13-14 }
+ (UnchangedAnchor))
+ []
+ (EpaComments
+ []))
+ (NotPromoted)
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:43:13-14 })
+ (Unqual
+ {OccName: D8}))))
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:43:16-18 })
+ (HsTyVar
+ (EpAnn
+ (Anchor
+ { T17544.hs:43:16-18 }
+ (UnchangedAnchor))
+ []
+ (EpaComments
+ []))
+ (NotPromoted)
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:43:16-18 })
+ (Unqual
+ {OccName: Int}))))))
+ (Nothing)))])
[]))))]
(Nothing)))))
,(L
@@ -1900,70 +1908,72 @@
(Prefix)
(HsDataDefn
(NoExtField)
- (DataType)
(Nothing)
(Nothing)
(Nothing)
- [(L
- (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:49:5-18 })
- (ConDeclGADT
- (EpAnn
- (Anchor
- { T17544.hs:49:5-18 }
- (UnchangedAnchor))
- []
- (EpaComments
- []))
- [(L
- (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:49:5-8 })
- (Unqual
- {OccName: MkD9}))]
- (L
- (TokenLoc
- (EpaSpan { T17544.hs:49:10-11 }))
- (HsNormalTok))
- (L
- (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:49:13-18 })
- (HsOuterImplicit
- (NoExtField)))
- (Nothing)
- (PrefixConGADT
- [])
- (L
- (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:49:13-18 })
- (HsAppTy
- (NoExtField)
- (L
- (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:49:13-14 })
- (HsTyVar
- (EpAnn
- (Anchor
- { T17544.hs:49:13-14 }
- (UnchangedAnchor))
- []
- (EpaComments
- []))
- (NotPromoted)
- (L
- (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:49:13-14 })
- (Unqual
- {OccName: D9}))))
+ (DataTypeCons
+ [(L
+ (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:49:5-18 })
+ (ConDeclGADT
+ (EpAnn
+ (Anchor
+ { T17544.hs:49:5-18 }
+ (UnchangedAnchor))
+ []
+ (EpaComments
+ []))
+ (:|
(L
- (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:49:16-18 })
- (HsTyVar
- (EpAnn
- (Anchor
- { T17544.hs:49:16-18 }
- (UnchangedAnchor))
- []
- (EpaComments
- []))
- (NotPromoted)
- (L
- (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:49:16-18 })
- (Unqual
- {OccName: Int}))))))
- (Nothing)))]
+ (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:49:5-8 })
+ (Unqual
+ {OccName: MkD9}))
+ [])
+ (L
+ (TokenLoc
+ (EpaSpan { T17544.hs:49:10-11 }))
+ (HsNormalTok))
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:49:13-18 })
+ (HsOuterImplicit
+ (NoExtField)))
+ (Nothing)
+ (PrefixConGADT
+ [])
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:49:13-18 })
+ (HsAppTy
+ (NoExtField)
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:49:13-14 })
+ (HsTyVar
+ (EpAnn
+ (Anchor
+ { T17544.hs:49:13-14 }
+ (UnchangedAnchor))
+ []
+ (EpaComments
+ []))
+ (NotPromoted)
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:49:13-14 })
+ (Unqual
+ {OccName: D9}))))
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:49:16-18 })
+ (HsTyVar
+ (EpAnn
+ (Anchor
+ { T17544.hs:49:16-18 }
+ (UnchangedAnchor))
+ []
+ (EpaComments
+ []))
+ (NotPromoted)
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:49:16-18 })
+ (Unqual
+ {OccName: Int}))))))
+ (Nothing)))])
[]))))]
(Nothing)))))
,(L
@@ -2166,70 +2176,72 @@
(Prefix)
(HsDataDefn
(NoExtField)
- (DataType)
(Nothing)
(Nothing)
(Nothing)
- [(L
- (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:55:5-20 })
- (ConDeclGADT
- (EpAnn
- (Anchor
- { T17544.hs:55:5-20 }
- (UnchangedAnchor))
- []
- (EpaComments
- []))
- [(L
- (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:55:5-9 })
- (Unqual
- {OccName: MkD10}))]
- (L
- (TokenLoc
- (EpaSpan { T17544.hs:55:11-12 }))
- (HsNormalTok))
- (L
- (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:55:14-20 })
- (HsOuterImplicit
- (NoExtField)))
- (Nothing)
- (PrefixConGADT
- [])
- (L
- (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:55:14-20 })
- (HsAppTy
- (NoExtField)
- (L
- (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:55:14-16 })
- (HsTyVar
- (EpAnn
- (Anchor
- { T17544.hs:55:14-16 }
- (UnchangedAnchor))
- []
- (EpaComments
- []))
- (NotPromoted)
- (L
- (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:55:14-16 })
- (Unqual
- {OccName: D10}))))
+ (DataTypeCons
+ [(L
+ (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:55:5-20 })
+ (ConDeclGADT
+ (EpAnn
+ (Anchor
+ { T17544.hs:55:5-20 }
+ (UnchangedAnchor))
+ []
+ (EpaComments
+ []))
+ (:|
(L
- (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:55:18-20 })
- (HsTyVar
- (EpAnn
- (Anchor
- { T17544.hs:55:18-20 }
- (UnchangedAnchor))
- []
- (EpaComments
- []))
- (NotPromoted)
- (L
- (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:55:18-20 })
- (Unqual
- {OccName: Int}))))))
- (Nothing)))]
+ (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:55:5-9 })
+ (Unqual
+ {OccName: MkD10}))
+ [])
+ (L
+ (TokenLoc
+ (EpaSpan { T17544.hs:55:11-12 }))
+ (HsNormalTok))
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:55:14-20 })
+ (HsOuterImplicit
+ (NoExtField)))
+ (Nothing)
+ (PrefixConGADT
+ [])
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:55:14-20 })
+ (HsAppTy
+ (NoExtField)
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:55:14-16 })
+ (HsTyVar
+ (EpAnn
+ (Anchor
+ { T17544.hs:55:14-16 }
+ (UnchangedAnchor))
+ []
+ (EpaComments
+ []))
+ (NotPromoted)
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:55:14-16 })
+ (Unqual
+ {OccName: D10}))))
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:55:18-20 })
+ (HsTyVar
+ (EpAnn
+ (Anchor
+ { T17544.hs:55:18-20 }
+ (UnchangedAnchor))
+ []
+ (EpaComments
+ []))
+ (NotPromoted)
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { T17544.hs:55:18-20 })
+ (Unqual
+ {OccName: Int}))))))
+ (Nothing)))])
[]))))]
(Nothing)))))
,(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 ce76e9de6d..e00ee8798a 100644
--- a/testsuite/tests/haddock/should_compile_flag_haddock/T17544_kw.stderr
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/T17544_kw.stderr
@@ -79,63 +79,65 @@
(Prefix)
(HsDataDefn
(NoExtField)
- (DataType)
(Nothing)
(Nothing)
(Nothing)
- [(L
- (SrcSpanAnn (EpAnnNotUsed) { T17544_kw.hs:16:9-20 })
- (ConDeclGADT
- (EpAnn
- (Anchor
- { T17544_kw.hs:16:9-20 }
- (UnchangedAnchor))
- []
- (EpaComments
- []))
- [(L
- (SrcSpanAnn (EpAnnNotUsed) { T17544_kw.hs:16:9-13 })
- (Unqual
- {OccName: MkFoo}))]
- (L
- (TokenLoc
- (EpaSpan { T17544_kw.hs:16:15-16 }))
- (HsNormalTok))
- (L
- (SrcSpanAnn (EpAnnNotUsed) { T17544_kw.hs:16:18-20 })
- (HsOuterImplicit
- (NoExtField)))
- (Nothing)
- (PrefixConGADT
- [])
- (L
- (SrcSpanAnn (EpAnnNotUsed) { T17544_kw.hs:16:18-20 })
- (HsTyVar
- (EpAnn
- (Anchor
- { T17544_kw.hs:16:18-20 }
- (UnchangedAnchor))
- []
- (EpaComments
- []))
- (NotPromoted)
+ (DataTypeCons
+ [(L
+ (SrcSpanAnn (EpAnnNotUsed) { T17544_kw.hs:16:9-20 })
+ (ConDeclGADT
+ (EpAnn
+ (Anchor
+ { T17544_kw.hs:16:9-20 }
+ (UnchangedAnchor))
+ []
+ (EpaComments
+ []))
+ (:|
(L
- (SrcSpanAnn (EpAnnNotUsed) { T17544_kw.hs:16:18-20 })
+ (SrcSpanAnn (EpAnnNotUsed) { T17544_kw.hs:16:9-13 })
(Unqual
- {OccName: Foo}))))
- (Just
+ {OccName: MkFoo}))
+ [])
(L
- { T17544_kw.hs:15:10-35 }
- (WithHsDocIdentifiers
- (MultiLineDocString
- (HsDocStringNext)
- (:|
- (L
- { T17544_kw.hs:15:14-35 }
- (HsDocStringChunk
- " Bad comment for MkFoo"))
+ (TokenLoc
+ (EpaSpan { T17544_kw.hs:16:15-16 }))
+ (HsNormalTok))
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { T17544_kw.hs:16:18-20 })
+ (HsOuterImplicit
+ (NoExtField)))
+ (Nothing)
+ (PrefixConGADT
+ [])
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { T17544_kw.hs:16:18-20 })
+ (HsTyVar
+ (EpAnn
+ (Anchor
+ { T17544_kw.hs:16:18-20 }
+ (UnchangedAnchor))
+ []
+ (EpaComments
[]))
- [])))))]
+ (NotPromoted)
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { T17544_kw.hs:16:18-20 })
+ (Unqual
+ {OccName: Foo}))))
+ (Just
+ (L
+ { T17544_kw.hs:15:10-35 }
+ (WithHsDocIdentifiers
+ (MultiLineDocString
+ (HsDocStringNext)
+ (:|
+ (L
+ { T17544_kw.hs:15:14-35 }
+ (HsDocStringChunk
+ " Bad comment for MkFoo"))
+ []))
+ [])))))])
[]))))
,(L
(SrcSpanAnn (EpAnn
@@ -167,11 +169,11 @@
(Prefix)
(HsDataDefn
(NoExtField)
- (NewType)
(Nothing)
(Nothing)
(Nothing)
- [(L
+ (NewTypeCon
+ (L
(SrcSpanAnn (EpAnnNotUsed) { T17544_kw.hs:19:9-26 })
(ConDeclGADT
(EpAnn
@@ -181,10 +183,12 @@
[]
(EpaComments
[]))
- [(L
+ (:|
+ (L
(SrcSpanAnn (EpAnnNotUsed) { T17544_kw.hs:19:9-13 })
(Unqual
- {OccName: MkBar}))]
+ {OccName: MkBar}))
+ [])
(L
(TokenLoc
(EpaSpan { T17544_kw.hs:19:15-16 }))
@@ -250,7 +254,7 @@
(HsDocStringChunk
" Bad comment for MkBar"))
[]))
- [])))))]
+ []))))))
[]))))
,(L
(SrcSpanAnn (EpAnn
diff --git a/testsuite/tests/parser/should_compile/DumpParsedAst.stderr b/testsuite/tests/parser/should_compile/DumpParsedAst.stderr
index 7ab8440879..926d97fb35 100644
--- a/testsuite/tests/parser/should_compile/DumpParsedAst.stderr
+++ b/testsuite/tests/parser/should_compile/DumpParsedAst.stderr
@@ -94,83 +94,83 @@
(Prefix)
(HsDataDefn
(NoExtField)
- (DataType)
(Nothing)
(Nothing)
(Nothing)
- [(L
- (SrcSpanAnn (EpAnn
- (Anchor
- { DumpParsedAst.hs:8:14-17 }
- (UnchangedAnchor))
- (AnnListItem
- [(AddVbarAnn
- (EpaSpan { DumpParsedAst.hs:8:19 }))])
- (EpaComments
- [])) { DumpParsedAst.hs:8:14-17 })
- (ConDeclH98
- (EpAnn
- (Anchor
- { DumpParsedAst.hs:8:14-17 }
- (UnchangedAnchor))
- []
- (EpaComments
- []))
- (L
- (SrcSpanAnn (EpAnnNotUsed) { DumpParsedAst.hs:8:14-17 })
- (Unqual
- {OccName: Zero}))
- (False)
- []
- (Nothing)
- (PrefixCon
- []
- [])
- (Nothing)))
- ,(L
- (SrcSpanAnn (EpAnnNotUsed) { DumpParsedAst.hs:8:21-30 })
- (ConDeclH98
- (EpAnn
- (Anchor
- { DumpParsedAst.hs:8:21-30 }
- (UnchangedAnchor))
+ (DataTypeCons
+ [(L
+ (SrcSpanAnn (EpAnn
+ (Anchor
+ { DumpParsedAst.hs:8:14-17 }
+ (UnchangedAnchor))
+ (AnnListItem
+ [(AddVbarAnn
+ (EpaSpan { DumpParsedAst.hs:8:19 }))])
+ (EpaComments
+ [])) { DumpParsedAst.hs:8:14-17 })
+ (ConDeclH98
+ (EpAnn
+ (Anchor
+ { DumpParsedAst.hs:8:14-17 }
+ (UnchangedAnchor))
+ []
+ (EpaComments
+ []))
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { DumpParsedAst.hs:8:14-17 })
+ (Unqual
+ {OccName: Zero}))
+ (False)
[]
- (EpaComments
- []))
- (L
- (SrcSpanAnn (EpAnnNotUsed) { DumpParsedAst.hs:8:21-24 })
- (Unqual
- {OccName: Succ}))
- (False)
- []
- (Nothing)
- (PrefixCon
+ (Nothing)
+ (PrefixCon
+ []
+ [])
+ (Nothing)))
+ ,(L
+ (SrcSpanAnn (EpAnnNotUsed) { DumpParsedAst.hs:8:21-30 })
+ (ConDeclH98
+ (EpAnn
+ (Anchor
+ { DumpParsedAst.hs:8:21-30 }
+ (UnchangedAnchor))
+ []
+ (EpaComments
+ []))
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { DumpParsedAst.hs:8:21-24 })
+ (Unqual
+ {OccName: Succ}))
+ (False)
[]
- [(HsScaled
- (HsLinearArrow
- (HsPct1
- (L
- (NoTokenLoc)
- (HsTok))
- (L
- (NoTokenLoc)
- (HsNormalTok))))
- (L
- (SrcSpanAnn (EpAnnNotUsed) { DumpParsedAst.hs:8:26-30 })
- (HsTyVar
- (EpAnn
- (Anchor
- { DumpParsedAst.hs:8:26-30 }
- (UnchangedAnchor))
- []
- (EpaComments
- []))
- (NotPromoted)
- (L
- (SrcSpanAnn (EpAnnNotUsed) { DumpParsedAst.hs:8:26-30 })
- (Unqual
- {OccName: Peano})))))])
- (Nothing)))]
+ (Nothing)
+ (PrefixCon
+ []
+ [(HsScaled
+ (HsLinearArrow
+ (HsPct1
+ (L
+ (NoTokenLoc)
+ (HsTok))
+ (L
+ (NoTokenLoc)
+ (HsNormalTok))))
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { DumpParsedAst.hs:8:26-30 })
+ (HsTyVar
+ (EpAnn
+ (Anchor
+ { DumpParsedAst.hs:8:26-30 }
+ (UnchangedAnchor))
+ []
+ (EpaComments
+ []))
+ (NotPromoted)
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { DumpParsedAst.hs:8:26-30 })
+ (Unqual
+ {OccName: Peano})))))])
+ (Nothing)))])
[]))))
,(L
(SrcSpanAnn (EpAnn
@@ -532,86 +532,86 @@
(Prefix)
(HsDataDefn
(NoExtField)
- (DataType)
(Nothing)
(Nothing)
(Nothing)
- [(L
- (SrcSpanAnn (EpAnnNotUsed) { DumpParsedAst.hs:15:21-29 })
- (ConDeclH98
- (EpAnn
- (Anchor
- { DumpParsedAst.hs:15:21-29 }
- (UnchangedAnchor))
- []
- (EpaComments
- []))
- (L
- (SrcSpanAnn (EpAnnNotUsed) { DumpParsedAst.hs:15:21-23 })
- (Unqual
- {OccName: MkT}))
- (False)
- []
- (Nothing)
- (PrefixCon
+ (DataTypeCons
+ [(L
+ (SrcSpanAnn (EpAnnNotUsed) { DumpParsedAst.hs:15:21-29 })
+ (ConDeclH98
+ (EpAnn
+ (Anchor
+ { DumpParsedAst.hs:15:21-29 }
+ (UnchangedAnchor))
+ []
+ (EpaComments
+ []))
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { DumpParsedAst.hs:15:21-23 })
+ (Unqual
+ {OccName: MkT}))
+ (False)
[]
- [(HsScaled
- (HsLinearArrow
- (HsPct1
- (L
- (NoTokenLoc)
- (HsTok))
- (L
- (NoTokenLoc)
- (HsNormalTok))))
- (L
- (SrcSpanAnn (EpAnnNotUsed) { DumpParsedAst.hs:15:25-29 })
- (HsParTy
- (EpAnn
- (Anchor
- { DumpParsedAst.hs:15:25 }
- (UnchangedAnchor))
- (AnnParen
- (AnnParens)
- (EpaSpan { DumpParsedAst.hs:15:25 })
- (EpaSpan { DumpParsedAst.hs:15:29 }))
- (EpaComments
- []))
- (L
- (SrcSpanAnn (EpAnnNotUsed) { DumpParsedAst.hs:15:26-28 })
- (HsAppTy
- (NoExtField)
- (L
- (SrcSpanAnn (EpAnnNotUsed) { DumpParsedAst.hs:15:26 })
- (HsTyVar
- (EpAnn
- (Anchor
- { DumpParsedAst.hs:15:26 }
- (UnchangedAnchor))
- []
- (EpaComments
- []))
- (NotPromoted)
- (L
- (SrcSpanAnn (EpAnnNotUsed) { DumpParsedAst.hs:15:26 })
- (Unqual
- {OccName: f}))))
- (L
- (SrcSpanAnn (EpAnnNotUsed) { DumpParsedAst.hs:15:28 })
- (HsTyVar
- (EpAnn
- (Anchor
- { DumpParsedAst.hs:15:28 }
- (UnchangedAnchor))
- []
- (EpaComments
- []))
- (NotPromoted)
- (L
- (SrcSpanAnn (EpAnnNotUsed) { DumpParsedAst.hs:15:28 })
- (Unqual
- {OccName: a})))))))))])
- (Nothing)))]
+ (Nothing)
+ (PrefixCon
+ []
+ [(HsScaled
+ (HsLinearArrow
+ (HsPct1
+ (L
+ (NoTokenLoc)
+ (HsTok))
+ (L
+ (NoTokenLoc)
+ (HsNormalTok))))
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { DumpParsedAst.hs:15:25-29 })
+ (HsParTy
+ (EpAnn
+ (Anchor
+ { DumpParsedAst.hs:15:25 }
+ (UnchangedAnchor))
+ (AnnParen
+ (AnnParens)
+ (EpaSpan { DumpParsedAst.hs:15:25 })
+ (EpaSpan { DumpParsedAst.hs:15:29 }))
+ (EpaComments
+ []))
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { DumpParsedAst.hs:15:26-28 })
+ (HsAppTy
+ (NoExtField)
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { DumpParsedAst.hs:15:26 })
+ (HsTyVar
+ (EpAnn
+ (Anchor
+ { DumpParsedAst.hs:15:26 }
+ (UnchangedAnchor))
+ []
+ (EpaComments
+ []))
+ (NotPromoted)
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { DumpParsedAst.hs:15:26 })
+ (Unqual
+ {OccName: f}))))
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { DumpParsedAst.hs:15:28 })
+ (HsTyVar
+ (EpAnn
+ (Anchor
+ { DumpParsedAst.hs:15:28 }
+ (UnchangedAnchor))
+ []
+ (EpaComments
+ []))
+ (NotPromoted)
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { DumpParsedAst.hs:15:28 })
+ (Unqual
+ {OccName: a})))))))))])
+ (Nothing)))])
[]))))
,(L
(SrcSpanAnn (EpAnn
@@ -1134,7 +1134,6 @@
(Prefix)
(HsDataDefn
(NoExtField)
- (NewType)
(Nothing)
(Nothing)
(Just
@@ -1226,7 +1225,8 @@
(SrcSpanAnn (EpAnnNotUsed) { DumpParsedAst.hs:21:57-60 })
(Unqual
{OccName: Type})))))))
- [(L
+ (NewTypeCon
+ (L
(SrcSpanAnn (EpAnnNotUsed) { DumpParsedAst.hs:22:3-45 })
(ConDeclGADT
(EpAnn
@@ -1236,10 +1236,12 @@
[]
(EpaComments
[]))
- [(L
+ (:|
+ (L
(SrcSpanAnn (EpAnnNotUsed) { DumpParsedAst.hs:22:3-5 })
(Unqual
- {OccName: Nat}))]
+ {OccName: Nat}))
+ [])
(L
(TokenLoc
(EpaSpan { DumpParsedAst.hs:22:7-8 }))
@@ -1441,7 +1443,7 @@
(SrcSpanAnn (EpAnnNotUsed) { DumpParsedAst.hs:22:45 })
(Unqual
{OccName: g}))))))
- (Nothing)))]
+ (Nothing))))
[]))))))
,(L
(SrcSpanAnn (EpAnn
@@ -1533,3 +1535,5 @@
{FastString: "hello"})))))))]
(EmptyLocalBinds
(NoExtField)))))])))))]))
+
+
diff --git a/testsuite/tests/parser/should_compile/DumpRenamedAst.stderr b/testsuite/tests/parser/should_compile/DumpRenamedAst.stderr
index 456117aa2c..88f23d3ee0 100644
--- a/testsuite/tests/parser/should_compile/DumpRenamedAst.stderr
+++ b/testsuite/tests/parser/should_compile/DumpRenamedAst.stderr
@@ -109,62 +109,62 @@
(Prefix)
(HsDataDefn
(NoExtField)
- (DataType)
(Nothing)
(Nothing)
(Nothing)
- [(L
- (SrcSpanAnn (EpAnn
- (Anchor
- { DumpRenamedAst.hs:10:14-17 }
- (UnchangedAnchor))
- (AnnListItem
- [(AddVbarAnn
- (EpaSpan { DumpRenamedAst.hs:10:19 }))])
- (EpaComments
- [])) { DumpRenamedAst.hs:10:14-17 })
- (ConDeclH98
- (EpAnnNotUsed)
- (L
- (SrcSpanAnn (EpAnnNotUsed) { DumpRenamedAst.hs:10:14-17 })
- {Name: DumpRenamedAst.Zero})
- (False)
- []
- (Nothing)
- (PrefixCon
+ (DataTypeCons
+ [(L
+ (SrcSpanAnn (EpAnn
+ (Anchor
+ { DumpRenamedAst.hs:10:14-17 }
+ (UnchangedAnchor))
+ (AnnListItem
+ [(AddVbarAnn
+ (EpaSpan { DumpRenamedAst.hs:10:19 }))])
+ (EpaComments
+ [])) { DumpRenamedAst.hs:10:14-17 })
+ (ConDeclH98
+ (EpAnnNotUsed)
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { DumpRenamedAst.hs:10:14-17 })
+ {Name: DumpRenamedAst.Zero})
+ (False)
[]
- [])
- (Nothing)))
- ,(L
- (SrcSpanAnn (EpAnnNotUsed) { DumpRenamedAst.hs:10:21-30 })
- (ConDeclH98
- (EpAnnNotUsed)
- (L
- (SrcSpanAnn (EpAnnNotUsed) { DumpRenamedAst.hs:10:21-24 })
- {Name: DumpRenamedAst.Succ})
- (False)
- []
- (Nothing)
- (PrefixCon
+ (Nothing)
+ (PrefixCon
+ []
+ [])
+ (Nothing)))
+ ,(L
+ (SrcSpanAnn (EpAnnNotUsed) { DumpRenamedAst.hs:10:21-30 })
+ (ConDeclH98
+ (EpAnnNotUsed)
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { DumpRenamedAst.hs:10:21-24 })
+ {Name: DumpRenamedAst.Succ})
+ (False)
[]
- [(HsScaled
- (HsLinearArrow
- (HsPct1
- (L
- (NoTokenLoc)
- (HsTok))
- (L
- (NoTokenLoc)
- (HsNormalTok))))
- (L
- (SrcSpanAnn (EpAnnNotUsed) { DumpRenamedAst.hs:10:26-30 })
- (HsTyVar
- (EpAnnNotUsed)
- (NotPromoted)
- (L
- (SrcSpanAnn (EpAnnNotUsed) { DumpRenamedAst.hs:10:26-30 })
- {Name: DumpRenamedAst.Peano}))))])
- (Nothing)))]
+ (Nothing)
+ (PrefixCon
+ []
+ [(HsScaled
+ (HsLinearArrow
+ (HsPct1
+ (L
+ (NoTokenLoc)
+ (HsTok))
+ (L
+ (NoTokenLoc)
+ (HsNormalTok))))
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { DumpRenamedAst.hs:10:26-30 })
+ (HsTyVar
+ (EpAnnNotUsed)
+ (NotPromoted)
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { DumpRenamedAst.hs:10:26-30 })
+ {Name: DumpRenamedAst.Peano}))))])
+ (Nothing)))])
[])))]
[]
[]
@@ -513,7 +513,6 @@
(Prefix)
(HsDataDefn
(NoExtField)
- (NewType)
(Nothing)
(Nothing)
(Just
@@ -575,13 +574,16 @@
(L
(SrcSpanAnn (EpAnnNotUsed) { DumpRenamedAst.hs:19:57-60 })
{Name: GHC.Types.Type}))))))
- [(L
+ (NewTypeCon
+ (L
(SrcSpanAnn (EpAnnNotUsed) { DumpRenamedAst.hs:20:3-45 })
(ConDeclGADT
(EpAnnNotUsed)
- [(L
+ (:|
+ (L
(SrcSpanAnn (EpAnnNotUsed) { DumpRenamedAst.hs:20:3-5 })
- {Name: DumpRenamedAst.Nat})]
+ {Name: DumpRenamedAst.Nat})
+ [])
(L
(TokenLoc
(EpaSpan { DumpRenamedAst.hs:20:7-8 }))
@@ -717,7 +719,7 @@
(L
(SrcSpanAnn (EpAnnNotUsed) { DumpRenamedAst.hs:20:45 })
{Name: g})))))
- (Nothing)))]
+ (Nothing))))
[])))))])
,(TyClGroup
(NoExtField)
@@ -782,56 +784,56 @@
(Prefix)
(HsDataDefn
(NoExtField)
- (DataType)
(Nothing)
(Nothing)
(Nothing)
- [(L
- (SrcSpanAnn (EpAnnNotUsed) { DumpRenamedAst.hs:22:21-29 })
- (ConDeclH98
- (EpAnnNotUsed)
- (L
- (SrcSpanAnn (EpAnnNotUsed) { DumpRenamedAst.hs:22:21-23 })
- {Name: DumpRenamedAst.MkT})
- (False)
- []
- (Nothing)
- (PrefixCon
+ (DataTypeCons
+ [(L
+ (SrcSpanAnn (EpAnnNotUsed) { DumpRenamedAst.hs:22:21-29 })
+ (ConDeclH98
+ (EpAnnNotUsed)
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { DumpRenamedAst.hs:22:21-23 })
+ {Name: DumpRenamedAst.MkT})
+ (False)
[]
- [(HsScaled
- (HsLinearArrow
- (HsPct1
- (L
- (NoTokenLoc)
- (HsTok))
- (L
- (NoTokenLoc)
- (HsNormalTok))))
- (L
- (SrcSpanAnn (EpAnnNotUsed) { DumpRenamedAst.hs:22:25-29 })
- (HsParTy
- (EpAnnNotUsed)
- (L
- (SrcSpanAnn (EpAnnNotUsed) { DumpRenamedAst.hs:22:26-28 })
- (HsAppTy
- (NoExtField)
- (L
- (SrcSpanAnn (EpAnnNotUsed) { DumpRenamedAst.hs:22:26 })
- (HsTyVar
- (EpAnnNotUsed)
- (NotPromoted)
- (L
- (SrcSpanAnn (EpAnnNotUsed) { DumpRenamedAst.hs:22:26 })
- {Name: f})))
- (L
- (SrcSpanAnn (EpAnnNotUsed) { DumpRenamedAst.hs:22:28 })
- (HsTyVar
- (EpAnnNotUsed)
- (NotPromoted)
- (L
- (SrcSpanAnn (EpAnnNotUsed) { DumpRenamedAst.hs:22:28 })
- {Name: a}))))))))])
- (Nothing)))]
+ (Nothing)
+ (PrefixCon
+ []
+ [(HsScaled
+ (HsLinearArrow
+ (HsPct1
+ (L
+ (NoTokenLoc)
+ (HsTok))
+ (L
+ (NoTokenLoc)
+ (HsNormalTok))))
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { DumpRenamedAst.hs:22:25-29 })
+ (HsParTy
+ (EpAnnNotUsed)
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { DumpRenamedAst.hs:22:26-28 })
+ (HsAppTy
+ (NoExtField)
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { DumpRenamedAst.hs:22:26 })
+ (HsTyVar
+ (EpAnnNotUsed)
+ (NotPromoted)
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { DumpRenamedAst.hs:22:26 })
+ {Name: f})))
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { DumpRenamedAst.hs:22:28 })
+ (HsTyVar
+ (EpAnnNotUsed)
+ (NotPromoted)
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { DumpRenamedAst.hs:22:28 })
+ {Name: a}))))))))])
+ (Nothing)))])
[])))]
[]
[]
diff --git a/testsuite/tests/parser/should_compile/T14189.stderr b/testsuite/tests/parser/should_compile/T14189.stderr
index 05401b78bb..29225d7f00 100644
--- a/testsuite/tests/parser/should_compile/T14189.stderr
+++ b/testsuite/tests/parser/should_compile/T14189.stderr
@@ -35,123 +35,123 @@
(Prefix)
(HsDataDefn
(NoExtField)
- (DataType)
(Nothing)
(Nothing)
(Nothing)
- [(L
- (SrcSpanAnn (EpAnn
- (Anchor
- { T14189.hs:6:15-20 }
- (UnchangedAnchor))
- (AnnListItem
- [(AddVbarAnn
- (EpaSpan { T14189.hs:6:22 }))])
- (EpaComments
- [])) { T14189.hs:6:15-20 })
- (ConDeclH98
- (EpAnnNotUsed)
- (L
- (SrcSpanAnn (EpAnnNotUsed) { T14189.hs:6:15-16 })
- {Name: T14189.MT})
- (False)
- []
- (Nothing)
- (PrefixCon
+ (DataTypeCons
+ [(L
+ (SrcSpanAnn (EpAnn
+ (Anchor
+ { T14189.hs:6:15-20 }
+ (UnchangedAnchor))
+ (AnnListItem
+ [(AddVbarAnn
+ (EpaSpan { T14189.hs:6:22 }))])
+ (EpaComments
+ [])) { T14189.hs:6:15-20 })
+ (ConDeclH98
+ (EpAnnNotUsed)
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { T14189.hs:6:15-16 })
+ {Name: T14189.MT})
+ (False)
[]
- [(HsScaled
- (HsLinearArrow
- (HsPct1
- (L
- (NoTokenLoc)
- (HsTok))
- (L
- (NoTokenLoc)
- (HsNormalTok))))
- (L
- (SrcSpanAnn (EpAnnNotUsed) { T14189.hs:6:18-20 })
- (HsTyVar
- (EpAnnNotUsed)
- (NotPromoted)
- (L
- (SrcSpanAnn (EpAnnNotUsed) { T14189.hs:6:18-20 })
- {Name: GHC.Types.Int}))))])
- (Nothing)))
- ,(L
- (SrcSpanAnn (EpAnn
- (Anchor
- { T14189.hs:6:24-25 }
- (UnchangedAnchor))
- (AnnListItem
- [(AddVbarAnn
- (EpaSpan { T14189.hs:6:27 }))])
- (EpaComments
- [])) { T14189.hs:6:24-25 })
- (ConDeclH98
- (EpAnnNotUsed)
- (L
- (SrcSpanAnn (EpAnnNotUsed) { T14189.hs:6:24-25 })
- {Name: T14189.NT})
- (False)
- []
- (Nothing)
- (PrefixCon
+ (Nothing)
+ (PrefixCon
+ []
+ [(HsScaled
+ (HsLinearArrow
+ (HsPct1
+ (L
+ (NoTokenLoc)
+ (HsTok))
+ (L
+ (NoTokenLoc)
+ (HsNormalTok))))
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { T14189.hs:6:18-20 })
+ (HsTyVar
+ (EpAnnNotUsed)
+ (NotPromoted)
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { T14189.hs:6:18-20 })
+ {Name: GHC.Types.Int}))))])
+ (Nothing)))
+ ,(L
+ (SrcSpanAnn (EpAnn
+ (Anchor
+ { T14189.hs:6:24-25 }
+ (UnchangedAnchor))
+ (AnnListItem
+ [(AddVbarAnn
+ (EpaSpan { T14189.hs:6:27 }))])
+ (EpaComments
+ [])) { T14189.hs:6:24-25 })
+ (ConDeclH98
+ (EpAnnNotUsed)
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { T14189.hs:6:24-25 })
+ {Name: T14189.NT})
+ (False)
[]
- [])
- (Nothing)))
- ,(L
- (SrcSpanAnn (EpAnnNotUsed) { T14189.hs:6:29-42 })
- (ConDeclH98
- (EpAnnNotUsed)
- (L
- (SrcSpanAnn (EpAnnNotUsed) { T14189.hs:6:29 })
- {Name: T14189.F})
- (False)
- []
- (Nothing)
- (RecCon
+ (Nothing)
+ (PrefixCon
+ []
+ [])
+ (Nothing)))
+ ,(L
+ (SrcSpanAnn (EpAnnNotUsed) { T14189.hs:6:29-42 })
+ (ConDeclH98
+ (EpAnnNotUsed)
(L
- (SrcSpanAnn (EpAnn
- (Anchor
- { T14189.hs:6:31 }
- (UnchangedAnchor))
- (AnnList
- (Just
- (Anchor
- { T14189.hs:6:33-40 }
- (UnchangedAnchor)))
- (Just
- (AddEpAnn AnnOpenC (EpaSpan { T14189.hs:6:31 })))
- (Just
- (AddEpAnn AnnCloseC (EpaSpan { T14189.hs:6:42 })))
- []
- [])
- (EpaComments
- [])) { T14189.hs:6:31-42 })
- [(L
- (SrcSpanAnn (EpAnnNotUsed) { T14189.hs:6:33-40 })
- (ConDeclField
- (EpAnnNotUsed)
- [(L
- (SrcSpanAnn
+ (SrcSpanAnn (EpAnnNotUsed) { T14189.hs:6:29 })
+ {Name: T14189.F})
+ (False)
+ []
+ (Nothing)
+ (RecCon
+ (L
+ (SrcSpanAnn (EpAnn
+ (Anchor
+ { T14189.hs:6:31 }
+ (UnchangedAnchor))
+ (AnnList
+ (Just
+ (Anchor
+ { T14189.hs:6:33-40 }
+ (UnchangedAnchor)))
+ (Just
+ (AddEpAnn AnnOpenC (EpaSpan { T14189.hs:6:31 })))
+ (Just
+ (AddEpAnn AnnCloseC (EpaSpan { T14189.hs:6:42 })))
+ []
+ [])
+ (EpaComments
+ [])) { T14189.hs:6:31-42 })
+ [(L
+ (SrcSpanAnn (EpAnnNotUsed) { T14189.hs:6:33-40 })
+ (ConDeclField
+ (EpAnnNotUsed)
+ [(L
+ (SrcSpanAnn
+ (EpAnnNotUsed)
+ { T14189.hs:6:33 })
+ (FieldOcc
+ {Name: T14189.f}
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { T14189.hs:6:33 })
+ (Unqual
+ {OccName: f}))))]
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { T14189.hs:6:38-40 })
+ (HsTyVar
(EpAnnNotUsed)
- { T14189.hs:6:33 })
- (FieldOcc
- {Name: T14189.f}
+ (NotPromoted)
(L
- (SrcSpanAnn (EpAnnNotUsed) { T14189.hs:6:33 })
- (Unqual
- {OccName: f}))))]
- (L
- (SrcSpanAnn (EpAnnNotUsed) { T14189.hs:6:38-40 })
- (HsTyVar
- (EpAnnNotUsed)
- (NotPromoted)
- (L
- (SrcSpanAnn (EpAnnNotUsed) { T14189.hs:6:38-40 })
- {Name: GHC.Types.Int})))
- (Nothing)))]))
- (Nothing)))]
+ (SrcSpanAnn (EpAnnNotUsed) { T14189.hs:6:38-40 })
+ {Name: GHC.Types.Int})))
+ (Nothing)))]))
+ (Nothing)))])
[])))]
[]
[]
diff --git a/testsuite/tests/parser/should_compile/T15323.stderr b/testsuite/tests/parser/should_compile/T15323.stderr
index ee0748d050..fbcfa63276 100644
--- a/testsuite/tests/parser/should_compile/T15323.stderr
+++ b/testsuite/tests/parser/should_compile/T15323.stderr
@@ -81,154 +81,156 @@
(Prefix)
(HsDataDefn
(NoExtField)
- (DataType)
(Nothing)
(Nothing)
(Nothing)
- [(L
- (SrcSpanAnn (EpAnnNotUsed) { T15323.hs:6:5-54 })
- (ConDeclGADT
- (EpAnn
- (Anchor
- { T15323.hs:6:5-54 }
- (UnchangedAnchor))
- []
- (EpaComments
- []))
- [(L
- (SrcSpanAnn (EpAnnNotUsed) { T15323.hs:6:5-14 })
- (Unqual
- {OccName: TestParens}))]
- (L
- (TokenLoc
- (EpaSpan { T15323.hs:6:17-18 }))
- (HsNormalTok))
- (L
- (SrcSpanAnn (EpAnnNotUsed) { T15323.hs:6:20-54 })
- (HsOuterExplicit
- (EpAnn
- (Anchor
- { T15323.hs:6:20-25 }
- (UnchangedAnchor))
- ((,)
- (AddEpAnn AnnForall (EpaSpan { T15323.hs:6:20-25 }))
- (AddEpAnn AnnDot (EpaSpan { T15323.hs:6:29 })))
- (EpaComments
- []))
- [(L
- (SrcSpanAnn (EpAnnNotUsed) { T15323.hs:6:27 })
- (UserTyVar
+ (DataTypeCons
+ [(L
+ (SrcSpanAnn (EpAnnNotUsed) { T15323.hs:6:5-54 })
+ (ConDeclGADT
+ (EpAnn
+ (Anchor
+ { T15323.hs:6:5-54 }
+ (UnchangedAnchor))
+ []
+ (EpaComments
+ []))
+ (:|
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { T15323.hs:6:5-14 })
+ (Unqual
+ {OccName: TestParens}))
+ [])
+ (L
+ (TokenLoc
+ (EpaSpan { T15323.hs:6:17-18 }))
+ (HsNormalTok))
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { T15323.hs:6:20-54 })
+ (HsOuterExplicit
+ (EpAnn
+ (Anchor
+ { T15323.hs:6:20-25 }
+ (UnchangedAnchor))
+ ((,)
+ (AddEpAnn AnnForall (EpaSpan { T15323.hs:6:20-25 }))
+ (AddEpAnn AnnDot (EpaSpan { T15323.hs:6:29 })))
+ (EpaComments
+ []))
+ [(L
+ (SrcSpanAnn (EpAnnNotUsed) { T15323.hs:6:27 })
+ (UserTyVar
+ (EpAnn
+ (Anchor
+ { T15323.hs:6:27 }
+ (UnchangedAnchor))
+ []
+ (EpaComments
+ []))
+ (SpecifiedSpec)
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { T15323.hs:6:27 })
+ (Unqual
+ {OccName: v}))))]))
+ (Just
+ (L
+ (SrcSpanAnn (EpAnn
+ (Anchor
+ { T15323.hs:6:31-36 }
+ (UnchangedAnchor))
+ (AnnContext
+ (Just
+ ((,)
+ (NormalSyntax)
+ (EpaSpan { T15323.hs:6:38-39 })))
+ []
+ [])
+ (EpaComments
+ [])) { T15323.hs:6:31-36 })
+ [(L
+ (SrcSpanAnn (EpAnnNotUsed) { T15323.hs:6:31-36 })
+ (HsParTy
+ (EpAnn
+ (Anchor
+ { T15323.hs:6:31 }
+ (UnchangedAnchor))
+ (AnnParen
+ (AnnParens)
+ (EpaSpan { T15323.hs:6:31 })
+ (EpaSpan { T15323.hs:6:36 }))
+ (EpaComments
+ []))
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { T15323.hs:6:32-35 })
+ (HsAppTy
+ (NoExtField)
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { T15323.hs:6:32-33 })
+ (HsTyVar
+ (EpAnn
+ (Anchor
+ { T15323.hs:6:32-33 }
+ (UnchangedAnchor))
+ []
+ (EpaComments
+ []))
+ (NotPromoted)
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { T15323.hs:6:32-33 })
+ (Unqual
+ {OccName: Eq}))))
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { T15323.hs:6:35 })
+ (HsTyVar
+ (EpAnn
+ (Anchor
+ { T15323.hs:6:35 }
+ (UnchangedAnchor))
+ []
+ (EpaComments
+ []))
+ (NotPromoted)
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { T15323.hs:6:35 })
+ (Unqual
+ {OccName: v}))))))))]))
+ (PrefixConGADT
+ [])
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { T15323.hs:6:41-54 })
+ (HsAppTy
+ (NoExtField)
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { T15323.hs:6:41-52 })
+ (HsTyVar
(EpAnn
(Anchor
- { T15323.hs:6:27 }
+ { T15323.hs:6:41-52 }
(UnchangedAnchor))
[]
(EpaComments
[]))
- (SpecifiedSpec)
+ (NotPromoted)
(L
- (SrcSpanAnn (EpAnnNotUsed) { T15323.hs:6:27 })
+ (SrcSpanAnn (EpAnnNotUsed) { T15323.hs:6:41-52 })
(Unqual
- {OccName: v}))))]))
- (Just
- (L
- (SrcSpanAnn (EpAnn
- (Anchor
- { T15323.hs:6:31-36 }
- (UnchangedAnchor))
- (AnnContext
- (Just
- ((,)
- (NormalSyntax)
- (EpaSpan { T15323.hs:6:38-39 })))
- []
- [])
- (EpaComments
- [])) { T15323.hs:6:31-36 })
- [(L
- (SrcSpanAnn (EpAnnNotUsed) { T15323.hs:6:31-36 })
- (HsParTy
+ {OccName: MaybeDefault}))))
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { T15323.hs:6:54 })
+ (HsTyVar
(EpAnn
(Anchor
- { T15323.hs:6:31 }
+ { T15323.hs:6:54 }
(UnchangedAnchor))
- (AnnParen
- (AnnParens)
- (EpaSpan { T15323.hs:6:31 })
- (EpaSpan { T15323.hs:6:36 }))
+ []
(EpaComments
[]))
+ (NotPromoted)
(L
- (SrcSpanAnn (EpAnnNotUsed) { T15323.hs:6:32-35 })
- (HsAppTy
- (NoExtField)
- (L
- (SrcSpanAnn (EpAnnNotUsed) { T15323.hs:6:32-33 })
- (HsTyVar
- (EpAnn
- (Anchor
- { T15323.hs:6:32-33 }
- (UnchangedAnchor))
- []
- (EpaComments
- []))
- (NotPromoted)
- (L
- (SrcSpanAnn (EpAnnNotUsed) { T15323.hs:6:32-33 })
- (Unqual
- {OccName: Eq}))))
- (L
- (SrcSpanAnn (EpAnnNotUsed) { T15323.hs:6:35 })
- (HsTyVar
- (EpAnn
- (Anchor
- { T15323.hs:6:35 }
- (UnchangedAnchor))
- []
- (EpaComments
- []))
- (NotPromoted)
- (L
- (SrcSpanAnn (EpAnnNotUsed) { T15323.hs:6:35 })
- (Unqual
- {OccName: v}))))))))]))
- (PrefixConGADT
- [])
- (L
- (SrcSpanAnn (EpAnnNotUsed) { T15323.hs:6:41-54 })
- (HsAppTy
- (NoExtField)
- (L
- (SrcSpanAnn (EpAnnNotUsed) { T15323.hs:6:41-52 })
- (HsTyVar
- (EpAnn
- (Anchor
- { T15323.hs:6:41-52 }
- (UnchangedAnchor))
- []
- (EpaComments
- []))
- (NotPromoted)
- (L
- (SrcSpanAnn (EpAnnNotUsed) { T15323.hs:6:41-52 })
- (Unqual
- {OccName: MaybeDefault}))))
- (L
- (SrcSpanAnn (EpAnnNotUsed) { T15323.hs:6:54 })
- (HsTyVar
- (EpAnn
- (Anchor
- { T15323.hs:6:54 }
- (UnchangedAnchor))
- []
- (EpaComments
- []))
- (NotPromoted)
- (L
- (SrcSpanAnn (EpAnnNotUsed) { T15323.hs:6:54 })
- (Unqual
- {OccName: v}))))))
- (Nothing)))]
+ (SrcSpanAnn (EpAnnNotUsed) { T15323.hs:6:54 })
+ (Unqual
+ {OccName: v}))))))
+ (Nothing)))])
[]))))]))
diff --git a/testsuite/tests/parser/should_compile/T20452.stderr b/testsuite/tests/parser/should_compile/T20452.stderr
index 810b831cd7..c7808c1019 100644
--- a/testsuite/tests/parser/should_compile/T20452.stderr
+++ b/testsuite/tests/parser/should_compile/T20452.stderr
@@ -98,31 +98,31 @@
(Prefix)
(HsDataDefn
(NoExtField)
- (DataType)
(Nothing)
(Nothing)
(Nothing)
- [(L
- (SrcSpanAnn (EpAnnNotUsed) { T20452.hs:5:26-31 })
- (ConDeclH98
- (EpAnn
- (Anchor
- { T20452.hs:5:26-31 }
- (UnchangedAnchor))
- []
- (EpaComments
- []))
- (L
- (SrcSpanAnn (EpAnnNotUsed) { T20452.hs:5:26-31 })
- (Unqual
- {OccName: Proxy1}))
- (False)
- []
- (Nothing)
- (PrefixCon
+ (DataTypeCons
+ [(L
+ (SrcSpanAnn (EpAnnNotUsed) { T20452.hs:5:26-31 })
+ (ConDeclH98
+ (EpAnn
+ (Anchor
+ { T20452.hs:5:26-31 }
+ (UnchangedAnchor))
+ []
+ (EpaComments
+ []))
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { T20452.hs:5:26-31 })
+ (Unqual
+ {OccName: Proxy1}))
+ (False)
[]
- [])
- (Nothing)))]
+ (Nothing)
+ (PrefixCon
+ []
+ [])
+ (Nothing)))])
[]))))
,(L
(SrcSpanAnn (EpAnn
@@ -187,31 +187,31 @@
(Prefix)
(HsDataDefn
(NoExtField)
- (DataType)
(Nothing)
(Nothing)
(Nothing)
- [(L
- (SrcSpanAnn (EpAnnNotUsed) { T20452.hs:6:26-31 })
- (ConDeclH98
- (EpAnn
- (Anchor
- { T20452.hs:6:26-31 }
- (UnchangedAnchor))
- []
- (EpaComments
- []))
- (L
- (SrcSpanAnn (EpAnnNotUsed) { T20452.hs:6:26-31 })
- (Unqual
- {OccName: Proxy2}))
- (False)
- []
- (Nothing)
- (PrefixCon
+ (DataTypeCons
+ [(L
+ (SrcSpanAnn (EpAnnNotUsed) { T20452.hs:6:26-31 })
+ (ConDeclH98
+ (EpAnn
+ (Anchor
+ { T20452.hs:6:26-31 }
+ (UnchangedAnchor))
+ []
+ (EpaComments
+ []))
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { T20452.hs:6:26-31 })
+ (Unqual
+ {OccName: Proxy2}))
+ (False)
[]
- [])
- (Nothing)))]
+ (Nothing)
+ (PrefixCon
+ []
+ [])
+ (Nothing)))])
[]))))
,(L
(SrcSpanAnn (EpAnn
diff --git a/testsuite/tests/parser/should_fail/T22070.hs b/testsuite/tests/parser/should_fail/T22070.hs
new file mode 100644
index 0000000000..3d03eeca53
--- /dev/null
+++ b/testsuite/tests/parser/should_fail/T22070.hs
@@ -0,0 +1,3 @@
+module T22070 where
+
+newtype FooBar = Foo | Bar
diff --git a/testsuite/tests/parser/should_fail/T22070.stderr b/testsuite/tests/parser/should_fail/T22070.stderr
new file mode 100644
index 0000000000..71ff16e7b3
--- /dev/null
+++ b/testsuite/tests/parser/should_fail/T22070.stderr
@@ -0,0 +1,4 @@
+
+T22070.hs:3:1: error: [GHC-05380]
+ A newtype must have exactly one constructor, but ‘FooBar’ has two
+ In the newtype declaration for ‘FooBar’
diff --git a/testsuite/tests/parser/should_fail/all.T b/testsuite/tests/parser/should_fail/all.T
index 4d70833bed..8713d91f2b 100644
--- a/testsuite/tests/parser/should_fail/all.T
+++ b/testsuite/tests/parser/should_fail/all.T
@@ -208,3 +208,4 @@ test('OpaqueParseFail4', normal, compile_fail, [''])
test('T20385A', normal, compile_fail, [''])
test('T20385B', normal, compile_fail, [''])
test('T16999', normal, compile_fail, [''])
+test('T22070', normal, compile_fail, [''])
diff --git a/testsuite/tests/printer/T18791.stderr b/testsuite/tests/printer/T18791.stderr
index f4264de86d..2d8d3060ab 100644
--- a/testsuite/tests/printer/T18791.stderr
+++ b/testsuite/tests/printer/T18791.stderr
@@ -67,78 +67,80 @@
(Prefix)
(HsDataDefn
(NoExtField)
- (DataType)
(Nothing)
(Nothing)
(Nothing)
- [(L
- (SrcSpanAnn (EpAnnNotUsed) { T18791.hs:5:3-17 })
- (ConDeclGADT
- (EpAnn
- (Anchor
- { T18791.hs:5:3-17 }
- (UnchangedAnchor))
- []
- (EpaComments
- []))
- [(L
- (SrcSpanAnn (EpAnnNotUsed) { T18791.hs:5:3-5 })
- (Unqual
- {OccName: MkT}))]
- (L
- (TokenLoc
- (EpaSpan { T18791.hs:5:7-8 }))
- (HsNormalTok))
- (L
- (SrcSpanAnn (EpAnnNotUsed) { T18791.hs:5:10-17 })
- (HsOuterImplicit
- (NoExtField)))
- (Nothing)
- (PrefixConGADT
- [(HsScaled
- (HsUnrestrictedArrow
- (L
- (TokenLoc
- (EpaSpan { T18791.hs:5:14-15 }))
- (HsNormalTok)))
- (L
- (SrcSpanAnn (EpAnn
- (Anchor
- { T18791.hs:5:10-12 }
- (UnchangedAnchor))
- (AnnListItem
- [])
- (EpaComments
- [])) { T18791.hs:5:10-12 })
- (HsTyVar
- (EpAnn
- (Anchor
- { T18791.hs:5:10-12 }
- (UnchangedAnchor))
- []
- (EpaComments
- []))
- (NotPromoted)
- (L
- (SrcSpanAnn (EpAnnNotUsed) { T18791.hs:5:10-12 })
- (Unqual
- {OccName: Int})))))])
- (L
- (SrcSpanAnn (EpAnnNotUsed) { T18791.hs:5:17 })
- (HsTyVar
- (EpAnn
- (Anchor
- { T18791.hs:5:17 }
- (UnchangedAnchor))
- []
- (EpaComments
- []))
- (NotPromoted)
+ (DataTypeCons
+ [(L
+ (SrcSpanAnn (EpAnnNotUsed) { T18791.hs:5:3-17 })
+ (ConDeclGADT
+ (EpAnn
+ (Anchor
+ { T18791.hs:5:3-17 }
+ (UnchangedAnchor))
+ []
+ (EpaComments
+ []))
+ (:|
(L
- (SrcSpanAnn (EpAnnNotUsed) { T18791.hs:5:17 })
+ (SrcSpanAnn (EpAnnNotUsed) { T18791.hs:5:3-5 })
(Unqual
- {OccName: T}))))
- (Nothing)))]
+ {OccName: MkT}))
+ [])
+ (L
+ (TokenLoc
+ (EpaSpan { T18791.hs:5:7-8 }))
+ (HsNormalTok))
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { T18791.hs:5:10-17 })
+ (HsOuterImplicit
+ (NoExtField)))
+ (Nothing)
+ (PrefixConGADT
+ [(HsScaled
+ (HsUnrestrictedArrow
+ (L
+ (TokenLoc
+ (EpaSpan { T18791.hs:5:14-15 }))
+ (HsNormalTok)))
+ (L
+ (SrcSpanAnn (EpAnn
+ (Anchor
+ { T18791.hs:5:10-12 }
+ (UnchangedAnchor))
+ (AnnListItem
+ [])
+ (EpaComments
+ [])) { T18791.hs:5:10-12 })
+ (HsTyVar
+ (EpAnn
+ (Anchor
+ { T18791.hs:5:10-12 }
+ (UnchangedAnchor))
+ []
+ (EpaComments
+ []))
+ (NotPromoted)
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { T18791.hs:5:10-12 })
+ (Unqual
+ {OccName: Int})))))])
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { T18791.hs:5:17 })
+ (HsTyVar
+ (EpAnn
+ (Anchor
+ { T18791.hs:5:17 }
+ (UnchangedAnchor))
+ []
+ (EpaComments
+ []))
+ (NotPromoted)
+ (L
+ (SrcSpanAnn (EpAnnNotUsed) { T18791.hs:5:17 })
+ (Unqual
+ {OccName: T}))))
+ (Nothing)))])
[]))))]))
diff --git a/testsuite/tests/typecheck/should_fail/T2126.stderr b/testsuite/tests/typecheck/should_fail/T2126.stderr
index c910148317..801243e651 100644
--- a/testsuite/tests/typecheck/should_fail/T2126.stderr
+++ b/testsuite/tests/typecheck/should_fail/T2126.stderr
@@ -1,4 +1,4 @@
-T2126.hs:5:1:
+T2126.hs:5:1: error: [GHC-05380]
A newtype must have exactly one constructor, but ‘X’ has none
In the newtype declaration for ‘X’
View Lorry Controller Status