Version 1.29c.

From Alexander Belopolsky.
* src/files.c (compute_header_macro): Map non alnum chars to `_'.

.cvsignore

@@ -3,10 +3,10 @@ config.cache
 config.h
 config.log
 config.status
-stamp-h
+stamp-h*
 bison-*
 patches
 *.patch *.log log patches applied
 *.prj
 releases
-*.flc
+autom4te.cache

ABOUT-NLS

@@ -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
+     Ready PO files    bg cs da de el en eo es et fi fr gl he hr id it ja
-                     +-------------------------------------------------+
+                     +----------------------------------------------------+
-     a2ps            |          []             []                      |
+     a2ps            |          []             []    []                   |
-     bash            |          []       [] []       []                |
+     bash            |          []       [] []       []                   |
-     bfd             |                                                 |
+     bfd             |                                                    |
-     binutils        |                                                 |
+     binutils        |                               []                   |
-     bison           |          []          [] []    []                |
+     bison           |          []          [] []    []                [] |
-     clisp           |          []    []    []       []                |
+     clisp           |          []    []    []       []                   |
-     cpio            |       [] []          []       [] []             |
+     cpio            |       [] []          []       [] []                |
-     diffutils       |       [] []       [] []       [] []       []    |
+     diffutils       |       [] []       [] []       [] []       []       |
-     enscript        |          []                   []                |
+     enscript        |          []                   []                   |
-     error           |                      []       []                |
+     error           |                      []       []                   |
-     fetchmail       |                                                 |
+     fetchmail       |                                                    |
-     fileutils       |    [] [] [] []       []       [] []             |
+     fileutils       |    [] [] [] []       []       [] []             [] |
-     findutils       |       [] []          [] []    [] []       [] [] |
+     findutils       |       [] []          [] []    [] []       [] []    |
-     flex            |       []             []       []                |
+     flex            |       []             []       []                   |
-     freetype        |                                                 |
+     freetype        |                                                    |
-     gas             |                                                 |
+     gas             |                                                    |
-     gawk            |                                     []          |
+     gawk            |                               []    []             |
-     gcal            |                                                 |
+     gcal            |                                                    |
-     gcc             |                                                 |
+     gcc             |                                                    |
-     gettext         |    [] [] [] []       []       [] []       [] [] |
+     gettext         |    [] [] [] []       []       [] []       [] [] [] |
-     gnupg           |          []       []    []    [] []          [] |
+     gnupg           |          []       []    []    [] []          [] [] |
-     gprof           |                                                 |
+     gprof           |                                                    |
-     grep            |          []       [] [] []    [] []          [] |
+     grep            |    []    []       [] [] []    [] []          []    |
-     hello           |       [] [] []    [] [] [] [] [] []          [] |
+     hello           |       [] [] []    [] [] [] [] [] []          [] [] |
-     id-utils        |       [] []                   []                |
+     id-utils        |       [] []                   []                   |
-     indent          |       [] []             []    [] []             |
+     indent          |       [] []             []    [] []                |
-     jpilot          |                               []                |
+     jpilot          |                               []                   |
-     kbd             |                                                 |
+     kbd             |                                                    |
-     ld              |                                                 |
+     ld              |                               []                   |
-     libc            |    [] [] [] []       []       [] []          [] |
+     libc            |    [] [] [] []       []       [] []             [] |
-     lilypond        |                                                 |
+     lilypond        |                                                 [] |
-     lynx            |    [] [] []                                     |
+     lynx            |    [] [] []                                     [] |
-     m4              |    [] [] [] []                [] []       []    |
+     m4              |    [] [] [] []                [] []       []    [] |
-     make            |       [] []          []       [] []             |
+     make            |       [] []          []       [] []             [] |
-     nano            |                                  []       []    |
+     mysecretdiary   |          []                                        |
-     opcodes         |                                                 |
+     nano            |                      []          []       []       |
-     parted          |          []                      []             |
+     opcodes         |                                                    |
-     ptx             |       [] []          [] []    [] []       []    |
+     parted          |          []                      []             [] |
-     python          |                                                 |
+     ptx             |       [] []          [] []    [] []       []       |
-     recode          |       [] [] []    [] []       [] [] []       [] |
+     python          |                                                    |
-     sed             |    [] [] [] []    []    []    [] []       [] [] |
+     recode          |       [] [] []    [] []       [] [] []       []    |
-     sh-utils        |    [] [] [] []       [] []    [] []          [] |
+     sed             |    [] [] [] []    []    []    [] [] []    [] [] [] |
-     sharutils       |    [] [] [] []       []       [] []             |
+     sh-utils        |    [] [] [] []       [] []    [] []          [] [] |
-     soundtracker    |                                  []             |
+     sharutils       |    [] [] [] []       []       [] []             [] |
-     sp              |                                                 |
+     sketch          |                                                    |
-     tar             |    [] [] []          [] []    []          [] [] |
+     soundtracker    |          []          []          []                |
-     texinfo         |    [] [] []       []          []                |
+     sp              |                                                    |
-     textutils       |    [] [] [] []       []       [] []             |
+     tar             |    [] [] []          [] []    []             [] [] |
-     util-linux      |    [] []                                        |
+     texinfo         |    [] [] []       []          []                [] |
-     wdiff           |          []             []                      |
+     textutils       |    [] [] [] []       []       [] []             [] |
-     wget            |    [] [] [] []       [] []    [] [] []          |
+     util-linux      |    [] []                                           |
-                     +-------------------------------------------------+
+     wdiff           |       [] []             []                         |
-                       bg cs da de el en eo es et fi fr gl he hr id it
+     wget            |    [] [] [] []       [] []    [] [] []          [] |
-                        0 13 23 30 11  1  8 21 13  1 29 22  3  0  8 10
+                     +----------------------------------------------------+
+                       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
+                       ko lv nb nl nn no pl pt pt_BR ru sk sl sv tr uk zh
-                     +-------------------------------------------------+
+                     +----------------------------------------------------+
-     a2ps            |          []                []    []             |  5
+     a2ps            |          []                   []    []             |  6
-     bash            |                                                 |  4
+     bash            |                                                    |  4
-     bfd             |                                                 |  0
+     bfd             |                                                    |  0
-     binutils        |                                                 |  0
+     binutils        |                                                    |  1
-     bison           | []       []                []                   |  7
+     bison           |                               []                   |  6
-     clisp           |          []                                     |  5
+     clisp           |          []                                        |  5
-     cpio            |    []    []    []     []   []                   | 10
+     cpio            | []       []       []     []   []                   | 10
-     diffutils       |                []          []       []          | 10
+     diffutils       |                   []          []       [] []       | 11
-     enscript        |          []           []   []                   |  5
+     enscript        |          []              []   []                   |  5
-     error           |                                        []       |  3
+     error           |                                  []       []       |  4
-     fetchmail       |                                                 |  0
+     fetchmail       |                                                    |  0
-     fileutils       | [] []    []    []     []   [] [] [] [] []       | 17
+     fileutils       | []       []       []     []   [] [] [] [] []       | 17
-     findutils       |    []    []    []     []   []    [] [] []       | 16
+     findutils       | []       []       []     []   []    [] [] []       | 16
-     flex            |    []                      []       []          |  6
+     flex            | []                            []       []          |  6
-     freetype        |                                                 |  0
+     freetype        |                                                    |  0
-     gas             |                                                 |  0
+     gas             |                                                    |  0
-     gawk            |                                        []       |  2
+     gawk            |                                           []       |  3
-     gcal            |                                                 |  0
+     gcal            |                                                    |  0
-     gcc             |                                                 |  0
+     gcc             |                                                    |  0
-     gettext         | [] []          []     []   []    [] [] []    [] | 18
+     gettext         | []                []     []   []    [] [] []    [] | 18
-     gnupg           | []             []                   [] []       | 10
+     gnupg           |                   []                   [] []       | 10
-     gprof           |                                                 |  0
+     gprof           |                                                    |  0
-     grep            |                []                []    []       | 10
+     grep            |                   []                [] [] []       | 12
-     hello           | [] [] [] [] [] []          [] []    [] [] []    | 21
+     hello           | [] [] [] []    [] []          [] []    [] [] []    | 22
-     id-utils        |          []                []       []          |  6
+     id-utils        |          []                   []       []          |  6
-     indent          |    []    []    []          [] []    [] []       | 12
+     indent          | []       []       []          [] []    [] []       | 12
-     jpilot          |                                                 |  1
+     jpilot          |                                                    |  1
-     kbd             |                                        []       |  1
+     kbd             |                                           []       |  1
-     ld              |                                                 |  0
+     ld              |                                                    |  1
-     libc            | [] []    [] [] []     []      []    [] []       | 17
+     libc            | []    []       [] []     []      []    [] []       | 16
-     lilypond        | []       []                                     |  2
+     lilypond        |          []                            []          |  3
-     lynx            | []       []           []   []       []          |  8
+     lynx            |          []              []   []       []          |  8
-     m4              | []       []    []          []       []          | 12
+     m4              |          []       []          []       []          | 12
-     make            | [] []    []    []     []   []          []       | 12
+     make            | []       []       []     []   []          []       | 12
-     nano            |                                     []          |  3
+     mysecretdiary   |                                                    |  1
-     opcodes         |                                                 |  0
+     nano            |                                        []          |  4
-     parted          | []       []                []                   |  5
+     opcodes         |                                           []       |  1
-     ptx             |          [] [] [] []       []       [] []       | 14
+     parted          |          []                   []                   |  5
-     python          |                                                 |  0
+     ptx             |       [] []    [] [] []       []       [] []       | 15
-     recode          |                []          []    [] []          | 13
+     python          |                                                    |  0
-     sed             | []       []           []   [] [] [] [] []       | 18
+     recode          |                   []          []    [] []          | 13
-     sh-utils        | []       [] [] []     []   [] [] [] [] []    [] | 20
+     sed             |          []              []   [] [] [] [] []       | 19
-     sharutils       | []       []                []       []          | 11
+     sh-utils        |       [] []    [] []     []   [] [] [] [] []    [] | 21
-     soundtracker    |                                                 |  1
+     sharutils       |          []                   []       []          | 11
-     sp              |                                                 |  0
+     sketch          |                                                    |  0
-     tar             | []       [] [] []     []   []    [] [] []       | 17
+     soundtracker    |                                                    |  3
-     texinfo         | []                         []                   |  7
+     sp              |                                                    |  0
-     textutils       | []       [] [] []     []   [] [] []             | 15
+     tar             |       []       [] []     []         [] [] []       | 15
-     util-linux      |                       []               []       |  4
+     texinfo         |                               []                   |  7
-     wdiff           |                            [] []       []       |  5
+     textutils       |       [] []    [] []     []   [] [] []             | 16
-     wget            |          []                [] [] [] [] [] []    | 16
+     util-linux      |                          []               []       |  4
-                     +-------------------------------------------------+
+     wdiff           |                               [] []    [] []       |  7
-       31 teams        ja ko lv nl no pl pt pt_BR ru sk sl sv tr uk zh
+     wget            |          []                   [] [] [] [] [] []    | 17
-       51 domains      17  9  1 23  6 17  1  13   26  9 11 20 19  2  2  369
+                     +----------------------------------------------------+
+       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
+   If September 2001 seems to be old, you may fetch a more recent copy
-this `ABOUT-NLS' file on most GNU archive sites.  The most up-to-date
+of this `ABOUT-NLS' file on most GNU archive sites.  The most
-matrix with full percentage details can be found at
+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
+package.  Of course you have to respect the GNU Library General Public
-sources from then on if you include `gettext' directly in your
+License which covers the use of the GNU `gettext' library.  This means
-distribution but since you are writing free software anyway this is no
+in particular that even non-free programs can use `libintl' as a shared
-restriction.
+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

ChangeLog

@@ -1,364 +1,437 @@
-2001-09-25  Pascal Bart  <pascal.bart@epita.fr>
+2001-10-02  Akim Demaille  <akim@epita.fr>
 
-	* src/output.c (output_master_parser): Don't finish action_obstack.
+	Version 1.29c.
-	(output_parser): Don't care about the muscle action, here.
-	(prepare): Copy the action_obstack in the action muscle.
-	(output): Free action_obstack.
 
-2001-09-23  Pascal Bart  <pascal.bart@epita.fr>
+2001-10-02  Akim Demaille  <akim@epita.fr>
 
-	* src/reader.c (parse_union_decl): Add new obstack union_obstack.  Which
+	* tests/regression.at (Invalid CPP headers): New.
-	will contain `%union' declaration.
+	From Alexander Belopolsky.
-	(parse_union_decl): Delete #line directive output.
+	* src/files.c (compute_header_macro): Map non alnum chars to `_'.
-	(parse_union_decl): Substitute /attrs_obstack/union_obstack for all
-	informations about %union.
-	(parse_union_decl): Copy the union_obstack in the muscle stype.
-	* src/bison.simple: Add new #line directive.
-	Add typdef %%stype YYSTYPE.
 
-2001-09-23  Pascal Bart  <pascal.bart@epita.fr>
+2001-10-02  Akim Demaille  <akim@epita.fr>
 
-	* src/bison.simple: Add new `#line' directive.
+	* tests/regression.at (Invalid input): New.
+	* src/lex.c (lex): Be sure to set `token_buffer' in any case.
+	Reported by Shura.
 
-2001-09-22  Pascal Bart  <pascal.bart@epita.fr>
+2001-10-02  Akim Demaille  <akim@epita.fr>
 
-	* src/bison.simple: New `#line' directive.
+	* tests/calc.at: Now that --debug works, the tests must be adjusted.
-	* src/output.c (output_parser): Support new dynamic muscle input_line.
 
-2001-09-22  Marc Autret  <autret_[email protected]>
+2001-10-02  Akim Demaille  <aki[email protected]>
 
-	* src/output.c (output_master_parser): New.
+	* src/output.c (output_parser): Assert `skeleton'.
-	(output_parser): Be more re-entrant.
+	* src/files.c (skeleton_find): Look harder for skeletons on DOSish
+	systems.
+	From Shura.
 
-2001-09-21  Marc Autret  <[email protected]>
+2001-10-01  Marc Autret  <[email protected]>
 
-	* src/reader.c (copy_definition, parse_union_decl): Update and use
+	* src/lex.h: Echo modifications.
-	`linef' muscle.
+	* src/lex.c (unlex): Parameter is now token_t.
-	(copy_action): Likewise.
+	From Hans Aberg.
-	Use obstack_1grow ().
-	* src/muscle_tab.c (muscle_init): Add muscle `linef'.
 
-2001-09-21  Marc Autret  <[email protected]>
+2001-10-01  Marc Autret  <[email protected]>
 
-	* src/options.c (option_table): Adjust.
+	* src/main.c: Include lex.h.
-	* src/lex.c (parse_percent_token): Fix.
+	From Hans Aberg.
 
-2001-09-20  Pascal Bart  <pascal.bart@epita.fr>
+2001-09-29  Akim Demaille  <akim@epita.fr>
 
-	* src/options.c (symtab.h): Include it, need by lex.h.
+	* src/getargs.c (longopts): `--debug' is `-t', not `-d'.
-	
-2001-09-20  Pascal Bart  <[email protected]>
 
-	* src/lex.c (parse_percent_token): Change type of variable `tx', which
+2001-09-28  Akim Demaille  <[email protected]>
-	is now an option_table_struct*.
-	(option_strcmp): New function option_strcmp.
-	(parse_percent_token): Call option_strcmp.
-	* src/getargs.c (xalloc.h, options.h): Include it.
-	(getargs): Call create_long_option_table.
-	(getargs): Free longopts at the end of the function.
-	(shortopts): Move in options.c.
-	* src/options.c (create_long_option_table): New function.  Convert
-	information from option_table to option structure.
-	* src/reader.c (options.h): Include it.
 
-	* src/Makefile.am: Adjust.
+	* tests/testsuite.at: Update to newer Autotest.
-	* src/options.c (option_table): Create from longopts and percent_table.
+	* tests/Makefile.am (EXTRA_DIST): bison is not to be shipped.
-	* src/getargs.c (longopts): Delete.
-	* src/lex.c (struct percent_table_struct): Delete.
-	(percent_table): Delete.
-	(options.h): Include it.
-	* src/options.c: Create.
-	* src/options.h: Create.
-	Declare enum opt_access_e.
-	Define struct option_table_struct.
 
-2001-09-20  Marc Autret  <autret_[email protected]>
+2001-09-27  Akim Demaille  <aki[email protected]>
 
-	* doc/bison.texinfo: Adjust terminologies about prologue and epilogue
+	Position independent wrapper.
-	sections of Bison.
 
-2001-09-19  Pascal Bart  <[email protected]>
+	* tests/bison: Remove.
+	* tests/bison.in: New.
+	* configure.in: Adjust.
 
-	* src/bison.simple: s/%%filename/%%skeleton.
+2001-09-27  Paul Eggert  <[email protected]>
-	* src/muscle_tab.c (getargs.h): Include it.
-	(muscle_init): Insert new muscle skeleton.
 
-2001-09-18  Pascal Bart  <[email protected]>
+	Port quotearg fixes from tar 1.13.24.
 
-	* src/output.c (output_parser): Delete unused variable actions_dumped.
+	* 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.
 
-2001-09-07  Pascal Bart  <[email protected]>
+	* 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).
 
-	* src/output.c (output): Delete call to reader_output_yylsp.
+2001-09-27  Akim Demaille  <[email protected]>
-	* src/reader.c (reader): Likewise.
-	* src/reader.h:	Delete declaration of reader_output_yylsp.
-	
-2001-09-02  Marc Autret  <[email protected]>
 
-	* src/reader.c: Include muscle_tab.h.
+	Bump to 1.29c.
-	(parse_union_decl): Update.
-	(parse_macro_decl): Rename parse_muscle_decl.
-	Update to use renamed functions and variable.
-	(read_declarations, copy_action, read_additionnal_code, : Updated
-	with correct variables and functions names.
-	(packsymbols, reader): Likewise.
-	
-	* src/reader.h (muscle_obstack): Extern declaration update.
-	
-	* src/output.c: Include muscle_tab.h
-	In all functions using macro_insert, change by using muscle_insert ().
-	(macro_obstack): Rename muscle_obstack.
-	Echo modifications in the whole file.
-	(MACRO_INSERT_INT): Rename MUSCLE_INSERT_INT.
-	(MACRO_INSERT_STRING): Rename MUSCLE_INSERT_STRING.
-	(MACRO_INSERT_PREFIX): Rename MUSCLE_INSERT_PREFIX.
 
-	* src/muscle_tab.h: Update double inclusion macros.
+2001-09-27  Akim Demaille  <[email protected]>
-	(macro_entry_s): Rename muscle_entry_s.
-	Update prototypes.
-	
-	* src/muscle_tab.c: Include muscle_tab.h.
-	Rename macro_tabble to muscle_table.
-	(mhash1, mhash2, mcmp): Use muscle_entry.
-	(macro_init): Rename muscle_init. Update.
-	(macro_insert): Rename muscle_insert. Update.
-	(macro_find): Rename muscle_find. Update.
 
-	* src/main.c: Include muscle_tab.h.
+	Version 1.29b.
-	(main): Call muscle_init ().
-	* src/Makefile.am (bison_SOURCES): Echo modifications.
 
-2001-09-02  Marc Autret  <autret_[email protected]>
+2001-09-25  Akim Demaille  <aki[email protected]>
 
-	Now the files macro_tab.[ch] are named muscle_tab.[ch].
+	* src/system.h: Include `xalloc.h'.
-	
+	Remove it from the C files.
-	* src/muscle_tab.c, src/muscle_tab.h: Add 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-02  Marc Autret  <[email protected]>
+2001-09-24  Marc Autret  <[email protected]>
 
-	* src/macrotab.c, src/macrotab.h: Remove.
+	* 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-01  Pascal Bart  <pascal.bart@epita.fr>
+2001-09-24  Marc Autret  <autret_m@epita.fr>
 
-	* src/reader.c (copy_guard): Use muscle to specify the `#line' 
+	* src/files.c (compute_output_file_names): Fix.
-	filename.
 
-2001-09-01  Marc Autret  <[email protected]>
+2001-09-24  Marc Autret  <[email protected]>, Akim Demaille  <[email protected]>
 
-	* tests/calc.at (exp): Now, YYERROR_VERBOSE need to be set
+	* src/reader.c (reader): Remove call to free_symtab ().
-	to an explicit value to activate the feature. We do it here.
+	* 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-08-31  Pascal Bart  <pascal.bart@epita.fr>
+2001-09-23  Marc Autret  <autret_m@epita.fr>
 
-	* src/output.c (prepare): Delete the `filename' muscule insertion.
+	* src/files.c (compute_header_macro): Computes header macro name
-	* src/reader.c (copy_action): Use `filename' muscule with `#line'.
+	from spec_defines_file when given.
-	(parse_union_decl): Likewise.
-	* src/macrotab.c (macro_init): Initialize filename by infile.
 
-2001-08-31  Marc Autret  <[email protected]>
+2001-09-23  Marc Autret  <[email protected]>
 
-	* src/bison.simple (YYLSP_NEEDED): New definition.
+	* src/files.c (output_files): Add default extensions.
-	* src/output.c (prepare): Add macro insertion of `locations_flag'
 
-2001-08-31  Pascal Bart  <pascal.bart@epita.fr>
+2001-09-22  Akim Demaille  <akim@epita.fr>
 
-	* src/output.c (prepare): Delete insertion of previous muscles,
+	* src/conflicts.c (finalize_conflicts): Rename as...
-	and insert the `prefix' muscles.
+	(free_conflicts): this.
-	* src/macrotab.c (macro_init): Likewise.
-	(macro_init): Initialization prefix directive by `yy'.
-	* src/bison.simple: Substitute all %%yylex, %%yychar, %%yylval, 
-	%%yydebug, %%yyerror, %%yynerrs and %%yyparse by yylex, yychar,
-	yylval, yydebug, yyerror, yynerrs and yyparse.
-	New directive `#define' to substitute yydebug, ... with option 
-	name_prefix.
 
-2001-08-31  Pascal Bart  <pascal.bart@epita.fr>
+2001-09-22  Akim Demaille  <akim@epita.fr>
 
-	* src/main.c (main): Standardize.
+	* src/gram.c (gram_free): Rename back as...
-	* src/output.c (output_table_data, output_parser): Likewise.
+	(dummy): this.
-	* src/macrotab.h, src/macrotab.c, src/bison.simple: Likewise.
+	(output_token_translations): Free `token_translations'.
+	* src/symtab.c (free_symtab): Free the tag field.
 
-2001-08-31  Pascal Bart  <[email protected]>, Marc Autret  <autret_[email protected]>
+2001-09-22  Akim Demaille  <aki[email protected]>
 
-	* src/reader.c (read_additionnal_code): Rename %%user_code to 
+	Remove `translations' as it is always set to true.
-	%%epilogue.
-	* src/output.c (output): Rename %%declarations to %%prologue.
-	* src/bison.simple: Echo modifications.
-	
-2001-08-31  Marc Autret  <[email protected]>
 
-	* src/reader.c (readgram): CleanUp.
+	* src/gram.h: Adjust.
-	(output_token_defines): Likewise.
+	* src/reader.c (packsymbols, parse_token_decl): Adjust
-	(packsymbols): Likewise.
+	* src/print.c (print_grammar): Adjust.
-	(reader): Likewise.
+	* src/output.c (output_token_translations): Adjust.
-	* src/output.c (output): CPP-out useless code.
+	* src/lex.c (lex): Adjust.
+	* src/gram.c: Be sure the set pointers to NULL.
+	(dummy): Rename as...
+	(gram_free): this.
 
-2001-08-31  Pascal Bart  <pascal.bart@epita.fr>
+2001-09-22  Akim Demaille  <akim@epita.fr>
 
-	* src/reader.c (reader): Delete obsolete call to function 
+	* configure.in: Invoke AM_LIB_DMALLOC.
-	output_trailers and output_headers.
+	* src/system.h: Use dmalloc.
-	* src/output.h: Remove obsolete functions prototypes of output_headers
+	* src/LR0.c: Be sure to have pointers initialized to NULL.
-	and output_trailers.
+	(allocate_itemsets): Allocate kernel_items only if needed.
 
-2001-08-30  Pascal Bart  <pascal.bart@epita.fr>
+2001-09-22  Akim Demaille  <akim@epita.fr>
 
-	* src/main.c: Include macrotab.h.
+	* configure.in: Bump to 1.29b.
-	* src/macrotab.h (macro_entry_s): Constify fields. 
+	* tests/Makefile.am (DISTCLEANFILES): Add package.m4.
-	Adjust functions prototypes.
+	* tests/calc.at (_AT_DATA_CALC_Y): #undef malloc so that we don't
-	* src/macrotab.c (macro_insert): Constify key and value.
+	need xmalloc.c in calc.y.
-	(macro_find): Constify key.
+	From Pascal Bart.
-	(macro_insert): Include 'xalloc.h'
-	(macro_insert): Use XMALLOC.
-	(macro_find): Constify return value.
-	* src/output.c (output_table_data): Rename table to table_data.
-	(output_parser): Constify macro_key, macro_value.
 
-2001-08-30  Marc Autret  <autret_[email protected]>
+2001-09-21  Akim Demaille  <aki[email protected]>
 
-	* src/reader.c (parse_skel_decl): New.
+	Version 1.29a.
-	(read_declarations): Add case `tok_skel', call parse_skel_decl (). 
+	* Makefile.maint, config/config.guess, config/config.sub,
-	* src/lex.h (token_t): New token `tok_skel'.
+	* config/missing: Update from masters.
-	* src/lex.c (percent_table): Add skeleton option entry.
+	* tests/Makefile.am ($(srcdir)/$(TESTSUITE)): No longer depend
-	Standardize.
+	upon package.m4.
+	* configure.in (ALL_LINGUAS): Add `tr'.
 
-2001-08-29  Marc Autret  <autret_[email protected]>
+2001-09-21  Akim Demaille  <aki[email protected]>
 
-	* src/bison.simple: Add %%user_code directive at the end.
+	* tests/Makefile.am (package.m4): Move to...
-	* src/reader.c (read_additionnal_code): New.
+	($(srcdir)/$(TESTSUITE)): here.
-	(reader): Use it.
-	* src/output.c (output_program): Remove.
-	(output): Update.
 
-2001-08-28  Marc Autret  <autret_[email protected]>
+2001-09-20  Akim Demaille  <aki[email protected]>
 
-	* src/output.c (output_actions): Clean up.
+	* src/complain.c: No longer try to be standalone: use system.h.
-	(output_gram): CPP-out useless code.
+	Don't assume __STDC__ is defined to 1. Just test if it is defined.
-	* src/reader.c (reader): Clean up, CPP-out useless code.
+	* src/complain.h: Likewise.
+	* src/reduce.c (useless_nonterminals, inaccessable_symbols):
+	Remove the unused variable `n'.
+	From Albert Chin-A-Young.
 
-2001-08-28  Pascal Bart  <pascal.bart@epita.fr>
+2001-09-18  Marc Autret  <autret_m@epita.fr>
 
-	* src/output.c (output): Copy attrs_obstack in the '%%definitions' 
+	* doc/bison.1: Update.
-	directive.
+	* doc/bison.texinfo (Bison Options): Update --defines and --graph
-	* src/bison.simple: Add `%%definitions'.
+	descriptions.
+	(Option Cross Key): Update.
+	Add --graph.
 
-2001-08-28  Marc Autret  <[email protected]>
+2001-09-18  Marc Autret  <[email protected]>
 
-	* config/depcomp: New file.
+	* tests/regression.at: New test (comment in %union).
 
-2001-08-27  Paul Eggert  <[email protected]>
+2001-09-18  Marc Autret  <[email protected]>
+
+	* src/reader.c (parse_union_decl): Do not output '/'. Let copy_comment
+	do that.
+	Reported by Keith Browne.
+
+2001-09-18  Marc Autret  <[email protected]>
+
+	* tests/output.at: Add tests for --defines and --graph.
+
+2001-09-18  Marc Autret  <[email protected]>
+
+	* tests/output.at: Removes tests of %{header,src}_extension features.
+
+2001-09-18  Akim Demaille  <[email protected]>
+
+	* tests/Makefile.am (package.m4): New.
+	* tests/calc.at (_AT_CHECK_CALC): Just run `calc input'.
+	(_AT_CHECK_CALC_ERROR): Likewise.
+	Factor the `, ' part of verbose error messages.
+
+2001-09-18  Marc Autret  <[email protected]>
+
+	* src/getargs.c (longopts): Declare --defines and --graph as options
+	with optional arguments.
+	* src/files.h: Add extern declarations.
+	* src/files.c (spec_graph_file, spec_defines_file): New.
+	(output_files): Update.
+	Remove CPP-outed code.
+
+2001-09-18  Marc Autret  <[email protected]>
+
+	Turn off %{source,header}_extension feature.
+
+	* src/files.c (compute_exts_from_gf): Update.
+	(compute_exts_from_src): Update.
+	(output_files): CPP-out useless code.
+	* src/files.h: Remove {header,source}_extension extern declarations.
+	* src/reader.c (parse_dquoted_param): CPP-out.
+	(parse_header_extension_decl): Remove.
+	(parse_source_extension_decl): Remove.
+	(read_declarations): Remove cases tok_{hdrext,srcext}.
+	* src/lex.c (percent_table): Remove {header,source}_extension entries.
+	* src/lex.h (token_t): Remove tok_hdrext and tok_srcext.
+
+2001-09-10  Akim Demaille  <[email protected]>
+
+	* tests/output.at (AT_CHECK_BISON_FLAGS, AT_CHECK_BISON_PERCENT):
+	(AT_CHECK_BISON_PERCENT_FLAGS): Merge into...
+	(AT_CHECK_OUTPUT): this.
+	Merely check ls' exit status, its output is useless.
+
+2001-09-10  Akim Demaille  <[email protected]>
+
+	* tests/calc.at: Use m4_match.
+	(_AT_DATA_CALC_Y): Check `yyin != NULL', not `stdin != NULL'.
+
+2001-09-10  Marc Autret   <[email protected]>, Akim Demaille  <[email protected]>
+
+	* src/vcg.h (graph_s): color, textcolor, bordercolor are now
+	enum color_e.
+	* src/print_graph.c (print_graph): Initalize graph.layoutalgorithm
+	to `normal'.
+	* src/reader.c (parse_token_decl): Initialize token with tok_eof.
+	* src/lex.h: Adjust prototype.
+	(token_t): Add `tok_undef'.
+	* src/lex.c (struct percent_table_struct): Retval is now a token_t.
+	(parse_percent_token): Now returns token_t.
+	Add default statement in switch.
+	(lex): Separate `c' as an input variable, from the token_t result
+	part.
+	(unlexed): Is a token_t.
+
+2001-09-10  Akim Demaille  <[email protected]>
+
+	* configure.in: Bump to 1.29a.
+
+2001-09-07  Akim Demaille  <[email protected]>
+
+	Version 1.29.
+
+2001-08-30  Akim Demaille  <[email protected]>
+
+	* tests/atgeneral.m4, tests/atconfig.in, tests/suite.at: Remove.
+	* m4/atconfig.m4: Remove.
+	* tests/testsuite.at, tests/atlocal.in, tests/output.at,
+	* tests/bison: New.
+	* tests/regression.at, tests/calc.at: Use m4_define, AT_BANNER,
+	m4_if, m4_patsubst, and m4_regexp.
+	* tests/calc.at (_AT_CHECK_CALC, _AT_CHECK_CALC_ERROR): Use an
+	`input' file instead of echo.
+
+2001-08-29  Akim Demaille  <[email protected]>
+
+	Bump to 1.28e.
+
+2001-08-29  Akim Demaille  <[email protected]>
+
+	Version 1.28d.
+
+2001-08-29  Paul Eggert  <[email protected]>
 
 	* src/bison.simple (yyparse): Don't take the address of an
 	item before the start of an array, as that doesn't conform to
 	the C Standard.
 
-2001-08-27  Robert Anisko  <robert.[email protected]>
+2001-08-29  Robert Anisko  <anisko_r@epita.fr>
 
-	* src/output.c (output): Remove the initialization of the macro
+	* doc/bison.texinfo (Location Tracking Calc): New node.
-	obstack.  It was done too late here.
 
-	* src/reader.c (parse_macro_decl): Fix.  Use of the macro obstack was
+2001-08-29  Paul Eggert  <[email protected]>
-	completely wrong.
-	(reader): Initialize the macro obstack here, since we need it to grow
-	'%define' directives.
 
-	* src/reader.h: Declare the macro obstack as extern.
+	* src/output.c (output): Do not define const, as this now
+	causes more problems than it cures.
 
-2001-08-27  Robert Anisko  <robert.anisko@epita.fr>
+2001-08-29  Akim Demaille  <akim@epita.fr>
 
-	* src/output.c (output_parser): Fix.  Store single '%' characters in
+	* doc/bison.texinfo: Modernize `@node' and `@top' use: just name
-	the output obstack instead of throwing them away.
+	the nodes.
+	Be sure to tag the `detailmenu'.
+
+2001-08-29  Akim Demaille  <[email protected]>
+
+	* Makefile.maint (do-po-update): Wget refuses to overwrite files:
+	download in a tmp dir.
+
+2001-08-28  Marc Autret  <[email protected]>
+
+	* config/depcomp: New file.
+
+2001-08-28  Marc Autret  <[email protected]>
+
+	* doc/bison.1 (mandoc): Adjust.
+	From Juan Manuel Guerrero.
+
+2001-08-28  Marc Autret  <[email protected]>
+
+	* src/print_graph.c (print_state): Fix.
+
+2001-08-27  Marc Autret  <[email protected]>
+
+	* src/vcg.h (classname_s, infoname_s, node_s): Constify the
+	char * members.
+	Echo modifications to the functions prototypes.
+	* src/vcg.c (add_classname, add_infoname): Adjust arguments.
+
+2001-08-27  Marc Autret  <[email protected]>
+
+	* src/vcg.c: Include `xalloc.h'.
+	(add_colorentry): New.
+	(add_classname): New.
+	(add_infoname): New.
+	* src/vcg.h: Add new prototypes.
+
+2001-08-27  Akim Demaille  <[email protected]>
+
+	* Makefile.maint: Sync. again with CVS Autoconf.
+
+2001-08-27  Akim Demaille  <[email protected]>
+
+	* Makefile.maint: Formatting changes.
+	(po-update, cvs-update, update): New targets.
+	(AMTAR): Remove.
 
 2001-08-27  Akim Demaille  <[email protected]>
 
 	* Makefile.am (AUTOMAKE_OPTIONS): 1.5.
+	* Makefile.maint: Sync. with CVS Autoconf.
 
-2001-08-25  Robert Anisko  <robert.anisko@epita.fr>
+2001-08-27  Marc Autret  <autret_m@epita.fr>
 
-	* lib/Makefile.am: Adjust.
+	* src/vcg.h (struct infoname_s): New.
+	(struct colorentry_s): New.
+	(graph_s): New fields {vertical,horizontal}_order in structure.
+	Add `infoname' field.
+	Add `colorentry' field;
+	* src/vcg_defaults.h (G_VERTICAL_ORDER): New.
+	(G_HORIZONTAL_ORDER): New.
+	(G_INFONAME): New.
+	(G_COLORENTRY): New.
+	* src/vcg.c (output_graph): Add output of {vertical,horizontal}_order.
+	Add output of `infoname'.
+	Add output of `colorentry'.
 
-2001-08-25  Robert Anisko  <robert.anisko@epita.fr>
+2001-08-27  Marc Autret  <autret_m@epita.fr>
 
-	* src/bison.simple: Update and add '%%' directives.
+	* src/reader.c (parse_dquoted_param): Rename variable `index' to `i'.
+	This one shadowed a global parameter.
 
-2001-08-25  Robert Anisko  <robert.anisko@epita.fr>
+2001-08-24  Marc Autret  <autret_m@epita.fr>
 
-	* src/reader.c (reader): Remove calls to 'output_headers' and
+	* src/print_graph.c (node_output_size): Declared POSIX `size_t' type,
-	'output_trailers'. Remove some C output.
+	instead of `unsigned'.
-	(readgram): Disable a piece of code that was writing a default
+	(print_state): Do not call obstack_object_size () in obstack_grow ()
-	definition for 'YYSTYPE'.
+	to avoid macro variables shadowing.
-	(reader_output_yylsp): Remove.
-	(packsymbols): Output token defintions to a macro.
-	(copy_definition): Disable C output.
 
-	* src/reader.c (parse_macro_decl): New function used to parse macro
+2001-08-23  Marc Autret  <[email protected]>
-	declarations.
-	(copy_string2): Put the body of copy_string into this new function.
-	Add a parameter to let the caller choose whether he wants to copy the
-	string delimiters or not.
-	(copy_string): Be a simple call to copy_string2 with the last argument
-	bound to true.
-	(read_declarations): Add case for macro definition.
-	(copy_identifier): New.
-	(parse_macro_decl): Read macro identifiers using copy_identifier
-	rather than lex.
 
-2001-08-25  Robert Anisko  <[email protected]>
+	* src/lex.c (percent_table): Typo: s/naem/name/.
+	Add graph option.
+	Normalize new options declarations.
 
-	* src/output.c (prepare): Add prefixed names.
+2001-08-20  Pascal Bart  <[email protected]>
-	(output_parser): Output semantic actions.
-	(output_parser): Fix bug on '%%line' directives.
 
-	* src/output.c (output_headers): Remove. The C code printed by this
+	* tests/suite.at: Exercise %header_extension and %source_extension.
-	function should now be in the skeletons.
-	(output_trailers): Remove.
-	(output): Disable call to 'reader_output_yylsp'.
-	(output_rule_data): Do not output tables to the table obstack.
 
-	* src/output.c: Remove some C dedicated output.
+2001-08-16  Marc Autret  <[email protected]>
-	Improve the use of macro and output obstacks.
-	(output_defines): Remove.
 
-	* src/output.c (output_token_translations): Associate 'translate'
+	* src/reader.c (parse_dquoted_param): New.
-	table with a macro. No output to the table obstack.
+	(parse_header_extension_decl): Use it.
-	(output_gram): Same for 'rhs' and 'prhs'.
+	(parse_source_extension_decl): Likewise.
-	(output_stos): Same for 'stos'.
-	(output_rule_data): Same for 'r1' and 'r2'.
-	(token_actions): Same for 'defact'.
-	(goto_actions): Same for 'defgoto'.
-	(output_base): Same for 'pact' and 'pgoto'.
-	(output_table): Same for 'table'.
-	(output_check): Same for 'check'.
 
-	* src/output.c (output_table_data): New function.
+2001-08-16  Marc Autret  <[email protected]>
-	(output_short_table): Remove.
-	(output_short_or_char_table): Remove.
 
