Version 1.33b.

bison fails when trying to output a parser and a header under the
same name.
* src/files.c (compute_output_file_names): Refuse when parser and
header have the same name.

ChangeLog

@@ -1,3 +1,32 @@
+2002-03-04  Akim Demaille  <[email protected]>
+
+	Version 1.33b.
+
+2002-03-04  Akim Demaille  <[email protected]>
+
+	* tests/output.at (AT_CHECK_OUTPUT): Another test, making sure
+	bison fails when trying to output a parser and a header under the
+	same name.
+	* src/files.c (compute_output_file_names): Refuse when parser and
+	header have the same name.
+
+2002-03-04  Akim Demaille  <[email protected]>
+
+	* src/reader.c (readgram): A missing `;' is a warning, not an
+	error!
+
+2002-03-04  Akim Demaille  <[email protected]>
+
+	* tests/sets.at (Broken Closure): Add the ending `;'.
+	* tests/input.at (Invalid $n, Invalid @n): Likewise.
+	* tests/output.at (AT_CHECK_OUTPUT): Likewise.
+	* src/reader.at (readgram): Complain if a rule is not ended with a
+	semi-colon.
+
+2002-02-28  Akim Demaille  <[email protected]>
+
+	* tests/Makefile.am (check_SCRIPTS): New.
+
 2002-02-28  Akim Demaille  <[email protected]>
 
 	Version 1.33a.

NEWS

@@ -1,7 +1,18 @@
 Bison News
 ----------
 
-Changes in version 1.33a:
+Changes in version 1.33b:
+
+* File name clashes are detected
+  $ bison foo.y -d -o foo.x
+  fatal error: header and parser would be both named `foo.x'
+
+* A missing `;' ending a rule triggers a warning
+  In accordance with POSIX, and in agreement with other
+  Yacc implementations, Bison will mandate this semicolon in a near
+  future.  This eases the implementation of a Bison parser of Bison
+  grammars by making this grammar LALR(1) instead of LR(2).  To
+  facilitate the transition, this release introduces a warning.
 
 * Revert the C++ namespace changes introduced in 1.31, as they caused too
   many portability hassles.

config/config.guess

@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002 Free Software Foundation, Inc.
 
-timestamp='2002-02-19'
+timestamp='2002-03-04'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -138,8 +138,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	#
 	# Note: NetBSD doesn't particularly care about the vendor
 	# portion of the name.  We always set it to "unknown".
-	UNAME_MACHINE_ARCH=`(uname -p) 2>/dev/null` || \
+	sysctl="sysctl -n hw.machine_arch"
-	    UNAME_MACHINE_ARCH=unknown
+	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
+	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
 	case "${UNAME_MACHINE_ARCH}" in
 	    arm*) machine=arm-unknown ;;
 	    sh3el) machine=shl-unknown ;;

config/config.sub

@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002 Free Software Foundation, Inc.
 
-timestamp='2002-02-22'
+timestamp='2002-03-04'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -247,7 +247,7 @@ case $basic_machine in
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
 	| sh | sh[34] | sh[34]eb | shbe | shle | sh64 \
-	| sparc | sparc64 | sparclet | sparclite | sparcv9 | sparcv9b \
+	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
 	| strongarm \
 	| tahoe | thumb | tic80 | tron \
 	| v850 | v850e \
@@ -306,7 +306,7 @@ case $basic_machine in
 	| pyramid-* \
 	| romp-* | rs6000-* \
 	| sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* | sh64-* \
-	| sparc-* | sparc64-* | sparc86x-* | sparclite-* \
+	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
 	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
 	| v850-* | v850e-* | vax-* \

config/prev-version.txt

@@ -1 +1 @@
-1.33
+1.33a

config/texinfo.tex

@@ -3,7 +3,7 @@
 % Load plain if necessary, i.e., if running under initex.
 \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
 %
-\def\texinfoversion{2002-02-14.08}
+\def\texinfoversion{2002-03-01.06}
 %
 % Copyright (C) 1985, 86, 88, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99,
 %               2000, 01, 02 Free Software Foundation, Inc.
@@ -847,7 +847,7 @@ where each line of input produces a line of output.}
 % at least we can have real math in the main text, where it's needed most.
 %
 % 
-\let\implicitmath = $
+\let\implicitmath = $%$ font-lock fix
 %
 % One complication: _ usually means subscripts, but it could also mean
 % an actual _ character, as in @math{@var{some_variable} + 1}.  So make
@@ -6173,7 +6173,7 @@ should work if nowhere else does.}
 \def\normalless{<}
 \def\normalgreater{>}
 \def\normalplus{+}
-\def\normaldollar{$}
+\def\normaldollar{$}%$ font-lock fix
 
 % This macro is used to make a character print one way in ttfont
 % where it can probably just be output, and another way in other fonts,
@@ -6222,7 +6222,7 @@ should work if nowhere else does.}
 \catcode`\+=\active
 \def+{{\tt \char 43}}
 \catcode`\$=\active
-\def${\ifusingit{{\sl\$}}\normaldollar}
+\def${\ifusingit{{\sl\$}}\normaldollar}%$ font-lock fix
 %\catcode 27=\active
 %\def^^[{$\diamondsuit$}
 
@@ -6267,7 +6267,7 @@ should work if nowhere else does.}
 @let<=@normalless
 @let>=@normalgreater
 @let+=@normalplus
-@let$=@normaldollar}
+@let$=@normaldollar}%$ font-lock fix
 
 @def@normalturnoffactive{@let"=@normaldoublequote
 @let\=@normalbackslash
@@ -6278,7 +6278,7 @@ should work if nowhere else does.}
 @let<=@normalless
 @let>=@normalgreater
 @let+=@normalplus
-@let$=@normaldollar}
+@let$=@normaldollar}%$ font-lock fix
 
 % Make _ and + \other characters, temporarily.
 % This is canceled by @fixbackslash.

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.52h for GNU Bison 1.33a.
+# Generated by GNU Autoconf 2.52h for GNU Bison 1.33b.
 #
 # Report bugs to <[email protected]>.
 #
@@ -256,8 +256,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='GNU Bison'
 PACKAGE_TARNAME='bison'
-PACKAGE_VERSION='1.33a'
+PACKAGE_VERSION='1.33b'
-PACKAGE_STRING='GNU Bison 1.33a'
+PACKAGE_STRING='GNU Bison 1.33b'
 PACKAGE_BUGREPORT='[email protected]'
 
 # Factoring default headers for most tests.
