diff options
| author | Ryan Scott <ryan.gl.scott@gmail.com> | 2020-09-07 11:34:37 -0400 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-09-08 15:43:16 -0400 |
| commit | 44472daf500bf862921e89ad45c9741a07a64f61 (patch) | |
| tree | fc904a7a9acbd407a00d4f6c93ca222cfdbc42fb /compiler/GHC/Hs | |
| parent | d7b2f799469a969ad7a2535be57f105186946c40 (diff) | |
| download | haskell-44472daf500bf862921e89ad45c9741a07a64f61.tar.gz | |
Make the forall-or-nothing rule only apply to invisible foralls (#18660)
This fixes #18660 by changing `isLHsForAllTy` to
`isLHsInvisForAllTy`, which is sufficient to make the
`forall`-or-nothing rule only apply to invisible `forall`s. I also
updated some related documentation and Notes while I was in the
neighborhood.
Diffstat (limited to 'compiler/GHC/Hs')
| -rw-r--r-- | compiler/GHC/Hs/Type.hs | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/compiler/GHC/Hs/Type.hs b/compiler/GHC/Hs/Type.hs index 343cc1d1ba..65210d1044 100644 --- a/compiler/GHC/Hs/Type.hs +++ b/compiler/GHC/Hs/Type.hs @@ -61,7 +61,7 @@ module GHC.Hs.Type ( mkEmptyImplicitBndrs, mkEmptyWildCardBndrs, mkHsForAllVisTele, mkHsForAllInvisTele, mkHsQTvs, hsQTvExplicit, emptyLHsQTvs, - isHsKindedTyVar, hsTvbAllKinded, isLHsForAllTy, + isHsKindedTyVar, hsTvbAllKinded, isLHsInvisForAllTy, hsScopedTvs, hsWcScopedTvs, dropWildCards, hsTyVarName, hsAllLTyVarNames, hsLTyVarLocNames, hsLTyVarName, hsLTyVarNames, hsLTyVarLocName, hsExplicitLTyVarNames, @@ -1278,9 +1278,12 @@ ignoreParens :: LHsType (GhcPass p) -> LHsType (GhcPass p) ignoreParens (L _ (HsParTy _ ty)) = ignoreParens ty ignoreParens ty = ty -isLHsForAllTy :: LHsType (GhcPass p) -> Bool -isLHsForAllTy (L _ (HsForAllTy {})) = True -isLHsForAllTy _ = False +-- | Is this type headed by an invisible @forall@? This is used to determine +-- if the type variables in a type should be implicitly quantified. +-- See @Note [forall-or-nothing rule]@ in "GHC.Rename.HsType". +isLHsInvisForAllTy :: LHsType (GhcPass p) -> Bool +isLHsInvisForAllTy (L _ (HsForAllTy{hst_tele = HsForAllInvis{}})) = True +isLHsInvisForAllTy _ = False {- ************************************************************************ |