-	* src/output.c (output_parser): Replace most of the skeleton copy code
+	* src/vcg.c: Remove includes of `complain.h' and `xalloc.h'.
-	with something new. Skeletons are now processed character by character
+	(get_xxxx_str): Use assert () instead of complain ().
-	rather than line by line, and Bison looks for '%%' macros. This is the
+	Remove return invokations in default cases.
-	first step in making Bison's output process (a lot) more flexible.
+	(get_decision_str): Modify default behaviour. Remove second argument.
-	(output_parser): Use the macro table.
+	Echo modifications on calls.
+	(output_graph): Fix.
 
-2001-08-25  Robert Anisko  <robert.anisko@epita.fr>
+2001-08-16  Marc Autret  <autret_m@epita.fr>
 
-	* src/main.c (main): Initialize the macro table.
+	* src/getargs.c (usage): Update with ``-g, --graph''.
 
-2001-08-25  Robert Anisko  <robert.anisko@epita.fr>
+2001-08-16  Marc Autret  <autret_m@epita.fr>
 
-	* src/lex.c (percent_table): Add tok_define.
+	* doc/bison.texinfo (Bison Options): Add items `-g', `--graph'.
-	* src/lex.h: Add tok_define.
+	(Option Cross Key): Likewise.
-
+	* doc/bison.1: Update.
-2001-08-25  Robert Anisko  <[email protected]>
-
-	* src/macrotab.c: New file.
-	* src/macrotab.h: New file.
-	* src/Makefile.am: Update.
-
-2001-08-25  Robert Anisko  <[email protected]>
-
-	* lib/hash.c: New file.
-	* lib/hash.h: New file.
-	* lib/Makefile.am: Update.
 
 2001-08-15  Akim Demaille  <[email protected]>
 

Makefile.am

@@ -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
 
@@ -26,3 +26,5 @@ alpha_url_dir = gnu/bison
 # Files to update automatically.
 wget_files = $(srcdir)/config/config.guess $(srcdir)/config/config.sub \
 	     $(srcdir)/config/texinfo.tex
+
+cvs_files = $(srcdir)/config/missing

Makefile.in

@@ -58,7 +58,6 @@ POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
 AMTAR = @AMTAR@
-AT_TESTPATH = @AT_TESTPATH@
 AWK = @AWK@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 CATALOGS = @CATALOGS@
@@ -67,9 +66,6 @@ CC = @CC@
 CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
 EXEEXT = @EXEEXT@
 GENCAT = @GENCAT@
 GLIBC21 = @GLIBC21@
@@ -100,7 +96,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
 
@@ -123,6 +119,8 @@ alpha_url_dir = gnu/bison
 wget_files = $(srcdir)/config/config.guess $(srcdir)/config/config.sub \
 	     $(srcdir)/config/texinfo.tex
 
+
+cvs_files = $(srcdir)/config/missing
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
@@ -135,9 +133,8 @@ RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-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 TODO \
+	INSTALL Makefile.am Makefile.in NEWS README-alpha THANKS \
-	aclocal.m4 config.hin configure configure.in missing \
+	aclocal.m4 config.hin configure configure.in
-	mkinstalldirs
 DIST_SUBDIRS = $(SUBDIRS)
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -156,7 +153,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/atconfig.m4 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 \
@@ -333,6 +330,10 @@ dist: 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)
+
 # This target untars the dist file and tries a VPATH configuration.  Then
 # it guarantees that the distribution is self-contained by making another
 # tarfile.
@@ -401,6 +402,7 @@ clean-am: clean-generic mostlyclean-am
 
 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)
 distclean: distclean-recursive
 	-rm -f config.status config.cache config.log
@@ -437,19 +439,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 \
+	clean-generic clean-recursive dist dist-all dist-bzip2 \
-	distclean-generic distclean-hdr distclean-recursive \
+	distcheck distclean distclean-generic distclean-hdr \
-	distclean-tags distdir dvi dvi-am dvi-recursive info info-am \
+	distclean-recursive distclean-tags distdir dvi dvi-am \
-	info-recursive install install-am install-data install-data-am \
+	dvi-recursive info info-am info-recursive install install-am \
-	install-data-recursive install-exec install-exec-am \
+	install-data install-data-am install-data-recursive \
-	install-exec-recursive install-info install-info-am \
+	install-exec install-exec-am install-exec-recursive \
-	install-info-recursive install-man install-recursive \
+	install-info install-info-am install-info-recursive install-man \
-	install-strip installcheck installcheck-am installdirs \
+	install-recursive install-strip installcheck installcheck-am \
-	installdirs-am installdirs-recursive maintainer-clean \
+	installdirs installdirs-am installdirs-recursive \
-	maintainer-clean-generic maintainer-clean-recursive mostlyclean \
+	maintainer-clean maintainer-clean-generic \
-	mostlyclean-generic mostlyclean-recursive tags tags-recursive \
+	maintainer-clean-recursive mostlyclean mostlyclean-generic \
-	uninstall uninstall-am uninstall-info-am \
+	mostlyclean-recursive tags tags-recursive uninstall \
-	uninstall-info-recursive uninstall-recursive
+	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.

Makefile.maint

@@ -22,9 +22,6 @@
 # Do not save the original name or timestamp in the .tar.gz file.
 GZIP_ENV = '--no-name --best'
 
-# Automake 1.4 does not define AMTAR.
-AMTAR ?= $(TAR)
-
 CVS = cvs
 
 prev_version_file ?= .prev-version
@@ -46,12 +43,101 @@ release_archive_dir ?= ../release
 
 
 
+## ---------------- ##
+## Updating files.  ##
+## ---------------- ##
+
+WGET = wget
+ftp-gnu = ftp://ftp.gnu.org/gnu
+
+# Use mv, if you don't have/want move-if-change.
+move_if_change ?= move-if-change
+
+# ------------------- #
+# Updating PO files.  #
+# ------------------- #
+
+po_repo = http://www.iro.umontreal.ca/contrib/po/maint/$(PACKAGE)
+.PHONY: do-po-update po-update
+do-po-update:
+	tmppo=/tmp/$(PACKAGE)-$(VERSION)-po &&\
+	rm -rf $$tmppo && \
+	mkdir $$tmppo && \
+	(cd $$tmppo && $(WGET) -r -l1 -nd --no-parent -A '*.po' $(po_repo)) &&\
+	cp $$tmppo/*.po po
+	cd po && $(MAKE) update-po
+	$(MAKE) po-check
+
+po-update:
+	if test -d "po"; then \
+	  $(MAKE) do-po-update; \
+	fi
+
+# -------------------------- #
+# Updating GNU build tools.  #
+# -------------------------- #
+
+# The following pseudo table associates a local directory and a URL
+# with each of the files that belongs to some other package and is
+# regularly updated from the specified URL.
+wget_files ?= $(srcdir)/config.guess $(srcdir)/config.sub \
+              $(srcdir)/src/ansi2knr.c \
+	      $(srcdir)/doc/texinfo.tex
+wget-targets = $(patsubst %, get-%, $(wget_files))
+
+config.guess-url_prefix = $(ftp-gnu)/config/
+config.sub-url_prefix = $(ftp-gnu)/config/
+
+ansi2knr.c-url_prefix = ftp://ftp.cs.wisc.edu/ghost/
+
+texinfo.tex-url_prefix = $(ftp-gnu)/texinfo/
+
+standards.texi-url_prefix = $(ftp-gnu)/GNUinfo/
+make-stds.texi-url_prefix = $(ftp-gnu)/GNUinfo/
+
+target = $(patsubst get-%, %, $@)
+url = $($(notdir $(target))-url_prefix)$(notdir $(target))
+
+.PHONY: $(wget-targets)
+$(wget-targets):
+	$(WGET) $(url) -O $(target).t \
+	  && $(move_if_change) $(target).t $(target)
+
+.PHONY: wget-update
+wget-update: $(wget-targets)
+
+
+# Updating tools via CVS.
+cvs_files ?= depcomp missing
+cvs-targets = $(patsubst %, get-%, $(cvs_files))
+
+automake_repo = :pserver:[email protected]:/cvs/automake
+.PHONY: $(cvs-targets)
+$(cvs-targets):
+	$(CVS) -d $(automake_repo) co -p automake/lib/$(notdir $(target)) \
+	  >$(target).t \
+	    && $(move_if_change) $(target).t $(target);
+
+.PHONY: cvs-update
+cvs-update: $(cvs-targets)
+
+
+# --------------------- #
+# Updating everything.  #
+# --------------------- #
+
+.PHONY: update
+update: wget-update cvs-update po-update
+
+
+
 ## --------------- ##
 ## Sanity checks.  ##
 ## --------------- ##
 
-# Checks that don't require cvs.
+# Checks that don't require cvs.  Run `changelog-check' last as
-local-check: changelog-check po-check writable-files copyright-check
+# previous test may reveal problems requiring new ChangeLog entries.
+local-check: po-check copyright-check writable-files changelog-check
 
 changelog-check:
 	if head ChangeLog | grep 'Version $(VERSION)' >/dev/null; then \
@@ -117,10 +203,16 @@ maintainer-distcheck: changelog-check
 	$(MAKE) my-distcheck
 
 
+
+## -------------- ##
+## Making dists.  ##
+## -------------- ##
+
+
 # Tag before making distribution.  Also, don't make a distribution if
 # checks fail.  Also, make sure the NEWS file is up-to-date.
 # FIXME: use dist-hook/my-dist like distcheck-hook/my-distcheck.
-cvs-dist: cvs-check maintainer-distcheck
+cvs-dist: local-check cvs-check maintainer-distcheck
 	$(CVS) update po
 	$(CVS) tag -c $(this-cvs-tag)
 	$(MAKE) dist
@@ -130,6 +222,7 @@ cvs-dist: cvs-check maintainer-distcheck
 null_AM_MAKEFLAGS = \
   ACLOCAL=false \
   AUTOCONF=false \
+  AUTOM4TE=false \
   AUTOMAKE=false \
   AUTOHEADER=false \
   MAKEINFO=false
@@ -177,7 +270,7 @@ rel-check:
 	md5_tmp=/tmp/rel-check-md5-$$$$; \
 	set -e; \
 	trap 'status=$$?; rm -f $$tarz $$md5_tmp; exit $$status' 0 1 2 3 15; \
-	wget -q --output-document=$$tarz $(url); \
+	$(WGET) -q --output-document=$$tarz $(url); \
 	echo "$(md5)  -" > $$md5_tmp; \
 	md5sum -c $$md5_tmp < $$tarz
 
@@ -228,48 +321,6 @@ announcement: NEWS ChangeLog $(rel-files)
 	      -e 'print "\n"."*"x70 ."\n"; s///; print; print "*"x70 ."\n"'; \
 	)
 
-WGET = wget
-ftp-gnu = ftp://ftp.gnu.org/gnu
-
-# Use mv, if you don't have/want move-if-change.
-move_if_change ?= move-if-change
-
-# The following pseudo table associates a local directory and a URL
-# with each of the files that belongs to some other package and is
-# regularly updated from the specified URL.
-wget_files ?= $(srcdir)/config.guess $(srcdir)/config.sub \
-              $(srcdir)/src/ansi2knr.c \
-	      $(srcdir)/doc/texinfo.tex
-get-targets = $(patsubst %, get-%, $(wget_files))
-
-config.guess-url_prefix = $(ftp-gnu)/config/
-config.sub-url_prefix = $(ftp-gnu)/config/
-
-ansi2knr.c-url_prefix = ftp://ftp.cs.wisc.edu/ghost/
-
-texinfo.tex-url_prefix = $(ftp-gnu)/texinfo/
-
-standards.texi-url_prefix = $(ftp-gnu)/GNUinfo/
-make-stds.texi-url_prefix = $(ftp-gnu)/GNUinfo/
-
-target = $(patsubst get-%, %, $@)
-url = $($(notdir $(target))-url_prefix)$(notdir $(target))
-
-.PHONY: $(get-targets)
-$(get-targets):
-	$(WGET) $(url) -O $(target).t \
-	  && $(move_if_change) $(target).t $(target)
-
-automake_repo=:pserver:[email protected]:/cvs/automake
-.PHONY: wget-update
-wget-update: $(get-targets)
-	for f in depcomp missing; do                                    \
-	  test -f $$f || continue;					\
-	  echo checking out $$f...;                                     \
-	  $(CVS) -d $(automake_repo) co -p automake/lib/$$f > $$f.t        \
-	    && $(move_if_change) $$f.t $$f;                             \
-	done
-
 define emit-rsync-commands
 	echo =====================================
 	echo =====================================
@@ -284,7 +335,7 @@ endef
 $(xd-delta): $(release_archive_dir)/$(prev-tgz) $(distdir).tar.gz
 	xdelta delta -9 $^ $@ || :
 
-alpha: local-check
+alpha:
 	$(MAKE) cvs-dist
 	$(MAKE) $(xd-delta)
 	$(MAKE) -s announcement > /tmp/announce-$(my_distdir)

NEWS

@@ -1,7 +1,24 @@
 Bison News
 ----------
 
-Changes in version 1.28c:
+Changes in version 1.29c:
+
+* `--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
+  argument.
+
+* `%source_extension' and `%header_extension' are removed, failed
+  experiment.
+
+* The test suite is more portable.
+
+* Better portability.
+
+Changes in version 1.29:
+
+* Output file does not redefine const; that is now config.h's job.
+
+* Added `-g' and `--graph'.
 
 * The Bison manual is now distributed under the terms of the GNU FDL.
 

THANKS

@@ -1,22 +1,27 @@
 Bison was originally written by Robert Corbett.  It would not be what
 it is today without the invaluable help of these people:
 
-Akim Demaille		[email protected]
+Akim Demaille           [email protected]
-Daniel Hagerty  	[email protected]
+Albert Chin-A-Young     [email protected]
-David J. MacKenzie  	[email protected]
+Alexander Belopolsky    [email protected]
-Fabrice Bauzac		[email protected]
+Daniel Hagerty          [email protected]
-Hans Aberg		[email protected]
+David J. MacKenzie      [email protected]
-Jesse Thilo  		[email protected]
+Fabrice Bauzac          [email protected]
-Jim Meyering  		[email protected]
+Hans Aberg              [email protected]
-Laurent Mascherpa	[email protected]
+Jesse Thilo             [email protected]
+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]
+Neil Booth              [email protected]
-Noah Friedman  		[email protected]
+Noah Friedman           [email protected]
 Pascal Bart             [email protected]
-Paul Eggert  		[email protected]
+Paul Eggert             [email protected]
-Piotr Gackiewicz	[email protected]
+Piotr Gackiewicz        [email protected]
-Richard Stallman  	[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.

TODO

@@ -1,28 +0,0 @@
--*- outline -*-
-
-* src/reader.c
-Complete parse_skel_decl () with parse_dquoted_param ().	[]
-Check and cleanup for CPP-out code.	[]
-
-* src/output.c
-Synchronize `#line' directive with user file.	[ok]
-
-Cleanup dirty CPP-out code.	[]
-** Output sub-skeleton files.	[]
-Useful for %no_parser.	[]
-*** New skeleton.	[]
-
-* src/getargs.c src/lex.c
-Synchronize percent and command line options.	[ok]
-
-* src/macrotab.[ch]
-Removing warnings when compiling. (gcc-warnings).	[ok]
-
-* src/print_graph.c
-Find the best graph parameters.	[]
-
-* doc/bison.texinfo
-Echo modifications of prologue and epilogue.	[]
-Add informations about YYERROR_VERBOSE.	[]
-Add explainations about skeleton muscles.	[]
-Add explainations about %skeleton.	[]

aclocal.m4

@@ -558,26 +558,6 @@ AC_DEFUN([_AM_DIRNAME],
 	      m4_patsubst([$1], [^\(.*[^/]\)//*[^/][^/]*/*$], [\1]))[]dnl
 ]) # _AM_DIRNAME
 
-
-# serial 2
-
-# Single argument says where are built sources to test, relative to the
-# built test directory.  Maybe omitted if the same (flat distribution).
-
-AC_DEFUN([AT_CONFIG],
-[AT_TESTPATH=ifelse([$1], [], [.], [$1])
-AC_SUBST([AT_TESTPATH])
-# Try to be compatible with both Autoconf 2.13 and 2.50.
-if test -z "$ECHO_C$ECHO_N$ECHO_T"; then
-  ECHO_C="$ac_c"
-  ECHO_N="$ac_n"
-  ECHO_T="$ac_t"
-  AC_SUBST([ECHO_C])
-  AC_SUBST([ECHO_N])
-  AC_SUBST([ECHO_T])
-fi
-])
-
 #serial 1
 # This test replaces the one in autoconf.
 # Currently this macro should have the same name as the autoconf macro
@@ -808,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_FUNCS(isascii iswprint mbsinit)
-  AC_CHECK_HEADERS(limits.h stdlib.h string.h wchar.h wctype.h)
+  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.
@@ -957,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.
 #

config.hin

@@ -1,4 +1,4 @@
-/* config.hin.  Generated automatically from configure.in by autoheader.  */
+/* config.hin.  Generated from configure.in by autoheader.  */
 
 /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
    systems. This function is required for `alloca.c' support on those systems.
@@ -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
 

config/Makefile.in

@@ -58,7 +58,6 @@ POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
 AMTAR = @AMTAR@
-AT_TESTPATH = @AT_TESTPATH@
 AWK = @AWK@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 CATALOGS = @CATALOGS@
@@ -67,9 +66,6 @@ CC = @CC@
 CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
 EXEEXT = @EXEEXT@
 GENCAT = @GENCAT@
 GLIBC21 = @GLIBC21@

config/config.guess

@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 #   Free Software Foundation, Inc.
 
-timestamp='2001-08-09'
+timestamp='2001-09-13'
 
 # 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
@@ -127,7 +127,7 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:NetBSD:*:*)
-	# Netbsd (nbsd) targets should (where applicable) match one or
+	# NetBSD (nbsd) targets should (where applicable) match one or
 	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
 	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
 	# switched to ELF, *-*-netbsd* would select the old
@@ -144,6 +144,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	    macppc) machine=powerpc-apple ;;
 	    hp3[0-9][05]) machine=m68k-hp ;;
 	    ibmrt|romp-ibm) machine=romp-ibm ;;
+	    sparc*) machine=`uname -p`-unknown ;;
 	    *) machine=${UNAME_MACHINE}-unknown ;;
 	esac
 	# The Operating System including object format, if it has switched
@@ -172,6 +173,45 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
 	exit 0 ;;
+    amiga:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    arc:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    hp300:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mac68k:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    macppc:OpenBSD:*:*)
+	echo powerpc-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvme68k:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvme88k:OpenBSD:*:*)
+	echo m88k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvmeppc:OpenBSD:*:*)
+	echo powerpc-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    pmax:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sgi:OpenBSD:*:*)
+	echo mipseb-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sun3:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    wgrisc:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    *:OpenBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
     alpha:OSF1:*:*)
 	if test $UNAME_RELEASE = "V4.0"; then
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
@@ -247,30 +287,9 @@ EOF
     Amiga*:UNIX_System_V:4.0:*)
 	echo m68k-unknown-sysv4
 	exit 0;;
-    amiga:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
     *:[Aa]miga[Oo][Ss]:*:*)
 	echo ${UNAME_MACHINE}-unknown-amigaos
 	exit 0 ;;
-    arc64:OpenBSD:*:*)
-	echo mips64el-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    arc:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    hkmips:OpenBSD:*:*)
-	echo mips-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    pmax:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sgi:OpenBSD:*:*)
-	echo mips-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    wgrisc:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
     *:OS/390:*:*)
 	echo i370-ibm-openedition
 	exit 0 ;;
@@ -333,9 +352,6 @@ EOF
     aushp:SunOS:*:*)
 	echo sparc-auspex-sunos${UNAME_RELEASE}
 	exit 0 ;;
-    atari*:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
     # The situation for MiNT is a little confusing.  The machine name
     # can be virtually everything (everything which is not
     # "atarist" or "atariste" at least should have a processor
@@ -362,18 +378,6 @@ EOF
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
         echo m68k-unknown-mint${UNAME_RELEASE}
         exit 0 ;;
-    sun3*:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mac68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme88k:OpenBSD:*:*)
-	echo m88k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
     powerpc:machten:*:*)
 	echo powerpc-apple-machten${UNAME_RELEASE}
 	exit 0 ;;
@@ -390,6 +394,7 @@ EOF
 	echo clipper-intergraph-clix${UNAME_RELEASE}
 	exit 0 ;;
     mips:*:*:UMIPS | mips:*:*:RISCos)
+	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
 #ifdef __cplusplus
 #include <stdio.h>  /* for printf() prototype */
@@ -411,7 +416,6 @@ EOF
 	  exit (-1);
 	}
 EOF
-	eval $set_cc_for_build
 	$CC_FOR_BUILD $dummy.c -o $dummy \
 	  && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
 	  && rm -f $dummy.c $dummy && exit 0
@@ -481,6 +485,7 @@ EOF
 	exit 0 ;;
     *:AIX:2:3)
 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+		eval $set_cc_for_build
 		sed 's/^		//' << EOF >$dummy.c
 		#include <sys/systemcfg.h>
 
@@ -492,7 +497,6 @@ EOF
 			exit(0);
 			}
 EOF
-		eval $set_cc_for_build
 		$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
 		rm -f $dummy.c $dummy
 		echo rs6000-ibm-aix3.2.5
@@ -560,6 +564,7 @@ EOF
                   fi ;;
               esac
               if [ "${HP_ARCH}" = "" ]; then
+	      eval $set_cc_for_build
               sed 's/^              //' << EOF >$dummy.c
 
               #define _HPUX_SOURCE
@@ -593,10 +598,9 @@ EOF
                   exit (0);
               }
 EOF
-	eval $set_cc_for_build
+	    (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
-	(CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
+	    if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
-	if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
+	    rm -f $dummy.c $dummy
-	rm -f $dummy.c $dummy
 	fi ;;
 	esac
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
@@ -606,6 +610,7 @@ EOF
 	echo ia64-hp-hpux${HPUX_REV}
 	exit 0 ;;
     3050*:HI-UX:*:*)
+	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
 	#include <unistd.h>
 	int
@@ -631,7 +636,6 @@ EOF
 	  exit (0);
 	}
 EOF
-	eval $set_cc_for_build
 	$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
 	rm -f $dummy.c $dummy
 	echo unknown-hitachi-hiuxwe2
@@ -661,9 +665,6 @@ EOF
     parisc*:Lites*:*:*)
 	echo hppa1.1-hp-lites
 	exit 0 ;;
-    hppa*:OpenBSD:*:*)
-	echo hppa-unknown-openbsd
-	exit 0 ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 	echo c1-convex-bsd
         exit 0 ;;
@@ -715,9 +716,6 @@ EOF
         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
         echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
         exit 0 ;;
-    hp300:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
 	exit 0 ;;
@@ -730,9 +728,6 @@ EOF
     *:FreeBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit 0 ;;
-    *:OpenBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-	exit 0 ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
 	exit 0 ;;
@@ -848,6 +843,7 @@ EOF
 		exit 0 ;;
 	esac
 	# Determine whether the default compiler is a.out or elf
+	eval $set_cc_for_build
 	cat >$dummy.c <<EOF
 #include <features.h>
 #ifdef __cplusplus
@@ -872,7 +868,6 @@ EOF
   return 0;
 }
 EOF
-	eval $set_cc_for_build
 	$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
 	rm -f $dummy.c $dummy
 	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
@@ -1111,11 +1106,15 @@ EOF
     i*86:XTS-300:*:STOP)
 	echo ${UNAME_MACHINE}-unknown-stop
 	exit 0 ;;
+    i*86:atheos:*:*)
+	echo ${UNAME_MACHINE}-unknown-atheos
+	exit 0 ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
 #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
 
+eval $set_cc_for_build
 cat >$dummy.c <<EOF
 #ifdef _SEQUENT_
 # include <sys/types.h>
@@ -1230,7 +1229,6 @@ main ()
 }
 EOF
 
-eval $set_cc_for_build
 $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
 rm -f $dummy.c $dummy
 

config/config.sub

@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 #   Free Software Foundation, Inc.
 
-timestamp='2001-08-13'
+timestamp='2001-09-14'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -236,7 +236,8 @@ case $basic_machine in
 	| mips16 | mips64 | mips64el | mips64orion | mips64orionel \
 	| mips64vr4100 | mips64vr4100el | mips64vr4300 \
 	| mips64vr4300el | mips64vr5000 | mips64vr5000el \
-	| mipsbe | mipsel | mipsle | mipstx39 | mipstx39el \
+	| mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \
+	| mipsisa32 \
 	| mn10200 | mn10300 \
 	| ns16k | ns32k \
 	| openrisc \
@@ -246,7 +247,7 @@ case $basic_machine in
 	| s390 | s390x \
 	| sh | sh[34] | sh[34]eb | shbe | shle \
 	| sparc | sparc64 | sparclet | sparclite | sparcv9 | sparcv9b \
-	| strongarm \
+	| stormy16 | strongarm \
 	| tahoe | thumb | tic80 | tron \
 	| v850 \
 	| we32k \
@@ -279,6 +280,7 @@ case $basic_machine in
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
 	| alphapca5[67]-* | arc-* \
 	| arm-*  | armbe-* | armle-* | armv*-* \
+	| avr-* \
 	| bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c54x-* \
 	| clipper-* | cray2-* | cydra-* \
@@ -293,8 +295,8 @@ case $basic_machine in
 	| m88110-* | m88k-* | mcore-* \
 	| mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \
 	| mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \
-	| mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipsel-* \
+	| mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \
-	| mipsle-* | mipstx39-* | mipstx39el-* \
+	| mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
@@ -304,7 +306,7 @@ case $basic_machine in
 	| s390-* | s390x-* \
 	| sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* \
 	| sparc-* | sparc64-* | sparc86x-* | sparclite-* \
-	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* \
+	| sparcv9-* | sparcv9b-* | stormy16-* | strongarm-* | sv1-* \
 	| t3e-* | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
 	| v850-* | vax-* \
 	| we32k-* \

config/missing

@@ -1,7 +1,7 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
-# Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+# Copyright 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
-# Franc,ois Pinard <[email protected]>, 1996.
+# Originally by Fran,cois Pinard <[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
@@ -18,11 +18,37 @@
 # 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.
+
 if test $# -eq 0; then
   echo 1>&2 "Try \`$0 --help' for more information"
   exit 1
 fi
 
+run=:
+
+# In the cases where this matters, `missing' is being run in the
+# srcdir already.
+if test -f configure.ac; then
+  configure_ac=configure.ac
+else
+  configure_ac=configure.in
+fi
+
+case "$1" in
+--run)
+  # Try to run requested program, and just exit if it succeeds.
+  run=
+  shift
+  "$@" && exit 0
+  ;;
+esac
+
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
 case "$1" in
 
   -h|--h|--he|--hel|--help)
@@ -35,6 +61,7 @@ error status if there is no known handling for PROGRAM.
 Options:
   -h, --help      display this help and exit
   -v, --version   output version information and exit
+  --run           try to run the given command, and emulate it if it fails
 
 Supported PROGRAM values:
   aclocal      touch file \`aclocal.m4'
@@ -43,13 +70,15 @@ Supported PROGRAM values:
   automake     touch all \`Makefile.in' files
   bison        create \`y.tab.[ch]', if possible, from existing .[ch]
   flex         create \`lex.yy.c', if possible, from existing .c
+  help2man     touch the output file
   lex          create \`lex.yy.c', if possible, from existing .c
   makeinfo     touch the output file
+  tar          try tar, gnutar, gtar, then tar without non-portable flags
   yacc         create \`y.tab.[ch]', if possible, from existing .[ch]"
     ;;
 
   -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing - GNU libit 0.0"
+    echo "missing 0.4 - GNU automake"
     ;;
 
   -*)
@@ -59,30 +88,45 @@ Supported PROGRAM values:
     ;;
 
   aclocal)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    fi
+
     echo 1>&2 "\
 WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`acinclude.m4' or \`configure.in'.  You might want
+         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
          to install the \`Automake' and \`Perl' packages.  Grab them from
          any GNU archive site."
     touch aclocal.m4
     ;;
 
   autoconf)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    fi
+
     echo 1>&2 "\
 WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`configure.in'.  You might want to install the
+         you modified \`${configure_ac}'.  You might want to install the
          \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
          archive site."
     touch configure
     ;;
 
   autoheader)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    fi
+
     echo 1>&2 "\
 WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`acconfig.h' or \`configure.in'.  You might want
+         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
          to install the \`Autoconf' and \`GNU m4' packages.  Grab them
          from any GNU archive site."
-    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' configure.in`
+    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
     test -z "$files" && files="config.h"
     touch_files=
     for f in $files; do
@@ -96,9 +140,14 @@ WARNING: \`$1' is missing on your system.  You should only need it if
     ;;
 
   automake)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    fi
+
     echo 1>&2 "\
 WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`Makefile.am', \`acinclude.m4' or \`configure.in'.
+         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
          You might want to install the \`Automake' and \`Perl' packages.
          Grab them from any GNU archive site."
     find . -type f -name Makefile.am -print |
@@ -106,6 +155,34 @@ WARNING: \`$1' is missing on your system.  You should only need it if
 	   while read f; do touch "$f"; done
     ;;
 
+  autom4te)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    fi
+
+    echo 1>&2 "\
+WARNING: \`$1' is needed, and you do not seem to have it handy on your
+         system.  You might have modified some files without having the
+         proper tools for further handling them.
+         You can get \`$1Help2man' as part of \`Autoconf' from any GNU
+         archive site."
+
+    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
+    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+    if test -f "$file"; then
+	touch $file
+    else
+	test -z "$file" || exec >$file
+	echo "#! /bin/sh"
+	echo "# Created by GNU Automake missing as a replacement of"
+	echo "#  $ $@"
+	echo "exit 0"
+	chmod +x $file
+	exit 1
+    fi
+    ;;
+
   bison|yacc)
     echo 1>&2 "\
 WARNING: \`$1' is missing on your system.  You should only need it if
@@ -159,7 +236,37 @@ WARNING: \`$1' is missing on your system.  You should only need it if
     fi
     ;;
 
+  help2man)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    fi
+
+    echo 1>&2 "\
+WARNING: \`$1' is missing on your system.  You should only need it if
+	 you modified a dependency of a manual page.  You may need the
+	 \`Help2man' package in order for those modifications to take
+	 effect.  You can get \`Help2man' from any GNU archive site."
+
+    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+    if test -z "$file"; then
+	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
+    fi
+    if [ -f "$file" ]; then
+	touch $file
+    else
+	test -z "$file" || exec >$file
+	echo ".ab help2man is required to generate this page"
+	exit 1
+    fi
+    ;;
+
   makeinfo)
+    if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
+       # We have makeinfo, but it failed.
+       exit 1
+    fi
+
     echo 1>&2 "\
 WARNING: \`$1' is missing on your system.  You should only need it if
          you modified a \`.texi' or \`.texinfo' file, or any other file
@@ -175,6 +282,45 @@ WARNING: \`$1' is missing on your system.  You should only need it if
     touch $file
     ;;
 
+  tar)
+    shift
+    if test -n "$run"; then
+      echo 1>&2 "ERROR: \`tar' requires --run"
+      exit 1
+    fi
+
+    # We have already tried tar in the generic part.
+    # Look for gnutar/gtar before invocation to avoid ugly error
+    # messages.
+    if (gnutar --version > /dev/null 2>&1); then
+       gnutar ${1+"$@"} && exit 0
+    fi
+    if (gtar --version > /dev/null 2>&1); then
+       gtar ${1+"$@"} && exit 0
+    fi
+    firstarg="$1"
+    if shift; then
+	case "$firstarg" in
+	*o*)
+	    firstarg=`echo "$firstarg" | sed s/o//`
+	    tar "$firstarg" ${1+"$@"} && exit 0
+	    ;;
+	esac
+	case "$firstarg" in
+	*h*)
+	    firstarg=`echo "$firstarg" | sed s/h//`
+	    tar "$firstarg" ${1+"$@"} && exit 0
+	    ;;
+	esac
+    fi
+
+    echo 1>&2 "\
+WARNING: I can't seem to be able to run \`tar' with the given arguments.
+         You may want to install GNU tar or Free paxutils, or check the
+         command line arguments."
+    exit 1
+    ;;
+
   *)
     echo 1>&2 "\
 WARNING: \`$1' is needed, and you do not seem to have it handy on your

config/prev-version.txt

@@ -1 +1 @@
-1.28c
+1.29b

configure.in

@@ -1,12 +1,32 @@
-# Process this file with autoconf to produce a configure script.
+# Configure template for GNU Bison.                   -*-Autoconf-*-
-AC_PREREQ(2.52)
+#
-AC_INIT(bison, 1.28c, [email protected])
+# 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 of the License, 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.
+#
+# 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
+
+# We need a recent Autoconf to run a recent Autotest.
+AC_PREREQ(2.52e)
+
+AC_INIT([GNU Bison], [1.29c], [[email protected]])
 AC_CONFIG_AUX_DIR(config)
-AM_INIT_AUTOMAKE(bison, 1.28c)
+
+AM_INIT_AUTOMAKE([bison], [1.29c])
 AM_CONFIG_HEADER(config.h:config.hin)
 
 # Initialize the test suite.
-AT_CONFIG(../src)
+AC_CONFIG_TESTDIR(tests)
+AC_CONFIG_FILES([tests/bison], [chmod +x tests/bison])
 
 # Checks for programs.
 AC_PROG_CC
@@ -69,8 +89,9 @@ jm_FUNC_MALLOC
 jm_FUNC_REALLOC
 jm_PREREQ_QUOTEARG
 jm_PREREQ_ERROR
+AM_WITH_DMALLOC
 
-ALL_LINGUAS="de es et fr ja nl ru"
+ALL_LINGUAS="de es et fr ja nl tr ru"
 AM_GNU_GETTEXT
 
 # This is necessary so that .o files in LIBOBJS are also built via
@@ -83,4 +104,4 @@ AC_OUTPUT([Makefile
            intl/Makefile po/Makefile.in
            lib/Makefile src/Makefile doc/Makefile
            m4/Makefile
-           tests/Makefile tests/atconfig])
+           tests/Makefile])

doc/Makefile.in

@@ -58,7 +58,6 @@ POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
 AMTAR = @AMTAR@
-AT_TESTPATH = @AT_TESTPATH@
 AWK = @AWK@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 CATALOGS = @CATALOGS@
@@ -67,9 +66,6 @@ CC = @CC@
 CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
 EXEEXT = @EXEEXT@
 GENCAT = @GENCAT@
 GLIBC21 = @GLIBC21@

doc/bison.1

