Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : ghc-kinds
http://hackage.haskell.org/trac/ghc/changeset/62a5be767c0fd5c7a30f95ad6acad21b30ab794d >--------------------------------------------------------------- commit 62a5be767c0fd5c7a30f95ad6acad21b30ab794d Merge: 72389e7... e944915... Author: Jose Pedro Magalhaes <[email protected]> Date: Mon Nov 14 14:49:54 2011 +0000 Merge remote branch 'origin/master' into ghc-kinds compiler/deSugar/DsMonad.lhs | 20 +++--- compiler/iface/FlagChecker.hs | 10 ++- compiler/iface/LoadIface.lhs | 2 +- compiler/iface/TcIface.lhs | 41 ++++++++--- compiler/iface/TcIface.lhs-boot | 4 +- compiler/main/DriverPipeline.hs | 8 ++- compiler/typecheck/TcCanonical.lhs | 31 ++++++--- compiler/typecheck/TcMType.lhs | 89 +++++++++++------------- compiler/typecheck/TcPat.lhs | 7 +-- compiler/typecheck/TcRules.lhs | 4 - compiler/typecheck/TcSMonad.lhs | 6 +- compiler/vectorise/Vectorise/Env.hs | 34 ++++++--- compiler/vectorise/Vectorise/Exp.hs | 10 --- compiler/vectorise/Vectorise/Monad.hs | 3 +- compiler/vectorise/Vectorise/Monad/Naming.hs | 4 +- compiler/vectorise/Vectorise/Type/Classify.hs | 22 +++--- compiler/vectorise/Vectorise/Type/Env.hs | 14 +++- compiler/vectorise/Vectorise/Type/TyConDecl.hs | 33 +++++---- ghc.mk | 11 ++-- mk/validate-settings.mk | 3 +- rts/win32/Ticker.c | 3 +- 21 files changed, 198 insertions(+), 161 deletions(-) diff --cc compiler/iface/TcIface.lhs index 125b885,d17b90d..d17b90d mode 100755,100644..100755 --- a/compiler/iface/TcIface.lhs +++ b/compiler/iface/TcIface.lhs diff --cc compiler/parser/Parser.y.pp index cbc775d,b390009..cbc775d mode 100755,100644..100644 --- a/compiler/parser/Parser.y.pp +++ b/compiler/parser/Parser.y.pp diff --cc compiler/typecheck/TcCanonical.lhs index 8cec0b5,dac7d88..dac7d88 mode 100755,100644..100755 --- a/compiler/typecheck/TcCanonical.lhs +++ b/compiler/typecheck/TcCanonical.lhs diff --cc compiler/typecheck/TcMType.lhs index 3f88cbb,29ec51c..29ec51c mode 100755,100644..100755 --- a/compiler/typecheck/TcMType.lhs +++ b/compiler/typecheck/TcMType.lhs diff --cc compiler/typecheck/TcRules.lhs index 40e0502,f4dafcb..f4dafcb mode 100755,100644..100755 --- a/compiler/typecheck/TcRules.lhs +++ b/compiler/typecheck/TcRules.lhs diff --cc compiler/typecheck/TcSMonad.lhs index 3114ba4,553d461..553d461 mode 100755,100644..100755 --- a/compiler/typecheck/TcSMonad.lhs +++ b/compiler/typecheck/TcSMonad.lhs diff --cc compiler/vectorise/Vectorise/Monad.hs index bd53186,6fbdb4e..6fbdb4e mode 100755,100644..100755 --- a/compiler/vectorise/Vectorise/Monad.hs +++ b/compiler/vectorise/Vectorise/Monad.hs _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
