Version 1.30c.

* tests/testsuite.at, tests/torture.at: Rely on Autotest 2.52g:
now the tests are run in private dirs, therefore AC_CLEANUP and
family can be simplified to 0-ary.
* tests/atlocal.in: Now that we run `elsewhere' than in tests/,
use abs. path to find config.h.

ChangeLog

@@ -1,3 +1,54 @@
+2001-11-14  Akim Demaille  <[email protected]>
+
+	Version 1.30c.
+
+2001-11-14  Akim Demaille  <[email protected]>
+
+	* tests/calc.at, tests/output.at, tests/regression.at,
+	* tests/testsuite.at, tests/torture.at: Rely on Autotest 2.52g:
+	now the tests are run in private dirs, therefore AC_CLEANUP and
+	family can be simplified to 0-ary.
+	* tests/atlocal.in: Now that we run `elsewhere' than in tests/,
+	use abs. path to find config.h.
+
+2001-11-14  Akim Demaille  <[email protected]>
+
+	* tests/calc.at (AT_CHECK_CALC): Don't try to check the compiler's
+	stderr, there can be way too much random noise.
+	Instead pass -Werror to GCC and rely on the exit status.
+	Reported by Wolfram Wagner.
+
+2001-11-14  Akim Demaille  <[email protected]>
+
+	* src/bison.simple (yyparse): Let yyls1, yyss1 and yyvs1 be
+	defined only if yyoverflow is defined, to avoid `warning: unused
+	variable `yyvs1''.
+	Reported by The Test Suite.
+
+2001-11-14  Akim Demaille  <[email protected]>
+
+	* src/print.c: Include reduce.h.
+	Reported by Hans Aberg.
+
+2001-11-14  Akim Demaille  <[email protected]>
+
+	* src/lex.c, src/lex.h (token_buffer, unlexed_token_buffer):
+	Revert a previous patch:  these are really const.
+	* src/conflicts.c (conflict_report): Additional useless pair of
+	braces to pacify GCC's warnings for `if () if () {} else {}'.
+	* src/lex.c (parse_percent_token): Replace equal_offset with
+	arg_offset.
+	arg is const.
+	Be sure to strdup `arg' when used, since there is no reason for
+	token_buffer not to change.
+
+2001-11-14  Akim Demaille  <[email protected]>
+
+	* src/system.h (EXIT_SUCCESS, EXIT_FAILURE): Ensure a proper
+	definition.
+	* src/main.c (main): Use them.
+	Suggested by Hans Aberg.
+
 2001-11-12  Akim Demaille  <[email protected]>
 
 	Version 1.30b.
@@ -82,7 +133,7 @@
 
 	* src/bison.simple (YYSTACK_REALLOC): New.
 	(yyparse) [!yyoverflow]: Use it and free the old stack.
-	Reported by FIXME: Who.
+	Reported by Per Allansson.
 
 2001-11-05  Akim Demaille  <[email protected]>
 

NEWS

@@ -1,6 +1,12 @@
 Bison News
 ----------
 
+Changes in version 1.30c:
+
+* Fixed a few warnings.
+
+* Some portability issues.
+
 Changes in version 1.30b:
 
 * Fixed parser memory leaks.

THANKS

@@ -26,6 +26,7 @@ Richard Stallman        [email protected]
 Robert Anisko           [email protected]
 Shura                   [email protected]
 Tom Lane                [email protected]
+Wolfram Wagner          [email protected]
 Wwp                     [email protected]
 
 Many people are not named here because we lost track of them.  We

config/prev-version.txt

@@ -1 +1 @@
-1.30a
+1.30b

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.52g for GNU Bison 1.30b.
+# Generated by GNU Autoconf 2.52g for GNU Bison 1.30c.
 #
 # Report bugs to <[email protected]>.
 #
@@ -332,8 +332,8 @@ mandir='${prefix}/man'
 # Identity of this package.
 PACKAGE_NAME='GNU Bison'
 PACKAGE_TARNAME='bison'
-PACKAGE_VERSION='1.30b'
+PACKAGE_VERSION='1.30c'
-PACKAGE_STRING='GNU Bison 1.30b'
+PACKAGE_STRING='GNU Bison 1.30c'
 PACKAGE_BUGREPORT='[email protected]'
 
 ac_prev=
@@ -760,7 +760,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures GNU Bison 1.30b to adapt to many kinds of systems.
+\`configure' configures GNU Bison 1.30c to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -826,7 +826,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of GNU Bison 1.30b:";;
+     short | recursive ) echo "Configuration of GNU Bison 1.30c:";;
    esac
   cat <<\_ACEOF
 
@@ -921,7 +921,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-GNU Bison configure 1.30b
+GNU Bison configure 1.30c
 generated by GNU Autoconf 2.52g
 
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
@@ -936,7 +936,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by GNU Bison $as_me 1.30b, which was
+It was created by GNU Bison $as_me 1.30c, which was
 generated by GNU Autoconf 2.52g.  Invocation command line was
 
   $ $0 $@
@@ -1470,7 +1470,7 @@ fi
 
 # Define the identity of the package.
 PACKAGE=bison
-VERSION=1.30b
+VERSION=1.30c
 
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE "$PACKAGE"
@@ -9000,7 +9000,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by GNU Bison $as_me 1.30b, which was
+This file was extended by GNU Bison $as_me 1.30c, which was
 generated by GNU Autoconf 2.52g.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -9062,7 +9062,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-GNU Bison config.status 1.30b
+GNU Bison config.status 1.30c
 configured by $0, generated by GNU Autoconf 2.52g,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 

configure.in

@@ -18,10 +18,10 @@
 # We need a recent Autoconf to run a recent Autotest.
 AC_PREREQ(2.52e)
 
-AC_INIT([GNU Bison], [1.30b], [[email protected]])
+AC_INIT([GNU Bison], [1.30c], [[email protected]])
 AC_CONFIG_AUX_DIR(config)
 
-AM_INIT_AUTOMAKE([bison], [1.30b])
+AM_INIT_AUTOMAKE([bison], [1.30c])
 AM_CONFIG_HEADER(config.h:config.hin)
 
 # Initialize the test suite.

doc/bison.info-1

@@ -34,7 +34,7 @@ File: bison.info,  Node: Top,  Next: Introduction,  Up: (dir)
 Bison
 *****
 
-   This manual documents version 1.30b of Bison, updated 12 November
+   This manual documents version 1.30c of Bison, updated 12 November
 2001.
 
 * Menu:
@@ -238,7 +238,7 @@ Bison in detail.
 it Yacc-compatible.  Wilfred Hansen of Carnegie Mellon University added
 multi-character string literals and other features.
 
-   This edition corresponds to version 1.30b of Bison.
+   This edition corresponds to version 1.30c of Bison.
 
 
 File: bison.info,  Node: Conditions,  Next: Copying,  Prev: Introduction,  Up: Top

doc/stamp-vti

@@ -1,4 +1,4 @@
 @set UPDATED 12 November 2001
 @set UPDATED-MONTH November 2001
-@set EDITION 1.30b
+@set EDITION 1.30c
-@set VERSION 1.30b
+@set VERSION 1.30c

doc/version.texi

@@ -1,4 +1,4 @@
 @set UPDATED 12 November 2001
 @set UPDATED-MONTH November 2001
-@set EDITION 1.30b
+@set EDITION 1.30c
-@set VERSION 1.30b
+@set VERSION 1.30c

po/de.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.25\n"
-"POT-Creation-Date: 2001-11-12 10:34+0100\n"
+"POT-Creation-Date: 2001-11-14 15:59+0100\n"
 "PO-Revision-Date: 1996-10-10 17:54 MET DST\n"
 "Last-Translator: Ulrich Drepper <[email protected]>\n"
 "Language-Team: German <[email protected]>\n"
@@ -72,37 +72,37 @@ msgstr "Zustand %d enth
 
 #. If invoked with `--yacc', use the output format specified by
 #. POSIX.
-#: src/conflicts.c:481
+#: src/conflicts.c:482
 msgid "conflicts: "
 msgstr "Konflikte: "
 
-#: src/conflicts.c:483
+#: src/conflicts.c:484
 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d Schiebe/Reduziere"
 
-#: src/conflicts.c:487
+#: src/conflicts.c:488
 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d Reduziere/Reduziere"
 
-#: src/conflicts.c:492 src/reduce.c:497
+#: src/conflicts.c:493 src/reduce.c:497
 #, c-format
 msgid "%s contains "
 msgstr "%s enthält "
 
-#: src/conflicts.c:500
+#: src/conflicts.c:502
 #, fuzzy, c-format
 msgid "expected %d shift/reduce conflict"
 msgid_plural "expected %d shift/reduce conflicts"
 msgstr[0] " %d Schiebe/Reduziere Konflikte"
 
-#: src/conflicts.c:587 src/conflicts.c:707
+#: src/conflicts.c:589 src/conflicts.c:709
 #, c-format
 msgid "    %-4s\t[reduce using rule %d (%s)]\n"
 msgstr "    %-4s\t[reduziere mit Regel %d (%s)]\n"
 
-#: src/conflicts.c:598 src/print.c:171
+#: src/conflicts.c:600 src/print.c:172
 #, c-format
 msgid ""
 "    $default\treduce using rule %d (%s)\n"
@@ -111,12 +111,12 @@ msgstr ""
 "    $default\treduziere mit Regel %d (%s)\n"
 "\n"
 
-#: src/conflicts.c:687 src/conflicts.c:701
+#: src/conflicts.c:689 src/conflicts.c:703
 #, c-format
 msgid "    %-4s\treduce using rule %d (%s)\n"
 msgstr "    %-4s\treduziere mit Tegel %d (%s)\n"
 
-#: src/conflicts.c:727
+#: src/conflicts.c:729
 #, c-format
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr "    $default\treduziere mit Regel %d (%s)\n"
@@ -209,7 +209,7 @@ msgid ""
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
 
-#: src/getargs.c:215 src/lex.c:693
+#: src/getargs.c:215 src/lex.c:694
 #, c-format
 msgid "`%s' is no longer supported"
 msgstr ""