@@ -10,7 +10,11 @@ bison \- GNU Project parser generator (yacc replacement)
 ] [
 .B \-d
 ] [
-.B \-\-defines
+.BI \-\-defines= defines-file
+] [
+.B \-g
+] [
+.BI \-\-graph= graph-file
 ] [
 .B \-k
 ] [
@@ -123,8 +127,6 @@ chosen as if the input file were named
 .B \-d
 .br
 .ns
-.TP
-.B \-\-defines
 Write an extra output file containing macro definitions for the token
 type names defined in the grammar and the semantic value type
 .BR YYSTYPE ,
@@ -145,6 +147,32 @@ in a separate source file, because
 needs to be able to refer to token type codes and the variable
 .BR yylval .
 .TP
+.BI \-\-defines= defines-file
+The behaviour of
+.BI \-\-defines 
+is the same than 
+.BI \-d 
+option. 
+The only difference is that it has an optionnal argument which is 
+the name of the output filename.
+.TP
+.BI \-g
+.br
+.ns
+Output a VCG definition of the LALR(1) grammar automaton computed by
+Bison. If the grammar file is 
+.BR foo.y
+, the VCG output file will be
+.BR foo.vcg .
+.TP
+.BI \-\-graph= graph-file
+The behaviour of 
+.BI \-\-graph 
+is the same than
+.BI \-g
+option. The only difference is that it has an optionnal argument which 
+is the name of the output graph filename.
+.TP
 .B \-k
 .br
 .ns
@@ -315,9 +343,9 @@ bison \-y $*
 .sp
 .RE
 .SH FILES
-/usr/local/lib/bison.simple	simple parser
+/usr/local/share/bison/bison.simple	simple parser
 .br
-/usr/local/lib/bison.hairy	complicated parser
+/usr/local/share/bison/bison.hairy	complicated parser
 .SH "ENVIRONMENT VARIABLES"
 .TP
 .SM BISON_SIMPLE

doc/bison.info

@@ -1,5 +1,5 @@
-This is bison.info, produced by makeinfo version 4.0b from
+Ceci est le fichier Info bison.info, produit par Makeinfo version 4.0b
-bison.texinfo.
+à partir bison.texinfo.
 
 START-INFO-DIR-ENTRY
 * bison: (bison).	GNU Project parser generator (yacc replacement).
@@ -30,112 +30,116 @@ instead of in the original English.
 
 
 Indirect:
-bison.info-1: 1292
+bison.info-1: 1313
-bison.info-2: 50351
+bison.info-2: 50691
-bison.info-3: 99751
+bison.info-3: 100581
-bison.info-4: 147940
+bison.info-4: 150131
-bison.info-5: 190640
+bison.info-5: 197908
 
 Tag Table:
 (Indirect)
-Node: Top1292
+Node: Top1313
-Node: Introduction8694
+Node: Introduction8969
-Node: Conditions9969
+Node: Conditions10244
-Node: Copying11433
+Node: Copying11708
-Node: Concepts30636
+Node: Concepts30911
-Node: Language and Grammar31715
+Node: Language and Grammar31990
-Node: Grammar in Bison36731
+Node: Grammar in Bison37006
-Node: Semantic Values38655
+Node: Semantic Values38930
-Node: Semantic Actions40756
+Node: Semantic Actions41031
-Node: Locations Overview41945
+Node: Locations Overview42220
-Node: Bison Parser43392
+Node: Bison Parser43667
-Node: Stages45704
+Node: Stages45979
-Node: Grammar Layout46987
+Node: Grammar Layout47262
-Node: Examples48243
+Node: Examples48519
-Node: RPN Calc49378
+Node: RPN Calc49717
-Node: Rpcalc Decls50351
+Node: Rpcalc Decls50691
-Node: Rpcalc Rules51916
+Node: Rpcalc Rules52278
-Node: Rpcalc Input53716
+Node: Rpcalc Input54078
-Node: Rpcalc Line55177
+Node: Rpcalc Line55539
-Node: Rpcalc Expr56292
+Node: Rpcalc Expr56654
-Node: Rpcalc Lexer58237
+Node: Rpcalc Lexer58599
-Node: Rpcalc Main60809
+Node: Rpcalc Main61171
-Node: Rpcalc Error61207
+Node: Rpcalc Error61569
-Node: Rpcalc Gen62215
+Node: Rpcalc Gen62577
-Node: Rpcalc Compile63345
+Node: Rpcalc Compile63726
-Node: Infix Calc64220
+Node: Infix Calc64601
-Node: Simple Error Recovery66927
+Node: Simple Error Recovery67308
-Node: Multi-function Calc68813
+Node: Location Tracking Calc69197
-Node: Mfcalc Decl70379
+Node: Ltcalc Decls69927
-Node: Mfcalc Rules72402
+Node: Ltcalc Rules70836
-Node: Mfcalc Symtab73782
+Node: Ltcalc Lexer72897
-Node: Exercises80155
+Node: Multi-function Calc75235
-Node: Grammar File80661
+Node: Mfcalc Decl76802
-Node: Grammar Outline81509
+Node: Mfcalc Rules78825
-Node: Prologue82197
+Node: Mfcalc Symtab80205
-Node: Bison Declarations82737
+Node: Exercises86578
-Node: Grammar Rules83143
+Node: Grammar File87084
-Node: Epilogue83605
+Node: Grammar Outline87932
-Node: Symbols84455
+Node: C Declarations88666
-Node: Rules89536
+Node: Bison Declarations89246
-Node: Recursion91175
+Node: Grammar Rules89658
-Node: Semantics92894
+Node: C Code90118
-Node: Value Type93988
+Node: Symbols91048
-Node: Multiple Types94646
+Node: Rules96129
-Node: Actions95663
+Node: Recursion97768
-Node: Action Types98448
+Node: Semantics99487
-Node: Mid-Rule Actions99751
+Node: Value Type100581
-Node: Locations105321
+Node: Multiple Types101253
-Node: Location Type105969
+Node: Actions102270
-Node: Actions and Locations106527
+Node: Action Types105055
-Node: Location Default Action108683
+Node: Mid-Rule Actions106358
-Node: Declarations110146
+Node: Locations111928
-Node: Token Decl111465
+Node: Location Type112576
-Node: Precedence Decl113478
+Node: Actions and Locations113134
-Node: Union Decl115029
+Node: Location Default Action115290
-Node: Type Decl115873
+Node: Declarations116753
-Node: Expect Decl116779
+Node: Token Decl118072
-Node: Start Decl118325
+Node: Precedence Decl120085
-Node: Pure Decl118703
+Node: Union Decl121636
-Node: Decl Summary120380
+Node: Type Decl122480
-Node: Multiple Parsers125763
+Node: Expect Decl123386
-Node: Interface127257
+Node: Start Decl124932
-Node: Parser Function128120
+Node: Pure Decl125310
-Node: Lexical128955
+Node: Decl Summary126987
-Node: Calling Convention130361
+Node: Multiple Parsers132370
-Node: Token Values133132
+Node: Interface133864
-Node: Token Positions134281
+Node: Parser Function134736
-Node: Pure Calling135166
+Node: Lexical135571
-Node: Error Reporting138098
+Node: Calling Convention136977
-Node: Action Features140220
+Node: Token Values139748
-Node: Algorithm143515
+Node: Token Positions140897
-Node: Look-Ahead145808
+Node: Pure Calling141782
-Node: Shift/Reduce147940
+Node: Error Reporting144714
-Node: Precedence150852
+Node: Action Features146836
-Node: Why Precedence151503
+Node: Algorithm150131
-Node: Using Precedence153368
+Node: Look-Ahead152424
-Node: Precedence Examples154336
+Node: Shift/Reduce154556
-Node: How Precedence155037
+Node: Precedence157468
-Node: Contextual Precedence156186
+Node: Why Precedence158119
-Node: Parser States157977
+Node: Using Precedence159984
-Node: Reduce/Reduce159220
+Node: Precedence Examples160952
-Node: Mystery Conflicts162781
+Node: How Precedence161653
-Node: Stack Overflow166167
+Node: Contextual Precedence162802
-Node: Error Recovery167540
+Node: Parser States164593
-Node: Context Dependency172676
+Node: Reduce/Reduce165836
-Node: Semantic Tokens173524
+Node: Mystery Conflicts169397
-Node: Lexical Tie-ins176541
+Node: Stack Overflow172783
-Node: Tie-in Recovery178055
+Node: Error Recovery174156
-Node: Debugging180227
+Node: Context Dependency179292
-Node: Invocation183478
+Node: Semantic Tokens180140
-Node: Bison Options184730
+Node: Lexical Tie-ins183157
-Node: Environment Variables188164
+Node: Tie-in Recovery184705
-Node: Option Cross Key189012
+Node: Debugging186877
-Node: VMS Invocation189856
+Node: Invocation190178
-Node: Table of Symbols190640
+Node: Bison Options191430
-Node: Glossary198241
+Node: Environment Variables195398
-Node: Copying This Manual204545
+Node: Option Cross Key196246
-Node: GNU Free Documentation License204754
+Node: VMS Invocation197124
-Node: Index224619
+Node: Table of Symbols197908
+Node: Glossary205547
+Node: Copying This Manual211851
+Node: GNU Free Documentation License212060
+Node: Index231925
 
 End Tag Table

doc/bison.info-1

@@ -1,5 +1,5 @@
-This is bison.info, produced by makeinfo version 4.0b from
+Ceci est le fichier Info bison.info, produit par Makeinfo version 4.0b
-bison.texinfo.
+à partir bison.texinfo.
 
 START-INFO-DIR-ENTRY
 * bison: (bison).	GNU Project parser generator (yacc replacement).
@@ -29,9 +29,13 @@ included in translations approved by the Free Software Foundation
 instead of in the original English.
 
 
-File: bison.info,  Node: Top,  Next: Introduction,  Prev: (dir),  Up: (dir)
+File: bison.info,  Node: Top,  Next: Introduction,  Up: (dir)
 
-   This manual documents version 1.28c of Bison.
+Bison
+*****
+
+   This manual documents version 1.29c of Bison, updated 20 September
+2001.
 
 * Menu:
 
@@ -58,7 +62,6 @@ Reference sections:
 * Copying This Manual::  License for copying this manual.
 * Index::             Cross-references to the text.
 
- --- The Detailed Node Listing ---
 
 The Concepts of Bison
 
@@ -81,13 +84,14 @@ Examples
 * Infix Calc::        Infix (algebraic) notation calculator.
                         Operator precedence is introduced.
 * Simple Error Recovery::  Continuing after syntax errors.
+* Location Tracking Calc:: Demonstrating the use of @N and @$.
 * Multi-function Calc::    Calculator with memory and trig functions.
                         It uses multiple data-types for semantic values.
 * Exercises::         Ideas for improving the multi-function calculator.
 
 Reverse Polish Notation Calculator
 
-* Decls: Rpcalc Decls.  Prologue (declarations) for rpcalc.
+* Decls: Rpcalc Decls.  Bison and C declarations for rpcalc.
 * Rules: Rpcalc Rules.  Grammar Rules for rpcalc, with explanation.
 * Lexer: Rpcalc Lexer.  The lexical analyzer.
 * Main: Rpcalc Main.    The controlling function.
@@ -101,6 +105,12 @@ Grammar Rules for `rpcalc'
 * Rpcalc Line::
 * Rpcalc Expr::
 
+Location Tracking Calculator: `ltcalc'
+
+* Decls: Ltcalc Decls.  Bison and C declarations for ltcalc.
+* Rules: Ltcalc Rules.  Grammar rules for ltcalc, with explanations.
+* Lexer: Ltcalc Lexer.  The lexical analyzer.
+
 Multi-Function Calculator: `mfcalc'
 
 * Decl: Mfcalc Decl.      Bison declarations for multi-function calculator.
@@ -119,10 +129,10 @@ Bison Grammar Files
 
 Outline of a Bison Grammar
 
-* Prologue::          Syntax and usage of the prologue (declarations section).
+* C Declarations::    Syntax and usage of the C declarations section.
 * Bison Declarations::  Syntax and usage of the Bison declarations section.
 * Grammar Rules::     Syntax and usage of the grammar rules section.
-* Epilogue::          Syntax and usage of the epilogue (additional code section).
+* C Code::            Syntax and usage of the additional C code section.
 
 Defining Language Semantics
 
@@ -228,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.28c of Bison.
+   This edition corresponds to version 1.29c of Bison.
 
 
 File: bison.info,  Node: Conditions,  Next: Copying,  Prev: Introduction,  Up: Top
@@ -981,7 +991,7 @@ The Overall Layout of a Bison Grammar
 general form of a Bison grammar file is as follows:
 
      %{
-     PROLOGUE (DECLARATIONS)
+     C DECLARATIONS
      %}
      
      BISON DECLARATIONS
@@ -989,14 +999,15 @@ general form of a Bison grammar file is as follows:
      %%
      GRAMMAR RULES
      %%
-     EPILOGUE (ADDITIONAL CODE)
+     ADDITIONAL C CODE
 
 The `%%', `%{' and `%}' are punctuation that appears in every Bison
 grammar file to separate the sections.
 
-   The prologue may define types and variables used in the actions. You
+   The C declarations may define types and variables used in the
-can also use preprocessor commands to define macros used there, and use
+actions.  You can also use preprocessor commands to define macros used
-`#include' to include header files that do any of these things.
+there, and use `#include' to include header files that do any of these
+things.
 
    The Bison declarations declare the names of the terminal and
 nonterminal symbols, and may also describe operator precedence and the
@@ -1005,10 +1016,10 @@ data types of semantic values of various symbols.
    The grammar rules define how to construct each nonterminal symbol
 from its parts.
 
-   The epilogue can contain any code you want to use. Often the
+   The additional C code can contain any C code you want to use.  Often
-definition of the lexical analyzer `yylex' goes here, plus subroutines
+the definition of the lexical analyzer `yylex' goes here, plus
-called by the actions in the grammar rules.  In a simple program, all
+subroutines called by the actions in the grammar rules.  In a simple
-the rest of the program can go here.
+program, all the rest of the program can go here.
 
 
 File: bison.info,  Node: Examples,  Next: Grammar File,  Prev: Concepts,  Up: Top
@@ -1033,6 +1044,7 @@ the Info file and into a source file to try them.
 * Infix Calc::        Infix (algebraic) notation calculator.
                         Operator precedence is introduced.
 * Simple Error Recovery::  Continuing after syntax errors.
+* Location Tracking Calc:: Demonstrating the use of @N and @$.
 * Multi-function Calc::  Calculator with memory and trig functions.
                            It uses multiple data-types for semantic values.
 * Exercises::         Ideas for improving the multi-function calculator.
@@ -1054,7 +1066,7 @@ extension is a convention used for Bison input files.
 
 * Menu:
 
-* Decls: Rpcalc Decls.  Prologue (declarations) for rpcalc.
+* Decls: Rpcalc Decls.  Bison and C declarations for rpcalc.
 * Rules: Rpcalc Rules.  Grammar Rules for rpcalc, with explanation.
 * Lexer: Rpcalc Lexer.  The lexical analyzer.
 * Main: Rpcalc Main.    The controlling function.

doc/bison.info-2

@@ -1,5 +1,5 @@
-This is bison.info, produced by makeinfo version 4.0b from
+Ceci est le fichier Info bison.info, produit par Makeinfo version 4.0b
-bison.texinfo.
+à partir bison.texinfo.
 
 START-INFO-DIR-ENTRY
 * bison: (bison).	GNU Project parser generator (yacc replacement).
@@ -48,8 +48,8 @@ calculator.  As in C, comments are placed between `/*...*/'.
      
      %% /* Grammar rules and actions follow */
 
-   The declarations section (*note The prologue: Prologue.) contains two
+   The C declarations section (*note The C Declarations Section: C
-preprocessor directives.
+Declarations.) contains two preprocessor directives.
 
    The `#define' directive defines the macro `YYSTYPE', thus specifying
 the C data type for semantic values of both tokens and groupings (*note
@@ -359,8 +359,8 @@ Running Bison to Make the Parser
 arrange all the source code in one or more source files.  For such a
 simple example, the easiest thing is to put everything in one file.  The
 definitions of `yylex', `yyerror' and `main' go at the end, in the
-epilogue of the file (*note The Overall Layout of a Bison Grammar:
+"additional C code" section of the file (*note The Overall Layout of a
-Grammar Layout.).
+Bison Grammar: Grammar Layout.).
 
    For a large project, you would probably have several source files,
 and use `make' to arrange to recompile them.
@@ -494,7 +494,7 @@ Precedence.
      9
 
 
-File: bison.info,  Node: Simple Error Recovery,  Next: Multi-function Calc,  Prev: Infix Calc,  Up: Examples
+File: bison.info,  Node: Simple Error Recovery,  Next: Location Tracking Calc,  Prev: Infix Calc,  Up: Examples
 
 Simple Error Recovery
 =====================
@@ -533,7 +533,192 @@ the current line of input.  We won't discuss this issue further because
 it is not specific to Bison programs.
 
 
-File: bison.info,  Node: Multi-function Calc,  Next: Exercises,  Prev: Simple Error Recovery,  Up: Examples
+File: bison.info,  Node: Location Tracking Calc,  Next: Multi-function Calc,  Prev: Simple Error Recovery,  Up: Examples
+
+Location Tracking Calculator: `ltcalc'
+======================================
+
+   This example extends the infix notation calculator with location
+tracking.  This feature will be used to improve error reporting, and
+provide better error messages.
+
+   For the sake of clarity, we will switch for this example to an
+integer calculator, since most of the work needed to use locations will
+be done in the lexical analyser.
+
+* Menu:
+
+* Decls: Ltcalc Decls.  Bison and C declarations for ltcalc.
+* Rules: Ltcalc Rules.  Grammar rules for ltcalc, with explanations.
+* Lexer: Ltcalc Lexer.  The lexical analyzer.
+
+
+File: bison.info,  Node: Ltcalc Decls,  Next: Ltcalc Rules,  Up: Location Tracking Calc
+
+Declarations for `ltcalc'
+-------------------------
+
+   The C and Bison declarations for the location tracking calculator
+are the same as the declarations for the infix notation calculator.
+
+     /* Location tracking calculator.  */
+     
+     %{
+     #define YYSTYPE int
+     #include <math.h>
+     %}
+     
+     /* Bison declarations.  */
+     %token NUM
+     
+     %left '-' '+'
+     %left '*' '/'
+     %left NEG
+     %right '^'
+     
+     %% /* Grammar follows */
+
+   In the code above, there are no declarations specific to locations.
+Defining a data type for storing locations is not needed: we will use
+the type provided by default (*note Data Types of Locations: Location
+Type.), which is a four member structure with the following integer
+fields: `first_line', `first_column', `last_line' and `last_column'.
+
+
+File: bison.info,  Node: Ltcalc Rules,  Next: Ltcalc Lexer,  Prev: Ltcalc Decls,  Up: Location Tracking Calc
+
+Grammar Rules for `ltcalc'
+--------------------------
+
+   Whether you choose to handle locations or not has no effect on the
+syntax of your language.  Therefore, grammar rules for this example
+will be very close to those of the previous example: we will only
+modify them to benefit from the new informations we will have.
+
+   Here, we will use locations to report divisions by zero, and locate
+the wrong expressions or subexpressions.
+
+     input   : /* empty */
+             | input line
+     ;
+     
+     line    : '\n'
+             | exp '\n' { printf ("%d\n", $1); }
+     ;
+     
+     exp     : NUM           { $$ = $1; }
+             | exp '+' exp   { $$ = $1 + $3; }
+             | exp '-' exp   { $$ = $1 - $3; }
+             | exp '*' exp   { $$ = $1 * $3; }
+             | exp '/' exp
+                 {
+                   if ($3)
+                     $$ = $1 / $3;
+                   else
+                     {
+                       $$ = 1;
+                       printf("Division by zero, l%d,c%d-l%d,c%d",
+                              @3.first_line, @3.first_column,
+                              @3.last_line, @3.last_column);
+                     }
+                 }
+             | '-' exp %preg NEG     { $$ = -$2; }
+             | exp '^' exp           { $$ = pow ($1, $3); }
+             | '(' exp ')'           { $$ = $2; }
+
+   This code shows how to reach locations inside of semantic actions, by
+using the pseudo-variables `@N' for rule components, and the
+pseudo-variable `@$' for groupings.
+
+   In this example, we never assign a value to `@$', because the output
+parser can do this automatically.  By default, before executing the C
+code of each action, `@$' is set to range from the beginning of `@1' to
+the end of `@N', for a rule with N components.
+
+   Of course, this behavior can be redefined (*note Default Action for
+Locations: Location Default Action.), and for very specific rules, `@$'
+can be computed by hand.
+
+
+File: bison.info,  Node: Ltcalc Lexer,  Prev: Ltcalc Rules,  Up: Location Tracking Calc
+
+The `ltcalc' Lexical Analyzer.
+------------------------------
+
+   Until now, we relied on Bison's defaults to enable location
+tracking. The next step is to rewrite the lexical analyser, and make it
+able to feed the parser with locations of tokens, as he already does
+for semantic values.
+
+   To do so, we must take into account every single character of the
+input text, to avoid the computed locations of being fuzzy or wrong:
+
+     int
+     yylex (void)
+     {
+       int c;
+     
+       /* skip white space */
+       while ((c = getchar ()) == ' ' || c == '\t')
+         ++yylloc.last_column;
+     
+       /* step */
+       yylloc.first_line = yylloc.last_line;
+       yylloc.first_column = yylloc.last_column;
+     
+       /* process numbers */
+       if (isdigit (c))
+         {
+           yylval = c - '0';
+           ++yylloc.last_column;
+           while (isdigit (c = getchar ()))
+             {
+               ++yylloc.last_column;
+               yylval = yylval * 10 + c - '0';
+             }
+           ungetc (c, stdin);
+           return NUM;
+         }
+     
+       /* return end-of-file */
+       if (c == EOF)
+         return 0;
+     
+       /* return single chars and update location */
+       if (c == '\n')
+         {
+           ++yylloc.last_line;
+           yylloc.last_column = 0;
+         }
+       else
+         ++yylloc.last_column;
+       return c;
+     }
+
+   Basically, the lexical analyzer does the same processing as before:
+it skips blanks and tabs, and reads numbers or single-character tokens.
+In addition to this, it updates the `yylloc' global variable (of type
+`YYLTYPE'), where the location of tokens is stored.
+
+   Now, each time this function returns a token, the parser has it's
+number as well as it's semantic value, and it's position in the text.
+The last needed change is to initialize `yylloc', for example in the
+controlling function:
+
+     int
+     main (void)
+     {
+       yylloc.first_line = yylloc.last_line = 1;
+       yylloc.first_column = yylloc.last_column = 0;
+       return yyparse ();
+     }
+
+   Remember that computing locations is not a matter of syntax.  Every
+character must be associated to a location update, whether it is in
+valid input, in comments, in literal strings, and so on...
+
+
+File: bison.info,  Node: Multi-function Calc,  Next: Exercises,  Prev: Location Tracking Calc,  Up: Examples
 
 Multi-Function Calculator: `mfcalc'
 ===================================
@@ -926,7 +1111,7 @@ Outline of a Bison Grammar
 appropriate delimiters:
 
      %{
-     PROLOGUE
+     C DECLARATIONS
      %}
      
      BISON DECLARATIONS
@@ -935,33 +1120,33 @@ appropriate delimiters:
      GRAMMAR RULES
      %%
      
-     EPILOGUE
+     ADDITIONAL C CODE
 
    Comments enclosed in `/* ... */' may appear in any of the sections.
 
 * Menu:
 
-* Prologue::          Syntax and usage of the prologue.
+* C Declarations::    Syntax and usage of the C declarations section.
 * Bison Declarations::  Syntax and usage of the Bison declarations section.
 * Grammar Rules::     Syntax and usage of the grammar rules section.
-* Epilogue::          Syntax and usage of the epilogue.
+* C Code::            Syntax and usage of the additional C code section.
 
 
-File: bison.info,  Node: Prologue,  Next: Bison Declarations,  Up: Grammar Outline
+File: bison.info,  Node: C Declarations,  Next: Bison Declarations,  Up: Grammar Outline
 
-The prologue
+The C Declarations Section
-------------
+--------------------------
 
-   The PROLOGUE section contains macro definitions and declarations of
+   The C DECLARATIONS section contains macro definitions and
-functions and variables that are used in the actions in the grammar
+declarations of functions and variables that are used in the actions in
-rules.  These are copied to the beginning of the parser file so that
+the grammar rules.  These are copied to the beginning of the parser
-they precede the definition of `yyparse'.  You can use `#include' to
+file so that they precede the definition of `yyparse'.  You can use
-get the declarations from a header file.  If you don't need any C
+`#include' to get the declarations from a header file.  If you don't
-declarations, you may omit the `%{' and `%}' delimiters that bracket
+need any C declarations, you may omit the `%{' and `%}' delimiters that
-this section.
+bracket this section.
 
 
-File: bison.info,  Node: Bison Declarations,  Next: Grammar Rules,  Prev: Prologue,  Up: Grammar Outline
+File: bison.info,  Node: Bison Declarations,  Next: Grammar Rules,  Prev: C Declarations,  Up: Grammar Outline
 
 The Bison Declarations Section
 ------------------------------
@@ -972,7 +1157,7 @@ some simple grammars you may not need any declarations.  *Note Bison
 Declarations: Declarations.
 
 
-File: bison.info,  Node: Grammar Rules,  Next: Epilogue,  Prev: Bison Declarations,  Up: Grammar Outline
+File: bison.info,  Node: Grammar Rules,  Next: C Code,  Prev: Bison Declarations,  Up: Grammar Outline
 
 The Grammar Rules Section
 -------------------------
@@ -985,17 +1170,17 @@ rules, and nothing else.  *Note Syntax of Grammar Rules: Rules.
 the first thing in the file.
 
 
-File: bison.info,  Node: Epilogue,  Prev: Grammar Rules,  Up: Grammar Outline
+File: bison.info,  Node: C Code,  Prev: Grammar Rules,  Up: Grammar Outline
 
-The epilogue
+The Additional C Code Section
-------------
+-----------------------------
 
-   The EPILOGUE is copied verbatim to the end of the parser file, just
+   The ADDITIONAL C CODE section is copied verbatim to the end of the
-as the PROLOGUE is copied to the beginning.  This is the most convenient
+parser file, just as the C DECLARATIONS section is copied to the
-place to put anything that you want to have in the parser file but
+beginning.  This is the most convenient place to put anything that you
-which need not come before the definition of `yyparse'.  For example,
+want to have in the parser file but which need not come before the
-the definitions of `yylex' and `yyerror' often go here.  *Note Parser
+definition of `yyparse'.  For example, the definitions of `yylex' and
-C-Language Interface: Interface.
+`yyerror' often go here.  *Note Parser C-Language Interface: Interface.
 
    If the last section is empty, you may omit the `%%' that separates it
 from the grammar rules.
@@ -1003,7 +1188,7 @@ from the grammar rules.
    The Bison parser itself contains many static variables whose names
 start with `yy' and many macros whose names start with `YY'.  It is a
 good idea to avoid using any such names (except those documented in this
-manual) in the epilogue of the grammar file.
+manual) in the additional C code section of the grammar file.
 
 
 File: bison.info,  Node: Symbols,  Next: Rules,  Prev: Grammar Outline,  Up: Grammar File
@@ -1240,147 +1425,3 @@ associated with X and Y.
                       This says when, why and how to use the exceptional
                         action in the middle of a rule.
 
-
-File: bison.info,  Node: Value Type,  Next: Multiple Types,  Up: Semantics
-
-Data Types of Semantic Values
------------------------------
-
-   In a simple program it may be sufficient to use the same data type
-for the semantic values of all language constructs.  This was true in
-the RPN and infix calculator examples (*note Reverse Polish Notation
-Calculator: RPN Calc.).
-
-   Bison's default is to use type `int' for all semantic values.  To
-specify some other type, define `YYSTYPE' as a macro, like this:
-
-     #define YYSTYPE double
-
-This macro definition must go in the prologue of the grammar file
-(*note Outline of a Bison Grammar: Grammar Outline.).
-
-
-File: bison.info,  Node: Multiple Types,  Next: Actions,  Prev: Value Type,  Up: Semantics
-
-More Than One Value Type
-------------------------
-
-   In most programs, you will need different data types for different
-kinds of tokens and groupings.  For example, a numeric constant may
-need type `int' or `long', while a string constant needs type `char *',
-and an identifier might need a pointer to an entry in the symbol table.
-
-   To use more than one data type for semantic values in one parser,
-Bison requires you to do two things:
-
-   * Specify the entire collection of possible data types, with the
-     `%union' Bison declaration (*note The Collection of Value Types:
-     Union Decl.).
-
-   * Choose one of those types for each symbol (terminal or
-     nonterminal) for which semantic values are used.  This is done for
-     tokens with the `%token' Bison declaration (*note Token Type
-     Names: Token Decl.)  and for groupings with the `%type' Bison
-     declaration (*note Nonterminal Symbols: Type Decl.).
-
-
-File: bison.info,  Node: Actions,  Next: Action Types,  Prev: Multiple Types,  Up: Semantics
-
-Actions
--------
-
-   An action accompanies a syntactic rule and contains C code to be
-executed each time an instance of that rule is recognized.  The task of
-most actions is to compute a semantic value for the grouping built by
-the rule from the semantic values associated with tokens or smaller
-groupings.
-
-   An action consists of C statements surrounded by braces, much like a
-compound statement in C.  It can be placed at any position in the rule;
-it is executed at that position.  Most rules have just one action at
-the end of the rule, following all the components.  Actions in the
-middle of a rule are tricky and used only for special purposes (*note
-Actions in Mid-Rule: Mid-Rule Actions.).
-
-   The C code in an action can refer to the semantic values of the
-components matched by the rule with the construct `$N', which stands for
-the value of the Nth component.  The semantic value for the grouping
-being constructed is `$$'.  (Bison translates both of these constructs
-into array element references when it copies the actions into the parser
-file.)
-
-   Here is a typical example:
-
-     exp:    ...
-             | exp '+' exp
-                 { $$ = $1 + $3; }
-
-This rule constructs an `exp' from two smaller `exp' groupings
-connected by a plus-sign token.  In the action, `$1' and `$3' refer to
-the semantic values of the two component `exp' groupings, which are the
-first and third symbols on the right hand side of the rule.  The sum is
-stored into `$$' so that it becomes the semantic value of the
-addition-expression just recognized by the rule.  If there were a
-useful semantic value associated with the `+' token, it could be
-referred to as `$2'.
-
-   If you don't specify an action for a rule, Bison supplies a default:
-`$$ = $1'.  Thus, the value of the first symbol in the rule becomes the
-value of the whole rule.  Of course, the default rule is valid only if
-the two data types match.  There is no meaningful default action for an
-empty rule; every empty rule must have an explicit action unless the
-rule's value does not matter.
-
-   `$N' with N zero or negative is allowed for reference to tokens and
-groupings on the stack _before_ those that match the current rule.
-This is a very risky practice, and to use it reliably you must be
-certain of the context in which the rule is applied.  Here is a case in
-which you can use this reliably:
-
-     foo:      expr bar '+' expr  { ... }
-             | expr bar '-' expr  { ... }
-             ;
-     
-     bar:      /* empty */
-             { previous_expr = $0; }
-             ;
-
-   As long as `bar' is used only in the fashion shown here, `$0' always
-refers to the `expr' which precedes `bar' in the definition of `foo'.
-
-
-File: bison.info,  Node: Action Types,  Next: Mid-Rule Actions,  Prev: Actions,  Up: Semantics
-
-Data Types of Values in Actions
--------------------------------
-
-   If you have chosen a single data type for semantic values, the `$$'
-and `$N' constructs always have that data type.
-
-   If you have used `%union' to specify a variety of data types, then
-you must declare a choice among these types for each terminal or
-nonterminal symbol that can have a semantic value.  Then each time you
-use `$$' or `$N', its data type is determined by which symbol it refers
-to in the rule.  In this example,
-
-     exp:    ...
-             | exp '+' exp
-                 { $$ = $1 + $3; }
-
-`$1' and `$3' refer to instances of `exp', so they all have the data
-type declared for the nonterminal symbol `exp'.  If `$2' were used, it
-would have the data type declared for the terminal symbol `'+'',
-whatever that might be.
-
-   Alternatively, you can specify the data type when you refer to the
-value, by inserting `<TYPE>' after the `$' at the beginning of the
-reference.  For example, if you have defined types as shown here:
-
-     %union {
-       int itype;
-       double dtype;
-     }
-
-then you can write `$<itype>1' to refer to the first subunit of the
-rule as an integer, or `$<dtype>1' to refer to it as a double.
-

doc/bison.info-3

@@ -1,5 +1,5 @@
-This is bison.info, produced by makeinfo version 4.0b from
+Ceci est le fichier Info bison.info, produit par Makeinfo version 4.0b
-bison.texinfo.
+à partir bison.texinfo.
 
 START-INFO-DIR-ENTRY
 * bison: (bison).	GNU Project parser generator (yacc replacement).
@@ -28,6 +28,150 @@ License", "Conditions for Using Bison" and this permission notice may be
 included in translations approved by the Free Software Foundation
 instead of in the original English.
 
+
+File: bison.info,  Node: Value Type,  Next: Multiple Types,  Up: Semantics
+
+Data Types of Semantic Values
+-----------------------------
+
+   In a simple program it may be sufficient to use the same data type
+for the semantic values of all language constructs.  This was true in
+the RPN and infix calculator examples (*note Reverse Polish Notation
+Calculator: RPN Calc.).
+
+   Bison's default is to use type `int' for all semantic values.  To
+specify some other type, define `YYSTYPE' as a macro, like this:
+
+     #define YYSTYPE double
+
+This macro definition must go in the C declarations section of the
+grammar file (*note Outline of a Bison Grammar: Grammar Outline.).
+
+
+File: bison.info,  Node: Multiple Types,  Next: Actions,  Prev: Value Type,  Up: Semantics
+
+More Than One Value Type
+------------------------
+
+   In most programs, you will need different data types for different
+kinds of tokens and groupings.  For example, a numeric constant may
+need type `int' or `long', while a string constant needs type `char *',
+and an identifier might need a pointer to an entry in the symbol table.
+
+   To use more than one data type for semantic values in one parser,
+Bison requires you to do two things:
+
+   * Specify the entire collection of possible data types, with the
+     `%union' Bison declaration (*note The Collection of Value Types:
+     Union Decl.).
+
+   * Choose one of those types for each symbol (terminal or
+     nonterminal) for which semantic values are used.  This is done for
+     tokens with the `%token' Bison declaration (*note Token Type
+     Names: Token Decl.)  and for groupings with the `%type' Bison
+     declaration (*note Nonterminal Symbols: Type Decl.).
+
+
+File: bison.info,  Node: Actions,  Next: Action Types,  Prev: Multiple Types,  Up: Semantics
+
+Actions
+-------
+
+   An action accompanies a syntactic rule and contains C code to be
+executed each time an instance of that rule is recognized.  The task of
+most actions is to compute a semantic value for the grouping built by
+the rule from the semantic values associated with tokens or smaller
+groupings.
+
+   An action consists of C statements surrounded by braces, much like a
+compound statement in C.  It can be placed at any position in the rule;
+it is executed at that position.  Most rules have just one action at
+the end of the rule, following all the components.  Actions in the
+middle of a rule are tricky and used only for special purposes (*note
+Actions in Mid-Rule: Mid-Rule Actions.).
+
+   The C code in an action can refer to the semantic values of the
+components matched by the rule with the construct `$N', which stands for
+the value of the Nth component.  The semantic value for the grouping
+being constructed is `$$'.  (Bison translates both of these constructs
+into array element references when it copies the actions into the parser
+file.)
+
+   Here is a typical example:
+
+     exp:    ...
+             | exp '+' exp
+                 { $$ = $1 + $3; }
+
+This rule constructs an `exp' from two smaller `exp' groupings
+connected by a plus-sign token.  In the action, `$1' and `$3' refer to
+the semantic values of the two component `exp' groupings, which are the
+first and third symbols on the right hand side of the rule.  The sum is
+stored into `$$' so that it becomes the semantic value of the
+addition-expression just recognized by the rule.  If there were a
+useful semantic value associated with the `+' token, it could be
+referred to as `$2'.
+
+   If you don't specify an action for a rule, Bison supplies a default:
+`$$ = $1'.  Thus, the value of the first symbol in the rule becomes the
+value of the whole rule.  Of course, the default rule is valid only if
+the two data types match.  There is no meaningful default action for an
+empty rule; every empty rule must have an explicit action unless the
+rule's value does not matter.
+
+   `$N' with N zero or negative is allowed for reference to tokens and
+groupings on the stack _before_ those that match the current rule.
+This is a very risky practice, and to use it reliably you must be
+certain of the context in which the rule is applied.  Here is a case in
+which you can use this reliably:
+
+     foo:      expr bar '+' expr  { ... }
+             | expr bar '-' expr  { ... }
+             ;
+     
+     bar:      /* empty */
+             { previous_expr = $0; }
+             ;
+
+   As long as `bar' is used only in the fashion shown here, `$0' always
+refers to the `expr' which precedes `bar' in the definition of `foo'.
+
+
+File: bison.info,  Node: Action Types,  Next: Mid-Rule Actions,  Prev: Actions,  Up: Semantics
+
+Data Types of Values in Actions
+-------------------------------
+
+   If you have chosen a single data type for semantic values, the `$$'
+and `$N' constructs always have that data type.
+
+   If you have used `%union' to specify a variety of data types, then
+you must declare a choice among these types for each terminal or
+nonterminal symbol that can have a semantic value.  Then each time you
+use `$$' or `$N', its data type is determined by which symbol it refers
+to in the rule.  In this example,
+
+     exp:    ...
+             | exp '+' exp
+                 { $$ = $1 + $3; }
+
+`$1' and `$3' refer to instances of `exp', so they all have the data
+type declared for the nonterminal symbol `exp'.  If `$2' were used, it
+would have the data type declared for the terminal symbol `'+'',
+whatever that might be.
+
+   Alternatively, you can specify the data type when you refer to the
+value, by inserting `<TYPE>' after the `$' at the beginning of the
+reference.  For example, if you have defined types as shown here:
+
+     %union {
+       int itype;
+       double dtype;
+     }
+
+then you can write `$<itype>1' to refer to the first subunit of the
+rule as an integer, or `$<dtype>1' to refer to it as a double.
+
 
 File: bison.info,  Node: Mid-Rule Actions,  Prev: Action Types,  Up: Semantics
 
@@ -746,8 +890,8 @@ that it needs to use.
 
    Keep in mind that the parser uses many C identifiers starting with
 `yy' and `YY' for internal purposes.  If you use such an identifier
-(aside from those in this manual) in an action or in epilogue in the
+(aside from those in this manual) in an action or in additional C code
-grammar file, you are likely to run into trouble.
+in the grammar file, you are likely to run into trouble.
 
 * Menu:
 
@@ -1171,110 +1315,3 @@ useful in actions.
      textual position of the Nth component of the current rule.  *Note
      Tracking Locations: Locations.
 
