Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : ghc-axioms
http://hackage.haskell.org/trac/ghc/changeset/1cd8ff02dd9e25abe326ea3fecec036c8f23ef5f >--------------------------------------------------------------- commit 1cd8ff02dd9e25abe326ea3fecec036c8f23ef5f Merge: 2ac6422... b0c0205... Author: Simon Peyton Jones <[email protected]> Date: Tue Jan 3 08:47:43 2012 +0000 Merge commit with HEAD compiler/basicTypes/Name.lhs | 3 + compiler/basicTypes/RdrName.lhs | 7 +- compiler/cmm/CmmParse.y | 2 +- compiler/codeGen/CgMonad.lhs | 4 +- compiler/codeGen/CgProf.hs | 2 +- compiler/codeGen/StgCmmMonad.hs | 4 +- compiler/codeGen/StgCmmProf.hs | 16 +- compiler/coreSyn/CoreLint.lhs | 43 +-- compiler/coreSyn/CoreSyn.lhs | 2 + compiler/coreSyn/CoreUtils.lhs | 8 +- compiler/coreSyn/MkCore.lhs | 2 +- compiler/coreSyn/PprCore.lhs | 3 + compiler/deSugar/DsArrows.lhs | 238 +++++---- compiler/deSugar/DsBinds.lhs | 4 +- compiler/deSugar/DsUtils.lhs | 2 +- compiler/hsSyn/HsDecls.lhs | 4 +- compiler/hsSyn/HsExpr.lhs | 19 +- compiler/hsSyn/HsImpExp.lhs | 8 +- compiler/hsSyn/HsTypes.lhs | 13 + compiler/hsSyn/HsUtils.lhs | 2 +- compiler/iface/IfaceSyn.lhs | 36 +- compiler/iface/MkIface.lhs | 11 +- compiler/iface/TcIface.lhs | 2 +- compiler/main/DriverPipeline.hs | 15 +- compiler/main/DynFlags.hs | 41 +- compiler/main/GHC.hs | 451 ++++++++-------- compiler/main/GhcMonad.hs | 9 +- compiler/main/HscMain.hs | 191 ++++--- compiler/main/InteractiveEval.hs | 95 ++-- compiler/main/TidyPgm.lhs | 4 +- compiler/nativeGen/AsmCodeGen.lhs | 18 +- compiler/nativeGen/NCGMonad.hs | 14 +- compiler/nativeGen/PPC/CodeGen.hs | 18 +- compiler/nativeGen/RegAlloc/Liveness.hs | 2 +- compiler/nativeGen/SPARC/CodeGen.hs | 2 +- compiler/nativeGen/SPARC/CodeGen/CCall.hs | 4 +- compiler/nativeGen/SPARC/CodeGen/CondCode.hs | 4 +- compiler/nativeGen/SPARC/CodeGen/Gen64.hs | 4 +- compiler/nativeGen/X86/CodeGen.hs | 26 +- compiler/nativeGen/X86/Instr.hs | 66 ++-- compiler/parser/Lexer.x | 4 +- compiler/parser/Parser.y.pp | 53 +- compiler/parser/RdrHsSyn.lhs | 22 +- compiler/prelude/PrimOp.lhs | 136 +++-- compiler/prelude/TysWiredIn.lhs | 8 +- compiler/prelude/primops.txt.pp | 5 +- compiler/rename/RnBinds.lhs | 8 +- compiler/rename/RnEnv.lhs | 20 +- compiler/rename/RnNames.lhs | 16 +- compiler/rename/RnPat.lhs | 2 +- compiler/rename/RnSource.lhs | 88 ++- compiler/simplCore/CoreMonad.lhs | 6 +- compiler/typecheck/TcArrows.lhs | 27 +- compiler/typecheck/TcBinds.lhs | 31 +- compiler/typecheck/TcCanonical.lhs | 232 +++----- compiler/typecheck/TcDeriv.lhs | 2 +- compiler/typecheck/TcErrors.lhs | 9 +- compiler/typecheck/TcEvidence.lhs | 45 ++- compiler/typecheck/TcForeign.lhs | 6 +- compiler/typecheck/TcGenDeriv.lhs | 57 +- compiler/typecheck/TcHsSyn.lhs | 50 ++- compiler/typecheck/TcHsType.lhs | 15 +- compiler/typecheck/TcInstDcls.lhs | 121 +++-- compiler/typecheck/TcInteract.lhs | 153 +++++- compiler/typecheck/TcMType.lhs | 4 + compiler/typecheck/TcMatches.lhs | 3 +- compiler/typecheck/TcRnMonad.lhs | 11 +- compiler/typecheck/TcRnTypes.lhs | 5 + compiler/typecheck/TcSMonad.lhs | 96 +--- compiler/typecheck/TcSplice.lhs | 53 +- compiler/types/Class.lhs | 2 +- compiler/types/Type.lhs | 14 +- compiler/types/TypeRep.lhs | 73 +-- compiler/utils/Exception.hs | 8 - compiler/utils/Outputable.lhs | 39 +- compiler/utils/Util.lhs | 31 +- compiler/vectorise/Vectorise.hs | 16 +- compiler/vectorise/Vectorise/Builtins.hs | 7 +- compiler/vectorise/Vectorise/Env.hs | 3 + compiler/vectorise/Vectorise/Exp.hs | 55 ++- compiler/vectorise/Vectorise/Monad/Global.hs | 17 +- compiler/vectorise/Vectorise/Type/Classify.hs | 10 +- compiler/vectorise/Vectorise/Type/TyConDecl.hs | 15 +- configure.ac | 8 +- docs/users_guide/glasgow_exts.xml | 50 ++- ghc/GhciMonad.hs | 68 +-- ghc/InteractiveUI.hs | 715 ++++++++++++------------ ghc/Main.hs | 123 ++--- includes/rts/Flags.h | 8 + includes/rts/prof/CCS.h | 2 +- mk/config.mk.in | 3 - rts/Capability.c | 20 +- rts/Capability.h | 7 + rts/RtsFlags.c | 37 +- rts/Schedule.c | 308 ++++++++--- rts/Schedule.h | 1 - rts/StgCRun.c | 12 + rts/ghc.mk | 2 +- rts/hooks/OutOfHeap.c | 8 +- rts/posix/GetTime.c | 3 + rts/posix/Signals.c | 67 ++- rts/sm/GC.c | 37 +- rts/sm/GCThread.h | 1 + rts/sm/Storage.c | 18 +- rules/package-config.mk | 4 - sync-all | 111 +++-- utils/count_lines/count_lines.lprl | 3 +- 107 files changed, 2636 insertions(+), 1957 deletions(-) Diff suppressed because of size. To see it, use: git show 1cd8ff02dd9e25abe326ea3fecec036c8f23ef5f _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
