[commit: ghc] ghc-8.0: API Annotations: AnnTilde missing (0392a23)

git at git.haskell.org git at git.haskell.org
Fri Jan 1 20:52:32 UTC 2016


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

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

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

commit 0392a237097ff0a271e424a40426c74f51a6f676
Author: Alan Zimmerman <alan.zimm at gmail.com>
Date:   Fri Jan 1 18:59:52 2016 +0200

    API Annotations: AnnTilde missing
    
    In T10689a.hs, the fragment
    
        data instance Sing (z :: [a])
          = z ~ '[] =>
            SNil
          | forall (m :: a)
                   (n :: [a]). z ~ (:) m n =>
            SCons (Sing m) (Sing n)
    
    ends up with the AnnTilde annotations for the two tildes not attached to
    the final AST.
    
    This patch moves the AnnTilde to the right place.
    
    Closes #11321
    
    (cherry picked from commit 0b8dc7d4d5b26e184a7698e22f9fe7d8ee3c90d4)


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

0392a237097ff0a271e424a40426c74f51a6f676
 compiler/parser/Lexer.x                           | 24 +++++++++++-
 compiler/parser/Parser.y                          |  8 ++--
 compiler/parser/RdrHsSyn.hs                       | 27 +++++++++-----
 testsuite/tests/ghc-api/annotations/Makefile      |  4 ++
 testsuite/tests/ghc-api/annotations/T11321.stderr |  3 ++
 testsuite/tests/ghc-api/annotations/T11321.stdout | 45 +++++++++++++++++++++++
 testsuite/tests/ghc-api/annotations/Test11321.hs  | 17 +++++++++
 testsuite/tests/ghc-api/annotations/all.T         |  1 +
 8 files changed, 114 insertions(+), 15 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 0392a237097ff0a271e424a40426c74f51a6f676


More information about the ghc-commits mailing list