Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : type-nats
http://hackage.haskell.org/trac/ghc/changeset/deed56f4473d93a40159ea5422d1840512952f3f >--------------------------------------------------------------- commit deed56f4473d93a40159ea5422d1840512952f3f Merge: 62b25ec... d7bd9ee... Author: Iavor S. Diatchki <[email protected]> Date: Mon Mar 19 20:11:50 2012 -0700 Merge remote-tracking branch 'origin/master' into type-nats aclocal.m4 | 29 +++++--- compiler/cmm/PprC.hs | 9 ++- compiler/coreSyn/CorePrep.lhs | 14 +++-- compiler/deSugar/DsMeta.hs | 87 ++++++++++++++++++++----- compiler/ghc.mk | 3 +- compiler/hsSyn/Convert.lhs | 30 ++++++--- compiler/hsSyn/HsDecls.lhs | 6 +- compiler/hsSyn/HsTypes.lhs | 22 +----- compiler/hsSyn/HsUtils.lhs | 2 +- compiler/parser/Parser.y.pp | 8 +- compiler/parser/ParserCore.y | 2 +- compiler/parser/RdrHsSyn.lhs | 11 ++-- compiler/rename/RnTypes.lhs | 24 ++++--- compiler/typecheck/TcEnv.lhs | 7 +-- compiler/typecheck/TcForeign.lhs | 45 +++++++------- compiler/typecheck/TcHsType.lhs | 10 ++-- compiler/typecheck/TcTyClsDecls.lhs | 7 +- compiler/typecheck/TcType.lhs | 9 ++- compiler/types/FamInstEnv.lhs | 1 - compiler/utils/Outputable.lhs | 5 +- configure.ac | 117 ++++++++++++++++++++--------------- docs/users_guide/glasgow_exts.xml | 29 +++++---- driver/ghci/ghc.mk | 4 +- driver/utils/cwrapper.c | 6 +- ghc/ghc.mk | 9 +++ includes/Cmm.h | 2 +- includes/HaskellConstants.hs | 6 ++ includes/MachDeps.h | 15 ++--- includes/Rts.h | 7 ++ includes/RtsAPI.h | 2 +- includes/rts/storage/InfoTables.h | 2 +- includes/stg/DLL.h | 4 +- mk/config.mk.in | 6 ++ rts/ClosureFlags.c | 18 +++--- rts/HeapStackCheck.cmm | 10 +++- rts/Interpreter.c | 4 +- rts/Linker.c | 37 +++++++----- rts/PrimOps.cmm | 2 +- rts/Printer.c | 2 +- rts/RtsMain.c | 4 +- rts/Schedule.c | 2 +- rts/StgCRun.c | 8 +++ rts/StgMiscClosures.cmm | 6 +- rts/ghc.mk | 8 ++- rts/win32/AwaitEvent.c | 4 +- rts/win32/ThrIOManager.c | 2 +- rts/win32/seh_excn.c | 5 +- utils/fingerprint/fingerprint.py | 2 +- 48 files changed, 397 insertions(+), 257 deletions(-) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