@@ -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.33a to adapt to many kinds of systems.
+\`configure' configures GNU Bison 1.33b 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.33a:";;
+     short | recursive ) echo "Configuration of GNU Bison 1.33b:";;
    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.33a
+GNU Bison configure 1.33b
 generated by GNU Autoconf 2.52h
 
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
@@ -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.33a, which was
+It was created by GNU Bison $as_me 1.33b, which was
 generated by GNU Autoconf 2.52h.  Invocation command line was
 
   $ $0 $@
@@ -1469,7 +1469,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=bison
- VERSION=1.33a
+ VERSION=1.33b
 
 
 cat >>confdefs.h <<_ACEOF
@@ -9472,7 +9472,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by GNU Bison $as_me 1.33a, which was
+This file was extended by GNU Bison $as_me 1.33b, which was
 generated by GNU Autoconf 2.52h.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -9534,7 +9534,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-GNU Bison config.status 1.33a
+GNU Bison config.status 1.33b
 configured by $0, generated by GNU Autoconf 2.52h,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 

configure.in

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

doc/version.texi

@@ -1,4 +1,4 @@
 @set UPDATED 25 February 2002
 @set UPDATED-MONTH February 2002
-@set EDITION 1.33a
+@set EDITION 1.33b
-@set VERSION 1.33a
+@set VERSION 1.33b

po/de.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.33\n"
-"POT-Creation-Date: 2002-02-28 16:14+0100\n"
+"POT-Creation-Date: 2002-03-04 19:13+0100\n"
 "PO-Revision-Date: 2002-02-08 09:34:24+0100\n"
 "Last-Translator: Michael Piefel <[email protected]>\n"
 "Language-Team: German <[email protected]>\n"
@@ -124,12 +124,12 @@ msgstr "    %-4s\treduziere mit Regel %d (%s)\n"
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr "    $default\treduziere mit Regel %d (%s)\n"
 
-#: src/files.c:150
+#: src/files.c:151
 #, c-format
 msgid "cannot open file `%s'"
 msgstr "kann Datei »%s« nicht öffnen"
 
-#: src/files.c:169
+#: src/files.c:170
 msgid "cannot close file"
 msgstr "kann Datei nicht schließen"
 
@@ -577,71 +577,75 @@ msgstr "Grammatik fängt mit einem vertikalen Strich (»|«) an"
 msgid "rule given for %s, which is a token"
 msgstr "Regel für %s vorhanden, welches aber ein Token ist"
 
-#: src/reader.c:1514
+#: src/reader.c:1444 src/reader.c:1556
+msgid "previous rule lacks an ending `;'"
+msgstr ""
+
+#: src/reader.c:1517
 msgid "two @prec's in a row"
 msgstr "zwei @prec-Anweisungen nacheinander"
 
-#: src/reader.c:1522
+#: src/reader.c:1525
 #, c-format
 msgid "%%guard present but %%semantic_parser not specified"
 msgstr ""
 "%%guard-Anweisung vorhanden, jedoch wird %%semantic_parser nicht angegeben"
 
-#: src/reader.c:1531
+#: src/reader.c:1534
 msgid "two actions at end of one rule"
 msgstr "Zwei Aktionen am Ende einer Regel"
 
-#: src/reader.c:1545
+#: src/reader.c:1548
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "Typkonflikt (»%s« »%s«) bei Default-Aktion"
 
-#: src/reader.c:1551
+#: src/reader.c:1554
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "leere Regel für Nicht-Terminal mit Typ und keine Aktion"
 
-#: src/reader.c:1595
+#: src/reader.c:1600
 #, c-format
 msgid "invalid input: %s"
 msgstr "ungültige Eingabe: %s"
 
-#: src/reader.c:1603
+#: src/reader.c:1608
 #, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "zu viele Symbole (Token plus Nicht-Terminale); Maximum %d"
 
-#: src/reader.c:1606
+#: src/reader.c:1611
 msgid "no rules in the input grammar"
 msgstr "Eingabegrammatik enthält keine Regeln"
 
-#: src/reader.c:1630
+#: src/reader.c:1635
 #, c-format
 msgid "symbol %s is used, but is not defined as a token and has no rules"
 msgstr ""
 "Symbol %s wird benutzt, ist aber nicht als Token definiert und hat keine "
 "Regel"
 
-#: src/reader.c:1765
+#: src/reader.c:1770
 #, c-format
 msgid "tokens %s and %s both assigned number %d"
 msgstr "Token %s und %s haben die selbe Nummer %d"
 
-#: src/reader.c:1818
+#: src/reader.c:1823
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "Vorrang für %s und %s widersprechen sich"
 
-#: src/reader.c:1830
+#: src/reader.c:1835
 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "Assoziativitäts-Werte für %s und %s widersprechen sich"
 
-#: src/reader.c:1869
+#: src/reader.c:1874
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "das Startsymbol %s ist undefiniert"
 
-#: src/reader.c:1871
+#: src/reader.c:1876
 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "das Startsymbol %s ist ein Token"

po/es.po

@@ -30,7 +30,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU bison 1.25\n"
-"POT-Creation-Date: 2002-02-28 16:14+0100\n"
+"POT-Creation-Date: 2002-03-04 19:13+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"
@@ -179,12 +179,12 @@ msgstr "    %-4s\treduce usando la regla  %d (%s)\n"
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr "    $default\treduce usando la regla %d (%s)\n"
 
-#: src/files.c:150
+#: src/files.c:151
 #, c-format
 msgid "cannot open file `%s'"
 msgstr ""
 
-#: src/files.c:169
+#: src/files.c:170
 msgid "cannot close file"
 msgstr ""
 
@@ -646,75 +646,79 @@ msgstr "la gram
 msgid "rule given for %s, which is a token"
 msgstr "se ha dado una regla para %s, que es un terminal"
 
-#: src/reader.c:1514
+#: src/reader.c:1444 src/reader.c:1556
+msgid "previous rule lacks an ending `;'"
+msgstr ""
+
+#: src/reader.c:1517
 msgid "two @prec's in a row"
 msgstr "dos @prec en una línea"
 
 # Insisto, el empleo de participios a secas me parece como hablar en
 # indio. Por favor, permíteme que añada un "está" :) - cll
 # ok - ngp
-#: src/reader.c:1522
+#: src/reader.c:1525
 #, c-format
 msgid "%%guard present but %%semantic_parser not specified"
 msgstr "%%guard presente pero %%semantic_parser está sin especificar"
 
