Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/50fd5a991f8a941f7357f48c98463d0ed1991fab >--------------------------------------------------------------- commit 50fd5a991f8a941f7357f48c98463d0ed1991fab Merge: 4ada19d... 3a3dcc3... Author: Simon Peyton Jones <[email protected]> Date: Thu Jan 12 17:21:00 2012 +0000 Merge branch 'master' of http://darcs.haskell.org/ghc aclocal.m4 | 8 +- compiler/coreSyn/CoreLint.lhs | 76 ++-- compiler/deSugar/DsBinds.lhs | 5 + compiler/deSugar/DsMonad.lhs | 5 +- compiler/ghci/Linker.lhs | 4 +- 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 | 88 +++- compiler/llvmGen/Llvm/Types.hs | 39 ++- compiler/llvmGen/LlvmCodeGen/CodeGen.hs | 57 +- compiler/llvmGen/LlvmCodeGen/Ppr.hs | 16 +- compiler/llvmGen/LlvmCodeGen/Regs.hs | 45 ++- 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/parser/Lexer.x | 6 +- compiler/rename/RnEnv.lhs | 4 +- compiler/rename/RnNames.lhs | 6 +- compiler/simplCore/CoreMonad.lhs | 2 +- compiler/stgSyn/StgLint.lhs | 40 +- 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 | 19 +- 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 | 75 ++- compiler/typecheck/TcUnify.lhs | 162 ++---- compiler/types/InstEnv.lhs | 2 +- compiler/types/Unify.lhs | 6 +- distrib/MacOS/GHC.xcodeproj/project.pbxproj | 2 +- docs/users_guide/flags.xml | 32 +- docs/users_guide/using.xml | 26 + ghc.mk | 9 +- rts/Linker.c | 96 +++- rts/package.conf.in | 2 +- 57 files changed, 1641 insertions(+), 1202 deletions(-) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
