Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/c1c2c25355bc462e521b2c5fb41ac79307da22ff >--------------------------------------------------------------- commit c1c2c25355bc462e521b2c5fb41ac79307da22ff Merge: eced7db... 3bb66cc... Author: Simon Peyton Jones <[email protected]> Date: Mon Jun 13 15:08:15 2011 +0100 Merge branch 'master' of http://darcs.haskell.org/ghc boot | 2 +- 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 | 30 +++- 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 +++++---- mk/config.mk.in | 4 +- packages | 96 ++++++------ rules/extra-packages.mk | 2 +- sync-all | 5 +- 22 files changed, 367 insertions(+), 278 deletions(-) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
