[commit: ghc] wip/api-annots: Manually patch D868, temporary for integration test (cfef477)

[git at git.haskell.org]

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

On branch  : wip/api-annots
Link       : http://ghc.haskell.org/trac/ghc/changeset/cfef4776d4d508c2fd3eec7bf6137882089745ac/ghc

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

commit cfef4776d4d508c2fd3eec7bf6137882089745ac
Author: Alan Zimmerman <alan.zimm at gmail.com>
Date:   Fri May 8 13:18:45 2015 +0200

    Manually patch D868, temporary for integration test


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

cfef4776d4d508c2fd3eec7bf6137882089745ac
 compiler/hsSyn/HsTypes.hs                          |  4 +-
 compiler/parser/Parser.y                           | 10 +--
 compiler/parser/RdrHsSyn.hs                        | 18 ++---
 testsuite/tests/ghc-api/annotations/.gitignore     |  1 +
 testsuite/tests/ghc-api/annotations/Makefile       |  8 +++
 testsuite/tests/ghc-api/annotations/T10278.stdout  |  4 +-
 testsuite/tests/ghc-api/annotations/T10354.stdout  | 81 ++++++++++++++++++++++
 testsuite/tests/ghc-api/annotations/Test10354.hs   | 11 +++
 testsuite/tests/ghc-api/annotations/all.T          |  1 +
 .../ghc-api/annotations/{t10278.hs => t10354.hs}   |  2 +-
 10 files changed, 122 insertions(+), 18 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 cfef4776d4d508c2fd3eec7bf6137882089745ac