[commit: ghc] master: Refactor RdrName.Provenance, to fix #7672 (7ea156a)

[git at git.haskell.org]

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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/7ea156ae3e1c66e59935f0eb877ea1a3f3bfd5b9/ghc

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

commit 7ea156ae3e1c66e59935f0eb877ea1a3f3bfd5b9
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Wed Jun 3 11:43:53 2015 +0100

    Refactor RdrName.Provenance, to fix #7672
    
    Trac #7672 has a data type T in module A that is in scope
    *both* locally-bound *and* imported (with a qualified) name.
    The Provenance of a GlobalRdrElt simply couldn't express that
    before. Now you can.
    
    In doing so, I flattened out Provenance into GlobalRdrElt,
    so quite a lot of modules are touched in a not-very-interesting
    way.


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

7ea156ae3e1c66e59935f0eb877ea1a3f3bfd5b9
 compiler/basicTypes/RdrName.hs                 | 283 +++++++++++++++----------
 compiler/deSugar/DsMonad.hs                    |   2 +-
 compiler/iface/IfaceEnv.hs                     |   8 +-
 compiler/main/DynamicLoading.hs                |   6 +-
 compiler/main/HscTypes.hs                      |   5 +-
 compiler/main/InteractiveEval.hs               |  20 +-
 compiler/rename/RnEnv.hs                       | 146 ++++++-------
 compiler/rename/RnNames.hs                     |  43 ++--
 compiler/rename/RnPat.hs                       |   2 +-
 compiler/typecheck/TcCanonical.hs              |  10 +-
 compiler/typecheck/TcDeriv.hs                  |   8 +-
 compiler/typecheck/TcRnDriver.hs               |  11 +-
 testsuite/tests/rename/should_compile/T7672.hs |   4 +-
 testsuite/tests/rename/should_compile/all.T    |   2 +-
 14 files changed, 285 insertions(+), 265 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 7ea156ae3e1c66e59935f0eb877ea1a3f3bfd5b9