diff options
| author | Vladislav Zavialov <vlad.z.4096@gmail.com> | 2019-06-28 21:01:39 +0300 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-07-04 21:23:10 -0400 |
| commit | 679427f878e50ba5a9981bac4c2f9c76f4de3c3c (patch) | |
| tree | 377567870a7988c2cade9a8cb31f68bbcda64014 /testsuite/tests/generics/GenDerivOutput1_1.stderr | |
| parent | 675d27fc241cafbdf666f421e9c2aa2c2625bc40 (diff) | |
| download | haskell-679427f878e50ba5a9981bac4c2f9c76f4de3c3c.tar.gz | |
Produce all DerivInfo in tcTyAndClassDecls
Before this refactoring:
* DerivInfo for data family instances was returned from tcTyAndClassDecls
* DerivInfo for data declarations was generated with mkDerivInfos and added at a
later stage of the pipeline in tcInstDeclsDeriv
After this refactoring:
* DerivInfo for both data family instances and data declarations is returned from
tcTyAndClassDecls in a single list.
This uniform treatment results in a more convenient arrangement to fix #16731.
Diffstat (limited to 'testsuite/tests/generics/GenDerivOutput1_1.stderr')
| -rw-r--r-- | testsuite/tests/generics/GenDerivOutput1_1.stderr | 148 |
1 files changed, 74 insertions, 74 deletions
diff --git a/testsuite/tests/generics/GenDerivOutput1_1.stderr b/testsuite/tests/generics/GenDerivOutput1_1.stderr index 139d7ed255..e82a61ec0f 100644 --- a/testsuite/tests/generics/GenDerivOutput1_1.stderr +++ b/testsuite/tests/generics/GenDerivOutput1_1.stderr @@ -83,31 +83,13 @@ Derived class instances: -> CanDoRep1_1.D1b (GHC.Generics.unPar1 g1) (GHC.Generics.unRec1 g2) - instance GHC.Generics.Generic (CanDoRep1_1.Da a) where - GHC.Generics.from x - = GHC.Generics.M1 - (case x of - CanDoRep1_1.D0 -> GHC.Generics.L1 (GHC.Generics.M1 GHC.Generics.U1) - CanDoRep1_1.D1 g1 g2 - -> GHC.Generics.R1 - (GHC.Generics.M1 - ((GHC.Generics.:*:) - (GHC.Generics.M1 (GHC.Generics.K1 g1)) - (GHC.Generics.M1 (GHC.Generics.K1 g2))))) - GHC.Generics.to (GHC.Generics.M1 x) - = case x of - (GHC.Generics.L1 (GHC.Generics.M1 GHC.Generics.U1)) - -> CanDoRep1_1.D0 - (GHC.Generics.R1 (GHC.Generics.M1 ((GHC.Generics.:*:) (GHC.Generics.M1 (GHC.Generics.K1 g1)) - (GHC.Generics.M1 (GHC.Generics.K1 g2))))) - -> CanDoRep1_1.D1 g1 g2 - - instance GHC.Generics.Generic1 CanDoRep1_1.Da where + instance GHC.Generics.Generic1 CanDoRep1_1.Dc where GHC.Generics.from1 x = GHC.Generics.M1 (case x of - CanDoRep1_1.D0 -> GHC.Generics.L1 (GHC.Generics.M1 GHC.Generics.U1) - CanDoRep1_1.D1 g1 g2 + CanDoRep1_1.D0c + -> GHC.Generics.L1 (GHC.Generics.M1 GHC.Generics.U1) + CanDoRep1_1.D1c g1 g2 -> GHC.Generics.R1 (GHC.Generics.M1 ((GHC.Generics.:*:) @@ -116,10 +98,11 @@ Derived class instances: GHC.Generics.to1 (GHC.Generics.M1 x) = case x of (GHC.Generics.L1 (GHC.Generics.M1 GHC.Generics.U1)) - -> CanDoRep1_1.D0 + -> CanDoRep1_1.D0c (GHC.Generics.R1 (GHC.Generics.M1 ((GHC.Generics.:*:) (GHC.Generics.M1 g1) (GHC.Generics.M1 g2)))) - -> CanDoRep1_1.D1 (GHC.Generics.unPar1 g1) (GHC.Generics.unRec1 g2) + -> CanDoRep1_1.D1c + (GHC.Generics.unPar1 g1) (GHC.Generics.unRec1 g2) instance GHC.Generics.Generic (CanDoRep1_1.Db a) where GHC.Generics.from x @@ -141,13 +124,31 @@ Derived class instances: (GHC.Generics.M1 (GHC.Generics.K1 g2))))) -> CanDoRep1_1.D1b g1 g2 - instance GHC.Generics.Generic1 CanDoRep1_1.Dc where + instance GHC.Generics.Generic (CanDoRep1_1.Da a) where + GHC.Generics.from x + = GHC.Generics.M1 + (case x of + CanDoRep1_1.D0 -> GHC.Generics.L1 (GHC.Generics.M1 GHC.Generics.U1) + CanDoRep1_1.D1 g1 g2 + -> GHC.Generics.R1 + (GHC.Generics.M1 + ((GHC.Generics.:*:) + (GHC.Generics.M1 (GHC.Generics.K1 g1)) + (GHC.Generics.M1 (GHC.Generics.K1 g2))))) + GHC.Generics.to (GHC.Generics.M1 x) + = case x of + (GHC.Generics.L1 (GHC.Generics.M1 GHC.Generics.U1)) + -> CanDoRep1_1.D0 + (GHC.Generics.R1 (GHC.Generics.M1 ((GHC.Generics.:*:) (GHC.Generics.M1 (GHC.Generics.K1 g1)) + (GHC.Generics.M1 (GHC.Generics.K1 g2))))) + -> CanDoRep1_1.D1 g1 g2 + + instance GHC.Generics.Generic1 CanDoRep1_1.Da where GHC.Generics.from1 x = GHC.Generics.M1 (case x of - CanDoRep1_1.D0c - -> GHC.Generics.L1 (GHC.Generics.M1 GHC.Generics.U1) - CanDoRep1_1.D1c g1 g2 + CanDoRep1_1.D0 -> GHC.Generics.L1 (GHC.Generics.M1 GHC.Generics.U1) + CanDoRep1_1.D1 g1 g2 -> GHC.Generics.R1 (GHC.Generics.M1 ((GHC.Generics.:*:) @@ -156,11 +157,10 @@ Derived class instances: GHC.Generics.to1 (GHC.Generics.M1 x) = case x of (GHC.Generics.L1 (GHC.Generics.M1 GHC.Generics.U1)) - -> CanDoRep1_1.D0c + -> CanDoRep1_1.D0 (GHC.Generics.R1 (GHC.Generics.M1 ((GHC.Generics.:*:) (GHC.Generics.M1 g1) (GHC.Generics.M1 g2)))) - -> CanDoRep1_1.D1c - (GHC.Generics.unPar1 g1) (GHC.Generics.unRec1 g2) + -> CanDoRep1_1.D1 (GHC.Generics.unPar1 g1) (GHC.Generics.unRec1 g2) Derived type family instances: @@ -278,50 +278,21 @@ Derived type family instances: 'GHC.Generics.DecidedLazy) (GHC.Generics.Rec1 CanDoRep1_1.Db))) - type GHC.Generics.Rep (CanDoRep1_1.Da a) = GHC.Generics.D1 - ('GHC.Generics.MetaData - "Da" "CanDoRep1_1" "main" 'GHC.Types.False) - (GHC.Generics.C1 - ('GHC.Generics.MetaCons - "D0" 'GHC.Generics.PrefixI 'GHC.Types.False) - GHC.Generics.U1 - GHC.Generics.:+: GHC.Generics.C1 - ('GHC.Generics.MetaCons - "D1" - 'GHC.Generics.PrefixI - 'GHC.Types.True) - (GHC.Generics.S1 - ('GHC.Generics.MetaSel - ('GHC.Maybe.Just "d11a") - 'GHC.Generics.NoSourceUnpackedness - 'GHC.Generics.NoSourceStrictness - 'GHC.Generics.DecidedLazy) - (GHC.Generics.Rec0 a) - GHC.Generics.:*: GHC.Generics.S1 - ('GHC.Generics.MetaSel - ('GHC.Maybe.Just - "d12a") - 'GHC.Generics.NoSourceUnpackedness - 'GHC.Generics.NoSourceStrictness - 'GHC.Generics.DecidedLazy) - (GHC.Generics.Rec0 - (CanDoRep1_1.Da - a)))) - type GHC.Generics.Rep1 CanDoRep1_1.Da = GHC.Generics.D1 + type GHC.Generics.Rep1 CanDoRep1_1.Dc = GHC.Generics.D1 ('GHC.Generics.MetaData - "Da" "CanDoRep1_1" "main" 'GHC.Types.False) + "Dc" "CanDoRep1_1" "main" 'GHC.Types.False) (GHC.Generics.C1 ('GHC.Generics.MetaCons - "D0" 'GHC.Generics.PrefixI 'GHC.Types.False) + "D0c" 'GHC.Generics.PrefixI 'GHC.Types.False) GHC.Generics.U1 GHC.Generics.:+: GHC.Generics.C1 ('GHC.Generics.MetaCons - "D1" + "D1c" 'GHC.Generics.PrefixI 'GHC.Types.True) (GHC.Generics.S1 ('GHC.Generics.MetaSel - ('GHC.Maybe.Just "d11a") + ('GHC.Maybe.Just "d11c") 'GHC.Generics.NoSourceUnpackedness 'GHC.Generics.NoSourceStrictness 'GHC.Generics.DecidedLazy) @@ -329,12 +300,12 @@ Derived type family instances: GHC.Generics.:*: GHC.Generics.S1 ('GHC.Generics.MetaSel ('GHC.Maybe.Just - "d12a") + "d12c") 'GHC.Generics.NoSourceUnpackedness 'GHC.Generics.NoSourceStrictness 'GHC.Generics.DecidedLazy) (GHC.Generics.Rec1 - CanDoRep1_1.Da))) + CanDoRep1_1.Dc))) type GHC.Generics.Rep (CanDoRep1_1.Db a) = GHC.Generics.D1 ('GHC.Generics.MetaData "Db" "CanDoRep1_1" "main" 'GHC.Types.False) @@ -364,21 +335,50 @@ Derived type family instances: (GHC.Generics.Rec0 (CanDoRep1_1.Db a)))) - type GHC.Generics.Rep1 CanDoRep1_1.Dc = GHC.Generics.D1 + type GHC.Generics.Rep (CanDoRep1_1.Da a) = GHC.Generics.D1 + ('GHC.Generics.MetaData + "Da" "CanDoRep1_1" "main" 'GHC.Types.False) + (GHC.Generics.C1 + ('GHC.Generics.MetaCons + "D0" 'GHC.Generics.PrefixI 'GHC.Types.False) + GHC.Generics.U1 + GHC.Generics.:+: GHC.Generics.C1 + ('GHC.Generics.MetaCons + "D1" + 'GHC.Generics.PrefixI + 'GHC.Types.True) + (GHC.Generics.S1 + ('GHC.Generics.MetaSel + ('GHC.Maybe.Just "d11a") + 'GHC.Generics.NoSourceUnpackedness + 'GHC.Generics.NoSourceStrictness + 'GHC.Generics.DecidedLazy) + (GHC.Generics.Rec0 a) + GHC.Generics.:*: GHC.Generics.S1 + ('GHC.Generics.MetaSel + ('GHC.Maybe.Just + "d12a") + 'GHC.Generics.NoSourceUnpackedness + 'GHC.Generics.NoSourceStrictness + 'GHC.Generics.DecidedLazy) + (GHC.Generics.Rec0 + (CanDoRep1_1.Da + a)))) + type GHC.Generics.Rep1 CanDoRep1_1.Da = GHC.Generics.D1 ('GHC.Generics.MetaData - "Dc" "CanDoRep1_1" "main" 'GHC.Types.False) + "Da" "CanDoRep1_1" "main" 'GHC.Types.False) (GHC.Generics.C1 ('GHC.Generics.MetaCons - "D0c" 'GHC.Generics.PrefixI 'GHC.Types.False) + "D0" 'GHC.Generics.PrefixI 'GHC.Types.False) GHC.Generics.U1 GHC.Generics.:+: GHC.Generics.C1 ('GHC.Generics.MetaCons - "D1c" + "D1" 'GHC.Generics.PrefixI 'GHC.Types.True) (GHC.Generics.S1 ('GHC.Generics.MetaSel - ('GHC.Maybe.Just "d11c") + ('GHC.Maybe.Just "d11a") 'GHC.Generics.NoSourceUnpackedness 'GHC.Generics.NoSourceStrictness 'GHC.Generics.DecidedLazy) @@ -386,11 +386,11 @@ Derived type family instances: GHC.Generics.:*: GHC.Generics.S1 ('GHC.Generics.MetaSel ('GHC.Maybe.Just - "d12c") + "d12a") 'GHC.Generics.NoSourceUnpackedness 'GHC.Generics.NoSourceStrictness 'GHC.Generics.DecidedLazy) (GHC.Generics.Rec1 - CanDoRep1_1.Dc))) + CanDoRep1_1.Da))) |