[commit: ghc] imp-param-class: Merge with Master, and resolve conflicts. (545afb0)
Iavor Diatchki
diatchki at galois.com
Mon Jun 11 02:19:34 CEST 2012
Repository : ssh://darcs.haskell.org//srv/darcs/ghc
On branch : imp-param-class
http://hackage.haskell.org/trac/ghc/changeset/545afb00a224ff1f6b8fa393e3245b3f42a24f84
>---------------------------------------------------------------
commit 545afb00a224ff1f6b8fa393e3245b3f42a24f84
Author: Iavor S. Diatchki <iavor.diatchki at gmail.com>
Date: Sun Jun 10 14:46:23 2012 -0700
Merge with Master, and resolve conflicts.
Conflicts:
compiler/iface/IfaceEnv.lhs
compiler/rename/RnTypes.lhs
compiler/typecheck/Inst.lhs
compiler/typecheck/TcBinds.lhs
compiler/typecheck/TcExpr.lhs
compiler/typecheck/TcMType.lhs
compiler/types/Type.lhs
compiler/HsVersions.h | 13 +-
compiler/basicTypes/BasicTypes.lhs | 13 +-
compiler/basicTypes/DataCon.lhs | 13 +-
compiler/basicTypes/Id.lhs | 12 +-
compiler/basicTypes/Literal.lhs | 46 +-
compiler/basicTypes/MkId.lhs | 10 +-
compiler/basicTypes/Unique.lhs | 1 +
compiler/cmm/Bitmap.hs | 2 +-
compiler/cmm/CmmBuildInfoTables.hs | 2 +-
compiler/cmm/CmmInfo.hs | 2 +
compiler/cmm/CmmUtils.hs | 7 +-
compiler/cmm/MkGraph.hs | 7 +-
compiler/cmm/OptimizationFuel.hs | 1 +
compiler/codeGen/CgBindery.lhs | 9 +-
compiler/codeGen/CgClosure.lhs | 7 +-
compiler/codeGen/CgCon.lhs | 8 +-
compiler/codeGen/CgExpr.lhs | 2 +-
compiler/codeGen/CgForeignCall.hs | 3 +-
compiler/codeGen/CgMonad.lhs | 1 +
compiler/codeGen/CgPrimOp.hs | 16 +-
compiler/codeGen/CgTailCall.lhs | 1 +
compiler/codeGen/ClosureInfo.lhs | 38 +-
compiler/codeGen/CodeGen.lhs | 1 +
compiler/codeGen/StgCmm.hs | 5 +-
compiler/codeGen/StgCmmBind.hs | 17 +-
compiler/codeGen/StgCmmClosure.hs | 34 +-
compiler/codeGen/StgCmmCon.hs | 4 +-
compiler/codeGen/StgCmmEnv.hs | 1 -
compiler/codeGen/StgCmmExpr.hs | 2 +-
compiler/codeGen/StgCmmForeign.hs | 3 +-
compiler/codeGen/StgCmmHeap.hs | 1 +
compiler/codeGen/StgCmmLayout.hs | 8 +-
compiler/codeGen/StgCmmPrim.hs | 17 +-
compiler/codeGen/StgCmmTicky.hs | 6 +-
compiler/codeGen/StgCmmUtils.hs | 2 +-
compiler/coreSyn/CoreLint.lhs | 18 +-
compiler/coreSyn/CorePrep.lhs | 385 +++++++-------
compiler/coreSyn/CoreSyn.lhs | 2 +-
compiler/coreSyn/CoreUnfold.lhs | 73 ++--
compiler/coreSyn/MkCore.lhs | 6 +-
compiler/deSugar/Coverage.lhs | 4 +-
compiler/deSugar/DsCCall.lhs | 1 +
compiler/deSugar/DsExpr.lhs | 40 +--
compiler/deSugar/DsForeign.lhs | 15 +-
compiler/deSugar/DsListComp.lhs | 1 +
compiler/deSugar/DsMeta.hs | 2 +-
compiler/deSugar/DsMonad.lhs | 8 +-
compiler/deSugar/MatchCon.lhs | 2 +-
compiler/ghc.cabal.in | 1 +
compiler/ghci/ByteCodeAsm.lhs | 1 +
compiler/ghci/ByteCodeGen.lhs | 132 +++--
compiler/ghci/ByteCodeItbls.lhs | 3 +-
compiler/ghci/ByteCodeLink.lhs | 1 +
compiler/ghci/Debugger.hs | 7 +-
compiler/ghci/Linker.lhs | 20 +-
compiler/ghci/RtClosureInspect.hs | 119 +++--
compiler/hsSyn/Convert.lhs | 3 +-
compiler/hsSyn/HsBinds.lhs | 17 +-
compiler/hsSyn/HsDecls.lhs | 6 +-
compiler/hsSyn/HsExpr.lhs | 2 +-
compiler/hsSyn/HsTypes.lhs | 7 -
compiler/iface/BinIface.hs | 3 +-
compiler/iface/BuildTyCl.lhs | 2 +-
compiler/iface/IfaceEnv.lhs | 1 +
compiler/iface/LoadIface.lhs | 4 +-
compiler/iface/TcIface.lhs | 8 +-
compiler/main/CodeOutput.lhs | 5 +-
compiler/main/DriverPipeline.hs | 5 +-
compiler/main/DynFlags.hs | 49 ++-
compiler/main/ErrUtils.lhs | 9 +-
compiler/main/ErrUtils.lhs-boot | 1 +
compiler/main/GHC.hs | 9 -
compiler/main/HscMain.hs | 12 +-
compiler/main/InteractiveEval.hs | 48 +-
compiler/main/Packages.lhs | 7 +-
compiler/main/StaticFlags.hs | 7 +-
compiler/main/TidyPgm.lhs | 530 +++++++++---------
compiler/nativeGen/PPC/CodeGen.hs | 1 +
compiler/nativeGen/X86/CodeGen.hs | 1 +
compiler/parser/ParserCore.y | 2 +-
compiler/parser/RdrHsSyn.lhs | 2 +
compiler/prelude/PrelNames.lhs | 24 +-
compiler/prelude/PrelRules.lhs | 175 +++++--
compiler/prelude/TysPrim.lhs | 31 +-
compiler/prelude/TysWiredIn.lhs | 5 +-
compiler/prelude/primops.txt.pp | 8 +
compiler/profiling/SCCfinal.lhs | 1 +
compiler/rename/RnEnv.lhs | 29 +-
compiler/rename/RnExpr.lhs | 2 +-
compiler/rename/RnPat.lhs | 12 +-
compiler/rename/RnTypes.lhs | 2 +-
compiler/simplCore/CSE.lhs | 30 +-
compiler/simplCore/CoreMonad.lhs | 29 +-
compiler/simplCore/FloatIn.lhs | 2 +-
compiler/simplCore/OccurAnal.lhs | 2 +-
compiler/simplCore/SimplCore.lhs | 15 +-
compiler/simplCore/SimplEnv.lhs | 1 +
compiler/simplCore/Simplify.lhs | 1 +
compiler/simplStg/SimplStg.lhs | 11 +-
compiler/simplStg/UnariseStg.lhs | 167 ++++++
compiler/specialise/Rules.lhs | 465 ++++++++--------
compiler/stgSyn/CoreToStg.lhs | 27 +-
compiler/stgSyn/StgLint.lhs | 37 +-
compiler/stgSyn/StgSyn.lhs | 48 +-
compiler/stranal/DmdAnal.lhs | 2 +-
compiler/stranal/WorkWrap.lhs | 2 +-
compiler/typecheck/FamInst.lhs | 2 +-
compiler/typecheck/Inst.lhs | 2 +-
compiler/typecheck/TcBinds.lhs | 13 +-
compiler/typecheck/TcCanonical.lhs | 27 +-
compiler/typecheck/TcClassDcl.lhs | 50 +--
compiler/typecheck/TcDeriv.lhs | 2 +-
compiler/typecheck/TcEnv.lhs | 1 +
compiler/typecheck/TcExpr.lhs | 4 +-
compiler/typecheck/TcForeign.lhs | 1 +
compiler/typecheck/TcGenGenerics.lhs | 1 +
compiler/typecheck/TcHsSyn.lhs | 1 +
compiler/typecheck/TcHsType.lhs | 68 ++-
compiler/typecheck/TcInstDcls.lhs | 106 ++---
compiler/typecheck/TcInteract.lhs | 166 +++----
compiler/typecheck/TcMType.lhs | 321 ++++++------
compiler/typecheck/TcPat.lhs | 32 +-
compiler/typecheck/TcRnDriver.lhs | 71 ++-
compiler/typecheck/TcRnMonad.lhs | 28 +-
compiler/typecheck/TcRnTypes.lhs | 41 +-
compiler/typecheck/TcSMonad.lhs | 130 ++---
compiler/typecheck/TcSimplify.lhs | 714 ++++++++++++++++---------
compiler/typecheck/TcSplice.lhs | 30 +-
compiler/typecheck/TcTyClsDecls.lhs | 230 +++++----
compiler/typecheck/TcType.lhs | 4 +-
compiler/typecheck/TcUnify.lhs | 2 +-
compiler/types/InstEnv.lhs | 1 +
compiler/types/Kind.lhs | 46 +--
compiler/types/OptCoercion.lhs | 1 +
compiler/types/TyCon.lhs | 2 +-
compiler/types/Type.lhs | 91 ++--
compiler/types/TypeRep.lhs | 5 +-
compiler/utils/Binary.hs | 3 -
compiler/utils/Outputable.lhs | 26 +-
compiler/utils/Panic.lhs | 75 ++--
compiler/utils/Util.lhs | 12 +-
compiler/vectorise/Vectorise/Exp.hs | 1 +
compiler/vectorise/Vectorise/Monad.hs | 8 +-
compiler/vectorise/Vectorise/Monad/Base.hs | 12 +-
compiler/vectorise/Vectorise/Monad/InstEnv.hs | 1 +
distrib/compare/compare.hs | 23 +-
docs/users_guide/flags.xml | 5 +-
docs/users_guide/glasgow_exts.xml | 275 ++++++----
ghc.mk | 5 +-
ghc/InteractiveUI.hs | 7 +-
rts/Capability.c | 14 +-
rts/Capability.h | 2 +-
rts/Linker.c | 2 +-
rts/RaiseAsync.c | 10 +-
rts/Schedule.c | 27 +-
rts/win32/libHSghc-prim.def | 1 +
rules/build-package-data.mk | 2 +-
rules/build-package-way.mk | 8 +-
rules/build-prog.mk | 4 +-
rules/c-suffix-rules.mk | 22 +-
rules/cmm-suffix-rules.mk | 12 +-
rules/hs-suffix-rules-srcdir.mk | 30 +-
rules/hs-suffix-rules.mk | 8 +-
rules/package-config.mk | 7 +
rules/pretty_commands.mk | 13 +
utils/ghc-pkg/Main.hs | 2 +-
166 files changed, 3234 insertions(+), 2601 deletions(-)
Diff suppressed because of size. To see it, use:
git show 545afb00a224ff1f6b8fa393e3245b3f42a24f84
More information about the Cvs-ghc
mailing list