Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/3bb66cc52ced70cd7081fb8a2e32a1005528d5a0 >--------------------------------------------------------------- commit 3bb66cc52ced70cd7081fb8a2e32a1005528d5a0 Merge: 1bf40a4... e2e0785... Author: Simon Peyton Jones <[email protected]> Date: Mon Jun 13 14:39:43 2011 +0100 Merge branch 'master' of http://darcs.haskell.org/ghc compiler/coreSyn/CoreFVs.lhs | 5 +- compiler/coreSyn/CoreSubst.lhs | 5 +- compiler/coreSyn/CoreSyn.lhs | 10 +- compiler/coreSyn/PprCore.lhs | 24 +++- compiler/deSugar/Desugar.lhs | 13 +- compiler/hsSyn/HsDecls.lhs | 23 ++- compiler/parser/Lexer.x | 5 +- compiler/parser/Parser.y.pp | 70 +++++----- compiler/rename/RnSource.lhs | 4 + compiler/simplCore/SimplCore.lhs | 19 ++- compiler/typecheck/TcBinds.lhs | 7 +- compiler/typecheck/TcHsSyn.lhs | 4 + compiler/vectorise/Vectorise.hs | 173 ++++++++++++--------- compiler/vectorise/Vectorise/Builtins/Prelude.hs | 80 +++++----- compiler/vectorise/Vectorise/Env.hs | 6 + compiler/vectorise/Vectorise/Monad.hs | 3 +- compiler/vectorise/Vectorise/Monad/Global.hs | 62 +++++---- 17 files changed, 301 insertions(+), 212 deletions(-) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