@@ -279,12 +279,12 @@ msgstr "unerwarteter Typname"
 msgid "use \"...\" for multi-character literal tokens"
 msgstr "für Literal mit mehreren Zeichen bitte \"...\" verwenden"
 
-#: src/lex.c:666
+#: src/lex.c:667
 #, c-format
 msgid "`%s' supports no argument: %s"
 msgstr ""
 
-#: src/lex.c:682
+#: src/lex.c:683
 #, fuzzy, c-format
 msgid "`%s' requires an argument"
 msgstr "%s: die Option »%s« erfordert ein Argument\n"
@@ -303,45 +303,45 @@ msgstr "F
 msgid "maximum table size (%d) exceeded"
 msgstr "maximale Tabellengröße (%s) überschritten"
 
-#: src/print.c:37
+#: src/print.c:38
 #, c-format
 msgid " type %d is %s\n"
 msgstr " Typ %d ist %s\n"
 
-#: src/print.c:85
+#: src/print.c:86
 #, c-format
 msgid "   (rule %d)"
 msgstr "   (Regel %d)"
 
-#: src/print.c:111
+#: src/print.c:112
 msgid "    $default\taccept\n"
 msgstr "    $default\takzeptiere\n"
 
-#: src/print.c:113
+#: src/print.c:114
 msgid "    NO ACTIONS\n"
 msgstr "    KEINE AKTIONEN\n"
 
-#: src/print.c:132
+#: src/print.c:133
 #, c-format
 msgid "    $   \tgo to state %d\n"
 msgstr "    $   \tgehe zu Zustand %d über\n"
 
-#: src/print.c:135
+#: src/print.c:136
 #, c-format
 msgid "    %-4s\tshift, and go to state %d\n"
 msgstr "    %-4s\tSchiebe und gehe zu Zustand %d über\n"
 
-#: src/print.c:159
+#: src/print.c:160
 #, c-format
 msgid "    %-4s\terror (nonassociative)\n"
 msgstr "    %-4s\tFehler (nicht assoziativ)\n"
 
-#: src/print.c:187
+#: src/print.c:188
 #, c-format
 msgid "    %-4s\tgo to state %d\n"
 msgstr "    %-4s\tgehe zu Zustand %d über\n"
 
-#: src/print.c:199
+#: src/print.c:200
 #, fuzzy, c-format
 msgid "state %d"
 msgstr ""
@@ -351,24 +351,24 @@ msgstr ""
 "\n"
 
 #. rule # : LHS -> RHS
-#: src/print.c:229
+#: src/print.c:230
 #, fuzzy
 msgid "Grammar"
 msgstr ""
 "\n"
 "Grammatik\n"
 
-#: src/print.c:234
+#: src/print.c:235
 #, c-format
 msgid "rule %-4d %s ->"
 msgstr "Regel %-4d %s ->"
 
-#: src/print.c:240
+#: src/print.c:241
 msgid "empty"
 msgstr ""
 
 #. TERMINAL (type #) : rule #s terminal is on RHS
-#: src/print.c:245
+#: src/print.c:246
 #, fuzzy
 msgid "Terminals, with rules where they appear"
 msgstr ""
@@ -376,7 +376,7 @@ msgstr ""
 "Terminale und die Regeln un denen sie verwendet werden\n"
 "\n"
 
-#: src/print.c:269
+#: src/print.c:270
 #, fuzzy
 msgid "Nonterminals, with rules where they appear"
 msgstr ""
@@ -384,11 +384,11 @@ msgstr ""
 "Nicht-Terminal und die Regeln in denen sie verwendet werden\n"
 "\n"
 
-#: src/print.c:295
+#: src/print.c:296
 msgid " on left:"
 msgstr " auf der linken Seite:"
 
-#: src/print.c:310
+#: src/print.c:311
 msgid " on right:"
 msgstr " auf der rechten Seite:"
 

po/es.po

@@ -30,7 +30,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU bison 1.25\n"
-"POT-Creation-Date: 2001-11-12 10:34+0100\n"
+"POT-Creation-Date: 2001-11-14 15:59+0100\n"
 "PO-Revision-Date: 1998-09-21 10:19+0200\n"
 "Last-Translator: Nicolás García-Pedrajas <[email protected]>\n"
 "Language-Team: Spanish <[email protected]>\n"
@@ -106,7 +106,7 @@ msgstr "El estado %d contiene"
 
 #. If invoked with `--yacc', use the output format specified by
 #. POSIX.
-#: src/conflicts.c:481
+#: src/conflicts.c:482
 msgid "conflicts: "
 msgstr "conflictos: "
 
@@ -122,7 +122,7 @@ msgstr "conflictos: "
 # ok
 # ngp
 #
-#: src/conflicts.c:483
+#: src/conflicts.c:484
 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d desplazamiento(s)/reducción(ones)"
@@ -139,28 +139,28 @@ msgstr " %d desplazamiento(s)/reducci
 #
 # ok
 # ngp
-#: src/conflicts.c:487
+#: src/conflicts.c:488
 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d reducción(ones)/reducción(ones)"
 
-#: src/conflicts.c:492 src/reduce.c:497
+#: src/conflicts.c:493 src/reduce.c:497
 #, c-format
 msgid "%s contains "
 msgstr "%s contiene "
 
-#: src/conflicts.c:500
+#: src/conflicts.c:502
 #, fuzzy, c-format
 msgid "expected %d shift/reduce conflict"
 msgid_plural "expected %d shift/reduce conflicts"
 msgstr[0] " %d conflictos desplazamiento/reducción"
 
-#: src/conflicts.c:587 src/conflicts.c:707
+#: src/conflicts.c:589 src/conflicts.c:709
 #, c-format
 msgid "    %-4s\t[reduce using rule %d (%s)]\n"
 msgstr "    %-4s\t[reduce usando la regla  %d (%s)]\n"
 
-#: src/conflicts.c:598 src/print.c:171
+#: src/conflicts.c:600 src/print.c:172
 #, c-format
 msgid ""
 "    $default\treduce using rule %d (%s)\n"
@@ -169,12 +169,12 @@ msgstr ""
 "    $default\treduce usando la regla %d (%s)\n"
 "\n"
 
-#: src/conflicts.c:687 src/conflicts.c:701
+#: src/conflicts.c:689 src/conflicts.c:703
 #, c-format
 msgid "    %-4s\treduce using rule %d (%s)\n"
 msgstr "    %-4s\treduce usando la regla  %d (%s)\n"
 
-#: src/conflicts.c:727
+#: src/conflicts.c:729
 #, c-format
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr "    $default\treduce usando la regla %d (%s)\n"
@@ -272,7 +272,7 @@ msgid ""
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
 
-#: src/getargs.c:215 src/lex.c:693
+#: src/getargs.c:215 src/lex.c:694
 #, c-format
 msgid "`%s' is no longer supported"
 msgstr ""
@@ -347,12 +347,12 @@ msgstr "nombre de tipo sin terminar"
 msgid "use \"...\" for multi-character literal tokens"
 msgstr "use \"...\" para terminales literales multicarácter"
 
-#: src/lex.c:666
+#: src/lex.c:667
 #, c-format
 msgid "`%s' supports no argument: %s"
 msgstr ""
 
-#: src/lex.c:682
+#: src/lex.c:683
 #, fuzzy, c-format
 msgid "`%s' requires an argument"
 msgstr "%s: la opción `%s' requiere un argumento\n"
@@ -376,45 +376,45 @@ msgstr "Entrando set_nullable"
 msgid "maximum table size (%d) exceeded"
 msgstr "excedido el tamaño máximo de la tabla (%s)"
 
-#: src/print.c:37
+#: src/print.c:38
 #, c-format
 msgid " type %d is %s\n"
 msgstr " el tipo %d es %s\n"
 
-#: src/print.c:85
+#: src/print.c:86
 #, c-format
 msgid "   (rule %d)"
 msgstr "   (regla %d)"
 
-#: src/print.c:111
+#: src/print.c:112
 msgid "    $default\taccept\n"
 msgstr "    $default\taceptar\n"
 
-#: src/print.c:113
+#: src/print.c:114
 msgid "    NO ACTIONS\n"
 msgstr "    SIN ACCIONES\n"
 
-#: src/print.c:132
+#: src/print.c:133
 #, c-format
 msgid "    $   \tgo to state %d\n"
 msgstr "    $   \tir al estado %d\n"
 
-#: src/print.c:135
+#: src/print.c:136
 #, c-format
 msgid "    %-4s\tshift, and go to state %d\n"
 msgstr "    %-4s\tdesplazar e ir al estado %d\n"
 
-#: src/print.c:159
+#: src/print.c:160
 #, c-format
 msgid "    %-4s\terror (nonassociative)\n"
 msgstr "    %-4s\terror (no asociativo)\n"
 
-#: src/print.c:187
+#: src/print.c:188
 #, c-format
 msgid "    %-4s\tgo to state %d\n"
 msgstr "    %-4s\tir al estado %d\n"
 
-#: src/print.c:199
+#: src/print.c:200
 #, fuzzy, c-format
 msgid "state %d"
 msgstr ""
@@ -424,24 +424,24 @@ msgstr ""
 "\n"
 
 #. rule # : LHS -> RHS
-#: src/print.c:229
+#: src/print.c:230
 #, fuzzy
 msgid "Grammar"
 msgstr ""
 "\n"
 "Gramática\n"
 
-#: src/print.c:234
+#: src/print.c:235
 #, c-format
 msgid "rule %-4d %s ->"
 msgstr "regla %-4d %s ->"
 
-#: src/print.c:240
+#: src/print.c:241
 msgid "empty"
 msgstr ""
 
 #. TERMINAL (type #) : rule #s terminal is on RHS
-#: src/print.c:245
+#: src/print.c:246
 #, fuzzy
 msgid "Terminals, with rules where they appear"
 msgstr ""
@@ -449,18 +449,18 @@ msgstr ""
 "Terminales con las reglas donde aparecen\n"
 "\n"
 
-#: src/print.c:269
+#: src/print.c:270
 #, fuzzy
 msgid "Nonterminals, with rules where they appear"
 msgstr ""
 "\n"
 "No terminales con las reglas donde aparecen\n"
 