-
-File: bison.info,  Node: Algorithm,  Next: Error Recovery,  Prev: Interface,  Up: Top
-
-The Bison Parser Algorithm
-**************************
-
-   As Bison reads tokens, it pushes them onto a stack along with their
-semantic values.  The stack is called the "parser stack".  Pushing a
-token is traditionally called "shifting".
-
-   For example, suppose the infix calculator has read `1 + 5 *', with a
-`3' to come.  The stack will have four elements, one for each token
-that was shifted.
-
-   But the stack does not always have an element for each token read.
-When the last N tokens and groupings shifted match the components of a
-grammar rule, they can be combined according to that rule.  This is
-called "reduction".  Those tokens and groupings are replaced on the
-stack by a single grouping whose symbol is the result (left hand side)
-of that rule.  Running the rule's action is part of the process of
-reduction, because this is what computes the semantic value of the
-resulting grouping.
-
-   For example, if the infix calculator's parser stack contains this:
-
-     1 + 5 * 3
-
-and the next input token is a newline character, then the last three
-elements can be reduced to 15 via the rule:
-
-     expr: expr '*' expr;
-
-Then the stack contains just these three elements:
-
-     1 + 15
-
-At this point, another reduction can be made, resulting in the single
-value 16.  Then the newline token can be shifted.
-
-   The parser tries, by shifts and reductions, to reduce the entire
-input down to a single grouping whose symbol is the grammar's
-start-symbol (*note Languages and Context-Free Grammars: Language and
-Grammar.).
-
-   This kind of parser is known in the literature as a bottom-up parser.
-
-* Menu:
-
-* Look-Ahead::        Parser looks one token ahead when deciding what to do.
-* Shift/Reduce::      Conflicts: when either shifting or reduction is valid.
-* Precedence::        Operator precedence works by resolving conflicts.
-* Contextual Precedence::  When an operator's precedence depends on context.
-* Parser States::     The parser is a finite-state-machine with stack.
-* Reduce/Reduce::     When two rules are applicable in the same situation.
-* Mystery Conflicts::  Reduce/reduce conflicts that look unjustified.
-* Stack Overflow::    What happens when stack gets full.  How to avoid it.
-
-
-File: bison.info,  Node: Look-Ahead,  Next: Shift/Reduce,  Up: Algorithm
-
-Look-Ahead Tokens
-=================
-
-   The Bison parser does _not_ always reduce immediately as soon as the
-last N tokens and groupings match a rule.  This is because such a
-simple strategy is inadequate to handle most languages.  Instead, when a
-reduction is possible, the parser sometimes "looks ahead" at the next
-token in order to decide what to do.
-
-   When a token is read, it is not immediately shifted; first it
-becomes the "look-ahead token", which is not on the stack.  Now the
-parser can perform one or more reductions of tokens and groupings on
-the stack, while the look-ahead token remains off to the side.  When no
-more reductions should take place, the look-ahead token is shifted onto
-the stack.  This does not mean that all possible reductions have been
-done; depending on the token type of the look-ahead token, some rules
-may choose to delay their application.
-
-   Here is a simple case where look-ahead is needed.  These three rules
-define expressions which contain binary addition operators and postfix
-unary factorial operators (`!'), and allow parentheses for grouping.
-
-     expr:     term '+' expr
-             | term
-             ;
-     
-     term:     '(' expr ')'
-             | term '!'
-             | NUMBER
-             ;
-
-   Suppose that the tokens `1 + 2' have been read and shifted; what
-should be done?  If the following token is `)', then the first three
-tokens must be reduced to form an `expr'.  This is the only valid
-course, because shifting the `)' would produce a sequence of symbols
-`term ')'', and no rule allows this.
-
-   If the following token is `!', then it must be shifted immediately so
-that `2 !' can be reduced to make a `term'.  If instead the parser were
-to reduce before shifting, `1 + 2' would become an `expr'.  It would
-then be impossible to shift the `!' because doing so would produce on
-the stack the sequence of symbols `expr '!''.  No rule allows that
-sequence.
-
-   The current look-ahead token is stored in the variable `yychar'.
-*Note Special Features for Use in Actions: Action Features.
-

doc/bison.info-4

@@ -1,5 +1,5 @@
-This is bison.info, produced by makeinfo version 4.0b from
+Ceci est le fichier Info bison.info, produit par Makeinfo version 4.0b
-bison.texinfo.
+à partir bison.texinfo.
 
 START-INFO-DIR-ENTRY
 * bison: (bison).	GNU Project parser generator (yacc replacement).
@@ -28,6 +28,113 @@ License", "Conditions for Using Bison" and this permission notice may be
 included in translations approved by the Free Software Foundation
 instead of in the original English.
 
+
+File: bison.info,  Node: Algorithm,  Next: Error Recovery,  Prev: Interface,  Up: Top
+
+The Bison Parser Algorithm
+**************************
+
+   As Bison reads tokens, it pushes them onto a stack along with their
+semantic values.  The stack is called the "parser stack".  Pushing a
+token is traditionally called "shifting".
+
+   For example, suppose the infix calculator has read `1 + 5 *', with a
+`3' to come.  The stack will have four elements, one for each token
+that was shifted.
+
+   But the stack does not always have an element for each token read.
+When the last N tokens and groupings shifted match the components of a
+grammar rule, they can be combined according to that rule.  This is
+called "reduction".  Those tokens and groupings are replaced on the
+stack by a single grouping whose symbol is the result (left hand side)
+of that rule.  Running the rule's action is part of the process of
+reduction, because this is what computes the semantic value of the
+resulting grouping.
+
+   For example, if the infix calculator's parser stack contains this:
+
+     1 + 5 * 3
+
+and the next input token is a newline character, then the last three
+elements can be reduced to 15 via the rule:
+
+     expr: expr '*' expr;
+
+Then the stack contains just these three elements:
+
+     1 + 15
+
+At this point, another reduction can be made, resulting in the single
+value 16.  Then the newline token can be shifted.
+
+   The parser tries, by shifts and reductions, to reduce the entire
+input down to a single grouping whose symbol is the grammar's
+start-symbol (*note Languages and Context-Free Grammars: Language and
+Grammar.).
+
+   This kind of parser is known in the literature as a bottom-up parser.
+
+* Menu:
+
+* Look-Ahead::        Parser looks one token ahead when deciding what to do.
+* Shift/Reduce::      Conflicts: when either shifting or reduction is valid.
+* Precedence::        Operator precedence works by resolving conflicts.
+* Contextual Precedence::  When an operator's precedence depends on context.
+* Parser States::     The parser is a finite-state-machine with stack.
+* Reduce/Reduce::     When two rules are applicable in the same situation.
+* Mystery Conflicts::  Reduce/reduce conflicts that look unjustified.
+* Stack Overflow::    What happens when stack gets full.  How to avoid it.
+
+
+File: bison.info,  Node: Look-Ahead,  Next: Shift/Reduce,  Up: Algorithm
+
+Look-Ahead Tokens
+=================
+
+   The Bison parser does _not_ always reduce immediately as soon as the
+last N tokens and groupings match a rule.  This is because such a
+simple strategy is inadequate to handle most languages.  Instead, when a
+reduction is possible, the parser sometimes "looks ahead" at the next
+token in order to decide what to do.
+
+   When a token is read, it is not immediately shifted; first it
+becomes the "look-ahead token", which is not on the stack.  Now the
+parser can perform one or more reductions of tokens and groupings on
+the stack, while the look-ahead token remains off to the side.  When no
+more reductions should take place, the look-ahead token is shifted onto
+the stack.  This does not mean that all possible reductions have been
+done; depending on the token type of the look-ahead token, some rules
+may choose to delay their application.
+
+   Here is a simple case where look-ahead is needed.  These three rules
+define expressions which contain binary addition operators and postfix
+unary factorial operators (`!'), and allow parentheses for grouping.
+
+     expr:     term '+' expr
+             | term
+             ;
+     
+     term:     '(' expr ')'
+             | term '!'
+             | NUMBER
+             ;
+
+   Suppose that the tokens `1 + 2' have been read and shifted; what
+should be done?  If the following token is `)', then the first three
+tokens must be reduced to form an `expr'.  This is the only valid
+course, because shifting the `)' would produce a sequence of symbols
+`term ')'', and no rule allows this.
+
+   If the following token is `!', then it must be shifted immediately so
+that `2 !' can be reduced to make a `term'.  If instead the parser were
+to reduce before shifting, `1 + 2' would become an `expr'.  It would
+then be impossible to shift the `!' because doing so would produce on
+the stack the sequence of symbols `expr '!''.  No rule allows that
+sequence.
+
+   The current look-ahead token is stored in the variable `yychar'.
+*Note Special Features for Use in Actions: Action Features.
+
 
 File: bison.info,  Node: Shift/Reduce,  Next: Precedence,  Prev: Look-Ahead,  Up: Algorithm
 
@@ -787,9 +894,10 @@ Here we assume that `yylex' looks at the value of `hexflag'; when it is
 nonzero, all integers are parsed in hexadecimal, and tokens starting
 with letters are parsed as integers if possible.
 
-   The declaration of `hexflag' shown in the prologue of the parser file
+   The declaration of `hexflag' shown in the C declarations section of
-is needed to make it accessible to the actions (*note The Prologue:
+the parser file is needed to make it accessible to the actions (*note
-Prologue.).  You must also write the code in `yylex' to obey the flag.
+The C Declarations Section: C Declarations.).  You must also write the
+code in `yylex' to obey the flag.
 
 
 File: bison.info,  Node: Tie-in Recovery,  Prev: Lexical Tie-ins,  Up: Context Dependency
@@ -858,13 +966,15 @@ out why.
 
    To enable compilation of trace facilities, you must define the macro
 `YYDEBUG' when you compile the parser.  You could use `-DYYDEBUG=1' as
-a compiler option or you could put `#define YYDEBUG 1' in the prologue
+a compiler option or you could put `#define YYDEBUG 1' in the C
-of the grammar file (*note The Prologue: Prologue.). Alternatively, use
+declarations section of the grammar file (*note The C Declarations
-the `-t' option when you run Bison (*note Invoking Bison: Invocation.).
+Section: C Declarations.).  Alternatively, use the `-t' option when you
-We always define `YYDEBUG' so that debugging is always possible.
+run Bison (*note Invoking Bison: Invocation.).  We always define
+`YYDEBUG' so that debugging is always possible.
 
    The trace facility uses `stderr', so you must add
-`#include <stdio.h>' to the prologue unless it is already there.
+`#include <stdio.h>' to the C declarations section unless it is already
+there.
 
    Once you have compiled the program with trace facilities, the way to
 request a trace is to store a nonzero value in the variable `yydebug'.
@@ -1042,12 +1152,16 @@ Tuning the parser:
 Adjust the output:
 
 `-d'
-`--defines'
      Pretend that `%verbose' was specified, i.e., write an extra output
      file containing macro definitions for the token type names defined
      in the grammar and the semantic value type `YYSTYPE', as well as a
      few `extern' variable declarations.  *Note Decl Summary::.
 
+`--defines=DEFINES-FILE'
+     The behaviour of -DEFINES is the same than `-d'. The only
+     difference is that it has an optionnal argument which is the name
+     of the output filename.
+
 `-b FILE-PREFIX'
 `--file-prefix=PREFIX'
      Specify a prefix to use for all Bison output file names.  The
@@ -1066,6 +1180,16 @@ Adjust the output:
      The other output files' names are constructed from OUTFILE as
      described under the `-v' and `-d' options.
 
+`-g'
+     Output a VCG definition of the LALR(1) grammar automaton computed
+     by Bison. If the grammar file is `foo.y', the VCG output file will
+     be `foo.vcg'.
+
+`--graph=GRAPH-FILE'
+     The behaviour of -GRAPH is the same than `-g'. The only difference
+     is that it has an optionnal argument which is the name of the
+     output graph filename.
+
 
 File: bison.info,  Node: Environment Variables,  Next: Option Cross Key,  Prev: Bison Options,  Up: Invocation
 
@@ -1098,9 +1222,10 @@ Option Cross Key
 find the corresponding short option.
 
      --debug                               -t
-     --defines                             -d
+     --defines=DEFINES-FILE          -d
      --file-prefix=PREFIX                  -b FILE-PREFIX
      --fixed-output-files --yacc           -y
+     --graph=GRAPH-FILE              -d
      --help                                -h
      --name-prefix=PREFIX                  -p NAME-PREFIX
      --no-lines                            -l

doc/bison.info-5

@@ -1,5 +1,5 @@
-This is bison.info, produced by makeinfo version 4.0b from
+Ceci est le fichier Info bison.info, produit par Makeinfo version 4.0b
-bison.texinfo.
+à partir bison.texinfo.
 
 START-INFO-DIR-ENTRY
 * bison: (bison).	GNU Project parser generator (yacc replacement).
@@ -220,13 +220,14 @@ Bison Symbols
 
 `%%'
      Delimiter used to separate the grammar rule section from the Bison
-     declarations section or the epilogue.  *Note The Overall Layout of
+     declarations section or the additional C code section.  *Note The
-     a Bison Grammar: Grammar Layout.
+     Overall Layout of a Bison Grammar: Grammar Layout.
 
 `%{ %}'
      All code listed between `%{' and `%}' is copied directly to the
-     output file uninterpreted.  Such code forms the prologue of the
+     output file uninterpreted.  Such code forms the "C declarations"
-     input file.  *Note Outline of a Bison Grammar: Grammar Outline.
+     section of the input file.  *Note Outline of a Bison Grammar:
+     Grammar Outline.
 
 `/*...*/'
      Comment delimiters, as in C.
@@ -823,17 +824,17 @@ Index
 * %token:                                Token Decl.
 * %type:                                 Type Decl.
 * %union:                                Union Decl.
-* @$ <1>:                                Actions and Locations.
+* @$ <1>:                                Action Features.
-* @$:                                    Action Features.
+* @$:                                    Actions and Locations.
-* @N <1>:                                Actions and Locations.
+* @N <1>:                                Action Features.
-* @N:                                    Action Features.
+* @N:                                    Actions and Locations.
 * action:                                Actions.
 * action data types:                     Action Types.
 * action features summary:               Action Features.
 * actions in mid-rule:                   Mid-Rule Actions.
 * actions, location:                     Actions and Locations.
 * actions, semantic:                     Semantic Actions.
-* additional C code section:             Epilogue.
+* additional C code section:             C Code.
 * algorithm of parser:                   Algorithm.
 * associativity:                         Why Precedence.
 * Backus-Naur form:                      Language and Grammar.
@@ -849,10 +850,12 @@ Index
 * BISON_HAIRY:                           Environment Variables.
 * BISON_SIMPLE:                          Environment Variables.
 * BNF:                                   Language and Grammar.
-* C code, section for additional:        Epilogue.
+* C code, section for additional:        C Code.
+* C declarations section:                C Declarations.
 * C-language interface:                  Interface.
 * calc:                                  Infix Calc.
 * calculator, infix notation:            Infix Calc.
+* calculator, location tracking:         Location Tracking Calc.
 * calculator, multi-function:            Multi-function Calc.
 * calculator, simple:                    RPN Calc.
 * character token:                       Symbols.
@@ -869,10 +872,9 @@ Index
 * data types of semantic values:         Value Type.
 * debugging:                             Debugging.
 * declaration summary:                   Decl Summary.
-* declarations:                          Prologue.
-* declarations section:                  Prologue.
 * declarations, Bison:                   Declarations.
 * declarations, Bison (introduction):    Bison Declarations.
+* declarations, C:                       C Declarations.
 * declaring literal string tokens:       Token Decl.
 * declaring operator precedence:         Precedence Decl.
 * declaring the start symbol:            Start Decl.
@@ -887,7 +889,6 @@ Index
 * defining language semantics:           Semantics.
 * else, dangling:                        Shift/Reduce.
 * environment variables:                 Environment Variables.
-* epilogue:                              Epilogue.
 * error:                                 Error Recovery.
 * error recovery:                        Error Recovery.
 * error recovery, simple:                Simple Error Recovery.
@@ -925,8 +926,10 @@ Index
 * location <1>:                          Locations.
 * location:                              Locations Overview.
 * location actions:                      Actions and Locations.
+* location tracking calculator:          Location Tracking Calc.
 * look-ahead token:                      Look-Ahead.
 * LR(1):                                 Mystery Conflicts.
+* ltcalc:                                Location Tracking Calc.
 * main function in simple example:       Rpcalc Main.
 * mfcalc:                                Multi-function Calc.
 * mid-rule actions:                      Mid-Rule Actions.
@@ -944,14 +947,13 @@ Index
 * parser stack overflow:                 Stack Overflow.
 * parser state:                          Parser States.
 * polish notation calculator:            RPN Calc.
-* position, textual <1>:                 Locations Overview.
+* position, textual <1>:                 Locations.
-* position, textual:                     Locations.
+* position, textual:                     Locations Overview.
 * precedence declarations:               Precedence Decl.
 * precedence of operators:               Precedence.
 * precedence, context-dependent:         Contextual Precedence.
 * precedence, unary operator:            Contextual Precedence.
 * preventing warnings about conflicts:   Expect Decl.
-* Prologue:                              Prologue.
 * pure parser:                           Pure Decl.
 * recovery from errors:                  Error Recovery.
 * recursive rule:                        Recursion.
@@ -1009,8 +1011,8 @@ Index
 * YYBACKUP:                              Action Features.
 * yychar:                                Look-Ahead.
 * yyclearin:                             Error Recovery.
-* YYDEBUG:                               Debugging.
 * yydebug:                               Debugging.
+* YYDEBUG:                               Debugging.
 * YYEMPTY:                               Action Features.
 * yyerrok:                               Error Recovery.
 * YYERROR:                               Action Features.

doc/fdl.texi

@@ -1,4 +1,3 @@
-
 @node GNU Free Documentation License
 @appendixsec GNU Free Documentation License
 
@@ -400,4 +399,3 @@ to permit their use in free software.
 @c Local Variables:
 @c ispell-local-pdict: "ispell-dict"
 @c End:
-

doc/gpl.texi

@@ -1,4 +1,4 @@
-@node Copying, Concepts, Conditions, Top
+@node Copying
 @unnumbered GNU GENERAL PUBLIC LICENSE
 @center Version 2, June 1991
 

doc/stamp-vti

@@ -1,3 +1,4 @@
-@set UPDATED 15 August 2001
+@set UPDATED 20 September 2001
-@set EDITION 1.28c
+@set UPDATED-MONTH September 2001
-@set VERSION 1.28c
+@set EDITION 1.29c
+@set VERSION 1.29c

doc/version.texi

@@ -1,3 +1,4 @@
-@set UPDATED 15 August 2001
+@set UPDATED 20 September 2001
-@set EDITION 1.28c
+@set UPDATED-MONTH September 2001
-@set VERSION 1.28c
+@set EDITION 1.29c
+@set VERSION 1.29c

intl/ChangeLog

@@ -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.
 

intl/Makefile.in

@@ -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
+# This program is free software; you can redistribute it and/or modify it
-# it under the terms of the GNU General Public License as published by
+# under the terms of the GNU Library General Public License as published
-# the Free Software Foundation; either version 2, or (at your option)
+# 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
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# GNU General Public License for more details.
+# Library General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU Library General Public
-# along with this program; if not, write to the Free Software
+# License along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# 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 \

intl/VERSION

@@ -1 +1 @@
-GNU gettext library from gettext-0.10.39
+GNU gettext library from gettext-0.10.40

intl/bindtextdom.c

@@ -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
+   This program is free software; you can redistribute it and/or modify it
-   it under the terms of the GNU General Public License as published by
+   under the terms of the GNU Library General Public License as published
-   the Free Software Foundation; either version 2, or (at your option)
+   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
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   GNU General Public License for more details.
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
+   You should have received a copy of the GNU Library General Public
-   along with this program; if not, write to the Free Software Foundation,
+   License along with this program; if not, write to the Free Software
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>

intl/dcgettext.c

@@ -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
+   This program is free software; you can redistribute it and/or modify it
-   it under the terms of the GNU General Public License as published by
+   under the terms of the GNU Library General Public License as published
-   the Free Software Foundation; either version 2, or (at your option)
+   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
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   GNU General Public License for more details.
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
+   You should have received a copy of the GNU Library General Public
-   along with this program; if not, write to the Free Software Foundation,
+   License along with this program; if not, write to the Free Software
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>

intl/dcigettext.c

@@ -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
+   This program is free software; you can redistribute it and/or modify it
-   it under the terms of the GNU General Public License as published by
+   under the terms of the GNU Library General Public License as published
-   the Free Software Foundation; either version 2, or (at your option)
+   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
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   GNU General Public License for more details.
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
+   You should have received a copy of the GNU Library General Public
-   along with this program; if not, write to the Free Software Foundation,
+   License along with this program; if not, write to the Free Software
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   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

intl/dcngettext.c

@@ -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
+   This program is free software; you can redistribute it and/or modify it
-   it under the terms of the GNU General Public License as published by
+   under the terms of the GNU Library General Public License as published
-   the Free Software Foundation; either version 2, or (at your option)
+   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
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   GNU General Public License for more details.
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
+   You should have received a copy of the GNU Library General Public
-   along with this program; if not, write to the Free Software Foundation,
+   License along with this program; if not, write to the Free Software
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>

intl/dgettext.c

@@ -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
+   This program is free software; you can redistribute it and/or modify it
-   it under the terms of the GNU General Public License as published by
+   under the terms of the GNU Library General Public License as published
-   the Free Software Foundation; either version 2, or (at your option)
+   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
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   GNU General Public License for more details.
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
+   You should have received a copy of the GNU Library General Public
-   along with this program; if not, write to the Free Software Foundation,
+   License along with this program; if not, write to the Free Software
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>

intl/dngettext.c

@@ -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
+   This program is free software; you can redistribute it and/or modify it
-   it under the terms of the GNU General Public License as published by
+   under the terms of the GNU Library General Public License as published
-   the Free Software Foundation; either version 2, or (at your option)
+   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
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   GNU General Public License for more details.
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
+   You should have received a copy of the GNU Library General Public
-   along with this program; if not, write to the Free Software Foundation,
+   License along with this program; if not, write to the Free Software
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>

intl/explodename.c

@@ -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
+   This program is free software; you can redistribute it and/or modify it
-   it under the terms of the GNU General Public License as published by
+   under the terms of the GNU Library General Public License as published
-   the Free Software Foundation; either version 2, or (at your option)
+   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
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   GNU General Public License for more details.
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
+   You should have received a copy of the GNU Library General Public
-   along with this program; if not, write to the Free Software Foundation,
+   License along with this program; if not, write to the Free Software
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>

intl/finddomain.c

@@ -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
+   This program is free software; you can redistribute it and/or modify it
-   it under the terms of the GNU General Public License as published by
+   under the terms of the GNU Library General Public License as published
-   the Free Software Foundation; either version 2, or (at your option)
+   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
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   GNU General Public License for more details.
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
+   You should have received a copy of the GNU Library General Public
-   along with this program; if not, write to the Free Software Foundation,
+   License along with this program; if not, write to the Free Software
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>

intl/gettext.c

@@ -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
+   This program is free software; you can redistribute it and/or modify it
-   it under the terms of the GNU General Public License as published by
+   under the terms of the GNU Library General Public License as published
-   the Free Software Foundation; either version 2, or (at your option)
+   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
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   GNU General Public License for more details.
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
+   You should have received a copy of the GNU Library General Public
-   along with this program; if not, write to the Free Software Foundation,
+   License along with this program; if not, write to the Free Software
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>

intl/gettext.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
+   This program is free software; you can redistribute it and/or modify it
-   it under the terms of the GNU General Public License as published by
+   under the terms of the GNU Library General Public License as published
-   the Free Software Foundation; either version 2, or (at your option)
+   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
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   GNU General Public License for more details.
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
+   You should have received a copy of the GNU Library General Public
-   along with this program; if not, write to the Free Software Foundation,
+   License along with this program; if not, write to the Free Software
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */
 
 #ifndef _GETTEXT_H
 #define _GETTEXT_H 1

intl/gettextP.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
+   This program is free software; you can redistribute it and/or modify it
-   it under the terms of the GNU General Public License as published by
+   under the terms of the GNU Library General Public License as published
-   the Free Software Foundation; either version 2, or (at your option)
+   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
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   GNU General Public License for more details.
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
+   You should have received a copy of the GNU Library General Public
-   along with this program; if not, write to the Free Software Foundation,
+   License along with this program; if not, write to the Free Software
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */
 
 #ifndef _GETTEXTP_H
 #define _GETTEXTP_H

intl/hash-string.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
+   This program is free software; you can redistribute it and/or modify it
-   it under the terms of the GNU General Public License as published by
+   under the terms of the GNU Library General Public License as published
-   the Free Software Foundation; either version 2, or (at your option)
+   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
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   GNU General Public License for more details.
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
+   You should have received a copy of the GNU Library General Public
-   along with this program; if not, write to the Free Software Foundation,
+   License along with this program; if not, write to the Free Software
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */
 
 /* @@ end of prolog @@ */
 

intl/intl-compat.c

@@ -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
+   This program is free software; you can redistribute it and/or modify it
-it under the terms of the GNU General Public License as published by
+   under the terms of the GNU Library General Public License as published
-the Free Software Foundation; either version 2, or (at your option)
+   by the Free Software Foundation; either version 2, or (at your option)
-any later version.
+   any later version.
 
-This program is distributed in the hope that it will be useful,
+   This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-GNU General Public License for more details.
+   Library General Public License for more details.
 
-You should have received a copy of the GNU General Public License
+   You should have received a copy of the GNU Library General Public
-along with this program; if not, write to the Free Software
+   License along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>

intl/l10nflist.c

@@ -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
+   This program is free software; you can redistribute it and/or modify it
-   it under the terms of the GNU General Public License as published by
+   under the terms of the GNU Library General Public License as published
-   the Free Software Foundation; either version 2, or (at your option)
+   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
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   GNU General Public License for more details.
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
+   You should have received a copy of the GNU Library General Public
-   along with this program; if not, write to the Free Software Foundation,
+   License along with this program; if not, write to the Free Software
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   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

intl/libgettext.h

@@ -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
+   This program is free software; you can redistribute it and/or modify it
-   it under the terms of the GNU General Public License as published by
+   under the terms of the GNU Library General Public License as published
-   the Free Software Foundation; either version 2, or (at your option)
+   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
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   GNU General Public License for more details.
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
+   You should have received a copy of the GNU Library General Public
-   along with this program; if not, write to the Free Software Foundation,
+   License along with this program; if not, write to the Free Software
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */
 
 #ifndef _LIBGETTEXT_H
 #define _LIBGETTEXT_H 1

intl/libgnuintl.h

@@ -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
+   This program is free software; you can redistribute it and/or modify it
-   it under the terms of the GNU General Public License as published by
+   under the terms of the GNU Library General Public License as published
-   the Free Software Foundation; either version 2, or (at your option)
+   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
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   GNU General Public License for more details.
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
+   You should have received a copy of the GNU Library General Public
-   along with this program; if not, write to the Free Software Foundation,
+   License along with this program; if not, write to the Free Software
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */
 
 #ifndef _LIBINTL_H
 #define _LIBINTL_H	1

intl/loadinfo.h

@@ -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
+   This program is free software; you can redistribute it and/or modify it
-   it under the terms of the GNU General Public License as published by
+   under the terms of the GNU Library General Public License as published
-   the Free Software Foundation; either version 2, or (at your option)
+   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
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   GNU General Public License for more details.
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
+   You should have received a copy of the GNU Library General Public
-   along with this program; if not, write to the Free Software Foundation,
+   License along with this program; if not, write to the Free Software
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */
 
 #ifndef _LOADINFO_H
 #define _LOADINFO_H	1

intl/loadmsgcat.c

@@ -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
+   This program is free software; you can redistribute it and/or modify it
-   it under the terms of the GNU General Public License as published by
+   under the terms of the GNU Library General Public License as published
-   the Free Software Foundation; either version 2, or (at your option)
+   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
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   GNU General Public License for more details.
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
+   You should have received a copy of the GNU Library General Public
-   along with this program; if not, write to the Free Software Foundation,
+   License along with this program; if not, write to the Free Software
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   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

intl/locale.alias

@@ -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
+# This program is free software; you can redistribute it and/or modify it
-# it under the terms of the GNU General Public License as published by
+# under the terms of the GNU Library General Public License as published
-# the Free Software Foundation; either version 2, or (at your option)
+# 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
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# GNU General Public License for more details.
+# Library General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License
+# You should have received a copy of the GNU Library General Public
-# along with this program; if not, write to the Free Software
+# License along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# 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

intl/localealias.c

@@ -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
+   This program is free software; you can redistribute it and/or modify it
-   it under the terms of the GNU General Public License as published by
+   under the terms of the GNU Library General Public License as published
-   the Free Software Foundation; either version 2, or (at your option)
+   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
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   GNU General Public License for more details.
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
+   You should have received a copy of the GNU Library General Public
-   along with this program; if not, write to the Free Software Foundation,
+   License along with this program; if not, write to the Free Software
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   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

intl/ngettext.c

@@ -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
+   This program is free software; you can redistribute it and/or modify it
-   it under the terms of the GNU General Public License as published by
+   under the terms of the GNU Library General Public License as published
-   the Free Software Foundation; either version 2, or (at your option)
+   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
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   GNU General Public License for more details.
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
+   You should have received a copy of the GNU Library General Public
-   along with this program; if not, write to the Free Software Foundation,
+   License along with this program; if not, write to the Free Software
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>

intl/plural.c

@@ -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
+   This program is free software; you can redistribute it and/or modify it
-   it under the terms of the GNU General Public License as published by
+   under the terms of the GNU Library General Public License as published
-   the Free Software Foundation; either version 2, or (at your option)
+   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
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   GNU General Public License for more details.
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
+   You should have received a copy of the GNU Library General Public
-   along with this program; if not, write to the Free Software Foundation,
+   License along with this program; if not, write to the Free Software
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   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,
+   178,   186,   190,   194,   198,   202,   206,   210,   214,   218,
-   221,   226
+   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

intl/plural.y

@@ -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
+   This program is free software; you can redistribute it and/or modify it
-   it under the terms of the GNU General Public License as published by
+   under the terms of the GNU Library General Public License as published
-   the Free Software Foundation; either version 2, or (at your option)
+   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
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   GNU General Public License for more details.
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
+   You should have received a copy of the GNU Library General Public
-   along with this program; if not, write to the Free Software Foundation,
+   License along with this program; if not, write to the Free Software
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   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

intl/textdomain.c

@@ -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
+   This program is free software; you can redistribute it and/or modify it
-   it under the terms of the GNU General Public License as published by
+   under the terms of the GNU Library General Public License as published
-   the Free Software Foundation; either version 2, or (at your option)
+   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
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   GNU General Public License for more details.
+   Library General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
+   You should have received a copy of the GNU Library General Public
-   along with this program; if not, write to the Free Software Foundation,
+   License along with this program; if not, write to the Free Software
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>

lib/Makefile.am

@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = ansi2knr
 
 noinst_LIBRARIES = libbison.a
 
-INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir)/src -I../intl
+INCLUDES = -I.. -I$(srcdir) -I../intl
 
 # Heck, we are still using an old version of Automake which does not
 # understand LIBOBJ additions using $objext...
@@ -14,7 +14,6 @@ EXTRA_DIST = malloc.c realloc.c
 libbison_a_SOURCES = \
   error.c error.h \
   getopt.h getopt.c getopt1.c \
-  hash.h hash.c \
   obstack.h obstack.c \
   quote.h quote.c quotearg.h quotearg.c \
   xalloc.h xmalloc.c xstrdup.c

lib/Makefile.in

@@ -58,7 +58,6 @@ POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
 AMTAR = @AMTAR@
-AT_TESTPATH = @AT_TESTPATH@
 AWK = @AWK@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 CATALOGS = @CATALOGS@
@@ -67,9 +66,6 @@ CC = @CC@
 CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
 EXEEXT = @EXEEXT@
 GENCAT = @GENCAT@
 GLIBC21 = @GLIBC21@
@@ -104,7 +100,7 @@ AUTOMAKE_OPTIONS = ansi2knr
 
 noinst_LIBRARIES = libbison.a
 
-INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir)/src -I../intl
+INCLUDES = -I.. -I$(srcdir) -I../intl
 
 
 # Heck, we are still using an old version of Automake which does not
@@ -114,7 +110,6 @@ EXTRA_DIST = malloc.c realloc.c
 libbison_a_SOURCES = \
   error.c error.h \
   getopt.h getopt.c getopt1.c \
-  hash.h hash.c \
   obstack.h obstack.c \
   quote.h quote.c quotearg.h quotearg.c \
   xalloc.h xmalloc.c xstrdup.c
@@ -130,9 +125,8 @@ LIBRARIES = $(noinst_LIBRARIES)
 
 libbison_a_AR = $(AR) cru
 am_libbison_a_OBJECTS = error$U.$(OBJEXT) getopt$U.$(OBJEXT) \
-	getopt1$U.$(OBJEXT) hash$U.$(OBJEXT) obstack$U.$(OBJEXT) \
+	getopt1$U.$(OBJEXT) obstack$U.$(OBJEXT) quote$U.$(OBJEXT) \
-	quote$U.$(OBJEXT) quotearg$U.$(OBJEXT) xmalloc$U.$(OBJEXT) \
+	quotearg$U.$(OBJEXT) xmalloc$U.$(OBJEXT) xstrdup$U.$(OBJEXT)
-	xstrdup$U.$(OBJEXT)
 libbison_a_OBJECTS = $(am_libbison_a_OBJECTS)
 
 DEFS = @DEFS@
@@ -142,13 +136,13 @@ LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/error$U.Po $(DEPDIR)/getopt$U.Po \
-@AMDEP_TRUE@	$(DEPDIR)/getopt1$U.Po $(DEPDIR)/hash$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/getopt1$U.Po $(DEPDIR)/malloc.Po \
-@AMDEP_TRUE@	$(DEPDIR)/malloc.Po $(DEPDIR)/memchr.Po \
+@AMDEP_TRUE@	$(DEPDIR)/memchr.Po $(DEPDIR)/obstack$U.Po \
-@AMDEP_TRUE@	$(DEPDIR)/obstack$U.Po $(DEPDIR)/quote$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/quote$U.Po $(DEPDIR)/quotearg$U.Po \
-@AMDEP_TRUE@	$(DEPDIR)/quotearg$U.Po $(DEPDIR)/realloc.Po \
+@AMDEP_TRUE@	$(DEPDIR)/realloc.Po $(DEPDIR)/stpcpy.Po \
-@AMDEP_TRUE@	$(DEPDIR)/stpcpy.Po $(DEPDIR)/strndup.Po \
+@AMDEP_TRUE@	$(DEPDIR)/strndup.Po $(DEPDIR)/strnlen.Po \
-@AMDEP_TRUE@	$(DEPDIR)/strnlen.Po $(DEPDIR)/strspn.Po \
+@AMDEP_TRUE@	$(DEPDIR)/strspn.Po $(DEPDIR)/xmalloc$U.Po \
-@AMDEP_TRUE@	$(DEPDIR)/xmalloc$U.Po $(DEPDIR)/xstrdup$U.Po
+@AMDEP_TRUE@	$(DEPDIR)/xstrdup$U.Po
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
@@ -200,7 +194,6 @@ mostlyclean-kr:
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/error$U.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getopt$U.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getopt1$U.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/hash$U.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/malloc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/memchr.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/obstack$U.Po@am__quote@
@@ -237,8 +230,6 @@ getopt_.c: getopt.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/getopt.c; then echo $(srcdir)/getopt.c; else echo getopt.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > getopt_.c || rm -f getopt_.c
 getopt1_.c: getopt1.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/getopt1.c; then echo $(srcdir)/getopt1.c; else echo getopt1.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > getopt1_.c || rm -f getopt1_.c
-hash_.c: hash.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/hash.c; then echo $(srcdir)/hash.c; else echo hash.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > hash_.c || rm -f hash_.c
 malloc_.c: malloc.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/malloc.c; then echo $(srcdir)/malloc.c; else echo malloc.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > malloc_.c || rm -f malloc_.c
 memchr_.c: memchr.c $(ANSI2KNR)
@@ -264,10 +255,10 @@ xmalloc_.c: xmalloc.c $(ANSI2KNR)
 xstrdup_.c: xstrdup.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/xstrdup.c; then echo $(srcdir)/xstrdup.c; else echo xstrdup.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > xstrdup_.c || rm -f xstrdup_.c
 alloca_.$(OBJEXT) error_.$(OBJEXT) getopt_.$(OBJEXT) getopt1_.$(OBJEXT) \
-hash_.$(OBJEXT) malloc_.$(OBJEXT) memchr_.$(OBJEXT) obstack_.$(OBJEXT) \
+malloc_.$(OBJEXT) memchr_.$(OBJEXT) obstack_.$(OBJEXT) quote_.$(OBJEXT) \
-quote_.$(OBJEXT) quotearg_.$(OBJEXT) realloc_.$(OBJEXT) \
+quotearg_.$(OBJEXT) realloc_.$(OBJEXT) stpcpy_.$(OBJEXT) \
-stpcpy_.$(OBJEXT) strndup_.$(OBJEXT) strnlen_.$(OBJEXT) \
+strndup_.$(OBJEXT) strnlen_.$(OBJEXT) strspn_.$(OBJEXT) \
-strspn_.$(OBJEXT) xmalloc_.$(OBJEXT) xstrdup_.$(OBJEXT) : $(ANSI2KNR)
+xmalloc_.$(OBJEXT) xstrdup_.$(OBJEXT) : $(ANSI2KNR)
 uninstall-info-am:
 
 tags: TAGS

lib/hash.c

@@ -1,293 +0,0 @@
-/* hash.c -- hash table maintenance
-   Copyright (C) 1995 Free Software Foundation, Inc.
-   Written by Greg McGary <gkm@gnu.ai.mit.edu>
-
-   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 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.
-
-   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.
-*/
-
-#include <config.h>
-#include <stdio.h>
-#include "hash.h"
-#include "error.h"
-#include "system.h"
-#include "xalloc.h"
-
-static void hash_rehash __P((struct hash_table* ht));
-static unsigned long round_up_2 __P((unsigned long rough));
-
-/* Implement double hashing with open addressing.  The table size is
-   always a power of two.  The secondary (`increment') hash function
-   is forced to return an odd-value, in order to be relatively prime
-   to the table size.  This guarantees that the increment can
-   potentially hit every slot in the table during collision
-   resolution.  */
-
-void *hash_deleted_item = &hash_deleted_item;
-
-/* Force the table size to be a power of two, possibly rounding up the
-   given size.  */
-
-void
-hash_init (struct hash_table* ht, unsigned long size,
-	   hash_func_t hash_1, hash_func_t hash_2, hash_cmp_func_t hash_cmp)
-{
-  ht->ht_size = round_up_2 (size);
-  if (ht->ht_size > (128 * 1024)) /* prevent size from getting out of hand */
-    ht->ht_size /= 2;
-  ht->ht_vec = (void**) XCALLOC (struct token *, ht->ht_size);
-  if (ht->ht_vec == 0)
-    error (1, 0, _("can't allocate %ld bytes for hash table: memory exhausted"),
-	   ht->ht_size * sizeof(struct token *));
-  ht->ht_capacity = ht->ht_size * 15 / 16; /* 93.75% loading factor */
-  ht->ht_fill = 0;
-  ht->ht_collisions = 0;
-  ht->ht_lookups = 0;
-  ht->ht_rehashes = 0;
-  ht->ht_hash_1 = hash_1;
-  ht->ht_hash_2 = hash_2;
-  ht->ht_compare = hash_cmp;
-}
-
-/* Load an array of items into `ht'.  */
-
-void
-hash_load (struct hash_table* ht, void *item_table, unsigned long cardinality, unsigned long size)
-{
-  char *items = (char *) item_table;
-  while (cardinality--)
-    {
-      hash_insert (ht, items);
-      items += size;
-    }
-}
-
-/* Returns the address of the table slot matching `key'.  If `key' is
-   not found, return the address of an empty slot suitable for
-   inserting `key'.  The caller is responsible for incrementing
-   ht_fill on insertion.  */
-
-void **
-hash_find_slot (struct hash_table* ht, void const *key)
-{
-  void **slot;
-  void **deleted_slot = 0;
-  unsigned int hash_2 = 0;
-  unsigned int hash_1 = (*ht->ht_hash_1) (key);
-
-  ht->ht_lookups++;
-  for (;;)
-    {
-      hash_1 %= ht->ht_size;
-      slot = &ht->ht_vec[hash_1];
-
-      if (*slot == 0)
-	return slot;
-      if (*slot == hash_deleted_item)
-	{
-	  if (deleted_slot == 0)
-	    deleted_slot = slot;
-	}
-      else
-	{
-	  if (key == *slot)
-	    return slot;
-	  if ((*ht->ht_compare) (key, *slot) == 0)
-	    return slot;
-	  ht->ht_collisions++;
-	}
-      if (!hash_2)
-	  hash_2 = (*ht->ht_hash_2) (key) | 1;
-      hash_1 += hash_2;
-    }
-}
-
-void *
-hash_find_item (struct hash_table* ht, void const *key)
-{
-  void **slot = hash_find_slot (ht, key);
-  return ((HASH_VACANT (*slot)) ? 0 : *slot);
-}
-
-void *
-hash_insert (struct hash_table* ht, void *item)
-{
-  void **slot = hash_find_slot (ht, item);
-  return hash_insert_at (ht, item, slot);
-}
-
-void *
-hash_insert_at (struct hash_table* ht, void *item, void const *slot)
-{
-  void *old_item = *(void **) slot;
-  if (HASH_VACANT (old_item))
-    {
-      ht->ht_fill++;
-      old_item = item;
-    }
-  *(void const **) slot = item;
-  if (ht->ht_fill >= ht->ht_capacity)
-    hash_rehash (ht);
-  return old_item;
-}
-
-void *
-hash_delete (struct hash_table* ht, void const *item)
-{
-  void **slot = hash_find_slot (ht, item);
-  return hash_delete_at (ht, slot);
-}
-
-void *
-hash_delete_at (struct hash_table* ht, void const *slot)
-{
-  void *item = *(void **) slot;
-  if (!HASH_VACANT (item))
-    {
-      *(void const **) slot = hash_deleted_item;
-      ht->ht_fill--;
-      return item;
-    }
-  else
-    return 0;
-}
-
-void
-hash_free_items (struct hash_table* ht)
-{
-  void **vec = ht->ht_vec;
-  void **end = &vec[ht->ht_size];
-  for (; vec < end; vec++)
-    {
-      void *item = *vec;
-      if (!HASH_VACANT (item))
-	free (item);
-      *vec = 0;
-    }
-  ht->ht_fill = 0;
-}
-
-void
-hash_delete_items (struct hash_table* ht)
-{
-  void **vec = ht->ht_vec;
-  void **end = &vec[ht->ht_size];
-  for (; vec < end; vec++)
-    *vec = 0;
-  ht->ht_fill = 0;
-  ht->ht_collisions = 0;
-  ht->ht_lookups = 0;
-  ht->ht_rehashes = 0;
-}
-
-void
-hash_free (struct hash_table* ht, int free_items)
-{
-  if (free_items)
-    hash_free_items (ht);
-  free (ht->ht_vec);
-  ht->ht_vec = 0;
-  ht->ht_fill = 0;
-  ht->ht_capacity = 0;
-}
-
-void
-hash_map (struct hash_table *ht, hash_map_func_t map)
-{
-  void **slot;
-  void **end = &ht->ht_vec[ht->ht_size];
-
-  for (slot = ht->ht_vec; slot < end; slot++)
-    {
-      if (!HASH_VACANT (*slot))
-	(*map) (*slot);
-    }
-}
-
-/* Double the size of the hash table in the event of overflow... */
-
-static void
-hash_rehash (struct hash_table* ht)
-{
-  unsigned long old_ht_size = ht->ht_size;
-  void **old_vec = ht->ht_vec;
-  void **ovp;
-  void **slot;
-
-  ht->ht_size *= 2;
-  ht->ht_rehashes++;
-  ht->ht_capacity = ht->ht_size - (ht->ht_size >> 4);
-  ht->ht_vec = (void **) XCALLOC (struct token *, ht->ht_size);
-
-  for (ovp = old_vec; ovp < &old_vec[old_ht_size]; ovp++)
-    {
-      if (*ovp == 0)
-	continue;
-      slot = hash_find_slot (ht, *ovp);
-      *slot = *ovp;
-    }
-  free (old_vec);
-}
-
-void
-hash_print_stats (struct hash_table *ht, FILE *out_FILE)
-{
-  fprintf (out_FILE, _("Load=%ld/%ld=%.0f%%, "), ht->ht_fill, ht->ht_size,
-	   100.0 * (double) ht->ht_fill / (double) ht->ht_size);
-  fprintf (out_FILE, _("Rehash=%d, "), ht->ht_rehashes);
-  fprintf (out_FILE, _("Collisions=%ld/%ld=%.0f%%"), ht->ht_collisions, ht->ht_lookups,
-	   (ht->ht_lookups
-	    ? (100.0 * (double) ht->ht_collisions / (double) ht->ht_lookups)
-	    : 0));
-}
-
-/* Dump all items into a NULL-terminated vector.  Use the
-   user-supplied vector, or malloc one.  */
-
-void**
-hash_dump (struct hash_table *ht, void **vector_0, qsort_cmp_t compare)
-{
-  void **vector;
-  void **slot;
-  void **end = &ht->ht_vec[ht->ht_size];
-
-  if (vector_0 == 0)
-    vector_0 = XMALLOC (void *, ht->ht_fill + 1);
-  vector = vector_0;
-
-  for (slot = ht->ht_vec; slot < end; slot++)
-    if (!HASH_VACANT (*slot))
-      *vector++ = *slot;
-  *vector = 0;
-
-  if (compare)
-    qsort (vector_0, ht->ht_fill, sizeof (void *), compare);
-  return vector_0;
-}
-
-/* Round a given number up to the nearest power of 2. */
-
-static unsigned long
-round_up_2 (unsigned long rough)
-{
-  int round;
-
-  round = 1;
-  while (rough)
-    {
-      round <<= 1;
-      rough >>= 1;
-    }
-  return round;
-}

lib/hash.h

@@ -1,144 +0,0 @@
-/* hash.h -- decls for hash table
-   Copyright (C) 1995 Free Software Foundation, Inc.
-   Written by Greg McGary <gkm@gnu.ai.mit.edu>
-
-   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 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.
-
-   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. */
-
-#ifndef _hash_h_
-#define _hash_h_
-
-#include <stdio.h>
-
-typedef unsigned long (*hash_func_t) __P((void const *key));
-typedef int (*hash_cmp_func_t) __P((void const *x, void const *y));
-typedef void (*hash_map_func_t) __P((void const *item));
-
-struct hash_table
-{
-  void **ht_vec;
-  unsigned long ht_size;	/* total number of slots (power of 2) */
-  unsigned long ht_capacity;	/* usable slots, limited by loading-factor */
-  unsigned long ht_fill;	/* items in table */
-  unsigned long ht_collisions;	/* # of failed calls to comparison function */
-  unsigned long ht_lookups;	/* # of queries */
-  unsigned int ht_rehashes;	/* # of times we've expanded table */
-  hash_func_t ht_hash_1;	/* primary hash function */
-  hash_func_t ht_hash_2;	/* secondary hash function */
-  hash_cmp_func_t ht_compare;	/* comparison function */
-};
-
-typedef int (*qsort_cmp_t) __P((void const *, void const *));
-
-void hash_init __P((struct hash_table *ht, unsigned long size,
-		    hash_func_t hash_1, hash_func_t hash_2, hash_cmp_func_t hash_cmp));
-void hash_load __P((struct hash_table *ht, void *item_table,
-		    unsigned long cardinality, unsigned long size));
-void **hash_find_slot __P((struct hash_table *ht, void const *key));
-void *hash_find_item __P((struct hash_table *ht, void const *key));
-void *hash_insert __P((struct hash_table *ht, void *item));
-void *hash_insert_at __P((struct hash_table *ht, void *item, void const *slot));
-void *hash_delete __P((struct hash_table *ht, void const *item));
-void *hash_delete_at __P((struct hash_table *ht, void const *slot));
-void hash_delete_items __P((struct hash_table *ht));
-void hash_free_items __P((struct hash_table *ht));
-void hash_free __P((struct hash_table *ht, int free_items));
-void hash_map __P((struct hash_table *ht, hash_map_func_t map));
-void hash_print_stats __P((struct hash_table *ht, FILE *out_FILE));
-void **hash_dump __P((struct hash_table *ht, void **vector_0, qsort_cmp_t compare));
-
-extern void *hash_deleted_item;
-#define HASH_VACANT(item) ((item) == 0 || (void *) (item) == hash_deleted_item)
-
-
-/* hash and comparison macros for string keys. */
-
-#define STRING_HASH_1(_key_, _result_) { \
-  unsigned char const *kk = (unsigned char const *) (_key_) - 1; \
-  while (*++kk) \
-    (_result_) += (*kk << (kk[1] & 0xf)); \
-} while (0)
-#define return_STRING_HASH_1(_key_) do { \
-  unsigned long result = 0; \
-  STRING_HASH_1 ((_key_), result); \
-  return result; \
-} while (0)
-
-#define STRING_HASH_2(_key_, _result_) do { \
-  unsigned char const *kk = (unsigned char const *) (_key_) - 1; \
-  while (*++kk) \
-    (_result_) += (*kk << (kk[1] & 0x7)); \
-} while (0)
-#define return_STRING_HASH_2(_key_) do { \
-  unsigned long result = 0; \
-  STRING_HASH_2 ((_key_), result); \
-  return result; \
-} while (0)
-
-#define STRING_COMPARE(_x_, _y_, _result_) do { \
-  unsigned char const *xx = (unsigned char const *) (_x_) - 1; \
-  unsigned char const *yy = (unsigned char const *) (_y_) - 1; \
-  do { \
-    if (*++xx == '\0') { \
-      yy++; \
-      break; \
-    } \
-  } while (*xx == *++yy); \
-  (_result_) = *xx - *yy; \
-} while (0)
-#define return_STRING_COMPARE(_x_, _y_) do { \
-  int result; \
-  STRING_COMPARE (_x_, _y_, result); \
-  return result; \
-} while (0)
-
-/* hash and comparison macros for integer keys. */
-
-#define INTEGER_HASH_1(_key_, _result_) do { \
-  (_result_) += ((unsigned long)(_key_)); \
-} while (0)
-#define return_INTEGER_HASH_1(_key_) do { \
-  unsigned long result = 0; \
-  INTEGER_HASH_1 ((_key_), result); \
-  return result; \
-} while (0)
-
-#define INTEGER_HASH_2(_key_, _result_) do { \
-  (_result_) += ~((unsigned long)(_key_)); \
-} while (0)
-#define return_INTEGER_HASH_2(_key_) do { \
-  unsigned long result = 0; \
-  INTEGER_HASH_2 ((_key_), result); \
-  return result; \
-} while (0)
-
-#define INTEGER_COMPARE(_x_, _y_, _result_) do { \
-  (_result_) = _x_ - _y_; \
-} while (0)
-#define return_INTEGER_COMPARE(_x_, _y_) do { \
-  int result; \
-  INTEGER_COMPARE (_x_, _y_, result); \
-  return result; \
-} while (0)
-
-/* hash and comparison macros for address keys. */
-
-#define ADDRESS_HASH_1(_key_, _result_) INTEGER_HASH_1 (((unsigned long)(_key_)) >> 3, (_result_))
-#define ADDRESS_HASH_2(_key_, _result_) INTEGER_HASH_2 (((unsigned long)(_key_)) >> 3, (_result_))
-#define ADDRESS_COMPARE(_x_, _y_, _result_) INTEGER_COMPARE ((_x_), (_y_), (_result_))
-#define return_ADDRESS_HASH_1(_key_) return_INTEGER_HASH_1 (((unsigned long)(_key_)) >> 3)
-#define return_ADDRESS_HASH_2(_key_) return_INTEGER_HASH_2 (((unsigned long)(_key_)) >> 3)
-#define return_ADDRESS_COMPARE(_x_, _y_) return_INTEGER_COMPARE ((_x_), (_y_))
-
-#endif /* not _hash_h_ */

