[commit: ghc] master: Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc (ec0d62c)
Simon Peyton Jones <[email protected]>
| Newsgroups | gmane.comp.lang.haskell.cvs.ghc |
|---|---|
| Message-ID | <[email protected]> |
Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master http://hackage.haskell.org/trac/ghc/changeset/ec0d62c59755e232be7b91eea713d35ccaa145ee >--------------------------------------------------------------- commit ec0d62c59755e232be7b91eea713d35ccaa145ee Merge: 3406c06... 66ec09b... Author: Simon Peyton Jones <[email protected]> Date: Fri Oct 26 11:14:02 2012 +0100 Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc Conflicts: compiler/coreSyn/CoreLint.lhs compiler/basicTypes/DataCon.lhs | 69 ++++---- compiler/basicTypes/OccName.lhs | 55 +++++-- compiler/coreSyn/CoreLint.lhs | 3 +- compiler/coreSyn/CoreUtils.lhs | 40 ++++-- compiler/deSugar/DsMeta.hs | 132 ++++++++-------- compiler/hsSyn/HsBinds.lhs | 16 -- compiler/iface/TcIface.lhs | 4 +- compiler/main/DynFlags.hs | 11 +- compiler/prelude/PrelRules.lhs | 2 +- compiler/prelude/TysWiredIn.lhs | 6 +- compiler/rename/RnBinds.lhs | 49 ++++-- compiler/simplCore/OccurAnal.lhs | 2 +- compiler/simplCore/Simplify.lhs | 2 +- compiler/typecheck/Inst.lhs | 30 ++-- compiler/typecheck/TcCanonical.lhs | 78 +--------- compiler/typecheck/TcErrors.lhs | 28 ++-- compiler/typecheck/TcExpr.lhs | 3 +- compiler/typecheck/TcHsType.lhs | 155 +++++++++++-------- compiler/typecheck/TcInteract.lhs | 80 +++++++--- compiler/typecheck/TcMType.lhs | 13 +-- compiler/typecheck/TcRnDriver.lhs | 10 +- compiler/typecheck/TcRnTypes.lhs | 16 ++- compiler/typecheck/TcSMonad.lhs | 4 +- compiler/typecheck/TcSimplify.lhs | 293 ++++++++++++++++++---------------- compiler/typecheck/TcSplice.lhs | 16 +- compiler/typecheck/TcSplice.lhs-boot | 2 +- compiler/typecheck/TcTyClsDecls.lhs | 34 +++-- compiler/typecheck/TcType.lhs | 108 ++++++++++--- compiler/typecheck/TcUnify.lhs | 146 ++++++++++-------- compiler/types/Kind.lhs | 2 +- compiler/types/TyCon.lhs | 2 +- mk/validate-settings.mk | 10 ++ 32 files changed, 785 insertions(+), 636 deletions(-)