[commit: ghc] type-nats: Merge remote-tracking branch 'origin/master' into type-nats (1e27e8b)
Iavor Diatchki
diatchki at galois.com
Tue Mar 19 00:33:23 CET 2013
Repository : http://darcs.haskell.org/ghc.git/
On branch : type-nats
https://github.com/ghc/ghc/commit/1e27e8baaadd7208b01103cd993f148ef7408cb3
>---------------------------------------------------------------
commit 1e27e8baaadd7208b01103cd993f148ef7408cb3
Merge: cdedac5 01efdd6
Author: Iavor S. Diatchki <diatchki at galois.com>
Date: Mon Mar 18 09:42:34 2013 -0700
Merge remote-tracking branch 'origin/master' into type-nats
HACKING | 63 -
HACKING.md | 149 ++
README.md | 67 +-
aclocal.m4 | 17 +-
boot | 2 +-
compiler/basicTypes/Demand.lhs | 29 +-
compiler/cmm/Cmm.hs | 1 -
compiler/cmm/CmmCommonBlockElim.hs | 5 -
compiler/cmm/CmmContFlowOpt.hs | 3 +-
compiler/cmm/CmmNode.hs | 5 +-
compiler/cmm/CmmProcPoint.hs | 1 -
compiler/cmm/CmmRewriteAssignments.hs | 3 -
compiler/cmm/CmmUtils.hs | 15 +-
compiler/codeGen/StgCmmEnv.hs | 133 +-
compiler/codeGen/StgCmmForeign.hs | 53 +-
compiler/codeGen/StgCmmHeap.hs | 83 -
compiler/codeGen/StgCmmMonad.hs | 330 ++-
compiler/codeGen/StgCmmPrim.hs | 2 +-
compiler/codeGen/StgCmmUtils.hs | 4 +-
compiler/deSugar/Coverage.lhs | 3 +
compiler/deSugar/DsArrows.lhs | 484 ++--
compiler/ghc.mk | 36 +-
compiler/ghci/Linker.lhs | 84 +-
compiler/hsSyn/HsExpr.lhs | 13 +-
compiler/hsSyn/HsUtils.lhs | 7 +-
compiler/iface/LoadIface.lhs | 9 +-
compiler/iface/MkIface.lhs | 2 +-
compiler/main/CodeOutput.lhs | 18 +-
compiler/main/DriverPipeline.hs | 521 ++--
compiler/main/DynFlags.hs | 114 +-
compiler/main/GHC.hs | 12 +-
compiler/main/GhcMake.hs | 8 +-
compiler/main/HscMain.hs | 519 ++--
compiler/main/InteractiveEval.hs | 16 +-
compiler/nativeGen/AsmCodeGen.lhs | 81 +-
compiler/parser/Lexer.x | 2 +-
compiler/parser/Parser.y.pp | 4 +-
compiler/parser/RdrHsSyn.lhs | 4 +-
compiler/rename/RnExpr.lhs | 4 +-
compiler/rename/RnTypes.lhs | 2 +-
compiler/typecheck/TcArrows.lhs | 272 +--
compiler/typecheck/TcCanonical.lhs | 150 +-
compiler/typecheck/TcDeriv.lhs | 99 +-
compiler/typecheck/TcHsSyn.lhs | 6 +-
compiler/typecheck/TcInteract.lhs | 1 +
compiler/typecheck/TcRnDriver.lhs | 33 +-
compiler/typecheck/TcRnTypes.lhs | 33 +-
compiler/typecheck/TcSMonad.lhs | 5 +-
compiler/typecheck/TcTyClsDecls.lhs | 533 ++--
compiler/typecheck/TcType.lhs | 2 +-
compiler/typecheck/TcValidity.lhs | 9 +-
compiler/types/FamInstEnv.lhs | 14 +-
compiler/types/InstEnv.lhs | 13 +-
compiler/types/Kind.lhs | 9 +-
compiler/utils/Fingerprint.hsc | 1 +
compiler/utils/IOEnv.hs | 20 -
compiler/utils/Outputable.lhs | 5 +-
compiler/utils/Util.lhs | 9 +-
configure.ac | 3 +
docs/users_guide/extending_ghc.xml | 4 +-
docs/users_guide/flags.xml | 9 +-
docs/users_guide/glasgow_exts.xml | 80 +-
docs/users_guide/profiling.xml | 8 +-
driver/ghc/ghc.mk | 2 +-
driver/ghci/ghc.mk | 2 +-
driver/haddock/ghc.mk | 2 +-
driver/split/ghc.mk | 2 +-
ghc.mk | 12 +-
ghc/InteractiveUI.hs | 16 +-
ghc/Main.hs | 51 +-
ghc/ghc.mk | 24 +-
includes/rts/storage/ClosureMacros.h | 4 -
libraries/Cabal | 2 +-
mk/build.mk.sample | 2 +-
mk/config.mk.in | 63 +-
mk/validate-settings.mk | 6 +-
packages | 89 +-
rts/LdvProfile.c | 2 +-
rts/Linker.c | 14 +-
rts/ghc.mk | 4 +-
rts/parallel/0Hash.c | 320 ---
rts/parallel/0Parallel.h | 414 ----
rts/parallel/0Unpack.c | 440 ----
rts/parallel/Dist.c | 117 -
rts/parallel/Dist.h | 20 -
rts/parallel/FetchMe.h | 24 -
rts/parallel/FetchMe.hc | 180 --
rts/parallel/Global.c | 1090 ---------
rts/parallel/GranSim.c | 3015 -----------------------
rts/parallel/GranSimRts.h | 268 --
rts/parallel/HLC.h | 63 -
rts/parallel/HLComms.c | 1810 --------------
rts/parallel/LLC.h | 130 -
rts/parallel/LLComms.c | 489 ----
rts/parallel/PEOpCodes.h | 58 -
rts/parallel/Pack.c | 4293 ---------------------------------
rts/parallel/ParInit.c | 322 ---
rts/parallel/ParInit.h | 19 -
rts/parallel/ParTicky.c | 450 ----
rts/parallel/ParTicky.h | 60 -
rts/parallel/ParTypes.h | 38 -
rts/parallel/Parallel.c | 1140 ---------
rts/parallel/ParallelDebug.c | 1955 ---------------
rts/parallel/ParallelDebug.h | 79 -
rts/parallel/ParallelRts.h | 253 --
rts/parallel/RBH.c | 337 ---
rts/parallel/SysMan.c | 650 -----
rules/build-package-data.mk | 13 +-
rules/build-package-way.mk | 55 +-
rules/build-perl.mk | 21 +-
rules/build-prog.mk | 34 +-
rules/distdir-opts.mk | 2 +-
rules/distdir-way-opts.mk | 4 +-
rules/hs-suffix-way-rules-srcdir.mk | 21 +
rules/shell-wrapper.mk | 8 +-
sync-all | 178 +-
utils/compare_sizes/ghc.mk | 2 +-
utils/count_lines/ghc.mk | 2 +-
utils/deriveConstants/ghc.mk | 2 +-
utils/genapply/ghc.mk | 2 +-
utils/genprimopcode/ghc.mk | 2 +-
utils/ghc-cabal/Main.hs | 73 +-
utils/ghc-cabal/ghc.mk | 4 +-
utils/ghc-pkg/ghc.mk | 6 +-
utils/ghc-pwd/ghc.mk | 2 +-
utils/ghctags/Main.hs | 9 +-
utils/ghctags/ghc.mk | 2 +-
utils/hp2ps/ghc.mk | 2 +-
utils/hpc/ghc.mk | 2 +-
utils/ltx/Makefile | 12 -
utils/ltx/ltx.prl | 229 --
utils/mkUserGuidePart/ghc.mk | 2 +-
utils/parallel/AVG.pl | 108 -
utils/parallel/GrAnSim.el | 432 ----
utils/parallel/Makefile | 53 -
utils/parallel/RTS2gran.pl | 684 ------
utils/parallel/SN.pl | 280 ---
utils/parallel/SPLIT.pl | 379 ---
utils/parallel/avg-RTS.pl | 15 -
utils/parallel/get_SN.pl | 40 -
utils/parallel/ghc-fool-sort.pl | 23 -
utils/parallel/ghc-unfool-sort.pl | 16 -
utils/parallel/gp-ext-imp.pl | 86 -
utils/parallel/gr2RTS.pl | 138 --
utils/parallel/gr2ap.bash | 124 -
utils/parallel/gr2gran.bash | 113 -
utils/parallel/gr2java.pl | 322 ---
utils/parallel/gr2jv.bash | 123 -
utils/parallel/gr2pe.pl | 1434 -----------
utils/parallel/gr2ps.bash | 169 --
utils/parallel/gr2qp.pl | 329 ---
utils/parallel/gran-extr.pl | 2114 ----------------
utils/parallel/grs2gr.pl | 48 -
utils/parallel/par-aux.pl | 89 -
utils/parallel/ps-scale-y.pl | 188 --
utils/parallel/qp2ap.pl | 495 ----
utils/parallel/qp2ps.pl | 988 --------
utils/parallel/sn_filter.pl | 92 -
utils/parallel/stats.pl | 168 --
utils/parallel/template.pl | 141 --
utils/parallel/tf.pl | 148 --
utils/runghc/ghc.mk | 2 +-
utils/stat2resid/Makefile | 41 -
utils/stat2resid/parse-gcstats.prl | 232 --
utils/stat2resid/prefix.txt | 10 -
utils/stat2resid/process-gcstats.prl | 45 -
utils/stat2resid/stat2resid.prl | 81 -
utils/touchy/ghc.mk | 2 +-
utils/unlit/ghc.mk | 2 +-
utils/verbatim/Makefile | 17 -
utils/verbatim/verbatim.lex | 63 -
171 files changed, 2552 insertions(+), 30528 deletions(-)
More information about the ghc-commits
mailing list