[commit: ghc] ghc-8.0: Refactoring on IdInfo and system derived names (b8fcf05)

Mon Jan 18 13:05:37 UTC 2016

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

On branch  : ghc-8.0
Link       : http://ghc.haskell.org/trac/ghc/changeset/b8fcf0556a458eeea720cc89ae5bf4fc25849de2/ghc

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

commit b8fcf0556a458eeea720cc89ae5bf4fc25849de2
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Fri Jan 15 17:30:30 2016 +0000

    Refactoring on IdInfo and system derived names

    Some modest refactoring, triggered in part by Trac #11051

    * Kill off PatSynId, ReflectionId in IdDetails
      They were barely used, and only for pretty-printing

    * Add helper function Id.mkExportedVanillaId, and use it

    * Polish up OccName.isDerivedOccName, as a predicate for
      definitions generated internally by GHC, which we
      might not want to show to the user.

    * Kill off unused OccName.mkDerivedTyConOcc

    * Shorten the derived OccNames for newtype and data
      instance axioms

    * A bit of related refactoring around newFamInstAxiomName

    (cherry picked from commit ec8a188a927a4db2e709541765e5ef545eae284c)

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

b8fcf0556a458eeea720cc89ae5bf4fc25849de2
 compiler/basicTypes/Id.hs                          |  6 ++-
 compiler/basicTypes/IdInfo.hs                      | 13 -----
 compiler/basicTypes/OccName.hs                     | 23 ++++----
 compiler/deSugar/DsExpr.hs                         |  3 +-
 compiler/iface/MkIface.hs                          |  5 --
 compiler/typecheck/TcEnv.hs                        |  9 ++--
 compiler/typecheck/TcInstDcls.hs                   |  5 +-
 compiler/typecheck/TcRnDriver.hs                   | 13 +++--
 compiler/typecheck/TcTyClsDecls.hs                 | 51 +++++++++---------
 compiler/typecheck/TcTyDecls.hs                    |  2 +-
 compiler/typecheck/TcTypeable.hs                   |  7 ++-
 .../tests/deSugar/should_compile/T2431.stderr      |  6 +--
 testsuite/tests/ghci/scripts/T4175.stdout          | 22 ++++----
 testsuite/tests/ghci/scripts/T7939.stdout          |  2 +-
 .../indexed-types/should_compile/T3017.stderr      |  7 ++-
 .../tests/numeric/should_compile/T7116.stdout      |  2 +-
 .../tests/partial-sigs/should_compile/ADT.stderr   |  3 +-
 .../should_compile/DataFamilyInstanceLHS.stderr    | 14 ++++-
 .../NamedWildcardInDataFamilyInstanceLHS.stderr    | 14 ++++-
 .../NamedWildcardInTypeFamilyInstanceLHS.stderr    |  6 +--
 .../partial-sigs/should_compile/SkipMany.stderr    |  4 +-
 .../should_compile/TypeFamilyInstanceLHS.stderr    |  6 +--
 testsuite/tests/roles/should_compile/Roles1.stderr |  9 +++-
 .../tests/roles/should_compile/Roles13.stderr      | 28 ++++++----
 .../tests/roles/should_compile/Roles14.stderr      | 17 ++++--
 testsuite/tests/roles/should_compile/Roles2.stderr | 24 +++++++--
 testsuite/tests/roles/should_compile/Roles3.stderr | 62 ++++++++++++++++------
 testsuite/tests/roles/should_compile/Roles4.stderr | 32 +++++++----
 testsuite/tests/roles/should_compile/T8958.stderr  | 45 +++++++++++-----
 .../tests/simplCore/should_compile/T3717.stderr    |  2 +-
 .../tests/simplCore/should_compile/T3772.stdout    |  2 +-
 .../tests/simplCore/should_compile/T4201.stdout    |  2 +-
 .../tests/simplCore/should_compile/T4908.stderr    |  2 +-
 .../tests/simplCore/should_compile/T4930.stderr    |  2 +-
 .../tests/simplCore/should_compile/T7360.stderr    | 10 ++--
 .../tests/simplCore/should_compile/T9400.stderr    |  2 +-
 .../simplCore/should_compile/spec-inline.stderr    |  2 +-
 .../tests/typecheck/should_compile/tc231.stderr    |  8 ++-
 38 files changed, 288 insertions(+), 184 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 b8fcf0556a458eeea720cc89ae5bf4fc25849de2