[commit: ghc] master: Make HsAppsType contents Located (ff92395)

[git at git.haskell.org]

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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/ff923954023bb35012c398cc8c3156257c10546b/ghc

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

commit ff923954023bb35012c398cc8c3156257c10546b
Author: Alan Zimmerman <alan.zimm at gmail.com>
Date:   Mon Dec 21 22:30:45 2015 +0200

    Make HsAppsType contents Located
    
    An HsAppInfix can carry a qconop/varop preceded by a SIMPLEQUOTE as a
    Located RdrName.
    
    In this case AnnSimpleQuote is attached to the Located HsAppType.
    
        | SIMPLEQUOTE qconop            {% ams (sLL $1 $> $ HsAppInfix $2)
                                               [mj AnnSimpleQuote $1] }
        | SIMPLEQUOTE varop             {% ams (sLL $1 $> $ HsAppInfix $2)
                                               [mj AnnSimpleQuote $1] }
    
    This patch changes
    
        data HsType name
          ...
          | HsAppsTy [HsAppType name]
    
    to
    
        data HsType name
          ...
          | HsAppsTy [LHsAppType name]
    
    so that the annotation is not discarded when it reaches the ParsedSource


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

ff923954023bb35012c398cc8c3156257c10546b
 compiler/hsSyn/Convert.hs                          |  6 +++---
 compiler/hsSyn/HsTypes.hs                          | 21 ++++++++++++---------
 compiler/hsSyn/HsUtils.hs                          | 12 +++++++-----
 compiler/parser/Parser.y                           |  8 ++++----
 compiler/parser/RdrHsSyn.hs                        | 20 ++++++++++++--------
 compiler/rename/RnNames.hs                         |  4 +++-
 compiler/rename/RnTypes.hs                         | 11 ++++++-----
 testsuite/tests/ghc-api/landmines/landmines.stdout |  4 ++--
 8 files changed, 49 insertions(+), 37 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 ff923954023bb35012c398cc8c3156257c10546b