Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/243523bae4033ab807d5fbc83c7a51edb6ebb19e >--------------------------------------------------------------- commit 243523bae4033ab807d5fbc83c7a51edb6ebb19e Merge: 9beb615... 1884f81... Author: Simon Peyton Jones <simo...@microsoft.com> Date: Wed Jan 2 08:36:09 2013 +0000 Merge branch 'master' of http://darcs.haskell.org/ghc compiler/coreSyn/CoreSubst.lhs | 2 +- compiler/coreSyn/CoreUnfold.lhs | 4 +- compiler/hsSyn/HsDecls.lhs | 44 +++++--- compiler/iface/MkIface.lhs | 7 +- compiler/iface/TcIface.lhs | 4 +- compiler/main/DynFlags.hs | 2 +- compiler/main/TidyPgm.lhs | 12 +-- compiler/prelude/PrelNames.lhs | 1 + compiler/typecheck/Inst.lhs | 112 ++++++++++----------- compiler/typecheck/TcDeriv.lhs | 30 +++--- compiler/typecheck/TcEnv.lhs | 2 +- compiler/typecheck/TcEvidence.lhs | 29 +++--- compiler/typecheck/TcGenGenerics.lhs | 23 ++--- compiler/typecheck/TcInstDcls.lhs | 44 +++++---- compiler/typecheck/TcInteract.lhs | 38 +++++++- compiler/typecheck/TcMType.lhs | 38 +++++-- compiler/typecheck/TcSimplify.lhs | 3 +- compiler/typecheck/TcSplice.lhs | 5 +- compiler/typecheck/TcTyClsDecls.lhs | 23 ++--- compiler/typecheck/TcType.lhs | 21 ++--- compiler/types/FunDeps.lhs | 12 +-- compiler/types/InstEnv.lhs | 136 +++++++++++++------------ docs/users_guide/glasgow_exts.xml | 180 ---------------------------------- 23 files changed, 317 insertions(+), 455 deletions(-) _______________________________________________ Cvs-ghc mailing list Cvs-ghc@haskell.org http://www.haskell.org/mailman/listinfo/cvs-ghc