-#: src/reader.c:1531
+#: src/reader.c:1534
 msgid "two actions at end of one rule"
 msgstr "dos acciones al final de una regla"
 
-#: src/reader.c:1545
+#: src/reader.c:1548
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "los tipos (`%s' `%s') no concuerdan en la acción por defecto"
 
-#: src/reader.c:1551
+#: src/reader.c:1554
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "regla vacía para un no terminal con tipo y no hay ninguna acción"
 
-#: src/reader.c:1595
+#: src/reader.c:1600
 #, c-format
 msgid "invalid input: %s"
 msgstr "entrada no válida: %s"
 
-#: src/reader.c:1603
+#: src/reader.c:1608
 #, fuzzy, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "demasiados símbolos (terminales y no terminales); máximo %s"
 
-#: src/reader.c:1606
+#: src/reader.c:1611
 msgid "no rules in the input grammar"
 msgstr "no hay reglas en la gramática de entrada"
 
 # `token' se debe traducir como `literal' - cll
 # en terminología de compiladores token es más un terminal - ngp
 #
-#: src/reader.c:1630
+#: src/reader.c:1635
 #, c-format
 msgid "symbol %s is used, but is not defined as a token and has no rules"
 msgstr ""
 "se usa el símbolo %s, pero no está definido como terminal y no tiene reglas"
 
-#: src/reader.c:1765
+#: src/reader.c:1770
 #, fuzzy, c-format
 msgid "tokens %s and %s both assigned number %d"
 msgstr "los terminales %s y %s tienen asignados ambos el número %s"
 
-#: src/reader.c:1818
+#: src/reader.c:1823
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "precedencias en conflicto entre %s y %s"
 
-#: src/reader.c:1830
+#: src/reader.c:1835
 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "conflicto de valores assoc para %s y %s"
 
-#: src/reader.c:1869
+#: src/reader.c:1874
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "el símbolo de inicio (axioma) %s no está definido"
 
-#: src/reader.c:1871
+#: src/reader.c:1876
 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "el símbolo de inicio (axioma) %s es un terminal"

po/et.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.33\n"
-"POT-Creation-Date: 2002-02-28 16:14+0100\n"
+"POT-Creation-Date: 2002-03-04 19:13+0100\n"
 "PO-Revision-Date: 2002-02-08 00:15+0200\n"
 "Last-Translator: Toomas Soome <[email protected]>\n"
 "Language-Team: Estonian <[email protected]>\n"
@@ -123,12 +123,12 @@ msgstr "    %-4s\tredutseerin kasutades reeglit %d (%s)\n"
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr "    $default\tredutseerin kasutades reeglit %d (%s)\n"
 
-#: src/files.c:150
+#: src/files.c:151
 #, c-format
 msgid "cannot open file `%s'"
 msgstr "faili `%s' ei saa avada"
 
-#: src/files.c:169
+#: src/files.c:170
 msgid "cannot close file"
 msgstr "faili ei õnnestu sulgeda"
 
@@ -567,70 +567,74 @@ msgstr "grammatika algab p
 msgid "rule given for %s, which is a token"
 msgstr "%s jaoks on antud reegel, aga see on märk"
 
-#: src/reader.c:1514
+#: src/reader.c:1444 src/reader.c:1556
+msgid "previous rule lacks an ending `;'"
+msgstr ""
+
+#: src/reader.c:1517
 msgid "two @prec's in a row"
 msgstr "kaks @prec ühel real"
 
-#: src/reader.c:1522
+#: src/reader.c:1525
 #, c-format
 msgid "%%guard present but %%semantic_parser not specified"
 msgstr "%%guard on määratud, aga %%semantic_parser ei ole"
 
-#: src/reader.c:1531
+#: src/reader.c:1534
 msgid "two actions at end of one rule"
 msgstr "kaks tegevust ühe reegli lõpus"
 
-#: src/reader.c:1545
+#: src/reader.c:1548
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "vaikimisi tegevuse tüübikonflikt (`%s' `%s')"
 
-#: src/reader.c:1551
+#: src/reader.c:1554
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "tüübiga mitteterminalil on tühi reegel ja puudub tegevus"
 
-#: src/reader.c:1595
+#: src/reader.c:1600
 #, c-format
 msgid "invalid input: %s"
 msgstr "vigane sisend: %s"
 
-#: src/reader.c:1603
+#: src/reader.c:1608
 #, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "liiga palju sümboleid (märgid ja mitteterminalid); maksimaalne on %d"
 
-#: src/reader.c:1606
+#: src/reader.c:1611
 msgid "no rules in the input grammar"
 msgstr "sisendgrammatikas pole reegleid"
 
-#: src/reader.c:1630
+#: src/reader.c:1635
 #, c-format
 msgid "symbol %s is used, but is not defined as a token and has no rules"
 msgstr ""
 "kasutatakse sümbolit %s, mis ei ole defineeritud märgina ja millel puuduvad "
 "reeglid"
 
-#: src/reader.c:1765
+#: src/reader.c:1770
 #, c-format
 msgid "tokens %s and %s both assigned number %d"
 msgstr "märkidele %s ja %s on mõlemale omistatud number %d"
 
-#: src/reader.c:1818
+#: src/reader.c:1823
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "%s ja %s omavad konfliktseid prioriteete"
 
-#: src/reader.c:1830
+#: src/reader.c:1835
 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "%s ja %s omavad konfliktseid assotsiatiivseid väärtuseid"
 
-#: src/reader.c:1869
+#: src/reader.c:1874
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "stardisümbol %s ei ole defineeritud"
 
-#: src/reader.c:1871
+#: src/reader.c:1876
 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "stardisümbol %s on märk"

po/fr.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU bison 1.33\n"
-"POT-Creation-Date: 2002-02-28 16:14+0100\n"
+"POT-Creation-Date: 2002-03-04 19:13+0100\n"
 "PO-Revision-Date: 2002-02-11 08:00-0500\n"
 "Last-Translator: Michel Robitaille <[email protected]>\n"
 "Language-Team: French <[email protected]>\n"
@@ -125,12 +125,12 @@ msgstr "    %-4s\tr
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr "    $défaut\tréduction par la règle %d (%s)\n"
 
-#: src/files.c:150
+#: src/files.c:151
 #, c-format
 msgid "cannot open file `%s'"
 msgstr "ne peut ouvrir le fichier `%s'"
 
-#: src/files.c:169
+#: src/files.c:170
 msgid "cannot close file"
 msgstr "ne peut fermer le fichier"
 
