diff options
| author | Akim Demaille <akim@lrde.epita.fr> | 2013-10-16 15:19:44 +0200 |
|---|---|---|
| committer | Akim Demaille <akim@lrde.epita.fr> | 2013-10-16 15:51:25 +0200 |
| commit | 071863b3d88c232c10348b7c38378c47d363857c (patch) | |
| tree | 315336afacfd777655604bbb1ea6f80cbee68de7 | |
| parent | e4678430c2506c577c05e92437b187fe9daf0b7f (diff) | |
| download | bison-071863b3d88c232c10348b7c38378c47d363857c.tar.gz | |
glr: allow spaces between "%?" and "{" in predicates
Reported by Rici Lake.
http://lists.gnu.org/archive/html/bug-bison/2013-10/msg00004.html
http://stackoverflow.com/questions/19330171/
* src/scan-gram.l: Do not try to be too smart when diagnosing invalid
directives.
* tests/glr-regression.at (Predicates): New test.
| -rw-r--r-- | NEWS | 5 | ||||
| -rw-r--r-- | THANKS | 1 | ||||
| -rw-r--r-- | src/scan-gram.l | 2 | ||||
| -rw-r--r-- | tests/glr-regression.at | 30 |
4 files changed, 37 insertions, 1 deletions
@@ -15,6 +15,11 @@ GNU Bison NEWS leaves "foo" diagnostics as warnings. Similarly, with "-Werror=foo -Wno-error", "foo" diagnostics are now errors. +*** GLR Predicates + + As demonstrated in the documentation, one can now leave spaces between + "%?" and its "{". + * Noteworthy changes in release 3.0 (2013-07-25) [stable] ** WARNING: Future backward-incompatibilities! @@ -110,6 +110,7 @@ R Blake blakers@mac.com Raja R Harinath harinath@cs.umn.edu Ralf Wildenhues Ralf.Wildenhues@gmx.de Richard Stallman rms@gnu.org +Rici Lake ricilake@gmail.com Rob Vermaas rob.vermaas@gmail.com Robert Anisko anisko_r@epita.fr Rob Conde rob.conde@ai-solutions.com diff --git a/src/scan-gram.l b/src/scan-gram.l index 665e80de..555e6952 100644 --- a/src/scan-gram.l +++ b/src/scan-gram.l @@ -266,7 +266,7 @@ eqopt ([[:space:]]*=)? "%pure"[-_]"parser" DEPRECATED("%pure-parser"); "%token"[-_]"table" DEPRECATED("%token-table"); - "%"{id}|"%"{notletter}([[:graph:]])+ { + "%"{id} { complain (loc, complaint, _("invalid directive: %s"), quote (yytext)); } diff --git a/tests/glr-regression.at b/tests/glr-regression.at index 711ab7ec..064b37b2 100644 --- a/tests/glr-regression.at +++ b/tests/glr-regression.at @@ -1749,3 +1749,33 @@ Cleanup: popping token 'a' () ]) AT_CLEANUP + + +## ----------------------------------------------------------------- ## +## Predicates. ## +## ## +## http://lists.gnu.org/archive/html/bug-bison/2013-10/msg00004.html ## +## ----------------------------------------------------------------- ## + +AT_SETUP([Predicates]) + +# FIXME: We need genuine test cases with uses of %?. + +AT_DATA_GRAMMAR([input.y], +[[%glr-parser +%expect-rr 1 +%% +// Exercise "%?{...}" and "%? {...}". +widget: + %? {new_syntax} "widget" id new_args { $$ = f($3, $4); } +| %?{!new_syntax} "widget" id old_args { $$ = f($3, $4); } +; +id:; +new_args:; +old_args:; +%% +]]) + +AT_BISON_CHECK([[input.y]]) + +AT_CLEANUP |