[commit: ghc] ghc-7.8: Simplify and tidy up the handling of tuple names (6e207de)

git at git.haskell.org git at git.haskell.org
Tue Apr 22 07:27:18 UTC 2014


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

On branch  : ghc-7.8
Link       : http://ghc.haskell.org/trac/ghc/changeset/6e207dead24fc783f78ae7c786150cb9e7cd7022/ghc

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

commit 6e207dead24fc783f78ae7c786150cb9e7cd7022
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Fri Apr 4 08:41:35 2014 +0100

    Simplify and tidy up the handling of tuple names
    
    This fixes Trac #8954.
    
    There were actually three places where tuple occ-names
    were parsed:
      - IfaceEnv.lookupOrigNameCache
      - Convert.isBuiltInOcc
      - OccName.isTupleOcc_maybe
    
    I combined all three into TysWiredIn.isBuiltInOcc_maybe
    Much nicer.
    
    (cherry picked from commit 750271e61bdbaad50c19176406512e79abe404a8)
    
    Conflicts:
    	testsuite/tests/th/all.T


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

6e207dead24fc783f78ae7c786150cb9e7cd7022
 compiler/basicTypes/OccName.lhs |   53 ---------------------
 compiler/hsSyn/Convert.lhs      |   25 ++--------
 compiler/iface/IfaceEnv.lhs     |   40 +++++++++-------
 compiler/prelude/PrelNames.lhs  |   97 ++++++++++++++++++++++-----------------
 compiler/prelude/TysWiredIn.lhs |   70 ++++++++++++++++++++++++++--
 testsuite/tests/th/T8954.hs     |   15 ++++++
 testsuite/tests/th/all.T        |    1 +
 7 files changed, 166 insertions(+), 135 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 6e207dead24fc783f78ae7c786150cb9e7cd7022


More information about the ghc-commits mailing list