@@ -575,70 +575,74 @@ msgstr "la grammaire d
 msgid "rule given for %s, which is a token"
 msgstr "la règle pour %s, qui est un terminal"
 
-#: src/reader.c:1514
+#: src/reader.c:1444 src/reader.c:1556
+msgid "previous rule lacks an ending `;'"
+msgstr ""
+
+#: src/reader.c:1517
 msgid "two @prec's in a row"
 msgstr "deux @prec de suite"
 
-#: src/reader.c:1522
+#: src/reader.c:1525
 #, c-format
 msgid "%%guard present but %%semantic_parser not specified"
 msgstr "%%guard est présent mais %%semantic_parser n'est pas spécifié"
 
-#: src/reader.c:1531
+#: src/reader.c:1534
 msgid "two actions at end of one rule"
 msgstr "deux actions à la fin d'une même règle"
 
-#: src/reader.c:1545
+#: src/reader.c:1548
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "conflit de type (`%s' `%s') pour l'action par défaut"
 
-#: src/reader.c:1551
+#: src/reader.c:1554
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "règle vide pour une catégorie typée et aucune action"
 
-#: src/reader.c:1595
+#: src/reader.c:1600
 #, c-format
 msgid "invalid input: %s"
 msgstr "entrée non valide: %s"
 
-#: src/reader.c:1603
+#: src/reader.c:1608
 #, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "trop de symboles (jeton plus non terminaux); maximum %d"
 
-#: src/reader.c:1606
+#: src/reader.c:1611
 msgid "no rules in the input grammar"
 msgstr "la grammaire n'a pas de règles"
 
-#: src/reader.c:1630
+#: src/reader.c:1635
 #, c-format
 msgid "symbol %s is used, but is not defined as a token and has no rules"
 msgstr ""
 "le symbole %s est utilisé mais ce n'est pas un terminal et il ne possède pas "
 "de règle"
 
-#: src/reader.c:1765
+#: src/reader.c:1770
 #, c-format
 msgid "tokens %s and %s both assigned number %d"
 msgstr "les jetons %s et %s se sont vus assigner le nombre %d"
 
-#: src/reader.c:1818
+#: src/reader.c:1823
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "les priorités pour %s et %s entrent en conflit"
 
-#: src/reader.c:1830
+#: src/reader.c:1835
 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "les valeurs d'association de %s et %s entrent en conflit"
 
-#: src/reader.c:1869
+#: src/reader.c:1874
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "le symbole de départ %s n'est pas défini"
 
-#: src/reader.c:1871
+#: src/reader.c:1876
 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "le symbole de départ %s est un terminal"

po/it.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.31\n"
-"POT-Creation-Date: 2002-02-28 16:14+0100\n"
+"POT-Creation-Date: 2002-03-04 19:13+0100\n"
 "PO-Revision-Date: 2002-01-23 14:16+0100\n"
 "Last-Translator: Paolo Bonzini <[email protected]>\n"
 "Language-Team: Italian <[email protected]>\n"
@@ -124,12 +124,12 @@ msgstr "    %-4s\triduzione con la regola %d (%s)\n"
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr "    $default\triduzione con la regola %d (%s)\n"
 
-#: src/files.c:150
+#: src/files.c:151
 #, c-format
 msgid "cannot open file `%s'"
 msgstr "impossibile aprire il file `%s'"
 
-#: src/files.c:169
+#: src/files.c:170
 msgid "cannot close file"
 msgstr "impossibile chiudere il file `%s'"
 
@@ -571,68 +571,72 @@ msgstr "la grammatica comincia con un `|'"
 msgid "rule given for %s, which is a token"
 msgstr "fornita una regola per il token %s"
 
-#: src/reader.c:1514
+#: src/reader.c:1444 src/reader.c:1556
+msgid "previous rule lacks an ending `;'"
+msgstr ""
+
+#: src/reader.c:1517
 msgid "two @prec's in a row"
 msgstr "due @prec di seguito"
 
-#: src/reader.c:1522
+#: src/reader.c:1525
 #, c-format
 msgid "%%guard present but %%semantic_parser not specified"
 msgstr "trovato %%guard senza che sia specificato %%semantic_parser"
 
-#: src/reader.c:1531
+#: src/reader.c:1534
 msgid "two actions at end of one rule"
 msgstr "due azioni alla fine di una regola"
 
-#: src/reader.c:1545
+#: src/reader.c:1548
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "conflitto di tipo (`%s' e `%s') nell'azione di default"
 
-#: src/reader.c:1551
+#: src/reader.c:1554
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "regola vuota e nessuna azione per un nonterminale con tipo"
 
-#: src/reader.c:1595
+#: src/reader.c:1600
 #, c-format
 msgid "invalid input: %s"
 msgstr "input non valido: %s"
 
-#: src/reader.c:1603
+#: src/reader.c:1608
 #, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "troppi simboli (token e nonterminali); il massimo è %d"
 
-#: src/reader.c:1606
+#: src/reader.c:1611
 msgid "no rules in the input grammar"
 msgstr "nessuna regola nella grammatica di input"
 
-#: src/reader.c:1630
+#: src/reader.c:1635
 #, c-format
 msgid "symbol %s is used, but is not defined as a token and has no rules"
 msgstr "usato il simbolo %s, ma non è un token e non ha regole"
 
-#: src/reader.c:1765
+#: src/reader.c:1770
 #, c-format
 msgid "tokens %s and %s both assigned number %d"
 msgstr "i token %s e %s hanno lo stesso numero %d"
 
-#: src/reader.c:1818
+#: src/reader.c:1823
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "precedenze in conflitto per %s und %s"
 
-#: src/reader.c:1830
+#: src/reader.c:1835
 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "associatività in conflitto per %s e %s"
 
-#: src/reader.c:1869
+#: src/reader.c:1874
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "simbolo iniziale %s non definito"
 
-#: src/reader.c:1871
+#: src/reader.c:1876
 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "specificato il token %s come simbolo iniziale"

po/ja.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU bison 1.30f\n"
-"POT-Creation-Date: 2002-02-28 16:14+0100\n"
+"POT-Creation-Date: 2002-03-04 19:13+0100\n"
 "PO-Revision-Date: 2001-12-10 15:59+0900\n"
 "Last-Translator: Daisuke Yamashita <[email protected]>\n"
 "Language-Team: Japanese <[email protected]>\n"
@@ -119,12 +119,12 @@ msgstr "    %-4s\t
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr "    $default\t規則 %d を利用して還元 (%s)\n"
 
