diff options
author | Ryan Scott <ryan.gl.scott@gmail.com> | 2020-07-05 16:15:01 -0400 |
---|---|---|
committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-11-06 03:45:28 -0500 |
commit | e07e383a3250cb27a9128ad8d5c68def5c3df336 (patch) | |
tree | b580fd84319138a3508303356318ac9b78750009 /testsuite/tests/haddock | |
parent | 2125b1d6bea0c620e3a089603dace6bb38020c81 (diff) | |
download | haskell-e07e383a3250cb27a9128ad8d5c68def5c3df336.tar.gz |
Replace HsImplicitBndrs with HsOuterTyVarBndrs
This refactors the GHC AST to remove `HsImplicitBndrs` and replace it with
`HsOuterTyVarBndrs`, a type which records whether the outermost quantification
in a type is explicit (i.e., with an outermost, invisible `forall`) or
implicit. As a result of this refactoring, it is now evident in the AST where
the `forall`-or-nothing rule applies: it's all the places that use
`HsOuterTyVarBndrs`. See the revamped `Note [forall-or-nothing rule]` in
`GHC.Hs.Type` (previously in `GHC.Rename.HsType`).
Moreover, the places where `ScopedTypeVariables` brings lexically scoped type
variables into scope are a subset of the places that adhere to the
`forall`-or-nothing rule, so this also makes places that interact with
`ScopedTypeVariables` easier to find. See the revamped
`Note [Lexically scoped type variables]` in `GHC.Hs.Type` (previously in
`GHC.Tc.Gen.Sig`).
`HsOuterTyVarBndrs` are used in type signatures (see `HsOuterSigTyVarBndrs`)
and type family equations (see `HsOuterFamEqnTyVarBndrs`). The main difference
between the former and the latter is that the former cares about specificity
but the latter does not.
There are a number of knock-on consequences:
* There is now a dedicated `HsSigType` type, which is the combination of
`HsOuterSigTyVarBndrs` and `HsType`. `LHsSigType` is now an alias for an
`XRec` of `HsSigType`.
* Working out the details led us to a substantial refactoring of
the handling of explicit (user-written) and implicit type-variable
bindings in `GHC.Tc.Gen.HsType`.
Instead of a confusing family of higher order functions, we now
have a local data type, `SkolemInfo`, that controls how these
binders are kind-checked.
It remains very fiddly, not fully satisfying. But it's better
than it was.
Fixes #16762. Bumps the Haddock submodule.
Co-authored-by: Simon Peyton Jones <simonpj@microsoft.com>
Co-authored-by: Richard Eisenberg <rae@richarde.dev>
Co-authored-by: Zubin Duggal <zubin@cmi.ac.in>
Diffstat (limited to 'testsuite/tests/haddock')
-rw-r--r-- | testsuite/tests/haddock/should_compile_flag_haddock/T17544.stderr | 1101 | ||||
-rw-r--r-- | testsuite/tests/haddock/should_compile_flag_haddock/T17544_kw.stderr | 29 |
2 files changed, 580 insertions, 550 deletions
diff --git a/testsuite/tests/haddock/should_compile_flag_haddock/T17544.stderr b/testsuite/tests/haddock/should_compile_flag_haddock/T17544.stderr index 2e5452129b..2d9cede53c 100644 --- a/testsuite/tests/haddock/should_compile_flag_haddock/T17544.stderr +++ b/testsuite/tests/haddock/should_compile_flag_haddock/T17544.stderr @@ -39,33 +39,36 @@ [({ T17544.hs:6:3-4 } (Unqual {OccName: f1}))] - (HsIB - (NoExtField) - ({ T17544.hs:6:9-16 } - (HsFunTy - (NoExtField) - (HsUnrestrictedArrow - (NormalSyntax)) - ({ T17544.hs:6:9 } - (HsTyVar - (NoExtField) - (NotPromoted) - ({ T17544.hs:6:9 } - (Unqual - {OccName: a})))) - ({ T17544.hs:6:14-16 } - (HsDocTy - (NoExtField) - ({ T17544.hs:6:14-16 } - (HsTyVar - (NoExtField) - (NotPromoted) - ({ T17544.hs:6:14-16 } - (Unqual - {OccName: Int})))) - ({ T17544.hs:7:5-23 } - (HsDocString - " comment on Int")))))))))] + ({ T17544.hs:6:9-16 } + (HsSig + (NoExtField) + (HsOuterImplicit + (NoExtField)) + ({ T17544.hs:6:9-16 } + (HsFunTy + (NoExtField) + (HsUnrestrictedArrow + (NormalSyntax)) + ({ T17544.hs:6:9 } + (HsTyVar + (NoExtField) + (NotPromoted) + ({ T17544.hs:6:9 } + (Unqual + {OccName: a})))) + ({ T17544.hs:6:14-16 } + (HsDocTy + (NoExtField) + ({ T17544.hs:6:14-16 } + (HsTyVar + (NoExtField) + (NotPromoted) + ({ T17544.hs:6:14-16 } + (Unqual + {OccName: Int})))) + ({ T17544.hs:7:5-23 } + (HsDocString + " comment on Int"))))))))))] {Bag(Located (HsBind GhcPs)): []} [] @@ -100,27 +103,30 @@ [({ T17544.hs:10:3-4 } (Unqual {OccName: f2}))] - (HsIB - (NoExtField) - ({ T17544.hs:10:9-16 } - (HsFunTy - (NoExtField) - (HsUnrestrictedArrow - (NormalSyntax)) - ({ T17544.hs:10:9 } - (HsTyVar - (NoExtField) - (NotPromoted) - ({ T17544.hs:10:9 } - (Unqual - {OccName: a})))) - ({ T17544.hs:10:14-16 } - (HsTyVar - (NoExtField) - (NotPromoted) - ({ T17544.hs:10:14-16 } - (Unqual - {OccName: Int})))))))))] + ({ T17544.hs:10:9-16 } + (HsSig + (NoExtField) + (HsOuterImplicit + (NoExtField)) + ({ T17544.hs:10:9-16 } + (HsFunTy + (NoExtField) + (HsUnrestrictedArrow + (NormalSyntax)) + ({ T17544.hs:10:9 } + (HsTyVar + (NoExtField) + (NotPromoted) + ({ T17544.hs:10:9 } + (Unqual + {OccName: a})))) + ({ T17544.hs:10:14-16 } + (HsTyVar + (NoExtField) + (NotPromoted) + ({ T17544.hs:10:14-16 } + (Unqual + {OccName: Int}))))))))))] {Bag(Located (HsBind GhcPs)): []} [] @@ -158,27 +164,30 @@ [({ T17544.hs:14:3-4 } (Unqual {OccName: f3}))] - (HsIB - (NoExtField) - ({ T17544.hs:14:9-16 } - (HsFunTy - (NoExtField) - (HsUnrestrictedArrow - (NormalSyntax)) - ({ T17544.hs:14:9 } - (HsTyVar - (NoExtField) - (NotPromoted) - ({ T17544.hs:14:9 } - (Unqual - {OccName: a})))) - ({ T17544.hs:14:14-16 } - (HsTyVar - (NoExtField) - (NotPromoted) - ({ T17544.hs:14:14-16 } - (Unqual - {OccName: Int})))))))))] + ({ T17544.hs:14:9-16 } + (HsSig + (NoExtField) + (HsOuterImplicit + (NoExtField)) + ({ T17544.hs:14:9-16 } + (HsFunTy + (NoExtField) + (HsUnrestrictedArrow + (NormalSyntax)) + ({ T17544.hs:14:9 } + (HsTyVar + (NoExtField) + (NotPromoted) + ({ T17544.hs:14:9 } + (Unqual + {OccName: a})))) + ({ T17544.hs:14:14-16 } + (HsTyVar + (NoExtField) + (NotPromoted) + ({ T17544.hs:14:14-16 } + (Unqual + {OccName: Int}))))))))))] {Bag(Located (HsBind GhcPs)): []} [] @@ -219,27 +228,30 @@ [({ T17544.hs:18:3-4 } (Unqual {OccName: f4}))] - (HsIB - (NoExtField) - ({ T17544.hs:18:9-16 } - (HsFunTy - (NoExtField) - (HsUnrestrictedArrow - (NormalSyntax)) - ({ T17544.hs:18:9 } - (HsTyVar - (NoExtField) - (NotPromoted) - ({ T17544.hs:18:9 } - (Unqual - {OccName: a})))) - ({ T17544.hs:18:14-16 } - (HsTyVar - (NoExtField) - (NotPromoted) - ({ T17544.hs:18:14-16 } - (Unqual - {OccName: Int}))))))))) + ({ T17544.hs:18:9-16 } + (HsSig + (NoExtField) + (HsOuterImplicit + (NoExtField)) + ({ T17544.hs:18:9-16 } + (HsFunTy + (NoExtField) + (HsUnrestrictedArrow + (NormalSyntax)) + ({ T17544.hs:18:9 } + (HsTyVar + (NoExtField) + (NotPromoted) + ({ T17544.hs:18:9 } + (Unqual + {OccName: a})))) + ({ T17544.hs:18:14-16 } + (HsTyVar + (NoExtField) + (NotPromoted) + ({ T17544.hs:18:14-16 } + (Unqual + {OccName: Int})))))))))) ,({ T17544.hs:20:3-16 } (ClassOpSig (NoExtField) @@ -247,27 +259,30 @@ [({ T17544.hs:20:3-4 } (Unqual {OccName: g4}))] - (HsIB - (NoExtField) - ({ T17544.hs:20:9-16 } - (HsFunTy - (NoExtField) - (HsUnrestrictedArrow - (NormalSyntax)) - ({ T17544.hs:20:9 } - (HsTyVar - (NoExtField) - (NotPromoted) - ({ T17544.hs:20:9 } - (Unqual - {OccName: a})))) - ({ T17544.hs:20:14-16 } - (HsTyVar - (NoExtField) - (NotPromoted) - ({ T17544.hs:20:14-16 } - (Unqual - {OccName: Int})))))))))] + ({ T17544.hs:20:9-16 } + (HsSig + (NoExtField) + (HsOuterImplicit + (NoExtField)) + ({ T17544.hs:20:9-16 } + (HsFunTy + (NoExtField) + (HsUnrestrictedArrow + (NormalSyntax)) + ({ T17544.hs:20:9 } + (HsTyVar + (NoExtField) + (NotPromoted) + ({ T17544.hs:20:9 } + (Unqual + {OccName: a})))) + ({ T17544.hs:20:14-16 } + (HsTyVar + (NoExtField) + (NotPromoted) + ({ T17544.hs:20:14-16 } + (Unqual + {OccName: Int}))))))))))] {Bag(Located (HsBind GhcPs)): []} [] @@ -327,87 +342,89 @@ (NoExtField) (ClsInstDecl (NoExtField) - (HsIB - (NoExtField) - ({ T17544.hs:23:10-15 } - (HsAppTy - (NoExtField) - ({ T17544.hs:23:10-11 } - (HsTyVar - (NoExtField) - (NotPromoted) - ({ T17544.hs:23:10-11 } - (Unqual - {OccName: C5})))) - ({ T17544.hs:23:13-15 } - (HsTyVar - (NoExtField) - (NotPromoted) - ({ T17544.hs:23:13-15 } - (Unqual - {OccName: Int}))))))) + ({ T17544.hs:23:10-15 } + (HsSig + (NoExtField) + (HsOuterImplicit + (NoExtField)) + ({ T17544.hs:23:10-15 } + (HsAppTy + (NoExtField) + ({ T17544.hs:23:10-11 } + (HsTyVar + (NoExtField) + (NotPromoted) + ({ T17544.hs:23:10-11 } + (Unqual + {OccName: C5})))) + ({ T17544.hs:23:13-15 } + (HsTyVar + (NoExtField) + (NotPromoted) + ({ T17544.hs:23:13-15 } + (Unqual + {OccName: Int})))))))) {Bag(Located (HsBind GhcPs)): []} [] [] [({ T17544.hs:(24,3)-(25,18) } (DataFamInstDecl - (HsIB + (FamEqn (NoExtField) - (FamEqn + ({ T17544.hs:24:8-9 } + (Unqual + {OccName: D5})) + (HsOuterImplicit + (NoExtField)) + [(HsValArg + ({ T17544.hs:24:11-13 } + (HsTyVar + (NoExtField) + (NotPromoted) + ({ T17544.hs:24:11-13 } + (Unqual + {OccName: Int})))))] + (Prefix) + (HsDataDefn (NoExtField) - ({ T17544.hs:24:8-9 } - (Unqual - {OccName: D5})) + (DataType) + ({ <no location info> } + []) + (Nothing) (Nothing) - [(HsValArg - ({ T17544.hs:24:11-13 } - (HsTyVar - (NoExtField) - (NotPromoted) - ({ T17544.hs:24:11-13 } + [({ T17544.hs:25:5-18 } + (ConDeclGADT + (NoExtField) + [({ T17544.hs:25:5-8 } (Unqual - {OccName: Int})))))] - (Prefix) - (HsDataDefn - (NoExtField) - (DataType) - ({ <no location info> } - []) - (Nothing) - (Nothing) - [({ T17544.hs:25:5-18 } - (ConDeclGADT - (NoExtField) - [({ T17544.hs:25:5-8 } - (Unqual - {OccName: MkD5}))] - ({ T17544.hs:25:13-18 } - (False)) - [] - (Nothing) - (PrefixConGADT - []) - ({ T17544.hs:25:13-18 } - (HsAppTy - (NoExtField) - ({ T17544.hs:25:13-14 } - (HsTyVar - (NoExtField) - (NotPromoted) - ({ T17544.hs:25:13-14 } - (Unqual - {OccName: D5})))) - ({ T17544.hs:25:16-18 } - (HsTyVar - (NoExtField) - (NotPromoted) - ({ T17544.hs:25:16-18 } - (Unqual - {OccName: Int})))))) - (Nothing)))] - ({ <no location info> } - []))))))] + {OccName: MkD5}))] + ({ T17544.hs:25:13-18 } + (HsOuterImplicit + (NoExtField))) + (Nothing) + (PrefixConGADT + []) + ({ T17544.hs:25:13-18 } + (HsAppTy + (NoExtField) + ({ T17544.hs:25:13-14 } + (HsTyVar + (NoExtField) + (NotPromoted) + ({ T17544.hs:25:13-14 } + (Unqual + {OccName: D5})))) + ({ T17544.hs:25:16-18 } + (HsTyVar + (NoExtField) + (NotPromoted) + ({ T17544.hs:25:16-18 } + (Unqual + {OccName: Int})))))) + (Nothing)))] + ({ <no location info> } + [])))))] (Nothing))))) ,({ T17544.hs:28:1-30 } (TyClD @@ -463,87 +480,89 @@ (NoExtField) (ClsInstDecl (NoExtField) - (HsIB - (NoExtField) - ({ T17544.hs:29:10-15 } - (HsAppTy - (NoExtField) - ({ T17544.hs:29:10-11 } - (HsTyVar - (NoExtField) - (NotPromoted) - ({ T17544.hs:29:10-11 } - (Unqual - {OccName: C6})))) - ({ T17544.hs:29:13-15 } - (HsTyVar - (NoExtField) - (NotPromoted) - ({ T17544.hs:29:13-15 } - (Unqual - {OccName: Int}))))))) + ({ T17544.hs:29:10-15 } + (HsSig + (NoExtField) + (HsOuterImplicit + (NoExtField)) + ({ T17544.hs:29:10-15 } + (HsAppTy + (NoExtField) + ({ T17544.hs:29:10-11 } + (HsTyVar + (NoExtField) + (NotPromoted) + ({ T17544.hs:29:10-11 } + (Unqual + {OccName: C6})))) + ({ T17544.hs:29:13-15 } + (HsTyVar + (NoExtField) + (NotPromoted) + ({ T17544.hs:29:13-15 } + (Unqual + {OccName: Int})))))))) {Bag(Located (HsBind GhcPs)): []} [] [] [({ T17544.hs:(30,3)-(31,18) } (DataFamInstDecl - (HsIB + (FamEqn (NoExtField) - (FamEqn + ({ T17544.hs:30:8-9 } + (Unqual + {OccName: D6})) + (HsOuterImplicit + (NoExtField)) + [(HsValArg + ({ T17544.hs:30:11-13 } + (HsTyVar + (NoExtField) + (NotPromoted) + ({ T17544.hs:30:11-13 } + (Unqual + {OccName: Int})))))] + (Prefix) + (HsDataDefn (NoExtField) - ({ T17544.hs:30:8-9 } - (Unqual - {OccName: D6})) + (DataType) + ({ <no location info> } + []) + (Nothing) (Nothing) - [(HsValArg - ({ T17544.hs:30:11-13 } - (HsTyVar - (NoExtField) - (NotPromoted) - ({ T17544.hs:30:11-13 } + [({ T17544.hs:31:5-18 } + (ConDeclGADT + (NoExtField) + [({ T17544.hs:31:5-8 } (Unqual - {OccName: Int})))))] - (Prefix) - (HsDataDefn - (NoExtField) - (DataType) - ({ <no location info> } - []) - (Nothing) - (Nothing) - [({ T17544.hs:31:5-18 } - (ConDeclGADT - (NoExtField) - [({ T17544.hs:31:5-8 } - (Unqual - {OccName: MkD6}))] - ({ T17544.hs:31:13-18 } - (False)) - [] - (Nothing) - (PrefixConGADT - []) - ({ T17544.hs:31:13-18 } - (HsAppTy - (NoExtField) - ({ T17544.hs:31:13-14 } - (HsTyVar - (NoExtField) - (NotPromoted) - ({ T17544.hs:31:13-14 } - (Unqual - {OccName: D6})))) - ({ T17544.hs:31:16-18 } - (HsTyVar - (NoExtField) - (NotPromoted) - ({ T17544.hs:31:16-18 } - (Unqual - {OccName: Int})))))) - (Nothing)))] - ({ <no location info> } - []))))))] + {OccName: MkD6}))] + ({ T17544.hs:31:13-18 } + (HsOuterImplicit + (NoExtField))) + (Nothing) + (PrefixConGADT + []) + ({ T17544.hs:31:13-18 } + (HsAppTy + (NoExtField) + ({ T17544.hs:31:13-14 } + (HsTyVar + (NoExtField) + (NotPromoted) + ({ T17544.hs:31:13-14 } + (Unqual + {OccName: D6})))) + ({ T17544.hs:31:16-18 } + (HsTyVar + (NoExtField) + (NotPromoted) + ({ T17544.hs:31:16-18 } + (Unqual + {OccName: Int})))))) + (Nothing)))] + ({ <no location info> } + [])))))] (Nothing))))) ,({ T17544.hs:34:1-30 } (TyClD @@ -599,87 +618,89 @@ (NoExtField) (ClsInstDecl (NoExtField) - (HsIB - (NoExtField) - ({ T17544.hs:35:10-15 } - (HsAppTy - (NoExtField) - ({ T17544.hs:35:10-11 } - (HsTyVar - (NoExtField) - (NotPromoted) - ({ T17544.hs:35:10-11 } - (Unqual - {OccName: C7})))) - ({ T17544.hs:35:13-15 } - (HsTyVar - (NoExtField) - (NotPromoted) - ({ T17544.hs:35:13-15 } - (Unqual - {OccName: Int}))))))) + ({ T17544.hs:35:10-15 } + (HsSig + (NoExtField) + (HsOuterImplicit + (NoExtField)) + ({ T17544.hs:35:10-15 } + (HsAppTy + (NoExtField) + ({ T17544.hs:35:10-11 } + (HsTyVar + (NoExtField) + (NotPromoted) + ({ T17544.hs:35:10-11 } + (Unqual + {OccName: C7})))) + ({ T17544.hs:35:13-15 } + (HsTyVar + (NoExtField) + (NotPromoted) + ({ T17544.hs:35:13-15 } + (Unqual + {OccName: Int})))))))) {Bag(Located (HsBind GhcPs)): []} [] [] [({ T17544.hs:(36,3)-(37,18) } (DataFamInstDecl - (HsIB + (FamEqn (NoExtField) - (FamEqn + ({ T17544.hs:36:8-9 } + (Unqual + {OccName: D7})) + (HsOuterImplicit + (NoExtField)) + [(HsValArg + ({ T17544.hs:36:11-13 } + (HsTyVar + (NoExtField) + (NotPromoted) + ({ T17544.hs:36:11-13 } + (Unqual + {OccName: Int})))))] + (Prefix) + (HsDataDefn (NoExtField) - ({ T17544.hs:36:8-9 } - (Unqual - {OccName: D7})) + (DataType) + ({ <no location info> } + []) + (Nothing) (Nothing) - [(HsValArg - ({ T17544.hs:36:11-13 } - (HsTyVar - (NoExtField) - (NotPromoted) - ({ T17544.hs:36:11-13 } + [({ T17544.hs:37:5-18 } + (ConDeclGADT + (NoExtField) + [({ T17544.hs:37:5-8 } (Unqual - {OccName: Int})))))] - (Prefix) - (HsDataDefn - (NoExtField) - (DataType) - ({ <no location info> } - []) - (Nothing) - (Nothing) - [({ T17544.hs:37:5-18 } - (ConDeclGADT - (NoExtField) - [({ T17544.hs:37:5-8 } - (Unqual - {OccName: MkD7}))] - ({ T17544.hs:37:13-18 } - (False)) - [] - (Nothing) - (PrefixConGADT - []) - ({ T17544.hs:37:13-18 } - (HsAppTy - (NoExtField) - ({ T17544.hs:37:13-14 } - (HsTyVar - (NoExtField) - (NotPromoted) - ({ T17544.hs:37:13-14 } - (Unqual - {OccName: D7})))) - ({ T17544.hs:37:16-18 } - (HsTyVar - (NoExtField) - (NotPromoted) - ({ T17544.hs:37:16-18 } - (Unqual - {OccName: Int})))))) - (Nothing)))] - ({ <no location info> } - []))))))] + {OccName: MkD7}))] + ({ T17544.hs:37:13-18 } + (HsOuterImplicit + (NoExtField))) + (Nothing) + (PrefixConGADT + []) + ({ T17544.hs:37:13-18 } + (HsAppTy + (NoExtField) + ({ T17544.hs:37:13-14 } + (HsTyVar + (NoExtField) + (NotPromoted) + ({ T17544.hs:37:13-14 } + (Unqual + {OccName: D7})))) + ({ T17544.hs:37:16-18 } + (HsTyVar + (NoExtField) + (NotPromoted) + ({ T17544.hs:37:16-18 } + (Unqual + {OccName: Int})))))) + (Nothing)))] + ({ <no location info> } + [])))))] (Nothing))))) ,({ T17544.hs:40:1-30 } (TyClD @@ -735,87 +756,89 @@ (NoExtField) (ClsInstDecl (NoExtField) - (HsIB - (NoExtField) - ({ T17544.hs:41:10-15 } - (HsAppTy - (NoExtField) - ({ T17544.hs:41:10-11 } - (HsTyVar - (NoExtField) - (NotPromoted) - ({ T17544.hs:41:10-11 } - (Unqual - {OccName: C8})))) - ({ T17544.hs:41:13-15 } - (HsTyVar - (NoExtField) - (NotPromoted) - ({ T17544.hs:41:13-15 } - (Unqual - {OccName: Int}))))))) + ({ T17544.hs:41:10-15 } + (HsSig + (NoExtField) + (HsOuterImplicit + (NoExtField)) + ({ T17544.hs:41:10-15 } + (HsAppTy + (NoExtField) + ({ T17544.hs:41:10-11 } + (HsTyVar + (NoExtField) + (NotPromoted) + ({ T17544.hs:41:10-11 } + (Unqual + {OccName: C8})))) + ({ T17544.hs:41:13-15 } + (HsTyVar + (NoExtField) + (NotPromoted) + ({ T17544.hs:41:13-15 } + (Unqual + {OccName: Int})))))))) {Bag(Located (HsBind GhcPs)): []} [] [] [({ T17544.hs:(42,3)-(43,18) } (DataFamInstDecl - (HsIB + (FamEqn (NoExtField) - (FamEqn + ({ T17544.hs:42:8-9 } + (Unqual + {OccName: D8})) + (HsOuterImplicit + (NoExtField)) + [(HsValArg + ({ T17544.hs:42:11-13 } + (HsTyVar + (NoExtField) + (NotPromoted) + ({ T17544.hs:42:11-13 } + (Unqual + {OccName: Int})))))] + (Prefix) + (HsDataDefn (NoExtField) - ({ T17544.hs:42:8-9 } - (Unqual - {OccName: D8})) + (DataType) + ({ <no location info> } + []) + (Nothing) (Nothing) - [(HsValArg - ({ T17544.hs:42:11-13 } - (HsTyVar - (NoExtField) - (NotPromoted) - ({ T17544.hs:42:11-13 } + [({ T17544.hs:43:5-18 } + (ConDeclGADT + (NoExtField) + [({ T17544.hs:43:5-8 } (Unqual - {OccName: Int})))))] - (Prefix) - (HsDataDefn - (NoExtField) - (DataType) - ({ <no location info> } - []) - (Nothing) - (Nothing) - [({ T17544.hs:43:5-18 } - (ConDeclGADT - (NoExtField) - [({ T17544.hs:43:5-8 } - (Unqual - {OccName: MkD8}))] - ({ T17544.hs:43:13-18 } - (False)) - [] - (Nothing) - (PrefixConGADT - []) - ({ T17544.hs:43:13-18 } - (HsAppTy - (NoExtField) - ({ T17544.hs:43:13-14 } - (HsTyVar - (NoExtField) - (NotPromoted) - ({ T17544.hs:43:13-14 } - (Unqual - {OccName: D8})))) - ({ T17544.hs:43:16-18 } - (HsTyVar - (NoExtField) - (NotPromoted) - ({ T17544.hs:43:16-18 } - (Unqual - {OccName: Int})))))) - (Nothing)))] - ({ <no location info> } - []))))))] + {OccName: MkD8}))] + ({ T17544.hs:43:13-18 } + (HsOuterImplicit + (NoExtField))) + (Nothing) + (PrefixConGADT + []) + ({ T17544.hs:43:13-18 } + (HsAppTy + (NoExtField) + ({ T17544.hs:43:13-14 } + (HsTyVar + (NoExtField) + (NotPromoted) + ({ T17544.hs:43:13-14 } + (Unqual + {OccName: D8})))) + ({ T17544.hs:43:16-18 } + (HsTyVar + (NoExtField) + (NotPromoted) + ({ T17544.hs:43:16-18 } + (Unqual + {OccName: Int})))))) + (Nothing)))] + ({ <no location info> } + [])))))] (Nothing))))) ,({ T17544.hs:46:1-30 } (TyClD @@ -871,87 +894,89 @@ (NoExtField) (ClsInstDecl (NoExtField) - (HsIB - (NoExtField) - ({ T17544.hs:47:10-15 } - (HsAppTy - (NoExtField) - ({ T17544.hs:47:10-11 } - (HsTyVar - (NoExtField) - (NotPromoted) - ({ T17544.hs:47:10-11 } - (Unqual - {OccName: C9})))) - ({ T17544.hs:47:13-15 } - (HsTyVar - (NoExtField) - (NotPromoted) - ({ T17544.hs:47:13-15 } - (Unqual - {OccName: Int}))))))) + ({ T17544.hs:47:10-15 } + (HsSig + (NoExtField) + (HsOuterImplicit + (NoExtField)) + ({ T17544.hs:47:10-15 } + (HsAppTy + (NoExtField) + ({ T17544.hs:47:10-11 } + (HsTyVar + (NoExtField) + (NotPromoted) + ({ T17544.hs:47:10-11 } + (Unqual + {OccName: C9})))) + ({ T17544.hs:47:13-15 } + (HsTyVar + (NoExtField) + (NotPromoted) + ({ T17544.hs:47:13-15 } + (Unqual + {OccName: Int})))))))) {Bag(Located (HsBind GhcPs)): []} [] [] [({ T17544.hs:(48,3)-(49,18) } (DataFamInstDecl - (HsIB + (FamEqn (NoExtField) - (FamEqn + ({ T17544.hs:48:8-9 } + (Unqual + {OccName: D9})) + (HsOuterImplicit + (NoExtField)) + [(HsValArg + ({ T17544.hs:48:11-13 } + (HsTyVar + (NoExtField) + (NotPromoted) + ({ T17544.hs:48:11-13 } + (Unqual + {OccName: Int})))))] + (Prefix) + (HsDataDefn (NoExtField) - ({ T17544.hs:48:8-9 } - (Unqual - {OccName: D9})) + (DataType) + ({ <no location info> } + []) + (Nothing) (Nothing) - [(HsValArg - ({ T17544.hs:48:11-13 } - (HsTyVar - (NoExtField) - (NotPromoted) - ({ T17544.hs:48:11-13 } + [({ T17544.hs:49:5-18 } + (ConDeclGADT + (NoExtField) + [({ T17544.hs:49:5-8 } (Unqual - {OccName: Int})))))] - (Prefix) - (HsDataDefn - (NoExtField) - (DataType) - ({ <no location info> } - []) - (Nothing) - (Nothing) - [({ T17544.hs:49:5-18 } - (ConDeclGADT - (NoExtField) - [({ T17544.hs:49:5-8 } - (Unqual - {OccName: MkD9}))] - ({ T17544.hs:49:13-18 } - (False)) - [] - (Nothing) - (PrefixConGADT - []) - ({ T17544.hs:49:13-18 } - (HsAppTy - (NoExtField) - ({ T17544.hs:49:13-14 } - (HsTyVar - (NoExtField) - (NotPromoted) - ({ T17544.hs:49:13-14 } - (Unqual - {OccName: D9})))) - ({ T17544.hs:49:16-18 } - (HsTyVar - (NoExtField) - (NotPromoted) - ({ T17544.hs:49:16-18 } - (Unqual - {OccName: Int})))))) - (Nothing)))] - ({ <no location info> } - []))))))] + {OccName: MkD9}))] + ({ T17544.hs:49:13-18 } + (HsOuterImplicit + (NoExtField))) + (Nothing) + (PrefixConGADT + []) + ({ T17544.hs:49:13-18 } + (HsAppTy + (NoExtField) + ({ T17544.hs:49:13-14 } + (HsTyVar + (NoExtField) + (NotPromoted) + ({ T17544.hs:49:13-14 } + (Unqual + {OccName: D9})))) + ({ T17544.hs:49:16-18 } + (HsTyVar + (NoExtField) + (NotPromoted) + ({ T17544.hs:49:16-18 } + (Unqual + {OccName: Int})))))) + (Nothing)))] + ({ <no location info> } + [])))))] (Nothing))))) ,({ T17544.hs:52:1-32 } (TyClD @@ -1007,87 +1032,89 @@ (NoExtField) (ClsInstDecl (NoExtField) - (HsIB - (NoExtField) - ({ T17544.hs:53:10-16 } - (HsAppTy - (NoExtField) - ({ T17544.hs:53:10-12 } - (HsTyVar - (NoExtField) - (NotPromoted) - ({ T17544.hs:53:10-12 } - (Unqual - {OccName: C10})))) - ({ T17544.hs:53:14-16 } - (HsTyVar - (NoExtField) - (NotPromoted) - ({ T17544.hs:53:14-16 } - (Unqual - {OccName: Int}))))))) + ({ T17544.hs:53:10-16 } + (HsSig + (NoExtField) + (HsOuterImplicit + (NoExtField)) + ({ T17544.hs:53:10-16 } + (HsAppTy + (NoExtField) + ({ T17544.hs:53:10-12 } + (HsTyVar + (NoExtField) + (NotPromoted) + ({ T17544.hs:53:10-12 } + (Unqual + {OccName: C10})))) + ({ T17544.hs:53:14-16 } + (HsTyVar + (NoExtField) + (NotPromoted) + ({ T17544.hs:53:14-16 } + (Unqual + {OccName: Int})))))))) {Bag(Located (HsBind GhcPs)): []} [] [] [({ T17544.hs:(54,3)-(55,20) } (DataFamInstDecl - (HsIB + (FamEqn (NoExtField) - (FamEqn + ({ T17544.hs:54:8-10 } + (Unqual + {OccName: D10})) + (HsOuterImplicit + (NoExtField)) + [(HsValArg + ({ T17544.hs:54:12-14 } + (HsTyVar + (NoExtField) + (NotPromoted) + ({ T17544.hs:54:12-14 } + (Unqual + {OccName: Int})))))] + (Prefix) + (HsDataDefn (NoExtField) - ({ T17544.hs:54:8-10 } - (Unqual - {OccName: D10})) + (DataType) + ({ <no location info> } + []) + (Nothing) (Nothing) - [(HsValArg - ({ T17544.hs:54:12-14 } - (HsTyVar - (NoExtField) - (NotPromoted) - ({ T17544.hs:54:12-14 } + [({ T17544.hs:55:5-20 } + (ConDeclGADT + (NoExtField) + [({ T17544.hs:55:5-9 } (Unqual - {OccName: Int})))))] - (Prefix) - (HsDataDefn - (NoExtField) - (DataType) - ({ <no location info> } - []) - (Nothing) - (Nothing) - [({ T17544.hs:55:5-20 } - (ConDeclGADT - (NoExtField) - [({ T17544.hs:55:5-9 } - (Unqual - {OccName: MkD10}))] - ({ T17544.hs:55:14-20 } - (False)) - [] - (Nothing) - (PrefixConGADT - []) - ({ T17544.hs:55:14-20 } - (HsAppTy - (NoExtField) - ({ T17544.hs:55:14-16 } - (HsTyVar - (NoExtField) - (NotPromoted) - ({ T17544.hs:55:14-16 } - (Unqual - {OccName: D10})))) - ({ T17544.hs:55:18-20 } - (HsTyVar - (NoExtField) - (NotPromoted) - ({ T17544.hs:55:18-20 } - (Unqual - {OccName: Int})))))) - (Nothing)))] - ({ <no location info> } - []))))))] + {OccName: MkD10}))] + ({ T17544.hs:55:14-20 } + (HsOuterImplicit + (NoExtField))) + (Nothing) + (PrefixConGADT + []) + ({ T17544.hs:55:14-20 } + (HsAppTy + (NoExtField) + ({ T17544.hs:55:14-16 } + (HsTyVar + (NoExtField) + (NotPromoted) + ({ T17544.hs:55:14-16 } + (Unqual + {OccName: D10})))) + ({ T17544.hs:55:18-20 } + (HsTyVar + (NoExtField) + (NotPromoted) + ({ T17544.hs:55:18-20 } + (Unqual + {OccName: Int})))))) + (Nothing)))] + ({ <no location info> } + [])))))] (Nothing))))) ,({ T17544.hs:56:1-38 } (DocD 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 d1ff09f56c..b8cb9eedf2 100644 --- a/testsuite/tests/haddock/should_compile_flag_haddock/T17544_kw.stderr +++ b/testsuite/tests/haddock/should_compile_flag_haddock/T17544_kw.stderr @@ -36,8 +36,8 @@ (Unqual {OccName: MkFoo}))] ({ T17544_kw.hs:16:18-20 } - (False)) - [] + (HsOuterImplicit + (NoExtField))) (Nothing) (PrefixConGADT []) @@ -80,8 +80,8 @@ (Unqual {OccName: MkBar}))] ({ T17544_kw.hs:19:18-26 } - (False)) - [] + (HsOuterImplicit + (NoExtField))) (Nothing) (PrefixConGADT [(HsScaled @@ -134,15 +134,18 @@ [({ T17544_kw.hs:24:5-13 } (Unqual {OccName: clsmethod}))] - (HsIB - (NoExtField) - ({ T17544_kw.hs:24:18 } - (HsTyVar - (NoExtField) - (NotPromoted) - ({ T17544_kw.hs:24:18 } - (Unqual - {OccName: a})))))))] + ({ T17544_kw.hs:24:18 } + (HsSig + (NoExtField) + (HsOuterImplicit + (NoExtField)) + ({ T17544_kw.hs:24:18 } + (HsTyVar + (NoExtField) + (NotPromoted) + ({ T17544_kw.hs:24:18 } + (Unqual + {OccName: a}))))))))] {Bag(Located (HsBind GhcPs)): []} [] |