[commit: haddock] master: Merge branch 'ghc-7.6' into ghc-7.6-merge-2 (8d4c94c)
Simon Hengel
sol at typeful.net
Tue Feb 12 23:40:18 CET 2013
Repository : ssh://darcs.haskell.org//srv/darcs/haddock
On branch : master
http://hackage.haskell.org/trac/ghc/changeset/8d4c94ca5a969a5ebbb791939fb0195dc672429e
>---------------------------------------------------------------
commit 8d4c94ca5a969a5ebbb791939fb0195dc672429e
Merge: 266a20a... 3d25ea2...
Author: Kazu Yamamoto <kazu at iij.ad.jp>
Date: Fri Feb 1 11:59:24 2013 +0900
Merge branch 'ghc-7.6' into ghc-7.6-merge-2
Conflicts:
haddock.cabal
src/Haddock/Interface/AttachInstances.hs
src/Haddock/Interface/Create.hs
src/Haddock/Interface/LexParseRn.hs
src/Haddock/InterfaceFile.hs
src/Haddock/Types.hs
Only GHC HEAD can compile this. GHC 7.6.x cannot compile this.
Some test fail.
.ghci | 1 +
.gitignore | 11 +-
ANNOUNCE | 37 +-
CHANGES | 27 ++
Setup.lhs | 8 +-
doc/README | 1 +
doc/haddock.xml | 23 +-
driver/Main.hs | 7 +
examples/A.hs | 2 -
examples/B.hs | 2 -
examples/Bug10.hs | 3 -
examples/Bug3.hs | 6 -
examples/Bug4.hs | 4 -
examples/Bug6.hs | 23 -
examples/Bug8.hs | 8 -
examples/Bug9.hs | 6 -
examples/Hash.hs | 45 --
examples/Hidden.hs | 4 -
examples/Makefile | 11 -
examples/NoLayout.hs | 4 -
examples/Test.hs | 410 -----------------
examples/hide-bug/A.hs | 2 -
examples/hide-bug/B.hs | 5 -
examples/hide-bug/C.hs | 6 -
examples/hide-bug/D.hs | 7 -
ghc.mk | 8 +-
haddock.cabal | 217 +++++-----
haddock.spec | 2 +-
html-test/README.markdown | 27 ++
html-test/accept.lhs | 49 ++
.../tests/A.html.ref => html-test/ref/A.html | 2 +-
.../ref/AdvanceTypes.html | 40 ++-
.../tests/B.html.ref => html-test/ref/B.html | 2 +-
.../tests/Bug1.html.ref => html-test/ref/Bug1.html | 2 +-
.../tests/Bug2.html.ref => html-test/ref/Bug2.html | 2 +-
.../tests/Bug3.html.ref => html-test/ref/Bug3.html | 2 +-
.../tests/Bug4.html.ref => html-test/ref/Bug4.html | 2 +-
.../tests/Bug6.html.ref => html-test/ref/Bug6.html | 2 +-
.../tests/Bug7.html.ref => html-test/ref/Bug7.html | 2 +-
.../tests/Bug8.html.ref => html-test/ref/Bug8.html | 2 +-
.../ref/BugDeprecated.html | 20 +-
.../ref/BugExportHeadings.html | 11 +-
.../tests/Bugs.html.ref => html-test/ref/Bugs.html | 2 +-
html-test/ref/CrossPackageDocs.html | 298 +++++++++++++
.../ref/DeprecatedClass.html | 14 +-
.../ref/DeprecatedData.html | 20 +-
.../ref/DeprecatedFunction.html | 23 +-
.../ref/DeprecatedFunction2.html | 5 +-
.../ref/DeprecatedFunction3.html | 5 +-
.../ref/DeprecatedModule.html | 7 +-
.../ref/DeprecatedModule2.html | 5 +-
.../ref/DeprecatedNewtype.html | 14 +-
.../ref/DeprecatedReExport.html | 63 +++-
.../ref/DeprecatedRecord.html | 5 +-
.../ref/DeprecatedTypeFamily.html | 8 +-
.../ref/DeprecatedTypeSynonym.html | 8 +-
.../ref/DeprecationMessageParseError.html | 27 +-
.../ref/Examples.html | 2 +-
.../FunArgs.html.ref => html-test/ref/FunArgs.html | 6 +-
.../ref/GADTRecords.html | 2 +-
.../tests/Hash.html.ref => html-test/ref/Hash.html | 10 +-
.../ref/HiddenInstances.html | 112 +++---
.../ref/HiddenInstancesB.html | 66 +--
.../ref/Hyperlinks.html | 21 +-
.../ref/IgnoreExports.html | 2 +-
.../ref/ModuleWithWarning.html | 7 +-
.../ref/NamedDoc.html | 2 +-
.../ref/NoLayout.html | 2 +-
.../ref/NonGreedy.html | 2 +-
.../ref/Properties.html | 30 +-
.../ref/PruneWithWarning.html | 19 +-
.../ref/QuasiExpr.html | 2 +-
.../ref/QuasiQuote.html | 2 +-
html-test/ref/SpuriousSuperclassConstraints.html | 128 ++++++
.../tests/TH.html.ref => html-test/ref/TH.html | 2 +-
.../tests/TH2.html.ref => html-test/ref/TH2.html | 2 +-
.../tests/Test.html.ref => html-test/ref/Test.html | 54 +--
.../ref/Ticket112.html | 2 +-
.../ref/Ticket61.html | 2 +-
.../ref/Ticket75.html | 2 +-
.../ref/TypeFamilies.html | 2 +-
.../ref/TypeOperators.html | 56 +---
.../Unicode.html.ref => html-test/ref/Unicode.html | 2 +-
.../Visible.html.ref => html-test/ref/Visible.html | 2 +-
{html => html-test/ref}/frames.html | 0
{html => html-test/ref}/haddock-util.js | 0
.../ref}/hslogo-16.png | Bin 1684 -> 1684 bytes
.../mini_A.html.ref => html-test/ref/mini_A.html | 0
.../ref/mini_AdvanceTypes.html | 6 +-
.../mini_B.html.ref => html-test/ref/mini_B.html | 0
.../ref/mini_Bug1.html | 0
.../ref/mini_Bug2.html | 0
.../ref/mini_Bug3.html | 0
.../ref/mini_Bug4.html | 0
.../ref/mini_Bug6.html | 0
.../ref/mini_Bug7.html | 0
.../ref/mini_Bug8.html | 0
.../ref/mini_BugDeprecated.html | 0
.../ref/mini_BugExportHeadings.html | 0
.../ref/mini_Bugs.html | 0
.../ref/mini_CrossPackageDocs.html | 4 +-
.../ref/mini_DeprecatedClass.html | 0
.../ref/mini_DeprecatedData.html | 0
.../ref/mini_DeprecatedFunction.html | 4 +-
.../ref/mini_DeprecatedFunction2.html | 0
.../ref/mini_DeprecatedFunction3.html | 0
.../ref/mini_DeprecatedModule.html | 0
.../ref/mini_DeprecatedModule2.html | 0
.../ref/mini_DeprecatedNewtype.html | 0
.../ref/mini_DeprecatedReExport.html | 18 +-
.../ref/mini_DeprecatedRecord.html | 0
.../ref/mini_DeprecatedTypeFamily.html | 0
.../ref/mini_DeprecatedTypeSynonym.html | 0
.../ref/mini_DeprecationMessageParseError.html | 4 +-
.../ref/mini_Examples.html | 0
.../ref/mini_FunArgs.html | 0
.../ref/mini_GADTRecords.html | 0
.../ref/mini_Hash.html | 0
.../ref/mini_HiddenInstances.html | 16 +-
.../ref/mini_HiddenInstancesB.html | 12 +-
.../ref/mini_Hyperlinks.html | 4 +-
.../ref/mini_IgnoreExports.html | 0
.../ref/mini_ModuleWithWarning.html | 0
.../ref/mini_NamedDoc.html | 0
.../ref/mini_NoLayout.html | 0
.../ref/mini_NonGreedy.html | 0
.../ref/mini_Properties.html | 4 +-
.../ref/mini_PruneWithWarning.html | 0
.../ref/mini_QuasiExpr.html | 0
.../ref/mini_QuasiQuote.html | 0
.../ref/mini_SpuriousSuperclassConstraints.html | 8 +-
.../mini_TH.html.ref => html-test/ref/mini_TH.html | 0
.../ref/mini_TH2.html | 0
.../ref/mini_Test.html | 0
.../ref/mini_Ticket112.html | 0
.../ref/mini_Ticket61.html | 0
.../ref/mini_Ticket75.html | 0
.../ref/mini_TypeFamilies.html | 0
.../ref/mini_TypeOperators.html | 8 -
.../ref/mini_Unicode.html | 0
.../ref/mini_Visible.html | 0
{html/Classic.theme => html-test/ref}/minus.gif | Bin 56 -> 56 bytes
{html/Ocean.std-theme => html-test/ref}/ocean.css | 0
{html/Classic.theme => html-test/ref}/plus.gif | Bin 59 -> 59 bytes
.../Ocean.std-theme => html-test/ref}/synopsis.png | Bin 11327 -> 11327 bytes
tests/html-tests/runtests.hs => html-test/run.lhs | 84 +++--
{tests/html-tests/tests => html-test/src}/A.hs | 0
html-test/src/AdvanceTypes.hs | 9 +
{tests/html-tests/tests => html-test/src}/B.hs | 0
{examples => html-test/src}/Bug1.hs | 0
{examples => html-test/src}/Bug2.hs | 0
{tests/html-tests/tests => html-test/src}/Bug3.hs | 0
{tests/html-tests/tests => html-test/src}/Bug4.hs | 0
{tests/html-tests/tests => html-test/src}/Bug6.hs | 0
{examples => html-test/src}/Bug7.hs | 0
{tests/html-tests/tests => html-test/src}/Bug8.hs | 0
.../tests => html-test/src}/BugDeprecated.hs | 0
.../tests => html-test/src}/BugExportHeadings.hs | 0
{tests/html-tests/tests => html-test/src}/Bugs.hs | 0
html-test/src/CrossPackageDocs.hs | 4 +
.../tests => html-test/src}/DeprecatedClass.hs | 0
.../tests => html-test/src}/DeprecatedData.hs | 0
html-test/src/DeprecatedFunction.hs | 10 +
.../tests => html-test/src}/DeprecatedFunction2.hs | 0
.../tests => html-test/src}/DeprecatedFunction3.hs | 0
html-test/src/DeprecatedModule.hs | 5 +
.../tests => html-test/src}/DeprecatedModule2.hs | 0
.../tests => html-test/src}/DeprecatedNewtype.hs | 0
html-test/src/DeprecatedReExport.hs | 16 +
.../tests => html-test/src}/DeprecatedRecord.hs | 0
.../src}/DeprecatedTypeFamily.hs | 0
.../src}/DeprecatedTypeSynonym.hs | 0
html-test/src/DeprecationMessageParseError.hs | 12 +
.../html-tests/tests => html-test/src}/Examples.hs | 0
.../html-tests/tests => html-test/src}/FunArgs.hs | 0
.../tests => html-test/src}/GADTRecords.hs | 0
{tests/html-tests/tests => html-test/src}/Hash.hs | 0
.../html-tests/tests => html-test/src}/Hidden.hs | 0
html-test/src/HiddenInstances.hs | 35 ++
html-test/src/HiddenInstancesA.hs | 17 +
html-test/src/HiddenInstancesB.hs | 2 +
html-test/src/Hyperlinks.hs | 8 +
.../tests => html-test/src}/IgnoreExports.hs | 0
.../tests => html-test/src}/ModuleWithWarning.hs | 2 +-
.../html-tests/tests => html-test/src}/NamedDoc.hs | 0
.../html-tests/tests => html-test/src}/NoLayout.hs | 0
.../tests => html-test/src}/NonGreedy.hs | 0
html-test/src/Properties.hs | 9 +
html-test/src/PruneWithWarning.hs | 15 +
.../tests => html-test/src}/QuasiExpr.hs | 0
.../tests => html-test/src}/QuasiQuote.hs | 0
html-test/src/SpuriousSuperclassConstraints.hs | 30 ++
{tests/html-tests/tests => html-test/src}/TH.hs | 0
{tests/html-tests/tests => html-test/src}/TH2.hs | 0
{tests/html-tests/tests => html-test/src}/Test.hs | 0
.../tests => html-test/src}/Ticket112.hs | 0
.../html-tests/tests => html-test/src}/Ticket61.hs | 0
.../tests => html-test/src}/Ticket61_Hidden.hs | 0
.../html-tests/tests => html-test/src}/Ticket75.hs | 0
.../tests => html-test/src}/TypeFamilies.hs | 0
.../tests => html-test/src}/TypeOperators.hs | 4 +-
.../src/Unicode.hs.disabled | 0
{examples => html-test/src}/Visible.hs | 0
.../html}/Classic.theme/haskell_icon.gif | Bin 911 -> 911 bytes
.../html/Classic.theme}/minus.gif | Bin 56 -> 56 bytes
.../html/Classic.theme}/plus.gif | Bin 59 -> 59 bytes
.../html}/Classic.theme/xhaddock.css | 0
.../html}/Ocean.std-theme/hslogo-16.png | Bin 1684 -> 1684 bytes
.../html/Ocean.std-theme}/minus.gif | Bin 56 -> 56 bytes
{html => resources/html}/Ocean.std-theme/ocean.css | 0
.../html/Ocean.std-theme}/plus.gif | Bin 59 -> 59 bytes
.../html}/Ocean.std-theme/synopsis.png | Bin 11327 -> 11327 bytes
{html => resources/html}/frames.html | 0
{html => resources/html}/haddock-util.js | 0
{latex => resources/latex}/haddock.sty | 0
src/.ghci | 1 -
src/Documentation/Haddock.hs | 15 +-
src/{Main.hs => Haddock.hs} | 73 ++--
src/Haddock/Backends/Hoogle.hs | 3 +-
src/Haddock/Backends/LaTeX.hs | 7 +-
src/Haddock/Backends/Xhtml/DocMarkup.hs | 4 +-
src/Haddock/Interface.hs | 7 +-
src/Haddock/Interface/AttachInstances.hs | 91 ++++-
src/Haddock/Interface/Create.hs | 100 +++--
src/Haddock/Interface/LexParseRn.hs | 4 +-
src/Haddock/Interface/ParseModuleHeader.hs | 1 +
src/Haddock/Interface/Rename.hs | 63 ++--
src/Haddock/InterfaceFile.hs | 45 ++-
src/Haddock/Lex.x | 4 +
src/Haddock/Parse.y | 27 +-
src/Haddock/Types.hs | 56 +++-
src/Haddock/Utils.hs | 7 +-
test/Haddock/ParseSpec.hs | 81 ++++
test/Spec.hs | 9 +
test/nanospec/README | 6 +
test/nanospec/Test/Hspec.hs | 126 ++++++
tests/html-tests/README | 24 -
tests/html-tests/accept.hs | 36 --
tests/html-tests/tests/Bug1.hs | 6 -
tests/html-tests/tests/Bug2.hs | 4 -
tests/html-tests/tests/Bug7.hs | 12 -
tests/html-tests/tests/CrossPackageDocs.hs | 3 -
tests/html-tests/tests/CrossPackageDocs.html.ref | 468 --------------------
tests/html-tests/tests/DeprecatedFunction.hs | 6 -
tests/html-tests/tests/DeprecatedModule.hs | 5 -
tests/html-tests/tests/PruneWithWarning.hs | 9 -
tests/html-tests/tests/Visible.hs | 3 -
tests/html-tests/tests/frames.html.ref | 30 --
tests/unit-tests/.ghci | 1 -
tests/unit-tests/parsetests.hs | 69 ---
tests/unit-tests/runparsetests.sh | 15 -
251 files changed, 1915 insertions(+), 1956 deletions(-)
Diff suppressed because of size. To see it, use:
git show 8d4c94ca5a969a5ebbb791939fb0195dc672429e
More information about the ghc-commits
mailing list