Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/5305c38484cccf341e761e05614d414cd77dfec9 >--------------------------------------------------------------- commit 5305c38484cccf341e761e05614d414cd77dfec9 Merge: 2c618c2... ce2ea82... Author: unknown <[email protected]> Date: Thu Apr 14 16:15:10 2011 +0100 Merge branch 'ghc-generics' of http://darcs.haskell.org/ghc compiler/basicTypes/OccName.lhs | 26 ++- compiler/deSugar/DsMeta.hs | 1 + compiler/hsSyn/HsBinds.lhs | 28 ++- compiler/hsSyn/HsUtils.lhs | 2 +- compiler/iface/BuildTyCl.lhs | 8 +- compiler/iface/MkIface.lhs | 6 +- compiler/main/HscStats.lhs | 22 +- compiler/parser/Lexer.x | 4 +- compiler/parser/Parser.y.pp | 11 +- compiler/parser/RdrHsSyn.lhs | 13 +- compiler/prelude/PrelNames.lhs | 161 +++++++++++- compiler/rename/RnBinds.lhs | 24 ++- compiler/rename/RnHsSyn.lhs | 9 +- compiler/rename/RnSource.lhs | 11 - compiler/typecheck/TcClassDcl.lhs | 222 +++++++--------- compiler/typecheck/TcDeriv.lhs | 165 +++++++++++- compiler/typecheck/TcEnv.lhs | 6 +- compiler/typecheck/TcGenDeriv.lhs | 2 +- compiler/typecheck/TcInstDcls.lhs | 21 ++- compiler/typecheck/TcRnDriver.lhs | 9 +- compiler/typecheck/TcTyClsDecls.lhs | 23 ++- compiler/types/Class.lhs | 10 +- compiler/types/Generics.lhs | 502 ++++++++++++++++++++++++++--------- compiler/types/TyCon.lhs | 7 +- compiler/types/Type.lhs | 6 +- 25 files changed, 941 insertions(+), 358 deletions(-) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
