[commit: ghc] master: Merge New Template Haskell branch. (e7394be)

[git at git.haskell.org]

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

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

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

commit e7394be2c43a0a4a70fa471e3aac3cb2bc52ddde
Merge: 1745779 5e1fda8
Author: Geoffrey Mainland <gmainlan at microsoft.com>
Date:   Fri Oct 4 17:52:52 2013 -0400

    Merge New Template Haskell branch.



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

e7394be2c43a0a4a70fa471e3aac3cb2bc52ddde
 compiler/basicTypes/RdrName.lhs      |   48 +--
 compiler/deSugar/Check.lhs           |    2 +
 compiler/deSugar/DsArrows.lhs        |    1 +
 compiler/deSugar/DsExpr.lhs          |    1 +
 compiler/deSugar/DsMeta.hs           |   43 ++-
 compiler/deSugar/Match.lhs           |    1 +
 compiler/ghc.cabal.in                |    1 +
 compiler/hsSyn/HsDecls.lhs           |   16 +-
 compiler/hsSyn/HsExpr.lhs            |   98 +++++-
 compiler/hsSyn/HsExpr.lhs-boot       |    1 +
 compiler/hsSyn/HsPat.lhs             |   13 +-
 compiler/hsSyn/HsUtils.lhs           |   15 +-
 compiler/parser/Lexer.x              |   47 +--
 compiler/parser/Parser.y.pp          |   36 ++-
 compiler/parser/RdrHsSyn.lhs         |   13 +-
 compiler/rename/RnEnv.lhs            |   28 +-
 compiler/rename/RnExpr.lhs           |   84 +-----
 compiler/rename/RnPat.lhs            |   12 +-
 compiler/rename/RnSource.lhs         |    7 +-
 compiler/rename/RnSplice.lhs         |  544 ++++++++++++++++++++++++++++++++++
 compiler/rename/RnSplice.lhs-boot    |   21 ++
 compiler/rename/RnTypes.lhs          |   64 +---
 compiler/typecheck/TcEnv.lhs         |   44 +--
 compiler/typecheck/TcExpr.lhs        |   14 +-
 compiler/typecheck/TcHsSyn.lhs       |   23 +-
 compiler/typecheck/TcRnDriver.lhs    |  108 ++++---
 compiler/typecheck/TcRnMonad.lhs     |   17 ++
 compiler/typecheck/TcRnTypes.lhs     |   40 ++-
 compiler/typecheck/TcSplice.lhs      |  483 +++++++++++++++++++-----------
 compiler/typecheck/TcSplice.lhs-boot |   13 +-
 30 files changed, 1376 insertions(+), 462 deletions(-)