diff options
author | Zubin Duggal <zubin@cmi.ac.in> | 2020-01-08 16:28:28 +0100 |
---|---|---|
committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-07-25 00:44:30 -0400 |
commit | 02133353e712e98bfbbc6ed32305b137bb3654eb (patch) | |
tree | 12909a607dd2910501813fc4d0550913ade367be /compiler/GHC/Hs/Instances.hs | |
parent | ba205046e4f2ea94b1c978c050b917de4daaf092 (diff) | |
download | haskell-02133353e712e98bfbbc6ed32305b137bb3654eb.tar.gz |
Simplify XRec definition
Change `Located X` usage to `XRec pass X`
This increases the scope of the LPat experiment to almost all of GHC.
Introduce UnXRec and MapXRec classes
Fixes #17587 and #18408
Updates haddock submodule
Co-authored-by: Philipp Krüger <philipp.krueger1@gmail.com>
Diffstat (limited to 'compiler/GHC/Hs/Instances.hs')
-rw-r--r-- | compiler/GHC/Hs/Instances.hs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/compiler/GHC/Hs/Instances.hs b/compiler/GHC/Hs/Instances.hs index d46f9d7986..1389453195 100644 --- a/compiler/GHC/Hs/Instances.hs +++ b/compiler/GHC/Hs/Instances.hs @@ -33,6 +33,8 @@ import GHC.Hs.Type import GHC.Hs.Pat import GHC.Hs.ImpExp +import GHC.Types.SrcLoc ( Located ) + -- --------------------------------------------------------------------- -- Data derivations from GHC.Hs----------------------------------------- @@ -433,9 +435,9 @@ deriving instance Data thing => Data (HsScaled GhcPs thing) deriving instance Data thing => Data (HsScaled GhcRn thing) deriving instance Data thing => Data (HsScaled GhcTc thing) -deriving instance Data (LHsTypeArg GhcPs) -deriving instance Data (LHsTypeArg GhcRn) -deriving instance Data (LHsTypeArg GhcTc) +deriving instance Data (HsArg (Located (HsType GhcPs)) (Located (HsKind GhcPs))) +deriving instance Data (HsArg (Located (HsType GhcRn)) (Located (HsKind GhcRn))) +deriving instance Data (HsArg (Located (HsType GhcTc)) (Located (HsKind GhcTc))) -- deriving instance (DataIdLR p p) => Data (ConDeclField p) deriving instance Data (ConDeclField GhcPs) |