[commit: ghc] master: Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc (71ae069)

[Simon Peyton Jones]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/71ae069182e3393bac87f796c65abe5d69f809f5

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

commit 71ae069182e3393bac87f796c65abe5d69f809f5
Merge: 6464d37... a7f9930...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Tue Jan 29 08:57:26 2013 +0000

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

 compiler/coreSyn/CoreSyn.lhs                      |    5 +-
 compiler/coreSyn/CoreTidy.lhs                     |    3 +-
 compiler/ghc.cabal.in                             |    1 -
 compiler/ghci/Debugger.hs                         |    5 +-
 compiler/iface/BinIface.hs                        |    7 -
 compiler/iface/IfaceSyn.lhs                       |   31 +--
 compiler/iface/MkIface.lhs                        |   22 +--
 compiler/iface/TcIface.lhs                        |   29 +--
 compiler/main/DriverPipeline.hs                   |    9 +-
 compiler/main/DynFlags.hs                         |   22 ++-
 compiler/main/DynFlags.hs-boot                    |    8 +-
 compiler/main/GHC.hs                              |    5 +-
 compiler/main/PprTyThing.hs                       |    1 +
 compiler/main/StaticFlagParser.hs                 |  151 -------------
 compiler/main/StaticFlags.hs                      |  241 +++++++++++++++------
 compiler/main/StaticFlags.hs-boot                 |    4 +
 compiler/main/TidyPgm.lhs                         |    2 +-
 compiler/simplCore/OccurAnal.lhs                  |    4 +-
 compiler/typecheck/FamInst.lhs                    |  101 ++++-----
 compiler/typecheck/TcBinds.lhs                    |    1 +
 compiler/typecheck/TcGenGenerics.lhs              |   10 +-
 compiler/typecheck/TcInstDcls.lhs                 |   51 ++---
 compiler/typecheck/TcRnDriver.lhs                 |    5 +-
 compiler/typecheck/TcTyClsDecls.lhs               |   22 +-
 compiler/typecheck/TcType.lhs                     |  155 -------------
 compiler/types/Class.lhs                          |   20 +--
 compiler/types/CoAxiom.lhs                        |   31 +++-
 compiler/types/Coercion.lhs                       |  120 ++++++++++-
 compiler/types/FamInstEnv.lhs                     |  126 +-----------
 compiler/types/Type.lhs                           |   10 +
 compiler/types/TypeRep.lhs                        |  119 ++++++++++
 compiler/utils/Outputable.lhs                     |    5 +-
 compiler/vectorise/Vectorise/Generic/PAMethods.hs |    4 +-
 compiler/vectorise/Vectorise/Generic/PData.hs     |   11 +-
 configure.ac                                      |    6 +-
 distrib/compare/FilenameDescr.hs                  |   17 +-
 distrib/compare/Utils.hs                          |    2 +-
 distrib/compare/compare.hs                        |   65 +++++-
 ghc/Main.hs                                       |    1 -
 rts/sm/Scav.c                                     |    2 +-
 sync-all                                          |    2 +-
 41 files changed, 700 insertions(+), 736 deletions(-)