lib/quotearg.c

@@ -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

m4/Makefile.am

@@ -1,8 +1,8 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-
 EXTRA_DIST = 					\
-atconfig.m4					\
 c-bs-a.m4					\
 codeset.m4					\
+dmalloc.m4					\
 error.m4					\
 gettext.m4					\
 glibc21.m4					\
@@ -11,6 +11,7 @@ isc-posix.m4					\
 lcmessage.m4					\
 m4.m4						\
 malloc.m4					\
+mbrtowc.m4					\
 mbstate_t.m4					\
 prereq.m4					\
 progtest.m4					\

m4/Makefile.in

@@ -58,7 +58,6 @@ POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
 AMTAR = @AMTAR@
-AT_TESTPATH = @AT_TESTPATH@
 AWK = @AWK@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 CATALOGS = @CATALOGS@
@@ -67,9 +66,6 @@ CC = @CC@
 CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
 EXEEXT = @EXEEXT@
 GENCAT = @GENCAT@
 GLIBC21 = @GLIBC21@
@@ -101,9 +97,9 @@ am__quote = @am__quote@
 install_sh = @install_sh@
 
 EXTRA_DIST = \
-atconfig.m4					\
 c-bs-a.m4					\
 codeset.m4					\
+dmalloc.m4					\
 error.m4					\
 gettext.m4					\
 glibc21.m4					\
@@ -112,6 +108,7 @@ isc-posix.m4					\
 lcmessage.m4					\
 m4.m4						\
 malloc.m4					\
+mbrtowc.m4					\
 mbstate_t.m4					\
 prereq.m4					\
 progtest.m4					\

m4/atconfig.m4

@@ -1,22 +0,0 @@
-## ----------------------##
-## Prepare for testing.  ##
-## ----------------------##
-
-# serial 2
-
-# Single argument says where are built sources to test, relative to the
-# built test directory.  Maybe omitted if the same (flat distribution).
-
-AC_DEFUN([AT_CONFIG],
-[AT_TESTPATH=ifelse([$1], [], [.], [$1])
-AC_SUBST([AT_TESTPATH])
-# Try to be compatible with both Autoconf 2.13 and 2.50.
-if test -z "$ECHO_C$ECHO_N$ECHO_T"; then
-  ECHO_C="$ac_c"
-  ECHO_N="$ac_n"
-  ECHO_T="$ac_t"
-  AC_SUBST([ECHO_C])
-  AC_SUBST([ECHO_N])
-  AC_SUBST([ECHO_T])
-fi
-])

m4/dmalloc.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)])
+])

m4/mbrtowc.m4

@@ -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
+])

m4/prereq.m4

@@ -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_FUNCS(isascii iswprint mbsinit)
-  AC_CHECK_HEADERS(limits.h stdlib.h string.h wchar.h wctype.h)
+  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

missing

@@ -1,283 +0,0 @@
-#! /bin/sh
-# Common stub for a few missing GNU programs while installing.
-# Copyright 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <[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)
-# 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.
-
-# 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.
-
-# 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.
-
-if test $# -eq 0; then
-  echo 1>&2 "Try \`$0 --help' for more information"
-  exit 1
-fi
-
-run=:
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
-  configure_ac=configure.ac
-else
-  configure_ac=configure.in
-fi
-
-case "$1" in
---run)
-  # Try to run requested program, and just exit if it succeeds.
-  run=
-  shift
-  "$@" && exit 0
-  ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case "$1" in
-
-  -h|--h|--he|--hel|--help)
-    echo "\
-$0 [OPTION]... PROGRAM [ARGUMENT]...
-
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
-
-Options:
-  -h, --help      display this help and exit
-  -v, --version   output version information and exit
-  --run           try to run the given command, and emulate it if it fails
-
-Supported PROGRAM values:
-  aclocal      touch file \`aclocal.m4'
-  autoconf     touch file \`configure'
-  autoheader   touch file \`config.h.in'
-  automake     touch all \`Makefile.in' files
-  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
-  flex         create \`lex.yy.c', if possible, from existing .c
-  help2man     touch the output file
-  lex          create \`lex.yy.c', if possible, from existing .c
-  makeinfo     touch the output file
-  tar          try tar, gnutar, gtar, then tar without non-portable flags
-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]"
-    ;;
-
-  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing 0.3 - GNU automake"
-    ;;
-
-  -*)
-    echo 1>&2 "$0: Unknown \`$1' option"
-    echo 1>&2 "Try \`$0 --help' for more information"
-    exit 1
-    ;;
-
-  aclocal)
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
-         to install the \`Automake' and \`Perl' packages.  Grab them from
-         any GNU archive site."
-    touch aclocal.m4
-    ;;
-
-  autoconf)
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`${configure_ac}'.  You might want to install the
-         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
-         archive site."
-    touch configure
-    ;;
-
-  autoheader)
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
-         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
-         from any GNU archive site."
-    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
-    test -z "$files" && files="config.h"
-    touch_files=
-    for f in $files; do
-      case "$f" in
-      *:*) touch_files="$touch_files "`echo "$f" |
-				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
-      *) touch_files="$touch_files $f.in";;
-      esac
-    done
-    touch $touch_files
-    ;;
-
-  automake)
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
-         You might want to install the \`Automake' and \`Perl' packages.
-         Grab them from any GNU archive site."
-    find . -type f -name Makefile.am -print |
-	   sed 's/\.am$/.in/' |
-	   while read f; do touch "$f"; done
-    ;;
-
-  bison|yacc)
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified a \`.y' file.  You may need the \`Bison' package
-         in order for those modifications to take effect.  You can get
-         \`Bison' from any GNU archive site."
-    rm -f y.tab.c y.tab.h
-    if [ $# -ne 1 ]; then
-        eval LASTARG="\${$#}"
-	case "$LASTARG" in
-	*.y)
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" y.tab.c
-	    fi
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" y.tab.h
-	    fi
-	  ;;
-	esac
-    fi
-    if [ ! -f y.tab.h ]; then
-	echo >y.tab.h
-    fi
-    if [ ! -f y.tab.c ]; then
-	echo 'main() { return 0; }' >y.tab.c
-    fi
-    ;;
-
-  lex|flex)
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified a \`.l' file.  You may need the \`Flex' package
-         in order for those modifications to take effect.  You can get
-         \`Flex' from any GNU archive site."
-    rm -f lex.yy.c
-    if [ $# -ne 1 ]; then
-        eval LASTARG="\${$#}"
-	case "$LASTARG" in
-	*.l)
-	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" lex.yy.c
-	    fi
-	  ;;
-	esac
-    fi
-    if [ ! -f lex.yy.c ]; then
-	echo 'main() { return 0; }' >lex.yy.c
-    fi
-    ;;
-
-  help2man)
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-	 you modified a dependency of a manual page.  You may need the
-	 \`Help2man' package in order for those modifications to take
-	 effect.  You can get \`Help2man' from any GNU archive site."
-
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-    if test -z "$file"; then
-	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
-    fi
-    if [ -f "$file" ]; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo ".ab help2man is required to generate this page"
-	exit 1
-    fi
-    ;;
-
-  makeinfo)
-    if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
-       # We have makeinfo, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified a \`.texi' or \`.texinfo' file, or any other file
-         indirectly affecting the aspect of the manual.  The spurious
-         call might also be the consequence of using a buggy \`make' (AIX,
-         DU, IRIX).  You might want to install the \`Texinfo' package or
-         the \`GNU make' package.  Grab either from any GNU archive site."
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-    if test -z "$file"; then
-      file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
-    fi
-    touch $file
-    ;;
-
-  tar)
-    shift
-    if test -n "$run"; then
-      echo 1>&2 "ERROR: \`tar' requires --run"
-      exit 1
-    fi
-
-    # We have already tried tar in the generic part.
-    # Look for gnutar/gtar before invocation to avoid ugly error
-    # messages.
-    if (gnutar --version > /dev/null 2>&1); then
-       gnutar ${1+"$@"} && exit 0
-    fi
-    if (gtar --version > /dev/null 2>&1); then
-       gtar ${1+"$@"} && exit 0
-    fi
-    firstarg="$1"
-    if shift; then
-	case "$firstarg" in
-	*o*)
-	    firstarg=`echo "$firstarg" | sed s/o//`
-	    tar "$firstarg" ${1+"$@"} && exit 0
-	    ;;
-	esac
-	case "$firstarg" in
-	*h*)
-	    firstarg=`echo "$firstarg" | sed s/h//`
-	    tar "$firstarg" ${1+"$@"} && exit 0
-	    ;;
-	esac
-    fi
-
-    echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
-         You may want to install GNU tar or Free paxutils, or check the
-         command line arguments."
-    exit 1
-    ;;
-
-  *)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
-         system.  You might have modified some files without having the
-         proper tools for further handling them.  Check the \`README' file,
-         it often tells you about the needed prerequirements for installing
-         this package.  You may also peek at any GNU archive site, in case
-         some other package would contain this missing \`$1' program."
-    exit 1
-    ;;
-esac
-
-exit 0

mkinstalldirs

@@ -1,40 +0,0 @@
-#! /bin/sh
-# mkinstalldirs --- make directory hierarchy
-# Author: Noah Friedman <[email protected]>
-# Created: 1993-05-16
-# Public domain
-
-# $Id$
-
-errstatus=0
-
-for file
-do
-   set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
-   shift
-
-   pathcomp=
-   for d
-   do
-     pathcomp="$pathcomp$d"
-     case "$pathcomp" in
-       -* ) pathcomp=./$pathcomp ;;
-     esac
-
-     if test ! -d "$pathcomp"; then
-        echo "mkdir $pathcomp"
-
-        mkdir "$pathcomp" || lasterr=$?
-
-        if test ! -d "$pathcomp"; then
-  	  errstatus=$lasterr
-        fi
-     fi
-
-     pathcomp="$pathcomp/"
-   done
-done
-
-exit $errstatus
-
-# mkinstalldirs ends here

po/.cvsignore

@@ -4,3 +4,4 @@ Makefile.in
 POTFILES
 bison.pot
 stamp-cat-id
+*.gmo

po/ChangeLog

@@ -1,3 +1,8 @@
+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.

po/POTFILES.in

@@ -13,7 +13,6 @@ src/print.c
 src/print_graph.c
 src/reader.c
 src/reduce.c
-src/vcg.c
 
 lib/error.c
 lib/getopt.c

po/de.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.25\n"
-"POT-Creation-Date: 2001-08-15 10:53+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"
@@ -18,90 +18,90 @@ msgstr ""
 msgid "too many states (max %d)"
 msgstr ""
 
-#: lib/error.c:117 src/complain.c:100
+#: lib/error.c:117 src/complain.c:96
 msgid "Unknown system error"
 msgstr ""
 
-#: src/complain.c:154
+#: src/complain.c:150
 msgid "warning: "
 msgstr ""
 
-#: src/complain.c:242 src/complain.c:283
+#: src/complain.c:238 src/complain.c:279
 #, fuzzy
 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:130
+#: src/files.c:133
 #, c-format
 msgid "cannot open file `%s'"
 msgstr ""
 
-#: src/files.c:149
+#: src/files.c:152
 msgid "cannot close file"
 msgstr ""
 
@@ -182,153 +182,155 @@ msgid ""
 "  -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"
+"  -g, --graph                also produce a VCG graph description of the "
+"automaton\n"
 msgstr ""
 
-#: src/getargs.c:124
+#: src/getargs.c:126
 msgid "Report bugs to <[email protected]>.\n"
 msgstr ""
 
 #. Some efforts were made to ease the translators' task, please
 #. continue.
-#: src/getargs.c:138
+#: src/getargs.c:140
 #, c-format
 msgid "bison (GNU Bison) %s"
 msgstr ""
 
-#: src/getargs.c:143
+#: src/getargs.c:145
 msgid ""
 "Copyright 1984, 1986, 1989, 1992, 2000, 2001 Free Software Foundation, Inc.\n"
 msgstr ""
 
-#: src/getargs.c:147
+#: src/getargs.c:149
 msgid ""
 "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"
 msgstr ""
 
-#: src/getargs.c:208 src/lex.c:635
+#: src/getargs.c:214 src/lex.c:650
 #, c-format
 msgid "`%s' is no longer supported"
 msgstr ""
 
-#: src/getargs.c:232
+#: src/getargs.c:238
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: src/getargs.c:239
+#: src/getargs.c:245
 #, c-format
 msgid "%s: no grammar file given\n"
 msgstr "%s: keine Grammatik-Datei angegeben\n"
 
-#: src/getargs.c:243
+#: src/getargs.c:249
 #, fuzzy, c-format
 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:70
+#: src/lex.c:78
 msgid "unexpected `/' found and ignored"
 msgstr "»/« wird hier nicht erwartet und wird deshalb ignoriert"
 
-#: src/lex.c:99 src/reader.c:270
+#: src/lex.c:107 src/reader.c:269
 msgid "unterminated comment"
 msgstr "unbeendeter Kommentar"
 
-#: src/lex.c:131
+#: src/lex.c:139
 #, fuzzy
 msgid "unexpected end of file"
 msgstr "Datei endet unerwartet"
 
 # Oder soll man den Begriff "Escapezeichen" verwenden?
-#: src/lex.c:160
+#: src/lex.c:168
 msgid "unescaped newline in constant"
 msgstr "nicht maskiertes Zeilenendezeichen in Konstante"
 
-#: src/lex.c:202
+#: 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:227
+#: 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:239
+#: src/lex.c:247
 #, c-format
 msgid "unknown escape sequence: `\\' followed by `%s'"
 msgstr "unbekanntes Fluchtzeichen: »\\« gefolgt von »%s«"
 
-#: src/lex.c:335
+#: src/lex.c:343
 msgid "unterminated type name at end of file"
 msgstr "unerwarteter Typname am Ende der Datei"
 
-#: src/lex.c:338
+#: src/lex.c:346
 msgid "unterminated type name"
 msgstr "unerwarteter Typname"
 
-#: src/lex.c:430
+#: 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 ""
@@ -337,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
+#: src/print.c:240
-msgid "\t\t/* empty */"
+msgid "empty"
-msgstr "\t\t/* leer */"
+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 ""
@@ -361,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 ""
@@ -369,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:"
 
@@ -387,116 +391,116 @@ 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:1268
+#: 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:1246
+#: 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:759 src/reader.c:1072 src/reader.c:1143
+#: 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:791
+#: src/reader.c:792
 #, fuzzy, c-format
 msgid "argument of %%expect is not an integer"
 msgstr "Argument von %expect ist keine ganze Zahl"
@@ -511,127 +515,117 @@ msgstr "unerwartetes Symbol %s, hier wird ein Bezeichner erwartet"
 msgid "expected string constant instead of %s"
 msgstr "hier wird eine Zeichenkette erwartet, nicht %s"
 
-#: src/reader.c:887
+#: src/reader.c:1005
-#, fuzzy, c-format
-msgid "multiple %%header_extension declarations"
-msgstr "erneute %union Definition"
-
-#: src/reader.c:902
-#, fuzzy, c-format
-msgid "multiple %%source_extension declarations"
-msgstr "erneute %union Definition"
-
-#: src/reader.c:988
 #, c-format
 msgid "unrecognized: %s"
 msgstr "unbekannt: %s"
 
-#: src/reader.c:993
+#: src/reader.c:1010
 msgid "no input grammar"
 msgstr "keine Eingabe-Grammatik"
 
-#: src/reader.c:998
+#: src/reader.c:1015
 #, c-format
 msgid "unknown character: %s"
 msgstr "unbekanntes Zeichen: %s"
 
-#: src/reader.c:1166
+#: src/reader.c:1183
 #, fuzzy, c-format
 msgid "unterminated %guard clause"
 msgstr "unbeendeter %%guard Fall"
 
-#: src/reader.c:1333
+#: 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:1340
+#: src/reader.c:1357
 msgid "grammar starts with vertical bar"
 msgstr "Grammatik fängt mit einem vertikalen Strich (»|«) an"
 
-#: src/reader.c:1371
+#: 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:1473
+#: src/reader.c:1490
 msgid "two @prec's in a row"
 msgstr "zwei @prec Anweisungen nacheinander"
 
-#: src/reader.c:1481
+#: src/reader.c:1498
-#, fuzzy, c-format
+#, c-format
 msgid "%%guard present but %%semantic_parser not specified"
 msgstr ""
 "%%guard Anweisung vorhanden, jedoch wird %%semantic_parser nicht angegeben"
 
-#: src/reader.c:1490
+#: src/reader.c:1507
 msgid "two actions at end of one rule"
 msgstr "Zwei Aktionen am Ende einer Regel"
 
-#: src/reader.c:1504
+#: src/reader.c:1521
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "Typkonflikt (»%s« »%s«) bei Default Aktion"
 
-#: src/reader.c:1510
+#: 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:1554
+#: src/reader.c:1571
 #, c-format
 msgid "invalid input: %s"
 msgstr "ungültige Eingabe: %s"
 
-#: src/reader.c:1562
+#: 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:1565
+#: src/reader.c:1582
 msgid "no rules in the input grammar"
 msgstr "Eingabegrammatik enthält keine Regeln"
 
-#: src/reader.c:1589
+#: 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:1694
+#: 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:1706
+#: 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:1757
+#: 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:1770
+#: src/reader.c:1782
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "das Startsymbol %s ist undefiniert"
 
-#: src/reader.c:1772
+#: src/reader.c:1784
 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "das Startsymbol %s ist ein Token"
 
-#: src/reduce.c:404
+#: src/reduce.c:401
 #, fuzzy
 msgid "Useless nonterminals:"
 msgstr ""
 "Nutzlose Nicht-Terminale:\n"
 "\n"
 
-#: src/reduce.c:419
+#: src/reduce.c:416
 #, fuzzy
 msgid "Terminals which are not used:"
 msgstr ""
@@ -640,7 +634,7 @@ msgstr ""
 "Nicht genutzte Terminale:\n"
 "\n"
 
-#: src/reduce.c:430
+#: src/reduce.c:427
 #, fuzzy
 msgid "Useless rules:"
 msgstr ""
@@ -649,7 +643,7 @@ msgstr ""
 "Ungenutzte Regeln:\n"
 "\n"
 
-#: src/reduce.c:459
+#: src/reduce.c:456
 msgid ""
 "Variables\n"
 "---------\n"
@@ -659,11 +653,11 @@ msgstr ""
 "---------\n"
 "\n"
 
-#: src/reduce.c:461
+#: src/reduce.c:458
 msgid "Value  Sprec    Sassoc    Tag\n"
 msgstr "Wert   Sprec    Sassoc    Tag\n"
 
-#: src/reduce.c:466
+#: src/reduce.c:463
 msgid ""
 "Rules\n"
 "-----\n"
@@ -673,7 +667,7 @@ msgstr ""
 "------\n"
 "\n"
 
-#: src/reduce.c:477
+#: src/reduce.c:474
 msgid ""
 "Rules interpreted\n"
 "-----------------\n"
@@ -683,36 +677,36 @@ msgstr ""
 "----------------------\n"
 "\n"
 
-#: src/reduce.c:494
+#: src/reduce.c:491
 #, c-format
 msgid "%d rules never reduced\n"
 msgstr "%d wurde niemals reduziert\n"
 
-#: src/reduce.c:496
+#: src/reduce.c:493
 #, c-format
 msgid "%s contains "
 msgstr "%s enthält "
 
-#: src/reduce.c:500
+#: src/reduce.c:497
 #, c-format
 msgid "%d useless nonterminal%s"
 msgstr "%d ungenutzte Nicht-Terminal"
 
-#: src/reduce.c:505
+#: src/reduce.c:502
 msgid " and "
 msgstr " und "
 
-#: src/reduce.c:509
+#: src/reduce.c:506
 #, c-format
 msgid "%d useless rule%s"
 msgstr "%d ungenutzte Regel"
 
-#: src/reduce.c:542
+#: 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:555
+#: src/reduce.c:552
 #, c-format
 msgid ""
 "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n"
@@ -720,50 +714,6 @@ msgstr ""
 "Reduzierung von %s definiert %d Terminal, %d Nicht-Terminal und %d "
 "Produktionen.\n"
 
-#: src/vcg.c:234
-msgid "vcg graph: no such color."
-msgstr ""
-
-#: src/vcg.c:249
-msgid "vcg graph: no such text mode"
-msgstr ""
-
-#: src/vcg.c:265
-msgid "vcg graph: no such shape"
-msgstr ""
-
-#: src/vcg.c:304
-msgid "vcg graph: no such decision"
-msgstr ""
-
-#: src/vcg.c:320
-msgid "vcg graph: no such an orientation"
-msgstr ""
-
-#: src/vcg.c:335
-msgid "vcg graph: no such an alignement"
-msgstr ""
-
-#: src/vcg.c:349
-msgid "vcg graph: no such an arrow mode"
-msgstr ""
-
-#: src/vcg.c:365
-msgid "vcg graph: no such crossing_type"
-msgstr ""
-
-#: src/vcg.c:382
-msgid "vcg graph: no such view"
-msgstr ""
-
-#: src/vcg.c:398
-msgid "vcg graph: no such linestyle"
-msgstr ""
-
-#: src/vcg.c:413
-msgid "vcg graph: no such an arrowstyle"
-msgstr ""
-
 #: lib/getopt.c:675
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
@@ -844,37 +794,14 @@ 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 ""
 
-#, fuzzy
-#~ msgid "Memory exhausted"
-#~ msgstr "%s: Hauptspeicher erschöpft\n"
-
-#~ msgid "$%s is invalid"
-#~ msgstr "$%s ist unzulässig"
-
-#~ msgid "unmatched close-brace (`}')"
-#~ msgstr "schließende geschweifte Klammer (»}«) hat kein Gegenstück"
-
-#~ msgid "unmatched right brace (`}')"
-#~ msgstr "schließende geschweifte Klammer (»}«) hat kein Gegenstück"
-
-#~ msgid "unterminated comment at end of file"
-#~ msgstr "unbeendeter Kommentar am Dateiende"
-
-#~ msgid "ill-formed %type declaration"
-#~ msgstr "falsch geformte %type Deklaration"
-
-#~ msgid "gotos"
-#~ msgstr "»goto« Anweisungen"
-
-#, fuzzy
 #~ msgid ""
 #~ "Usage: %s [-dhklntvyV] [-b file-prefix] [-o outfile] [-p name-prefix]\n"
 #~ "       [--debug] [--defines] [--fixed-output-files] [--no-lines]\n"
@@ -882,8 +809,6 @@ msgstr ""
 #~ "       [--no-parser] [--token-table]\n"
 #~ "       [--file-prefix=prefix] [--name-prefix=prefix]\n"
 #~ "       [--output=outfile] grammar-file\n"
-#~ "\n"
-#~ "Report bugs to [email protected]\n"
 #~ msgstr ""
 #~ "Benutzung: %s [-dhklntvyV] [-b Datei-Präfix] [-o Ausgabe-Datei]\n"
 #~ "           [-p Namen-Präfix] [--debug] [--defines] [--fixed-output-"
@@ -893,15 +818,8 @@ msgstr ""
 #~ "           [--file-prefix=Präfix] [--name-prefix=Präfix]\n"
 #~ "           [--output=Ausgabe-Datei] Grammatik-Datei\n"
 
-#, fuzzy
+#~ msgid "gotos"
-#~ msgid "%s:%d: fatal error: "
+#~ msgstr "»goto« Anweisungen"
-#~ msgstr "fataler Fehler: %s\n"
-
-#~ msgid "unterminated comment in `%{' definition"
-#~ msgstr "unbeendeter Kommentar in »%{« Definition"
-
-#~ msgid "invalid @-construct"
-#~ msgstr "unzulässig @-Konstruktion"
 
 #~ msgid "\"%s\", line %d: %s\n"
 #~ msgstr "»%s«, Zeile %d: %s\n"
@@ -914,3 +832,30 @@ 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"
+
+#~ msgid "multiple %union declarations"
+#~ msgstr "erneute %union Definition"
+
+#~ msgid "unterminated comment at end of file"
+#~ msgstr "unbeendeter Kommentar am Dateiende"
+
+#~ msgid "unmatched close-brace (`}')"
+#~ msgstr "schließende geschweifte Klammer (»}«) hat kein Gegenstück"
+
+#~ msgid "unmatched right brace (`}')"
+#~ msgstr "schließende geschweifte Klammer (»}«) hat kein Gegenstück"
+
+#~ msgid "$%s is invalid"
+#~ msgstr "$%s ist unzulässig"
+
+#~ msgid "invalid @-construct"
+#~ msgstr "unzulässig @-Konstruktion"
+
+#~ msgid "ill-formed %type declaration"
+#~ msgstr "falsch geformte %type Deklaration"

po/es.po

@@ -30,7 +30,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU bison 1.25\n"
-"POT-Creation-Date: 2001-08-15 10:53+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"
@@ -43,11 +43,11 @@ msgstr ""
 msgid "too many states (max %d)"
 msgstr ""
 
-#: lib/error.c:117 src/complain.c:100
+#: lib/error.c:117 src/complain.c:96
 msgid "Unknown system error"
 msgstr ""
 
-#: src/complain.c:154
+#: src/complain.c:150
 msgid "warning: "
 msgstr ""
 
@@ -58,60 +58,60 @@ msgstr ""
 # La verdad es que a mi lo de error fatal me suena fatal
 # ngp
 #
-#: src/complain.c:242 src/complain.c:283
+#: src/complain.c:238 src/complain.c:279
 #, fuzzy
 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:130
+#: src/files.c:133
 #, c-format
 msgid "cannot open file `%s'"
 msgstr ""
 
-#: src/files.c:149
+#: src/files.c:152
 msgid "cannot close file"
 msgstr ""
 
@@ -245,111 +245,113 @@ msgid ""
 "  -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"
+"  -g, --graph                also produce a VCG graph description of the "
+"automaton\n"
 msgstr ""
 
-#: src/getargs.c:124
+#: src/getargs.c:126
 msgid "Report bugs to <[email protected]>.\n"
 msgstr ""
 
 #. Some efforts were made to ease the translators' task, please
 #. continue.
-#: src/getargs.c:138
+#: src/getargs.c:140
 #, c-format
 msgid "bison (GNU Bison) %s"
 msgstr ""
 
-#: src/getargs.c:143
+#: src/getargs.c:145
 msgid ""
 "Copyright 1984, 1986, 1989, 1992, 2000, 2001 Free Software Foundation, Inc.\n"
 msgstr ""
 
-#: src/getargs.c:147
+#: src/getargs.c:149
 msgid ""
 "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"
 msgstr ""
 
-#: src/getargs.c:208 src/lex.c:635
+#: src/getargs.c:214 src/lex.c:650
 #, c-format
 msgid "`%s' is no longer supported"
 msgstr ""
 
-#: src/getargs.c:232
+#: src/getargs.c:238
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
 # Me parece menos "computadora" decir "ningún fichero de gramática" - cll
 #
-#: src/getargs.c:239
+#: src/getargs.c:245
 #, c-format
 msgid "%s: no grammar file given\n"
 msgstr "%s: no se ha especificado ningún fichero de gramática\n"
 
 # Ignorar es no saber, to ignore es no hacer caso, que no es lo mismo. sv
-#: src/getargs.c:243
+#: src/getargs.c:249
 #, fuzzy, c-format
 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:70
+#: 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:99 src/reader.c:270
+#: src/lex.c:107 src/reader.c:269
 msgid "unterminated comment"
 msgstr "comentario sin terminar"
 
-#: src/lex.c:131
+#: src/lex.c:139
 #, fuzzy
 msgid "unexpected end of file"
 msgstr "Fin de fichero inesperado"
 
 # ¿unescaped?
-#: src/lex.c:160
+#: src/lex.c:168
 msgid "unescaped newline in constant"
 msgstr "salto de línea en constante sin secuencia de escape"
 
-#: src/lex.c:202
+#: 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:227
+#: src/lex.c:235
 #, c-format
 msgid "hexadecimal value above 255: `\\x%x'"
 msgstr "valor hexadecimal mayor que 255: `\\x%x'"
 
-#: src/lex.c:239
+#: src/lex.c:247
 #, c-format
 msgid "unknown escape sequence: `\\' followed by `%s'"
 msgstr "secuencia de escape desconocida: `\\' seguido de `%s'"
 
-#: src/lex.c:335
+#: 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:338
+#: src/lex.c:346
 msgid "unterminated type name"
 msgstr "nombre de tipo sin terminar"
 
 # ¿multicarácter o multicaracteres? sv
-#: src/lex.c:430
+#: 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"
 
@@ -358,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 ""
@@ -410,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
+#: src/print.c:240
-# el contrario, pudiera cualquiera de los casos, debieras traducirlo
+msgid "empty"
-# como `vacía/o' - cll
+msgstr ""
-# 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:253
+#. TERMINAL (type #) : rule #s terminal is on RHS
+#: src/print.c:244
 #, fuzzy
 msgid "Terminals, with rules where they appear"
 msgstr ""
@@ -439,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:"
 
@@ -464,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:1268
+#: 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:1246
+#: 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"
@@ -562,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 ""
@@ -572,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:759 src/reader.c:1072 src/reader.c:1143
+#: src/reader.c:760 src/reader.c:1089 src/reader.c:1160
 #, fuzzy, c-format
 msgid "unmatched %s"
 msgstr "`{' desemparejada"
 
-#: src/reader.c:791
+#: src/reader.c:792
 #, fuzzy, c-format
 msgid "argument of %%expect is not an integer"
 msgstr "el argumento de %expect no es un entero"
@@ -604,26 +603,16 @@ msgstr "no se reconoce el
 msgid "expected string constant instead of %s"
 msgstr "se esperaba una cadena constante en lugar de %s"
 
-#: src/reader.c:887
+#: src/reader.c:1005
-#, fuzzy, c-format
-msgid "multiple %%header_extension declarations"
-msgstr "declaraciones múltiples de %union"
-
-#: src/reader.c:902
-#, fuzzy, c-format
-msgid "multiple %%source_extension declarations"
-msgstr "declaraciones múltiples de %union"
-
-#: src/reader.c:988
 #, c-format
 msgid "unrecognized: %s"
 msgstr "no reconocido: %s"
 
