Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/30b5ba9b86610f38da704d6b7426cd776e3fbbe4 >--------------------------------------------------------------- commit 30b5ba9b86610f38da704d6b7426cd776e3fbbe4 Merge: c7a8941... f75f240... Author: Ian Lynagh <[email protected]> Date: Wed Jun 27 21:51:29 2012 +0100 Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc compiler/basicTypes/Id.lhs | 7 +- compiler/basicTypes/IdInfo.lhs | 12 ++- compiler/basicTypes/MkId.lhs | 20 +++- compiler/coreSyn/CoreFVs.lhs | 2 +- compiler/coreSyn/CoreSubst.lhs | 5 +- compiler/coreSyn/CoreSyn.lhs | 18 +++- compiler/coreSyn/CoreTidy.lhs | 4 +- compiler/coreSyn/CoreUnfold.lhs | 2 +- compiler/coreSyn/CoreUtils.lhs | 2 +- compiler/coreSyn/PprCore.lhs | 4 + compiler/iface/BinIface.hs | 13 ++- compiler/iface/IfaceSyn.lhs | 10 +- compiler/iface/MkIface.lhs | 4 +- compiler/iface/TcIface.lhs | 8 +- compiler/main/TidyPgm.lhs | 2 +- compiler/simplCore/Simplify.lhs | 2 +- compiler/typecheck/TcErrors.lhs | 3 + compiler/typecheck/TcInstDcls.lhs | 147 +++++++++++++-------- compiler/typecheck/TcSplice.lhs | 3 +- compiler/types/InstEnv.lhs | 11 ++- compiler/vectorise/Vectorise/Generic/PADict.hs | 39 ++++-- compiler/vectorise/Vectorise/Generic/PAMethods.hs | 11 +-- compiler/vectorise/Vectorise/Monad/InstEnv.hs | 9 +- compiler/vectorise/Vectorise/Utils/Base.hs | 19 +++- compiler/vectorise/Vectorise/Utils/PADict.hs | 51 +++++-- 25 files changed, 280 insertions(+), 128 deletions(-) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