-#: src/print.c:295
+#: src/print.c:296
 msgid " on left:"
 msgstr " en la izquierda:"
 
-#: src/print.c:310
+#: src/print.c:311
 msgid " on right:"
 msgstr " en la derecha:"
 

po/et.po

@@ -4,9 +4,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: bison 1.30a\n"
+"Project-Id-Version: bison 1.30b\n"
-"POT-Creation-Date: 2001-11-12 10:34+0100\n"
+"POT-Creation-Date: 2001-11-14 15:59+0100\n"
-"PO-Revision-Date: 2001-11-05 21:19+02:00\n"
+"PO-Revision-Date: 2001-11-13 10:42+02:00\n"
 "Last-Translator: Toomas Soome <[email protected]>\n"
 "Language-Team: Estonian <[email protected]>\n"
 "MIME-Version: 1.0\n"
@@ -48,60 +48,62 @@ msgid "an error"
 msgstr "viga"
 
 #: src/conflicts.c:411
-#, fuzzy, c-format
+#, c-format
 msgid "%d shift/reduce conflict"
 msgid_plural "%d shift/reduce conflicts"
-msgstr[0] " %d nihutamine/redutseerimine konflikti"
+msgstr[0] "%d nihutamine/redutseerimine konflikt"
+msgstr[1] "%d nihutamine/redutseerimine konflikti"
 
 #: src/conflicts.c:418
-#, fuzzy
 msgid "and"
-msgstr " ja"
+msgstr "ja"
 
 #: src/conflicts.c:424
-#, fuzzy, c-format
+#, c-format
 msgid "%d reduce/reduce conflict"
 msgid_plural "%d reduce/reduce conflicts"
-msgstr[0] " %d redutseerimine/redutseerimine konflikti"
+msgstr[0] "%d redutseerimine/redutseerimine konflikt"
+msgstr[1] "%d redutseerimine/redutseerimine konflikti"
 
 #: src/conflicts.c:448
-#, fuzzy, c-format
+#, c-format
 msgid "State %d contains "
-msgstr "Olek %d sisaldab"
+msgstr "Olek %d sisaldab "
 
 #. If invoked with `--yacc', use the output format specified by
 #. POSIX.
-#: src/conflicts.c:481
+#: src/conflicts.c:482
 msgid "conflicts: "
 msgstr "konfliktid: "
 
-#: src/conflicts.c:483
+#: src/conflicts.c:484
 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d nihutamine/redutseerimine"
 
-#: src/conflicts.c:487
+#: src/conflicts.c:488
 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d redutseerimine/redutseerimine"
 
-#: src/conflicts.c:492 src/reduce.c:497
+#: src/conflicts.c:493 src/reduce.c:497
 #, c-format
 msgid "%s contains "
 msgstr "%s sisaldab "
 
-#: src/conflicts.c:500
+#: src/conflicts.c:502
-#, fuzzy, c-format
+#, c-format
 msgid "expected %d shift/reduce conflict"
 msgid_plural "expected %d shift/reduce conflicts"
-msgstr[0] " %d nihutamine/redutseerimine konflikti"
+msgstr[0] "eeldasime %d nihutamine/redutseerimine konflikti"
+msgstr[1] "eeldasime %d nihutamine/redutseerimine konflikti"
 
-#: src/conflicts.c:587 src/conflicts.c:707
+#: src/conflicts.c:589 src/conflicts.c:709
 #, c-format
 msgid "    %-4s\t[reduce using rule %d (%s)]\n"
 msgstr "    %-4s\t[redutseerin, kasutades reeglit %d (%s)]\n"
 
-#: src/conflicts.c:598 src/print.c:171
+#: src/conflicts.c:600 src/print.c:172
 #, c-format
 msgid ""
 "    $default\treduce using rule %d (%s)\n"
@@ -110,12 +112,12 @@ msgstr ""
 "    $default\tredutseerin kasutades reeglit %d (%s)\n"
 "\n"
 
-#: src/conflicts.c:687 src/conflicts.c:701
+#: src/conflicts.c:689 src/conflicts.c:703
 #, c-format
 msgid "    %-4s\treduce using rule %d (%s)\n"
 msgstr "    %-4s\tredutseerin kasutades reeglit %d (%s)\n"
 
-#: src/conflicts.c:727
+#: src/conflicts.c:729
 #, c-format
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr "    $default\tredutseerin kasutades reeglit %d (%s)\n"
@@ -232,7 +234,7 @@ msgstr ""
 "See on vaba tarkvara; kopeerimistingimused leiate lähtetekstidest. Garantii\n"
 "PUUDUB; ka müügiks või mingil eesmärgil kasutamiseks.\n"
 
-#: src/getargs.c:215 src/lex.c:693
+#: src/getargs.c:215 src/lex.c:694
 #, c-format
 msgid "`%s' is no longer supported"
 msgstr "`%s' ei ole enam toetatud"
@@ -300,12 +302,12 @@ msgstr "l
 msgid "use \"...\" for multi-character literal tokens"
 msgstr "kasuta mitmesümboliliste literaalidega \"...\" konstruktsiooni"
 
-#: src/lex.c:666
+#: src/lex.c:667
 #, c-format
 msgid "`%s' supports no argument: %s"
 msgstr "`%s' ei toeta argumente: %s"
 
-#: src/lex.c:682
+#: src/lex.c:683
 #, c-format
 msgid "`%s' requires an argument"
 msgstr "võti `%s' nõuab argumenti"
@@ -324,77 +326,77 @@ msgstr "Entering set_nullable"
 msgid "maximum table size (%d) exceeded"
 msgstr "ületati maksimaalset tabelisuurust (%d)"
 
-#: src/print.c:37
+#: src/print.c:38
 #, c-format
 msgid " type %d is %s\n"
 msgstr " tüüp %d on %s\n"
 
-#: src/print.c:85
+#: src/print.c:86
 #, c-format
 msgid "   (rule %d)"
 msgstr "   (reegel %d)"
 
-#: src/print.c:111
+#: src/print.c:112
 msgid "    $default\taccept\n"
 msgstr "    $default\taktsepteerin\n"
 
-#: src/print.c:113
+#: src/print.c:114
 msgid "    NO ACTIONS\n"
 msgstr "    TEGEVUSI POLE\n"
 
-#: src/print.c:132
+#: src/print.c:133
 #, c-format
 msgid "    $   \tgo to state %d\n"
 msgstr "    $   \tliigu olekule %d\n"
 
-#: src/print.c:135
+#: src/print.c:136
 #, c-format
 msgid "    %-4s\tshift, and go to state %d\n"
 msgstr "    %-4s\tnihuta ja liigu olekule %d\n"
 
-#: src/print.c:159
+#: src/print.c:160
 #, c-format
 msgid "    %-4s\terror (nonassociative)\n"
 msgstr "    %-4s\tviga (mitteassotsiatiivne)\n"
 
-#: src/print.c:187
+#: src/print.c:188
 #, c-format
 msgid "    %-4s\tgo to state %d\n"
 msgstr "    %-4s\tliigu olekule %d\n"
 
-#: src/print.c:199
+#: src/print.c:200
 #, c-format
 msgid "state %d"
 msgstr "olek %d"
 
 #. rule # : LHS -> RHS
-#: src/print.c:229
+#: src/print.c:230
 msgid "Grammar"
 msgstr "Grammatika"
 
-#: src/print.c:234
+#: src/print.c:235
 #, c-format
 msgid "rule %-4d %s ->"
 msgstr "reegel %-4d %s ->"
 
-#: src/print.c:240
+#: src/print.c:241
 msgid "empty"
 msgstr "tühi"
 
 #. TERMINAL (type #) : rule #s terminal is on RHS
-#: src/print.c:245
+#: src/print.c:246
 msgid "Terminals, with rules where they appear"
 msgstr "Terminalid, koos reeglitega, kus nad ilmuvad"
 
-#: src/print.c:269
+#: src/print.c:270
 msgid "Nonterminals, with rules where they appear"
 msgstr "Mitteterminalid, koos reeglitega, kus nad ilmuvad"
 
-#: src/print.c:295
+#: src/print.c:296
 msgid " on left:"
 msgstr " vasakul:"
 
-#: src/print.c:310
+#: src/print.c:311
 msgid " on right:"
 msgstr " paremal:"
 
@@ -796,12 +798,3 @@ msgstr "`"
 #: lib/quotearg.c:269
 msgid "'"
 msgstr "'"
-
-#~ msgid " 1 shift/reduce conflict"
-#~ msgstr " 1 nihutamine/redutseerimine konflikt"
-
-#~ msgid " 1 reduce/reduce conflict"
-#~ msgstr " 1 redutseerimine/redutseerimine konflikt"
-
-#~ msgid "%s contains"
-#~ msgstr "%s sisaldab"

po/fr.po

@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU bison 1.29f\n"
+"Project-Id-Version: GNU bison 1.30a\n"
-"POT-Creation-Date: 2001-11-12 10:34+0100\n"
+"POT-Creation-Date: 2001-11-14 15:59+0100\n"
-"PO-Revision-Date: 2001-10-19 15:00-0500\n"
+"PO-Revision-Date: 2001-11-12 08:00-0500\n"
 "Last-Translator: Michel Robitaille <[email protected]>\n"
 "Language-Team: French <[email protected]>\n"
 "MIME-Version: 1.0\n"
@@ -73,37 +73,37 @@ msgstr "L'
 
 #. If invoked with `--yacc', use the output format specified by
 #. POSIX.
-#: src/conflicts.c:481
+#: src/conflicts.c:482
 msgid "conflicts: "
 msgstr "conflits: "
 
-#: src/conflicts.c:483
+#: src/conflicts.c:484
 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d décalage/réduction"
 
-#: src/conflicts.c:487
+#: src/conflicts.c:488
 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d réduction/réduction"
 
-#: src/conflicts.c:492 src/reduce.c:497
+#: src/conflicts.c:493 src/reduce.c:497
 #, c-format
 msgid "%s contains "
 msgstr "%s contient "
 
-#: src/conflicts.c:500
+#: src/conflicts.c:502
 #, fuzzy, c-format
 msgid "expected %d shift/reduce conflict"
 msgid_plural "expected %d shift/reduce conflicts"
 msgstr[0] " %d conflits décalage/réduction"
 