-#: src/reader.c:993
+#: src/reader.c:1010
 msgid "no input grammar"
 msgstr "no hay gramática de entrada"
 
-#: src/reader.c:998
+#: src/reader.c:1015
 #, c-format
 msgid "unknown character: %s"
 msgstr "carácter desconocido: %s"
@@ -632,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:1166
+#: src/reader.c:1183
 #, fuzzy, c-format
 msgid "unterminated %guard clause"
 msgstr "cláusula %%guard sin terminar"
 
-#: src/reader.c:1333
+#: 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:1340
+#: src/reader.c:1357
 msgid "grammar starts with vertical bar"
 msgstr "la gramática comienza con una barra vertical"
 
-#: src/reader.c:1371
+#: 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:1473
+#: 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:1481
+#: src/reader.c:1498
-#, fuzzy, c-format
+#, c-format
 msgid "%%guard present but %%semantic_parser not specified"
 msgstr "%%guard presente pero %%semantic_parser está sin especificar"
 
-#: src/reader.c:1490
+#: src/reader.c:1507
 msgid "two actions at end of one rule"
 msgstr "dos acciones al final de una regla"
 
-#: src/reader.c:1504
+#: 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:1510
+#: 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:1554
+#: src/reader.c:1571
 #, c-format
 msgid "invalid input: %s"
 msgstr "entrada no válida: %s"
 
-#: src/reader.c:1562
+#: 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:1565
+#: 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:1589
+#: 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:1694
+#: src/reader.c:1712
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "precedencias en conflicto entre %s y %s"
 
-#: src/reader.c:1706
+#: 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:1757
+#: 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:1770
+#: 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:1772
+#: 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:404
+#: src/reduce.c:401
 #, fuzzy
 msgid "Useless nonterminals:"
 msgstr ""
 "No terminales sin uso:\n"
 "\n"
 
-#: src/reduce.c:419
+#: src/reduce.c:416
 #, fuzzy
 msgid "Terminals which are not used:"
 msgstr ""
@@ -739,7 +728,7 @@ msgstr ""
 "Terminales que no se usan:\n"
 "\n"
 
-#: src/reduce.c:430
+#: src/reduce.c:427
 #, fuzzy
 msgid "Useless rules:"
 msgstr ""
@@ -748,7 +737,7 @@ msgstr ""
 "Reglas sin uso:\n"
 "\n"
 
-#: src/reduce.c:459
+#: src/reduce.c:456
 msgid ""
 "Variables\n"
 "---------\n"
@@ -758,11 +747,11 @@ msgstr ""
 "---------\n"
 "\n"
 
-#: src/reduce.c:461
+#: src/reduce.c:458
 msgid "Value  Sprec    Sassoc    Tag\n"
 msgstr "Valor  Sprec    Sasoc     Tag\n"
 
-#: src/reduce.c:466
+#: src/reduce.c:463
 msgid ""
 "Rules\n"
 "-----\n"
@@ -772,7 +761,7 @@ msgstr ""
 "------\n"
 "\n"
 
-#: src/reduce.c:477
+#: src/reduce.c:474
 msgid ""
 "Rules interpreted\n"
 "-----------------\n"
@@ -782,31 +771,31 @@ msgstr ""
 "--------------------\n"
 "\n"
 
-#: src/reduce.c:494
+#: src/reduce.c:491
 #, c-format
 msgid "%d rules never reduced\n"
 msgstr "%d reglas que nunca se han reducido\n"
 
-#: src/reduce.c:496
+#: src/reduce.c:493
 #, c-format
 msgid "%s contains "
 msgstr "%s contiene "
 
-#: src/reduce.c:500
+#: src/reduce.c:497
 #, c-format
 msgid "%d useless nonterminal%s"
 msgstr "%d no terminales %s sin uso"
 
-#: src/reduce.c:505
+#: src/reduce.c:502
 msgid " and "
 msgstr " y "
 
-#: src/reduce.c:509
+#: src/reduce.c:506
 #, c-format
 msgid "%d useless rule%s"
 msgstr "%d regla%s sin uso"
 
-#: src/reduce.c:542
+#: 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"
@@ -823,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:555
+#: src/reduce.c:552
 #, c-format
 msgid ""
 "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n"
@@ -831,50 +820,6 @@ msgstr ""
 "la reducción de %s define %d terminal%s, %d no terminal%s, y %d produccion%"
 "s.\n"
 
-#: src/vcg.c:234
-msgid "vcg graph: no such color."
-msgstr ""
-
-#: src/vcg.c:249
-msgid "vcg graph: no such text mode"
-msgstr ""
-
-#: src/vcg.c:265
-msgid "vcg graph: no such shape"
-msgstr ""
-
-#: src/vcg.c:304
-msgid "vcg graph: no such decision"
-msgstr ""
-
-#: src/vcg.c:320
-msgid "vcg graph: no such an orientation"
-msgstr ""
-
-#: src/vcg.c:335
-msgid "vcg graph: no such an alignement"
-msgstr ""
-
-#: src/vcg.c:349
-msgid "vcg graph: no such an arrow mode"
-msgstr ""
-
-#: src/vcg.c:365
-msgid "vcg graph: no such crossing_type"
-msgstr ""
-
-#: src/vcg.c:382
-msgid "vcg graph: no such view"
-msgstr ""
-
-#: src/vcg.c:398
-msgid "vcg graph: no such linestyle"
-msgstr ""
-
-#: src/vcg.c:413
-msgid "vcg graph: no such an arrowstyle"
-msgstr ""
-
 #: lib/getopt.c:675
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
@@ -979,45 +924,14 @@ 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 ""
 
-#, fuzzy
-#~ msgid "Memory exhausted"
-#~ msgstr "%s: memoria agotada\n"
-
-#~ msgid "$%s is invalid"
-#~ msgstr "$%s no es válida"
-
-#~ msgid "unmatched close-brace (`}')"
-#~ msgstr "llave de cierre (`}') desemparejada"
-
-#~ msgid "unmatched right brace (`}')"
-#~ msgstr "llave derecha (`}') desemparejada"
-
-#~ msgid "unterminated comment at end of file"
-#~ msgstr "comentario sin terminar al final del fichero"
-
-#~ msgid "ill-formed %type declaration"
-#~ msgstr "declaración %type incorrectamente formada"
-
-# Duda: desconozco en qué caso se emplea esto. Estúdialo bien y
-# comprueba que realmente es necesario emplear una palabra no
-# española. Recuerda que el acuerdo que existe en la lista de correo en
-# español es, en el peor de los casos, poner algo en español y luego en
-# inglés a modo de recordatorio. Por ejemplo: "tubería (pipe)" - cll
-#
-# miré el código, lo que indica es el número de gotos del código
-# ngp
-#
-#~ msgid "gotos"
-#~ msgstr "saltos (gotos)"
-
 # ¿Por qué no lo pones en mayúsculas? Al fin y al cabo, eso es lo que
 # haces luego con "FDERIVES" que traduces como "FDERIVACIONES", ... -
 # cll
@@ -1069,7 +983,6 @@ msgstr ""
 #~ "\n"
 #~ "%s deriva\n"
 
-#, fuzzy
 #~ msgid ""
 #~ "Usage: %s [-dhklntvyV] [-b file-prefix] [-o outfile] [-p name-prefix]\n"
 #~ "       [--debug] [--defines] [--fixed-output-files] [--no-lines]\n"
@@ -1077,8 +990,6 @@ msgstr ""
 #~ "       [--no-parser] [--token-table]\n"
 #~ "       [--file-prefix=prefix] [--name-prefix=prefix]\n"
 #~ "       [--output=outfile] grammar-file\n"
-#~ "\n"
-#~ "Report bugs to [email protected]\n"
 #~ msgstr ""
 #~ "Uso: %s [-dhklntvyV] [-b prefijo-ficheros] [-o fichero-salida] [-p "
 #~ "prefijo-nombres]\n"
@@ -1088,26 +999,17 @@ msgstr ""
 #~ "     [--file-prefix=prefijo] [--name-prefix=prefijo]\n"
 #~ "     [--output=fichero-salida ] fichero-de-gramática\n"
 
-# Duda: desconozco cuál será el convenio en la lista de correo a
+# Duda: desconozco en qué caso se emplea esto. Estúdialo bien y
-# propósito de "fatal". Por favor, comprueba que "error grave" es
+# comprueba que realmente es necesario emplear una palabra no
-# preferido por todos los miembros a "error fatal" - cll
+# española. Recuerda que el acuerdo que existe en la lista de correo en
-# veremos que dice la mayoría, como hay otros 2 revisores
+# español es, en el peor de los casos, poner algo en español y luego en
-# La verdad es que a mi lo de error fatal me suena fatal
+# inglés a modo de recordatorio. Por ejemplo: "tubería (pipe)" - cll
+#
+# miré el código, lo que indica es el número de gotos del código
 # ngp
 #
-#, fuzzy
+#~ msgid "gotos"
-#~ msgid "%s:%d: fatal error: "
+#~ msgstr "saltos (gotos)"
-#~ msgstr "error grave: %s\n"
-
-#~ msgid "unterminated comment in `%{' definition"
-#~ msgstr "comentario sin terminar en la definición `%{'"
-
-# Duda: ¿`construct' no se refiere a `construcción'? Si es así, el
-# mensaje debiera ser "@-construcción no válida" - cll
-# O incluso "construcción @" sv
-# en ese caso supongo que sería @-construction ngp
-#~ msgid "invalid @-construct"
-#~ msgstr "@-constructo no válido"
 
 #~ msgid "\"%s\", line %d: %s\n"
 #~ msgstr "\"%s\", línea %d: %s\n"
@@ -1122,3 +1024,39 @@ msgstr ""
 # de gettext dice cómo ha de hacerse, no de cualquier manera. sv
 #~ 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 `%{'"
+
+#~ msgid "multiple %union declarations"
+#~ msgstr "declaraciones múltiples de %union"
+
+#~ msgid "unterminated comment at end of file"
+#~ msgstr "comentario sin terminar al final del fichero"
+
+#~ msgid "unmatched close-brace (`}')"
+#~ msgstr "llave de cierre (`}') desemparejada"
+
+#~ msgid "unmatched right brace (`}')"
+#~ msgstr "llave derecha (`}') desemparejada"
+
+#~ msgid "$%s is invalid"
+#~ msgstr "$%s no es válida"
+
+# Duda: ¿`construct' no se refiere a `construcción'? Si es así, el
+# mensaje debiera ser "@-construcción no válida" - cll
+# O incluso "construcción @" sv
+# en ese caso supongo que sería @-construction ngp
+#~ msgid "invalid @-construct"
+#~ msgstr "@-constructo no válido"
+
+#~ msgid "ill-formed %type declaration"
+#~ msgstr "declaración %type incorrectamente formada"

po/ja.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU bison 1.28\n"
-"POT-Creation-Date: 2001-08-15 10:53+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"
@@ -18,90 +18,90 @@ msgstr ""
 msgid "too many states (max %d)"
 msgstr "%s の数が多すぎます (最大 %d)"
 
-#: lib/error.c:117 src/complain.c:100
+#: lib/error.c:117 src/complain.c:96
 msgid "Unknown system error"
 msgstr ""
 
-#: src/complain.c:154
+#: src/complain.c:150
 msgid "warning: "
 msgstr ""
 
-#: src/complain.c:242 src/complain.c:283
+#: src/complain.c:238 src/complain.c:279
 #, fuzzy
 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:130
+#: src/files.c:133
 #, c-format
 msgid "cannot open file `%s'"
 msgstr ""
 
-#: src/files.c:149
+#: src/files.c:152
 msgid "cannot close file"
 msgstr ""
 
@@ -188,152 +188,154 @@ msgid ""
 "  -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"
+"  -g, --graph                also produce a VCG graph description of the "
+"automaton\n"
 msgstr ""
 
-#: src/getargs.c:124
+#: src/getargs.c:126
 msgid "Report bugs to <[email protected]>.\n"
 msgstr ""
 
 #. Some efforts were made to ease the translators' task, please
 #. continue.
-#: src/getargs.c:138
+#: src/getargs.c:140
 #, c-format
 msgid "bison (GNU Bison) %s"
 msgstr ""
 
-#: src/getargs.c:143
+#: src/getargs.c:145
 msgid ""
 "Copyright 1984, 1986, 1989, 1992, 2000, 2001 Free Software Foundation, Inc.\n"
 msgstr ""
 
-#: src/getargs.c:147
+#: src/getargs.c:149
 msgid ""
 "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"
 msgstr ""
 
-#: src/getargs.c:208 src/lex.c:635
+#: src/getargs.c:214 src/lex.c:650
 #, c-format
 msgid "`%s' is no longer supported"
 msgstr ""
 
-#: src/getargs.c:232
+#: src/getargs.c:238
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: src/getargs.c:239
+#: src/getargs.c:245
 #, c-format
 msgid "%s: no grammar file given\n"
 msgstr "%s: 文法ファイルが指定されていません\n"
 
-#: src/getargs.c:243
+#: src/getargs.c:249
 #, fuzzy, c-format
 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:70
+#: src/lex.c:78
 msgid "unexpected `/' found and ignored"
 msgstr "予期しない `/' が見つかり、無視されました"
 
-#: src/lex.c:99 src/reader.c:270
+#: src/lex.c:107 src/reader.c:269
 msgid "unterminated comment"
 msgstr "閉じていないコメントです"
 
-#: src/lex.c:131
+#: src/lex.c:139
 #, fuzzy
 msgid "unexpected end of file"
 msgstr "予期しないファイルの終端です"
 
-#: src/lex.c:160
+#: src/lex.c:168
 msgid "unescaped newline in constant"
 msgstr "定数の中にエスケープされていない改行があります"
 
-#: src/lex.c:202
+#: src/lex.c:210
 #, c-format
 msgid "octal value outside range 0...255: `\\%o'"
 msgstr "8 進数の値が 0...255 の範囲外です: `\\%o'"
 
-#: src/lex.c:227
+#: src/lex.c:235
 #, c-format
 msgid "hexadecimal value above 255: `\\x%x'"
 msgstr "16 進数の値が 255 を越えています: `\\x%x'"
 
-#: src/lex.c:239
+#: src/lex.c:247
 #, c-format
 msgid "unknown escape sequence: `\\' followed by `%s'"
 msgstr "未知のエスケープシーケンス: `\\' の後に `%s'"
 
-#: src/lex.c:335
+#: src/lex.c:343
 msgid "unterminated type name at end of file"
 msgstr "閉じられていないタイプ名が、ファイル末尾にあります"
 
-#: src/lex.c:338
+#: src/lex.c:346
 msgid "unterminated type name"
 msgstr "閉じられていないタイプ名があります"
 
-#: src/lex.c:430
+#: 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 ""
@@ -342,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
+#: src/print.c:240
-msgid "\t\t/* empty */"
+msgid "empty"
-msgstr "\t\t/* 空 */"
+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 ""
@@ -366,7 +370,7 @@ msgstr ""
 "終端トークン、およびそこに現れた規則\n"
 "\n"
 
-#: src/print.c:302
+#: src/print.c:268
 #, fuzzy
 msgid "Nonterminals, with rules where they appear"
 msgstr ""
@@ -374,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 " 右辺:"
 
@@ -392,116 +396,116 @@ 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:1268
+#: 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:1246
+#: 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:759 src/reader.c:1072 src/reader.c:1143
+#: src/reader.c:760 src/reader.c:1089 src/reader.c:1160
 #, fuzzy, c-format
 msgid "unmatched %s"
 msgstr "対応のない `{' です"
 
-#: src/reader.c:791
+#: src/reader.c:792
 #, fuzzy, c-format
 msgid "argument of %%expect is not an integer"
 msgstr "%expect の引数が整数値ではありません"
@@ -516,124 +520,114 @@ msgstr "ǧ
 msgid "expected string constant instead of %s"
 msgstr "ここでは %s ではなく文字列定数が期待されます"
 
-#: src/reader.c:887
+#: src/reader.c:1005
-#, fuzzy, c-format
-msgid "multiple %%header_extension declarations"
-msgstr "複数の %union 宣言です"
-
-#: src/reader.c:902
-#, fuzzy, c-format
-msgid "multiple %%source_extension declarations"
-msgstr "複数の %union 宣言です"
-
-#: src/reader.c:988
 #, c-format
 msgid "unrecognized: %s"
 msgstr "認識できない: %s"
 
-#: src/reader.c:993
+#: src/reader.c:1010
 msgid "no input grammar"
 msgstr "文法の入力が無い"
 
-#: src/reader.c:998
+#: src/reader.c:1015
 #, c-format
 msgid "unknown character: %s"
 msgstr "未知の文字: %s"
 
-#: src/reader.c:1166
+#: src/reader.c:1183
 #, fuzzy, c-format
 msgid "unterminated %guard clause"
 msgstr "閉じられていない %%guard 節です"
 
-#: src/reader.c:1333
+#: src/reader.c:1350
 msgid "ill-formed rule: initial symbol not followed by colon"
 msgstr "邪悪な規則: 初期化シンボルにコロン (:) が続いていません"
 
-#: src/reader.c:1340
+#: src/reader.c:1357
 msgid "grammar starts with vertical bar"
 msgstr "文法は縦棒 (|) で始めます"
 
-#: src/reader.c:1371
+#: src/reader.c:1388
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "%s に規則が与えられ、それはトークンとなります"
 
-#: src/reader.c:1473
+#: src/reader.c:1490
 msgid "two @prec's in a row"
 msgstr "@prec のもの二つが同列になっています"
 
-#: src/reader.c:1481
+#: src/reader.c:1498
-#, fuzzy, c-format
+#, c-format
 msgid "%%guard present but %%semantic_parser not specified"
 msgstr "%%guard がありますが %%semantic_parser が指定されていません"
 
-#: src/reader.c:1490
+#: src/reader.c:1507
 msgid "two actions at end of one rule"
 msgstr "一つの規則の終りに二つの動作を指定しています"
 
-#: src/reader.c:1504
+#: src/reader.c:1521
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "初期状態の動作では型 (`%s' `%s') が衝突します"
 
-#: src/reader.c:1510
+#: src/reader.c:1527
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "空の型付き非終端アイテム用規則であり、動作が起りません"
 
-#: src/reader.c:1554
+#: src/reader.c:1571
 #, c-format
 msgid "invalid input: %s"
 msgstr "無効な入力: %s"
 
-#: src/reader.c:1562
+#: src/reader.c:1579
 #, fuzzy, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "シンボルが多すぎます (トークンと非終端アイテム) -- 最大 %s"
 
-#: src/reader.c:1565
+#: src/reader.c:1582
 msgid "no rules in the input grammar"
 msgstr "入力した文法に規則が定義されていません"
 
-#: src/reader.c:1589
+#: 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:1694
+#: src/reader.c:1712
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "先行している %s と %s で競合が生じています"
 
-#: src/reader.c:1706
+#: src/reader.c:1724
 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "非結合値 %s と %s で競合が生じています"
 
-#: src/reader.c:1757
+#: src/reader.c:1770
 #, fuzzy, c-format
 msgid "tokens %s and %s both assigned number %d"
 msgstr "トークン %s と %s の双方が番号 %s に割り当てられました"
 
-#: src/reader.c:1770
+#: src/reader.c:1782
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "開始シンボル %s は定義されていません"
 
-#: src/reader.c:1772
+#: src/reader.c:1784
 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "開始シンボル %s はトークンです"
 
-#: src/reduce.c:404
+#: src/reduce.c:401
 #, fuzzy
 msgid "Useless nonterminals:"
 msgstr ""
 "不使用非終端子:\n"
 "\n"
 
-#: src/reduce.c:419
+#: src/reduce.c:416
 #, fuzzy
 msgid "Terminals which are not used:"
 msgstr ""
@@ -642,7 +636,7 @@ msgstr ""
 "利用されない終端子:\n"
 "\n"
 
-#: src/reduce.c:430
+#: src/reduce.c:427
 #, fuzzy
 msgid "Useless rules:"
 msgstr ""
@@ -651,7 +645,7 @@ msgstr ""
 "不使用規則:\n"
 "\n"
 
-#: src/reduce.c:459
+#: src/reduce.c:456
 msgid ""
 "Variables\n"
 "---------\n"
@@ -661,11 +655,11 @@ msgstr ""
 "---------\n"
 "\n"
 
-#: src/reduce.c:461
+#: src/reduce.c:458
 msgid "Value  Sprec    Sassoc    Tag\n"
 msgstr "値     前置     結合      タグ\n"
 
-#: src/reduce.c:466
+#: src/reduce.c:463
 msgid ""
 "Rules\n"
 "-----\n"
@@ -675,7 +669,7 @@ msgstr ""
 "-----\n"
 "\n"
 
-#: src/reduce.c:477
+#: src/reduce.c:474
 msgid ""
 "Rules interpreted\n"
 "-----------------\n"
@@ -685,36 +679,36 @@ msgstr ""
 "-----------------\n"
 "\n"
 
-#: src/reduce.c:494
+#: src/reduce.c:491
 #, c-format
 msgid "%d rules never reduced\n"
 msgstr "%d 個の規則は決して還元されません\n"
 
-#: src/reduce.c:496
+#: src/reduce.c:493
 #, c-format
 msgid "%s contains "
 msgstr "%s には"
 
-#: src/reduce.c:500
+#: src/reduce.c:497
 #, c-format
 msgid "%d useless nonterminal%s"
 msgstr "%d 個の不使用非終端子%.0s"
 
-#: src/reduce.c:505
+#: src/reduce.c:502
 msgid " and "
 msgstr "および"
 
-#: src/reduce.c:509
+#: src/reduce.c:506
 #, c-format
 msgid "%d useless rule%s"
 msgstr "%d 個の不使用規則%.0s"
 
-#: src/reduce.c:542
+#: src/reduce.c:539
 #, c-format
 msgid "Start symbol %s does not derive any sentence"
 msgstr "開始シンボル %s はどの文にも由来しません"
 
-#: src/reduce.c:555
+#: src/reduce.c:552
 #, c-format
 msgid ""
 "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n"
@@ -722,50 +716,6 @@ msgstr ""
 "還元ファイル %s で %d 個の終端子%.0s, %d 個の非終端子%.0s, %d 個の規則%.0sが"
 "定義されました\n"
 
-#: src/vcg.c:234
-msgid "vcg graph: no such color."
-msgstr ""
-
-#: src/vcg.c:249
-msgid "vcg graph: no such text mode"
-msgstr ""
-
-#: src/vcg.c:265
-msgid "vcg graph: no such shape"
-msgstr ""
-
-#: src/vcg.c:304
-msgid "vcg graph: no such decision"
-msgstr ""
-
-#: src/vcg.c:320
-msgid "vcg graph: no such an orientation"
-msgstr ""
-
-#: src/vcg.c:335
-msgid "vcg graph: no such an alignement"
-msgstr ""
-
-#: src/vcg.c:349
-msgid "vcg graph: no such an arrow mode"
-msgstr ""
-
-#: src/vcg.c:365
-msgid "vcg graph: no such crossing_type"
-msgstr ""
-
-#: src/vcg.c:382
-msgid "vcg graph: no such view"
-msgstr ""
-
-#: src/vcg.c:398
-msgid "vcg graph: no such linestyle"
-msgstr ""
-
-#: src/vcg.c:413
-msgid "vcg graph: no such an arrowstyle"
-msgstr ""
-
 #: lib/getopt.c:675
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
@@ -846,21 +796,14 @@ 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 ""
 
-#, fuzzy
-#~ msgid "Memory exhausted"
-#~ msgstr "%s: メモリを使い果たしました\n"
-
-#~ msgid "$%s is invalid"
-#~ msgstr "$%s は無効です"
-
 #~ msgid ""
 #~ "\n"
 #~ "\n"
@@ -938,9 +881,15 @@ msgstr ""
 #~ msgid "%s:%d: "
 #~ msgstr "%s:%d: "
 
+#~ msgid "\t\t/* empty */"
+#~ msgstr "\t\t/* 空 */"
+
 #~ msgid "unterminated comment in `%{' definition"
 #~ msgstr "`%{' 定義 に閉じられていないコメントがあります"
 
+#~ msgid "multiple %union declarations"
+#~ msgstr "複数の %union 宣言です"
+
 #~ msgid "unterminated comment at end of file"
 #~ msgstr "ファイル末尾に閉じられていないコメントがあります"
 
@@ -950,6 +899,9 @@ msgstr ""
 #~ msgid "unmatched right brace (`}')"
 #~ msgstr "対応のない右ブレース (`}') です"
 
+#~ msgid "$%s is invalid"
+#~ msgstr "$%s は無効です"
+
 #~ msgid "invalid @-construct"
 #~ msgstr "無効な @-コンストラクトです"
 

po/nl.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.25\n"
-"POT-Creation-Date: 2001-08-15 10:53+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"
@@ -18,90 +18,90 @@ msgstr ""
 msgid "too many states (max %d)"
 msgstr ""
 
-#: lib/error.c:117 src/complain.c:100
+#: lib/error.c:117 src/complain.c:96
 msgid "Unknown system error"
 msgstr ""
 
-#: src/complain.c:154
+#: src/complain.c:150
 msgid "warning: "
 msgstr ""
 
-#: src/complain.c:242 src/complain.c:283
+#: src/complain.c:238 src/complain.c:279
 #, fuzzy
 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:130
+#: src/files.c:133
 #, c-format
 msgid "cannot open file `%s'"
 msgstr ""
 
-#: src/files.c:149
+#: src/files.c:152
 msgid "cannot close file"
 msgstr ""
 
@@ -188,152 +188,154 @@ msgid ""
 "  -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"
+"  -g, --graph                also produce a VCG graph description of the "
+"automaton\n"
 msgstr ""
 
-#: src/getargs.c:124
+#: src/getargs.c:126
 msgid "Report bugs to <[email protected]>.\n"
 msgstr ""
 
 #. Some efforts were made to ease the translators' task, please
 #. continue.
-#: src/getargs.c:138
+#: src/getargs.c:140
 #, c-format
 msgid "bison (GNU Bison) %s"
 msgstr ""
 
-#: src/getargs.c:143
+#: src/getargs.c:145
 msgid ""
 "Copyright 1984, 1986, 1989, 1992, 2000, 2001 Free Software Foundation, Inc.\n"
 msgstr ""
 
-#: src/getargs.c:147
+#: src/getargs.c:149
 msgid ""
 "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"
 msgstr ""
 
-#: src/getargs.c:208 src/lex.c:635
+#: src/getargs.c:214 src/lex.c:650
 #, c-format
 msgid "`%s' is no longer supported"
 msgstr ""
 
-#: src/getargs.c:232
+#: src/getargs.c:238
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: src/getargs.c:239
+#: src/getargs.c:245
 #, c-format
 msgid "%s: no grammar file given\n"
 msgstr "%s: geen grammatica bestand gegeven\n"
 
-#: src/getargs.c:243
+#: src/getargs.c:249
 #, fuzzy, c-format
 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:70
+#: src/lex.c:78
 msgid "unexpected `/' found and ignored"
 msgstr "onverwachte `/' gevonden en genegeerd"
 
-#: src/lex.c:99 src/reader.c:270
+#: src/lex.c:107 src/reader.c:269
 msgid "unterminated comment"
 msgstr "ongetermineerd commentaar"
 
-#: src/lex.c:131
+#: src/lex.c:139
 #, fuzzy
 msgid "unexpected end of file"
 msgstr "Onverwacht bestandseinde"
 
-#: src/lex.c:160
+#: src/lex.c:168
 msgid "unescaped newline in constant"
 msgstr "niet geescapete nieuwe regel in constante"
 
-#: src/lex.c:202
+#: 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:227
+#: src/lex.c:235
 #, c-format
 msgid "hexadecimal value above 255: `\\x%x'"
 msgstr "hexadecimale waarde boven 255: `\\x%x'"
 
-#: src/lex.c:239
+#: src/lex.c:247
 #, c-format
 msgid "unknown escape sequence: `\\' followed by `%s'"
 msgstr "onbekende escape reeks: `\\' gevolgd door `%s'"
 
-#: src/lex.c:335
+#: 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:338
+#: src/lex.c:346
 msgid "unterminated type name"
 msgstr "niet getermineerd type naam"
 
-#: src/lex.c:430
+#: 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 ""
@@ -342,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
+#: src/print.c:240
-msgid "\t\t/* empty */"
+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 ""
@@ -366,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 ""
@@ -374,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:"
 
@@ -394,116 +398,116 @@ 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:1268
+#: 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:1246
+#: 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:759 src/reader.c:1072 src/reader.c:1143
+#: src/reader.c:760 src/reader.c:1089 src/reader.c:1160
 #, fuzzy, c-format
 msgid "unmatched %s"
 msgstr "niet overeenkomstige `{'"
 
-#: src/reader.c:791
+#: src/reader.c:792
 #, fuzzy, c-format
 msgid "argument of %%expect is not an integer"
 msgstr "argument van %expect is niet een integer"
@@ -518,125 +522,115 @@ msgstr "onbekend item %s, verwacht een identifier"
 msgid "expected string constant instead of %s"
 msgstr "verwacht string constante in plaats van %s"
 
-#: src/reader.c:887
+#: src/reader.c:1005
-#, fuzzy, c-format
-msgid "multiple %%header_extension declarations"
-msgstr "meerdere %union declaraties"
-
-#: src/reader.c:902
-#, fuzzy, c-format
-msgid "multiple %%source_extension declarations"
-msgstr "meerdere %union declaraties"
-
-#: src/reader.c:988
 #, c-format
 msgid "unrecognized: %s"
 msgstr "onbekend: %s"
 
-#: src/reader.c:993
+#: src/reader.c:1010
 msgid "no input grammar"
 msgstr "geen invoer grammatica"
 
-#: src/reader.c:998
+#: src/reader.c:1015
 #, c-format
 msgid "unknown character: %s"
 msgstr "onbekend karakter: %s"
 
-#: src/reader.c:1166
+#: src/reader.c:1183
 #, fuzzy, c-format
 msgid "unterminated %guard clause"
 msgstr "niet getermineerde %%guard voorwaarde"
 
-#: src/reader.c:1333
+#: 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:1340
+#: src/reader.c:1357
 msgid "grammar starts with vertical bar"
 msgstr "grammatica start met een verticale bar"
 
-#: src/reader.c:1371
+#: 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:1473
+#: src/reader.c:1490
 msgid "two @prec's in a row"
 msgstr "twee @prec's in een regel"
 
-#: src/reader.c:1481
+#: src/reader.c:1498
-#, fuzzy, c-format
+#, c-format
 msgid "%%guard present but %%semantic_parser not specified"
 msgstr "%%guard aanwezig maar %%semantic_parser niet gespecificeerd"
 
-#: src/reader.c:1490
+#: src/reader.c:1507
 msgid "two actions at end of one rule"
 msgstr "twee akties aan het einde van een regel"
 
-#: src/reader.c:1504
+#: 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:1510
+#: 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:1554
+#: src/reader.c:1571
 #, c-format
 msgid "invalid input: %s"
 msgstr "ongeldige invoer: %s"
 
-#: src/reader.c:1562
+#: 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:1565
+#: src/reader.c:1582
 msgid "no rules in the input grammar"
 msgstr "geen regels voor invoer grammatica"
 
-#: src/reader.c:1589
+#: 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:1694
+#: src/reader.c:1712
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "conflictuerende precedentein voor %s en %s"
 
-#: src/reader.c:1706
+#: 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:1757
+#: src/reader.c:1770
 #, c-format
 msgid "tokens %s and %s both assigned number %d"
 msgstr ""
 
-#: src/reader.c:1770
+#: src/reader.c:1782
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr ""
 
-#: src/reader.c:1772
+#: 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:404
+#: src/reduce.c:401
 #, fuzzy
 msgid "Useless nonterminals:"
 msgstr ""
 "Onbruikbare niet terminals:\n"
 "\n"
 
-#: src/reduce.c:419
+#: src/reduce.c:416
 #, fuzzy
 msgid "Terminals which are not used:"
 msgstr ""
@@ -645,7 +639,7 @@ msgstr ""
 "Terminals welke niet worden gebruikt:\n"
 "\n"
 
-#: src/reduce.c:430
+#: src/reduce.c:427
 #, fuzzy
 msgid "Useless rules:"
 msgstr ""
@@ -654,7 +648,7 @@ msgstr ""
 "Onbruikbare regels:\n"
 "\n"
 
-#: src/reduce.c:459
+#: src/reduce.c:456
 msgid ""
 "Variables\n"
 "---------\n"
@@ -664,11 +658,11 @@ msgstr ""
 "----------\n"
 "\n"
 
-#: src/reduce.c:461
+#: src/reduce.c:458
 msgid "Value  Sprec    Sassoc    Tag\n"
 msgstr "Waarde  Sprec    Sassoc    Tag\n"
 
-#: src/reduce.c:466
+#: src/reduce.c:463
 msgid ""
 "Rules\n"
 "-----\n"
@@ -678,7 +672,7 @@ msgstr ""
 "------\n"
 "\n"
 
-#: src/reduce.c:477
+#: src/reduce.c:474
 msgid ""
 "Rules interpreted\n"
 "-----------------\n"
@@ -688,36 +682,36 @@ msgstr ""
 "-----------------------\n"
 "\n"
 
-#: src/reduce.c:494
+#: src/reduce.c:491
 #, c-format
 msgid "%d rules never reduced\n"
 msgstr "%d regels nooit gereduceerd\n"
 
-#: src/reduce.c:496
+#: src/reduce.c:493
 #, c-format
 msgid "%s contains "
 msgstr "%s bevat"
 
-#: src/reduce.c:500
+#: src/reduce.c:497
 #, c-format
 msgid "%d useless nonterminal%s"
 msgstr "%d onbruikbare niet terminal%s"
 
-#: src/reduce.c:505
+#: src/reduce.c:502
 msgid " and "
 msgstr " en "
 
-#: src/reduce.c:509
+#: src/reduce.c:506
 #, c-format
 msgid "%d useless rule%s"
 msgstr "%d onbruikbare regels%s"
 
-#: src/reduce.c:542
+#: 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:555
+#: src/reduce.c:552
 #, c-format
 msgid ""
 "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n"
@@ -725,50 +719,6 @@ msgstr ""
 "gereduceerd %s gedefinieerd %d terminal%s, %d nietterminal%s, en %d productie"
 "%s.\n"
 
-#: src/vcg.c:234
-msgid "vcg graph: no such color."
-msgstr ""
-
-#: src/vcg.c:249
-msgid "vcg graph: no such text mode"
-msgstr ""
-
-#: src/vcg.c:265
-msgid "vcg graph: no such shape"
-msgstr ""
-
-#: src/vcg.c:304
-msgid "vcg graph: no such decision"
-msgstr ""
-
-#: src/vcg.c:320
-msgid "vcg graph: no such an orientation"
-msgstr ""
-
-#: src/vcg.c:335
-msgid "vcg graph: no such an alignement"
-msgstr ""
-
-#: src/vcg.c:349
-msgid "vcg graph: no such an arrow mode"
-msgstr ""
-
-#: src/vcg.c:365
-msgid "vcg graph: no such crossing_type"
-msgstr ""
-
-#: src/vcg.c:382
-msgid "vcg graph: no such view"
-msgstr ""
-
-#: src/vcg.c:398
-msgid "vcg graph: no such linestyle"
-msgstr ""
-
-#: src/vcg.c:413
-msgid "vcg graph: no such an arrowstyle"
-msgstr ""
-
 #: lib/getopt.c:675
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
@@ -849,36 +799,14 @@ 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 ""
 
-#, fuzzy
-#~ msgid "Memory exhausted"
-#~ msgstr "%s: geen geheugen meer beschikbaar\n"
-
-#~ msgid "$%s is invalid"
-#~ msgstr "$%s is onjuist"
-
-#~ msgid "unmatched close-brace (`}')"
-#~ msgstr "niet overeenkomstige afsluit-haakje (`}')"
-
-#~ msgid "unmatched right brace (`}')"
-#~ msgstr "niet overeenkomstig rechter haakje (`}')"
-
-#~ msgid "unterminated comment at end of file"
-#~ msgstr "niet getermineerd commentaar aan einde van bestand"
-
-#~ msgid "ill-formed %type declaration"
-#~ msgstr "slecht geformuleerde %type declaratie"
-
-#~ msgid "gotos"
-#~ msgstr "ganaar"
-
 #~ msgid ""
 #~ "\n"
 #~ "\n"
@@ -925,7 +853,6 @@ msgstr ""
 #~ "%s afgeleiden\n"
 #~ "\n"
 
-#, fuzzy
 #~ msgid ""
 #~ "Usage: %s [-dhklntvyV] [-b file-prefix] [-o outfile] [-p name-prefix]\n"
 #~ "       [--debug] [--defines] [--fixed-output-files] [--no-lines]\n"
@@ -933,8 +860,6 @@ msgstr ""
 #~ "       [--no-parser] [--token-table]\n"
 #~ "       [--file-prefix=prefix] [--name-prefix=prefix]\n"
 #~ "       [--output=outfile] grammar-file\n"
-#~ "\n"
-#~ "Report bugs to [email protected]\n"
 #~ msgstr ""
 #~ "Gebruik: %s [-dhklntvyV] [-b file-prefix] [-o outfile] [-p name-prefix]\n"
 #~ "       [--debug] [--defines] [--fixed-output-files] [--no-lines]\n"
@@ -943,15 +868,8 @@ msgstr ""
 #~ "       [--file-prefix=prefix] [--name-prefix=prefix]\n"
 #~ "       [--output=outfile] grammar-bestand\n"
 
-#, fuzzy
+#~ msgid "gotos"
-#~ msgid "%s:%d: fatal error: "
+#~ msgstr "ganaar"
-#~ msgstr "fatale fout: %s\n"
-
-#~ msgid "unterminated comment in `%{' definition"
-#~ msgstr "niet getermineerd commentaar in `%{' definitie"
-
-#~ msgid "invalid @-construct"
-#~ msgstr "ongeldige @-constructie"
 
 #~ msgid "\"%s\", line %d: %s\n"
 #~ msgstr "\"%s\", regel %d: %s\n"
@@ -964,3 +882,27 @@ msgstr ""
 
 #~ msgid "limit of %d exceeded, too many %s"
 #~ msgstr "limiet van %d overschreden, te veel %s"
+
+#~ msgid "unterminated comment in `%{' definition"
+#~ msgstr "niet getermineerd commentaar in `%{' definitie"
+
+#~ msgid "multiple %union declarations"
+#~ msgstr "meerdere %union declaraties"
+
+#~ msgid "unterminated comment at end of file"
+#~ msgstr "niet getermineerd commentaar aan einde van bestand"
+
+#~ msgid "unmatched close-brace (`}')"
+#~ msgstr "niet overeenkomstige afsluit-haakje (`}')"
+
+#~ msgid "unmatched right brace (`}')"
+#~ msgstr "niet overeenkomstig rechter haakje (`}')"
+
+#~ msgid "$%s is invalid"
+#~ msgstr "$%s is onjuist"
+
+#~ msgid "invalid @-construct"
+#~ msgstr "ongeldige @-constructie"
+
+#~ msgid "ill-formed %type declaration"
+#~ msgstr "slecht geformuleerde %type declaratie"

