Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/4716851af175ec9e63b92a616693b8e29be1d0ab >--------------------------------------------------------------- commit 4716851af175ec9e63b92a616693b8e29be1d0ab Merge: cfcddaa... 541781f... Author: Simon Peyton Jones <[email protected]> Date: Fri Dec 23 17:57:13 2011 +0000 Merge branch 'master' of http://darcs.haskell.org/ghc compiler/deSugar/DsBinds.lhs | 4 +- compiler/main/GHC.hs | 26 +++-- compiler/main/HscMain.hs | 123 +++++++++++-------- compiler/rename/RnNames.lhs | 16 ++- compiler/typecheck/TcCanonical.lhs | 230 ++++++++++++------------------------ compiler/typecheck/TcErrors.lhs | 9 +- compiler/typecheck/TcEvidence.lhs | 45 ++++++-- compiler/typecheck/TcHsSyn.lhs | 39 +++++-- compiler/typecheck/TcInteract.lhs | 138 +++++++++++++++++++-- compiler/typecheck/TcRnMonad.lhs | 11 ++- compiler/typecheck/TcRnTypes.lhs | 5 + compiler/typecheck/TcSMonad.lhs | 94 ++------------- compiler/types/TypeRep.lhs | 2 +- ghc/InteractiveUI.hs | 58 +++++++--- 14 files changed, 438 insertions(+), 362 deletions(-) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