-#: src/conflicts.c:587 src/conflicts.c:707
+#: src/conflicts.c:589 src/conflicts.c:709
 #, c-format
 msgid "    %-4s\t[reduce using rule %d (%s)]\n"
 msgstr "    %-4s\t[réduction par la règle %d (%s)\n"
 
-#: src/conflicts.c:598 src/print.c:171
+#: src/conflicts.c:600 src/print.c:172
 #, c-format
 msgid ""
 "    $default\treduce using rule %d (%s)\n"
@@ -112,12 +112,12 @@ msgstr ""
 "    $défaut\tréduction par la règle %d (%s)\n"
 "\n"
 
-#: src/conflicts.c:687 src/conflicts.c:701
+#: src/conflicts.c:689 src/conflicts.c:703
 #, c-format
 msgid "    %-4s\treduce using rule %d (%s)\n"
 msgstr "    %-4s\tréduction par la règle %d (%s)\n"
 
-#: src/conflicts.c:727
+#: src/conflicts.c:729
 #, c-format
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr "    $défaut\tréduction par la règle %d (%s)\n"
@@ -156,9 +156,9 @@ msgid ""
 "If a long option shows an argument as mandatory, then it is mandatory\n"
 "for the equivalent short option also.  Similarly for optional arguments.\n"
 msgstr ""
-"Si une option de forme longue montre un paramètre comme étant obligatoire,\n"
+"Si une option de forme longue montre un arguement comme étant obligatoire,\n"
 "il est alors obligatoire également pour une option de forme courte.\n"
-"Il en est de même pour les paramètres optionnels.\n"
+"Il en est de même pour les arguments optionnels.\n"
 
 #: src/getargs.c:98
 msgid ""
@@ -195,7 +195,6 @@ msgstr ""
 "  -k, --token-table          inclure la table des noms de jetons\n"
 
 #: src/getargs.c:117
-#, fuzzy
 msgid ""
 "Output:\n"
 "  -d, --defines              also produce a header file\n"
@@ -209,7 +208,7 @@ msgstr ""
 "  -d, --defines              produire un fichier d'en-tête\n"
 "  -v, --verbose              produire une explication de l'automate\n"
 "  -b, --file-prefix=PREFIXE  utiliser le PREFIXE pour le fichier de sortie\n"
-"  -o, --output-file=FICHIER  produire la sortie dans le FICHIER\n"
+"  -o, --output=FICHIER       produire la sortie dans le FICHIER\n"
 "  -g, --graph                produire aussi la description du graphe VCG de "
 "l'automate\n"
 
@@ -239,7 +238,7 @@ msgstr ""
 "reproduction. AUCUNE garantie n'est donnée; tant pour des raisons\n"
 "COMMERCIALES que pour RÉPONDRE À UN BESOIN PARTICULIER.\n"
 
-#: src/getargs.c:215 src/lex.c:693
+#: src/getargs.c:215 src/lex.c:694
 #, c-format
 msgid "`%s' is no longer supported"
 msgstr "`%s' n'est plus supporté"
@@ -257,7 +256,7 @@ msgstr "%s: grammaire manquante\n"
 #: src/getargs.c:250
 #, c-format
 msgid "%s: extra arguments ignored after `%s'\n"
-msgstr "%s: paramètres supplémentaires ignorés après `%s'\n"
+msgstr "%s: arguments supplémentaires ignorés après `%s'\n"
 
 #: src/lalr.c:311
 #, c-format
@@ -307,15 +306,15 @@ msgstr "le nom de type ne se termine pas"
 msgid "use \"...\" for multi-character literal tokens"
 msgstr "utilisez \"...\" pour les terminaux litéraux de plusieurs caractères"
 
-#: src/lex.c:666
+#: src/lex.c:667
 #, c-format
 msgid "`%s' supports no argument: %s"
-msgstr ""
+msgstr "`%s' ne supporte aucun argument: %s"
 
-#: src/lex.c:682
+#: src/lex.c:683
-#, fuzzy, c-format
+#, c-format
 msgid "`%s' requires an argument"
-msgstr "%s: l'option %s requiert un paramètre\n"
+msgstr "`%s': requiert un argument"
 
 #: src/main.c:128
 #, c-format
@@ -331,77 +330,77 @@ msgstr "Entr
 msgid "maximum table size (%d) exceeded"
 msgstr "taille maximale de la table (%d) dépassée"
 
-#: src/print.c:37
+#: src/print.c:38
 #, c-format
 msgid " type %d is %s\n"
 msgstr " le type %d est %s\n"
 
-#: src/print.c:85
+#: src/print.c:86
 #, c-format
 msgid "   (rule %d)"
 msgstr "   (règle %d)"
 
-#: src/print.c:111
+#: src/print.c:112
 msgid "    $default\taccept\n"
 msgstr "    $défaut\taccepter\n"
 
-#: src/print.c:113
+#: src/print.c:114
 msgid "    NO ACTIONS\n"
 msgstr "    PAS D'ACTION\n"
 
-#: src/print.c:132
+#: src/print.c:133
 #, c-format
 msgid "    $   \tgo to state %d\n"
 msgstr "    $   \taller à l'état %d\n"
 
-#: src/print.c:135
+#: src/print.c:136
 #, c-format
 msgid "    %-4s\tshift, and go to state %d\n"
 msgstr "    %-4s\tdécalage et aller à l'état %d\n"
 
-#: src/print.c:159
+#: src/print.c:160
 #, c-format
 msgid "    %-4s\terror (nonassociative)\n"
 msgstr "    %-4s\terreur (non-associatif)\n"
 
-#: src/print.c:187
+#: src/print.c:188
 #, c-format
 msgid "    %-4s\tgo to state %d\n"
 msgstr "    %-4s\taller à l'état %d\n"
 
-#: src/print.c:199
+#: src/print.c:200
 #, c-format
 msgid "state %d"
 msgstr "état %d"
 
 #. rule # : LHS -> RHS
-#: src/print.c:229
+#: src/print.c:230
 msgid "Grammar"
 msgstr "Grammaire"
 
-#: src/print.c:234
+#: src/print.c:235
 #, c-format
 msgid "rule %-4d %s ->"
 msgstr "règle %-4d %s ->"
 
-#: src/print.c:240
+#: src/print.c:241
 msgid "empty"
 msgstr "vide"
 
 #. TERMINAL (type #) : rule #s terminal is on RHS
-#: src/print.c:245
+#: src/print.c:246
 msgid "Terminals, with rules where they appear"
 msgstr "Terminaux, suivis des règles où ils apparaissent"
 
-#: src/print.c:269
+#: src/print.c:270
 msgid "Nonterminals, with rules where they appear"
 msgstr "Non-terminaux, suivis des règles où ils apparaissent"
 
-#: src/print.c:295
+#: src/print.c:296
 msgid " on left:"
 msgstr " à gauche:"
 
-#: src/print.c:310
+#: src/print.c:311
 msgid " on right:"
 msgstr " à droite:"
 
@@ -528,7 +527,7 @@ msgstr "non appariement de %s"
 #: src/reader.c:798
 #, c-format
 msgid "argument of %%expect is not an integer"
-msgstr "le paramètre de %%expect n'est pas un entier"
+msgstr "l'argument de %%expect n'est pas un entier"
 
 #: src/reader.c:844
 #, c-format
@@ -726,17 +725,17 @@ msgstr "%s: l'option %s est ambig
 #: lib/getopt.c:719
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: l'option --%s n'admet pas de paramètre\n"
+msgstr "%s: l'option --%s n'admet pas d'argument\n"
 
 #: lib/getopt.c:724
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: l'option %c%s n'admet pas de paramètre\n"
+msgstr "%s: l'option %c%s n'admet pas d'argument\n"
 
 #: lib/getopt.c:742 lib/getopt.c:915
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: l'option %s requiert un paramètre\n"
+msgstr "%s: l'option %s requiert un argument\n"
 
 #. --option
 #: lib/getopt.c:771
@@ -765,7 +764,7 @@ msgstr "%s: option non valide -- %c\n"
 #: lib/getopt.c:834 lib/getopt.c:964
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: l'option requiert un paramètre -- %c\n"
+msgstr "%s: l'option requiert un argument -- %c\n"
 
 #: lib/getopt.c:881
 #, c-format
@@ -775,7 +774,7 @@ msgstr "%s: l'option `-W %s' est ambigu
 #: lib/getopt.c:899
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: l'option `-W %s' n'admet pas de paramètre\n"
+msgstr "%s: l'option `-W %s' n'admet pas d'argument\n"
 
 #. If XALLOC_FAIL_FUNC is NULL, or does return, display this message
 #. before exiting when memory is exhausted.  Goes through gettext.

po/ja.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU bison 1.28\n"
-"POT-Creation-Date: 2001-11-12 10:34+0100\n"
+"POT-Creation-Date: 2001-11-14 15:59+0100\n"
 "PO-Revision-Date: 1999-09-28 21:10+0900\n"
 "Last-Translator: Daisuke Yamashita <[email protected]>\n"
 "Language-Team: Japanese <[email protected]>\n"
@@ -72,37 +72,37 @@ msgstr "
 
 #. If invoked with `--yacc', use the output format specified by
 #. POSIX.
-#: src/conflicts.c:481
+#: src/conflicts.c:482
 msgid "conflicts: "
 msgstr "衝突: "
 
-#: src/conflicts.c:483
+#: src/conflicts.c:484
 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d シフト/還元"
 
-#: src/conflicts.c:487
+#: src/conflicts.c:488
 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d 還元/還元"
 
-#: src/conflicts.c:492 src/reduce.c:497
+#: src/conflicts.c:493 src/reduce.c:497
 #, c-format
 msgid "%s contains "
 msgstr "%s には"
 
-#: src/conflicts.c:500
+#: src/conflicts.c:502
 #, fuzzy, c-format
 msgid "expected %d shift/reduce conflict"
 msgid_plural "expected %d shift/reduce conflicts"
 msgstr[0] " %d シフト/還元衝突"
 
