Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : type-nats
http://hackage.haskell.org/trac/ghc/changeset/d0e3776f8e4d954160437db27465f1af3c2aea36 >--------------------------------------------------------------- commit d0e3776f8e4d954160437db27465f1af3c2aea36 Merge: 2307516... 3a3dcc3... Author: Simon Peyton Jones <[email protected]> Date: Mon Jan 23 12:12:11 2012 +0000 Merge in more HEAD, fix stuff up aclocal.m4 | 54 ++- compiler/cmm/CmmCvt.hs | 4 +- compiler/cmm/CmmLint.hs | 2 +- compiler/cmm/CmmOpt.hs | 6 +- compiler/cmm/CmmParse.y | 8 +- compiler/cmm/OldCmm.hs | 54 +- compiler/cmm/OldPprCmm.hs | 28 +- compiler/cmm/PprC.hs | 4 +- compiler/codeGen/CgClosure.lhs | 10 +- compiler/codeGen/CgCon.lhs | 13 +- compiler/codeGen/CgExpr.lhs | 8 +- compiler/codeGen/CgHeapery.lhs | 90 ++-- compiler/codeGen/CgInfoTbls.hs | 8 +- compiler/codeGen/CgMonad.lhs | 2 +- compiler/codeGen/CgTailCall.lhs | 88 ++-- compiler/codeGen/CgUtils.hs | 2 +- compiler/coreSyn/CoreLint.lhs | 76 ++-- compiler/coreSyn/CoreSyn.lhs | 8 + compiler/deSugar/DsBinds.lhs | 8 +- compiler/deSugar/DsMonad.lhs | 5 +- compiler/ghc.mk | 2 +- compiler/ghci/Linker.lhs | 4 +- compiler/ghci/ObjLink.lhs | 38 +- compiler/hsSyn/Convert.lhs | 20 +- compiler/iface/LoadIface.lhs | 10 +- compiler/iface/MkIface.lhs | 2 +- compiler/iface/TcIface.lhs | 2 +- compiler/llvmGen/Llvm.hs | 6 +- compiler/llvmGen/Llvm/AbsSyn.hs | 15 + compiler/llvmGen/Llvm/PpLlvm.hs | 124 +++- compiler/llvmGen/Llvm/Types.hs | 39 ++- compiler/llvmGen/LlvmCodeGen.hs | 1 + compiler/llvmGen/LlvmCodeGen/CodeGen.hs | 87 ++-- compiler/llvmGen/LlvmCodeGen/Ppr.hs | 16 +- compiler/llvmGen/LlvmCodeGen/Regs.hs | 51 ++- compiler/main/CmdLineParser.hs | 3 +- compiler/main/DynFlags.hs | 16 +- compiler/main/ErrUtils.lhs | 157 +++--- compiler/main/ErrUtils.lhs-boot | 4 +- compiler/main/HeaderInfo.hs | 2 +- compiler/main/HscMain.hs | 8 +- compiler/main/HscTypes.lhs | 4 +- compiler/main/Packages.lhs | 8 +- compiler/main/SysTools.lhs | 4 +- compiler/nativeGen/AsmCodeGen.lhs | 4 +- compiler/nativeGen/PPC/CodeGen.hs | 2 +- compiler/nativeGen/SPARC/CodeGen.hs | 2 +- compiler/nativeGen/X86/CodeGen.hs | 2 +- compiler/parser/Lexer.x | 6 +- compiler/parser/Parser.y.pp | 4 +- compiler/parser/RdrHsSyn.lhs | 12 +- compiler/prelude/PrelNames.lhs | 74 ++- compiler/prelude/PrelRules.lhs | 111 +++-- compiler/rename/RnEnv.lhs | 4 +- compiler/rename/RnNames.lhs | 6 +- compiler/simplCore/CoreMonad.lhs | 2 +- compiler/stgSyn/StgLint.lhs | 42 +- compiler/typecheck/Inst.lhs | 60 +-- compiler/typecheck/TcBinds.lhs | 4 +- compiler/typecheck/TcCanonical.lhs | 106 ++-- compiler/typecheck/TcDeriv.lhs | 10 +- compiler/typecheck/TcErrors.lhs | 872 ++++++++++++++++----------- compiler/typecheck/TcEvidence.lhs | 37 +- compiler/typecheck/TcExpr.lhs | 2 +- compiler/typecheck/TcForeign.lhs | 4 +- compiler/typecheck/TcHsSyn.lhs | 3 + compiler/typecheck/TcInteract.lhs | 77 ++-- compiler/typecheck/TcMType.lhs | 13 +- compiler/typecheck/TcMatches.lhs | 18 + compiler/typecheck/TcRnDriver.lhs | 2 +- compiler/typecheck/TcRnMonad.lhs | 149 +++-- compiler/typecheck/TcRnTypes.lhs | 202 ++++--- compiler/typecheck/TcSMonad.lhs | 84 +--- compiler/typecheck/TcSimplify.lhs | 140 +++-- compiler/typecheck/TcSplice.lhs | 8 +- compiler/typecheck/TcType.lhs | 77 ++- compiler/typecheck/TcUnify.lhs | 162 ++---- compiler/types/InstEnv.lhs | 2 +- compiler/types/Unify.lhs | 6 +- configure.ac | 12 + distrib/MacOS/GHC.xcodeproj/project.pbxproj | 2 +- docs/users_guide/flags.xml | 32 +- docs/users_guide/using.xml | 26 + ghc.mk | 31 +- includes/ghc.mk | 8 +- includes/rts/Linker.h | 18 +- includes/rts/storage/GC.h | 8 +- libraries/gen_contents_index | 21 +- mk/config.mk.in | 3 + mk/tree.mk | 2 +- rts/Capability.c | 2 +- rts/Linker.c | 232 +++++--- rts/LinkerInternals.h | 2 +- rts/Updates.cmm | 11 +- rts/ghc.mk | 4 +- rts/package.conf.in | 2 +- rules/hs-suffix-rules-srcdir.mk | 4 +- rules/manual-package-config.mk | 4 +- settings.in | 4 +- sync-all | 2 +- utils/genapply/ghc.mk | 6 +- utils/hp2ps/ghc.mk | 2 +- 102 files changed, 2266 insertions(+), 1582 deletions(-) Diff suppressed because of size. To see it, use: git show d0e3776f8e4d954160437db27465f1af3c2aea36 _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
