Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : type-holes-branch
http://hackage.haskell.org/trac/ghc/changeset/4ca93b057da3a1cda4fa51eed805ddcf049e0098 >--------------------------------------------------------------- commit 4ca93b057da3a1cda4fa51eed805ddcf049e0098 Merge: 69bff6a... f438722... Author: Thijs Alkemade <[email protected]> Date: Wed Jan 25 18:39:51 2012 +0100 Merge git://github.com/ghc/ghc .gitignore | 5 + aclocal.m4 | 9 + compiler/codeGen/StgCmmPrim.hs | 24 +- compiler/coreSyn/CoreLint.lhs | 76 +- compiler/coreSyn/CorePrep.lhs | 2 +- compiler/coreSyn/CoreSyn.lhs | 8 +- compiler/coreSyn/CoreUtils.lhs | 59 +- compiler/coreSyn/MkCore.lhs | 22 + compiler/deSugar/Coverage.lhs | 7 +- compiler/deSugar/DsBinds.lhs | 70 +- compiler/deSugar/DsExpr.lhs | 10 +- compiler/deSugar/DsForeign.lhs | 2 +- compiler/deSugar/DsListComp.lhs | 2 +- compiler/deSugar/DsMonad.lhs | 14 +- compiler/deSugar/Match.lhs | 2 +- compiler/ghc.cabal.in | 5 +- compiler/ghci/Linker.lhs | 4 +- compiler/hsSyn/Convert.lhs | 20 +- compiler/iface/BinIface.hs | 13 +- compiler/iface/LoadIface.lhs | 16 +- compiler/iface/MkIface.lhs | 12 +- compiler/iface/TcIface.lhs | 44 +- compiler/llvmGen/Llvm/Types.hs | 5 +- compiler/llvmGen/LlvmCodeGen.hs | 7 +- compiler/llvmGen/LlvmCodeGen/Base.hs | 16 +- compiler/llvmGen/LlvmCodeGen/CodeGen.hs | 31 +- compiler/llvmGen/LlvmCodeGen/Regs.hs | 13 +- compiler/main/CmdLineParser.hs | 3 +- compiler/main/CodeOutput.lhs | 159 +- compiler/main/DriverPipeline.hs | 45 +- compiler/main/DynFlags.hs | 59 +- compiler/main/ErrUtils.lhs | 157 +- compiler/main/ErrUtils.lhs-boot | 4 +- compiler/main/Finder.lhs | 4 +- compiler/main/GHC.hs | 4 +- compiler/main/GhcMake.hs | 20 +- compiler/main/HeaderInfo.hs | 2 +- compiler/main/HscMain.hs | 8 +- compiler/main/HscTypes.lhs | 28 +- compiler/main/Packages.lhs | 8 +- compiler/main/TidyPgm.lhs | 1 + compiler/parser/LexCore.hs | 54 +- compiler/parser/Lexer.x | 8 +- compiler/parser/Parser.y.pp | 25 +- compiler/prelude/PrelNames.lhs | 8 +- compiler/prelude/PrimOp.lhs | 163 +- compiler/prelude/primops.txt.pp | 5 +- compiler/rename/RnEnv.lhs | 14 +- compiler/rename/RnExpr.lhs | 2 +- compiler/rename/RnNames.lhs | 10 +- compiler/rename/RnSource.lhs | 4 +- compiler/rename/RnTypes.lhs | 8 +- compiler/simplCore/CoreMonad.lhs | 2 +- compiler/simplCore/FloatIn.lhs | 121 +- compiler/simplCore/FloatOut.lhs | 20 +- compiler/simplCore/SetLevels.lhs | 4 +- compiler/simplCore/SimplEnv.lhs | 1 + compiler/simplCore/SimplMonad.lhs | 8 +- compiler/simplCore/SimplUtils.lhs | 4 +- compiler/simplCore/Simplify.lhs | 25 +- compiler/stgSyn/StgLint.lhs | 40 +- compiler/stranal/DmdAnal.lhs | 17 +- compiler/typecheck/FamInst.lhs | 3 +- compiler/typecheck/Inst.lhs | 62 +- compiler/typecheck/TcBinds.lhs | 11 +- compiler/typecheck/TcCanonical.lhs | 106 +- compiler/typecheck/TcClassDcl.lhs | 2 +- compiler/typecheck/TcDeriv.lhs | 16 +- compiler/typecheck/TcEnv.lhs | 2 +- compiler/typecheck/TcErrors.lhs | 872 +++-- compiler/typecheck/TcEvidence.lhs | 19 +- compiler/typecheck/TcExpr.lhs | 4 +- compiler/typecheck/TcForeign.lhs | 16 +- compiler/typecheck/TcGenGenerics.lhs | 2 +- compiler/typecheck/TcHsSyn.lhs | 3 + compiler/typecheck/TcHsType.lhs | 6 +- compiler/typecheck/TcInstDcls.lhs | 39 +- compiler/typecheck/TcInteract.lhs | 110 +- compiler/typecheck/TcMType.lhs | 17 +- compiler/typecheck/TcMatches.lhs | 20 +- compiler/typecheck/TcRnDriver.lhs | 10 +- compiler/typecheck/TcRnMonad.lhs | 166 +- compiler/typecheck/TcRnTypes.lhs | 206 +- compiler/typecheck/TcSMonad.lhs | 86 +- compiler/typecheck/TcSimplify.lhs | 140 +- compiler/typecheck/TcSimplify.lhs-old | 3297 --------------- compiler/typecheck/TcSplice.lhs | 11 +- compiler/typecheck/TcTyClsDecls.lhs | 16 +- compiler/typecheck/TcType.lhs | 75 +- compiler/typecheck/TcUnify.lhs | 162 +- compiler/types/Coercion.lhs | 23 +- compiler/types/InstEnv.lhs | 2 +- compiler/types/Unify.lhs | 6 +- compiler/utils/Binary.hs | 18 + compiler/utils/IOEnv.hs | 5 + compiler/utils/Util.lhs | 30 +- compiler/vectorise/Vectorise/Monad.hs | 6 +- compiler/vectorise/Vectorise/Type/Classify.hs | 10 +- compiler/vectorise/Vectorise/Type/Env.hs | 31 +- configure.ac | 3 +- distrib/configure.ac.in | 4 +- docs/users_guide/bugs.xml | 92 + docs/users_guide/flags.xml | 5596 +++++++++++++------------ docs/users_guide/glasgow_exts.xml | 20 +- docs/users_guide/runtime_control.xml | 11 + docs/users_guide/using.xml | 26 + ghc.mk | 107 +- ghc/InteractiveUI.hs | 2 +- includes/Rts.h | 2 +- libraries/bin-package-db/bin-package-db.cabal | 2 +- mk/build.mk.sample | 27 +- mk/validate-settings.mk | 3 + rts/Capability.c | 1 + rts/Stats.c | 7 +- rts/package.conf.in | 2 +- rts/posix/Itimer.c | 4 +- rts/posix/Select.c | 33 +- settings.in | 2 +- utils/ghc-cabal/ghc-cabal.cabal | 2 +- 119 files changed, 5235 insertions(+), 7864 deletions(-) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
