Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/ed63eae050ef8eebb2140719361f95361e065228 >--------------------------------------------------------------- commit ed63eae050ef8eebb2140719361f95361e065228 Merge: 17e9e85... 09015be... Author: Simon Peyton Jones <[email protected]> Date: Fri Nov 11 09:20:40 2011 +0000 Merge branch 'master' of http://darcs.haskell.org/ghc compiler/basicTypes/MkId.lhs | 2 +- compiler/basicTypes/OccName.lhs | 35 ++ compiler/basicTypes/RdrName.lhs | 10 +- compiler/basicTypes/Var.lhs | 49 ++- compiler/coreSyn/CoreLint.lhs | 221 +++++---- compiler/coreSyn/CoreUtils.lhs | 26 +- compiler/coreSyn/MkCore.lhs | 4 +- compiler/coreSyn/MkExternalCore.lhs | 1 + compiler/coreSyn/PprCore.lhs | 1 + compiler/deSugar/Desugar.lhs | 2 - compiler/deSugar/DsMeta.hs | 16 +- compiler/ghci/RtClosureInspect.hs | 3 +- compiler/hsSyn/Convert.lhs | 22 +- compiler/hsSyn/HsBinds.lhs | 7 +- compiler/hsSyn/HsDecls.lhs | 33 +- compiler/hsSyn/HsExpr.lhs | 10 +- compiler/hsSyn/HsExpr.lhs-boot | 10 +- compiler/hsSyn/HsLit.lhs | 23 +- compiler/hsSyn/HsPat.lhs-boot | 5 +- compiler/hsSyn/HsTypes.lhs | 171 +++++-- compiler/iface/BinIface.hs | 99 ++++- compiler/iface/BuildTyCl.lhs | 26 +- compiler/iface/IfaceSyn.lhs | 12 +- compiler/iface/IfaceType.lhs | 97 +++-- compiler/iface/MkIface.lhs | 2 +- compiler/iface/TcIface.lhs | 54 ++- compiler/main/DynFlags.hs | 6 +- compiler/main/GHC.hs | 4 +- compiler/main/HscMain.hs | 6 +- compiler/main/HscTypes.lhs | 8 +- compiler/main/TidyPgm.lhs | 12 +- compiler/parser/Lexer.x | 15 +- compiler/parser/Parser.y.pp | 105 +++-- compiler/parser/ParserCore.y | 16 +- compiler/parser/RdrHsSyn.lhs | 32 +- compiler/prelude/PrelNames.lhs | 26 +- compiler/prelude/TysPrim.lhs | 134 +++--- compiler/prelude/TysWiredIn.lhs | 15 +- compiler/prelude/primops.txt.pp | 9 +- compiler/rename/RnBinds.lhs | 2 +- compiler/rename/RnEnv.lhs | 152 ++++-- compiler/rename/RnExpr.lhs | 25 +- compiler/rename/RnHsSyn.lhs | 31 +- compiler/rename/RnPat.lhs | 5 +- compiler/rename/RnSource.lhs | 103 +++-- compiler/rename/RnTypes.lhs | 187 +++++--- compiler/simplCore/SetLevels.lhs | 22 +- compiler/simplCore/SimplUtils.lhs | 30 +- compiler/simplCore/Simplify.lhs | 9 +- compiler/typecheck/FamInst.lhs | 1 + compiler/typecheck/TcArrows.lhs | 9 +- compiler/typecheck/TcBinds.lhs | 1 + compiler/typecheck/TcCanonical.lhs | 47 +- compiler/typecheck/TcClassDcl.lhs | 4 +- compiler/typecheck/TcDeriv.lhs | 9 +- compiler/typecheck/TcEnv.lhs | 60 ++- compiler/typecheck/TcExpr.lhs | 23 +- compiler/typecheck/TcHsSyn.lhs | 252 +++++++---- compiler/typecheck/TcHsType.lhs | 559 +++++++++++++++++---- compiler/typecheck/TcInstDcls.lhs | 82 ++-- compiler/typecheck/TcInteract.lhs | 33 +- compiler/typecheck/TcMType.lhs | 455 +++++++++++------- compiler/typecheck/TcPat.lhs | 2 + compiler/typecheck/TcRnDriver.lhs | 22 +- compiler/typecheck/TcRnMonad.lhs | 1 - compiler/typecheck/TcRnTypes.lhs | 35 ++- compiler/typecheck/TcRules.lhs | 9 +- compiler/typecheck/TcSMonad.lhs | 18 +- compiler/typecheck/TcSimplify.lhs | 32 +- compiler/typecheck/TcSplice.lhs | 17 +- compiler/typecheck/TcTyClsDecls.lhs | 879 ++++++++++++++++++++------------- compiler/typecheck/TcType.lhs | 59 ++- compiler/typecheck/TcUnify.lhs | 383 ++++++++------- compiler/typecheck/TcUnify.lhs-boot | 12 +- compiler/types/Class.lhs | 28 +- compiler/types/Coercion.lhs | 81 ++-- compiler/types/FamInstEnv.lhs | 88 +--- compiler/types/Kind.lhs | 239 +++++++-- compiler/types/TyCon.lhs | 125 ++++-- compiler/types/Type.lhs | 147 ++++-- compiler/types/Type.lhs-boot | 3 + compiler/types/TypeRep.lhs | 63 ++- compiler/types/TypeRep.lhs-boot | 1 + compiler/types/Unify.lhs | 57 ++- compiler/utils/Outputable.lhs | 5 +- compiler/utils/Pretty.lhs | 9 +- compiler/vectorise/Vectorise/Monad.hs | 2 +- 87 files changed, 3768 insertions(+), 1979 deletions(-) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
