[commit: haddock] T6018-injective-type-families, adamse-D1033, ghc-head, wip/10268, wip/10313, wip/D548-master, wip/D548-master-2, wip/T10483, wip/T8584, wip/T9840, wip/api-ann-hstylit, wip/api-ann-hstylit-1, wip/api-ann-hstylit-2, wip/api-ann-hstylit-3, wip/api-ann-hstylit-4, wip/api-ann-hstylit-5, wip/ast-annotations-separate, wip/ast-prepare-annotations, wip/ast-prepare-annotations-final, wip/ast-prepare-annotations-final2, wip/ast-prepare-annotations-final3, wip/ast-prepare-annotations-final4, wip/ast-prepare-annotations-final5, wip/ast-prepare-annotations-final6, wip/orf-new, wip/orf-reboot, wip/pattern-synonyms, wip/rae, wip/trac-9744: Followup changes to addition of -fwarn-context-quantification (GHC Trac #4426) (4023817)

[git at git.haskell.org]

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

On branches: T6018-injective-type-families,adamse-D1033,ghc-head,wip/10268,wip/10313,wip/D548-master,wip/D548-master-2,wip/T10483,wip/T8584,wip/T9840,wip/api-ann-hstylit,wip/api-ann-hstylit-1,wip/api-ann-hstylit-2,wip/api-ann-hstylit-3,wip/api-ann-hstylit-4,wip/api-ann-hstylit-5,wip/ast-annotations-separate,wip/ast-prepare-annotations,wip/ast-prepare-annotations-final,wip/ast-prepare-annotations-final2,wip/ast-prepare-annotations-final3,wip/ast-prepare-annotations-final4,wip/ast-prepare-annotations-final5,wip/ast-prepare-annotations-final6,wip/orf-new,wip/orf-reboot,wip/pattern-synonyms,wip/rae,wip/trac-9744
Link       : http://git.haskell.org/haddock.git/commitdiff/4023817d7c0e46db012ba2eea28022626841ca9b

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

commit 4023817d7c0e46db012ba2eea28022626841ca9b
Author: Krzysztof Gogolewski <krz.gogolewski at gmail.com>
Date:   Sun Sep 14 14:08:35 2014 +0200

    Followup changes to addition of -fwarn-context-quantification (GHC Trac #4426)


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

4023817d7c0e46db012ba2eea28022626841ca9b
 src/Haddock/Backends/Hoogle.hs     | 1 +
 src/Haddock/Backends/LaTeX.hs      | 5 ++++-
 src/Haddock/Backends/Xhtml/Decl.hs | 3 ++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/Haddock/Backends/Hoogle.hs b/src/Haddock/Backends/Hoogle.hs
index 1314529..4535ce5 100644
--- a/src/Haddock/Backends/Hoogle.hs
+++ b/src/Haddock/Backends/Hoogle.hs
@@ -134,6 +134,7 @@ ppSig dflags (TypeSig names sig)
         prettyNames = intercalate ", " $ map (out dflags) names
         typ = case unL sig of
                    HsForAllTy Explicit a b c -> HsForAllTy Implicit a b c
+                   HsForAllTy Qualified a b c -> HsForAllTy Implicit a b c
                    x -> x
 ppSig _ _ = []
 
diff --git a/src/Haddock/Backends/LaTeX.hs b/src/Haddock/Backends/LaTeX.hs
index eca2207..014f335 100644
--- a/src/Haddock/Backends/LaTeX.hs
+++ b/src/Haddock/Backends/LaTeX.hs
@@ -402,6 +402,8 @@ ppTypeOrFunSig _ _ typ (doc, argDocs) (pref1, pref2, sep0)
                 ppLContextNoArrow lctxt unicode) <+> nl $$
          do_largs n (darrow unicode) ltype
 
+     do_args n leader (HsForAllTy Qualified a lctxt ltype)
+       = do_args n leader (HsForAllTy Implicit a lctxt ltype)
      do_args n leader (HsForAllTy Implicit _ lctxt ltype)
        | not (null (unLoc lctxt))
        = decltt leader <-> decltt (ppLContextNoArrow lctxt unicode) <+> nl $$
@@ -621,6 +623,7 @@ ppConstrHdr forall tvs ctxt unicode
   where
     ppForall = case forall of
       Explicit -> forallSymbol unicode <+> hsep (map ppName tvs) <+> text ". "
+      Qualified -> empty
       Implicit -> empty
 
 
@@ -871,7 +874,7 @@ ppForAll expl tvs cxt unicode
   | otherwise   = ppLContext cxt unicode
   where
     show_forall = not (null (hsQTvBndrs tvs)) && is_explicit
-    is_explicit = case expl of {Explicit -> True; Implicit -> False}
+    is_explicit = case expl of {Explicit -> True; Implicit -> False; Qualified -> False}
     forall_part = hsep (forallSymbol unicode : ppTyVars tvs) <> dot
 
 
diff --git a/src/Haddock/Backends/Xhtml/Decl.hs b/src/Haddock/Backends/Xhtml/Decl.hs
index 0429580..829c666 100644
--- a/src/Haddock/Backends/Xhtml/Decl.hs
+++ b/src/Haddock/Backends/Xhtml/Decl.hs
@@ -650,6 +650,7 @@ ppConstrHdr forall_ tvs ctxt unicode qual
   where
     ppForall = case forall_ of
       Explicit -> forallSymbol unicode <+> hsep (map (ppName Prefix) tvs) <+> toHtml ". "
+      Qualified -> noHtml
       Implicit -> noHtml
 
 
@@ -812,7 +813,7 @@ ppForAll expl tvs cxt unicode qual
   | otherwise   = ppLContext cxt unicode qual
   where
     show_forall = not (null (hsQTvBndrs tvs)) && is_explicit
-    is_explicit = case expl of {Explicit -> True; Implicit -> False}
+    is_explicit = case expl of {Explicit -> True; Implicit -> False; Qualified -> False}
     forall_part = hsep (forallSymbol unicode : ppTyVars tvs) +++ dot