Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/6529337f804c8171b46ada0275f413f756e2cac9 >--------------------------------------------------------------- commit 6529337f804c8171b46ada0275f413f756e2cac9 Merge: 1466b0c... 4c35337... Author: Simon Peyton Jones <[email protected]> Date: Fri Sep 9 10:07:46 2011 +0100 Merge branch 'master' of http://darcs.haskell.org/ghc compiler/basicTypes/OccName.lhs | 2 +- compiler/deSugar/DsMeta.hs | 2 +- compiler/hsSyn/Convert.lhs | 2 +- compiler/hsSyn/HsDecls.lhs | 8 +- compiler/iface/BinIface.hs | 15 ++ compiler/iface/BuildTyCl.lhs | 7 +- compiler/iface/IfaceSyn.lhs | 36 +++- compiler/iface/MkIface.lhs | 13 +- compiler/iface/TcIface.lhs | 14 ++- compiler/parser/Parser.y.pp | 6 + compiler/parser/RdrHsSyn.lhs | 14 +- compiler/rename/RnSource.lhs | 14 +- compiler/specialise/SpecConstr.lhs | 6 +- compiler/typecheck/TcClassDcl.lhs | 2 +- compiler/typecheck/TcEnv.lhs | 4 +- compiler/typecheck/TcInstDcls.lhs | 329 +++-------------------------- compiler/typecheck/TcRnDriver.lhs | 12 +- compiler/typecheck/TcTyClsDecls.lhs | 390 ++++++++++++++++++++++++++++++++++- compiler/types/Class.lhs | 44 +++-- compiler/utils/Util.lhs | 11 +- docs/users_guide/glasgow_exts.xml | 16 ++- ghc.mk | 1 + packages | 2 +- 23 files changed, 592 insertions(+), 358 deletions(-) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