-#: src/conflicts.c:587 src/conflicts.c:707
+#: src/conflicts.c:589 src/conflicts.c:709
 #, c-format
 msgid "    %-4s\t[reduce using rule %d (%s)]\n"
 msgstr "    %-4s\t[規則 %d を利用して還元 (%s)]\n"
 
-#: src/conflicts.c:598 src/print.c:171
+#: src/conflicts.c:600 src/print.c:172
 #, c-format
 msgid ""
 "    $default\treduce using rule %d (%s)\n"
@@ -111,12 +111,12 @@ msgstr ""
 "    $default\t規則 %d を利用して還元 (%s)\n"
 "\n"
 
-#: src/conflicts.c:687 src/conflicts.c:701
+#: src/conflicts.c:689 src/conflicts.c:703
 #, c-format
 msgid "    %-4s\treduce using rule %d (%s)\n"
 msgstr "    %-4s\t規則 %d を利用して還元 (%s)\n"
 
-#: src/conflicts.c:727
+#: src/conflicts.c:729
 #, c-format
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr "    $default\t規則 %d を利用して還元 (%s)\n"
@@ -215,7 +215,7 @@ msgid ""
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
 
-#: src/getargs.c:215 src/lex.c:693
+#: src/getargs.c:215 src/lex.c:694
 #, c-format
 msgid "`%s' is no longer supported"
 msgstr ""
@@ -284,12 +284,12 @@ msgstr "
 msgid "use \"...\" for multi-character literal tokens"
 msgstr "複数文字のリテラルトークンには \"...\" を使いましょう"
 
-#: src/lex.c:666
+#: src/lex.c:667
 #, c-format
 msgid "`%s' supports no argument: %s"
 msgstr ""
 
-#: src/lex.c:682
+#: src/lex.c:683
 #, fuzzy, c-format
 msgid "`%s' requires an argument"
 msgstr "%s: オプション `%s' は引数を要求します\n"
@@ -308,45 +308,45 @@ msgstr "set_nullable
 msgid "maximum table size (%d) exceeded"
 msgstr "最大テーブルサイズ (%s) を超えました"
 
-#: src/print.c:37
+#: src/print.c:38
 #, c-format
 msgid " type %d is %s\n"
 msgstr " タイプ %d は %s です\n"
 
-#: src/print.c:85
+#: src/print.c:86
 #, c-format
 msgid "   (rule %d)"
 msgstr "   (規則 %d)"
 
-#: src/print.c:111
+#: src/print.c:112
 msgid "    $default\taccept\n"
 msgstr "    $default\taccept\n"
 
-#: src/print.c:113
+#: src/print.c:114
 msgid "    NO ACTIONS\n"
 msgstr "    動作無し\n"
 
-#: src/print.c:132
+#: src/print.c:133
 #, c-format
 msgid "    $   \tgo to state %d\n"
 msgstr "    $   \t状態 %d へ\n"
 
-#: src/print.c:135
+#: src/print.c:136
 #, c-format
 msgid "    %-4s\tshift, and go to state %d\n"
 msgstr "    %-4s\tシフト、および状態 %d へ\n"
 
-#: src/print.c:159
+#: src/print.c:160
 #, c-format
 msgid "    %-4s\terror (nonassociative)\n"
 msgstr "    %-4s\tエラー (非結合)\n"
 
-#: src/print.c:187
+#: src/print.c:188
 #, c-format
 msgid "    %-4s\tgo to state %d\n"
 msgstr "    %-4s\t状態 %d へ\n"
 
-#: src/print.c:199
+#: src/print.c:200
 #, fuzzy, c-format
 msgid "state %d"
 msgstr ""
@@ -356,24 +356,24 @@ msgstr ""
 "\n"
 
 #. rule # : LHS -> RHS
-#: src/print.c:229
+#: src/print.c:230
 #, fuzzy
 msgid "Grammar"
 msgstr ""
 "\n"
 "文法\n"
 
-#: src/print.c:234
+#: src/print.c:235
 #, c-format
 msgid "rule %-4d %s ->"
 msgstr "規則 %-4d %s ->"
 
-#: src/print.c:240
+#: src/print.c:241
 msgid "empty"
 msgstr ""
 
 #. TERMINAL (type #) : rule #s terminal is on RHS
-#: src/print.c:245
+#: src/print.c:246
 #, fuzzy
 msgid "Terminals, with rules where they appear"
 msgstr ""
@@ -381,7 +381,7 @@ msgstr ""
 "終端トークン、およびそこに現れた規則\n"
 "\n"
 
-#: src/print.c:269
+#: src/print.c:270
 #, fuzzy
 msgid "Nonterminals, with rules where they appear"
 msgstr ""
@@ -389,11 +389,11 @@ msgstr ""
 "非終端トークン、およびそこに現れた規則\n"
 "\n"
 
-#: src/print.c:295
+#: src/print.c:296
 msgid " on left:"
 msgstr " 左辺:"
 
-#: src/print.c:310
+#: src/print.c:311
 msgid " on right:"
 msgstr " 右辺:"
 

po/nl.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.25\n"
-"POT-Creation-Date: 2001-11-12 10:34+0100\n"
+"POT-Creation-Date: 2001-11-14 15:59+0100\n"
 "PO-Revision-Date: 1996-08-27 15:34 MET DST\n"
 "Last-Translator: Erick Branderhorst <[email protected]>\n"
 "Language-Team: Dutch <[email protected]>\n"
@@ -72,37 +72,37 @@ msgstr "Stadium %d bevat"
 
 #. If invoked with `--yacc', use the output format specified by
 #. POSIX.
-#: src/conflicts.c:481
+#: src/conflicts.c:482
 msgid "conflicts: "
 msgstr "conflictueerd: "
 
-#: src/conflicts.c:483
+#: src/conflicts.c:484
 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d vershuif/reduceer"
 
-#: src/conflicts.c:487
+#: src/conflicts.c:488
 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d reduceer/reduceer"
 
-#: src/conflicts.c:492 src/reduce.c:497
+#: src/conflicts.c:493 src/reduce.c:497
 #, c-format
 msgid "%s contains "
 msgstr "%s bevat"
 
-#: src/conflicts.c:500
+#: src/conflicts.c:502
 #, fuzzy, c-format
 msgid "expected %d shift/reduce conflict"
 msgid_plural "expected %d shift/reduce conflicts"
 msgstr[0] " %d verschuif/reduceer conflicten"
 
-#: src/conflicts.c:587 src/conflicts.c:707
+#: src/conflicts.c:589 src/conflicts.c:709
 #, c-format
 msgid "    %-4s\t[reduce using rule %d (%s)]\n"
 msgstr "    %-4s\t[reduceer gebruikt regel %d (%s)]\n"
 
-#: src/conflicts.c:598 src/print.c:171
+#: src/conflicts.c:600 src/print.c:172
 #, c-format
 msgid ""
 "    $default\treduce using rule %d (%s)\n"
@@ -111,12 +111,12 @@ msgstr ""
 "    $default\treduce using rule %d (%s)\n"
 "\n"
 
-#: src/conflicts.c:687 src/conflicts.c:701
+#: src/conflicts.c:689 src/conflicts.c:703
 #, c-format
 msgid "    %-4s\treduce using rule %d (%s)\n"
 msgstr ""
 
-#: src/conflicts.c:727
+#: src/conflicts.c:729
 #, c-format
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr ""
@@ -215,7 +215,7 @@ msgid ""
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
 
-#: src/getargs.c:215 src/lex.c:693
+#: src/getargs.c:215 src/lex.c:694
 #, c-format
 msgid "`%s' is no longer supported"
 msgstr ""
@@ -284,12 +284,12 @@ msgstr "niet getermineerd type naam"
 msgid "use \"...\" for multi-character literal tokens"
 msgstr "gebruik \"...\" voor meerdere karakters literal tekens"
 
-#: src/lex.c:666
+#: src/lex.c:667
 #, c-format
 msgid "`%s' supports no argument: %s"
 msgstr ""
 
-#: src/lex.c:682
+#: src/lex.c:683
 #, fuzzy, c-format
 msgid "`%s' requires an argument"
 msgstr "%s: optie `%s' vereist een argument\n"
@@ -308,45 +308,45 @@ msgstr "Inkomende set nullable"
 msgid "maximum table size (%d) exceeded"
 msgstr "maximale tabel grootte (%s) overschreden"
 
-#: src/print.c:37
+#: src/print.c:38
 #, c-format
 msgid " type %d is %s\n"
 msgstr ""
 
-#: src/print.c:85
+#: src/print.c:86
 #, c-format
 msgid "   (rule %d)"
 msgstr "   (regel %d)"
 
-#: src/print.c:111
+#: src/print.c:112
 msgid "    $default\taccept\n"
 msgstr ""
 
-#: src/print.c:113
+#: src/print.c:114
 msgid "    NO ACTIONS\n"
 msgstr "    GEEN AKTIES\n"
 
-#: src/print.c:132
+#: src/print.c:133
 #, c-format
 msgid "    $   \tgo to state %d\n"
 msgstr ""
 
-#: src/print.c:135
+#: src/print.c:136
 #, c-format
 msgid "    %-4s\tshift, and go to state %d\n"
 msgstr ""
 
-#: src/print.c:159
+#: src/print.c:160
 #, c-format
 msgid "    %-4s\terror (nonassociative)\n"
 msgstr ""
 
-#: src/print.c:187
+#: src/print.c:188
 #, c-format
 msgid "    %-4s\tgo to state %d\n"
 msgstr ""
 
-#: src/print.c:199
+#: src/print.c:200
 #, fuzzy, c-format
 msgid "state %d"
 msgstr ""
@@ -356,24 +356,24 @@ msgstr ""
 "\n"
 
 #. rule # : LHS -> RHS
-#: src/print.c:229
+#: src/print.c:230
 #, fuzzy
 msgid "Grammar"
 msgstr ""
 "\n"
 "Grammatica\n"
 
-#: src/print.c:234
+#: src/print.c:235
 #, c-format
 msgid "rule %-4d %s ->"
 msgstr "regel %-4d %s ->"
 
-#: src/print.c:240
+#: src/print.c:241
 msgid "empty"
 msgstr ""
 
 #. TERMINAL (type #) : rule #s terminal is on RHS