po/ru.po

@@ -1,12 +1,12 @@
 # ðÅÒÅ×ÏÄ ÓÏÏÂÝÅÎÉÊ bison.
 # Copyright (C) 1999 Free Software Foundation, Inc.
-# Dmitry S. Sivachenko <[email protected]>, 1999,2000.
+# Dmitry S. Sivachenko <[email protected]>, 1999,2000,2001.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: bison 1.28a\n"
+"Project-Id-Version: bison 1.29\n"
-"POT-Creation-Date: 2001-08-15 10:53+0200\n"
+"POT-Creation-Date: 2001-10-02 18:30+0200\n"
-"PO-Revision-Date: 2000-04-12 13:16+04:00\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"
 "MIME-Version: 1.0\n"
@@ -18,91 +18,90 @@ msgstr ""
 msgid "too many states (max %d)"
 msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ ÓÏÓÔÏÑÎÉÊ (ÍÁËÓÉÍÁÌØÎÏ %d)"
 
-#: lib/error.c:117 src/complain.c:100
+#: lib/error.c:117 src/complain.c:96
 msgid "Unknown system error"
-msgstr ""
+msgstr "îÅÉÚ×ÅÓÔÎÁÑ ÓÉÓÔÅÍÎÁÑ ÏÛÉÂËÁ"
 
-#: src/complain.c:154
+#: src/complain.c:150
 msgid "warning: "
-msgstr ""
+msgstr "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: "
 
-#: src/complain.c:242 src/complain.c:283
+#: src/complain.c:238 src/complain.c:279
-#, fuzzy
 msgid "fatal error: "
-msgstr "ÏÛÉÂËÁ"
+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"
@@ -111,39 +110,33 @@ 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 ""
+msgstr "DERIVES"
-"\n"
-"\n"
-"\n"
-"DERIVES\n"
-"\n"
 
-#: src/derives.c:49
+#: src/derives.c:48
 #, c-format
 msgid "%s derives"
 msgstr "%s ×Ù×ÏÄÉÔ"
 
-#: src/files.c:130
+#: src/files.c:133
 #, c-format
 msgid "cannot open file `%s'"
-msgstr ""
+msgstr "ÎÅ ÕÄÁÅÔÓÑ ÏÔËÒÙÔØ ÆÁÊÌ `%s'"
 
-#: src/files.c:149
+#: src/files.c:152
 msgid "cannot close file"
-msgstr ""
+msgstr "ÎÅ ÕÄÁÅÔÓÑ ÚÁËÒÙÔØ ÆÁÊÌ"
 
 #. Some efforts were made to ease the translators' task, please
 #. continue.
@@ -178,7 +171,6 @@ msgstr ""
 "  -y, --yacc      ÜÍÕÌÉÒÏ×ÁÔØ POSIX yacc\n"
 
 #: src/getargs.c:104
-#, fuzzy
 msgid ""
 "Parser:\n"
 "  -S, --skeleton=FILE        specify the skeleton to use\n"
@@ -190,11 +182,12 @@ msgid ""
 "  -k, --token-table          include a table of token names\n"
 msgstr ""
 "áÎÁÌÉÚÁÔÏÒ:\n"
+"  -S, --skeleton=æáêì        ÕËÁÚÁÔØ ÆÁÊÌ ÛÁÂÌÏÎÁ\n"
 "  -t, --debug                ÎÁÓÔÒÏÉÔØ ÁÎÁÌÉÚÁÔÏÒ ÄÌÑ ÏÔÌÁÄËÉ\n"
+"      --locations            ×ËÌÀÞÉÔØ ×ÙÞÉÓÌÅÎÉÅ ÍÅÓÔÏÐÏÌÏÖÅÎÉÊ\n"
 "  -p, --name-prefix=ðòåæéëó  ÐÏÄÓÔÁ×ÉÔØ ðòåæéëó ÄÌÑ ×ÎÅÛÎÉÈ ÓÉÍ×ÏÌÏ×\n"
 "  -l, --no-lines             ÎÅ ÇÅÎÅÒÉÒÏ×ÁÔØ ÄÉÒÅËÔÉ×Ù `#line'\n"
 "  -n, --no-parser            ÇÅÎÅÒÉÒÏ×ÁÔØ ÔÏÌØËÏ ÔÁÂÌÉÃÙ\n"
-"  -r, --raw                  ÎÕÍÅÒÏ×ÁÔØ ÌÅËÓÅÍÙ, ÎÁÞÉÎÁÑ Ó 3\n"
 "  -k, --token-table          ×ËÌÀÞÉÔØ ÔÁÂÌÉÃÕ ÉÍÅÎ ÌÅËÓÅÍ\n"
 
 #: src/getargs.c:116
@@ -204,327 +197,324 @@ msgid ""
 "  -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"
+"  -g, --graph                also produce a VCG graph description of the "
+"automaton\n"
 msgstr ""
 "÷Ù×ÏÄ:\n"
 "  -d, --defines              ÓÏÚÄÁÔØ ÔÁËÖÅ ÆÁÊÌ ÚÁÇÏÌÏ×ËÏ×\n"
 "  -v, --verbose              ÓÏÚÄÁÔØ ÔÁËÖÅ ÐÏÑÓÎÅÎÉÑ × Á×ÔÏÍÁÔÕ\n"
 "  -b, --file-prefix=ðòåæéëó  ÕËÁÚÁÔØ ðòåæéëó ÄÌÑ ×ÙÈÏÄÎÙÈ ÆÁÊÌÏ×\n"
 "  -o, --output-file=æáêì     ÐÏÍÅÓÔÉÔØ ÒÅÚÕÌØÔÁÔ × æáêì\n"
+"  -g, --graph                ÓÏÚÄÁÔØ ÔÁËÖÅ ÐÏÑÓÎÅÎÉÑ Ë Á×ÔÏÍÁÔÕ × ×ÉÄÅ \n"
+"VCG-ÇÒÁÆÁ\n"
 
-#: src/getargs.c:124
+#: src/getargs.c:126
 msgid "Report bugs to <[email protected]>.\n"
 msgstr "ïÛÉÂËÉ ÓÏÏÂÝÁÊÔÅ ÐÏ ÁÄÒÅÓÕ <[email protected]>.\n"
 
 #. Some efforts were made to ease the translators' task, please
 #. continue.
-#: src/getargs.c:138
+#: src/getargs.c:140
 #, c-format
 msgid "bison (GNU Bison) %s"
-msgstr ""
+msgstr "bison (GNU Bison) %s"
 
-#: src/getargs.c:143
+#: src/getargs.c:145
 msgid ""
 "Copyright 1984, 1986, 1989, 1992, 2000, 2001 Free Software Foundation, Inc.\n"
 msgstr ""
+"Copyright 1984, 1986, 1989, 1992, 2000, 2001 Free Software Foundation, Inc.\n"
 
-#: src/getargs.c:147
+#: src/getargs.c:149
 msgid ""
 "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"
 msgstr ""
+"üÔÏ Ó×ÏÂÏÄÎÁÑ ÐÒÏÇÒÁÍÍÁ; ÕÓÌÏ×ÉÑ ÒÁÓÐÒÏÓÔÒÁÎÅÎÉÑ ÓÍÏÔÒÉÔÅ × ÉÓÈÏÄÎÙÈ "
+"ÔÅËÓÔÁÈ.\n"
+"îéëáëéè ÇÁÒÁÎÔÉÊ ÎÅ ÐÒÅÄÏÓÔÁ×ÌÑÅÔÓÑ, ÄÁÖÅ ÇÁÒÁÎÔÉÉ ðïìåúîïóôé ÉÌÉ "
+"ðòéçïäîïóôé\n"
+"äìñ ïðòåäåìåîîïê ãåìé.\n"
 
-#: src/getargs.c:208 src/lex.c:635
+#: src/getargs.c:214 src/lex.c:650
 #, c-format
 msgid "`%s' is no longer supported"
-msgstr ""
+msgstr "`%s' ÂÏÌØÛÅ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ"
 
-#: src/getargs.c:232
+#: src/getargs.c:238
 #, c-format
 msgid "Try `%s --help' for more information.\n"
-msgstr ""
+msgstr "éÓÐÏÌØÚÕÊÔÅ `%s --help' ÄÌÑ ÄÏÐÏÌÎÉÔÅÌØÎÏÊ ÉÎÆÏÒÍÁÃÉÉ.\n"
 
-#: src/getargs.c:239
+#: src/getargs.c:245
 #, c-format
 msgid "%s: no grammar file given\n"
 msgstr "%s: ÎÅ ÚÁÄÁÎ ÆÁÊÌ Ó ÇÒÁÍÍÁÔÉËÏÊ\n"
 
-#: src/getargs.c:243
+#: src/getargs.c:249
 #, c-format
 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:70
+#: src/lex.c:78
 msgid "unexpected `/' found and ignored"
 msgstr "×ÓÔÒÅÞÅÎ É ÐÒÏÉÇÎÏÒÉÒÏ×ÁÎ ÎÅÏÖÉÄÁÎÎÙÊ ÓÉÍ×ÏÌ `/'"
 
-#: src/lex.c:99 src/reader.c:270
+#: src/lex.c:107 src/reader.c:269
 msgid "unterminated comment"
 msgstr "ÎÅÚÁËÏÎÞÅÎÎÙÊ ËÏÍÍÅÎÔÁÒÉÊ"
 
-#: src/lex.c:131
+#: src/lex.c:139
 msgid "unexpected end of file"
 msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ËÏÎÅÃ ÆÁÊÌÁ"
 
-#: src/lex.c:160
+#: src/lex.c:168
 msgid "unescaped newline in constant"
 msgstr "ÎÅÜËÒÁÎÉÒÏ×ÁÎÎÙÊ ÐÅÒÅ×ÏÄ ÓÔÒÏËÉ × ËÏÎÓÔÁÎÔÅ"
 
-#: src/lex.c:202
+#: src/lex.c:210
 #, c-format
 msgid "octal value outside range 0...255: `\\%o'"
 msgstr "×ÏÓØÍÅÒÉÞÎÁÑ ×ÅÌÉÞÉÎÁ ÚÁ ÐÒÅÄÅÌÁÍÉ ÄÉÁÐÁÚÏÎÁ 0...255: `\\%o'"
 
-#: src/lex.c:227
+#: src/lex.c:235
 #, c-format
 msgid "hexadecimal value above 255: `\\x%x'"
 msgstr "ÛÅÓÔÎÁÄÃÁÔÅÒÉÞÎÁÑ ×ÅÌÉÞÉÎÁ ÐÒÅ×ÙÛÁÅÔ 255: `\\x%x'"
 
-#: src/lex.c:239
+#: src/lex.c:247
 #, c-format
 msgid "unknown escape sequence: `\\' followed by `%s'"
 msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ escape-ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ: `%s' ÐÏÓÌÅ `\\'"
 
-#: src/lex.c:335
+#: src/lex.c:343
 msgid "unterminated type name at end of file"
 msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ ÉÍÑ ÔÉÐÁ × ËÏÎÃÅ ÆÁÊÌÁ"
 
-#: src/lex.c:338
+#: src/lex.c:346
 msgid "unterminated type name"
 msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ ÉÍÑ ÔÉÐÁ"
 
-#: src/lex.c:430
+#: 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
-#, fuzzy, c-format
+#, c-format
 msgid "state %d"
-msgstr ""
+msgstr "ÓÏÓÔÏÑÎÉÅ %d"
-"\n"
-"\n"
-"ÓÏÓÔÏÑÎÉÅ %d\n"
-"\n"
 
-#: src/print.c:233
+#. rule # : LHS -> RHS
-#, fuzzy
+#: src/print.c:229
 msgid "Grammar"
-msgstr ""
+msgstr "çÒÁÍÍÁÔÉËÁ"
-"\n"
-"çÒÁÍÍÁÔÉËÁ\n"
 
-#: src/print.c:240
+#: src/print.c:234
 #, c-format
 msgid "rule %-4d %s ->"
 msgstr "ÐÒÁ×ÉÌÏ %-4d %s ->"
 
-#: src/print.c:246
+#: src/print.c:240
-msgid "\t\t/* empty */"
+msgid "empty"
-msgstr "\t\t/* ÐÕÓÔÏ */"
+msgstr ""
 
-#: src/print.c:253
+#. TERMINAL (type #) : rule #s terminal is on RHS
-#, fuzzy
+#: src/print.c:244
 msgid "Terminals, with rules where they appear"
-msgstr ""
+msgstr "ôÅÒÍÉÎÁÌØÎÙÅ ÓÉÍ×ÏÌÙ Ó ÐÒÁ×ÉÌÁÍÉ, × ËÏÔÏÒÙÈ ÏÎÉ ÐÏÑ×ÌÑÀÔÓÑ"
-"\n"
-"ôÅÒÍÉÎÁÌØÎÙÅ ÓÉÍ×ÏÌÙ Ó ÐÒÁ×ÉÌÁÍÉ, × ËÏÔÏÒÙÈ ÏÎÉ ÐÏÑ×ÌÑÀÔÓÑ\n"
-"\n"
 
-#: src/print.c:302
+#: src/print.c:268
-#, fuzzy
 msgid "Nonterminals, with rules where they appear"
-msgstr ""
+msgstr "îÅÔÅÒÍÉÎÁÌØÎÙÅ ÓÉÍ×ÏÌÙ Ó ÐÒÁ×ÉÌÁÍÉ, × ËÏÔÏÒÙÈ ÏÎÉ ÐÏÑ×ÌÑÀÔÓÑ"
-"\n"
-"îÅÔÅÒÍÉÎÁÌØÎÙÅ ÓÉÍ×ÏÌÙ Ó ÐÒÁ×ÉÌÁÍÉ, × ËÏÔÏÒÙÈ ÏÎÉ ÐÏÑ×ÌÑÀÔÓÑ\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 " ÎÁÐÒÁ×Ï:"
 
 #: src/print_graph.c:174
-#, fuzzy, c-format
+#, c-format
 msgid "%-4s\terror (nonassociative)"
-msgstr "    %-4s\tÏÛÉÂËÁ (ÎÅÁÓÓÏÃÉÁÔÉ×ÎÁÑ)\n"
+msgstr "%-4s\tÏÛÉÂËÁ (ÎÅÁÓÓÏÃÉÁÔÉ×ÎÁÑ)"
 
 #: src/print_graph.c:187
-#, fuzzy, c-format
+#, c-format
 msgid "$default\treduce using rule %d (%s)"
-msgstr "    $default\t×Ù×ÏÄ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÐÒÁ×ÉÌÁ %d (%s)\n"
+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
-#, fuzzy, c-format
+#, c-format
 msgid "%s is invalid"
-msgstr "ÎÅ×ÅÒÎÙÊ ÚÎÁË $%s"
+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:1268
+#: 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
-#, fuzzy, c-format
+#, c-format
 msgid "multiple %s declarations"
-msgstr "ÍÎÏÖÅÓÔ×ÅÎÎÏÅ ÏÐÉÓÁÎÉÅ %start"
+msgstr "ÍÎÏÖÅÓÔ×ÅÎÎÏÅ ÏÐÉÓÁÎÉÅ %s"
 
-#: src/reader.c:563 src/reader.c:1246
+#: src/reader.c:560 src/reader.c:897 src/reader.c:922 src/reader.c:1263
-#, fuzzy, c-format
+#, c-format
 msgid "invalid %s declaration"
-msgstr "ÎÅ×ÅÒÎÏÅ ÏÐÉÓÁÎÉÅ %start"
+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:759 src/reader.c:1072 src/reader.c:1143
+#: src/reader.c:760 src/reader.c:1089 src/reader.c:1160
-#, fuzzy, c-format
+#, c-format
 msgid "unmatched %s"
-msgstr "ÎÅÐÁÒÎÁÑ `{'"
+msgstr "ÎÅÐÁÒÎÁÑ %s"
 
-#: src/reader.c:791
+#: src/reader.c:792
-#, fuzzy, c-format
+#, c-format
 msgid "argument of %%expect is not an integer"
-msgstr "ÁÒÇÕÍÅÎÔ %expect ÎÅ Ñ×ÌÑÅÔÓÑ ÃÅÌÙÍ ÞÉÓÌÏÍ"
+msgstr "ÁÒÇÕÍÅÎÔ %%expect ÎÅ Ñ×ÌÑÅÔÓÑ ÃÅÌÙÍ ÞÉÓÌÏÍ"
 
 #: src/reader.c:838
 #, c-format
@@ -536,141 +526,118 @@ msgstr "
 msgid "expected string constant instead of %s"
 msgstr "×ÍÅÓÔÏ %s ÏÖÉÄÁÌÁÓØ ÓÔÒÏËÏ×ÁÑ ÐÏÓÔÏÑÎÎÁÑ"
 
-#: src/reader.c:887
+#: src/reader.c:1005
-#, fuzzy, c-format
-msgid "multiple %%header_extension declarations"
-msgstr "ÍÎÏÖÅÓÔ×ÅÎÎÏÅ ÏÐÉÓÁÎÉÅ %union"
-
-#: src/reader.c:902
-#, fuzzy, c-format
-msgid "multiple %%source_extension declarations"
-msgstr "ÍÎÏÖÅÓÔ×ÅÎÎÏÅ ÏÐÉÓÁÎÉÅ %union"
-
-#: src/reader.c:988
 #, c-format
 msgid "unrecognized: %s"
 msgstr "ÎÅÒÁÓÐÏÚÎÁÎÏ: %s"
 
-#: src/reader.c:993
+#: src/reader.c:1010
 msgid "no input grammar"
 msgstr "ÎÅÔ ×ÈÏÄÎÏÊ ÇÒÁÍÍÁÔÉËÉ"
 
-#: src/reader.c:998
+#: src/reader.c:1015
 #, c-format
 msgid "unknown character: %s"
 msgstr "ÎÅÉÚ×ÅÓÔÎÙÊ ÓÉÍ×ÏÌ: %s"
 
-#: src/reader.c:1166
+#: src/reader.c:1183
 #, c-format
 msgid "unterminated %guard clause"
 msgstr "ÎÅÚÁËÏÎÞÅÎÎÙÊ ÏÐÅÒÁÔÏÒ %guard"
 
-#: src/reader.c:1333
+#: src/reader.c:1350
 msgid "ill-formed rule: initial symbol not followed by colon"
 msgstr "ÎÅ×ÅÒÎÏÅ ÐÒÁ×ÉÌÏ: Ä×ÏÅÔÏÞÉÅ ÎÅ ÓÌÅÄÕÅÔ ÚÁ ÎÁÞÁÌØÎÙÍ ÓÉÍ×ÏÌÏÍ"
 
-#: src/reader.c:1340
+#: src/reader.c:1357
 msgid "grammar starts with vertical bar"
 msgstr "ÇÒÁÍÍÁÔÉËÁ ÎÁÞÉÎÁÅÔÓÑ Ó ×ÅÒÔÉËÁÌØÎÏÊ ÞÅÒÔÙ"
 
-#: src/reader.c:1371
+#: src/reader.c:1388
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "ÐÒÁ×ÉÌÏ ÚÁÄÁÎÏ ÄÌÑ %s, ËÏÔÏÒÙÊ Ñ×ÌÑÅÔÓÑ ÌÅËÓÅÍÏÊ"
 
-#: src/reader.c:1473
+#: src/reader.c:1490
 msgid "two @prec's in a row"
 msgstr "Ä×Á @prec ÐÏÄÒÑÄ"
 
-#: src/reader.c:1481
+#: src/reader.c:1498
-#, fuzzy, c-format
+#, c-format
 msgid "%%guard present but %%semantic_parser not specified"
-msgstr "%guard ÐÒÉÓÕÔÓÔ×ÕÅÔ, Á %semantic_parser ÎÅ ÚÁÄÁÎ"
+msgstr "%%guard ÐÒÉÓÕÔÓÔ×ÕÅÔ, Á %%semantic_parser ÎÅ ÚÁÄÁÎ"
 
-#: src/reader.c:1490
+#: src/reader.c:1507
 msgid "two actions at end of one rule"
 msgstr "Ä×Á ÄÅÊÓÔ×ÉÑ × ËÏÎÃÅ ÏÄÎÏÇÏ ÐÒÁ×ÉÌÁ"
 
-#: src/reader.c:1504
+#: src/reader.c:1521
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "ËÏÎÆÌÉËÔ ÔÉÐÏ× (`%s' `%s') ÎÁ ÄÅÊÓÔ×ÉÉ ÐÏ ÕÍÏÌÞÁÎÉÀ"
 
-#: src/reader.c:1510
+#: src/reader.c:1527
 msgid "empty rule for typed nonterminal, and no action"
 msgstr ""
 "ÐÕÓÔÏÅ ÐÒÁ×ÉÌÏ ÄÌÑ ÔÉÐÉÚÉÒÏ×ÁÎÎÏÇÏ ÎÅÔÅÒÍÉÎÁÌØÎÏÇÏ ÓÉÍ×ÏÌÁ, É ÎÅÔ ÄÅÊÓÔ×ÉÑ"
 
-#: src/reader.c:1554
+#: src/reader.c:1571
 #, c-format
 msgid "invalid input: %s"
 msgstr "ÎÅ×ÅÒÎÙÅ ×ÈÏÄÎÙÅ ÄÁÎÎÙÅ: %s"
 
-#: src/reader.c:1562
+#: src/reader.c:1579
 #, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ ÓÉÍ×ÏÌÏ× (ÌÅËÓÅÍÙ ÐÌÀÓ ÎÅÔÅÒÍÉÎÁÌÙ); ÍÁËÓÉÍÁÌØÎÏ %d"
 
-#: src/reader.c:1565
+#: src/reader.c:1582
 msgid "no rules in the input grammar"
 msgstr "ÏÔÓÕÔÓÔ×ÕÀÔ ÐÒÁ×ÉÌÁ ×Ï ×ÈÏÄÎÏÊ ÇÒÁÍÍÁÔÉËÅ"
 
-#: src/reader.c:1589
+#: 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:1694
+#: src/reader.c:1712
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "ÐÒÏÔÉ×ÏÒÅÞÉ×ÙÅ ÐÒÉÏÒÉÔÅÔÙ ÄÌÑ %s É %s"
 
-#: src/reader.c:1706
+#: src/reader.c:1724
 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "ÐÒÏÔÉ×ÏÒÅÞÉ×ÙÅ ÚÎÁÞÅÎÉÑ ÁÓÓÏÃÉÁÔÉ×ÎÏÓÔÉ ÄÌÑ %s É %s"
 
-#: src/reader.c:1757
+#: src/reader.c:1770
 #, c-format
 msgid "tokens %s and %s both assigned number %d"
 msgstr "ÏÂÅÉÍ ÌÅËÓÅÍÁÍ %s É %s ÐÒÉÓ×ÏÅÎ ÎÏÍÅÒ %d"
 
-#: src/reader.c:1770
+#: src/reader.c:1782
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "ÎÁÞÁÌØÎÙÊ ÓÉÍ×ÏÌ %s ÎÅÏÐÒÅÄÅÌÅÎ"
 
-#: src/reader.c:1772
+#: src/reader.c:1784
 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "ÎÁÞÁÌØÎÙÊ ÓÉÍ×ÏÌ %s Ñ×ÌÑÅÔÓÑ ÌÅËÓÅÍÏÊ"
 
-#: src/reduce.c:404
+#: src/reduce.c:401
-#, fuzzy
 msgid "Useless nonterminals:"
-msgstr ""
+msgstr "âÅÓÐÏÌÅÚÎÙÅ ÎÅÔÅÒÍÉÎÁÌÙ:"
-"âÅÓÐÏÌÅÚÎÙÅ ÎÅÔÅÒÍÉÎÁÌÙ:\n"
-"\n"
 
-#: src/reduce.c:419
+#: src/reduce.c:416
-#, fuzzy
 msgid "Terminals which are not used:"
-msgstr ""
+msgstr "îÅÉÓÐÏÌØÚÏ×ÁÎÎÙÅ ÔÅÒÍÉÎÁÌÙ:"
-"\n"
-"\n"
-"îÅÉÓÐÏÌØÚÏ×ÁÎÎÙÅ ÔÅÒÍÉÎÁÌÙ:\n"
-"\n"
 
-#: src/reduce.c:430
+#: src/reduce.c:427
-#, fuzzy
 msgid "Useless rules:"
-msgstr ""
+msgstr "âÅÓÐÏÌÅÚÎÙÅ ÐÒÁ×ÉÌÁ:"
-"\n"
-"\n"
-"âÅÓÐÏÌÅÚÎÙÅ ÐÒÁ×ÉÌÁ:\n"
-"\n"
 
-#: src/reduce.c:459
+#: src/reduce.c:456
 msgid ""
 "Variables\n"
 "---------\n"
@@ -680,11 +647,11 @@ msgstr ""
 "----------\n"
 "\n"
 
-#: src/reduce.c:461
+#: src/reduce.c:458
 msgid "Value  Sprec    Sassoc    Tag\n"
 msgstr "úÎÁÞ   ðÒÉÏÒ    áÓÓÏÃ     ôÅÇ\n"
 
-#: src/reduce.c:466
+#: src/reduce.c:463
 msgid ""
 "Rules\n"
 "-----\n"
@@ -694,7 +661,7 @@ msgstr ""
 "-------\n"
 "\n"
 
-#: src/reduce.c:477
+#: src/reduce.c:474
 msgid ""
 "Rules interpreted\n"
 "-----------------\n"
@@ -704,36 +671,36 @@ msgstr ""
 "--------------------------\n"
 "\n"
 
-#: src/reduce.c:494
+#: src/reduce.c:491
 #, c-format
 msgid "%d rules never reduced\n"
 msgstr "%d ÐÒÁ×ÉÌ ÎÅ Ó×ÅÄÅÎÏ\n"
 
-#: src/reduce.c:496
+#: src/reduce.c:493
 #, c-format
 msgid "%s contains "
 msgstr "%s ÓÏÄÅÒÖÉÔ "
 
-#: src/reduce.c:500
+#: src/reduce.c:497
 #, c-format
 msgid "%d useless nonterminal%s"
 msgstr "%d ÂÅÓÐÏÌÅÚÎÙÈ ÎÅÔÅÒÍÉÎÁÌÏ×%s"
 
-#: src/reduce.c:505
+#: src/reduce.c:502
 msgid " and "
 msgstr " É "
 
-#: src/reduce.c:509
+#: src/reduce.c:506
 #, c-format
 msgid "%d useless rule%s"
 msgstr "%d ÂÅÓÐÏÌÅÚÎÙÈ ÐÒÁ×ÉÌ%s"
 
-#: src/reduce.c:542
+#: src/reduce.c:539
 #, c-format
 msgid "Start symbol %s does not derive any sentence"
 msgstr "îÁÞÁÌØÎÙÊ ÓÉÍ×ÏÌ %s ÎÅ ×Ù×ÏÄÉÔ ÎÉ ÏÄÎÏÇÏ ÐÒÅÄÌÏÖÅÎÉÑ"
 
-#: src/reduce.c:555
+#: src/reduce.c:552
 #, c-format
 msgid ""
 "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n"
@@ -741,50 +708,6 @@ msgstr ""
 "×Ù×ÅÄÅÎÎÙÊ %s ÏÐÒÅÄÅÌÑÅÔ %d ÔÅÒÍÉÎÁÌÏ×%s, %d ÎÅÔÅÒÍÉÎÁÌÏ×%s, É %d ÐÒÁ×ÉÌ "
 "×Ù×ÏÄÁ%s.\n"
 
-#: src/vcg.c:234
-msgid "vcg graph: no such color."
-msgstr ""
-
-#: src/vcg.c:249
-msgid "vcg graph: no such text mode"
-msgstr ""
-
-#: src/vcg.c:265
-msgid "vcg graph: no such shape"
-msgstr ""
-
-#: src/vcg.c:304
-msgid "vcg graph: no such decision"
-msgstr ""
-
-#: src/vcg.c:320
-msgid "vcg graph: no such an orientation"
-msgstr ""
-
-#: src/vcg.c:335
-msgid "vcg graph: no such an alignement"
-msgstr ""
-
-#: src/vcg.c:349
-msgid "vcg graph: no such an arrow mode"
-msgstr ""
-
-#: src/vcg.c:365
-msgid "vcg graph: no such crossing_type"
-msgstr ""
-
-#: src/vcg.c:382
-msgid "vcg graph: no such view"
-msgstr ""
-
-#: src/vcg.c:398
-msgid "vcg graph: no such linestyle"
-msgstr ""
-
-#: src/vcg.c:413
-msgid "vcg graph: no such an arrowstyle"
-msgstr ""
-
 #: lib/getopt.c:675
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
@@ -847,9 +770,8 @@ msgstr "%s:
 #. If XALLOC_FAIL_FUNC is NULL, or does return, display this message
 #. before exiting when memory is exhausted.  Goes through gettext.
 #: lib/obstack.c:477 lib/xmalloc.c:66
-#, fuzzy
 msgid "memory exhausted"
-msgstr "%s: ÐÁÍÑÔØ ÉÓÞÅÒÐÁÎÁ\n"
+msgstr "ÐÁÍÑÔØ ÉÓÞÅÒÐÁÎÁ"
 
 #. Get translations for open and closing quotation marks.
 #.
@@ -865,25 +787,22 @@ 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 ""
+msgstr "`"
 
-#: lib/quotearg.c:260
+#: lib/quotearg.c:269
 msgid "'"
-msgstr ""
+msgstr "'"
 
-#~ msgid "unterminated comment at end of file"
+#~ msgid "\t\t/* empty */"
-#~ msgstr "ÎÅÚÁËÏÎÞÅÎÎÙÊ ËÏÍÍÅÎÔÁÒÉÊ × ËÏÎÃÅ ÆÁÊÌÁ"
+#~ msgstr "\t\t/* ÐÕÓÔÏ */"
 
-#~ msgid "unmatched close-brace (`}')"
+#~ msgid "multiple %%header_extension declarations"
-#~ msgstr "ÎÅÐÁÒÎÁÑ ÚÁËÒÙ×ÁÀÝÁÑ ÆÉÇÕÒÎÁÑ ÓËÏÂËÁ (`}')"
+#~ msgstr "ÍÎÏÖÅÓÔ×ÅÎÎÙÅ ÏÐÉÓÁÎÉÑ %%header_extension"
+
+#~ msgid "multiple %%source_extension declarations"
+#~ msgstr "ÍÎÏÖÅÓÔ×ÅÎÎÙÅ ÏÐÉÓÁÎÉÑ %%source_extension"
 
 #~ msgid "@%s is invalid"
 #~ msgstr "ÎÅ×ÅÒÎÙÊ ÚÎÁË @%s"
-
-#~ msgid "unmatched right brace (`}')"
-#~ msgstr "ÎÅÐÁÒÎÁÑ ÐÒÁ×ÁÑ ÆÉÇÕÒÎÁÑ ÓËÏÂËÁ (`}')"
-
-#~ msgid "ill-formed %type declaration"
-#~ msgstr "ÎÅ×ÅÒÎÏÅ ÏÐÉÓÁÎÉÅ %type"

po/tr.po

