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

On branch  : ghc-generics

http://hackage.haskell.org/trac/ghc/changeset/858cdd2f2725c75d35dabf7411dbafa932d84095

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

commit 858cdd2f2725c75d35dabf7411dbafa932d84095
Merge: fbf4bc1... 0d3a6d5...
Author: Simon Peyton Jones <[email protected]>
Date:   Thu May 5 09:00:27 2011 +0100

    Merge branch 'ghc-generics' of http://darcs.haskell.org/ghc into 
ghc-generics

 Makefile                            |    8 +-
 aclocal.m4                          |   12 -
 compiler/basicTypes/Var.lhs         |    3 +-
 compiler/deSugar/Check.lhs          |   21 +-
 compiler/deSugar/Coverage.lhs       |   83 +++---
 compiler/deSugar/DsArrows.lhs       |   16 +-
 compiler/deSugar/DsExpr.lhs         |  215 +++----------
 compiler/deSugar/DsGRHSs.lhs        |    4 +-
 compiler/deSugar/DsListComp.lhs     |  535 +++++++++++++++++++++----------
 compiler/deSugar/DsMeta.hs          |   22 +-
 compiler/deSugar/Match.lhs          |    2 +-
 compiler/deSugar/MatchLit.lhs       |   14 +-
 compiler/hsSyn/Convert.lhs          |   15 +-
 compiler/hsSyn/HsBinds.lhs          |    2 +-
 compiler/hsSyn/HsExpr.lhs           |  342 +++++++++++++-------
 compiler/hsSyn/HsLit.lhs            |   18 +-
 compiler/hsSyn/HsPat.lhs            |   13 +-
 compiler/hsSyn/HsTypes.lhs          |    3 -
 compiler/hsSyn/HsUtils.lhs          |   70 +++--
 compiler/iface/IfaceSyn.lhs         |  443 +++++++++++++-------------
 compiler/llvmGen/LlvmCodeGen/Ppr.hs |   31 +--
 compiler/llvmGen/LlvmMangler.hs     |   68 +++--
 compiler/main/DriverPhases.hs       |    4 -
 compiler/main/DriverPipeline.hs     |   14 +-
 compiler/main/DynFlags.hs           |   15 +-
 compiler/main/GhcMonad.hs           |    4 +-
 compiler/main/HscMain.lhs           |    2 +-
 compiler/main/SysTools.lhs          |    2 +-
 compiler/parser/Lexer.x             |    1 +
 compiler/parser/Parser.y.pp         |   22 +-
 compiler/parser/RdrHsSyn.lhs        |   52 +--
 compiler/prelude/PrelNames.lhs      |   36 ++-
 compiler/rename/RnBinds.lhs         |   36 +--
 compiler/rename/RnExpr.lhs          |  440 +++++++++++++++++---------
 compiler/rename/RnHsSyn.lhs         |   26 +--
 compiler/rename/RnPat.lhs           |    4 -
 compiler/rename/RnSource.lhs        |   14 +-
 compiler/rename/RnTypes.lhs         |    7 -
 compiler/typecheck/TcArrows.lhs     |   93 +++++--
 compiler/typecheck/TcDeriv.lhs      |    2 +-
 compiler/typecheck/TcExpr.lhs       |   28 ++-
 compiler/typecheck/TcGenDeriv.lhs   |   15 +-
 compiler/typecheck/TcHsSyn.lhs      |   56 ++--
 compiler/typecheck/TcHsType.lhs     |    9 -
 compiler/typecheck/TcMatches.lhs    |  603 ++++++++++++++++++++++++-----------
 compiler/typecheck/TcPat.lhs        |   32 +-
 compiler/typecheck/TcRnDriver.lhs   |   51 ++--
 compiler/typecheck/TcRnMonad.lhs    |    5 -
 compiler/typecheck/TcRnTypes.lhs    |    2 +
 compiler/typecheck/TcSMonad.lhs     |    6 +-
 compiler/typecheck/TcTyClsDecls.lhs |   15 -
 compiler/typecheck/TcUnify.lhs      |    2 +-
 configure.ac                        |    2 -
 docs/users_guide/flags.xml          |    6 +
 docs/users_guide/glasgow_exts.xml   |  228 +++++++++++++
 ghc.spec.in                         |    1 -
 mk/config.mk.in                     |    2 -
 utils/Makefile                      |    2 +-
 utils/ghctags/Main.hs               |    1 -
 59 files changed, 2291 insertions(+), 1489 deletions(-)




_______________________________________________
Cvs-ghc mailing list
[email protected]
http://www.haskell.org/mailman/listinfo/cvs-ghc

Reply via email to