Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/650f76fe29394adac14fd59cafe72cec3125daf5

>---------------------------------------------------------------

commit 650f76fe29394adac14fd59cafe72cec3125daf5
Merge: b585312... 909d52e...
Author: Simon Peyton Jones <simo...@microsoft.com>
Date:   Wed Dec 19 10:32:09 2012 +0000

    Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc

 compiler/basicTypes/Literal.lhs     |    7 +-
 compiler/codeGen/StgCmmUtils.hs     |    3 +-
 compiler/coreSyn/CoreUnfold.lhs     |    3 +-
 compiler/coreSyn/MkCore.lhs         |    4 +-
 compiler/coreSyn/MkExternalCore.lhs |    3 +-
 compiler/deSugar/Check.lhs          |    2 +-
 compiler/deSugar/DsBinds.lhs        |    2 +-
 compiler/deSugar/MatchLit.lhs       |    6 +-
 compiler/hsSyn/Convert.lhs          |  356 +++++++++++-----------
 compiler/hsSyn/HsLit.lhs            |    3 +-
 compiler/main/DriverPipeline.hs     |   27 ++-
 compiler/main/DynFlags.hs           |   22 ++-
 compiler/nativeGen/AsmCodeGen.lhs   |  138 +++++----
 compiler/nativeGen/PPC/Instr.hs     |  575 +++++++++++++++++++----------------
 compiler/nativeGen/X86/Instr.hs     |    2 +-
 compiler/parser/Lexer.x             |    7 +-
 compiler/parser/ParserCore.y        |    2 +-
 compiler/prelude/PrelRules.lhs      |    3 +-
 compiler/rename/RnExpr.lhs          |    2 +-
 compiler/typecheck/TcInstDcls.lhs   |    2 +-
 compiler/typecheck/TcTyClsDecls.lhs |    2 +-
 compiler/utils/Binary.hs            |   28 +-
 compiler/utils/BufWrite.hs          |    5 +-
 compiler/utils/FastString.lhs       |   88 ++-----
 compiler/utils/Outputable.lhs       |    6 +-
 docs/users_guide/ghci.xml           |    5 +-
 rts/STM.c                           |   84 +++---
 27 files changed, 715 insertions(+), 672 deletions(-)




_______________________________________________
Cvs-ghc mailing list
Cvs-ghc@haskell.org
http://www.haskell.org/mailman/listinfo/cvs-ghc

Reply via email to