-#: src/print.c:245
+#: src/print.c:246
 #, fuzzy
 msgid "Terminals, with rules where they appear"
 msgstr ""
@@ -381,7 +381,7 @@ msgstr ""
 "Terminals, met regels waar ze voorkomen\n"
 "\n"
 
-#: src/print.c:269
+#: src/print.c:270
 #, fuzzy
 msgid "Nonterminals, with rules where they appear"
 msgstr ""
@@ -389,11 +389,11 @@ msgstr ""
 "Geen terminals, met regels waar ze voorkomen\n"
 "\n"
 
-#: src/print.c:295
+#: src/print.c:296
 msgid " on left:"
 msgstr " links:"
 
-#: src/print.c:310
+#: src/print.c:311
 msgid " on right:"
 msgstr " rechts:"
 

po/ru.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.29\n"
-"POT-Creation-Date: 2001-11-12 10:34+0100\n"
+"POT-Creation-Date: 2001-11-14 15:59+0100\n"
 "PO-Revision-Date: 2001-09-09 13:49+04:00\n"
 "Last-Translator: Dmitry S. Sivachenko <[email protected]>\n"
 "Language-Team: Russian <[email protected]>\n"
@@ -72,37 +72,37 @@ msgstr "
 
 #. If invoked with `--yacc', use the output format specified by
 #. POSIX.
-#: src/conflicts.c:481
+#: src/conflicts.c:482
 msgid "conflicts: "
 msgstr "ËÏÎÆÌÉËÔÙ: "
 
-#: src/conflicts.c:483
+#: src/conflicts.c:484
 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d ÓÄ×ÉÇ/×Ù×ÏÄ"
 
-#: src/conflicts.c:487
+#: src/conflicts.c:488
 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d ×Ù×ÏÄ/×Ù×ÏÄ"
 
-#: src/conflicts.c:492 src/reduce.c:497
+#: src/conflicts.c:493 src/reduce.c:497
 #, c-format
 msgid "%s contains "
 msgstr "%s ÓÏÄÅÒÖÉÔ "
 
-#: src/conflicts.c:500
+#: src/conflicts.c:502
 #, fuzzy, c-format
 msgid "expected %d shift/reduce conflict"
 msgid_plural "expected %d shift/reduce conflicts"
 msgstr[0] " %d ËÏÎÆÌÉËÔÏ× ÓÄ×ÉÇÁ/×Ù×ÏÄÁ"
 
-#: src/conflicts.c:587 src/conflicts.c:707
+#: src/conflicts.c:589 src/conflicts.c:709
 #, c-format
 msgid "    %-4s\t[reduce using rule %d (%s)]\n"
 msgstr "    %-4s\t[×Ù×ÏÄ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÐÒÁ×ÉÌÁ %d (%s)]\n"
 
-#: src/conflicts.c:598 src/print.c:171
+#: src/conflicts.c:600 src/print.c:172
 #, c-format
 msgid ""
 "    $default\treduce using rule %d (%s)\n"
@@ -111,12 +111,12 @@ msgstr ""
 "    $default\t×Ù×ÏÄ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÐÒÁ×ÉÌÁ %d (%s)\n"
 "\n"
 
-#: src/conflicts.c:687 src/conflicts.c:701
+#: src/conflicts.c:689 src/conflicts.c:703
 #, c-format
 msgid "    %-4s\treduce using rule %d (%s)\n"
 msgstr "    %-4s\t×Ù×ÏÄ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÐÒÁ×ÉÌÁ %d (%s)\n"
 
-#: src/conflicts.c:727
+#: src/conflicts.c:729
 #, c-format
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr "    $default\t×Ù×ÏÄ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÐÒÁ×ÉÌÁ %d (%s)\n"
@@ -238,7 +238,7 @@ msgstr ""
 "ðòéçïäîïóôé\n"
 "äìñ ïðòåäåìåîîïê ãåìé.\n"
 
-#: src/getargs.c:215 src/lex.c:693
+#: src/getargs.c:215 src/lex.c:694
 #, c-format
 msgid "`%s' is no longer supported"
 msgstr "`%s' ÂÏÌØÛÅ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ"
@@ -306,12 +306,12 @@ msgstr "
 msgid "use \"...\" for multi-character literal tokens"
 msgstr "ÉÓÐÏÌØÚÕÊÔÅ \"...\" ÄÌÑ ÍÎÏÇÏÓÉÍ×ÏÌØÎÙÈ ÌÉÔÅÒÁÌØÎÙÈ ÌÅËÓÅÍ"
 
-#: src/lex.c:666
+#: src/lex.c:667
 #, c-format
 msgid "`%s' supports no argument: %s"
 msgstr ""
 
-#: src/lex.c:682
+#: src/lex.c:683
 #, fuzzy, c-format
 msgid "`%s' requires an argument"
 msgstr "%s: ËÌÀÞ `%s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ Ó ÁÒÇÕÍÅÎÔÏÍ\n"
@@ -330,77 +330,77 @@ msgstr "
 msgid "maximum table size (%d) exceeded"
 msgstr "ÐÒÅ×ÙÛÅÎ ÍÁËÓÉÍÁÌØÎÙÊ ÒÁÚÍÅÒ ÔÁÂÌÉÃÙ (%d)"
 
-#: src/print.c:37
+#: src/print.c:38
 #, c-format
 msgid " type %d is %s\n"
 msgstr " ÔÉÐ %d Ñ×ÌÑÅÔÓÑ %s\n"
 
-#: src/print.c:85
+#: src/print.c:86
 #, c-format
 msgid "   (rule %d)"
 msgstr "   (ÐÒÁ×ÉÌÏ %d)"
 
-#: src/print.c:111
+#: src/print.c:112
 msgid "    $default\taccept\n"
 msgstr "    $default\tÐÒÉÎÑÔÉÅ\n"
 
-#: src/print.c:113
+#: src/print.c:114
 msgid "    NO ACTIONS\n"
 msgstr "    îåô äåêóô÷éê\n"
 
-#: src/print.c:132
+#: src/print.c:133
 #, c-format
 msgid "    $   \tgo to state %d\n"
 msgstr "    $   \tÐÅÒÅÈÏÄ × ÓÏÓÔÏÑÎÉÅ %d\n"
 
-#: src/print.c:135
+#: src/print.c:136
 #, c-format
 msgid "    %-4s\tshift, and go to state %d\n"
 msgstr "    %-4s\tÓÄ×ÉÇ, É ÐÅÒÅÈÏÄ × ÓÏÓÔÏÑÎÉÅ %d\n"
 
-#: src/print.c:159
+#: src/print.c:160
 #, c-format
 msgid "    %-4s\terror (nonassociative)\n"
 msgstr "    %-4s\tÏÛÉÂËÁ (ÎÅÁÓÓÏÃÉÁÔÉ×ÎÁÑ)\n"
 
-#: src/print.c:187
+#: src/print.c:188
 #, c-format
 msgid "    %-4s\tgo to state %d\n"
 msgstr "    %-4s\tÐÅÒÅÈÏÄ × ÓÏÓÔÏÑÎÉÅ %d\n"
 
-#: src/print.c:199
+#: src/print.c:200
 #, c-format
 msgid "state %d"
 msgstr "ÓÏÓÔÏÑÎÉÅ %d"
 
 #. rule # : LHS -> RHS
-#: src/print.c:229
+#: src/print.c:230
 msgid "Grammar"
 msgstr "çÒÁÍÍÁÔÉËÁ"
 
-#: src/print.c:234
+#: src/print.c:235
 #, c-format
 msgid "rule %-4d %s ->"
 msgstr "ÐÒÁ×ÉÌÏ %-4d %s ->"
 
-#: src/print.c:240
+#: src/print.c:241
 msgid "empty"
 msgstr ""
 
 #. TERMINAL (type #) : rule #s terminal is on RHS
-#: src/print.c:245
+#: src/print.c:246
 msgid "Terminals, with rules where they appear"
 msgstr "ôÅÒÍÉÎÁÌØÎÙÅ ÓÉÍ×ÏÌÙ Ó ÐÒÁ×ÉÌÁÍÉ, × ËÏÔÏÒÙÈ ÏÎÉ ÐÏÑ×ÌÑÀÔÓÑ"
 
-#: src/print.c:269
+#: src/print.c:270
 msgid "Nonterminals, with rules where they appear"
 msgstr "îÅÔÅÒÍÉÎÁÌØÎÙÅ ÓÉÍ×ÏÌÙ Ó ÐÒÁ×ÉÌÁÍÉ, × ËÏÔÏÒÙÈ ÏÎÉ ÐÏÑ×ÌÑÀÔÓÑ"
 
-#: src/print.c:295
+#: src/print.c:296
 msgid " on left:"
 msgstr " ÎÁÌÅ×Ï:"
 
-#: src/print.c:310
+#: src/print.c:311
 msgid " on right:"
 msgstr " ÎÁÐÒÁ×Ï:"
 

po/tr.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.30\n"
-"POT-Creation-Date: 2001-11-12 10:34+0100\n"
+"POT-Creation-Date: 2001-11-14 15:59+0100\n"
 "PO-Revision-Date: 2001-11-02 14:49GMT\n"
 "Last-Translator: Altug Bayram <[email protected]>\n"
 "Language-Team: Turkish <[email protected]>\n"
@@ -74,37 +74,37 @@ msgstr "%d durumu i
 
 #. If invoked with `--yacc', use the output format specified by
 #. POSIX.
-#: src/conflicts.c:481
+#: src/conflicts.c:482
 msgid "conflicts: "
 msgstr "çeliþkiler: "
 
-#: src/conflicts.c:483
+#: src/conflicts.c:484
 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d öteleme/indirgeme"
 
-#: src/conflicts.c:487
+#: src/conflicts.c:488
 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d indirgeme/indirgeme"
 
-#: src/conflicts.c:492 src/reduce.c:497
+#: src/conflicts.c:493 src/reduce.c:497
 #, c-format
 msgid "%s contains "
 msgstr "%s içerir "
 
