Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : ghc-kinds
http://hackage.haskell.org/trac/ghc/changeset/48aaf49cb1ce7463aff85d8e9ea1fcdf1af1f3bb >--------------------------------------------------------------- commit 48aaf49cb1ce7463aff85d8e9ea1fcdf1af1f3bb Merge: e75c36d... 7ca27dc... Author: Julien Cretin <g...@ia0.eu> Date: Mon Sep 12 11:45:01 2011 +0200 Merge branch 'master' into step2 compiler/basicTypes/Literal.lhs | 316 +++++++------- compiler/codeGen/CgUtils.hs | 598 ++++++++++++------------ compiler/typecheck/TcInteract.lhs | 18 +- compiler/typecheck/TcTyClsDecls.lhs | 4 +- compiler/vectorise/Vectorise.hs | 18 +- compiler/vectorise/Vectorise/Convert.hs | 81 ++-- compiler/vectorise/Vectorise/Exp.hs | 16 +- compiler/vectorise/Vectorise/Monad.hs | 8 +- compiler/vectorise/Vectorise/Monad/Base.hs | 190 +++++--- compiler/vectorise/Vectorise/Monad/InstEnv.hs | 27 +- compiler/vectorise/Vectorise/Utils/PADict.hs | 6 +- 11 files changed, 692 insertions(+), 590 deletions(-) _______________________________________________ Cvs-ghc mailing list Cvs-ghc@haskell.org http://www.haskell.org/mailman/listinfo/cvs-ghc
