[commit: haddock] master: Forward port changes from stable. (6e8bc1d)
Paolo Capriotti
p.capriotti at gmail.com
Thu Jul 19 21:24:07 CEST 2012
Repository : ssh://darcs.haskell.org//srv/darcs/haddock
On branch : master
http://hackage.haskell.org/trac/ghc/changeset/6e8bc1dca77bbbc5743f63a2e8ea5b1eab0ed80c
>---------------------------------------------------------------
commit 6e8bc1dca77bbbc5743f63a2e8ea5b1eab0ed80c
Merge: 105f31e... 2a931d3...
Author: Paolo Capriotti <p.capriotti at gmail.com>
Date: Thu Jul 19 16:28:45 2012 +0100
Forward port changes from stable.
.gitignore | 8 +-
CHANGES | 37 +++
doc/haddock.xml | 2 +-
haddock.cabal | 6 +-
haddock.spec | 2 +-
html/Classic.theme/xhaddock.css | 6 +-
html/Ocean.std-theme/ocean.css | 4 +
html/frames.html | 8 +-
src/.ghci | 1 +
src/Haddock/Backends/Hoogle.hs | 33 ++-
src/Haddock/Backends/LaTeX.hs | 55 ++--
src/Haddock/Backends/Xhtml.hs | 35 +--
src/Haddock/Backends/Xhtml/Decl.hs | 95 +++----
src/Haddock/Backends/Xhtml/DocMarkup.hs | 11 +-
src/Haddock/Backends/Xhtml/Layout.hs | 9 +
src/Haddock/Backends/Xhtml/Names.hs | 33 ++-
src/Haddock/Backends/Xhtml/Utils.hs | 15 +-
src/Haddock/Interface/Create.hs | 319 ++++++++++++--------
src/Haddock/Interface/LexParseRn.hs | 78 +++---
src/Haddock/Interface/ParseModuleHeader.hs | 6 +-
src/Haddock/Interface/Rename.hs | 38 ++-
src/Haddock/InterfaceFile.hs | 48 ++--
src/Haddock/Lex.x | 3 +-
src/Haddock/Options.hs | 16 +-
src/Haddock/Types.hs | 79 ++++--
src/Haddock/Utils.hs | 11 +-
src/Main.hs | 28 +-
tests/html-tests/accept.hs | 4 +-
tests/html-tests/copy.hs | 36 ---
tests/html-tests/tests/A.hs | 9 +
tests/html-tests/tests/A.html.ref | 92 ++++++-
tests/html-tests/tests/B.hs | 4 +-
tests/html-tests/tests/B.html.ref | 61 ++++-
tests/html-tests/tests/Bug1.html.ref | 4 +-
tests/html-tests/tests/Bug2.html.ref | 4 +-
tests/html-tests/tests/Bug3.html.ref | 4 +-
tests/html-tests/tests/Bug4.html.ref | 4 +-
tests/html-tests/tests/Bug6.html.ref | 4 +-
tests/html-tests/tests/Bug7.html.ref | 4 +-
tests/html-tests/tests/Bug8.html.ref | 4 +-
tests/html-tests/tests/BugDeprecated.hs | 18 ++
tests/html-tests/tests/BugDeprecated.html.ref | 192 ++++++++++++
tests/html-tests/tests/BugExportHeadings.hs | 29 ++
tests/html-tests/tests/BugExportHeadings.html.ref | 217 +++++++++++++
tests/html-tests/tests/Bugs.html.ref | 4 +-
tests/html-tests/tests/CrossPackageDocs.html.ref | 4 +-
tests/html-tests/tests/DeprecatedClass.hs | 15 +
...eFamilies.html.ref => DeprecatedClass.html.ref} | 173 ++++-------
tests/html-tests/tests/DeprecatedData.hs | 15 +
.../{Bug7.html.ref => DeprecatedData.html.ref} | 161 ++++++-----
tests/html-tests/tests/DeprecatedFunction.hs | 6 +
.../{Bug3.html.ref => DeprecatedFunction.html.ref} | 19 +-
tests/html-tests/tests/DeprecatedFunction2.hs | 6 +
...{Bug4.html.ref => DeprecatedFunction2.html.ref} | 17 +-
tests/html-tests/tests/DeprecatedFunction3.hs | 6 +
...{Bug3.html.ref => DeprecatedFunction3.html.ref} | 22 +-
tests/html-tests/tests/DeprecatedModule.hs | 5 +
.../{Bug3.html.ref => DeprecatedModule.html.ref} | 41 ++--
tests/html-tests/tests/DeprecatedModule2.hs | 4 +
...Visible.html.ref => DeprecatedModule2.html.ref} | 26 +-
tests/html-tests/tests/DeprecatedNewtype.hs | 10 +
.../{Bug7.html.ref => DeprecatedNewtype.html.ref} | 144 ++++-----
tests/html-tests/tests/DeprecatedRecord.hs | 9 +
.../{Bug1.html.ref => DeprecatedRecord.html.ref} | 83 ++++--
tests/html-tests/tests/DeprecatedTypeFamily.hs | 9 +
...et75.html.ref => DeprecatedTypeFamily.html.ref} | 80 +++---
tests/html-tests/tests/DeprecatedTypeSynonym.hs | 9 +
...t75.html.ref => DeprecatedTypeSynonym.html.ref} | 82 +++---
tests/html-tests/tests/Examples.html.ref | 4 +-
tests/html-tests/tests/FunArgs.html.ref | 4 +-
tests/html-tests/tests/GADTRecords.html.ref | 4 +-
tests/html-tests/tests/Hash.html.ref | 4 +-
tests/html-tests/tests/IgnoreExports.hs | 10 +
.../{Bug3.html.ref => IgnoreExports.html.ref} | 32 ++-
tests/html-tests/tests/ModuleWithWarning.hs | 5 +
.../{Bug3.html.ref => ModuleWithWarning.html.ref} | 41 ++--
tests/html-tests/tests/NamedDoc.html.ref | 4 +-
tests/html-tests/tests/NoLayout.html.ref | 4 +-
tests/html-tests/tests/NonGreedy.html.ref | 4 +-
tests/html-tests/tests/PruneWithWarning.hs | 9 +
.../{TH2.html.ref => PruneWithWarning.html.ref} | 20 +-
tests/html-tests/tests/QuasiExpr.html.ref | 4 +-
tests/html-tests/tests/QuasiQuote.html.ref | 4 +-
tests/html-tests/tests/TH.html.ref | 4 +-
tests/html-tests/tests/TH2.html.ref | 4 +-
tests/html-tests/tests/Test.html.ref | 4 +-
tests/html-tests/tests/Ticket112.html.ref | 4 +-
tests/html-tests/tests/Ticket61.html.ref | 4 +-
tests/html-tests/tests/Ticket75.html.ref | 4 +-
tests/html-tests/tests/TypeFamilies.html.ref | 4 +-
tests/html-tests/tests/TypeOperators.html.ref | 4 +-
tests/html-tests/tests/Unicode.html.ref | 4 +-
tests/html-tests/tests/Visible.html.ref | 4 +-
.../html-tests/tests/frames.html.ref | 8 +-
tests/html-tests/tests/mini_A.html.ref | 59 ++++
tests/html-tests/tests/mini_B.html.ref | 45 +++
tests/html-tests/tests/mini_Bug1.html.ref | 33 ++
tests/html-tests/tests/mini_Bug2.html.ref | 31 ++
tests/html-tests/tests/mini_Bug3.html.ref | 31 ++
tests/html-tests/tests/mini_Bug4.html.ref | 31 ++
tests/html-tests/tests/mini_Bug6.html.ref | 65 ++++
tests/html-tests/tests/mini_Bug7.html.ref | 41 +++
tests/html-tests/tests/mini_Bug8.html.ref | 63 ++++
tests/html-tests/tests/mini_BugDeprecated.html.ref | 61 ++++
.../tests/mini_BugExportHeadings.html.ref | 79 +++++
tests/html-tests/tests/mini_Bugs.html.ref | 33 ++
.../tests/mini_CrossPackageDocs.html.ref | 45 +++
.../html-tests/tests/mini_DeprecatedClass.html.ref | 41 +++
.../html-tests/tests/mini_DeprecatedData.html.ref | 41 +++
.../tests/mini_DeprecatedFunction.html.ref | 31 ++
.../tests/mini_DeprecatedFunction2.html.ref | 31 ++
.../tests/mini_DeprecatedFunction3.html.ref | 31 ++
.../tests/mini_DeprecatedModule.html.ref | 31 ++
.../tests/mini_DeprecatedModule2.html.ref | 31 ++
.../tests/mini_DeprecatedNewtype.html.ref | 41 +++
.../tests/mini_DeprecatedRecord.html.ref | 33 ++
.../tests/mini_DeprecatedTypeFamily.html.ref | 41 +++
.../tests/mini_DeprecatedTypeSynonym.html.ref | 41 +++
tests/html-tests/tests/mini_Examples.html.ref | 31 ++
tests/html-tests/tests/mini_FunArgs.html.ref | 37 +++
tests/html-tests/tests/mini_GADTRecords.html.ref | 33 ++
tests/html-tests/tests/mini_Hash.html.ref | 74 +++++
tests/html-tests/tests/mini_IgnoreExports.html.ref | 37 +++
.../tests/mini_ModuleWithWarning.html.ref | 31 ++
tests/html-tests/tests/mini_NamedDoc.html.ref | 25 ++
tests/html-tests/tests/mini_NoLayout.html.ref | 31 ++
tests/html-tests/tests/mini_NonGreedy.html.ref | 31 ++
.../tests/mini_PruneWithWarning.html.ref | 25 ++
tests/html-tests/tests/mini_QuasiExpr.html.ref | 59 ++++
tests/html-tests/tests/mini_QuasiQuote.html.ref | 31 ++
tests/html-tests/tests/mini_TH.html.ref | 31 ++
tests/html-tests/tests/mini_TH2.html.ref | 31 ++
tests/html-tests/tests/mini_Test.html.ref | 269 +++++++++++++++++
tests/html-tests/tests/mini_Ticket112.html.ref | 31 ++
tests/html-tests/tests/mini_Ticket61.html.ref | 33 ++
tests/html-tests/tests/mini_Ticket75.html.ref | 39 +++
tests/html-tests/tests/mini_TypeFamilies.html.ref | 55 ++++
tests/html-tests/tests/mini_TypeOperators.html.ref | 74 +++++
tests/html-tests/tests/mini_Unicode.html.ref | 31 ++
tests/html-tests/tests/mini_Visible.html.ref | 31 ++
tests/unit-tests/.ghci | 1 +
tests/unit-tests/parsetests.hs | 15 +-
tests/unit-tests/runparsetests.sh | 20 +-
143 files changed, 3958 insertions(+), 985 deletions(-)
Diff suppressed because of size. To see it, use:
git show 6e8bc1dca77bbbc5743f63a2e8ea5b1eab0ed80c
More information about the Cvs-ghc
mailing list