diff options
| author | Eugene Akentyev <ak3ntev@gmail.com> | 2017-07-11 13:59:47 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2017-07-11 14:36:05 -0400 |
| commit | ef7fd0ae8b519b3cd05349753a0e145112c26b67 (patch) | |
| tree | d10796537fd7fc3d37dd6cc1d44aad3341791329 | |
| parent | 85ac65c5f0b057f1b07ed7bf9a8d9aeae4ce1390 (diff) | |
| download | haskell-ef7fd0ae8b519b3cd05349753a0e145112c26b67.tar.gz | |
Parenthesize infix type names in data declarations in TH printer
Previously datatype names were not paraenthesized (#13887).
Reviewers: austin, bgamari, RyanGlScott
Reviewed By: RyanGlScott
Subscribers: RyanGlScott, rwbarton, thomie
Differential Revision: https://phabricator.haskell.org/D3717
| -rw-r--r-- | libraries/template-haskell/Language/Haskell/TH/Ppr.hs | 7 | ||||
| -rw-r--r-- | testsuite/tests/th/T10828.stderr | 2 | ||||
| -rw-r--r-- | testsuite/tests/th/T12403.stdout | 6 |
3 files changed, 8 insertions, 7 deletions
diff --git a/libraries/template-haskell/Language/Haskell/TH/Ppr.hs b/libraries/template-haskell/Language/Haskell/TH/Ppr.hs index 122f0b9ec0..696c4454c7 100644 --- a/libraries/template-haskell/Language/Haskell/TH/Ppr.hs +++ b/libraries/template-haskell/Language/Haskell/TH/Ppr.hs @@ -399,7 +399,7 @@ ppr_data :: Doc -> Cxt -> Name -> Doc -> Maybe Kind -> [Con] -> [DerivClause] ppr_data maybeInst ctxt t argsDoc ksig cs decs = sep [text "data" <+> maybeInst <+> pprCxt ctxt - <+> ppr t <+> argsDoc <+> ksigDoc <+> maybeWhere, + <+> pprName' Applied t <+> argsDoc <+> ksigDoc <+> maybeWhere, nest nestDepth (sep (pref $ map ppr cs)), if null decs then empty @@ -679,8 +679,9 @@ pprStrictType = pprBangType ------------------------------ pprParendType :: Type -> Doc -pprParendType (VarT v) = ppr v -pprParendType (ConT c) = ppr c +pprParendType (VarT v) = pprName' Applied v +-- `Applied` is used here instead of `ppr` because of infix names (#13887) +pprParendType (ConT c) = pprName' Applied c pprParendType (TupleT 0) = text "()" pprParendType (TupleT n) = parens (hcat (replicate (n-1) comma)) pprParendType (UnboxedTupleT n) = hashParens $ hcat $ replicate (n-1) comma diff --git a/testsuite/tests/th/T10828.stderr b/testsuite/tests/th/T10828.stderr index 82509ec7b0..70ed74bc1e 100644 --- a/testsuite/tests/th/T10828.stderr +++ b/testsuite/tests/th/T10828.stderr @@ -8,7 +8,7 @@ newtype Bar_13 :: * -> GHC.Types.Bool -> * = MkBar_14 :: a_15 -> Bar_13 a_15 b_16 data T10828.T (a_0 :: *) where T10828.MkT :: forall (a_1 :: *) . a_1 -> a_1 -> T10828.T a_1 - T10828.MkC :: forall (a_2 :: *) (b_3 :: *) . Data.Type.Equality.~ a_2 + T10828.MkC :: forall (a_2 :: *) (b_3 :: *) . (Data.Type.Equality.~) a_2 GHC.Types.Int => {T10828.foo :: a_2, T10828.bar :: b_3} -> T10828.T GHC.Types.Int data T'_0 a_1 :: * where diff --git a/testsuite/tests/th/T12403.stdout b/testsuite/tests/th/T12403.stdout index 24e222a732..386b1c0a89 100644 --- a/testsuite/tests/th/T12403.stdout +++ b/testsuite/tests/th/T12403.stdout @@ -1,5 +1,5 @@ data Main.T = Main.T ((# , #) GHC.Types.Int - GHC.Types.Int :: GHC.Prim.TYPE (GHC.Types.TupleRep (GHC.Types.: GHC.Types.LiftedRep - (GHC.Types.: GHC.Types.LiftedRep - GHC.Types.[])))) + GHC.Types.Int :: GHC.Prim.TYPE (GHC.Types.TupleRep ((GHC.Types.:) GHC.Types.LiftedRep + ((GHC.Types.:) GHC.Types.LiftedRep + GHC.Types.[])))) |