-#: src/files.c:150
+#: src/files.c:151
 #, c-format
 msgid "cannot open file `%s'"
 msgstr "ファイル `%s' を開けません"
 
-#: src/files.c:169
+#: src/files.c:170
 msgid "cannot close file"
 msgstr "ファイルを閉じることができません"
 
@@ -567,70 +567,74 @@ msgstr "ʸˡ
 msgid "rule given for %s, which is a token"
 msgstr "%s に規則が与えられ、それはトークンとなります"
 
-#: src/reader.c:1514
+#: src/reader.c:1444 src/reader.c:1556
+msgid "previous rule lacks an ending `;'"
+msgstr ""
+
+#: src/reader.c:1517
 msgid "two @prec's in a row"
 msgstr "@prec のもの二つが同列になっています"
 
-#: src/reader.c:1522
+#: src/reader.c:1525
 #, c-format
 msgid "%%guard present but %%semantic_parser not specified"
 msgstr "%%guard がありますが %%semantic_parser が指定されていません"
 
-#: src/reader.c:1531
+#: src/reader.c:1534
 msgid "two actions at end of one rule"
 msgstr "一つの規則の終りに二つの動作を指定しています"
 
-#: src/reader.c:1545
+#: src/reader.c:1548
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "初期状態の動作では型 (`%s' `%s') が衝突します"
 
-#: src/reader.c:1551
+#: src/reader.c:1554
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "空の型付き非終端アイテム用規則であり、動作が起りません"
 
-#: src/reader.c:1595
+#: src/reader.c:1600
 #, c-format
 msgid "invalid input: %s"
 msgstr "不適切な入力: %s"
 
-#: src/reader.c:1603
+#: src/reader.c:1608
 #, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "シンボルが多すぎます (トークン + 非終端アイテム) -- 最大 %d"
 
-#: src/reader.c:1606
+#: src/reader.c:1611
 msgid "no rules in the input grammar"
 msgstr "入力した文法に規則が定義されていません"
 
-#: src/reader.c:1630
+#: src/reader.c:1635
 #, c-format
 msgid "symbol %s is used, but is not defined as a token and has no rules"
 msgstr ""
 "シンボル %s が使われていますが、トークンとして定義されておらず、規則を持ちま"
 "せん"
 
-#: src/reader.c:1765
+#: src/reader.c:1770
 #, c-format
 msgid "tokens %s and %s both assigned number %d"
 msgstr "トークン %s と %s の双方が番号 %d に割り当てられました"
 
-#: src/reader.c:1818
+#: src/reader.c:1823
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "先行している %s と %s で競合が生じています"
 
-#: src/reader.c:1830
+#: src/reader.c:1835
 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "非結合値 %s と %s で競合が生じています"
 
-#: src/reader.c:1869
+#: src/reader.c:1874
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "開始シンボル %s は定義されていません"
 
-#: src/reader.c:1871
+#: src/reader.c:1876
 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "開始シンボル %s はトークンです"

po/nl.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.32\n"
-"POT-Creation-Date: 2002-02-28 16:14+0100\n"
+"POT-Creation-Date: 2002-03-04 19:13+0100\n"
 "PO-Revision-Date: 2002-02-01 18:46+0000\n"
 "Last-Translator: Tim Van Holder <[email protected]>\n"
 "Language-Team: Dutch <[email protected]>\n"
@@ -125,12 +125,12 @@ msgstr "    %-4s\treductie via regel %d (%s)\n"
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr "    $standaard\treductie via regel %d (%s)\n"
 
-#: src/files.c:150
+#: src/files.c:151
 #, c-format
 msgid "cannot open file `%s'"
 msgstr "kan bestand `%s' niet openen"
 
-#: src/files.c:169
+#: src/files.c:170
 msgid "cannot close file"
 msgstr "kan bestand niet sluiten"
 
@@ -585,70 +585,74 @@ msgstr "grammatica start met een verticale streep"
 msgid "rule given for %s, which is a token"
 msgstr "regel opgegeven voor token (%s)"
 
-#: src/reader.c:1514
+#: src/reader.c:1444 src/reader.c:1556
+msgid "previous rule lacks an ending `;'"
+msgstr ""
+
+#: src/reader.c:1517
 msgid "two @prec's in a row"
 msgstr "twee @prec's na elkaar"
 
-#: src/reader.c:1522
+#: src/reader.c:1525
 #, c-format
 msgid "%%guard present but %%semantic_parser not specified"
 msgstr "%%guard aanwezig maar %%semantic_parser niet opgegeven"
 
-#: src/reader.c:1531
+#: src/reader.c:1534
 msgid "two actions at end of one rule"
 msgstr "twee akties aan het einde van één regel"
 
-#: src/reader.c:1545
+#: src/reader.c:1548
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "type-conflict (`%s' `%s') bij standaardaktie"
 
-#: src/reader.c:1551
+#: src/reader.c:1554
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "lege regel voor niet-eindsymbool met type, en geen actie"
 
-#: src/reader.c:1595
+#: src/reader.c:1600
 #, c-format
 msgid "invalid input: %s"
 msgstr "ongeldige invoer: %s"
 
-#: src/reader.c:1603
+#: src/reader.c:1608
 #, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "teveel symbolen (tokens plus niet-eindsymbolen); het maximum is %d"
 
-#: src/reader.c:1606
+#: src/reader.c:1611
 msgid "no rules in the input grammar"
 msgstr "invoergrammatica bevat geen regels"
 
-#: src/reader.c:1630
+#: src/reader.c:1635
 #, c-format
 msgid "symbol %s is used, but is not defined as a token and has no rules"
 msgstr ""
 "symbool %s wordt gebruikt, maar is niet gedefinieerd als een teken en heeft "
 "geen regels"
 
-#: src/reader.c:1765
+#: src/reader.c:1770
 #, c-format
 msgid "tokens %s and %s both assigned number %d"
 msgstr "tokens %s en %s hebben beide nummer %d toegewezen gekregen"
 
-#: src/reader.c:1818
+#: src/reader.c:1823
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "voorrangen voor %s en %s geven conflicten"
 
-#: src/reader.c:1830
+#: src/reader.c:1835
 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "associativiteitswaarden voor %s en %s geven conflicten"
 
-#: src/reader.c:1869
+#: src/reader.c:1874
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "het startsymbool %s is niet gedefinieerd"
 
-#: src/reader.c:1871
+#: src/reader.c:1876
 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "het startsymbool %s is een token"

