Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/1091ebc9aaf430a0ed69f4ebd6190e31c3154e90 >--------------------------------------------------------------- commit 1091ebc9aaf430a0ed69f4ebd6190e31c3154e90 Merge: 3664c19... 97ce7b5... Author: Simon Peyton Jones <[email protected]> Date: Thu May 26 17:22:02 2011 +0100 Merge branch 'master' of http://darcs.haskell.org/ghc compiler/basicTypes/MkId.lhs | 7 +- compiler/basicTypes/OccName.lhs | 26 +- compiler/deSugar/Check.lhs | 2 +- compiler/deSugar/DsArrows.lhs | 1 - compiler/deSugar/DsMeta.hs | 5 +- compiler/hsSyn/HsBinds.lhs | 28 +- compiler/hsSyn/HsDecls.lhs | 2 +- compiler/hsSyn/HsPat.lhs | 9 - compiler/hsSyn/HsTypes.lhs | 3 - compiler/hsSyn/HsUtils.lhs | 4 +- compiler/iface/BinIface.hs | 6 +- compiler/iface/BuildTyCl.lhs | 18 +- compiler/iface/IfaceSyn.lhs | 16 +- compiler/iface/MkIface.lhs | 7 +- compiler/iface/TcIface.lhs | 3 +- compiler/main/DynFlags.hs | 10 +- compiler/main/HscStats.lhs | 22 +- compiler/main/HscTypes.lhs | 41 +- compiler/parser/Lexer.x | 16 +- compiler/parser/Parser.y.pp | 18 +- compiler/parser/RdrHsSyn.lhs | 19 +- compiler/prelude/PrelNames.lhs | 172 +++++- compiler/prelude/TysWiredIn.lhs | 5 +- compiler/rename/RnBinds.lhs | 58 +- compiler/rename/RnHsSyn.lhs | 35 +- compiler/rename/RnPat.lhs | 4 - compiler/rename/RnSource.lhs | 25 +- compiler/rename/RnTypes.lhs | 7 - compiler/typecheck/FamInst.lhs | 41 +- compiler/typecheck/TcClassDcl.lhs | 369 +++-------- compiler/typecheck/TcDeriv.lhs | 345 ++++++++-- compiler/typecheck/TcEnv.lhs | 6 +- compiler/typecheck/TcGenDeriv.lhs | 2 +- compiler/typecheck/TcHsType.lhs | 9 - compiler/typecheck/TcInstDcls.lhs | 65 +- compiler/typecheck/TcPat.lhs | 6 - compiler/typecheck/TcRnDriver.lhs | 22 +- compiler/typecheck/TcTyClsDecls.lhs | 66 +- compiler/typecheck/TcTyDecls.lhs | 15 +- compiler/types/Class.lhs | 10 +- compiler/types/FamInstEnv.lhs | 7 +- compiler/types/Generics.lhs | 842 ++++++++++-------------- compiler/types/TyCon.lhs | 35 +- compiler/types/Type.lhs | 6 +- compiler/vectorise/Vectorise/Type/PData.hs | 1 - compiler/vectorise/Vectorise/Type/TyConDecl.hs | 1 - docs/users_guide/flags.xml | 16 +- docs/users_guide/glasgow_exts.xml | 393 ++++++------ mk/build.mk.sample | 2 +- mk/config.mk.in | 7 +- mk/validate-settings.mk | 3 +- utils/ghctags/Main.hs | 1 - 52 files changed, 1378 insertions(+), 1461 deletions(-) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
