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

On branch  : type-nats

http://hackage.haskell.org/trac/ghc/changeset/0ff88164eeb6a70ae83631679ecbce3e4d60f139

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

commit 0ff88164eeb6a70ae83631679ecbce3e4d60f139
Merge: 9efd621... 4527991...
Author: Iavor S. Diatchki <iavor.diatc...@gmail.com>
Date:   Fri Dec 28 16:15:15 2012 -0800

    Merge remote-tracking branch 'origin/master' into type-nats

 compiler/basicTypes/BasicTypes.lhs             |   51 ------
 compiler/basicTypes/DataCon.lhs                |   52 ++++++-
 compiler/basicTypes/MkId.lhs                   |  229 ++++++++++++++----------
 compiler/deSugar/DsArrows.lhs                  |   76 ++++----
 compiler/hsSyn/HsTypes.lhs                     |    1 +
 compiler/iface/BinIface.hs                     |   20 +--
 compiler/iface/BuildTyCl.lhs                   |   12 +-
 compiler/iface/IfaceSyn.lhs                    |   14 +-
 compiler/iface/MkIface.lhs                     |    8 +-
 compiler/iface/TcIface.lhs                     |   13 ++-
 compiler/main/PprTyThing.hs                    |    3 +-
 compiler/prelude/PrelNames.lhs                 |    3 +-
 compiler/prelude/TysWiredIn.lhs                |    2 +-
 compiler/simplCore/Simplify.lhs                |    4 +-
 compiler/stranal/DmdAnal.lhs                   |    4 +-
 compiler/typecheck/TcCanonical.lhs             |   10 +-
 compiler/typecheck/TcGenDeriv.lhs              |   43 +++--
 compiler/typecheck/TcInteract.lhs              |   38 ++++-
 compiler/typecheck/TcRnDriver.lhs              |    2 +-
 compiler/typecheck/TcSMonad.lhs                |    4 +
 compiler/typecheck/TcSimplify.lhs              |   24 ++--
 compiler/typecheck/TcSplice.lhs                |   10 +-
 compiler/typecheck/TcTyClsDecls.lhs            |    6 +-
 compiler/vectorise/Vectorise/Generic/PData.hs  |    9 +-
 compiler/vectorise/Vectorise/Type/TyConDecl.hs |    4 +-
 25 files changed, 376 insertions(+), 266 deletions(-)




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

Reply via email to