Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/7dffc188e7351c142d05235dc87d77f16454066e >--------------------------------------------------------------- commit 7dffc188e7351c142d05235dc87d77f16454066e Merge: 97db0ed... 03d360f... Author: Simon Peyton Jones <simo...@microsoft.com> Date: Tue Jan 8 08:27:11 2013 +0000 Merge remote branch 'origin/master' compiler/deSugar/Coverage.lhs | 12 +- compiler/deSugar/DsArrows.lhs | 13 +- compiler/deSugar/DsExpr.lhs | 21 +-- compiler/deSugar/DsGRHSs.lhs | 14 +- compiler/deSugar/DsMeta.hs | 10 +- compiler/deSugar/DsUtils.lhs | 2 +- compiler/deSugar/Match.lhs | 55 +++++-- compiler/deSugar/MatchCon.lhs | 3 +- compiler/deSugar/MatchLit.lhs | 2 +- compiler/ghc.cabal.in | 3 +- compiler/hsSyn/HsExpr.lhs | 28 ++-- compiler/hsSyn/HsUtils.lhs | 2 +- compiler/iface/TcIface.lhs | 3 +- compiler/llvmGen/LlvmCodeGen/CodeGen.hs | 8 +- compiler/main/DynFlags.hs | 4 +- compiler/nativeGen/AsmCodeGen.lhs | 10 +- compiler/nativeGen/PPC/Instr.hs | 7 +- compiler/nativeGen/X86/Instr.hs | 124 ++++++++++---- compiler/parser/Parser.y.pp | 2 + compiler/parser/RdrHsSyn.lhs | 8 +- compiler/prelude/PrelNames.lhs | 9 +- compiler/rename/RnBinds.lhs | 22 ++- compiler/rename/RnExpr.lhs | 2 +- compiler/rename/RnTypes.lhs | 2 +- compiler/simplCore/Simplify.lhs | 36 +++-- compiler/typecheck/FamInst.lhs | 115 +++++++------ compiler/typecheck/TcArrows.lhs | 9 +- compiler/typecheck/TcBinds.lhs | 4 +- compiler/typecheck/TcDeriv.lhs | 4 +- compiler/typecheck/TcGenDeriv.lhs | 196 +++++++++++++-------- compiler/typecheck/TcGenGenerics.lhs | 5 +- compiler/typecheck/TcHsSyn.lhs | 7 +- compiler/typecheck/TcInstDcls.lhs | 144 ++++++++++------ compiler/typecheck/TcMType.lhs | 16 ++- compiler/typecheck/TcMatches.lhs | 14 +- compiler/typecheck/TcPat.lhs | 3 +- compiler/types/CoAxiom.lhs | 40 +++- compiler/types/Coercion.lhs | 5 +- compiler/types/FamInstEnv.lhs | 186 ++++++++++++-------- compiler/utils/MonadUtils.hs | 32 +--- compiler/vectorise/Vectorise/Generic/PAMethods.hs | 4 +- compiler/vectorise/Vectorise/Generic/PData.hs | 8 +- docs/users_guide/glasgow_exts.xml | 38 ++++ ghc.mk | 22 ++-- ghc/GhciMonad.hs | 22 +-- mk/config.mk.in | 2 + mk/validate-settings.mk | 3 + rts/ghc.mk | 4 + sync-all | 10 +- validate | 9 +- 50 files changed, 806 insertions(+), 498 deletions(-) _______________________________________________ Cvs-ghc mailing list Cvs-ghc@haskell.org http://www.haskell.org/mailman/listinfo/cvs-ghc