po/ru.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.32\n"
-"POT-Creation-Date: 2002-02-28 16:14+0100\n"
+"POT-Creation-Date: 2002-03-04 19:13+0100\n"
 "PO-Revision-Date: 2002-01-25 12:19+0300\n"
 "Last-Translator: Dmitry S. Sivachenko <[email protected]>\n"
 "Language-Team: Russian <[email protected]>\n"
@@ -126,12 +126,12 @@ msgstr "    %-4s\t
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr "    $default\t×Ù×ÏÄ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÐÒÁ×ÉÌÁ %d (%s)\n"
 
-#: src/files.c:150
+#: src/files.c:151
 #, c-format
 msgid "cannot open file `%s'"
 msgstr "ÎÅ ÕÄÁÅÔÓÑ ÏÔËÒÙÔØ ÆÁÊÌ `%s'"
 
-#: src/files.c:169
+#: src/files.c:170
 msgid "cannot close file"
 msgstr "ÎÅ ÕÄÁÅÔÓÑ ÚÁËÒÙÔØ ÆÁÊÌ"
 
@@ -576,69 +576,73 @@ msgstr "
 msgid "rule given for %s, which is a token"
 msgstr "ÐÒÁ×ÉÌÏ ÚÁÄÁÎÏ ÄÌÑ %s, ËÏÔÏÒÙÊ Ñ×ÌÑÅÔÓÑ ÌÅËÓÅÍÏÊ"
 
-#: src/reader.c:1514
+#: src/reader.c:1444 src/reader.c:1556
+msgid "previous rule lacks an ending `;'"
+msgstr ""
+
+#: src/reader.c:1517
 msgid "two @prec's in a row"
 msgstr "Ä×Á @prec ÐÏÄÒÑÄ"
 
-#: src/reader.c:1522
+#: src/reader.c:1525
 #, c-format
 msgid "%%guard present but %%semantic_parser not specified"
 msgstr "%%guard ÐÒÉÓÕÔÓÔ×ÕÅÔ, Á %%semantic_parser ÎÅ ÚÁÄÁÎ"
 
-#: src/reader.c:1531
+#: src/reader.c:1534
 msgid "two actions at end of one rule"
 msgstr "Ä×Á ÄÅÊÓÔ×ÉÑ × ËÏÎÃÅ ÏÄÎÏÇÏ ÐÒÁ×ÉÌÁ"
 
-#: src/reader.c:1545
+#: src/reader.c:1548
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "ËÏÎÆÌÉËÔ ÔÉÐÏ× (`%s' `%s') ÎÁ ÄÅÊÓÔ×ÉÉ ÐÏ ÕÍÏÌÞÁÎÉÀ"
 
-#: src/reader.c:1551
+#: src/reader.c:1554
 msgid "empty rule for typed nonterminal, and no action"
 msgstr ""
 "ÐÕÓÔÏÅ ÐÒÁ×ÉÌÏ ÄÌÑ ÔÉÐÉÚÉÒÏ×ÁÎÎÏÇÏ ÎÅÔÅÒÍÉÎÁÌØÎÏÇÏ ÓÉÍ×ÏÌÁ, É ÎÅÔ ÄÅÊÓÔ×ÉÑ"
 
-#: src/reader.c:1595
+#: src/reader.c:1600
 #, c-format
 msgid "invalid input: %s"
 msgstr "ÎÅ×ÅÒÎÙÅ ×ÈÏÄÎÙÅ ÄÁÎÎÙÅ: %s"
 
-#: src/reader.c:1603
+#: src/reader.c:1608
 #, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ ÓÉÍ×ÏÌÏ× (ÌÅËÓÅÍÙ ÐÌÀÓ ÎÅÔÅÒÍÉÎÁÌÙ); ÍÁËÓÉÍÁÌØÎÏ %d"
 
-#: src/reader.c:1606
+#: src/reader.c:1611
 msgid "no rules in the input grammar"
 msgstr "ÏÔÓÕÔÓÔ×ÕÀÔ ÐÒÁ×ÉÌÁ ×Ï ×ÈÏÄÎÏÊ ÇÒÁÍÍÁÔÉËÅ"
 
-#: src/reader.c:1630
+#: src/reader.c:1635
 #, c-format
 msgid "symbol %s is used, but is not defined as a token and has no rules"
 msgstr "ÓÉÍ×ÏÌ %s ÉÓÐÏÌØÚÕÅÔÓÑ, ÎÏ ÎÅ ÏÐÒÅÄÅÌÅÎ ËÁË ÌÅËÓÅÍÁ É ÎÅ ÉÍÅÅÔ ÐÒÁ×ÉÌ"
 
-#: src/reader.c:1765
+#: src/reader.c:1770
 #, c-format
 msgid "tokens %s and %s both assigned number %d"
 msgstr "ÏÂÅÉÍ ÌÅËÓÅÍÁÍ %s É %s ÐÒÉÓ×ÏÅÎ ÎÏÍÅÒ %d"
 
-#: src/reader.c:1818
+#: src/reader.c:1823
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "ÐÒÏÔÉ×ÏÒÅÞÉ×ÙÅ ÐÒÉÏÒÉÔÅÔÙ ÄÌÑ %s É %s"
 
-#: src/reader.c:1830
+#: src/reader.c:1835
 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "ÐÒÏÔÉ×ÏÒÅÞÉ×ÙÅ ÚÎÁÞÅÎÉÑ ÁÓÓÏÃÉÁÔÉ×ÎÏÓÔÉ ÄÌÑ %s É %s"
 
-#: src/reader.c:1869
+#: src/reader.c:1874
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "ÎÁÞÁÌØÎÙÊ ÓÉÍ×ÏÌ %s ÎÅÏÐÒÅÄÅÌÅÎ"
 
-#: src/reader.c:1871
+#: src/reader.c:1876
 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "ÎÁÞÁÌØÎÙÊ ÓÉÍ×ÏÌ %s Ñ×ÌÑÅÔÓÑ ÌÅËÓÅÍÏÊ"

po/sv.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.33\n"
-"POT-Creation-Date: 2002-02-28 16:14+0100\n"
+"POT-Creation-Date: 2002-03-04 19:13+0100\n"
 "PO-Revision-Date: 2002-02-07 22:57+0100\n"
 "Last-Translator: Göran Uddeborg <[email protected]>\n"
 "Language-Team: Swedish <[email protected]>\n"
