diff options
author | Ryan Scott <ryan.gl.scott@gmail.com> | 2019-03-19 17:47:55 -0400 |
---|---|---|
committer | Ben Gamari <ben@well-typed.com> | 2019-07-09 11:52:45 -0400 |
commit | 6a03d77b9a9915e4b37fe1ea6688c135e7b00654 (patch) | |
tree | 4154abaa768adbfadc4eb17db620c3ed08b82c5f /testsuite/tests/parser | |
parent | 5af815f2e43e9f1b5ca9ec0803f9fccabb49e2fe (diff) | |
download | haskell-6a03d77b9a9915e4b37fe1ea6688c135e7b00654.tar.gz |
Use an empty data type in TTG extension constructors (#15247)
To avoid having to `panic` any time a TTG extension constructor is
consumed, this MR introduces an uninhabited 'NoExtCon' type and uses
that in every extension constructor's type family instance where it
is appropriate. This also introduces a 'noExtCon' function which
eliminates a 'NoExtCon', much like 'Data.Void.absurd' eliminates
a 'Void'.
I also renamed the existing `NoExt` type to `NoExtField` to better
distinguish it from `NoExtCon`. Unsurprisingly, there is a lot of
code churn resulting from this.
Bumps the Haddock submodule. Fixes #15247.
Diffstat (limited to 'testsuite/tests/parser')
6 files changed, 534 insertions, 524 deletions
diff --git a/testsuite/tests/parser/should_compile/DumpParsedAst.stderr b/testsuite/tests/parser/should_compile/DumpParsedAst.stderr index d290e61da1..d7996df404 100644 --- a/testsuite/tests/parser/should_compile/DumpParsedAst.stderr +++ b/testsuite/tests/parser/should_compile/DumpParsedAst.stderr @@ -9,7 +9,7 @@ (Nothing) [({ DumpParsedAst.hs:5:1-16 } (ImportDecl - (NoExt) + (NoExtField) (NoSourceText) ({ DumpParsedAst.hs:5:8-16 } {ModuleName: Data.Kind}) @@ -22,18 +22,18 @@ (Nothing)))] [({ DumpParsedAst.hs:7:1-30 } (TyClD - (NoExt) + (NoExtField) (DataDecl - (NoExt) + (NoExtField) ({ DumpParsedAst.hs:7:6-10 } (Unqual {OccName: Peano})) (HsQTvs - (NoExt) + (NoExtField) []) (Prefix) (HsDataDefn - (NoExt) + (NoExtField) (DataType) ({ <no location info> } []) @@ -41,7 +41,7 @@ (Nothing) [({ DumpParsedAst.hs:7:14-17 } (ConDeclH98 - (NoExt) + (NoExtField) ({ DumpParsedAst.hs:7:14-17 } (Unqual {OccName: Zero})) @@ -54,7 +54,7 @@ (Nothing))) ,({ DumpParsedAst.hs:7:21-30 } (ConDeclH98 - (NoExt) + (NoExtField) ({ DumpParsedAst.hs:7:21-24 } (Unqual {OccName: Succ})) @@ -65,7 +65,7 @@ (PrefixCon [({ DumpParsedAst.hs:7:26-30 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ DumpParsedAst.hs:7:26-30 } (Unqual @@ -75,18 +75,18 @@ []))))) ,({ DumpParsedAst.hs:9:1-39 } (TyClD - (NoExt) + (NoExtField) (FamDecl - (NoExt) + (NoExtField) (FamilyDecl - (NoExt) + (NoExtField) (ClosedTypeFamily (Just [({ DumpParsedAst.hs:10:3-36 } (HsIB - (NoExt) + (NoExtField) (FamEqn - (NoExt) + (NoExtField) ({ DumpParsedAst.hs:10:3-8 } (Unqual {OccName: Length})) @@ -94,13 +94,13 @@ [(HsValArg ({ DumpParsedAst.hs:10:10-17 } (HsParTy - (NoExt) + (NoExtField) ({ DumpParsedAst.hs:10:11-16 } (HsOpTy - (NoExt) + (NoExtField) ({ DumpParsedAst.hs:10:11 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ DumpParsedAst.hs:10:11 } (Unqual @@ -110,7 +110,7 @@ {Name: :})) ({ DumpParsedAst.hs:10:15-16 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ DumpParsedAst.hs:10:15-16 } (Unqual @@ -118,39 +118,39 @@ (Prefix) ({ DumpParsedAst.hs:10:21-36 } (HsAppTy - (NoExt) + (NoExtField) ({ DumpParsedAst.hs:10:21-24 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ DumpParsedAst.hs:10:21-24 } (Unqual {OccName: Succ})))) ({ DumpParsedAst.hs:10:26-36 } (HsParTy - (NoExt) + (NoExtField) ({ DumpParsedAst.hs:10:27-35 } (HsAppTy - (NoExt) + (NoExtField) ({ DumpParsedAst.hs:10:27-32 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ DumpParsedAst.hs:10:27-32 } (Unqual {OccName: Length})))) ({ DumpParsedAst.hs:10:34-35 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ DumpParsedAst.hs:10:34-35 } (Unqual {OccName: as}))))))))))))) ,({ DumpParsedAst.hs:11:3-24 } (HsIB - (NoExt) + (NoExtField) (FamEqn - (NoExt) + (NoExtField) ({ DumpParsedAst.hs:11:3-8 } (Unqual {OccName: Length})) @@ -158,13 +158,13 @@ [(HsValArg ({ DumpParsedAst.hs:11:10-12 } (HsExplicitListTy - (NoExt) + (NoExtField) (IsPromoted) [])))] (Prefix) ({ DumpParsedAst.hs:11:21-24 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ DumpParsedAst.hs:11:21-24 } (Unqual @@ -173,19 +173,19 @@ (Unqual {OccName: Length})) (HsQTvs - (NoExt) + (NoExtField) [({ DumpParsedAst.hs:9:21-29 } (KindedTyVar - (NoExt) + (NoExtField) ({ DumpParsedAst.hs:9:21-22 } (Unqual {OccName: as})) ({ DumpParsedAst.hs:9:27-29 } (HsListTy - (NoExt) + (NoExtField) ({ DumpParsedAst.hs:9:28 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ DumpParsedAst.hs:9:28 } (Unqual @@ -193,10 +193,10 @@ (Prefix) ({ DumpParsedAst.hs:9:32-39 } (KindSig - (NoExt) + (NoExtField) ({ DumpParsedAst.hs:9:35-39 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ DumpParsedAst.hs:9:35-39 } (Unqual @@ -204,36 +204,36 @@ (Nothing))))) ,({ DumpParsedAst.hs:14:1-29 } (TyClD - (NoExt) + (NoExtField) (DataDecl - (NoExt) + (NoExtField) ({ DumpParsedAst.hs:14:6 } (Unqual {OccName: T})) (HsQTvs - (NoExt) + (NoExtField) [({ DumpParsedAst.hs:14:8 } (UserTyVar - (NoExt) + (NoExtField) ({ DumpParsedAst.hs:14:8 } (Unqual {OccName: f})))) ,({ DumpParsedAst.hs:14:11-16 } (KindedTyVar - (NoExt) + (NoExtField) ({ DumpParsedAst.hs:14:11 } (Unqual {OccName: a})) ({ DumpParsedAst.hs:14:16 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ DumpParsedAst.hs:14:16 } (Unqual {OccName: k}))))))]) (Prefix) (HsDataDefn - (NoExt) + (NoExtField) (DataType) ({ <no location info> } []) @@ -241,7 +241,7 @@ (Nothing) [({ DumpParsedAst.hs:14:21-29 } (ConDeclH98 - (NoExt) + (NoExtField) ({ DumpParsedAst.hs:14:21-23 } (Unqual {OccName: MkT})) @@ -252,20 +252,20 @@ (PrefixCon [({ DumpParsedAst.hs:14:25-29 } (HsParTy - (NoExt) + (NoExtField) ({ DumpParsedAst.hs:14:26-28 } (HsAppTy - (NoExt) + (NoExtField) ({ DumpParsedAst.hs:14:26 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ DumpParsedAst.hs:14:26 } (Unqual {OccName: f})))) ({ DumpParsedAst.hs:14:28 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ DumpParsedAst.hs:14:28 } (Unqual @@ -275,18 +275,18 @@ []))))) ,({ DumpParsedAst.hs:16:1-48 } (TyClD - (NoExt) + (NoExtField) (FamDecl - (NoExt) + (NoExtField) (FamilyDecl - (NoExt) + (NoExtField) (ClosedTypeFamily (Just [({ DumpParsedAst.hs:17:3-30 } (HsIB - (NoExt) + (NoExtField) (FamEqn - (NoExt) + (NoExtField) ({ DumpParsedAst.hs:17:3-4 } (Unqual {OccName: F1})) @@ -295,7 +295,7 @@ { DumpParsedAst.hs:17:6-11 } ({ DumpParsedAst.hs:17:7-11 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ DumpParsedAst.hs:17:7-11 } (Unqual @@ -303,7 +303,7 @@ ,(HsValArg ({ DumpParsedAst.hs:17:13 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ DumpParsedAst.hs:17:13 } (Unqual @@ -311,7 +311,7 @@ ,(HsValArg ({ DumpParsedAst.hs:17:15 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ DumpParsedAst.hs:17:15 } (Unqual @@ -319,37 +319,37 @@ (Prefix) ({ DumpParsedAst.hs:17:19-30 } (HsAppTy - (NoExt) + (NoExtField) ({ DumpParsedAst.hs:17:19-28 } (HsAppTy - (NoExt) + (NoExtField) ({ DumpParsedAst.hs:17:19-26 } (HsAppKindTy { DumpParsedAst.hs:17:21-26 } ({ DumpParsedAst.hs:17:19 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ DumpParsedAst.hs:17:19 } (Unqual {OccName: T})))) ({ DumpParsedAst.hs:17:22-26 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ DumpParsedAst.hs:17:22-26 } (Unqual {OccName: Peano})))))) ({ DumpParsedAst.hs:17:28 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ DumpParsedAst.hs:17:28 } (Unqual {OccName: f})))))) ({ DumpParsedAst.hs:17:30 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ DumpParsedAst.hs:17:30 } (Unqual @@ -358,39 +358,39 @@ (Unqual {OccName: F1})) (HsQTvs - (NoExt) + (NoExtField) [({ DumpParsedAst.hs:16:17-22 } (KindedTyVar - (NoExt) + (NoExtField) ({ DumpParsedAst.hs:16:17 } (Unqual {OccName: a})) ({ DumpParsedAst.hs:16:22 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ DumpParsedAst.hs:16:22 } (Unqual {OccName: k})))))) ,({ DumpParsedAst.hs:16:26-39 } (KindedTyVar - (NoExt) + (NoExtField) ({ DumpParsedAst.hs:16:26 } (Unqual {OccName: f})) ({ DumpParsedAst.hs:16:31-39 } (HsFunTy - (NoExt) + (NoExtField) ({ DumpParsedAst.hs:16:31 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ DumpParsedAst.hs:16:31 } (Unqual {OccName: k})))) ({ DumpParsedAst.hs:16:36-39 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ DumpParsedAst.hs:16:36-39 } (Unqual @@ -398,10 +398,10 @@ (Prefix) ({ DumpParsedAst.hs:16:42-48 } (KindSig - (NoExt) + (NoExtField) ({ DumpParsedAst.hs:16:45-48 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ DumpParsedAst.hs:16:45-48 } (Unqual @@ -409,18 +409,18 @@ (Nothing))))) ,({ DumpParsedAst.hs:19:1-23 } (ValD - (NoExt) + (NoExtField) (FunBind - (NoExt) + (NoExtField) ({ DumpParsedAst.hs:19:1-4 } (Unqual {OccName: main})) (MG - (NoExt) + (NoExtField) ({ DumpParsedAst.hs:19:1-23 } [({ DumpParsedAst.hs:19:1-23 } (Match - (NoExt) + (NoExtField) (FunRhs ({ DumpParsedAst.hs:19:1-4 } (Unqual @@ -429,32 +429,34 @@ (NoSrcStrict)) [] (GRHSs - (NoExt) + (NoExtField) [({ DumpParsedAst.hs:19:6-23 } (GRHS - (NoExt) + (NoExtField) [] ({ DumpParsedAst.hs:19:8-23 } (HsApp - (NoExt) + (NoExtField) ({ DumpParsedAst.hs:19:8-15 } (HsVar - (NoExt) + (NoExtField) ({ DumpParsedAst.hs:19:8-15 } (Unqual {OccName: putStrLn})))) ({ DumpParsedAst.hs:19:17-23 } (HsLit - (NoExt) + (NoExtField) (HsString (SourceText "\"hello\"") {FastString: "hello"})))))))] ({ <no location info> } (EmptyLocalBinds - (NoExt))))))]) + (NoExtField))))))]) (FromSource)) (WpHole) [])))] (Nothing) (Nothing))) + + diff --git a/testsuite/tests/parser/should_compile/DumpRenamedAst.stderr b/testsuite/tests/parser/should_compile/DumpRenamedAst.stderr index 48b880b16d..49ec1d111a 100644 --- a/testsuite/tests/parser/should_compile/DumpRenamedAst.stderr +++ b/testsuite/tests/parser/should_compile/DumpRenamedAst.stderr @@ -4,7 +4,7 @@ (Just ((,,,) (HsGroup - (NoExt) + (NoExtField) (XValBindsLR (NValBinds [((,) @@ -17,11 +17,11 @@ ({ DumpRenamedAst.hs:26:1-4 } {Name: DumpRenamedAst.main}) (MG - (NoExt) + (NoExtField) ({ DumpRenamedAst.hs:26:1-23 } [({ DumpRenamedAst.hs:26:1-23 } (Match - (NoExt) + (NoExtField) (FunRhs ({ DumpRenamedAst.hs:26:1-4 } {Name: DumpRenamedAst.main}) @@ -29,36 +29,36 @@ (NoSrcStrict)) [] (GRHSs - (NoExt) + (NoExtField) [({ DumpRenamedAst.hs:26:6-23 } (GRHS - (NoExt) + (NoExtField) [] ({ DumpRenamedAst.hs:26:8-23 } (HsApp - (NoExt) + (NoExtField) ({ DumpRenamedAst.hs:26:8-15 } (HsVar - (NoExt) + (NoExtField) ({ DumpRenamedAst.hs:26:8-15 } {Name: System.IO.putStrLn}))) ({ DumpRenamedAst.hs:26:17-23 } (HsLit - (NoExt) + (NoExtField) (HsString (SourceText "\"hello\"") {FastString: "hello"})))))))] ({ <no location info> } (EmptyLocalBinds - (NoExt))))))]) + (NoExtField))))))]) (FromSource)) (WpHole) []))]})] [])) [] [(TyClGroup - (NoExt) + (NoExtField) [({ DumpRenamedAst.hs:9:1-30 } (DataDecl (DataDeclRn @@ -72,7 +72,7 @@ []) (Prefix) (HsDataDefn - (NoExt) + (NoExtField) (DataType) ({ <no location info> } []) @@ -80,7 +80,7 @@ (Nothing) [({ DumpRenamedAst.hs:9:14-17 } (ConDeclH98 - (NoExt) + (NoExtField) ({ DumpRenamedAst.hs:9:14-17 } {Name: DumpRenamedAst.Zero}) ({ <no location info> } @@ -92,7 +92,7 @@ (Nothing))) ,({ DumpRenamedAst.hs:9:21-30 } (ConDeclH98 - (NoExt) + (NoExtField) ({ DumpRenamedAst.hs:9:21-24 } {Name: DumpRenamedAst.Succ}) ({ <no location info> } @@ -102,7 +102,7 @@ (PrefixCon [({ DumpRenamedAst.hs:9:26-30 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ DumpRenamedAst.hs:9:26-30 } {Name: DumpRenamedAst.Peano})))]) @@ -112,12 +112,12 @@ [] []) ,(TyClGroup - (NoExt) + (NoExtField) [({ DumpRenamedAst.hs:11:1-39 } (FamDecl - (NoExt) + (NoExtField) (FamilyDecl - (NoExt) + (NoExtField) (ClosedTypeFamily (Just [({ DumpRenamedAst.hs:12:3-36 } @@ -125,20 +125,20 @@ [{Name: a} ,{Name: as}] (FamEqn - (NoExt) + (NoExtField) ({ DumpRenamedAst.hs:12:3-8 } {Name: DumpRenamedAst.Length}) (Nothing) [(HsValArg ({ DumpRenamedAst.hs:12:10-17 } (HsParTy - (NoExt) + (NoExtField) ({ DumpRenamedAst.hs:12:11-16 } (HsOpTy - (NoExt) + (NoExtField) ({ DumpRenamedAst.hs:12:11 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ DumpRenamedAst.hs:12:11 } {Name: a}))) @@ -146,35 +146,35 @@ {Name: :}) ({ DumpRenamedAst.hs:12:15-16 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ DumpRenamedAst.hs:12:15-16 } {Name: as}))))))))] (Prefix) ({ DumpRenamedAst.hs:12:21-36 } (HsAppTy - (NoExt) + (NoExtField) ({ DumpRenamedAst.hs:12:21-24 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ DumpRenamedAst.hs:12:21-24 } {Name: DumpRenamedAst.Succ}))) ({ DumpRenamedAst.hs:12:26-36 } (HsParTy - (NoExt) + (NoExtField) ({ DumpRenamedAst.hs:12:27-35 } (HsAppTy - (NoExt) + (NoExtField) ({ DumpRenamedAst.hs:12:27-32 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ DumpRenamedAst.hs:12:27-32 } {Name: DumpRenamedAst.Length}))) ({ DumpRenamedAst.hs:12:34-35 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ DumpRenamedAst.hs:12:34-35 } {Name: as})))))))))))) @@ -182,20 +182,20 @@ (HsIB [] (FamEqn - (NoExt) + (NoExtField) ({ DumpRenamedAst.hs:13:3-8 } {Name: DumpRenamedAst.Length}) (Nothing) [(HsValArg ({ DumpRenamedAst.hs:13:10-12 } (HsExplicitListTy - (NoExt) + (NoExtField) (IsPromoted) [])))] (Prefix) ({ DumpRenamedAst.hs:13:21-24 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ DumpRenamedAst.hs:13:21-24 } {Name: DumpRenamedAst.Zero}))))))])) @@ -205,25 +205,25 @@ [{Name: k}] [({ DumpRenamedAst.hs:11:21-29 } (KindedTyVar - (NoExt) + (NoExtField) ({ DumpRenamedAst.hs:11:21-22 } {Name: as}) ({ DumpRenamedAst.hs:11:27-29 } (HsListTy - (NoExt) + (NoExtField) ({ DumpRenamedAst.hs:11:28 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ DumpRenamedAst.hs:11:28 } {Name: k})))))))]) (Prefix) ({ DumpRenamedAst.hs:11:32-39 } (KindSig - (NoExt) + (NoExtField) ({ DumpRenamedAst.hs:11:35-39 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ DumpRenamedAst.hs:11:35-39 } {Name: DumpRenamedAst.Peano}))))) @@ -231,12 +231,12 @@ [] []) ,(TyClGroup - (NoExt) + (NoExtField) [({ DumpRenamedAst.hs:15:1-33 } (FamDecl - (NoExt) + (NoExtField) (FamilyDecl - (NoExt) + (NoExtField) (DataFamily) ({ DumpRenamedAst.hs:15:13-15 } {Name: DumpRenamedAst.Nat}) @@ -246,28 +246,28 @@ (Prefix) ({ DumpRenamedAst.hs:15:17-33 } (KindSig - (NoExt) + (NoExtField) ({ DumpRenamedAst.hs:15:20-33 } (HsFunTy - (NoExt) + (NoExtField) ({ DumpRenamedAst.hs:15:20 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ DumpRenamedAst.hs:15:20 } {Name: k}))) ({ DumpRenamedAst.hs:15:25-33 } (HsFunTy - (NoExt) + (NoExtField) ({ DumpRenamedAst.hs:15:25 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ DumpRenamedAst.hs:15:25 } {Name: k}))) ({ DumpRenamedAst.hs:15:30-33 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ DumpRenamedAst.hs:15:30-33 } {Name: GHC.Types.Type}))))))))) @@ -275,47 +275,47 @@ [] [({ DumpRenamedAst.hs:(18,1)-(19,45) } (DataFamInstD - (NoExt) + (NoExtField) (DataFamInstDecl (HsIB [{Name: a} ,{Name: k}] (FamEqn - (NoExt) + (NoExtField) ({ DumpRenamedAst.hs:18:18-20 } {Name: DumpRenamedAst.Nat}) (Nothing) [(HsValArg ({ DumpRenamedAst.hs:18:22-37 } (HsParTy - (NoExt) + (NoExtField) ({ DumpRenamedAst.hs:18:23-36 } (HsKindSig - (NoExt) + (NoExtField) ({ DumpRenamedAst.hs:18:23 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ DumpRenamedAst.hs:18:23 } {Name: a}))) ({ DumpRenamedAst.hs:18:28-36 } (HsFunTy - (NoExt) + (NoExtField) ({ DumpRenamedAst.hs:18:28 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ DumpRenamedAst.hs:18:28 } {Name: k}))) ({ DumpRenamedAst.hs:18:33-36 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ DumpRenamedAst.hs:18:33-36 } {Name: GHC.Types.Type}))))))))))] (Prefix) (HsDataDefn - (NoExt) + (NoExtField) (NewType) ({ <no location info> } []) @@ -323,34 +323,34 @@ (Just ({ DumpRenamedAst.hs:18:42-60 } (HsFunTy - (NoExt) + (NoExtField) ({ DumpRenamedAst.hs:18:42-52 } (HsParTy - (NoExt) + (NoExtField) ({ DumpRenamedAst.hs:18:43-51 } (HsFunTy - (NoExt) + (NoExtField) ({ DumpRenamedAst.hs:18:43 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ DumpRenamedAst.hs:18:43 } {Name: k}))) ({ DumpRenamedAst.hs:18:48-51 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ DumpRenamedAst.hs:18:48-51 } {Name: GHC.Types.Type}))))))) ({ DumpRenamedAst.hs:18:57-60 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ DumpRenamedAst.hs:18:57-60 } {Name: GHC.Types.Type})))))) [({ DumpRenamedAst.hs:19:3-45 } (ConDeclGADT - (NoExt) + (NoExtField) [({ DumpRenamedAst.hs:19:3-5 } {Name: DumpRenamedAst.Nat})] ({ DumpRenamedAst.hs:19:10-45 } @@ -363,70 +363,70 @@ (PrefixCon [({ DumpRenamedAst.hs:19:10-34 } (HsParTy - (NoExt) + (NoExtField) ({ DumpRenamedAst.hs:19:11-33 } (HsForAllTy - (NoExt) + (NoExtField) (ForallInvis) [({ DumpRenamedAst.hs:19:18-19 } (UserTyVar - (NoExt) + (NoExtField) ({ DumpRenamedAst.hs:19:18-19 } {Name: xx})))] ({ DumpRenamedAst.hs:19:22-33 } (HsFunTy - (NoExt) + (NoExtField) ({ DumpRenamedAst.hs:19:22-25 } (HsAppTy - (NoExt) + (NoExtField) ({ DumpRenamedAst.hs:19:22 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ DumpRenamedAst.hs:19:22 } {Name: f}))) ({ DumpRenamedAst.hs:19:24-25 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ DumpRenamedAst.hs:19:24-25 } {Name: xx}))))) ({ DumpRenamedAst.hs:19:30-33 } (HsAppTy - (NoExt) + (NoExtField) ({ DumpRenamedAst.hs:19:30 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ DumpRenamedAst.hs:19:30 } {Name: g}))) ({ DumpRenamedAst.hs:19:32-33 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ DumpRenamedAst.hs:19:32-33 } {Name: xx})))))))))))]) ({ DumpRenamedAst.hs:19:39-45 } (HsAppTy - (NoExt) + (NoExtField) ({ DumpRenamedAst.hs:19:39-43 } (HsAppTy - (NoExt) + (NoExtField) ({ DumpRenamedAst.hs:19:39-41 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ DumpRenamedAst.hs:19:39-41 } {Name: DumpRenamedAst.Nat}))) ({ DumpRenamedAst.hs:19:43 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ DumpRenamedAst.hs:19:43 } {Name: f}))))) ({ DumpRenamedAst.hs:19:45 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ DumpRenamedAst.hs:19:45 } {Name: g}))))) @@ -434,7 +434,7 @@ ({ <no location info> } [])))))))]) ,(TyClGroup - (NoExt) + (NoExtField) [({ DumpRenamedAst.hs:21:1-29 } (DataDecl (DataDeclRn @@ -448,23 +448,23 @@ [{Name: k}] [({ DumpRenamedAst.hs:21:8 } (UserTyVar - (NoExt) + (NoExtField) ({ DumpRenamedAst.hs:21:8 } {Name: f}))) ,({ DumpRenamedAst.hs:21:11-16 } (KindedTyVar - (NoExt) + (NoExtField) ({ DumpRenamedAst.hs:21:11 } {Name: a}) ({ DumpRenamedAst.hs:21:16 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ DumpRenamedAst.hs:21:16 } {Name: k})))))]) (Prefix) (HsDataDefn - (NoExt) + (NoExtField) (DataType) ({ <no location info> } []) @@ -472,7 +472,7 @@ (Nothing) [({ DumpRenamedAst.hs:21:21-29 } (ConDeclH98 - (NoExt) + (NoExtField) ({ DumpRenamedAst.hs:21:21-23 } {Name: DumpRenamedAst.MkT}) ({ <no location info> } @@ -482,19 +482,19 @@ (PrefixCon [({ DumpRenamedAst.hs:21:25-29 } (HsParTy - (NoExt) + (NoExtField) ({ DumpRenamedAst.hs:21:26-28 } (HsAppTy - (NoExt) + (NoExtField) ({ DumpRenamedAst.hs:21:26 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ DumpRenamedAst.hs:21:26 } {Name: f}))) ({ DumpRenamedAst.hs:21:28 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ DumpRenamedAst.hs:21:28 } {Name: a})))))))]) @@ -504,12 +504,12 @@ [] []) ,(TyClGroup - (NoExt) + (NoExtField) [({ DumpRenamedAst.hs:23:1-48 } (FamDecl - (NoExt) + (NoExtField) (FamilyDecl - (NoExt) + (NoExtField) (ClosedTypeFamily (Just [({ DumpRenamedAst.hs:24:3-30 } @@ -517,7 +517,7 @@ [{Name: a} ,{Name: f}] (FamEqn - (NoExt) + (NoExtField) ({ DumpRenamedAst.hs:24:3-4 } {Name: DumpRenamedAst.F1}) (Nothing) @@ -525,55 +525,55 @@ { DumpRenamedAst.hs:24:6-11 } ({ DumpRenamedAst.hs:24:7-11 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ DumpRenamedAst.hs:24:7-11 } {Name: DumpRenamedAst.Peano})))) ,(HsValArg ({ DumpRenamedAst.hs:24:13 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ DumpRenamedAst.hs:24:13 } {Name: a})))) ,(HsValArg ({ DumpRenamedAst.hs:24:15 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ DumpRenamedAst.hs:24:15 } {Name: f}))))] (Prefix) ({ DumpRenamedAst.hs:24:19-30 } (HsAppTy - (NoExt) + (NoExtField) ({ DumpRenamedAst.hs:24:19-28 } (HsAppTy - (NoExt) + (NoExtField) ({ DumpRenamedAst.hs:24:19-26 } (HsAppKindTy { DumpRenamedAst.hs:24:21-26 } ({ DumpRenamedAst.hs:24:19 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ DumpRenamedAst.hs:24:19 } {Name: DumpRenamedAst.T}))) ({ DumpRenamedAst.hs:24:22-26 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ DumpRenamedAst.hs:24:22-26 } {Name: DumpRenamedAst.Peano}))))) ({ DumpRenamedAst.hs:24:28 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ DumpRenamedAst.hs:24:28 } {Name: f}))))) ({ DumpRenamedAst.hs:24:30 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ DumpRenamedAst.hs:24:30 } {Name: a}))))))))])) @@ -583,42 +583,42 @@ [{Name: k}] [({ DumpRenamedAst.hs:23:17-22 } (KindedTyVar - (NoExt) + (NoExtField) ({ DumpRenamedAst.hs:23:17 } {Name: a}) ({ DumpRenamedAst.hs:23:22 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ DumpRenamedAst.hs:23:22 } {Name: k}))))) ,({ DumpRenamedAst.hs:23:26-39 } (KindedTyVar - (NoExt) + (NoExtField) ({ DumpRenamedAst.hs:23:26 } {Name: f}) ({ DumpRenamedAst.hs:23:31-39 } (HsFunTy - (NoExt) + (NoExtField) ({ DumpRenamedAst.hs:23:31 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ DumpRenamedAst.hs:23:31 } {Name: k}))) ({ DumpRenamedAst.hs:23:36-39 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ DumpRenamedAst.hs:23:36-39 } {Name: GHC.Types.Type})))))))]) (Prefix) ({ DumpRenamedAst.hs:23:42-48 } (KindSig - (NoExt) + (NoExtField) ({ DumpRenamedAst.hs:23:45-48 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ DumpRenamedAst.hs:23:45-48 } {Name: GHC.Types.Type}))))) @@ -635,7 +635,7 @@ []) [({ DumpRenamedAst.hs:4:8-21 } (ImportDecl - (NoExt) + (NoExtField) (NoSourceText) ({ DumpRenamedAst.hs:4:8-21 } {ModuleName: Prelude}) @@ -648,7 +648,7 @@ (Nothing))) ,({ DumpRenamedAst.hs:5:1-16 } (ImportDecl - (NoExt) + (NoExtField) (NoSourceText) ({ DumpRenamedAst.hs:5:8-16 } {ModuleName: Data.Kind}) @@ -661,7 +661,7 @@ (Nothing))) ,({ DumpRenamedAst.hs:7:1-23 } (ImportDecl - (NoExt) + (NoExtField) (NoSourceText) ({ DumpRenamedAst.hs:7:8-16 } {ModuleName: Data.Kind}) @@ -677,10 +677,12 @@ ({ DumpRenamedAst.hs:7:18-23 } [({ DumpRenamedAst.hs:7:19-22 } (IEThingAbs - (NoExt) + (NoExtField) ({ DumpRenamedAst.hs:7:19-22 } (IEName ({ DumpRenamedAst.hs:7:19-22 } {Name: GHC.Types.Type})))))])))))] (Nothing) (Nothing))) + + diff --git a/testsuite/tests/parser/should_compile/DumpTypecheckedAst.stderr b/testsuite/tests/parser/should_compile/DumpTypecheckedAst.stderr index 7c6bfd72d0..6aa8aa4578 100644 --- a/testsuite/tests/parser/should_compile/DumpTypecheckedAst.stderr +++ b/testsuite/tests/parser/should_compile/DumpTypecheckedAst.stderr @@ -4,350 +4,350 @@ {Bag(Located (HsBind Var)): [({ <no location info> } (VarBind - (NoExt) + (NoExtField) {Var: DumpTypecheckedAst.$tcT} ({ <no location info> } (HsApp - (NoExt) + (NoExtField) ({ <no location info> } (HsApp - (NoExt) + (NoExtField) ({ <no location info> } (HsApp - (NoExt) + (NoExtField) ({ <no location info> } (HsApp - (NoExt) + (NoExtField) ({ <no location info> } (HsApp - (NoExt) + (NoExtField) ({ <no location info> } (HsApp - (NoExt) + (NoExtField) ({ <no location info> } (HsConLikeOut - (NoExt) + (NoExtField) ({abstract:ConLike}))) ({ <no location info> } (HsLit - (NoExt) + (NoExtField) {HsWord{64}Prim (1374752024144278257) (NoSourceText)})))) ({ <no location info> } (HsLit - (NoExt) + (NoExtField) {HsWord{64}Prim (13654949607623281177) (NoSourceText)})))) ({ <no location info> } (HsVar - (NoExt) + (NoExtField) ({ <no location info> } {Var: DumpTypecheckedAst.$trModule}))))) ({ <no location info> } (HsPar - (NoExt) + (NoExtField) ({ <no location info> } (HsApp - (NoExt) + (NoExtField) ({ <no location info> } (HsConLikeOut - (NoExt) + (NoExtField) ({abstract:ConLike}))) ({ <no location info> } (HsLit - (NoExt) + (NoExtField) (HsStringPrim (NoSourceText) "T"))))))))) ({ <no location info> } (HsLit - (NoExt) + (NoExtField) {HsInt{64}Prim (1) (SourceText "1")})))) ({ <no location info> } (HsVar - (NoExt) + (NoExtField) ({ <no location info> } {Var: $krep}))))) (False))) ,({ <no location info> } (VarBind - (NoExt) + (NoExtField) {Var: DumpTypecheckedAst.$tc'MkT} ({ <no location info> } (HsApp - (NoExt) + (NoExtField) ({ <no location info> } (HsApp - (NoExt) + (NoExtField) ({ <no location info> } (HsApp - (NoExt) + (NoExtField) ({ <no location info> } (HsApp - (NoExt) + (NoExtField) ({ <no location info> } (HsApp - (NoExt) + (NoExtField) ({ <no location info> } (HsApp - (NoExt) + (NoExtField) ({ <no location info> } (HsConLikeOut - (NoExt) + (NoExtField) ({abstract:ConLike}))) ({ <no location info> } (HsLit - (NoExt) + (NoExtField) {HsWord{64}Prim (10715337633704422415) (NoSourceText)})))) ({ <no location info> } (HsLit - (NoExt) + (NoExtField) {HsWord{64}Prim (12411373583424111944) (NoSourceText)})))) ({ <no location info> } (HsVar - (NoExt) + (NoExtField) ({ <no location info> } {Var: DumpTypecheckedAst.$trModule}))))) ({ <no location info> } (HsPar - (NoExt) + (NoExtField) ({ <no location info> } (HsApp - (NoExt) + (NoExtField) ({ <no location info> } (HsConLikeOut - (NoExt) + (NoExtField) ({abstract:ConLike}))) ({ <no location info> } (HsLit - (NoExt) + (NoExtField) (HsStringPrim (NoSourceText) "'MkT"))))))))) ({ <no location info> } (HsLit - (NoExt) + (NoExtField) {HsInt{64}Prim (3) (SourceText "3")})))) ({ <no location info> } (HsVar - (NoExt) + (NoExtField) ({ <no location info> } {Var: $krep}))))) (False))) ,({ <no location info> } (VarBind - (NoExt) + (NoExtField) {Var: DumpTypecheckedAst.$tcPeano} ({ <no location info> } (HsApp - (NoExt) + (NoExtField) ({ <no location info> } (HsApp - (NoExt) + (NoExtField) ({ <no location info> } (HsApp - (NoExt) + (NoExtField) ({ <no location info> } (HsApp - (NoExt) + (NoExtField) ({ <no location info> } (HsApp - (NoExt) + (NoExtField) ({ <no location info> } (HsApp - (NoExt) + (NoExtField) ({ <no location info> } (HsConLikeOut - (NoExt) + (NoExtField) ({abstract:ConLike}))) ({ <no location info> } (HsLit - (NoExt) + (NoExtField) {HsWord{64}Prim (14073232900889011755) (NoSourceText)})))) ({ <no location info> } (HsLit - (NoExt) + (NoExtField) {HsWord{64}Prim (2739668351064589274) (NoSourceText)})))) ({ <no location info> } (HsVar - (NoExt) + (NoExtField) ({ <no location info> } {Var: DumpTypecheckedAst.$trModule}))))) ({ <no location info> } (HsPar - (NoExt) + (NoExtField) ({ <no location info> } (HsApp - (NoExt) + (NoExtField) ({ <no location info> } (HsConLikeOut - (NoExt) + (NoExtField) ({abstract:ConLike}))) ({ <no location info> } (HsLit - (NoExt) + (NoExtField) (HsStringPrim (NoSourceText) "Peano"))))))))) ({ <no location info> } (HsLit - (NoExt) + (NoExtField) {HsInt{64}Prim (0) (SourceText "0")})))) ({ <no location info> } (HsVar - (NoExt) + (NoExtField) ({ <no location info> } {Var: GHC.Types.krep$*}))))) (False))) ,({ <no location info> } (VarBind - (NoExt) + (NoExtField) {Var: DumpTypecheckedAst.$tc'Zero} ({ <no location info> } (HsApp - (NoExt) + (NoExtField) ({ <no location info> } (HsApp - (NoExt) + (NoExtField) ({ <no location info> } (HsApp - (NoExt) + (NoExtField) ({ <no location info> } (HsApp - (NoExt) + (NoExtField) ({ <no location info> } (HsApp - (NoExt) + (NoExtField) ({ <no location info> } (HsApp - (NoExt) + (NoExtField) ({ <no location info> } (HsConLikeOut - (NoExt) + (NoExtField) ({abstract:ConLike}))) ({ <no location info> } (HsLit - (NoExt) + (NoExtField) {HsWord{64}Prim (13760111476013868540) (NoSourceText)})))) ({ <no location info> } (HsLit - (NoExt) + (NoExtField) {HsWord{64}Prim (12314848029315386153) (NoSourceText)})))) ({ <no location info> } (HsVar - (NoExt) + (NoExtField) ({ <no location info> } {Var: DumpTypecheckedAst.$trModule}))))) ({ <no location info> } (HsPar - (NoExt) + (NoExtField) ({ <no location info> } (HsApp - (NoExt) + (NoExtField) ({ <no location info> } (HsConLikeOut - (NoExt) + (NoExtField) ({abstract:ConLike}))) ({ <no location info> } (HsLit - (NoExt) + (NoExtField) (HsStringPrim (NoSourceText) "'Zero"))))))))) ({ <no location info> } (HsLit - (NoExt) + (NoExtField) {HsInt{64}Prim (0) (SourceText "0")})))) ({ <no location info> } (HsVar - (NoExt) + (NoExtField) ({ <no location info> } {Var: $krep}))))) (False))) ,({ <no location info> } (VarBind - (NoExt) + (NoExtField) {Var: DumpTypecheckedAst.$tc'Succ} ({ <no location info> } (HsApp - (NoExt) + (NoExtField) ({ <no location info> } (HsApp - (NoExt) + (NoExtField) ({ <no location info> } (HsApp - (NoExt) + (NoExtField) ({ <no location info> } (HsApp - (NoExt) + (NoExtField) ({ <no location info> } (HsApp - (NoExt) + (NoExtField) ({ <no location info> } (HsApp - (NoExt) + (NoExtField) ({ <no location info> } (HsConLikeOut - (NoExt) + (NoExtField) ({abstract:ConLike}))) ({ <no location info> } (HsLit - (NoExt) + (NoExtField) {HsWord{64}Prim (1143980031331647856) (NoSourceText)})))) ({ <no location info> } (HsLit - (NoExt) + (NoExtField) {HsWord{64}Prim (14802086722010293686) (NoSourceText)})))) ({ <no location info> } (HsVar - (NoExt) + (NoExtField) ({ <no location info> } {Var: DumpTypecheckedAst.$trModule}))))) ({ <no location info> } (HsPar - (NoExt) + (NoExtField) ({ <no location info> } (HsApp - (NoExt) + (NoExtField) ({ <no location info> } (HsConLikeOut - (NoExt) + (NoExtField) ({abstract:ConLike}))) ({ <no location info> } (HsLit - (NoExt) + (NoExtField) (HsStringPrim (NoSourceText) "'Succ"))))))))) ({ <no location info> } (HsLit - (NoExt) + (NoExtField) {HsInt{64}Prim (0) (SourceText "0")})))) ({ <no location info> } (HsVar - (NoExt) + (NoExtField) ({ <no location info> } {Var: $krep}))))) (False))) ,({ <no location info> } (VarBind - (NoExt) + (NoExtField) {Var: $krep} ({ <no location info> } (HsApp - (NoExt) + (NoExtField) ({ <no location info> } (HsConLikeOut - (NoExt) + (NoExtField) ({abstract:ConLike}))) ({ <no location info> } (HsLit - (NoExt) + (NoExtField) (HsInt - (NoExt) + (NoExtField) (IL (SourceText "2") @@ -356,20 +356,20 @@ (False))) ,({ <no location info> } (VarBind - (NoExt) + (NoExtField) {Var: $krep} ({ <no location info> } (HsApp - (NoExt) + (NoExtField) ({ <no location info> } (HsConLikeOut - (NoExt) + (NoExtField) ({abstract:ConLike}))) ({ <no location info> } (HsLit - (NoExt) + (NoExtField) (HsInt - (NoExt) + (NoExtField) (IL (SourceText "1") @@ -378,20 +378,20 @@ (False))) ,({ <no location info> } (VarBind - (NoExt) + (NoExtField) {Var: $krep} ({ <no location info> } (HsApp - (NoExt) + (NoExtField) ({ <no location info> } (HsConLikeOut - (NoExt) + (NoExtField) ({abstract:ConLike}))) ({ <no location info> } (HsLit - (NoExt) + (NoExtField) (HsInt - (NoExt) + (NoExtField) (IL (SourceText "0") @@ -400,315 +400,315 @@ (False))) ,({ <no location info> } (VarBind - (NoExt) + (NoExtField) {Var: $krep} ({ <no location info> } (HsApp - (NoExt) + (NoExtField) ({ <no location info> } (HsApp - (NoExt) + (NoExtField) ({ <no location info> } (HsConLikeOut - (NoExt) + (NoExtField) ({abstract:ConLike}))) ({ <no location info> } (HsVar - (NoExt) + (NoExtField) ({ <no location info> } {Var: $krep}))))) ({ <no location info> } (HsVar - (NoExt) + (NoExtField) ({ <no location info> } {Var: $krep}))))) (False))) ,({ <no location info> } (VarBind - (NoExt) + (NoExtField) {Var: $krep} ({ <no location info> } (HsApp - (NoExt) + (NoExtField) ({ <no location info> } (HsApp - (NoExt) + (NoExtField) ({ <no location info> } (HsConLikeOut - (NoExt) + (NoExtField) ({abstract:ConLike}))) ({ <no location info> } (HsVar - (NoExt) + (NoExtField) ({ <no location info> } {Var: $krep}))))) ({ <no location info> } (HsVar - (NoExt) + (NoExtField) ({ <no location info> } {Var: GHC.Types.krep$*}))))) (False))) ,({ <no location info> } (VarBind - (NoExt) + (NoExtField) {Var: $krep} ({ <no location info> } (HsApp - (NoExt) + (NoExtField) ({ <no location info> } (HsApp - (NoExt) + (NoExtField) ({ <no location info> } (HsConLikeOut - (NoExt) + (NoExtField) ({abstract:ConLike}))) ({ <no location info> } (HsVar - (NoExt) + (NoExtField) ({ <no location info> } {Var: $krep}))))) ({ <no location info> } (HsVar - (NoExt) + (NoExtField) ({ <no location info> } {Var: $krep}))))) (False))) ,({ <no location info> } (VarBind - (NoExt) + (NoExtField) {Var: $krep} ({ <no location info> } (HsApp - (NoExt) + (NoExtField) ({ <no location info> } (HsApp - (NoExt) + (NoExtField) ({ <no location info> } (HsConLikeOut - (NoExt) + (NoExtField) ({abstract:ConLike}))) ({ <no location info> } (HsVar - (NoExt) + (NoExtField) ({ <no location info> } {Var: $krep}))))) ({ <no location info> } (HsVar - (NoExt) + (NoExtField) ({ <no location info> } {Var: $krep}))))) (False))) ,({ <no location info> } (VarBind - (NoExt) + (NoExtField) {Var: $krep} ({ <no location info> } (HsApp - (NoExt) + (NoExtField) ({ <no location info> } (HsApp - (NoExt) + (NoExtField) ({ <no location info> } (HsConLikeOut - (NoExt) + (NoExtField) ({abstract:ConLike}))) ({ <no location info> } (HsVar - (NoExt) + (NoExtField) ({ <no location info> } {Var: $krep}))))) ({ <no location info> } (HsVar - (NoExt) + (NoExtField) ({ <no location info> } {Var: $krep}))))) (False))) ,({ <no location info> } (VarBind - (NoExt) + (NoExtField) {Var: $krep} ({ <no location info> } (HsApp - (NoExt) + (NoExtField) ({ <no location info> } (HsApp - (NoExt) + (NoExtField) ({ <no location info> } (HsConLikeOut - (NoExt) + (NoExtField) ({abstract:ConLike}))) ({ <no location info> } (HsVar - (NoExt) + (NoExtField) ({ <no location info> } {Var: DumpTypecheckedAst.$tcT}))))) ({ <no location info> } (HsPar - (NoExt) + (NoExtField) ({ <no location info> } (HsApp - (NoExt) + (NoExtField) ({ <no location info> } (HsApp - (NoExt) + (NoExtField) ({ <no location info> } (HsWrap - (NoExt) + (NoExtField) (WpTyApp (TyConApp ({abstract:TyCon}) [])) (HsConLikeOut - (NoExt) + (NoExtField) ({abstract:ConLike})))) ({ <no location info> } (HsVar - (NoExt) + (NoExtField) ({ <no location info> } {Var: $krep}))))) ({ <no location info> } (HsPar - (NoExt) + (NoExtField) ({ <no location info> } (HsApp - (NoExt) + (NoExtField) ({ <no location info> } (HsApp - (NoExt) + (NoExtField) ({ <no location info> } (HsWrap - (NoExt) + (NoExtField) (WpTyApp (TyConApp ({abstract:TyCon}) [])) (HsConLikeOut - (NoExt) + (NoExtField) ({abstract:ConLike})))) ({ <no location info> } (HsVar - (NoExt) + (NoExtField) ({ <no location info> } {Var: $krep}))))) ({ <no location info> } (HsPar - (NoExt) + (NoExtField) ({ <no location info> } (HsApp - (NoExt) + (NoExtField) ({ <no location info> } (HsApp - (NoExt) + (NoExtField) ({ <no location info> } (HsWrap - (NoExt) + (NoExtField) (WpTyApp (TyConApp ({abstract:TyCon}) [])) (HsConLikeOut - (NoExt) + (NoExtField) ({abstract:ConLike})))) ({ <no location info> } (HsVar - (NoExt) + (NoExtField) ({ <no location info> } {Var: $krep}))))) ({ <no location info> } (HsWrap - (NoExt) + (NoExtField) (WpTyApp (TyConApp ({abstract:TyCon}) [])) (HsConLikeOut - (NoExt) + (NoExtField) ({abstract:ConLike})))))))))))))))))) (False))) ,({ <no location info> } (VarBind - (NoExt) + (NoExtField) {Var: $krep} ({ <no location info> } (HsApp - (NoExt) + (NoExtField) ({ <no location info> } (HsApp - (NoExt) + (NoExtField) ({ <no location info> } (HsConLikeOut - (NoExt) + (NoExtField) ({abstract:ConLike}))) ({ <no location info> } (HsVar - (NoExt) + (NoExtField) ({ <no location info> } {Var: DumpTypecheckedAst.$tcPeano}))))) ({ <no location info> } (HsWrap - (NoExt) + (NoExtField) (WpTyApp (TyConApp ({abstract:TyCon}) [])) (HsConLikeOut - (NoExt) + (NoExtField) ({abstract:ConLike})))))) (False))) ,({ <no location info> } (VarBind - (NoExt) + (NoExtField) {Var: DumpTypecheckedAst.$trModule} ({ <no location info> } (HsApp - (NoExt) + (NoExtField) ({ <no location info> } (HsApp - (NoExt) + (NoExtField) ({ <no location info> } (HsConLikeOut - (NoExt) + (NoExtField) ({abstract:ConLike}))) ({ <no location info> } (HsPar - (NoExt) + (NoExtField) ({ <no location info> } (HsApp - (NoExt) + (NoExtField) ({ <no location info> } (HsConLikeOut - (NoExt) + (NoExtField) ({abstract:ConLike}))) ({ <no location info> } (HsLit - (NoExt) + (NoExtField) (HsStringPrim (NoSourceText) "main"))))))))) ({ <no location info> } (HsPar - (NoExt) + (NoExtField) ({ <no location info> } (HsApp - (NoExt) + (NoExtField) ({ <no location info> } (HsConLikeOut - (NoExt) + (NoExtField) ({abstract:ConLike}))) ({ <no location info> } (HsLit - (NoExt) + (NoExtField) (HsStringPrim (NoSourceText) "DumpTypecheckedAst"))))))))) (False))) ,({ DumpTypecheckedAst.hs:18:1-23 } (AbsBinds - (NoExt) + (NoExtField) [] [] [(ABE - (NoExt) + (NoExtField) {Var: main} {Var: main} (WpHole) @@ -733,7 +733,7 @@ ({ DumpTypecheckedAst.hs:18:1-23 } [({ DumpTypecheckedAst.hs:18:1-23 } (Match - (NoExt) + (NoExtField) (FunRhs ({ DumpTypecheckedAst.hs:18:1-4 } {Name: main}) @@ -741,29 +741,29 @@ (NoSrcStrict)) [] (GRHSs - (NoExt) + (NoExtField) [({ DumpTypecheckedAst.hs:18:6-23 } (GRHS - (NoExt) + (NoExtField) [] ({ DumpTypecheckedAst.hs:18:8-23 } (HsApp - (NoExt) + (NoExtField) ({ DumpTypecheckedAst.hs:18:8-15 } (HsVar - (NoExt) + (NoExtField) ({ <no location info> } {Var: putStrLn}))) ({ DumpTypecheckedAst.hs:18:17-23 } (HsLit - (NoExt) + (NoExtField) (HsString (SourceText "\"hello\"") {FastString: "hello"})))))))] ({ <no location info> } (EmptyLocalBinds - (NoExt))))))]) + (NoExtField))))))]) (FromSource)) (WpHole) []))]} diff --git a/testsuite/tests/parser/should_compile/KindSigs.stderr b/testsuite/tests/parser/should_compile/KindSigs.stderr index 6c7ef797a1..4612d87cad 100644 --- a/testsuite/tests/parser/should_compile/KindSigs.stderr +++ b/testsuite/tests/parser/should_compile/KindSigs.stderr @@ -9,7 +9,7 @@ (Nothing) [({ KindSigs.hs:8:1-16 } (ImportDecl - (NoExt) + (NoExtField) (NoSourceText) ({ KindSigs.hs:8:8-16 } {ModuleName: Data.Kind}) @@ -22,18 +22,18 @@ (Nothing)))] [({ KindSigs.hs:11:1-17 } (TyClD - (NoExt) + (NoExtField) (FamDecl - (NoExt) + (NoExtField) (FamilyDecl - (NoExt) + (NoExtField) (ClosedTypeFamily (Just [({ KindSigs.hs:12:3-21 } (HsIB - (NoExt) + (NoExtField) (FamEqn - (NoExt) + (NoExtField) ({ KindSigs.hs:12:3-5 } (Unqual {OccName: Foo})) @@ -41,7 +41,7 @@ [(HsValArg ({ KindSigs.hs:12:7 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ KindSigs.hs:12:7 } (Unqual @@ -49,17 +49,17 @@ (Prefix) ({ KindSigs.hs:12:11-21 } (HsKindSig - (NoExt) + (NoExtField) ({ KindSigs.hs:12:11-13 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ KindSigs.hs:12:11-13 } (Unqual {OccName: Int})))) ({ KindSigs.hs:12:18-21 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ KindSigs.hs:12:18-21 } (Unqual @@ -68,271 +68,271 @@ (Unqual {OccName: Foo})) (HsQTvs - (NoExt) + (NoExtField) [({ KindSigs.hs:11:17 } (UserTyVar - (NoExt) + (NoExtField) ({ KindSigs.hs:11:17 } (Unqual {OccName: a}))))]) (Prefix) ({ <no location info> } (NoSig - (NoExt))) + (NoExtField))) (Nothing))))) ,({ KindSigs.hs:15:1-51 } (TyClD - (NoExt) + (NoExtField) (SynDecl - (NoExt) + (NoExtField) ({ KindSigs.hs:15:6-8 } (Unqual {OccName: Bar})) (HsQTvs - (NoExt) + (NoExtField) [({ KindSigs.hs:15:10 } (UserTyVar - (NoExt) + (NoExtField) ({ KindSigs.hs:15:10 } (Unqual {OccName: a}))))]) (Prefix) ({ KindSigs.hs:15:14-51 } (HsTupleTy - (NoExt) + (NoExtField) (HsBoxedOrConstraintTuple) [({ KindSigs.hs:15:16-26 } (HsKindSig - (NoExt) + (NoExtField) ({ KindSigs.hs:15:16-18 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ KindSigs.hs:15:16-18 } (Unqual {OccName: Int})))) ({ KindSigs.hs:15:23-26 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ KindSigs.hs:15:23-26 } (Unqual {OccName: Type})))))) ,({ KindSigs.hs:15:29-32 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ KindSigs.hs:15:29-32 } (Unqual {OccName: Bool})))) ,({ KindSigs.hs:15:35-49 } (HsKindSig - (NoExt) + (NoExtField) ({ KindSigs.hs:15:35-41 } (HsAppTy - (NoExt) + (NoExtField) ({ KindSigs.hs:15:35-39 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ KindSigs.hs:15:35-39 } (Unqual {OccName: Maybe})))) ({ KindSigs.hs:15:41 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ KindSigs.hs:15:41 } (Unqual {OccName: a})))))) ({ KindSigs.hs:15:46-49 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ KindSigs.hs:15:46-49 } (Unqual {OccName: Type}))))))]))))) ,({ KindSigs.hs:16:1-54 } (TyClD - (NoExt) + (NoExtField) (SynDecl - (NoExt) + (NoExtField) ({ KindSigs.hs:16:6-9 } (Unqual {OccName: Bar'})) (HsQTvs - (NoExt) + (NoExtField) [({ KindSigs.hs:16:11 } (UserTyVar - (NoExt) + (NoExtField) ({ KindSigs.hs:16:11 } (Unqual {OccName: a}))))]) (Prefix) ({ KindSigs.hs:16:15-54 } (HsTupleTy - (NoExt) + (NoExtField) (HsUnboxedTuple) [({ KindSigs.hs:16:18-28 } (HsKindSig - (NoExt) + (NoExtField) ({ KindSigs.hs:16:18-20 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ KindSigs.hs:16:18-20 } (Unqual {OccName: Int})))) ({ KindSigs.hs:16:25-28 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ KindSigs.hs:16:25-28 } (Unqual {OccName: Type})))))) ,({ KindSigs.hs:16:31-34 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ KindSigs.hs:16:31-34 } (Unqual {OccName: Bool})))) ,({ KindSigs.hs:16:37-51 } (HsKindSig - (NoExt) + (NoExtField) ({ KindSigs.hs:16:37-43 } (HsAppTy - (NoExt) + (NoExtField) ({ KindSigs.hs:16:37-41 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ KindSigs.hs:16:37-41 } (Unqual {OccName: Maybe})))) ({ KindSigs.hs:16:43 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ KindSigs.hs:16:43 } (Unqual {OccName: a})))))) ({ KindSigs.hs:16:48-51 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ KindSigs.hs:16:48-51 } (Unqual {OccName: Type}))))))]))))) ,({ KindSigs.hs:19:1-26 } (TyClD - (NoExt) + (NoExtField) (SynDecl - (NoExt) + (NoExtField) ({ KindSigs.hs:19:6-8 } (Unqual {OccName: Baz})) (HsQTvs - (NoExt) + (NoExtField) []) (Prefix) ({ KindSigs.hs:19:12-26 } (HsListTy - (NoExt) + (NoExtField) ({ KindSigs.hs:19:14-24 } (HsKindSig - (NoExt) + (NoExtField) ({ KindSigs.hs:19:14-16 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ KindSigs.hs:19:14-16 } (Unqual {OccName: Int})))) ({ KindSigs.hs:19:21-24 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ KindSigs.hs:19:21-24 } (Unqual {OccName: Type}))))))))))) ,({ KindSigs.hs:22:1-44 } (SigD - (NoExt) + (NoExtField) (TypeSig - (NoExt) + (NoExtField) [({ KindSigs.hs:22:1-3 } (Unqual {OccName: qux}))] (HsWC - (NoExt) + (NoExtField) (HsIB - (NoExt) + (NoExtField) ({ KindSigs.hs:22:8-44 } (HsFunTy - (NoExt) + (NoExtField) ({ KindSigs.hs:22:8-20 } (HsParTy - (NoExt) + (NoExtField) ({ KindSigs.hs:22:9-19 } (HsKindSig - (NoExt) + (NoExtField) ({ KindSigs.hs:22:9-11 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ KindSigs.hs:22:9-11 } (Unqual {OccName: Int})))) ({ KindSigs.hs:22:16-19 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ KindSigs.hs:22:16-19 } (Unqual {OccName: Type})))))))) ({ KindSigs.hs:22:25-44 } (HsFunTy - (NoExt) + (NoExtField) ({ KindSigs.hs:22:25-28 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ KindSigs.hs:22:25-28 } (Unqual {OccName: Bool})))) ({ KindSigs.hs:22:33-44 } (HsParTy - (NoExt) + (NoExtField) ({ KindSigs.hs:22:34-43 } (HsKindSig - (NoExt) + (NoExtField) ({ KindSigs.hs:22:34-35 } (HsTupleTy - (NoExt) + (NoExtField) (HsBoxedOrConstraintTuple) [])) ({ KindSigs.hs:22:40-43 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ KindSigs.hs:22:40-43 } (Unqual {OccName: Type}))))))))))))))))) ,({ KindSigs.hs:23:1-12 } (ValD - (NoExt) + (NoExtField) (FunBind - (NoExt) + (NoExtField) ({ KindSigs.hs:23:1-3 } (Unqual {OccName: qux})) (MG - (NoExt) + (NoExtField) ({ KindSigs.hs:23:1-12 } [({ KindSigs.hs:23:1-12 } (Match - (NoExt) + (NoExtField) (FunRhs ({ KindSigs.hs:23:1-3 } (Unqual @@ -341,246 +341,246 @@ (NoSrcStrict)) [(XPat ({ KindSigs.hs:23:5 } - (WildPat - (NoExt)))) + (WildPat + (NoExtField)))) ,(XPat ({ KindSigs.hs:23:7 } - (WildPat - (NoExt))))] + (WildPat + (NoExtField))))] (GRHSs - (NoExt) + (NoExtField) [({ KindSigs.hs:23:9-12 } (GRHS - (NoExt) + (NoExtField) [] ({ KindSigs.hs:23:11-12 } (HsVar - (NoExt) + (NoExtField) ({ KindSigs.hs:23:11-12 } (Exact {Name: ()}))))))] ({ <no location info> } (EmptyLocalBinds - (NoExt))))))]) + (NoExtField))))))]) (FromSource)) (WpHole) []))) ,({ KindSigs.hs:26:1-29 } (TyClD - (NoExt) + (NoExtField) (SynDecl - (NoExt) + (NoExtField) ({ KindSigs.hs:26:6-9 } (Unqual {OccName: Quux})) (HsQTvs - (NoExt) + (NoExtField) []) (Prefix) ({ KindSigs.hs:26:13-29 } (HsExplicitListTy - (NoExt) + (NoExtField) (IsPromoted) [({ KindSigs.hs:26:16-27 } (HsKindSig - (NoExt) + (NoExtField) ({ KindSigs.hs:26:16-19 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ KindSigs.hs:26:16-19 } (Unqual {OccName: True})))) ({ KindSigs.hs:26:24-27 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ KindSigs.hs:26:24-27 } (Unqual {OccName: Bool}))))))]))))) ,({ KindSigs.hs:27:1-45 } (TyClD - (NoExt) + (NoExtField) (SynDecl - (NoExt) + (NoExtField) ({ KindSigs.hs:27:6-10 } (Unqual {OccName: Quux'})) (HsQTvs - (NoExt) + (NoExtField) []) (Prefix) ({ KindSigs.hs:27:14-45 } (HsExplicitListTy - (NoExt) + (NoExtField) (NotPromoted) [({ KindSigs.hs:27:16-27 } (HsKindSig - (NoExt) + (NoExtField) ({ KindSigs.hs:27:16-19 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ KindSigs.hs:27:16-19 } (Unqual {OccName: True})))) ({ KindSigs.hs:27:24-27 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ KindSigs.hs:27:24-27 } (Unqual {OccName: Bool})))))) ,({ KindSigs.hs:27:30-42 } (HsKindSig - (NoExt) + (NoExtField) ({ KindSigs.hs:27:30-34 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ KindSigs.hs:27:30-34 } (Unqual {OccName: False})))) ({ KindSigs.hs:27:39-42 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ KindSigs.hs:27:39-42 } (Unqual {OccName: Bool}))))))]))))) ,({ KindSigs.hs:28:1-44 } (TyClD - (NoExt) + (NoExtField) (SynDecl - (NoExt) + (NoExtField) ({ KindSigs.hs:28:6-10 } (Unqual {OccName: Quuux})) (HsQTvs - (NoExt) + (NoExtField) [({ KindSigs.hs:28:12 } (UserTyVar - (NoExt) + (NoExtField) ({ KindSigs.hs:28:12 } (Unqual {OccName: b}))))]) (Prefix) ({ KindSigs.hs:28:16-44 } (HsExplicitTupleTy - (NoExt) + (NoExtField) [({ KindSigs.hs:28:19-39 } (HsKindSig - (NoExt) + (NoExtField) ({ KindSigs.hs:28:19-29 } (HsExplicitListTy - (NoExt) + (NoExtField) (NotPromoted) [({ KindSigs.hs:28:20-22 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ KindSigs.hs:28:20-22 } (Unqual {OccName: Int})))) ,({ KindSigs.hs:28:25-28 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ KindSigs.hs:28:25-28 } (Unqual {OccName: Bool}))))])) ({ KindSigs.hs:28:34-39 } (HsListTy - (NoExt) + (NoExtField) ({ KindSigs.hs:28:35-38 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ KindSigs.hs:28:35-38 } (Unqual {OccName: Type})))))))) ,({ KindSigs.hs:28:42 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ KindSigs.hs:28:42 } (Unqual {OccName: b}))))]))))) ,({ KindSigs.hs:31:1-31 } (TyClD - (NoExt) + (NoExtField) (SynDecl - (NoExt) + (NoExtField) ({ KindSigs.hs:31:6-17 } (Unqual {OccName: Sarsaparilla})) (HsQTvs - (NoExt) + (NoExtField) []) (Prefix) ({ KindSigs.hs:31:21-31 } (HsKindSig - (NoExt) + (NoExtField) ({ KindSigs.hs:31:21-23 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ KindSigs.hs:31:21-23 } (Unqual {OccName: Int})))) ({ KindSigs.hs:31:28-31 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ KindSigs.hs:31:28-31 } (Unqual {OccName: Type}))))))))) ,({ KindSigs.hs:34:1-22 } (SigD - (NoExt) + (NoExtField) (TypeSig - (NoExt) + (NoExtField) [({ KindSigs.hs:34:1-4 } (Unqual {OccName: true}))] (HsWC - (NoExt) + (NoExtField) (HsIB - (NoExt) + (NoExtField) ({ KindSigs.hs:34:9-22 } (HsParTy - (NoExt) + (NoExtField) ({ KindSigs.hs:34:10-21 } (HsKindSig - (NoExt) + (NoExtField) ({ KindSigs.hs:34:10-13 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ KindSigs.hs:34:10-13 } (Unqual {OccName: Bool})))) ({ KindSigs.hs:34:18-21 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ KindSigs.hs:34:18-21 } (Unqual {OccName: Type}))))))))))))) ,({ KindSigs.hs:35:1-11 } (ValD - (NoExt) + (NoExtField) (FunBind - (NoExt) + (NoExtField) ({ KindSigs.hs:35:1-4 } (Unqual {OccName: true})) (MG - (NoExt) + (NoExtField) ({ KindSigs.hs:35:1-11 } [({ KindSigs.hs:35:1-11 } (Match - (NoExt) + (NoExtField) (FunRhs ({ KindSigs.hs:35:1-4 } (Unqual @@ -589,22 +589,24 @@ (NoSrcStrict)) [] (GRHSs - (NoExt) + (NoExtField) [({ KindSigs.hs:35:6-11 } (GRHS - (NoExt) + (NoExtField) [] ({ KindSigs.hs:35:8-11 } (HsVar - (NoExt) + (NoExtField) ({ KindSigs.hs:35:8-11 } (Unqual {OccName: True}))))))] ({ <no location info> } (EmptyLocalBinds - (NoExt))))))]) + (NoExtField))))))]) (FromSource)) (WpHole) [])))] (Nothing) (Nothing))) + + diff --git a/testsuite/tests/parser/should_compile/T14189.stderr b/testsuite/tests/parser/should_compile/T14189.stderr index e405262c5c..9e6b981bb8 100644 --- a/testsuite/tests/parser/should_compile/T14189.stderr +++ b/testsuite/tests/parser/should_compile/T14189.stderr @@ -4,14 +4,14 @@ (Just ((,,,) (HsGroup - (NoExt) + (NoExtField) (XValBindsLR (NValBinds [] [])) [] [(TyClGroup - (NoExt) + (NoExtField) [({ T14189.hs:6:1-42 } (DataDecl (DataDeclRn @@ -25,7 +25,7 @@ []) (Prefix) (HsDataDefn - (NoExt) + (NoExtField) (DataType) ({ <no location info> } []) @@ -33,7 +33,7 @@ (Nothing) [({ T14189.hs:6:15-20 } (ConDeclH98 - (NoExt) + (NoExtField) ({ T14189.hs:6:15-16 } {Name: T14189.MT}) ({ <no location info> } @@ -43,14 +43,14 @@ (PrefixCon [({ T14189.hs:6:18-20 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ T14189.hs:6:18-20 } {Name: GHC.Types.Int})))]) (Nothing))) ,({ T14189.hs:6:24-25 } (ConDeclH98 - (NoExt) + (NoExtField) ({ T14189.hs:6:24-25 } {Name: T14189.NT}) ({ <no location info> } @@ -62,7 +62,7 @@ (Nothing))) ,({ T14189.hs:6:29-42 } (ConDeclH98 - (NoExt) + (NoExtField) ({ T14189.hs:6:29 } {Name: T14189.F}) ({ <no location info> } @@ -73,7 +73,7 @@ ({ T14189.hs:6:31-42 } [({ T14189.hs:6:33-40 } (ConDeclField - (NoExt) + (NoExtField) [({ T14189.hs:6:33 } (FieldOcc {Name: T14189.f} @@ -82,7 +82,7 @@ {OccName: f}))))] ({ T14189.hs:6:38-40 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ T14189.hs:6:38-40 } {Name: GHC.Types.Int}))) @@ -102,7 +102,7 @@ []) [({ T14189.hs:1:8-13 } (ImportDecl - (NoExt) + (NoExtField) (NoSourceText) ({ T14189.hs:1:8-13 } {ModuleName: Prelude}) @@ -117,7 +117,7 @@ [((,) ({ T14189.hs:3:3-15 } (IEThingWith - (NoExt) + (NoExtField) ({ T14189.hs:3:3-8 } (IEName ({ T14189.hs:3:3-8 } @@ -141,3 +141,5 @@ (False) {Name: T14189.f})])])]) (Nothing))) + + diff --git a/testsuite/tests/parser/should_compile/T15323.stderr b/testsuite/tests/parser/should_compile/T15323.stderr index 93b254bf32..25b0ed002d 100644 --- a/testsuite/tests/parser/should_compile/T15323.stderr +++ b/testsuite/tests/parser/should_compile/T15323.stderr @@ -10,23 +10,23 @@ [] [({ T15323.hs:(5,1)-(6,56) } (TyClD - (NoExt) + (NoExtField) (DataDecl - (NoExt) + (NoExtField) ({ T15323.hs:5:6-17 } (Unqual {OccName: MaybeDefault})) (HsQTvs - (NoExt) + (NoExtField) [({ T15323.hs:5:19 } (UserTyVar - (NoExt) + (NoExtField) ({ T15323.hs:5:19 } (Unqual {OccName: v}))))]) (Prefix) (HsDataDefn - (NoExt) + (NoExtField) (DataType) ({ <no location info> } []) @@ -34,17 +34,17 @@ (Nothing) [({ T15323.hs:6:5-56 } (ConDeclGADT - (NoExt) + (NoExtField) [({ T15323.hs:6:5-14 } (Unqual {OccName: TestParens}))] ({ T15323.hs:6:21-55 } (True)) (HsQTvs - (NoExt) + (NoExtField) [({ T15323.hs:6:28 } (UserTyVar - (NoExt) + (NoExtField) ({ T15323.hs:6:28 } (Unqual {OccName: v}))))]) @@ -52,20 +52,20 @@ ({ T15323.hs:6:32-37 } [({ T15323.hs:6:32-37 } (HsParTy - (NoExt) + (NoExtField) ({ T15323.hs:6:33-36 } (HsAppTy - (NoExt) + (NoExtField) ({ T15323.hs:6:33-34 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ T15323.hs:6:33-34 } (Unqual {OccName: Eq})))) ({ T15323.hs:6:36 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ T15323.hs:6:36 } (Unqual @@ -74,17 +74,17 @@ []) ({ T15323.hs:6:42-55 } (HsAppTy - (NoExt) + (NoExtField) ({ T15323.hs:6:42-53 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ T15323.hs:6:42-53 } (Unqual {OccName: MaybeDefault})))) ({ T15323.hs:6:55 } (HsTyVar - (NoExt) + (NoExtField) (NotPromoted) ({ T15323.hs:6:55 } (Unqual @@ -94,3 +94,5 @@ [])))))] (Nothing) (Nothing))) + + |