[commit: ghc] master: Merge branch 'master' of http://darcs.haskell.org/ghc (fd6587b)
Simon Peyton Jones
simonpj at microsoft.com
Thu May 12 13:59:08 CEST 2011
Repository : ssh://darcs.haskell.org//srv/darcs/ghc
On branch : master
http://hackage.haskell.org/trac/ghc/changeset/fd6587b68ad5aa4b6202066b598aec234220bae0
>---------------------------------------------------------------
commit fd6587b68ad5aa4b6202066b598aec234220bae0
Merge: 10ffbfd... c8c2f6b...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date: Thu May 12 11:22:50 2011 +0100
Merge branch 'master' of http://darcs.haskell.org/ghc
compiler/basicTypes/DataCon.lhs | 88 +-
compiler/basicTypes/Id.lhs | 39 +-
compiler/basicTypes/IdInfo.lhs | 5 +-
compiler/basicTypes/IdInfo.lhs-boot | 2 +
compiler/basicTypes/MkId.lhs | 121 +-
compiler/basicTypes/Var.lhs | 87 +-
compiler/basicTypes/VarEnv.lhs | 3 +-
compiler/basicTypes/VarSet.lhs | 6 +-
compiler/cmm/CmmCPS.hs | 1 +
compiler/coreSyn/CoreArity.lhs | 42 +-
compiler/coreSyn/CoreFVs.lhs | 24 +-
compiler/coreSyn/CoreLint.lhs | 438 +++---
compiler/coreSyn/CorePrep.lhs | 37 +-
compiler/coreSyn/CoreSubst.lhs | 255 ++--
compiler/coreSyn/CoreSyn.lhs | 64 +-
compiler/coreSyn/CoreTidy.lhs | 9 +-
compiler/coreSyn/CoreUnfold.lhs | 44 +-
compiler/coreSyn/CoreUtils.lhs | 239 ++--
compiler/coreSyn/ExternalCore.lhs | 13 +-
compiler/coreSyn/MkCore.lhs | 10 +-
compiler/coreSyn/MkExternalCore.lhs | 54 +-
compiler/coreSyn/PprCore.lhs | 16 +-
compiler/coreSyn/PprExternalCore.lhs | 6 +-
compiler/deSugar/Check.lhs | 1 -
compiler/deSugar/Desugar.lhs | 2 +
compiler/deSugar/DsBinds.lhs | 26 +-
compiler/deSugar/DsCCall.lhs | 4 +-
compiler/deSugar/DsExpr.lhs | 28 +-
compiler/deSugar/DsForeign.lhs | 13 +-
compiler/deSugar/DsUtils.lhs | 20 +-
compiler/deSugar/Match.lhs | 14 +-
compiler/deSugar/MatchCon.lhs | 1 -
compiler/ghc.cabal.in | 2 +
compiler/ghci/ByteCodeGen.lhs | 31 +-
compiler/ghci/RtClosureInspect.hs | 281 ++--
compiler/hsSyn/HsBinds.lhs | 10 +-
compiler/hsSyn/HsPat.lhs | 4 +-
compiler/hsSyn/HsUtils.lhs | 32 +-
compiler/iface/BinIface.hs | 99 +-
compiler/iface/BuildTyCl.lhs | 20 +-
compiler/iface/IfaceSyn.lhs | 44 +-
compiler/iface/IfaceType.lhs | 111 +-
compiler/iface/MkIface.lhs | 37 +-
compiler/iface/TcIface.lhs | 77 +-
compiler/main/DynFlags.hs | 4 +-
compiler/main/GHC.hs | 7 +-
compiler/main/HscTypes.lhs | 27 +-
compiler/main/PprTyThing.hs | 10 +-
compiler/main/TidyPgm.lhs | 1 +
compiler/parser/ParserCore.y | 2 +-
compiler/prelude/PrelNames.lhs | 13 +-
compiler/prelude/PrelRules.lhs | 4 +-
compiler/prelude/TysPrim.lhs | 312 +++--
compiler/prelude/TysWiredIn.lhs | 29 +-
compiler/rename/RnNames.lhs | 2 +-
compiler/rename/RnTypes.lhs | 2 +-
compiler/simplCore/CSE.lhs | 2 +
compiler/simplCore/FloatIn.lhs | 19 +-
compiler/simplCore/FloatOut.lhs | 1 +
compiler/simplCore/LiberateCase.lhs | 1 +
compiler/simplCore/OccurAnal.lhs | 96 +-
compiler/simplCore/SAT.lhs | 23 +-
compiler/simplCore/SetLevels.lhs | 19 +-
compiler/simplCore/SimplEnv.lhs | 92 +-
compiler/simplCore/SimplUtils.lhs | 42 +-
compiler/simplCore/Simplify.lhs | 195 ++-
compiler/specialise/Rules.lhs | 30 +-
compiler/specialise/SpecConstr.lhs | 34 +-
compiler/specialise/Specialise.lhs | 7 +-
compiler/stgSyn/CoreToStg.lhs | 15 +-
compiler/stgSyn/StgSyn.lhs | 24 +-
compiler/stranal/DmdAnal.lhs | 33 +-
compiler/stranal/WorkWrap.lhs | 1 +
compiler/stranal/WwLib.lhs | 27 +-
compiler/typecheck/FamInst.lhs | 8 +-
compiler/typecheck/Inst.lhs | 10 +-
compiler/typecheck/TcArrows.lhs | 16 +-
compiler/typecheck/TcBinds.lhs | 2 +-
compiler/typecheck/TcCanonical.lhs | 190 +--
compiler/typecheck/TcDeriv.lhs | 10 +-
compiler/typecheck/TcEnv.lhs | 4 +-
compiler/typecheck/TcErrors.lhs | 14 +-
compiler/typecheck/TcExpr.lhs | 70 +-
compiler/typecheck/TcGenDeriv.lhs | 3 +-
compiler/typecheck/TcHsSyn.lhs | 34 +-
compiler/typecheck/TcHsType.lhs | 17 +-
compiler/typecheck/TcInstDcls.lhs | 233 +++-
compiler/typecheck/TcInteract.lhs | 106 +-
compiler/typecheck/TcMType.lhs | 47 +-
compiler/typecheck/TcMatches.lhs | 10 +-
compiler/typecheck/TcPat.lhs | 42 +-
compiler/typecheck/TcRnDriver.lhs | 48 +-
compiler/typecheck/TcRnMonad.lhs | 4 +-
compiler/typecheck/TcRnTypes.lhs | 7 +-
compiler/typecheck/TcRules.lhs | 1 -
compiler/typecheck/TcSMonad.lhs | 8 +-
compiler/typecheck/TcSimplify.lhs | 7 +-
compiler/typecheck/TcSplice.lhs | 21 +-
compiler/typecheck/TcTyClsDecls.lhs | 264 +---
compiler/typecheck/TcTyDecls.lhs | 2 +-
compiler/typecheck/TcType.lhs | 321 ++---
compiler/typecheck/TcUnify.lhs | 101 +-
compiler/typecheck/TcUnify.lhs-boot | 4 +-
compiler/types/Coercion.lhs | 1553 ++++++++++++--------
compiler/types/FamInstEnv.lhs | 81 +-
compiler/types/FunDeps.lhs | 6 +-
compiler/types/InstEnv.lhs | 4 +-
compiler/types/Kind.lhs | 232 +++
compiler/types/OptCoercion.lhs | 538 +++----
compiler/types/TyCon.lhs | 234 ++--
compiler/types/Type.lhs | 677 ++++-----
compiler/types/TypeRep.lhs | 556 ++++---
compiler/types/TypeRep.lhs-boot | 3 +-
compiler/types/Unify.lhs | 70 +-
compiler/utils/Pair.lhs | 47 +
compiler/vectorise/Vectorise.hs | 3 +-
compiler/vectorise/Vectorise/Builtins/Base.hs | 1 -
.../vectorise/Vectorise/Builtins/Initialise.hs | 1 -
compiler/vectorise/Vectorise/Exp.hs | 3 +-
compiler/vectorise/Vectorise/Type/Env.hs | 1 -
compiler/vectorise/Vectorise/Type/PRepr.hs | 11 +-
compiler/vectorise/Vectorise/Type/Type.hs | 1 -
compiler/vectorise/Vectorise/Utils.hs | 3 +-
compiler/vectorise/Vectorise/Utils/Base.hs | 2 +-
compiler/vectorise/Vectorise/Utils/Closure.hs | 1 -
compiler/vectorise/Vectorise/Utils/Hoisting.hs | 1 -
compiler/vectorise/Vectorise/Utils/PADict.hs | 7 +-
compiler/vectorise/Vectorise/Utils/Poly.hs | 1 -
compiler/vectorise/Vectorise/Var.hs | 1 -
ghc/GhciTags.hs | 7 +-
130 files changed, 4928 insertions(+), 4255 deletions(-)
More information about the Cvs-ghc
mailing list