[commit: ghc] ghc-new-co: Merge master into the ghc-new-co branch (ca53c38)

[Simon Peyton Jones]

Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : ghc-new-co

http://hackage.haskell.org/trac/ghc/changeset/ca53c38335cdc671f0b1e0949aa1514fc3fd72a5

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

commit ca53c38335cdc671f0b1e0949aa1514fc3fd72a5
Merge: 4f8d714... 246183c...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Fri May 6 15:56:06 2011 +0100

    Merge master into the ghc-new-co branch

 Makefile                            |    8 +-
 aclocal.m4                          |   12 -
 compiler/cmm/CLabel.hs              |   29 +-
 compiler/cmm/CmmOpt.hs              |   60 +++
 compiler/cmm/PprC.hs                |    2 +-
 compiler/deSugar/Check.lhs          |   19 +-
 compiler/deSugar/Coverage.lhs       |   83 ++--
 compiler/deSugar/DsArrows.lhs       |   15 +-
 compiler/deSugar/DsExpr.lhs         |  215 +++--------
 compiler/deSugar/DsGRHSs.lhs        |    4 +-
 compiler/deSugar/DsListComp.lhs     |  535 ++++++++++++++++--------
 compiler/deSugar/DsMeta.hs          |   16 +-
 compiler/deSugar/Match.lhs          |    2 +-
 compiler/deSugar/MatchLit.lhs       |   14 +-
 compiler/ghc.cabal.in               |   17 +-
 compiler/ghc.mk                     |   58 +++-
 compiler/ghci/ByteCodeAsm.lhs       |    5 +-
 compiler/hsSyn/Convert.lhs          |   15 +-
 compiler/hsSyn/HsExpr.lhs           |  342 ++++++++++------
 compiler/hsSyn/HsLit.lhs            |   18 +-
 compiler/hsSyn/HsPat.lhs            |    4 +-
 compiler/hsSyn/HsUtils.lhs          |   68 ++--
 compiler/iface/IfaceSyn.lhs         |  435 ++++++++++----------
 compiler/llvmGen/LlvmCodeGen/Ppr.hs |   31 +-
 compiler/llvmGen/LlvmMangler.hs     |   78 +++--
 compiler/main/CodeOutput.lhs        |   22 +-
 compiler/main/DriverPhases.hs       |    4 -
 compiler/main/DriverPipeline.hs     |  102 ++---
 compiler/main/DynFlags.hs           |  104 +++--
 compiler/main/GhcMonad.hs           |    4 +-
 compiler/main/HscMain.lhs           |    2 +-
 compiler/main/SysTools.lhs          |    2 +-
 compiler/nativeGen/Alpha/CodeGen.hs |  789 -----------------------------------
 compiler/nativeGen/Alpha/Instr.hs   |  142 -------
 compiler/nativeGen/Alpha/Ppr.hs-old |  562 -------------------------
 compiler/nativeGen/Alpha/RegInfo.hs |  218 ----------
 compiler/nativeGen/Alpha/Regs.hs    |  323 --------------
 compiler/nativeGen/AsmCodeGen.lhs   |   53 ++--
 compiler/nativeGen/PPC/Regs.hs      |    1 -
 compiler/nativeGen/Platform.hs      |    7 +-
 compiler/nativeGen/X86/Instr.hs     |    2 +-
 compiler/nativeGen/X86/Regs.hs      |   23 +-
 compiler/parser/Lexer.x             |    1 +
 compiler/parser/Parser.y.pp         |   20 +-
 compiler/parser/RdrHsSyn.lhs        |   46 +--
 compiler/prelude/PrelNames.lhs      |   37 ++-
 compiler/rename/RnBinds.lhs         |    6 +-
 compiler/rename/RnExpr.lhs          |  440 +++++++++++++-------
 compiler/typecheck/TcArrows.lhs     |   93 ++++-
 compiler/typecheck/TcExpr.lhs       |   28 +-
 compiler/typecheck/TcGenDeriv.lhs   |   15 +-
 compiler/typecheck/TcHsSyn.lhs      |   56 ++--
 compiler/typecheck/TcMatches.lhs    |  603 ++++++++++++++++++---------
 compiler/typecheck/TcPat.lhs        |   26 +-
 compiler/typecheck/TcRnDriver.lhs   |   51 ++--
 compiler/typecheck/TcRnMonad.lhs    |    5 -
 compiler/typecheck/TcRnTypes.lhs    |    2 +
 compiler/typecheck/TcSMonad.lhs     |    7 +-
 compiler/typecheck/TcUnify.lhs      |    2 +-
 configure.ac                        |    3 +-
 docs/users_guide/flags.xml          |    6 +
 docs/users_guide/glasgow_exts.xml   |  228 ++++++++++
 ghc.spec.in                         |    1 -
 includes/stg/SMP.h                  |    2 +
 mk/build.mk.sample                  |    9 -
 mk/config.mk.in                     |    2 -
 utils/Makefile                      |    2 +-
 67 files changed, 2556 insertions(+), 3580 deletions(-)


Diff suppressed because of size. To see it, use:

    git show ca53c38335cdc671f0b1e0949aa1514fc3fd72a5