Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/4c29dcb6ed80f5397b7b52c2e70341f7ccf344dc >--------------------------------------------------------------- commit 4c29dcb6ed80f5397b7b52c2e70341f7ccf344dc Merge: 1bc8014... 6f4a073... Author: Simon Peyton Jones <simo...@microsoft.com> Date: Fri Feb 17 14:01:41 2012 +0000 Merge branch 'master' of http://darcs.haskell.org/ghc compiler/coreSyn/CoreLint.lhs | 5 +- compiler/deSugar/DsForeign.lhs | 39 ++- compiler/hsSyn/Convert.lhs | 16 +- compiler/hsSyn/HsDecls.lhs | 2 + compiler/iface/BinIface.hs | 12 +- compiler/iface/BuildTyCl.lhs | 11 +- compiler/iface/IfaceSyn.lhs | 2 + compiler/iface/MkIface.lhs | 2 + compiler/iface/TcIface.lhs | 6 +- compiler/parser/Lexer.x | 4 +- compiler/parser/Parser.y.pp | 62 ++-- compiler/parser/RdrHsSyn.lhs | 11 +- compiler/prelude/ForeignCall.lhs | 13 + compiler/prelude/TysWiredIn.lhs | 34 +- compiler/rename/RnSource.lhs | 12 +- compiler/typecheck/TcGenGenerics.lhs | 2 +- compiler/typecheck/TcInstDcls.lhs | 5 +- compiler/typecheck/TcTyClsDecls.lhs | 13 +- compiler/types/TyCon.lhs | 596 ++++++++++++------------ compiler/vectorise/Vectorise/Generic/PData.hs | 1 + compiler/vectorise/Vectorise/Type/Env.hs | 2 +- compiler/vectorise/Vectorise/Type/TyConDecl.hs | 1 + ghc/GhciMonad.hs | 5 - 23 files changed, 473 insertions(+), 383 deletions(-) _______________________________________________ Cvs-ghc mailing list Cvs-ghc@haskell.org http://www.haskell.org/mailman/listinfo/cvs-ghc
