From 765e1bd4fc08bdee636b8aeab12908d8895ece67 Mon Sep 17 00:00:00 2001 From: "Joel E. Denny" Date: Sun, 21 Aug 2011 14:45:03 -0400 Subject: [PATCH] tests: fix empty unions. Empty unions are not accepted by the ISO C99 grammar or by at least some versions of Sun Studio. Reported by Wolfgang S. Kechel at . * NEWS (2.5.1): Document fix. * THANKS (Wolfgang S. Kechel): Add. * tests/existing.at (GNU Cim Grammar) (GNU pic (Groff 1.18.1) Grammar.): Remove empty %union. (cherry picked from commit 7451638148706f6317975db418cc78e488f420aa) --- ChangeLog | 12 ++++++++++++ NEWS | 2 ++ THANKS | 1 + tests/existing.at | 6 ++---- 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index abea813f..3da26ebc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2011-08-21 Joel E. Denny + + tests: fix empty unions. + Empty unions are not accepted by the ISO C99 grammar or by at + least some versions of Sun Studio. Reported by Wolfgang S. Kechel + at + . + * NEWS (2.5.1): Document fix. + * THANKS (Wolfgang S. Kechel): Add. + * tests/existing.at (GNU Cim Grammar) + (GNU pic (Groff 1.18.1) Grammar.): Remove empty %union. + 2011-07-24 Joel E. Denny global: remove unnecessary horizontal tabs. diff --git a/NEWS b/NEWS index c3f73190..7e791c59 100644 --- a/NEWS +++ b/NEWS @@ -62,6 +62,8 @@ Bison News * Changes in version 2.5.1 (????-??-??): +** Some portability problems in the test suite have been fixed. + ** Minor improvements have been made to the manual. * Changes in version 2.5 (2011-05-14): diff --git a/THANKS b/THANKS index 921b4ef5..17243d49 100644 --- a/THANKS +++ b/THANKS @@ -109,6 +109,7 @@ Tys Lefering twlevo@gmail.com Vin Shelton acs@alumni.princeton.edu W.C.A. Wijngaards wouter@NLnetLabs.nl Wayne Green wayne@infosavvy.com +Wolfgang S. Kechel wolfgang.kechel@prs.de Wolfram Wagner ww@mpi-sb.mpg.de Wwp subscript@free.fr Zack Weinberg zack@codesourcery.com diff --git a/tests/existing.at b/tests/existing.at index 71b01f33..b972a1fe 100644 --- a/tests/existing.at +++ b/tests/existing.at @@ -778,8 +778,7 @@ dnl In the case of the syntax error, the parser recovers, so it returns 0. # It reported 80 SR && 99 RR conflicts instead of 78/10!!! AT_TEST_EXISTING_GRAMMAR([[GNU Cim Grammar]], -[[%union {} - +[[ %token HACTIVATE HAFTER /*HAND*/ HARRAY HAT HBEFORE HBEGIN HBOOLEAN @@ -1400,7 +1399,6 @@ State 427 conflicts: 9 shift/reduce, 2 reduce/reduce AT_TEST_EXISTING_GRAMMAR([[GNU pic (Groff 1.18.1) Grammar]], [[%error-verbose -%union {} %token LABEL %token VARIABLE @@ -1950,7 +1948,7 @@ dnl without being followed by "of".) [[VARIABLE, '=', LABEL, LEFT, DOT_X]], dnl BISON-STDERR -[[input.y:471.11-48: warning: rule useless in parser due to conflicts: path: ORDINAL LAST object_type relative_path +[[input.y:470.11-48: warning: rule useless in parser due to conflicts: path: ORDINAL LAST object_type relative_path ]], dnl LAST-STATE -- 2.45.2