[commit: ghc] wip/merge: AST changes to prepare for API annotations, for #9628 (d49f153)

[git at git.haskell.org]

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

On branch  : wip/merge
Link       : http://ghc.haskell.org/trac/ghc/changeset/d49f1537714d82df16ca1611d996032b428b5581/ghc

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

commit d49f1537714d82df16ca1611d996032b428b5581
Author: Alan Zimmerman <alan.zimm at gmail.com>
Date:   Thu Nov 20 22:55:09 2014 -0600

    AST changes to prepare for API annotations, for #9628
    
    Summary:
    AST changes to prepare for API annotations
    
    Add locations to parts of the AST so that API annotations can
    then be added.
    
    The outline of the whole process is captured here
    https://ghc.haskell.org/trac/ghc/wiki/GhcAstAnnotations
    
    Test Plan: sh ./validate
    
    Reviewers: austin, simonpj
    
    Reviewed By: simonpj
    
    Subscribers: thomie, goldfire, carter
    
    Differential Revision: https://phabricator.haskell.org/D426
    
    GHC Trac Issues: #9628
    
    Conflicts:
    	compiler/parser/RdrHsSyn.hs


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

d49f1537714d82df16ca1611d996032b428b5581
 compiler/basicTypes/BasicTypes.lhs                 |   9 +-
 compiler/deSugar/Check.lhs                         |   8 +-
 compiler/deSugar/Coverage.lhs                      |  11 +-
 compiler/deSugar/Desugar.lhs                       |   8 +-
 compiler/deSugar/DsExpr.lhs                        |  18 +-
 compiler/deSugar/DsForeign.lhs                     |   7 +-
 compiler/deSugar/DsMeta.hs                         | 100 +++++-----
 compiler/deSugar/Match.lhs                         |   4 +-
 compiler/deSugar/MatchCon.lhs                      |   9 +-
 compiler/hsSyn/Convert.lhs                         |  55 +++---
 compiler/hsSyn/HsBinds.lhs                         |  11 +-
 compiler/hsSyn/HsDecls.lhs                         | 104 +++++++----
 compiler/hsSyn/HsExpr.lhs                          |  14 +-
 compiler/hsSyn/HsImpExp.lhs                        |  51 +++---
 compiler/hsSyn/HsPat.lhs                           |   9 +-
 compiler/hsSyn/HsSyn.lhs                           |   9 +-
 compiler/hsSyn/HsTypes.lhs                         |  21 ++-
 compiler/hsSyn/HsUtils.lhs                         |  18 +-
 compiler/main/HeaderInfo.hs                        |   3 +-
 compiler/main/HscMain.hs                           |   4 +-
 compiler/main/HscStats.hs                          |   9 +-
 compiler/parser/HaddockUtils.hs                    |   8 +-
 compiler/parser/Parser.y                           | 204 +++++++++++----------
 compiler/parser/RdrHsSyn.hs                        |  94 +++++-----
 compiler/rename/RnBinds.lhs                        |  25 ++-
 compiler/rename/RnEnv.lhs                          |   9 +-
 compiler/rename/RnExpr.lhs                         |  12 +-
 compiler/rename/RnNames.lhs                        | 129 +++++++------
 compiler/rename/RnPat.lhs                          |  32 ++--
 compiler/rename/RnSource.lhs                       | 126 ++++++-------
 compiler/rename/RnTypes.lhs                        |  18 +-
 compiler/typecheck/TcBinds.lhs                     |  25 +--
 compiler/typecheck/TcDeriv.lhs                     |  13 +-
 compiler/typecheck/TcExpr.lhs                      |  20 +-
 compiler/typecheck/TcForeign.lhs                   |  19 +-
 compiler/typecheck/TcHsSyn.lhs                     |  26 +--
 compiler/typecheck/TcInstDcls.lhs                  |   9 +-
 compiler/typecheck/TcPat.lhs                       |   7 +-
 compiler/typecheck/TcPatSyn.lhs                    |   6 +-
 compiler/typecheck/TcRnDriver.lhs                  |   6 +-
 compiler/typecheck/TcRules.lhs                     |  19 +-
 compiler/typecheck/TcTyClsDecls.lhs                | 129 +++++++++----
 compiler/utils/Binary.hs                           |  38 ++++
 ghc/InteractiveUI.hs                               |   7 +-
 .../haddock/haddock_examples/haddock.Test.stderr   |   6 +-
 utils/ghctags/Main.hs                              |   2 +-
 utils/haddock                                      |   2 +-
 47 files changed, 858 insertions(+), 615 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 d49f1537714d82df16ca1611d996032b428b5581