Tue Nov 28 11:40:47 UTC 2017

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

On branches: 2.17.3.1-spanfix,alexbiehl-patch-1,ghc-8.0,ghc-8.0-facebook,ghc-head,ghc-head1,haddock-quick,headdock-library-1.4.5,ie_avails,issue-303,issue-475,master,pr-filter-maps,pr/cabal-desc,travis,v2.17,v2.17.3,v2.18,wip-located-module-as,wip/D2418,wip/T11028-3,wip/T11080-open-data-kinds,wip/T11258,wip/T11430,wip/T12105,wip/T12105-2,wip/T12942,wip/T13163,wip/T14529,wip/T3384,wip/embelleshed-rdr,wip/new-tree-one-param,wip/rae,wip/rae-nokinds,wip/remove-frames,wip/remove-frames1,wip/revert-ttg-2017-11-20,wip/ttg-2017-10-13,wip/ttg-2017-10-31,wip/ttg-2017-11-06,wip/ttg2-2017-11-10,wip/ttg3-2017-11-12,wip/ttg4-constraints-2017-11-13,wip/ttg6-unrevert-2017-11-22
Link       : http://git.haskell.org/haddock.git/commitdiff/f4ef2548954bedf26674adc7a06574e718898d19

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

commit f4ef2548954bedf26674adc7a06574e718898d19
Author: Alan Zimmerman <alan.zimm at gmail.com>
Date:   Sat Dec 5 19:45:33 2015 +0200

    Placeholder for record style GADT declaration
    
    A GADT Declaration is now presented as
    
        CmmCondBranch :: {..} -> CmmNode O C
            cml_pred :: CmmExpr
            cml_true, cml_false :: !Label
            cml_likely :: Maybe Bool
    for
    
        CmmCondBranch :: {              -- conditional branch
            cml_pred :: CmmExpr,
            cml_true, cml_false :: ULabel,
            cml_likely :: Maybe Bool    -- likely result of the conditional,
                                        -- if known
        } -> CmmNode O C


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

f4ef2548954bedf26674adc7a06574e718898d19
 haddock-api/src/Haddock/Backends/Xhtml/Decl.hs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs b/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs
index d49d094..4983aad 100644
--- a/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs
+++ b/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs
@@ -694,6 +694,7 @@ ppSideBySideConstr subdocs fixities unicode qual (L _ con)
 
     doGADTCon :: Located (HsType DocName) -> Html
     doGADTCon ty = ppOcc <+> dcolon unicode
+        -- ++AZ++ make this prepend "{..}" when it is a record style GADT
         <+> ppLType unicode qual ty
         <+> fixity
 
@@ -856,9 +857,10 @@ ppr_mono_ty _         (HsPArrTy ty)       u q = pabrackets (ppr_mono_lty pREC_TO
 ppr_mono_ty ctxt_prec (HsIParamTy n ty)   u q =
     maybeParen ctxt_prec pREC_CTX $ ppIPName n <+> dcolon u <+> ppr_mono_lty pREC_TOP ty u q
 ppr_mono_ty _         (HsSpliceTy {})     _ _ = error "ppr_mono_ty HsSpliceTy"
-ppr_mono_ty _         (HsRecTy {})        _ _ = mempty -- Can now legally occur
-                                                       -- un ConDeclGADT, but is
-                                                       -- output elsewhere
+ppr_mono_ty _         (HsRecTy {})        _ _ = toHtml "{..}"
+       -- Can now legally occur in ConDeclGADT, the output here is to provide a
+       -- placeholder in the signature, which is followed by the field
+       -- declarations.
 ppr_mono_ty _         (HsCoreTy {})       _ _ = error "ppr_mono_ty HsCoreTy"
 ppr_mono_ty _         (HsExplicitListTy _ tys) u q = quote $ brackets $ hsep $ punctuate comma $ map (ppLType u q) tys
 ppr_mono_ty _         (HsExplicitTupleTy _ tys) u q = quote $ parenList $ map (ppLType u q) tys

