Changes to ghc(6) haddock(2)

Changes to ghc:
commit 9de7cefec507d0d682eab2bf69c4d4547602541d
Author: Austin Seipp <austin@well-typed.com>
Date:   Mon Jun 23 04:26:01 2014 -0500

    Revert "Store IfExtNames for PatSyn matchers and wrappers in interface file."

    This reverts commit e40bd13b5b509b76d61ae66247ded145d4af93ea.

    Signed-off-by: Austin Seipp <austin@well-typed.com>

commit 5eb0e9fcad134d5199f2c171b98a74ab09021466
Author: Austin Seipp <austin@well-typed.com>
Date:   Mon Jun 23 04:25:55 2014 -0500

    Revert "Fix egregious instantiation bug in matchOneConLike (fixing Trac #9023)"

    This reverts commit d1c2a2784ffc120bdd8f1fccc9cc61933c0cc5d0.

    Signed-off-by: Austin Seipp <austin@well-typed.com>

commit e86e5cd941c016a9fb8de379fc760b58ec79e93b
Author: Austin Seipp <austin@well-typed.com>
Date:   Mon Jun 23 04:25:46 2014 -0500

    Revert "Test Trac #9023"

    This reverts commit f6e494231b2ad00fa073fc6623a876ffe40e900e.

    Signed-off-by: Austin Seipp <austin@well-typed.com>

commit f6e494231b2ad00fa073fc6623a876ffe40e900e
Author: Simon Peyton Jones <simonpj@microsoft.com>
Date:   Thu Jun 5 12:26:24 2014 +0100

    Test Trac #9023

    (cherry picked from commit 1b45c6b4959762209dbcabf3290feb8673a60b23)

commit d1c2a2784ffc120bdd8f1fccc9cc61933c0cc5d0
Author: Simon Peyton Jones <simonpj@microsoft.com>
Date:   Thu Jun 5 11:03:45 2014 +0100

    Fix egregious instantiation bug in matchOneConLike (fixing Trac #9023)

    We simply weren't giving anything like the right instantiating types
    to patSynInstArgTys in matchOneConLike.

    To get these instantiating types would have involved matching the
    result type of the pattern synonym with the pattern type, which is
    tiresome.  So instead I changed ConPatOut so that instead of recording
    the type of the *whole* pattern (in old field pat_ty), it not records
    the *instantiating* types (in new field pat_arg_tys).  Then we canuse
    TcHsSyn.conLikeResTy to get the pattern type when needed.

    There are lots of knock-on incidental effects, but they mostly made
    the code simpler, so I'm happy.

    Conflicts:
    	compiler/typecheck/TcPat.lhs

    (cherry picked from commit 1fc4f6b973a4fb14b2b15143b2774ec597b4da0f)

commit e40bd13b5b509b76d61ae66247ded145d4af93ea
Author: Dr. ERDI Gergo <gergo@erdi.hu>
Date:   Tue May 27 21:16:41 2014 +0800

    Store IfExtNames for PatSyn matchers and wrappers in interface file.
    This way, the Ids for the matchers/wrappers are reused by importing
    modules, and thus unfoldings are kept.

    Also updates haddock submodule to accomodate tweaks in PatSyn representation

    Conflicts:
    	compiler/typecheck/TcPatSyn.lhs
    	utils/haddock

    (cherry picked from commit e0fbf1e3bc062b7ce3f1c515a135fd9f3d49e2ee)

Changes to haddock:
commit 87a6eed7f0d4e646c424a6c0a94b19f2c3d56666
Author: Austin Seipp <austin@well-typed.com>
Date:   Mon Jun 23 04:25:01 2014 -0500

    Revert "Accomodate change in PatSyn representation"

    This reverts commit e56a8037c04a32922cb0951c66f64ecc6ebfecb3.

commit e56a8037c04a32922cb0951c66f64ecc6ebfecb3
Author: Dr. ERDI Gergo <gergo@erdi.hu>
Date:   Sun May 25 10:39:12 2014 +0800

    Accomodate change in PatSyn representation

    (cherry picked from commit 57aa591362d7c8ba21285fccd6a958629a422091)