[commit: ghc] type-nats: Merge remote-tracking branch 'origin/master' into type-nats (7c4c48c)
Iavor Diatchki
diatchki at galois.com
Mon May 20 20:43:56 CEST 2013
Repository : http://darcs.haskell.org/ghc.git/
On branch : type-nats
https://github.com/ghc/ghc/commit/7c4c48cf1c96fe3d7fa0fa94cd2dc1e52530fa15
>---------------------------------------------------------------
commit 7c4c48cf1c96fe3d7fa0fa94cd2dc1e52530fa15
Merge: 8514632 5734f7a
Author: Iavor S. Diatchki <diatchki at galois.com>
Date: Mon May 20 10:05:53 2013 -0700
Merge remote-tracking branch 'origin/master' into type-nats
Makefile | 1 -
aclocal.m4 | 7 +
compiler/basicTypes/BasicTypes.lhs | 3 +-
compiler/basicTypes/DataCon.lhs | 4 +
compiler/basicTypes/OccName.lhs | 2 +-
compiler/basicTypes/UniqSupply.lhs | 4 +-
compiler/cbits/genSym.c | 9 +
compiler/cmm/CLabel.hs | 10 +-
compiler/cmm/CmmLayoutStack.hs | 4 +-
compiler/cmm/CmmParse.y | 5 +-
compiler/cmm/CmmSink.hs | 2 +-
compiler/cmm/PprC.hs | 34 +-
compiler/codeGen/StgCmmBind.hs | 24 +-
compiler/codeGen/StgCmmCon.hs | 24 +-
compiler/codeGen/StgCmmExpr.hs | 7 +-
compiler/codeGen/StgCmmExtCode.hs | 17 +-
compiler/codeGen/StgCmmHeap.hs | 14 +-
compiler/codeGen/StgCmmMonad.hs | 2 +-
compiler/codeGen/StgCmmPrim.hs | 5 +-
compiler/codeGen/StgCmmTicky.hs | 52 ++-
compiler/codeGen/StgCmmUtils.hs | 11 +-
compiler/coreSyn/CorePrep.lhs | 16 +-
compiler/coreSyn/CoreSubst.lhs | 6 +-
compiler/coreSyn/MkCore.lhs | 48 +-
compiler/coreSyn/MkExternalCore.lhs | 46 +-
compiler/deSugar/DsBinds.lhs | 33 +-
compiler/deSugar/Match.lhs | 2 +-
compiler/ghc.cabal.in | 1 +
compiler/ghc.mk | 16 +
compiler/ghci/Linker.lhs | 2 +-
compiler/hsSyn/HsBinds.lhs | 82 +++-
compiler/hsSyn/HsPat.lhs | 14 +-
compiler/hsSyn/HsTypes.lhs | 7 +-
compiler/iface/IfaceSyn.lhs | 14 +-
compiler/iface/MkIface.lhs | 12 +-
compiler/iface/TcIface.lhs | 4 +-
compiler/llvmGen/Llvm/AbsSyn.hs | 16 +-
compiler/main/CodeOutput.lhs | 12 +-
compiler/main/DriverPipeline.hs | 117 +++--
compiler/main/DynFlags.hs | 47 +-
compiler/main/GHC.hs | 8 +-
compiler/main/HscMain.hs | 41 +-
compiler/main/HscTypes.lhs | 5 +-
compiler/main/Packages.lhs | 17 +-
compiler/main/PprTyThing.hs | 6 +-
compiler/main/StaticFlags.hs | 82 +---
compiler/main/SysTools.lhs | 18 +-
compiler/main/TidyPgm.lhs | 40 +-
compiler/nativeGen/AsmCodeGen.lhs | 76 ++--
compiler/nativeGen/NCGMonad.hs | 42 +-
compiler/nativeGen/PIC.hs | 66 +--
compiler/nativeGen/PPC/CodeGen.hs | 8 +-
compiler/nativeGen/SPARC/CodeGen.hs | 2 +-
compiler/nativeGen/X86/CodeGen.hs | 9 +-
compiler/parser/Parser.y.pp | 2 +-
compiler/prelude/PrelNames.lhs | 5 -
compiler/profiling/SCCfinal.lhs | 2 +-
compiler/rename/RnEnv.lhs | 43 +-
compiler/rename/RnTypes.lhs | 12 +-
compiler/simplCore/FloatIn.lhs | 2 +-
compiler/specialise/SpecConstr.lhs | 205 +++++++--
compiler/stgSyn/CoreToStg.lhs | 40 +-
compiler/stgSyn/StgSyn.lhs | 8 +-
compiler/typecheck/FamInst.lhs | 10 +-
compiler/typecheck/TcBinds.lhs | 21 +-
compiler/typecheck/TcCanonical.lhs | 23 +-
compiler/typecheck/TcDeriv.lhs | 3 +-
compiler/typecheck/TcErrors.lhs | 70 ++-
compiler/typecheck/TcExpr.lhs | 47 +-
compiler/typecheck/TcGenGenerics.lhs | 32 +-
compiler/typecheck/TcHsSyn.lhs | 681 ++++++++++++++--------------
compiler/typecheck/TcHsType.lhs | 71 ++-
compiler/typecheck/TcInteract.lhs | 82 ++--
compiler/typecheck/TcMType.lhs | 32 +-
compiler/typecheck/TcPat.lhs | 79 ++--
compiler/typecheck/TcRnDriver.lhs | 42 +-
compiler/typecheck/TcRnMonad.lhs | 10 +-
compiler/typecheck/TcRnTypes.lhs | 30 +-
compiler/typecheck/TcRules.lhs | 4 +-
compiler/typecheck/TcSMonad.lhs | 30 +-
compiler/typecheck/TcSimplify.lhs | 15 +-
compiler/typecheck/TcSplice.lhs | 57 ++-
compiler/typecheck/TcTyClsDecls.lhs | 26 +-
compiler/typecheck/TcType.lhs | 10 +-
compiler/typecheck/TcUnify.lhs | 9 +-
compiler/typecheck/TcValidity.lhs | 80 ++--
compiler/types/CoAxiom.lhs | 2 +-
compiler/types/FamInstEnv.lhs | 112 +++--
compiler/types/OptCoercion.lhs | 2 +-
compiler/types/Type.lhs | 22 +-
compiler/types/Unify.lhs | 18 +-
compiler/utils/Platform.hs | 8 +
configure.ac | 2 +-
distrib/compare/Utils.hs | 4 +
distrib/compare/compare.hs | 3 +-
distrib/ghc.iss.in | 97 ----
distrib/windows-installer-licences.txt | 704 -----------------------------
docs/comm/the-beast/data-types.html | 4 +-
docs/core-spec/Makefile | 2 +-
docs/users_guide/extending_ghc.xml | 15 +-
docs/users_guide/external_core.xml | 5 +-
docs/users_guide/ghc.mk | 4 +-
docs/users_guide/ghci.xml | 18 +-
docs/users_guide/glasgow_exts.xml | 82 ++--
docs/users_guide/using.xml | 11 +-
driver/ghci/ghc.mk | 2 +-
driver/utils/dynwrapper.c | 197 ++++++++
ghc.mk | 122 +++--
ghc/InteractiveUI.hs | 7 +-
ghc/Main.hs | 2 -
includes/ghc.mk | 12 +-
includes/rts/PrimFloat.h | 2 +
includes/rts/Utils.h | 5 -
libffi/ghc.mk | 8 +-
libraries/Cabal | 2 +-
mk/build.mk.sample | 44 +-
mk/config.mk.in | 26 +-
mk/project.mk.in | 5 +-
rts/Adjustor.c | 4 +-
rts/FrontPanel.c | 796 ---------------------------------
rts/FrontPanel.h | 39 --
rts/Linker.c | 31 +-
rts/RtsAPI.c | 11 +-
rts/RtsFlags.c | 13 -
rts/RtsStartup.c | 16 -
rts/RtsUtils.c | 20 -
rts/STM.c | 8 +-
rts/StgCRun.c | 37 +-
rts/StgPrimFloat.c | 23 -
rts/StgPrimFloat.h | 5 +-
rts/Threads.c | 4 +-
rts/ghc.mk | 50 ++-
rts/package.conf.in | 7 +-
rts/posix/Itimer.c | 55 ++-
rts/sm/GC.c | 15 -
rules/build-dependencies.mk | 16 +-
rules/build-package-data.mk | 4 +-
rules/build-package-way.mk | 4 +-
rules/build-prog.mk | 100 ++++-
rules/c-sources.mk | 5 +-
rules/c-suffix-rules.mk | 12 +-
rules/cmm-suffix-rules.mk | 12 +-
rules/distdir-opts.mk | 6 +-
rules/distdir-way-opts.mk | 14 +-
rules/haddock.mk | 4 +-
rules/hs-suffix-way-rules-srcdir.mk | 12 +-
rules/hs-suffix-way-rules.mk | 8 +-
rules/shell-wrapper.mk | 2 +
sync-all | 246 ++++++----
utils/ghc-cabal/Main.hs | 49 +-
utils/ghc-cabal/ghc.mk | 14 +-
utils/ghc-pkg/Main.hs | 32 +-
utils/runghc/ghc.mk | 2 +-
153 files changed, 2730 insertions(+), 3434 deletions(-)
More information about the ghc-commits
mailing list