[commit: ghc] overlapping-tyfams: Fixed bugs in overlapping type family instances. (728f4cf)

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

On branch  : overlapping-tyfams

http://hackage.haskell.org/trac/ghc/changeset/728f4cf1da5e0297e55b3ee9b7ceda82a4543d90

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

commit 728f4cf1da5e0297e55b3ee9b7ceda82a4543d90
Author: Richard Eisenberg <[email protected]>
Date:   Wed Nov 21 09:36:02 2012 -0500

    Fixed bugs in overlapping type family instances.
    
    The biggest change is adding group tracking -- whether or not
    an instance was declared with group syntax. This allows finer control
    over when to allow confluent overlap. Another change was how locations
    of instances are tracked. They are now tracked using a SrcSpan in a
    FamInstBranch.

 compiler/hsSyn/Convert.lhs        |    1 +
 compiler/hsSyn/HsDecls.lhs        |   12 ++--
 compiler/iface/BinIface.hs        |    6 +-
 compiler/iface/IfaceSyn.lhs       |    1 +
 compiler/iface/MkIface.lhs        |    2 +
 compiler/iface/TcIface.lhs        |    4 +-
 compiler/parser/RdrHsSyn.lhs      |   10 ++-
 compiler/rename/RnSource.lhs      |    6 +-
 compiler/typecheck/FamInst.lhs    |   96 +++++++++++++++++++++----
 compiler/typecheck/TcInstDcls.lhs |   17 +++--
 compiler/types/FamInstEnv.lhs     |  139 +++++++++++++++++++++++++------------
 11 files changed, 208 insertions(+), 86 deletions(-)


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

    git show 728f4cf1da5e0297e55b3ee9b7ceda82a4543d90