[commit: ghc] overlapping-tyfams: Merge branch 'master' into overlapping-tyfams (14bcbcd)
Richard Eisenberg
eir at cis.upenn.edu
Fri Jun 21 15:17:17 CEST 2013
Repository : http://darcs.haskell.org/ghc.git/
On branch : overlapping-tyfams
https://github.com/ghc/ghc/commit/14bcbcdb829e9330116b1e61977670840fa7b627
>---------------------------------------------------------------
commit 14bcbcdb829e9330116b1e61977670840fa7b627
Merge: 81bccef 6ca7525
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date: Thu Jun 20 17:02:12 2013 +0100
Merge branch 'master' into overlapping-tyfams
Conflicts:
compiler/deSugar/DsMeta.hs
compiler/typecheck/FamInst.lhs
compiler/types/FamInstEnv.lhs
.gitignore | 1 -
aclocal.m4 | 46 +-
compiler/basicTypes/DataCon.lhs | 6 +-
compiler/basicTypes/Demand.lhs | 1037 ++++++++++++++++--------
compiler/basicTypes/MkId.lhs | 68 +-
compiler/basicTypes/MkId.lhs-boot | 2 +
compiler/basicTypes/Name.lhs | 13 +-
compiler/basicTypes/OccName.lhs | 13 +-
compiler/cmm/CLabel.hs | 6 +-
compiler/cmm/CmmParse.y | 3 +-
compiler/cmm/CmmUtils.hs | 2 +-
compiler/codeGen/StgCmmBind.hs | 48 +-
compiler/codeGen/StgCmmClosure.hs | 2 +-
compiler/codeGen/StgCmmMonad.hs | 5 +-
compiler/codeGen/StgCmmTicky.hs | 27 +-
compiler/coreSyn/CoreArity.lhs | 52 +-
compiler/coreSyn/CoreFVs.lhs | 33 +-
compiler/coreSyn/CoreLint.lhs | 24 +-
compiler/coreSyn/CorePrep.lhs | 57 +-
compiler/coreSyn/CoreSubst.lhs | 65 +-
compiler/coreSyn/CoreSyn.lhs | 39 +-
compiler/coreSyn/CoreTidy.lhs | 7 +-
compiler/coreSyn/CoreUnfold.lhs | 37 +-
compiler/coreSyn/CoreUtils.lhs | 84 +-
compiler/coreSyn/PprCore.lhs | 10 +-
compiler/deSugar/DsBinds.lhs | 39 +-
compiler/deSugar/DsMeta.hs | 529 ++++++------
compiler/ghci/ByteCodeAsm.lhs | 2 +-
compiler/ghci/DebuggerUtils.hs | 4 +-
compiler/ghci/Linker.lhs | 4 +-
compiler/ghci/RtClosureInspect.hs | 2 +-
compiler/iface/BinIface.hs | 15 +-
compiler/iface/IfaceEnv.lhs | 20 +
compiler/iface/IfaceSyn.lhs | 9 +-
compiler/iface/MkIface.lhs | 4 +-
compiler/iface/TcIface.lhs | 27 +-
compiler/llvmGen/LlvmCodeGen.hs | 24 +-
compiler/llvmGen/LlvmCodeGen/CodeGen.hs | 3 +
compiler/llvmGen/LlvmCodeGen/Ppr.hs | 3 +
compiler/main/DriverPipeline.hs | 14 +-
compiler/main/DynFlags.hs | 32 +-
compiler/main/GhcMake.hs | 3 +-
compiler/main/StaticFlags.hs | 13 +-
compiler/main/SysTools.lhs | 115 ++-
compiler/main/TidyPgm.lhs | 3 +-
compiler/nativeGen/PPC/CodeGen.hs | 2 +-
compiler/nativeGen/X86/CodeGen.hs | 2 +-
compiler/parser/Parser.y.pp | 10 +-
compiler/prelude/PrelNames.lhs | 6 +-
compiler/prelude/PrelRules.lhs | 205 ++---
compiler/prelude/TysPrim.lhs | 26 +-
compiler/prelude/primops.txt.pp | 11 +-
compiler/rename/RnEnv.lhs | 2 +-
compiler/rename/RnExpr.lhs | 611 +++++++-------
compiler/rename/RnNames.lhs | 5 +-
compiler/rename/RnTypes.lhs | 396 +++++----
compiler/simplCore/CSE.lhs | 271 +++----
compiler/simplCore/CoreMonad.lhs | 3 +-
compiler/simplCore/OccurAnal.lhs | 210 ++---
compiler/simplCore/SimplUtils.lhs | 77 +-
compiler/simplCore/Simplify.lhs | 72 +-
compiler/specialise/Rules.lhs | 76 +-
compiler/specialise/Specialise.lhs | 60 +-
compiler/stgSyn/CoreToStg.lhs | 32 +-
compiler/stranal/DmdAnal.lhs | 639 +++++++++------
compiler/typecheck/FamInst.lhs | 47 +-
compiler/typecheck/TcCanonical.lhs | 172 ++--
compiler/typecheck/TcDeriv.lhs | 163 ++--
compiler/typecheck/TcEvidence.lhs | 2 +-
compiler/typecheck/TcExpr.lhs | 797 +++++++++---------
compiler/typecheck/TcForeign.lhs | 29 +-
compiler/typecheck/TcGenDeriv.lhs | 20 +-
compiler/typecheck/TcGenGenerics.lhs | 18 +-
compiler/typecheck/TcHsSyn.lhs | 4 +-
compiler/typecheck/TcHsType.lhs | 95 ++-
compiler/typecheck/TcInstDcls.lhs | 163 ++--
compiler/typecheck/TcInteract.lhs | 79 +-
compiler/typecheck/TcMType.lhs | 12 +-
compiler/typecheck/TcPat.lhs | 1 +
compiler/typecheck/TcRnTypes.lhs | 53 +-
compiler/typecheck/TcSMonad.lhs | 16 -
compiler/typecheck/TcSimplify.lhs | 61 +-
compiler/typecheck/TcTyClsDecls.lhs | 37 +-
compiler/typecheck/TcUnify.lhs | 23 +-
compiler/typecheck/TcUnify.lhs-boot | 5 +-
compiler/typecheck/TcValidity.lhs | 6 +-
compiler/types/Coercion.lhs | 99 ++-
compiler/types/FamInstEnv.lhs | 124 ++-
compiler/types/Kind.lhs | 44 +-
compiler/types/TyCon.lhs | 58 +-
compiler/types/Type.lhs | 66 +-
compiler/types/TypeRep.lhs | 12 +-
compiler/utils/Util.lhs | 9 +-
compiler/vectorise/Vectorise/Generic/PADict.hs | 24 +-
configure.ac | 5 +-
distrib/configure.ac.in | 2 -
docs/storage-mgt/ldv.tex | 6 +-
docs/users_guide/7.8.1-notes.xml | 497 +++++++++++-
docs/users_guide/flags.xml | 6 +
docs/users_guide/ghci.xml | 10 +
docs/users_guide/using.xml | 12 +
ghc.mk | 82 +-
ghc.spec.in | 187 -----
ghc/GhciMonad.hs | 2 +-
ghc/InteractiveUI.hs | 76 +-
ghc/Main.hs | 21 +-
includes/Rts.h | 2 +-
includes/ghc.mk | 5 +
includes/rts/storage/Closures.h | 12 +-
includes/rts/storage/GC.h | 10 +-
includes/rts/storage/SMPClosureOps.h | 40 +-
includes/stg/MiscClosures.h | 3 +-
includes/stg/Ticky.h | 7 +-
mk/build.mk.sample | 6 +
mk/config.mk.in | 10 +-
mk/project.mk.in | 3 +-
mk/tree.mk | 6 -
rts/Linker.c | 10 +-
rts/PrimOps.cmm | 338 ++++----
rts/RetainerProfile.c | 9 +-
rts/RtsStartup.c | 6 +-
rts/StgMiscClosures.cmm | 9 +
rts/Ticky.c | 15 +-
rts/Weak.c | 41 +-
rts/Weak.h | 4 +-
rts/ghc.mk | 12 +-
rts/package.conf.in | 50 +-
rts/sm/Compact.c | 17 +-
rts/sm/GC.c | 2 +-
rts/sm/MarkStack.h | 2 +-
rts/sm/MarkWeak.c | 230 +++---
rts/sm/Storage.c | 61 +-
rules/bindist.mk | 2 +-
rules/build-dependencies.mk | 4 +
rules/manual-package-config.mk | 11 +-
utils/deriveConstants/DeriveConstants.hs | 13 +-
utils/ghc-pkg/Main.hs | 52 +-
utils/hp2ps/Error.c | 2 +-
validate | 19 +
139 files changed, 5479 insertions(+), 3947 deletions(-)
Diff suppressed because of size. To see it, use:
git show 14bcbcdb829e9330116b1e61977670840fa7b627
More information about the ghc-commits
mailing list