[commit: ghc] ghc-7.10: ApiAnnotations tweaks (2d56598)

[git at git.haskell.org]

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

On branch  : ghc-7.10
Link       : http://ghc.haskell.org/trac/ghc/changeset/2d56598932551061bc389ab0d17e7ae761b7cbda/ghc

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

commit 2d56598932551061bc389ab0d17e7ae761b7cbda
Author: Alan Zimmerman <alan.zimm at gmail.com>
Date:   Wed May 27 17:50:55 2015 +0200

    ApiAnnotations tweaks
    
    Summary:
    A collection of minor updates for the API Annotations.
    
    1. The annotations for the implicity parameter is disconnected in the
       following
    
        type MPI = ?mpi_secret :: MPISecret
    
    2. In the following, the annotation for one of the commas is disconeected.
    
        mkPoli = mkBila . map ((,,(),,()) <$> P.base <*> P.pos <*> P.form)
    
    3. In the following, the annotation for the parens becomes disconnected
    
        data MaybeDefault v where
            SetTo :: forall v . ( Eq v, Show v ) => !v -> MaybeDefault v
            SetTo4 :: forall v a. (( Eq v, Show v ) => v -> MaybeDefault v
                                                    -> a -> MaybeDefault [a])
    
    Test Plan: ./validate
    
    Reviewers: hvr, austin
    
    Reviewed By: austin
    
    Subscribers: bgamari, thomie, mpickering
    
    Differential Revision: https://phabricator.haskell.org/D901
    
    GHC Trac Issues: #10399
    
    (cherry picked from commit c5911479f295242e16e396eb5d1369f2e4ce8de0)


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

2d56598932551061bc389ab0d17e7ae761b7cbda
 compiler/ghc.mk                                    |   2 +
 compiler/hsSyn/HsTypes.hs                          |  28 ++--
 compiler/parser/ApiAnnotation.hs                   |   3 +
 compiler/parser/Parser.y                           |  25 ++--
 compiler/parser/RdrHsSyn.hs                        |  12 +-
 testsuite/tests/ghc-api/annotations/.gitignore     |   1 +
 testsuite/tests/ghc-api/annotations/Makefile       |   8 ++
 testsuite/tests/ghc-api/annotations/T10399.stderr  |  13 ++
 testsuite/tests/ghc-api/annotations/T10399.stdout  | 154 +++++++++++++++++++++
 testsuite/tests/ghc-api/annotations/Test10399.hs   |  18 +++
 testsuite/tests/ghc-api/annotations/all.T          |   1 +
 .../tests/ghc-api/annotations/exampleTest.stdout   |   2 -
 .../tests/ghc-api/annotations/parseTree.stdout     |   4 +-
 .../ghc-api/annotations/{t10278.hs => t10399.hs}   |   2 +-
 14 files changed, 242 insertions(+), 31 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 2d56598932551061bc389ab0d17e7ae761b7cbda