@@ -0,0 +1,840 @@
+# Turkish translations for GNU Bison messages.
+# Copyright (C) 2001 Free Software Foundation, Inc.
+# Altug Bayram <[email protected]>, 2001.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: bison 1.28c\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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-9\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 0.9.5\n"
+
+#: src/LR0.c:207
+#, c-format
+msgid "too many states (max %d)"
+msgstr "çok fazla durum (en fazla %d)"
+
+#: lib/error.c:117 src/complain.c:96
+msgid "Unknown system error"
+msgstr "Bilinmeyen sistem hatasý"
+
+#: src/complain.c:150
+msgid "warning: "
+msgstr "uyarý: "
+
+#: src/complain.c:238 src/complain.c:279
+msgid "fatal error: "
+msgstr "ölümcül hata:"
+
+#: 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:114 src/conflicts.c:137
+msgid "reduce"
+msgstr "indirgeme"
+
+#: src/conflicts.c:120 src/conflicts.c:133
+msgid "shift"
+msgstr "öteleme"
+
+#: src/conflicts.c:141
+msgid "an error"
+msgstr "bir hata"
+
+#: src/conflicts.c:421
+msgid " 1 shift/reduce conflict"
+msgstr " 1 öteleme/indirgeme çeliþkisi"
+
+#: src/conflicts.c:426
+#, c-format
+msgid " %d shift/reduce conflicts"
+msgstr " %d öteleme/indirgeme çeliþkisi"
+
+#: src/conflicts.c:432
+msgid " and"
+msgstr " ve"
+
+#: src/conflicts.c:438
+msgid " 1 reduce/reduce conflict"
+msgstr " 1 indirgeme/indirgeme çeliþkisi"
+
+#: src/conflicts.c:443
+#, c-format
+msgid " %d reduce/reduce conflicts"
+msgstr " %d indirgeme/indirgeme çeliþkisi"
+
+#: 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:491
+msgid "conflicts: "
+msgstr "çeliþkiler: "
+
+#: src/conflicts.c:493
+#, c-format
+msgid " %d shift/reduce"
+msgstr " %d öteleme/indirgeme"
+
+#: src/conflicts.c:497
+#, c-format
+msgid " %d reduce/reduce"
+msgstr " %d indirgeme/indirgeme"
+
+#: src/conflicts.c:502
+#, c-format
+msgid "%s contains"
+msgstr "%s içerir"
+
+#: 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:600 src/print.c:171
+#, c-format
+msgid ""
+"    $default\treduce using rule %d (%s)\n"
+"\n"
+msgstr ""
+"    $default\tindirgeme kural %d (%s)'i kullanýyor\n"
+"\n"
+
+#: 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:730
+#, c-format
+msgid "    $default\treduce using rule %d (%s)\n"
+msgstr "    $default\tindirgeme kural %d (%s)'i kullanýyor\n"
+
+#: src/derives.c:43
+msgid "DERIVES"
+msgstr "TÜRETÝLENLER"
+
+#: src/derives.c:48
+#, c-format
+msgid "%s derives"
+msgstr "%s türetildi"
+
+#: src/files.c:133
+#, c-format
+msgid "cannot open file `%s'"
+msgstr "`%s' dosyasý açýlamadý"
+
+#: src/files.c:152
+msgid "cannot close file"
+msgstr "dosya kapatýlamýyor"
+
+#. Some efforts were made to ease the translators' task, please
+#. continue.
+#: src/getargs.c:83
+msgid "GNU bison generates parsers for LALR(1) grammars.\n"
+msgstr "GNU bison LALR(1) gramerler için ayrýþtýrýcýlar üretir.\n"
+
+#: src/getargs.c:87
+#, c-format
+msgid "Usage: %s [OPTION]... FILE\n"
+msgstr "Kullaným: %s [SEÇENEK]... DOSYA\n"
+
+#: src/getargs.c:91
+msgid ""
+"If a long option shows an argument as mandatory, then it is mandatory\n"
+"for the equivalent short option also.  Similarly for optional arguments.\n"
+msgstr ""
+"Eðer bir uzun seçenek bir argümaný gerektirirse, bu gereklilik, denk olan\n"
+"kýsa seçenek için de geçerlidir.  Bu durum, seçimli argümanlar için de\n"
+"geçerlidir.\n"
+
+#: src/getargs.c:97
+msgid ""
+"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"
+msgstr ""
+"Çalýþma kipleri:\n"
+"  -h, --help      bu yardýmý göster ve çýk\n"
+"  -V, --version   sürüm bilgisini ver ve çýk\n"
+"  -y, --yacc      POSIX yacc öykünmesi\n"
+
+#: src/getargs.c:104
+msgid ""
+"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"
+"  -k, --token-table          include a table of token names\n"
+msgstr ""
+"Ayrýþtýrýcý:\n"
+"  -S, --skeleton=DOSYA       kullanýlacak iskeleti belirler\n"
+"  -t, --debug                ayrýþtýrýcý için hata ayýklayýcý aracý\n"
+"      --locations            konum hesaplamalarýný etkinleþtirir\n"
+"  -p, --name-prefix=ÖNEK     dýþ simgelere eklenen ÖNEK\n"
+"  -l, --no-lines             `#line' bildirimlerini üretmez\n"
+"  -n, --no-parser            sadece tablolarý üretir\n"
+"  -k, --token-table          andaç isimlerinin bir tablosunu içerir\n"
+
+#: src/getargs.c:116
+#, fuzzy
+msgid ""
+"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"
+"  -g, --graph                also produce a VCG graph description of the "
+"automaton\n"
+msgstr ""
+"Çýktý:\n"
+"  -d, --defines              bir baþlýk dosyasý da üretir\n"
+"  -v, --verbose              otomatýn bir açýklamasýný da üretir\n"
+"  -b, --file-prefix=ÖNEK     çýktý dosyalarý için bir ÖNEK belirtir\n"
+"  -o, --output-file=DOSYA    çýktýyý DOSYAYA býrakýr\n"
+
+#: src/getargs.c:126
+msgid "Report bugs to <[email protected]>.\n"
+msgstr ""
+"Hatalarý <[email protected]>'a,\n"
+"çeviri hatalarýný <[email protected]>'e bildir.\n"
+
+#. Some efforts were made to ease the translators' task, please
+#. continue.
+#: src/getargs.c:140
+#, c-format
+msgid "bison (GNU Bison) %s"
+msgstr "bison (GNU Bison) %s"
+
+#: src/getargs.c:145
+msgid ""
+"Copyright 1984, 1986, 1989, 1992, 2000, 2001 Free Software Foundation, Inc.\n"
+msgstr ""
+"Telifhakký 1984, 1986, 1989, 1992, 2000, 2001 Free Software Foundation, "
+"Inc.\n"
+
+#: src/getargs.c:149
+msgid ""
+"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"
+msgstr ""
+"Bu bir serbest yazýlýmdýr; kopyalama koþullarý için kaynak koduna bakýnýz.\n"
+"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:650
+#, c-format
+msgid "`%s' is no longer supported"
+msgstr "`%s' artýk desteklenmiyor"
+
+#: src/getargs.c:238
+#, c-format
+msgid "Try `%s --help' for more information.\n"
+msgstr "Daha fazla bilgi için `%s --help' yazýn.\n"
+
+#: src/getargs.c:245
+#, c-format
+msgid "%s: no grammar file given\n"
+msgstr "%s: gramer dosyasý verilmemiþ\n"
+
+#: src/getargs.c:249
+#, c-format
+msgid "%s: extra arguments ignored after `%s'\n"
+msgstr "%s: '%s' den sonraki argümanlar yoksayýldý\n"
+
+#: src/lalr.c:311
+#, c-format
+msgid "too many gotos (max %d)"
+msgstr "gotos çok fazla (en fazla %d)"
+
+#: src/lex.c:78
+msgid "unexpected `/' found and ignored"
+msgstr "beklenmeyen `/' bulundu ve yoksayýldý"
+
+#: src/lex.c:107 src/reader.c:269
+msgid "unterminated comment"
+msgstr "sonlandýrýlmamýþ açýklama"
+
+#: src/lex.c:139
+msgid "unexpected end of file"
+msgstr "beklenmeyen dosya sonu"
+
+#: src/lex.c:168
+msgid "unescaped newline in constant"
+msgstr "sabit içinde kaçýþsýz yeni satýr"
+
+#: 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: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:247
+#, c-format
+msgid "unknown escape sequence: `\\' followed by `%s'"
+msgstr "bilinmeyen kaçýþ sýrasý: `\\' `%s' tarafýndan takip edildi"
+
+#: src/lex.c:343
+msgid "unterminated type name at end of file"
+msgstr "dosya sonunda sonlandýrýlmamýþ tip adý"
+
+#: src/lex.c:346
+msgid "unterminated type name"
+msgstr "sonlandýrýlmamýþ tip ismi"
+
+#: src/lex.c:437
+msgid "use \"...\" for multi-character literal tokens"
+msgstr "çok-karakterli yazýn andaçlarý için \"...\" kullan"
+
+#: src/main.c:125
+#, c-format
+msgid "%s: internal error: %s\n"
+msgstr "%s: iç hata: %s\n"
+
+#: src/nullable.c:51
+msgid "Entering set_nullable"
+msgstr "set_nullable'a girildi"
+
+#: 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:37
+#, c-format
+msgid " type %d is %s\n"
+msgstr " tip %d %s'dir\n"
+
+#: src/print.c:85
+#, c-format
+msgid "   (rule %d)"
+msgstr "   (kural %d)"
+
+#: src/print.c:111
+msgid "    $default\taccept\n"
+msgstr "    $default\tonayla\n"
+
+#: src/print.c:113
+msgid "    NO ACTIONS\n"
+msgstr "    EYLEM YOK\n"
+
+#: src/print.c:132
+#, c-format
+msgid "    $   \tgo to state %d\n"
+msgstr "    $   \tdurum %d'ye git\n"
+
+#: 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:159
+#, c-format
+msgid "    %-4s\terror (nonassociative)\n"
+msgstr "    %-4s\thata (birleþmeli deðil)\n"
+
+#: src/print.c:187
+#, c-format
+msgid "    %-4s\tgo to state %d\n"
+msgstr "    %-4s\tdurum %d'ye git\n"
+
+#: src/print.c:199
+#, c-format
+msgid "state %d"
+msgstr "durum %d"
+
+#. rule # : LHS -> RHS
+#: src/print.c:229
+msgid "Grammar"
+msgstr "Gramer"
+
+#: src/print.c:234
+#, c-format
+msgid "rule %-4d %s ->"
+msgstr "kural %-4d %s ->"
+
+#: src/print.c:240
+msgid "empty"
+msgstr ""
+
+#. 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:268
+msgid "Nonterminals, with rules where they appear"
+msgstr "Deðiþken simgeler, kurallarýnýn bulunduklarý yerde"
+
+#: src/print.c:294
+msgid " on left:"
+msgstr " solda:"
+
+#: src/print.c:309
+msgid " on right:"
+msgstr " saðda:"
+
+#: src/print_graph.c:174
+#, c-format
+msgid "%-4s\terror (nonassociative)"
+msgstr "%-4s\thata (birleþmeli deðil)"
+
+#: src/print_graph.c:187
+#, c-format
+msgid "$default\treduce using rule %d (%s)"
+msgstr "$default\tindirgeme kural %d (%s)'i kullanýyor"
+
+#: src/reader.c:78
+msgid "   Skipping to next \\n"
+msgstr "   Sonrakine atlanýyor \\n"
+
+#: src/reader.c:80
+#, c-format
+msgid "   Skipping to next %c"
+msgstr "   Sonraki  %c'ye atlanýyor"
+
+#: src/reader.c:131 src/reader.c:143
+msgid "invalid $ value"
+msgstr "geçersiz $ deðeri"
+
+#: 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:172
+msgid "unterminated string"
+msgstr "sonlandýrýlmamýþ dizge"
+
+#: src/reader.c:325 src/reader.c:389
+#, c-format
+msgid "%s is invalid"
+msgstr "%s geçersizdir"
+
+#: src/reader.c:365
+#, c-format
+msgid "$$ of `%s' has no declared type"
+msgstr "`%s''in $$'ý bildirilmiþ tip deðil"
+
+#: 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:436
+msgid "unterminated `%{' definition"
+msgstr "`%{' tanýmlamasý sonlandýrýlmamýþ"
+
+#: 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: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:501
+#, c-format
+msgid "symbol `%s' given more than one literal string"
+msgstr "`%s' simgesine birden fazla sabit dizge verilmiþ"
+
+#: src/reader.c:522 src/reader.c:664
+#, c-format
+msgid "symbol %s redefined"
+msgstr "%s simgesi yeniden tanýmlandý"
+
+#: 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:541
+#, c-format
+msgid "`%s' is invalid in %s"
+msgstr "`%s' %s içinde geçersizdir"
+
+#: src/reader.c:558 src/reader.c:717
+#, c-format
+msgid "multiple %s declarations"
+msgstr "çoklu %s bildirimleri"
+
+#: 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:580
+msgid "%type declaration has no <typename>"
+msgstr "%type bildirimi <tipadý>'na sahip deðil"
+
+#: 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:660
+#, c-format
+msgid "redefining precedence of %s"
+msgstr "%s'in önceliði tekrar tanýmlandý"
+
+#: 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:693
+#, c-format
+msgid "unexpected item: %s"
+msgstr "beklenmeyen öðe: %s"
+
+#: src/reader.c:760 src/reader.c:1089 src/reader.c:1160
+#, c-format
+msgid "unmatched %s"
+msgstr "eþlenemeyen %s"
+
+#: 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: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:862
+#, c-format
+msgid "expected string constant instead of %s"
+msgstr "%s'in yerine sabit dizge beklendi"
+
+#: src/reader.c:1005
+#, c-format
+msgid "unrecognized: %s"
+msgstr "tanýnmayan: %s"
+
+#: src/reader.c:1010
+msgid "no input grammar"
+msgstr "girdi grameri yok"
+
+#: src/reader.c:1015
+#, c-format
+msgid "unknown character: %s"
+msgstr "bilinmeyen karakter: %s"
+
+#: src/reader.c:1183
+#, c-format
+msgid "unterminated %guard clause"
+msgstr "sonlandýrýlmamýþ %guard yantümcesi"
+
+#: 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:1357
+msgid "grammar starts with vertical bar"
+msgstr "gramer düþey çubuk ile baþlýyor"
+
+#: 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:1490
+msgid "two @prec's in a row"
+msgstr "bir satýrda iki @prec"
+
+#: src/reader.c:1498
+#, c-format
+msgid "%%guard present but %%semantic_parser not specified"
+msgstr "%%guard sunulmuþ fakat %%semantic_parser belirlenmemiþ"
+
+#: src/reader.c:1507
+msgid "two actions at end of one rule"
+msgstr "bir kuralýn sonunda iki eylem"
+
+#: 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: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:1571
+#, c-format
+msgid "invalid input: %s"
+msgstr "geçersiz girdi: %s"
+
+#: 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:1582
+msgid "no rules in the input grammar"
+msgstr "girdi grameri içinde kurallar yok"
+
+#: 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:1712
+#, c-format
+msgid "conflicting precedences for %s and %s"
+msgstr "%s ve %s için çeliþen öncelikler"
+
+#: 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: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:1782
+#, c-format
+msgid "the start symbol %s is undefined"
+msgstr "baþlangýç simgesi %s tanýmlanmadý"
+
+#: 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:401
+msgid "Useless nonterminals:"
+msgstr "Yararsýz kurallar:"
+
+#: src/reduce.c:416
+msgid "Terminals which are not used:"
+msgstr "Kullanýlmayan sabit simgeler:"
+
+#: src/reduce.c:427
+msgid "Useless rules:"
+msgstr "Yararsýz kurallar:"
+
+#: src/reduce.c:456
+msgid ""
+"Variables\n"
+"---------\n"
+"\n"
+msgstr ""
+"Deðiþkenler\n"
+"-----------\n"
+"\n"
+
+#: src/reduce.c:458
+msgid "Value  Sprec    Sassoc    Tag\n"
+msgstr "Deðer  Söncel   Sbirleþ   Etiket\n"
+
+#: src/reduce.c:463
+msgid ""
+"Rules\n"
+"-----\n"
+"\n"
+msgstr ""
+"Kurallar\n"
+"--------\n"
+"\n"
+
+#: src/reduce.c:474
+msgid ""
+"Rules interpreted\n"
+"-----------------\n"
+"\n"
+msgstr ""
+"Kurallar yorumlandý\n"
+"-------------------\n"
+"\n"
+
+#: src/reduce.c:491
+#, c-format
+msgid "%d rules never reduced\n"
+msgstr "%d kural asla indirgenmedi\n"
+
+#: src/reduce.c:493
+#, c-format
+msgid "%s contains "
+msgstr "%s içerir "
+
+#: src/reduce.c:497
+#, c-format
+msgid "%d useless nonterminal%s"
+msgstr "%d yararsýz deðiþken simge%s"
+
+#: src/reduce.c:502
+msgid " and "
+msgstr " ve "
+
+#: src/reduce.c:506
+#, c-format
+msgid "%d useless rule%s"
+msgstr "%d yararsýz kural%s"
+
+#: 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:552
+#, fuzzy, c-format
+msgid ""
+"reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n"
+msgstr ""
+"indirgenen %s tanýmlanan %d sabit simge%s, %d deðiþken simge%s, ve %düretilen"
+"%s.\n"
+
+#: lib/getopt.c:675
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: `%s' seçeneði belirsiz\n"
+
+#: lib/getopt.c:700
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: `--%s' seçeneði argümansýz kullanýlýr\n"
+
+#: lib/getopt.c:705
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: seçenek `%c%s' argümansýz kullanýlýr\n"
+
+#: lib/getopt.c:723 lib/getopt.c:896
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: `%s' seçeneði bir argümanla kullanýlýr\n"
+
+#. --option
+#: lib/getopt.c:752
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: `--%s' seçeneði bilinmiyor\n"
+
+#. +option or -option
+#: lib/getopt.c:756
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: `%c%s' seçeneði bilinmiyor\n"
+
+#. 1003.2 specifies the format of this message.
+#: lib/getopt.c:782
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: kuraldýþý seçenek -- %c\n"
+
+#: lib/getopt.c:785
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: geçersiz seçenek -- %c\n"
+
+#. 1003.2 specifies the format of this message.
+#: lib/getopt.c:815 lib/getopt.c:945
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: seçenek bir argümanla kullanýlýr -- %c\n"
+
+#: lib/getopt.c:862
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: `-W %s' seçeneði belirsiz\n"
+
+#: lib/getopt.c:880
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: `-W %s' seçeneði argümansýz kullanýlýr\n"
+
+#. If XALLOC_FAIL_FUNC is NULL, or does return, display this message
+#. before exiting when memory is exhausted.  Goes through gettext.
+#: lib/obstack.c:477 lib/xmalloc.c:66
+msgid "memory exhausted"
+msgstr "bellek tükendi"
+
+#. Get translations for open and closing quotation marks.
+#.
+#. The message catalog should translate "`" to a left
+#. quotation mark suitable for the locale, and similarly for
+#. "'".  If the catalog has no translation,
+#. locale_quoting_style quotes `like this', and
+#. clocale_quoting_style quotes "like this".
+#.
+#. For example, an American English Unicode locale should
+#. translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and
+#. should translate "'" to U+201D (RIGHT DOUBLE QUOTATION
+#. 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:268
+msgid "`"
+msgstr "`"
+
+#: lib/quotearg.c:269
+msgid "'"
+msgstr "'"
+
+#~ msgid "\t\t/* empty */"
+#~ msgstr "\t\t/* boþ */"
+
+#~ msgid "multiple %%header_extension declarations"
+#~ msgstr "çoklu %%header_extension bildirimleri"
+
+#~ msgid "multiple %%source_extension declarations"
+#~ msgstr "çoklu %%source_extension bildirimleri"
+
+#~ msgid "vcg graph: no such color."
+#~ msgstr "vcg graph: böyle bir renk yok."
+
+#~ msgid "vcg graph: no such text mode"
+#~ msgstr "vcg graph: böyle bir metin kipi yok"
+
+#~ msgid "vcg graph: no such shape"
+#~ msgstr "vcg graph: böyle bir þekil yok"
+
+#~ msgid "vcg graph: no such decision"
+#~ msgstr "vcg graph: böyle bir karar yok"
+
+#~ msgid "vcg graph: no such an orientation"
+#~ msgstr "vcg graph: böyle bir konum yok"
+
+#~ msgid "vcg graph: no such an alignement"
+#~ msgstr "vcg graph: böyle bir hizalama yok"
+
+#~ msgid "vcg graph: no such an arrow mode"
+#~ msgstr "vcg graph: böyle bir yön kipi yok"
+
+#~ msgid "vcg graph: no such crossing_type"
+#~ msgstr "vcg graph: böyle bir kesme tipi yok"
+
+#~ msgid "vcg graph: no such view"
+#~ msgstr "vcg graph: böyle bir görünüm yok"
+
+#~ msgid "vcg graph: no such linestyle"
+#~ msgstr "vcg graph: böyle bir çizgi biçemi yok"
+
+#~ msgid "vcg graph: no such an arrowstyle"
+#~ msgstr "vcg graph: böyle bir yön biçemi yok"

src/.cvsignore

@@ -3,4 +3,3 @@
 Makefile
 bison
 *.log
-*.flc

src/LR0.c

@@ -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;
+core *first_state = NULL;
-shifts *first_shift;
+shifts *first_shift = NULL;
-reductions *first_reduction;
+reductions *first_reduction = NULL;
 
-static core *this_state;
+static core *this_state = NULL;
-static core *last_state;
+static core *last_state = NULL;
-static shifts *last_shift;
+static shifts *last_shift = NULL;
-static reductions *last_reduction;
+static reductions *last_reduction = NULL;
 
 static int nshifts;
-static short *shift_symbol;
+static short *shift_symbol = NULL;
 
-static short *redset;
+static short *redset = NULL;
-static short *shiftset;
+static short *shiftset = NULL;
 
-static short **kernel_base;
+static short **kernel_base = NULL;
-static short **kernel_end;
+static short **kernel_end = NULL;
-static short *kernel_items;
+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++)

src/Makefile.am

@@ -13,19 +13,17 @@ bin_PROGRAMS = bison
 bison_SOURCES = LR0.c closure.c complain.c conflicts.c	\
     derives.c	\
     files.c getargs.c gram.c lalr.c lex.c main.c nullable.c \
-    output.c print_graph.c \
+    output.c	\
-    muscle_tab.c options.c \
+    print.c reader.c reduce.c symtab.c warshall.c vcg.c print_graph.c
-    print.c reader.c reduce.c symtab.c warshall.c vcg.c
 
 EXTRA_bison_SOURCES = vmsgetargs.c
 
 noinst_HEADERS = LR0.h closure.h complain.h conflicts.h \
  derives.h \
  files.h getargs.h gram.h lalr.h lex.h nullable.h \
- output.h print_graph.h	\
+ output.h state.h	\
- muscle_tab.h options.h \
+ print.h reader.h reduce.h symtab.h warshall.h system.h types.h \
- print.h reader.h reduce.h state.h symtab.h warshall.h system.h \
+ vcg.h vcg_defaults.h print_graph.h
- types.h vcg.h vcg_defaults.h
 
 pkgdata_DATA = bison.simple bison.hairy
 

src/Makefile.in

@@ -58,7 +58,6 @@ POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
 AMTAR = @AMTAR@
-AT_TESTPATH = @AT_TESTPATH@
 AWK = @AWK@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 CATALOGS = @CATALOGS@
@@ -67,9 +66,6 @@ CC = @CC@
 CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
 DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
 EXEEXT = @EXEEXT@
 GENCAT = @GENCAT@
 GLIBC21 = @GLIBC21@
@@ -115,9 +111,8 @@ bin_PROGRAMS = bison
 bison_SOURCES = LR0.c closure.c complain.c conflicts.c	\
     derives.c	\
     files.c getargs.c gram.c lalr.c lex.c main.c nullable.c \
-    output.c print_graph.c \
+    output.c	\
-    muscle_tab.c options.c \
+    print.c reader.c reduce.c symtab.c warshall.c vcg.c print_graph.c
-    print.c reader.c reduce.c symtab.c warshall.c vcg.c
 
 
 EXTRA_bison_SOURCES = vmsgetargs.c
@@ -125,10 +120,9 @@ EXTRA_bison_SOURCES = vmsgetargs.c
 noinst_HEADERS = LR0.h closure.h complain.h conflicts.h \
  derives.h \
  files.h getargs.h gram.h lalr.h lex.h nullable.h \
- output.h print_graph.h	\
+ output.h state.h	\
- muscle_tab.h options.h \
+ print.h reader.h reduce.h symtab.h warshall.h system.h types.h \
- print.h reader.h reduce.h state.h symtab.h warshall.h system.h \
+ vcg.h vcg_defaults.h print_graph.h
- types.h vcg.h vcg_defaults.h
 
 
 pkgdata_DATA = bison.simple bison.hairy
@@ -145,10 +139,9 @@ am_bison_OBJECTS = LR0$U.$(OBJEXT) closure$U.$(OBJEXT) \
 	complain$U.$(OBJEXT) conflicts$U.$(OBJEXT) derives$U.$(OBJEXT) \
 	files$U.$(OBJEXT) getargs$U.$(OBJEXT) gram$U.$(OBJEXT) \
 	lalr$U.$(OBJEXT) lex$U.$(OBJEXT) main$U.$(OBJEXT) \
-	nullable$U.$(OBJEXT) output$U.$(OBJEXT) print_graph$U.$(OBJEXT) \
+	nullable$U.$(OBJEXT) output$U.$(OBJEXT) print$U.$(OBJEXT) \
-	muscle_tab$U.$(OBJEXT) options$U.$(OBJEXT) print$U.$(OBJEXT) \
 	reader$U.$(OBJEXT) reduce$U.$(OBJEXT) symtab$U.$(OBJEXT) \
-	warshall$U.$(OBJEXT) vcg$U.$(OBJEXT)
+	warshall$U.$(OBJEXT) vcg$U.$(OBJEXT) print_graph$U.$(OBJEXT)
 bison_OBJECTS = $(am_bison_OBJECTS)
 bison_LDADD = $(LDADD)
 bison_DEPENDENCIES = ../lib/libbison.a
@@ -163,8 +156,7 @@ depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 @AMDEP_TRUE@	$(DEPDIR)/derives$U.Po $(DEPDIR)/files$U.Po \
 @AMDEP_TRUE@	$(DEPDIR)/getargs$U.Po $(DEPDIR)/gram$U.Po \
 @AMDEP_TRUE@	$(DEPDIR)/lalr$U.Po $(DEPDIR)/lex$U.Po \
-@AMDEP_TRUE@	$(DEPDIR)/main$U.Po $(DEPDIR)/muscle_tab$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/main$U.Po $(DEPDIR)/nullable$U.Po \
-@AMDEP_TRUE@	$(DEPDIR)/nullable$U.Po $(DEPDIR)/options$U.Po \
 @AMDEP_TRUE@	$(DEPDIR)/output$U.Po $(DEPDIR)/print$U.Po \
 @AMDEP_TRUE@	$(DEPDIR)/print_graph$U.Po $(DEPDIR)/reader$U.Po \
 @AMDEP_TRUE@	$(DEPDIR)/reduce$U.Po $(DEPDIR)/symtab$U.Po \
@@ -245,9 +237,7 @@ mostlyclean-kr:
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/lalr$U.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/lex$U.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/main$U.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/muscle_tab$U.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/nullable$U.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/options$U.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/output$U.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/print$U.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/print_graph$U.Po@am__quote@
@@ -295,12 +285,8 @@ lex_.c: lex.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/lex.c; then echo $(srcdir)/lex.c; else echo lex.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > lex_.c || rm -f lex_.c
 main_.c: main.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/main.c; then echo $(srcdir)/main.c; else echo main.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > main_.c || rm -f main_.c
-muscle_tab_.c: muscle_tab.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/muscle_tab.c; then echo $(srcdir)/muscle_tab.c; else echo muscle_tab.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > muscle_tab_.c || rm -f muscle_tab_.c
 nullable_.c: nullable.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/nullable.c; then echo $(srcdir)/nullable.c; else echo nullable.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > nullable_.c || rm -f nullable_.c
-options_.c: options.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/options.c; then echo $(srcdir)/options.c; else echo options.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > options_.c || rm -f options_.c
 output_.c: output.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/output.c; then echo $(srcdir)/output.c; else echo output.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > output_.c || rm -f output_.c
 print_.c: print.c $(ANSI2KNR)
@@ -322,8 +308,7 @@ warshall_.c: warshall.c $(ANSI2KNR)
 LR0_.$(OBJEXT) closure_.$(OBJEXT) complain_.$(OBJEXT) \
 conflicts_.$(OBJEXT) derives_.$(OBJEXT) files_.$(OBJEXT) \
 getargs_.$(OBJEXT) gram_.$(OBJEXT) lalr_.$(OBJEXT) lex_.$(OBJEXT) \
-main_.$(OBJEXT) muscle_tab_.$(OBJEXT) nullable_.$(OBJEXT) \
+main_.$(OBJEXT) nullable_.$(OBJEXT) output_.$(OBJEXT) print_.$(OBJEXT) \
-options_.$(OBJEXT) output_.$(OBJEXT) print_.$(OBJEXT) \
 print_graph_.$(OBJEXT) reader_.$(OBJEXT) reduce_.$(OBJEXT) \
 symtab_.$(OBJEXT) vcg_.$(OBJEXT) vmsgetargs_.$(OBJEXT) \
 warshall_.$(OBJEXT) : $(ANSI2KNR)

src/bison.simple

@@ -1,8 +1,5 @@
-/* -*- C -*- */
+/* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */
-
+#line
-/* A Bison parser, made from %%filename
-   by GNU bison %%version.  */
-
 /* Skeleton output parser for bison,
    Copyright 1984, 1989, 1990, 2000, 2001 Free Software Foundation, Inc.
 
@@ -31,29 +28,6 @@
    It was written by Richard Stallman by simplifying the hairy parser
    used when %semantic_parser is specified.  */
 
-#include <stdio.h>
-
-/* If name_prefix is specify substitute the variables and functions
-   names.  */
-#define yyparse %%prefix##parse
-#define yylex %%prefix##lex
-#define yyerror %%prefix##error
-#define yylval %%prefix##lval
-#define yychar %%prefix##char
-#define yydebug %%prefix##debug
-#define yynerrs %%prefix##nerrs
-
-/* Copy the user declarations.  */
-#line %%input_line "%%filename"
-%%prologue
-
-#line %%line "%%skeleton"
-#ifndef __cplusplus
-# ifndef __STDC__
-#  define const
-# endif
-#endif
-
 #ifndef YYSTACK_USE_ALLOCA
 # ifdef alloca
 #  define YYSTACK_USE_ALLOCA 1
@@ -104,163 +78,31 @@
 # define YYSTACK_ALLOC malloc
 #endif
 
-#define YYBISON	1	/* Identify Bison output.  */
-#define YYPURE	%%pure	/* Identify pure parsers.  */
-
-#ifndef YYDEBUG
-# define YYDEBUG %%debug
-#endif
-
-#line %%input_line "%%filename"
-#ifndef YYSTYPE
-typedef %%stype YYSTYPE;
-#endif
-
-#ifndef YYLTYPE
-typedef struct yyltype
-{
-  int first_line;
-  int first_column;
-  int last_line;
-  int last_column;
-} yyltype;
-# define YYLTYPE %%ltype
-#endif
-
-#ifndef YYERROR_VERBOSE
-# define YYERROR_VERBOSE %%verbose
-#endif
-
-/* Tokens.  */
-%%tokendef
-
-#define YYFINAL		%%final
-#define YYFLAG		%%flag
-#define YYNTBASE	%%ntbase
-#define YYLAST		%%last
-
-#define YYNTOKENS	%%ntokens
-#define YYNNTS		%%nnts
-#define YYNRULES	%%nrules
-#define YYNSTATES	%%nstates
-#define YYMAXUTOK	%%maxtok
-
-/* YYTRANSLATE(YYLEX) -- Bison token number corresponding to YYLEX.  */
-#define YYTRANSLATE(x) ((unsigned)(x) <= %%maxtok ? yytranslate[x] : %%nsym)
-
-/* YYTRANSLATE[YYLEX] -- Bison token number corresponding to YYLEX.  */
-static const char yytranslate[] =
-{
-  %%translate
-};
-
-#if YYDEBUG
-static const short yyprhs[] =
-{
-  %%prhs
-};
-
-static const short yyrhs[] =
-{
-  %%rhs
-};
-
-/* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
-static const short yyrline[] =
-{
-  %%rline
-};
-#endif
-
-#if YYDEBUG || YYERROR_VERBOSE
-/* YYTNME[TOKEN_NUM] -- String name of the token TOKEN_NUM.  */
-static const char *const yytname[] =
-{
-  %%tname
-};
-#endif
-
-/* YYTOKNUM[YYN] -- Index in YYTNAME corresponding to YYLEX.  */
-static const short yytoknum[] =
-{
-  %%toknum
-};
-
-/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
-static const short yyr1[] =
-{
-  %%r1
-};
-
-/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
-static const short yyr2[] =
-{
-  %%r2
-};
-
-/* YYDEFACT[S] -- default rule to reduce with in state S when YYTABLE
-   doesn't specify something else to do.  Zero means the default is an
-   error.  */
-static const short yydefact[] =
-{
-  %%defact
-};
-
-static const short yydefgoto[] =
-{
-  %%defgoto
-};
-
-static const short yypact[] =
-{
-  %%pact
-};
-
-static const short yypgoto[] =
-{
-  %%pgoto
-};
-
-static const short yytable[] =
-{
-  %%table
-};
-
-static const short yycheck[] =
-{
-  %%check
-};
-
 #define yyerrok		(yyerrstatus = 0)
 #define yyclearin	(yychar = YYEMPTY)
 #define YYEMPTY		-2
 #define YYEOF		0
-
 #define YYACCEPT	goto yyacceptlab
-#define YYABORT		goto yyabortlab
+#define YYABORT 	goto yyabortlab
 #define YYERROR		goto yyerrlab1
-
 /* Like YYERROR except do call yyerror.  This remains here temporarily
    to ease the transition to the new meaning of YYERROR, for GCC.
    Once GCC version 2 has supplanted version 1, this can go.  */
-
 #define YYFAIL		goto yyerrlab
-
 #define YYRECOVERING()  (!!yyerrstatus)
-
 #define YYBACKUP(Token, Value)					\
 do								\
   if (yychar == YYEMPTY && yylen == 1)				\
     {								\
       yychar = (Token);						\
-      yylval = (Value);					\
+      yylval = (Value);						\
       yychar1 = YYTRANSLATE (yychar);				\
       YYPOPSTACK;						\
       goto yybackup;						\
     }								\
   else								\
     { 								\
-      yyerror ("syntax error: cannot back up");		\
+      yyerror ("syntax error: cannot back up");			\
       YYERROR;							\
     }								\
 while (0)
@@ -268,6 +110,7 @@ while (0)
 #define YYTERROR	1
 #define YYERRCODE	256
 
+
 /* YYLLOC_DEFAULT -- Compute the default location (before the actions
    are run).
 
@@ -281,8 +124,6 @@ while (0)
    Current.last_column = Rhs[N].last_column;
 #endif
 
-/* Definition of YYLSP_NEEDED.  */
-#define YYLSP_NEEDED %%locations_flag
 
 /* YYLEX -- calling `yylex' with the right arguments.  */
 
@@ -304,6 +145,7 @@ while (0)
 # define YYLEX			yylex ()
 #endif /* !YYPURE */
 
+
 /* Enable debugging if requested.  */
 #if YYDEBUG
 # define YYDPRINTF(Args)			\
@@ -322,7 +164,7 @@ int yydebug;
 
 /* YYINITDEPTH -- initial size of the parser's stacks.  */
 #ifndef	YYINITDEPTH
-# define YYINITDEPTH %%initdepth
+# define YYINITDEPTH 200
 #endif
 
 /* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
@@ -332,11 +174,9 @@ int yydebug;
 #endif
 
 #ifndef YYMAXDEPTH
-# define YYMAXDEPTH %%maxdepth
+# define YYMAXDEPTH 10000
 #endif
-
 
-
 /* Define __yy_memcpy.  Note that the size argument
    should be passed with type unsigned int, because that is what the non-GCC
    definitions require.  With GCC, __builtin_memcpy takes an arg
@@ -365,11 +205,10 @@ __yy_memcpy (char *to, const char *from, unsigned int count)
   while (i-- > 0)
     *t++ = *f++;
 }
+
 #endif
-
 
-
+#line
-#line %%line "%%skeleton"
 
 /* The user can define YYPARSE_PARAM as the name of an argument to be passed
    into yyparse.  The argument should have type void *.
@@ -406,7 +245,7 @@ int yyparse (void);
 /* The lookahead symbol.  */				\
 int yychar;						\
 							\
-/* The semantic value of the lookahead symbol.  */	\
+/* The semantic value of the lookahead symbol. */	\
 YYSTYPE yylval;						\
 							\
 /* Number of parse errors so far.  */			\
@@ -423,7 +262,8 @@ YYLTYPE yylloc;
 _YY_DECL_VARIABLES
 #endif
 
-/* If nonreentrant, generate the variables here.  */
+
+/* If nonreentrant, generate the variables here. */
 
 #if !YYPURE
 YY_DECL_VARIABLES
@@ -433,7 +273,7 @@ int
 yyparse (YYPARSE_PARAM_ARG)
      YYPARSE_PARAM_DECL
 {
-  /* If reentrant, generate the variables here.  */
+  /* If reentrant, generate the variables here. */
 #if YYPURE
   YY_DECL_VARIABLES
 #endif  /* !YYPURE */
@@ -453,7 +293,7 @@ yyparse (YYPARSE_PARAM_ARG)
      Refer to the stacks thru separate pointers, to allow yyoverflow
      to reallocate them elsewhere.  */
 
-  /* The state stack.  */
+  /* The state stack. */
   short	yyssa[YYINITDEPTH];
   short *yyss = yyssa;
   register short *yyssp;
@@ -479,6 +319,7 @@ yyparse (YYPARSE_PARAM_ARG)
   int yystacksize = YYINITDEPTH;
   int yyfree_stacks = 0;
 
+
   /* The variables used to return semantic value and location from the
      action routines.  */
   YYSTYPE yyval;
@@ -487,7 +328,7 @@ yyparse (YYPARSE_PARAM_ARG)
 # endif
 
   /* When reducing, the number of symbols on the RHS of the reduced
-     rule.  */
+     rule. */
   int yylen;
 
   YYDPRINTF ((stderr, "Starting parse\n"));
@@ -512,13 +353,13 @@ yyparse (YYPARSE_PARAM_ARG)
 /*------------------------------------------------------------.
 | yynewstate -- Push a new state, which is found in yystate.  |
 `------------------------------------------------------------*/
-yynewstate:
+ yynewstate:
   /* In all cases, when you get here, the value and location stacks
      have just been pushed. so pushing a state here evens the stacks.
      */
   yyssp++;
-
+  
-yysetstate:
+ yysetstate:
   *yyssp = yystate;
 
   if (yyssp >= yyss + yystacksize - 1)
@@ -575,7 +416,7 @@ yysetstate:
       yystacksize *= 2;
       if (yystacksize > YYMAXDEPTH)
 	yystacksize = YYMAXDEPTH;
-# if !YYSTACK_USE_ALLOCA
+# ifndef YYSTACK_USE_ALLOCA
       yyfree_stacks = 1;
 # endif
       yyss = (short *) YYSTACK_ALLOC (yystacksize * sizeof (*yyssp));
@@ -607,6 +448,7 @@ yysetstate:
 
   goto yybackup;
 
+
 /*-----------.
 | yybackup.  |
 `-----------*/
@@ -633,12 +475,12 @@ yybackup:
       yychar = YYLEX;
     }
 
-  /* Convert token to internal form (in yychar1) for indexing tables with.  */
+  /* Convert token to internal form (in yychar1) for indexing tables with */
 
-  if (yychar <= 0)		/* This means end of input.  */
+  if (yychar <= 0)		/* This means end of input. */
     {
       yychar1 = 0;
-      yychar = YYEOF;		/* Don't call YYLEX any more.  */
+      yychar = YYEOF;		/* Don't call YYLEX any more */
 
       YYDPRINTF ((stderr, "Now at end of input.\n"));
     }
@@ -759,11 +601,8 @@ yyreduce:
       fprintf (stderr, " -> %s\n", yytname[yyr1[yyn]]);
     }
 #endif
-  switch (yyn)
+%% actions /* The action file replaces this line. */
-    {
+#line
-      %%action
-    }
-#line %%line "%%skeleton"
 
   yyvsp -= yylen;
   yyssp -= yylen;
@@ -811,7 +650,7 @@ yyerrlab:
     {
       ++yynerrs;
 
-#if YYERROR_VERBOSE
+#ifdef YYERROR_VERBOSE
       yyn = yypact[yystate];
 
       if (yyn > YYFLAG && yyn < YYLAST)
@@ -839,11 +678,11 @@ yyerrlab:
 		{
 		  count = 0;
 		  for (x = (yyn < 0 ? -yyn : 0);
-			 x < (int) (sizeof (yytname) / sizeof (char *)); x++)
+		       x < (int) (sizeof (yytname) / sizeof (char *)); x++)
 		    if (yycheck[x + yyn] == x)
 		      {
-		        strcat (msg, count == 0 ? ", expecting `" : " or `");
+			strcat (msg, count == 0 ? ", expecting `" : " or `");
-		        strcat (msg, yytname[x]);
+			strcat (msg, yytname[x]);
 			strcat (msg, "'");
 			count++;
 		      }
@@ -851,26 +690,26 @@ yyerrlab:
 	      yyerror (msg);
 	      free (msg);
 	    }
-          else
+	  else
 	    yyerror ("parse error; also virtual memory exceeded");
-        }
+	}
       else
 #endif /* YYERROR_VERBOSE */
-        yyerror ("parse error");
+	yyerror ("parse error");
     }
   goto yyerrlab1;
 
 
-/*----------------------------------------------------.
+/*--------------------------------------------------.
-| yyerrlab1 -- error raised explicitly by an action.  |
+| yyerrlab1 -- error raised explicitly by an action |
-`----------------------------------------------------*/
+`--------------------------------------------------*/
 yyerrlab1:
   if (yyerrstatus == 3)
     {
       /* If just tried and failed to reuse lookahead token after an
 	 error, discard it.  */
 
-      /* Return failure if at end of input.  */
+      /* return failure if at end of input */
       if (yychar == YYEOF)
 	YYABORT;
       YYDPRINTF ((stderr, "Discarding token %d (%s).\n",
@@ -881,7 +720,7 @@ yyerrlab1:
   /* Else will try to reuse lookahead token after shifting the error
      token.  */
 
-  yyerrstatus = 3;		/* Each real token shifted decrements this.  */
+  yyerrstatus = 3;		/* Each real token shifted decrements this */
 
   goto yyerrhandle;
 
@@ -904,7 +743,7 @@ yyerrdefault:
 
 /*---------------------------------------------------------------.
 | yyerrpop -- pop the current state because it cannot handle the |
-| error token.                                                   |
+| error token                                                    |
 `---------------------------------------------------------------*/
 yyerrpop:
   if (yyssp == yyss)
@@ -992,7 +831,3 @@ yyabortlab:
     }
   return 1;
 }
-
-#line %%input_line "%%filename"
-%%epilogue
-

src/closure.c

@@ -19,7 +19,6 @@
    02111-1307, USA.  */
 
 #include "system.h"
-#include "xalloc.h"
 #include "gram.h"
 #include "closure.h"
 #include "derives.h"

src/complain.c

@@ -19,14 +19,10 @@
 /* Based on error.c and error.h,
    written by David MacKenzie <djm@gnu.ai.mit.edu>.  */
 
-#ifdef HAVE_CONFIG_H
+#include "system.h"
-# include <config.h>
-#endif
-
-#include <stdio.h>
 
 #if HAVE_VPRINTF || HAVE_DOPRNT || _LIBC
-# if __STDC__
+# ifdef __STDC__
 #  include <stdarg.h>
 #  define VA_START(args, lastarg) va_start(args, lastarg)
 # else
@@ -119,7 +115,7 @@ int error_one_per_line;
 `--------------------------------*/
 
 void
-#if defined VA_START && __STDC__
+#if defined VA_START && defined __STDC__
 warn (const char *message, ...)
 #else
 warn (message, va_alist)
@@ -171,7 +167,7 @@ warn (message, va_alist)
 `-----------------------------------------------------------*/
 
 void
-#if defined VA_START && __STDC__
+#if defined VA_START && defined __STDC__
 complain (const char *message, ...)
 #else
 complain (message, va_alist)
@@ -221,7 +217,7 @@ complain (message, va_alist)
 `-------------------------------------------------*/
 
 void
-#if defined VA_START && __STDC__
+#if defined VA_START && defined __STDC__
 fatal (const char *message, ...)
 #else
 fatal (message, va_alist)
@@ -259,7 +255,7 @@ fatal (message, va_alist)
 `------------------------------------------------------------------*/
 
 void
-#if defined VA_START && __STDC__
+#if defined VA_START && defined __STDC__
 error (int status, int errnum,
        const char *message, ...)
 #else

src/complain.h

@@ -23,7 +23,7 @@
 extern "C" {
 #endif
 
-#if defined (__STDC__) && __STDC__
+#ifdef __STDC__
 
 /* Informative messages, but we proceed. */
 

src/conflicts.c

@@ -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 *shiftset = NULL;
-static unsigned *lookaheadset;
+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);
+	      fprintf (out, _("State %d contains"), i);
-	      obstack_sgrow (&output_obstack,
+	      fputs (conflict_report (src_count, rrc_count), out);
-			     conflict_report (src_count, rrc_count));
 	    }
 	}
     }
@@ -738,7 +736,7 @@ print_reductions (int state)
 
 
 void
-finalize_conflicts (void)
+free_conflicts (void)
 {
   XFREE (conflicts);
   XFREE (shiftset);

src/conflicts.h

@@ -22,10 +22,10 @@
 # define CONFLICTS_H_
 # include "state.h"
 
-void initialize_conflicts PARAMS ((void));
+void solve_conflicts PARAMS ((void));
-void print_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;

src/derives.c

@@ -25,7 +25,6 @@
    */
 
 #include "system.h"
-#include "xalloc.h"
 #include "types.h"
 #include "gram.h"
 #include "derives.h"