@@ -125,12 +125,12 @@ msgstr "    %-4s\treducera med regel %d (%s)\n"
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr "    $standard\treducera med regel %d (%s)\n"
 
-#: src/files.c:150
+#: src/files.c:151
 #, c-format
 msgid "cannot open file `%s'"
 msgstr "kan inte öppna filen \"%s\""
 
-#: src/files.c:169
+#: src/files.c:170
 msgid "cannot close file"
 msgstr "kan inte stänga fil"
 
@@ -573,70 +573,74 @@ msgstr "grammatiken startar med ett vertikalt streck"
 msgid "rule given for %s, which is a token"
 msgstr "regel given för %s, som är ett element"
 
-#: src/reader.c:1514
+#: src/reader.c:1444 src/reader.c:1556
+msgid "previous rule lacks an ending `;'"
+msgstr ""
+
+#: src/reader.c:1517
 msgid "two @prec's in a row"
 msgstr "två @prec i rad"
 
-#: src/reader.c:1522
+#: src/reader.c:1525
 #, c-format
 msgid "%%guard present but %%semantic_parser not specified"
 msgstr "%%guard finns men %%semantic_parser är inte angiven"
 
-#: src/reader.c:1531
+#: src/reader.c:1534
 msgid "two actions at end of one rule"
 msgstr "två åtgärder vid slutet av en regel"
 
-#: src/reader.c:1545
+#: src/reader.c:1548
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "typkonflikt (\"%s\" \"%s\") för standardåtgärd"
 
-#: src/reader.c:1551
+#: src/reader.c:1554
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "tom regel för typad icketerminal, och ingen åtgärd"
 
-#: src/reader.c:1595
+#: src/reader.c:1600
 #, c-format
 msgid "invalid input: %s"
 msgstr "felaktig indata: %s"
 
-#: src/reader.c:1603
+#: src/reader.c:1608
 #, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "för många symboler (element plus icketerminaler); max %d"
 
-#: src/reader.c:1606
+#: src/reader.c:1611
 msgid "no rules in the input grammar"
 msgstr "inga regler i ingrammatiken"
 
-#: src/reader.c:1630
+#: src/reader.c:1635
 #, c-format
 msgid "symbol %s is used, but is not defined as a token and has no rules"
 msgstr ""
 "symbolen %s används, men är inte definierad som ett element och har inga "
 "regler"
 
-#: src/reader.c:1765
+#: src/reader.c:1770
 #, c-format
 msgid "tokens %s and %s both assigned number %d"
 msgstr "elementen %s och %s har båda fått nummer %d"
 
-#: src/reader.c:1818
+#: src/reader.c:1823
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "motstridiga precedenser mellan %s och %s"
 
-#: src/reader.c:1830
+#: src/reader.c:1835
 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "motstridiga assoc-värden mellan %s och %s"
 
-#: src/reader.c:1869
+#: src/reader.c:1874
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "startsymbolen %s är odefinierad"
 
-#: src/reader.c:1871
+#: src/reader.c:1876
 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "startsymbolen %s är ett element"

po/tr.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.33\n"
-"POT-Creation-Date: 2002-02-28 16:14+0100\n"
+"POT-Creation-Date: 2002-03-04 19:13+0100\n"
 "PO-Revision-Date: 2002-02-08 18:51+0200\n"
 "Last-Translator: Altuð Bayram <[email protected]>\n"
 "Language-Team: Turkish <[email protected]>\n"
@@ -126,12 +126,12 @@ msgstr "    %-4s\tindirgeme kural %d (%s)'i kullan
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr "    $default\tindirgeme kural %d (%s)'i kullanýyor\n"
 
-#: src/files.c:150
+#: src/files.c:151
 #, c-format
 msgid "cannot open file `%s'"
 msgstr "`%s' dosyasý açýlamadý"
 
-#: src/files.c:169
+#: src/files.c:170
 msgid "cannot close file"
 msgstr "dosya kapatýlamýyor"
 
@@ -575,70 +575,74 @@ msgstr "gramer d
 msgid "rule given for %s, which is a token"
 msgstr "bir andaç olan %s için verilen kural"
 
-#: src/reader.c:1514
+#: src/reader.c:1444 src/reader.c:1556
+msgid "previous rule lacks an ending `;'"
+msgstr ""
+
+#: src/reader.c:1517
 msgid "two @prec's in a row"
 msgstr "bir satýrda iki @prec"
 
-#: src/reader.c:1522
+#: src/reader.c:1525
 #, c-format
 msgid "%%guard present but %%semantic_parser not specified"
 msgstr "%%guard sunulmuþ fakat %%semantic_parser belirlenmemiþ"
 
-#: src/reader.c:1531
+#: src/reader.c:1534
 msgid "two actions at end of one rule"
 msgstr "bir kuralýn sonunda iki eylem"
 
-#: src/reader.c:1545
+#: src/reader.c:1548
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "öntanýmlý eylem üzerinde (`%s' `%s') tip çatýþmasý"
 
-#: src/reader.c:1551
+#: src/reader.c:1554
 msgid "empty rule for typed nonterminal, and no action"
 msgstr ""
 "Tipli deðiþken simge için boþ kural tanýmlanmýþ, ve eylem belirtilmemiþ"
 
-#: src/reader.c:1595
+#: src/reader.c:1600
 #, c-format
 msgid "invalid input: %s"
 msgstr "geçersiz girdi: %s"
 
-#: src/reader.c:1603
+#: src/reader.c:1608
 #, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "çok fazla simge var (andaçlar ve deðiþken simgeler); en fazla %d"
 
-#: src/reader.c:1606
+#: src/reader.c:1611
 msgid "no rules in the input grammar"
 msgstr "girdi grameri içinde kurallar yok"
 
-#: src/reader.c:1630
+#: src/reader.c:1635
 #, c-format
 msgid "symbol %s is used, but is not defined as a token and has no rules"
 msgstr ""
 "simge %s kullanýldý, fakat bir andaç olarak tanýmlanmadý ve kurallarý yok"
 
-#: src/reader.c:1765
+#: src/reader.c:1770
 #, c-format
 msgid "tokens %s and %s both assigned number %d"
 msgstr "%s ve %s andaçlarýnýn her ikisi %d sayýsýna atandý"
 
-#: src/reader.c:1818
+#: src/reader.c:1823
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "%s ve %s için çeliþen öncelikler"
 
-#: src/reader.c:1830
+#: src/reader.c:1835
 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "%s ve %s için çeliþen birleþmeli deðerler"
 
