Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : type-nats
http://hackage.haskell.org/trac/ghc/changeset/9c1575228173218a3cfa06ddbec3865b12d87713 >--------------------------------------------------------------- commit 9c1575228173218a3cfa06ddbec3865b12d87713 Merge: d0e3776... f438722... Author: Iavor S. Diatchki <[email protected]> Date: Tue Jan 24 19:40:06 2012 -0800 Merge remote-tracking branch 'origin/master' into type-nats Conflicts: compiler/typecheck/TcEvidence.lhs .gitignore | 5 + aclocal.m4 | 9 + compiler/codeGen/StgCmmPrim.hs | 24 +- 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 | 65 +- compiler/deSugar/DsExpr.lhs | 10 +- compiler/deSugar/DsForeign.lhs | 2 +- compiler/deSugar/DsListComp.lhs | 2 +- compiler/deSugar/DsMonad.lhs | 9 +- compiler/deSugar/Match.lhs | 2 +- compiler/ghc.cabal.in | 5 +- compiler/iface/BinIface.hs | 13 +- compiler/iface/LoadIface.lhs | 6 +- compiler/iface/MkIface.lhs | 10 +- compiler/iface/TcIface.lhs | 42 +- 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/CodeOutput.lhs | 159 +- compiler/main/DriverPipeline.hs | 45 +- compiler/main/DynFlags.hs | 43 +- compiler/main/Finder.lhs | 4 +- compiler/main/GHC.hs | 4 +- compiler/main/GhcMake.hs | 20 +- compiler/main/HscTypes.lhs | 24 +- compiler/main/TidyPgm.lhs | 1 + compiler/parser/LexCore.hs | 54 +- compiler/parser/Lexer.x | 2 - 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 | 10 +- compiler/rename/RnExpr.lhs | 2 +- compiler/rename/RnNames.lhs | 4 +- compiler/rename/RnSource.lhs | 4 +- compiler/rename/RnTypes.lhs | 8 +- 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/stranal/DmdAnal.lhs | 17 +- compiler/typecheck/FamInst.lhs | 3 +- compiler/typecheck/Inst.lhs | 2 +- compiler/typecheck/TcBinds.lhs | 7 +- compiler/typecheck/TcClassDcl.lhs | 2 +- compiler/typecheck/TcDeriv.lhs | 6 +- compiler/typecheck/TcEnv.lhs | 2 +- compiler/typecheck/TcErrors.lhs | 2 +- compiler/typecheck/TcEvidence.lhs | 18 +- compiler/typecheck/TcExpr.lhs | 2 +- compiler/typecheck/TcForeign.lhs | 12 +- compiler/typecheck/TcGenGenerics.lhs | 2 +- compiler/typecheck/TcHsType.lhs | 6 +- compiler/typecheck/TcInstDcls.lhs | 39 +- compiler/typecheck/TcInteract.lhs | 67 +- compiler/typecheck/TcMType.lhs | 4 +- compiler/typecheck/TcMatches.lhs | 2 +- compiler/typecheck/TcRnDriver.lhs | 8 +- compiler/typecheck/TcRnMonad.lhs | 21 +- compiler/typecheck/TcRnTypes.lhs | 4 + compiler/typecheck/TcSMonad.lhs | 2 +- compiler/typecheck/TcSimplify.lhs-old | 3297 --------------- compiler/typecheck/TcSplice.lhs | 3 +- compiler/typecheck/TcTyClsDecls.lhs | 16 +- compiler/types/Coercion.lhs | 23 +- 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 | 5610 +++++++++++++------------ docs/users_guide/glasgow_exts.xml | 20 +- docs/users_guide/runtime_control.xml | 11 + 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/posix/Itimer.c | 4 +- rts/posix/Select.c | 33 +- settings.in | 2 +- utils/ghc-cabal/ghc-cabal.cabal | 2 +- 99 files changed, 3949 insertions(+), 6792 deletions(-) Diff suppressed because of size. To see it, use: git show 9c1575228173218a3cfa06ddbec3865b12d87713 _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
