[commit: haddock] T6018-injective-type-families, adamse-D1033, ghc-head, master, metainfo, wip/10268, wip/10313, wip/D538, wip/D538-1, wip/D538-2, wip/D538-3, wip/D538-4, wip/D538-5, wip/D538-6, wip/D548-master, wip/D548-master-2, wip/T10483, wip/T9840, wip/api-annot-tweaks-7.10, wip/api-annots-ghc-7.10-3, wip/orf-reboot: Allow the parser to spit out meta-info (12a066d)

[git at git.haskell.org]

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

On branches: T6018-injective-type-families,adamse-D1033,ghc-head,master,metainfo,wip/10268,wip/10313,wip/D538,wip/D538-1,wip/D538-2,wip/D538-3,wip/D538-4,wip/D538-5,wip/D538-6,wip/D548-master,wip/D548-master-2,wip/T10483,wip/T9840,wip/api-annot-tweaks-7.10,wip/api-annots-ghc-7.10-3,wip/orf-reboot
Link       : http://git.haskell.org/haddock.git/commitdiff/12a066d96332b40f346621c9376c5c7328c92a0b

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

commit 12a066d96332b40f346621c9376c5c7328c92a0b
Author: Mateusz Kowalczyk <fuuzetsu at fuuzetsu.co.uk>
Date:   Tue Dec 9 07:00:07 2014 +0000

    Allow the parser to spit out meta-info
    
    Currently we only use it only for ‘since’ annotations but with these
    patches it should be fairly simple to add new attributes if we wish to.
    
    Closes #26. It seems to work fine but due to 7.10 rush I don't have the
    chance to do more exhaustive testing right now. The way the meta is
    output (emphasis at the end of the whole comment) is fairly arbitrary
    and subject to bikeshedding.
    
    Note that this makes test for Bug310 fail due to interface version bump:
    it can't find the docs for base with this interface version so it fails.
    There is not much we can do to help this because it tests for ’built-in’
    identifier, not something we can provide ourselves.


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

12a066d96332b40f346621c9376c5c7328c92a0b
 haddock-api/src/Haddock.hs                         |   9 +-
 haddock-api/src/Haddock/Backends/Hoogle.hs         |   4 +-
 haddock-api/src/Haddock/Backends/LaTeX.hs          |  13 +-
 haddock-api/src/Haddock/Backends/Xhtml.hs          |  12 +-
 .../src/Haddock/Backends/Xhtml/DocMarkup.hs        |  82 +++++++-----
 haddock-api/src/Haddock/Backends/Xhtml/Layout.hs   |   2 +-
 haddock-api/src/Haddock/Doc.hs                     |   7 +-
 haddock-api/src/Haddock/Interface/Create.hs        |  19 +--
 haddock-api/src/Haddock/Interface/LexParseRn.hs    |  35 +++---
 .../src/Haddock/Interface/ParseModuleHeader.hs     |   2 +-
 haddock-api/src/Haddock/Interface/Rename.hs        |   5 +-
 haddock-api/src/Haddock/InterfaceFile.hs           |  15 ++-
 haddock-api/src/Haddock/ModuleTree.hs              |  10 +-
 haddock-api/src/Haddock/Parser.hs                  |   4 +-
 haddock-api/src/Haddock/Types.hs                   |  15 +--
 haddock-api/src/Haddock/Utils.hs                   |  12 +-
 haddock-library/src/Documentation/Haddock/Doc.hs   |  20 ++-
 .../src/Documentation/Haddock/Parser.hs            |   6 +-
 haddock-library/src/Documentation/Haddock/Types.hs |  20 +++
 .../test/Documentation/Haddock/ParserSpec.hs       |  23 ++--
 html-test/ref/{DeprecatedClass.html => Bug26.html} | 138 ++++++++++++---------
 html-test/src/Bug26.hs                             |  29 +++++
 22 files changed, 311 insertions(+), 171 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 12a066d96332b40f346621c9376c5c7328c92a0b