-#: src/reader.c:1869
+#: src/reader.c:1874
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "baþlangýç simgesi %s tanýmlanmadý"
 
-#: src/reader.c:1871
+#: src/reader.c:1876
 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "baþlangýç simgesi %s bir andaçtýr"

src/files.c

@@ -22,6 +22,7 @@
 
 #include "system.h"
 #include "getargs.h"
+#include "quote.h"
 #include "files.h"
 #include "gram.h"
 #include "error.h"
@@ -419,7 +420,7 @@ compute_base_names (void)
 
       /* Computes the extensions from the grammar file name.  */
       filename_split (infile, &base, &tab, &ext);
-      
+
       if (ext && !yacc_flag)
 	compute_exts_from_gf (ext);
     }
@@ -445,6 +446,20 @@ compute_output_file_names (void)
   if (!spec_defines_file)
     spec_defines_file = stringappend (full_base_name, header_extension);
 
+  if (defines_flag)
+    {
+      /* This is really Q&D, but I don't want to spend time on issues
+	 which will be different with 1.50.  */
+      const char *parser_filename = NULL;
+      if (spec_outfile)
+	parser_filename = spec_outfile;
+      else
+	parser_filename = stringappend (full_base_name, src_extension);
+      if (!strcmp (spec_defines_file, parser_filename))
+	fatal ("header and parser would be both named %s",
+	       quote (parser_filename));
+    }
+
   /* It the graph filename if not given, we create it.  */
   if (!spec_graph_file)
     spec_graph_file = stringappend (short_base_name, ".vcg");

src/output.c

@@ -1,7 +1,7 @@
 /* Output the generated parsing program for bison,
 
-   Copyright (C) 1984, 1986, 1989, 1992, 2000, 2001 Free Software
+   Copyright (C) 1984, 1986, 1989, 1992, 2000, 2001, 2002
-   Foundation, Inc.
+   Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 

src/reader.c

@@ -1440,7 +1440,10 @@ readgram (void)
 		  unlex (t1);
 		  symval = ssave;
 		  if (t1 == tok_colon)
-		    break;
+		    {
+		      warn (_("previous rule lacks an ending `;'"));
+		      break;
+		    }
 
 		  if (!first_rhs)	/* JF */
 		    first_rhs = symval;
@@ -1549,6 +1552,8 @@ readgram (void)
 	  /* Warn if there is no default for $$ but we need one.  */
 	  else if (!xactions && !first_rhs && lhs->type_name != 0)
 	    complain (_("empty rule for typed nonterminal, and no action"));
+	  if (t == tok_two_percents || t == tok_eof)
+	    warn (_("previous rule lacks an ending `;'"));
 	  if (t == tok_semicolon)
 	    t = lex ();
 	}

tests/Makefile.am

@@ -20,7 +20,8 @@
 
 EXTRA_DIST = $(TESTSUITE_AT) testsuite
 
-DISTCLEANFILES       = atconfig bison
+check_SCRIPTS        = bison
+DISTCLEANFILES       = atconfig $(check_SCRIPTS)
 MAINTAINERCLEANFILES = Makefile.in $(TESTSUITE)
 
 ## ------------ ##

tests/Makefile.in

@@ -105,7 +105,8 @@ install_sh = @install_sh@
 
 EXTRA_DIST = $(TESTSUITE_AT) testsuite package.m4
 
-DISTCLEANFILES = atconfig bison
+check_SCRIPTS = bison
+DISTCLEANFILES = atconfig $(check_SCRIPTS)
 MAINTAINERCLEANFILES = Makefile.in $(TESTSUITE)
 
 TESTSUITE_AT = \
@@ -162,6 +163,7 @@ distdir: $(DISTFILES)
 	  fi; \
 	done
 check-am: all-am
+	$(MAKE) $(AM_MAKEFLAGS) $(check_SCRIPTS)
 	$(MAKE) $(AM_MAKEFLAGS) check-local
 check: check-am
 all-am: Makefile

tests/input.at

@@ -29,7 +29,7 @@ AT_SETUP([Invalid $n])
 
 AT_DATA([input.y],
 [[%%
-exp: { $$ = $1 ; }
+exp: { $$ = $1 ; };
 ]])
 
 AT_CHECK([bison input.y], [1], [],
@@ -48,7 +48,7 @@ AT_SETUP([Invalid @n])
 
 AT_DATA([input.y],
 [[%%
-exp: { @$ = @1 ; }
+exp: { @$ = @1 ; };
 ]])
 
 AT_CHECK([bison input.y], [1], [],

tests/output.at

@@ -26,10 +26,10 @@ m4_define([AT_CHECK_OUTPUT],
 AT_DATA([$1],
 [[$2
 %%
-foo: {}
+foo: {};
 ]])
 
-AT_CHECK([bison $3 $1], 0)
+AT_CHECK([bison $3 $1])
 AT_CHECK([ls $4], [], [ignore])
 AT_CLEANUP
 ])
@@ -81,3 +81,15 @@ AT_CHECK_OUTPUT([foo.yy], [],
 AT_CHECK_OUTPUT([foo.yy], [],
                 [-o foo.c++ --graph=foo.gph],
                 [foo.c++ foo.gph])
+
+# Be sure to reject cases where the parser and the header would have
+# the same name.
+AT_SETUP([Clashing Output Files.])
+AT_DATA([foo.y],
+[[%% foo: {};
+]])
+
+AT_CHECK([bison -do foo.x foo.y], [1], [],
+         [foo.y:2: fatal error: header and parser would be both named `foo.x'
+])
+AT_CLEANUP

tests/regression.at

@@ -103,7 +103,7 @@ AT_DATA([input.y],
 [[/* Bison used to swallow the character after `}'. */
 
 %%
-exp: { tests = {{{{{{{{{{}}}}}}}}}}; }
+exp: { tests = {{{{{{{{{{}}}}}}}}}}; };
 %%
 ]])
 
@@ -382,7 +382,7 @@ expr:
 
 {
 
-}
+};
 ]])
 
 AT_CHECK([bison input.y -o input.c -v], 0, [], [])

tests/sets.at

@@ -161,14 +161,14 @@ AT_SETUP([Broken Closure])
 
 AT_DATA([input.y],
 [[%%
-a: b
+a: b;
-b: c
+b: c;
-c: d
+c: d;
-d: e
+d: e;
-e: f
+e: f;
-f: g
+f: g;
-g: h
+g: h;
-h: 'h'
+h: 'h';
 ]])
 
 AT_CHECK([bison --trace input.y 2>&1 |