[commit: ghc] type-nats: Squashed commit of the following: (9df6bbf)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : type-nats
Link       : http://ghc.haskell.org/trac/ghc/changeset/9df6bbfcf699daeebf60e3281a0b9506e65cff35/ghc

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

commit 9df6bbfcf699daeebf60e3281a0b9506e65cff35
Author: Iavor S. Diatchki <iavor.diatchki at gmail.com>
Date:   Sun Sep 1 12:21:56 2013 -0700

    Squashed commit of the following:
    
    commit e25c23444320f76f8cd7309399c8144b4fb748e4
    Author: Iavor S. Diatchki <iavor.diatchki at gmail.com>
    Date:   Sun Sep 1 11:57:50 2013 -0700
    
        Rename TypeNatCo (and friends) to AxiomRuleCo
    
    commit bb105329c6f8f675e42166f51a3ee3cc7fe6d632
    Author: Iavor S. Diatchki <iavor.diatchki at gmail.com>
    Date:   Sun Sep 1 11:33:20 2013 -0700
    
        Move CoAxiomRule into CoAxiom
    
    commit 2d361d0b065d8f605d909d28c99b2126469165d4
    Author: Iavor S. Diatchki <iavor.diatchki at gmail.com>
    Date:   Sun Sep 1 11:32:30 2013 -0700
    
        Squash changes to type nats and merge with master in a single commit.
    
        This is useful in preparation for merging with master, and the history
        is not particularly interesting.


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

9df6bbfcf699daeebf60e3281a0b9506e65cff35
 compiler/basicTypes/Unique.lhs        |    5 +
 compiler/coreSyn/CoreLint.lhs         |   31 +
 compiler/coreSyn/MkExternalCore.lhs   |    1 +
 compiler/coreSyn/TrieMap.lhs          |   16 +-
 compiler/deSugar/DsBinds.lhs          |    4 +
 compiler/ghc.cabal.in                 |    3 +
 compiler/iface/IfaceSyn.lhs           |    5 +
 compiler/iface/IfaceType.lhs          |   23 +
 compiler/iface/MkIface.lhs            |    3 +
 compiler/iface/TcIface.lhs            |   12 +
 compiler/main/HscTypes.lhs            |    2 +
 compiler/main/PprTyThing.hs           |    2 +
 compiler/prelude/PrelInfo.lhs         |    3 +
 compiler/prelude/PrelNames.lhs        |   41 +-
 compiler/prelude/TysWiredIn.lhs       |  134 +++-
 compiler/typecheck/TcEvidence.lhs     |   26 +-
 compiler/typecheck/TcHsSyn.lhs        |    4 +
 compiler/typecheck/TcInteract.lhs     |    5 +-
 compiler/typecheck/TcSMonad.lhs       |    3 +
 compiler/typecheck/TcType.lhs         |    2 +
 compiler/typecheck/TcTypeNats.hs      | 1428 +++++++++++++++++++++++++++++++++
 compiler/typecheck/TcTypeNatsEval.hs  |  204 +++++
 compiler/typecheck/TcTypeNatsRules.hs |  267 ++++++
 compiler/types/CoAxiom.lhs            |   83 +-
 compiler/types/Coercion.lhs           |   38 +
 compiler/types/OptCoercion.lhs        |    6 +
 compiler/types/Type.lhs               |   60 ++
 compiler/types/TypeRep.lhs            |    4 +
 compiler/types/TypeRep.lhs-boot       |    1 +
 ghc/GhciTags.hs                       |    3 +
 30 files changed, 2401 insertions(+), 18 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 9df6bbfcf699daeebf60e3281a0b9506e65cff35