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
<http://lists.gnu.org/archive/html/bug-bison/2011-08/msg00003.html>.
* 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)

diff --git a/ChangeLog b/ChangeLog
index abea813f5b52537028692c01a1c0ca3de67c09ea..3da26ebc0408fb271fe1301be19f58c96e722d34 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2011-08-21  Joel E. Denny  <joeldenny@joeldenny.org>
+
+       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
+       <http://lists.gnu.org/archive/html/bug-bison/2011-08/msg00003.html>.
+       * 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  <joeldenny@joeldenny.org>
 
        global: remove unnecessary horizontal tabs.

diff --git a/NEWS b/NEWS
index c3f73190c246616478f5bd943ca9dbb4ebaa9357..7e791c597f1035ea8779cd9fb02a47f8457d3554 100644 (file)
--- 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 921b4ef5372075b9bbd6e18627d17bda22ead91f..17243d4930463e6d9f905033f99034f64b2b360a 100644 (file)
--- 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 71b01f33a7bebb3ece3884f5ea7a79affaecf4be..b972a1fe4d794f04899e59e238f2a04aaf76615f 100644 (file)
--- 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