Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/012596565fe588037fda352b6e9fc6dd29c723ff >--------------------------------------------------------------- commit 012596565fe588037fda352b6e9fc6dd29c723ff Merge: 70b0f16... 1a4ae30... Author: Simon Peyton Jones <[email protected]> Date: Thu Apr 5 11:39:46 2012 +0100 Merge branch 'master' of http://darcs.haskell.org//ghc compiler/basicTypes/RdrName.lhs | 2 +- compiler/coreSyn/CoreLint.lhs | 12 +- compiler/coreSyn/CoreUtils.lhs | 17 +- compiler/coreSyn/TrieMap.lhs | 35 ++- compiler/deSugar/Desugar.lhs | 3 + compiler/deSugar/DsMeta.hs | 84 ++- compiler/ghc.cabal.in | 38 +- compiler/hsSyn/Convert.lhs | 2 +- compiler/iface/MkIface.lhs | 43 +- compiler/main/DynFlags.hs | 29 +- compiler/main/ErrUtils.lhs | 5 +- compiler/main/GHC.hs | 50 ++- compiler/main/HscMain.hs | 155 +++--- compiler/main/HscTypes.lhs | 17 +- compiler/main/Packages.lhs | 265 +++++----- compiler/parser/Lexer.x | 25 +- compiler/parser/Parser.y.pp | 5 + compiler/rename/RnSource.lhs | 10 +- compiler/simplCore/OccurAnal.lhs | 111 ++++- compiler/simplCore/SimplUtils.lhs | 1 + compiler/simplCore/Simplify.lhs | 1 + compiler/typecheck/Inst.lhs | 52 ++- compiler/typecheck/TcCanonical.lhs | 871 ++++++++++++------------------ compiler/typecheck/TcEnv.lhs | 28 +- compiler/typecheck/TcErrors.lhs | 60 ++- compiler/typecheck/TcForeign.lhs | 15 +- compiler/typecheck/TcInteract.lhs | 825 ++++++++++++++++------------- compiler/typecheck/TcMType.lhs | 125 +++-- compiler/typecheck/TcRnDriver.lhs | 26 +- compiler/typecheck/TcRnMonad.lhs | 9 + compiler/typecheck/TcRnTypes.lhs | 180 ++++--- compiler/typecheck/TcSMonad.lhs | 1058 +++++++++++++++++++---------------- compiler/typecheck/TcSimplify.lhs | 100 ++-- compiler/typecheck/TcSplice.lhs | 33 +- compiler/typecheck/TcType.lhs | 45 ++- compiler/typecheck/TcUnify.lhs | 2 +- compiler/types/Unify.lhs | 6 + compiler/utils/Panic.lhs | 14 +- docs/users_guide/flags.xml | 6 + docs/users_guide/glasgow_exts.xml | 51 ++- docs/users_guide/using.xml | 131 ++--- ghc/InteractiveUI.hs | 3 +- includes/rts/EventLogFormat.h | 27 +- includes/rts/storage/GC.h | 4 +- mk/config.mk.in | 2 +- rts/Capability.c | 22 +- rts/Capability.h | 2 + rts/Linker.c | 345 ++++++++++++- rts/LinkerInternals.h | 6 +- rts/RtsFlags.c | 2 +- rts/RtsProbes.d | 36 +- rts/Schedule.c | 7 +- rts/Stats.c | 97 +++- rts/Stats.h | 8 +- rts/Trace.c | 98 ++++- rts/Trace.h | 245 ++++++++- rts/eventlog/EventLog.c | 196 +++++++- rts/eventlog/EventLog.h | 34 ++ rts/sm/GC.c | 25 +- rts/sm/Storage.c | 58 ++- rts/sm/Storage.h | 3 +- 61 files changed, 3571 insertions(+), 2196 deletions(-) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
