* src/bison.simple: Be sure to set YYSTACK_USE_ALLOCA.

Use `#if , not `#ifndef'. Reported by Airy Andre.
2026-08-08 18:25:13 +00:00 · 2001-10-10 14:59:46 +00:00 · 2001-10-10 14:52:20 +00:00 · 2001-10-10 14:43:44 +00:00 · 2001-10-10 14:39:31 +00:00 · 2001-10-10 14:39:11 +00:00
106 changed files with 4195 additions and 3292 deletions
@@ -164,124 +164,128 @@ Available Packages
 ==================

   Languages are not equally supported in all packages.  The following
-matrix shows the current state of internationalization, as of July
+matrix shows the current state of internationalization, as of September
 2001.  The matrix shows, in regard of each package, for which languages
 PO files have been submitted to translation coordination, with a
 translation percentage of at least 50%.

-     Ready PO files    bg cs da de el en eo es et fi fr gl he hr id it
-                     +-------------------------------------------------+
-     a2ps            |          []             []                      |
-     bash            |          []       [] []       []                |
-     bfd             |                                                 |
-     binutils        |                                                 |
-     bison           |          []          [] []    []                |
-     clisp           |          []    []    []       []                |
-     cpio            |       [] []          []       [] []             |
-     diffutils       |       [] []       [] []       [] []       []    |
-     enscript        |          []                   []                |
-     error           |                      []       []                |
-     fetchmail       |                                                 |
-     fileutils       |    [] [] [] []       []       [] []             |
-     findutils       |       [] []          [] []    [] []       [] [] |
-     flex            |       []             []       []                |
-     freetype        |                                                 |
-     gas             |                                                 |
-     gawk            |                                     []          |
-     gcal            |                                                 |
-     gcc             |                                                 |
-     gettext         |    [] [] [] []       []       [] []       [] [] |
-     gnupg           |          []       []    []    [] []          [] |
-     gprof           |                                                 |
-     grep            |          []       [] [] []    [] []          [] |
-     hello           |       [] [] []    [] [] [] [] [] []          [] |
-     id-utils        |       [] []                   []                |
-     indent          |       [] []             []    [] []             |
-     jpilot          |                               []                |
-     kbd             |                                                 |
-     ld              |                                                 |
-     libc            |    [] [] [] []       []       [] []          [] |
-     lilypond        |                                                 |
-     lynx            |    [] [] []                                     |
-     m4              |    [] [] [] []                [] []       []    |
-     make            |       [] []          []       [] []             |
-     nano            |                                  []       []    |
-     opcodes         |                                                 |
-     parted          |          []                      []             |
-     ptx             |       [] []          [] []    [] []       []    |
-     python          |                                                 |
-     recode          |       [] [] []    [] []       [] [] []       [] |
-     sed             |    [] [] [] []    []    []    [] []       [] [] |
-     sh-utils        |    [] [] [] []       [] []    [] []          [] |
-     sharutils       |    [] [] [] []       []       [] []             |
-     soundtracker    |                                  []             |
-     sp              |                                                 |
-     tar             |    [] [] []          [] []    []          [] [] |
-     texinfo         |    [] [] []       []          []                |
-     textutils       |    [] [] [] []       []       [] []             |
-     util-linux      |    [] []                                        |
-     wdiff           |          []             []                      |
-     wget            |    [] [] [] []       [] []    [] [] []          |
-                     +-------------------------------------------------+
-                       bg cs da de el en eo es et fi fr gl he hr id it
-                        0 13 23 30 11  1  8 21 13  1 29 22  3  0  8 10
+     Ready PO files    bg cs da de el en eo es et fi fr gl he hr id it ja
+                     +----------------------------------------------------+
+     a2ps            |          []             []    []                   |
+     bash            |          []       [] []       []                   |
+     bfd             |                                                    |
+     binutils        |                               []                   |
+     bison           |          []          [] []    []                [] |
+     clisp           |          []    []    []       []                   |
+     cpio            |       [] []          []       [] []                |
+     diffutils       |       [] []       [] []       [] []       []       |
+     enscript        |          []                   []                   |
+     error           |                      []       []                   |
+     fetchmail       |                                                    |
+     fileutils       |    [] [] [] []       []       [] []             [] |
+     findutils       |       [] []          [] []    [] []       [] []    |
+     flex            |       []             []       []                   |
+     freetype        |                                                    |
+     gas             |                                                    |
+     gawk            |                               []    []             |
+     gcal            |                                                    |
+     gcc             |                                                    |
+     gettext         |    [] [] [] []       []       [] []       [] [] [] |
+     gnupg           |          []       []    []    [] []          [] [] |
+     gprof           |                                                    |
+     grep            |    []    []       [] [] []    [] []          []    |
+     hello           |       [] [] []    [] [] [] [] [] []          [] [] |
+     id-utils        |       [] []                   []                   |
+     indent          |       [] []             []    [] []                |
+     jpilot          |                               []                   |
+     kbd             |                                                    |
+     ld              |                               []                   |
+     libc            |    [] [] [] []       []       [] []             [] |
+     lilypond        |                                                 [] |
+     lynx            |    [] [] []                                     [] |
+     m4              |    [] [] [] []                [] []       []    [] |
+     make            |       [] []          []       [] []             [] |
+     mysecretdiary   |          []                                        |
+     nano            |                      []          []       []       |
+     opcodes         |                                                    |
+     parted          |          []                      []             [] |
+     ptx             |       [] []          [] []    [] []       []       |
+     python          |                                                    |
+     recode          |       [] [] []    [] []       [] [] []       []    |
+     sed             |    [] [] [] []    []    []    [] [] []    [] [] [] |
+     sh-utils        |    [] [] [] []       [] []    [] []          [] [] |
+     sharutils       |    [] [] [] []       []       [] []             [] |
+     sketch          |                                                    |
+     soundtracker    |          []          []          []                |
+     sp              |                                                    |
+     tar             |    [] [] []          [] []    []             [] [] |
+     texinfo         |    [] [] []       []          []                [] |
+     textutils       |    [] [] [] []       []       [] []             [] |
+     util-linux      |    [] []                                           |
+     wdiff           |       [] []             []                         |
+     wget            |    [] [] [] []       [] []    [] [] []          [] |
+                     +----------------------------------------------------+
+                       bg cs da de el en eo es et fi fr gl he hr id it ja
+                        0 14 24 32 11  1  8 23 13  1 33 22  4  0  7  9 18
     
-                       ja ko lv nl no pl pt pt_BR ru sk sl sv tr uk zh
-                     +-------------------------------------------------+
-     a2ps            |          []                []    []             |  5
-     bash            |                                                 |  4
-     bfd             |                                                 |  0
-     binutils        |                                                 |  0
-     bison           | []       []                []                   |  7
-     clisp           |          []                                     |  5
-     cpio            |    []    []    []     []   []                   | 10
-     diffutils       |                []          []       []          | 10
-     enscript        |          []           []   []                   |  5
-     error           |                                        []       |  3
-     fetchmail       |                                                 |  0
-     fileutils       | [] []    []    []     []   [] [] [] [] []       | 17
-     findutils       |    []    []    []     []   []    [] [] []       | 16
-     flex            |    []                      []       []          |  6
-     freetype        |                                                 |  0
-     gas             |                                                 |  0
-     gawk            |                                        []       |  2
-     gcal            |                                                 |  0
-     gcc             |                                                 |  0
-     gettext         | [] []          []     []   []    [] [] []    [] | 18
-     gnupg           | []             []                   [] []       | 10
-     gprof           |                                                 |  0
-     grep            |                []                []    []       | 10
-     hello           | [] [] [] [] [] []          [] []    [] [] []    | 21
-     id-utils        |          []                []       []          |  6
-     indent          |    []    []    []          [] []    [] []       | 12
-     jpilot          |                                                 |  1
-     kbd             |                                        []       |  1
-     ld              |                                                 |  0
-     libc            | [] []    [] [] []     []      []    [] []       | 17
-     lilypond        | []       []                                     |  2
-     lynx            | []       []           []   []       []          |  8
-     m4              | []       []    []          []       []          | 12
-     make            | [] []    []    []     []   []          []       | 12
-     nano            |                                     []          |  3
-     opcodes         |                                                 |  0
-     parted          | []       []                []                   |  5
-     ptx             |          [] [] [] []       []       [] []       | 14
-     python          |                                                 |  0
-     recode          |                []          []    [] []          | 13
-     sed             | []       []           []   [] [] [] [] []       | 18
-     sh-utils        | []       [] [] []     []   [] [] [] [] []    [] | 20
-     sharutils       | []       []                []       []          | 11
-     soundtracker    |                                                 |  1
-     sp              |                                                 |  0
-     tar             | []       [] [] []     []   []    [] [] []       | 17
-     texinfo         | []                         []                   |  7
-     textutils       | []       [] [] []     []   [] [] []             | 15
-     util-linux      |                       []               []       |  4
-     wdiff           |                            [] []       []       |  5
-     wget            |          []                [] [] [] [] [] []    | 16
-                     +-------------------------------------------------+
-       31 teams        ja ko lv nl no pl pt pt_BR ru sk sl sv tr uk zh
-       51 domains      17  9  1 23  6 17  1  13   26  9 11 20 19  2  2  369
+                       ko lv nb nl nn no pl pt pt_BR ru sk sl sv tr uk zh
+                     +----------------------------------------------------+
+     a2ps            |          []                   []    []             |  6
+     bash            |                                                    |  4
+     bfd             |                                                    |  0
+     binutils        |                                                    |  1
+     bison           |                               []                   |  6
+     clisp           |          []                                        |  5
+     cpio            | []       []       []     []   []                   | 10
+     diffutils       |                   []          []       [] []       | 11
+     enscript        |          []              []   []                   |  5
+     error           |                                  []       []       |  4
+     fetchmail       |                                                    |  0
+     fileutils       | []       []       []     []   [] [] [] [] []       | 17
+     findutils       | []       []       []     []   []    [] [] []       | 16
+     flex            | []                            []       []          |  6
+     freetype        |                                                    |  0
+     gas             |                                                    |  0
+     gawk            |                                           []       |  3
+     gcal            |                                                    |  0
+     gcc             |                                                    |  0
+     gettext         | []                []     []   []    [] [] []    [] | 18
+     gnupg           |                   []                   [] []       | 10
+     gprof           |                                                    |  0
+     grep            |                   []                [] [] []       | 12
+     hello           | [] [] [] []    [] []          [] []    [] [] []    | 22
+     id-utils        |          []                   []       []          |  6
+     indent          | []       []       []          [] []    [] []       | 12
+     jpilot          |                                                    |  1
+     kbd             |                                           []       |  1
+     ld              |                                                    |  1
+     libc            | []    []       [] []     []      []    [] []       | 16
+     lilypond        |          []                            []          |  3
+     lynx            |          []              []   []       []          |  8
+     m4              |          []       []          []       []          | 12
+     make            | []       []       []     []   []          []       | 12
+     mysecretdiary   |                                                    |  1
+     nano            |                                        []          |  4
+     opcodes         |                                           []       |  1
+     parted          |          []                   []                   |  5
+     ptx             |       [] []    [] [] []       []       [] []       | 15
+     python          |                                                    |  0
+     recode          |                   []          []    [] []          | 13
+     sed             |          []              []   [] [] [] [] []       | 19
+     sh-utils        |       [] []    [] []     []   [] [] [] [] []    [] | 21
+     sharutils       |          []                   []       []          | 11
+     sketch          |                                                    |  0
+     soundtracker    |                                                    |  3
+     sp              |                                                    |  0
+     tar             |       []       [] []     []         [] [] []       | 15
+     texinfo         |                               []                   |  7
+     textutils       |       [] []    [] []     []   [] [] []             | 16
+     util-linux      |                          []               []       |  4
+     wdiff           |                               [] []    [] []       |  7
+     wget            |          []                   [] [] [] [] [] []    | 17
+                     +----------------------------------------------------+
+       33 teams        ko lv nb nl nn no pl pt pt_BR ru sk sl sv tr uk zh
+       53 domains       9  1  6 20  0  6 17  1  13   25 10 11 23 21  2  2  387

   Some counters in the preceding matrix are higher than the number of
 visible blocks let us expect.  This is because a few extra PO files are
@@ -294,9 +298,9 @@ distributed as such by its maintainer.  There might be an observable
 lag between the mere existence a PO file and its wide availability in a
 distribution.

-   If July 2001 seems to be old, you may fetch a more recent copy of
-this `ABOUT-NLS' file on most GNU archive sites.  The most up-to-date
-matrix with full percentage details can be found at
+   If September 2001 seems to be old, you may fetch a more recent copy
+of this `ABOUT-NLS' file on most GNU archive sites.  The most
+up-to-date matrix with full percentage details can be found at
 `http://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'.

 Using `gettext' in new packages
@@ -304,10 +308,11 @@ Using `gettext' in new packages

   If you are writing a freely available program and want to
 internationalize it you are welcome to use GNU `gettext' in your
-package.  Of course the GNU General Public License applies to your
-sources from then on if you include `gettext' directly in your
-distribution but since you are writing free software anyway this is no
-restriction.
+package.  Of course you have to respect the GNU Library General Public
+License which covers the use of the GNU `gettext' library.  This means
+in particular that even non-free programs can use `libintl' as a shared
+library, whereas only free software can use `libintl' as a static
+library or use modified versions of `libintl'.

   Once the sources are changed appropriately and the setup can handle
 to use of `gettext' the only thing missing are the translations.  The
@@ -1,3 +1,188 @@
+2001-10-10  Akim Demaille  <[email protected]>
+
+	Version 1.29d.
+	* src/bison.simple: Be sure to set YYSTACK_USE_ALLOCA.
+	Use `#if !YYSTACK_USE_ALLOCA', not `#ifndef'.
+	Reported by Airy Andre.
+
+2001-10-10  Akim Demaille  <[email protected]>
+
+	* INSTALL, config/config.guess, config/config.sub, config/mdate-sh
+	* config/mkinstalldirs, lib/ansi2knr.c: Update.
+
+2001-10-02  Akim Demaille  <[email protected]>
+
+	Bump 1.29d.
+
+2001-10-02  Akim Demaille  <[email protected]>
+
+	Version 1.29c.
+
+2001-10-02  Akim Demaille  <[email protected]>
+
+	* tests/regression.at (Invalid CPP headers): New.
+	From Alexander Belopolsky.
+	* src/files.c (compute_header_macro): Map non alnum chars to `_'.
+
+2001-10-02  Akim Demaille  <[email protected]>
+
+	* tests/regression.at (Invalid input): New.
+	* src/lex.c (lex): Be sure to set `token_buffer' in any case.
+	Reported by Shura.
+
+2001-10-02  Akim Demaille  <[email protected]>
+
+	* tests/calc.at: Now that --debug works, the tests must be adjusted.
+
+2001-10-02  Akim Demaille  <[email protected]>
+
+	* src/output.c (output_parser): Assert `skeleton'.
+	* src/files.c (skeleton_find): Look harder for skeletons on DOSish
+	systems.
+	From Shura.
+
+2001-10-01  Marc Autret  <[email protected]>
+
+	* src/lex.h: Echo modifications.
+	* src/lex.c (unlex): Parameter is now token_t.
+	From Hans Aberg.
+
+2001-10-01  Marc Autret  <[email protected]>
+
+	* src/main.c: Include lex.h.
+	From Hans Aberg.
+
+2001-09-29  Akim Demaille  <[email protected]>
+
+	* src/getargs.c (longopts): `--debug' is `-t', not `-d'.
+
+2001-09-28  Akim Demaille  <[email protected]>
+
+	* tests/testsuite.at: Update to newer Autotest.
+	* tests/Makefile.am (EXTRA_DIST): bison is not to be shipped.
+
+2001-09-27  Akim Demaille  <[email protected]>
+
+	Position independent wrapper.
+
+	* tests/bison: Remove.
+	* tests/bison.in: New.
+	* configure.in: Adjust.
+
+2001-09-27  Paul Eggert  <[email protected]>
+
+	Port quotearg fixes from tar 1.13.24.
+
+	* lib/quotearg.c: BSD/OS 4.1 wchar.h requires FILE and struct
+	tm to be declared.
+	(HAVE_MBSINIT): Undef if !HAVE_MBRTOWC.
+	(mbsinit): Define to 1 if !defined mbsinit && !HAVE_MBSINIT.
+
+	* m4/Makefile.am (EXTRA_DIST): Add mbrtowc.m4.
+	* m4/mbrtowc.m4: New file.
+	* m4/prereq.m4 (jm_PREREQ_QUOTEARG): Check for mbsinit and stddef.h.
+	Use jm_FUNC_MBRTOWC instead of AC_CHECK_FUNCS(mbrtowc).
+
+2001-09-27  Akim Demaille  <[email protected]>
+
+	Bump to 1.29c.
+
+2001-09-27  Akim Demaille  <[email protected]>
+
+	Version 1.29b.
+
+2001-09-25  Akim Demaille  <[email protected]>
+
+	* src/system.h: Include `xalloc.h'.
+	Remove it from the C files.
+	* src/files.c (output_files): Free the obstacks.
+	* src/lex.c (init_lex): Rename as...
+	(lex_init): this.
+	(lex_free): New.
+	* src/main.c (main): Use it.
+
+2001-09-24  Marc Autret  <[email protected]>
+
+	* src/vcg.c (open_edge, close_edge, open_node, close_node): Change
+	to output informations in fout (FILE*).
+	(open_graph, close_graph): Likewise.
+	(output_graph, output_edge, output_node): Likewise.
+	* src/vcg.h: Update function prototypes.
+	* src/print_graph.c (print_graph): Open output graph file.
+	(print_actions): Adjust.
+	* src/files.h: Remove extern declaration.
+	* src/files.c: Remove graph_obstack declaration.
+	(open_files): Remove graph_obstack initialization.
+	(output_files): Remove graph_obstack saving.
+
+2001-09-24  Marc Autret  <[email protected]>
+
+	* src/files.c (compute_output_file_names): Fix.
+
+2001-09-24  Marc Autret  <[email protected]>, Akim Demaille  <[email protected]>
+
+	* src/reader.c (reader): Remove call to free_symtab ().
+	* src/main.c (main): Call it here.
+	Include symtab.h.
+	* src/conflicts.c (initialize_conflicts): Rename as...
+	(solve_conflicts): this.
+	* src/print.c (print_core, print_actions, print_state)
+	(print_grammar): Dump to a file instead a `output_obstack'.
+	(print_results): Dump `output_obstack', and then proceed with the
+	FILE *.
+	* src/files.c (compute_output_file_names, close_files): New.
+	(output_files): Adjust.
+	* src/main.c (main): Adjust.
+
+2001-09-23  Marc Autret  <[email protected]>
+
+	* src/files.c (compute_header_macro): Computes header macro name
+	from spec_defines_file when given.
+
+2001-09-23  Marc Autret  <[email protected]>
+
+	* src/files.c (output_files): Add default extensions.
+
+2001-09-22  Akim Demaille  <[email protected]>
+
+	* src/conflicts.c (finalize_conflicts): Rename as...
+	(free_conflicts): this.
+
+2001-09-22  Akim Demaille  <[email protected]>
+
+	* src/gram.c (gram_free): Rename back as...
+	(dummy): this.
+	(output_token_translations): Free `token_translations'.
+	* src/symtab.c (free_symtab): Free the tag field.
+
+2001-09-22  Akim Demaille  <[email protected]>
+
+	Remove `translations' as it is always set to true.
+
+	* src/gram.h: Adjust.
+	* src/reader.c (packsymbols, parse_token_decl): Adjust
+	* src/print.c (print_grammar): Adjust.
+	* src/output.c (output_token_translations): Adjust.
+	* src/lex.c (lex): Adjust.
+	* src/gram.c: Be sure the set pointers to NULL.
+	(dummy): Rename as...
+	(gram_free): this.
+
+2001-09-22  Akim Demaille  <[email protected]>
+
+	* configure.in: Invoke AM_LIB_DMALLOC.
+	* src/system.h: Use dmalloc.
+	* src/LR0.c: Be sure to have pointers initialized to NULL.
+	(allocate_itemsets): Allocate kernel_items only if needed.
+
+2001-09-22  Akim Demaille  <[email protected]>
+
+	* configure.in: Bump to 1.29b.
+	* tests/Makefile.am (DISTCLEANFILES): Add package.m4.
+	* tests/calc.at (_AT_DATA_CALC_Y): #undef malloc so that we don't
+	need xmalloc.c in calc.y.
+	From Pascal Bart.
+
 2001-09-21  Akim Demaille  <[email protected]>

 	Version 1.29a.
@@ -1,3 +1,9 @@
+Copyright 1994, 1995, 1996, 1999, 2000, 2001 Free Software Foundation,
+Inc.
+
+   This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
 Basic Installation
 ==================

@@ -8,20 +14,27 @@ various system-dependent variables used during compilation.  It uses
 those values to create a `Makefile' in each directory of the package.
 It may also create one or more `.h' files containing system-dependent
 definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, a file
-`config.cache' that saves the results of its tests to speed up
-reconfiguring, and a file `config.log' containing compiler output
-(useful mainly for debugging `configure').
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+   It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring.  (Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.)

   If you need to do unusual things to compile the package, please try
 to figure out how `configure' could check whether to do them, and mail
 diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If at some point `config.cache'
-contains results you don't want to keep, you may remove or edit it.
+be considered for the next release.  If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.

-   The file `configure.in' is used to create `configure' by a program
-called `autoconf'.  You only need `configure.in' if you want to change
-it or regenerate `configure' using a newer version of `autoconf'.
+   The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'.  You only need
+`configure.ac' if you want to change it or regenerate `configure' using
+a newer version of `autoconf'.

 The simplest way to compile this package is:

@@ -55,14 +68,15 @@ Compilers and Options
 =====================

   Some systems require unusual options for compilation or linking that
-the `configure' script does not know about.  You can give `configure'
-initial values for variables by setting them in the environment.  Using
-a Bourne-compatible shell, you can do that on the command line like
-this:
-     CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure
+the `configure' script does not know about.  Run `./configure --help'
+for details on some of the pertinent environment variables.

-Or on systems that have the `env' program, you can do it like this:
-     env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
+   You can give `configure' initial values for variables by setting
+them in the environment.  You can do that on the command line like this:
+
+     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+
+   *Note Defining Variables::, for more details.

 Compiling For Multiple Architectures
 ====================================
@@ -75,11 +89,11 @@ directory where you want the object files and executables to go and run
 the `configure' script.  `configure' automatically checks for the
 source code in the directory that `configure' is in and in `..'.

-   If you have to use a `make' that does not supports the `VPATH'
-variable, you have to compile the package for one architecture at a time
-in the source code directory.  After you have installed the package for
-one architecture, use `make distclean' before reconfiguring for another
-architecture.
+   If you have to use a `make' that does not support the `VPATH'
+variable, you have to compile the package for one architecture at a
+time in the source code directory.  After you have installed the
+package for one architecture, use `make distclean' before reconfiguring
+for another architecture.

 Installation Names
 ==================
@@ -122,22 +136,35 @@ you can use the `configure' options `--x-includes=DIR' and
 Specifying the System Type
 ==========================

-   There may be some features `configure' can not figure out
+   There may be some features `configure' cannot figure out
 automatically, but needs to determine by the type of host the package
 will run on.  Usually `configure' can figure that out, but if it prints
-a message saying it can not guess the host type, give it the
-`--host=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name with three fields:
+a message saying it cannot guess the host type, give it the
+`--build=TYPE' option.  TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
     CPU-COMPANY-SYSTEM

-See the file `config.sub' for the possible values of each field.  If
+where SYSTEM can have one of these forms:
+
+     OS KERNEL-OS
+
+   See the file `config.sub' for the possible values of each field.  If
 `config.sub' isn't included in this package, then this package doesn't
 need to know the host type.

-   If you are building compiler tools for cross-compiling, you can also
+   If you are _building_ compiler tools for cross-compiling, you should
 use the `--target=TYPE' option to select the type of system they will
-produce code for and the `--build=TYPE' option to select the type of
-system on which you are compiling the package.
+produce code for.
+
+   If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the host
+platform (i.e., that on which the generated programs will eventually be
+run) with `--host=TYPE'.  In this case, you should also specify the
+build platform with `--build=TYPE', because, in this case, it may not
+be possible to guess the build platform (it sometimes involves
+compiling and running simple test programs, and this can't be done if
+the compiler is a cross compiler).

 Sharing Defaults
 ================
@@ -150,20 +177,44 @@ default values for variables like `CC', `cache_file', and `prefix'.
 `CONFIG_SITE' environment variable to the location of the site script.
 A warning: not all `configure' scripts look for a site script.

-Operation Controls
+Defining Variables
 ==================

+   Variables not defined in a site shell script can be set in the
+environment passed to `configure'.  However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost.  In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'.  For example:
+
+     ./configure CC=/usr/local2/bin/gcc
+
+will cause the specified gcc to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+`configure' Invocation
+======================
+
   `configure' recognizes the following options to control how it
 operates.

-`--cache-file=FILE'
-     Use and save the results of the tests in FILE instead of
-     `./config.cache'.  Set FILE to `/dev/null' to disable caching, for
-     debugging `configure'.
-
 `--help'
+`-h'
     Print a summary of the options to `configure', and exit.

+`--version'
+`-V'
+     Print the version of Autoconf used to generate the `configure'
+     script, and exit.
+
+`--cache-file=FILE'
+     Enable the cache: use and save the results of the tests in FILE,
+     traditionally `config.cache'.  FILE defaults to `/dev/null' to
+     disable caching.
+
+`--config-cache'
+`-C'
+     Alias for `--cache-file=config.cache'.
+
 `--quiet'
 `--silent'
 `-q'
@@ -175,8 +226,6 @@ operates.
     Look for the package's source code in directory DIR.  Usually
     `configure' can determine that directory automatically.

-`--version'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
+`configure' also accepts some other, not widely useful, options.  Run
+`configure --help' for more details.

-`configure' also accepts some other, not widely useful, options.
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-
-AUTOMAKE_OPTIONS = 1.5 check-news readme-alpha
+AUTOMAKE_OPTIONS = 1.5 check-news readme-alpha dist-bzip2

 ACLOCAL_AMFLAGS = -I m4

@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.5 from Makefile.am.
+# Makefile.in generated automatically by automake 1.5a from Makefile.am.

 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -43,6 +43,7 @@ AUTOCONF = @AUTOCONF@
 AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@

+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
@@ -57,6 +58,10 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
 AWK = @AWK@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
@@ -66,7 +71,6 @@ CC = @CC@
 CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
-EXEEXT = @EXEEXT@
 GENCAT = @GENCAT@
 GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@
@@ -82,7 +86,6 @@ LIBOBJS = @LIBOBJS@
 M4 = @M4@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 POFILES = @POFILES@
 POSUB = @POSUB@
@@ -96,7 +99,7 @@ am__include = @am__include@
 am__quote = @am__quote@
 install_sh = @install_sh@

-AUTOMAKE_OPTIONS = 1.5 check-news readme-alpha
+AUTOMAKE_OPTIONS = 1.5 check-news readme-alpha dist-bzip2

 ACLOCAL_AMFLAGS = -I m4

@@ -132,9 +135,10 @@ RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
 	uninstall-info-recursive all-recursive install-data-recursive \
 	install-exec-recursive installdirs-recursive install-recursive \
 	uninstall-recursive check-recursive installcheck-recursive
-DIST_COMMON = README ./stamp-h.in ABOUT-NLS AUTHORS COPYING ChangeLog \
-	INSTALL Makefile.am Makefile.in NEWS README-alpha THANKS \
-	aclocal.m4 config.hin configure configure.in
+DIST_COMMON = README ././stamp-h.in ./stamp-h.in ABOUT-NLS AUTHORS \
+	COPYING ChangeLog INSTALL Makefile.am Makefile.in NEWS \
+	README-alpha THANKS aclocal.m4 config.hin configure \
+	configure.in
 DIST_SUBDIRS = $(SUBDIRS)
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -153,7 +157,7 @@ $(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 $(srcdir)/configure:  $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
 	cd $(srcdir) && $(AUTOCONF)

-$(ACLOCAL_M4):  configure.in m4/c-bs-a.m4 m4/codeset.m4 m4/error.m4 m4/gettext.m4 m4/glibc21.m4 m4/iconv.m4 m4/isc-posix.m4 m4/lcmessage.m4 m4/m4.m4 m4/malloc.m4 m4/mbstate_t.m4 m4/prereq.m4 m4/progtest.m4 m4/realloc.m4 m4/strerror_r.m4 m4/warning.m4
+$(ACLOCAL_M4):  configure.in m4/c-bs-a.m4 m4/codeset.m4 m4/dmalloc.m4 m4/error.m4 m4/gettext.m4 m4/glibc21.m4 m4/iconv.m4 m4/isc-posix.m4 m4/lcmessage.m4 m4/m4.m4 m4/malloc.m4 m4/mbrtowc.m4 m4/mbstate_t.m4 m4/prereq.m4 m4/progtest.m4 m4/realloc.m4 m4/strerror_r.m4 m4/warning.m4
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 config.h: stamp-h
 	@if test ! -f $@; then \
@@ -269,7 +273,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.hin $(TAGS_DEPENDENCIES) \
 	  || etags $(ETAGS_ARGS) $$tags config.hin $$unique $(LISP)

 GTAGS:
-	here=`CDPATH=: && cd $(top_builddir) && pwd` \
+	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && cd $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) $$here

@@ -292,7 +296,7 @@ distdir: $(DISTFILES)
 	fi
 	-chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)
 	mkdir $(distdir)
-	$(mkinstalldirs) $(distdir)/intl $(distdir)/po
+	$(mkinstalldirs) $(distdir)/./. $(distdir)/intl $(distdir)/po $(distdir)/tests
 	@for file in $(DISTFILES); do \
 	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
@@ -326,10 +330,19 @@ distdir: $(DISTFILES)
 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
 	|| chmod -R a+r $(distdir)
-dist: distdir
+dist-gzip: distdir
 	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
 	-chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)

+dist-bzip2: distdir
+	$(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2
+	-chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)
+
+dist dist-all: distdir
+	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	$(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2
+	-chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)
+
 # This target untars the dist file and tries a VPATH configuration.  Then
 # it guarantees that the distribution is self-contained by making another
 # tarfile.
@@ -340,7 +353,7 @@ distcheck: dist
 	mkdir $(distdir)/=build
 	mkdir $(distdir)/=inst
 	chmod a-w $(distdir)
-	dc_install_base=`CDPATH=: && cd $(distdir)/=inst && pwd` \
+	dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \
 	  && cd $(distdir)/=build \
 	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
 	    --with-included-gettext \
@@ -351,14 +364,16 @@ distcheck: dist
 	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
 	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
 	  && (test `find $$dc_install_base -type f -print | wc -l` -le 1 \
-	     || (echo "Error: files left after uninstall" 1>&2; \
-	         exit 1) ) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist \
+	      || { echo "ERROR: files left after uninstall:" ; \
+	           find $$dc_install_base -type f -print ; \
+	           exit 1; } >&2 ) \
+	  && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \
 	  && $(MAKE) $(AM_MAKEFLAGS) distclean \
 	  && rm -f $(distdir).tar.gz \
 	  && (test `find . -type f -print | wc -l` -eq 0 \
-	     || (echo "Error: files left after distclean" 1>&2; \
-	         exit 1) )
+	      || { echo "ERROR: files left after distclean:" ; \
+	           find . -type f -print ; \
+	           exit 1; } >&2 )
 	-chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir)
 	@echo "$(distdir).tar.gz is ready for distribution" | \
 	  sed 'h;s/./=/g;p;x;p;x'
@@ -396,9 +411,6 @@ clean: clean-recursive

 clean-am: clean-generic mostlyclean-am

-dist-all: distdir
-	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	-chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)
 distclean: distclean-recursive
 	-rm -f config.status config.cache config.log
 distclean-am: clean-am distclean-generic distclean-hdr distclean-tags
@@ -434,19 +446,20 @@ uninstall-am: uninstall-info-am
 uninstall-info: uninstall-info-recursive

 .PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
-	clean-generic clean-recursive dist dist-all distcheck distclean \
-	distclean-generic distclean-hdr distclean-recursive \
-	distclean-tags distdir dvi dvi-am dvi-recursive info info-am \
-	info-recursive install install-am install-data install-data-am \
-	install-data-recursive install-exec install-exec-am \
-	install-exec-recursive install-info install-info-am \
-	install-info-recursive install-man install-recursive \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am installdirs-recursive maintainer-clean \
-	maintainer-clean-generic maintainer-clean-recursive mostlyclean \
-	mostlyclean-generic mostlyclean-recursive tags tags-recursive \
-	uninstall uninstall-am uninstall-info-am \
-	uninstall-info-recursive uninstall-recursive
+	clean-generic clean-recursive dist dist-all dist-bzip2 \
+	dist-gzip distcheck distclean distclean-generic distclean-hdr \
+	distclean-recursive distclean-tags distdir dvi dvi-am \
+	dvi-recursive info info-am info-recursive install install-am \
+	install-data install-data-am install-data-recursive \
+	install-exec install-exec-am install-exec-recursive \
+	install-info install-info-am install-info-recursive install-man \
+	install-recursive install-strip installcheck installcheck-am \
+	installdirs installdirs-am installdirs-recursive \
+	maintainer-clean maintainer-clean-generic \
+	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+	mostlyclean-recursive tags tags-recursive uninstall \
+	uninstall-am uninstall-info-am uninstall-info-recursive \
+	uninstall-recursive

 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
@@ -1,10 +1,10 @@
 Bison News
 ----------

-Changes in version 1.29a:
+Changes in version 1.29d:

 * `--defines' and `--graph' have now an optionnal argument which is the
-  output file name. `-d' and `-g' do not change, they do not take any 
+  output file name. `-d' and `-g' do not change, they do not take any
  argument.

 * `%source_extension' and `%header_extension' are removed, failed
@@ -16,7 +16,10 @@ Changes in version 1.29a:

 Changes in version 1.29:

-* Output file does not redefine const; that is now config.h's job.
+* The output file does not define const, as this caused problems when used
+  with common autoconfiguration schemes.  If you still use ancient compilers
+  that lack const, compile with the equivalent of the C compiler option
+  `-Dconst='.  autoconf's AC_C_CONST macro provides one way to do this.

 * Added `-g' and `--graph'.

@@ -1,25 +1,28 @@
 Bison was originally written by Robert Corbett.  It would not be what
 it is today without the invaluable help of these people:

-Akim Demaille		akim@epita.fr
+Airy Andre              Airy.Andre@edf.fr
+Akim Demaille           [email protected]
 Albert Chin-A-Young     [email protected]
-Daniel Hagerty  	[email protected]
-David J. MacKenzie  	djm@gnu.org
-Fabrice Bauzac		[email protected]
-Hans Aberg		[email protected]
-Jesse Thilo  		[email protected]
-Jim Meyering  		meyering@gnu.org
-Juan Manuel Guerrero	[email protected]
-Keith Browne		[email protected]
-Laurent Mascherpa	[email protected]
+Alexander Belopolsky    [email protected]
+Daniel Hagerty          hag@gnu.org
+David J. MacKenzie      [email protected]
+Fabrice Bauzac          [email protected]
+Hans Aberg              [email protected]
+Jesse Thilo             jthilo@gnu.org
+Jim Meyering            [email protected]
+Juan Manuel Guerrero    [email protected]
+Keith Browne            [email protected]
+Laurent Mascherpa       [email protected]
 Marc Autret             [email protected]
-Neil Booth		[email protected]
-Noah Friedman  		[email protected]
+Neil Booth              [email protected]
+Noah Friedman           [email protected]
 Pascal Bart             [email protected]
-Paul Eggert  		[email protected]
-Piotr Gackiewicz	[email protected]
-Richard Stallman  	[email protected]
+Paul Eggert             [email protected]
+Piotr Gackiewicz        [email protected]
+Richard Stallman        [email protected]
 Robert Anisko           [email protected]
+Shura                   [email protected]

 Many people are not named here because we lost track of them.  We
 thank them!  Please, help us keeping this list up to date.
@@ -788,21 +788,41 @@ AC_DEFUN(jm_FUNC_REALLOC,
  fi
 ])

-#serial 1
+#serial 2

 dnl These are the prerequisite macros for files in the lib/
 dnl directories of Bison.

 AC_DEFUN([jm_PREREQ_QUOTEARG],
 [
-  AC_CHECK_FUNCS(isascii iswprint mbrtowc)
-  AC_CHECK_HEADERS(limits.h stdlib.h string.h wchar.h wctype.h)
+  AC_CHECK_FUNCS(isascii iswprint mbsinit)
+  jm_FUNC_MBRTOWC
+  AC_CHECK_HEADERS(limits.h stddef.h stdlib.h string.h wchar.h wctype.h)
  AC_HEADER_STDC
  AC_C_BACKSLASH_A
  AC_MBSTATE_T
  AM_C_PROTOTYPES
 ])

+#serial 4
+
+dnl From Paul Eggert
+
+AC_DEFUN([jm_FUNC_MBRTOWC],
+[
+  AC_CACHE_CHECK([whether mbrtowc and mbstate_t are properly declared],
+    jm_cv_func_mbrtowc,
+    [AC_TRY_LINK(
+       [#include <wchar.h>],
+       [mbstate_t state; return ! (sizeof state && mbrtowc);],
+       jm_cv_func_mbrtowc=yes,
+       jm_cv_func_mbrtowc=no)])
+  if test $jm_cv_func_mbrtowc = yes; then
+    AC_DEFINE(HAVE_MBRTOWC, 1,
+      [Define to 1 if mbrtowc and mbstate_t are properly declared.])
+  fi
+])
+
 #serial 3

 dnl From Paul Eggert.
@@ -937,6 +957,25 @@ if test $ac_cv_func_strerror_r = yes; then
 fi
 ])# AC_FUNC_STRERROR_R

+
+# serial 1
+
+AC_DEFUN([AM_WITH_DMALLOC],
+[AC_MSG_CHECKING([if malloc debugging is wanted])
+AC_ARG_WITH(dmalloc,
+[  --with-dmalloc          use dmalloc, as in
+                          http://www.dmalloc.com/dmalloc.tar.gz],
+[if test "$withval" = yes; then
+  AC_MSG_RESULT(yes)
+  AC_DEFINE(WITH_DMALLOC,1,
+            [Define if using the dmalloc debugging malloc package])
+  LIBS="$LIBS -ldmalloc"
+  LDFLAGS="$LDFLAGS -g"
+else
+  AC_MSG_RESULT(no)
+fi], [AC_MSG_RESULT(no)])
+])
+
 # Macro to add for using GNU gettext.
 # Ulrich Drepper <[email protected]>, 1995.
 #
@@ -113,9 +113,12 @@
 /* Define if you have the <malloc.h> header file. */
 #undef HAVE_MALLOC_H

-/* Define if you have the `mbrtowc' function. */
+/* Define to 1 if mbrtowc and mbstate_t are properly declared. */
 #undef HAVE_MBRTOWC

+/* Define if you have the `mbsinit' function. */
+#undef HAVE_MBSINIT
+
 /* Define if you have the `memchr' function. */
 #undef HAVE_MEMCHR

@@ -250,6 +253,9 @@
 /* Version number of package */
 #undef VERSION

+/* Define if using the dmalloc debugging malloc package */
+#undef WITH_DMALLOC
+
 /* Define to 1 for GNU C library extensions. */
 #undef _GNU_SOURCE

@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.5 from Makefile.am.
+# Makefile.in generated automatically by automake 1.5a from Makefile.am.

 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -43,6 +43,7 @@ AUTOCONF = @AUTOCONF@
 AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@

+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
@@ -57,6 +58,10 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
 AWK = @AWK@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
@@ -66,7 +71,6 @@ CC = @CC@
 CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
-EXEEXT = @EXEEXT@
 GENCAT = @GENCAT@
 GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@
@@ -82,7 +86,6 @@ LIBOBJS = @LIBOBJS@
 M4 = @M4@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 POFILES = @POFILES@
 POSUB = @POSUB@
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 #   Free Software Foundation, Inc.

-timestamp='2001-09-13'
+timestamp='2001-10-05'

 # 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
@@ -24,8 +24,9 @@ timestamp='2001-09-13'
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.

-# Written by Per Bothner <[email protected]>.
-# Please send patches to <[email protected]>.
+# Originally written by Per Bothner <[email protected]>.
+# Please send patches to <[email protected]>.  Submit a context
+# diff and a properly formatted ChangeLog entry.
 #
 # This script attempts to guess a canonical system name similar to
 # config.sub.  If it succeeds, it prints the system name on stdout, and
@@ -547,10 +548,8 @@ EOF
 	    9000/31? )            HP_ARCH=m68000 ;;
 	    9000/[34]?? )         HP_ARCH=m68k ;;
 	    9000/[678][0-9][0-9])
-              case "${HPUX_REV}" in
-                11.[0-9][0-9])
-                  if [ -x /usr/bin/getconf ]; then
-                    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+		if [ -x /usr/bin/getconf ]; then
+		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
                    case "${sc_cpu_version}" in
                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
@@ -559,13 +558,13 @@ EOF
                        case "${sc_kernel_bits}" in
                          32) HP_ARCH="hppa2.0n" ;;
                          64) HP_ARCH="hppa2.0w" ;;
+			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
                        esac ;;
                    esac
-                  fi ;;
-              esac
-              if [ "${HP_ARCH}" = "" ]; then
-	      eval $set_cc_for_build
-              sed 's/^              //' << EOF >$dummy.c
+		fi
+		if [ "${HP_ARCH}" = "" ]; then
+		    eval $set_cc_for_build
+		    sed 's/^              //' << EOF >$dummy.c

              #define _HPUX_SOURCE
              #include <stdlib.h>
@@ -598,10 +597,10 @@ EOF
                  exit (0);
              }
 EOF
-	    (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
-	    if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
-	    rm -f $dummy.c $dummy
-	fi ;;
+		    (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null) && HP_ARCH=`./$dummy`
+		    if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
+		    rm -f $dummy.c $dummy
+		fi ;;
 	esac
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
 	exit 0 ;;
@@ -948,7 +947,7 @@ EOF
 	exit 0 ;;
    M68*:*:R3V[567]*:*)
 	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
+    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0)
 	OS_REL=''
 	test -r /etc/.relid \
 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 #   Free Software Foundation, Inc.

-timestamp='2001-09-14'
+timestamp='2001-10-05'

 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -29,7 +29,8 @@ timestamp='2001-09-14'
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.

-# Please send patches to <[email protected]>.
+# Please send patches to <[email protected]>.  Submit a context
+# diff and a properly formatted ChangeLog entry.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
@@ -725,7 +726,7 @@ case $basic_machine in
        pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
-	pentium | p5 | k5 | k6 | nexgen)
+	pentium | p5 | k5 | k6 | nexgen | viac3)
 		basic_machine=i586-pc
 		;;
 	pentiumpro | p6 | 6x86 | athlon)
@@ -734,7 +735,7 @@ case $basic_machine in
 	pentiumii | pentium2)
 		basic_machine=i686-pc
 		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-*)
+	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pentiumpro-* | p6-* | 6x86-* | athlon-*)
@@ -796,7 +797,7 @@ case $basic_machine in
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
-	sparclite-wrs)
+	sparclite-wrs | simso-wrs)
 		basic_machine=sparclite-wrs
 		os=-vxworks
 		;;
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Get modification time of a file or directory and pretty-print it.
-# Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+# Copyright 1995, 1996, 1997 Free Software Foundation, Inc.
 # written by Ulrich Drepper <[email protected]>, June 1995
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,6 +17,11 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
 # Prevent date giving response in another language.
 LANG=C
 export LANG
@@ -7,6 +7,52 @@
 # $Id$

 errstatus=0
+dirmode=""
+
+usage="\
+Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
+
+# process command line arguments
+while test $# -gt 0 ; do
+   case "${1}" in
+     -h | --help | --h* )			# -h for help
+	echo "${usage}" 1>&2; exit 0 ;;
+     -m )					# -m PERM arg
+	shift
+	test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; }
+	dirmode="${1}"
+	shift ;;
+     -- ) shift; break ;;			# stop option processing
+     -* ) echo "${usage}" 1>&2; exit 1 ;;	# unknown option
+     * )  break ;;				# first non-opt arg
+   esac
+done
+
+for file
+do
+  if test -d "$file"; then
+    shift
+  else
+    break
+  fi
+done
+
+case $# in
+0) exit 0 ;;
+esac
+
+case $dirmode in
+'')
+  if mkdir -p -- . 2>/dev/null; then
+    echo "mkdir -p -- $*"
+    exec mkdir -p -- "$@"
+  fi ;;
+*)
+  if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
+    echo "mkdir -m $dirmode -p -- $*"
+    exec mkdir -m "$dirmode" -p -- "$@"
+  fi ;;
+esac

 for file
 do
@@ -22,13 +68,24 @@ do
     esac

     if test ! -d "$pathcomp"; then
-        echo "mkdir $pathcomp"
+	echo "mkdir $pathcomp"

-        mkdir "$pathcomp" || lasterr=$?
+	mkdir "$pathcomp" || lasterr=$?

-        if test ! -d "$pathcomp"; then
-  	  errstatus=$lasterr
-        fi
+	if test ! -d "$pathcomp"; then
+	  errstatus=$lasterr
+	else
+	  if test ! -z "$dirmode"; then
+	     echo "chmod $dirmode $pathcomp"
+
+	     lasterr=""
+	     chmod "$dirmode" "$pathcomp" || lasterr=$?
+
+	     if test ! -z "$lasterr"; then
+	       errstatus=$lasterr
+	     fi
+	  fi
+	fi
     fi

     pathcomp="$pathcomp/"
@@ -37,4 +94,8 @@ done

 exit $errstatus

+# Local Variables:
+# mode: shell-script
+# sh-indentation: 3
+# End:
 # mkinstalldirs ends here
@@ -1 +1 @@
-1.29
+1.29c
@@ -16,16 +16,17 @@
 # 02111-1307  USA

 # We need a recent Autoconf to run a recent Autotest.
-AC_PREREQ(2.52c)
+AC_PREREQ(2.52e)

-AC_INIT([GNU Bison], [1.29a], [[email protected]])
+AC_INIT([GNU Bison], [1.29d], [[email protected]])
 AC_CONFIG_AUX_DIR(config)

-AM_INIT_AUTOMAKE([bison], [1.29a])
+AM_INIT_AUTOMAKE([bison], [1.29d])
 AM_CONFIG_HEADER(config.h:config.hin)

 # Initialize the test suite.
 AC_CONFIG_TESTDIR(tests)
+AC_CONFIG_FILES([tests/bison], [chmod +x tests/bison])

 # Checks for programs.
 AC_PROG_CC
@@ -88,6 +89,7 @@ jm_FUNC_MALLOC
 jm_FUNC_REALLOC
 jm_PREREQ_QUOTEARG
 jm_PREREQ_ERROR
+AM_WITH_DMALLOC

 ALL_LINGUAS="de es et fr ja nl tr ru"
 AM_GNU_GETTEXT
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.5 from Makefile.am.
+# Makefile.in generated automatically by automake 1.5a from Makefile.am.

 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -43,6 +43,7 @@ AUTOCONF = @AUTOCONF@
 AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@

+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
@@ -57,6 +58,10 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
 AWK = @AWK@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
@@ -66,7 +71,6 @@ CC = @CC@
 CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
-EXEEXT = @EXEEXT@
 GENCAT = @GENCAT@
 GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@
@@ -82,7 +86,6 @@ LIBOBJS = @LIBOBJS@
 M4 = @M4@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 POFILES = @POFILES@
 POSUB = @POSUB@
@@ -161,7 +164,7 @@ bison.dvi: bison.texinfo $(srcdir)/version.texi $(bison_TEXINFOS)
 	       `echo $< | sed 's,.*/,,'`

 .texinfo.dvi:
-	TEXINPUTS=$(top_srcdir)/config:$$TEXINPUTS \
+	TEXINPUTS="$(top_srcdir)/config$(PATH_SEPARATOR)$$TEXINPUTS" \
 	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
 	$(TEXI2DVI) $<

@@ -200,9 +203,10 @@ dist-info: $(INFO_DEPS)
 	list='$(INFO_DEPS)'; \
 	for base in $$list; do \
 	  d=$(srcdir); \
-	  for file in `CDPATH=: && cd $$d && eval echo $$base*`; do \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file; \
+	  for file in $$d/$$base*; do \
+	    relfile=`expr "$$file" : "$$d/\(.*\)"`; \
+	    test -f $(distdir)/$$relfile || \
+	      cp -p $$file $(distdir)/$$relfile; \
 	  done; \
 	done

@@ -344,10 +348,11 @@ install-info-am: $(INFO_DEPS)
 	@list='$(INFO_DEPS)'; \
 	for file in $$list; do \
 	  d=$(srcdir); \
-	  for ifile in `CDPATH=: && cd $$d && echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \
-	    if test -f $$d/$$ifile; then \
-	      echo " $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile"; \
-	      $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile; \
+	  for ifile in echo $$d/$$file $$d/$$file-[0-9] $$d/$$file-[0-9][0-9]; do \
+	    if test -f $$ifile; then \
+	      relfile=`expr "$$ifile" : "$$d/\(.*\)"`; \
+	      echo " $(INSTALL_DATA) $$ifile $(DESTDIR)$(infodir)/$$relfile"; \
+	      $(INSTALL_DATA) $$ifile $(DESTDIR)$(infodir)/$$relfile; \
 	    else : ; fi; \
 	  done; \
 	done
@@ -34,7 +34,7 @@ File: bison.info,  Node: Top,  Next: Introduction,  Up: (dir)
 Bison
 *****

-   This manual documents version 1.29a of Bison, updated 20 September
+   This manual documents version 1.29d of Bison, updated 20 September
 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.29a of Bison.
+   This edition corresponds to version 1.29d of Bison.


 File: bison.info,  Node: Conditions,  Next: Copying,  Prev: Introduction,  Up: Top
@@ -1,4 +1,4 @@
@set UPDATED 20 September 2001
@set UPDATED-MONTH September 2001
-@set EDITION 1.29a
-@set VERSION 1.29a
+@set EDITION 1.29d
+@set VERSION 1.29d
@@ -1,4 +1,4 @@
@set UPDATED 20 September 2001
@set UPDATED-MONTH September 2001
-@set EDITION 1.29a
-@set VERSION 1.29a
+@set EDITION 1.29d
+@set VERSION 1.29d
@@ -1,4 +1,4 @@
-2001-07-24  GNU  <[email protected]>
+2001-09-13  GNU  <[email protected]>

-	* Version 0.10.39 released.
+	* Version 0.10.40 released.

@@ -1,19 +1,20 @@
 # Makefile for directory with message catalog handling in GNU NLS Utilities.
 # Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc.
 #
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Library General Public License as published
+# by the Free Software Foundation; either version 2, or (at your option)
 # any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Library General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# You should have received a copy of the GNU Library General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+# USA.

 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
@@ -74,7 +75,7 @@ DISTFILES.common = Makefile.in \
 config.charset locale.alias ref-add.sin ref-del.sin $(HEADERS) $(SOURCES)
 DISTFILES.generated = plural.c
 DISTFILES.normal = VERSION
-DISTFILES.gettext = libintl.glibc
+DISTFILES.gettext = COPYING.LIB-2 COPYING.LIB-2.1 libintl.glibc
 DISTFILES.obsolete = xopen-msg.sed linux-msg.sed po2tbl.sed.in cat-compat.c

 # Libtool's library version information for libintl.
@@ -184,7 +185,7 @@ install-data: all
 	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
 	  $(INSTALL_DATA) VERSION $(DESTDIR)$(gettextsrcdir)/VERSION; \
 	  $(INSTALL_DATA) ChangeLog.inst $(DESTDIR)$(gettextsrcdir)/ChangeLog; \
-	  dists="$(DISTFILES.common)"; \
+	  dists="COPYING.LIB-2 COPYING.LIB-2.1 $(DISTFILES.common)"; \
 	  for file in $$dists; do \
 	    $(INSTALL_DATA) $(srcdir)/$$file \
 			    $(DESTDIR)$(gettextsrcdir)/$$file; \
@@ -243,7 +244,7 @@ uninstall:
 	  : ; \
 	fi
 	if test "$(PACKAGE)" = "gettext"; then \
-	  for file in VERSION ChangeLog $(DISTFILES.common) $(DISTFILES.generated); do \
+	  for file in VERSION ChangeLog COPYING.LIB-2 COPYING.LIB-2.1 $(DISTFILES.common) $(DISTFILES.generated); do \
 	    rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
 	  done; \
 	else \
@@ -1 +1 @@
-GNU gettext library from gettext-0.10.39
+GNU gettext library from gettext-0.10.40
@@ -1,19 +1,20 @@
 /* Implementation of the bindtextdomain(3) function
   Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
   any later version.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.

-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */

 #ifdef HAVE_CONFIG_H
 # include <config.h>
@@ -1,19 +1,20 @@
 /* Implementation of the dcgettext(3) function.
   Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
   any later version.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.

-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */

 #ifdef HAVE_CONFIG_H
 # include <config.h>
@@ -1,19 +1,20 @@
 /* Implementation of the internal dcigettext function.
   Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
   any later version.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.

-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */

 /* Tell glibc's <string.h> to provide a prototype for mempcpy().
   This must come before <config.h> because <config.h> may include
@@ -1,19 +1,20 @@
 /* Implementation of the dcngettext(3) function.
   Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
   any later version.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.

-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */

 #ifdef HAVE_CONFIG_H
 # include <config.h>
@@ -1,19 +1,20 @@
 /* Implementation of the dgettext(3) function.
   Copyright (C) 1995-1997, 2000, 2001 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
   any later version.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.

-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */

 #ifdef HAVE_CONFIG_H
 # include <config.h>
@@ -1,19 +1,20 @@
 /* Implementation of the dngettext(3) function.
   Copyright (C) 1995-1997, 2000, 2001 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
   any later version.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.

-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */

 #ifdef HAVE_CONFIG_H
 # include <config.h>
@@ -1,19 +1,20 @@
 /* Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc.
   Contributed by Ulrich Drepper <[email protected]>, 1995.

-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
   any later version.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.

-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */

 #ifdef HAVE_CONFIG_H
 # include <config.h>
@@ -2,19 +2,20 @@
   Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
   Written by Ulrich Drepper <[email protected]>, 1995.

-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
   any later version.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.

-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */

 #ifdef HAVE_CONFIG_H
 # include <config.h>
@@ -1,19 +1,20 @@
 /* Implementation of gettext(3) function.
   Copyright (C) 1995, 1997, 2000, 2001 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
   any later version.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.

-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */

 #ifdef HAVE_CONFIG_H
 # include <config.h>
@@ -1,19 +1,20 @@
 /* Description of GNU message catalog format: general file layout.
   Copyright (C) 1995, 1997, 2000, 2001 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
   any later version.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.

-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */

 #ifndef _GETTEXT_H
 #define _GETTEXT_H 1
@@ -2,19 +2,20 @@
   Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
   Written by Ulrich Drepper <[email protected]>, 1995.

-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
   any later version.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.

-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */

 #ifndef _GETTEXTP_H
 #define _GETTEXTP_H
@@ -1,19 +1,20 @@
 /* Description of GNU message catalog format: string hashing function.
   Copyright (C) 1995, 1997, 1998, 2000, 2001 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
   any later version.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.

-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */

 /* @@ end of prolog @@ */

@@ -2,19 +2,20 @@
   Library.
   Copyright (C) 1995, 2000, 2001 Software Foundation, Inc.

-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
+   any later version.

-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.

-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */

 #ifdef HAVE_CONFIG_H
 # include <config.h>
@@ -1,19 +1,20 @@
 /* Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
   Contributed by Ulrich Drepper <[email protected]>, 1995.

-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
   any later version.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.

-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */

 /* Tell glibc's <string.h> to provide a prototype for stpcpy().
   This must come before <config.h> because <config.h> may include
@@ -1,19 +1,20 @@
 /* Convenience header for conditional use of GNU <libintl.h>.
   Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
   any later version.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.

-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */

 #ifndef _LIBGETTEXT_H
 #define _LIBGETTEXT_H 1
@@ -1,19 +1,20 @@
 /* Message catalogs for internationalization.
   Copyright (C) 1995-1997, 2000, 2001 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
   any later version.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.

-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */

 #ifndef _LIBINTL_H
 #define _LIBINTL_H	1
@@ -2,19 +2,20 @@
   This file is part of the GNU C Library.
   Contributed by Ulrich Drepper <[email protected]>, 1996.

-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
   any later version.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.

-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */

 #ifndef _LOADINFO_H
 #define _LOADINFO_H	1
@@ -1,19 +1,20 @@
 /* Load needed message catalogs.
   Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
   any later version.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.

-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */

 /* Tell glibc's <string.h> to provide a prototype for mempcpy().
   This must come before <config.h> because <config.h> may include
@@ -1,19 +1,20 @@
 # Locale name alias data base.
 # Copyright (C) 1996,1997,1998,1999,2000,2001 Free Software Foundation, Inc.
 #
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Library General Public License as published
+# by the Free Software Foundation; either version 2, or (at your option)
 # any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Library General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# You should have received a copy of the GNU Library General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+# USA.

 # The format of this file is the same as for the corresponding file of
 # the X Window System, which normally can be found in
@@ -46,7 +47,7 @@ galego		gl_ES.ISO-8859-1
 galician	gl_ES.ISO-8859-1
 german		de_DE.ISO-8859-1
 greek           el_GR.ISO-8859-7
-hebrew          iw_IL.ISO-8859-8
+hebrew          he_IL.ISO-8859-8
 hrvatski	hr_HR.ISO-8859-2
 hungarian       hu_HU.ISO-8859-2
 icelandic       is_IS.ISO-8859-1
@@ -1,19 +1,20 @@
 /* Handle aliases for locale names.
   Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
   any later version.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.

-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */

 /* Tell glibc's <string.h> to provide a prototype for mempcpy().
   This must come before <config.h> because <config.h> may include
@@ -1,19 +1,20 @@
 /* Implementation of ngettext(3) function.
   Copyright (C) 1995, 1997, 2000, 2001 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
   any later version.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.

-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */

 #ifdef HAVE_CONFIG_H
 # include <config.h>
@@ -23,19 +23,20 @@
   Copyright (C) 2000, 2001 Free Software Foundation, Inc.
   Written by Ulrich Drepper <[email protected]>, 2000.

-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
   any later version.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.

-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */

 /* The bison generated parser uses alloca.  AIX 3 forces us to put this
   declaration at the beginning of the file.  The declaration in bison's
@@ -66,13 +67,13 @@
 #define YYLEX_PARAM	&((struct parse_args *) arg)->cp
 #define YYPARSE_PARAM	arg

-#line 52 "plural.y"
+#line 53 "plural.y"
 typedef union {
  unsigned long int num;
  enum operator op;
  struct expression *exp;
 } YYSTYPE;
-#line 58 "plural.y"
+#line 59 "plural.y"

 /* Prototypes for local functions.  */
 static struct expression *new_exp PARAMS ((int nargs, enum operator op,
@@ -234,8 +235,8 @@ static const short yyrhs[] = {    17,

 #if YYDEBUG != 0
 static const short yyrline[] = { 0,
-   177,   185,   189,   193,   197,   201,   205,   209,   213,   217,
-   221,   226
+   178,   186,   190,   194,   198,   202,   206,   210,   214,   218,
+   222,   227
 };
 #endif

@@ -845,7 +846,7 @@ yyreduce:
  switch (yyn) {

 case 1:
-#line 178 "plural.y"
+#line 179 "plural.y"
 {
 	    if (yyvsp[0].exp == NULL)
 	      YYABORT;
@@ -853,68 +854,68 @@ case 1:
 	  ;
    break;}
 case 2:
-#line 186 "plural.y"
+#line 187 "plural.y"
 {
 	    yyval.exp = new_exp_3 (qmop, yyvsp[-4].exp, yyvsp[-2].exp, yyvsp[0].exp);
 	  ;
    break;}
 case 3:
-#line 190 "plural.y"
+#line 191 "plural.y"
 {
 	    yyval.exp = new_exp_2 (lor, yyvsp[-2].exp, yyvsp[0].exp);
 	  ;
    break;}
 case 4:
-#line 194 "plural.y"
+#line 195 "plural.y"
 {
 	    yyval.exp = new_exp_2 (land, yyvsp[-2].exp, yyvsp[0].exp);
 	  ;
    break;}
 case 5:
-#line 198 "plural.y"
+#line 199 "plural.y"
 {
 	    yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
 	  ;
    break;}
 case 6:
-#line 202 "plural.y"
+#line 203 "plural.y"
 {
 	    yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
 	  ;
    break;}
 case 7:
-#line 206 "plural.y"
+#line 207 "plural.y"
 {
 	    yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
 	  ;
    break;}
 case 8:
-#line 210 "plural.y"
+#line 211 "plural.y"
 {
 	    yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
 	  ;
    break;}
 case 9:
-#line 214 "plural.y"
+#line 215 "plural.y"
 {
 	    yyval.exp = new_exp_1 (lnot, yyvsp[0].exp);
 	  ;
    break;}
 case 10:
-#line 218 "plural.y"
+#line 219 "plural.y"
 {
 	    yyval.exp = new_exp_0 (var);
 	  ;
    break;}
 case 11:
-#line 222 "plural.y"
+#line 223 "plural.y"
 {
 	    if ((yyval.exp = new_exp_0 (num)) != NULL)
 	      yyval.exp->val.num = yyvsp[0].num;
 	  ;
    break;}
 case 12:
-#line 227 "plural.y"
+#line 228 "plural.y"
 {
 	    yyval.exp = yyvsp[-1].exp;
 	  ;
@@ -1141,7 +1142,7 @@ yyerrhandle:
    }
  return 1;
 }
-#line 232 "plural.y"
+#line 233 "plural.y"


 void
@@ -3,19 +3,20 @@
   Copyright (C) 2000, 2001 Free Software Foundation, Inc.
   Written by Ulrich Drepper <[email protected]>, 2000.

-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
   any later version.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.

-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */

 /* The bison generated parser uses alloca.  AIX 3 forces us to put this
   declaration at the beginning of the file.  The declaration in bison's
@@ -1,19 +1,20 @@
 /* Implementation of the textdomain(3) function.
   Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc.

-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
   any later version.

   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.

-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */

 #ifdef HAVE_CONFIG_H
 # include <config.h>
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.5 from Makefile.am.
+# Makefile.in generated automatically by automake 1.5a from Makefile.am.

 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -43,6 +43,7 @@ AUTOCONF = @AUTOCONF@
 AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@

+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
@@ -57,6 +58,10 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
 AWK = @AWK@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
@@ -66,7 +71,6 @@ CC = @CC@
 CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
-EXEEXT = @EXEEXT@
 GENCAT = @GENCAT@
 GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@
@@ -82,7 +86,6 @@ LIBOBJS = @LIBOBJS@
 M4 = @M4@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 POFILES = @POFILES@
 POSUB = @POSUB@
@@ -286,7 +289,7 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  || etags $(ETAGS_ARGS) $$tags  $$unique $(LISP)

 GTAGS:
-	here=`CDPATH=: && cd $(top_builddir) && pwd` \
+	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && cd $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) $$here

@@ -1,4 +1,4 @@
-/* Copyright (C) 1989, 1997, 1998 Aladdin Enterprises.  All rights reserved. */
+/* Copyright (C) 1989, 2000 Aladdin Enterprises.  All rights reserved. */

 /*$Id$*/
 /* Convert ANSI C function definitions to K&R ("traditional C") syntax */
@@ -37,27 +37,62 @@ program under the GPL.
 * There are no error messages.
 *
 * ansi2knr recognizes function definitions by seeing a non-keyword
- * identifier at the left margin, followed by a left parenthesis,
- * with a right parenthesis as the last character on the line,
- * and with a left brace as the first token on the following line
- * (ignoring possible intervening comments), except that a line
+ * identifier at the left margin, followed by a left parenthesis, with a
+ * right parenthesis as the last character on the line, and with a left
+ * brace as the first token on the following line (ignoring possible
+ * intervening comments and/or preprocessor directives), except that a line
 * consisting of only
 *	identifier1(identifier2)
 * will not be considered a function definition unless identifier2 is
- * the word "void".  ansi2knr will recognize a multi-line header provided
- * that no intervening line ends with a left or right brace or a semicolon.
- * These algorithms ignore whitespace and comments, except that
- * the function name must be the first thing on the line.
- * The following constructs will confuse it:
+ * the word "void", and a line consisting of
+ *	identifier1(identifier2, <<arbitrary>>)
+ * will not be considered a function definition.
+ * ansi2knr will recognize a multi-line header provided that no intervening
+ * line ends with a left or right brace or a semicolon.  These algorithms
+ * ignore whitespace, comments, and preprocessor directives, except that
+ * the function name must be the first thing on the line.  The following
+ * constructs will confuse it:
 *	- Any other construct that starts at the left margin and
 *	    follows the above syntax (such as a macro or function call).
- *	- Some macros that tinker with the syntax of the function header.
+ *	- Some macros that tinker with the syntax of function headers.
 */

 /*
 * The original and principal author of ansi2knr is L. Peter Deutsch
 * <[email protected]>.  Other authors are noted in the change history
 * that follows (in reverse chronological order):
+
+	lpd 2000-04-12 backs out Eggert's changes because of bugs:
+	- concatlits didn't declare the type of its bufend argument;
+	- concatlits didn't't recognize when it was inside a comment;
+	- scanstring could scan backward past the beginning of the string; when
+	- the check for \ + newline in scanstring was unnecessary.
+
+	2000-03-05  Paul Eggert  <[email protected]>
+
+	Add support for concatenated string literals.
+	* ansi2knr.c (concatlits): New decl.
+	(main): Invoke concatlits to concatenate string literals.
+	(scanstring): Handle backslash-newline correctly.  Work with
+	character constants.  Fix bug when scanning backwards through
+	backslash-quote.  Check for unterminated strings.
+	(convert1): Parse character constants, too.
+	(appendline, concatlits): New functions.
+	* ansi2knr.1: Document this.
+
+	lpd 1999-08-17 added code to allow preprocessor directives
+		wherever comments are allowed
+	lpd 1999-04-12 added minor fixes from Pavel Roskin
+		<[email protected]> for clean compilation with
+		gcc -W -Wall
+	lpd 1999-03-22 added hack to recognize lines consisting of
+		identifier1(identifier2, xxx) as *not* being procedures
+	lpd 1999-02-03 made indentation of preprocessor commands consistent
+	lpd 1999-01-28 fixed two bugs: a '/' in an argument list caused an
+		endless loop; quoted strings within an argument list
+		confused the parser
+	lpd 1999-01-24 added a check for write errors on the output,
+		suggested by Jim Meyering <[email protected]>
 	lpd 1998-11-09 added further hack to recognize identifier(void)
 		as being a procedure
 	lpd 1998-10-23 added hack to recognize lines consisting of
@@ -153,19 +188,24 @@ program under the GPL.

 #endif

+/* Define NULL (for *very* old compilers). */
+#ifndef NULL
+# define NULL (0)
+#endif
+
 /*
 * The ctype macros don't always handle 8-bit characters correctly.
 * Compensate for this here.
 */
 #ifdef isascii
-#  undef HAVE_ISASCII		/* just in case */
-#  define HAVE_ISASCII 1
+# undef HAVE_ISASCII		/* just in case */
+# define HAVE_ISASCII 1
 #else
 #endif
 #if STDC_HEADERS || !HAVE_ISASCII
-#  define is_ascii(c) 1
+# define is_ascii(c) 1
 #else
-#  define is_ascii(c) isascii(c)
+# define is_ascii(c) isascii(c)
 #endif

 #define is_space(c) (is_ascii(c) && isspace(c))
@@ -177,7 +217,10 @@ program under the GPL.
 #define isidfirstchar(ch) (is_alpha(ch) || (ch) == '_')

 /* Forward references */
+char *ppdirforward();
+char *ppdirbackward();
 char *skipspace();
+char *scanstring();
 int writeblanks();
 int test1();
 int convert1();
@@ -190,6 +233,8 @@ main(argc, argv)
 {	FILE *in = stdin;
 	FILE *out = stdout;
 	char *filename = 0;
+	char *program_name = argv[0];
+	char *output_name = 0;
 #define bufsize 5000			/* arbitrary size */
 	char *buf;
 	char *line;
@@ -205,6 +250,7 @@ main(argc, argv)
 	 * check for this switch for backward compatibility.
 	 */
 	int convert_varargs = 1;
+	int output_error;

 	while ( argc > 1 && argv[1][0] == '-' ) {
 	  if ( !strcmp(argv[1], "--varargs") ) {
@@ -219,7 +265,8 @@ main(argc, argv)
 	    argv += 2;
 	    continue;
 	  }
-	  fprintf(stderr, "Unrecognized switch: %s\n", argv[1]);
+	  fprintf(stderr, "%s: Unrecognized switch: %s\n", program_name,
+		  argv[1]);
 	  fprintf(stderr, usage);
 	  exit(1);
 	}
@@ -229,16 +276,19 @@ main(argc, argv)
 		fprintf(stderr, usage);
 		exit(0);
 	case 3:
-		out = fopen(argv[2], "w");
+		output_name = argv[2];
+		out = fopen(output_name, "w");
 		if ( out == NULL ) {
-		  fprintf(stderr, "Cannot open output file %s\n", argv[2]);
+		  fprintf(stderr, "%s: Cannot open output file %s\n",
+			  program_name, output_name);
 		  exit(1);
 		}
 		/* falls through */
 	case 2:
 		in = fopen(argv[1], "r");
 		if ( in == NULL ) {
-		  fprintf(stderr, "Cannot open input file %s\n", argv[1]);
+		  fprintf(stderr, "%s: Cannot open input file %s\n",
+			  program_name, argv[1]);
 		  exit(1);
 		}
 		if ( filename == 0 )
@@ -250,6 +300,11 @@ main(argc, argv)
 	if ( filename )
 	  fprintf(out, "#line 1 \"%s\"\n", filename);
 	buf = malloc(bufsize);
+	if ( buf == NULL )
+	   {
+		fprintf(stderr, "Unable to allocate read buffer!\n");
+		exit(1);
+	   }
 	line = buf;
 	while ( fgets(line, (unsigned)(buf + bufsize - line), in) != NULL )
 	   {
@@ -266,7 +321,7 @@ f:			if ( line >= buf + (bufsize - 1) ) /* overflow check */
 			  goto wl;
 			if ( fgets(line, (unsigned)(buf + bufsize - line), in) == NULL )
 			  goto wl;
-			switch ( *skipspace(more, 1) )
+			switch ( *skipspace(ppdirforward(more), 1) )
 			  {
 			  case '{':
 			    /* Definitely a function header. */
@@ -300,32 +355,91 @@ wl:			fputs(buf, out);
 	if ( line != buf )
 	  fputs(buf, out);
 	free(buf);
-	if ( out != stdout )
-	  fclose(out);
+	if ( output_name ) {
+	  output_error = ferror(out);
+	  output_error |= fclose(out);
+	} else {		/* out == stdout */
+	  fflush(out);
+	  output_error = ferror(out);
+	}
+	if ( output_error ) {
+	  fprintf(stderr, "%s: error writing to %s\n", program_name,
+		  (output_name ? output_name : "stdout"));
+	  exit(1);
+	}
 	if ( in != stdin )
 	  fclose(in);
 	return 0;
 }

-/* Skip over space and comments, in either direction. */
+/*
+ * Skip forward or backward over one or more preprocessor directives.
+ */
+char *
+ppdirforward(p)
+    char *p;
+{
+    for (; *p == '#'; ++p) {
+	for (; *p != '\r' && *p != '\n'; ++p)
+	    if (*p == 0)
+		return p;
+	if (*p == '\r' && p[1] == '\n')
+	    ++p;
+    }
+    return p;
+}
+char *
+ppdirbackward(p, limit)
+    char *p;
+    char *limit;
+{
+    char *np = p;
+
+    for (;; p = --np) {
+	if (*np == '\n' && np[-1] == '\r')
+	    --np;
+	for (; np > limit && np[-1] != '\r' && np[-1] != '\n'; --np)
+	    if (np[-1] == 0)
+		return np;
+	if (*np != '#')
+	    return p;
+    }
+}
+
+/*
+ * Skip over whitespace, comments, and preprocessor directives,
+ * in either direction.
+ */
 char *
 skipspace(p, dir)
-    register char *p;
-    register int dir;			/* 1 for forward, -1 for backward */
-{	for ( ; ; )
-	   {	while ( is_space(*p) )
-		  p += dir;
-		if ( !(*p == '/' && p[dir] == '*') )
-		  break;
-		p += dir;  p += dir;
-		while ( !(*p == '*' && p[dir] == '/') )
-		   {	if ( *p == 0 )
-			  return p;	/* multi-line comment?? */
-			p += dir;
-		   }
-		p += dir;  p += dir;
-	   }
-	return p;
+    char *p;
+    int dir;			/* 1 for forward, -1 for backward */
+{
+    for ( ; ; ) {
+	while ( is_space(*p) )
+	    p += dir;
+	if ( !(*p == '/' && p[dir] == '*') )
+	    break;
+	p += dir;  p += dir;
+	while ( !(*p == '*' && p[dir] == '/') ) {
+	    if ( *p == 0 )
+		return p;	/* multi-line comment?? */
+	    p += dir;
+	}
+	p += dir;  p += dir;
+    }
+    return p;
+}
+
+/* Scan over a quoted string, in either direction. */
+char *
+scanstring(p, dir)
+    char *p;
+    int dir;
+{
+    for (p += dir; ; p += dir)
+	if (*p == '"' && p[-dir] != '\\')
+	    return p + dir;
 }

 /*
@@ -359,14 +473,14 @@ writeblanks(start, end)
 int
 test1(buf)
    char *buf;
-{	register char *p = buf;
+{	char *p = buf;
 	char *bend;
 	char *endfn;
 	int contin;

 	if ( !isidfirstchar(*p) )
 	  return 0;		/* no name at left margin */
-	bend = skipspace(buf + strlen(buf) - 1, -1);
+	bend = skipspace(ppdirbackward(buf + strlen(buf) - 1, buf), -1);
 	switch ( *bend )
 	   {
 	   case ';': contin = 0 /*2*/; break;
@@ -396,7 +510,7 @@ test1(buf)
 		   };
 		char **key = words;
 		char *kp;
-		int len = endfn - buf;
+		unsigned len = endfn - buf;

 		while ( (kp = *key) != 0 )
 		   {	if ( strlen(kp) == len && !strncmp(kp, buf, len) )
@@ -409,14 +523,16 @@ test1(buf)
 	       int len;
 	       /*
 		* Check for identifier1(identifier2) and not
-		* identifier1(void).
+		* identifier1(void), or identifier1(identifier2, xxxx).
 		*/

 	       while ( isidchar(*p) )
 		   p++;
 	       len = p - id;
 	       p = skipspace(p, 1);
-	       if ( *p == ')' && (len != 4 || strncmp(id, "void", 4)) )
+	       if (*p == ',' ||
+		   (*p == ')' && (len != 4 || strncmp(id, "void", 4)))
+		   )
 		   return 0;	/* not a function */
 	   }
 	/*
@@ -443,7 +559,7 @@ convert1(buf, out, header, convert_varargs)
    int header;			/* Boolean */
    int convert_varargs;	/* Boolean */
 {	char *endfn;
-	register char *p;
+	char *p;
 	/*
 	 * The breaks table contains pointers to the beginning and end
 	 * of each argument.
@@ -461,7 +577,7 @@ convert1(buf, out, header, convert_varargs)
 	  ;
 top:	p = endfn;
 	breaks = (char **)malloc(sizeof(char *) * num_breaks * 2);
-	if ( breaks == 0 )
+	if ( breaks == NULL )
 	   {	/* Couldn't allocate break table, give up */
 		fprintf(stderr, "Unable to allocate break table!\n");
 		fputs(buf, out);
@@ -473,7 +589,7 @@ top:	p = endfn;
 	do
 	   {	int level = 0;
 		char *lp = NULL;
-		char *rp;
+		char *rp = NULL;
 		char *end = NULL;

 		if ( bp >= btop )
@@ -500,14 +616,18 @@ top:	p = endfn;
 				else rp = p;
 				break;
 			   case '/':
-				p = skipspace(p, 1) - 1;
+				if (p[1] == '*')
+				    p = skipspace(p, 1) - 1;
 				break;
+			   case '"':
+			       p = scanstring(p, 1) - 1;
+			       break;
 			   default:
 				;
 			   }
 		   }
 		/* Erase any embedded prototype parameters. */
-		if ( lp )
+		if ( lp && rp )
 		  writeblanks(lp + 1, rp);
 		p--;			/* back up over terminator */
 		/* Find the name being declared. */
@@ -523,9 +643,19 @@ top:	p = endfn;
 				while ( level )
 				 switch ( *--p )
 				   {
-				   case ']': case ')': level++; break;
-				   case '[': case '(': level--; break;
-				   case '/': p = skipspace(p, -1) + 1; break;
+				   case ']': case ')':
+				       level++;
+				       break;
+				   case '[': case '(':
+				       level--;
+				       break;
+				   case '/':
+				       if (p > buf && p[-1] == '*')
+					   p = skipspace(p, -1) + 1;
+				       break;
+				   case '"':
+				       p = scanstring(p, -1) + 1;
+				       break;
 				   default: ;
 				   }
 			   }
@@ -63,6 +63,11 @@
 #endif

 #if HAVE_WCHAR_H
+
+/* BSD/OS 4.1 wchar.h requires FILE and struct tm to be declared.  */
+# include <stdio.h>
+# include <time.h>
+
 # include <wchar.h>
 #endif

@@ -73,8 +78,12 @@
 # undef MB_CUR_MAX
 # define MB_CUR_MAX 1
 # define mbrtowc(pwc, s, n, ps) ((*(pwc) = *(s)) != 0)
-# define mbsinit(ps) 1
 # define iswprint(wc) ISPRINT ((unsigned char) (wc))
+# undef HAVE_MBSINIT
+#endif
+
+#if !defined mbsinit && !HAVE_MBSINIT
+# define mbsinit(ps) 1
 #endif

 #ifndef iswprint
@@ -2,6 +2,7 @@
 EXTRA_DIST = 					\
 c-bs-a.m4					\
 codeset.m4					\
+dmalloc.m4					\
 error.m4					\
 gettext.m4					\
 glibc21.m4					\
@@ -10,6 +11,7 @@ isc-posix.m4					\
 lcmessage.m4					\
 m4.m4						\
 malloc.m4					\
+mbrtowc.m4					\
 mbstate_t.m4					\
 prereq.m4					\
 progtest.m4					\
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.5 from Makefile.am.
+# Makefile.in generated automatically by automake 1.5a from Makefile.am.

 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -43,6 +43,7 @@ AUTOCONF = @AUTOCONF@
 AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@

+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
@@ -57,6 +58,10 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
 AWK = @AWK@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
@@ -66,7 +71,6 @@ CC = @CC@
 CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
-EXEEXT = @EXEEXT@
 GENCAT = @GENCAT@
 GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@
@@ -82,7 +86,6 @@ LIBOBJS = @LIBOBJS@
 M4 = @M4@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 POFILES = @POFILES@
 POSUB = @POSUB@
@@ -99,6 +102,7 @@ install_sh = @install_sh@
 EXTRA_DIST = \
 c-bs-a.m4					\
 codeset.m4					\
+dmalloc.m4					\
 error.m4					\
 gettext.m4					\
 glibc21.m4					\
@@ -107,6 +111,7 @@ isc-posix.m4					\
 lcmessage.m4					\
 m4.m4						\
 malloc.m4					\
+mbrtowc.m4					\
 mbstate_t.m4					\
 prereq.m4					\
 progtest.m4					\
@@ -0,0 +1,22 @@
+## ----------------------------------- ##
+## Check if --with-dmalloc was given.  ##
+## From Franc,ois Pinard               ##
+## ----------------------------------- ##
+
+# serial 1
+
+AC_DEFUN([AM_WITH_DMALLOC],
+[AC_MSG_CHECKING([if malloc debugging is wanted])
+AC_ARG_WITH(dmalloc,
+[  --with-dmalloc          use dmalloc, as in
+                          http://www.dmalloc.com/dmalloc.tar.gz],
+[if test "$withval" = yes; then
+  AC_MSG_RESULT(yes)
+  AC_DEFINE(WITH_DMALLOC,1,
+            [Define if using the dmalloc debugging malloc package])
+  LIBS="$LIBS -ldmalloc"
+  LDFLAGS="$LDFLAGS -g"
+else
+  AC_MSG_RESULT(no)
+fi], [AC_MSG_RESULT(no)])
+])
@@ -0,0 +1,18 @@
+#serial 4
+
+dnl From Paul Eggert
+
+AC_DEFUN([jm_FUNC_MBRTOWC],
+[
+  AC_CACHE_CHECK([whether mbrtowc and mbstate_t are properly declared],
+    jm_cv_func_mbrtowc,
+    [AC_TRY_LINK(
+       [#include <wchar.h>],
+       [mbstate_t state; return ! (sizeof state && mbrtowc);],
+       jm_cv_func_mbrtowc=yes,
+       jm_cv_func_mbrtowc=no)])
+  if test $jm_cv_func_mbrtowc = yes; then
+    AC_DEFINE(HAVE_MBRTOWC, 1,
+      [Define to 1 if mbrtowc and mbstate_t are properly declared.])
+  fi
+])
@@ -1,12 +1,13 @@
-#serial 1
+#serial 2

 dnl These are the prerequisite macros for files in the lib/
 dnl directories of Bison.

 AC_DEFUN([jm_PREREQ_QUOTEARG],
 [
-  AC_CHECK_FUNCS(isascii iswprint mbrtowc)
-  AC_CHECK_HEADERS(limits.h stdlib.h string.h wchar.h wctype.h)
+  AC_CHECK_FUNCS(isascii iswprint mbsinit)
+  jm_FUNC_MBRTOWC
+  AC_CHECK_HEADERS(limits.h stddef.h stdlib.h string.h wchar.h wctype.h)
  AC_HEADER_STDC
  AC_C_BACKSLASH_A
  AC_MBSTATE_T
@@ -1,3 +1,21 @@
+2001-10-10  gettextize  <[email protected]>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.40.
+
+2001-10-10  gettextize  <[email protected]>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.40.
+
+2001-10-09  gettextize  <[email protected]>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.40.
+	* cat-id-tbl.c: Remove file.
+
+2001-09-27  gettextize  <[email protected]>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.40.
+	* cat-id-tbl.c: Remove file.
+
 2001-08-03  gettextize  <[email protected]>

 	* Makefile.in.in: Upgrade to gettext-0.10.39.
@@ -1,188 +0,0 @@
-/* Automatically generated by po2tbl.sed from bison.pot.  */
-
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include "libgettext.h"
-
-const struct _msg_ent _msg_tbl[] = {
-  {"", 1},
-  {"too many states (max %d)", 2},
-  {"Conflict in state %d between rule %d and token %s resolved as %s.\n", 3},
-  {"reduce", 4},
-  {"shift", 5},
-  {"an error", 6},
-  {" 1 shift/reduce conflict", 7},
-  {" %d shift/reduce conflicts", 8},
-  {" and", 9},
-  {" 1 reduce/reduce conflict", 10},
-  {" %d reduce/reduce conflicts", 11},
-  {"State %d contains", 12},
-  {"conflicts: ", 13},
-  {" %d shift/reduce", 14},
-  {" %d reduce/reduce", 15},
-  {"%s contains", 16},
-  {"    %-4s\t[reduce using rule %d (%s)]\n", 17},
-  {"\
-    $default\treduce using rule %d (%s)\n\
-\n", 18},
-  {"    %-4s\treduce using rule %d (%s)\n", 19},
-  {"    $default\treduce using rule %d (%s)\n", 20},
-  {"DERIVES", 21},
-  {"%s derives", 22},
-  {"GNU bison generates parsers for LALR(1) grammars.\n", 23},
-  {"Usage: %s [OPTION]... FILE\n", 24},
-  {"\
-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", 25},
-  {"\
-Operation modes:\n\
-  -h, --help      display this help and exit\n\
-  -V, --version   output version information and exit\n\
-  -y, --yacc      emulate POSIX yacc\n", 26},
-  {"\
-Parser:\n\
-  -S, --skeleton=FILE        specify the skeleton to use\n\
-  -t, --debug                instrument the parser for debugging\n\
-      --locations            enable locations computation\n\
-  -p, --name-prefix=PREFIX   prepend PREFIX to the external symbols\n\
-  -l, --no-lines             don't generate `#line' directives\n\
-  -n, --no-parser            generate the tables only\n\
-  -r, --raw                  number the tokens from 3\n\
-  -k, --token-table          include a table of token names\n", 27},
-  {"\
-Output:\n\
-  -d, --defines              also produce a header file\n\
-  -v, --verbose              also produce an explanation of the automaton\n\
-  -b, --file-prefix=PREFIX   specify a PREFIX for output files\n\
-  -o, --output-file=FILE     leave output to FILE\n", 28},
-  {"Report bugs to <[email protected]>.\n", 29},
-  {"bison (GNU Bison) %s", 30},
-  {"\
-Copyright 1984, 1986, 1989, 1992, 2000, 2001 Free Software Foundation, Inc.\n", 31},
-  {"\
-This is free software; see the source for copying conditions.  There is NO\n\
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n", 32},
-  {"Try `%s --help' for more information.\n", 33},
-  {"%s: no grammar file given\n", 34},
-  {"%s: extra arguments ignored after `%s'\n", 35},
-  {"too many gotos (max %d)", 36},
-  {"unexpected `/' found and ignored", 37},
-  {"unterminated comment", 38},
-  {"unexpected end of file", 39},
-  {"unescaped newline in constant", 40},
-  {"octal value outside range 0...255: `\\%o'", 41},
-  {"hexadecimal value above 255: `\\x%x'", 42},
-  {"unknown escape sequence: `\\' followed by `%s'", 43},
-  {"unterminated type name at end of file", 44},
-  {"unterminated type name", 45},
-  {"use \"...\" for multi-character literal tokens", 46},
-  {"%s: internal error: %s\n", 47},
-  {"Entering set_nullable", 48},
-  {"maximum table size (%d) exceeded", 49},
-  {" type %d is %s\n", 50},
-  {"   (rule %d)", 51},
-  {"    $default\taccept\n", 52},
-  {"    NO ACTIONS\n", 53},
-  {"    $   \tgo to state %d\n", 54},
-  {"    %-4s\tshift, and go to state %d\n", 55},
-  {"    %-4s\terror (nonassociative)\n", 56},
-  {"    %-4s\tgo to state %d\n", 57},
-  {"state %d", 58},
-  {"Grammar", 59},
-  {"rule %-4d %s ->", 60},
-  {"\t\t/* empty */", 61},
-  {"Terminals, with rules where they appear", 62},
-  {"Nonterminals, with rules where they appear", 63},
-  {" on left:", 64},
-  {" on right:", 65},
-  {"   Skipping to next \\n", 66},
-  {"   Skipping to next %c", 67},
-  {"invalid $ value", 68},
-  {"unterminated string at end of file", 69},
-  {"unterminated string", 70},
-  {"%s is invalid", 71},
-  {"$$ of `%s' has no declared type", 72},
-  {"$%d of `%s' has no declared type", 73},
-  {"unterminated `%{' definition", 74},
-  {"Premature EOF after %s", 75},
-  {"symbol `%s' used more than once as a literal string", 76},
-  {"symbol `%s' given more than one literal string", 77},
-  {"symbol %s redefined", 78},
-  {"type redeclaration for %s", 79},
-  {"`%s' is invalid in %s", 80},
-  {"multiple %s declarations", 81},
-  {"invalid %s declaration", 82},
-  {"%type declaration has no <typename>", 83},
-  {"invalid %%type declaration due to item: %s", 84},
-  {"redefining precedence of %s", 85},
-  {"invalid text (%s) - number should be after identifier", 86},
-  {"unexpected item: %s", 87},
-  {"unmatched %s", 88},
-  {"argument of %%expect is not an integer", 89},
-  {"unrecognized item %s, expected an identifier", 90},
-  {"expected string constant instead of %s", 91},
-  {"unrecognized: %s", 92},
-  {"no input grammar", 93},
-  {"unknown character: %s", 94},
-  {"unterminated %guard clause", 95},
-  {"ill-formed rule: initial symbol not followed by colon", 96},
-  {"grammar starts with vertical bar", 97},
-  {"rule given for %s, which is a token", 98},
-  {"two @prec's in a row", 99},
-  {"%%guard present but %%semantic_parser not specified", 100},
-  {"two actions at end of one rule", 101},
-  {"type clash (`%s' `%s') on default action", 102},
-  {"empty rule for typed nonterminal, and no action", 103},
-  {"invalid input: %s", 104},
-  {"too many symbols (tokens plus nonterminals); maximum %d", 105},
-  {"no rules in the input grammar", 106},
-  {"symbol %s is used, but is not defined as a token and has no rules", 107},
-  {"conflicting precedences for %s and %s", 108},
-  {"conflicting assoc values for %s and %s", 109},
-  {"tokens %s and %s both assigned number %d", 110},
-  {"the start symbol %s is undefined", 111},
-  {"the start symbol %s is a token", 112},
-  {"Useless nonterminals:", 113},
-  {"Terminals which are not used:", 114},
-  {"Useless rules:", 115},
-  {"\
-Variables\n\
---------\n\
-\n", 116},
-  {"Value  Sprec    Sassoc    Tag\n", 117},
-  {"\
-Rules\n\
-----\n\
-\n", 118},
-  {"\
-Rules interpreted\n\
-----------------\n\
-\n", 119},
-  {"%d rules never reduced\n", 120},
-  {"%s contains ", 121},
-  {"%d useless nonterminal%s", 122},
-  {" and ", 123},
-  {"%d useless rule%s", 124},
-  {"Start symbol %s does not derive any sentence", 125},
-  {"\
-reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n", 126},
-  {"Unknown system error", 127},
-  {"%s: option `%s' is ambiguous\n", 128},
-  {"%s: option `--%s' doesn't allow an argument\n", 129},
-  {"%s: option `%c%s' doesn't allow an argument\n", 130},
-  {"%s: option `%s' requires an argument\n", 131},
-  {"%s: unrecognized option `--%s'\n", 132},
-  {"%s: unrecognized option `%c%s'\n", 133},
-  {"%s: illegal option -- %c\n", 134},
-  {"%s: invalid option -- %c\n", 135},
-  {"%s: option requires an argument -- %c\n", 136},
-  {"%s: option `-W %s' is ambiguous\n", 137},
-  {"%s: option `-W %s' doesn't allow an argument\n", 138},
-  {"memory exhausted", 139},
-  {"`", 140},
-  {"'", 141},
-};
-
-int _msg_tbl_length = 141;
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.25\n"
-"POT-Creation-Date: 2001-09-22 18:19+0200\n"
+"POT-Creation-Date: 2001-10-02 18:30+0200\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"
@@ -31,77 +31,77 @@ msgstr ""
 msgid "fatal error: "
 msgstr "fataler Fehler: %s\n"

-#: src/conflicts.c:49
+#: src/conflicts.c:48
 #, c-format
 msgid "Conflict in state %d between rule %d and token %s resolved as %s.\n"
 msgstr "Konflikt in Zustand %d zwischen Regel %d and Token %s wurde %s.\n"

-#: src/conflicts.c:115 src/conflicts.c:138
+#: src/conflicts.c:114 src/conflicts.c:137
 msgid "reduce"
 msgstr "durch Reduzierung gelöst"

-#: src/conflicts.c:121 src/conflicts.c:134
+#: src/conflicts.c:120 src/conflicts.c:133
 msgid "shift"
 msgstr "durch Schieben gelöst"

-#: src/conflicts.c:142
+#: src/conflicts.c:141
 msgid "an error"
 msgstr "als Fehler betrachtet"

-#: src/conflicts.c:422
+#: src/conflicts.c:421
 msgid " 1 shift/reduce conflict"
 msgstr " 1 Schiebe/Reduziere Konflikt"

-#: src/conflicts.c:427
+#: src/conflicts.c:426
 #, c-format
 msgid " %d shift/reduce conflicts"
 msgstr " %d Schiebe/Reduziere Konflikte"

-#: src/conflicts.c:433
+#: src/conflicts.c:432
 msgid " and"
 msgstr " und"

-#: src/conflicts.c:439
+#: src/conflicts.c:438
 msgid " 1 reduce/reduce conflict"
 msgstr " 1 Reduziere/Reduziere Konflikt"

-#: src/conflicts.c:444
+#: src/conflicts.c:443
 #, c-format
 msgid " %d reduce/reduce conflicts"
 msgstr " %d Reduziere/Reduziere Konflikte"

-#: src/conflicts.c:481
+#: src/conflicts.c:480
 #, c-format
 msgid "State %d contains"
 msgstr "Zustand %d enthält"

 #. If invoked with `--yacc', use the output format specified by
 #. POSIX.
-#: src/conflicts.c:493
+#: src/conflicts.c:491
 msgid "conflicts: "
 msgstr "Konflikte: "

-#: src/conflicts.c:495
+#: src/conflicts.c:493
 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d Schiebe/Reduziere"

-#: src/conflicts.c:499
+#: src/conflicts.c:497
 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d Reduziere/Reduziere"

-#: src/conflicts.c:504
+#: src/conflicts.c:502
 #, c-format
 msgid "%s contains"
 msgstr "%s enthält"

-#: src/conflicts.c:590 src/conflicts.c:711
+#: src/conflicts.c:588 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:602 src/print.c:173
+#: src/conflicts.c:600 src/print.c:171
 #, c-format
 msgid ""
 "    $default\treduce using rule %d (%s)\n"
@@ -110,31 +110,31 @@ msgstr ""
 "    $default\treduziere mit Regel %d (%s)\n"
 "\n"

-#: src/conflicts.c:691 src/conflicts.c:705
+#: 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:732
+#: src/conflicts.c:730
 #, c-format
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr "    $default\treduziere mit Regel %d (%s)\n"

-#: src/derives.c:44
+#: src/derives.c:43
 msgid "DERIVES"
 msgstr ""

-#: src/derives.c:49
+#: src/derives.c:48
 #, c-format
 msgid "%s derives"
 msgstr "%s leitet ab"

-#: src/files.c:132
+#: src/files.c:133
 #, c-format
 msgid "cannot open file `%s'"
 msgstr ""

-#: src/files.c:151
+#: src/files.c:152
 msgid "cannot close file"
 msgstr ""

@@ -208,7 +208,7 @@ msgid ""
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""

-#: src/getargs.c:214 src/lex.c:635
+#: src/getargs.c:214 src/lex.c:650
 #, c-format
 msgid "`%s' is no longer supported"
 msgstr ""
@@ -228,109 +228,109 @@ msgstr "%s: keine Grammatik-Datei angegeben\n"
 msgid "%s: extra arguments ignored after `%s'\n"
 msgstr "%s: zusätzliche Argumente nach »%s« werden ignoriert\n"

-#: src/lalr.c:312
+#: src/lalr.c:311
 #, c-format
 msgid "too many gotos (max %d)"
 msgstr ""

-#: src/lex.c:72
+#: src/lex.c:78
 msgid "unexpected `/' found and ignored"
 msgstr "»/« wird hier nicht erwartet und wird deshalb ignoriert"

-#: src/lex.c:101 src/reader.c:270
+#: src/lex.c:107 src/reader.c:269
 msgid "unterminated comment"
 msgstr "unbeendeter Kommentar"

-#: src/lex.c:133
+#: src/lex.c:139
 #, fuzzy
 msgid "unexpected end of file"
 msgstr "Datei endet unerwartet"

 # Oder soll man den Begriff "Escapezeichen" verwenden?
-#: src/lex.c:162
+#: src/lex.c:168
 msgid "unescaped newline in constant"
 msgstr "nicht maskiertes Zeilenendezeichen in Konstante"

-#: src/lex.c:204
+#: src/lex.c:210
 #, c-format
 msgid "octal value outside range 0...255: `\\%o'"
 msgstr "oktaler Zahlenwert außerhalb des Bereichs 0...255: »\\%o«"

-#: src/lex.c:229
+#: src/lex.c:235
 #, c-format
 msgid "hexadecimal value above 255: `\\x%x'"
 msgstr "hexadezimaler Zahlenwert größer als 255: »\\x%x«"

-#: src/lex.c:241
+#: src/lex.c:247
 #, c-format
 msgid "unknown escape sequence: `\\' followed by `%s'"
 msgstr "unbekanntes Fluchtzeichen: »\\« gefolgt von »%s«"

-#: src/lex.c:337
+#: src/lex.c:343
 msgid "unterminated type name at end of file"
 msgstr "unerwarteter Typname am Ende der Datei"

-#: src/lex.c:340
+#: src/lex.c:346
 msgid "unterminated type name"
 msgstr "unerwarteter Typname"

-#: src/lex.c:432
+#: src/lex.c:437
 msgid "use \"...\" for multi-character literal tokens"
 msgstr "für Literal mit mehreren Zeichen bitte \"...\" verwenden"

-#: src/main.c:108
+#: src/main.c:125
 #, fuzzy, c-format
 msgid "%s: internal error: %s\n"
 msgstr "interner Fehler, %s\n"

-#: src/nullable.c:52
+#: src/nullable.c:51
 msgid "Entering set_nullable"
 msgstr "Führe »set_nullable« aus"

-#: src/output.c:993
+#: src/output.c:986
 #, fuzzy, c-format
 msgid "maximum table size (%d) exceeded"
 msgstr "maximale Tabellengröße (%s) überschritten"

-#: src/print.c:38
+#: src/print.c:37
 #, c-format
 msgid " type %d is %s\n"
 msgstr " Typ %d ist %s\n"

-#: src/print.c:86
+#: src/print.c:85
 #, c-format
 msgid "   (rule %d)"
 msgstr "   (Regel %d)"

-#: src/print.c:112
+#: src/print.c:111
 msgid "    $default\taccept\n"
 msgstr "    $default\takzeptiere\n"

-#: src/print.c:114
+#: src/print.c:113
 msgid "    NO ACTIONS\n"
 msgstr "    KEINE AKTIONEN\n"

-#: src/print.c:133
+#: src/print.c:132
 #, c-format
 msgid "    $   \tgo to state %d\n"
 msgstr "    $   \tgehe zu Zustand %d über\n"

-#: src/print.c:136
+#: src/print.c:135
 #, c-format
 msgid "    %-4s\tshift, and go to state %d\n"
 msgstr "    %-4s\tSchiebe und gehe zu Zustand %d über\n"

-#: src/print.c:160
+#: src/print.c:159
 #, c-format
 msgid "    %-4s\terror (nonassociative)\n"
 msgstr "    %-4s\tFehler (nicht assoziativ)\n"

-#: src/print.c:190
+#: src/print.c:187
 #, c-format
 msgid "    %-4s\tgo to state %d\n"
 msgstr "    %-4s\tgehe zu Zustand %d über\n"

-#: src/print.c:202
+#: src/print.c:199
 #, fuzzy, c-format
 msgid "state %d"
 msgstr ""
@@ -339,23 +339,25 @@ msgstr ""
 "Zustand %d\n"
 "\n"

-#: src/print.c:233
+#. rule # : LHS -> RHS
+#: src/print.c:229
 #, fuzzy
 msgid "Grammar"
 msgstr ""
 "\n"
 "Grammatik\n"

-#: src/print.c:240
+#: src/print.c:234
 #, c-format
 msgid "rule %-4d %s ->"
 msgstr "Regel %-4d %s ->"

-#: src/print.c:246
-msgid "\t\t/* empty */"
-msgstr "\t\t/* leer */"
+#: src/print.c:240
+msgid "empty"
+msgstr ""

-#: src/print.c:253
+#. TERMINAL (type #) : rule #s terminal is on RHS
+#: src/print.c:244
 #, fuzzy
 msgid "Terminals, with rules where they appear"
 msgstr ""
@@ -363,7 +365,7 @@ msgstr ""
 "Terminale und die Regeln un denen sie verwendet werden\n"
 "\n"

-#: src/print.c:302
+#: src/print.c:268
 #, fuzzy
 msgid "Nonterminals, with rules where they appear"
 msgstr ""
@@ -371,11 +373,11 @@ msgstr ""
 "Nicht-Terminal und die Regeln in denen sie verwendet werden\n"
 "\n"

-#: src/print.c:329
+#: src/print.c:294
 msgid " on left:"
 msgstr " auf der linken Seite:"

-#: src/print.c:344
+#: src/print.c:309
 msgid " on right:"
 msgstr " auf der rechten Seite:"

@@ -389,241 +391,241 @@ msgstr "    %-4s\tFehler (nicht assoziativ)\n"
 msgid "$default\treduce using rule %d (%s)"
 msgstr "    $default\treduziere mit Regel %d (%s)\n"

-#: src/reader.c:79
+#: src/reader.c:78
 msgid "   Skipping to next \\n"
 msgstr "   Überspringe Zeichen bis zum nächsten \\n"

-#: src/reader.c:81
+#: src/reader.c:80
 #, c-format
 msgid "   Skipping to next %c"
 msgstr "   Überspringe Zeichen bis zum nächten %c"

-#: src/reader.c:132 src/reader.c:144
+#: src/reader.c:131 src/reader.c:143
 msgid "invalid $ value"
 msgstr "unzulässiger $ Wert"

-#: src/reader.c:170 src/reader.c:185
+#: src/reader.c:169 src/reader.c:184
 msgid "unterminated string at end of file"
 msgstr "unbeendete Zeichenkette am Ende der Datei"

-#: src/reader.c:173
+#: src/reader.c:172
 msgid "unterminated string"
 msgstr "unbeendete Zeichenkette"

-#: src/reader.c:326 src/reader.c:390
+#: src/reader.c:325 src/reader.c:389
 #, fuzzy, c-format
 msgid "%s is invalid"
 msgstr "@%s ist unzulässig"

-#: src/reader.c:366
+#: src/reader.c:365
 #, c-format
 msgid "$$ of `%s' has no declared type"
 msgstr "$$ von »%s« hat keine deklarierten Wert"

-#: src/reader.c:383
+#: src/reader.c:382
 #, fuzzy, c-format
 msgid "$%d of `%s' has no declared type"
 msgstr "»%s« von »%s« hat keine deklarierten Wert"

-#: src/reader.c:437
+#: src/reader.c:436
 msgid "unterminated `%{' definition"
 msgstr "unbeendete »%{« Definition"

-#: src/reader.c:482 src/reader.c:598 src/reader.c:648
+#: src/reader.c:481 src/reader.c:595 src/reader.c:645
 #, c-format
 msgid "Premature EOF after %s"
 msgstr ""

-#: src/reader.c:499
+#: src/reader.c:498
 #, c-format
 msgid "symbol `%s' used more than once as a literal string"
 msgstr ""

-#: src/reader.c:502
+#: src/reader.c:501
 #, c-format
 msgid "symbol `%s' given more than one literal string"
 msgstr ""

-#: src/reader.c:524 src/reader.c:667
+#: src/reader.c:522 src/reader.c:664
 #, c-format
 msgid "symbol %s redefined"
 msgstr "Symbol %s noch einmal definiert"

-#: src/reader.c:534 src/reader.c:613 src/reader.c:674 src/reader.c:1290
+#: src/reader.c:532 src/reader.c:610 src/reader.c:671 src/reader.c:1285
 #, c-format
 msgid "type redeclaration for %s"
 msgstr "erneute Deklaration des Typs für %s"

-#: src/reader.c:544
+#: src/reader.c:541
 #, c-format
 msgid "`%s' is invalid in %s"
 msgstr "»%s« ist in %s nicht erlaubt"

-#: src/reader.c:561 src/reader.c:721
+#: src/reader.c:558 src/reader.c:717
 #, fuzzy, c-format
 msgid "multiple %s declarations"
 msgstr "mehr als eine %start Deklaration"

-#: src/reader.c:563 src/reader.c:902 src/reader.c:927 src/reader.c:1268
+#: src/reader.c:560 src/reader.c:897 src/reader.c:922 src/reader.c:1263
 #, fuzzy, c-format
 msgid "invalid %s declaration"
 msgstr "ungültige %start Deklaration"

-#: src/reader.c:583
+#: src/reader.c:580
 msgid "%type declaration has no <typename>"
 msgstr "%type Deklaration hat keinen <Typ-Namen>"

-#: src/reader.c:618
+#: src/reader.c:615
 #, fuzzy, c-format
 msgid "invalid %%type declaration due to item: %s"
 msgstr "ungültige %%type Deklaration wegen »%s«"

-#: src/reader.c:663
+#: src/reader.c:660
 #, c-format
 msgid "redefining precedence of %s"
 msgstr "Stellenwertigkeit von %s wird erneut definiert"

-#: src/reader.c:687
+#: src/reader.c:683
 #, c-format
 msgid "invalid text (%s) - number should be after identifier"
 msgstr "unzulässiger Text (%s) - Nummer sollte nach Bezeichner kommen"

-#: src/reader.c:697
+#: src/reader.c:693
 #, c-format
 msgid "unexpected item: %s"
 msgstr "unerwartetes Symbol: %s"

-#: src/reader.c:764 src/reader.c:1094 src/reader.c:1165
+#: src/reader.c:760 src/reader.c:1089 src/reader.c:1160
 #, fuzzy, c-format
 msgid "unmatched %s"
 msgstr "»{« hat kein Gegenstück"

-#: src/reader.c:796
+#: src/reader.c:792
 #, fuzzy, c-format
 msgid "argument of %%expect is not an integer"
 msgstr "Argument von %expect ist keine ganze Zahl"

-#: src/reader.c:843
+#: src/reader.c:838
 #, c-format
 msgid "unrecognized item %s, expected an identifier"
 msgstr "unerwartetes Symbol %s, hier wird ein Bezeichner erwartet"

-#: src/reader.c:867
+#: src/reader.c:862
 #, c-format
 msgid "expected string constant instead of %s"
 msgstr "hier wird eine Zeichenkette erwartet, nicht %s"

-#: src/reader.c:1010
+#: src/reader.c:1005
 #, c-format
 msgid "unrecognized: %s"
 msgstr "unbekannt: %s"

-#: src/reader.c:1015
+#: src/reader.c:1010
 msgid "no input grammar"
 msgstr "keine Eingabe-Grammatik"

-#: src/reader.c:1020
+#: src/reader.c:1015
 #, c-format
 msgid "unknown character: %s"
 msgstr "unbekanntes Zeichen: %s"

-#: src/reader.c:1188
+#: src/reader.c:1183
 #, fuzzy, c-format
 msgid "unterminated %guard clause"
 msgstr "unbeendeter %%guard Fall"

-#: src/reader.c:1355
+#: src/reader.c:1350
 msgid "ill-formed rule: initial symbol not followed by colon"
 msgstr ""
 "falsch geformte Regel: führendes Symbol wird nicht von einem Semikolon "
 "gefolgt"

-#: src/reader.c:1362
+#: src/reader.c:1357
 msgid "grammar starts with vertical bar"
 msgstr "Grammatik fängt mit einem vertikalen Strich (»|«) an"

-#: src/reader.c:1393
+#: src/reader.c:1388
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "Regel für %s vorhanden, welches aber ein Token ist"

-#: src/reader.c:1495
+#: src/reader.c:1490
 msgid "two @prec's in a row"
 msgstr "zwei @prec Anweisungen nacheinander"

-#: src/reader.c:1503
+#: src/reader.c:1498
 #, c-format
 msgid "%%guard present but %%semantic_parser not specified"
 msgstr ""
 "%%guard Anweisung vorhanden, jedoch wird %%semantic_parser nicht angegeben"

-#: src/reader.c:1512
+#: src/reader.c:1507
 msgid "two actions at end of one rule"
 msgstr "Zwei Aktionen am Ende einer Regel"

-#: src/reader.c:1526
+#: src/reader.c:1521
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "Typkonflikt (»%s« »%s«) bei Default Aktion"

-#: src/reader.c:1532
+#: src/reader.c:1527
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "leere Regel für Nicht-Terminal vmit Typ und keine Aktion"

-#: src/reader.c:1576
+#: src/reader.c:1571
 #, c-format
 msgid "invalid input: %s"
 msgstr "ungültige Eingabe: %s"

-#: src/reader.c:1584
+#: src/reader.c:1579
 #, fuzzy, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "zu viele Symbols (Token plus Nicht-Terminal); Maximum %s"

-#: src/reader.c:1587
+#: src/reader.c:1582
 msgid "no rules in the input grammar"
 msgstr "Eingabegrammatik enthält keine Regeln"

-#: src/reader.c:1611
+#: src/reader.c:1606
 #, 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:1716
+#: src/reader.c:1712
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "Vorrangwertigkeiten für %s und %s widersprechen sich"

-#: src/reader.c:1728
+#: src/reader.c:1724
 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "assoc Werte für %s nd %s widersprechen sich"

-#: src/reader.c:1779
+#: src/reader.c:1770
 #, fuzzy, c-format
 msgid "tokens %s and %s both assigned number %d"
 msgstr "Token %s und %s haben die selbe nummer %s"

-#: src/reader.c:1792
+#: src/reader.c:1782
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "das Startsymbol %s ist undefiniert"

-#: src/reader.c:1794
+#: src/reader.c:1784
 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "das Startsymbol %s ist ein Token"

-#: src/reduce.c:402
+#: src/reduce.c:401
 #, fuzzy
 msgid "Useless nonterminals:"
 msgstr ""
 "Nutzlose Nicht-Terminale:\n"
 "\n"

-#: src/reduce.c:417
+#: src/reduce.c:416
 #, fuzzy
 msgid "Terminals which are not used:"
 msgstr ""
@@ -632,7 +634,7 @@ msgstr ""
 "Nicht genutzte Terminale:\n"
 "\n"

-#: src/reduce.c:428
+#: src/reduce.c:427
 #, fuzzy
 msgid "Useless rules:"
 msgstr ""
@@ -641,7 +643,7 @@ msgstr ""
 "Ungenutzte Regeln:\n"
 "\n"

-#: src/reduce.c:457
+#: src/reduce.c:456
 msgid ""
 "Variables\n"
 "---------\n"
@@ -651,11 +653,11 @@ msgstr ""
 "---------\n"
 "\n"

-#: src/reduce.c:459
+#: src/reduce.c:458
 msgid "Value  Sprec    Sassoc    Tag\n"
 msgstr "Wert   Sprec    Sassoc    Tag\n"

-#: src/reduce.c:464
+#: src/reduce.c:463
 msgid ""
 "Rules\n"
 "-----\n"
@@ -665,7 +667,7 @@ msgstr ""
 "------\n"
 "\n"

-#: src/reduce.c:475
+#: src/reduce.c:474
 msgid ""
 "Rules interpreted\n"
 "-----------------\n"
@@ -675,36 +677,36 @@ msgstr ""
 "----------------------\n"
 "\n"

-#: src/reduce.c:492
+#: src/reduce.c:491
 #, c-format
 msgid "%d rules never reduced\n"
 msgstr "%d wurde niemals reduziert\n"

-#: src/reduce.c:494
+#: src/reduce.c:493
 #, c-format
 msgid "%s contains "
 msgstr "%s enthält "

-#: src/reduce.c:498
+#: src/reduce.c:497
 #, c-format
 msgid "%d useless nonterminal%s"
 msgstr "%d ungenutzte Nicht-Terminal"

-#: src/reduce.c:503
+#: src/reduce.c:502
 msgid " and "
 msgstr " und "

-#: src/reduce.c:507
+#: src/reduce.c:506
 #, c-format
 msgid "%d useless rule%s"
 msgstr "%d ungenutzte Regel"

-#: src/reduce.c:540
+#: src/reduce.c:539
 #, c-format
 msgid "Start symbol %s does not derive any sentence"
 msgstr "es lassen sich keine Sätze vom Startsymbol %s ableiten"

-#: src/reduce.c:553
+#: src/reduce.c:552
 #, c-format
 msgid ""
 "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n"
@@ -792,11 +794,11 @@ msgstr "%s: Hauptspeicher ersch
 #. MARK).  A British English Unicode locale should instead
 #. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and
 #. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
-#: lib/quotearg.c:259
+#: lib/quotearg.c:268
 msgid "`"
 msgstr ""

-#: lib/quotearg.c:260
+#: lib/quotearg.c:269
 msgid "'"
 msgstr ""

@@ -831,6 +833,9 @@ msgstr ""
 #~ msgid "limit of %d exceeded, too many %s"
 #~ msgstr "Grenze von %d erreicht, zu viele %s"

+#~ msgid "\t\t/* empty */"
+#~ msgstr "\t\t/* leer */"
+
 #~ msgid "unterminated comment in `%{' definition"
 #~ msgstr "unbeendeter Kommentar in »%{« Definition"

@@ -30,7 +30,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU bison 1.25\n"
-"POT-Creation-Date: 2001-09-22 18:19+0200\n"
+"POT-Creation-Date: 2001-10-02 18:30+0200\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"
@@ -63,55 +63,55 @@ msgstr ""
 msgid "fatal error: "
 msgstr "error grave: %s\n"

-#: src/conflicts.c:49
+#: src/conflicts.c:48
 #, c-format
 msgid "Conflict in state %d between rule %d and token %s resolved as %s.\n"
 msgstr ""
 "El conflicto en el estado %s entre la regla %d y el terminal %s se resuelve "
 "como %s.\n"

-#: src/conflicts.c:115 src/conflicts.c:138
+#: src/conflicts.c:114 src/conflicts.c:137
 msgid "reduce"
 msgstr "reduce"

-#: src/conflicts.c:121 src/conflicts.c:134
+#: src/conflicts.c:120 src/conflicts.c:133
 msgid "shift"
 msgstr "desplaza"

-#: src/conflicts.c:142
+#: src/conflicts.c:141
 msgid "an error"
 msgstr "un error"

-#: src/conflicts.c:422
+#: src/conflicts.c:421
 msgid " 1 shift/reduce conflict"
 msgstr " 1 conflicto desplazamiento/reducción"

-#: src/conflicts.c:427
+#: src/conflicts.c:426
 #, c-format
 msgid " %d shift/reduce conflicts"
 msgstr " %d conflictos desplazamiento/reducción"

-#: src/conflicts.c:433
+#: src/conflicts.c:432
 msgid " and"
 msgstr " y"

-#: src/conflicts.c:439
+#: src/conflicts.c:438
 msgid " 1 reduce/reduce conflict"
 msgstr " 1 conflicto reducción/reducción"

-#: src/conflicts.c:444
+#: src/conflicts.c:443
 #, c-format
 msgid " %d reduce/reduce conflicts"
 msgstr " %d conflictos reducción/reducción"

-#: src/conflicts.c:481
+#: src/conflicts.c:480
 #, c-format
 msgid "State %d contains"
 msgstr "El estado %d contiene"

 #. If invoked with `--yacc', use the output format specified by
 #. POSIX.
-#: src/conflicts.c:493
+#: src/conflicts.c:491
 msgid "conflicts: "
 msgstr "conflictos: "

@@ -127,7 +127,7 @@ msgstr "conflictos: "
 # ok
 # ngp
 #
-#: src/conflicts.c:495
+#: src/conflicts.c:493
 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d desplazamiento(s)/reducción(ones)"
@@ -144,22 +144,22 @@ msgstr " %d desplazamiento(s)/reducci
 #
 # ok
 # ngp
-#: src/conflicts.c:499
+#: src/conflicts.c:497
 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d reducción(ones)/reducción(ones)"

-#: src/conflicts.c:504
+#: src/conflicts.c:502
 #, c-format
 msgid "%s contains"
 msgstr "%s contiene"

-#: src/conflicts.c:590 src/conflicts.c:711
+#: src/conflicts.c:588 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:602 src/print.c:173
+#: src/conflicts.c:600 src/print.c:171
 #, c-format
 msgid ""
 "    $default\treduce using rule %d (%s)\n"
@@ -168,17 +168,17 @@ msgstr ""
 "    $default\treduce usando la regla %d (%s)\n"
 "\n"

-#: src/conflicts.c:691 src/conflicts.c:705
+#: 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:732
+#: src/conflicts.c:730
 #, c-format
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr "    $default\treduce usando la regla %d (%s)\n"

-#: src/derives.c:44
+#: src/derives.c:43
 #, fuzzy
 msgid "DERIVES"
 msgstr ""
@@ -187,17 +187,17 @@ msgstr ""
 "\n"
 "DERIVACIONES\n"

-#: src/derives.c:49
+#: src/derives.c:48
 #, c-format
 msgid "%s derives"
 msgstr "%s deriva"

-#: src/files.c:132
+#: src/files.c:133
 #, c-format
 msgid "cannot open file `%s'"
 msgstr ""

-#: src/files.c:151
+#: src/files.c:152
 msgid "cannot close file"
 msgstr ""

@@ -271,7 +271,7 @@ msgid ""
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""

-#: src/getargs.c:214 src/lex.c:635
+#: src/getargs.c:214 src/lex.c:650
 #, c-format
 msgid "`%s' is no longer supported"
 msgstr ""
@@ -294,64 +294,64 @@ msgstr "%s: no se ha especificado ning
 msgid "%s: extra arguments ignored after `%s'\n"
 msgstr "%s: los argumentos extra después de '%s' no se tendrán en cuenta\n"

-#: src/lalr.c:312
+#: src/lalr.c:311
 #, c-format
 msgid "too many gotos (max %d)"
 msgstr ""

 # to ignore no es ignorar. Pon otra cosa, please. sv
-#: src/lex.c:72
+#: src/lex.c:78
 msgid "unexpected `/' found and ignored"
 msgstr "se ha encontrado `/' cuando no se esperaba, no se tendrán en cuenta"

-#: src/lex.c:101 src/reader.c:270
+#: src/lex.c:107 src/reader.c:269
 msgid "unterminated comment"
 msgstr "comentario sin terminar"

-#: src/lex.c:133
+#: src/lex.c:139
 #, fuzzy
 msgid "unexpected end of file"
 msgstr "Fin de fichero inesperado"

 # ¿unescaped?
-#: src/lex.c:162
+#: src/lex.c:168
 msgid "unescaped newline in constant"
 msgstr "salto de línea en constante sin secuencia de escape"

-#: src/lex.c:204
+#: src/lex.c:210
 #, c-format
 msgid "octal value outside range 0...255: `\\%o'"
 msgstr "valor octal fuera del rango 0...255: `\\%o'"

-#: src/lex.c:229
+#: src/lex.c:235
 #, c-format
 msgid "hexadecimal value above 255: `\\x%x'"
 msgstr "valor hexadecimal mayor que 255: `\\x%x'"

-#: src/lex.c:241
+#: src/lex.c:247
 #, c-format
 msgid "unknown escape sequence: `\\' followed by `%s'"
 msgstr "secuencia de escape desconocida: `\\' seguido de `%s'"

-#: src/lex.c:337
+#: src/lex.c:343
 msgid "unterminated type name at end of file"
 msgstr "nombre de tipo sin terminar al final del fichero"

-#: src/lex.c:340
+#: src/lex.c:346
 msgid "unterminated type name"
 msgstr "nombre de tipo sin terminar"

 # ¿multicarácter o multicaracteres? sv
-#: src/lex.c:432
+#: src/lex.c:437
 msgid "use \"...\" for multi-character literal tokens"
 msgstr "use \"...\" para terminales literales multicarácter"

-#: src/main.c:108
+#: src/main.c:125
 #, fuzzy, c-format
 msgid "%s: internal error: %s\n"
 msgstr "error interno, %s\n"

-#: src/nullable.c:52
+#: src/nullable.c:51
 msgid "Entering set_nullable"
 msgstr "Entrando set_nullable"

@@ -360,50 +360,50 @@ msgstr "Entrando set_nullable"
 # en inglés era así, pero quizás en español sea mejor como dices
 # ngp
 #
-#: src/output.c:993
+#: src/output.c:986
 #, fuzzy, c-format
 msgid "maximum table size (%d) exceeded"
 msgstr "excedido el tamaño máximo de la tabla (%s)"

-#: src/print.c:38
+#: src/print.c:37
 #, c-format
 msgid " type %d is %s\n"
 msgstr " el tipo %d es %s\n"

-#: src/print.c:86
+#: src/print.c:85
 #, c-format
 msgid "   (rule %d)"
 msgstr "   (regla %d)"

-#: src/print.c:112
+#: src/print.c:111
 msgid "    $default\taccept\n"
 msgstr "    $default\taceptar\n"

-#: src/print.c:114
+#: src/print.c:113
 msgid "    NO ACTIONS\n"
 msgstr "    SIN ACCIONES\n"

-#: src/print.c:133
+#: src/print.c:132
 #, c-format
 msgid "    $   \tgo to state %d\n"
 msgstr "    $   \tir al estado %d\n"

-#: src/print.c:136
+#: src/print.c:135
 #, c-format
 msgid "    %-4s\tshift, and go to state %d\n"
 msgstr "    %-4s\tdesplazar e ir al estado %d\n"

-#: src/print.c:160
+#: src/print.c:159
 #, c-format
 msgid "    %-4s\terror (nonassociative)\n"
 msgstr "    %-4s\terror (no asociativo)\n"

-#: src/print.c:190
+#: src/print.c:187
 #, c-format
 msgid "    %-4s\tgo to state %d\n"
 msgstr "    %-4s\tir al estado %d\n"

-#: src/print.c:202
+#: src/print.c:199
 #, fuzzy, c-format
 msgid "state %d"
 msgstr ""
@@ -412,28 +412,25 @@ msgstr ""
 "estado %d\n"
 "\n"

-#: src/print.c:233
+#. rule # : LHS -> RHS
+#: src/print.c:229
 #, fuzzy
 msgid "Grammar"
 msgstr ""
 "\n"
 "Gramática\n"

-#: src/print.c:240
+#: src/print.c:234
 #, c-format
 msgid "rule %-4d %s ->"
 msgstr "regla %-4d %s ->"

-# Duda: ¿Estás seguro de que no será `vacío'? Si no lo estás o, si por
-# el contrario, pudiera cualquiera de los casos, debieras traducirlo
-# como `vacía/o' - cll
-# según el código indica reglas vacías por eso lo puse así
-# ngp
-#: src/print.c:246
-msgid "\t\t/* empty */"
-msgstr "\t\t/* vacía */"
+#: src/print.c:240
+msgid "empty"
+msgstr ""

-#: src/print.c:253
+#. TERMINAL (type #) : rule #s terminal is on RHS
+#: src/print.c:244
 #, fuzzy
 msgid "Terminals, with rules where they appear"
 msgstr ""
@@ -441,18 +438,18 @@ msgstr ""
 "Terminales con las reglas donde aparecen\n"
 "\n"

-#: src/print.c:302
+#: src/print.c:268
 #, fuzzy
 msgid "Nonterminals, with rules where they appear"
 msgstr ""
 "\n"
 "No terminales con las reglas donde aparecen\n"

-#: src/print.c:329
+#: src/print.c:294
 msgid " on left:"
 msgstr " en la izquierda:"

-#: src/print.c:344
+#: src/print.c:309
 msgid " on right:"
 msgstr " en la derecha:"

@@ -466,96 +463,96 @@ msgstr "    %-4s\terror (no asociativo)\n"
 msgid "$default\treduce using rule %d (%s)"
 msgstr "    $default\treduce usando la regla %d (%s)\n"

-#: src/reader.c:79
+#: src/reader.c:78
 msgid "   Skipping to next \\n"
 msgstr "   Saltando al siguiente \\n"

-#: src/reader.c:81
+#: src/reader.c:80
 #, c-format
 msgid "   Skipping to next %c"
 msgstr "   Saltando al siguiente %c"

-#: src/reader.c:132 src/reader.c:144
+#: src/reader.c:131 src/reader.c:143
 msgid "invalid $ value"
 msgstr "valor $ no válido"

-#: src/reader.c:170 src/reader.c:185
+#: src/reader.c:169 src/reader.c:184
 msgid "unterminated string at end of file"
 msgstr "cadena sin terminar al final del fichero"

-#: src/reader.c:173
+#: src/reader.c:172
 msgid "unterminated string"
 msgstr "cadena sin terminar"

-#: src/reader.c:326 src/reader.c:390
+#: src/reader.c:325 src/reader.c:389
 #, fuzzy, c-format
 msgid "%s is invalid"
 msgstr "@%s no es válido"

-#: src/reader.c:366
+#: src/reader.c:365
 #, c-format
 msgid "$$ of `%s' has no declared type"
 msgstr "$$ de `%s' no tiene tipo declarado"

-#: src/reader.c:383
+#: src/reader.c:382
 #, fuzzy, c-format
 msgid "$%d of `%s' has no declared type"
 msgstr "$%s de `%s' no tiene tipo declarado"

-#: src/reader.c:437
+#: src/reader.c:436
 msgid "unterminated `%{' definition"
 msgstr "definición `%{' sin terminar"

-#: src/reader.c:482 src/reader.c:598 src/reader.c:648
+#: src/reader.c:481 src/reader.c:595 src/reader.c:645
 #, c-format
 msgid "Premature EOF after %s"
 msgstr ""

-#: src/reader.c:499
+#: src/reader.c:498
 #, c-format
 msgid "symbol `%s' used more than once as a literal string"
 msgstr ""

-#: src/reader.c:502
+#: src/reader.c:501
 #, c-format
 msgid "symbol `%s' given more than one literal string"
 msgstr ""

-#: src/reader.c:524 src/reader.c:667
+#: src/reader.c:522 src/reader.c:664
 #, c-format
 msgid "symbol %s redefined"
 msgstr "redefinido el símbolo %s"

-#: src/reader.c:534 src/reader.c:613 src/reader.c:674 src/reader.c:1290
+#: src/reader.c:532 src/reader.c:610 src/reader.c:671 src/reader.c:1285
 #, c-format
 msgid "type redeclaration for %s"
 msgstr "redeclaración del tipo de %s"

-#: src/reader.c:544
+#: src/reader.c:541
 #, c-format
 msgid "`%s' is invalid in %s"
 msgstr "`%s' no es válido en %s"

-#: src/reader.c:561 src/reader.c:721
+#: src/reader.c:558 src/reader.c:717
 #, fuzzy, c-format
 msgid "multiple %s declarations"
 msgstr "múltiples declaraciones de %start"

-#: src/reader.c:563 src/reader.c:902 src/reader.c:927 src/reader.c:1268
+#: src/reader.c:560 src/reader.c:897 src/reader.c:922 src/reader.c:1263
 #, fuzzy, c-format
 msgid "invalid %s declaration"
 msgstr "declaración de %start no válida"

-#: src/reader.c:583
+#: src/reader.c:580
 msgid "%type declaration has no <typename>"
 msgstr "la declaración %type no tiene <nombre-tipo>"

-#: src/reader.c:618
+#: src/reader.c:615
 #, fuzzy, c-format
 msgid "invalid %%type declaration due to item: %s"
 msgstr "declaración de %%type no válida debido al ítem: `%s'"

-#: src/reader.c:663
+#: src/reader.c:660
 #, c-format
 msgid "redefining precedence of %s"
 msgstr "redefinición de la precedencia de %s"
@@ -564,7 +561,7 @@ msgstr "redefinici
 # de "to must" y aquí se emplea en su forma condicional. Por eso, he
 # cambiado `debe' por `debería' - cll
 # ahí me has pillado en un olvido del inglés - ngp
-#: src/reader.c:687
+#: src/reader.c:683
 #, c-format
 msgid "invalid text (%s) - number should be after identifier"
 msgstr ""
@@ -574,18 +571,18 @@ msgstr ""
 # otras, como `inesperado'. Cualquiera es correcta, por supuesto y, en
 # este caso, la segunda me parece más apropiada - cll
 # ok - ngp
-#: src/reader.c:697
+#: src/reader.c:693
 #, c-format
 msgid "unexpected item: %s"
 msgstr "ítem inesperado: %s"

 # Cambio el orden y el sexo. Ahora está "en español". sv
-#: src/reader.c:764 src/reader.c:1094 src/reader.c:1165
+#: src/reader.c:760 src/reader.c:1089 src/reader.c:1160
 #, fuzzy, c-format
 msgid "unmatched %s"
 msgstr "`{' desemparejada"

-#: src/reader.c:796
+#: src/reader.c:792
 #, fuzzy, c-format
 msgid "argument of %%expect is not an integer"
 msgstr "el argumento de %expect no es un entero"
@@ -596,26 +593,26 @@ msgstr "el argumento de %expect no es un entero"
 # - cll
 # ok - ngp
 #
-#: src/reader.c:843
+#: src/reader.c:838
 #, c-format
 msgid "unrecognized item %s, expected an identifier"
 msgstr "no se reconoce el ítem %s, se esperaba un identificador"

-#: src/reader.c:867
+#: src/reader.c:862
 #, c-format
 msgid "expected string constant instead of %s"
 msgstr "se esperaba una cadena constante en lugar de %s"

-#: src/reader.c:1010
+#: src/reader.c:1005
 #, c-format
 msgid "unrecognized: %s"
 msgstr "no reconocido: %s"

-#: src/reader.c:1015
+#: src/reader.c:1010
 msgid "no input grammar"
 msgstr "no hay gramática de entrada"

-#: src/reader.c:1020
+#: src/reader.c:1015
 #, c-format
 msgid "unknown character: %s"
 msgstr "carácter desconocido: %s"
@@ -624,105 +621,105 @@ msgstr "car
 # mejor que `sin terminar' que me parece más "computerizado" - cll
 # quizás un poco cacofónico lo de claúsula inconclusa - ngp
 #
-#: src/reader.c:1188
+#: src/reader.c:1183
 #, fuzzy, c-format
 msgid "unterminated %guard clause"
 msgstr "cláusula %%guard sin terminar"

-#: src/reader.c:1355
+#: src/reader.c:1350
 msgid "ill-formed rule: initial symbol not followed by colon"
 msgstr "regla mal formada: el símbolo inicial no está seguido por :"

-#: src/reader.c:1362
+#: src/reader.c:1357
 msgid "grammar starts with vertical bar"
 msgstr "la gramática comienza con una barra vertical"

-#: src/reader.c:1393
+#: src/reader.c:1388
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "se ha dado una regla para %s, que es un terminal"

-#: src/reader.c:1495
+#: src/reader.c:1490
 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:1503
+#: src/reader.c:1498
 #, c-format
 msgid "%%guard present but %%semantic_parser not specified"
 msgstr "%%guard presente pero %%semantic_parser está sin especificar"

-#: src/reader.c:1512
+#: src/reader.c:1507
 msgid "two actions at end of one rule"
 msgstr "dos acciones al final de una regla"

-#: src/reader.c:1526
+#: src/reader.c:1521
 #, 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:1532
+#: src/reader.c:1527
 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:1576
+#: src/reader.c:1571
 #, c-format
 msgid "invalid input: %s"
 msgstr "entrada no válida: %s"

-#: src/reader.c:1584
+#: src/reader.c:1579
 #, 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:1587
+#: src/reader.c:1582
 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:1611
+#: src/reader.c:1606
 #, 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:1716
+#: src/reader.c:1712
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "precedencias en conflicto entre %s y %s"

-#: src/reader.c:1728
+#: src/reader.c:1724
 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "conflicto de valores assoc para %s y %s"

-#: src/reader.c:1779
+#: 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:1792
+#: src/reader.c:1782
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "el símbolo de inicio (axioma) %s no está definido"

-#: src/reader.c:1794
+#: src/reader.c:1784
 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "el símbolo de inicio (axioma) %s es un terminal"

-#: src/reduce.c:402
+#: src/reduce.c:401
 #, fuzzy
 msgid "Useless nonterminals:"
 msgstr ""
 "No terminales sin uso:\n"
 "\n"

-#: src/reduce.c:417
+#: src/reduce.c:416
 #, fuzzy
 msgid "Terminals which are not used:"
 msgstr ""
@@ -731,7 +728,7 @@ msgstr ""
 "Terminales que no se usan:\n"
 "\n"

-#: src/reduce.c:428
+#: src/reduce.c:427
 #, fuzzy
 msgid "Useless rules:"
 msgstr ""
@@ -740,7 +737,7 @@ msgstr ""
 "Reglas sin uso:\n"
 "\n"

-#: src/reduce.c:457
+#: src/reduce.c:456
 msgid ""
 "Variables\n"
 "---------\n"
@@ -750,11 +747,11 @@ msgstr ""
 "---------\n"
 "\n"

-#: src/reduce.c:459
+#: src/reduce.c:458
 msgid "Value  Sprec    Sassoc    Tag\n"
 msgstr "Valor  Sprec    Sasoc     Tag\n"

-#: src/reduce.c:464
+#: src/reduce.c:463
 msgid ""
 "Rules\n"
 "-----\n"
@@ -764,7 +761,7 @@ msgstr ""
 "------\n"
 "\n"

-#: src/reduce.c:475
+#: src/reduce.c:474
 msgid ""
 "Rules interpreted\n"
 "-----------------\n"
@@ -774,31 +771,31 @@ msgstr ""
 "--------------------\n"
 "\n"

-#: src/reduce.c:492
+#: src/reduce.c:491
 #, c-format
 msgid "%d rules never reduced\n"
 msgstr "%d reglas que nunca se han reducido\n"

-#: src/reduce.c:494
+#: src/reduce.c:493
 #, c-format
 msgid "%s contains "
 msgstr "%s contiene "

-#: src/reduce.c:498
+#: src/reduce.c:497
 #, c-format
 msgid "%d useless nonterminal%s"
 msgstr "%d no terminales %s sin uso"

-#: src/reduce.c:503
+#: src/reduce.c:502
 msgid " and "
 msgstr " y "

-#: src/reduce.c:507
+#: src/reduce.c:506
 #, c-format
 msgid "%d useless rule%s"
 msgstr "%d regla%s sin uso"

-#: src/reduce.c:540
+#: src/reduce.c:539
 #, c-format
 msgid "Start symbol %s does not derive any sentence"
 msgstr "El símbolo de inicio (axioma) %s no deriva ninguna sentencia"
@@ -815,7 +812,7 @@ msgstr "El s
 # Te recomiendo `la reducción de %s' en vez de seguir el estilo inglés y
 # usar participios - cll
 # un error lo tiene cualquiera - ngp
-#: src/reduce.c:553
+#: src/reduce.c:552
 #, c-format
 msgid ""
 "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n"
@@ -927,11 +924,11 @@ msgstr "%s: memoria agotada\n"
 #. MARK).  A British English Unicode locale should instead
 #. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and
 #. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
-#: lib/quotearg.c:259
+#: lib/quotearg.c:268
 msgid "`"
 msgstr ""

-#: lib/quotearg.c:260
+#: lib/quotearg.c:269
 msgid "'"
 msgstr ""

@@ -1028,6 +1025,14 @@ msgstr ""
 #~ msgid "limit of %d exceeded, too many %s"
 #~ msgstr "excedido el límite de %d, demasiados %s"

+# Duda: ¿Estás seguro de que no será `vacío'? Si no lo estás o, si por
+# el contrario, pudiera cualquiera de los casos, debieras traducirlo
+# como `vacía/o' - cll
+# según el código indica reglas vacías por eso lo puse así
+# ngp
+#~ msgid "\t\t/* empty */"
+#~ msgstr "\t\t/* vacía */"
+
 #~ msgid "unterminated comment in `%{' definition"
 #~ msgstr "comentario sin terminar en la definición `%{'"

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.28d\n"
-"POT-Creation-Date: 2001-09-22 18:19+0200\n"
+"POT-Creation-Date: 2001-10-02 18:30+0200\n"
 "PO-Revision-Date: 2001-08-29 17:06+02:00\n"
 "Last-Translator: Toomas Soome <[email protected]>\n"
 "Language-Team: Estonian <[email protected]>\n"
@@ -30,77 +30,77 @@ msgstr "hoiatus: "
 msgid "fatal error: "
 msgstr "fataalne viga: "

-#: src/conflicts.c:49
+#: src/conflicts.c:48
 #, c-format
 msgid "Conflict in state %d between rule %d and token %s resolved as %s.\n"
 msgstr "Konflikt olekus %d reegli %d ja märgi %s vahel lahendatud, kui %s.\n"

-#: src/conflicts.c:115 src/conflicts.c:138
+#: src/conflicts.c:114 src/conflicts.c:137
 msgid "reduce"
 msgstr "redutseerimine"

-#: src/conflicts.c:121 src/conflicts.c:134
+#: src/conflicts.c:120 src/conflicts.c:133
 msgid "shift"
 msgstr "nihutamine"

-#: src/conflicts.c:142
+#: src/conflicts.c:141
 msgid "an error"
 msgstr "viga"

-#: src/conflicts.c:422
+#: src/conflicts.c:421
 msgid " 1 shift/reduce conflict"
 msgstr " 1 nihutamine/redutseerimine konflikt"

-#: src/conflicts.c:427
+#: src/conflicts.c:426
 #, c-format
 msgid " %d shift/reduce conflicts"
 msgstr " %d nihutamine/redutseerimine konflikti"

-#: src/conflicts.c:433
+#: src/conflicts.c:432
 msgid " and"
 msgstr " ja"

-#: src/conflicts.c:439
+#: src/conflicts.c:438
 msgid " 1 reduce/reduce conflict"
 msgstr " 1 redutseerimine/redutseerimine konflikt"

-#: src/conflicts.c:444
+#: src/conflicts.c:443
 #, c-format
 msgid " %d reduce/reduce conflicts"
 msgstr " %d redutseerimine/redutseerimine konflikti"

-#: src/conflicts.c:481
+#: src/conflicts.c:480
 #, c-format
 msgid "State %d contains"
 msgstr "Olek %d sisaldab"

 #. If invoked with `--yacc', use the output format specified by
 #. POSIX.
-#: src/conflicts.c:493
+#: src/conflicts.c:491
 msgid "conflicts: "
 msgstr "konfliktid: "

-#: src/conflicts.c:495
+#: src/conflicts.c:493
 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d nihutamine/redutseerimine"

-#: src/conflicts.c:499
+#: src/conflicts.c:497
 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d redutseerimine/redutseerimine"

-#: src/conflicts.c:504
+#: src/conflicts.c:502
 #, c-format
 msgid "%s contains"
 msgstr "%s sisaldab"

-#: src/conflicts.c:590 src/conflicts.c:711
+#: src/conflicts.c:588 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:602 src/print.c:173
+#: src/conflicts.c:600 src/print.c:171
 #, c-format
 msgid ""
 "    $default\treduce using rule %d (%s)\n"
@@ -109,31 +109,31 @@ msgstr ""
 "    $default\tredutseerin kasutades reeglit %d (%s)\n"
 "\n"

-#: src/conflicts.c:691 src/conflicts.c:705
+#: 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:732
+#: src/conflicts.c:730
 #, c-format
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr "    $default\tredutseerin kasutades reeglit %d (%s)\n"

-#: src/derives.c:44
+#: src/derives.c:43
 msgid "DERIVES"
 msgstr "DERIVES"

-#: src/derives.c:49
+#: src/derives.c:48
 #, c-format
 msgid "%s derives"
 msgstr "%s derives"

-#: src/files.c:132
+#: src/files.c:133
 #, c-format
 msgid "cannot open file `%s'"
 msgstr "faili `%s' ei saa avada"

-#: src/files.c:151
+#: src/files.c:152
 msgid "cannot close file"
 msgstr "faili ei õnnestu sulgeda"

@@ -231,7 +231,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:214 src/lex.c:635
+#: src/getargs.c:214 src/lex.c:650
 #, c-format
 msgid "`%s' is no longer supported"
 msgstr "`%s' ei ole enam toetatud"
@@ -251,137 +251,139 @@ msgstr "%s: puudub grammatikafail\n"
 msgid "%s: extra arguments ignored after `%s'\n"
 msgstr "%s: ignoreerin lisaargumente peale `%s'\n"

-#: src/lalr.c:312
+#: src/lalr.c:311
 #, c-format
 msgid "too many gotos (max %d)"
 msgstr "liiga palju gotosid (maks %d)"

-#: src/lex.c:72
+#: src/lex.c:78
 msgid "unexpected `/' found and ignored"
 msgstr "leidsin ja ignoreerin ootamatu `/'"

-#: src/lex.c:101 src/reader.c:270
+#: src/lex.c:107 src/reader.c:269
 msgid "unterminated comment"
 msgstr "lõpetamata kommentaar"

-#: src/lex.c:133
+#: src/lex.c:139
 msgid "unexpected end of file"
 msgstr "ootamatu faililõpp"

-#: src/lex.c:162
+#: src/lex.c:168
 msgid "unescaped newline in constant"
 msgstr "paojadata reavahetus konstandis"

-#: src/lex.c:204
+#: src/lex.c:210
 #, c-format
 msgid "octal value outside range 0...255: `\\%o'"
 msgstr "kaheksandväärtus väljaspool piire 0...255: `\\%o'"

-#: src/lex.c:229
+#: src/lex.c:235
 #, c-format
 msgid "hexadecimal value above 255: `\\x%x'"
 msgstr "kuueteistkümnendväärtus  suurem, kui above 255: `\\x%x'"

-#: src/lex.c:241
+#: src/lex.c:247
 #, c-format
 msgid "unknown escape sequence: `\\' followed by `%s'"
 msgstr "tundmatu paojada: `\\' järgneb `%s'"

-#: src/lex.c:337
+#: src/lex.c:343
 msgid "unterminated type name at end of file"
 msgstr "lõpetamata tüübinimi faili lõpus"

-#: src/lex.c:340
+#: src/lex.c:346
 msgid "unterminated type name"
 msgstr "lõpetamata tüübinimi"

-#: src/lex.c:432
+#: src/lex.c:437
 msgid "use \"...\" for multi-character literal tokens"
 msgstr "kasuta mitmesümboliliste literaalidega \"...\" konstruktsiooni"

-#: src/main.c:108
+#: src/main.c:125
 #, c-format
 msgid "%s: internal error: %s\n"
 msgstr "%s: sisemine viga: %s\n"

-#: src/nullable.c:52
+#: src/nullable.c:51
 msgid "Entering set_nullable"
 msgstr "Entering set_nullable"

-#: src/output.c:993
+#: src/output.c:986
 #, c-format
 msgid "maximum table size (%d) exceeded"
 msgstr "ületati maksimaalset tabelisuurust (%d)"

-#: src/print.c:38
+#: src/print.c:37
 #, c-format
 msgid " type %d is %s\n"
 msgstr " tüüp %d on %s\n"

-#: src/print.c:86
+#: src/print.c:85
 #, c-format
 msgid "   (rule %d)"
 msgstr "   (reegel %d)"

-#: src/print.c:112
+#: src/print.c:111
 msgid "    $default\taccept\n"
 msgstr "    $default\taktsepteerin\n"

-#: src/print.c:114
+#: src/print.c:113
 msgid "    NO ACTIONS\n"
 msgstr "    TEGEVUSI POLE\n"

-#: src/print.c:133
+#: src/print.c:132
 #, c-format
 msgid "    $   \tgo to state %d\n"
 msgstr "    $   \tliigu olekule %d\n"

-#: src/print.c:136
+#: src/print.c:135
 #, c-format
 msgid "    %-4s\tshift, and go to state %d\n"
 msgstr "    %-4s\tnihuta ja liigu olekule %d\n"

-#: src/print.c:160
+#: src/print.c:159
 #, c-format
 msgid "    %-4s\terror (nonassociative)\n"
 msgstr "    %-4s\tviga (mitteassotsiatiivne)\n"

-#: src/print.c:190
+#: src/print.c:187
 #, c-format
 msgid "    %-4s\tgo to state %d\n"
 msgstr "    %-4s\tliigu olekule %d\n"

-#: src/print.c:202
+#: src/print.c:199
 #, c-format
 msgid "state %d"
 msgstr "olek %d"

-#: src/print.c:233
+#. rule # : LHS -> RHS
+#: src/print.c:229
 msgid "Grammar"
 msgstr "Grammatika"

-#: src/print.c:240
+#: src/print.c:234
 #, c-format
 msgid "rule %-4d %s ->"
 msgstr "reegel %-4d %s ->"

-#: src/print.c:246
-msgid "\t\t/* empty */"
-msgstr "\t\t/* tühi */"
+#: src/print.c:240
+msgid "empty"
+msgstr ""

-#: src/print.c:253
+#. TERMINAL (type #) : rule #s terminal is on RHS
+#: src/print.c:244
 msgid "Terminals, with rules where they appear"
 msgstr "Terminalid, koos reeglitega, kus nad ilmuvad"

-#: src/print.c:302
+#: src/print.c:268
 msgid "Nonterminals, with rules where they appear"
 msgstr "Mitteterminalid, koos reeglitega, kus nad ilmuvad"

-#: src/print.c:329
+#: src/print.c:294
 msgid " on left:"
 msgstr " vasakul:"

-#: src/print.c:344
+#: src/print.c:309
 msgid " on right:"
 msgstr " paremal:"

@@ -395,243 +397,243 @@ msgstr "%-4s\tviga (mitteassotsiatiivne)"
 msgid "$default\treduce using rule %d (%s)"
 msgstr "$default\tredutseerin kasutades reeglit %d (%s)"

-#: src/reader.c:79
+#: src/reader.c:78
 msgid "   Skipping to next \\n"
 msgstr "   Liigun järgmisele \\n"

-#: src/reader.c:81
+#: src/reader.c:80
 #, c-format
 msgid "   Skipping to next %c"
 msgstr "   Liigun järgmisele %c"

-#: src/reader.c:132 src/reader.c:144
+#: src/reader.c:131 src/reader.c:143
 msgid "invalid $ value"
 msgstr "vigane $ väärtus"

-#: src/reader.c:170 src/reader.c:185
+#: src/reader.c:169 src/reader.c:184
 msgid "unterminated string at end of file"
 msgstr "lõpetamata sõne faili lõpus"

-#: src/reader.c:173
+#: src/reader.c:172
 msgid "unterminated string"
 msgstr "lõpetamata sõne"

-#: src/reader.c:326 src/reader.c:390
+#: src/reader.c:325 src/reader.c:389
 #, c-format
 msgid "%s is invalid"
 msgstr "%s on vigane"

-#: src/reader.c:366
+#: src/reader.c:365
 #, c-format
 msgid "$$ of `%s' has no declared type"
 msgstr "`%s' $$ ei oma deklareeritud tüüpi"

-#: src/reader.c:383
+#: src/reader.c:382
 #, c-format
 msgid "$%d of `%s' has no declared type"
 msgstr "$%d `%s' ei oma deklareeritud tüüpi"

-#: src/reader.c:437
+#: src/reader.c:436
 msgid "unterminated `%{' definition"
 msgstr "lõpetamata `%{' definitsioon"

-#: src/reader.c:482 src/reader.c:598 src/reader.c:648
+#: src/reader.c:481 src/reader.c:595 src/reader.c:645
 #, c-format
 msgid "Premature EOF after %s"
 msgstr "Enneaegne EOF peale %s"

-#: src/reader.c:499
+#: src/reader.c:498
 #, c-format
 msgid "symbol `%s' used more than once as a literal string"
 msgstr "sümbolit `%s' on kasutatud enam kui kord literaal sõnena"

-#: src/reader.c:502
+#: src/reader.c:501
 #, c-format
 msgid "symbol `%s' given more than one literal string"
 msgstr "sümbolile `%s' on antud enam kui üks literaal sõne"

-#: src/reader.c:524 src/reader.c:667
+#: src/reader.c:522 src/reader.c:664
 #, c-format
 msgid "symbol %s redefined"
 msgstr "sümbol %s on uuesti defineeritud"

-#: src/reader.c:534 src/reader.c:613 src/reader.c:674 src/reader.c:1290
+#: src/reader.c:532 src/reader.c:610 src/reader.c:671 src/reader.c:1285
 #, c-format
 msgid "type redeclaration for %s"
 msgstr "%s tüübi uuesti deklareerimine"

-#: src/reader.c:544
+#: src/reader.c:541
 #, c-format
 msgid "`%s' is invalid in %s"
 msgstr "`%s' ei ole %s sees lubatud"

-#: src/reader.c:561 src/reader.c:721
+#: src/reader.c:558 src/reader.c:717
 #, c-format
 msgid "multiple %s declarations"
 msgstr "korduvad %s deklaratsioonid"

-#: src/reader.c:563 src/reader.c:902 src/reader.c:927 src/reader.c:1268
+#: src/reader.c:560 src/reader.c:897 src/reader.c:922 src/reader.c:1263
 #, c-format
 msgid "invalid %s declaration"
 msgstr "vigane %s deklaratsioon"

-#: src/reader.c:583
+#: src/reader.c:580
 msgid "%type declaration has no <typename>"
 msgstr "%type deklaratsioonis puudub <tüübinimi>"

-#: src/reader.c:618
+#: src/reader.c:615
 #, c-format
 msgid "invalid %%type declaration due to item: %s"
 msgstr "vigane %%type deklaratsioon, element: %s"

-#: src/reader.c:663
+#: src/reader.c:660
 #, c-format
 msgid "redefining precedence of %s"
 msgstr "%s prioriteedi uus definitsioon"

-#: src/reader.c:687
+#: src/reader.c:683
 #, c-format
 msgid "invalid text (%s) - number should be after identifier"
 msgstr "vigane tekst (%s) - number peab olema peale identifikaatorit"

-#: src/reader.c:697
+#: src/reader.c:693
 #, c-format
 msgid "unexpected item: %s"
 msgstr "ootamatu element: %s"

-#: src/reader.c:764 src/reader.c:1094 src/reader.c:1165
+#: src/reader.c:760 src/reader.c:1089 src/reader.c:1160
 #, c-format
 msgid "unmatched %s"
 msgstr "puudub %s"

-#: src/reader.c:796
+#: src/reader.c:792
 #, c-format
 msgid "argument of %%expect is not an integer"
 msgstr "%%expect argument ei ole täisarv"

-#: src/reader.c:843
+#: src/reader.c:838
 #, c-format
 msgid "unrecognized item %s, expected an identifier"
 msgstr "tundmatu element %s, eeldasin identifikaatorit"

-#: src/reader.c:867
+#: src/reader.c:862
 #, c-format
 msgid "expected string constant instead of %s"
 msgstr "eeldasin %s asemel sõnekonstanti"

-#: src/reader.c:1010
+#: src/reader.c:1005
 #, c-format
 msgid "unrecognized: %s"
 msgstr "tundmatu: %s"

-#: src/reader.c:1015
+#: src/reader.c:1010
 msgid "no input grammar"
 msgstr "sisendgrammatikat pole"

-#: src/reader.c:1020
+#: src/reader.c:1015
 #, c-format
 msgid "unknown character: %s"
 msgstr "tundmatu sümbol: %s"

-#: src/reader.c:1188
+#: src/reader.c:1183
 #, c-format
 msgid "unterminated %guard clause"
 msgstr "lõpetamata %guard klausel"

-#: src/reader.c:1355
+#: src/reader.c:1350
 msgid "ill-formed rule: initial symbol not followed by colon"
 msgstr "vigaselt formeeritud reegel: algsümbolile ei järgne koolonit"

-#: src/reader.c:1362
+#: src/reader.c:1357
 msgid "grammar starts with vertical bar"
 msgstr "grammatika algab püstkriipsuga"

-#: src/reader.c:1393
+#: src/reader.c:1388
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "%s jaoks on antud reegel, aga see on märk"

-#: src/reader.c:1495
+#: src/reader.c:1490
 msgid "two @prec's in a row"
 msgstr "kaks @prec ühel real"

-#: src/reader.c:1503
+#: src/reader.c:1498
 #, c-format
 msgid "%%guard present but %%semantic_parser not specified"
 msgstr "%%guard on määratud, aga %%semantic_parser ei ole"

-#: src/reader.c:1512
+#: src/reader.c:1507
 msgid "two actions at end of one rule"
 msgstr "kaks tegevust ühe reegli lõpus"

-#: src/reader.c:1526
+#: src/reader.c:1521
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "vaikimisi tegevuse tüübikonflikt (`%s' `%s')"

-#: src/reader.c:1532
+#: src/reader.c:1527
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "tüübiga mitteterminalil on tühi reegel ja puudub tegevus"

-#: src/reader.c:1576
+#: src/reader.c:1571
 #, c-format
 msgid "invalid input: %s"
 msgstr "vigane sisend: %s"

-#: src/reader.c:1584
+#: src/reader.c:1579
 #, 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:1587
+#: src/reader.c:1582
 msgid "no rules in the input grammar"
 msgstr "sisendgrammatikas pole reegleid"

-#: src/reader.c:1611
+#: src/reader.c:1606
 #, 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:1716
+#: src/reader.c:1712
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "%s ja %s omavad konfliktseid prioriteete"

-#: src/reader.c:1728
+#: src/reader.c:1724
 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "%s ja %s omavad konfliktseid assotsiatiivseid väärtuseid"

-#: src/reader.c:1779
+#: 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:1792
+#: src/reader.c:1782
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "stardisümbol %s ei ole defineeritud"

-#: src/reader.c:1794
+#: src/reader.c:1784
 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "stardisümbol %s on märk"

-#: src/reduce.c:402
+#: src/reduce.c:401
 msgid "Useless nonterminals:"
 msgstr "Kasutamata mitteterminalid:"

-#: src/reduce.c:417
+#: src/reduce.c:416
 msgid "Terminals which are not used:"
 msgstr "Terminalid, mida ei kasutatud:"

-#: src/reduce.c:428
+#: src/reduce.c:427
 msgid "Useless rules:"
 msgstr "Kasutamata reeglid:"

-#: src/reduce.c:457
+#: src/reduce.c:456
 msgid ""
 "Variables\n"
 "---------\n"
@@ -641,11 +643,11 @@ msgstr ""
 "--------\n"
 "\n"

-#: src/reduce.c:459
+#: src/reduce.c:458
 msgid "Value  Sprec    Sassoc    Tag\n"
 msgstr "Value  Sprec    Sassoc    Tag\n"

-#: src/reduce.c:464
+#: src/reduce.c:463
 msgid ""
 "Rules\n"
 "-----\n"
@@ -655,7 +657,7 @@ msgstr ""
 "-------\n"
 "\n"

-#: src/reduce.c:475
+#: src/reduce.c:474
 msgid ""
 "Rules interpreted\n"
 "-----------------\n"
@@ -665,36 +667,36 @@ msgstr ""
 "------------------------\n"
 "\n"

-#: src/reduce.c:492
+#: src/reduce.c:491
 #, c-format
 msgid "%d rules never reduced\n"
 msgstr "%d reeglit ei redutseeritud\n"

-#: src/reduce.c:494
+#: src/reduce.c:493
 #, c-format
 msgid "%s contains "
 msgstr "%s sisaldab "

-#: src/reduce.c:498
+#: src/reduce.c:497
 #, c-format
 msgid "%d useless nonterminal%s"
 msgstr "%d kasutamata mitteterminali%s"

-#: src/reduce.c:503
+#: src/reduce.c:502
 msgid " and "
 msgstr " ja "

-#: src/reduce.c:507
+#: src/reduce.c:506
 #, c-format
 msgid "%d useless rule%s"
 msgstr "%d kasutamata reeglit%s"

-#: src/reduce.c:540
+#: src/reduce.c:539
 #, c-format
 msgid "Start symbol %s does not derive any sentence"
 msgstr "Stardisümbolist %s ei tuletata ühtegi lauset"

-#: src/reduce.c:553
+#: src/reduce.c:552
 #, c-format
 msgid ""
 "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n"
@@ -781,14 +783,17 @@ msgstr "m
 #. MARK).  A British English Unicode locale should instead
 #. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and
 #. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
-#: lib/quotearg.c:259
+#: lib/quotearg.c:268
 msgid "`"
 msgstr "`"

-#: lib/quotearg.c:260
+#: lib/quotearg.c:269
 msgid "'"
 msgstr "'"

+#~ msgid "\t\t/* empty */"
+#~ msgstr "\t\t/* tühi */"
+
 #~ msgid "multiple %%header_extension declarations"
 #~ msgstr "korduvad %%header_extension eklaratsioonid"

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU bison 1.28d\n"
-"POT-Creation-Date: 2001-09-22 18:19+0200\n"
+"POT-Creation-Date: 2001-10-02 18:30+0200\n"
 "PO-Revision-Date: 2001-08-29 20:00-0500\n"
 "Last-Translator: Michel Robitaille <[email protected]>\n"
 "Language-Team: French <[email protected]>\n"
@@ -31,78 +31,78 @@ msgstr "AVERTISSEMENT: "
 msgid "fatal error: "
 msgstr "erreur fatale: "

-#: src/conflicts.c:49
+#: src/conflicts.c:48
 #, c-format
 msgid "Conflict in state %d between rule %d and token %s resolved as %s.\n"
 msgstr ""
 "Conflit à l'état %d entre la règle %d et le terminal %s résolu par %s.\n"

-#: src/conflicts.c:115 src/conflicts.c:138
+#: src/conflicts.c:114 src/conflicts.c:137
 msgid "reduce"
 msgstr "réduction"

-#: src/conflicts.c:121 src/conflicts.c:134
+#: src/conflicts.c:120 src/conflicts.c:133
 msgid "shift"
 msgstr "décalage"

-#: src/conflicts.c:142
+#: src/conflicts.c:141
 msgid "an error"
 msgstr "une erreur"

-#: src/conflicts.c:422
+#: src/conflicts.c:421
 msgid " 1 shift/reduce conflict"
 msgstr " 1 conflit décalage/réduction"

-#: src/conflicts.c:427
+#: src/conflicts.c:426
 #, c-format
 msgid " %d shift/reduce conflicts"
 msgstr " %d conflits décalage/réduction"

-#: src/conflicts.c:433
+#: src/conflicts.c:432
 msgid " and"
 msgstr " et"

-#: src/conflicts.c:439
+#: src/conflicts.c:438
 msgid " 1 reduce/reduce conflict"
 msgstr "1 conflit réduction/réduction"

-#: src/conflicts.c:444
+#: src/conflicts.c:443
 #, c-format
 msgid " %d reduce/reduce conflicts"
 msgstr " %d conflits réduction/réduction"

-#: src/conflicts.c:481
+#: src/conflicts.c:480
 #, c-format
 msgid "State %d contains"
 msgstr "L'état %d contient"

 #. If invoked with `--yacc', use the output format specified by
 #. POSIX.
-#: src/conflicts.c:493
+#: src/conflicts.c:491
 msgid "conflicts: "
 msgstr "conflits: "

-#: src/conflicts.c:495
+#: src/conflicts.c:493
 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d décalage/réduction"

-#: src/conflicts.c:499
+#: src/conflicts.c:497
 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d réduction/réduction"

-#: src/conflicts.c:504
+#: src/conflicts.c:502
 #, c-format
 msgid "%s contains"
 msgstr "%s contient"

-#: src/conflicts.c:590 src/conflicts.c:711
+#: src/conflicts.c:588 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:602 src/print.c:173
+#: src/conflicts.c:600 src/print.c:171
 #, c-format
 msgid ""
 "    $default\treduce using rule %d (%s)\n"
@@ -111,31 +111,31 @@ msgstr ""
 "    $défaut\tréduction par la règle %d (%s)\n"
 "\n"

-#: src/conflicts.c:691 src/conflicts.c:705
+#: 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:732
+#: src/conflicts.c:730
 #, c-format
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr "    $défaut\tréduction par la règle %d (%s)\n"

-#: src/derives.c:44
+#: src/derives.c:43
 msgid "DERIVES"
 msgstr "DÉRIVES"

-#: src/derives.c:49
+#: src/derives.c:48
 #, c-format
 msgid "%s derives"
 msgstr "%s dérive"

-#: src/files.c:132
+#: src/files.c:133
 #, c-format
 msgid "cannot open file `%s'"
 msgstr "ne peut ouvrir le fichier `%s'"

-#: src/files.c:151
+#: src/files.c:152
 msgid "cannot close file"
 msgstr "ne peut fermer le fichier"

@@ -237,7 +237,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:214 src/lex.c:635
+#: src/getargs.c:214 src/lex.c:650
 #, c-format
 msgid "`%s' is no longer supported"
 msgstr "`%s' n'est plus supporté"
@@ -257,137 +257,139 @@ msgstr "%s: grammaire manquante\n"
 msgid "%s: extra arguments ignored after `%s'\n"
 msgstr "%s: paramètres supplémentaires ignorés après `%s'\n"

-#: src/lalr.c:312
+#: src/lalr.c:311
 #, c-format
 msgid "too many gotos (max %d)"
 msgstr "nombre trop grand de \"goto\" (Max %d)"

-#: src/lex.c:72
+#: src/lex.c:78
 msgid "unexpected `/' found and ignored"
 msgstr "`/' inattendu et ignoré"

-#: src/lex.c:101 src/reader.c:270
+#: src/lex.c:107 src/reader.c:269
 msgid "unterminated comment"
 msgstr "le commentaire ne se termine pas"

-#: src/lex.c:133
+#: src/lex.c:139
 msgid "unexpected end of file"
 msgstr "Fin de fichier inattendue"

-#: src/lex.c:162
+#: src/lex.c:168
 msgid "unescaped newline in constant"
 msgstr "retour de chariot sans échappement dans une constante"

-#: src/lex.c:204
+#: src/lex.c:210
 #, c-format
 msgid "octal value outside range 0...255: `\\%o'"
 msgstr "valeur octale à l'extérieur de l'intervalle 0...255: \\%o"

-#: src/lex.c:229
+#: src/lex.c:235
 #, c-format
 msgid "hexadecimal value above 255: `\\x%x'"
 msgstr "valeur hexadécimale supérieure à 255: \\x%x"

-#: src/lex.c:241
+#: src/lex.c:247
 #, c-format
 msgid "unknown escape sequence: `\\' followed by `%s'"
 msgstr "séquence d'échappement inconnue: `\\' suivie de `%s'"

-#: src/lex.c:337
+#: src/lex.c:343
 msgid "unterminated type name at end of file"
 msgstr "le nom de type ne se termine pas avant la fin de fichier"

-#: src/lex.c:340
+#: src/lex.c:346
 msgid "unterminated type name"
 msgstr "le nom de type ne se termine pas"

-#: src/lex.c:432
+#: src/lex.c:437
 msgid "use \"...\" for multi-character literal tokens"
 msgstr "utilisez \"...\" pour les terminaux litéraux de plusieurs caractères"

-#: src/main.c:108
+#: src/main.c:125
 #, c-format
 msgid "%s: internal error: %s\n"
 msgstr "%s: erreur interne: %s\n"

-#: src/nullable.c:52
+#: src/nullable.c:51
 msgid "Entering set_nullable"
 msgstr "Entré dans set_nullable"

-#: src/output.c:993
+#: src/output.c:986
 #, c-format
 msgid "maximum table size (%d) exceeded"
 msgstr "taille maximale de la table (%d) dépassée"

-#: src/print.c:38
+#: src/print.c:37
 #, c-format
 msgid " type %d is %s\n"
 msgstr " le type %d est %s\n"

-#: src/print.c:86
+#: src/print.c:85
 #, c-format
 msgid "   (rule %d)"
 msgstr "   (règle %d)"

-#: src/print.c:112
+#: src/print.c:111
 msgid "    $default\taccept\n"
 msgstr "    $défaut\taccepter\n"

-#: src/print.c:114
+#: src/print.c:113
 msgid "    NO ACTIONS\n"
 msgstr "    PAS D'ACTION\n"

-#: src/print.c:133
+#: src/print.c:132
 #, c-format
 msgid "    $   \tgo to state %d\n"
 msgstr "    $   \taller à l'état %d\n"

-#: src/print.c:136
+#: src/print.c:135
 #, c-format
 msgid "    %-4s\tshift, and go to state %d\n"
 msgstr "    %-4s\tdécalage et aller à l'état %d\n"

-#: src/print.c:160
+#: src/print.c:159
 #, c-format
 msgid "    %-4s\terror (nonassociative)\n"
 msgstr "    %-4s\terreur (non-associatif)\n"

-#: src/print.c:190
+#: src/print.c:187
 #, c-format
 msgid "    %-4s\tgo to state %d\n"
 msgstr "    %-4s\taller à l'état %d\n"

-#: src/print.c:202
+#: src/print.c:199
 #, c-format
 msgid "state %d"
 msgstr "état %d"

-#: src/print.c:233
+#. rule # : LHS -> RHS
+#: src/print.c:229
 msgid "Grammar"
 msgstr "Grammaire"

-#: src/print.c:240
+#: src/print.c:234
 #, c-format
 msgid "rule %-4d %s ->"
 msgstr "règle %-4d %s ->"

-#: src/print.c:246
-msgid "\t\t/* empty */"
-msgstr "\t\t/* epsilon */"
+#: src/print.c:240
+msgid "empty"
+msgstr ""

-#: src/print.c:253
+#. TERMINAL (type #) : rule #s terminal is on RHS
+#: src/print.c:244
 msgid "Terminals, with rules where they appear"
 msgstr "Terminaux, suivis des règles où ils apparaissent"

-#: src/print.c:302
+#: src/print.c:268
 msgid "Nonterminals, with rules where they appear"
 msgstr "Non-terminaux, suivis des règles où ils apparaissent"

-#: src/print.c:329
+#: src/print.c:294
 msgid " on left:"
 msgstr " à gauche:"

-#: src/print.c:344
+#: src/print.c:309
 msgid " on right:"
 msgstr " à droite:"

@@ -401,244 +403,244 @@ msgstr "%-4s\terreur (non-associatif)"
 msgid "$default\treduce using rule %d (%s)"
 msgstr "$défaut\tréduction par la règle %d (%s)"

-#: src/reader.c:79
+#: src/reader.c:78
 msgid "   Skipping to next \\n"
 msgstr "   Saut jusqu'au prochain \\n"

-#: src/reader.c:81
+#: src/reader.c:80
 #, c-format
 msgid "   Skipping to next %c"
 msgstr "   Saut jusqu'au prochain %c"

-#: src/reader.c:132 src/reader.c:144
+#: src/reader.c:131 src/reader.c:143
 msgid "invalid $ value"
 msgstr "la valeur de symbole $ n'est pas valide"

-#: src/reader.c:170 src/reader.c:185
+#: src/reader.c:169 src/reader.c:184
 msgid "unterminated string at end of file"
 msgstr "chaîne de caractères non terminée en fin de fichier"

-#: src/reader.c:173
+#: src/reader.c:172
 msgid "unterminated string"
 msgstr "chaîne de caractère non terminée"

-#: src/reader.c:326 src/reader.c:390
+#: src/reader.c:325 src/reader.c:389
 #, c-format
 msgid "%s is invalid"
 msgstr "%s n'est pas valide"

-#: src/reader.c:366
+#: src/reader.c:365
 #, c-format
 msgid "$$ of `%s' has no declared type"
 msgstr "$$ de `%s' n'a pas son type déclaré"

-#: src/reader.c:383
+#: src/reader.c:382
 #, c-format
 msgid "$%d of `%s' has no declared type"
 msgstr "$%d de `%s' n'a pas de type déclaré"

-#: src/reader.c:437
+#: src/reader.c:436
 msgid "unterminated `%{' definition"
 msgstr "La section de définition (%{) ne termine pas avant la fin du fichier"

-#: src/reader.c:482 src/reader.c:598 src/reader.c:648
+#: src/reader.c:481 src/reader.c:595 src/reader.c:645
 #, c-format
 msgid "Premature EOF after %s"
 msgstr "Fin de fichier prématutée après %s"

-#: src/reader.c:499
+#: src/reader.c:498
 #, c-format
 msgid "symbol `%s' used more than once as a literal string"
 msgstr "symbole `%s' utilisé plus d'une fois dans une chaîne litérale"

-#: src/reader.c:502
+#: src/reader.c:501
 #, c-format
 msgid "symbol `%s' given more than one literal string"
 msgstr "symbole `%s' présent dans plus d'une chaîne litérale"

-#: src/reader.c:524 src/reader.c:667
+#: src/reader.c:522 src/reader.c:664
 #, c-format
 msgid "symbol %s redefined"
 msgstr "symbole %s redéfini"

-#: src/reader.c:534 src/reader.c:613 src/reader.c:674 src/reader.c:1290
+#: src/reader.c:532 src/reader.c:610 src/reader.c:671 src/reader.c:1285
 #, c-format
 msgid "type redeclaration for %s"
 msgstr "redéclaration du type de %s"

-#: src/reader.c:544
+#: src/reader.c:541
 #, c-format
 msgid "`%s' is invalid in %s"
 msgstr "`%s' n'est pas valide dans %s"

-#: src/reader.c:561 src/reader.c:721
+#: src/reader.c:558 src/reader.c:717
 #, c-format
 msgid "multiple %s declarations"
 msgstr "multiples déclarations %s"

-#: src/reader.c:563 src/reader.c:902 src/reader.c:927 src/reader.c:1268
+#: src/reader.c:560 src/reader.c:897 src/reader.c:922 src/reader.c:1263
 #, c-format
 msgid "invalid %s declaration"
 msgstr "la déclaration %s n'est pas valide"

-#: src/reader.c:583
+#: src/reader.c:580
 msgid "%type declaration has no <typename>"
 msgstr "la déclaration %type n'a pas de <nom_de_type>"

-#: src/reader.c:618
+#: src/reader.c:615
 #, c-format
 msgid "invalid %%type declaration due to item: %s"
 msgstr "la déclaration %%type n'est pas valide en raison de l'item: %s"

-#: src/reader.c:663
+#: src/reader.c:660
 #, c-format
 msgid "redefining precedence of %s"
 msgstr "redéfinition du niveau de priorité de %s"

-#: src/reader.c:687
+#: src/reader.c:683
 #, c-format
 msgid "invalid text (%s) - number should be after identifier"
 msgstr ""
 "le texte n'est pas valide (%s) - le nombre devrait suivre l'identificateur"

-#: src/reader.c:697
+#: src/reader.c:693
 #, c-format
 msgid "unexpected item: %s"
 msgstr "item inattendu: %s"

-#: src/reader.c:764 src/reader.c:1094 src/reader.c:1165
+#: src/reader.c:760 src/reader.c:1089 src/reader.c:1160
 #, c-format
 msgid "unmatched %s"
 msgstr "non appariement de %s"

-#: src/reader.c:796
+#: src/reader.c:792
 #, c-format
 msgid "argument of %%expect is not an integer"
 msgstr "le paramètre de %%expect n'est pas un entier"

-#: src/reader.c:843
+#: src/reader.c:838
 #, c-format
 msgid "unrecognized item %s, expected an identifier"
 msgstr "item %s non reconnu, un identificateur est attendu"

-#: src/reader.c:867
+#: src/reader.c:862
 #, c-format
 msgid "expected string constant instead of %s"
 msgstr "chaîne de caractères constante attendue plutôt que %s"

-#: src/reader.c:1010
+#: src/reader.c:1005
 #, c-format
 msgid "unrecognized: %s"
 msgstr "non reconnu: %s"

-#: src/reader.c:1015
+#: src/reader.c:1010
 msgid "no input grammar"
 msgstr "aucune grammaire en entrée"

-#: src/reader.c:1020
+#: src/reader.c:1015
 #, c-format
 msgid "unknown character: %s"
 msgstr "caractère inconnu: %s"

-#: src/reader.c:1188
+#: src/reader.c:1183
 #, c-format
 msgid "unterminated %guard clause"
 msgstr "clause %guard non terminée"

-#: src/reader.c:1355
+#: src/reader.c:1350
 msgid "ill-formed rule: initial symbol not followed by colon"
 msgstr "règle mal formée: le symbole initial n'est pas suivi de `:'"

-#: src/reader.c:1362
+#: src/reader.c:1357
 msgid "grammar starts with vertical bar"
 msgstr "la grammaire débute par une barre verticale"

-#: src/reader.c:1393
+#: src/reader.c:1388
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "la règle pour %s, qui est un terminal"

-#: src/reader.c:1495
+#: src/reader.c:1490
 msgid "two @prec's in a row"
 msgstr "deux @prec de suite"

-#: src/reader.c:1503
+#: src/reader.c:1498
 #, 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:1512
+#: src/reader.c:1507
 msgid "two actions at end of one rule"
 msgstr "deux actions à la fin d'une même règle"

-#: src/reader.c:1526
+#: src/reader.c:1521
 #, 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:1532
+#: src/reader.c:1527
 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:1576
+#: src/reader.c:1571
 #, c-format
 msgid "invalid input: %s"
 msgstr "entrée non valide: %s"

-#: src/reader.c:1584
+#: src/reader.c:1579
 #, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "trop de symboles (jeton plus non terminaux); maximum %d"

-#: src/reader.c:1587
+#: src/reader.c:1582
 msgid "no rules in the input grammar"
 msgstr "la grammaire n'a pas de règles"

-#: src/reader.c:1611
+#: src/reader.c:1606
 #, 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:1716
+#: src/reader.c:1712
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "les priorités pour %s et %s entrent en conflit"

-#: src/reader.c:1728
+#: src/reader.c:1724
 #, 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:1779
+#: 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:1792
+#: src/reader.c:1782
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "le symbole de départ %s n'est pas défini"

-#: src/reader.c:1794
+#: src/reader.c:1784
 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "le symbole de départ %s est un terminal"

-#: src/reduce.c:402
+#: src/reduce.c:401
 msgid "Useless nonterminals:"
 msgstr "Non-terminaux inutiles:"

-#: src/reduce.c:417
+#: src/reduce.c:416
 msgid "Terminals which are not used:"
 msgstr "Terminaux non utilisés:"

-#: src/reduce.c:428
+#: src/reduce.c:427
 msgid "Useless rules:"
 msgstr "Règles inutiles:"

-#: src/reduce.c:457
+#: src/reduce.c:456
 msgid ""
 "Variables\n"
 "---------\n"
@@ -648,11 +650,11 @@ msgstr ""
 "---------\n"
 "\n"

-#: src/reduce.c:459
+#: src/reduce.c:458
 msgid "Value  Sprec    Sassoc    Tag\n"
 msgstr "Valeur Spréc    Sassoc    Tag\n"

-#: src/reduce.c:464
+#: src/reduce.c:463
 msgid ""
 "Rules\n"
 "-----\n"
@@ -662,7 +664,7 @@ msgstr ""
 "------\n"
 "\n"

-#: src/reduce.c:475
+#: src/reduce.c:474
 msgid ""
 "Rules interpreted\n"
 "-----------------\n"
@@ -672,36 +674,36 @@ msgstr ""
 "-------------------\n"
 "\n"

-#: src/reduce.c:492
+#: src/reduce.c:491
 #, c-format
 msgid "%d rules never reduced\n"
 msgstr "%d règles jamais réduites\n"

-#: src/reduce.c:494
+#: src/reduce.c:493
 #, c-format
 msgid "%s contains "
 msgstr "%s contient "

-#: src/reduce.c:498
+#: src/reduce.c:497
 #, c-format
 msgid "%d useless nonterminal%s"
 msgstr "%d catégories non productives%s"

-#: src/reduce.c:503
+#: src/reduce.c:502
 msgid " and "
 msgstr " et "

-#: src/reduce.c:507
+#: src/reduce.c:506
 #, c-format
 msgid "%d useless rule%s"
 msgstr "%d règle(s) non productive(s)%s"

-#: src/reduce.c:540
+#: src/reduce.c:539
 #, c-format
 msgid "Start symbol %s does not derive any sentence"
 msgstr "Aucune phrase ne peut être dérivée du symbole de départ %s"

-#: src/reduce.c:553
+#: src/reduce.c:552
 #, c-format
 msgid ""
 "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n"
@@ -788,14 +790,17 @@ msgstr "m
 #. MARK).  A British English Unicode locale should instead
 #. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and
 #. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
-#: lib/quotearg.c:259
+#: lib/quotearg.c:268
 msgid "`"
 msgstr "`"

-#: lib/quotearg.c:260
+#: lib/quotearg.c:269
 msgid "'"
 msgstr "'"

+#~ msgid "\t\t/* empty */"
+#~ msgstr "\t\t/* epsilon */"
+
 #~ msgid "multiple %%header_extension declarations"
 #~ msgstr "multiples déclarations %%header_extension"

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU bison 1.28\n"
-"POT-Creation-Date: 2001-09-22 18:19+0200\n"
+"POT-Creation-Date: 2001-10-02 18:30+0200\n"
 "PO-Revision-Date: 1999-09-28 21:10+0900\n"
 "Last-Translator: Daisuke Yamashita <[email protected]>\n"
 "Language-Team: Japanese <[email protected]>\n"
@@ -31,77 +31,77 @@ msgstr ""
 msgid "fatal error: "
 msgstr "%s: 致命的エラー: "

-#: src/conflicts.c:49
+#: src/conflicts.c:48
 #, c-format
 msgid "Conflict in state %d between rule %d and token %s resolved as %s.\n"
 msgstr "状態 %d の規則 %d とトークン %s の競合を%sとして解決。\n"

-#: src/conflicts.c:115 src/conflicts.c:138
+#: src/conflicts.c:114 src/conflicts.c:137
 msgid "reduce"
 msgstr "還元"

-#: src/conflicts.c:121 src/conflicts.c:134
+#: src/conflicts.c:120 src/conflicts.c:133
 msgid "shift"
 msgstr "シフト"

-#: src/conflicts.c:142
+#: src/conflicts.c:141
 msgid "an error"
 msgstr "エラー"

-#: src/conflicts.c:422
+#: src/conflicts.c:421
 msgid " 1 shift/reduce conflict"
 msgstr " 1 シフト/還元衝突"

-#: src/conflicts.c:427
+#: src/conflicts.c:426
 #, c-format
 msgid " %d shift/reduce conflicts"
 msgstr " %d シフト/還元衝突"

-#: src/conflicts.c:433
+#: src/conflicts.c:432
 msgid " and"
 msgstr " および"

-#: src/conflicts.c:439
+#: src/conflicts.c:438
 msgid " 1 reduce/reduce conflict"
 msgstr " 1 還元/還元衝突"

-#: src/conflicts.c:444
+#: src/conflicts.c:443
 #, c-format
 msgid " %d reduce/reduce conflicts"
 msgstr " %d 還元/還元衝突"

-#: src/conflicts.c:481
+#: src/conflicts.c:480
 #, c-format
 msgid "State %d contains"
 msgstr "状態 %d が含むのは"

 #. If invoked with `--yacc', use the output format specified by
 #. POSIX.
-#: src/conflicts.c:493
+#: src/conflicts.c:491
 msgid "conflicts: "
 msgstr "衝突: "

-#: src/conflicts.c:495
+#: src/conflicts.c:493
 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d シフト/還元"

-#: src/conflicts.c:499
+#: src/conflicts.c:497
 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d 還元/還元"

-#: src/conflicts.c:504
+#: src/conflicts.c:502
 #, c-format
 msgid "%s contains"
 msgstr "%s には、"

-#: src/conflicts.c:590 src/conflicts.c:711
+#: src/conflicts.c:588 src/conflicts.c:709
 #, c-format
 msgid "    %-4s\t[reduce using rule %d (%s)]\n"
 msgstr "    %-4s\t[規則 %d を利用して還元 (%s)]\n"

-#: src/conflicts.c:602 src/print.c:173
+#: src/conflicts.c:600 src/print.c:171
 #, c-format
 msgid ""
 "    $default\treduce using rule %d (%s)\n"
@@ -110,17 +110,17 @@ msgstr ""
 "    $default\t規則 %d を利用して還元 (%s)\n"
 "\n"

-#: src/conflicts.c:691 src/conflicts.c:705
+#: 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:732
+#: src/conflicts.c:730
 #, c-format
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr "    $default\t規則 %d を利用して還元 (%s)\n"

-#: src/derives.c:44
+#: src/derives.c:43
 #, fuzzy
 msgid "DERIVES"
 msgstr ""
@@ -130,17 +130,17 @@ msgstr ""
 "DERIVES\n"
 "\n"

-#: src/derives.c:49
+#: src/derives.c:48
 #, c-format
 msgid "%s derives"
 msgstr "%s は以下から派生"

-#: src/files.c:132
+#: src/files.c:133
 #, c-format
 msgid "cannot open file `%s'"
 msgstr ""

-#: src/files.c:151
+#: src/files.c:152
 msgid "cannot close file"
 msgstr ""

@@ -214,7 +214,7 @@ msgid ""
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""

-#: src/getargs.c:214 src/lex.c:635
+#: src/getargs.c:214 src/lex.c:650
 #, c-format
 msgid "`%s' is no longer supported"
 msgstr ""
@@ -234,108 +234,108 @@ msgstr "%s: ʸˡ
 msgid "%s: extra arguments ignored after `%s'\n"
 msgstr "%s: '%s' より後ろの余分な引数は無視されました\n"

-#: src/lalr.c:312
+#: src/lalr.c:311
 #, fuzzy, c-format
 msgid "too many gotos (max %d)"
 msgstr "%s の数が多すぎます (最大 %d)"

-#: src/lex.c:72
+#: src/lex.c:78
 msgid "unexpected `/' found and ignored"
 msgstr "予期しない `/' が見つかり、無視されました"

-#: src/lex.c:101 src/reader.c:270
+#: src/lex.c:107 src/reader.c:269
 msgid "unterminated comment"
 msgstr "閉じていないコメントです"

-#: src/lex.c:133
+#: src/lex.c:139
 #, fuzzy
 msgid "unexpected end of file"
 msgstr "予期しないファイルの終端です"

-#: src/lex.c:162
+#: src/lex.c:168
 msgid "unescaped newline in constant"
 msgstr "定数の中にエスケープされていない改行があります"

-#: src/lex.c:204
+#: src/lex.c:210
 #, c-format
 msgid "octal value outside range 0...255: `\\%o'"
 msgstr "8 進数の値が 0...255 の範囲外です: `\\%o'"

-#: src/lex.c:229
+#: src/lex.c:235
 #, c-format
 msgid "hexadecimal value above 255: `\\x%x'"
 msgstr "16 進数の値が 255 を越えています: `\\x%x'"

-#: src/lex.c:241
+#: src/lex.c:247
 #, c-format
 msgid "unknown escape sequence: `\\' followed by `%s'"
 msgstr "未知のエスケープシーケンス: `\\' の後に `%s'"

-#: src/lex.c:337
+#: src/lex.c:343
 msgid "unterminated type name at end of file"
 msgstr "閉じられていないタイプ名が、ファイル末尾にあります"

-#: src/lex.c:340
+#: src/lex.c:346
 msgid "unterminated type name"
 msgstr "閉じられていないタイプ名があります"

-#: src/lex.c:432
+#: src/lex.c:437
 msgid "use \"...\" for multi-character literal tokens"
 msgstr "複数文字のリテラルトークンには \"...\" を使いましょう"

-#: src/main.c:108
+#: src/main.c:125
 #, c-format
 msgid "%s: internal error: %s\n"
 msgstr "%s: 内部エラー: %s\n"

-#: src/nullable.c:52
+#: src/nullable.c:51
 msgid "Entering set_nullable"
 msgstr "set_nullable に入ります"

-#: src/output.c:993
+#: src/output.c:986
 #, fuzzy, c-format
 msgid "maximum table size (%d) exceeded"
 msgstr "最大テーブルサイズ (%s) を超えました"

-#: src/print.c:38
+#: src/print.c:37
 #, c-format
 msgid " type %d is %s\n"
 msgstr " タイプ %d は %s です\n"

-#: src/print.c:86
+#: src/print.c:85
 #, c-format
 msgid "   (rule %d)"
 msgstr "   (規則 %d)"

-#: src/print.c:112
+#: src/print.c:111
 msgid "    $default\taccept\n"
 msgstr "    $default\taccept\n"

-#: src/print.c:114
+#: src/print.c:113
 msgid "    NO ACTIONS\n"
 msgstr "    動作無し\n"

-#: src/print.c:133
+#: src/print.c:132
 #, c-format
 msgid "    $   \tgo to state %d\n"
 msgstr "    $   \t状態 %d へ\n"

-#: src/print.c:136
+#: src/print.c:135
 #, c-format
 msgid "    %-4s\tshift, and go to state %d\n"
 msgstr "    %-4s\tシフト、および状態 %d へ\n"

-#: src/print.c:160
+#: src/print.c:159
 #, c-format
 msgid "    %-4s\terror (nonassociative)\n"
 msgstr "    %-4s\tエラー (非結合)\n"

-#: src/print.c:190
+#: src/print.c:187
 #, c-format
 msgid "    %-4s\tgo to state %d\n"
 msgstr "    %-4s\t状態 %d へ\n"

-#: src/print.c:202
+#: src/print.c:199
 #, fuzzy, c-format
 msgid "state %d"
 msgstr ""
@@ -344,23 +344,25 @@ msgstr ""
 "状態 %d\n"
 "\n"

-#: src/print.c:233
+#. rule # : LHS -> RHS
+#: src/print.c:229
 #, fuzzy
 msgid "Grammar"
 msgstr ""
 "\n"
 "文法\n"

-#: src/print.c:240
+#: src/print.c:234
 #, c-format
 msgid "rule %-4d %s ->"
 msgstr "規則 %-4d %s ->"

-#: src/print.c:246
-msgid "\t\t/* empty */"
-msgstr "\t\t/* ¶õ */"
+#: src/print.c:240
+msgid "empty"
+msgstr ""

-#: src/print.c:253
+#. TERMINAL (type #) : rule #s terminal is on RHS
+#: src/print.c:244
 #, fuzzy
 msgid "Terminals, with rules where they appear"
 msgstr ""
@@ -368,7 +370,7 @@ msgstr ""
 "終端トークン、およびそこに現れた規則\n"
 "\n"

-#: src/print.c:302
+#: src/print.c:268
 #, fuzzy
 msgid "Nonterminals, with rules where they appear"
 msgstr ""
@@ -376,11 +378,11 @@ msgstr ""
 "非終端トークン、およびそこに現れた規則\n"
 "\n"

-#: src/print.c:329
+#: src/print.c:294
 msgid " on left:"
 msgstr " 左辺:"

-#: src/print.c:344
+#: src/print.c:309
 msgid " on right:"
 msgstr " 右辺:"

@@ -394,238 +396,238 @@ msgstr "    %-4s\t
 msgid "$default\treduce using rule %d (%s)"
 msgstr "    $default\t規則 %d を利用して還元 (%s)\n"

-#: src/reader.c:79
+#: src/reader.c:78
 msgid "   Skipping to next \\n"
 msgstr "   次の \\n にスキップ"

-#: src/reader.c:81
+#: src/reader.c:80
 #, c-format
 msgid "   Skipping to next %c"
 msgstr "   次の %c にスキップ"

-#: src/reader.c:132 src/reader.c:144
+#: src/reader.c:131 src/reader.c:143
 msgid "invalid $ value"
 msgstr "無効な $ の値"

-#: src/reader.c:170 src/reader.c:185
+#: src/reader.c:169 src/reader.c:184
 msgid "unterminated string at end of file"
 msgstr "閉じられていない文字列がファイル末尾にあります"

-#: src/reader.c:173
+#: src/reader.c:172
 msgid "unterminated string"
 msgstr "閉じられていない文字列"

-#: src/reader.c:326 src/reader.c:390
+#: src/reader.c:325 src/reader.c:389
 #, fuzzy, c-format
 msgid "%s is invalid"
 msgstr "@%s は無効です"

-#: src/reader.c:366
+#: src/reader.c:365
 #, c-format
 msgid "$$ of `%s' has no declared type"
 msgstr "`%s' の $$ に宣言のない型があります"

-#: src/reader.c:383
+#: src/reader.c:382
 #, fuzzy, c-format
 msgid "$%d of `%s' has no declared type"
 msgstr "`%s' の $%s に宣言のない型があります"

-#: src/reader.c:437
+#: src/reader.c:436
 msgid "unterminated `%{' definition"
 msgstr "`%{' 定義 が閉じられていません"

-#: src/reader.c:482 src/reader.c:598 src/reader.c:648
+#: src/reader.c:481 src/reader.c:595 src/reader.c:645
 #, c-format
 msgid "Premature EOF after %s"
 msgstr ""

-#: src/reader.c:499
+#: src/reader.c:498
 #, c-format
 msgid "symbol `%s' used more than once as a literal string"
 msgstr ""

-#: src/reader.c:502
+#: src/reader.c:501
 #, c-format
 msgid "symbol `%s' given more than one literal string"
 msgstr ""

-#: src/reader.c:524 src/reader.c:667
+#: src/reader.c:522 src/reader.c:664
 #, c-format
 msgid "symbol %s redefined"
 msgstr "シンボル %s が再定義されました"

-#: src/reader.c:534 src/reader.c:613 src/reader.c:674 src/reader.c:1290
+#: src/reader.c:532 src/reader.c:610 src/reader.c:671 src/reader.c:1285
 #, c-format
 msgid "type redeclaration for %s"
 msgstr "%s の型が再定義されました"

-#: src/reader.c:544
+#: src/reader.c:541
 #, c-format
 msgid "`%s' is invalid in %s"
 msgstr "%2$s 内の `%1$s' は無効です"

-#: src/reader.c:561 src/reader.c:721
+#: src/reader.c:558 src/reader.c:717
 #, fuzzy, c-format
 msgid "multiple %s declarations"
 msgstr "複数の %start が宣言されました"

-#: src/reader.c:563 src/reader.c:902 src/reader.c:927 src/reader.c:1268
+#: src/reader.c:560 src/reader.c:897 src/reader.c:922 src/reader.c:1263
 #, fuzzy, c-format
 msgid "invalid %s declaration"
 msgstr "無効な %start が宣言されました"

-#: src/reader.c:583
+#: src/reader.c:580
 msgid "%type declaration has no <typename>"
 msgstr "%type 宣言に <タイプ名> がありません"

-#: src/reader.c:618
+#: src/reader.c:615
 #, fuzzy, c-format
 msgid "invalid %%type declaration due to item: %s"
 msgstr "アイテムに与えられるべき %%type 宣言が無効です: `%s'"

-#: src/reader.c:663
+#: src/reader.c:660
 #, c-format
 msgid "redefining precedence of %s"
 msgstr "%s に先行した再定義です"

-#: src/reader.c:687
+#: src/reader.c:683
 #, c-format
 msgid "invalid text (%s) - number should be after identifier"
 msgstr "無効なテキスト (%s) - 数値は識別子の後ろにあるべきです"

-#: src/reader.c:697
+#: src/reader.c:693
 #, c-format
 msgid "unexpected item: %s"
 msgstr "予期せぬアイテム: %s"

-#: src/reader.c:764 src/reader.c:1094 src/reader.c:1165
+#: src/reader.c:760 src/reader.c:1089 src/reader.c:1160
 #, fuzzy, c-format
 msgid "unmatched %s"
 msgstr "対応のない `{' です"

-#: src/reader.c:796
+#: src/reader.c:792
 #, fuzzy, c-format
 msgid "argument of %%expect is not an integer"
 msgstr "%expect の引数が整数値ではありません"

-#: src/reader.c:843
+#: src/reader.c:838
 #, c-format
 msgid "unrecognized item %s, expected an identifier"
 msgstr "認識できないアイテム %s、ここでは識別子が期待されます"

-#: src/reader.c:867
+#: src/reader.c:862
 #, c-format
 msgid "expected string constant instead of %s"
 msgstr "ここでは %s ではなく文字列定数が期待されます"

-#: src/reader.c:1010
+#: src/reader.c:1005
 #, c-format
 msgid "unrecognized: %s"
 msgstr "認識できない: %s"

-#: src/reader.c:1015
+#: src/reader.c:1010
 msgid "no input grammar"
 msgstr "文法の入力が無い"

-#: src/reader.c:1020
+#: src/reader.c:1015
 #, c-format
 msgid "unknown character: %s"
 msgstr "未知の文字: %s"

-#: src/reader.c:1188
+#: src/reader.c:1183
 #, fuzzy, c-format
 msgid "unterminated %guard clause"
 msgstr "閉じられていない %%guard 節です"

-#: src/reader.c:1355
+#: src/reader.c:1350
 msgid "ill-formed rule: initial symbol not followed by colon"
 msgstr "邪悪な規則: 初期化シンボルにコロン (:) が続いていません"

-#: src/reader.c:1362
+#: src/reader.c:1357
 msgid "grammar starts with vertical bar"
 msgstr "文法は縦棒 (|) で始めます"

-#: src/reader.c:1393
+#: src/reader.c:1388
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "%s に規則が与えられ、それはトークンとなります"

-#: src/reader.c:1495
+#: src/reader.c:1490
 msgid "two @prec's in a row"
 msgstr "@prec のもの二つが同列になっています"

-#: src/reader.c:1503
+#: src/reader.c:1498
 #, c-format
 msgid "%%guard present but %%semantic_parser not specified"
 msgstr "%%guard がありますが %%semantic_parser が指定されていません"

-#: src/reader.c:1512
+#: src/reader.c:1507
 msgid "two actions at end of one rule"
 msgstr "一つの規則の終りに二つの動作を指定しています"

-#: src/reader.c:1526
+#: src/reader.c:1521
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "初期状態の動作では型 (`%s' `%s') が衝突します"

-#: src/reader.c:1532
+#: src/reader.c:1527
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "空の型付き非終端アイテム用規則であり、動作が起りません"

-#: src/reader.c:1576
+#: src/reader.c:1571
 #, c-format
 msgid "invalid input: %s"
 msgstr "無効な入力: %s"

-#: src/reader.c:1584
+#: src/reader.c:1579
 #, fuzzy, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "シンボルが多すぎます (トークンと非終端アイテム) -- 最大 %s"

-#: src/reader.c:1587
+#: src/reader.c:1582
 msgid "no rules in the input grammar"
 msgstr "入力した文法に規則が定義されていません"

-#: src/reader.c:1611
+#: src/reader.c:1606
 #, c-format
 msgid "symbol %s is used, but is not defined as a token and has no rules"
 msgstr ""
 "シンボル %s が使われていますが、トークンとして定義されておらず、規則を持ちま"
 "せん"

-#: src/reader.c:1716
+#: src/reader.c:1712
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "先行している %s と %s で競合が生じています"

-#: src/reader.c:1728
+#: src/reader.c:1724
 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "非結合値 %s と %s で競合が生じています"

-#: src/reader.c:1779
+#: src/reader.c:1770
 #, fuzzy, c-format
 msgid "tokens %s and %s both assigned number %d"
 msgstr "トークン %s と %s の双方が番号 %s に割り当てられました"

-#: src/reader.c:1792
+#: src/reader.c:1782
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "開始シンボル %s は定義されていません"

-#: src/reader.c:1794
+#: src/reader.c:1784
 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "開始シンボル %s はトークンです"

-#: src/reduce.c:402
+#: src/reduce.c:401
 #, fuzzy
 msgid "Useless nonterminals:"
 msgstr ""
 "不使用非終端子:\n"
 "\n"

-#: src/reduce.c:417
+#: src/reduce.c:416
 #, fuzzy
 msgid "Terminals which are not used:"
 msgstr ""
@@ -634,7 +636,7 @@ msgstr ""
 "利用されない終端子:\n"
 "\n"

-#: src/reduce.c:428
+#: src/reduce.c:427
 #, fuzzy
 msgid "Useless rules:"
 msgstr ""
@@ -643,7 +645,7 @@ msgstr ""
 "不使用規則:\n"
 "\n"

-#: src/reduce.c:457
+#: src/reduce.c:456
 msgid ""
 "Variables\n"
 "---------\n"
@@ -653,11 +655,11 @@ msgstr ""
 "---------\n"
 "\n"

-#: src/reduce.c:459
+#: src/reduce.c:458
 msgid "Value  Sprec    Sassoc    Tag\n"
 msgstr "値     前置     結合      タグ\n"

-#: src/reduce.c:464
+#: src/reduce.c:463
 msgid ""
 "Rules\n"
 "-----\n"
@@ -667,7 +669,7 @@ msgstr ""
 "-----\n"
 "\n"

-#: src/reduce.c:475
+#: src/reduce.c:474
 msgid ""
 "Rules interpreted\n"
 "-----------------\n"
@@ -677,36 +679,36 @@ msgstr ""
 "-----------------\n"
 "\n"

-#: src/reduce.c:492
+#: src/reduce.c:491
 #, c-format
 msgid "%d rules never reduced\n"
 msgstr "%d 個の規則は決して還元されません\n"

-#: src/reduce.c:494
+#: src/reduce.c:493
 #, c-format
 msgid "%s contains "
 msgstr "%s には"

-#: src/reduce.c:498
+#: src/reduce.c:497
 #, c-format
 msgid "%d useless nonterminal%s"
 msgstr "%d 個の不使用非終端子%.0s"

-#: src/reduce.c:503
+#: src/reduce.c:502
 msgid " and "
 msgstr "および"

-#: src/reduce.c:507
+#: src/reduce.c:506
 #, c-format
 msgid "%d useless rule%s"
 msgstr "%d 個の不使用規則%.0s"

-#: src/reduce.c:540
+#: src/reduce.c:539
 #, c-format
 msgid "Start symbol %s does not derive any sentence"
 msgstr "開始シンボル %s はどの文にも由来しません"

-#: src/reduce.c:553
+#: src/reduce.c:552
 #, c-format
 msgid ""
 "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n"
@@ -794,11 +796,11 @@ msgstr "%s:
 #. MARK).  A British English Unicode locale should instead
 #. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and
 #. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
-#: lib/quotearg.c:259
+#: lib/quotearg.c:268
 msgid "`"
 msgstr ""

-#: lib/quotearg.c:260
+#: lib/quotearg.c:269
 msgid "'"
 msgstr ""

@@ -879,6 +881,9 @@ msgstr ""
 #~ msgid "%s:%d: "
 #~ msgstr "%s:%d: "

+#~ msgid "\t\t/* empty */"
+#~ msgstr "\t\t/* ¶õ */"
+
 #~ msgid "unterminated comment in `%{' definition"
 #~ msgstr "`%{' 定義 に閉じられていないコメントがあります"

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.25\n"
-"POT-Creation-Date: 2001-09-22 18:19+0200\n"
+"POT-Creation-Date: 2001-10-02 18:30+0200\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"
@@ -31,77 +31,77 @@ msgstr ""
 msgid "fatal error: "
 msgstr "fatale fout: %s\n"

-#: src/conflicts.c:49
+#: src/conflicts.c:48
 #, c-format
 msgid "Conflict in state %d between rule %d and token %s resolved as %s.\n"
 msgstr "Conflict in stadium %d tussen regel %d en teken %s opgelost als %s.\n"

-#: src/conflicts.c:115 src/conflicts.c:138
+#: src/conflicts.c:114 src/conflicts.c:137
 msgid "reduce"
 msgstr "reduceer"

-#: src/conflicts.c:121 src/conflicts.c:134
+#: src/conflicts.c:120 src/conflicts.c:133
 msgid "shift"
 msgstr "verschuif"

-#: src/conflicts.c:142
+#: src/conflicts.c:141
 msgid "an error"
 msgstr "een fout"

-#: src/conflicts.c:422
+#: src/conflicts.c:421
 msgid " 1 shift/reduce conflict"
 msgstr " 1 verschuif/reduceer conflict"

-#: src/conflicts.c:427
+#: src/conflicts.c:426
 #, c-format
 msgid " %d shift/reduce conflicts"
 msgstr " %d verschuif/reduceer conflicten"

-#: src/conflicts.c:433
+#: src/conflicts.c:432
 msgid " and"
 msgstr " en"

-#: src/conflicts.c:439
+#: src/conflicts.c:438
 msgid " 1 reduce/reduce conflict"
 msgstr " 1 reduceer/reduceer conflict"

-#: src/conflicts.c:444
+#: src/conflicts.c:443
 #, c-format
 msgid " %d reduce/reduce conflicts"
 msgstr " %d reduceer/reduceer conflicten"

-#: src/conflicts.c:481
+#: src/conflicts.c:480
 #, c-format
 msgid "State %d contains"
 msgstr "Stadium %d bevat"

 #. If invoked with `--yacc', use the output format specified by
 #. POSIX.
-#: src/conflicts.c:493
+#: src/conflicts.c:491
 msgid "conflicts: "
 msgstr "conflictueerd: "

-#: src/conflicts.c:495
+#: src/conflicts.c:493
 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d vershuif/reduceer"

-#: src/conflicts.c:499
+#: src/conflicts.c:497
 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d reduceer/reduceer"

-#: src/conflicts.c:504
+#: src/conflicts.c:502
 #, c-format
 msgid "%s contains"
 msgstr "%s bevat"

-#: src/conflicts.c:590 src/conflicts.c:711
+#: src/conflicts.c:588 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:602 src/print.c:173
+#: src/conflicts.c:600 src/print.c:171
 #, c-format
 msgid ""
 "    $default\treduce using rule %d (%s)\n"
@@ -110,17 +110,17 @@ msgstr ""
 "    $default\treduce using rule %d (%s)\n"
 "\n"

-#: src/conflicts.c:691 src/conflicts.c:705
+#: src/conflicts.c:689 src/conflicts.c:703
 #, c-format
 msgid "    %-4s\treduce using rule %d (%s)\n"
 msgstr ""

-#: src/conflicts.c:732
+#: src/conflicts.c:730
 #, c-format
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr ""

-#: src/derives.c:44
+#: src/derives.c:43
 #, fuzzy
 msgid "DERIVES"
 msgstr ""
@@ -130,17 +130,17 @@ msgstr ""
 "AFGELEIDEN\n"
 "\n"

-#: src/derives.c:49
+#: src/derives.c:48
 #, c-format
 msgid "%s derives"
 msgstr "%s afgeleiden"

-#: src/files.c:132
+#: src/files.c:133
 #, c-format
 msgid "cannot open file `%s'"
 msgstr ""

-#: src/files.c:151
+#: src/files.c:152
 msgid "cannot close file"
 msgstr ""

@@ -214,7 +214,7 @@ msgid ""
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""

-#: src/getargs.c:214 src/lex.c:635
+#: src/getargs.c:214 src/lex.c:650
 #, c-format
 msgid "`%s' is no longer supported"
 msgstr ""
@@ -234,108 +234,108 @@ msgstr "%s: geen grammatica bestand gegeven\n"
 msgid "%s: extra arguments ignored after `%s'\n"
 msgstr "%s: extra argumenten genegeerd na '%s'\n"

-#: src/lalr.c:312
+#: src/lalr.c:311
 #, c-format
 msgid "too many gotos (max %d)"
 msgstr ""

-#: src/lex.c:72
+#: src/lex.c:78
 msgid "unexpected `/' found and ignored"
 msgstr "onverwachte `/' gevonden en genegeerd"

-#: src/lex.c:101 src/reader.c:270
+#: src/lex.c:107 src/reader.c:269
 msgid "unterminated comment"
 msgstr "ongetermineerd commentaar"

-#: src/lex.c:133
+#: src/lex.c:139
 #, fuzzy
 msgid "unexpected end of file"
 msgstr "Onverwacht bestandseinde"

-#: src/lex.c:162
+#: src/lex.c:168
 msgid "unescaped newline in constant"
 msgstr "niet geescapete nieuwe regel in constante"

-#: src/lex.c:204
+#: src/lex.c:210
 #, c-format
 msgid "octal value outside range 0...255: `\\%o'"
 msgstr "octale waarde buiten domein 0...255: `\\%o'"

-#: src/lex.c:229
+#: src/lex.c:235
 #, c-format
 msgid "hexadecimal value above 255: `\\x%x'"
 msgstr "hexadecimale waarde boven 255: `\\x%x'"

-#: src/lex.c:241
+#: src/lex.c:247
 #, c-format
 msgid "unknown escape sequence: `\\' followed by `%s'"
 msgstr "onbekende escape reeks: `\\' gevolgd door `%s'"

-#: src/lex.c:337
+#: src/lex.c:343
 msgid "unterminated type name at end of file"
 msgstr "niet getermineerd type naam aan het einde van bestand"

-#: src/lex.c:340
+#: src/lex.c:346
 msgid "unterminated type name"
 msgstr "niet getermineerd type naam"

-#: src/lex.c:432
+#: src/lex.c:437
 msgid "use \"...\" for multi-character literal tokens"
 msgstr "gebruik \"...\" voor meerdere karakters literal tekens"

-#: src/main.c:108
+#: src/main.c:125
 #, fuzzy, c-format
 msgid "%s: internal error: %s\n"
 msgstr "interne fout, %s\n"

-#: src/nullable.c:52
+#: src/nullable.c:51
 msgid "Entering set_nullable"
 msgstr "Inkomende set nullable"

-#: src/output.c:993
+#: src/output.c:986
 #, fuzzy, c-format
 msgid "maximum table size (%d) exceeded"
 msgstr "maximale tabel grootte (%s) overschreden"

-#: src/print.c:38
+#: src/print.c:37
 #, c-format
 msgid " type %d is %s\n"
 msgstr ""

-#: src/print.c:86
+#: src/print.c:85
 #, c-format
 msgid "   (rule %d)"
 msgstr "   (regel %d)"

-#: src/print.c:112
+#: src/print.c:111
 msgid "    $default\taccept\n"
 msgstr ""

-#: src/print.c:114
+#: src/print.c:113
 msgid "    NO ACTIONS\n"
 msgstr "    GEEN AKTIES\n"

-#: src/print.c:133
+#: src/print.c:132
 #, c-format
 msgid "    $   \tgo to state %d\n"
 msgstr ""

-#: src/print.c:136
+#: src/print.c:135
 #, c-format
 msgid "    %-4s\tshift, and go to state %d\n"
 msgstr ""

-#: src/print.c:160
+#: src/print.c:159
 #, c-format
 msgid "    %-4s\terror (nonassociative)\n"
 msgstr ""

-#: src/print.c:190
+#: src/print.c:187
 #, c-format
 msgid "    %-4s\tgo to state %d\n"
 msgstr ""

-#: src/print.c:202
+#: src/print.c:199
 #, fuzzy, c-format
 msgid "state %d"
 msgstr ""
@@ -344,23 +344,25 @@ msgstr ""
 "stadium %d\n"
 "\n"

-#: src/print.c:233
+#. rule # : LHS -> RHS
+#: src/print.c:229
 #, fuzzy
 msgid "Grammar"
 msgstr ""
 "\n"
 "Grammatica\n"

-#: src/print.c:240
+#: src/print.c:234
 #, c-format
 msgid "rule %-4d %s ->"
 msgstr "regel %-4d %s ->"

-#: src/print.c:246
-msgid "\t\t/* empty */"
+#: src/print.c:240
+msgid "empty"
 msgstr ""

-#: src/print.c:253
+#. TERMINAL (type #) : rule #s terminal is on RHS
+#: src/print.c:244
 #, fuzzy
 msgid "Terminals, with rules where they appear"
 msgstr ""
@@ -368,7 +370,7 @@ msgstr ""
 "Terminals, met regels waar ze voorkomen\n"
 "\n"

-#: src/print.c:302
+#: src/print.c:268
 #, fuzzy
 msgid "Nonterminals, with rules where they appear"
 msgstr ""
@@ -376,11 +378,11 @@ msgstr ""
 "Geen terminals, met regels waar ze voorkomen\n"
 "\n"

-#: src/print.c:329
+#: src/print.c:294
 msgid " on left:"
 msgstr " links:"

-#: src/print.c:344
+#: src/print.c:309
 msgid " on right:"
 msgstr " rechts:"

@@ -396,239 +398,239 @@ msgstr ""
 "    $default\treduce using rule %d (%s)\n"
 "\n"

-#: src/reader.c:79
+#: src/reader.c:78
 msgid "   Skipping to next \\n"
 msgstr "   Verder naar volgende \\n"

-#: src/reader.c:81
+#: src/reader.c:80
 #, c-format
 msgid "   Skipping to next %c"
 msgstr "   Verder naar volgende %c"

-#: src/reader.c:132 src/reader.c:144
+#: src/reader.c:131 src/reader.c:143
 msgid "invalid $ value"
 msgstr "onjuiste $ waarde"

-#: src/reader.c:170 src/reader.c:185
+#: src/reader.c:169 src/reader.c:184
 msgid "unterminated string at end of file"
 msgstr "niet getermineerde string aan einde van bestand"

-#: src/reader.c:173
+#: src/reader.c:172
 msgid "unterminated string"
 msgstr "niet getermineerde string"

-#: src/reader.c:326 src/reader.c:390
+#: src/reader.c:325 src/reader.c:389
 #, fuzzy, c-format
 msgid "%s is invalid"
 msgstr "@%s is onjuist"

-#: src/reader.c:366
+#: src/reader.c:365
 #, c-format
 msgid "$$ of `%s' has no declared type"
 msgstr "$$ van `%s' heeft geen gedeclareerd type"

-#: src/reader.c:383
+#: src/reader.c:382
 #, fuzzy, c-format
 msgid "$%d of `%s' has no declared type"
 msgstr "$%s van `%s' heeft geen gedeclareerd type"

-#: src/reader.c:437
+#: src/reader.c:436
 msgid "unterminated `%{' definition"
 msgstr "niet getermineerde `%{' definitie"

-#: src/reader.c:482 src/reader.c:598 src/reader.c:648
+#: src/reader.c:481 src/reader.c:595 src/reader.c:645
 #, c-format
 msgid "Premature EOF after %s"
 msgstr ""

-#: src/reader.c:499
+#: src/reader.c:498
 #, c-format
 msgid "symbol `%s' used more than once as a literal string"
 msgstr ""

-#: src/reader.c:502
+#: src/reader.c:501
 #, c-format
 msgid "symbol `%s' given more than one literal string"
 msgstr ""

-#: src/reader.c:524 src/reader.c:667
+#: src/reader.c:522 src/reader.c:664
 #, c-format
 msgid "symbol %s redefined"
 msgstr "symbool %s opnieuw gedefinieerd"

-#: src/reader.c:534 src/reader.c:613 src/reader.c:674 src/reader.c:1290
+#: src/reader.c:532 src/reader.c:610 src/reader.c:671 src/reader.c:1285
 #, c-format
 msgid "type redeclaration for %s"
 msgstr "type herdeclaratie voor %s"

-#: src/reader.c:544
+#: src/reader.c:541
 #, c-format
 msgid "`%s' is invalid in %s"
 msgstr "`%s' is onjuist in %s"

-#: src/reader.c:561 src/reader.c:721
+#: src/reader.c:558 src/reader.c:717
 #, fuzzy, c-format
 msgid "multiple %s declarations"
 msgstr "meerdere %start declaraties"

-#: src/reader.c:563 src/reader.c:902 src/reader.c:927 src/reader.c:1268
+#: src/reader.c:560 src/reader.c:897 src/reader.c:922 src/reader.c:1263
 #, fuzzy, c-format
 msgid "invalid %s declaration"
 msgstr "onjuiste %start declaratie"

-#: src/reader.c:583
+#: src/reader.c:580
 msgid "%type declaration has no <typename>"
 msgstr "%type declaratie heeft geen <typenaam>"

-#: src/reader.c:618
+#: src/reader.c:615
 #, fuzzy, c-format
 msgid "invalid %%type declaration due to item: %s"
 msgstr "onjuist %%type declaratie door item: `%s'"

-#: src/reader.c:663
+#: src/reader.c:660
 #, c-format
 msgid "redefining precedence of %s"
 msgstr "herdefinieren voorganger van %s"

-#: src/reader.c:687
+#: src/reader.c:683
 #, c-format
 msgid "invalid text (%s) - number should be after identifier"
 msgstr "onjuiste tekst (%s) - nummer hoort na de identifier"

-#: src/reader.c:697
+#: src/reader.c:693
 #, c-format
 msgid "unexpected item: %s"
 msgstr "onbekend item: %s"

-#: src/reader.c:764 src/reader.c:1094 src/reader.c:1165
+#: src/reader.c:760 src/reader.c:1089 src/reader.c:1160
 #, fuzzy, c-format
 msgid "unmatched %s"
 msgstr "niet overeenkomstige `{'"

-#: src/reader.c:796
+#: src/reader.c:792
 #, fuzzy, c-format
 msgid "argument of %%expect is not an integer"
 msgstr "argument van %expect is niet een integer"

-#: src/reader.c:843
+#: src/reader.c:838
 #, c-format
 msgid "unrecognized item %s, expected an identifier"
 msgstr "onbekend item %s, verwacht een identifier"

-#: src/reader.c:867
+#: src/reader.c:862
 #, c-format
 msgid "expected string constant instead of %s"
 msgstr "verwacht string constante in plaats van %s"

-#: src/reader.c:1010
+#: src/reader.c:1005
 #, c-format
 msgid "unrecognized: %s"
 msgstr "onbekend: %s"

-#: src/reader.c:1015
+#: src/reader.c:1010
 msgid "no input grammar"
 msgstr "geen invoer grammatica"

-#: src/reader.c:1020
+#: src/reader.c:1015
 #, c-format
 msgid "unknown character: %s"
 msgstr "onbekend karakter: %s"

-#: src/reader.c:1188
+#: src/reader.c:1183
 #, fuzzy, c-format
 msgid "unterminated %guard clause"
 msgstr "niet getermineerde %%guard voorwaarde"

-#: src/reader.c:1355
+#: src/reader.c:1350
 msgid "ill-formed rule: initial symbol not followed by colon"
 msgstr ""
 "slecht geformuleerde regel: initieel symbool niet gevolgd door dubbele punt"

-#: src/reader.c:1362
+#: src/reader.c:1357
 msgid "grammar starts with vertical bar"
 msgstr "grammatica start met een verticale bar"

-#: src/reader.c:1393
+#: src/reader.c:1388
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "regel geven voor %s, welke een teken is"

-#: src/reader.c:1495
+#: src/reader.c:1490
 msgid "two @prec's in a row"
 msgstr "twee @prec's in een regel"

-#: src/reader.c:1503
+#: src/reader.c:1498
 #, c-format
 msgid "%%guard present but %%semantic_parser not specified"
 msgstr "%%guard aanwezig maar %%semantic_parser niet gespecificeerd"

-#: src/reader.c:1512
+#: src/reader.c:1507
 msgid "two actions at end of one rule"
 msgstr "twee akties aan het einde van een regel"

-#: src/reader.c:1526
+#: src/reader.c:1521
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "type clash (`%s' `%s') bij standaard aktie"

-#: src/reader.c:1532
+#: src/reader.c:1527
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "lege regel voor getypte niet terminal, en geen aktie"

-#: src/reader.c:1576
+#: src/reader.c:1571
 #, c-format
 msgid "invalid input: %s"
 msgstr "ongeldige invoer: %s"

-#: src/reader.c:1584
+#: src/reader.c:1579
 #, fuzzy, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "te veel symbolen (tekens plus nietterminals); maximum %s"

-#: src/reader.c:1587
+#: src/reader.c:1582
 msgid "no rules in the input grammar"
 msgstr "geen regels voor invoer grammatica"

-#: src/reader.c:1611
+#: src/reader.c:1606
 #, c-format
 msgid "symbol %s is used, but is not defined as a token and has no rules"
 msgstr ""
 "symbool %s is gebruikt, maar is niet gedefinieerd als een teken en\n"
 "heeft geen regels"

-#: src/reader.c:1716
+#: src/reader.c:1712
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "conflictuerende precedentein voor %s en %s"

-#: src/reader.c:1728
+#: src/reader.c:1724
 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "conflictuerende associatieve waarden voor %s en %s"

-#: src/reader.c:1779
+#: src/reader.c:1770
 #, c-format
 msgid "tokens %s and %s both assigned number %d"
 msgstr ""

-#: src/reader.c:1792
+#: src/reader.c:1782
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr ""

-#: src/reader.c:1794
+#: src/reader.c:1784
 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "het start symbool %s is een token"

-#: src/reduce.c:402
+#: src/reduce.c:401
 #, fuzzy
 msgid "Useless nonterminals:"
 msgstr ""
 "Onbruikbare niet terminals:\n"
 "\n"

-#: src/reduce.c:417
+#: src/reduce.c:416
 #, fuzzy
 msgid "Terminals which are not used:"
 msgstr ""
@@ -637,7 +639,7 @@ msgstr ""
 "Terminals welke niet worden gebruikt:\n"
 "\n"

-#: src/reduce.c:428
+#: src/reduce.c:427
 #, fuzzy
 msgid "Useless rules:"
 msgstr ""
@@ -646,7 +648,7 @@ msgstr ""
 "Onbruikbare regels:\n"
 "\n"

-#: src/reduce.c:457
+#: src/reduce.c:456
 msgid ""
 "Variables\n"
 "---------\n"
@@ -656,11 +658,11 @@ msgstr ""
 "----------\n"
 "\n"

-#: src/reduce.c:459
+#: src/reduce.c:458
 msgid "Value  Sprec    Sassoc    Tag\n"
 msgstr "Waarde  Sprec    Sassoc    Tag\n"

-#: src/reduce.c:464
+#: src/reduce.c:463
 msgid ""
 "Rules\n"
 "-----\n"
@@ -670,7 +672,7 @@ msgstr ""
 "------\n"
 "\n"

-#: src/reduce.c:475
+#: src/reduce.c:474
 msgid ""
 "Rules interpreted\n"
 "-----------------\n"
@@ -680,36 +682,36 @@ msgstr ""
 "-----------------------\n"
 "\n"

-#: src/reduce.c:492
+#: src/reduce.c:491
 #, c-format
 msgid "%d rules never reduced\n"
 msgstr "%d regels nooit gereduceerd\n"

-#: src/reduce.c:494
+#: src/reduce.c:493
 #, c-format
 msgid "%s contains "
 msgstr "%s bevat"

-#: src/reduce.c:498
+#: src/reduce.c:497
 #, c-format
 msgid "%d useless nonterminal%s"
 msgstr "%d onbruikbare niet terminal%s"

-#: src/reduce.c:503
+#: src/reduce.c:502
 msgid " and "
 msgstr " en "

-#: src/reduce.c:507
+#: src/reduce.c:506
 #, c-format
 msgid "%d useless rule%s"
 msgstr "%d onbruikbare regels%s"

-#: src/reduce.c:540
+#: src/reduce.c:539
 #, c-format
 msgid "Start symbol %s does not derive any sentence"
 msgstr "Start symbool %s is niet afkomstig uit een zin"

-#: src/reduce.c:553
+#: src/reduce.c:552
 #, c-format
 msgid ""
 "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n"
@@ -797,11 +799,11 @@ msgstr "%s: geen geheugen meer beschikbaar\n"
 #. MARK).  A British English Unicode locale should instead
 #. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and
 #. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
-#: lib/quotearg.c:259
+#: lib/quotearg.c:268
 msgid "`"
 msgstr ""

-#: lib/quotearg.c:260
+#: lib/quotearg.c:269
 msgid "'"
 msgstr ""

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.29\n"
-"POT-Creation-Date: 2001-09-22 18:19+0200\n"
+"POT-Creation-Date: 2001-10-02 18:30+0200\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"
@@ -30,78 +30,78 @@ msgstr "
 msgid "fatal error: "
 msgstr "ÆÁÔÁÌØÎÁÑ ÏÛÉÂËÁ: "

-#: src/conflicts.c:49
+#: src/conflicts.c:48
 #, c-format
 msgid "Conflict in state %d between rule %d and token %s resolved as %s.\n"
 msgstr ""
 "ëÏÎÆÌÉËÔ × ÓÏÓÔÏÑÎÉÉ %d ÍÅÖÄÕ ÐÒÁ×ÉÌÏÍ %d É ÌÅËÓÅÍÏÊ %s ÒÁÚÒÅÛÅÎ ËÁË %s.\n"

-#: src/conflicts.c:115 src/conflicts.c:138
+#: src/conflicts.c:114 src/conflicts.c:137
 msgid "reduce"
 msgstr "×Ù×ÏÄ"

-#: src/conflicts.c:121 src/conflicts.c:134
+#: src/conflicts.c:120 src/conflicts.c:133
 msgid "shift"
 msgstr "ÓÄ×ÉÇ"

-#: src/conflicts.c:142
+#: src/conflicts.c:141
 msgid "an error"
 msgstr "ÏÛÉÂËÁ"

-#: src/conflicts.c:422
+#: src/conflicts.c:421
 msgid " 1 shift/reduce conflict"
 msgstr " 1 ËÏÎÆÌÉËÔ ÓÄ×ÉÇÁ/×Ù×ÏÄÁ"

-#: src/conflicts.c:427
+#: src/conflicts.c:426
 #, c-format
 msgid " %d shift/reduce conflicts"
 msgstr " %d ËÏÎÆÌÉËÔÏ× ÓÄ×ÉÇÁ/×Ù×ÏÄÁ"

-#: src/conflicts.c:433
+#: src/conflicts.c:432
 msgid " and"
 msgstr " É"

-#: src/conflicts.c:439
+#: src/conflicts.c:438
 msgid " 1 reduce/reduce conflict"
 msgstr " 1 ËÏÎÆÌÉËÔ ×Ù×ÏÄÁ/×Ù×ÏÄÁ"

-#: src/conflicts.c:444
+#: src/conflicts.c:443
 #, c-format
 msgid " %d reduce/reduce conflicts"
 msgstr " %d ËÏÎÆÌÉËÔÏ× ×Ù×ÏÄÁ/×Ù×ÏÄÁ"

-#: src/conflicts.c:481
+#: src/conflicts.c:480
 #, c-format
 msgid "State %d contains"
 msgstr "óÏÓÔÏÑÎÉÅ %d ÓÏÄÅÒÖÉÔ"

 #. If invoked with `--yacc', use the output format specified by
 #. POSIX.
-#: src/conflicts.c:493
+#: src/conflicts.c:491
 msgid "conflicts: "
 msgstr "ËÏÎÆÌÉËÔÙ: "

-#: src/conflicts.c:495
+#: src/conflicts.c:493
 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d ÓÄ×ÉÇ/×Ù×ÏÄ"

-#: src/conflicts.c:499
+#: src/conflicts.c:497
 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d ×Ù×ÏÄ/×Ù×ÏÄ"

-#: src/conflicts.c:504
+#: src/conflicts.c:502
 #, c-format
 msgid "%s contains"
 msgstr "%s ÓÏÄÅÒÖÉÔ"

-#: src/conflicts.c:590 src/conflicts.c:711
+#: src/conflicts.c:588 src/conflicts.c:709
 #, c-format
 msgid "    %-4s\t[reduce using rule %d (%s)]\n"
 msgstr "    %-4s\t[×Ù×ÏÄ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÐÒÁ×ÉÌÁ %d (%s)]\n"

-#: src/conflicts.c:602 src/print.c:173
+#: src/conflicts.c:600 src/print.c:171
 #, c-format
 msgid ""
 "    $default\treduce using rule %d (%s)\n"
@@ -110,31 +110,31 @@ msgstr ""
 "    $default\t×Ù×ÏÄ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÐÒÁ×ÉÌÁ %d (%s)\n"
 "\n"

-#: src/conflicts.c:691 src/conflicts.c:705
+#: 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:732
+#: src/conflicts.c:730
 #, c-format
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr "    $default\t×Ù×ÏÄ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÐÒÁ×ÉÌÁ %d (%s)\n"

-#: src/derives.c:44
+#: src/derives.c:43
 msgid "DERIVES"
 msgstr "DERIVES"

-#: src/derives.c:49
+#: src/derives.c:48
 #, c-format
 msgid "%s derives"
 msgstr "%s ×Ù×ÏÄÉÔ"

-#: src/files.c:132
+#: src/files.c:133
 #, c-format
 msgid "cannot open file `%s'"
 msgstr "ÎÅ ÕÄÁÅÔÓÑ ÏÔËÒÙÔØ ÆÁÊÌ `%s'"

-#: src/files.c:151
+#: src/files.c:152
 msgid "cannot close file"
 msgstr "ÎÅ ÕÄÁÅÔÓÑ ÚÁËÒÙÔØ ÆÁÊÌ"

@@ -236,7 +236,7 @@ msgstr ""
 "ðòéçïäîïóôé\n"
 "äìñ ïðòåäåìåîîïê ãåìé.\n"

-#: src/getargs.c:214 src/lex.c:635
+#: src/getargs.c:214 src/lex.c:650
 #, c-format
 msgid "`%s' is no longer supported"
 msgstr "`%s' ÂÏÌØÛÅ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ"
@@ -256,137 +256,139 @@ msgstr "%s:
 msgid "%s: extra arguments ignored after `%s'\n"
 msgstr "%s: ÌÉÛÎÉÅ ÁÒÇÕÍÅÎÔÙ ÐÏÓÌÅ `%s' ÉÇÎÏÒÉÒÏ×ÁÎÙ\n"

-#: src/lalr.c:312
+#: src/lalr.c:311
 #, c-format
 msgid "too many gotos (max %d)"
 msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ goto (ÍÁËÓÉÍÁÌØÎÏ %d)"

-#: src/lex.c:72
+#: src/lex.c:78
 msgid "unexpected `/' found and ignored"
 msgstr "×ÓÔÒÅÞÅÎ É ÐÒÏÉÇÎÏÒÉÒÏ×ÁÎ ÎÅÏÖÉÄÁÎÎÙÊ ÓÉÍ×ÏÌ `/'"

-#: src/lex.c:101 src/reader.c:270
+#: src/lex.c:107 src/reader.c:269
 msgid "unterminated comment"
 msgstr "ÎÅÚÁËÏÎÞÅÎÎÙÊ ËÏÍÍÅÎÔÁÒÉÊ"

-#: src/lex.c:133
+#: src/lex.c:139
 msgid "unexpected end of file"
 msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ËÏÎÅÃ ÆÁÊÌÁ"

-#: src/lex.c:162
+#: src/lex.c:168
 msgid "unescaped newline in constant"
 msgstr "ÎÅÜËÒÁÎÉÒÏ×ÁÎÎÙÊ ÐÅÒÅ×ÏÄ ÓÔÒÏËÉ × ËÏÎÓÔÁÎÔÅ"

-#: src/lex.c:204
+#: src/lex.c:210
 #, c-format
 msgid "octal value outside range 0...255: `\\%o'"
 msgstr "×ÏÓØÍÅÒÉÞÎÁÑ ×ÅÌÉÞÉÎÁ ÚÁ ÐÒÅÄÅÌÁÍÉ ÄÉÁÐÁÚÏÎÁ 0...255: `\\%o'"

-#: src/lex.c:229
+#: src/lex.c:235
 #, c-format
 msgid "hexadecimal value above 255: `\\x%x'"
 msgstr "ÛÅÓÔÎÁÄÃÁÔÅÒÉÞÎÁÑ ×ÅÌÉÞÉÎÁ ÐÒÅ×ÙÛÁÅÔ 255: `\\x%x'"

-#: src/lex.c:241
+#: src/lex.c:247
 #, c-format
 msgid "unknown escape sequence: `\\' followed by `%s'"
 msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ escape-ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ: `%s' ÐÏÓÌÅ `\\'"

-#: src/lex.c:337
+#: src/lex.c:343
 msgid "unterminated type name at end of file"
 msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ ÉÍÑ ÔÉÐÁ × ËÏÎÃÅ ÆÁÊÌÁ"

-#: src/lex.c:340
+#: src/lex.c:346
 msgid "unterminated type name"
 msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ ÉÍÑ ÔÉÐÁ"

-#: src/lex.c:432
+#: src/lex.c:437
 msgid "use \"...\" for multi-character literal tokens"
 msgstr "ÉÓÐÏÌØÚÕÊÔÅ \"...\" ÄÌÑ ÍÎÏÇÏÓÉÍ×ÏÌØÎÙÈ ÌÉÔÅÒÁÌØÎÙÈ ÌÅËÓÅÍ"

-#: src/main.c:108
+#: src/main.c:125
 #, c-format
 msgid "%s: internal error: %s\n"
 msgstr "%s: ×ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ: %s\n"

-#: src/nullable.c:52
+#: src/nullable.c:51
 msgid "Entering set_nullable"
 msgstr "÷ÈÏÄ × set_nullable"

-#: src/output.c:993
+#: src/output.c:986
 #, c-format
 msgid "maximum table size (%d) exceeded"
 msgstr "ÐÒÅ×ÙÛÅÎ ÍÁËÓÉÍÁÌØÎÙÊ ÒÁÚÍÅÒ ÔÁÂÌÉÃÙ (%d)"

-#: src/print.c:38
+#: src/print.c:37
 #, c-format
 msgid " type %d is %s\n"
 msgstr " ÔÉÐ %d Ñ×ÌÑÅÔÓÑ %s\n"

-#: src/print.c:86
+#: src/print.c:85
 #, c-format
 msgid "   (rule %d)"
 msgstr "   (ÐÒÁ×ÉÌÏ %d)"

-#: src/print.c:112
+#: src/print.c:111
 msgid "    $default\taccept\n"
 msgstr "    $default\tÐÒÉÎÑÔÉÅ\n"

-#: src/print.c:114
+#: src/print.c:113
 msgid "    NO ACTIONS\n"
 msgstr "    îåô äåêóô÷éê\n"

-#: src/print.c:133
+#: src/print.c:132
 #, c-format
 msgid "    $   \tgo to state %d\n"
 msgstr "    $   \tÐÅÒÅÈÏÄ × ÓÏÓÔÏÑÎÉÅ %d\n"

-#: src/print.c:136
+#: src/print.c:135
 #, c-format
 msgid "    %-4s\tshift, and go to state %d\n"
 msgstr "    %-4s\tÓÄ×ÉÇ, É ÐÅÒÅÈÏÄ × ÓÏÓÔÏÑÎÉÅ %d\n"

-#: src/print.c:160
+#: src/print.c:159
 #, c-format
 msgid "    %-4s\terror (nonassociative)\n"
 msgstr "    %-4s\tÏÛÉÂËÁ (ÎÅÁÓÓÏÃÉÁÔÉ×ÎÁÑ)\n"

-#: src/print.c:190
+#: src/print.c:187
 #, c-format
 msgid "    %-4s\tgo to state %d\n"
 msgstr "    %-4s\tÐÅÒÅÈÏÄ × ÓÏÓÔÏÑÎÉÅ %d\n"

-#: src/print.c:202
+#: src/print.c:199
 #, c-format
 msgid "state %d"
 msgstr "ÓÏÓÔÏÑÎÉÅ %d"

-#: src/print.c:233
+#. rule # : LHS -> RHS
+#: src/print.c:229
 msgid "Grammar"
 msgstr "çÒÁÍÍÁÔÉËÁ"

-#: src/print.c:240
+#: src/print.c:234
 #, c-format
 msgid "rule %-4d %s ->"
 msgstr "ÐÒÁ×ÉÌÏ %-4d %s ->"

-#: src/print.c:246
-msgid "\t\t/* empty */"
-msgstr "\t\t/* ÐÕÓÔÏ */"
+#: src/print.c:240
+msgid "empty"
+msgstr ""

-#: src/print.c:253
+#. TERMINAL (type #) : rule #s terminal is on RHS
+#: src/print.c:244
 msgid "Terminals, with rules where they appear"
 msgstr "ôÅÒÍÉÎÁÌØÎÙÅ ÓÉÍ×ÏÌÙ Ó ÐÒÁ×ÉÌÁÍÉ, × ËÏÔÏÒÙÈ ÏÎÉ ÐÏÑ×ÌÑÀÔÓÑ"

-#: src/print.c:302
+#: src/print.c:268
 msgid "Nonterminals, with rules where they appear"
 msgstr "îÅÔÅÒÍÉÎÁÌØÎÙÅ ÓÉÍ×ÏÌÙ Ó ÐÒÁ×ÉÌÁÍÉ, × ËÏÔÏÒÙÈ ÏÎÉ ÐÏÑ×ÌÑÀÔÓÑ"

-#: src/print.c:329
+#: src/print.c:294
 msgid " on left:"
 msgstr " ÎÁÌÅ×Ï:"

-#: src/print.c:344
+#: src/print.c:309
 msgid " on right:"
 msgstr " ÎÁÐÒÁ×Ï:"

@@ -400,242 +402,242 @@ msgstr "%-4s\t
 msgid "$default\treduce using rule %d (%s)"
 msgstr "$default\t×Ù×ÏÄ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÐÒÁ×ÉÌÁ %d (%s)"

-#: src/reader.c:79
+#: src/reader.c:78
 msgid "   Skipping to next \\n"
 msgstr "   ðÒÏÐÕÓË ÄÏ ÓÌÅÄÕÀÝÅÇÏ \\n"

-#: src/reader.c:81
+#: src/reader.c:80
 #, c-format
 msgid "   Skipping to next %c"
 msgstr "   ðÒÏÐÕÓË ÄÏ ÓÌÅÄÕÀÝÅÇÏ %c"

-#: src/reader.c:132 src/reader.c:144
+#: src/reader.c:131 src/reader.c:143
 msgid "invalid $ value"
 msgstr "ÎÅ×ÅÒÎÏÅ $ ÚÎÁÞÅÎÉÅ"

-#: src/reader.c:170 src/reader.c:185
+#: src/reader.c:169 src/reader.c:184
 msgid "unterminated string at end of file"
 msgstr "ÎÅÚÁËÏÎÞÅÎÎÁÑ ÓÔÒÏËÁ × ËÏÎÃÅ ÆÁÊÌÁ"

-#: src/reader.c:173
+#: src/reader.c:172
 msgid "unterminated string"
 msgstr "ÎÅÚÁËÏÎÞÅÎÎÁÑ ÓÔÒÏËÁ"

-#: src/reader.c:326 src/reader.c:390
+#: src/reader.c:325 src/reader.c:389
 #, c-format
 msgid "%s is invalid"
 msgstr "ÎÅ×ÅÒÎÙÊ ÚÎÁË %s"

-#: src/reader.c:366
+#: src/reader.c:365
 #, c-format
 msgid "$$ of `%s' has no declared type"
 msgstr "$$ × `%s' ÎÅ ÉÍÅÅÔ ÏÐÉÓÁÎÎÏÇÏ ÔÉÐÁ"

-#: src/reader.c:383
+#: src/reader.c:382
 #, c-format
 msgid "$%d of `%s' has no declared type"
 msgstr "$%d ÉÚ `%s' ÎÅ ÉÍÅÅÔ ÏÐÉÓÁÎÎÏÇÏ ÔÉÐÁ"

-#: src/reader.c:437
+#: src/reader.c:436
 msgid "unterminated `%{' definition"
 msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ ÏÐÒÅÄÅÌÅÎÉÅ `%{'"

-#: src/reader.c:482 src/reader.c:598 src/reader.c:648
+#: src/reader.c:481 src/reader.c:595 src/reader.c:645
 #, c-format
 msgid "Premature EOF after %s"
 msgstr "ðÒÅÖÄÅ×ÒÅÍÅÎÎÙÊ ËÏÎÅÃ ÆÁÊÌÁ ÐÏÓÌÅ %s"

-#: src/reader.c:499
+#: src/reader.c:498
 #, c-format
 msgid "symbol `%s' used more than once as a literal string"
 msgstr ""

-#: src/reader.c:502
+#: src/reader.c:501
 #, c-format
 msgid "symbol `%s' given more than one literal string"
 msgstr ""

-#: src/reader.c:524 src/reader.c:667
+#: src/reader.c:522 src/reader.c:664
 #, c-format
 msgid "symbol %s redefined"
 msgstr "ÐÏ×ÔÏÒÎÏÅ ÏÐÒÅÄÅÌÅÎÉÅ ÓÉÍ×ÏÌÁ %s"

-#: src/reader.c:534 src/reader.c:613 src/reader.c:674 src/reader.c:1290
+#: src/reader.c:532 src/reader.c:610 src/reader.c:671 src/reader.c:1285
 #, c-format
 msgid "type redeclaration for %s"
 msgstr "ÐÏ×ÔÏÒÎÏÅ ÏÐÉÓÁÎÉÅ ÔÉÐÁ ÄÌÑ %s"

-#: src/reader.c:544
+#: src/reader.c:541
 #, c-format
 msgid "`%s' is invalid in %s"
 msgstr "`%s' ÎÅ×ÅÒÎÏ × %s"

-#: src/reader.c:561 src/reader.c:721
+#: src/reader.c:558 src/reader.c:717
 #, c-format
 msgid "multiple %s declarations"
 msgstr "ÍÎÏÖÅÓÔ×ÅÎÎÏÅ ÏÐÉÓÁÎÉÅ %s"

-#: src/reader.c:563 src/reader.c:902 src/reader.c:927 src/reader.c:1268
+#: src/reader.c:560 src/reader.c:897 src/reader.c:922 src/reader.c:1263
 #, c-format
 msgid "invalid %s declaration"
 msgstr "ÎÅ×ÅÒÎÏÅ ÏÐÉÓÁÎÉÅ %s"

-#: src/reader.c:583
+#: src/reader.c:580
 msgid "%type declaration has no <typename>"
 msgstr "ÏÐÉÓÁÎÉÅ %type ÎÅ ÉÍÅÅÔ <ÉÍÑ_ÔÉÐÁ>"

-#: src/reader.c:618
+#: src/reader.c:615
 #, c-format
 msgid "invalid %%type declaration due to item: %s"
 msgstr "ÎÅ×ÅÒÎÏÅ ÏÐÉÓÁÎÉÅ %%type ÉÚ-ÚÁ ÜÌÅÍÅÎÔÁ: %s"

-#: src/reader.c:663
+#: src/reader.c:660
 #, c-format
 msgid "redefining precedence of %s"
 msgstr "ÐÅÒÅÏÐÒÅÄÅÌÅÎÉÅ ÐÒÉÏÒÉÔÅÔÁ ÄÌÑ %s"

-#: src/reader.c:687
+#: src/reader.c:683
 #, c-format
 msgid "invalid text (%s) - number should be after identifier"
 msgstr "ÎÅ×ÅÒÎÙÊ ÔÅËÓÔ (%s) - ÞÉÓÌÏ ÄÏÌÖÎÏ ÓÌÅÄÏ×ÁÔØ ÚÁ ÉÄÅÎÔÉÆÉËÁÔÏÒÏÍ"

-#: src/reader.c:697
+#: src/reader.c:693
 #, c-format
 msgid "unexpected item: %s"
 msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ÜÌÅÍÅÎÔ: %s"

-#: src/reader.c:764 src/reader.c:1094 src/reader.c:1165
+#: src/reader.c:760 src/reader.c:1089 src/reader.c:1160
 #, c-format
 msgid "unmatched %s"
 msgstr "ÎÅÐÁÒÎÁÑ %s"

-#: src/reader.c:796
+#: src/reader.c:792
 #, c-format
 msgid "argument of %%expect is not an integer"
 msgstr "ÁÒÇÕÍÅÎÔ %%expect ÎÅ Ñ×ÌÑÅÔÓÑ ÃÅÌÙÍ ÞÉÓÌÏÍ"

-#: src/reader.c:843
+#: src/reader.c:838
 #, c-format
 msgid "unrecognized item %s, expected an identifier"
 msgstr "ÎÅÒÁÓÐÏÚÎÁÎÎÙÊ ÜÌÅÍÅÎÔ %s, ÏÖÉÄÁÌÓÑ ÉÄÅÎÔÉÆÉËÁÔÏÒ"

-#: src/reader.c:867
+#: src/reader.c:862
 #, c-format
 msgid "expected string constant instead of %s"
 msgstr "×ÍÅÓÔÏ %s ÏÖÉÄÁÌÁÓØ ÓÔÒÏËÏ×ÁÑ ÐÏÓÔÏÑÎÎÁÑ"

-#: src/reader.c:1010
+#: src/reader.c:1005
 #, c-format
 msgid "unrecognized: %s"
 msgstr "ÎÅÒÁÓÐÏÚÎÁÎÏ: %s"

-#: src/reader.c:1015
+#: src/reader.c:1010
 msgid "no input grammar"
 msgstr "ÎÅÔ ×ÈÏÄÎÏÊ ÇÒÁÍÍÁÔÉËÉ"

-#: src/reader.c:1020
+#: src/reader.c:1015
 #, c-format
 msgid "unknown character: %s"
 msgstr "ÎÅÉÚ×ÅÓÔÎÙÊ ÓÉÍ×ÏÌ: %s"

-#: src/reader.c:1188
+#: src/reader.c:1183
 #, c-format
 msgid "unterminated %guard clause"
 msgstr "ÎÅÚÁËÏÎÞÅÎÎÙÊ ÏÐÅÒÁÔÏÒ %guard"

-#: src/reader.c:1355
+#: src/reader.c:1350
 msgid "ill-formed rule: initial symbol not followed by colon"
 msgstr "ÎÅ×ÅÒÎÏÅ ÐÒÁ×ÉÌÏ: Ä×ÏÅÔÏÞÉÅ ÎÅ ÓÌÅÄÕÅÔ ÚÁ ÎÁÞÁÌØÎÙÍ ÓÉÍ×ÏÌÏÍ"

-#: src/reader.c:1362
+#: src/reader.c:1357
 msgid "grammar starts with vertical bar"
 msgstr "ÇÒÁÍÍÁÔÉËÁ ÎÁÞÉÎÁÅÔÓÑ Ó ×ÅÒÔÉËÁÌØÎÏÊ ÞÅÒÔÙ"

-#: src/reader.c:1393
+#: src/reader.c:1388
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "ÐÒÁ×ÉÌÏ ÚÁÄÁÎÏ ÄÌÑ %s, ËÏÔÏÒÙÊ Ñ×ÌÑÅÔÓÑ ÌÅËÓÅÍÏÊ"

-#: src/reader.c:1495
+#: src/reader.c:1490
 msgid "two @prec's in a row"
 msgstr "Ä×Á @prec ÐÏÄÒÑÄ"

-#: src/reader.c:1503
+#: src/reader.c:1498
 #, c-format
 msgid "%%guard present but %%semantic_parser not specified"
 msgstr "%%guard ÐÒÉÓÕÔÓÔ×ÕÅÔ, Á %%semantic_parser ÎÅ ÚÁÄÁÎ"

-#: src/reader.c:1512
+#: src/reader.c:1507
 msgid "two actions at end of one rule"
 msgstr "Ä×Á ÄÅÊÓÔ×ÉÑ × ËÏÎÃÅ ÏÄÎÏÇÏ ÐÒÁ×ÉÌÁ"

-#: src/reader.c:1526
+#: src/reader.c:1521
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "ËÏÎÆÌÉËÔ ÔÉÐÏ× (`%s' `%s') ÎÁ ÄÅÊÓÔ×ÉÉ ÐÏ ÕÍÏÌÞÁÎÉÀ"

-#: src/reader.c:1532
+#: src/reader.c:1527
 msgid "empty rule for typed nonterminal, and no action"
 msgstr ""
 "ÐÕÓÔÏÅ ÐÒÁ×ÉÌÏ ÄÌÑ ÔÉÐÉÚÉÒÏ×ÁÎÎÏÇÏ ÎÅÔÅÒÍÉÎÁÌØÎÏÇÏ ÓÉÍ×ÏÌÁ, É ÎÅÔ ÄÅÊÓÔ×ÉÑ"

-#: src/reader.c:1576
+#: src/reader.c:1571
 #, c-format
 msgid "invalid input: %s"
 msgstr "ÎÅ×ÅÒÎÙÅ ×ÈÏÄÎÙÅ ÄÁÎÎÙÅ: %s"

-#: src/reader.c:1584
+#: src/reader.c:1579
 #, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ ÓÉÍ×ÏÌÏ× (ÌÅËÓÅÍÙ ÐÌÀÓ ÎÅÔÅÒÍÉÎÁÌÙ); ÍÁËÓÉÍÁÌØÎÏ %d"

-#: src/reader.c:1587
+#: src/reader.c:1582
 msgid "no rules in the input grammar"
 msgstr "ÏÔÓÕÔÓÔ×ÕÀÔ ÐÒÁ×ÉÌÁ ×Ï ×ÈÏÄÎÏÊ ÇÒÁÍÍÁÔÉËÅ"

-#: src/reader.c:1611
+#: src/reader.c:1606
 #, c-format
 msgid "symbol %s is used, but is not defined as a token and has no rules"
 msgstr "ÓÉÍ×ÏÌ %s ÉÓÐÏÌØÚÕÅÔÓÑ, ÎÏ ÎÅ ÏÐÒÅÄÅÌÅÎ ËÁË ÌÅËÓÅÍÁ É ÎÅ ÉÍÅÅÔ ÐÒÁ×ÉÌ"

-#: src/reader.c:1716
+#: src/reader.c:1712
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "ÐÒÏÔÉ×ÏÒÅÞÉ×ÙÅ ÐÒÉÏÒÉÔÅÔÙ ÄÌÑ %s É %s"

-#: src/reader.c:1728
+#: src/reader.c:1724
 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "ÐÒÏÔÉ×ÏÒÅÞÉ×ÙÅ ÚÎÁÞÅÎÉÑ ÁÓÓÏÃÉÁÔÉ×ÎÏÓÔÉ ÄÌÑ %s É %s"

-#: src/reader.c:1779
+#: src/reader.c:1770
 #, c-format
 msgid "tokens %s and %s both assigned number %d"
 msgstr "ÏÂÅÉÍ ÌÅËÓÅÍÁÍ %s É %s ÐÒÉÓ×ÏÅÎ ÎÏÍÅÒ %d"

-#: src/reader.c:1792
+#: src/reader.c:1782
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "ÎÁÞÁÌØÎÙÊ ÓÉÍ×ÏÌ %s ÎÅÏÐÒÅÄÅÌÅÎ"

-#: src/reader.c:1794
+#: src/reader.c:1784
 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "ÎÁÞÁÌØÎÙÊ ÓÉÍ×ÏÌ %s Ñ×ÌÑÅÔÓÑ ÌÅËÓÅÍÏÊ"

-#: src/reduce.c:402
+#: src/reduce.c:401
 msgid "Useless nonterminals:"
 msgstr "âÅÓÐÏÌÅÚÎÙÅ ÎÅÔÅÒÍÉÎÁÌÙ:"

-#: src/reduce.c:417
+#: src/reduce.c:416
 msgid "Terminals which are not used:"
 msgstr "îÅÉÓÐÏÌØÚÏ×ÁÎÎÙÅ ÔÅÒÍÉÎÁÌÙ:"

-#: src/reduce.c:428
+#: src/reduce.c:427
 msgid "Useless rules:"
 msgstr "âÅÓÐÏÌÅÚÎÙÅ ÐÒÁ×ÉÌÁ:"

-#: src/reduce.c:457
+#: src/reduce.c:456
 msgid ""
 "Variables\n"
 "---------\n"
@@ -645,11 +647,11 @@ msgstr ""
 "----------\n"
 "\n"

-#: src/reduce.c:459
+#: src/reduce.c:458
 msgid "Value  Sprec    Sassoc    Tag\n"
 msgstr "úÎÁÞ   ðÒÉÏÒ    áÓÓÏÃ     ôÅÇ\n"

-#: src/reduce.c:464
+#: src/reduce.c:463
 msgid ""
 "Rules\n"
 "-----\n"
@@ -659,7 +661,7 @@ msgstr ""
 "-------\n"
 "\n"

-#: src/reduce.c:475
+#: src/reduce.c:474
 msgid ""
 "Rules interpreted\n"
 "-----------------\n"
@@ -669,36 +671,36 @@ msgstr ""
 "--------------------------\n"
 "\n"

-#: src/reduce.c:492
+#: src/reduce.c:491
 #, c-format
 msgid "%d rules never reduced\n"
 msgstr "%d ÐÒÁ×ÉÌ ÎÅ Ó×ÅÄÅÎÏ\n"

-#: src/reduce.c:494
+#: src/reduce.c:493
 #, c-format
 msgid "%s contains "
 msgstr "%s ÓÏÄÅÒÖÉÔ "

-#: src/reduce.c:498
+#: src/reduce.c:497
 #, c-format
 msgid "%d useless nonterminal%s"
 msgstr "%d ÂÅÓÐÏÌÅÚÎÙÈ ÎÅÔÅÒÍÉÎÁÌÏ×%s"

-#: src/reduce.c:503
+#: src/reduce.c:502
 msgid " and "
 msgstr " É "

-#: src/reduce.c:507
+#: src/reduce.c:506
 #, c-format
 msgid "%d useless rule%s"
 msgstr "%d ÂÅÓÐÏÌÅÚÎÙÈ ÐÒÁ×ÉÌ%s"

-#: src/reduce.c:540
+#: src/reduce.c:539
 #, c-format
 msgid "Start symbol %s does not derive any sentence"
 msgstr "îÁÞÁÌØÎÙÊ ÓÉÍ×ÏÌ %s ÎÅ ×Ù×ÏÄÉÔ ÎÉ ÏÄÎÏÇÏ ÐÒÅÄÌÏÖÅÎÉÑ"

-#: src/reduce.c:553
+#: src/reduce.c:552
 #, c-format
 msgid ""
 "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n"
@@ -785,14 +787,17 @@ msgstr "
 #. MARK).  A British English Unicode locale should instead
 #. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and
 #. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
-#: lib/quotearg.c:259
+#: lib/quotearg.c:268
 msgid "`"
 msgstr "`"

-#: lib/quotearg.c:260
+#: lib/quotearg.c:269
 msgid "'"
 msgstr "'"

+#~ msgid "\t\t/* empty */"
+#~ msgstr "\t\t/* ÐÕÓÔÏ */"
+
 #~ msgid "multiple %%header_extension declarations"
 #~ msgstr "ÍÎÏÖÅÓÔ×ÅÎÎÙÅ ÏÐÉÓÁÎÉÑ %%header_extension"

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.28c\n"
-"POT-Creation-Date: 2001-09-22 18:19+0200\n"
+"POT-Creation-Date: 2001-10-02 18:30+0200\n"
 "PO-Revision-Date: 2001-09-10 10:54GMT\n"
 "Last-Translator: Altug Bayram <[email protected]>\n"
 "Language-Team: Turkish <[email protected]>\n"
@@ -31,79 +31,79 @@ msgstr "uyar
 msgid "fatal error: "
 msgstr "ölümcül hata:"

-#: src/conflicts.c:49
+#: src/conflicts.c:48
 #, c-format
 msgid "Conflict in state %d between rule %d and token %s resolved as %s.\n"
 msgstr ""
 "%d durumu içinde %d kuralý ve %s andaçý arasýndaki çeliþki %s "
 "olarakçözümlendi.\n"

-#: src/conflicts.c:115 src/conflicts.c:138
+#: src/conflicts.c:114 src/conflicts.c:137
 msgid "reduce"
 msgstr "indirgeme"

-#: src/conflicts.c:121 src/conflicts.c:134
+#: src/conflicts.c:120 src/conflicts.c:133
 msgid "shift"
 msgstr "öteleme"

-#: src/conflicts.c:142
+#: src/conflicts.c:141
 msgid "an error"
 msgstr "bir hata"

-#: src/conflicts.c:422
+#: src/conflicts.c:421
 msgid " 1 shift/reduce conflict"
 msgstr " 1 öteleme/indirgeme çeliþkisi"

-#: src/conflicts.c:427
+#: src/conflicts.c:426
 #, c-format
 msgid " %d shift/reduce conflicts"
 msgstr " %d öteleme/indirgeme çeliþkisi"

-#: src/conflicts.c:433
+#: src/conflicts.c:432
 msgid " and"
 msgstr " ve"

-#: src/conflicts.c:439
+#: src/conflicts.c:438
 msgid " 1 reduce/reduce conflict"
 msgstr " 1 indirgeme/indirgeme çeliþkisi"

-#: src/conflicts.c:444
+#: src/conflicts.c:443
 #, c-format
 msgid " %d reduce/reduce conflicts"
 msgstr " %d indirgeme/indirgeme çeliþkisi"

-#: src/conflicts.c:481
+#: src/conflicts.c:480
 #, c-format
 msgid "State %d contains"
 msgstr "%d durumu içerir"

 #. If invoked with `--yacc', use the output format specified by
 #. POSIX.
-#: src/conflicts.c:493
+#: src/conflicts.c:491
 msgid "conflicts: "
 msgstr "çeliþkiler: "

-#: src/conflicts.c:495
+#: src/conflicts.c:493
 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d öteleme/indirgeme"

-#: src/conflicts.c:499
+#: src/conflicts.c:497
 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d indirgeme/indirgeme"

-#: src/conflicts.c:504
+#: src/conflicts.c:502
 #, c-format
 msgid "%s contains"
 msgstr "%s içerir"

-#: src/conflicts.c:590 src/conflicts.c:711
+#: src/conflicts.c:588 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:602 src/print.c:173
+#: src/conflicts.c:600 src/print.c:171
 #, c-format
 msgid ""
 "    $default\treduce using rule %d (%s)\n"
@@ -112,31 +112,31 @@ msgstr ""
 "    $default\tindirgeme kural %d (%s)'i kullanýyor\n"
 "\n"

-#: src/conflicts.c:691 src/conflicts.c:705
+#: 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:732
+#: src/conflicts.c:730
 #, c-format
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr "    $default\tindirgeme kural %d (%s)'i kullanýyor\n"

-#: src/derives.c:44
+#: src/derives.c:43
 msgid "DERIVES"
 msgstr "TÜRETÝLENLER"

-#: src/derives.c:49
+#: src/derives.c:48
 #, c-format
 msgid "%s derives"
 msgstr "%s türetildi"

-#: src/files.c:132
+#: src/files.c:133
 #, c-format
 msgid "cannot open file `%s'"
 msgstr "`%s' dosyasý açýlamadý"

-#: src/files.c:151
+#: src/files.c:152
 msgid "cannot close file"
 msgstr "dosya kapatýlamýyor"

@@ -238,7 +238,7 @@ msgstr ""
 "Hiçbir garantisi yoktur; hatta SATILABÝLÝRLÝÐÝ veya HERHANGÝ BÝR AMACA\n"
 "UYGUNLUÐU için bile garanti verilmez.\n"

-#: src/getargs.c:214 src/lex.c:635
+#: src/getargs.c:214 src/lex.c:650
 #, c-format
 msgid "`%s' is no longer supported"
 msgstr "`%s' artýk desteklenmiyor"
@@ -258,137 +258,139 @@ msgstr "%s: gramer dosyas
 msgid "%s: extra arguments ignored after `%s'\n"
 msgstr "%s: '%s' den sonraki argümanlar yoksayýldý\n"

-#: src/lalr.c:312
+#: src/lalr.c:311
 #, c-format
 msgid "too many gotos (max %d)"
 msgstr "gotos çok fazla (en fazla %d)"

-#: src/lex.c:72
+#: src/lex.c:78
 msgid "unexpected `/' found and ignored"
 msgstr "beklenmeyen `/' bulundu ve yoksayýldý"

-#: src/lex.c:101 src/reader.c:270
+#: src/lex.c:107 src/reader.c:269
 msgid "unterminated comment"
 msgstr "sonlandýrýlmamýþ açýklama"

-#: src/lex.c:133
+#: src/lex.c:139
 msgid "unexpected end of file"
 msgstr "beklenmeyen dosya sonu"

-#: src/lex.c:162
+#: src/lex.c:168
 msgid "unescaped newline in constant"
 msgstr "sabit içinde kaçýþsýz yeni satýr"

-#: src/lex.c:204
+#: src/lex.c:210
 #, c-format
 msgid "octal value outside range 0...255: `\\%o'"
 msgstr "sekizli deðer 0...255'in dýþýnda: `\\%o'"

-#: src/lex.c:229
+#: src/lex.c:235
 #, c-format
 msgid "hexadecimal value above 255: `\\x%x'"
 msgstr "onaltýlýk deðer 255'in üstünde: `\\x%x'"

-#: src/lex.c:241
+#: src/lex.c:247
 #, c-format
 msgid "unknown escape sequence: `\\' followed by `%s'"
 msgstr "bilinmeyen kaçýþ sýrasý: `\\' `%s' tarafýndan takip edildi"

-#: src/lex.c:337
+#: src/lex.c:343
 msgid "unterminated type name at end of file"
 msgstr "dosya sonunda sonlandýrýlmamýþ tip adý"

-#: src/lex.c:340
+#: src/lex.c:346
 msgid "unterminated type name"
 msgstr "sonlandýrýlmamýþ tip ismi"

-#: src/lex.c:432
+#: src/lex.c:437
 msgid "use \"...\" for multi-character literal tokens"
 msgstr "çok-karakterli yazýn andaçlarý için \"...\" kullan"

-#: src/main.c:108
+#: src/main.c:125
 #, c-format
 msgid "%s: internal error: %s\n"
 msgstr "%s: iç hata: %s\n"

-#: src/nullable.c:52
+#: src/nullable.c:51
 msgid "Entering set_nullable"
 msgstr "set_nullable'a girildi"

-#: src/output.c:993
+#: src/output.c:986
 #, c-format
 msgid "maximum table size (%d) exceeded"
 msgstr "en büyük tablo uzunluðu (%d) aþýldý"

-#: src/print.c:38
+#: src/print.c:37
 #, c-format
 msgid " type %d is %s\n"
 msgstr " tip %d %s'dir\n"

-#: src/print.c:86
+#: src/print.c:85
 #, c-format
 msgid "   (rule %d)"
 msgstr "   (kural %d)"

-#: src/print.c:112
+#: src/print.c:111
 msgid "    $default\taccept\n"
 msgstr "    $default\tonayla\n"

-#: src/print.c:114
+#: src/print.c:113
 msgid "    NO ACTIONS\n"
 msgstr "    EYLEM YOK\n"

-#: src/print.c:133
+#: src/print.c:132
 #, c-format
 msgid "    $   \tgo to state %d\n"
 msgstr "    $   \tdurum %d'ye git\n"

-#: src/print.c:136
+#: src/print.c:135
 #, c-format
 msgid "    %-4s\tshift, and go to state %d\n"
 msgstr "    %-4s\tötele, ve durum %d'ye git\n"

-#: src/print.c:160
+#: src/print.c:159
 #, c-format
 msgid "    %-4s\terror (nonassociative)\n"
 msgstr "    %-4s\thata (birleþmeli deðil)\n"

-#: src/print.c:190
+#: src/print.c:187
 #, c-format
 msgid "    %-4s\tgo to state %d\n"
 msgstr "    %-4s\tdurum %d'ye git\n"

-#: src/print.c:202
+#: src/print.c:199
 #, c-format
 msgid "state %d"
 msgstr "durum %d"

-#: src/print.c:233
+#. rule # : LHS -> RHS
+#: src/print.c:229
 msgid "Grammar"
 msgstr "Gramer"

-#: src/print.c:240
+#: src/print.c:234
 #, c-format
 msgid "rule %-4d %s ->"
 msgstr "kural %-4d %s ->"

-#: src/print.c:246
-msgid "\t\t/* empty */"
-msgstr "\t\t/* boþ */"
+#: src/print.c:240
+msgid "empty"
+msgstr ""

-#: src/print.c:253
+#. TERMINAL (type #) : rule #s terminal is on RHS
+#: src/print.c:244
 msgid "Terminals, with rules where they appear"
 msgstr "Sabit simgeler, kurallarýnýn bulunduklarý yerde"

-#: src/print.c:302
+#: src/print.c:268
 msgid "Nonterminals, with rules where they appear"
 msgstr "Deðiþken simgeler, kurallarýnýn bulunduklarý yerde"

-#: src/print.c:329
+#: src/print.c:294
 msgid " on left:"
 msgstr " solda:"

-#: src/print.c:344
+#: src/print.c:309
 msgid " on right:"
 msgstr " saðda:"

@@ -402,242 +404,242 @@ msgstr "%-4s\thata (birle
 msgid "$default\treduce using rule %d (%s)"
 msgstr "$default\tindirgeme kural %d (%s)'i kullanýyor"

-#: src/reader.c:79
+#: src/reader.c:78
 msgid "   Skipping to next \\n"
 msgstr "   Sonrakine atlanýyor \\n"

-#: src/reader.c:81
+#: src/reader.c:80
 #, c-format
 msgid "   Skipping to next %c"
 msgstr "   Sonraki  %c'ye atlanýyor"

-#: src/reader.c:132 src/reader.c:144
+#: src/reader.c:131 src/reader.c:143
 msgid "invalid $ value"
 msgstr "geçersiz $ deðeri"

-#: src/reader.c:170 src/reader.c:185
+#: src/reader.c:169 src/reader.c:184
 msgid "unterminated string at end of file"
 msgstr "dosyanýn sonunda sonlandýrýlmamýþ dizge"

-#: src/reader.c:173
+#: src/reader.c:172
 msgid "unterminated string"
 msgstr "sonlandýrýlmamýþ dizge"

-#: src/reader.c:326 src/reader.c:390
+#: src/reader.c:325 src/reader.c:389
 #, c-format
 msgid "%s is invalid"
 msgstr "%s geçersizdir"

-#: src/reader.c:366
+#: src/reader.c:365
 #, c-format
 msgid "$$ of `%s' has no declared type"
 msgstr "`%s''in $$'ý bildirilmiþ tip deðil"

-#: src/reader.c:383
+#: src/reader.c:382
 #, c-format
 msgid "$%d of `%s' has no declared type"
 msgstr "`%d''in $%s'i bildirilmiþ tip deðil"

-#: src/reader.c:437
+#: src/reader.c:436
 msgid "unterminated `%{' definition"
 msgstr "`%{' tanýmlamasý sonlandýrýlmamýþ"

-#: src/reader.c:482 src/reader.c:598 src/reader.c:648
+#: src/reader.c:481 src/reader.c:595 src/reader.c:645
 #, c-format
 msgid "Premature EOF after %s"
 msgstr "%s'den sonra erken EOF"

-#: src/reader.c:499
+#: src/reader.c:498
 #, c-format
 msgid "symbol `%s' used more than once as a literal string"
 msgstr "simge `%s' birden fazla defa sabit dizge olarak kullanýldý"

-#: src/reader.c:502
+#: src/reader.c:501
 #, c-format
 msgid "symbol `%s' given more than one literal string"
 msgstr "`%s' simgesine birden fazla sabit dizge verilmiþ"

-#: src/reader.c:524 src/reader.c:667
+#: src/reader.c:522 src/reader.c:664
 #, c-format
 msgid "symbol %s redefined"
 msgstr "%s simgesi yeniden tanýmlandý"

-#: src/reader.c:534 src/reader.c:613 src/reader.c:674 src/reader.c:1290
+#: src/reader.c:532 src/reader.c:610 src/reader.c:671 src/reader.c:1285
 #, c-format
 msgid "type redeclaration for %s"
 msgstr "%s için yeniden tip bildirimi"

-#: src/reader.c:544
+#: src/reader.c:541
 #, c-format
 msgid "`%s' is invalid in %s"
 msgstr "`%s' %s içinde geçersizdir"

-#: src/reader.c:561 src/reader.c:721
+#: src/reader.c:558 src/reader.c:717
 #, c-format
 msgid "multiple %s declarations"
 msgstr "çoklu %s bildirimleri"

-#: src/reader.c:563 src/reader.c:902 src/reader.c:927 src/reader.c:1268
+#: src/reader.c:560 src/reader.c:897 src/reader.c:922 src/reader.c:1263
 #, c-format
 msgid "invalid %s declaration"
 msgstr "geçersiz %s bildirimi"

-#: src/reader.c:583
+#: src/reader.c:580
 msgid "%type declaration has no <typename>"
 msgstr "%type bildirimi <tipadý>'na sahip deðil"

-#: src/reader.c:618
+#: src/reader.c:615
 #, c-format
 msgid "invalid %%type declaration due to item: %s"
 msgstr "geçersiz %%type bildirimine neden olan öðe: %s"

-#: src/reader.c:663
+#: src/reader.c:660
 #, c-format
 msgid "redefining precedence of %s"
 msgstr "%s'in önceliði tekrar tanýmlandý"

-#: src/reader.c:687
+#: src/reader.c:683
 #, c-format
 msgid "invalid text (%s) - number should be after identifier"
 msgstr "geçersiz metin (%s) - sayý tanýtýcýdan sonra olmalýdýr"

-#: src/reader.c:697
+#: src/reader.c:693
 #, c-format
 msgid "unexpected item: %s"
 msgstr "beklenmeyen öðe: %s"

-#: src/reader.c:764 src/reader.c:1094 src/reader.c:1165
+#: src/reader.c:760 src/reader.c:1089 src/reader.c:1160
 #, c-format
 msgid "unmatched %s"
 msgstr "eþlenemeyen %s"

-#: src/reader.c:796
+#: src/reader.c:792
 #, c-format
 msgid "argument of %%expect is not an integer"
 msgstr "%%expect'in argümaný bir tamsayý deðil"

-#: src/reader.c:843
+#: src/reader.c:838
 #, c-format
 msgid "unrecognized item %s, expected an identifier"
 msgstr "%s öðesi tanýnmadý, beklenen bir tanýtýcýdýr"

-#: src/reader.c:867
+#: src/reader.c:862
 #, c-format
 msgid "expected string constant instead of %s"
 msgstr "%s'in yerine sabit dizge beklendi"

-#: src/reader.c:1010
+#: src/reader.c:1005
 #, c-format
 msgid "unrecognized: %s"
 msgstr "tanýnmayan: %s"

-#: src/reader.c:1015
+#: src/reader.c:1010
 msgid "no input grammar"
 msgstr "girdi grameri yok"

-#: src/reader.c:1020
+#: src/reader.c:1015
 #, c-format
 msgid "unknown character: %s"
 msgstr "bilinmeyen karakter: %s"

-#: src/reader.c:1188
+#: src/reader.c:1183
 #, c-format
 msgid "unterminated %guard clause"
 msgstr "sonlandýrýlmamýþ %guard yantümcesi"

-#: src/reader.c:1355
+#: src/reader.c:1350
 msgid "ill-formed rule: initial symbol not followed by colon"
 msgstr "kötü-biçemli kural: baþlangýç simgesini takip eden \":\" yok"

-#: src/reader.c:1362
+#: src/reader.c:1357
 msgid "grammar starts with vertical bar"
 msgstr "gramer düþey çubuk ile baþlýyor"

-#: src/reader.c:1393
+#: src/reader.c:1388
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "bir andaç olan %s için verilen kural"

-#: src/reader.c:1495
+#: src/reader.c:1490
 msgid "two @prec's in a row"
 msgstr "bir satýrda iki @prec"

-#: src/reader.c:1503
+#: src/reader.c:1498
 #, c-format
 msgid "%%guard present but %%semantic_parser not specified"
 msgstr "%%guard sunulmuþ fakat %%semantic_parser belirlenmemiþ"

-#: src/reader.c:1512
+#: src/reader.c:1507
 msgid "two actions at end of one rule"
 msgstr "bir kuralýn sonunda iki eylem"

-#: src/reader.c:1526
+#: src/reader.c:1521
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "öntanýmlý eylem üzerinde (`%s' `%s') tip çatýþmasý"

-#: src/reader.c:1532
+#: src/reader.c:1527
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "Tipli deðiþken simge için boþ kural tanýmlanmýþ, ve eylembelirtilmemiþ"

-#: src/reader.c:1576
+#: src/reader.c:1571
 #, c-format
 msgid "invalid input: %s"
 msgstr "geçersiz girdi: %s"

-#: src/reader.c:1584
+#: src/reader.c:1579
 #, 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:1587
+#: src/reader.c:1582
 msgid "no rules in the input grammar"
 msgstr "girdi grameri içinde kurallar yok"

-#: src/reader.c:1611
+#: src/reader.c:1606
 #, 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ý vekurallarý yok"

-#: src/reader.c:1716
+#: src/reader.c:1712
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "%s ve %s için çeliþen öncelikler"

-#: src/reader.c:1728
+#: src/reader.c:1724
 #, 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:1779
+#: 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:1792
+#: src/reader.c:1782
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "baþlangýç simgesi %s tanýmlanmadý"

-#: src/reader.c:1794
+#: src/reader.c:1784
 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "baþlangýç simgesi %s bir andaçtýr"

-#: src/reduce.c:402
+#: src/reduce.c:401
 msgid "Useless nonterminals:"
 msgstr "Yararsýz kurallar:"

-#: src/reduce.c:417
+#: src/reduce.c:416
 msgid "Terminals which are not used:"
 msgstr "Kullanýlmayan sabit simgeler:"

-#: src/reduce.c:428
+#: src/reduce.c:427
 msgid "Useless rules:"
 msgstr "Yararsýz kurallar:"

-#: src/reduce.c:457
+#: src/reduce.c:456
 msgid ""
 "Variables\n"
 "---------\n"
@@ -647,11 +649,11 @@ msgstr ""
 "-----------\n"
 "\n"

-#: src/reduce.c:459
+#: src/reduce.c:458
 msgid "Value  Sprec    Sassoc    Tag\n"
 msgstr "Deðer  Söncel   Sbirleþ   Etiket\n"

-#: src/reduce.c:464
+#: src/reduce.c:463
 msgid ""
 "Rules\n"
 "-----\n"
@@ -661,7 +663,7 @@ msgstr ""
 "--------\n"
 "\n"

-#: src/reduce.c:475
+#: src/reduce.c:474
 msgid ""
 "Rules interpreted\n"
 "-----------------\n"
@@ -671,36 +673,36 @@ msgstr ""
 "-------------------\n"
 "\n"

-#: src/reduce.c:492
+#: src/reduce.c:491
 #, c-format
 msgid "%d rules never reduced\n"
 msgstr "%d kural asla indirgenmedi\n"

-#: src/reduce.c:494
+#: src/reduce.c:493
 #, c-format
 msgid "%s contains "
 msgstr "%s içerir "

-#: src/reduce.c:498
+#: src/reduce.c:497
 #, c-format
 msgid "%d useless nonterminal%s"
 msgstr "%d yararsýz deðiþken simge%s"

-#: src/reduce.c:503
+#: src/reduce.c:502
 msgid " and "
 msgstr " ve "

-#: src/reduce.c:507
+#: src/reduce.c:506
 #, c-format
 msgid "%d useless rule%s"
 msgstr "%d yararsýz kural%s"

-#: src/reduce.c:540
+#: src/reduce.c:539
 #, c-format
 msgid "Start symbol %s does not derive any sentence"
 msgstr "Baþlangýç simgesi %s herhangi bir cümleden türemez"

-#: src/reduce.c:553
+#: src/reduce.c:552
 #, fuzzy, c-format
 msgid ""
 "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n"
@@ -787,14 +789,17 @@ msgstr "bellek t
 #. MARK).  A British English Unicode locale should instead
 #. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and
 #. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
-#: lib/quotearg.c:259
+#: lib/quotearg.c:268
 msgid "`"
 msgstr "`"

-#: lib/quotearg.c:260
+#: lib/quotearg.c:269
 msgid "'"
 msgstr "'"

+#~ msgid "\t\t/* empty */"
+#~ msgstr "\t\t/* boþ */"
+
 #~ msgid "multiple %%header_extension declarations"
 #~ msgstr "çoklu %%header_extension bildirimleri"

@@ -23,7 +23,6 @@
   The entry point is generate_states.  */

 #include "system.h"
-#include "xalloc.h"
 #include "gram.h"
 #include "state.h"
 #include "complain.h"
@@ -33,39 +32,39 @@

 int nstates;
 int final_state;
-core *first_state;
-shifts *first_shift;
-reductions *first_reduction;
+core *first_state = NULL;
+shifts *first_shift = NULL;
+reductions *first_reduction = NULL;

-static core *this_state;
-static core *last_state;
-static shifts *last_shift;
-static reductions *last_reduction;
+static core *this_state = NULL;
+static core *last_state = NULL;
+static shifts *last_shift = NULL;
+static reductions *last_reduction = NULL;

 static int nshifts;
-static short *shift_symbol;
+static short *shift_symbol = NULL;

-static short *redset;
-static short *shiftset;
+static short *redset = NULL;
+static short *shiftset = NULL;

-static short **kernel_base;
-static short **kernel_end;
-static short *kernel_items;
+static short **kernel_base = NULL;
+static short **kernel_end = NULL;
+static short *kernel_items = NULL;

 /* hash table for states, to recognize equivalent ones.  */

 #define	STATE_TABLE_SIZE	1009
-static core **state_table;
+static core **state_table = NULL;


 static void
 allocate_itemsets (void)
 {
-  short *itemp;
+  short *itemp = NULL;
  int symbol;
  int i;
  int count;
-  short *symbol_count;
+  short *symbol_count = NULL;

  count = 0;
  symbol_count = XCALLOC (short, nsyms);
@@ -89,7 +88,8 @@ allocate_itemsets (void)
     We allocate that much space for each symbol.  */

  kernel_base = XCALLOC (short *, nsyms);
-  kernel_items = XCALLOC (short, count);
+  if (count)
+    kernel_items = XCALLOC (short, count);

  count = 0;
  for (i = 0; i < nsyms; i++)
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.5 from Makefile.am.
+# Makefile.in generated automatically by automake 1.5a from Makefile.am.

 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -43,6 +43,7 @@ AUTOCONF = @AUTOCONF@
 AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@

+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
@@ -57,6 +58,10 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
 AWK = @AWK@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
@@ -66,7 +71,6 @@ CC = @CC@
 CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
-EXEEXT = @EXEEXT@
 GENCAT = @GENCAT@
 GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@
@@ -82,7 +86,6 @@ LIBOBJS = @LIBOBJS@
 M4 = @M4@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 POFILES = @POFILES@
 POSUB = @POSUB@
@@ -356,7 +359,7 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  || etags $(ETAGS_ARGS) $$tags  $$unique $(LISP)

 GTAGS:
-	here=`CDPATH=: && cd $(top_builddir) && pwd` \
+	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && cd $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) $$here

@@ -72,6 +72,10 @@
 # endif /* alloca not defined */
 #endif /* YYSTACK_USE_ALLOCA not defined */

+#ifndef YYSTACK_USE_ALLOCA
+# define YYSTACK_USE_ALLOCA 0
+#endif
+
 #if YYSTACK_USE_ALLOCA
 # define YYSTACK_ALLOC alloca
 #else
@@ -358,7 +362,7 @@ yyparse (YYPARSE_PARAM_ARG)
     have just been pushed. so pushing a state here evens the stacks.
     */
  yyssp++;
-  
+
 yysetstate:
  *yyssp = yystate;

@@ -416,7 +420,7 @@ yyparse (YYPARSE_PARAM_ARG)
      yystacksize *= 2;
      if (yystacksize > YYMAXDEPTH)
 	yystacksize = YYMAXDEPTH;
-# ifndef YYSTACK_USE_ALLOCA
+# if !YYSTACK_USE_ALLOCA
      yyfree_stacks = 1;
 # endif
      yyss = (short *) YYSTACK_ALLOC (yystacksize * sizeof (*yyssp));
@@ -19,7 +19,6 @@
   02111-1307, USA.  */

 #include "system.h"
-#include "xalloc.h"
 #include "gram.h"
 #include "closure.h"
 #include "derives.h"
@@ -20,7 +20,6 @@

 #include "system.h"
 #include "getargs.h"
-#include "xalloc.h"
 #include "files.h"
 #include "gram.h"
 #include "state.h"
@@ -30,12 +29,12 @@
 #include "LR0.h"

 int any_conflicts = 0;
-errs **err_table;
+errs **err_table = NULL;
 int expected_conflicts;
-static char *conflicts;
+static char *conflicts = NULL;

-static unsigned *shiftset;
-static unsigned *lookaheadset;
+static unsigned *shiftset = NULL;
+static unsigned *lookaheadset = NULL;
 static int src_total;
 static int rrc_total;
 static int src_count;
@@ -264,7 +263,7 @@ set_conflicts (int state)
 }

 void
-initialize_conflicts (void)
+solve_conflicts (void)
 {
  int i;

@@ -458,7 +457,7 @@ conflict_report (int src_num, int rrc_num)
 `---------------------------------------------*/

 void
-print_conflicts (void)
+print_conflicts (FILE *out)
 {
  int i;

@@ -478,9 +477,8 @@ print_conflicts (void)

 	  if (verbose_flag)
 	    {
-	      obstack_fgrow1 (&output_obstack, _("State %d contains"), i);
-	      obstack_sgrow (&output_obstack,
-			     conflict_report (src_count, rrc_count));
+	      fprintf (out, _("State %d contains"), i);
+	      fputs (conflict_report (src_count, rrc_count), out);
 	    }
 	}
    }
@@ -738,7 +736,7 @@ print_reductions (int state)


 void
-finalize_conflicts (void)
+free_conflicts (void)
 {
  XFREE (conflicts);
  XFREE (shiftset);
@@ -22,10 +22,10 @@
 # define CONFLICTS_H_
 # include "state.h"

-void initialize_conflicts PARAMS ((void));
-void print_conflicts PARAMS ((void));
+void solve_conflicts PARAMS ((void));
+void print_conflicts PARAMS ((FILE *out));
 void print_reductions PARAMS ((int));
-void finalize_conflicts PARAMS ((void));
+void free_conflicts PARAMS ((void));

 /* Were there conflicts? */
 extern int any_conflicts;
@@ -25,7 +25,6 @@
   */

 #include "system.h"
-#include "xalloc.h"
 #include "types.h"
 #include "gram.h"
 #include "derives.h"
@@ -22,7 +22,6 @@
 #include "system.h"
 #include "getargs.h"
 #include "files.h"
-#include "xalloc.h"
 #include "gram.h"
 #include "complain.h"

@@ -34,11 +33,11 @@ struct obstack table_obstack;
 struct obstack defines_obstack;
 struct obstack guard_obstack;
 struct obstack output_obstack;
-struct obstack graph_obstack;

 char *spec_outfile = NULL;	/* for -o. */
 char *spec_file_prefix = NULL;	/* for -b. */
 char *spec_name_prefix = NULL;	/* for -p. */
+char *spec_verbose_file = NULL;   /* for --verbose. */
 char *spec_graph_file = NULL;   /* for -g. */
 char *spec_defines_file = NULL; /* for --defines. */

@@ -95,24 +94,26 @@ stringappend (const char *string1, const char *string2)
 static char *
 compute_header_macro (void)
 {
-  int ite;
-  char *macro_name;
+  char *macro_name, *cp;

-  macro_name = XMALLOC (char,
-			strlen (base_name) +
-			strlen (header_extension) + 1);
+  if (spec_defines_file)
+    macro_name = xstrdup (spec_defines_file);
+  else
+    {
+      macro_name = XMALLOC (char,
+			    strlen (base_name) +
+			    strlen (header_extension) + 1);

-  stpcpy (macro_name, base_name);
-  strcat (macro_name, header_extension);
+      stpcpy (macro_name, base_name);
+      strcat (macro_name, header_extension);
+    }
+
+  for (cp = macro_name; *cp; ++cp)
+    if (islower (*cp))
+      *cp = toupper (*cp);
+    else if (!isalnum (*cp))
+      *cp = '_';

-  for (ite = 0; macro_name[ite]; ite++)
-    if (macro_name[ite] == '.')
-      macro_name[ite] = '_';
-    else
-      {
-	if (islower (macro_name[ite]))
-	  macro_name[ite] -= ('a' - 'A');
-      }
  return macro_name;
 }

@@ -196,17 +197,42 @@ skeleton_find (const char *envvar, const char *skeleton_name)
 {
  const char *res = getenv (envvar);

-#ifdef MSDOS
-  const char *cp;
-
-  /* File doesn't exist in current directory; try in INIT directory.  */
-  if (!res && (cp = getenv ("INIT")))
+#if defined (MSDOS) || defined (_WIN32)
+  if (!res)
    {
-      res = XMALLOC (char, strlen (cp) + strlen (skeleton_name) + 2);
-      sprintf (res, "%s%c%s", cp, '/', skeleton_name);
-    }
-#endif /* !MSDOS */
+      /* Skeleton file name without path */
+      const char *skel_name = strrchr(skeleton_name, '/');
+      if (!skel_name)
+        skel_name = strrchr(skeleton_name, '\\');
+      if (!skel_name)
+        skel_name = skeleton_name;
+      else
+        ++skel_name;

+      /* File doesn't exist in current directory; try in INIT directory.  */
+      const char *cp = getenv ("INIT");
+      if (cp)
+	{
+	  res = XMALLOC (char, strlen (cp) + strlen (skel_name) + 2);
+	  sprintf (res, "%s%c%s", cp, '\\', skel_name);
+	}
+      else if (access (skel_name, 4) == 0) /* Look in current dir. */
+        res = skel_name;
+      else
+	{
+	  /* Look in program locations dir. */
+	  extern char *program_name;
+	  cp = strrchr(program_name, '\\');
+	  if (!cp)
+	    return skeleton_name;
+	  else
+	    ++cp;
+	  res = XMALLOC (char, cp - program_name + strlen (skel_name) + 1);
+	  strncpy (res, program_name, cp - program_name);
+	  strcpy (res + (cp - program_name), skel_name);
+	}
+    }
+#endif /* defined (MSDOS) || defined (_WIN32) */
  if (!res)
    res = skeleton_name;

@@ -387,6 +413,38 @@ compute_base_names (void)
  }
 }

+/*-------------------------------------------------------.
+| Close the open files, compute the output files names.  |
+`-------------------------------------------------------*/
+
+void
+compute_output_file_names (void)
+{
+  compute_base_names ();
+
+  /* If not yet done. */
+  if (!src_extension)
+    src_extension = ".c";
+  if (!header_extension)
+    header_extension = ".h";
+
+  /* It the defines filename if not given, we create it.  */
+  if (!spec_defines_file)
+    spec_defines_file = stringappend (base_name, header_extension);
+
+  /* It the graph filename if not given, we create it.  */
+  if (!spec_graph_file)
+    spec_graph_file = stringappend (short_base_name, ".vcg");
+
+  spec_verbose_file = stringappend (short_base_name, EXT_OUTPUT);
+
+  attrsfile = stringappend (short_base_name, EXT_STYPE_H);
+#ifndef MSDOS
+  attrsfile = stringappend (attrsfile, header_extension);
+#endif /* MSDOS */
+
+}
+
 /*-----------------------------------------------------------------.
 | Open the input file.  Look for the skeletons.  Find the names of |
 | the output files.  Prepare the obstacks.                         |
@@ -404,48 +462,43 @@ open_files (void)
  obstack_init (&defines_obstack);
  obstack_init (&guard_obstack);
  obstack_init (&output_obstack);
-  obstack_init (&graph_obstack);
 }



-/*-----------------------------------------------------.
-| Close the open files, produce all the output files.  |
-`-----------------------------------------------------*/
+/*-----------------------.
+| Close the open file..  |
+`-----------------------*/
+
+void
+close_files (void)
+{
+  xfclose (finput);
+}
+
+/*---------------------------.
+| Produce the output files.  |
+`---------------------------*/

 void
 output_files (void)
 {
-  xfclose (finput);
-
-  compute_base_names ();
-
-  /* It the defines filename if not given, we create it.  */
-  if (!spec_defines_file)
-    spec_defines_file = stringappend (base_name, header_extension);
-  
-  /* It the graph filename if not given, we create it.  */
-  if (!spec_graph_file)
-    spec_graph_file = stringappend (short_base_name, ".vcg");
-  
-  attrsfile = stringappend (short_base_name, EXT_STYPE_H);
-#ifndef MSDOS
-  stringappend (attrsfile, header_extension);
-#endif /* MSDOS */
-
  /* Output the main file.  */
  if (spec_outfile)
    obstack_save (&table_obstack, spec_outfile);
  else
    obstack_save (&table_obstack, stringappend (base_name, src_extension));
+  obstack_free (&table_obstack, NULL);

  /* Output the header file if wanted. */
  if (defines_flag)
    defines_obstack_save (spec_defines_file);
+  obstack_free (&defines_obstack, NULL);

  /* If we output only the table, dump the actions in ACTFILE. */
  if (no_parser_flag)
    obstack_save (&action_obstack, stringappend (short_base_name, ".act"));
+  obstack_free (&action_obstack, NULL);

  /* If we produced a semantic parser ATTRS_OBSTACK must be dumped
     into its own file, ATTTRSFILE.  */
@@ -454,19 +507,12 @@ output_files (void)
      char *temp_name;

      obstack_save (&attrs_obstack, attrsfile);
+      obstack_free (&attrs_obstack, NULL);
      temp_name = stringappend (short_base_name, EXT_GUARD_C);
 #ifndef MSDOS
      temp_name = stringappend (temp_name, src_extension);
 #endif /* MSDOS */
      obstack_save (&guard_obstack, temp_name);
+      obstack_free (&guard_obstack, NULL);
    }
-
-  if (verbose_flag)
-    /* We used to use just .out if spec_name_prefix (-p) was used, but
-       that conflicts with Posix.  */
-    obstack_save (&output_obstack,
-		  stringappend (short_base_name, EXT_OUTPUT));
-
-  if (graph_flag)
-    obstack_save (&graph_obstack, spec_graph_file);
 }
@@ -33,9 +33,12 @@ extern char *spec_name_prefix;
 /* File name pfx specified with -b, or 0 if no -b.  */
 extern char *spec_file_prefix;

+/* --verbose. */
+extern char *spec_verbose_file;
+
 /* File name specified for the output VCG graph.  */
 extern char *spec_graph_file;
- 
+
 /* File name specified with --defines.  */
 extern char *spec_defines_file;

@@ -62,14 +65,13 @@ extern struct obstack guard_obstack;
 /* The verbose output. */
 extern struct obstack output_obstack;

-/* The VCG graph output. */
-extern struct obstack graph_obstack;
-
 extern char *infile;
 extern char *attrsfile;

 void open_files PARAMS((void));
+void close_files PARAMS((void));

+void compute_output_file_names PARAMS((void));
 void output_files PARAMS((void));

 FILE *xfopen PARAMS ((const char *name, const char *mode));
@@ -50,7 +50,7 @@ static struct option longopts[] =

  /* Parser. */
  {"skeleton",		required_argument,	0, 'S'},
-  {"debug",		no_argument,		0, 'd'},
+  {"debug",		no_argument,		0, 't'},
  {"locations",		no_argument, 	&locations_flag, 1},
  /* was 'a';  apparently unused -wjh */
  {"name-prefix",	required_argument, 	0, 'p'},
@@ -183,7 +183,7 @@ getargs (int argc, char *argv[])
 	exit (0);

      case 'g':
-	/* Here, the -g and --graph=FILE options are differentiated.  */	
+	/* Here, the -g and --graph=FILE options are differentiated.  */
 	graph_flag = 1;
 	spec_graph_file = optarg;
 	break;
@@ -31,21 +31,19 @@ int nsyms;
 int ntokens;
 int nvars;

-short *ritem;
-short *rlhs;
-short *rrhs;
-short *rprec;
-short *rprecsym;
-short *sprec;
-short *rassoc;
-short *sassoc;
-short *token_translations;
-short *rline;
+short *ritem = NULL;
+short *rlhs = NULL;
+short *rrhs = NULL;
+short *rprec = NULL;
+short *rprecsym = NULL;
+short *sprec = NULL;
+short *rassoc = NULL;
+short *sassoc = NULL;
+short *token_translations = NULL;
+short *rline = NULL;

 int start_symbol;

-int translations;
-
 int max_user_token_number;

 int semantic_parser;
@@ -107,13 +107,9 @@ typedef enum

 /* token translation table: indexed by a token number as returned by
   the user's yylex routine, it yields the internal token number used
-   by the parser and throughout bison.  If translations is zero, the
-   translation table is not used because the two kinds of token
-   numbers are the same.  (It is noted in reader.c that "Nowadays
-   translations is always set to 1...") */
+   by the parser and throughout bison.  */

 extern short *token_translations;
-extern int translations;
 extern int max_user_token_number;

 /* SEMANTIC_PARSER is nonzero if the input file says to use the hairy
@@ -26,7 +26,6 @@
 #include "system.h"
 #include "types.h"
 #include "LR0.h"
-#include "xalloc.h"
 #include "gram.h"
 #include "complain.h"
 #include "lalr.h"
@@ -24,7 +24,6 @@
 #include "getopt.h"		/* for optarg */
 #include "symtab.h"
 #include "lex.h"
-#include "xalloc.h"
 #include "complain.h"
 #include "gram.h"
 #include "quote.h"
@@ -43,13 +42,20 @@ static bucket *unlexed_symval = NULL;


 void
-init_lex (void)
+lex_init (void)
 {
  obstack_init (&token_obstack);
  unlexed = tok_undef;
 }


+void
+lex_free (void)
+{
+  obstack_free (&token_obstack, NULL);
+}
+
+
 int
 skip_white_space (void)
 {
@@ -315,7 +321,7 @@ literalchar (struct obstack *out, int *pcode, char term)


 void
-unlex (int token)
+unlex (token_t token)
 {
  unlexed = token;
  unlexed_symval = symval;
@@ -419,7 +425,6 @@ lex (void)
    case '\'':
      /* parse the literal token and compute character code in  code  */

-      translations = -1;
      {
 	int code, discode;

@@ -447,7 +452,6 @@ lex (void)
    case '\"':
      /* parse the literal string token and treat as an identifier */

-      translations = -1;
      {
 	int code;		/* ignored here */

@@ -465,32 +469,40 @@ lex (void)
      }

    case ',':
+      token_buffer = ",";
      return tok_comma;

    case ':':
+      token_buffer = ":";
      return tok_colon;

    case ';':
+      token_buffer = ";";
      return tok_semicolon;

    case '|':
+      token_buffer = "|";
      return tok_bar;

    case '{':
+      token_buffer = "{";
      return tok_left_curly;

    case '=':
+      obstack_1grow (&token_obstack, c);
      do
 	{
 	  c = getc (finput);
+	  obstack_1grow (&token_obstack, c);
 	  if (c == '\n')
 	    lineno++;
 	}
      while (c == ' ' || c == '\n' || c == '\t');
+      obstack_1grow (&token_obstack, '\0');
+      token_buffer = obstack_finish (&token_obstack);

      if (c == '{')
 	{
-	  token_buffer = "={";
 	  return tok_left_curly;
 	}
      else
@@ -507,6 +519,9 @@ lex (void)
      return parse_percent_token ();

    default:
+      obstack_1grow (&token_obstack, c);
+      obstack_1grow (&token_obstack, '\0');
+      token_buffer = obstack_finish (&token_obstack);
      return tok_illegal;
    }
 }
@@ -58,9 +58,10 @@ extern const char *token_buffer;
 extern bucket *symval;
 extern int numval;

-void init_lex PARAMS ((void));
+void lex_init PARAMS ((void));
+void lex_free PARAMS ((void));
 int skip_white_space PARAMS ((void));
-void unlex PARAMS ((int));
+void unlex PARAMS ((token_t));
 void read_type_name PARAMS ((FILE *fin));

 /* Return one of the token-type codes.  When an identifier is seen,
@@ -34,6 +34,8 @@
 #include "LR0.h"
 #include "conflicts.h"
 #include "print_graph.h"
+#include "symtab.h"
+#include "lex.h"

 /* The name this program was run with, for messages.  */
 char *program_name;
@@ -79,7 +81,15 @@ main (int argc, char *argv[])
     lookahead is not enough to disambiguate the parsing.  In file
     conflicts.  Also resolve s/r conflicts based on precedence
     declarations.  */
-  initialize_conflicts ();
+  solve_conflicts ();
+
+  /* Output file names. */
+  compute_output_file_names ();
+
+  /* Stop if there were errors, to avoid trashing previous output
+     files.  */
+  if (complain_message_count)
+    exit (1);

  /* Print information about results, if requested.  */
  print_results ();
@@ -90,12 +100,19 @@ main (int argc, char *argv[])
  /* Output the tables and the parser to ftable.  In file output.  */
  output ();

-  finalize_conflicts ();
+  /* Free the symbol table data structure.  */
+  free_symtab ();
+
+  lex_free ();
+
+  /* Close the input files. */
+  close_files ();
+
+  free_conflicts ();
  free_nullable ();
  free_derives ();

-  if (!complain_message_count)
-    output_files ();
+  output_files ();

  exit (complain_message_count ? 1 : 0);
 }
@@ -26,7 +26,6 @@
 #include "system.h"
 #include "types.h"
 #include "gram.h"
-#include "xalloc.h"
 #include "nullable.h"

 char *nullable = NULL;
@@ -94,7 +94,6 @@
 #include "obstack.h"
 #include "quotearg.h"
 #include "getargs.h"
-#include "xalloc.h"
 #include "files.h"
 #include "gram.h"
 #include "LR0.h"
@@ -110,17 +109,17 @@ extern void berror PARAMS((const char *));

 static int nvectors;
 static int nentries;
-static short **froms;
-static short **tos;
-static short *tally;
-static short *width;
-static short *actrow;
-static short *state_count;
-static short *order;
-static short *base;
-static short *pos;
-static short *table;
-static short *check;
+static short **froms = NULL;
+static short **tos = NULL;
+static short *tally = NULL;
+static short *width = NULL;
+static short *actrow = NULL;
+static short *state_count = NULL;
+static short *order = NULL;
+static short *base = NULL;
+static short *pos = NULL;
+static short *table = NULL;
+static short *check = NULL;
 static int lowzero;
 static int high;

@@ -295,25 +294,19 @@ output_token_translations (void)
 \n\
 /* YYTRANSLATE(YYLEX) -- Bison token number corresponding to YYLEX. */\n");

-  if (translations)
-    {
-      obstack_fgrow2 (&table_obstack,
+  obstack_fgrow2 (&table_obstack,
      "#define YYTRANSLATE(x) ((unsigned)(x) <= %d ? yytranslate[x] : %d)\
 \n\
 \n",
-	       max_user_token_number, nsyms);
+		  max_user_token_number, nsyms);

-      output_short_or_char_table (&table_obstack,
+  output_short_or_char_table (&table_obstack,
 	     "YYTRANSLATE[YYLEX] -- Bison token number corresponding to YYLEX",
-		    ntokens < 127 ? "char" : "short",
-		    "yytranslate", token_translations,
-		    0, 1, max_user_token_number + 1);
-    }
-  else
-    {
-      obstack_sgrow (&table_obstack,
-			   "\n#define YYTRANSLATE(x) (x)\n");
-    }
+			      ntokens < 127 ? "char" : "short",
+			      "yytranslate", token_translations,
+			      0, 1, max_user_token_number + 1);
+
+  XFREE (token_translations);
 }


@@ -1167,6 +1160,7 @@ output_parser (void)
      else
 	skeleton = skeleton_find ("BISON_SIMPLE", BISON_SIMPLE);
    }
+  assert (skeleton);
  fskel = xfopen (skeleton, "r");

  /* Set LINE to 2, not 1: `#line LINENUM' -- Here LINENUM is a
@@ -20,7 +20,6 @@


 #include "system.h"
-#include "xalloc.h"
 #include "files.h"
 #include "gram.h"
 #include "LR0.h"
@@ -35,17 +34,17 @@
 static void
 print_token (int extnum, int token)
 {
-  obstack_fgrow2 (&output_obstack, _(" type %d is %s\n"), extnum, tags[token]);
+  fprintf (out, _(" type %d is %s\n"), extnum, tags[token]);
 }
 #endif


-/*================================\
+/*--------------------------------.
 | Report information on a state.  |
-\================================*/
+`--------------------------------*/

 static void
-print_core (int state)
+print_core (FILE *out, int state)
 {
  int i;
  int k;
@@ -68,30 +67,30 @@ print_core (int state)
 	sp++;

      rule = -(*sp);
-      obstack_fgrow1 (&output_obstack, "    %s  ->  ", tags[rlhs[rule]]);
+      fprintf (out, "    %s  ->  ", tags[rlhs[rule]]);

      for (sp = ritem + rrhs[rule]; sp < sp1; sp++)
 	{
-	  obstack_fgrow1 (&output_obstack, "%s ", tags[*sp]);
+	  fprintf (out, "%s ", tags[*sp]);
 	}

-      obstack_1grow (&output_obstack, '.');
+      fputc ('.', out);

      while (*sp > 0)
 	{
-	  obstack_fgrow1 (&output_obstack, " %s", tags[*sp]);
+	  fprintf (out, " %s", tags[*sp]);
 	  sp++;
 	}

-      obstack_fgrow1 (&output_obstack, _("   (rule %d)"), rule);
-      obstack_1grow (&output_obstack, '\n');
+      fprintf (out, _("   (rule %d)"), rule);
+      fputc ('\n', out);
    }

-  obstack_1grow (&output_obstack, '\n');
+  fputc ('\n', out);
 }

 static void
-print_actions (int state)
+print_actions (FILE *out, int state)
 {
  int i;
  int k;
@@ -109,9 +108,9 @@ print_actions (int state)
  if (!shiftp && !redp)
    {
      if (final_state == state)
-	obstack_sgrow (&output_obstack, _("    $default\taccept\n"));
+	fprintf (out, _("    $default\taccept\n"));
      else
-	obstack_sgrow (&output_obstack, _("    NO ACTIONS\n"));
+	fprintf (out, _("    NO ACTIONS\n"));
      return;
    }

@@ -129,16 +128,16 @@ print_actions (int state)
 	  if (ISVAR (symbol))
 	    break;
 	  if (symbol == 0)	/* I.e. strcmp(tags[symbol],"$")==0 */
-	    obstack_fgrow1 (&output_obstack,
-			    _("    $   \tgo to state %d\n"), state1);
+	    fprintf (out,
+		     _("    $   \tgo to state %d\n"), state1);
 	  else
-	    obstack_fgrow2 (&output_obstack,
-			    _("    %-4s\tshift, and go to state %d\n"),
-			    tags[symbol], state1);
+	    fprintf (out,
+		     _("    %-4s\tshift, and go to state %d\n"),
+		     tags[symbol], state1);
 	}

      if (i > 0)
-	obstack_1grow (&output_obstack, '\n');
+	fputc ('\n', out);
    }
  else
    {
@@ -157,21 +156,20 @@ print_actions (int state)
 	  if (!errp->errs[j])
 	    continue;
 	  symbol = errp->errs[j];
-	  obstack_fgrow1 (&output_obstack, _("    %-4s\terror (nonassociative)\n"),
+	  fprintf (out, _("    %-4s\terror (nonassociative)\n"),
 		   tags[symbol]);
 	}

      if (j > 0)
-	obstack_1grow (&output_obstack, '\n');
+	fputc ('\n', out);
    }

  if (consistent[state] && redp)
    {
      rule = redp->rules[0];
      symbol = rlhs[rule];
-      obstack_fgrow2 (&output_obstack,
-		      _("    $default\treduce using rule %d (%s)\n\n"),
-		      rule, tags[symbol]);
+      fprintf (out, _("    $default\treduce using rule %d (%s)\n\n"),
+	       rule, tags[symbol]);
    }
  else if (redp)
    {
@@ -186,42 +184,41 @@ print_actions (int state)
 	    continue;
 	  state1 = shiftp->shifts[i];
 	  symbol = accessing_symbol[state1];
-	  obstack_fgrow2 (&output_obstack,
-			  _("    %-4s\tgo to state %d\n"),
-			  tags[symbol], state1);
+	  fprintf (out, _("    %-4s\tgo to state %d\n"),
+		   tags[symbol], state1);
 	}

-      obstack_1grow (&output_obstack, '\n');
+      fputc ('\n', out);
    }
 }

 static void
-print_state (int state)
+print_state (FILE *out, int state)
 {
-  obstack_sgrow (&output_obstack, "\n\n");
-  obstack_fgrow1 (&output_obstack, _("state %d"), state);
-  obstack_sgrow (&output_obstack, "\n\n");
-  print_core (state);
-  print_actions (state);
+  fputs ("\n\n", out);
+  fprintf (out, _("state %d"), state);
+  fputs ("\n\n", out);
+  print_core (out, state);
+  print_actions (out, state);
 }

 /*-----------------------------------------.
 | Print information on the whole grammar.  |
 `-----------------------------------------*/

-#define END_TEST(End)						\
-do {								\
-  if (column + strlen(buffer) > (End))				\
-    {								\
-      obstack_fgrow1 (&output_obstack, "%s\n   ", buffer);	\
-      column = 3;						\
-      buffer[0] = 0;						\
-    }								\
+#define END_TEST(End)				\
+do {						\
+  if (column + strlen(buffer) > (End))		\
+    {						\
+      fprintf (out, "%s\n   ", buffer);		\
+      column = 3;				\
+      buffer[0] = 0;				\
+    }						\
 } while (0)


 static void
-print_grammar (void)
+print_grammar (FILE *out)
 {
  int i, j;
  short *rule;
@@ -229,78 +226,46 @@ print_grammar (void)
  int column = 0;

  /* rule # : LHS -> RHS */
-  obstack_1grow (&output_obstack, '\n');
-  obstack_sgrow (&output_obstack, _("Grammar"));
-  obstack_1grow (&output_obstack, '\n');
+  fprintf (out, "\n%s\n", _("Grammar"));
  for (i = 1; i <= nrules; i++)
    /* Don't print rules disabled in reduce_grammar_tables.  */
    if (rlhs[i] >= 0)
      {
-	obstack_fgrow2 (&output_obstack,
-			_("rule %-4d %s ->"), i, tags[rlhs[i]]);
+	fprintf (out, _("rule %-4d %s ->"), i, tags[rlhs[i]]);
 	rule = &ritem[rrhs[i]];
 	if (*rule > 0)
 	  while (*rule > 0)
-	    obstack_fgrow1 (&output_obstack, " %s", tags[*rule++]);
+	    fprintf (out, " %s", tags[*rule++]);
 	else
-	  obstack_sgrow (&output_obstack, _("		/* empty */"));
-	obstack_1grow (&output_obstack, '\n');
+	  fprintf (out, "		/* %s */\n", _("empty"));
      }

  /* TERMINAL (type #) : rule #s terminal is on RHS */
-  obstack_sgrow (&output_obstack, "\n");
-  obstack_sgrow (&output_obstack,
-		 _("Terminals, with rules where they appear"));
-  obstack_sgrow (&output_obstack, "\n\n");
-  obstack_fgrow1 (&output_obstack, "%s (-1)\n", tags[0]);
-  if (translations)
-    {
-      for (i = 0; i <= max_user_token_number; i++)
-	if (token_translations[i] != 2)
-	  {
-	    buffer[0] = 0;
-	    column = strlen (tags[token_translations[i]]);
-	    obstack_sgrow (&output_obstack, tags[token_translations[i]]);
-	    END_TEST (50);
-	    sprintf (buffer, " (%d)", i);
+  fprintf (out, "\n%s\n\n", _("Terminals, with rules where they appear"));
+  fprintf (out, "%s (-1)\n", tags[0]);

-	    for (j = 1; j <= nrules; j++)
-	      for (rule = &ritem[rrhs[j]]; *rule > 0; rule++)
-		if (*rule == token_translations[i])
-		  {
-		    END_TEST (65);
-		    sprintf (buffer + strlen (buffer), " %d", j);
-		    break;
-		  }
-	    obstack_fgrow1 (&output_obstack, "%s\n", buffer);
-	  }
-    }
-  else
-    {
-      for (i = 1; i < ntokens; i++)
-	{
-	  buffer[0] = 0;
-	  column = strlen (tags[i]);
-	  obstack_sgrow (&output_obstack, tags[i]);
-	  END_TEST (50);
-	  sprintf (buffer, " (%d)", i);
+  for (i = 0; i <= max_user_token_number; i++)
+    if (token_translations[i] != 2)
+      {
+	buffer[0] = 0;
+	column = strlen (tags[token_translations[i]]);
+	fputs (tags[token_translations[i]], out);
+	END_TEST (50);
+	sprintf (buffer, " (%d)", i);

-	  for (j = 1; j <= nrules; j++)
-	    for (rule = &ritem[rrhs[j]]; *rule > 0; rule++)
-	      if (*rule == i)
-		{
-		  END_TEST (65);
-		  sprintf (buffer + strlen (buffer), " %d", j);
-		  break;
-		}
-	  obstack_fgrow1 (&output_obstack, "%s\n", buffer);
-	}
-    }
+	for (j = 1; j <= nrules; j++)
+	  for (rule = &ritem[rrhs[j]]; *rule > 0; rule++)
+	    if (*rule == token_translations[i])
+	      {
+		END_TEST (65);
+		sprintf (buffer + strlen (buffer), " %d", j);
+		break;
+	      }
+	fprintf (out, "%s\n", buffer);
+      }

-  obstack_sgrow (&output_obstack, "\n");
-  obstack_sgrow (&output_obstack,
-		 _("Nonterminals, with rules where they appear"));
-  obstack_sgrow (&output_obstack, "\n\n");
+  fprintf (out, "\n%s\n\n",
+	   _("Nonterminals, with rules where they appear"));
  for (i = ntokens; i <= nsyms - 1; i++)
    {
      int left_count = 0, right_count = 0;
@@ -318,7 +283,7 @@ print_grammar (void)
 	}

      buffer[0] = 0;
-      obstack_sgrow (&output_obstack, tags[i]);
+      fputs (tags[i], out);
      column = strlen (tags[i]);
      sprintf (buffer, " (%d)", i);
      END_TEST (0);
@@ -353,22 +318,33 @@ print_grammar (void)
 		  }
 	    }
 	}
-      obstack_fgrow1 (&output_obstack, "%s\n", buffer);
+      fprintf (out, "%s\n", buffer);
    }
 }

 void
 print_results (void)
 {
-  int i;
-
-  if (any_conflicts)
-    print_conflicts ();
-
  if (verbose_flag)
-    print_grammar ();
+    {
+      int i;

-  if (verbose_flag)
-    for (i = 0; i < nstates; i++)
-      print_state (i);
+      /* We used to use just .out if spec_name_prefix (-p) was used, but
+	 that conflicts with Posix.  */
+      FILE *out = xfopen (spec_verbose_file, "w");
+
+      size_t size = obstack_object_size (&output_obstack);
+      fwrite (obstack_finish (&output_obstack), 1, size, out);
+
+      if (any_conflicts)
+	print_conflicts (out);
+
+      print_grammar (out);
+
+      for (i = 0; i < nstates; i++)
+	print_state (out, i);
+
+      xfclose (out);
+    }
+  obstack_free (&output_obstack, NULL);
 }
@@ -19,7 +19,6 @@
   Boston, MA 02111-1307, USA.  */

 #include "system.h"
-#include "xalloc.h"
 #include "files.h"
 #include "gram.h"
 #include "LR0.h"
@@ -35,6 +34,7 @@
 #include "quotearg.h"

 static graph_t graph;
+static FILE *fgraph = NULL;

 static size_t node_output_size = 0;

@@ -136,7 +136,7 @@ print_actions (int state, const char *node_name, struct obstack *node_obstack)

 	    if (state > state1)
 	      edge.type = back_edge;
-	    open_edge (&edge, &graph_obstack);
+	    open_edge (&edge, fgraph);
 	    /* The edge source is the current node.  */
 	    edge.sourcename = node_name;
 	    sprintf (buff, "%d", state1);
@@ -145,8 +145,8 @@ print_actions (int state, const char *node_name, struct obstack *node_obstack)
 	    /* FIXME: Be aware that quote uses static memory.  The string
 	       must be output immediately (which is the case here). */
 	    edge.label = tags[symbol] ? quote (tags[symbol]) : NULL;
-	    output_edge (&edge, &graph_obstack);
-	    close_edge (&graph_obstack);
+	    output_edge (&edge, fgraph);
+	    close_edge (fgraph);
 	  }
 	}
    }
@@ -198,14 +198,14 @@ print_actions (int state, const char *node_name, struct obstack *node_obstack)
 	  symbol = accessing_symbol[state1];

 	  new_edge (&edge);
-	  open_edge (&edge, &graph_obstack);
+	  open_edge (&edge, fgraph);
 	  edge.sourcename = node_name;
 	  sprintf (buff, "%d", state1);
 	  edge.targetname = buff;
 	  edge.color = red;
 	  edge.label = tags[symbol] ? quote (tags[symbol]) : NULL;
-	  output_edge (&edge, &graph_obstack);
-	  close_edge (&graph_obstack);
+	  output_edge (&edge, fgraph);
+	  close_edge (fgraph);
 	}
    }
 }
@@ -223,9 +223,6 @@ print_state (int state)
  new_node (&node);	/* Set node attributs default value.  */
  sprintf (name, "%d", state);
  node.title = name;	/* Give a name to the node.  */
-  open_node (&node_obstack);
-  /* Output a VCG formatted attributs list.  */
-  output_node (&node, &node_obstack);
  
  { 
    /* Here we begin to compute the node label. */  
@@ -241,20 +238,17 @@ print_state (int state)
    print_actions (state, node.title, &node_obstack);
    
    obstack_sgrow (&node_obstack, "\"\n");		/* Close Label.  */
-    
-    close_node (&node_obstack);
-  }
-  
-  /* `obstack_cat' NODE_OBSTACK to GRAPH_OBSTACK.  */
-  {
-    size_t obs_size;
+  }    

-    obs_size = obstack_object_size (&node_obstack);
-    obstack_grow (&graph_obstack, 
-		  obstack_base (&node_obstack), 
-		  obs_size);
-    obstack_free (&node_obstack, 0);
-  }
+  open_node (fgraph);
+  /* Output a VCG formatted attributs list.  */
+  output_node (&node, fgraph);
+  /* Save the node label.  */
+  fwrite (obstack_base (&node_obstack), 
+	  obstack_object_size (&node_obstack), 1, fgraph);
+  close_node (fgraph);
+
+  obstack_free (&node_obstack, 0);
 }


@@ -262,9 +256,13 @@ void
 print_graph (void)
 {
  int i;
-
+  
  if (!graph_flag)
    return;
+
+  /* Output file.  */
+  fgraph = xfopen (spec_graph_file, "w");
+
  new_graph (&graph);

 #if 0
@@ -284,13 +282,14 @@ print_graph (void)
  graph.crossing_weight = median;

  /* Output graph options. */
-  open_graph (&graph_obstack);
-  output_graph (&graph, &graph_obstack);
+  open_graph (fgraph);
+  output_graph (&graph, fgraph);

  for (i = 0; i < nstates; i++)
    /* Output nodes & edges. */
    print_state (i);

  /* Close graph. */
-  close_graph (&graph, &graph_obstack);
+  close_graph (&graph, fgraph);
+  xfclose (fgraph);
 }
@@ -26,7 +26,6 @@
 #include "quote.h"
 #include "getargs.h"
 #include "files.h"
-#include "xalloc.h"
 #include "symtab.h"
 #include "lex.h"
 #include "gram.h"
@@ -512,7 +511,6 @@ parse_token_decl (symbol_class what_is, symbol_class what_is_not)
 	      /* symbol and symval combined are only one symbol */
 	      nsyms--;
 	    }
-	  translations = 1;
 	  symbol = NULL;
 	}
      else if (token == tok_identifier)
@@ -537,7 +535,6 @@ parse_token_decl (symbol_class what_is, symbol_class what_is_not)
      else if (symbol && token == tok_number)
 	{
 	  symbol->user_token_number = numval;
-	  translations = 1;
 	}
      else
 	{
@@ -679,7 +676,6 @@ parse_assoc_decl (associativity assoc)
 	  if (prev == tok_identifier)
 	    {
 	      symval->user_token_number = numval;
-	      translations = 1;
 	    }
 	  else
 	    {
@@ -736,7 +732,7 @@ parse_union_decl (void)

  while (c != EOF)
    {
-      
+
      /* If C contains '/', it is output by copy_comment ().  */
      if (c != '/')
 	{
@@ -744,7 +740,7 @@ parse_union_decl (void)
 	  if (defines_flag)
 	    obstack_1grow (&defines_obstack, c);
 	}
-      
+
      switch (c)
 	{
 	case '\n':
@@ -827,7 +823,6 @@ parse_thong_decl (void)
  char *typename = 0;
  int usrtoknum;

-  translations = 1;
  token = lex ();		/* fetch typename or first token */
  if (token == tok_typename)
    {
@@ -1657,9 +1652,10 @@ output_token_defines (struct obstack *oout)
 	continue;

      obstack_fgrow2 (oout, "# define\t%s\t%d\n",
-		      symbol,
-		      (translations ? bp->user_token_number : bp->value));
+		      symbol, bp->user_token_number);
      if (semantic_parser)
+	/* FIXME: This is certainly dead wrong, and should be just as
+	   above. --akim.  */
 	obstack_fgrow2 (oout, "# define\tT%s\t%d\n", symbol, bp->value);
    }

@@ -1676,9 +1672,9 @@ output_token_defines (struct obstack *oout)
 static void
 packsymbols (void)
 {
-  bucket *bp;
+  bucket *bp = NULL;
  int tokno = 1;
-  int i;
+  int i, j;
  int last_user_token_number;
  static char DOLLAR[] = "$";

@@ -1744,7 +1740,7 @@ packsymbols (void)

      if (bp->class == token_sym)
 	{
-	  if (translations && !(bp->user_token_number))
+	  if (!bp->user_token_number)
 	    bp->user_token_number = ++last_user_token_number;
 	  if (bp->user_token_number > max_user_token_number)
 	    max_user_token_number = bp->user_token_number;
@@ -1754,33 +1750,27 @@ packsymbols (void)
      user_toknums[bp->value] = bp->user_token_number;
      sprec[bp->value] = bp->prec;
      sassoc[bp->value] = bp->assoc;
-
    }

-  if (translations)
+  token_translations = XCALLOC (short, max_user_token_number + 1);
+
+  /* initialize all entries for literal tokens to 2, the internal
+     token number for $undefined., which represents all invalid
+     inputs.  */
+  for (j = 0; j <= max_user_token_number; j++)
+    token_translations[j] = 2;
+
+  for (bp = firstsymbol; bp; bp = bp->next)
    {
-      int j;
-
-      token_translations = XCALLOC (short, max_user_token_number + 1);
-
-      /* initialize all entries for literal tokens to 2, the internal
-         token number for $undefined., which represents all invalid
-         inputs.  */
-      for (j = 0; j <= max_user_token_number; j++)
-	token_translations[j] = 2;
-
-      for (bp = firstsymbol; bp; bp = bp->next)
-	{
-	  if (bp->value >= ntokens)
-	    continue;		/* non-terminal */
-	  if (bp->user_token_number == SALIAS)
-	    continue;
-	  if (token_translations[bp->user_token_number] != 2)
-	    complain (_("tokens %s and %s both assigned number %d"),
-		      tags[token_translations[bp->user_token_number]],
-		      bp->tag, bp->user_token_number);
-	  token_translations[bp->user_token_number] = bp->value;
-	}
+      if (bp->value >= ntokens)
+	continue;		/* non-terminal */
+      if (bp->user_token_number == SALIAS)
+	continue;
+      if (token_translations[bp->user_token_number] != 2)
+	complain (_("tokens %s and %s both assigned number %d"),
+		  tags[token_translations[bp->user_token_number]],
+		  bp->tag, bp->user_token_number);
+      token_translations[bp->user_token_number] = bp->value;
    }

  error_token_number = errtoken->value;
@@ -1906,15 +1896,6 @@ reader (void)
  start_flag = 0;
  startval = NULL;		/* start symbol not specified yet. */

-#if 0
-  /* initially assume token number translation not needed.  */
-  translations = 0;
-#endif
-  /* Nowadays translations is always set to 1, since we give `error' a
-     user-token-number to satisfy the Posix demand for YYERRCODE==256.
-   */
-  translations = 1;
-
  nsyms = 1;
  nvars = 0;
  nrules = 0;
@@ -1930,7 +1911,7 @@ reader (void)

  grammar = NULL;

-  init_lex ();
+  lex_init ();
  lineno = 1;

  /* Initialize the symbol table.  */
@@ -1977,9 +1958,6 @@ reader (void)
  packsymbols ();
  /* Convert the grammar into the format described in gram.h.  */
  packgram ();
-  /* Free the symbol table data structure since symbols are now all
-     referred to by symbol number.  */
-  free_symtab ();
 }


@@ -29,7 +29,6 @@
 #include "getargs.h"
 #include "files.h"
 #include "gram.h"
-#include "xalloc.h"
 #include "complain.h"
 #include "reduce.h"
 #include "reader.h"
@@ -20,7 +20,6 @@


 #include "system.h"
-#include "xalloc.h"
 #include "symtab.h"
 #include "gram.h"

@@ -143,6 +142,7 @@ free_symtab (void)
 	  if (bp->type_name)
 	    XFREE (bp->type_name);
 #endif
+	  XFREE (bp->tag);
 	  XFREE (bp);
 	  bp = bptmp;
 	}
@@ -73,7 +73,7 @@ extern int errno;
 # define PARAMS(p) ()
 #endif

-
+# include "xalloc.h"

 /*---------------------.
 | Missing prototypes.  |
@@ -143,8 +143,6 @@ size_t strnlen PARAMS ((const char *s, size_t maxlen));
 # define LOCALEDIR "/usr/local/share/locale"
 #endif

-#endif  /* BISON_SYSTEM_H */
-

 /*-----------.
 | Booleans.  |
@@ -161,9 +159,9 @@ typedef int bool;
 | Obstacks.  |
 `-----------*/

-#define obstack_chunk_alloc xmalloc
-#define obstack_chunk_free  free
-#include "obstack.h"
+# define obstack_chunk_alloc xmalloc
+# define obstack_chunk_free  free
+# include "obstack.h"

 #define obstack_sgrow(Obs, Str) \
  obstack_grow (Obs, Str, strlen (Str))
@@ -264,3 +262,15 @@ do {								\
 #  define BISON_HAIRY "c:/usr/local/lib/bison.hairy"
 # endif
 #endif
+
+
+/*---------------------------------.
+| Debugging the memory allocator.  |
+`---------------------------------*/
+
+# if WITH_DMALLOC
+#  define DMALLOC_FUNC_CHECK
+#  include <dmalloc.h>
+# endif /* WITH_DMALLOC */
+
+#endif  /* BISON_SYSTEM_H */
@@ -19,7 +19,6 @@
   Boston, MA 02111-1307, USA.  */

 #include "system.h"
-#include "xalloc.h"
 #include "vcg.h"
 #include "vcg_defaults.h"

@@ -471,55 +470,55 @@ add_colorentry (graph_t *g, int color_idx, int red_cp,
 `-------------------------------------*/

 void
-open_edge(edge_t *edge, struct obstack *os)
+open_edge(edge_t *edge, FILE *fout)
 {
  switch (edge->type)
    {
    case normal_edge:
-      obstack_sgrow (os, "\tedge: {\n");
+      fputs ("\tedge: {\n", fout);
      break;
    case back_edge:
-      obstack_sgrow (os, "\tbackedge: {\n");
+      fputs ("\tbackedge: {\n", fout);
      break;
    case near_edge:
-      obstack_sgrow (os, "\tnearedge: {\n");
+      fputs ("\tnearedge: {\n", fout);
      break;
    case bent_near_edge:
-      obstack_sgrow (os, "\tbentnearedge: {\n");
+      fputs ("\tbentnearedge: {\n", fout);
      break;
    default:
-      obstack_sgrow (os, "\tedge: {\n");
+      fputs ("\tedge: {\n", fout);
    }
 }

 void
-close_edge(struct obstack *os)
+close_edge(FILE *fout)
 {
-  obstack_sgrow (os, "\t}\n");
+  fputs ("\t}\n", fout);
 }

 void
-open_node(struct obstack *os)
+open_node(FILE *fout)
 {
-  obstack_sgrow (os, "\tnode: {\n");
+  fputs ("\tnode: {\n", fout);
 }

 void
-close_node(struct obstack *os)
+close_node(FILE *fout)
 {
-  obstack_sgrow (os, "\t}\n");
+  fputs ("\t}\n", fout);
 }

 void
-open_graph(struct obstack *os)
+open_graph(FILE *fout)
 {
-  obstack_sgrow (os, "graph: {\n");
+  fputs ("graph: {\n", fout);
 }

 void
-close_graph(graph_t *graph, struct obstack *os)
+close_graph(graph_t *graph, FILE *fout)
 {
-  obstack_1grow (os, '\n');
+  fputc ('\n', fout);

  /* FIXME: Unallocate nodes and edges if required.  */
  {
@@ -527,223 +526,223 @@ close_graph(graph_t *graph, struct obstack *os)

    for (node = graph->node_list; node; node = node->next)
      {
-	open_node (os);
-	output_node (node, os);
-	close_node (os);
+	open_node (fout);
+	output_node (node, fout);
+	close_node (fout);
      }
  }

-  obstack_1grow (os, '\n');
+  fputc ('\n', fout);

  {
    edge_t *edge;

    for (edge = graph->edge_list; edge; edge = edge->next)
      {
-	open_edge (edge, os);
-	output_edge (edge, os);
-	close_edge (os);
+	open_edge (edge, fout);
+	output_edge (edge, fout);
+	close_edge (fout);
      }
  }

-  obstack_sgrow (os, "}\n");
+  fputs ("}\n", fout);
 }

 /*-------------------------------------------.
-| Output functions (formatted) in obstack os |
+| Output functions (formatted) in file FOUT  |
 `-------------------------------------------*/

 void
-output_node (node_t *node, struct obstack *os)
+output_node (node_t *node, FILE *fout)
 {
  if (node->title != N_TITLE)
-    obstack_fgrow1 (os, "\t\ttitle:\t\"%s\"\n", node->title);
+    fprintf (fout, "\t\ttitle:\t\"%s\"\n", node->title);
  if (node->label != N_LABEL)
-    obstack_fgrow1 (os, "\t\tlabel:\t\"%s\"\n", node->label);
+    fprintf (fout, "\t\tlabel:\t\"%s\"\n", node->label);

  if ((node->locx != N_LOCX) && (node->locy != N_LOCY))
-    obstack_fgrow2 (os, "\t\tloc { x: %d  y: %d }\t\n", node->locx, node->locy);
+    fprintf (fout, "\t\tloc { x: %d  y: %d }\t\n", node->locx, node->locy);

  if (node->vertical_order != N_VERTICAL_ORDER)
-    obstack_fgrow1 (os, "\t\tvertical_order:\t%d\n", node->vertical_order);
+    fprintf (fout, "\t\tvertical_order:\t%d\n", node->vertical_order);
  if (node->horizontal_order != N_HORIZONTAL_ORDER)
-    obstack_fgrow1 (os, "\t\thorizontal_order:\t%d\n", node->horizontal_order);
+    fprintf (fout, "\t\thorizontal_order:\t%d\n", node->horizontal_order);

  if (node->width != N_WIDTH)
-    obstack_fgrow1 (os, "\t\twidth:\t%d\n", node->width);
+    fprintf (fout, "\t\twidth:\t%d\n", node->width);
  if (node->height != N_HEIGHT)
-    obstack_fgrow1 (os, "\t\theight:\t%d\n", node->height);
+    fprintf (fout, "\t\theight:\t%d\n", node->height);

  if (node->shrink != N_SHRINK)
-    obstack_fgrow1 (os, "\t\tshrink:\t%d\n", node->shrink);
+    fprintf (fout, "\t\tshrink:\t%d\n", node->shrink);
  if (node->stretch != N_STRETCH)
-    obstack_fgrow1 (os, "\t\tstretch:\t%d\n", node->stretch);
+    fprintf (fout, "\t\tstretch:\t%d\n", node->stretch);

  if (node->folding != N_FOLDING)
-    obstack_fgrow1 (os, "\t\tfolding:\t%d\n", node->folding);
+    fprintf (fout, "\t\tfolding:\t%d\n", node->folding);

  if (node->textmode != N_TEXTMODE)
-    obstack_fgrow1 (os, "\t\ttextmode:\t%s\n",
-		    get_textmode_str (node->textmode));
+    fprintf (fout, "\t\ttextmode:\t%s\n",
+	     get_textmode_str (node->textmode));

  if (node->shape != N_SHAPE)
-    obstack_fgrow1 (os, "\t\tshape:\t%s\n", get_shape_str (node->shape));
+    fprintf (fout, "\t\tshape:\t%s\n", get_shape_str (node->shape));

  if (node->borderwidth != N_BORDERWIDTH)
-    obstack_fgrow1 (os, "\t\tborderwidth:\t%d\n", node->borderwidth);
+    fprintf (fout, "\t\tborderwidth:\t%d\n", node->borderwidth);

  if (node->color != N_COLOR)
-    obstack_fgrow1 (os, "\t\tcolor:\t%s\n", get_color_str (node->color));
+    fprintf (fout, "\t\tcolor:\t%s\n", get_color_str (node->color));
  if (node->textcolor != N_TEXTCOLOR)
-    obstack_fgrow1 (os, "\t\ttextcolor:\t%s\n",
-		    get_color_str (node->textcolor));
+    fprintf (fout, "\t\ttextcolor:\t%s\n",
+	     get_color_str (node->textcolor));
  if (node->bordercolor != N_BORDERCOLOR)
-    obstack_fgrow1 (os, "\t\tbordercolor:\t%s\n",
-		    get_color_str (node->bordercolor));
+    fprintf (fout, "\t\tbordercolor:\t%s\n",
+	     get_color_str (node->bordercolor));

  if (node->infos[0])
-    obstack_fgrow1 (os, "\t\tinfo1:\t\"%s\"\n", node->infos[0]);
+    fprintf (fout, "\t\tinfo1:\t\"%s\"\n", node->infos[0]);
  if (node->infos[1])
-    obstack_fgrow1 (os, "\t\tinfo2:\t\"%s\"\n", node->infos[1]);
+    fprintf (fout, "\t\tinfo2:\t\"%s\"\n", node->infos[1]);
  if (node->infos[2])
-    obstack_fgrow1 (os, "\t\tinfo3:\t\"%s\"\n", node->infos[2]);
+    fprintf (fout, "\t\tinfo3:\t\"%s\"\n", node->infos[2]);
 }

 void
-output_edge (edge_t *edge, struct obstack *os)
+output_edge (edge_t *edge, FILE *fout)
 {
  /* FIXME: SOURCENAME and TARGETNAME are mandatory
     so it has to be fatal not to give these informations.  */
  if (edge->sourcename != E_SOURCENAME)
-    obstack_fgrow1 (os, "\t\tsourcename:\t\"%s\"\n", edge->sourcename);
+    fprintf (fout, "\t\tsourcename:\t\"%s\"\n", edge->sourcename);
  if (edge->targetname != E_TARGETNAME)
-    obstack_fgrow1 (os, "\t\ttargetname:\t\"%s\"\n", edge->targetname);
+    fprintf (fout, "\t\ttargetname:\t\"%s\"\n", edge->targetname);

  if (edge->label != E_LABEL)
-    obstack_fgrow1 (os, "\t\tlabel:\t\"%s\"\n", edge->label);
+    fprintf (fout, "\t\tlabel:\t\"%s\"\n", edge->label);

  if (edge->linestyle != E_LINESTYLE)
-    obstack_fgrow1 (os, "\t\tlinestyle:\t\"%s\"\n",
-		    get_linestyle_str(edge->linestyle));
+    fprintf (fout, "\t\tlinestyle:\t\"%s\"\n", 
+	     get_linestyle_str(edge->linestyle));

  if (edge->thickness != E_THICKNESS)
-    obstack_fgrow1 (os, "\t\tthickness:\t%d\n", edge->thickness);
+    fprintf (fout, "\t\tthickness:\t%d\n", edge->thickness);
  if (edge->class != E_CLASS)
-    obstack_fgrow1 (os, "\t\tclass:\t%d\n", edge->class);
+    fprintf (fout, "\t\tclass:\t%d\n", edge->class);

  if (edge->color != E_COLOR)
-    obstack_fgrow1 (os, "\t\tcolor:\t%s\n", get_color_str (edge->color));
+    fprintf (fout, "\t\tcolor:\t%s\n", get_color_str (edge->color));
  if (edge->color != E_TEXTCOLOR)
-    obstack_fgrow1 (os, "\t\ttextcolor:\t%s\n",
-		    get_color_str (edge->textcolor));
+    fprintf (fout, "\t\ttextcolor:\t%s\n",
+	     get_color_str (edge->textcolor));
  if (edge->arrowcolor != E_ARROWCOLOR)
-    obstack_fgrow1 (os, "\t\tarrowcolor:\t%s\n",
-		    get_color_str (edge->arrowcolor));
+    fprintf (fout, "\t\tarrowcolor:\t%s\n",
+	     get_color_str (edge->arrowcolor));
  if (edge->backarrowcolor != E_BACKARROWCOLOR)
-    obstack_fgrow1 (os, "\t\tbackarrowcolor:\t%s\n",
-		    get_color_str (edge->backarrowcolor));
+    fprintf (fout, "\t\tbackarrowcolor:\t%s\n",
+	     get_color_str (edge->backarrowcolor));

  if (edge->arrowsize != E_ARROWSIZE)
-    obstack_fgrow1 (os, "\t\tarrowsize:\t%d\n", edge->arrowsize);
+    fprintf (fout, "\t\tarrowsize:\t%d\n", edge->arrowsize);
  if (edge->backarrowsize != E_BACKARROWSIZE)
-    obstack_fgrow1 (os, "\t\tbackarrowsize:\t%d\n", edge->backarrowsize);
+    fprintf (fout, "\t\tbackarrowsize:\t%d\n", edge->backarrowsize);

  if (edge->arrowstyle != E_ARROWSTYLE)
-    obstack_fgrow1 (os, "\t\tarrowstyle:\t%s\n",
-		    get_arrowstyle_str(edge->arrowstyle));
+    fprintf (fout, "\t\tarrowstyle:\t%s\n",
+	     get_arrowstyle_str(edge->arrowstyle));
  if (edge->backarrowstyle != E_BACKARROWSTYLE)
-    obstack_fgrow1 (os, "\t\tbackarrowstyle:\t%s\n",
-		    get_arrowstyle_str(edge->backarrowstyle));
+    fprintf (fout, "\t\tbackarrowstyle:\t%s\n",
+	     get_arrowstyle_str(edge->backarrowstyle));

  if (edge->priority != E_PRIORITY)
-    obstack_fgrow1 (os, "\t\tpriority:\t%d\n", edge->priority);
+    fprintf (fout, "\t\tpriority:\t%d\n", edge->priority);
  if (edge->anchor != E_ANCHOR)
-    obstack_fgrow1 (os, "\t\tanchor:\t%d\n", edge->anchor);
+    fprintf (fout, "\t\tanchor:\t%d\n", edge->anchor);
  if (edge->horizontal_order != E_HORIZONTAL_ORDER)
-    obstack_fgrow1 (os, "\t\thorizontal_order:\t%d\n", edge->horizontal_order);
+    fprintf (fout, "\t\thorizontal_order:\t%d\n", edge->horizontal_order);
 }

 void
-output_graph (graph_t *graph, struct obstack *os)
+output_graph (graph_t *graph, FILE *fout)
 {
  if (graph->title)
-    obstack_fgrow1 (os, "\ttitle:\t\"%s\"\n", graph->title);
+    fprintf (fout, "\ttitle:\t\"%s\"\n", graph->title);
  if (graph->label)
-    obstack_fgrow1 (os, "\tlabel:\t\"%s\"\n", graph->label);
+    fprintf (fout, "\tlabel:\t\"%s\"\n", graph->label);

  if (graph->infos[0])
-    obstack_fgrow1 (os, "\tinfo1:\t\"%s\"\n", graph->infos[0]);
+    fprintf (fout, "\tinfo1:\t\"%s\"\n", graph->infos[0]);
  if (graph->infos[1])
-    obstack_fgrow1 (os, "\tinfo2:\t\"%s\"\n", graph->infos[1]);
+    fprintf (fout, "\tinfo2:\t\"%s\"\n", graph->infos[1]);
  if (graph->infos[2])
-    obstack_fgrow1 (os, "\tinfo3:\t\"%s\"\n", graph->infos[2]);
+    fprintf (fout, "\tinfo3:\t\"%s\"\n", graph->infos[2]);

  if (graph->color != G_COLOR)
-    obstack_fgrow1 (os, "\tcolor:\t%s\n", get_color_str (graph->color));
+    fprintf (fout, "\tcolor:\t%s\n", get_color_str (graph->color));
  if (graph->textcolor != G_TEXTCOLOR)
-    obstack_fgrow1 (os, "\ttextcolor:\t%s\n", get_color_str (graph->textcolor));
+    fprintf (fout, "\ttextcolor:\t%s\n", get_color_str (graph->textcolor));
  if (graph->bordercolor != G_BORDERCOLOR)
-    obstack_fgrow1 (os, "\tbordercolor:\t%s\n",
-		    get_color_str (graph->bordercolor));
+    fprintf (fout, "\tbordercolor:\t%s\n",
+	     get_color_str (graph->bordercolor));

  if (graph->width != G_WIDTH)
-    obstack_fgrow1 (os, "\twidth:\t%d\n", graph->width);
+    fprintf (fout, "\twidth:\t%d\n", graph->width);
  if (graph->height != G_HEIGHT)
-    obstack_fgrow1 (os, "\theight:\t%d\n", graph->height);
+    fprintf (fout, "\theight:\t%d\n", graph->height);
  if (graph->borderwidth != G_BORDERWIDTH)
-    obstack_fgrow1 (os, "\tborderwidth:\t%d\n", graph->borderwidth);
+    fprintf (fout, "\tborderwidth:\t%d\n", graph->borderwidth);

  if (graph->x != G_X)
-    obstack_fgrow1 (os, "\tx:\t%d\n", graph->x);
+    fprintf (fout, "\tx:\t%d\n", graph->x);
  if (graph->y != G_Y)
-    obstack_fgrow1 (os, "\ty:\t%d\n", graph->y);
+    fprintf (fout, "\ty:\t%d\n", graph->y);

  if (graph->folding != G_FOLDING)
-    obstack_fgrow1 (os, "\tfolding:\t%d\n", graph->folding);
+    fprintf (fout, "\tfolding:\t%d\n", graph->folding);

  if (graph->shrink != G_SHRINK)
-    obstack_fgrow1 (os, "\tshrink:\t%d\n", graph->shrink);
+    fprintf (fout, "\tshrink:\t%d\n", graph->shrink);
  if (graph->stretch != G_STRETCH)
-    obstack_fgrow1 (os, "\tstretch:\t%d\n", graph->stretch);
+    fprintf (fout, "\tstretch:\t%d\n", graph->stretch);

  if (graph->textmode != G_TEXTMODE)
-    obstack_fgrow1 (os, "\ttextmode:\t%s\n",
-		    get_textmode_str (graph->textmode));
+    fprintf (fout, "\ttextmode:\t%s\n",
+	     get_textmode_str (graph->textmode));

  if (graph->shape != G_SHAPE)
-    obstack_fgrow1 (os, "\tshape:\t%s\n", get_shape_str (graph->shape));
+    fprintf (fout, "\tshape:\t%s\n", get_shape_str (graph->shape));
  
  if (graph->vertical_order != G_VERTICAL_ORDER)
-    obstack_fgrow1 (os, "\tvertical_order:\t%d\n", graph->vertical_order);  
+    fprintf (fout, "\tvertical_order:\t%d\n", graph->vertical_order);  
  if (graph->horizontal_order != G_HORIZONTAL_ORDER)
-    obstack_fgrow1 (os, "\thorizontal_order:\t%d\n", graph->horizontal_order);  
+    fprintf (fout, "\thorizontal_order:\t%d\n", graph->horizontal_order);  

  if (graph->xmax != G_XMAX)
-    obstack_fgrow1 (os, "\txmax:\t%d\n", graph->xmax);
+    fprintf (fout, "\txmax:\t%d\n", graph->xmax);
  if (graph->ymax != G_YMAX)
-    obstack_fgrow1 (os, "\tymax:\t%d\n", graph->ymax);
+    fprintf (fout, "\tymax:\t%d\n", graph->ymax);

  if (graph->xbase != G_XBASE)
-    obstack_fgrow1 (os, "\txbase:\t%d\n", graph->xbase);
+    fprintf (fout, "\txbase:\t%d\n", graph->xbase);
  if (graph->ybase != G_YBASE)
-    obstack_fgrow1 (os, "\tybase:\t%d\n", graph->ybase);
+    fprintf (fout, "\tybase:\t%d\n", graph->ybase);

  if (graph->xspace != G_XSPACE)
-    obstack_fgrow1 (os, "\txspace:\t%d\n", graph->xspace);
+    fprintf (fout, "\txspace:\t%d\n", graph->xspace);
  if (graph->yspace != G_YSPACE)
-    obstack_fgrow1 (os, "\tyspace:\t%d\n", graph->yspace);
+    fprintf (fout, "\tyspace:\t%d\n", graph->yspace);
  if (graph->xlspace != G_XLSPACE)
-    obstack_fgrow1 (os, "\txlspace:\t%d\n", graph->xlspace);
+    fprintf (fout, "\txlspace:\t%d\n", graph->xlspace);

  if (graph->xraster != G_XRASTER)
-    obstack_fgrow1 (os, "\txraster:\t%d\n", graph->xraster);
+    fprintf (fout, "\txraster:\t%d\n", graph->xraster);
  if (graph->yraster != G_YRASTER)
-    obstack_fgrow1 (os, "\tyraster:\t%d\n", graph->yraster);
+    fprintf (fout, "\tyraster:\t%d\n", graph->yraster);
  if (graph->xlraster != G_XLRASTER)
-    obstack_fgrow1 (os, "\txlraster:\t%d\n", graph->xlraster);
+    fprintf (fout, "\txlraster:\t%d\n", graph->xlraster);

  if (graph->hidden != G_HIDDEN)
-    obstack_fgrow1 (os, "\thidden:\t%d\n", graph->hidden);
+    fprintf (fout, "\thidden:\t%d\n", graph->hidden);
  
  /* FIXME: Unallocate struct list if required.  
     Maybe with a little function.  */
@@ -752,7 +751,7 @@ output_graph (graph_t *graph, struct obstack *os)
      struct classname_s *ite;

      for (ite = graph->classname; ite; ite = ite->next)
-	obstack_fgrow2 (os, "\tclassname %d :\t%s\n", ite->no, ite->name);
+	fprintf (fout, "\tclassname %d :\t%s\n", ite->no, ite->name);
    }

  if (graph->infoname != G_INFONAME)
@@ -760,129 +759,127 @@ output_graph (graph_t *graph, struct obstack *os)
      struct infoname_s *ite;

      for (ite = graph->infoname; ite; ite = ite->next)
-	obstack_fgrow2 (os, "\tinfoname %d :\t%s\n", ite->integer, ite->string);
+	fprintf (fout, "\tinfoname %d :\t%s\n", ite->integer, ite->string);
    }

  if (graph->colorentry != G_COLORENTRY)
    {
      struct colorentry_s *ite;
-      char buff[64];
      
      for (ite = graph->colorentry; ite; ite = ite->next)
 	{	
-	  sprintf (buff, "\tcolorentry %d :\t%d %d %d\n", 
+	  fprintf (fout, "\tcolorentry %d :\t%d %d %d\n", 
 		   ite->color_index, 
 		   ite->red_cp,
 		   ite->green_cp,
 		   ite->blue_cp);
-	  obstack_sgrow (os, buff);
 	}    
    }

  if (graph->layoutalgorithm != G_LAYOUTALGORITHM)
-    obstack_fgrow1 (os, "\tlayoutalgorithm:\t%s\n",
-		    get_layoutalgorithm_str(graph->layoutalgorithm));
+    fprintf (fout, "\tlayoutalgorithm:\t%s\n",
+	     get_layoutalgorithm_str(graph->layoutalgorithm));

  if (graph->layout_downfactor != G_LAYOUT_DOWNFACTOR)
-    obstack_fgrow1 (os, "\tlayout_downfactor:\t%d\n", graph->layout_downfactor);
+    fprintf (fout, "\tlayout_downfactor:\t%d\n", graph->layout_downfactor);
  if (graph->layout_upfactor != G_LAYOUT_UPFACTOR)
-    obstack_fgrow1 (os, "\tlayout_upfactor:\t%d\n", graph->layout_upfactor);
+    fprintf (fout, "\tlayout_upfactor:\t%d\n", graph->layout_upfactor);
  if (graph->layout_nearfactor != G_LAYOUT_NEARFACTOR)
-    obstack_fgrow1 (os, "\tlayout_nearfactor:\t%d\n", graph->layout_nearfactor);
+    fprintf (fout, "\tlayout_nearfactor:\t%d\n", graph->layout_nearfactor);
  if (graph->layout_splinefactor != G_LAYOUT_SPLINEFACTOR)
-    obstack_fgrow1 (os, "\tlayout_splinefactor:\t%d\n",
-		    graph->layout_splinefactor);
+    fprintf (fout, "\tlayout_splinefactor:\t%d\n",
+	     graph->layout_splinefactor);

  if (graph->late_edge_labels != G_LATE_EDGE_LABELS)
-    obstack_fgrow1 (os, "\tlate_edge_labels:\t%s\n",
-		    get_decision_str(graph->late_edge_labels));
+    fprintf (fout, "\tlate_edge_labels:\t%s\n",
+	     get_decision_str(graph->late_edge_labels));
  if (graph->display_edge_labels != G_DISPLAY_EDGE_LABELS)
-    obstack_fgrow1 (os, "\tdisplay_edge_labels:\t%s\n",
-		    get_decision_str(graph->display_edge_labels));
+    fprintf (fout, "\tdisplay_edge_labels:\t%s\n",
+	     get_decision_str(graph->display_edge_labels));
  if (graph->dirty_edge_labels != G_DIRTY_EDGE_LABELS)
-    obstack_fgrow1 (os, "\tdirty_edge_labels:\t%s\n",
-		    get_decision_str(graph->dirty_edge_labels));
+    fprintf (fout, "\tdirty_edge_labels:\t%s\n",
+	     get_decision_str(graph->dirty_edge_labels));
  if (graph->finetuning != G_FINETUNING)
-    obstack_fgrow1 (os, "\tfinetuning:\t%s\n",
-		    get_decision_str(graph->finetuning));
+    fprintf (fout, "\tfinetuning:\t%s\n",
+	     get_decision_str(graph->finetuning));
  if (graph->ignore_singles != G_IGNORE_SINGLES)
-    obstack_fgrow1 (os, "\tignore_singles:\t%s\n",
-		    get_decision_str(graph->ignore_singles));
+    fprintf (fout, "\tignore_singles:\t%s\n",
+	     get_decision_str(graph->ignore_singles));
  if (graph->straight_phase != G_STRAIGHT_PHASE)
-    obstack_fgrow1 (os, "\tstraight_phase:\t%s\n",
-		    get_decision_str(graph->straight_phase));
+    fprintf (fout, "\tstraight_phase:\t%s\n",
+	     get_decision_str(graph->straight_phase));
  if (graph->priority_phase != G_PRIORITY_PHASE)
-    obstack_fgrow1 (os, "\tpriority_phase:\t%s\n",
-		    get_decision_str(graph->priority_phase));
+    fprintf (fout, "\tpriority_phase:\t%s\n",
+	     get_decision_str(graph->priority_phase));
  if (graph->manhattan_edges != G_MANHATTAN_EDGES)
-    obstack_fgrow1 (os,
-		    "\tmanhattan_edges:\t%s\n",
-		    get_decision_str(graph->manhattan_edges));
+    fprintf (fout,
+	     "\tmanhattan_edges:\t%s\n",
+	     get_decision_str(graph->manhattan_edges));
  if (graph->smanhattan_edges != G_SMANHATTAN_EDGES)
-    obstack_fgrow1 (os,
-		    "\tsmanhattan_edges:\t%s\n",
-		    get_decision_str(graph->smanhattan_edges));
+    fprintf (fout,
+	     "\tsmanhattan_edges:\t%s\n",
+	     get_decision_str(graph->smanhattan_edges));
  if (graph->near_edges != G_NEAR_EDGES)
-    obstack_fgrow1 (os, "\tnear_edges:\t%s\n",
-		    get_decision_str(graph->near_edges));
+    fprintf (fout, "\tnear_edges:\t%s\n",
+	     get_decision_str(graph->near_edges));

  if (graph->orientation != G_ORIENTATION)
-    obstack_fgrow1 (os, "\torientation:\t%s\n",
-		    get_orientation_str(graph->orientation));
+    fprintf (fout, "\torientation:\t%s\n",
+	     get_orientation_str(graph->orientation));

  if (graph->node_alignement != G_NODE_ALIGNEMENT)
-    obstack_fgrow1 (os, "\tnode_alignement:\t%s\n",
-		    get_node_alignement_str(graph->node_alignement));
+    fprintf (fout, "\tnode_alignement:\t%s\n",
+	     get_node_alignement_str(graph->node_alignement));

  if (graph->port_sharing != G_PORT_SHARING)
-    obstack_fgrow1 (os, "\tport_sharing:\t%s\n",
-		    get_decision_str(graph->port_sharing));
+    fprintf (fout, "\tport_sharing:\t%s\n",
+	     get_decision_str(graph->port_sharing));

  if (graph->arrow_mode != G_ARROW_MODE)
-    obstack_fgrow1 (os, "\tarrow_mode:\t%s\n",
-		    get_arrow_mode_str(graph->arrow_mode));
+    fprintf (fout, "\tarrow_mode:\t%s\n",
+	     get_arrow_mode_str(graph->arrow_mode));

  if (graph->treefactor != G_TREEFACTOR)
-    obstack_fgrow1 (os, "\ttreefactor:\t%f\n", graph->treefactor);
+    fprintf (fout, "\ttreefactor:\t%f\n", graph->treefactor);
  if (graph->spreadlevel != G_SPREADLEVEL)
-    obstack_fgrow1 (os, "\tspreadlevel:\t%d\n", graph->spreadlevel);
+    fprintf (fout, "\tspreadlevel:\t%d\n", graph->spreadlevel);

  if (graph->crossing_weight != G_CROSSING_WEIGHT)
-    obstack_fgrow1 (os, "\tcrossing_weight:\t%s\n",
-		    get_crossing_type_str(graph->crossing_weight));
+    fprintf (fout, "\tcrossing_weight:\t%s\n",
+	     get_crossing_type_str(graph->crossing_weight));
  if (graph->crossing_phase2 != G_CROSSING_PHASE2)
-    obstack_fgrow1 (os, "\tcrossing_phase2:\t%s\n",
-		    get_decision_str(graph->crossing_phase2));
+    fprintf (fout, "\tcrossing_phase2:\t%s\n",
+	     get_decision_str(graph->crossing_phase2));
  if (graph->crossing_optimization != G_CROSSING_OPTIMIZATION)
-    obstack_fgrow1 (os, "\tcrossing_optimization:\t%s\n",
-		    get_decision_str(graph->crossing_optimization));
+    fprintf (fout, "\tcrossing_optimization:\t%s\n",
+	     get_decision_str(graph->crossing_optimization));

  if (graph->view != G_VIEW)
-    obstack_fgrow1 (os, "\tview:\t%s\n", get_view_str(graph->view));
+    fprintf (fout, "\tview:\t%s\n", get_view_str(graph->view));

  if (graph->edges != G_EDGES)
-    obstack_fgrow1 (os, "\tedges:\t%s\n", get_decision_str(graph->edges));
+    fprintf (fout, "\tedges:\t%s\n", get_decision_str(graph->edges));

  if (graph->nodes != G_NODES)
-    obstack_fgrow1 (os,"\tnodes:\t%s\n", get_decision_str(graph->nodes));
+    fprintf (fout,"\tnodes:\t%s\n", get_decision_str(graph->nodes));

  if (graph->splines != G_SPLINES)
-    obstack_fgrow1 (os, "\tsplines:\t%s\n", get_decision_str(graph->splines));
+    fprintf (fout, "\tsplines:\t%s\n", get_decision_str(graph->splines));

  if (graph->bmax != G_BMAX)
-    obstack_fgrow1 (os, "\tbmax:\t%d\n", graph->bmax);
+    fprintf (fout, "\tbmax:\t%d\n", graph->bmax);
  if (graph->cmin != G_CMIN)
-    obstack_fgrow1 (os, "\tcmin:\t%d\n", graph->cmin);
+    fprintf (fout, "\tcmin:\t%d\n", graph->cmin);
  if (graph->cmax != G_CMAX)
-    obstack_fgrow1 (os, "\tcmax:\t%d\n", graph->cmax);
+    fprintf (fout, "\tcmax:\t%d\n", graph->cmax);
  if (graph->pmin != G_PMIN)
-    obstack_fgrow1 (os, "\tpmin:\t%d\n", graph->pmin);
+    fprintf (fout, "\tpmin:\t%d\n", graph->pmin);
  if (graph->pmax != G_PMAX)
-    obstack_fgrow1 (os, "\tpmax:\t%d\n", graph->pmax);
+    fprintf (fout, "\tpmax:\t%d\n", graph->pmax);
  if (graph->rmin != G_RMIN)
-    obstack_fgrow1 (os, "\trmin:\t%d\n", graph->rmin);
+    fprintf (fout, "\trmin:\t%d\n", graph->rmin);
  if (graph->rmax != G_RMAX)
-    obstack_fgrow1 (os, "\trmax:\t%d\n", graph->rmax);
+    fprintf (fout, "\trmax:\t%d\n", graph->rmax);
  if (graph->smax != G_SMAX)
-    obstack_fgrow1 (os, "\tsmax:\t%d\n", graph->smax);
+    fprintf (fout, "\tsmax:\t%d\n", graph->smax);
 }
@@ -1004,16 +1004,16 @@ void add_colorentry PARAMS ((graph_t *g, int color_idx, int red_cp,
 void add_classname PARAMS ((graph_t *g, int val, const char *name));
 void add_infoname PARAMS ((graph_t *g, int val, const char *name));

-void open_node PARAMS ((struct obstack *os));
-void output_node PARAMS ((node_t *node, struct obstack *os));
-void close_node PARAMS ((struct obstack *os));
+void open_node PARAMS ((FILE *fout));
+void output_node PARAMS ((node_t *node, FILE *fout));
+void close_node PARAMS ((FILE *fout));

-void open_edge PARAMS ((edge_t *edge, struct obstack *os));
-void output_edge PARAMS ((edge_t *edge, struct obstack *os));
-void close_edge PARAMS ((struct obstack *os));
+void open_edge PARAMS ((edge_t *edge, FILE *fout));
+void output_edge PARAMS ((edge_t *edge, FILE *fout));
+void close_edge PARAMS ((FILE *fout));

-void open_graph PARAMS ((struct obstack *os));
-void output_graph PARAMS ((graph_t *graph, struct obstack *os));
-void close_graph PARAMS ((graph_t *graph, struct obstack *os));
+void open_graph PARAMS ((FILE *fout));
+void output_graph PARAMS ((graph_t *graph, FILE *fout));
+void close_graph PARAMS ((graph_t *graph, FILE *fout));

 #endif /* VCG_H_ */
@@ -16,3 +16,4 @@ calc.tab.*
 calc
 *.output *.vcg
 autom4te.cache
+bison
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Akim Demaille	bf31619762	* src/bison.simple: Be sure to set YYSTACK_USE_ALLOCA. Use `#if , not `#ifndef'. Reported by Airy Andre.	2001-10-10 14:59:46 +00:00
Akim Demaille	31a743b2bb	* src/bison.simple: Be sure to set YYSTACK_USE_ALLOCA. Use `#if YYSTACK_USE_ALLOCA', not `#ifdef'. Reported by Airy Andre.	2001-10-10 14:52:20 +00:00
Akim Demaille	48b43d9d83	Remove.	2001-10-10 14:43:44 +00:00
Akim Demaille	4b9e71f993	Version 1.29d.	2001-10-10 14:39:31 +00:00
Akim Demaille	16cd214585	* INSTALL, config/config.guess, config/config.sub, config/mdate-sh * config/mkinstalldirs, lib/ansi2knr.c: Update.	2001-10-10 14:39:11 +00:00
Paul Eggert	f2c7ab2c1f	Explain better why the output file no longer defines 'const', and explain what to do about it if this still matters to you.	2001-10-02 18:09:13 +00:00
Akim Demaille	2c377512c2	Bump 1.29d.	2001-10-02 16:52:33 +00:00
Akim Demaille	74c3b26d85	.	2001-10-02 16:28:21 +00:00
Akim Demaille	72ab1d45d2	Version 1.29c.	2001-10-02 16:23:59 +00:00
Akim Demaille	d9302e4b73	* tests/regression.at (Invalid CPP headers): New. From Alexander Belopolsky. * src/files.c (compute_header_macro): Map non alnum chars to `_'.	2001-10-02 16:17:41 +00:00
Akim Demaille	f1394282f0	* tests/regression.at (Invalid input): New. * src/lex.c (lex): Be sure to set `token_buffer' in any case. Reported by Shura.	2001-10-02 15:52:24 +00:00
Akim Demaille	d8b1af2801	* tests/calc.at: Now that --debug works, the tests must be adjusted.	2001-10-02 15:36:11 +00:00
Akim Demaille	445cb4e989	* src/output.c (output_parser): Assert `skeleton'. * src/files.c (skeleton_find): Look harder for skeletons on DOSish systems. From Shura.	2001-10-02 14:48:53 +00:00
Marc Autret	f40703a29a	Adjust	2001-10-01 19:59:56 +00:00
Marc Autret	e348b12ae0	* src/lex.h: Echo modifications. * src/lex.c (unlex): Parameter is now token_t.	2001-10-01 19:47:09 +00:00
Marc Autret	ba6f6bf90f	* src/main.c: Include lex.h.	2001-10-01 19:37:31 +00:00
Akim Demaille	d9af6cc62f	* src/getargs.c (longopts): `--debug' is` -t', not `-d'.	2001-09-29 15:32:36 +00:00
Akim Demaille	ab30845981	* tests/testsuite.at: Update to newer Autotest. * tests/Makefile.am (EXTRA_DIST): bison is not to be shipped.	2001-09-28 11:56:12 +00:00
Akim Demaille	0b3870c112	Make bzip2 dists.	2001-09-27 15:24:45 +00:00
Akim Demaille	e92a5d5bae	Add.	2001-09-27 15:07:44 +00:00
Akim Demaille	02cbcfc577	Position independent wrapper. * tests/bison: Remove. * tests/bison.in: New. * configure.in: Adjust.	2001-09-27 15:06:14 +00:00
Akim Demaille	8c67836b58	Position independent wrapper. * tests/bison: Remove. * tests/bison.in: New. * configure.in: Adjust.	2001-09-27 15:00:02 +00:00
Akim Demaille	cae30a7df4	Port quotearg fixes from tar 1.13.24. * lib/quotearg.c: BSD/OS 4.1 wchar.h requires FILE and struct tm to be declared. (HAVE_MBSINIT): Undef if !HAVE_MBRTOWC. (mbsinit): Define to 1 if !defined mbsinit && !HAVE_MBSINIT. * m4/Makefile.am (EXTRA_DIST): Add mbrtowc.m4. * m4/mbrtowc.m4: New file. * m4/prereq.m4 (jm_PREREQ_QUOTEARG): Check for mbsinit and stddef.h. Use jm_FUNC_MBRTOWC instead of AC_CHECK_FUNCS(mbrtowc).	2001-09-27 14:25:57 +00:00
Akim Demaille	9fb2ad6738	Gettext 0.10.40.	2001-09-27 14:06:39 +00:00
Akim Demaille	8bce355d7c	Bump to 1.29c.	2001-09-27 09:19:45 +00:00
Akim Demaille	ae7c7ada67	.	2001-09-27 09:02:40 +00:00
Akim Demaille	9e42f7b625	Version 1.29b.	2001-09-27 08:54:51 +00:00
Akim Demaille	f87fc33f87	Regen.	2001-09-27 08:54:11 +00:00
Akim Demaille	7ba81a101f	* src/system.h: Include `xalloc.h'. Remove it from the C files. * src/files.c (output_files): Free the obstacks. * src/lex.c (init_lex): Rename as... (lex_init): this. (lex_free): New. * src/main.c (main): Use it.	2001-09-25 18:35:04 +00:00
Marc Autret	9190f3e726	* src/vcg.c (open_edge, close_edge, open_node, close_node): Change to output informations in fout (FILE). (open_graph, close_graph): Likewise. (output_graph, output_edge, output_node): Likewise. src/vcg.h: Update function prototypes. * src/print_graph.c (print_graph): Open output graph file. (print_actions): Adjust. * src/files.h: Remove extern declaration. * src/files.c: Remove graph_obstack declaration. (open_files): Remove graph_obstack initialization. (output_files): Remove graph_obstack saving.	2001-09-24 15:54:18 +00:00
Marc Autret	330de47708	* src/files.c (compute_output_file_names): Fix.	2001-09-24 14:14:58 +00:00
Akim Demaille	bb84601097	* src/reader.c (reader): Remove call to free_symtab (). * src/main.c (main): Call it here. Include symtab.h. * src/conflicts.c (initialize_conflicts): Rename as... (solve_conflicts): this. * src/print.c (print_core, print_actions, print_state) (print_grammar): Dump to a file instead a `output_obstack'. (print_results): Dump `output_obstack', and then proceed with the FILE . src/files.c (compute_output_file_names, close_files): New. (output_files): Adjust. * src/main.c (main): Adjust.	2001-09-24 08:15:53 +00:00
Marc Autret	9a96ccfa20	* src/files.c (compute_header_macro): Computes header macro name from spec_defines_file when given.	2001-09-23 14:49:30 +00:00
Marc Autret	6051d37287	* src/files.c (output_files): Add default extensions.	2001-09-23 14:09:59 +00:00
Akim Demaille	2aec1bc1de	* src/conflicts.c (finalize_conflicts): Rename as... (free_conflicts): this.	2001-09-22 18:13:24 +00:00
Akim Demaille	c6e1f6235a	* src/gram.c (gram_free): Rename back as... (dummy): this. (output_token_translations): Free `token_translations'. * src/symtab.c (free_symtab): Free the tag field.	2001-09-22 17:57:59 +00:00
Akim Demaille	ab6fbb02ad	Remove `translations' as it is always set to true. * src/gram.h: Adjust. * src/reader.c (packsymbols, parse_token_decl): Adjust * src/print.c (print_grammar): Adjust. * src/output.c (output_token_translations): Adjust. * src/lex.c (lex): Adjust. * src/gram.c: Be sure the set pointers to NULL. (dummy): Rename as... (gram_free): this.	2001-09-22 17:43:26 +00:00
Akim Demaille	f2632e420f	* configure.in: Invoke AM_LIB_DMALLOC. * src/system.h: Use dmalloc. * src/LR0.c: Be sure to have pointers initialized to NULL. (allocate_itemsets): Allocate kernel_items only if needed.	2001-09-22 17:19:03 +00:00
Akim Demaille	19f01e885f	* configure.in: Bump to 1.29b. * tests/Makefile.am (DISTCLEANFILES): Add package.m4. * tests/calc.at (_AT_DATA_CALC_Y): #undef malloc so that we don't need xmalloc.c in calc.y. From Pascal Bart.	2001-09-22 16:56:37 +00:00
Akim Demaille	6792619fa8	.	2001-09-22 16:23:53 +00:00
@@ -1 +1 @@
 .29
 .29c