-#: src/conflicts.c:500
+#: src/conflicts.c:502
 #, fuzzy, c-format
 msgid "expected %d shift/reduce conflict"
 msgid_plural "expected %d shift/reduce conflicts"
 msgstr[0] " %d öteleme/indirgeme çeliþkisi"
 
-#: src/conflicts.c:587 src/conflicts.c:707
+#: src/conflicts.c:589 src/conflicts.c:709
 #, c-format
 msgid "    %-4s\t[reduce using rule %d (%s)]\n"
 msgstr "    %-4s\t[indirgeme kural %d (%s)'i kullanýyor]\n"
 
-#: src/conflicts.c:598 src/print.c:171
+#: src/conflicts.c:600 src/print.c:172
 #, c-format
 msgid ""
 "    $default\treduce using rule %d (%s)\n"
@@ -113,12 +113,12 @@ msgstr ""
 "    $default\tindirgeme kural %d (%s)'i kullanýyor\n"
 "\n"
 
-#: src/conflicts.c:687 src/conflicts.c:701
+#: src/conflicts.c:689 src/conflicts.c:703
 #, c-format
 msgid "    %-4s\treduce using rule %d (%s)\n"
 msgstr "    %-4s\tindirgeme kural %d (%s)'i kullanýyor\n"
 
-#: src/conflicts.c:727
+#: src/conflicts.c:729
 #, c-format
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr "    $default\tindirgeme kural %d (%s)'i kullanýyor\n"
@@ -238,7 +238,7 @@ msgstr ""
 "Hiçbir garantisi yoktur; hatta SATILABÝLÝRLÝÐÝ veya ÞAHSÝ KULLANIMINIZA\n"
 "UYGUNLUÐU için bile garanti verilmez.\n"
 
-#: src/getargs.c:215 src/lex.c:693
+#: src/getargs.c:215 src/lex.c:694
 #, c-format
 msgid "`%s' is no longer supported"
 msgstr "`%s' artýk desteklenmeyecek"
@@ -306,12 +306,12 @@ msgstr "sonland
 msgid "use \"...\" for multi-character literal tokens"
 msgstr "cok-karakterli yazýn andaçlarý için \"...\" kullan"
 
-#: src/lex.c:666
+#: src/lex.c:667
 #, c-format
 msgid "`%s' supports no argument: %s"
 msgstr ""
 
-#: src/lex.c:682
+#: src/lex.c:683
 #, fuzzy, c-format
 msgid "`%s' requires an argument"
 msgstr "%s: `%s' seçeneði bir argümanla kullanýlýr\n"
@@ -330,77 +330,77 @@ msgstr "set_nullable'a girildi"
 msgid "maximum table size (%d) exceeded"
 msgstr "en büyük tablo uzunluðu (%d) aþýldý"
 
-#: src/print.c:37
+#: src/print.c:38
 #, c-format
 msgid " type %d is %s\n"
 msgstr " tip %d %s'dir\n"
 
-#: src/print.c:85
+#: src/print.c:86
 #, c-format
 msgid "   (rule %d)"
 msgstr "   (kural %d)"
 
-#: src/print.c:111
+#: src/print.c:112
 msgid "    $default\taccept\n"
 msgstr "    $default\tonayla\n"
 
-#: src/print.c:113
+#: src/print.c:114
 msgid "    NO ACTIONS\n"
 msgstr "    EYLEMLER YOK\n"
 
-#: src/print.c:132
+#: src/print.c:133
 #, c-format
 msgid "    $   \tgo to state %d\n"
 msgstr "    $   \tdurum %d'ye git\n"
 
-#: src/print.c:135
+#: src/print.c:136
 #, c-format
 msgid "    %-4s\tshift, and go to state %d\n"
 msgstr "    %-4s\tötele, ve durum %d'ye git\n"
 
-#: src/print.c:159
+#: src/print.c:160
 #, c-format
 msgid "    %-4s\terror (nonassociative)\n"
 msgstr "    %-4s\thata (birleþmeli deðil)\n"
 
-#: src/print.c:187
+#: src/print.c:188
 #, c-format
 msgid "    %-4s\tgo to state %d\n"
 msgstr "    %-4s\tdurum %d'ye git\n"
 
-#: src/print.c:199
+#: src/print.c:200
 #, c-format
 msgid "state %d"
 msgstr "durum %d"
 
 #. rule # : LHS -> RHS
-#: src/print.c:229
+#: src/print.c:230
 msgid "Grammar"
 msgstr "Gramer"
 
-#: src/print.c:234
+#: src/print.c:235
 #, c-format
 msgid "rule %-4d %s ->"
 msgstr "kural %-4d %s ->"
 
-#: src/print.c:240
+#: src/print.c:241
 msgid "empty"
 msgstr "boþ"
 
 #. TERMINAL (type #) : rule #s terminal is on RHS
-#: src/print.c:245
+#: src/print.c:246
 msgid "Terminals, with rules where they appear"
 msgstr "Sabit simgeler, kurallarýnýn bulunduklarý yerde"
 
-#: src/print.c:269
+#: src/print.c:270
 msgid "Nonterminals, with rules where they appear"
 msgstr "Deðiþken simgeler, kurallarýnýn bulunduklarý yerde"
 
-#: src/print.c:295
+#: src/print.c:296
 msgid " on left:"
 msgstr " solda:"
 
-#: src/print.c:310
+#: src/print.c:311
 msgid " on right:"
 msgstr " saðda:"
 

src/bison.simple

@@ -385,40 +385,38 @@ yyparse (YYPARSE_PARAM_ARG)
 
   if (yyssp >= yyss + yystacksize - 1)
     {
-      /* Give user a chance to reallocate the stack. Use copies of
-	 these so that the &'s don't force the real ones into memory.
-	 */
-      YYSTYPE *yyvs1 = yyvs;
-      short *yyss1 = yyss;
-#if YYLSP_NEEDED
-      YYLTYPE *yyls1 = yyls;
-#endif
-
       /* Get the current used size of the three stacks, in elements.  */
       int size = yyssp - yyss + 1;
 
 #ifdef yyoverflow
-      /* Each stack pointer address is followed by the size of the
+      {
-	 data in use in that stack, in bytes.  */
+	/* Give user a chance to reallocate the stack. Use copies of
-# if YYLSP_NEEDED
+	   these so that the &'s don't force the real ones into
-      /* This used to be a conditional around just the two extra args,
+	   memory.  */
-	 but that might be undefined if yyoverflow is a macro.  */
+	YYSTYPE *yyvs1 = yyvs;
-      yyoverflow ("parser stack overflow",
+	short *yyss1 = yyss;
-		  &yyss1, size * sizeof (*yyssp),
-		  &yyvs1, size * sizeof (*yyvsp),
-		  &yyls1, size * sizeof (*yylsp),
-		  &yystacksize);
-# else
-      yyoverflow ("parser stack overflow",
-		  &yyss1, size * sizeof (*yyssp),
-		  &yyvs1, size * sizeof (*yyvsp),
-		  &yystacksize);
-# endif
 
-      yyss = yyss1; yyvs = yyvs1;
+	/* Each stack pointer address is followed by the size of the
+	   data in use in that stack, in bytes.  */
 # if YYLSP_NEEDED
-      yyls = yyls1;
+	YYLTYPE *yyls1 = yyls;
+	/* This used to be a conditional around just the two extra args,
+	   but that might be undefined if yyoverflow is a macro.  */
+	yyoverflow ("parser stack overflow",
+		    &yyss1, size * sizeof (*yyssp),
+		    &yyvs1, size * sizeof (*yyvsp),
+		    &yyls1, size * sizeof (*yylsp),
+		    &yystacksize);
+	yyls = yyls1;
+# else
+	yyoverflow ("parser stack overflow",
+		    &yyss1, size * sizeof (*yyssp),
+		    &yyvs1, size * sizeof (*yyvsp),
+		    &yystacksize);
 # endif
+	yyss = yyss1;
+	yyvs = yyvs1;
+      }
 #else /* no yyoverflow */
       /* Extend the stack our own way.  */
       if (yystacksize >= YYMAXDEPTH)

src/conflicts.c

@@ -474,24 +474,26 @@ conflicts_print (void)
 
   /* Report the total number of conflicts on STDERR.  */
   if (src_total || rrc_total)
-    if (yacc_flag)
+    {
-      {
+      if (yacc_flag)
-	/* If invoked with `--yacc', use the output format specified by
+	{
-	   POSIX.  */
+	  /* If invoked with `--yacc', use the output format specified by
-	fprintf (stderr, _("conflicts: "));
+	     POSIX.  */
-	if (src_total > 0)
+	  fprintf (stderr, _("conflicts: "));
-	  fprintf (stderr, _(" %d shift/reduce"), src_total);
+	  if (src_total > 0)
-	if (src_total > 0 && rrc_total > 0)
+	    fprintf (stderr, _(" %d shift/reduce"), src_total);
-	  fprintf (stderr, ",");
+	  if (src_total > 0 && rrc_total > 0)
-	if (rrc_total > 0)
+	    fprintf (stderr, ",");
-	  fprintf (stderr, _(" %d reduce/reduce"), rrc_total);
+	  if (rrc_total > 0)
-	putc ('\n', stderr);
+	    fprintf (stderr, _(" %d reduce/reduce"), rrc_total);
-      }
+	  putc ('\n', stderr);
-    else
+	}
-      {
+      else
-	fprintf (stderr, _("%s contains "), infile);
+	{
-	fputs (conflict_report (src_total, rrc_total), stderr);
+	  fprintf (stderr, _("%s contains "), infile);
-      }
+	  fputs (conflict_report (src_total, rrc_total), stderr);
+	}
+    }
 
   if (expected_conflicts != -1
       && src_total != expected_conflicts)

src/lex.c

@@ -29,15 +29,15 @@
 
 /* Buffer for storing the current token.  */
 struct obstack token_obstack;
-char *token_buffer = NULL;
+const char *token_buffer = NULL;
 
-bucket *symval;
+bucket *symval = NULL;
 int numval;
 
 /* A token to be reread, see unlex and lex. */
 static token_t unlexed = tok_undef;
 static bucket *unlexed_symval = NULL;
