[commit: ghc] master: ApiAnnotations : ITopenExpQuote needs SourceText (ee91482)
git at git.haskell.org
git at git.haskell.org
Mon Nov 16 19:10:31 UTC 2015
Repository : ssh://git@git.haskell.org/ghc
On branch : master
Link : http://ghc.haskell.org/trac/ghc/changeset/ee9148284dd5a66ed4970aff5218d973997cb9cf/ghc
>---------------------------------------------------------------
commit ee9148284dd5a66ed4970aff5218d973997cb9cf
Author: Alan Zimmerman <alan.zimm at gmail.com>
Date: Mon Nov 16 21:10:39 2015 +0200
ApiAnnotations : ITopenExpQuote needs SourceText
Summary:
In the lexer, ITopenExpQuote can be recognised for '[e|' or '[|'.
The token definition needs to capture the original SourceText, and pass
it through to ExpBr, which also needs a SrcText field.
It is easier to simply add a flag to the token identifying the variant
and to generate a different AnnKeywordId based on this.
Test Plan: ./validate
Reviewers: mpickering, bgamari, austin
Reviewed By: bgamari
Subscribers: thomie
Differential Revision: https://phabricator.haskell.org/D1479
GHC Trac Issues: #10276
>---------------------------------------------------------------
ee9148284dd5a66ed4970aff5218d973997cb9cf
compiler/parser/ApiAnnotation.hs | 13 ++++
compiler/parser/Lexer.x | 12 ++--
compiler/parser/Parser.y | 15 +++--
testsuite/tests/ghc-api/annotations/Makefile | 4 ++
testsuite/tests/ghc-api/annotations/T10276.stderr | 78 +++++++++++++++++++++++
testsuite/tests/ghc-api/annotations/T10276.stdout | 63 ++++++++++++++++++
testsuite/tests/ghc-api/annotations/Test10276.hs | 15 +++++
testsuite/tests/ghc-api/annotations/all.T | 3 +-
8 files changed, 192 insertions(+), 11 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 ee9148284dd5a66ed4970aff5218d973997cb9cf
More information about the ghc-commits
mailing list