Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/b643fe08b3c083fd23889ed9413a01928779a9e8 >--------------------------------------------------------------- commit b643fe08b3c083fd23889ed9413a01928779a9e8 Merge: 9f611cc... 5bfd893... Author: Ian Lynagh <[email protected]> Date: Thu Apr 26 19:45:11 2012 +0100 Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc compiler/deSugar/DsMeta.hs | 2 +- compiler/ghci/RtClosureInspect.hs | 4 +- compiler/iface/LoadIface.lhs | 2 +- compiler/main/GHC.hs | 20 ++++ compiler/main/HscMain.hs | 6 + compiler/main/HscTypes.lhs | 7 +- compiler/prelude/PrelNames.lhs | 18 +++- compiler/rename/RnEnv.lhs | 192 ++++++++++++++++++++++++++++------ compiler/rename/RnNames.lhs | 98 +---------------- compiler/rename/RnSource.lhs | 4 +- compiler/simplCore/FloatIn.lhs | 16 ++- compiler/typecheck/FamInst.lhs | 11 +- compiler/typecheck/TcGenGenerics.lhs | 22 ++-- compiler/typecheck/TcHsSyn.lhs | 90 ++++++++++------- compiler/typecheck/TcHsType.lhs | 112 +++++++++----------- compiler/typecheck/TcInstDcls.lhs | 23 ++++- compiler/typecheck/TcMType.lhs | 79 +++++--------- compiler/typecheck/TcRnDriver.lhs | 82 +++++++++++---- compiler/typecheck/TcRnMonad.lhs | 3 + compiler/typecheck/TcTyClsDecls.lhs | 122 ++++++++++++--------- compiler/typecheck/TcUnify.lhs | 67 +++++++------ compiler/types/Coercion.lhs | 3 +- compiler/vectorise/Vectorise.hs | 2 +- compiler/vectorise/Vectorise/Exp.hs | 35 ++---- ghc.mk | 2 +- ghc/InteractiveUI.hs | 11 +- 26 files changed, 601 insertions(+), 432 deletions(-) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