-static char *unlexed_token_buffer = NULL;
+static const char *unlexed_token_buffer = NULL;
 
 void
 lex_init (void)
@@ -585,9 +585,9 @@ token_t
 parse_percent_token (void)
 {
   struct percent_table_struct *tx = NULL;
-  /* Where `=' was found in token_buffer. */
+  const char *arg = NULL;
-  size_t equal_offset = 0;
+  /* Where the ARG was found in token_buffer. */
-  char *arg = NULL;
+  size_t arg_offset = 0;
 
   int c = getc (finput);
 
@@ -629,33 +629,34 @@ parse_percent_token (void)
       c = getc (finput);
     }
 
+  /* %DIRECTIVE="ARG".  Separate into
+     TOKEN_BUFFER = `%DIRECTIVE\0ARG\0'.
+     This is a bit hackish, but once we move to a Bison parser,
+     things will be cleaned up.  */
   if (c == '=')
     {
-      equal_offset = obstack_object_size (&token_obstack);
+      /* End of the directive.  We skip the `='. */
-      obstack_1grow (&token_obstack, c);
+      obstack_1grow (&token_obstack, '\0');
+      /* Fetch the ARG if present. */
       c = getc (finput);
-      if (c = '"')
+      if (c == '"')
 	{
-	  int code;		/* ignored here */
+	  int code;
-
+	  arg_offset = obstack_object_size (&token_obstack);
-	  obstack_1grow (&token_obstack, '"');
+	  /* Read up to and including `"'.  Do not append the closing
-	  /* Read up to and including ".  */
+	     `"' in the output: it's not part of the ARG.  */
-	  while (literalchar (&token_obstack, &code, '"'))
+	  while (literalchar (NULL, &code, '"'))
-	    /* nothing */;
+	    obstack_1grow (&token_obstack, code);
 	}
+      /* else: should be an error. */
     }
   else
     ungetc (c, finput);
 
   obstack_1grow (&token_obstack, '\0');
   token_buffer = obstack_finish (&token_obstack);
-  if (equal_offset)
+  if (arg_offset)
-    {
+    arg = token_buffer + arg_offset;
-      /* %token_buffer="arg" */
-      arg = token_buffer + equal_offset + 2;
-      arg[strlen (arg) - 1] = '\0';
-      token_buffer[equal_offset] = '\0';
-    }
 
   /* table lookup % directive */
   for (tx = percent_table; tx->name; tx++)
@@ -676,7 +677,7 @@ parse_percent_token (void)
 	     precedence.  Side effect: if this %-option is used
 	     several times, only the first is honored.  Bah.  */
 	  if (!*((char **) (tx->set_flag)))
-	    *((char **) (tx->set_flag)) = arg;
+	    *((char **) (tx->set_flag)) = xstrdup (arg);
 	}
       else
 	fatal (_("`%s' requires an argument"), token_buffer);

src/lex.h

@@ -55,7 +55,7 @@ typedef enum token_e
     tok_obsolete
   } token_t;
 
-extern char *token_buffer;
+extern const char *token_buffer;
 extern bucket *symval;
 extern int numval;
 

src/main.c

@@ -117,7 +117,7 @@ main (int argc, char *argv[])
 
   output_files ();
 
-  exit (complain_message_count ? 1 : 0);
+  return complain_message_count ? EXIT_FAILURE : EXIT_SUCCESS;
 }
 
 /* Abort for an internal error denoted by string S.  */

src/print.c

@@ -1,5 +1,5 @@
 /* Print information on generated parser, for bison,
-   Copyright 1984, 1986, 1989, 2000 Free Software Foundation, Inc.
+   Copyright 1984, 1986, 1989, 2000, 2001 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -29,6 +29,7 @@
 #include "state.h"
 #include "reader.h"
 #include "print.h"
+#include "reduce.h"
 
 #if 0
 static void

src/system.h

@@ -40,6 +40,18 @@
 # include <stdlib.h>
 #endif
 
+/* The following test is to work around the gross typo in
+   systems like Sony NEWS-OS Release 4.0C, whereby EXIT_FAILURE
+   is defined to 0, not 1.  */
+#if !EXIT_FAILURE
+# undef EXIT_FAILURE
+# define EXIT_FAILURE 1
+#endif
+
+#ifndef EXIT_SUCCESS
+# define EXIT_SUCCESS 0
+#endif
+
 #if HAVE_UNISTD_H
 # include <unistd.h>
 #endif

tests/atlocal.in

@@ -10,4 +10,4 @@ CFLAGS='@CFLAGS@'
 GCC='@GCC@'
 
 # We need `config.h'.
-CPPFLAGS="-I $top_builddir @CPPFLAGS@"
+CPPFLAGS="-I $top_buildpath @CPPFLAGS@"

tests/calc.at

@@ -338,8 +338,14 @@ AT_CHECK([bison calc.y -o calc.c m4_bpatsubst([$1], [--yyerror-verbose])],
 # Maybe some day we will have proper Autoconf macros to disable these
 # warnings, but this place is not the right one for that.
 # So let's keep only GCC warnings, which we know are sane.
-AT_CHECK([$CC $CFLAGS $CPPFLAGS calc.c -o calc], 0, [], [stderr])
+# Well, that's only part of the story: some assemblers issue warnings
-AT_CHECK([if test "$GCC" = yes; then cat stderr; else true; fi])
+# which can be totally useless, and actually polluting.  It seems that
+# the best bet be to completely ignore stderr, but to pass -Werror
+# to GCC.
+if test "$GCC" = yes; then
+  CFLAGS="$CFLAGS -Werror"
+fi
+AT_CHECK([$CC $CFLAGS $CPPFLAGS calc.c -o calc], 0, [], [ignore])
 
 # Test the priorities.
 _AT_CHECK_CALC([$1],
@@ -377,7 +383,7 @@ _AT_CHECK_CALC_ERROR([$1],
                      [2.0:2.1],
                      [unexpected `'+''])
 
-AT_CLEANUP(calc calc.c calc.h calc.output)
+AT_CLEANUP
 ])# AT_CHECK_CALC
 
 

tests/output.at

@@ -31,7 +31,7 @@ foo: {}
 
 AT_CHECK([bison $3 $1], 0)
 AT_CHECK([ls $4], [], [ignore])
-AT_CLEANUP($4)
+AT_CLEANUP
 ])
 
 AT_CHECK_OUTPUT([foo.y], [], [-dv],

tests/regression.at

@@ -40,7 +40,7 @@ exp: '(' exp ')' | NUM ;
 
 AT_CHECK([bison -v duplicate.y -o duplicate.c], 0, ignore, ignore)
 
-AT_CLEANUP([duplicate.*])
+AT_CLEANUP
 
 
 ## ------------------------- ##
@@ -139,7 +139,7 @@ state 6
     $default	accept
 ]])
 
-AT_CLEANUP(input.c input.output)
+AT_CLEANUP
 
 
 ## --------------------- ##
@@ -236,7 +236,7 @@ state 6
     $default	accept
 ]])
 
-AT_CLEANUP(input.c input.output)
+AT_CLEANUP
 
 
 
@@ -257,7 +257,7 @@ AT_CHECK([bison input.y -o input.c], 1, [],
 [input.y contains 1 shift/reduce conflict.
 expected 0 shift/reduce conflicts
 ])
-AT_CLEANUP(input.c)
+AT_CLEANUP
 
 
 ## --------------- ##
@@ -276,7 +276,7 @@ exp: exp OP exp | NUM;
 AT_CHECK([bison input.y -o input.c], 0, [],
 [input.y contains 1 shift/reduce conflict.
 ])
-AT_CLEANUP(input.c)
+AT_CLEANUP
 
 
 ## ------------------ ##
@@ -296,7 +296,7 @@ AT_CHECK([bison input.y -o input.c], 1, [],
 [input.y contains 1 shift/reduce conflict.
 expected 2 shift/reduce conflicts
 ])
-AT_CLEANUP(input.c)
+AT_CLEANUP
 
 
 ## ---------------------- ##
@@ -318,7 +318,7 @@ exp: ;
 
 AT_CHECK([bison -v input.y -o input.c], 0, ignore, ignore)
 
-AT_CLEANUP([input.*])
+AT_CLEANUP
 
 
 
@@ -341,7 +341,7 @@ exp: {};
 
 AT_CHECK([bison --defines union.y])
 
-AT_CLEANUP([union.*])
+AT_CLEANUP
 
 
 ## --------------------------------------- ##
@@ -364,7 +364,7 @@ exp: {};
 AT_CHECK([bison union-comment.y])
 AT_CHECK([fgrep '//*' union-comment.tab.c], [1], [])
 
-AT_CLEANUP([union-comment.*])
+AT_CLEANUP
 
 
 ## ----------------- ##
@@ -416,11 +416,9 @@ AT_CLEANUP
 m4_define([AT_TEST_CPP_GUARD_H],
 [AT_SETUP([Invalid CPP guards: $1])
 
-# possibly create and nuke inner directories.
+# Possibly create inner directories.
-m4_bmatch([$1], [[/]],
+dirname=`AS_DIRNAME([$1])`
-[dirname=`AS_DIRNAME([$1])`
 AS_MKDIR_P([$dirname])
-AT_CLEANUP_FILES([$dirname])])
 
 AT_DATA([$1.y],
 [%%
@@ -432,7 +430,7 @@ AT_CHECK([bison --defines=$1.h $1.y])
 # CPP should be happy with it.
 AT_CHECK([$CC -E $1.h], 0, [ignore])
 
-AT_CLEANUP($1.*)
+AT_CLEANUP
 ])
 
 AT_TEST_CPP_GUARD_H([input/input])

tests/testsuite.at

@@ -19,7 +19,7 @@
 # 02111-1307, USA.
 
 # We need a recent Autotest.
-m4_version_prereq([2.52e])
+m4_version_prereq([2.52g])
 
 AT_INIT
 

tests/torture.at

@@ -73,7 +73,6 @@ main (int argc, const char **argv)
 ]])
 AT_CHECK([bison input.y -o input.c])
 AT_CHECK([$CC $CFLAGS $CPPFLAGS input.c -o input], 0, [], [ignore])
-AT_CLEANUP_FILES(input input.c)
 ])