[commit: ghc] master: Merge branch 'master' of http://darcs.haskell.org/ghc (e0e4288)

[Simon Peyton Jones]

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

On branch  : master

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

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

commit e0e4288b2457c668319ce0581249c683573c666c
Merge: 5c312b4... 73aeb7d...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Wed Sep 14 09:38:27 2011 +0100

    Merge branch 'master' of http://darcs.haskell.org/ghc

 compiler/basicTypes/Literal.lhs               |  341 ++++++++-------
 compiler/basicTypes/MkId.lhs                  |   49 ++-
 compiler/codeGen/CgUtils.hs                   |  601 +++++++++++++------------
 compiler/coreSyn/CoreLint.lhs                 |   15 +-
 compiler/coreSyn/CorePrep.lhs                 |   43 ++-
 compiler/coreSyn/CoreUtils.lhs                |    1 +
 compiler/coreSyn/MkCore.lhs                   |   34 +--
 compiler/ghc.mk                               |   10 +
 compiler/ghci/ByteCodeGen.lhs                 |    4 +
 compiler/prelude/PrelNames.lhs                |   29 +-
 compiler/prelude/PrelRules.lhs                |   54 +--
 compiler/prelude/TysWiredIn.lhs               |   91 ++++
 compiler/stgSyn/CoreToStg.lhs                 |    4 +
 compiler/typecheck/Inst.lhs                   |    1 +
 compiler/typecheck/TcForeign.lhs              |   53 ++-
 compiler/typecheck/TcInteract.lhs             |   18 +-
 compiler/typecheck/TcTyClsDecls.lhs           |    4 +-
 compiler/vectorise/Vectorise.hs               |   18 +-
 compiler/vectorise/Vectorise/Convert.hs       |   81 ++--
 compiler/vectorise/Vectorise/Exp.hs           |   16 +-
 compiler/vectorise/Vectorise/Monad.hs         |    8 +-
 compiler/vectorise/Vectorise/Monad/Base.hs    |  190 +++++---
 compiler/vectorise/Vectorise/Monad/InstEnv.hs |   27 +-
 compiler/vectorise/Vectorise/Utils/PADict.hs  |    6 +-
 configure.ac                                  |    3 -
 ghc/ghc.mk                                    |    1 -
 26 files changed, 1011 insertions(+), 691 deletions(-)