[commit: ghc] ghc-7.10: API Annotations tweaks. (1a7621a)

[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/1a7621a441c0d6e67ea1b2ccbc1e1d546981be5c/ghc

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

commit 1a7621a441c0d6e67ea1b2ccbc1e1d546981be5c
Author: Alan Zimmerman <alan.zimm at gmail.com>
Date:   Thu Jan 15 13:11:21 2015 -0600

    API Annotations tweaks.
    
    Summary:
    HsTyLit now has SourceText
    
    Update documentation of HsSyn to reflect which annotations are attached to which element.
    
    Ensure that the parser always keeps HsSCC and HsTickPragma values, to
    be ignored in the desugar phase if not needed
    
    Bringing in SourceText for pragmas
    
    Add Location in NPlusKPat
    
    Add Location in FunDep
    
    Make RecCon payload Located
    
    Explicitly add AnnVal to RdrName where it is compound
    
    Add Location in IPBind
    
    Add Location to name in IEThingAbs
    
    Add Maybe (Located id,Bool) to Match to track fun_id,infix
      This includes converting Match into a record and adding a note about why
      the fun_id needs to be replicated in the Match.
    
    Add Location in KindedTyVar
    
    Sort out semi-colons for parsing
    
      - import statements
      - stmts
      - decls
      - decls_cls
      - decls_inst
    
    This updates the haddock submodule.
    
    Test Plan: ./validate
    
    Reviewers: hvr, austin, goldfire, simonpj
    
    Reviewed By: simonpj
    
    Subscribers: thomie, carter
    
    Differential Revision: https://phabricator.haskell.org/D538
    
    (cherry picked from commit 11881ec6f8d4db881671173441df87c2457409f4)


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

1a7621a441c0d6e67ea1b2ccbc1e1d546981be5c
 compiler/basicTypes/BasicTypes.hs                  | 135 +++-
 compiler/basicTypes/DataCon.hs                     |  21 +-
 compiler/basicTypes/MkId.hs                        |  14 +-
 compiler/basicTypes/RdrName.hs                     |  14 +
 compiler/basicTypes/SrcLoc.hs                      |  11 +
 compiler/deSugar/Check.hs                          |   8 +-
 compiler/deSugar/Coverage.hs                       |  22 +-
 compiler/deSugar/Desugar.hs                        |   8 +-
 compiler/deSugar/DsArrows.hs                       |   9 +-
 compiler/deSugar/DsExpr.hs                         |  27 +-
 compiler/deSugar/DsForeign.hs                      |   2 +-
 compiler/deSugar/DsMeta.hs                         |  61 +-
 compiler/deSugar/Match.hs                          |   9 +-
 compiler/deSugar/MatchLit.hs                       |   6 +-
 compiler/ghc.mk                                    |   2 -
 compiler/hsSyn/Convert.hs                          |  70 +-
 compiler/hsSyn/HsBinds.hs                          |  48 +-
 compiler/hsSyn/HsDecls.hs                          | 161 ++--
 compiler/hsSyn/HsExpr.hs                           | 171 ++--
 compiler/hsSyn/HsImpExp.hs                         |  12 +-
 compiler/hsSyn/HsLit.hs                            |  39 +-
 compiler/hsSyn/HsPat.hs                            |  23 +-
 compiler/hsSyn/HsTypes.hs                          |  69 +-
 compiler/hsSyn/HsUtils.hs                          |  18 +-
 compiler/main/GHC.hs                               |   3 +-
 compiler/main/HeaderInfo.hs                        |   3 +-
 compiler/main/HscMain.hs                           |   6 +-
 compiler/main/HscTypes.hs                          |   1 +
 compiler/main/InteractiveEval.hs                   |   1 +
 compiler/parser/ApiAnnotation.hs                   |  55 +-
 compiler/parser/Lexer.x                            | 157 ++--
 compiler/parser/Parser.y                           | 891 ++++++++++++---------
 compiler/parser/RdrHsSyn.hs                        | 128 +--
 compiler/prelude/ForeignCall.hs                    |  20 +-
 compiler/prelude/TysWiredIn.hs                     |  20 +-
 compiler/rename/RnBinds.hs                         |  12 +-
 compiler/rename/RnExpr.hs                          |  14 +-
 compiler/rename/RnNames.hs                         |  24 +-
 compiler/rename/RnPat.hs                           |  14 +-
 compiler/rename/RnSource.hs                        |  86 +-
 compiler/rename/RnTypes.hs                         |  10 +-
 compiler/stranal/WorkWrap.hs                       |   6 +-
 compiler/typecheck/Inst.hs                         |   6 +-
 compiler/typecheck/TcAnnotations.hs                |   8 +-
 compiler/typecheck/TcArrows.hs                     |   6 +-
 compiler/typecheck/TcBinds.hs                      |  20 +-
 compiler/typecheck/TcClassDcl.hs                   |   4 +-
 compiler/typecheck/TcExpr.hs                       |  12 +-
 compiler/typecheck/TcGenGenerics.hs                |   2 +-
 compiler/typecheck/TcHsSyn.hs                      |  42 +-
 compiler/typecheck/TcHsType.hs                     |  15 +-
 compiler/typecheck/TcInstDcls.hs                   |   6 +-
 compiler/typecheck/TcMatches.hs                    |   6 +-
 compiler/typecheck/TcPat.hs                        |   8 +-
 compiler/typecheck/TcPatSyn.hs                     |   5 +-
 compiler/typecheck/TcRnDriver.hs                   |   3 +-
 compiler/typecheck/TcRules.hs                      |   9 +-
 compiler/typecheck/TcSplice.hs                     |  12 +-
 compiler/typecheck/TcTyClsDecls.hs                 |  32 +-
 compiler/types/Class.hs                            |  10 +-
 compiler/types/InstEnv.hs                          |   6 +-
 compiler/utils/Binary.hs                           |  42 +-
 compiler/utils/OrdList.hs                          |  10 +-
 .../tests/ghc-api/annotations/AnnotationLet.hs     |   7 +-
 testsuite/tests/ghc-api/annotations/Makefile       |   1 +
 .../tests/ghc-api/annotations/annotations.stdout   |  86 +-
 .../tests/ghc-api/annotations/parseTree.stdout     |  46 +-
 testsuite/tests/ghc-api/landmines/landmines.stdout |   8 +-
 utils/haddock                                      |   2 +-
 69 files changed, 1735 insertions(+), 1090 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 1a7621a441c0d6e67ea1b2ccbc1e1d546981be5c