[commit: ghc] tc-arrows: Merge remote-tracking branch 'origin/master' into tc-arrows (47d2265)
Simon Peyton Jones
simonpj at microsoft.com
Fri Mar 1 14:11:49 CET 2013
Repository : http://darcs.haskell.org/ghc.git/
On branch : tc-arrows
http://hackage.haskell.org/trac/ghc/changeset/47d226544fc3fb11d024740a162f8ae4e1d044c9
>---------------------------------------------------------------
commit 47d226544fc3fb11d024740a162f8ae4e1d044c9
Merge: 7b5e514 0ee3165
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date: Wed Feb 27 09:57:09 2013 +0000
Merge remote-tracking branch 'origin/master' into tc-arrows
aclocal.m4 | 115 ++++++-------
compiler/basicTypes/Name.lhs | 24 ++-
compiler/basicTypes/RdrName.lhs | 6 +-
compiler/codeGen/StgCmmPrim.hs | 4 +
compiler/deSugar/Check.lhs | 15 +-
compiler/deSugar/Coverage.lhs | 16 +-
compiler/deSugar/DsArrows.lhs | 2 +-
compiler/deSugar/DsExpr.lhs | 42 +++--
compiler/deSugar/DsMeta.hs | 7 +-
compiler/deSugar/Match.lhs | 31 +++-
compiler/ghc.mk | 19 +-
compiler/hsSyn/Convert.lhs | 6 +-
compiler/hsSyn/HsDecls.lhs | 35 ++--
compiler/hsSyn/HsExpr.lhs | 12 +-
compiler/hsSyn/HsPat.lhs | 12 +-
compiler/hsSyn/HsTypes.lhs | 2 +-
compiler/hsSyn/HsUtils.lhs | 6 +-
compiler/iface/TcIface.lhs | 2 +-
compiler/main/CodeOutput.lhs | 14 +-
compiler/main/DriverPipeline.hs | 18 +-
compiler/main/DynFlags.hs | 17 +-
compiler/main/DynFlags.hs-boot | 1 +
compiler/main/GHC.hs | 1 -
compiler/main/GhcMonad.hs | 10 +-
compiler/main/SysTools.lhs | 3 +-
compiler/main/TidyPgm.lhs | 9 +-
compiler/nativeGen/X86/CodeGen.hs | 20 ++-
compiler/parser/Lexer.x | 9 +-
compiler/parser/Parser.y.pp | 12 +-
compiler/parser/RdrHsSyn.lhs | 4 +-
compiler/prelude/PrelNames.lhs | 26 ++-
compiler/prelude/PrelNames.lhs-boot | 3 +-
compiler/prelude/PrelRules.lhs | 9 +
compiler/prelude/TysWiredIn.lhs | 2 +-
compiler/prelude/primops.txt.pp | 11 ++
compiler/rename/RnEnv.lhs | 18 +-
compiler/rename/RnExpr.lhs | 45 +++--
compiler/rename/RnPat.lhs | 21 ++-
compiler/rename/RnSource.lhs | 3 +-
compiler/simplCore/SimplCore.lhs | 6 +
compiler/typecheck/TcDeriv.lhs | 2 +-
compiler/typecheck/TcExpr.lhs | 111 +++++++-----
compiler/typecheck/TcHsSyn.lhs | 32 +++-
compiler/typecheck/TcHsType.lhs | 2 +-
compiler/typecheck/TcPat.lhs | 16 +-
compiler/typecheck/TcRnDriver.lhs | 45 +++--
compiler/typecheck/TcRnTypes.lhs | 2 +
compiler/typecheck/TcSimplify.lhs | 2 +
compiler/types/Type.lhs | 4 +
compiler/types/TypeRep.lhs | 42 ++---
compiler/utils/Exception.hs | 24 +--
compiler/utils/Outputable.lhs | 11 +-
compiler/vectorise/Vectorise/Exp.hs | 11 +-
configure.ac | 87 +++-------
distrib/configure.ac.in | 3 -
docs/users_guide/extending_ghc.xml | 11 +-
docs/users_guide/flags.xml | 7 +
docs/users_guide/glasgow_exts.xml | 191 +++++++++++++++++++++
driver/ghci/ghc.mk | 2 +-
ghc.mk | 51 ++----
ghc/GhciMonad.hs | 5 -
ghc/InteractiveUI.hs | 5 +-
ghc/ghc.mk | 12 +-
includes/Cmm.h | 8 +-
includes/rts/storage/SMPClosureOps.h | 4 +-
includes/stg/MiscClosures.h | 1 +
libraries/Cabal | 2 +-
libraries/Win32 | 2 +-
libraries/binary | 2 +-
libraries/bytestring | 2 +-
libraries/haskeline | 2 +-
libraries/pretty | 2 +-
libraries/random | 2 +-
mk/config.mk.in | 28 +--
mk/custom-settings.mk | 2 +-
mk/ways.mk | 2 +-
packages | 2 +-
rts/Prelude.h | 1 +
rts/RtsStartup.c | 1 +
rts/Schedule.c | 40 +++--
rts/Stable.c | 46 +++--
rts/Updates.h | 4 +-
rts/ghc.mk | 11 +-
rts/sm/Evac.c | 17 +-
rts/sm/GCAux.c | 8 +
rts/win32/ThrIOManager.c | 10 +-
rts/win32/libHSbase.def | 1 +
rules/build-dependencies.mk | 13 +-
rules/build-package-data.mk | 14 +-
rules/build-package-way.mk | 6 +-
rules/build-package.mk | 21 ++-
rules/build-prog.mk | 16 +-
rules/c-suffix-rules.mk | 3 +-
rules/cmm-suffix-rules.mk | 4 -
rules/distdir-opts.mk | 111 ++++++++++++
rules/distdir-way-opts.mk | 98 +----------
rules/haddock.mk | 2 +-
rules/hi-rule.mk | 34 ++--
rules/hs-suffix-rules-srcdir.mk | 77 ++-------
...les-srcdir.mk => hs-suffix-way-rules-srcdir.mk} | 48 +-----
.../{hs-suffix-rules.mk => hs-suffix-way-rules.mk} | 33 ++--
rules/manual-package-config.mk | 2 +-
settings.in | 1 +
sync-all | 77 ++++++++-
utils/Makefile | 119 -------------
utils/ghc-cabal/ghc.mk | 2 +-
utils/ghc-pkg/Main.hs | 3 +-
utils/ghc-pkg/ghc-pkg.cabal | 2 +-
utils/ghc-pkg/ghc.mk | 71 ++------
utils/ghctags/Main.hs | 2 +-
utils/lndir/Makefile | 17 --
utils/runghc/runghc.hs | 2 +-
112 files changed, 1265 insertions(+), 1009 deletions(-)
More information about the ghc-commits
mailing list