[commit: haddock] adamse-D1033, ghc-head, wip/10313, wip/T10483, wip/T9840, wip/orf-reboot: Track change in API of TyCon (5bbae8b)

git at git.haskell.org git at git.haskell.org
Wed Jul 8 08:38:26 UTC 2015


Repository : ssh://git@git.haskell.org/haddock

On branches: adamse-D1033,ghc-head,wip/10313,wip/T10483,wip/T9840,wip/orf-reboot
Link       : http://git.haskell.org/haddock.git/commitdiff/5bbae8b9bc17d2166c7e03d5f42f2b12fadf70b7

>---------------------------------------------------------------

commit 5bbae8b9bc17d2166c7e03d5f42f2b12fadf70b7
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Fri May 1 09:36:47 2015 +0100

    Track change in API of TyCon


>---------------------------------------------------------------

5bbae8b9bc17d2166c7e03d5f42f2b12fadf70b7
 haddock-api/src/Haddock/Convert.hs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/haddock-api/src/Haddock/Convert.hs b/haddock-api/src/Haddock/Convert.hs
index 8317322..ce1ef8b 100644
--- a/haddock-api/src/Haddock/Convert.hs
+++ b/haddock-api/src/Haddock/Convert.hs
@@ -338,8 +338,9 @@ synifyType :: SynifyTypeState -> Type -> LHsType Name
 synifyType _ (TyVarTy tv) = noLoc $ HsTyVar (getName tv)
 synifyType _ (TyConApp tc tys)
   -- Use non-prefix tuple syntax where possible, because it looks nicer.
-  | isTupleTyCon tc, tyConArity tc == length tys =
-     noLoc $ HsTupleTy (case tupleTyConSort tc of
+  | Just sort <- tyConTuple_maybe tc
+  , tyConArity tc == length tys
+  = noLoc $ HsTupleTy (case sort of
                           BoxedTuple      -> HsBoxedTuple
                           ConstraintTuple -> HsConstraintTuple
                           UnboxedTuple    -> HsUnboxedTuple)



More information about the ghc-commits mailing list