Version 1.29b.

Regen.
* src/system.h: Include `xalloc.h'.
2026-08-08 18:25:13 +00:00 · 2001-09-27 08:54:51 +00:00 · 2001-09-27 08:54:11 +00:00 · 2001-09-25 18:35:04 +00:00 · 2001-09-24 15:54:18 +00:00 · 2001-09-24 14:14:58 +00:00
95 changed files with 10553 additions and 7243 deletions
@@ -3,9 +3,10 @@ config.cache
 config.h
 config.log
 config.status
-stamp-h
+stamp-h*
 bison-*
 patches
 *.patch *.log log patches applied
 *.prj
 releases
+autom4te.cache
@@ -1,8 +1,370 @@
+2001-09-27  Akim Demaille  <[email protected]>
+
+	Version 1.29b.
+
+2001-09-25  Akim Demaille  <[email protected]>
+
+	* src/system.h: Include `xalloc.h'.
+	Remove it from the C files.
+	* src/files.c (output_files): Free the obstacks.
+	* src/lex.c (init_lex): Rename as...
+	(lex_init): this.
+	(lex_free): New.
+	* src/main.c (main): Use it.
+
+2001-09-24  Marc Autret  <[email protected]>
+
+	* src/vcg.c (open_edge, close_edge, open_node, close_node): Change
+	to output informations in fout (FILE*).
+	(open_graph, close_graph): Likewise.
+	(output_graph, output_edge, output_node): Likewise.
+	* src/vcg.h: Update function prototypes.
+	* src/print_graph.c (print_graph): Open output graph file.
+	(print_actions): Adjust.
+	* src/files.h: Remove extern declaration.
+	* src/files.c: Remove graph_obstack declaration.
+	(open_files): Remove graph_obstack initialization.
+	(output_files): Remove graph_obstack saving.
+
+2001-09-24  Marc Autret  <[email protected]>
+
+	* src/files.c (compute_output_file_names): Fix.
+
+2001-09-24  Marc Autret  <[email protected]>, Akim Demaille  <[email protected]>
+
+	* src/reader.c (reader): Remove call to free_symtab ().
+	* src/main.c (main): Call it here.
+	Include symtab.h.
+	* src/conflicts.c (initialize_conflicts): Rename as...
+	(solve_conflicts): this.
+	* src/print.c (print_core, print_actions, print_state)
+	(print_grammar): Dump to a file instead a `output_obstack'.
+	(print_results): Dump `output_obstack', and then proceed with the
+	FILE *.
+	* src/files.c (compute_output_file_names, close_files): New.
+	(output_files): Adjust.
+	* src/main.c (main): Adjust.
+
+2001-09-23  Marc Autret  <[email protected]>
+
+	* src/files.c (compute_header_macro): Computes header macro name
+	from spec_defines_file when given.
+
+2001-09-23  Marc Autret  <[email protected]>
+
+	* src/files.c (output_files): Add default extensions.
+
+2001-09-22  Akim Demaille  <[email protected]>
+
+	* src/conflicts.c (finalize_conflicts): Rename as...
+	(free_conflicts): this.
+
+2001-09-22  Akim Demaille  <[email protected]>
+
+	* src/gram.c (gram_free): Rename back as...
+	(dummy): this.
+	(output_token_translations): Free `token_translations'.
+	* src/symtab.c (free_symtab): Free the tag field.
+
+2001-09-22  Akim Demaille  <[email protected]>
+
+	Remove `translations' as it is always set to true.
+
+	* src/gram.h: Adjust.
+	* src/reader.c (packsymbols, parse_token_decl): Adjust
+	* src/print.c (print_grammar): Adjust.
+	* src/output.c (output_token_translations): Adjust.
+	* src/lex.c (lex): Adjust.
+	* src/gram.c: Be sure the set pointers to NULL.
+	(dummy): Rename as...
+	(gram_free): this.
+
+2001-09-22  Akim Demaille  <[email protected]>
+
+	* configure.in: Invoke AM_LIB_DMALLOC.
+	* src/system.h: Use dmalloc.
+	* src/LR0.c: Be sure to have pointers initialized to NULL.
+	(allocate_itemsets): Allocate kernel_items only if needed.
+
+2001-09-22  Akim Demaille  <[email protected]>
+
+	* configure.in: Bump to 1.29b.
+	* tests/Makefile.am (DISTCLEANFILES): Add package.m4.
+	* tests/calc.at (_AT_DATA_CALC_Y): #undef malloc so that we don't
+	need xmalloc.c in calc.y.
+	From Pascal Bart.
+
+2001-09-21  Akim Demaille  <[email protected]>
+
+	Version 1.29a.
+	* Makefile.maint, config/config.guess, config/config.sub,
+	* config/missing: Update from masters.
+	* tests/Makefile.am ($(srcdir)/$(TESTSUITE)): No longer depend
+	upon package.m4.
+	* configure.in (ALL_LINGUAS): Add `tr'.
+
+2001-09-21  Akim Demaille  <[email protected]>
+
+	* tests/Makefile.am (package.m4): Move to...
+	($(srcdir)/$(TESTSUITE)): here.
+
+2001-09-20  Akim Demaille  <[email protected]>
+
+	* src/complain.c: No longer try to be standalone: use system.h.
+	Don't assume __STDC__ is defined to 1. Just test if it is defined.
+	* src/complain.h: Likewise.
+	* src/reduce.c (useless_nonterminals, inaccessable_symbols):
+	Remove the unused variable `n'.
+	From Albert Chin-A-Young.
+
+2001-09-18  Marc Autret  <[email protected]>
+
+	* doc/bison.1: Update.
+	* doc/bison.texinfo (Bison Options): Update --defines and --graph
+	descriptions.
+	(Option Cross Key): Update.
+	Add --graph.
+
+2001-09-18  Marc Autret  <[email protected]>
+
+	* tests/regression.at: New test (comment in %union).
+
+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-29  Robert Anisko  <[email protected]>
+
+	* doc/bison.texinfo (Location Tracking Calc): New node.
+
+2001-08-29  Paul Eggert  <[email protected]>
+
+	* src/output.c (output): Do not define const, as this now
+	causes more problems than it cures.
+
+2001-08-29  Akim Demaille  <[email protected]>
+
+	* doc/bison.texinfo: Modernize `@node' and `@top' use: just name
+	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-27  Marc Autret  <[email protected]>
+
+	* 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-27  Marc Autret  <[email protected]>
+
+	* src/reader.c (parse_dquoted_param): Rename variable `index' to `i'.
+	This one shadowed a global parameter.
+
+2001-08-24  Marc Autret  <[email protected]>
+
+	* src/print_graph.c (node_output_size): Declared POSIX `size_t' type,
+	instead of `unsigned'.
+	(print_state): Do not call obstack_object_size () in obstack_grow ()
+	to avoid macro variables shadowing.
+
+2001-08-23  Marc Autret  <[email protected]>
+
+	* src/lex.c (percent_table): Typo: s/naem/name/.
+	Add graph option.
+	Normalize new options declarations.
+
+2001-08-20  Pascal Bart  <[email protected]>
+
+	* tests/suite.at: Exercise %header_extension and %source_extension.
+
+2001-08-16  Marc Autret  <[email protected]>
+
+	* src/reader.c (parse_dquoted_param): New.
+	(parse_header_extension_decl): Use it.
+	(parse_source_extension_decl): Likewise.
+
+2001-08-16  Marc Autret  <[email protected]>
+
+	* src/vcg.c: Remove includes of `complain.h' and `xalloc.h'.
+	(get_xxxx_str): Use assert () instead of complain ().
+	Remove return invokations in default cases.
+	(get_decision_str): Modify default behaviour. Remove second argument.
+	Echo modifications on calls.
+	(output_graph): Fix.
+
+2001-08-16  Marc Autret  <[email protected]>
+
+	* src/getargs.c (usage): Update with ``-g, --graph''.
+
+2001-08-16  Marc Autret  <[email protected]>
+
+	* doc/bison.texinfo (Bison Options): Add items `-g', `--graph'.
+	(Option Cross Key): Likewise.
+	* doc/bison.1: Update.
+
 2001-08-15  Akim Demaille  <[email protected]>

 	Version 1.28c.

-2001-08-15  Marc Autret  <prog@epita.fr>
+2001-08-15  Marc Autret  <autret_m@epita.fr>

 	* src/reader.c (readgram): Indent output macro YYSTYPE.
 	(packsymbols): Likewise.
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-
-AUTOMAKE_OPTIONS = 1.4 check-news readme-alpha
+AUTOMAKE_OPTIONS = 1.5 check-news readme-alpha

 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
@@ -1,6 +1,7 @@
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
+# Makefile.in generated automatically by automake 1.5 from Makefile.am.

-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+# Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -10,6 +11,7 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.

+@SET_MAKE@

 SHELL = @SHELL@

@@ -31,13 +33,9 @@ infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
-DESTDIR =
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = .

 ACLOCAL = @ACLOCAL@
@@ -46,11 +44,11 @@ AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@

 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
-
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
@@ -59,20 +57,21 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
-AT_TESTPATH = @AT_TESTPATH@
+AMTAR = @AMTAR@
+AWK = @AWK@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
+DEPDIR = @DEPDIR@
+EXEEXT = @EXEEXT@
 GENCAT = @GENCAT@
 GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
@@ -81,9 +80,9 @@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LIBICONV = @LIBICONV@
 LIBOBJS = @LIBOBJS@
 M4 = @M4@
-MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
+OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 POFILES = @POFILES@
 POSUB = @POSUB@
@@ -93,8 +92,11 @@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WARNING_CFLAGS = @WARNING_CFLAGS@
+am__include = @am__include@
+am__quote = @am__quote@
+install_sh = @install_sh@

-AUTOMAKE_OPTIONS = 1.4 check-news readme-alpha
+AUTOMAKE_OPTIONS = 1.5 check-news readme-alpha

 ACLOCAL_AMFLAGS = -I m4

@@ -114,69 +116,73 @@ alpha_host = alpha.gnu.org
 alpha_url_dir = gnu/bison

 # Files to update automatically.
-wget_files = $(srcdir)/config/config.guess $(srcdir)/config/config.sub 	     $(srcdir)/config/texinfo.tex
+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
 CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = 
-DIST_COMMON =  README ./stamp-h.in ABOUT-NLS AUTHORS COPYING ChangeLog \
-INSTALL Makefile.am Makefile.in NEWS README-alpha THANKS aclocal.m4 \
-config.hin configure configure.in missing mkinstalldirs
+CONFIG_CLEAN_FILES = intl/Makefile
+DIST_SOURCES =

+RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
+	uninstall-info-recursive all-recursive install-data-recursive \
+	install-exec-recursive installdirs-recursive install-recursive \
+	uninstall-recursive check-recursive installcheck-recursive
+DIST_COMMON = README ./stamp-h.in ABOUT-NLS AUTHORS COPYING ChangeLog \
+	INSTALL Makefile.am Makefile.in NEWS README-alpha THANKS \
+	aclocal.m4 config.hin configure configure.in
+DIST_SUBDIRS = $(SUBDIRS)
+all: config.h
+	$(MAKE) $(AM_MAKEFLAGS) all-recursive

-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = tar
-GZIP_ENV = --best
-all: all-redirect
 .SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  Makefile
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	cd $(top_builddir) && \
+	  CONFIG_HEADERS= CONFIG_LINKS= \
+	  CONFIG_FILES=$@ $(SHELL) ./config.status

-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-$(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
-	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-
-config.status: $(srcdir)/configure.in $(CONFIG_STATUS_DEPENDENCIES)
+$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
-$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
+$(srcdir)/configure:  $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
 	cd $(srcdir) && $(AUTOCONF)

+$(ACLOCAL_M4):  configure.in m4/c-bs-a.m4 m4/codeset.m4 m4/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/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 \
 		rm -f stamp-h; \
 		$(MAKE) stamp-h; \
 	else :; fi
 stamp-h: $(srcdir)/config.hin $(top_builddir)/config.status
+	@rm -f stamp-h stamp-hT
+	@echo timestamp > stamp-hT 2> /dev/null
 	cd $(top_builddir) \
 	  && CONFIG_FILES= CONFIG_HEADERS=config.h:config.hin \
 	     $(SHELL) ./config.status
-	@echo timestamp > stamp-h 2> /dev/null
-$(srcdir)/config.hin: $(srcdir)/stamp-h.in
+	@mv stamp-hT stamp-h
+$(srcdir)/config.hin:  $(srcdir)/./stamp-h.in
 	@if test ! -f $@; then \
-		rm -f $(srcdir)/stamp-h.in; \
-		$(MAKE) $(srcdir)/stamp-h.in; \
+		rm -f $(srcdir)/./stamp-h.in; \
+		$(MAKE) $(srcdir)/./stamp-h.in; \
 	else :; fi
-$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+$(srcdir)/./stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+	@rm -f $(srcdir)/./stamp-h.in $(srcdir)/./stamp-h.inT
+	@echo timestamp > $(srcdir)/./stamp-h.inT 2> /dev/null
 	cd $(top_srcdir) && $(AUTOHEADER)
-	@echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null
-
-mostlyclean-hdr:
-
-clean-hdr:
+	@mv $(srcdir)/./stamp-h.inT $(srcdir)/./stamp-h.in

 distclean-hdr:
 	-rm -f config.h
-
-maintainer-clean-hdr:
+intl/Makefile: $(top_builddir)/config.status $(top_srcdir)/intl/Makefile.in
+	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status
+uninstall-info-am:

 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -184,12 +190,7 @@ maintainer-clean-hdr:
 # (1) if the variable is set in `config.status', edit `config.status'
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
-
-@SET_MAKE@
-
-all-recursive install-data-recursive install-exec-recursive \
-installdirs-recursive install-recursive uninstall-recursive  \
-check-recursive installcheck-recursive info-recursive dvi-recursive:
+$(RECURSIVE_TARGETS):
 	@set fnord $(MAKEFLAGS); amf=$$2; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
@@ -212,11 +213,16 @@ mostlyclean-recursive clean-recursive distclean-recursive \
 maintainer-clean-recursive:
 	@set fnord $(MAKEFLAGS); amf=$$2; \
 	dot_seen=no; \
-	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
-	  rev="$$subdir $$rev"; \
-	  test "$$subdir" = "." && dot_seen=yes; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
 	done; \
-	test "$$dot_seen" = "no" && rev=". $$rev"; \
+	rev="$$rev ."; \
 	target=`echo $@ | sed s/-recursive//`; \
 	for subdir in $$rev; do \
 	  echo "Making $$target in $$subdir"; \
@@ -235,93 +241,71 @@ tags-recursive:

 tags: TAGS

-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
+	mkid -fID $$unique $(LISP)

-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.hin $(TAGS_DEPENDENCIES) $(LISP)
+TAGS: tags-recursive $(HEADERS) $(SOURCES) config.hin $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-   if test "$$subdir" = .; then :; else \
+	  if test "$$subdir" = .; then :; else \
 	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-   fi; \
+	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
+	list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	test -z "$(ETAGS_ARGS)config.hin$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.hin $$unique $(LISP) -o $$here/TAGS)
+	  || etags $(ETAGS_ARGS) $$tags config.hin $$unique $(LISP)

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

 distclean-tags:
-	-rm -f TAGS ID
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH

-maintainer-clean-tags:
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)

+top_distdir = .
+# Avoid unsightly `./'.
 distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(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.
-distcheck: dist
-	-rm -rf $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
-	mkdir $(distdir)/=build
-	mkdir $(distdir)/=inst
-	dc_install_base=`cd $(distdir)/=inst && pwd`; \
-	cd $(distdir)/=build \
-	  && ../configure --with-included-gettext --srcdir=.. --prefix=$$dc_install_base \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist
-	-rm -rf $(distdir)
-	@banner="$(distdir).tar.gz is ready for distribution"; \
-	dashes=`echo "$$banner" | sed s/./=/g`; \
-	echo "$$dashes"; \
-	echo "$$banner"; \
-	echo "$$dashes"
-dist: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	-rm -rf $(distdir)
-dist-all: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	-rm -rf $(distdir)
+GZIP_ENV = --best
+
 distdir: $(DISTFILES)
-	@if sed 15q $(srcdir)/NEWS | fgrep -e "$(VERSION)" > /dev/null; then :; else \
+	@if sed 15q $(srcdir)/NEWS | fgrep -e "$(VERSION)" >/dev/null; \
+	then :; else \
 	  echo "NEWS not updated; not releasing" 1>&2; \
 	  exit 1; \
 	fi
-	-rm -rf $(distdir)
+	-chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)
 	mkdir $(distdir)
-	-chmod 777 $(distdir)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile
+	$(mkinstalldirs) $(distdir)/intl $(distdir)/po
 	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    $(mkinstalldirs) "$(distdir)/$$dir"; \
+	  fi; \
 	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
+	    cp -pR $$d/$$file $(distdir) \
+	    || exit 1; \
 	  else \
 	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
 	  fi; \
 	done
 	for subdir in $(SUBDIRS); do \
@@ -329,85 +313,140 @@ distdir: $(DISTFILES)
 	    test -d $(distdir)/$$subdir \
 	    || mkdir $(distdir)/$$subdir \
 	    || exit 1; \
-	    chmod 777 $(distdir)/$$subdir; \
-	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
+	    (cd $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$(top_distdir)" \
+	        distdir=../$(distdir)/$$subdir \
+	        distdir) \
 	      || exit 1; \
 	  fi; \
 	done
-info-am:
-info: info-recursive
-dvi-am:
-dvi: dvi-recursive
+	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
+	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
+	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
+	|| chmod -R a+r $(distdir)
+dist: distdir
+	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	-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.
+distcheck: dist
+	-chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir)
+	GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
+	chmod -R a-w $(distdir); chmod a+w $(distdir)
+	mkdir $(distdir)/=build
+	mkdir $(distdir)/=inst
+	chmod a-w $(distdir)
+	dc_install_base=`CDPATH=: && cd $(distdir)/=inst && pwd` \
+	  && cd $(distdir)/=build \
+	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
+	    --with-included-gettext \
+	  && $(MAKE) $(AM_MAKEFLAGS) \
+	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
+	  && $(MAKE) $(AM_MAKEFLAGS) check \
+	  && $(MAKE) $(AM_MAKEFLAGS) install \
+	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
+	  && (test `find $$dc_install_base -type f -print | wc -l` -le 1 \
+	     || (echo "Error: files left after uninstall" 1>&2; \
+	         exit 1) ) \
+	  && $(MAKE) $(AM_MAKEFLAGS) dist \
+	  && $(MAKE) $(AM_MAKEFLAGS) distclean \
+	  && rm -f $(distdir).tar.gz \
+	  && (test `find . -type f -print | wc -l` -eq 0 \
+	     || (echo "Error: files left after distclean" 1>&2; \
+	         exit 1) )
+	-chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir)
+	@echo "$(distdir).tar.gz is ready for distribution" | \
+	  sed 'h;s/./=/g;p;x;p;x'
 check-am: all-am
 check: check-recursive
-installcheck-am:
-installcheck: installcheck-recursive
-all-recursive-am: config.h
-	$(MAKE) $(AM_MAKEFLAGS) all-recursive
-
-install-exec-am:
-install-exec: install-exec-recursive
-
-install-data-am:
-install-data: install-data-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-recursive
-uninstall-am:
-uninstall: uninstall-recursive
 all-am: Makefile config.h
-all-redirect: all-recursive-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
 installdirs: installdirs-recursive
 installdirs-am:

+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive

+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:

 clean-generic:

 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)

 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-hdr mostlyclean-tags mostlyclean-generic
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic mostlyclean-am
+
+dist-all: distdir
+	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	-chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)
+distclean: distclean-recursive
+	-rm -f config.status config.cache config.log
+distclean-am: clean-am distclean-generic distclean-hdr distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-recursive
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+
+maintainer-clean-am: distclean-am maintainer-clean-generic

 mostlyclean: mostlyclean-recursive

-clean-am:  clean-hdr clean-tags clean-generic mostlyclean-am
+mostlyclean-am: mostlyclean-generic

-clean: clean-recursive
+uninstall-am: uninstall-info-am

-distclean-am:  distclean-hdr distclean-tags distclean-generic clean-am
-
-distclean: distclean-recursive
-	-rm -f config.status
-
-maintainer-clean-am:  maintainer-clean-hdr maintainer-clean-tags \
-		maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f config.status
-
-.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
-install-data-recursive uninstall-data-recursive install-exec-recursive \
-uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
-all-recursive check-recursive installcheck-recursive info-recursive \
-dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
-maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck all-recursive-am \
-install-exec-am install-exec install-data-am install-data install-am \
-install uninstall-am uninstall all-redirect all-am all installdirs-am \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+uninstall-info: uninstall-info-recursive

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

 # 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.
@@ -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.
-local-check: changelog-check po-check writable-files copyright-check
+# Checks that don't require cvs.  Run `changelog-check' last as
+# 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)
@@ -1,7 +1,24 @@
 Bison News
 ----------

-Changes in version 1.28c:
+Changes in version 1.29b:
+
+* `--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.

@@ -2,12 +2,15 @@ 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]
+Albert Chin-A-Young     [email protected]
 Daniel Hagerty  	[email protected]
 David J. MacKenzie  	[email protected]
 Fabrice Bauzac		[email protected]
 Hans Aberg		[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]
@@ -1,70 +1,133 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p4
+# aclocal.m4 generated automatically by aclocal 1.5

-dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
+# Copyright 1996, 1997, 1998, 1999, 2000, 2001
+# Free Software Foundation, Inc.
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.

-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.

 # Do all the work for Automake.  This macro actually does too much --
 # some checks are only needed if your package does certain things.
 # But this isn't really a big deal.

-# serial 1
+# serial 5

-dnl Usage:
-dnl AM_INIT_AUTOMAKE(package,version, [no-define])
+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+# written in clear, in which case automake, when reading aclocal.m4,
+# will think it sees a *use*, and therefore will trigger all it's
+# C support machinery.  Also note that it means that autoscan, seeing
+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...

-AC_DEFUN(AM_INIT_AUTOMAKE,
-[AC_REQUIRE([AC_PROG_INSTALL])
-PACKAGE=[$1]
-AC_SUBST(PACKAGE)
-VERSION=[$2]
-AC_SUBST(VERSION)
-dnl test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+
+# We require 2.13 because we rely on SHELL being computed by configure.
+AC_PREREQ([2.13])
+
+# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+# -----------------------------------------------------------
+# If MACRO-NAME is provided do IF-PROVIDED, else IF-NOT-PROVIDED.
+# The purpose of this macro is to provide the user with a means to
+# check macros which are provided without letting her know how the
+# information is coded.
+# If this macro is not defined by Autoconf, define it here.
+ifdef([AC_PROVIDE_IFELSE],
+      [],
+      [define([AC_PROVIDE_IFELSE],
+              [ifdef([AC_PROVIDE_$1],
+                     [$2], [$3])])])
+
+
+# AM_INIT_AUTOMAKE(PACKAGE,VERSION, [NO-DEFINE])
+# ----------------------------------------------
+AC_DEFUN([AM_INIT_AUTOMAKE],
+[AC_REQUIRE([AC_PROG_INSTALL])dnl
+# test to see if srcdir already configured
+if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" &&
+   test -f $srcdir/config.status; then
+  AC_MSG_ERROR([source directory already configured; run \"make distclean\" there first])
 fi
+
+# Define the identity of the package.
+PACKAGE=$1
+AC_SUBST(PACKAGE)dnl
+VERSION=$2
+AC_SUBST(VERSION)dnl
 ifelse([$3],,
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
-AC_REQUIRE([AM_SANITY_CHECK])
-AC_REQUIRE([AC_ARG_PROGRAM])
-dnl FIXME This is truly gross.
-missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
-AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
-AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
-AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
-AC_REQUIRE([AC_PROG_MAKE_SET])])
+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])
+
+# Autoconf 2.50 wants to disallow AM_ names.  We explicitly allow
+# the ones we care about.
+ifdef([m4_pattern_allow],
+      [m4_pattern_allow([^AM_[A-Z]+FLAGS])])dnl
+
+# Autoconf 2.50 always computes EXEEXT.  However we need to be
+# compatible with 2.13, for now.  So we always define EXEEXT, but we
+# don't compute it.
+AC_SUBST(EXEEXT)
+# Similar for OBJEXT -- only we only use OBJEXT if the user actually
+# requests that it be used.  This is a bit dumb.
+: ${OBJEXT=o}
+AC_SUBST(OBJEXT)
+
+# Some tools Automake needs.
+AC_REQUIRE([AM_SANITY_CHECK])dnl
+AC_REQUIRE([AC_ARG_PROGRAM])dnl
+AM_MISSING_PROG(ACLOCAL, aclocal)
+AM_MISSING_PROG(AUTOCONF, autoconf)
+AM_MISSING_PROG(AUTOMAKE, automake)
+AM_MISSING_PROG(AUTOHEADER, autoheader)
+AM_MISSING_PROG(MAKEINFO, makeinfo)
+AM_MISSING_PROG(AMTAR, tar)
+AM_PROG_INSTALL_SH
+AM_PROG_INSTALL_STRIP
+# We need awk for the "check" target.  The system "awk" is bad on
+# some platforms.
+AC_REQUIRE([AC_PROG_AWK])dnl
+AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+AC_REQUIRE([AM_DEP_TRACK])dnl
+AC_REQUIRE([AM_SET_DEPDIR])dnl
+AC_PROVIDE_IFELSE([AC_PROG_][CC],
+                  [_AM_DEPENDENCIES(CC)],
+                  [define([AC_PROG_][CC],
+                          defn([AC_PROG_][CC])[_AM_DEPENDENCIES(CC)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_][CXX],
+                  [_AM_DEPENDENCIES(CXX)],
+                  [define([AC_PROG_][CXX],
+                          defn([AC_PROG_][CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+])

 #
 # Check to make sure that the build environment is sane.
 #

-AC_DEFUN(AM_SANITY_CHECK,
+# serial 3
+
+# AM_SANITY_CHECK
+# ---------------
+AC_DEFUN([AM_SANITY_CHECK],
 [AC_MSG_CHECKING([whether build environment is sane])
 # Just in case
 sleep 1
-echo timestamp > conftestfile
+echo timestamp > conftest.file
 # Do `set' in a subshell so we don't clobber the current shell's
 # arguments.  Must try -L first in case configure is actually a
 # symlink; some systems play weird games with the mod time of symlinks
 # (eg FreeBSD returns the mod time of the symlink's containing
 # directory).
 if (
-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "[$]*" = "X"; then
+   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
+   if test "$[*]" = "X"; then
      # -L didn't work.
-      set X `ls -t $srcdir/configure conftestfile`
+      set X `ls -t $srcdir/configure conftest.file`
   fi
-   if test "[$]*" != "X $srcdir/configure conftestfile" \
-      && test "[$]*" != "X conftestfile $srcdir/configure"; then
+   rm -f conftest.file
+   if test "$[*]" != "X $srcdir/configure conftest.file" \
+      && test "$[*]" != "X conftest.file $srcdir/configure"; then

      # If neither matched, then we have a broken ls.  This can happen
      # if, for instance, CONFIG_SHELL is bash and it inherits a
@@ -74,7 +137,7 @@ if (
 alias in your environment])
   fi

-   test "[$]2" = conftestfile
+   test "$[2]" = conftest.file
   )
 then
   # Ok.
@@ -83,68 +146,418 @@ else
   AC_MSG_ERROR([newly created file is older than distributed files!
 Check your system clock])
 fi
-rm -f conftest*
 AC_MSG_RESULT(yes)])

-dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
-dnl The program must properly implement --version.
-AC_DEFUN(AM_MISSING_PROG,
-[AC_MSG_CHECKING(for working $2)
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if ($2 --version) < /dev/null > /dev/null 2>&1; then
-   $1=$2
-   AC_MSG_RESULT(found)
-else
-   $1="$3/missing $2"
-   AC_MSG_RESULT(missing)
-fi
-AC_SUBST($1)])
-
-# Like AC_CONFIG_HEADER, but automatically create stamp file.
-
-AC_DEFUN(AM_CONFIG_HEADER,
-[AC_PREREQ([2.12])
-AC_CONFIG_HEADER([$1])
-dnl When config.status generates a header, we must update the stamp-h file.
-dnl This file resides in the same directory as the config header
-dnl that is generated.  We must strip everything past the first ":",
-dnl and everything past the last "/".
-AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl
-ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>,
-<<test -z "<<$>>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>,
-<<am_indx=1
-for am_file in <<$1>>; do
-  case " <<$>>CONFIG_HEADERS " in
-  *" <<$>>am_file "*<<)>>
-    echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx
-    ;;
-  esac
-  am_indx=`expr "<<$>>am_indx" + 1`
-done<<>>dnl>>)
-changequote([,]))])
-

 # serial 2

-# Single argument says where are built sources to test, relative to the
-# built test directory.  Maybe omitted if the same (flat distribution).
+# AM_MISSING_PROG(NAME, PROGRAM)
+# ------------------------------
+AC_DEFUN([AM_MISSING_PROG],
+[AC_REQUIRE([AM_MISSING_HAS_RUN])
+$1=${$1-"${am_missing_run}$2"}
+AC_SUBST($1)])

-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])
+
+# AM_MISSING_HAS_RUN
+# ------------------
+# Define MISSING if not defined so far and test if it supports --run.
+# If it does, set am_missing_run to use it, otherwise, to nothing.
+AC_DEFUN([AM_MISSING_HAS_RUN],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+# Use eval to expand $SHELL
+if eval "$MISSING --run true"; then
+  am_missing_run="$MISSING --run "
+else
+  am_missing_run=
+  am_backtick='`'
+  AC_MSG_WARN([${am_backtick}missing' script is too old or missing])
 fi
 ])

+# AM_AUX_DIR_EXPAND
+
+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
+# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
+# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
+#
+# Of course, Automake must honor this variable whenever it calls a
+# tool from the auxiliary directory.  The problem is that $srcdir (and
+# therefore $ac_aux_dir as well) can be either absolute or relative,
+# depending on how configure is run.  This is pretty annoying, since
+# it makes $ac_aux_dir quite unusable in subdirectories: in the top
+# source directory, any form will work fine, but in subdirectories a
+# relative path needs to be adjusted first.
+#
+# $ac_aux_dir/missing
+#    fails when called from a subdirectory if $ac_aux_dir is relative
+# $top_srcdir/$ac_aux_dir/missing
+#    fails if $ac_aux_dir is absolute,
+#    fails when called from a subdirectory in a VPATH build with
+#          a relative $ac_aux_dir
+#
+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
+# are both prefixed by $srcdir.  In an in-source build this is usually
+# harmless because $srcdir is `.', but things will broke when you
+# start a VPATH build or use an absolute $srcdir.
+#
+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
+# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
+#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
+# and then we would define $MISSING as
+#   MISSING="\${SHELL} $am_aux_dir/missing"
+# This will work as long as MISSING is not called from configure, because
+# unfortunately $(top_srcdir) has no meaning in configure.
+# However there are other variables, like CC, which are often used in
+# configure, and could therefore not use this "fixed" $ac_aux_dir.
+#
+# Another solution, used here, is to always expand $ac_aux_dir to an
+# absolute PATH.  The drawback is that using absolute paths prevent a
+# configured tree to be moved without reconfiguration.
+
+AC_DEFUN([AM_AUX_DIR_EXPAND], [
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd`
+])
+
+# AM_PROG_INSTALL_SH
+# ------------------
+# Define $install_sh.
+AC_DEFUN([AM_PROG_INSTALL_SH],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+install_sh=${install_sh-"$am_aux_dir/install-sh"}
+AC_SUBST(install_sh)])
+
+# One issue with vendor `install' (even GNU) is that you can't
+# specify the program used to strip binaries.  This is especially
+# annoying in cross-compiling environments, where the build's strip
+# is unlikely to handle the host's binaries.
+# Fortunately install-sh will honor a STRIPPROG variable, so we
+# always use install-sh in `make install-strip', and initialize
+# STRIPPROG with the value of the STRIP variable (set by the user).
+AC_DEFUN([AM_PROG_INSTALL_STRIP],
+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+AC_SUBST([INSTALL_STRIP_PROGRAM])])
+
+# serial 4						-*- Autoconf -*-
+
+
+
+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+# written in clear, in which case automake, when reading aclocal.m4,
+# will think it sees a *use*, and therefore will trigger all it's
+# C support machinery.  Also note that it means that autoscan, seeing
+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+
+
+
+# _AM_DEPENDENCIES(NAME)
+# ---------------------
+# See how the compiler implements dependency checking.
+# NAME is "CC", "CXX" or "OBJC".
+# We try a few techniques and use that to set a single cache variable.
+#
+# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
+# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
+# dependency, and given that the user is not expected to run this macro,
+# just rely on AC_PROG_CC.
+AC_DEFUN([_AM_DEPENDENCIES],
+[AC_REQUIRE([AM_SET_DEPDIR])dnl
+AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
+AC_REQUIRE([AM_MAKE_INCLUDE])dnl
+AC_REQUIRE([AM_DEP_TRACK])dnl
+
+ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
+       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
+       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc']
+       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
+                   [depcc="$$1"   am_compiler_list=])
+
+AC_CACHE_CHECK([dependency style of $depcc],
+               [am_cv_$1_dependencies_compiler_type],
+[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named `D' -- because `-MD' means `put the output
+  # in D'.
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+
+  am_cv_$1_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
+  fi
+  for depmode in $am_compiler_list; do
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    echo '#include "conftest.h"' > conftest.c
+    echo 'int i;' > conftest.h
+    echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
+
+    case $depmode in
+    nosideeffect)
+      # after this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested
+      if test "x$enable_dependency_tracking" = xyes; then
+	continue
+      else
+	break
+      fi
+      ;;
+    none) break ;;
+    esac
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle `-M -o', and we need to detect this.
+    if depmode=$depmode \
+       source=conftest.c object=conftest.o \
+       depfile=conftest.Po tmpdepfile=conftest.TPo \
+       $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 &&
+       grep conftest.h conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+      am_cv_$1_dependencies_compiler_type=$depmode
+      break
+    fi
+  done
+
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_$1_dependencies_compiler_type=none
+fi
+])
+$1DEPMODE="depmode=$am_cv_$1_dependencies_compiler_type"
+AC_SUBST([$1DEPMODE])
+])
+
+
+# AM_SET_DEPDIR
+# -------------
+# Choose a directory name for dependency files.
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES
+AC_DEFUN([AM_SET_DEPDIR],
+[rm -f .deps 2>/dev/null
+mkdir .deps 2>/dev/null
+if test -d .deps; then
+  DEPDIR=.deps
+else
+  # MS-DOS does not allow filenames that begin with a dot.
+  DEPDIR=_deps
+fi
+rmdir .deps 2>/dev/null
+AC_SUBST(DEPDIR)
+])
+
+
+# AM_DEP_TRACK
+# ------------
+AC_DEFUN([AM_DEP_TRACK],
+[AC_ARG_ENABLE(dependency-tracking,
+[  --disable-dependency-tracking Speeds up one-time builds
+  --enable-dependency-tracking  Do not reject slow dependency extractors])
+if test "x$enable_dependency_tracking" != xno; then
+  am_depcomp="$ac_aux_dir/depcomp"
+  AMDEPBACKSLASH='\'
+fi
+AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
+pushdef([subst], defn([AC_SUBST]))
+subst(AMDEPBACKSLASH)
+popdef([subst])
+])
+
+# Generate code to set up dependency tracking.
+# This macro should only be invoked once -- use via AC_REQUIRE.
+# Usage:
+# AM_OUTPUT_DEPENDENCY_COMMANDS
+
+#
+# This code is only required when automatic dependency tracking
+# is enabled.  FIXME.  This creates each `.P' file that we will
+# need in order to bootstrap the dependency handling code.
+AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],[
+AC_OUTPUT_COMMANDS([
+test x"$AMDEP_TRUE" != x"" ||
+for mf in $CONFIG_FILES; do
+  case "$mf" in
+  Makefile) dirpart=.;;
+  */Makefile) dirpart=`echo "$mf" | sed -e 's|/[^/]*$||'`;;
+  *) continue;;
+  esac
+  grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue
+  # Extract the definition of DEP_FILES from the Makefile without
+  # running `make'.
+  DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
+  test -z "$DEPDIR" && continue
+  # When using ansi2knr, U may be empty or an underscore; expand it
+  U=`sed -n -e '/^U = / s///p' < "$mf"`
+  test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
+  # We invoke sed twice because it is the simplest approach to
+  # changing $(DEPDIR) to its actual value in the expansion.
+  for file in `sed -n -e '
+    /^DEP_FILES = .*\\\\$/ {
+      s/^DEP_FILES = //
+      :loop
+	s/\\\\$//
+	p
+	n
+	/\\\\$/ b loop
+      p
+    }
+    /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
+       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+    # Make sure the directory exists.
+    test -f "$dirpart/$file" && continue
+    fdir=`echo "$file" | sed -e 's|/[^/]*$||'`
+    $ac_aux_dir/mkinstalldirs "$dirpart/$fdir" > /dev/null 2>&1
+    # echo "creating $dirpart/$file"
+    echo '# dummy' > "$dirpart/$file"
+  done
+done
+], [AMDEP_TRUE="$AMDEP_TRUE"
+ac_aux_dir="$ac_aux_dir"])])
+
+# AM_MAKE_INCLUDE()
+# -----------------
+# Check to see how make treats includes.
+AC_DEFUN([AM_MAKE_INCLUDE],
+[am_make=${MAKE-make}
+cat > confinc << 'END'
+doit:
+	@echo done
+END
+# If we don't find an include directive, just comment out the code.
+AC_MSG_CHECKING([for style of include used by $am_make])
+am__include='#'
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# We grep out `Entering directory' and `Leaving directory'
+# messages which can occur if `w' ends up in MAKEFLAGS.
+# In particular we don't look at `^make:' because GNU make might
+# be invoked under some other name (usually "gmake"), in which
+# case it prints its new name instead of `make'.
+if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then
+   am__include=include
+   am__quote=
+   _am_result=GNU
+fi
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+   echo '.include "confinc"' > confmf
+   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
+      am__include=.include
+      am__quote='"'
+      _am_result=BSD
+   fi
+fi
+AC_SUBST(am__include)
+AC_SUBST(am__quote)
+AC_MSG_RESULT($_am_result)
+rm -f confinc confmf
+])
+
+# serial 3
+
+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
+# -------------------------------------
+# Define a conditional.
+#
+# FIXME: Once using 2.50, use this:
+# m4_match([$1], [^TRUE\|FALSE$], [AC_FATAL([$0: invalid condition: $1])])dnl
+AC_DEFUN([AM_CONDITIONAL],
+[ifelse([$1], [TRUE],
+        [errprint(__file__:__line__: [$0: invalid condition: $1
+])dnl
+m4exit(1)])dnl
+ifelse([$1], [FALSE],
+       [errprint(__file__:__line__: [$0: invalid condition: $1
+])dnl
+m4exit(1)])dnl
+AC_SUBST([$1_TRUE])
+AC_SUBST([$1_FALSE])
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi])
+
+# Like AC_CONFIG_HEADER, but automatically create stamp file.
+
+# serial 3
+
+# When config.status generates a header, we must update the stamp-h file.
+# This file resides in the same directory as the config header
+# that is generated.  We must strip everything past the first ":",
+# and everything past the last "/".
+
+AC_PREREQ([2.12])
+
+AC_DEFUN([AM_CONFIG_HEADER],
+[ifdef([AC_FOREACH],dnl
+	 [dnl init our file count if it isn't already
+	 m4_ifndef([_AM_Config_Header_Index], m4_define([_AM_Config_Header_Index], [0]))
+	 dnl prepare to store our destination file list for use in config.status
+	 AC_FOREACH([_AM_File], [$1],
+		    [m4_pushdef([_AM_Dest], m4_patsubst(_AM_File, [:.*]))
+		    m4_define([_AM_Config_Header_Index], m4_incr(_AM_Config_Header_Index))
+		    dnl and add it to the list of files AC keeps track of, along
+		    dnl with our hook
+		    AC_CONFIG_HEADERS(_AM_File,
+dnl COMMANDS, [, INIT-CMDS]
+[# update the timestamp
+echo timestamp >"AS_ESCAPE(_AM_DIRNAME(]_AM_Dest[))/stamp-h]_AM_Config_Header_Index["
+][$2]m4_ifval([$3], [, [$3]]))dnl AC_CONFIG_HEADERS
+		    m4_popdef([_AM_Dest])])],dnl
+[AC_CONFIG_HEADER([$1])
+  AC_OUTPUT_COMMANDS(
+   ifelse(patsubst([$1], [[^ ]], []),
+	  [],
+	  [test -z "$CONFIG_HEADERS" || echo timestamp >dnl
+	   patsubst([$1], [^\([^:]*/\)?.*], [\1])stamp-h]),dnl
+[am_indx=1
+for am_file in $1; do
+  case " \$CONFIG_HEADERS " in
+  *" \$am_file "*)
+    am_dir=\`echo \$am_file |sed 's%:.*%%;s%[^/]*\$%%'\`
+    if test -n "\$am_dir"; then
+      am_tmpdir=\`echo \$am_dir |sed 's%^\(/*\).*\$%\1%'\`
+      for am_subdir in \`echo \$am_dir |sed 's%/% %'\`; do
+        am_tmpdir=\$am_tmpdir\$am_subdir/
+        if test ! -d \$am_tmpdir; then
+          mkdir \$am_tmpdir
+        fi
+      done
+    fi
+    echo timestamp > "\$am_dir"stamp-h\$am_indx
+    ;;
+  esac
+  am_indx=\`expr \$am_indx + 1\`
+done])
+])]) # AM_CONFIG_HEADER
+
+# _AM_DIRNAME(PATH)
+# -----------------
+# Like AS_DIRNAME, only do it during macro expansion
+AC_DEFUN([_AM_DIRNAME],
+       [m4_if(m4_regexp([$1], [^.*[^/]//*[^/][^/]*/*$]), -1,
+	      m4_if(m4_regexp([$1], [^//\([^/]\|$\)]), -1,
+		    m4_if(m4_regexp([$1], [^/.*]), -1,
+			  [.],
+			  m4_patsubst([$1], [^\(/\).*], [\1])),
+		    m4_patsubst([$1], [^\(//\)\([^/].*\|$\)], [\1])),
+	      m4_patsubst([$1], [^\(.*[^/]\)//*[^/][^/]*/*$], [\1]))[]dnl
+]) # _AM_DIRNAME
+
 #serial 1
 # This test replaces the one in autoconf.
 # Currently this macro should have the same name as the autoconf macro
@@ -181,7 +594,7 @@ AC_DEFUN([AC_ISC_POSIX],
 # program @code{ansi2knr}, which comes with Ghostscript.
 # @end defmac

-AC_DEFUN(AM_PROG_CC_STDC,
+AC_DEFUN([AM_PROG_CC_STDC],
 [AC_REQUIRE([AC_PROG_CC])
 AC_BEFORE([$0], [AC_C_INLINE])
 AC_BEFORE([$0], [AC_C_CONST])
@@ -191,7 +604,7 @@ dnl like #elif.
 dnl FIXME: can't do this because then AC_AIX won't work due to a
 dnl circular dependency.
 dnl AC_BEFORE([$0], [AC_PROG_CPP])
-AC_MSG_CHECKING(for ${CC-cc} option to accept ANSI C)
+AC_MSG_CHECKING([for ${CC-cc} option to accept ANSI C])
 AC_CACHE_VAL(am_cv_prog_cc_stdc,
 [am_cv_prog_cc_stdc=no
 ac_save_CC="$CC"
@@ -199,9 +612,10 @@ ac_save_CC="$CC"
 # breaks some systems' header files.
 # AIX			-qlanglvl=ansi
 # Ultrix and OSF/1	-std1
-# HP-UX			-Aa -D_HPUX_SOURCE
+# HP-UX 10.20 and later	-Ae
+# HP-UX older versions	-Aa -D_HPUX_SOURCE
 # SVR4			-Xc -D__EXTENSIONS__
-for ac_arg in "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
 do
  CC="$ac_save_CC $ac_arg"
  AC_TRY_COMPILE(
@@ -243,7 +657,7 @@ CC="$ac_save_CC"
 if test -z "$am_cv_prog_cc_stdc"; then
  AC_MSG_RESULT([none needed])
 else
-  AC_MSG_RESULT($am_cv_prog_cc_stdc)
+  AC_MSG_RESULT([$am_cv_prog_cc_stdc])
 fi
 case "x$am_cv_prog_cc_stdc" in
  x|xno) ;;
@@ -283,7 +697,7 @@ CFLAGS="$ac_save_CFLAGS"])

 # serial 1

-AC_DEFUN(AM_C_PROTOTYPES,
+AC_DEFUN([AM_C_PROTOTYPES],
 [AC_REQUIRE([AM_PROG_CC_STDC])
 AC_REQUIRE([AC_PROG_CPP])
 AC_MSG_CHECKING([for function prototypes])
@@ -294,10 +708,10 @@ if test "$am_cv_prog_cc_stdc" != no; then
 else
  AC_MSG_RESULT(no)
  U=_ ANSI2KNR=./ansi2knr
-  # Ensure some checks needed by ansi2knr itself.
-  AC_HEADER_STDC
-  AC_CHECK_HEADERS(string.h)
 fi
+# Ensure some checks needed by ansi2knr itself.
+AC_HEADER_STDC
+AC_CHECK_HEADERS(string.h)
 AC_SUBST(U)dnl
 AC_SUBST(ANSI2KNR)dnl
 ])
@@ -523,6 +937,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.
 #
@@ -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.
@@ -250,6 +250,9 @@
 /* Version number of package */
 #undef VERSION

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

@@ -1,6 +1,7 @@
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
+# Makefile.in generated automatically by automake 1.5 from Makefile.am.

-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+# Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -10,6 +11,7 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.

+@SET_MAKE@

 SHELL = @SHELL@

@@ -31,13 +33,9 @@ infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
-DESTDIR =
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ..

 ACLOCAL = @ACLOCAL@
@@ -46,11 +44,11 @@ AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@

 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
-
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
@@ -59,20 +57,21 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
-AT_TESTPATH = @AT_TESTPATH@
+AMTAR = @AMTAR@
+AWK = @AWK@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
+DEPDIR = @DEPDIR@
+EXEEXT = @EXEEXT@
 GENCAT = @GENCAT@
 GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
@@ -81,9 +80,9 @@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LIBICONV = @LIBICONV@
 LIBOBJS = @LIBOBJS@
 M4 = @M4@
-MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
+OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 POFILES = @POFILES@
 POSUB = @POSUB@
@@ -93,112 +92,126 @@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WARNING_CFLAGS = @WARNING_CFLAGS@
+am__include = @am__include@
+am__quote = @am__quote@
+install_sh = @install_sh@

 EXTRA_DIST = move-if-change prev-version.txt
+subdir = config
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
-CONFIG_HEADER = ../config.h
-CONFIG_CLEAN_FILES = 
-DIST_COMMON =  Makefile.am Makefile.in config.guess config.sub \
-install-sh mdate-sh missing mkinstalldirs texinfo.tex
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+DIST_SOURCES =
+DIST_COMMON = Makefile.am Makefile.in config.guess config.sub depcomp \
+	install-sh mdate-sh missing mkinstalldirs texinfo.tex
+all: all-am

-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = tar
-GZIP_ENV = --best
-all: all-redirect
 .SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu config/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  config/Makefile
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	cd $(top_builddir) && \
+	  CONFIG_HEADERS= CONFIG_LINKS= \
+	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
+uninstall-info-am:
 tags: TAGS
 TAGS:


-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)

-subdir = config
+top_distdir = ..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)

 distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu config/Makefile
 	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    $(mkinstalldirs) "$(distdir)/$$dir"; \
+	  fi; \
 	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
+	    cp -pR $$d/$$file $(distdir) \
+	    || exit 1; \
 	  else \
 	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
 	  fi; \
 	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
 check-am: all-am
 check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
+all-am: Makefile

-install-data-am:
+installdirs:
+
+install: install-am
+install-exec: install-exec-am
 install-data: install-data-am
+uninstall: uninstall-am

 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am:
-uninstall: uninstall-am
-all-am: Makefile
-all-redirect: all-am
+
+installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
-
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:

 clean-generic:

 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*

 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-generic mostlyclean-am
-
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-am

-distclean-am:  distclean-generic clean-am
+clean-am: clean-generic mostlyclean-am

 distclean: distclean-am

-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:

 maintainer-clean: maintainer-clean-am

-.PHONY: tags distdir info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
+maintainer-clean-am: distclean-am maintainer-clean-generic

+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+uninstall-am: uninstall-info-am
+
+.PHONY: all all-am check check-am clean clean-generic distclean \
+	distclean-generic distdir dvi dvi-am info info-am install \
+	install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-info-am install-man \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic uninstall uninstall-am uninstall-info-am

 # 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.
@@ -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`
-	if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
-	rm -f $dummy.c $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
+	    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

@@ -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-* \
-	| mipsle-* | mipstx39-* | mipstx39el-* \
+	| mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \
+	| 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-* \
@@ -0,0 +1,411 @@
+#! /bin/sh
+
+# depcomp - compile a program generating dependencies as side-effects
+# Copyright 1999, 2000 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# 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.
+
+# Originally written by Alexandre Oliva <[email protected]>.
+
+if test -z "$depmode" || test -z "$source" || test -z "$object"; then
+  echo "depcomp: Variables source, object and depmode must be set" 1>&2
+  exit 1
+fi
+# `libtool' can also be set to `yes' or `no'.
+
+depfile=${depfile-`echo "$object" | sed 's,\([^/]*\)$,.deps/\1,;s/\.\([^.]*\)$/.P\1/'`}
+tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
+
+rm -f "$tmpdepfile"
+
+# Some modes work just like other modes, but use different flags.  We
+# parameterize here, but still list the modes in the big case below,
+# to make depend.m4 easier to write.  Note that we *cannot* use a case
+# here, because this file can only contain one case statement.
+if test "$depmode" = hp; then
+  # HP compiler uses -M and no extra arg.
+  gccflag=-M
+  depmode=gcc
+fi
+
+if test "$depmode" = dashXmstdout; then
+   # This is just like dashmstdout with a different argument.
+   dashmflag=-xM
+   depmode=dashmstdout
+fi
+
+case "$depmode" in
+gcc3)
+## gcc 3 implements dependency tracking that does exactly what
+## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
+## it if -MD -MP comes after the -MF stuff.  Hmm.
+  "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  mv "$tmpdepfile" "$depfile"
+  ;;
+
+gcc)
+## There are various ways to get dependency output from gcc.  Here's
+## why we pick this rather obscure method:
+## - Don't want to use -MD because we'd like the dependencies to end
+##   up in a subdir.  Having to rename by hand is ugly.
+##   (We might end up doing this anyway to support other compilers.)
+## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
+##   -MM, not -M (despite what the docs say).
+## - Using -M directly means running the compiler twice (even worse
+##   than renaming).
+  if test -z "$gccflag"; then
+    gccflag=-MD,
+  fi
+  "$@" -Wp,"$gccflag$tmpdepfile"
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
+## The second -e expression handles DOS-style file names with drive letters.
+  sed -e 's/^[^:]*: / /' \
+      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
+## This next piece of magic avoids the `deleted header file' problem.
+## The problem is that when a header file which appears in a .P file
+## is deleted, the dependency causes make to die (because there is
+## typically no way to rebuild the header).  We avoid this by adding
+## dummy dependencies for each header file.  Too bad gcc doesn't do
+## this for us directly.
+  tr ' ' '
+' < "$tmpdepfile" |
+## Some versions of gcc put a space before the `:'.  On the theory
+## that the space means something, we add a space to the output as
+## well.
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly.  Breaking it into two sed invocations is a workaround.
+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+hp)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+sgi)
+  if test "$libtool" = yes; then
+    "$@" "-Wp,-MDupdate,$tmpdepfile"
+  else
+    "$@" -MDupdate "$tmpdepfile"
+  fi
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+
+  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
+    echo "$object : \\" > "$depfile"
+
+    # Clip off the initial element (the dependent).  Don't try to be
+    # clever and replace this with sed code, as IRIX sed won't handle
+    # lines with more than a fixed number of characters (4096 in
+    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
+    # the IRIX cc adds comments like `#:fec' to the end of the
+    # dependency line.
+    tr ' ' '
+' < "$tmpdepfile" \
+    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
+    tr '
+' ' ' >> $depfile
+    echo >> $depfile
+
+    # The second pass generates a dummy entry for each header file.
+    tr ' ' '
+' < "$tmpdepfile" \
+   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
+   >> $depfile
+  else
+    # The sourcefile does not contain any dependencies, so just
+    # store a dummy comment line, to avoid errors with the Makefile
+    # "include basename.Plo" scheme.
+    echo "#dummy" > "$depfile"
+  fi
+  rm -f "$tmpdepfile"
+  ;;
+
+aix)
+  # The C for AIX Compiler uses -M and outputs the dependencies
+  # in a .u file.  This file always lives in the current directory.
+  # Also, the AIX compiler puts `$object:' at the start of each line;
+  # $object doesn't have directory information.
+  stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'`
+  tmpdepfile="$stripped.u"
+  outname="$stripped.o"
+  if test "$libtool" = yes; then
+    "$@" -Wc,-M
+  else
+    "$@" -M
+  fi
+
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+
+  if test -f "$tmpdepfile"; then
+    # Each line is of the form `foo.o: dependent.h'.
+    # Do two passes, one to just change these to
+    # `$object: dependent.h' and one to simply `dependent.h:'.
+    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
+    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
+  else
+    # The sourcefile does not contain any dependencies, so just
+    # store a dummy comment line, to avoid errors with the Makefile
+    # "include basename.Plo" scheme.
+    echo "#dummy" > "$depfile"
+  fi
+  rm -f "$tmpdepfile"
+  ;;
+
+tru64)
+   # The Tru64 AIX compiler uses -MD to generate dependencies as a side
+   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
+   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put 
+   # dependencies in `foo.d' instead, so we check for that too.
+   # Subdirectories are respected.
+
+   tmpdepfile1="$object.d"
+   tmpdepfile2=`echo "$object" | sed -e 's/.o$/.d/'` 
+   if test "$libtool" = yes; then
+      "$@" -Wc,-MD
+   else
+      "$@" -MD
+   fi
+
+   stat=$?
+   if test $stat -eq 0; then :
+   else
+      rm -f "$tmpdepfile1" "$tmpdepfile2"
+      exit $stat
+   fi
+
+   if test -f "$tmpdepfile1"; then
+      tmpdepfile="$tmpdepfile1"
+   else
+      tmpdepfile="$tmpdepfile2"
+   fi
+   if test -f "$tmpdepfile"; then
+      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
+      # That's a space and a tab in the [].
+      sed -e 's,^.*\.[a-z]*:[ 	]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+   else
+      echo "#dummy" > "$depfile"
+   fi
+   rm -f "$tmpdepfile"
+   ;;
+
+#nosideeffect)
+  # This comment above is used by automake to tell side-effect
+  # dependency tracking mechanisms from slower ones.
+
+dashmstdout)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the proprocessed file to stdout, regardless of -o,
+  # because we must use -o when running libtool.
+  test -z "$dashmflag" && dashmflag=-M
+  ( IFS=" "
+    case " $* " in
+    *" --mode=compile "*) # this is libtool, let us make it quiet
+      for arg
+      do # cycle over the arguments
+        case "$arg" in
+	"--mode=compile")
+	  # insert --quiet before "--mode=compile"
+	  set fnord "$@" --quiet
+	  shift # fnord
+	  ;;
+	esac
+	set fnord "$@" "$arg"
+	shift # fnord
+	shift # "$arg"
+      done
+      ;;
+    esac
+    "$@" $dashmflag | sed 's:^[^:]*\:[ 	]*:'"$object"'\: :' > "$tmpdepfile"
+  ) &
+  proc=$!
+  "$@"
+  stat=$?
+  wait "$proc"
+  if test "$stat" != 0; then exit $stat; fi
+  rm -f "$depfile"
+  cat < "$tmpdepfile" > "$depfile"
+  tr ' ' '
+' < "$tmpdepfile" | \
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly.  Breaking it into two sed invocations is a workaround.
+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+dashXmstdout)
+  # This case only exists to satisfy depend.m4.  It is never actually
+  # run, as this mode is specially recognized in the preamble.
+  exit 1
+  ;;
+
+makedepend)
+  # X makedepend
+  (
+    shift
+    cleared=no
+    for arg in "$@"; do
+      case $cleared in no)
+        set ""; shift
+	cleared=yes
+      esac
+      case "$arg" in
+        -D*|-I*)
+	  set fnord "$@" "$arg"; shift;;
+	-*)
+	  ;;
+	*)
+	  set fnord "$@" "$arg"; shift;;
+      esac
+    done
+    obj_suffix="`echo $object | sed 's/^.*\././'`"
+    touch "$tmpdepfile"
+    ${MAKEDEPEND-makedepend} 2>/dev/null -o"$obj_suffix" -f"$tmpdepfile" "$@"
+  ) &
+  proc=$!
+  "$@"
+  stat=$?
+  wait "$proc"
+  if test "$stat" != 0; then exit $stat; fi
+  rm -f "$depfile"
+  cat < "$tmpdepfile" > "$depfile"
+  tail +3 "$tmpdepfile" | tr ' ' '
+' | \
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly.  Breaking it into two sed invocations is a workaround.
+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile" "$tmpdepfile".bak
+  ;;
+
+cpp)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the proprocessed file to stdout, regardless of -o,
+  # because we must use -o when running libtool.
+  ( IFS=" "
+    case " $* " in
+    *" --mode=compile "*)
+      for arg
+      do # cycle over the arguments
+        case $arg in
+	"--mode=compile")
+	  # insert --quiet before "--mode=compile"
+	  set fnord "$@" --quiet
+	  shift # fnord
+	  ;;
+	esac
+	set fnord "$@" "$arg"
+	shift # fnord
+	shift # "$arg"
+      done
+      ;;
+    esac
+    "$@" -E |
+    sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
+    sed '$ s: \\$::' > "$tmpdepfile"
+  ) &
+  proc=$!
+  "$@"
+  stat=$?
+  wait "$proc"
+  if test "$stat" != 0; then exit $stat; fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  cat < "$tmpdepfile" >> "$depfile"
+  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+msvisualcpp)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the proprocessed file to stdout, regardless of -o,
+  # because we must use -o when running libtool.
+  ( IFS=" "
+    case " $* " in
+    *" --mode=compile "*)
+      for arg
+      do # cycle over the arguments
+        case $arg in
+	"--mode=compile")
+	  # insert --quiet before "--mode=compile"
+	  set fnord "$@" --quiet
+	  shift # fnord
+	  ;;
+	esac
+	set fnord "$@" "$arg"
+	shift # fnord
+	shift # "$arg"
+      done
+      ;;
+    esac
+    "$@" -E |
+    sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
+  ) &
+  proc=$!
+  "$@"
+  stat=$?
+  wait "$proc"
+  if test "$stat" != 0; then exit $stat; fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
+  echo "	" >> "$depfile"
+  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+none)
+  exec "$@"
+  ;;
+
+*)
+  echo "Unknown depmode $depmode" 1>&2
+  exit 1
+  ;;
+esac
+
+exit 0
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
-# Copyright (C) 1996, 1997 Free Software Foundation, Inc.
-# Franc,ois Pinard <[email protected]>, 1996.
+# 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
@@ -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
@@ -1 +1 @@
-1.28c
+1.29a
@@ -1,12 +1,31 @@
-# Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.52)
-AC_INIT(bison, 1.28c, [email protected])
+# Configure template for GNU Bison.                   -*-Autoconf-*-
+#
+# 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.29b], [[email protected]])
 AC_CONFIG_AUX_DIR(config)
-AM_INIT_AUTOMAKE(bison, 1.28c)
+
+AM_INIT_AUTOMAKE([bison], [1.29b])
 AM_CONFIG_HEADER(config.h:config.hin)

 # Initialize the test suite.
-AT_CONFIG(../src)
+AC_CONFIG_TESTDIR(tests)

 # Checks for programs.
 AC_PROG_CC
@@ -69,8 +88,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 +103,4 @@ AC_OUTPUT([Makefile
           intl/Makefile po/Makefile.in
           lib/Makefile src/Makefile doc/Makefile
           m4/Makefile
-           tests/Makefile tests/atconfig])
+           tests/Makefile])
@@ -1,6 +1,7 @@
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
+# Makefile.in generated automatically by automake 1.5 from Makefile.am.

-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+# Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -10,6 +11,7 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.

+@SET_MAKE@

 SHELL = @SHELL@

@@ -31,13 +33,9 @@ infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
-DESTDIR =
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ..

 ACLOCAL = @ACLOCAL@
@@ -46,11 +44,11 @@ AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@

 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
-
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
@@ -59,20 +57,21 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
-AT_TESTPATH = @AT_TESTPATH@
+AMTAR = @AMTAR@
+AWK = @AWK@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
+DEPDIR = @DEPDIR@
+EXEEXT = @EXEEXT@
 GENCAT = @GENCAT@
 GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
@@ -81,9 +80,9 @@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LIBICONV = @LIBICONV@
 LIBOBJS = @LIBOBJS@
 M4 = @M4@
-MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
+OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 POFILES = @POFILES@
 POSUB = @POSUB@
@@ -93,6 +92,9 @@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WARNING_CFLAGS = @WARNING_CFLAGS@
+am__include = @am__include@
+am__quote = @am__quote@
+install_sh = @install_sh@

 AUTOMAKE_OPTIONS = 1.4

@@ -103,44 +105,40 @@ bison_TEXINFOS = gpl.texi fdl.texi
 EXTRA_DIST = FAQ bison.1 bison.rnh refcard.tex

 CLEANFILES = refcard.dvi refcard.log refcard.ps
+subdir = doc
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
-CONFIG_HEADER = ../config.h
-CONFIG_CLEAN_FILES = 
-TEXI2DVI = texi2dvi
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+DIST_SOURCES =
 TEXINFO_TEX = $(top_srcdir)/config/texinfo.tex
 INFO_DEPS = bison.info
 DVIS = bison.dvi
 TEXINFOS = bison.texinfo
-man1dir = $(mandir)/man1
-MANS = $(man_MANS)

 NROFF = nroff
-DIST_COMMON =  $(bison_TEXINFOS) Makefile.am Makefile.in stamp-vti \
-version.texi
+MANS = $(man_MANS)
+DIST_COMMON = $(bison_TEXINFOS) Makefile.am Makefile.in stamp-vti \
+	version.texi
+all: all-am

-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = tar
-GZIP_ENV = --best
-all: all-redirect
 .SUFFIXES:
-.SUFFIXES: .dvi .info .ps .texi .texinfo .txi
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile
+.SUFFIXES: .dvi .info .ps .texinfo
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  doc/Makefile
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	cd $(top_builddir) && \
+	  CONFIG_HEADERS= CONFIG_LINKS= \
+	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status

-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-$(srcdir)/version.texi: stamp-vti
+$(srcdir)/version.texi:  $(srcdir)/stamp-vti
 	@:
-
 $(srcdir)/stamp-vti: bison.texinfo $(top_srcdir)/configure.in
-	@echo "@set UPDATED `$(SHELL) $(top_srcdir)/config/mdate-sh $(srcdir)/bison.texinfo`" > vti.tmp
-	@echo "@set EDITION $(VERSION)" >> vti.tmp
-	@echo "@set VERSION $(VERSION)" >> vti.tmp
+	@(set `$(SHELL) $(top_srcdir)/config/mdate-sh $(srcdir)/bison.texinfo`; \
+	echo "@set UPDATED $$1 $$2 $$3"; \
+	echo "@set UPDATED-MONTH $$2 $$3"; \
+	echo "@set EDITION $(VERSION)"; \
+	echo "@set VERSION $(VERSION)") > vti.tmp
 	@cmp -s vti.tmp $(srcdir)/version.texi \
 	  || (echo "Updating $(srcdir)/version.texi"; \
 	      cp vti.tmp $(srcdir)/version.texi)
@@ -150,134 +148,84 @@ $(srcdir)/stamp-vti: bison.texinfo $(top_srcdir)/configure.in
 mostlyclean-vti:
 	-rm -f vti.tmp

-clean-vti:
-
-distclean-vti:
-
 maintainer-clean-vti:
 	-rm -f $(srcdir)/stamp-vti $(srcdir)/version.texi

-bison.info: bison.texinfo version.texi $(bison_TEXINFOS)
-bison.dvi: bison.texinfo version.texi $(bison_TEXINFOS)
-
-
-DVIPS = dvips
-
-.texi.info:
-	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
-	cd $(srcdir) \
-	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
-
-.texi.dvi:
-	TEXINPUTS=$(top_srcdir)/config/texinfo.tex:$$TEXINPUTS \
-	  MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $<
-
-.texi:
-	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
-	cd $(srcdir) \
-	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
+bison.info: bison.texinfo $(srcdir)/version.texi $(bison_TEXINFOS)
+bison.dvi: bison.texinfo $(srcdir)/version.texi $(bison_TEXINFOS)

 .texinfo.info:
 	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
 	cd $(srcdir) \
-	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
+	  && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
+	       `echo $< | sed 's,.*/,,'`
+
+.texinfo.dvi:
+	TEXINPUTS=$(top_srcdir)/config:$$TEXINPUTS \
+	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
+	$(TEXI2DVI) $<

 .texinfo:
 	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
 	cd $(srcdir) \
-	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
+	  && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
+	       `echo $< | sed 's,.*/,,'`

-.texinfo.dvi:
-	TEXINPUTS=$(top_srcdir)/config/texinfo.tex:$$TEXINPUTS \
-	  MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $<
-
-.txi.info:
-	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
-	cd $(srcdir) \
-	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
-
-.txi.dvi:
-	TEXINPUTS=$(top_srcdir)/config/texinfo.tex:$$TEXINPUTS \
-	  MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $<
-
-.txi:
-	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
-	cd $(srcdir) \
-	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
+MAKEINFO = @MAKEINFO@
+TEXI2DVI = texi2dvi
+DVIPS = dvips
 .dvi.ps:
 	$(DVIPS) $< -o $@

-install-info-am: $(INFO_DEPS)
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(infodir)
-	@list='$(INFO_DEPS)'; \
-	for file in $$list; do \
-	  d=$(srcdir); \
-	  for ifile in `cd $$d && echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \
-	    if test -f $$d/$$ifile; then \
-	      echo " $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile"; \
-	      $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile; \
-	    else : ; fi; \
-	  done; \
-	done
-	@$(POST_INSTALL)
-	@if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
+uninstall-info-am:
+	$(PRE_UNINSTALL)
+	@if (install-info --version && \
+	     install-info --version | fgrep -i -v debian) >/dev/null 2>&1; then \
 	  list='$(INFO_DEPS)'; \
 	  for file in $$list; do \
-	    echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file";\
-	    install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file || :;\
+	    echo " install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$$file"; \
+	    install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$$file; \
 	  done; \
-	else : ; fi
-
-uninstall-info:
-	$(PRE_UNINSTALL)
-	@if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
-	  ii=yes; \
-	else ii=; fi; \
-	list='$(INFO_DEPS)'; \
-	for file in $$list; do \
-	  test -z "$$ii" \
-	    || install-info --info-dir=$(DESTDIR)$(infodir) --remove $$file; \
-	done
+	else :; fi
 	@$(NORMAL_UNINSTALL)
-	list='$(INFO_DEPS)'; \
+	@list='$(INFO_DEPS)'; \
 	for file in $$list; do \
-	  (cd $(DESTDIR)$(infodir) && rm -f $$file $$file-[0-9] $$file-[0-9][0-9]); \
+	  (if cd $(DESTDIR)$(infodir); then \
+	     echo " rm -f $$file $$file-[0-9] $$file-[0-9][0-9])"; \
+	     rm -f $$file $$file-[0-9] $$file-[0-9][0-9]; \
+	   else :; fi); \
 	done

 dist-info: $(INFO_DEPS)
 	list='$(INFO_DEPS)'; \
 	for base in $$list; do \
 	  d=$(srcdir); \
-	  for file in `cd $$d && eval echo $$base*`; do \
+	  for file in `CDPATH=: && cd $$d && eval echo $$base*`; do \
 	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
 	    || cp -p $$d/$$file $(distdir)/$$file; \
 	  done; \
 	done

 mostlyclean-aminfo:
-	-rm -f bison.aux bison.cp bison.cps bison.dvi bison.fn bison.fns \
-	  bison.ky bison.kys bison.ps bison.log bison.pg bison.toc \
-	  bison.tp bison.tps bison.vr bison.vrs bison.op bison.tr \
-	  bison.cv bison.cn
-
-clean-aminfo:
-
-distclean-aminfo:
+	-rm -f bison.aux bison.cp bison.cps bison.dvi bison.fn bison.ky bison.log \
+	  bison.pg bison.ps bison.toc bison.tp bison.vr

 maintainer-clean-aminfo:
-	cd $(srcdir) && for i in $(INFO_DEPS); do \
+	cd $(srcdir) && \
+	for i in $(INFO_DEPS); do \
 	  rm -f $$i; \
 	  if test "`echo $$i-[0-9]*`" != "$$i-[0-9]*"; then \
 	    rm -f $$i-[0-9]*; \
 	  fi; \
 	done

-install-man1:
+man1dir = $(mandir)/man1
+install-man1: $(man1_MANS) $(man_MANS)
+	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(man1dir)
-	@list='$(man1_MANS)'; \
-	l2='$(man_MANS)'; for i in $$l2; do \
+	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	for i in $$l2; do \
 	  case "$$i" in \
 	    *.1*) list="$$list $$i" ;; \
 	  esac; \
@@ -287,14 +235,16 @@ install-man1:
 	  else file=$$i; fi; \
 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
 	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
 	  $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \
 	done
-
 uninstall-man1:
-	@list='$(man1_MANS)'; \
-	l2='$(man_MANS)'; for i in $$l2; do \
+	@$(NORMAL_UNINSTALL)
+	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	for i in $$l2; do \
 	  case "$$i" in \
 	    *.1*) list="$$list $$i" ;; \
 	  esac; \
@@ -302,113 +252,147 @@ uninstall-man1:
 	for i in $$list; do \
 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
 	  echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \
 	  rm -f $(DESTDIR)$(man1dir)/$$inst; \
 	done
-install-man: $(MANS)
-	@$(NORMAL_INSTALL)
-	$(MAKE) $(AM_MAKEFLAGS) install-man1
-uninstall-man:
-	@$(NORMAL_UNINSTALL)
-	$(MAKE) $(AM_MAKEFLAGS) uninstall-man1
 tags: TAGS
 TAGS:


-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)

-subdir = doc
+top_distdir = ..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)

 distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu doc/Makefile
 	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    $(mkinstalldirs) "$(distdir)/$$dir"; \
+	  fi; \
 	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
+	    cp -pR $$d/$$file $(distdir) \
+	    || exit 1; \
 	  else \
 	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
 	  fi; \
 	done
-	$(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-info
-info-am: $(INFO_DEPS)
-info: info-am
-dvi-am: $(DVIS)
-dvi: dvi-am
+	$(MAKE) $(AM_MAKEFLAGS) \
+	  top_distdir="${top_distdir}" distdir="$(distdir)" \
+	  dist-info
 check-am: all-am
 check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
+all-am: Makefile $(INFO_DEPS) $(MANS)

-install-data-am: install-info-am install-man
+installdirs:
+	$(mkinstalldirs) $(DESTDIR)$(infodir) $(DESTDIR)$(man1dir)
+
+install: install-am
+install-exec: install-exec-am
 install-data: install-data-am
+uninstall: uninstall-am

 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am: uninstall-info uninstall-man
-uninstall: uninstall-am
-all-am: Makefile $(INFO_DEPS) $(MANS)
-all-redirect: all-am
+
+installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-	$(mkinstalldirs)  $(DESTDIR)$(infodir) $(DESTDIR)$(mandir)/man1
-
-
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:

 clean-generic:
 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)

 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*

 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-vti mostlyclean-aminfo mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-vti clean-aminfo clean-generic mostlyclean-am
-
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-am

-distclean-am:  distclean-vti distclean-aminfo distclean-generic clean-am
+clean-am: clean-generic mostlyclean-am

 distclean: distclean-am

-maintainer-clean-am:  maintainer-clean-vti maintainer-clean-aminfo \
-		maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am: $(DVIS)
+
+info: info-am
+
+info-am: $(INFO_DEPS)
+
+install-data-am: install-info-am install-man
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-info-am: $(INFO_DEPS)
+	@$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(DESTDIR)$(infodir)
+	@list='$(INFO_DEPS)'; \
+	for file in $$list; do \
+	  d=$(srcdir); \
+	  for ifile in `CDPATH=: && cd $$d && echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \
+	    if test -f $$d/$$ifile; then \
+	      echo " $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile"; \
+	      $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile; \
+	    else : ; fi; \
+	  done; \
+	done
+	@$(POST_INSTALL)
+	@if (install-info --version && \
+	     install-info --version | fgrep -i -v debian) >/dev/null 2>&1; then \
+	  list='$(INFO_DEPS)'; \
+	  for file in $$list; do \
+	    echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file";\
+	    install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file || :;\
+	  done; \
+	else : ; fi
+install-man: install-man1
+
+installcheck-am:

 maintainer-clean: maintainer-clean-am

-.PHONY: mostlyclean-vti distclean-vti clean-vti maintainer-clean-vti \
-install-info-am uninstall-info mostlyclean-aminfo distclean-aminfo \
-clean-aminfo maintainer-clean-aminfo install-man1 uninstall-man1 \
-install-man uninstall-man tags distdir info-am info dvi-am dvi check \
-check-am installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
+maintainer-clean-am: distclean-am maintainer-clean-aminfo \
+	maintainer-clean-generic maintainer-clean-vti
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-aminfo mostlyclean-generic mostlyclean-vti
+
+uninstall-am: uninstall-info-am uninstall-man
+
+uninstall-man: uninstall-man1
+
+.PHONY: all all-am check check-am clean clean-generic dist-info \
+	distclean distclean-generic distdir dvi dvi-am info info-am \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-info-am install-man \
+	install-man1 install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-aminfo \
+	maintainer-clean-generic maintainer-clean-vti mostlyclean \
+	mostlyclean-aminfo mostlyclean-generic mostlyclean-vti \
+	uninstall uninstall-am uninstall-info-am uninstall-man \
+	uninstall-man1


 refcard.dvi: refcard.tex
 	tex refcard.tex

 refcard.ps: refcard.dvi
-
 # 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.
 .NOEXPORT:
@@ -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
@@ -31,111 +31,115 @@ instead of in the original English.

 Indirect:
 bison.info-1: 1313
-bison.info-2: 50357
-bison.info-3: 99982
-bison.info-4: 148180
-bison.info-5: 190964
+bison.info-2: 50691
+bison.info-3: 100581
+bison.info-4: 150131
+bison.info-5: 197908

 Tag Table:
 (Indirect)
 Node: Top1313
-Node: Introduction8698
-Node: Conditions9973
-Node: Copying11437
-Node: Concepts30640
-Node: Language and Grammar31719
-Node: Grammar in Bison36735
-Node: Semantic Values38659
-Node: Semantic Actions40760
-Node: Locations Overview41949
-Node: Bison Parser43396
-Node: Stages45708
-Node: Grammar Layout46991
-Node: Examples48248
-Node: RPN Calc49383
-Node: Rpcalc Decls50357
-Node: Rpcalc Rules51944
-Node: Rpcalc Input53744
-Node: Rpcalc Line55205
-Node: Rpcalc Expr56320
-Node: Rpcalc Lexer58265
-Node: Rpcalc Main60837
-Node: Rpcalc Error61235
-Node: Rpcalc Gen62243
-Node: Rpcalc Compile63392
-Node: Infix Calc64267
-Node: Simple Error Recovery66974
-Node: Multi-function Calc68860
-Node: Mfcalc Decl70426
-Node: Mfcalc Rules72449
-Node: Mfcalc Symtab73829
-Node: Exercises80202
-Node: Grammar File80708
-Node: Grammar Outline81556
-Node: C Declarations82290
-Node: Bison Declarations82870
-Node: Grammar Rules83282
-Node: C Code83742
-Node: Symbols84672
-Node: Rules89753
-Node: Recursion91392
-Node: Semantics93111
-Node: Value Type94205
-Node: Multiple Types94877
-Node: Actions95894
-Node: Action Types98679
-Node: Mid-Rule Actions99982
-Node: Locations105552
-Node: Location Type106200
-Node: Actions and Locations106758
-Node: Location Default Action108914
-Node: Declarations110377
-Node: Token Decl111696
-Node: Precedence Decl113709
-Node: Union Decl115260
-Node: Type Decl116104
-Node: Expect Decl117010
-Node: Start Decl118556
-Node: Pure Decl118934
-Node: Decl Summary120611
-Node: Multiple Parsers125994
-Node: Interface127488
-Node: Parser Function128360
-Node: Lexical129195
-Node: Calling Convention130601
-Node: Token Values133372
-Node: Token Positions134521
-Node: Pure Calling135406
-Node: Error Reporting138338
-Node: Action Features140460
-Node: Algorithm143755
-Node: Look-Ahead146048
-Node: Shift/Reduce148180
-Node: Precedence151092
-Node: Why Precedence151743
-Node: Using Precedence153608
-Node: Precedence Examples154576
-Node: How Precedence155277
-Node: Contextual Precedence156426
-Node: Parser States158217
-Node: Reduce/Reduce159460
-Node: Mystery Conflicts163021
-Node: Stack Overflow166407
-Node: Error Recovery167780
-Node: Context Dependency172916
-Node: Semantic Tokens173764
-Node: Lexical Tie-ins176781
-Node: Tie-in Recovery178329
-Node: Debugging180501
-Node: Invocation183802
-Node: Bison Options185054
-Node: Environment Variables188488
-Node: Option Cross Key189336
-Node: VMS Invocation190180
-Node: Table of Symbols190964
-Node: Glossary198603
-Node: Copying This Manual204907
-Node: GNU Free Documentation License205116
-Node: Index224981
+Node: Introduction8969
+Node: Conditions10244
+Node: Copying11708
+Node: Concepts30911
+Node: Language and Grammar31990
+Node: Grammar in Bison37006
+Node: Semantic Values38930
+Node: Semantic Actions41031
+Node: Locations Overview42220
+Node: Bison Parser43667
+Node: Stages45979
+Node: Grammar Layout47262
+Node: Examples48519
+Node: RPN Calc49717
+Node: Rpcalc Decls50691
+Node: Rpcalc Rules52278
+Node: Rpcalc Input54078
+Node: Rpcalc Line55539
+Node: Rpcalc Expr56654
+Node: Rpcalc Lexer58599
+Node: Rpcalc Main61171
+Node: Rpcalc Error61569
+Node: Rpcalc Gen62577
+Node: Rpcalc Compile63726
+Node: Infix Calc64601
+Node: Simple Error Recovery67308
+Node: Location Tracking Calc69197
+Node: Ltcalc Decls69927
+Node: Ltcalc Rules70836
+Node: Ltcalc Lexer72897
+Node: Multi-function Calc75235
+Node: Mfcalc Decl76802
+Node: Mfcalc Rules78825
+Node: Mfcalc Symtab80205
+Node: Exercises86578
+Node: Grammar File87084
+Node: Grammar Outline87932
+Node: C Declarations88666
+Node: Bison Declarations89246
+Node: Grammar Rules89658
+Node: C Code90118
+Node: Symbols91048
+Node: Rules96129
+Node: Recursion97768
+Node: Semantics99487
+Node: Value Type100581
+Node: Multiple Types101253
+Node: Actions102270
+Node: Action Types105055
+Node: Mid-Rule Actions106358
+Node: Locations111928
+Node: Location Type112576
+Node: Actions and Locations113134
+Node: Location Default Action115290
+Node: Declarations116753
+Node: Token Decl118072
+Node: Precedence Decl120085
+Node: Union Decl121636
+Node: Type Decl122480
+Node: Expect Decl123386
+Node: Start Decl124932
+Node: Pure Decl125310
+Node: Decl Summary126987
+Node: Multiple Parsers132370
+Node: Interface133864
+Node: Parser Function134736
+Node: Lexical135571
+Node: Calling Convention136977
+Node: Token Values139748
+Node: Token Positions140897
+Node: Pure Calling141782
+Node: Error Reporting144714
+Node: Action Features146836
+Node: Algorithm150131
+Node: Look-Ahead152424
+Node: Shift/Reduce154556
+Node: Precedence157468
+Node: Why Precedence158119
+Node: Using Precedence159984
+Node: Precedence Examples160952
+Node: How Precedence161653
+Node: Contextual Precedence162802
+Node: Parser States164593
+Node: Reduce/Reduce165836
+Node: Mystery Conflicts169397
+Node: Stack Overflow172783
+Node: Error Recovery174156
+Node: Context Dependency179292
+Node: Semantic Tokens180140
+Node: Lexical Tie-ins183157
+Node: Tie-in Recovery184705
+Node: Debugging186877
+Node: Invocation190178
+Node: Bison Options191430
+Node: Environment Variables195398
+Node: Option Cross Key196246
+Node: VMS Invocation197124
+Node: Table of Symbols197908
+Node: Glossary205547
+Node: Copying This Manual211851
+Node: GNU Free Documentation License212060
+Node: Index231925

 End Tag Table
@@ -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.29b 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,6 +84,7 @@ 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.
@@ -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.
@@ -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.29b of Bison.


 File: bison.info,  Node: Conditions,  Next: Copying,  Prev: Introduction,  Up: Top
@@ -1034,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.
@@ -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'
 ===================================
@@ -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 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.
-
@@ -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

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

@@ -1045,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
@@ -1069,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

@@ -1101,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
@@ -855,6 +855,7 @@ Index
 * 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.
@@ -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.
@@ -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:
-
@@ -1,4 +1,4 @@
-@node Copying, Concepts, Conditions, Top
+@node Copying
@unnumbered GNU GENERAL PUBLIC LICENSE
@center Version 2, June 1991

@@ -1,3 +1,4 @@
-@set UPDATED 15 August 2001
-@set EDITION 1.28c
-@set VERSION 1.28c
+@set UPDATED 20 September 2001
+@set UPDATED-MONTH September 2001
+@set EDITION 1.29b
+@set VERSION 1.29b
@@ -1,3 +1,4 @@
-@set UPDATED 15 August 2001
-@set EDITION 1.28c
-@set VERSION 1.28c
+@set UPDATED 20 September 2001
+@set UPDATED-MONTH September 2001
+@set EDITION 1.29b
+@set VERSION 1.29b
@@ -1,6 +1,7 @@
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
+# Makefile.in generated automatically by automake 1.5 from Makefile.am.

-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+# Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -10,6 +11,7 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.

+@SET_MAKE@

 SHELL = @SHELL@

@@ -31,13 +33,9 @@ infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
-DESTDIR =
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ..

 ACLOCAL = @ACLOCAL@
@@ -46,11 +44,11 @@ AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@

 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
-
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
@@ -59,20 +57,21 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
-AT_TESTPATH = @AT_TESTPATH@
+AMTAR = @AMTAR@
+AWK = @AWK@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
+DEPDIR = @DEPDIR@
+EXEEXT = @EXEEXT@
 GENCAT = @GENCAT@
 GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
@@ -81,9 +80,9 @@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LIBICONV = @LIBICONV@
 LIBOBJS = @LIBOBJS@
 M4 = @M4@
-MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
+OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 POFILES = @POFILES@
 POSUB = @POSUB@
@@ -93,6 +92,9 @@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WARNING_CFLAGS = @WARNING_CFLAGS@
+am__include = @am__include@
+am__quote = @am__quote@
+install_sh = @install_sh@

 AUTOMAKE_OPTIONS = ansi2knr

@@ -100,300 +102,295 @@ noinst_LIBRARIES = libbison.a

 INCLUDES = -I.. -I$(srcdir) -I../intl

+
 # Heck, we are still using an old version of Automake which does not
 # understand LIBOBJ additions using $objext...
-
 EXTRA_DIST = malloc.c realloc.c

-libbison_a_SOURCES =    error.c error.h   getopt.h getopt.c getopt1.c   obstack.h obstack.c   quote.h quote.c quotearg.h quotearg.c   xalloc.h xmalloc.c xstrdup.c
+libbison_a_SOURCES = \
+  error.c error.h \
+  getopt.h getopt.c getopt1.c \
+  obstack.h obstack.c \
+  quote.h quote.c quotearg.h quotearg.c \
+  xalloc.h xmalloc.c xstrdup.c


 libbison_a_LIBADD = @LIBOBJS@
 libbison_a_DEPENDENCIES = $(libbison_a_LIBADD)
+subdir = lib
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
-CONFIG_HEADER = ../config.h
-CONFIG_CLEAN_FILES = 
-LIBRARIES =  $(noinst_LIBRARIES)
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+LIBRARIES = $(noinst_LIBRARIES)

+libbison_a_AR = $(AR) cru
+am_libbison_a_OBJECTS = error$U.$(OBJEXT) getopt$U.$(OBJEXT) \
+	getopt1$U.$(OBJEXT) obstack$U.$(OBJEXT) quote$U.$(OBJEXT) \
+	quotearg$U.$(OBJEXT) xmalloc$U.$(OBJEXT) xstrdup$U.$(OBJEXT)
+libbison_a_OBJECTS = $(am_libbison_a_OBJECTS)

-DEFS = @DEFS@ -I. -I$(srcdir) -I..
+DEFS = @DEFS@
+DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
-ANSI2KNR = @ANSI2KNR@
-libbison_a_OBJECTS =  error$U.o getopt$U.o getopt1$U.o obstack$U.o \
-quote$U.o quotearg$U.o xmalloc$U.o xstrdup$U.o
-AR = ar
-CFLAGS = @CFLAGS@
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+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)/malloc.Po \
+@AMDEP_TRUE@	$(DEPDIR)/memchr.Po $(DEPDIR)/obstack$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/quote$U.Po $(DEPDIR)/quotearg$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/realloc.Po $(DEPDIR)/stpcpy.Po \
+@AMDEP_TRUE@	$(DEPDIR)/strndup.Po $(DEPDIR)/strnlen.Po \
+@AMDEP_TRUE@	$(DEPDIR)/strspn.Po $(DEPDIR)/xmalloc$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/xstrdup$U.Po
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-DIST_COMMON =  Makefile.am Makefile.in ansi2knr.1 ansi2knr.c memchr.c \
-stpcpy.c strndup.c strnlen.c strspn.c
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = tar
-GZIP_ENV = --best
-DEP_FILES =  .deps/error.P .deps/getopt.P .deps/getopt1.P .deps/memchr.P \
-.deps/obstack.P .deps/quote.P .deps/quotearg.P .deps/stpcpy.P \
-.deps/strndup.P .deps/strnlen.P .deps/strspn.P .deps/xmalloc.P \
-.deps/xstrdup.P
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+CFLAGS = @CFLAGS@
+DIST_SOURCES = $(libbison_a_SOURCES)
+DIST_COMMON = Makefile.am Makefile.in ansi2knr.1 ansi2knr.c malloc.c \
+	memchr.c realloc.c stpcpy.c strndup.c strnlen.c strspn.c
 SOURCES = $(libbison_a_SOURCES)
-OBJECTS = $(libbison_a_OBJECTS)

-all: all-redirect
+all: all-am
+
 .SUFFIXES:
-.SUFFIXES: .S .c .o .s
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/Makefile
+.SUFFIXES: .c .o .obj
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  lib/Makefile
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	cd $(top_builddir) && \
+	  CONFIG_HEADERS= CONFIG_LINKS= \
+	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status

-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-mostlyclean-noinstLIBRARIES:
+AR = ar

 clean-noinstLIBRARIES:
 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-
-distclean-noinstLIBRARIES:
-
-maintainer-clean-noinstLIBRARIES:
-
-.s.o:
-	$(COMPILE) -c $<
-
-.S.o:
-	$(COMPILE) -c $<
+libbison.a: $(libbison_a_OBJECTS) $(libbison_a_DEPENDENCIES) 
+	-rm -f libbison.a
+	$(libbison_a_AR) libbison.a $(libbison_a_OBJECTS) $(libbison_a_LIBADD)
+	$(RANLIB) libbison.a

 mostlyclean-compile:
-	-rm -f *.o core *.core
-
-clean-compile:
+	-rm -f *.$(OBJEXT) core *.core

 distclean-compile:
 	-rm -f *.tab.c

-maintainer-clean-compile:
-
-mostlyclean-krextra:
+ANSI2KNR = @ANSI2KNR@
+ansi2knr: ansi2knr.$(OBJEXT)
+	$(LINK) ansi2knr.$(OBJEXT) $(LIBS)
+ansi2knr.$(OBJEXT): $(CONFIG_HEADER)

 clean-krextra:
 	-rm -f ansi2knr

-distclean-krextra:
-
-maintainer-clean-krextra:
-ansi2knr: ansi2knr.o
-	$(LINK) ansi2knr.o $(LIBS)
-ansi2knr.o: $(CONFIG_HEADER)
-
-
 mostlyclean-kr:
 	-rm -f *_.c

-clean-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)/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@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/quote$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/quotearg$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/realloc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/stpcpy.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strndup.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strnlen.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strspn.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/xmalloc$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/xstrdup$U.Po@am__quote@

-distclean-kr:
+distclean-depend:
+	-rm -rf $(DEPDIR)

-maintainer-clean-kr:
+.c.o:
+@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$<

-libbison.a: $(libbison_a_OBJECTS) $(libbison_a_DEPENDENCIES)
-	-rm -f libbison.a
-	$(AR) cru libbison.a $(libbison_a_OBJECTS) $(libbison_a_LIBADD)
-	$(RANLIB) libbison.a
+.c.obj:
+@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(COMPILE) -c `cygpath -w $<`
+CCDEPMODE = @CCDEPMODE@
 alloca_.c: alloca.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/alloca.c; then echo $(srcdir)/alloca.c; else echo alloca.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > alloca_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/alloca.c; then echo $(srcdir)/alloca.c; else echo alloca.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > alloca_.c || rm -f alloca_.c
 error_.c: error.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/error.c; then echo $(srcdir)/error.c; else echo error.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > error_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/error.c; then echo $(srcdir)/error.c; else echo error.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > error_.c || rm -f error_.c
 getopt_.c: getopt.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(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
+	$(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) $(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
+	$(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
+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)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/memchr.c; then echo $(srcdir)/memchr.c; else echo memchr.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > memchr_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/memchr.c; then echo $(srcdir)/memchr.c; else echo memchr.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > memchr_.c || rm -f memchr_.c
 obstack_.c: obstack.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/obstack.c; then echo $(srcdir)/obstack.c; else echo obstack.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > obstack_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/obstack.c; then echo $(srcdir)/obstack.c; else echo obstack.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > obstack_.c || rm -f obstack_.c
 quote_.c: quote.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/quote.c; then echo $(srcdir)/quote.c; else echo quote.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > quote_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/quote.c; then echo $(srcdir)/quote.c; else echo quote.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > quote_.c || rm -f quote_.c
 quotearg_.c: quotearg.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/quotearg.c; then echo $(srcdir)/quotearg.c; else echo quotearg.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > quotearg_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/quotearg.c; then echo $(srcdir)/quotearg.c; else echo quotearg.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > quotearg_.c || rm -f quotearg_.c
+realloc_.c: realloc.c $(ANSI2KNR)
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/realloc.c; then echo $(srcdir)/realloc.c; else echo realloc.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > realloc_.c || rm -f realloc_.c
 stpcpy_.c: stpcpy.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/stpcpy.c; then echo $(srcdir)/stpcpy.c; else echo stpcpy.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > stpcpy_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/stpcpy.c; then echo $(srcdir)/stpcpy.c; else echo stpcpy.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > stpcpy_.c || rm -f stpcpy_.c
 strndup_.c: strndup.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/strndup.c; then echo $(srcdir)/strndup.c; else echo strndup.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > strndup_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/strndup.c; then echo $(srcdir)/strndup.c; else echo strndup.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > strndup_.c || rm -f strndup_.c
 strnlen_.c: strnlen.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/strnlen.c; then echo $(srcdir)/strnlen.c; else echo strnlen.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > strnlen_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/strnlen.c; then echo $(srcdir)/strnlen.c; else echo strnlen.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > strnlen_.c || rm -f strnlen_.c
 strspn_.c: strspn.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/strspn.c; then echo $(srcdir)/strspn.c; else echo strspn.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > strspn_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/strspn.c; then echo $(srcdir)/strspn.c; else echo strspn.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > strspn_.c || rm -f strspn_.c
 xmalloc_.c: xmalloc.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/xmalloc.c; then echo $(srcdir)/xmalloc.c; else echo xmalloc.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > xmalloc_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/xmalloc.c; then echo $(srcdir)/xmalloc.c; else echo xmalloc.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > xmalloc_.c || rm -f xmalloc_.c
 xstrdup_.c: xstrdup.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(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
-alloca_.o error_.o getopt_.o getopt1_.o memchr_.o obstack_.o quote_.o \
-quotearg_.o stpcpy_.o strndup_.o strnlen_.o strspn_.o xmalloc_.o \
-xstrdup_.o : $(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) \
+malloc_.$(OBJEXT) memchr_.$(OBJEXT) obstack_.$(OBJEXT) quote_.$(OBJEXT) \
+quotearg_.$(OBJEXT) realloc_.$(OBJEXT) stpcpy_.$(OBJEXT) \
+strndup_.$(OBJEXT) strnlen_.$(OBJEXT) strspn_.$(OBJEXT) \
+xmalloc_.$(OBJEXT) xstrdup_.$(OBJEXT) : $(ANSI2KNR)
+uninstall-info-am:

 tags: TAGS

-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
+	mkid -fID $$unique $(LISP)

-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
+	list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
+	  || etags $(ETAGS_ARGS) $$tags  $$unique $(LISP)

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

 distclean-tags:
-	-rm -f TAGS ID
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH

-maintainer-clean-tags:
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)

-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = lib
+top_distdir = ..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)

 distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu lib/Makefile
 	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    $(mkinstalldirs) "$(distdir)/$$dir"; \
+	  fi; \
 	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
+	    cp -pR $$d/$$file $(distdir) \
+	    || exit 1; \
 	  else \
 	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
 	  fi; \
 	done
-
-DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
-
-include $(DEP_FILES)
-
-mostlyclean-depend:
-
-clean-depend:
-
-distclean-depend:
-	-rm -rf .deps
-
-maintainer-clean-depend:
-
-%.o: %.c
-	@echo '$(COMPILE) -c $<'; \
-	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-	@-cp .deps/$(*F).pp .deps/$(*F).P; \
-	tr ' ' '\012' < .deps/$(*F).pp \
-	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-	    >> .deps/$(*F).P; \
-	rm .deps/$(*F).pp
-
-%.lo: %.c
-	@echo '$(LTCOMPILE) -c $<'; \
-	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
-	  < .deps/$(*F).pp > .deps/$(*F).P; \
-	tr ' ' '\012' < .deps/$(*F).pp \
-	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-	    >> .deps/$(*F).P; \
-	rm -f .deps/$(*F).pp
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
 check-am: all-am
 check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
+all-am: Makefile $(ANSI2KNR) $(LIBRARIES)

-install-data-am:
+installdirs:
+
+install: install-am
+install-exec: install-exec-am
 install-data: install-data-am
+uninstall: uninstall-am

 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am:
-uninstall: uninstall-am
-all-am: Makefile $(ANSI2KNR) $(LIBRARIES)
-all-redirect: all-am
+
+installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
-
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:

 clean-generic:

 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*

 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
-		mostlyclean-krextra mostlyclean-kr mostlyclean-tags \
-		mostlyclean-depend mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-noinstLIBRARIES clean-compile clean-krextra clean-kr \
-		clean-tags clean-depend clean-generic mostlyclean-am
-
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-am

-distclean-am:  distclean-noinstLIBRARIES distclean-compile \
-		distclean-krextra distclean-kr distclean-tags \
-		distclean-depend distclean-generic clean-am
+clean-am: clean-generic clean-krextra clean-noinstLIBRARIES \
+	mostlyclean-am

 distclean: distclean-am

-maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
-		maintainer-clean-compile maintainer-clean-krextra \
-		maintainer-clean-kr maintainer-clean-tags \
-		maintainer-clean-depend maintainer-clean-generic \
-		distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+distclean-am: clean-am distclean-compile distclean-depend \
+	distclean-generic distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:

 maintainer-clean: maintainer-clean-am

-.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
-clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
-mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile mostlyclean-krextra distclean-krextra \
-clean-krextra maintainer-clean-krextra mostlyclean-kr distclean-kr \
-clean-kr maintainer-clean-kr tags mostlyclean-tags distclean-tags \
-clean-tags maintainer-clean-tags distdir mostlyclean-depend \
-distclean-depend clean-depend maintainer-clean-depend info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-install-exec install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+maintainer-clean-am: distclean-am maintainer-clean-generic

+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic mostlyclean-kr
+
+uninstall-am: uninstall-info-am
+
+.PHONY: GTAGS all all-am check check-am clean clean-generic \
+	clean-krextra clean-noinstLIBRARIES distclean distclean-compile \
+	distclean-depend distclean-generic distclean-tags distdir dvi \
+	dvi-am info info-am install install-am install-data \
+	install-data-am install-exec install-exec-am install-info \
+	install-info-am install-man install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-kr tags uninstall uninstall-am \
+	uninstall-info-am

 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
@@ -1,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					\
@@ -1,6 +1,7 @@
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
+# Makefile.in generated automatically by automake 1.5 from Makefile.am.

-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+# Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -10,6 +11,7 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.

+@SET_MAKE@

 SHELL = @SHELL@

@@ -31,13 +33,9 @@ infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
-DESTDIR =
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ..

 ACLOCAL = @ACLOCAL@
@@ -46,11 +44,11 @@ AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@

 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
-
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
@@ -59,20 +57,21 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
-AT_TESTPATH = @AT_TESTPATH@
+AMTAR = @AMTAR@
+AWK = @AWK@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
+DEPDIR = @DEPDIR@
+EXEEXT = @EXEEXT@
 GENCAT = @GENCAT@
 GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
@@ -81,9 +80,9 @@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LIBICONV = @LIBICONV@
 LIBOBJS = @LIBOBJS@
 M4 = @M4@
-MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
+OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 POFILES = @POFILES@
 POSUB = @POSUB@
@@ -93,112 +92,143 @@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WARNING_CFLAGS = @WARNING_CFLAGS@
+am__include = @am__include@
+am__quote = @am__quote@
+install_sh = @install_sh@

-EXTRA_DIST =  atconfig.m4					c-bs-a.m4					codeset.m4					error.m4					gettext.m4					glibc21.m4					iconv.m4					isc-posix.m4					lcmessage.m4					m4.m4						malloc.m4					mbstate_t.m4					prereq.m4					progtest.m4					realloc.m4					strerror_r.m4					warning.m4
+EXTRA_DIST = \
+c-bs-a.m4					\
+codeset.m4					\
+dmalloc.m4					\
+error.m4					\
+gettext.m4					\
+glibc21.m4					\
+iconv.m4					\
+isc-posix.m4					\
+lcmessage.m4					\
+m4.m4						\
+malloc.m4					\
+mbstate_t.m4					\
+prereq.m4					\
+progtest.m4					\
+realloc.m4					\
+strerror_r.m4					\
+warning.m4

+subdir = m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
-CONFIG_HEADER = ../config.h
-CONFIG_CLEAN_FILES = 
-DIST_COMMON =  Makefile.am Makefile.in
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+DIST_SOURCES =
+DIST_COMMON = Makefile.am Makefile.in
+all: all-am

-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = tar
-GZIP_ENV = --best
-all: all-redirect
 .SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu m4/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  m4/Makefile
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	cd $(top_builddir) && \
+	  CONFIG_HEADERS= CONFIG_LINKS= \
+	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
+uninstall-info-am:
 tags: TAGS
 TAGS:


-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)

-subdir = m4
+top_distdir = ..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)

 distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu m4/Makefile
 	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    $(mkinstalldirs) "$(distdir)/$$dir"; \
+	  fi; \
 	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
+	    cp -pR $$d/$$file $(distdir) \
+	    || exit 1; \
 	  else \
 	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
 	  fi; \
 	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
 check-am: all-am
 check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
+all-am: Makefile

-install-data-am:
+installdirs:
+
+install: install-am
+install-exec: install-exec-am
 install-data: install-data-am
+uninstall: uninstall-am

 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am:
-uninstall: uninstall-am
-all-am: Makefile
-all-redirect: all-am
+
+installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
-
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:

 clean-generic:

 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*

 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-generic mostlyclean-am
-
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-am

-distclean-am:  distclean-generic clean-am
+clean-am: clean-generic mostlyclean-am

 distclean: distclean-am

-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:

 maintainer-clean: maintainer-clean-am

-.PHONY: tags distdir info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
+maintainer-clean-am: distclean-am maintainer-clean-generic

+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+uninstall-am: uninstall-info-am
+
+.PHONY: all all-am check check-am clean clean-generic distclean \
+	distclean-generic distdir dvi dvi-am info info-am install \
+	install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-info-am install-man \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic uninstall uninstall-am uninstall-info-am

 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
@@ -1,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
-])
@@ -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)])
+])
@@ -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
@@ -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
@@ -4,3 +4,4 @@ Makefile.in
 POTFILES
 bison.pot
 stamp-cat-id
+*.gmo
@@ -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
@@ -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-09-27 10:55+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:136
 #, c-format
 msgid "cannot open file `%s'"
 msgstr ""

-#: src/files.c:149
+#: src/files.c:155
 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:639
 #, 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:124
 #, 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
-msgid "\t\t/* empty */"
-msgstr "\t\t/* leer */"
+#: src/print.c:240
+msgid "empty"
+msgstr ""

-#: src/print.c:253
+#. TERMINAL (type #) : rule #s terminal is on RHS
+#: src/print.c:244
 #, fuzzy
 msgid "Terminals, with rules where they appear"
 msgstr ""
@@ -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
-#, 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
+#: src/reader.c:1005
 #, 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
-#, fuzzy, c-format
+#: src/reader.c:1498
+#, c-format
 msgid "%%guard present but %%semantic_parser not specified"
 msgstr ""
 "%%guard Anweisung vorhanden, jedoch wird %%semantic_parser nicht angegeben"

-#: src/reader.c: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"
@@ -852,29 +802,6 @@ msgstr ""
 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 "%s:%d: fatal error: "
-#~ msgstr "fataler Fehler: %s\n"
-
-#~ msgid "unterminated comment in `%{' definition"
-#~ msgstr "unbeendeter Kommentar in »%{« Definition"
-
-#~ msgid "invalid @-construct"
-#~ msgstr "unzulässig @-Konstruktion"
+#~ msgid "gotos"
+#~ msgstr "»goto« Anweisungen"

 #~ 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"
@@ -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-09-27 10:55+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:136
 #, c-format
 msgid "cannot open file `%s'"
 msgstr ""

-#: src/files.c:149
+#: src/files.c:155
 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:639
 #, 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:124
 #, 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
-# el contrario, pudiera cualquiera de los casos, debieras traducirlo
-# como `vacía/o' - cll
-# según el código indica reglas vacías por eso lo puse así
-# ngp
-#: src/print.c:246
-msgid "\t\t/* empty */"
-msgstr "\t\t/* vacía */"
+#: src/print.c:240
+msgid "empty"
+msgstr ""

-#: src/print.c:253
+#. TERMINAL (type #) : rule #s terminal is on RHS
+#: src/print.c:244
 #, fuzzy
 msgid "Terminals, with rules where they appear"
 msgstr ""
@@ -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
-#, 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
+#: src/reader.c:1005
 #, 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
-#, fuzzy, c-format
+#: src/reader.c:1498
+#, c-format
 msgid "%%guard present but %%semantic_parser not specified"
 msgstr "%%guard presente pero %%semantic_parser está sin especificar"

-#: src/reader.c: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"
@@ -987,37 +932,6 @@ msgstr ""
 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
-# propósito de "fatal". Por favor, comprueba que "error grave" es
-# preferido por todos los miembros a "error fatal" - cll
-# veremos que dice la mayoría, como hay otros 2 revisores
-# La verdad es que a mi lo de error fatal me suena fatal
+# 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
 #
-#, fuzzy
-#~ msgid "%s:%d: fatal error: "
-#~ 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 "gotos"
+#~ msgstr "saltos (gotos)"

 #~ 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"
@@ -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-09-27 10:55+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:136
 #, c-format
 msgid "cannot open file `%s'"
 msgstr ""

-#: src/files.c:149
+#: src/files.c:155
 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:639
 #, 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:124
 #, 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
-msgid "\t\t/* empty */"
-msgstr "\t\t/* 空 */"
+#: src/print.c:240
+msgid "empty"
+msgstr ""

-#: src/print.c:253
+#. TERMINAL (type #) : rule #s terminal is on RHS
+#: src/print.c:244
 #, fuzzy
 msgid "Terminals, with rules where they appear"
 msgstr ""
@@ -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
-#, 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
+#: src/reader.c:1005
 #, 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
-#, fuzzy, c-format
+#: src/reader.c:1498
+#, 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"
@@ -854,13 +804,6 @@ msgstr ""
 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 "無効な @-コンストラクトです"

@@ -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-09-27 10:55+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:136
 #, c-format
 msgid "cannot open file `%s'"
 msgstr ""

-#: src/files.c:149
+#: src/files.c:155
 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:639
 #, 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:124
 #, 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
-msgid "\t\t/* empty */"
+#: src/print.c:240
+msgid "empty"
 msgstr ""

-#: src/print.c:253
+#. TERMINAL (type #) : rule #s terminal is on RHS
+#: src/print.c:244
 #, fuzzy
 msgid "Terminals, with rules where they appear"
 msgstr ""
@@ -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
-#, 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
+#: src/reader.c:1005
 #, 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
-#, fuzzy, c-format
+#: src/reader.c:1498
+#, c-format
 msgid "%%guard present but %%semantic_parser not specified"
 msgstr "%%guard aanwezig maar %%semantic_parser niet gespecificeerd"

-#: src/reader.c: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"
@@ -857,28 +807,6 @@ msgstr ""
 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 "%s:%d: fatal error: "
-#~ msgstr "fatale fout: %s\n"
-
-#~ msgid "unterminated comment in `%{' definition"
-#~ msgstr "niet getermineerd commentaar in `%{' definitie"
-
-#~ msgid "invalid @-construct"
-#~ msgstr "ongeldige @-constructie"
+#~ msgid "gotos"
+#~ msgstr "ganaar"

 #~ 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"
@@ -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"
-"POT-Creation-Date: 2001-08-15 10:53+0200\n"
-"PO-Revision-Date: 2000-04-12 13:16+04:00\n"
+"Project-Id-Version: bison 1.29\n"
+"POT-Creation-Date: 2001-09-27 10:55+0200\n"
+"PO-Revision-Date: 2001-09-09 13:49+04:00\n"
 "Last-Translator: Dmitry S. Sivachenko <[email protected]>\n"
 "Language-Team: Russian <[email protected]>\n"
 "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
-#, fuzzy
+#: src/complain.c:238 src/complain.c:279
 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
-#, fuzzy
+#: src/derives.c:43
 msgid "DERIVES"
-msgstr ""
-"\n"
-"\n"
-"\n"
-"DERIVES\n"
-"\n"
+msgstr "DERIVES"

-#: src/derives.c:49
+#: src/derives.c:48
 #, c-format
 msgid "%s derives"
 msgstr "%s ×Ù×ÏÄÉÔ"

-#: src/files.c:130
+#: src/files.c:136
 #, c-format
 msgid "cannot open file `%s'"
-msgstr ""
+msgstr "ÎÅ ÕÄÁÅÔÓÑ ÏÔËÒÙÔØ ÆÁÊÌ `%s'"

-#: src/files.c:149
+#: src/files.c:155
 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:639
 #, 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:124
 #, 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
-#, fuzzy, c-format
+#: src/print.c:199
+#, c-format
 msgid "state %d"
-msgstr ""
-"\n"
-"\n"
-"ÓÏÓÔÏÑÎÉÅ %d\n"
-"\n"
+msgstr "ÓÏÓÔÏÑÎÉÅ %d"

-#: src/print.c:233
-#, fuzzy
+#. rule # : LHS -> RHS
+#: src/print.c:229
 msgid "Grammar"
-msgstr ""
-"\n"
-"çÒÁÍÍÁÔÉËÁ\n"
+msgstr "çÒÁÍÍÁÔÉËÁ"

-#: src/print.c:240
+#: src/print.c:234
 #, c-format
 msgid "rule %-4d %s ->"
 msgstr "ÐÒÁ×ÉÌÏ %-4d %s ->"

-#: src/print.c:246
-msgid "\t\t/* empty */"
-msgstr "\t\t/* ÐÕÓÔÏ */"
+#: src/print.c:240
+msgid "empty"
+msgstr ""

-#: src/print.c:253
-#, fuzzy
+#. TERMINAL (type #) : rule #s terminal is on RHS
+#: src/print.c:244
 msgid "Terminals, with rules where they appear"
-msgstr ""
-"\n"
-"ôÅÒÍÉÎÁÌØÎÙÅ ÓÉÍ×ÏÌÙ Ó ÐÒÁ×ÉÌÁÍÉ, × ËÏÔÏÒÙÈ ÏÎÉ ÐÏÑ×ÌÑÀÔÓÑ\n"
-"\n"
+msgstr "ôÅÒÍÉÎÁÌØÎÙÅ ÓÉÍ×ÏÌÙ Ó ÐÒÁ×ÉÌÁÍÉ, × ËÏÔÏÒÙÈ ÏÎÉ ÐÏÑ×ÌÑÀÔÓÑ"

-#: src/print.c:302
-#, fuzzy
+#: src/print.c:268
 msgid "Nonterminals, with rules where they appear"
-msgstr ""
-"\n"
-"îÅÔÅÒÍÉÎÁÌØÎÙÅ ÓÉÍ×ÏÌÙ Ó ÐÒÁ×ÉÌÁÍÉ, × ËÏÔÏÒÙÈ ÏÎÉ ÐÏÑ×ÌÑÀÔÓÑ\n"
-"\n"
+msgstr "îÅÔÅÒÍÉÎÁÌØÎÙÅ ÓÉÍ×ÏÌÙ Ó ÐÒÁ×ÉÌÁÍÉ, × ËÏÔÏÒÙÈ ÏÎÉ ÐÏÑ×ÌÑÀÔÓÑ"

-#: src/print.c:329
+#: src/print.c:294
 msgid " on left:"
 msgstr " ÎÁÌÅ×Ï:"

-#: src/print.c:344
+#: src/print.c:309
 msgid " on right:"
 msgstr " ÎÁÐÒÁ×Ï:"

 #: 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
-#, fuzzy, c-format
+#: src/reader.c:325 src/reader.c:389
+#, 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
-#, fuzzy, c-format
+#: src/reader.c:558 src/reader.c:717
+#, c-format
 msgid "multiple %s declarations"
-msgstr "ÍÎÏÖÅÓÔ×ÅÎÎÏÅ ÏÐÉÓÁÎÉÅ %start"
+msgstr "ÍÎÏÖÅÓÔ×ÅÎÎÏÅ ÏÐÉÓÁÎÉÅ %s"

-#: src/reader.c:563 src/reader.c:1246
-#, fuzzy, c-format
+#: src/reader.c:560 src/reader.c:897 src/reader.c:922 src/reader.c:1263
+#, 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
-#, fuzzy, c-format
+#: src/reader.c:760 src/reader.c:1089 src/reader.c:1160
+#, c-format
 msgid "unmatched %s"
-msgstr "ÎÅÐÁÒÎÁÑ `{'"
+msgstr "ÎÅÐÁÒÎÁÑ %s"

-#: src/reader.c:791
-#, fuzzy, c-format
+#: src/reader.c:792
+#, 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
-#, 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
+#: src/reader.c:1005
 #, 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
-#, fuzzy, c-format
+#: src/reader.c:1498
+#, 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
-#, fuzzy
+#: src/reduce.c:401
 msgid "Useless nonterminals:"
-msgstr ""
-"âÅÓÐÏÌÅÚÎÙÅ ÎÅÔÅÒÍÉÎÁÌÙ:\n"
-"\n"
+msgstr "âÅÓÐÏÌÅÚÎÙÅ ÎÅÔÅÒÍÉÎÁÌÙ:"

-#: src/reduce.c:419
-#, fuzzy
+#: src/reduce.c:416
 msgid "Terminals which are not used:"
-msgstr ""
-"\n"
-"\n"
-"îÅÉÓÐÏÌØÚÏ×ÁÎÎÙÅ ÔÅÒÍÉÎÁÌÙ:\n"
-"\n"
+msgstr "îÅÉÓÐÏÌØÚÏ×ÁÎÎÙÅ ÔÅÒÍÉÎÁÌÙ:"

-#: src/reduce.c:430
-#, fuzzy
+#: src/reduce.c:427
 msgid "Useless rules:"
-msgstr ""
-"\n"
-"\n"
-"âÅÓÐÏÌÅÚÎÙÅ ÐÒÁ×ÉÌÁ:\n"
-"\n"
+msgstr "âÅÓÐÏÌÅÚÎÙÅ ÐÒÁ×ÉÌÁ:"

-#: 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.
 #.
@@ -867,23 +789,20 @@ msgstr "%s:
 #. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively.
 #: lib/quotearg.c:259
 msgid "`"
-msgstr ""
+msgstr "`"

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

-#~ msgid "unterminated comment at end of file"
-#~ msgstr "ÎÅÚÁËÏÎÞÅÎÎÙÊ ËÏÍÍÅÎÔÁÒÉÊ × ËÏÎÃÅ ÆÁÊÌÁ"
+#~ msgid "\t\t/* empty */"
+#~ msgstr "\t\t/* ÐÕÓÔÏ */"

-#~ msgid "unmatched close-brace (`}')"
-#~ msgstr "ÎÅÐÁÒÎÁÑ ÚÁËÒÙ×ÁÀÝÁÑ ÆÉÇÕÒÎÁÑ ÓËÏÂËÁ (`}')"
+#~ msgid "multiple %%header_extension declarations"
+#~ 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"
@@ -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-09-27 10:55+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:136
+#, c-format
+msgid "cannot open file `%s'"
+msgstr "`%s' dosyasý açýlamadý"
+
+#: src/files.c:155
+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:639
+#, 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:124
+#, 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:259
+msgid "`"
+msgstr "`"
+
+#: lib/quotearg.c:260
+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"
@@ -23,7 +23,6 @@
   The entry point is generate_states.  */

 #include "system.h"
-#include "xalloc.h"
 #include "gram.h"
 #include "state.h"
 #include "complain.h"
@@ -33,39 +32,39 @@

 int nstates;
 int final_state;
-core *first_state;
-shifts *first_shift;
-reductions *first_reduction;
+core *first_state = NULL;
+shifts *first_shift = NULL;
+reductions *first_reduction = NULL;

-static core *this_state;
-static core *last_state;
-static shifts *last_shift;
-static reductions *last_reduction;
+static core *this_state = NULL;
+static core *last_state = NULL;
+static shifts *last_shift = NULL;
+static reductions *last_reduction = NULL;

 static int nshifts;
-static short *shift_symbol;
+static short *shift_symbol = NULL;

-static short *redset;
-static short *shiftset;
+static short *redset = NULL;
+static short *shiftset = NULL;

-static short **kernel_base;
-static short **kernel_end;
-static short *kernel_items;
+static short **kernel_base = NULL;
+static short **kernel_end = NULL;
+static short *kernel_items = NULL;

 /* hash table for states, to recognize equivalent ones.  */

 #define	STATE_TABLE_SIZE	1009
-static core **state_table;
+static core **state_table = NULL;


 static void
 allocate_itemsets (void)
 {
-  short *itemp;
+  short *itemp = NULL;
  int symbol;
  int i;
  int count;
-  short *symbol_count;
+  short *symbol_count = NULL;

  count = 0;
  symbol_count = XCALLOC (short, nsyms);
@@ -89,7 +88,8 @@ allocate_itemsets (void)
     We allocate that much space for each symbol.  */

  kernel_base = XCALLOC (short *, nsyms);
-  kernel_items = XCALLOC (short, count);
+  if (count)
+    kernel_items = XCALLOC (short, count);

  count = 0;
  for (i = 0; i < nsyms; i++)
@@ -1,6 +1,7 @@
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
+# Makefile.in generated automatically by automake 1.5 from Makefile.am.

-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+# Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -10,6 +11,7 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.

+@SET_MAKE@

 SHELL = @SHELL@

@@ -31,13 +33,9 @@ infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
-DESTDIR =
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ..

 ACLOCAL = @ACLOCAL@
@@ -46,11 +44,11 @@ AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@

 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
-
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
@@ -59,20 +57,21 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
-AT_TESTPATH = @AT_TESTPATH@
+AMTAR = @AMTAR@
+AWK = @AWK@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
+DEPDIR = @DEPDIR@
+EXEEXT = @EXEEXT@
 GENCAT = @GENCAT@
 GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
@@ -81,9 +80,9 @@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LIBICONV = @LIBICONV@
 LIBOBJS = @LIBOBJS@
 M4 = @M4@
-MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
+OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 POFILES = @POFILES@
 POSUB = @POSUB@
@@ -93,9 +92,15 @@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WARNING_CFLAGS = @WARNING_CFLAGS@
+am__include = @am__include@
+am__quote = @am__quote@
+install_sh = @install_sh@

 AUTOMAKE_OPTIONS = 1.4 ../lib/ansi2knr
-DEFS = @DEFS@   -DBISON_SIMPLE=\"$(pkgdatadir)/bison.simple\"   -DBISON_HAIRY=\"$(pkgdatadir)/bison.hairy\"   -DLOCALEDIR=\"$(datadir)/locale\"
+DEFS = @DEFS@ \
+  -DBISON_SIMPLE=\"$(pkgdatadir)/bison.simple\" \
+  -DBISON_HAIRY=\"$(pkgdatadir)/bison.hairy\" \
+  -DLOCALEDIR=\"$(datadir)/locale\"


 INCLUDES = -I../intl -I$(top_srcdir)/lib -I..
@@ -103,363 +108,360 @@ LDADD = @INTLLIBS@ ../lib/libbison.a

 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.c reader.c reduce.c symtab.c warshall.c vcg.c print_graph.c
+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.c reader.c reduce.c symtab.c warshall.c vcg.c print_graph.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 state.h	 print.h reader.h reduce.h symtab.h warshall.h system.h types.h  vcg.h vcg_defaults.h print_graph.h
+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 state.h	\
+ print.h reader.h reduce.h symtab.h warshall.h system.h types.h \
+ vcg.h vcg_defaults.h print_graph.h


 pkgdata_DATA = bison.simple bison.hairy

 EXTRA_DIST = $(pkgdata_DATA) build.com bison.cld vmshlp.mar
+subdir = src
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
-CONFIG_HEADER = ../config.h
-CONFIG_CLEAN_FILES = 
-PROGRAMS =  $(bin_PROGRAMS)
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+bin_PROGRAMS = bison$(EXEEXT)
+PROGRAMS = $(bin_PROGRAMS)

+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$U.$(OBJEXT) \
+	reader$U.$(OBJEXT) reduce$U.$(OBJEXT) symtab$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
+bison_LDFLAGS =
+DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
-ANSI2KNR = ../lib/ansi2knr
-bison_OBJECTS =  LR0$U.o closure$U.o complain$U.o conflicts$U.o \
-derives$U.o files$U.o getargs$U.o gram$U.o lalr$U.o lex$U.o main$U.o \
-nullable$U.o output$U.o print$U.o reader$U.o reduce$U.o symtab$U.o \
-warshall$U.o vcg$U.o print_graph$U.o
-bison_LDADD = $(LDADD)
-bison_DEPENDENCIES =  ../lib/libbison.a
-bison_LDFLAGS = 
-CFLAGS = @CFLAGS@
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+depcomp = $(SHELL) $(top_srcdir)/config/depcomp
+@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/LR0$U.Po $(DEPDIR)/closure$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/complain$U.Po $(DEPDIR)/conflicts$U.Po \
+@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)/nullable$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 \
+@AMDEP_TRUE@	$(DEPDIR)/vcg$U.Po $(DEPDIR)/vmsgetargs$U.Po \
+@AMDEP_TRUE@	$(DEPDIR)/warshall$U.Po
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-DATA =  $(pkgdata_DATA)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+CFLAGS = @CFLAGS@
+DIST_SOURCES = $(bison_SOURCES) $(EXTRA_bison_SOURCES)
+DATA = $(pkgdata_DATA)

-HEADERS =  $(noinst_HEADERS)
+HEADERS = $(noinst_HEADERS)

-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = tar
-GZIP_ENV = --best
-DEP_FILES =  .deps/LR0.P .deps/closure.P .deps/complain.P \
-.deps/conflicts.P .deps/derives.P .deps/files.P .deps/getargs.P \
-.deps/gram.P .deps/lalr.P .deps/lex.P .deps/main.P .deps/nullable.P \
-.deps/output.P .deps/print.P .deps/print_graph.P .deps/reader.P \
-.deps/reduce.P .deps/symtab.P .deps/vcg.P .deps/vmsgetargs.P \
-.deps/warshall.P
+DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in
 SOURCES = $(bison_SOURCES) $(EXTRA_bison_SOURCES)
-OBJECTS = $(bison_OBJECTS)

-all: all-redirect
+all: all-am
+
 .SUFFIXES:
-.SUFFIXES: .S .c .o .s
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-mostlyclean-binPROGRAMS:
-
-clean-binPROGRAMS:
-	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
-
-distclean-binPROGRAMS:
-
-maintainer-clean-binPROGRAMS:
-
+.SUFFIXES: .c .o .obj
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  src/Makefile
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	cd $(top_builddir) && \
+	  CONFIG_HEADERS= CONFIG_LINKS= \
+	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    echo "  $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
-	     $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  if test -f $$p \
+	  ; then \
+	    f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f"; \
+	   $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f; \
 	  else :; fi; \
 	done

 uninstall-binPROGRAMS:
 	@$(NORMAL_UNINSTALL)
-	list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
+	  rm -f $(DESTDIR)$(bindir)/$$f; \
 	done

-.s.o:
-	$(COMPILE) -c $<
-
-.S.o:
-	$(COMPILE) -c $<
+clean-binPROGRAMS:
+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+bison$(EXEEXT): $(bison_OBJECTS) $(bison_DEPENDENCIES) 
+	@rm -f bison$(EXEEXT)
+	$(LINK) $(bison_LDFLAGS) $(bison_OBJECTS) $(bison_LDADD) $(LIBS)

 mostlyclean-compile:
-	-rm -f *.o core *.core
-
-clean-compile:
+	-rm -f *.$(OBJEXT) core *.core

 distclean-compile:
 	-rm -f *.tab.c

-maintainer-clean-compile:
-../lib/ansi2knr: ../lib/ansi2knr.o
+ANSI2KNR = ../lib/ansi2knr
+../lib/ansi2knr:
 	cd ../lib && $(MAKE) $(AM_MAKEFLAGS) ansi2knr

-../lib/ansi2knr.o:
-	cd ../lib && $(MAKE) $(AM_MAKEFLAGS) ansi2knr.o
-
-
 mostlyclean-kr:
 	-rm -f *_.c

-clean-kr:
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/LR0$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/closure$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/complain$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/conflicts$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/derives$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/files$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getargs$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/gram$U.Po@am__quote@
+@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)/nullable$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@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/reader$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/reduce$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/symtab$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/vcg$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/vmsgetargs$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/warshall$U.Po@am__quote@

-distclean-kr:
+distclean-depend:
+	-rm -rf $(DEPDIR)

-maintainer-clean-kr:
+.c.o:
+@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$<

-bison: $(bison_OBJECTS) $(bison_DEPENDENCIES)
-	@rm -f bison
-	$(LINK) $(bison_LDFLAGS) $(bison_OBJECTS) $(bison_LDADD) $(LIBS)
+.c.obj:
+@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(COMPILE) -c `cygpath -w $<`
+CCDEPMODE = @CCDEPMODE@
 LR0_.c: LR0.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/LR0.c; then echo $(srcdir)/LR0.c; else echo LR0.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > LR0_.c
-alloca_.c: alloca.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/alloca.c; then echo $(srcdir)/alloca.c; else echo alloca.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > alloca_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/LR0.c; then echo $(srcdir)/LR0.c; else echo LR0.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > LR0_.c || rm -f LR0_.c
 closure_.c: closure.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/closure.c; then echo $(srcdir)/closure.c; else echo closure.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > closure_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/closure.c; then echo $(srcdir)/closure.c; else echo closure.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > closure_.c || rm -f closure_.c
 complain_.c: complain.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/complain.c; then echo $(srcdir)/complain.c; else echo complain.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > complain_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/complain.c; then echo $(srcdir)/complain.c; else echo complain.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > complain_.c || rm -f complain_.c
 conflicts_.c: conflicts.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/conflicts.c; then echo $(srcdir)/conflicts.c; else echo conflicts.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > conflicts_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/conflicts.c; then echo $(srcdir)/conflicts.c; else echo conflicts.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > conflicts_.c || rm -f conflicts_.c
 derives_.c: derives.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/derives.c; then echo $(srcdir)/derives.c; else echo derives.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > derives_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/derives.c; then echo $(srcdir)/derives.c; else echo derives.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > derives_.c || rm -f derives_.c
 files_.c: files.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/files.c; then echo $(srcdir)/files.c; else echo files.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > files_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/files.c; then echo $(srcdir)/files.c; else echo files.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > files_.c || rm -f files_.c
 getargs_.c: getargs.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/getargs.c; then echo $(srcdir)/getargs.c; else echo getargs.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > getargs_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/getargs.c; then echo $(srcdir)/getargs.c; else echo getargs.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > getargs_.c || rm -f getargs_.c
 gram_.c: gram.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/gram.c; then echo $(srcdir)/gram.c; else echo gram.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > gram_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/gram.c; then echo $(srcdir)/gram.c; else echo gram.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > gram_.c || rm -f gram_.c
 lalr_.c: lalr.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/lalr.c; then echo $(srcdir)/lalr.c; else echo lalr.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > lalr_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/lalr.c; then echo $(srcdir)/lalr.c; else echo lalr.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > lalr_.c || rm -f lalr_.c
 lex_.c: lex.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(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
+	$(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) $(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
-memchr_.c: memchr.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/memchr.c; then echo $(srcdir)/memchr.c; else echo memchr.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > memchr_.c
+	$(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
 nullable_.c: nullable.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(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
+	$(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
 output_.c: output.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(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
+	$(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)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/print.c; then echo $(srcdir)/print.c; else echo print.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > print_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/print.c; then echo $(srcdir)/print.c; else echo print.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > print_.c || rm -f print_.c
 print_graph_.c: print_graph.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/print_graph.c; then echo $(srcdir)/print_graph.c; else echo print_graph.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > print_graph_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/print_graph.c; then echo $(srcdir)/print_graph.c; else echo print_graph.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > print_graph_.c || rm -f print_graph_.c
 reader_.c: reader.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/reader.c; then echo $(srcdir)/reader.c; else echo reader.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > reader_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/reader.c; then echo $(srcdir)/reader.c; else echo reader.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > reader_.c || rm -f reader_.c
 reduce_.c: reduce.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/reduce.c; then echo $(srcdir)/reduce.c; else echo reduce.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > reduce_.c
-stpcpy_.c: stpcpy.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/stpcpy.c; then echo $(srcdir)/stpcpy.c; else echo stpcpy.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > stpcpy_.c
-strndup_.c: strndup.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/strndup.c; then echo $(srcdir)/strndup.c; else echo strndup.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > strndup_.c
-strnlen_.c: strnlen.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/strnlen.c; then echo $(srcdir)/strnlen.c; else echo strnlen.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > strnlen_.c
-strspn_.c: strspn.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/strspn.c; then echo $(srcdir)/strspn.c; else echo strspn.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > strspn_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/reduce.c; then echo $(srcdir)/reduce.c; else echo reduce.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > reduce_.c || rm -f reduce_.c
 symtab_.c: symtab.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/symtab.c; then echo $(srcdir)/symtab.c; else echo symtab.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > symtab_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/symtab.c; then echo $(srcdir)/symtab.c; else echo symtab.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > symtab_.c || rm -f symtab_.c
 vcg_.c: vcg.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/vcg.c; then echo $(srcdir)/vcg.c; else echo vcg.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > vcg_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/vcg.c; then echo $(srcdir)/vcg.c; else echo vcg.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > vcg_.c || rm -f vcg_.c
 vmsgetargs_.c: vmsgetargs.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/vmsgetargs.c; then echo $(srcdir)/vmsgetargs.c; else echo vmsgetargs.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > vmsgetargs_.c
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/vmsgetargs.c; then echo $(srcdir)/vmsgetargs.c; else echo vmsgetargs.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > vmsgetargs_.c || rm -f vmsgetargs_.c
 warshall_.c: warshall.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/warshall.c; then echo $(srcdir)/warshall.c; else echo warshall.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > warshall_.c
-LR0_.o alloca_.o closure_.o complain_.o conflicts_.o derives_.o \
-files_.o getargs_.o gram_.o lalr_.o lex_.o main_.o memchr_.o \
-nullable_.o output_.o print_.o print_graph_.o reader_.o reduce_.o \
-stpcpy_.o strndup_.o strnlen_.o strspn_.o symtab_.o vcg_.o \
-vmsgetargs_.o warshall_.o : $(ANSI2KNR)
-
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/warshall.c; then echo $(srcdir)/warshall.c; else echo warshall.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > warshall_.c || rm -f warshall_.c
+LR0_.$(OBJEXT) closure_.$(OBJEXT) complain_.$(OBJEXT) \
+conflicts_.$(OBJEXT) derives_.$(OBJEXT) files_.$(OBJEXT) \
+getargs_.$(OBJEXT) gram_.$(OBJEXT) lalr_.$(OBJEXT) lex_.$(OBJEXT) \
+main_.$(OBJEXT) nullable_.$(OBJEXT) output_.$(OBJEXT) print_.$(OBJEXT) \
+print_graph_.$(OBJEXT) reader_.$(OBJEXT) reduce_.$(OBJEXT) \
+symtab_.$(OBJEXT) vcg_.$(OBJEXT) vmsgetargs_.$(OBJEXT) \
+warshall_.$(OBJEXT) : $(ANSI2KNR)
+uninstall-info-am:
 install-pkgdataDATA: $(pkgdata_DATA)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
 	@list='$(pkgdata_DATA)'; for p in $$list; do \
-	  if test -f $(srcdir)/$$p; then \
-	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgdatadir)/$$p"; \
-	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgdatadir)/$$p; \
-	  else if test -f $$p; then \
-	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(pkgdatadir)/$$p"; \
-	    $(INSTALL_DATA) $$p $(DESTDIR)$(pkgdatadir)/$$p; \
-	  fi; fi; \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f"; \
+	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f; \
 	done

 uninstall-pkgdataDATA:
 	@$(NORMAL_UNINSTALL)
-	list='$(pkgdata_DATA)'; for p in $$list; do \
-	  rm -f $(DESTDIR)$(pkgdatadir)/$$p; \
+	@list='$(pkgdata_DATA)'; for p in $$list; do \
+	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  echo " rm -f $(DESTDIR)$(pkgdatadir)/$$f"; \
+	  rm -f $(DESTDIR)$(pkgdatadir)/$$f; \
 	done

 tags: TAGS

-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
+	mkid -fID $$unique $(LISP)

-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
+	list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
+	  || etags $(ETAGS_ARGS) $$tags  $$unique $(LISP)

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

 distclean-tags:
-	-rm -f TAGS ID
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH

-maintainer-clean-tags:
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)

-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = src
+top_distdir = ..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)

 distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/Makefile
 	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    $(mkinstalldirs) "$(distdir)/$$dir"; \
+	  fi; \
 	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
+	    cp -pR $$d/$$file $(distdir) \
+	    || exit 1; \
 	  else \
 	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
 	  fi; \
 	done
-
-DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
-
-include $(DEP_FILES)
-
-mostlyclean-depend:
-
-clean-depend:
-
-distclean-depend:
-	-rm -rf .deps
-
-maintainer-clean-depend:
-
-%.o: %.c
-	@echo '$(COMPILE) -c $<'; \
-	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-	@-cp .deps/$(*F).pp .deps/$(*F).P; \
-	tr ' ' '\012' < .deps/$(*F).pp \
-	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-	    >> .deps/$(*F).P; \
-	rm .deps/$(*F).pp
-
-%.lo: %.c
-	@echo '$(LTCOMPILE) -c $<'; \
-	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
-	  < .deps/$(*F).pp > .deps/$(*F).P; \
-	tr ' ' '\012' < .deps/$(*F).pp \
-	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-	    >> .deps/$(*F).P; \
-	rm -f .deps/$(*F).pp
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
 check-am: all-am
 check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am: install-binPROGRAMS
-install-exec: install-exec-am
+all-am: Makefile $(PROGRAMS) $(DATA) $(HEADERS)

-install-data-am: install-pkgdataDATA
+installdirs:
+	$(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(pkgdatadir)
+
+install: install-am
+install-exec: install-exec-am
 install-data: install-data-am
+uninstall: uninstall-am

 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am: uninstall-binPROGRAMS uninstall-pkgdataDATA
-uninstall: uninstall-am
-all-am: Makefile $(PROGRAMS) $(DATA) $(HEADERS)
-all-redirect: all-am
+
+installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-	$(mkinstalldirs)  $(DESTDIR)$(bindir) $(DESTDIR)$(pkgdatadir)
-
-
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:

 clean-generic:

 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*

 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-binPROGRAMS mostlyclean-compile \
-		mostlyclean-kr mostlyclean-tags mostlyclean-depend \
-		mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-binPROGRAMS clean-compile clean-kr clean-tags \
-		clean-depend clean-generic mostlyclean-am
-
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-am

-distclean-am:  distclean-binPROGRAMS distclean-compile distclean-kr \
-		distclean-tags distclean-depend distclean-generic \
-		clean-am
+clean-am: clean-binPROGRAMS clean-generic mostlyclean-am

 distclean: distclean-am

-maintainer-clean-am:  maintainer-clean-binPROGRAMS \
-		maintainer-clean-compile maintainer-clean-kr \
-		maintainer-clean-tags maintainer-clean-depend \
-		maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+distclean-am: clean-am distclean-compile distclean-depend \
+	distclean-generic distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-pkgdataDATA
+
+install-exec-am: install-binPROGRAMS
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:

 maintainer-clean: maintainer-clean-am

-.PHONY: mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \
-maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \
-mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile mostlyclean-kr distclean-kr clean-kr \
-maintainer-clean-kr uninstall-pkgdataDATA install-pkgdataDATA tags \
-mostlyclean-tags distclean-tags clean-tags maintainer-clean-tags \
-distdir mostlyclean-depend distclean-depend clean-depend \
-maintainer-clean-depend info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
+maintainer-clean-am: distclean-am maintainer-clean-generic

+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic mostlyclean-kr
+
+uninstall-am: uninstall-binPROGRAMS uninstall-info-am \
+	uninstall-pkgdataDATA
+
+.PHONY: GTAGS all all-am check check-am clean clean-binPROGRAMS \
+	clean-generic distclean distclean-compile distclean-depend \
+	distclean-generic distclean-tags distdir dvi dvi-am info \
+	info-am install install-am install-binPROGRAMS install-data \
+	install-data-am install-exec install-exec-am install-info \
+	install-info-am install-man install-pkgdataDATA install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-kr tags uninstall uninstall-am \
+	uninstall-binPROGRAMS uninstall-info-am uninstall-pkgdataDATA

 # 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.
@@ -343,21 +343,24 @@ yyparse (YYPARSE_PARAM_ARG)
     so that they stay on the same level as the state stack.
     The wasted elements are never initialized.  */

-  yyssp = yyss - 1;
+  yyssp = yyss;
  yyvsp = yyvs;
 #if YYLSP_NEEDED
  yylsp = yyls;
 #endif
-
+  goto yysetstate;

 /*------------------------------------------------------------.
 | 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 = yystate;
+  yyssp++;
+  
+ yysetstate:
+  *yyssp = yystate;

  if (yyssp >= yyss + yystacksize - 1)
    {
@@ -19,7 +19,6 @@
   02111-1307, USA.  */

 #include "system.h"
-#include "xalloc.h"
 #include "gram.h"
 #include "closure.h"
 #include "derives.h"
@@ -19,14 +19,10 @@
 /* Based on error.c and error.h,
   written by David MacKenzie <[email protected]>.  */

-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <stdio.h>
+#include "system.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
@@ -23,7 +23,7 @@
 extern "C" {
 #endif

-#if defined (__STDC__) && __STDC__
+#ifdef __STDC__

 /* Informative messages, but we proceed. */

@@ -20,7 +20,6 @@

 #include "system.h"
 #include "getargs.h"
-#include "xalloc.h"
 #include "files.h"
 #include "gram.h"
 #include "state.h"
@@ -30,12 +29,12 @@
 #include "LR0.h"

 int any_conflicts = 0;
-errs **err_table;
+errs **err_table = NULL;
 int expected_conflicts;
-static char *conflicts;
+static char *conflicts = NULL;

-static unsigned *shiftset;
-static unsigned *lookaheadset;
+static unsigned *shiftset = NULL;
+static unsigned *lookaheadset = NULL;
 static int src_total;
 static int rrc_total;
 static int src_count;
@@ -264,7 +263,7 @@ set_conflicts (int state)
 }

 void
-initialize_conflicts (void)
+solve_conflicts (void)
 {
  int i;

@@ -458,7 +457,7 @@ conflict_report (int src_num, int rrc_num)
 `---------------------------------------------*/

 void
-print_conflicts (void)
+print_conflicts (FILE *out)
 {
  int i;

@@ -478,9 +477,8 @@ print_conflicts (void)

 	  if (verbose_flag)
 	    {
-	      obstack_fgrow1 (&output_obstack, _("State %d contains"), i);
-	      obstack_sgrow (&output_obstack,
-			     conflict_report (src_count, rrc_count));
+	      fprintf (out, _("State %d contains"), i);
+	      fputs (conflict_report (src_count, rrc_count), out);
 	    }
 	}
    }
@@ -738,7 +736,7 @@ print_reductions (int state)


 void
-finalize_conflicts (void)
+free_conflicts (void)
 {
  XFREE (conflicts);
  XFREE (shiftset);
@@ -22,10 +22,10 @@
 # define CONFLICTS_H_
 # include "state.h"

-void initialize_conflicts PARAMS ((void));
-void print_conflicts PARAMS ((void));
+void solve_conflicts PARAMS ((void));
+void print_conflicts PARAMS ((FILE *out));
 void print_reductions PARAMS ((int));
-void finalize_conflicts PARAMS ((void));
+void free_conflicts PARAMS ((void));

 /* Were there conflicts? */
 extern int any_conflicts;
@@ -25,7 +25,6 @@
   */

 #include "system.h"
-#include "xalloc.h"
 #include "types.h"
 #include "gram.h"
 #include "derives.h"
@@ -22,7 +22,6 @@
 #include "system.h"
 #include "getargs.h"
 #include "files.h"
-#include "xalloc.h"
 #include "gram.h"
 #include "complain.h"

@@ -34,11 +33,13 @@ struct obstack table_obstack;
 struct obstack defines_obstack;
 struct obstack guard_obstack;
 struct obstack output_obstack;
-struct obstack graph_obstack;

 char *spec_outfile = NULL;	/* for -o. */
 char *spec_file_prefix = NULL;	/* for -b. */
 char *spec_name_prefix = NULL;	/* for -p. */
+char *spec_verbose_file = NULL;   /* for --verbose. */
+char *spec_graph_file = NULL;   /* for -g. */
+char *spec_defines_file = NULL; /* for --defines. */

 char *infile = NULL;
 char *attrsfile = NULL;
@@ -96,12 +97,17 @@ compute_header_macro (void)
  int ite;
  char *macro_name;

-  macro_name = XMALLOC (char,
-			strlen (base_name) +
-			strlen (header_extension) + 1);
+  if (spec_defines_file)
+    macro_name = xstrdup (spec_defines_file);
+  else
+    {
+      macro_name = XMALLOC (char,
+			    strlen (base_name) +
+			    strlen (header_extension) + 1);

-  stpcpy (macro_name, base_name);
-  strcat (macro_name, header_extension);
+      stpcpy (macro_name, base_name);
+      strcat (macro_name, header_extension);
+    }

  for (ite = 0; macro_name[ite]; ite++)
    if (macro_name[ite] == '.')
@@ -260,20 +266,10 @@ get_extension_index (const char *filename)
 static void
 compute_exts_from_gf (const char *ext)
 {
-  /* Checks if SRC_EXTENSION is NULL. In the other case, %source_extension
-     was specified in the grammar file.  */
-  if (src_extension == NULL)
-    {
-      src_extension = tr (ext, 'y', 'c');
-      src_extension = tr (src_extension, 'Y', 'C');
-    }
-  /* Checks if HEADER_EXTENSION is NULL. In the other case,
-     %header_extension was specified in the grammar file.  */
-  if (header_extension == NULL)
-    {
-      header_extension = tr (ext, 'y', 'h');
-      header_extension = tr (header_extension, 'Y', 'H');
-    }
+  src_extension = tr (ext, 'y', 'c');
+  src_extension = tr (src_extension, 'Y', 'C');
+  header_extension = tr (ext, 'y', 'h');
+  header_extension = tr (header_extension, 'Y', 'H');
 }

 /* Computes extensions from the given c source file extension. */
@@ -395,6 +391,38 @@ compute_base_names (void)
  }
 }

+/*-------------------------------------------------------.
+| Close the open files, compute the output files names.  |
+`-------------------------------------------------------*/
+
+void
+compute_output_file_names (void)
+{
+  compute_base_names ();
+
+  /* If not yet done. */
+  if (!src_extension)
+    src_extension = ".c";
+  if (!header_extension)
+    header_extension = ".h";
+
+  /* It the defines filename if not given, we create it.  */
+  if (!spec_defines_file)
+    spec_defines_file = stringappend (base_name, header_extension);
+
+  /* It the graph filename if not given, we create it.  */
+  if (!spec_graph_file)
+    spec_graph_file = stringappend (short_base_name, ".vcg");
+
+  spec_verbose_file = stringappend (short_base_name, EXT_OUTPUT);
+
+  attrsfile = stringappend (short_base_name, EXT_STYPE_H);
+#ifndef MSDOS
+  attrsfile = stringappend (attrsfile, header_extension);
+#endif /* MSDOS */
+
+}
+
 /*-----------------------------------------------------------------.
 | Open the input file.  Look for the skeletons.  Find the names of |
 | the output files.  Prepare the obstacks.                         |
@@ -412,46 +440,43 @@ open_files (void)
  obstack_init (&defines_obstack);
  obstack_init (&guard_obstack);
  obstack_init (&output_obstack);
-  obstack_init (&graph_obstack);
 }



-/*-----------------------------------------------------.
-| Close the open files, produce all the output files.  |
-`-----------------------------------------------------*/
+/*-----------------------.
+| Close the open file..  |
+`-----------------------*/
+
+void
+close_files (void)
+{
+  xfclose (finput);
+}
+
+/*---------------------------.
+| Produce the output files.  |
+`---------------------------*/

 void
 output_files (void)
 {
-  xfclose (finput);
-
-  compute_base_names ();
-
-  /* Set default extensions */
-  if (!src_extension)
-    src_extension = ".c";
-  if (!header_extension)
-    header_extension = ".h";
-
-  attrsfile = stringappend (short_base_name, EXT_STYPE_H);
-#ifndef MSDOS
-  stringappend (attrsfile, header_extension);
-#endif /* MSDOS */
-
  /* Output the main file.  */
  if (spec_outfile)
    obstack_save (&table_obstack, spec_outfile);
  else
    obstack_save (&table_obstack, stringappend (base_name, src_extension));
+  obstack_free (&table_obstack, NULL);

  /* Output the header file if wanted. */
  if (defines_flag)
-    defines_obstack_save (stringappend (base_name, header_extension));
+    defines_obstack_save (spec_defines_file);
+  obstack_free (&defines_obstack, NULL);

  /* If we output only the table, dump the actions in ACTFILE. */
  if (no_parser_flag)
    obstack_save (&action_obstack, stringappend (short_base_name, ".act"));
+  obstack_free (&action_obstack, NULL);

  /* If we produced a semantic parser ATTRS_OBSTACK must be dumped
     into its own file, ATTTRSFILE.  */
@@ -460,19 +485,12 @@ output_files (void)
      char *temp_name;

      obstack_save (&attrs_obstack, attrsfile);
+      obstack_free (&attrs_obstack, NULL);
      temp_name = stringappend (short_base_name, EXT_GUARD_C);
 #ifndef MSDOS
      temp_name = stringappend (temp_name, src_extension);
 #endif /* MSDOS */
      obstack_save (&guard_obstack, temp_name);
+      obstack_free (&guard_obstack, NULL);
    }
-
-  if (verbose_flag)
-    /* We used to use just .out if spec_name_prefix (-p) was used, but
-       that conflicts with Posix.  */
-    obstack_save (&output_obstack,
-		  stringappend (short_base_name, EXT_OUTPUT));
-
-  if (graph_flag)
-    obstack_save (&graph_obstack, stringappend (short_base_name, ".vcg"));
 }
@@ -33,10 +33,19 @@ extern char *spec_name_prefix;
 /* File name pfx specified with -b, or 0 if no -b.  */
 extern char *spec_file_prefix;

+/* --verbose. */
+extern char *spec_verbose_file;
+
+/* File name specified for the output VCG graph.  */
+extern char *spec_graph_file;
+
+/* File name specified with --defines.  */
+extern char *spec_defines_file;

 /* Read grammar specifications. */
 extern FILE *finput;

+
 /* Output all the action code; precise form depends on which parser. */
 extern struct obstack action_obstack;

@@ -56,17 +65,13 @@ extern struct obstack guard_obstack;
 /* The verbose output. */
 extern struct obstack output_obstack;

-/* The VCG graph output. */
-extern struct obstack graph_obstack;
-
 extern char *infile;
 extern char *attrsfile;

-extern const char *src_extension;
-extern const char *header_extension;
-
 void open_files PARAMS((void));
+void close_files PARAMS((void));

+void compute_output_file_names PARAMS((void));
 void output_files PARAMS((void));

 FILE *xfopen PARAMS ((const char *name, const char *mode));
@@ -60,11 +60,11 @@ static struct option longopts[] =
  {"token-table",	no_argument,		0, 'k'},

  /* Output. */
-  {"defines",		no_argument,		0, 'd'},
+  {"defines",		optional_argument,     	0, 'd'},
  {"verbose",		no_argument,		0, 'v'},
  {"file-prefix",	required_argument, 	0, 'b'},
  {"output-file",	required_argument, 	0, 'o'},
-  {"graph",		no_argument,		0, 'g'},
+  {"graph",		optional_argument,     	0, 'g'},

  /* Hidden. */
  {"statistics",	no_argument, 	&statistics_flag, 1},
@@ -118,7 +118,9 @@ 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"), stream);
+  -o, --output-file=FILE     leave output to FILE\n\
+  -g, --graph                also produce a VCG graph description of the \
+automaton\n"), stream);
  putc ('\n', stream);

  fputs (_("\
@@ -181,7 +183,9 @@ getargs (int argc, char *argv[])
 	exit (0);

      case 'g':
+	/* Here, the -g and --graph=FILE options are differentiated.  */	
 	graph_flag = 1;
+	spec_graph_file = optarg;
 	break;

      case 'v':
@@ -193,7 +197,9 @@ getargs (int argc, char *argv[])
 	break;

      case 'd':
+	/* Here, the -d and --defines options are differentiated.  */
 	defines_flag = 1;
+	spec_defines_file = optarg;
 	break;

      case 'l':
@@ -31,21 +31,19 @@ int nsyms;
 int ntokens;
 int nvars;

-short *ritem;
-short *rlhs;
-short *rrhs;
-short *rprec;
-short *rprecsym;
-short *sprec;
-short *rassoc;
-short *sassoc;
-short *token_translations;
-short *rline;
+short *ritem = NULL;
+short *rlhs = NULL;
+short *rrhs = NULL;
+short *rprec = NULL;
+short *rprecsym = NULL;
+short *sprec = NULL;
+short *rassoc = NULL;
+short *sassoc = NULL;
+short *token_translations = NULL;
+short *rline = NULL;

 int start_symbol;

-int translations;
-
 int max_user_token_number;

 int semantic_parser;
@@ -107,13 +107,9 @@ typedef enum

 /* token translation table: indexed by a token number as returned by
   the user's yylex routine, it yields the internal token number used
-   by the parser and throughout bison.  If translations is zero, the
-   translation table is not used because the two kinds of token
-   numbers are the same.  (It is noted in reader.c that "Nowadays
-   translations is always set to 1...") */
+   by the parser and throughout bison.  */

 extern short *token_translations;
-extern int translations;
 extern int max_user_token_number;

 /* SEMANTIC_PARSER is nonzero if the input file says to use the hairy
@@ -26,7 +26,6 @@
 #include "system.h"
 #include "types.h"
 #include "LR0.h"
-#include "xalloc.h"
 #include "gram.h"
 #include "complain.h"
 #include "lalr.h"
@@ -24,7 +24,6 @@
 #include "getopt.h"		/* for optarg */
 #include "symtab.h"
 #include "lex.h"
-#include "xalloc.h"
 #include "complain.h"
 #include "gram.h"
 #include "quote.h"
@@ -36,15 +35,24 @@ const char *token_buffer = NULL;
 bucket *symval;
 int numval;

-static int unlexed;		/* these two describe a token to be reread */
-static bucket *unlexed_symval;	/* by the next call to lex */
+/* these two describe a token to be reread */
+static token_t unlexed = tok_undef;
+/* by the next call to lex */
+static bucket *unlexed_symval = NULL;


 void
-init_lex (void)
+lex_init (void)
 {
  obstack_init (&token_obstack);
-  unlexed = -1;
+  unlexed = tok_undef;
+}
+
+
+void
+lex_free (void)
+{
+  obstack_free (&token_obstack, NULL);
 }


@@ -356,12 +364,12 @@ lex (void)
  /* Just to make sure. */
  token_buffer = NULL;

-  if (unlexed >= 0)
+  if (unlexed != tok_undef)
    {
+      token_t res = unlexed;
      symval = unlexed_symval;
-      c = unlexed;
-      unlexed = -1;
-      return c;
+      unlexed = tok_undef;
+      return res;
    }

  c = skip_white_space ();
@@ -417,7 +425,6 @@ lex (void)
    case '\'':
      /* parse the literal token and compute character code in  code  */

-      translations = -1;
      {
 	int code, discode;

@@ -445,7 +452,6 @@ lex (void)
    case '\"':
      /* parse the literal string token and treat as an identifier */

-      translations = -1;
      {
 	int code;		/* ignored here */

@@ -516,7 +522,7 @@ struct percent_table_struct
 {
  const char *name;
  void *set_flag;
-  int retval;
+  token_t retval;
 };

 struct percent_table_struct percent_table[] =
@@ -543,17 +549,16 @@ struct percent_table_struct percent_table[] =
  { "fixed_output_files",&yacc_flag,		tok_noop },	/* -y */
  { "defines",		&defines_flag,		tok_noop },	/* -d */
  { "no_parser",	&no_parser_flag,	tok_noop },	/* -n */
+  { "graph",		&graph_flag,		tok_noop },	/* -g */
 #if 0
  /* For the time being, this is not enabled yet, while it's possible
     though, since we use obstacks.  The only risk is with semantic
     parsers which will output an `include' of an output file: be sure
-     that the naem included is indeed the name of the output file.  */
+     that the name included is indeed the name of the output file.  */
  { "output_file",	&spec_outfile,		tok_setopt },	/* -o */
  { "file_prefix",	&spec_file_prefix,	tok_setopt },	/* -b */
  { "name_prefix",	&spec_name_prefix,	tok_setopt },	/* -p */
 #endif
-  { "header_extension",	NULL,			tok_hdrext},
-  { "source_extension",	NULL,			tok_srcext},
  { "verbose",		&verbose_flag,		tok_noop },	/* -v */
  { "debug",		&debug_flag,		tok_noop },	/* -t */
  { "semantic_parser",	&semantic_parser,	tok_noop },
@@ -565,13 +570,12 @@ struct percent_table_struct percent_table[] =
 /* Parse a token which starts with %.
   Assumes the % has already been read and discarded.  */

-int
+token_t
 parse_percent_token (void)
 {
-  int c;
  struct percent_table_struct *tx;

-  c = getc (finput);
+  int c = getc (finput);

  switch (c)
    {
@@ -634,6 +638,10 @@ parse_percent_token (void)
    case tok_obsolete:
      fatal (_("`%s' is no longer supported"), token_buffer);
      break;
+
+    default:
+      /* Other cases do not apply here. */
+      break;
    }

  return tx->retval;
@@ -24,6 +24,7 @@
 /* Token-type codes. */
 typedef enum token_e
  {
+    tok_undef,	/* Not defined.  Used to initial token_t vars. */
    tok_eof,
    tok_identifier,
    tok_comma,
@@ -47,8 +48,6 @@ typedef enum token_e
    tok_number,
    tok_expect,
    tok_thong,
-    tok_hdrext,
-    tok_srcext,
    tok_noop,
    tok_setopt,
    tok_illegal,
@@ -59,7 +58,8 @@ extern const char *token_buffer;
 extern bucket *symval;
 extern int numval;

-void init_lex PARAMS ((void));
+void lex_init PARAMS ((void));
+void lex_free PARAMS ((void));
 int skip_white_space PARAMS ((void));
 void unlex PARAMS ((int));
 void read_type_name PARAMS ((FILE *fin));
@@ -71,6 +71,6 @@ void read_type_name PARAMS ((FILE *fin));

 token_t lex PARAMS ((void));

-int parse_percent_token PARAMS ((void));
+token_t parse_percent_token PARAMS ((void));

 #endif /* !LEX_H_ */
@@ -34,6 +34,7 @@
 #include "LR0.h"
 #include "conflicts.h"
 #include "print_graph.h"
+#include "symtab.h"

 /* The name this program was run with, for messages.  */
 char *program_name;
@@ -79,7 +80,15 @@ main (int argc, char *argv[])
     lookahead is not enough to disambiguate the parsing.  In file
     conflicts.  Also resolve s/r conflicts based on precedence
     declarations.  */
-  initialize_conflicts ();
+  solve_conflicts ();
+
+  /* Output file names. */
+  compute_output_file_names ();
+
+  /* Stop if there were errors, to avoid trashing previous output
+     files.  */
+  if (complain_message_count)
+    exit (1);

  /* Print information about results, if requested.  */
  print_results ();
@@ -90,12 +99,19 @@ main (int argc, char *argv[])
  /* Output the tables and the parser to ftable.  In file output.  */
  output ();

-  finalize_conflicts ();
+  /* Free the symbol table data structure.  */
+  free_symtab ();
+
+  lex_free ();
+
+  /* Close the input files. */
+  close_files ();
+
+  free_conflicts ();
  free_nullable ();
  free_derives ();

-  if (!complain_message_count)
-    output_files ();
+  output_files ();

  exit (complain_message_count ? 1 : 0);
 }
@@ -26,7 +26,6 @@
 #include "system.h"
 #include "types.h"
 #include "gram.h"
-#include "xalloc.h"
 #include "nullable.h"

 char *nullable = NULL;
@@ -94,7 +94,6 @@
 #include "obstack.h"
 #include "quotearg.h"
 #include "getargs.h"
-#include "xalloc.h"
 #include "files.h"
 #include "gram.h"
 #include "LR0.h"
@@ -110,17 +109,17 @@ extern void berror PARAMS((const char *));

 static int nvectors;
 static int nentries;
-static short **froms;
-static short **tos;
-static short *tally;
-static short *width;
-static short *actrow;
-static short *state_count;
-static short *order;
-static short *base;
-static short *pos;
-static short *table;
-static short *check;
+static short **froms = NULL;
+static short **tos = NULL;
+static short *tally = NULL;
+static short *width = NULL;
+static short *actrow = NULL;
+static short *state_count = NULL;
+static short *order = NULL;
+static short *base = NULL;
+static short *pos = NULL;
+static short *table = NULL;
+static short *check = NULL;
 static int lowzero;
 static int high;

@@ -295,25 +294,19 @@ output_token_translations (void)
 \n\
 /* YYTRANSLATE(YYLEX) -- Bison token number corresponding to YYLEX. */\n");

-  if (translations)
-    {
-      obstack_fgrow2 (&table_obstack,
+  obstack_fgrow2 (&table_obstack,
      "#define YYTRANSLATE(x) ((unsigned)(x) <= %d ? yytranslate[x] : %d)\
 \n\
 \n",
-	       max_user_token_number, nsyms);
+		  max_user_token_number, nsyms);

-      output_short_or_char_table (&table_obstack,
+  output_short_or_char_table (&table_obstack,
 	     "YYTRANSLATE[YYLEX] -- Bison token number corresponding to YYLEX",
-		    ntokens < 127 ? "char" : "short",
-		    "yytranslate", token_translations,
-		    0, 1, max_user_token_number + 1);
-    }
-  else
-    {
-      obstack_sgrow (&table_obstack,
-			   "\n#define YYTRANSLATE(x) (x)\n");
-    }
+			      ntokens < 127 ? "char" : "short",
+			      "yytranslate", token_translations,
+			      0, 1, max_user_token_number + 1);
+
+  XFREE (token_translations);
 }


@@ -1340,15 +1333,6 @@ output (void)
  if (!no_parser_flag)
    obstack_sgrow (&table_obstack, "#include <stdio.h>\n\n");

-  /* Make "const" do nothing if not in ANSI C.  */
-  obstack_sgrow (&table_obstack, "\
-#ifndef __cplusplus\n\
-# ifndef __STDC__\n\
-#  define const\n\
-# endif\n\
-#endif\n\
-\n");
-
  free_itemsets ();
  output_defines ();
  output_token_translations ();
@@ -20,7 +20,6 @@


 #include "system.h"
-#include "xalloc.h"
 #include "files.h"
 #include "gram.h"
 #include "LR0.h"
@@ -35,17 +34,17 @@
 static void
 print_token (int extnum, int token)
 {
-  obstack_fgrow2 (&output_obstack, _(" type %d is %s\n"), extnum, tags[token]);
+  fprintf (out, _(" type %d is %s\n"), extnum, tags[token]);
 }
 #endif


-/*================================\
+/*--------------------------------.
 | Report information on a state.  |
-\================================*/
+`--------------------------------*/

 static void
-print_core (int state)
+print_core (FILE *out, int state)
 {
  int i;
  int k;
@@ -68,30 +67,30 @@ print_core (int state)
 	sp++;

      rule = -(*sp);
-      obstack_fgrow1 (&output_obstack, "    %s  ->  ", tags[rlhs[rule]]);
+      fprintf (out, "    %s  ->  ", tags[rlhs[rule]]);

      for (sp = ritem + rrhs[rule]; sp < sp1; sp++)
 	{
-	  obstack_fgrow1 (&output_obstack, "%s ", tags[*sp]);
+	  fprintf (out, "%s ", tags[*sp]);
 	}

-      obstack_1grow (&output_obstack, '.');
+      fputc ('.', out);

      while (*sp > 0)
 	{
-	  obstack_fgrow1 (&output_obstack, " %s", tags[*sp]);
+	  fprintf (out, " %s", tags[*sp]);
 	  sp++;
 	}

-      obstack_fgrow1 (&output_obstack, _("   (rule %d)"), rule);
-      obstack_1grow (&output_obstack, '\n');
+      fprintf (out, _("   (rule %d)"), rule);
+      fputc ('\n', out);
    }

-  obstack_1grow (&output_obstack, '\n');
+  fputc ('\n', out);
 }

 static void
-print_actions (int state)
+print_actions (FILE *out, int state)
 {
  int i;
  int k;
@@ -109,9 +108,9 @@ print_actions (int state)
  if (!shiftp && !redp)
    {
      if (final_state == state)
-	obstack_sgrow (&output_obstack, _("    $default\taccept\n"));
+	fprintf (out, _("    $default\taccept\n"));
      else
-	obstack_sgrow (&output_obstack, _("    NO ACTIONS\n"));
+	fprintf (out, _("    NO ACTIONS\n"));
      return;
    }

@@ -129,16 +128,16 @@ print_actions (int state)
 	  if (ISVAR (symbol))
 	    break;
 	  if (symbol == 0)	/* I.e. strcmp(tags[symbol],"$")==0 */
-	    obstack_fgrow1 (&output_obstack,
-			    _("    $   \tgo to state %d\n"), state1);
+	    fprintf (out,
+		     _("    $   \tgo to state %d\n"), state1);
 	  else
-	    obstack_fgrow2 (&output_obstack,
-			    _("    %-4s\tshift, and go to state %d\n"),
-			    tags[symbol], state1);
+	    fprintf (out,
+		     _("    %-4s\tshift, and go to state %d\n"),
+		     tags[symbol], state1);
 	}

      if (i > 0)
-	obstack_1grow (&output_obstack, '\n');
+	fputc ('\n', out);
    }
  else
    {
@@ -157,21 +156,20 @@ print_actions (int state)
 	  if (!errp->errs[j])
 	    continue;
 	  symbol = errp->errs[j];
-	  obstack_fgrow1 (&output_obstack, _("    %-4s\terror (nonassociative)\n"),
+	  fprintf (out, _("    %-4s\terror (nonassociative)\n"),
 		   tags[symbol]);
 	}

      if (j > 0)
-	obstack_1grow (&output_obstack, '\n');
+	fputc ('\n', out);
    }

  if (consistent[state] && redp)
    {
      rule = redp->rules[0];
      symbol = rlhs[rule];
-      obstack_fgrow2 (&output_obstack,
-		      _("    $default\treduce using rule %d (%s)\n\n"),
-		      rule, tags[symbol]);
+      fprintf (out, _("    $default\treduce using rule %d (%s)\n\n"),
+	       rule, tags[symbol]);
    }
  else if (redp)
    {
@@ -186,42 +184,41 @@ print_actions (int state)
 	    continue;
 	  state1 = shiftp->shifts[i];
 	  symbol = accessing_symbol[state1];
-	  obstack_fgrow2 (&output_obstack,
-			  _("    %-4s\tgo to state %d\n"),
-			  tags[symbol], state1);
+	  fprintf (out, _("    %-4s\tgo to state %d\n"),
+		   tags[symbol], state1);
 	}

-      obstack_1grow (&output_obstack, '\n');
+      fputc ('\n', out);
    }
 }

 static void
-print_state (int state)
+print_state (FILE *out, int state)
 {
-  obstack_sgrow (&output_obstack, "\n\n");
-  obstack_fgrow1 (&output_obstack, _("state %d"), state);
-  obstack_sgrow (&output_obstack, "\n\n");
-  print_core (state);
-  print_actions (state);
+  fputs ("\n\n", out);
+  fprintf (out, _("state %d"), state);
+  fputs ("\n\n", out);
+  print_core (out, state);
+  print_actions (out, state);
 }

 /*-----------------------------------------.
 | Print information on the whole grammar.  |
 `-----------------------------------------*/

-#define END_TEST(End)						\
-do {								\
-  if (column + strlen(buffer) > (End))				\
-    {								\
-      obstack_fgrow1 (&output_obstack, "%s\n   ", buffer);	\
-      column = 3;						\
-      buffer[0] = 0;						\
-    }								\
+#define END_TEST(End)				\
+do {						\
+  if (column + strlen(buffer) > (End))		\
+    {						\
+      fprintf (out, "%s\n   ", buffer);		\
+      column = 3;				\
+      buffer[0] = 0;				\
+    }						\
 } while (0)


 static void
-print_grammar (void)
+print_grammar (FILE *out)
 {
  int i, j;
  short *rule;
@@ -229,78 +226,46 @@ print_grammar (void)
  int column = 0;

  /* rule # : LHS -> RHS */
-  obstack_1grow (&output_obstack, '\n');
-  obstack_sgrow (&output_obstack, _("Grammar"));
-  obstack_1grow (&output_obstack, '\n');
+  fprintf (out, "\n%s\n", _("Grammar"));
  for (i = 1; i <= nrules; i++)
    /* Don't print rules disabled in reduce_grammar_tables.  */
    if (rlhs[i] >= 0)
      {
-	obstack_fgrow2 (&output_obstack,
-			_("rule %-4d %s ->"), i, tags[rlhs[i]]);
+	fprintf (out, _("rule %-4d %s ->"), i, tags[rlhs[i]]);
 	rule = &ritem[rrhs[i]];
 	if (*rule > 0)
 	  while (*rule > 0)
-	    obstack_fgrow1 (&output_obstack, " %s", tags[*rule++]);
+	    fprintf (out, " %s", tags[*rule++]);
 	else
-	  obstack_sgrow (&output_obstack, _("		/* empty */"));
-	obstack_1grow (&output_obstack, '\n');
+	  fprintf (out, "		/* %s */\n", _("empty"));
      }

  /* TERMINAL (type #) : rule #s terminal is on RHS */
-  obstack_sgrow (&output_obstack, "\n");
-  obstack_sgrow (&output_obstack,
-		 _("Terminals, with rules where they appear"));
-  obstack_sgrow (&output_obstack, "\n\n");
-  obstack_fgrow1 (&output_obstack, "%s (-1)\n", tags[0]);
-  if (translations)
-    {
-      for (i = 0; i <= max_user_token_number; i++)
-	if (token_translations[i] != 2)
-	  {
-	    buffer[0] = 0;
-	    column = strlen (tags[token_translations[i]]);
-	    obstack_sgrow (&output_obstack, tags[token_translations[i]]);
-	    END_TEST (50);
-	    sprintf (buffer, " (%d)", i);
+  fprintf (out, "\n%s\n\n", _("Terminals, with rules where they appear"));
+  fprintf (out, "%s (-1)\n", tags[0]);

-	    for (j = 1; j <= nrules; j++)
-	      for (rule = &ritem[rrhs[j]]; *rule > 0; rule++)
-		if (*rule == token_translations[i])
-		  {
-		    END_TEST (65);
-		    sprintf (buffer + strlen (buffer), " %d", j);
-		    break;
-		  }
-	    obstack_fgrow1 (&output_obstack, "%s\n", buffer);
-	  }
-    }
-  else
-    {
-      for (i = 1; i < ntokens; i++)
-	{
-	  buffer[0] = 0;
-	  column = strlen (tags[i]);
-	  obstack_sgrow (&output_obstack, tags[i]);
-	  END_TEST (50);
-	  sprintf (buffer, " (%d)", i);
+  for (i = 0; i <= max_user_token_number; i++)
+    if (token_translations[i] != 2)
+      {
+	buffer[0] = 0;
+	column = strlen (tags[token_translations[i]]);
+	fputs (tags[token_translations[i]], out);
+	END_TEST (50);
+	sprintf (buffer, " (%d)", i);

-	  for (j = 1; j <= nrules; j++)
-	    for (rule = &ritem[rrhs[j]]; *rule > 0; rule++)
-	      if (*rule == i)
-		{
-		  END_TEST (65);
-		  sprintf (buffer + strlen (buffer), " %d", j);
-		  break;
-		}
-	  obstack_fgrow1 (&output_obstack, "%s\n", buffer);
-	}
-    }
+	for (j = 1; j <= nrules; j++)
+	  for (rule = &ritem[rrhs[j]]; *rule > 0; rule++)
+	    if (*rule == token_translations[i])
+	      {
+		END_TEST (65);
+		sprintf (buffer + strlen (buffer), " %d", j);
+		break;
+	      }
+	fprintf (out, "%s\n", buffer);
+      }

-  obstack_sgrow (&output_obstack, "\n");
-  obstack_sgrow (&output_obstack,
-		 _("Nonterminals, with rules where they appear"));
-  obstack_sgrow (&output_obstack, "\n\n");
+  fprintf (out, "\n%s\n\n",
+	   _("Nonterminals, with rules where they appear"));
  for (i = ntokens; i <= nsyms - 1; i++)
    {
      int left_count = 0, right_count = 0;
@@ -318,7 +283,7 @@ print_grammar (void)
 	}

      buffer[0] = 0;
-      obstack_sgrow (&output_obstack, tags[i]);
+      fputs (tags[i], out);
      column = strlen (tags[i]);
      sprintf (buffer, " (%d)", i);
      END_TEST (0);
@@ -353,22 +318,33 @@ print_grammar (void)
 		  }
 	    }
 	}
-      obstack_fgrow1 (&output_obstack, "%s\n", buffer);
+      fprintf (out, "%s\n", buffer);
    }
 }

 void
 print_results (void)
 {
-  int i;
-
-  if (any_conflicts)
-    print_conflicts ();
-
  if (verbose_flag)
-    print_grammar ();
+    {
+      int i;

-  if (verbose_flag)
-    for (i = 0; i < nstates; i++)
-      print_state (i);
+      /* We used to use just .out if spec_name_prefix (-p) was used, but
+	 that conflicts with Posix.  */
+      FILE *out = xfopen (spec_verbose_file, "w");
+
+      size_t size = obstack_object_size (&output_obstack);
+      fwrite (obstack_finish (&output_obstack), 1, size, out);
+
+      if (any_conflicts)
+	print_conflicts (out);
+
+      print_grammar (out);
+
+      for (i = 0; i < nstates; i++)
+	print_state (out, i);
+
+      xfclose (out);
+    }
+  obstack_free (&output_obstack, NULL);
 }
@@ -19,7 +19,6 @@
   Boston, MA 02111-1307, USA.  */

 #include "system.h"
-#include "xalloc.h"
 #include "files.h"
 #include "gram.h"
 #include "LR0.h"
@@ -35,8 +34,9 @@
 #include "quotearg.h"

 static graph_t graph;
+static FILE *fgraph = NULL;

-static unsigned node_output_size = 0;
+static size_t node_output_size = 0;

 /* Return an unambiguous printable representated, allocated in slot 0,
   for NAME, suitable for C strings.  */
@@ -136,7 +136,7 @@ print_actions (int state, const char *node_name, struct obstack *node_obstack)

 	    if (state > state1)
 	      edge.type = back_edge;
-	    open_edge (&edge, &graph_obstack);
+	    open_edge (&edge, fgraph);
 	    /* The edge source is the current node.  */
 	    edge.sourcename = node_name;
 	    sprintf (buff, "%d", state1);
@@ -145,8 +145,8 @@ print_actions (int state, const char *node_name, struct obstack *node_obstack)
 	    /* FIXME: Be aware that quote uses static memory.  The string
 	       must be output immediately (which is the case here). */
 	    edge.label = tags[symbol] ? quote (tags[symbol]) : NULL;
-	    output_edge (&edge, &graph_obstack);
-	    close_edge (&graph_obstack);
+	    output_edge (&edge, fgraph);
+	    close_edge (fgraph);
 	  }
 	}
    }
@@ -198,14 +198,14 @@ print_actions (int state, const char *node_name, struct obstack *node_obstack)
 	  symbol = accessing_symbol[state1];

 	  new_edge (&edge);
-	  open_edge (&edge, &graph_obstack);
+	  open_edge (&edge, fgraph);
 	  edge.sourcename = node_name;
 	  sprintf (buff, "%d", state1);
 	  edge.targetname = buff;
 	  edge.color = red;
 	  edge.label = tags[symbol] ? quote (tags[symbol]) : NULL;
-	  output_edge (&edge, &graph_obstack);
-	  close_edge (&graph_obstack);
+	  output_edge (&edge, fgraph);
+	  close_edge (fgraph);
 	}
    }
 }
@@ -223,9 +223,6 @@ print_state (int state)
  new_node (&node);	/* Set node attributs default value.  */
  sprintf (name, "%d", state);
  node.title = name;	/* Give a name to the node.  */
-  open_node (&node_obstack);
-  /* Output a VCG formatted attributs list.  */
-  output_node (&node, &node_obstack);
  
  { 
    /* Here we begin to compute the node label. */  
@@ -241,15 +238,17 @@ print_state (int state)
    print_actions (state, node.title, &node_obstack);
    
    obstack_sgrow (&node_obstack, "\"\n");		/* Close Label.  */
-    
-    close_node (&node_obstack);
-  }
-  
-  /* `obstack_cat' NODE_OBSTACK to GRAPH_OBSTACK.  */
-  obstack_grow (&graph_obstack, 
-		obstack_base (&node_obstack), 
-		obstack_object_size (&node_obstack));
-  obstack_finish (&node_obstack);
+  }    
+
+  open_node (fgraph);
+  /* Output a VCG formatted attributs list.  */
+  output_node (&node, fgraph);
+  /* Save the node label.  */
+  fwrite (obstack_base (&node_obstack), 
+	  obstack_object_size (&node_obstack), 1, fgraph);
+  close_node (fgraph);
+
+  obstack_free (&node_obstack, 0);
 }


@@ -257,9 +256,13 @@ void
 print_graph (void)
 {
  int i;
-
+  
  if (!graph_flag)
    return;
+
+  /* Output file.  */
+  fgraph = xfopen (spec_graph_file, "w");
+
  new_graph (&graph);

 #if 0
@@ -268,7 +271,7 @@ print_graph (void)
 #endif

  graph.display_edge_labels = yes;
-  graph.layoutalgorithm = 0;
+  graph.layoutalgorithm = normal;

  graph.port_sharing = no;
  graph.finetuning = yes;
@@ -279,13 +282,14 @@ print_graph (void)
  graph.crossing_weight = median;

  /* Output graph options. */
-  open_graph (&graph_obstack);
-  output_graph (&graph, &graph_obstack);
+  open_graph (fgraph);
+  output_graph (&graph, fgraph);

  for (i = 0; i < nstates; i++)
    /* Output nodes & edges. */
    print_state (i);

  /* Close graph. */
-  close_graph (&graph, &graph_obstack);
+  close_graph (&graph, fgraph);
+  xfclose (fgraph);
 }
@@ -26,7 +26,6 @@
 #include "quote.h"
 #include "getargs.h"
 #include "files.h"
-#include "xalloc.h"
 #include "symtab.h"
 #include "lex.h"
 #include "gram.h"
@@ -462,8 +461,8 @@ copy_definition (void)
 static void
 parse_token_decl (symbol_class what_is, symbol_class what_is_not)
 {
-  token_t token = 0;
-  char *typename = 0;
+  token_t token = tok_undef;
+  char *typename = NULL;

  /* The symbol being defined.  */
  struct bucket *symbol = NULL;
@@ -512,7 +511,6 @@ parse_token_decl (symbol_class what_is, symbol_class what_is_not)
 	      /* symbol and symval combined are only one symbol */
 	      nsyms--;
 	    }
-	  translations = 1;
 	  symbol = NULL;
 	}
      else if (token == tok_identifier)
@@ -537,7 +535,6 @@ parse_token_decl (symbol_class what_is, symbol_class what_is_not)
      else if (symbol && token == tok_number)
 	{
 	  symbol->user_token_number = numval;
-	  translations = 1;
 	}
      else
 	{
@@ -679,7 +676,6 @@ parse_assoc_decl (associativity assoc)
 	  if (prev == tok_identifier)
 	    {
 	      symval->user_token_number = numval;
-	      translations = 1;
 	    }
 	  else
 	    {
@@ -736,9 +732,14 @@ parse_union_decl (void)

  while (c != EOF)
    {
-      obstack_1grow (&attrs_obstack, c);
-      if (defines_flag)
-	obstack_1grow (&defines_obstack, c);
+
+      /* If C contains '/', it is output by copy_comment ().  */
+      if (c != '/')
+	{
+	  obstack_1grow (&attrs_obstack, c);
+	  if (defines_flag)
+	    obstack_1grow (&defines_obstack, c);
+	}

      switch (c)
 	{
@@ -822,7 +823,6 @@ parse_thong_decl (void)
  char *typename = 0;
  int usrtoknum;

-  translations = 1;
  token = lex ();		/* fetch typename or first token */
  if (token == tok_typename)
    {
@@ -874,35 +874,60 @@ parse_thong_decl (void)
  nsyms--;
 }

-/*------------------------------------------.
-| Parse what comes after %header_extension. |
-`------------------------------------------*/

-static void
-parse_header_extension_decl (void)
+/*-----------------------------------------------------------------------------.
+| Parse a double quoted parameter. It was used for %{source,header}_extension. |
+| For the moment, It is not used since extension features have been removed.   |
+`-----------------------------------------------------------------------------*/
+
+#if 0
+
+static const char *
+parse_dquoted_param (const char *from)
 {
  char buff[32];
+  int c;
+  int i;

-  if (header_extension)
-    complain (_("multiple %%header_extension declarations"));
-  fscanf (finput, "%s", buff);
-  header_extension = xstrdup (buff);
+  c = skip_white_space ();
+
+  if (c != '"')
+    {
+      ungetc (c, finput);
+      complain (_("invalid %s declaration"), from);
+      return NULL;
+    }
+
+  c = getc (finput);
+  for (i = 0; (c >= '!') && (c <= '~'); i++)
+    {
+      if (c == '"')
+	break;
+
+      if (c == '\\')
+	{
+	  c = getc (finput);
+	  if ((c < '!') && (c > '~'))
+	    break;
+	}
+
+      buff[i] = c;
+      c = getc (finput);
+    }
+  buff[i] = '\0';
+
+  if (c != '"')
+    {
+      ungetc (c, finput);
+      complain (_("invalid %s declaration"), from);
+      return NULL;
+    }
+
+  return xstrdup (buff);
 }

-/*------------------------------------------.
-| Parse what comes after %source_extension. |
-`------------------------------------------*/
+#endif

-static void
-parse_source_extension_decl (void)
-{
-  char buff[32];
-
-  if (src_extension)
-    complain (_("multiple %%source_extension declarations"));
-  fscanf (finput, "%s", buff);
-  src_extension = xstrdup (buff);
-}

 /*----------------------------------------------------------------.
 | Read from finput until `%%' is seen.  Discard the `%%'.  Handle |
@@ -973,14 +998,6 @@ read_declarations (void)
 	      parse_assoc_decl (non_assoc);
 	      break;

-	    case tok_hdrext:
-	      parse_header_extension_decl ();
-	      break;
-
-	    case tok_srcext:
-	      parse_source_extension_decl ();
-	      break;
-
 	    case tok_noop:
 	      break;

@@ -1635,9 +1652,10 @@ output_token_defines (struct obstack *oout)
 	continue;

      obstack_fgrow2 (oout, "# define\t%s\t%d\n",
-		      symbol,
-		      (translations ? bp->user_token_number : bp->value));
+		      symbol, bp->user_token_number);
      if (semantic_parser)
+	/* FIXME: This is certainly dead wrong, and should be just as
+	   above. --akim.  */
 	obstack_fgrow2 (oout, "# define\tT%s\t%d\n", symbol, bp->value);
    }

@@ -1654,9 +1672,9 @@ output_token_defines (struct obstack *oout)
 static void
 packsymbols (void)
 {
-  bucket *bp;
+  bucket *bp = NULL;
  int tokno = 1;
-  int i;
+  int i, j;
  int last_user_token_number;
  static char DOLLAR[] = "$";

@@ -1722,7 +1740,7 @@ packsymbols (void)

      if (bp->class == token_sym)
 	{
-	  if (translations && !(bp->user_token_number))
+	  if (!bp->user_token_number)
 	    bp->user_token_number = ++last_user_token_number;
 	  if (bp->user_token_number > max_user_token_number)
 	    max_user_token_number = bp->user_token_number;
@@ -1732,33 +1750,27 @@ packsymbols (void)
      user_toknums[bp->value] = bp->user_token_number;
      sprec[bp->value] = bp->prec;
      sassoc[bp->value] = bp->assoc;
-
    }

-  if (translations)
+  token_translations = XCALLOC (short, max_user_token_number + 1);
+
+  /* initialize all entries for literal tokens to 2, the internal
+     token number for $undefined., which represents all invalid
+     inputs.  */
+  for (j = 0; j <= max_user_token_number; j++)
+    token_translations[j] = 2;
+
+  for (bp = firstsymbol; bp; bp = bp->next)
    {
-      int j;
-
-      token_translations = XCALLOC (short, max_user_token_number + 1);
-
-      /* initialize all entries for literal tokens to 2, the internal
-         token number for $undefined., which represents all invalid
-         inputs.  */
-      for (j = 0; j <= max_user_token_number; j++)
-	token_translations[j] = 2;
-
-      for (bp = firstsymbol; bp; bp = bp->next)
-	{
-	  if (bp->value >= ntokens)
-	    continue;		/* non-terminal */
-	  if (bp->user_token_number == SALIAS)
-	    continue;
-	  if (token_translations[bp->user_token_number] != 2)
-	    complain (_("tokens %s and %s both assigned number %d"),
-		      tags[token_translations[bp->user_token_number]],
-		      bp->tag, bp->user_token_number);
-	  token_translations[bp->user_token_number] = bp->value;
-	}
+      if (bp->value >= ntokens)
+	continue;		/* non-terminal */
+      if (bp->user_token_number == SALIAS)
+	continue;
+      if (token_translations[bp->user_token_number] != 2)
+	complain (_("tokens %s and %s both assigned number %d"),
+		  tags[token_translations[bp->user_token_number]],
+		  bp->tag, bp->user_token_number);
+      token_translations[bp->user_token_number] = bp->value;
    }

  error_token_number = errtoken->value;
@@ -1884,15 +1896,6 @@ reader (void)
  start_flag = 0;
  startval = NULL;		/* start symbol not specified yet. */

-#if 0
-  /* initially assume token number translation not needed.  */
-  translations = 0;
-#endif
-  /* Nowadays translations is always set to 1, since we give `error' a
-     user-token-number to satisfy the Posix demand for YYERRCODE==256.
-   */
-  translations = 1;
-
  nsyms = 1;
  nvars = 0;
  nrules = 0;
@@ -1908,7 +1911,7 @@ reader (void)

  grammar = NULL;

-  init_lex ();
+  lex_init ();
  lineno = 1;

  /* Initialize the symbol table.  */
@@ -1955,9 +1958,6 @@ reader (void)
  packsymbols ();
  /* Convert the grammar into the format described in gram.h.  */
  packgram ();
-  /* Free the symbol table data structure since symbols are now all
-     referred to by symbol number.  */
-  free_symtab ();
 }


@@ -29,7 +29,6 @@
 #include "getargs.h"
 #include "files.h"
 #include "gram.h"
-#include "xalloc.h"
 #include "complain.h"
 #include "reduce.h"
 #include "reader.h"
@@ -117,7 +116,7 @@ static void
 useless_nonterminals (void)
 {
  BSet Np, Ns;
-  int i, n;
+  int i;

  /* N is set as built.  Np is set being built this iteration. P is
     set of all productions which have a RHS all in N.  */
@@ -140,7 +139,6 @@ useless_nonterminals (void)
     saved to be used when finding useful productions: only
     productions in this set will appear in the final grammar.  */

-  n = 0;
  while (1)
    {
      for (i = WORDSIZE (nvars) - 1; i >= 0; i--)
@@ -171,7 +169,7 @@ static void
 inaccessable_symbols (void)
 {
  BSet Vp, Vs, Pp;
-  int i, n;
+  int i;
  short t;
  rule r;

@@ -207,7 +205,6 @@ inaccessable_symbols (void)

  SETBIT (V, start_symbol);

-  n = 0;
  while (1)
    {
      for (i = WORDSIZE (nsyms) - 1; i >= 0; i--)
@@ -20,7 +20,6 @@


 #include "system.h"
-#include "xalloc.h"
 #include "symtab.h"
 #include "gram.h"

@@ -143,6 +142,7 @@ free_symtab (void)
 	  if (bp->type_name)
 	    XFREE (bp->type_name);
 #endif
+	  XFREE (bp->tag);
 	  XFREE (bp);
 	  bp = bptmp;
 	}
@@ -73,7 +73,7 @@ extern int errno;
 # define PARAMS(p) ()
 #endif

-
+# include "xalloc.h"

 /*---------------------.
 | Missing prototypes.  |
@@ -143,8 +143,6 @@ size_t strnlen PARAMS ((const char *s, size_t maxlen));
 # define LOCALEDIR "/usr/local/share/locale"
 #endif

-#endif  /* BISON_SYSTEM_H */
-

 /*-----------.
 | Booleans.  |
@@ -161,9 +159,9 @@ typedef int bool;
 | Obstacks.  |
 `-----------*/

-#define obstack_chunk_alloc xmalloc
-#define obstack_chunk_free  free
-#include "obstack.h"
+# define obstack_chunk_alloc xmalloc
+# define obstack_chunk_free  free
+# include "obstack.h"

 #define obstack_sgrow(Obs, Str) \
  obstack_grow (Obs, Str, strlen (Str))
@@ -264,3 +262,15 @@ do {								\
 #  define BISON_HAIRY "c:/usr/local/lib/bison.hairy"
 # endif
 #endif
+
+
+/*---------------------------------.
+| Debugging the memory allocator.  |
+`---------------------------------*/
+
+# if WITH_DMALLOC
+#  define DMALLOC_FUNC_CHECK
+#  include <dmalloc.h>
+# endif /* WITH_DMALLOC */
+
+#endif  /* BISON_SYSTEM_H */
@@ -21,8 +21,6 @@
 #include "system.h"
 #include "vcg.h"
 #include "vcg_defaults.h"
-#include "xalloc.h"
-#include "complain.h"

 /* Initialize a graph with the default values. */
 void
@@ -51,6 +49,9 @@ new_graph (graph_t *g)
  g->textmode = G_TEXTMODE;
  g->shape = G_SHAPE;

+  g->vertical_order = G_VERTICAL_ORDER;
+  g->horizontal_order = G_HORIZONTAL_ORDER;
+
  g->xmax = G_XMAX; /* Not output. */
  g->ymax = G_YMAX; /* Not output. */

@@ -231,8 +232,7 @@ get_color_str (enum color_e c)
    case orchid:	return "orchid";
    case black:		return "black";
    default:
-      complain (_("vcg graph: no such color."));
-      return get_color_str(G_COLOR);
+      assert (!"Not a default color.");
    }
  return NULL;
 }
@@ -246,8 +246,7 @@ get_textmode_str (enum textmode_e t)
    case left_justify:	return "left_justify";
    case right_justify:	return "right_justify";
    default:
-      complain (_("vcg graph: no such text mode"));
-      return get_textmode_str(G_TEXTMODE);
+      assert (!"Not a text mode.");
    }
  return NULL;
 }
@@ -262,8 +261,7 @@ get_shape_str (enum shape_e s)
    case ellipse:	return "ellipse";
    case triangle:	return "triangle";
    default:
-      complain (_("vcg graph: no such shape"));
-      return get_shape_str(G_SHAPE);
+      assert (!"Not a shape.");
    }
  return NULL;
 }
@@ -288,21 +286,20 @@ get_layoutalgorithm_str (enum layoutalgorithm_e l)
    case dfs:		return "dfs";
    case tree:		return "tree";
    default:
-      return "normal";
+      assert (!"Not a layout algorithm.");
    }
  return NULL;
 }

 static const char *
-get_decision_str (enum decision_e d, enum decision_e defaults)
+get_decision_str (enum decision_e d)
 {
  switch (d)
    {
    case no:	return "no";
    case yes:	return "yes";
    default:
-      complain (_("vcg graph: no such decision"));
-      return get_decision_str(defaults, 0);
+      assert (!"Either yes nor no.");
    }
  return NULL;
 }
@@ -317,8 +314,7 @@ get_orientation_str (enum orientation_e o)
    case left_to_right: return "left_to_right";
    case right_to_left: return "right_to_left";
    default:
-      complain (_("vcg graph: no such an orientation"));
-      return get_orientation_str(G_ORIENTATION);
+      assert (!"Not an orientation.");
    }
  return NULL;
 }
@@ -332,8 +328,7 @@ get_node_alignement_str (enum alignement_e a)
    case top:		return "top";
    case bottom:	return "bottom";
    default:
-      complain (_("vcg graph: no such an alignement"));
-      return get_node_alignement_str(G_NODE_ALIGNEMENT);
+      assert (!"Not an alignement.");
    }
  return NULL;
 }
@@ -346,8 +341,7 @@ get_arrow_mode_str (enum arrow_mode_e a)
    case fixed:		return "fixed";
    case free_a:	return "free";
    default:
-      complain (_("vcg graph: no such an arrow mode"));
-      return get_arrow_mode_str(G_ARROW_MODE);
+      assert (!"Not an arrow mode.");
    }
  return NULL;
 }
@@ -362,8 +356,7 @@ get_crossing_type_str (enum crossing_type_e c)
    case barymedian:	return "barymedian";
    case medianbary:	return "medianbary";
    default:
-      complain (_("vcg graph: no such crossing_type"));
-      return get_crossing_type_str(G_CROSSING_WEIGHT);
+      assert (!"Not a crossing type.");
    }
  return NULL;
 }
@@ -379,8 +372,7 @@ get_view_str (enum view_e v)
    case fcfish:	return "fcfish";
    case fpfish:	return "fpfish";
    default:
-      complain (_("vcg graph: no such view"));
-      return get_view_str(G_VIEW);
+      assert (!"Not a view.");
    }
  return NULL;
 }
@@ -395,8 +387,7 @@ get_linestyle_str (enum linestyle_e l)
    case dotted:	return "dotted";
    case invisible:	return "invisible";
    default:
-      complain (_("vcg graph: no such linestyle"));
-      return get_linestyle_str(E_LINESTYLE);
+      assert (!"Not a line style.");
    }
  return NULL;
 }
@@ -410,8 +401,7 @@ get_arrowstyle_str (enum arrowstyle_e a)
    case line:	return "line";
    case none:	return "none";
    default:
-      complain (_("vcg graph: no such an arrowstyle"));
-      return get_arrowstyle_str(E_ARROWSTYLE);
+      assert (!"Not an arrow style.");
    }
  return NULL;
 }
@@ -435,402 +425,461 @@ add_edge (graph_t *graph, edge_t *edge)
  graph->edge_list = edge;
 }

+void
+add_classname (graph_t *g, int val, const char *name)
+{
+  struct classname_s *classname;
+  
+  classname = XMALLOC (struct classname_s, 1);
+  classname->no = val;
+  classname->name = name;
+  classname->next = g->classname;
+  g->classname = classname;
+}
+
+void
+add_infoname (graph_t *g, int integer, const char *string)
+{
+  struct infoname_s *infoname;
+  
+  infoname = XMALLOC (struct infoname_s, 1);
+  infoname->integer = integer;
+  infoname->string = string;
+  infoname->next = g->infoname;
+  g->infoname = infoname;
+}
+
+/* Build a colorentry struct and add it to the list.  */
+void
+add_colorentry (graph_t *g, int color_idx, int red_cp, 
+		int green_cp, int blue_cp)
+{
+  struct colorentry_s *ce;
+  
+  ce = XMALLOC (struct colorentry_s, 1);
+  ce->color_index = color_idx;
+  ce->red_cp = red_cp;
+  ce->green_cp = green_cp;
+  ce->blue_cp = blue_cp;
+  ce->next = g->colorentry;
+  g->colorentry = ce;
+}
+
 /*-------------------------------------.
 | Open and close functions (formatted) |
 `-------------------------------------*/

 void
-open_edge(edge_t *edge, struct obstack *os)
+open_edge(edge_t *edge, FILE *fout)
 {
  switch (edge->type)
    {
    case normal_edge:
-      obstack_sgrow (os, "\tedge: {\n");
+      fputs ("\tedge: {\n", fout);
      break;
    case back_edge:
-      obstack_sgrow (os, "\tbackedge: {\n");
+      fputs ("\tbackedge: {\n", fout);
      break;
    case near_edge:
-      obstack_sgrow (os, "\tnearedge: {\n");
+      fputs ("\tnearedge: {\n", fout);
      break;
    case bent_near_edge:
-      obstack_sgrow (os, "\tbentnearedge: {\n");
+      fputs ("\tbentnearedge: {\n", fout);
      break;
    default:
-      obstack_sgrow (os, "\tedge: {\n");
+      fputs ("\tedge: {\n", fout);
    }
 }

 void
-close_edge(struct obstack *os)
+close_edge(FILE *fout)
 {
-  obstack_sgrow (os, "\t}\n");
+  fputs ("\t}\n", fout);
 }

 void
-open_node(struct obstack *os)
+open_node(FILE *fout)
 {
-  obstack_sgrow (os, "\tnode: {\n");
+  fputs ("\tnode: {\n", fout);
 }

 void
-close_node(struct obstack *os)
+close_node(FILE *fout)
 {
-  obstack_sgrow (os, "\t}\n");
+  fputs ("\t}\n", fout);
 }

 void
-open_graph(struct obstack *os)
+open_graph(FILE *fout)
 {
-  obstack_sgrow (os, "graph: {\n");
+  fputs ("graph: {\n", fout);
 }

 void
-close_graph(graph_t *graph, struct obstack *os)
+close_graph(graph_t *graph, FILE *fout)
 {
-  obstack_1grow (os, '\n');
+  fputc ('\n', fout);

+  /* FIXME: Unallocate nodes and edges if required.  */
  {
    node_t *node;

    for (node = graph->node_list; node; node = node->next)
      {
-	open_node (os);
-	output_node (node, os);
-	close_node (os);
+	open_node (fout);
+	output_node (node, fout);
+	close_node (fout);
      }
  }

-  obstack_1grow (os, '\n');
+  fputc ('\n', fout);

  {
    edge_t *edge;

    for (edge = graph->edge_list; edge; edge = edge->next)
      {
-	open_edge (edge, os);
-	output_edge (edge, os);
-	close_edge (os);
+	open_edge (edge, fout);
+	output_edge (edge, fout);
+	close_edge (fout);
      }
  }

-  obstack_sgrow (os, "}\n");
+  fputs ("}\n", fout);
 }

 /*-------------------------------------------.
-| Output functions (formatted) in obstack os |
+| Output functions (formatted) in file FOUT  |
 `-------------------------------------------*/

 void
-output_node (node_t *node, struct obstack *os)
+output_node (node_t *node, FILE *fout)
 {
  if (node->title != N_TITLE)
-    obstack_fgrow1 (os, "\t\ttitle:\t\"%s\"\n", node->title);
+    fprintf (fout, "\t\ttitle:\t\"%s\"\n", node->title);
  if (node->label != N_LABEL)
-    obstack_fgrow1 (os, "\t\tlabel:\t\"%s\"\n", node->label);
+    fprintf (fout, "\t\tlabel:\t\"%s\"\n", node->label);

  if ((node->locx != N_LOCX) && (node->locy != N_LOCY))
-    obstack_fgrow2 (os, "\t\tloc { x: %d  y: %d }\t\n", node->locx, node->locy);
+    fprintf (fout, "\t\tloc { x: %d  y: %d }\t\n", node->locx, node->locy);

  if (node->vertical_order != N_VERTICAL_ORDER)
-    obstack_fgrow1 (os, "\t\tvertical_order:\t%d\n", node->vertical_order);
+    fprintf (fout, "\t\tvertical_order:\t%d\n", node->vertical_order);
  if (node->horizontal_order != N_HORIZONTAL_ORDER)
-    obstack_fgrow1 (os, "\t\thorizontal_order:\t%d\n", node->horizontal_order);
+    fprintf (fout, "\t\thorizontal_order:\t%d\n", node->horizontal_order);

  if (node->width != N_WIDTH)
-    obstack_fgrow1 (os, "\t\twidth:\t%d\n", node->width);
+    fprintf (fout, "\t\twidth:\t%d\n", node->width);
  if (node->height != N_HEIGHT)
-    obstack_fgrow1 (os, "\t\theight:\t%d\n", node->height);
+    fprintf (fout, "\t\theight:\t%d\n", node->height);

  if (node->shrink != N_SHRINK)
-    obstack_fgrow1 (os, "\t\tshrink:\t%d\n", node->shrink);
+    fprintf (fout, "\t\tshrink:\t%d\n", node->shrink);
  if (node->stretch != N_STRETCH)
-    obstack_fgrow1 (os, "\t\tstretch:\t%d\n", node->stretch);
+    fprintf (fout, "\t\tstretch:\t%d\n", node->stretch);

  if (node->folding != N_FOLDING)
-    obstack_fgrow1 (os, "\t\tfolding:\t%d\n", node->folding);
+    fprintf (fout, "\t\tfolding:\t%d\n", node->folding);

  if (node->textmode != N_TEXTMODE)
-    obstack_fgrow1 (os, "\t\ttextmode:\t%s\n",
-		    get_textmode_str (node->textmode));
+    fprintf (fout, "\t\ttextmode:\t%s\n",
+	     get_textmode_str (node->textmode));

  if (node->shape != N_SHAPE)
-    obstack_fgrow1 (os, "\t\tshape:\t%s\n", get_shape_str (node->shape));
+    fprintf (fout, "\t\tshape:\t%s\n", get_shape_str (node->shape));

  if (node->borderwidth != N_BORDERWIDTH)
-    obstack_fgrow1 (os, "\t\tborderwidth:\t%d\n", node->borderwidth);
+    fprintf (fout, "\t\tborderwidth:\t%d\n", node->borderwidth);

  if (node->color != N_COLOR)
-    obstack_fgrow1 (os, "\t\tcolor:\t%s\n", get_color_str (node->color));
+    fprintf (fout, "\t\tcolor:\t%s\n", get_color_str (node->color));
  if (node->textcolor != N_TEXTCOLOR)
-    obstack_fgrow1 (os, "\t\ttextcolor:\t%s\n",
-		    get_color_str (node->textcolor));
+    fprintf (fout, "\t\ttextcolor:\t%s\n",
+	     get_color_str (node->textcolor));
  if (node->bordercolor != N_BORDERCOLOR)
-    obstack_fgrow1 (os, "\t\tbordercolor:\t%s\n",
-		    get_color_str (node->bordercolor));
+    fprintf (fout, "\t\tbordercolor:\t%s\n",
+	     get_color_str (node->bordercolor));

  if (node->infos[0])
-    obstack_fgrow1 (os, "\t\tinfo1:\t\"%s\"\n", node->infos[0]);
+    fprintf (fout, "\t\tinfo1:\t\"%s\"\n", node->infos[0]);
  if (node->infos[1])
-    obstack_fgrow1 (os, "\t\tinfo2:\t\"%s\"\n", node->infos[1]);
+    fprintf (fout, "\t\tinfo2:\t\"%s\"\n", node->infos[1]);
  if (node->infos[2])
-    obstack_fgrow1 (os, "\t\tinfo3:\t\"%s\"\n", node->infos[2]);
+    fprintf (fout, "\t\tinfo3:\t\"%s\"\n", node->infos[2]);
 }

 void
-output_edge (edge_t *edge, struct obstack *os)
+output_edge (edge_t *edge, FILE *fout)
 {
  /* FIXME: SOURCENAME and TARGETNAME are mandatory
     so it has to be fatal not to give these informations.  */
  if (edge->sourcename != E_SOURCENAME)
-    obstack_fgrow1 (os, "\t\tsourcename:\t\"%s\"\n", edge->sourcename);
+    fprintf (fout, "\t\tsourcename:\t\"%s\"\n", edge->sourcename);
  if (edge->targetname != E_TARGETNAME)
-    obstack_fgrow1 (os, "\t\ttargetname:\t\"%s\"\n", edge->targetname);
+    fprintf (fout, "\t\ttargetname:\t\"%s\"\n", edge->targetname);

  if (edge->label != E_LABEL)
-    obstack_fgrow1 (os, "\t\tlabel:\t\"%s\"\n", edge->label);
+    fprintf (fout, "\t\tlabel:\t\"%s\"\n", edge->label);

  if (edge->linestyle != E_LINESTYLE)
-    obstack_fgrow1 (os, "\t\tlinestyle:\t\"%s\"\n",
-		    get_linestyle_str(edge->linestyle));
+    fprintf (fout, "\t\tlinestyle:\t\"%s\"\n", 
+	     get_linestyle_str(edge->linestyle));

  if (edge->thickness != E_THICKNESS)
-    obstack_fgrow1 (os, "\t\tthickness:\t%d\n", edge->thickness);
+    fprintf (fout, "\t\tthickness:\t%d\n", edge->thickness);
  if (edge->class != E_CLASS)
-    obstack_fgrow1 (os, "\t\tclass:\t%d\n", edge->class);
+    fprintf (fout, "\t\tclass:\t%d\n", edge->class);

  if (edge->color != E_COLOR)
-    obstack_fgrow1 (os, "\t\tcolor:\t%s\n", get_color_str (edge->color));
+    fprintf (fout, "\t\tcolor:\t%s\n", get_color_str (edge->color));
  if (edge->color != E_TEXTCOLOR)
-    obstack_fgrow1 (os, "\t\ttextcolor:\t%s\n",
-		    get_color_str (edge->textcolor));
+    fprintf (fout, "\t\ttextcolor:\t%s\n",
+	     get_color_str (edge->textcolor));
  if (edge->arrowcolor != E_ARROWCOLOR)
-    obstack_fgrow1 (os, "\t\tarrowcolor:\t%s\n",
-		    get_color_str (edge->arrowcolor));
+    fprintf (fout, "\t\tarrowcolor:\t%s\n",
+	     get_color_str (edge->arrowcolor));
  if (edge->backarrowcolor != E_BACKARROWCOLOR)
-    obstack_fgrow1 (os, "\t\tbackarrowcolor:\t%s\n",
-		    get_color_str (edge->backarrowcolor));
+    fprintf (fout, "\t\tbackarrowcolor:\t%s\n",
+	     get_color_str (edge->backarrowcolor));

  if (edge->arrowsize != E_ARROWSIZE)
-    obstack_fgrow1 (os, "\t\tarrowsize:\t%d\n", edge->arrowsize);
+    fprintf (fout, "\t\tarrowsize:\t%d\n", edge->arrowsize);
  if (edge->backarrowsize != E_BACKARROWSIZE)
-    obstack_fgrow1 (os, "\t\tbackarrowsize:\t%d\n", edge->backarrowsize);
+    fprintf (fout, "\t\tbackarrowsize:\t%d\n", edge->backarrowsize);

  if (edge->arrowstyle != E_ARROWSTYLE)
-    obstack_fgrow1 (os, "\t\tarrowstyle:\t%s\n",
-		    get_arrowstyle_str(edge->arrowstyle));
+    fprintf (fout, "\t\tarrowstyle:\t%s\n",
+	     get_arrowstyle_str(edge->arrowstyle));
  if (edge->backarrowstyle != E_BACKARROWSTYLE)
-    obstack_fgrow1 (os, "\t\tbackarrowstyle:\t%s\n",
-		    get_arrowstyle_str(edge->backarrowstyle));
+    fprintf (fout, "\t\tbackarrowstyle:\t%s\n",
+	     get_arrowstyle_str(edge->backarrowstyle));

  if (edge->priority != E_PRIORITY)
-    obstack_fgrow1 (os, "\t\tpriority:\t%d\n", edge->priority);
+    fprintf (fout, "\t\tpriority:\t%d\n", edge->priority);
  if (edge->anchor != E_ANCHOR)
-    obstack_fgrow1 (os, "\t\tanchor:\t%d\n", edge->anchor);
+    fprintf (fout, "\t\tanchor:\t%d\n", edge->anchor);
  if (edge->horizontal_order != E_HORIZONTAL_ORDER)
-    obstack_fgrow1 (os, "\t\thorizontal_order:\t%d\n", edge->horizontal_order);
+    fprintf (fout, "\t\thorizontal_order:\t%d\n", edge->horizontal_order);
 }

 void
-output_graph (graph_t *graph, struct obstack *os)
+output_graph (graph_t *graph, FILE *fout)
 {
  if (graph->title)
-    obstack_fgrow1 (os, "\ttitle:\t\"%s\"\n", graph->title);
+    fprintf (fout, "\ttitle:\t\"%s\"\n", graph->title);
  if (graph->label)
-    obstack_fgrow1 (os, "\tlabel:\t\"%s\"\n", graph->label);
+    fprintf (fout, "\tlabel:\t\"%s\"\n", graph->label);

  if (graph->infos[0])
-    obstack_fgrow1 (os, "\tinfo1:\t\"%s\"\n", graph->infos[0]);
+    fprintf (fout, "\tinfo1:\t\"%s\"\n", graph->infos[0]);
  if (graph->infos[1])
-    obstack_fgrow1 (os, "\tinfo2:\t\"%s\"\n", graph->infos[1]);
+    fprintf (fout, "\tinfo2:\t\"%s\"\n", graph->infos[1]);
  if (graph->infos[2])
-    obstack_fgrow1 (os, "\tinfo3:\t\"%s\"\n", graph->infos[2]);
+    fprintf (fout, "\tinfo3:\t\"%s\"\n", graph->infos[2]);

  if (graph->color != G_COLOR)
-    obstack_fgrow1 (os, "\tcolor:\t%s\n", get_color_str (graph->color));
+    fprintf (fout, "\tcolor:\t%s\n", get_color_str (graph->color));
  if (graph->textcolor != G_TEXTCOLOR)
-    obstack_fgrow1 (os, "\ttextcolor:\t%s\n", get_color_str (graph->textcolor));
+    fprintf (fout, "\ttextcolor:\t%s\n", get_color_str (graph->textcolor));
  if (graph->bordercolor != G_BORDERCOLOR)
-    obstack_fgrow1 (os, "\tbordercolor:\t%s\n",
-		    get_color_str (graph->bordercolor));
+    fprintf (fout, "\tbordercolor:\t%s\n",
+	     get_color_str (graph->bordercolor));

  if (graph->width != G_WIDTH)
-    obstack_fgrow1 (os, "\twidth:\t%d\n", graph->width);
+    fprintf (fout, "\twidth:\t%d\n", graph->width);
  if (graph->height != G_HEIGHT)
-    obstack_fgrow1 (os, "\theight:\t%d\n", graph->height);
+    fprintf (fout, "\theight:\t%d\n", graph->height);
  if (graph->borderwidth != G_BORDERWIDTH)
-    obstack_fgrow1 (os, "\tborderwidth:\t%d\n", graph->borderwidth);
+    fprintf (fout, "\tborderwidth:\t%d\n", graph->borderwidth);

  if (graph->x != G_X)
-    obstack_fgrow1 (os, "\tx:\t%d\n", graph->x);
+    fprintf (fout, "\tx:\t%d\n", graph->x);
  if (graph->y != G_Y)
-    obstack_fgrow1 (os, "\ty:\t%d\n", graph->y);
+    fprintf (fout, "\ty:\t%d\n", graph->y);

  if (graph->folding != G_FOLDING)
-    obstack_fgrow1 (os, "\tfolding:\t%d\n", graph->folding);
+    fprintf (fout, "\tfolding:\t%d\n", graph->folding);

  if (graph->shrink != G_SHRINK)
-    obstack_fgrow1 (os, "\tshrink:\t%d\n", graph->shrink);
+    fprintf (fout, "\tshrink:\t%d\n", graph->shrink);
  if (graph->stretch != G_STRETCH)
-    obstack_fgrow1 (os, "\tstretch:\t%d\n", graph->stretch);
+    fprintf (fout, "\tstretch:\t%d\n", graph->stretch);

  if (graph->textmode != G_TEXTMODE)
-    obstack_fgrow1 (os, "\ttextmode:\t%s\n",
-		    get_textmode_str (graph->textmode));
+    fprintf (fout, "\ttextmode:\t%s\n",
+	     get_textmode_str (graph->textmode));

  if (graph->shape != G_SHAPE)
-    obstack_fgrow1 (os, "\tshape:\t%s\n", get_shape_str (graph->shape));
+    fprintf (fout, "\tshape:\t%s\n", get_shape_str (graph->shape));
+  
+  if (graph->vertical_order != G_VERTICAL_ORDER)
+    fprintf (fout, "\tvertical_order:\t%d\n", graph->vertical_order);  
+  if (graph->horizontal_order != G_HORIZONTAL_ORDER)
+    fprintf (fout, "\thorizontal_order:\t%d\n", graph->horizontal_order);  

  if (graph->xmax != G_XMAX)
-    obstack_fgrow1 (os, "\txmax:\t%d\n", graph->xmax);
+    fprintf (fout, "\txmax:\t%d\n", graph->xmax);
  if (graph->ymax != G_YMAX)
-    obstack_fgrow1 (os, "\tymax:\t%d\n", graph->ymax);
+    fprintf (fout, "\tymax:\t%d\n", graph->ymax);

  if (graph->xbase != G_XBASE)
-    obstack_fgrow1 (os, "\txbase:\t%d\n", graph->xbase);
+    fprintf (fout, "\txbase:\t%d\n", graph->xbase);
  if (graph->ybase != G_YBASE)
-    obstack_fgrow1 (os, "\tybase:\t%d\n", graph->ybase);
+    fprintf (fout, "\tybase:\t%d\n", graph->ybase);

  if (graph->xspace != G_XSPACE)
-    obstack_fgrow1 (os, "\txspace:\t%d\n", graph->xspace);
+    fprintf (fout, "\txspace:\t%d\n", graph->xspace);
  if (graph->yspace != G_YSPACE)
-    obstack_fgrow1 (os, "\tyspace:\t%d\n", graph->yspace);
+    fprintf (fout, "\tyspace:\t%d\n", graph->yspace);
  if (graph->xlspace != G_XLSPACE)
-    obstack_fgrow1 (os, "\txlspace:\t%d\n", graph->xlspace);
+    fprintf (fout, "\txlspace:\t%d\n", graph->xlspace);

  if (graph->xraster != G_XRASTER)
-    obstack_fgrow1 (os, "\txraster:\t%d\n", graph->xraster);
+    fprintf (fout, "\txraster:\t%d\n", graph->xraster);
  if (graph->yraster != G_YRASTER)
-    obstack_fgrow1 (os, "\tyraster:\t%d\n", graph->yraster);
+    fprintf (fout, "\tyraster:\t%d\n", graph->yraster);
  if (graph->xlraster != G_XLRASTER)
-    obstack_fgrow1 (os, "\txlraster:\t%d\n", graph->xlraster);
+    fprintf (fout, "\txlraster:\t%d\n", graph->xlraster);

  if (graph->hidden != G_HIDDEN)
-    obstack_fgrow1 (os, "\thidden:\t%d\n", graph->hidden);
-
+    fprintf (fout, "\thidden:\t%d\n", graph->hidden);
+  
+  /* FIXME: Unallocate struct list if required.  
+     Maybe with a little function.  */
  if (graph->classname != G_CLASSNAME)
    {
      struct classname_s *ite;

      for (ite = graph->classname; ite; ite = ite->next)
-	obstack_fgrow2 (os, "\tclassname %d :\t%s\n", ite->no, ite->name);
+	fprintf (fout, "\tclassname %d :\t%s\n", ite->no, ite->name);
+    }
+
+  if (graph->infoname != G_INFONAME)
+    {
+      struct infoname_s *ite;
+
+      for (ite = graph->infoname; ite; ite = ite->next)
+	fprintf (fout, "\tinfoname %d :\t%s\n", ite->integer, ite->string);
+    }
+
+  if (graph->colorentry != G_COLORENTRY)
+    {
+      struct colorentry_s *ite;
+      
+      for (ite = graph->colorentry; ite; ite = ite->next)
+	{	
+	  fprintf (fout, "\tcolorentry %d :\t%d %d %d\n", 
+		   ite->color_index, 
+		   ite->red_cp,
+		   ite->green_cp,
+		   ite->blue_cp);
+	}    
    }

  if (graph->layoutalgorithm != G_LAYOUTALGORITHM)
-    obstack_fgrow1 (os, "\tlayoutalgorithm:\t%s\n",
-		    get_layoutalgorithm_str(graph->layoutalgorithm));
+    fprintf (fout, "\tlayoutalgorithm:\t%s\n",
+	     get_layoutalgorithm_str(graph->layoutalgorithm));

  if (graph->layout_downfactor != G_LAYOUT_DOWNFACTOR)
-    obstack_fgrow1 (os, "\tlayout_downfactor:\t%d\n", graph->layout_downfactor);
+    fprintf (fout, "\tlayout_downfactor:\t%d\n", graph->layout_downfactor);
  if (graph->layout_upfactor != G_LAYOUT_UPFACTOR)
-    obstack_fgrow1 (os, "\tlayout_upfactor:\t%d\n", graph->layout_upfactor);
+    fprintf (fout, "\tlayout_upfactor:\t%d\n", graph->layout_upfactor);
  if (graph->layout_nearfactor != G_LAYOUT_NEARFACTOR)
-    obstack_fgrow1 (os, "\tlayout_nearfactor:\t%d\n", graph->layout_nearfactor);
+    fprintf (fout, "\tlayout_nearfactor:\t%d\n", graph->layout_nearfactor);
  if (graph->layout_splinefactor != G_LAYOUT_SPLINEFACTOR)
-    obstack_fgrow1 (os, "\tlayout_splinefactor:\t%d\n",
-		    graph->layout_splinefactor);
+    fprintf (fout, "\tlayout_splinefactor:\t%d\n",
+	     graph->layout_splinefactor);

  if (graph->late_edge_labels != G_LATE_EDGE_LABELS)
-    obstack_fgrow1 (os, "\tlate_edge_labels:\t%s\n",
-		    get_decision_str(graph->late_edge_labels,
-				     G_LATE_EDGE_LABELS));
+    fprintf (fout, "\tlate_edge_labels:\t%s\n",
+	     get_decision_str(graph->late_edge_labels));
  if (graph->display_edge_labels != G_DISPLAY_EDGE_LABELS)
-    obstack_fgrow1 (os, "\tdisplay_edge_labels:\t%s\n",
-		    get_decision_str(graph->display_edge_labels,
-				     G_DISPLAY_EDGE_LABELS));
+    fprintf (fout, "\tdisplay_edge_labels:\t%s\n",
+	     get_decision_str(graph->display_edge_labels));
  if (graph->dirty_edge_labels != G_DIRTY_EDGE_LABELS)
-    obstack_fgrow1 (os, "\tdirty_edge_labels:\t%s\n",
-		    get_decision_str(graph->dirty_edge_labels,
-				     G_DIRTY_EDGE_LABELS));
+    fprintf (fout, "\tdirty_edge_labels:\t%s\n",
+	     get_decision_str(graph->dirty_edge_labels));
  if (graph->finetuning != G_FINETUNING)
-    obstack_fgrow1 (os, "\tfinetuning:\t%s\n",
-		    get_decision_str(graph->finetuning, G_FINETUNING));
+    fprintf (fout, "\tfinetuning:\t%s\n",
+	     get_decision_str(graph->finetuning));
  if (graph->ignore_singles != G_IGNORE_SINGLES)
-    obstack_fgrow1 (os, "\tignore_singles:\t%s\n",
-		    get_decision_str(graph->ignore_singles, G_IGNORE_SINGLES));
+    fprintf (fout, "\tignore_singles:\t%s\n",
+	     get_decision_str(graph->ignore_singles));
  if (graph->straight_phase != G_STRAIGHT_PHASE)
-    obstack_fgrow1 (os, "\tstraight_phase:\t%s\n",
-		    get_decision_str(graph->straight_phase, G_STRAIGHT_PHASE));
+    fprintf (fout, "\tstraight_phase:\t%s\n",
+	     get_decision_str(graph->straight_phase));
  if (graph->priority_phase != G_PRIORITY_PHASE)
-    obstack_fgrow1 (os, "\tpriority_phase:\t%s\n",
-		    get_decision_str(graph->priority_phase, G_PRIORITY_PHASE));
+    fprintf (fout, "\tpriority_phase:\t%s\n",
+	     get_decision_str(graph->priority_phase));
  if (graph->manhattan_edges != G_MANHATTAN_EDGES)
-    obstack_fgrow1 (os,
-		    "\tmanhattan_edges:\t%s\n",
-		    get_decision_str(graph->manhattan_edges,
-				     G_MANHATTAN_EDGES));
+    fprintf (fout,
+	     "\tmanhattan_edges:\t%s\n",
+	     get_decision_str(graph->manhattan_edges));
  if (graph->smanhattan_edges != G_SMANHATTAN_EDGES)
-    obstack_fgrow1 (os,
-		    "\tsmanhattan_edges:\t%s\n",
-		    get_decision_str(graph->smanhattan_edges,
-				     G_SMANHATTAN_EDGES));
+    fprintf (fout,
+	     "\tsmanhattan_edges:\t%s\n",
+	     get_decision_str(graph->smanhattan_edges));
  if (graph->near_edges != G_NEAR_EDGES)
-    obstack_fgrow1 (os, "\tnear_edges:\t%s\n",
-		    get_decision_str(graph->near_edges, G_NEAR_EDGES));
+    fprintf (fout, "\tnear_edges:\t%s\n",
+	     get_decision_str(graph->near_edges));

  if (graph->orientation != G_ORIENTATION)
-    obstack_fgrow1 (os, "\torientation:\t%s\n",
-		    get_decision_str(graph->orientation, G_ORIENTATION));
+    fprintf (fout, "\torientation:\t%s\n",
+	     get_orientation_str(graph->orientation));

  if (graph->node_alignement != G_NODE_ALIGNEMENT)
-    obstack_fgrow1 (os, "\tnode_alignement:\t%s\n",
-		    get_decision_str(graph->node_alignement,
-				     G_NODE_ALIGNEMENT));
+    fprintf (fout, "\tnode_alignement:\t%s\n",
+	     get_node_alignement_str(graph->node_alignement));

  if (graph->port_sharing != G_PORT_SHARING)
-    obstack_fgrow1 (os, "\tport_sharing:\t%s\n",
-		    get_decision_str(graph->port_sharing, G_PORT_SHARING));
+    fprintf (fout, "\tport_sharing:\t%s\n",
+	     get_decision_str(graph->port_sharing));

  if (graph->arrow_mode != G_ARROW_MODE)
-    obstack_fgrow1 (os, "\tarrow_mode:\t%s\n",
-		    get_arrow_mode_str(graph->arrow_mode));
+    fprintf (fout, "\tarrow_mode:\t%s\n",
+	     get_arrow_mode_str(graph->arrow_mode));

  if (graph->treefactor != G_TREEFACTOR)
-    obstack_fgrow1 (os, "\ttreefactor:\t%f\n", graph->treefactor);
+    fprintf (fout, "\ttreefactor:\t%f\n", graph->treefactor);
  if (graph->spreadlevel != G_SPREADLEVEL)
-    obstack_fgrow1 (os, "\tspreadlevel:\t%d\n", graph->spreadlevel);
+    fprintf (fout, "\tspreadlevel:\t%d\n", graph->spreadlevel);

  if (graph->crossing_weight != G_CROSSING_WEIGHT)
-    obstack_fgrow1 (os, "\tcrossing_weight:\t%s\n",
-		    get_crossing_type_str(graph->crossing_weight));
+    fprintf (fout, "\tcrossing_weight:\t%s\n",
+	     get_crossing_type_str(graph->crossing_weight));
  if (graph->crossing_phase2 != G_CROSSING_PHASE2)
-    obstack_fgrow1 (os, "\tcrossing_phase2:\t%s\n",
-		    get_decision_str(graph->crossing_phase2,
-				     G_CROSSING_PHASE2));
+    fprintf (fout, "\tcrossing_phase2:\t%s\n",
+	     get_decision_str(graph->crossing_phase2));
  if (graph->crossing_optimization != G_CROSSING_OPTIMIZATION)
-    obstack_fgrow1 (os, "\tcrossing_optimization:\t%s\n",
-		    get_decision_str(graph->crossing_optimization,
-				     G_CROSSING_OPTIMIZATION));
+    fprintf (fout, "\tcrossing_optimization:\t%s\n",
+	     get_decision_str(graph->crossing_optimization));

  if (graph->view != G_VIEW)
-    obstack_fgrow1 (os, "\tview:\t%s\n", get_view_str(graph->view));
+    fprintf (fout, "\tview:\t%s\n", get_view_str(graph->view));

  if (graph->edges != G_EDGES)
-    obstack_fgrow1 (os, "\tedges:\t%s\n", get_decision_str(graph->edges,
-							   G_EDGES));
+    fprintf (fout, "\tedges:\t%s\n", get_decision_str(graph->edges));

  if (graph->nodes != G_NODES)
-    obstack_fgrow1 (os,"\tnodes:\t%s\n",
-		    get_decision_str(graph->nodes, G_NODES));
+    fprintf (fout,"\tnodes:\t%s\n", get_decision_str(graph->nodes));

  if (graph->splines != G_SPLINES)
-    obstack_fgrow1 (os, "\tsplines:\t%s\n",
-		    get_decision_str(graph->splines, G_SPLINES));
+    fprintf (fout, "\tsplines:\t%s\n", get_decision_str(graph->splines));

  if (graph->bmax != G_BMAX)
-    obstack_fgrow1 (os, "\tbmax:\t%d\n", graph->bmax);
+    fprintf (fout, "\tbmax:\t%d\n", graph->bmax);
  if (graph->cmin != G_CMIN)
-    obstack_fgrow1 (os, "\tcmin:\t%d\n", graph->cmin);
+    fprintf (fout, "\tcmin:\t%d\n", graph->cmin);
  if (graph->cmax != G_CMAX)
-    obstack_fgrow1 (os, "\tcmax:\t%d\n", graph->cmax);
+    fprintf (fout, "\tcmax:\t%d\n", graph->cmax);
  if (graph->pmin != G_PMIN)
-    obstack_fgrow1 (os, "\tpmin:\t%d\n", graph->pmin);
+    fprintf (fout, "\tpmin:\t%d\n", graph->pmin);
  if (graph->pmax != G_PMAX)
-    obstack_fgrow1 (os, "\tpmax:\t%d\n", graph->pmax);
+    fprintf (fout, "\tpmax:\t%d\n", graph->pmax);
  if (graph->rmin != G_RMIN)
-    obstack_fgrow1 (os, "\trmin:\t%d\n", graph->rmin);
+    fprintf (fout, "\trmin:\t%d\n", graph->rmin);
  if (graph->rmax != G_RMAX)
-    obstack_fgrow1 (os, "\trmax:\t%d\n", graph->rmax);
+    fprintf (fout, "\trmax:\t%d\n", graph->rmax);
  if (graph->smax != G_SMAX)
-    obstack_fgrow1 (os, "\tsmax:\t%d\n", graph->smax);
+    fprintf (fout, "\tsmax:\t%d\n", graph->smax);
 }
@@ -75,14 +75,32 @@ enum shape_e
  triangle
 };

+/* Structure for colorentries.  */
+struct colorentry_s
+{
+  int color_index;
+  int red_cp;
+  int green_cp;
+  int blue_cp;
+  struct colorentry_s *next;
+};
+
 /* Structure to construct lists of classnames. */
 struct classname_s
 {
  int no; /* Class number */
-  char *name; /* Name associated to the class no. */
+  const char *name; /* Name associated to the class no. */
  struct classname_s *next; /* next name class association. */
 };

+/* Structure is in infoname.  */
+struct infoname_s
+{
+  int integer;
+  const char *string;
+  struct infoname_s *next;
+};
+
 /* Layout Algorithms which can be found in VCG.
   Details about each algoithm can be found below. */
 enum layoutalgorithm_e
@@ -161,13 +179,13 @@ struct node_s
 {
  /* Title the unique string identifying the node. This attribute is
     mandatory. */
-  char *title;
+  const char *title;

  /* Label the text displayed inside the node. If no label is specified
     then the title of the node will be used. Note that this text may
     contain control characters like NEWLINE that influences the size of
     the node. */
-  char *label;
+  const char *label;

  /* loc is the location as x, y position relatively to the system of
     coordinates of the graph. Locations are specified in the form
@@ -277,7 +295,7 @@ struct node_s
  /* info2, info3 can be selected from the menu. The corresponding text
     labels can be shown by mouse clicks on nodes.
     Default are null strings. */
-  char *infos[3];
+  const char *infos[3];

  /* Node border color.
     Default is textcolor. */
@@ -483,19 +501,19 @@ struct	graph_s
     index 2, green has index 3, etc.
     Default is white for background and white or transparent for summary
     nodes. */
-  unsigned char color;
+  enum color_e color;

  /* Textcolor.
     need explainations ???
     defalut is black for summary nodes. */
-  unsigned char textcolor;
+  enum color_e textcolor;

  /* Bordercolor is the color of the summary node's border. Default color
     is the textcolor. width, height are width and height of the
     displayed part of the window of the outermost graph in pixels, or
     width and height of the summary node of inner subgraphs.
     Default is the defalut of the textcolor. */
-  unsigned char bordercolor;
+  enum color_e bordercolor;

  /* Width, height are width and height of the displayed part of the
     window of the outermost graph in pixels, or width and height of the
@@ -559,7 +577,22 @@ struct	graph_s
     Defalut is box, other: rhomb, ellipse, triangle. */
  enum shape_e shape;

-  /* FIXME {vertival,horizontal}_order */
+  /* Vertical order is the level position (rank) of the summary node of an 
+     inner subgraph, if this subgraph is folded. We can also specify 
+     level: int. The level is only recognized, if an automatical layout is 
+     calculated.  */
+  int vertical_order;
+
+  /* Horizontal order is the horizontal position of the summary node within 
+     a level. The nodes which are specified with horizontal positions are 
+     ordered according to these positions within the levels. The nodes which 
+     do not have this attribute are inserted into this ordering by the 
+     crossing reduction mechanism. Note that connected components are 
+     handled separately, thus it is not possible to intermix such components 
+     by specifying a horizontal order. If the algorithm for downward laid 
+     out trees is used, the horizontal order influences only the order of 
+     the child nodes at a node, but not the order of the whole level.  */
+  int horizontal_order;

  /* xmax, ymax specify the maximal size of the virtual window that is
     used to display the graph. This is usually larger than the displayed
@@ -630,8 +663,19 @@ struct	graph_s
     By default, no class names. */
  struct classname_s *classname;

-  /* FIXME : infoname. */
-  /* FIXME : colorentry. */
+  /* Infoname allows to introduce names for the additional text labels. 
+     The names are used in the menus.  
+     Infoname is given by an integer and a string.  
+     The default value is NULL.  */
+  struct infoname_s *infoname;
+  
+  /* Colorentry allows to fill the color map. A color is a triplet of integer 
+     values for the red/green/blue-part. Each integer is between 0 (off) and 
+     255 (on), e.g., 0 0 0 is black and 255 255 255 is white. For instance 
+     colorentry 75 : 70 130 180 sets the map entry 75 to steel blue. This 
+     color can be used by specifying just the number 75.
+     Default id NULL.  */
+  struct colorentry_s *colorentry;

  /* layoutalgorithm chooses different graph layout algorithms
     Possibilities are maxdepth, mindepth, maxdepthslow, mindepthslow,
@@ -955,16 +999,21 @@ void new_edge PARAMS ((edge_t *edge));
 void add_node PARAMS ((graph_t *graph, node_t *node));
 void add_edge PARAMS ((graph_t *graph, edge_t *edge));

-void open_node PARAMS ((struct obstack *os));
-void output_node PARAMS ((node_t *node, struct obstack *os));
-void close_node PARAMS ((struct obstack *os));
+void add_colorentry PARAMS ((graph_t *g, int color_idx, int red_cp, 
+			     int green_cp, int blue_cp));
+void add_classname PARAMS ((graph_t *g, int val, const char *name));
+void add_infoname PARAMS ((graph_t *g, int val, const char *name));

-void open_edge PARAMS ((edge_t *edge, struct obstack *os));
-void output_edge PARAMS ((edge_t *edge, struct obstack *os));
-void close_edge PARAMS ((struct obstack *os));
+void open_node PARAMS ((FILE *fout));
+void output_node PARAMS ((node_t *node, FILE *fout));
+void close_node PARAMS ((FILE *fout));

-void open_graph PARAMS ((struct obstack *os));
-void output_graph PARAMS ((graph_t *graph, struct obstack *os));
-void close_graph PARAMS ((graph_t *graph, struct obstack *os));
+void open_edge PARAMS ((edge_t *edge, FILE *fout));
+void output_edge PARAMS ((edge_t *edge, FILE *fout));
+void close_edge PARAMS ((FILE *fout));
+
+void open_graph PARAMS ((FILE *fout));
+void output_graph PARAMS ((graph_t *graph, FILE *fout));
+void close_graph PARAMS ((graph_t *graph, FILE *fout));

 #endif /* VCG_H_ */
@@ -47,8 +47,11 @@
 # define G_TEXTMODE		centered
 # define G_SHAPE		box

-# define G_XMAX			90		/* Not output */
-# define G_YMAX			90		/* Not output */
+# define G_VERTICAL_ORDER	0      	/* Unspecified for subgraphs. */
+# define G_HORIZONTAL_ORDER	0      	/* Unspecified for subgraphs. */
+
+# define G_XMAX			90     	/* Not output */
+# define G_YMAX			90     	/* Not output */

 # define G_XBASE		5
 # define G_YBASE		5
@@ -61,9 +64,12 @@
 # define G_YRASTER		1
 # define G_XLRASTER		1

-# define G_HIDDEN		-1		/* No default value. */
+# define G_HIDDEN		-1     	/* No default value. */
+
+# define G_CLASSNAME		NULL   	/* No class name association */
+# define G_INFONAME		NULL
+# define G_COLORENTRY		NULL

-# define G_CLASSNAME		NULL		/* No class name association */
 # define G_LAYOUTALGORITHM	normal
 # define G_LAYOUT_DOWNFACTOR	1
 # define G_LAYOUT_UPFACTOR	1
@@ -1,7 +1,6 @@
 Makefile
 Makefile.in
 at-*
-debug-*
 atconfig
 empty
 experr
@@ -9,7 +8,11 @@ expout
 stderr
 stdout
 testsuite
+testsuite.[0-9]
+testsuite.[0-9][0-9]
+package.m4
 calc.[chy]
 calc.tab.*
 calc
 *.output *.vcg
+autom4te.cache
@@ -18,23 +18,34 @@
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.

-# Distribute the testsuite since GNU M4 is needed to build it.
-noinst_SCRIPTS = testsuite
+EXTRA_DIST = atlocal.in bison $(TESTSUITE_AT) testsuite

-SUITE = calc.at regression.at
+DISTCLEANFILES       = atconfig atlocal package.m4
+MAINTAINERCLEANFILES = Makefile.in $(TESTSUITE)

-EXTRA_DIST = atgeneral.m4 suite.at $(SUITE) $(noinst_SCRIPTS)
+TESTSUITE_AT = \
+	testsuite.at \
+	output.at calc.at regression.at
+TESTSUITE = $(srcdir)/testsuite

-check-local: atconfig $(srcdir)/testsuite
-	$(SHELL) $(srcdir)/testsuite
+AUTOM4TE = autom4te
+AUTOTEST = $(AUTOM4TE) --language=autotest
+$(srcdir)/$(TESTSUITE): $(TESTSUITE_AT)
+	$(AUTOTEST) -I $(srcdir) testsuite.at -o $@.tmp
+	mv $@.tmp $@

-testsuite: atgeneral.m4 suite.at $(SUITE)
-	$(M4) -I $(srcdir) atgeneral.m4 suite.at | \
-          sed -e 's/[ 	]*$$//' | \
-	  sed -e '/^$$/N;/\n$$/D' > $@-tmp
-	chmod +x $@-tmp
-	mv $@-tmp $@
+atconfig: $(top_builddir)/config.status
+	cd $(top_builddir) && ./config.status tests/$@

-CLEANFILES = debug-*.sh empty
-DISTCLEANFILES = atconfig
-MAINTAINERCLEANFILES = testsuite
+atlocal: $(srcdir)/atlocal.in $(top_builddir)/config.status
+	cd $(top_builddir) && ./config.status tests/$@
+
+clean-local:
+	$(SHELL) $(TESTSUITE) --clean
+
+check-local: atconfig atlocal $(TESTSUITE)
+	$(SHELL) $(TESTSUITE)
+
+# Run the test suite on the *installed* tree.
+installcheck-local:
+	$(SHELL) $(TESTSUITE) AUTOTEST_PATH=$(exec_prefix)/bin
@@ -1,6 +1,7 @@
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
+# Makefile.in generated automatically by automake 1.5 from Makefile.am.

-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+# Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -10,8 +11,7 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.

-# Distribute the testsuite since GNU M4 is needed to build it.
-
+@SET_MAKE@

 SHELL = @SHELL@

@@ -33,13 +33,9 @@ infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
-DESTDIR =
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ..

 ACLOCAL = @ACLOCAL@
@@ -48,11 +44,11 @@ AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@

 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
-
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
@@ -61,20 +57,21 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
-AT_TESTPATH = @AT_TESTPATH@
+AMTAR = @AMTAR@
+AWK = @AWK@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
+DEPDIR = @DEPDIR@
+EXEEXT = @EXEEXT@
 GENCAT = @GENCAT@
 GLIBC21 = @GLIBC21@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
@@ -83,9 +80,9 @@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 LIBICONV = @LIBICONV@
 LIBOBJS = @LIBOBJS@
 M4 = @M4@
-MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
+OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 POFILES = @POFILES@
 POSUB = @POSUB@
@@ -95,138 +92,161 @@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WARNING_CFLAGS = @WARNING_CFLAGS@
+am__include = @am__include@
+am__quote = @am__quote@
+install_sh = @install_sh@

-noinst_SCRIPTS = testsuite
+EXTRA_DIST = atlocal.in bison $(TESTSUITE_AT) testsuite

-SUITE = calc.at regression.at
+DISTCLEANFILES = atconfig atlocal package.m4
+MAINTAINERCLEANFILES = Makefile.in $(TESTSUITE)

-EXTRA_DIST = atgeneral.m4 suite.at $(SUITE) $(noinst_SCRIPTS)
+TESTSUITE_AT = \
+	testsuite.at \
+	output.at calc.at regression.at

-CLEANFILES = debug-*.sh empty
-DISTCLEANFILES = atconfig
-MAINTAINERCLEANFILES = testsuite
+TESTSUITE = $(srcdir)/testsuite
+
+AUTOM4TE = autom4te
+AUTOTEST = $(AUTOM4TE) --language=autotest
+subdir = tests
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
-CONFIG_HEADER = ../config.h
-CONFIG_CLEAN_FILES =  atconfig
-SCRIPTS =  $(noinst_SCRIPTS)
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+DIST_SOURCES =
+DIST_COMMON = Makefile.am Makefile.in
+all: all-am

-DIST_COMMON =  Makefile.am Makefile.in atconfig.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = tar
-GZIP_ENV = --best
-all: all-redirect
 .SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-atconfig: $(top_builddir)/config.status atconfig.in
-	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  tests/Makefile
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	cd $(top_builddir) && \
+	  CONFIG_HEADERS= CONFIG_LINKS= \
+	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
+uninstall-info-am:
 tags: TAGS
 TAGS:


-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)

-subdir = tests
+top_distdir = ..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)

 distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu tests/Makefile
 	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    $(mkinstalldirs) "$(distdir)/$$dir"; \
+	  fi; \
 	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
+	    cp -pR $$d/$$file $(distdir) \
+	    || exit 1; \
 	  else \
 	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
 	  fi; \
 	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
 check-am: all-am
 	$(MAKE) $(AM_MAKEFLAGS) check-local
 check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
+all-am: Makefile

-install-data-am:
+installdirs:
+
+install: install-am
+install-exec: install-exec-am
 install-data: install-data-am
+uninstall: uninstall-am

 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am:
-uninstall: uninstall-am
-all-am: Makefile $(SCRIPTS)
-all-redirect: all-am
+
+installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
-
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:

 clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)

 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)

 maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
 	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-mostlyclean-am:  mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-generic mostlyclean-am
-
 clean: clean-am

-distclean-am:  distclean-generic clean-am
+clean-am: clean-generic clean-local mostlyclean-am

 distclean: distclean-am

-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am: installcheck-local

 maintainer-clean: maintainer-clean-am

-.PHONY: tags distdir info-am info dvi-am dvi check-local check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
+maintainer-clean-am: distclean-am maintainer-clean-generic

+mostlyclean: mostlyclean-am

-check-local: atconfig $(srcdir)/testsuite
-	$(SHELL) $(srcdir)/testsuite
+mostlyclean-am: mostlyclean-generic

-testsuite: atgeneral.m4 suite.at $(SUITE)
-	$(M4) -I $(srcdir) atgeneral.m4 suite.at | \
-          sed -e 's/[ 	]*$$//' | \
-	  sed -e '/^$$/N;/\n$$/D' > $@-tmp
-	chmod +x $@-tmp
-	mv $@-tmp $@
+uninstall-am: uninstall-info-am

+.PHONY: all all-am check check-am check-local clean clean-generic \
+	clean-local distclean distclean-generic distdir dvi dvi-am info \
+	info-am install install-am install-data install-data-am \
+	install-exec install-exec-am install-info install-info-am \
+	install-man install-strip installcheck installcheck-am \
+	installcheck-local installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	uninstall uninstall-am uninstall-info-am
+
+$(srcdir)/$(TESTSUITE): $(TESTSUITE_AT)
+	$(AUTOTEST) -I $(srcdir) testsuite.at -o $@.tmp
+	mv $@.tmp $@
+
+atconfig: $(top_builddir)/config.status
+	cd $(top_builddir) && ./config.status tests/$@
+
+atlocal: $(srcdir)/atlocal.in $(top_builddir)/config.status
+	cd $(top_builddir) && ./config.status tests/$@
+
+clean-local:
+	$(SHELL) $(TESTSUITE) --clean
+
+check-local: atconfig atlocal $(TESTSUITE)
+	$(SHELL) $(TESTSUITE)
+
+# Run the test suite on the *installed* tree.
+installcheck-local:
+	$(SHELL) $(TESTSUITE) AUTOTEST_PATH=$(exec_prefix)/bin
 # 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.
 .NOEXPORT:
@@ -1,97 +0,0 @@
-# @configure_input@					-*- shell-script -*-
-# Configurable variable values for building test suites.
-# Copyright (C) 2000, 2001 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# 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.
-
-# This script is part of Autotest.  Unlimited permission to copy,
-# distribute and modify the testing scripts that are the output of
-# that Autotest script is given.  You need not follow the terms of the
-# GNU General Public License when using or distributing such scripts,
-# even though portions of the text of Autotest appear in them.  The
-# GNU General Public License (GPL) does govern all other use of the
-# material that constitutes the Autotest.
-#
-# Certain portions of the Autotest source text are designed to be
-# copied (in certain cases, depending on the input) into the output of
-# Autotest.  We call these the "data" portions.  The rest of the
-# Autotest source text consists of comments plus executable code that
-# decides which of the data portions to output in any given case.  We
-# call these comments and executable code the "non-data" portions.
-# Autotest never copies any of the non-data portions into its output.
-#
-# This special exception to the GPL applies to versions of Autotest
-# released by the Free Software Foundation.  When you make and
-# distribute a modified version of Autotest, you may extend this
-# special exception to the GPL to apply to your modified version as
-# well, *unless* your modified version has the potential to copy into
-# its output some of the text that was the non-data portion of the
-# version that you started with.  (In other words, unless your change
-# moves or copies text from the non-data portions to the data
-# portions.)  If your modification has such potential, you must delete
-# any notice of this special exception to the GPL from your modified
-# version.
-
-# Snippet (1
-# This debugging script has been automatically generated from `make check'.
-# Call it with `--help' to get a quick usage summary.
-
-at_package='@PACKAGE@'
-at_version='@VERSION@'
-# Snippet )1
-# Snippet (2
-at_n='@ECHO_N@'
-at_c='@ECHO_C@'
-test -f atlocal && . ./atlocal
-
-# LC_MESSAGES is always shadowed by LC_ALL.  Here are the only cases:
-# - GNU:       LANGUAGE -> LC_ALL -> LC_MESSAGES -> LANG
-# - POSIX:     LC_ALL -> LC_MESSAGES -> LANG
-# - XPG4:      LC_ALL -> LANG
-# - SysV/XPG2: LANG
-export LANGUAGE; LANGUAGE=C
-export LANG; LANG=C
-export LC_ALL; LC_ALL=C
-
-srcdir=@srcdir@
-top_srcdir=@top_srcdir@
-# Use absolute file notations, as the test might change directories.
-at_srcdir=`cd @srcdir@ && pwd`
-at_top_srcdir=`cd @top_srcdir@ && pwd`
-at_builddir=`pwd`
-at_top_builddir=`cd .. && pwd`
-if test -n "@AT_TESTPATH@"; then
-  export PATH; PATH=`pwd`:`cd @AT_TESTPATH@ && pwd`:$PATH
-else
-  export PATH; PATH=`pwd`:$PATH
-fi
-
-# We need GNU M4.
-M4='@M4@'
-
-# We need a C compiler.
-CC='@CC@'
-CFLAGS='@CFLAGS@'
-
-# We need `config.h'.
-CPPFLAGS="-I$at_top_builddir @CPPFLAGS@"
-
-# We want to use the files shipped with Bison.
-BISON_SIMPLE=$at_top_srcdir/src/bison.simple
-export BISON_SIMPLE
-BISON_HAIRY=$at_top_srcdir/src/bison.hairy
-export BISON_HAIRY
-# Snippet )2
@@ -1,420 +0,0 @@
-divert(-1)						    -*- Autoconf -*-
-# `m4' macros used in building test suites.
-# Copyright (C) 2000 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# 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.
-
-# This script is part of Autotest.  Unlimited permission to copy,
-# distribute and modify the testing scripts that are the output of
-# that Autotest script is given.  You need not follow the terms of the
-# GNU General Public License when using or distributing such scripts,
-# even though portions of the text of Autotest appear in them.  The
-# GNU General Public License (GPL) does govern all other use of the
-# material that constitutes the Autotest.
-#
-# Certain portions of the Autotest source text are designed to be
-# copied (in certain cases, depending on the input) into the output of
-# Autotest.  We call these the "data" portions.  The rest of the
-# Autotest source text consists of comments plus executable code that
-# decides which of the data portions to output in any given case.  We
-# call these comments and executable code the "non-data" portions.
-# Autotest never copies any of the non-data portions into its output.
-#
-# This special exception to the GPL applies to versions of Autotest
-# released by the Free Software Foundation.  When you make and
-# distribute a modified version of Autotest, you may extend this
-# special exception to the GPL to apply to your modified version as
-# well, *unless* your modified version has the potential to copy into
-# its output some of the text that was the non-data portion of the
-# version that you started with.  (In other words, unless your change
-# moves or copies text from the non-data portions to the data
-# portions.)  If your modification has such potential, you must delete
-# any notice of this special exception to the GPL from your modified
-# version.
-
-changequote()
-changequote([, ])
-
-define([AT_DEFINE], defn([define]))
-define([AT_EVAL], defn([eval]))
-define([AT_FORMAT], defn([format]))
-define([AT_INCLUDE], defn([include]))
-define([AT_SHIFT], defn([shift]))
-define([AT_UNDEFINE], defn([undefine]))
-
-undefine([define])
-undefine([eval])
-undefine([format])
-undefine([include])
-undefine([shift])
-undefine([undefine])
-
-
-# AT_CASE(SWITCH, VAL1, IF-VAL1, VAL2, IF-VAL2, ..., DEFAULT)
-# -----------------------------------------------------------
-# m4 equivalent of
-# switch (SWITCH)
-# {
-#   case VAL1:
-#     IF-VAL1;
-#     break;
-#   case VAL2:
-#     IF-VAL2;
-#     break;
-#   ...
-#   default:
-#     DEFAULT;
-#     break;
-# }.
-# All the values are optional, and the macro is robust to active
-# symbols properly quoted.
-AT_DEFINE([AT_CASE],
-[ifelse([$#], 0, [],
-	[$#], 1, [],
-	[$#], 2, [$2],
-        [$1], [$2], [$3],
-        [AT_CASE([$1], AT_SHIFT(AT_SHIFT(AT_SHIFT($@))))])])
-
-
-# Use of diversions:
-#  0 - overall initialization; for each test group: skipping and cleanups;
-#  1 - for each test group: proper code, to reinsert between cleanups;
-#  2 - overall wrap up: generation of debugging scripts and statistics.
-
-
-# AT_LINE
-# -------
-# Return the current file sans directory, a colon, and the current line.
-AT_DEFINE([AT_LINE],
-[patsubst(__file__, ^.*/\(.*\), \1):__line__])
-
-
-# AT_INIT(PROGRAM)
-# ----------------
-# Begin testing suite, using PROGRAM to check version.  The search path
-# should be already preset so the proper executable will be selected.
-AT_DEFINE([AT_INIT],
-[AT_DEFINE(AT_ordinal, 0)
-. ./atconfig
-# Snippet (3
-# -e sets to true
-at_stop_on_error=false;
-# Shall we save and check stdout and stderr?
-# -n sets to false
-at_check_stds=:;
-# Shall we
-# -s sets to false, and -v to true
-at_verbose=false
-
-at_usage="Usage: $[0] [OPTION]...
-
-  -e  Abort the full suite and inhibit normal clean up if a test fails
-  -n  Do not redirect stdout and stderr and do not test their contents
-  -s  Inhibit verbosity while generating or executing debugging scripts
-  -v  Force more detailed output, default for debugging scripts unless -s
-  -x  Have the shell to trace command execution; also implies option -n"
-
-# Snippet )3
-
-# Snippet (4
-while test $[#] -gt 0; do
-  case "$[1]" in
-    --help) echo "$at_usage"; exit 0 ;;
-    --version) echo "$[0] ($at_package) $at_version"; exit 0 ;;
-    -e) at_stop_on_error=:;;
-    -n) at_check_stds=false;;
-    -s) at_verbose=false; at_silent=1;;
-    -v) at_verbose=:; at_silent=;;
-    -x) at_traceon='set -vx'; at_traceoff='set +vx'; at_check_stds=false;;
-    *) echo 1>&2 "Try \`$[0] --help' for more information."; exit 1 ;;
-  esac
-  shift
-done
-
-
-# To check whether a test succeeded or not, we compare an expected
-# output with a reference.  In the testing suite, we just need `cmp'
-# but in debugging scripts, we want more information, so we prefer
-# `diff -u'.  Nonetheless we will use `diff' only, because in DOS
-# environments, `diff' considers that two files are equal included
-# when there are only differences on the coding of new lines. `cmp'
-# does not.
-#
-# Finally, not all the `diff' support `-u', and some, like Tru64, even
-# refuse to `diff' /dev/null.
-: >empty
-
-if diff -u empty empty >/dev/null 2>&1; then
-  at_diff='diff -u'
-else
-  at_diff='diff'
-fi
-
-
-
-# Each generated debugging script, containing a single test group, cleans
-# up files at the beginning only, not at the end.  This is so we can repeat
-# the script many times and browse left over files.  To cope with such left
-# over files, the full test suite cleans up both before and after test groups.
-# Snippet )4
-
-if $1 --version | grep "$at_package.*$at_version" >/dev/null; then
-  at_banner="Testing suite for $at_package, version $at_version"
-  at_dashes=`echo $at_banner | sed s/./=/g`
-  echo "$at_dashes"
-  echo "$at_banner"
-  echo "$at_dashes"
-else
-  echo '======================================================='
-  echo 'ERROR: Not using the proper version, no tests performed'
-  echo '======================================================='
-  exit 1
-fi
-
-# Remove any debugging script resulting from a previous run.
-rm -f debug-*.sh
-
-at_failed_list=
-at_ignore_count=0
-divert(2)[]dnl
-
-# Wrap up the testing suite with summary statistics.
-
-rm -f at-check-line at-setup-line
-at_fail_count=0
-if test -z "$at_failed_list"; then
-  if test "$at_ignore_count" = 0; then
-    at_banner="All $at_test_count tests were successful"
-  else
-    at_banner="All $at_test_count tests were successful ($at_ignore_count ignored)"
-  fi
-else
-  echo
-  echo $at_n "Writing \`debug-NN.sh' scripts, NN =$at_c"
-  for at_group in $at_failed_list; do
-    echo $at_n " $at_group$at_c"
-    ( echo '#!/bin/sh'
-      sed -n '/^[#] Snippet (1/,/^[#] Snippet )1/p' atconfig
-      sed -n '/^[#] Snippet (2/,/^[#] Snippet )2/p' atconfig
-      sed -n "/^[#] Snippet (3/,/^[#] Snippet )3/p" $[0]
-      test -z "$at_silent" && echo 'at_verbose=:'
-      sed -n "/^[#] Snippet (4/,/^[#] Snippet )4/p" $[0]
-      sed -n "/^[#] Snippet (c$at_group(/,/^[#] Snippet )c$at_group)/p" $[0]
-      at_desc=`sed -n \
-        '/^[#] Snippet (d'$at_group'(/,/^[#] Snippet )d'$at_group')/p' $[0] \
-        | sed -n '2s/^[#] //p'`
-      echo 'if $at_verbose; then'
-      echo '  at_banner="$[0]: '$at_desc'"'
-      echo '  at_dashes=`echo $at_banner | sed s/./=/g`'
-      echo '  echo'
-      echo '  echo "$at_dashes"'
-      echo '  echo "$at_banner"'
-      echo '  echo "$at_dashes"'
-      echo 'fi'
-      echo
-      sed -n "/^[#] Snippet (d$at_group(/,/^[#] Snippet )d$at_group)/p" $[0]
-      sed -n "/^[#] Snippet (s$at_group(/,/^[#] Snippet )s$at_group)/p" $[0]
-      echo 'exit 0'
-    ) | grep -v '^[#] Snippet' > debug-$at_group.sh
-    chmod +x debug-$at_group.sh
-    at_fail_count=`expr $at_fail_count + 1`
-  done
-  echo ', done'
-  if $at_stop_on_error; then
-    at_banner='ERROR: One of the tests failed, inhibiting subsequent tests'
-  else
-    at_banner="ERROR: Suite unsuccessful, $at_fail_count of $at_test_count tests failed"
-  fi
-fi
-at_dashes=`echo $at_banner | sed s/./=/g`
-echo
-echo "$at_dashes"
-echo "$at_banner"
-echo "$at_dashes"
-
-if test -n "$at_failed_list"; then
-  if test -z "$at_silent"; then
-    echo
-    echo 'When reporting failed tests to maintainers, do not merely list test'
-    echo 'numbers, as the numbering changes between releases and pretests.'
-    echo 'Be careful to give at least all the information you got about them.'
-    echo 'You may investigate any problem if you feel able to do so, in which'
-    echo 'case the generated debugging scripts provide good starting points.'
-    echo "Go on and modify them at will.  \`./debug-NN --help' gives usage"
-    echo 'information.  Now, failed tests will be executed again, verbosely.'
-    for at_group in $at_failed_list; do
-      ./debug-$at_group.sh
-    done
-  fi
-  exit 1
-fi
-
-exit 0
-divert[]dnl
-])# AT_INIT
-
-
-
-# AT_SETUP(DESCRIPTION)
-# ---------------------
-# Start a group of related tests, all to be executed in the same subshell.
-# The group is testing what DESCRIPTION says.
-AT_DEFINE([AT_SETUP],
-[AT_DEFINE([AT_ordinal], AT_EVAL(AT_ordinal + 1))
-pushdef([AT_group_description], [$1])
-pushdef([AT_data_files], )
-pushdef([AT_data_expout], )
-pushdef([AT_data_experr], )
-if $at_stop_on_error && test -n "$at_failed_list"; then :; else
-divert(1)[]dnl
-  echo AT_LINE > at-check-line
-  echo AT_LINE > at-setup-line
-  if $at_verbose; then
-    echo 'testing AT_group_description'
-    echo $at_n "     $at_c"
-  fi
-  if $at_verbose; then
-    echo "AT_ordinal. $srcdir/AT_LINE..."
-  else
-    echo $at_n "substr(AT_ordinal. $srcdir/AT_LINE                            , 0, 30)[]$at_c"
-  fi
-  if test -z "$at_skip_mode"; then
-    (
-[#] Snippet (d[]AT_ordinal[](
-[#] Testing AT_group_description
-[#] Snippet )d[]AT_ordinal[])
-[#] Snippet (s[]AT_ordinal[](
-[#] starting from `AT_LINE'.
-$at_traceon
-])
-
-
-# AT_CLEANUP(FILES)
-# -----------------
-# Complete a group of related tests, recursively remove those FILES
-# created within the test.  There is no need to list stdout, stderr,
-# nor files created with AT_DATA.
-AT_DEFINE([AT_CLEANUP],
-$at_traceoff
-[[#] Snippet )s[]AT_ordinal[])
-    )
-    at_status=$?
-    $at_verbose &&
-      echo $at_n "     AT_ordinal. $srcdir/`cat at-setup-line`: $at_c"
-    case $at_status in
-      0) echo ok
-         ;;
-      77) echo "ignored near \``cat at-check-line`'"
-          at_ignore_count=`expr $at_ignore_count + 1`
-          ;;
-      *) echo "FAILED near \``cat at-check-line`'"
-         at_failed_list="$at_failed_list AT_ordinal"
-         ;;
-    esac
-  else
-     echo 'ignored (skipped)'
-     at_ignore_count=`expr $at_ignore_count + 1`
-  fi
-  at_test_count=AT_ordinal
-  if $at_stop_on_error && test -n "$at_failed_list"; then :; else
-divert(0)[]dnl
-[#] Snippet (c[]AT_ordinal[](
-
-rm ifelse([AT_data_files$1], , [-f], [-rf[]AT_data_files[]ifelse($1, , , [ $1])]) stdout stderr[]AT_data_expout[]AT_data_experr
-[#] Snippet )c[]AT_ordinal[])
-undivert(1)[]dnl
-    rm ifelse([AT_data_files$1], , [-f], [-rf[]AT_data_files[]ifelse($1, , , [ $1])]) stdout stderr[]AT_data_expout[]AT_data_experr
-  fi
-fi
-popdef([AT_data_experr])
-popdef([AT_data_expout])
-popdef([AT_data_files])
-popdef([AT_group_description])[]dnl
-])# AT_CLEANUP
-
-
-# AT_DATA(FILE, CONTENTS)
-# -----------------------
-# Initialize an input data FILE with given CONTENTS, which should end with
-# an end of line.
-# This macro is not robust to active symbols in CONTENTS *on purpose*.
-# If you don't want CONTENT to be evaluated, quote it twice.
-AT_DEFINE([AT_DATA],
-[AT_DEFINE([AT_data_files], AT_data_files[ ]$1)
-cat >$1 <<'_ATEOF'
-$2[]_ATEOF
-])
-
-
-# AT_CHECK(COMMANDS, [STATUS], STDOUT, STDERR)
-# --------------------------------------------
-# Execute a test by performing given shell COMMANDS.  These commands
-# should normally exit with STATUS, while producing expected STDOUT and
-# STDERR contents.  The special word `expout' for STDOUT means that file
-# `expout' contents has been set to the expected stdout.  The special word
-# `experr' for STDERR means that file `experr' contents has been set to
-# the expected stderr.
-# STATUS is not checked if it is empty.
-# STDOUT and STDERR can be the special value `ignore', in which case
-# their content is not checked.
-AT_DEFINE([AT_CHECK],
-[$at_traceoff
-$at_verbose && echo "$srcdir/AT_LINE: patsubst([$1], [\([\"`$]\)], \\\1)"
-echo AT_LINE > at-check-line
-$at_check_stds && exec 5>&1 6>&2 1>stdout 2>stderr
-$at_traceon
-$1
-ifelse([$2], [], [],
-[at_status=$?
-if test $at_status != $2; then
-  $at_verbose && echo "Exit code was $at_status, expected $2" >&6
-dnl Maybe there was an important message to read before it died.
-  $at_verbose && $at_check_stds && cat stderr >&6
-dnl Preserve exit code 77.
-  test $at_status = 77 && exit 77
-  exit 1
-fi
-])dnl
-$at_traceoff
-if $at_check_stds; then
-dnl Restore stdout to fd1 and stderr to fd2.
-  exec 1>&5 2>&6
-dnl If not verbose, neutralize the output of diff.
-  $at_verbose || exec 1>/dev/null 2>/dev/null
-  at_failed=false;
-  AT_CASE([$4],
-          ignore, [$at_verbose && cat stderr;:],
-          experr, [AT_DEFINE([AT_data_experr], [ experr])dnl
-$at_diff experr stderr || at_failed=:],
-          [], [$at_diff empty stderr || at_failed=:],
-          [echo $at_n "patsubst([$4], [\([\"`$]\)], \\\1)$at_c" | $at_diff - stderr || at_failed=:])
-  AT_CASE([$3],
-          ignore, [$at_verbose && cat stdout;:],
-          expout, [AT_DEFINE([AT_data_expout], [ expout])dnl
-$at_diff expout stdout || at_failed=:],
-          [], [$at_diff empty stdout || at_failed=:],
-          [echo $at_n "patsubst([$3], [\([\"`$]\)], \\\1)$at_c" | $at_diff - stdout || at_failed=:])
-  if $at_failed; then
-    exit 1
-  else
-    :
-  fi
-fi
-$at_traceon
-])# AT_CHECK
-
-
-divert(0)dnl
@@ -0,0 +1,10 @@
+# @configure_input@					-*- shell-script -*-
+# Configurable variable values for Bison test suite.
+# Copyright 2000, 2001 Free Software Foundation, Inc.
+
+# We need a C compiler.
+CC='@CC@'
+CFLAGS='@CFLAGS@'
+
+# We need `config.h'.
+CPPFLAGS="-I $top_builddir @CPPFLAGS@"
@@ -0,0 +1,11 @@
+#! /bin/sh
+# Wrapper around a non installed bison to make it work as an installed one.
+. ./atconfig
+
+# We want to use the files shipped with Bison.
+BISON_SIMPLE=$top_srcdir/src/bison.simple
+export BISON_SIMPLE
+BISON_HAIRY=$top_srcdir/src/bison.hairy
+export BISON_HAIRY
+
+exec $top_builddir/src/bison ${1+"$@"}
@@ -1,11 +1,22 @@
-#                                                        -*- Autoconf -*-
+# Checking the output filenames.                         -*- Autotest -*-
+# Copyright 2000, 2001 Free Software Foundation, Inc.

-cat <<EOF
+# 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.

-Simple Calculator.
+# 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.

-EOF
+# 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.

+AT_BANNER([[Simple Calculator.]])

 ## ---------------------------------------------------- ##
 ## Compile the grammar described in the documentation.  ##
@@ -23,16 +34,16 @@ EOF
 # some occurrences of `$1' etc. which will be interpreted by m4.  So
 # you should call it with $1, $2, and $3 as arguments, which is what
 # AT_DATA_CALC_Y does.
-AT_DEFINE([_AT_DATA_CALC_Y],
-[ifelse([$1$2$3],
-        $[1]$[2]$[3], [],
-        [errprint([$0: Invalid arguments: $@
-])m4exit(1)])dnl
+m4_define([_AT_DATA_CALC_Y],
+[m4_if([$1$2$3], $[1]$[2]$[3], [],
+       [m4_fatal([$0: Invalid arguments: $@])])dnl
 AT_DATA([calc.y],
 [[/* Infix notation calculator--calc */

 %{
 #include <config.h>
+/* We don't need a perfect malloc for these tests. */
+#undef malloc
 #include <stdio.h>

 #if STDC_HEADERS
@@ -211,14 +222,16 @@ power (int base, int exponent)
 }

 int
-main (int argn, const char **argv)
+main (int argc, const char **argv)
 {
-  if (argn == 2)
+  yyin = NULL;
+
+  if (argc == 2)
    yyin = fopen (argv[1], "r");
  else
    yyin = stdin;

-  if (!stdin)
+  if (!yyin)
    {
      perror (argv[1]);
      exit (1);
@@ -241,41 +254,45 @@ main (int argn, const char **argv)
 # AT_DATA_CALC_Y([BISON-OPTIONS])
 # -------------------------------
 # Produce `calc.y'.
-AT_DEFINE([AT_DATA_CALC_Y],
+m4_define([AT_DATA_CALC_Y],
 [_AT_DATA_CALC_Y($[1], $[2], $[3],
-                 [ifelse(regexp([$1], [--yyerror-verbose]),
-                         [-1], [],
-                         [[#define YYERROR_VERBOSE]])])])
+                 [m4_match([$1], [--yyerror-verbose],
+                           [[#define YYERROR_VERBOSE]])])])



 # _AT_CHECK_CALC(BISON-OPTIONS, INPUT)
 # ------------------------------------
 # Run `calc' on INPUT and expect no STDOUT nor STDERR.
-# If `--debug' is passed to bison, discard all the debugging traces
-# preserving only the `parse errors'.  Note that since there should be
-# none, the `grep' will fail with exit status 1.
-AT_DEFINE([_AT_CHECK_CALC],
-[ifelse(regexp([$1], [--debug]),
-  [-1],
-     [AT_CHECK([echo "$2" | calc],
-               [0], [], [])],
-     [AT_CHECK([echo "$2" | calc 2>&1 >/dev/null | grep 'parse error' >&2],
-               [1], [], [])])])
+m4_define([_AT_CHECK_CALC],
+[AT_DATA([[input]],
+[[$2
+]])
+AT_CHECK([calc input])dnl
+])


 # _AT_CHECK_CALC_ERROR(BISON-OPTIONS, INPUT,
 #                      [ERROR-LOCATION], [IF-YYERROR-VERBOSE])
 # ------------------------------------------------------------
-# Run `calc' on INPUT, and expect STDERR.
-AT_DEFINE([_AT_CHECK_CALC_ERROR],
-[AT_CHECK([echo "$2" | calc 2>&1 >/dev/null | grep 'parse error' >&2], 0,
-          [],
-[ifelse(regexp([$1], [--location]),
-        [-1], [], [$3: ])[]dnl
+# Run `calc' on INPUT, and expect a `parse error' message.
+#
+# If BISON-OPTIONS contains `--location', then make sure the ERROR-LOCATION
+# is correctly output on stderr.
+#
+# If BISON-OPTIONS contains `--yyerror-verbose', then make sure the
+# IF-YYERROR-VERBOSE message is properly output after `parse error, '
+# on STDERR.
+m4_define([_AT_CHECK_CALC_ERROR],
+[AT_DATA([[input]],
+[[$2
+]])
+
+AT_CHECK([calc input], 0,
+         [],
+[m4_match([$1], [--location], [$3: ])[]dnl
 parse error[]dnl
-ifelse(regexp([$1], [--yyerror-verbose]),
-       [-1], [], [$4])[]dnl
+m4_match([$1], [--yyerror-verbose], [, $4])[]dnl

 ])])

@@ -284,14 +301,14 @@ ifelse(regexp([$1], [--yyerror-verbose]),
 # --------------------------------------------------------
 # Start a testing chunk which compiles `calc' grammar with
 # BISON-OPTIONS, and performs several tests over the parser.
-AT_DEFINE([AT_CHECK_CALC],
+m4_define([AT_CHECK_CALC],
 [# We use integers to avoid dependencies upon the precision of doubles.
 AT_SETUP([Calculator $1])

 AT_DATA_CALC_Y([$1])

 # Specify the output files to avoid problems on different file systems.
-AT_CHECK([bison calc.y -o calc.c patsubst([$1], [--yyerror-verbose])],
+AT_CHECK([bison calc.y -o calc.c m4_patsubst([$1], [--yyerror-verbose])],
         [0], [], [])
 AT_CHECK([$CC $CFLAGS $CPPFLAGS calc.c -o calc], 0, [], [])

@@ -314,21 +331,21 @@ _AT_CHECK_CALC([$1],
 # Some parse errors.
 _AT_CHECK_CALC_ERROR([$1], [+1],
                     [1.0:1.1],
-                     [, unexpected `'+''])
+                     [unexpected `'+''])
 _AT_CHECK_CALC_ERROR([$1], [1//2],
                     [1.2:1.3],
-                     [, unexpected `'/'', expecting `NUM' or `'-'' or `'(''])
+                     [unexpected `'/'', expecting `NUM' or `'-'' or `'(''])
 _AT_CHECK_CALC_ERROR([$1], [error],
                     [1.0:1.1],
-                     [, unexpected `$undefined.'])
+                     [unexpected `$undefined.'])
 _AT_CHECK_CALC_ERROR([$1], [1 = 2 = 3],
                     [1.6:1.7],
-                     [, unexpected `'=''])
+                     [unexpected `'=''])
 _AT_CHECK_CALC_ERROR([$1],
                     [
 +1],
                     [2.0:2.1],
-                     [, unexpected `'+''])
+                     [unexpected `'+''])

 AT_CLEANUP(calc calc.c calc.h calc.output)
 ])# AT_CHECK_CALC
@@ -0,0 +1,70 @@
+# Checking the output filenames.                    -*- Autotest -*-
+# Copyright 2000, 2001 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# 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.
+
+AT_BANNER([[Output file names.]])
+
+
+# AT_CHECK_OUTPUT(INPUT-FILE, [DIRECTIVES], [FLAGS], EXPECTED-FILES)
+# ------------------------------------------------------------------
+m4_define([AT_CHECK_OUTPUT],
+[AT_SETUP([Output files: $2 & $3.])
+AT_DATA([$1],
+[[$2
+%%
+foo: {}
+]])
+
+AT_CHECK([bison $3 $1], 0)
+AT_CHECK([ls $4], [], [ignore])
+AT_CLEANUP($4)
+])
+
+AT_CHECK_OUTPUT([foo.y], [], [-dv],
+                [foo.output foo.tab.c foo.tab.h])
+AT_CHECK_OUTPUT([foo.y], [], [-dv -o foo.c],
+                [foo.c foo.h foo.output])
+AT_CHECK_OUTPUT([foo.y], [], [-dv -o foo.tab.c],
+                [foo.output foo.tab.c foo.tab.h])
+AT_CHECK_OUTPUT([foo.y], [], [-dv -y],
+                [y.output y.tab.c y.tab.h])
+AT_CHECK_OUTPUT([foo.y], [], [-dv -b bar],
+                [bar.output bar.tab.c bar.tab.h])
+AT_CHECK_OUTPUT([foo.y], [], [-dv -g -o foo.c],
+                [foo.c foo.h foo.output foo.vcg])
+
+
+AT_CHECK_OUTPUT([foo.y], [%defines %verbose],      [],
+                [foo.output foo.tab.c foo.tab.h])
+AT_CHECK_OUTPUT([foo.y], [%defines %verbose %yacc],[],
+                [y.output y.tab.c y.tab.h])
+
+
+# Check priorities of extension control.
+AT_CHECK_OUTPUT([foo.yy], [%defines %verbose], [],
+                [foo.output foo.tab.cc foo.tab.hh])
+
+AT_CHECK_OUTPUT([foo.yy], [%defines %verbose ], [-o foo.c],
+                [foo.c foo.h foo.output])
+
+AT_CHECK_OUTPUT([foo.yy], [],
+                [--defines=foo.hpp -o foo.c++],
+                [foo.c++ foo.hpp])
+
+AT_CHECK_OUTPUT([foo.yy], [],
+                [-o foo.c++ --graph=foo.gph],
+                [foo.c++ foo.gph])
@@ -1,11 +1,22 @@
-#                                                        -*- Autoconf -*-
+# Bison Regressions.                               -*- Autotest -*-
+# Copyright 2001 Free Software Foundation, Inc.

-cat <<EOF
+# 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.

-Regression tests.
+# 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.

-EOF
+# 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.

+AT_BANNER([[Regression tests.]])

 ## ------------------ ##
 ## Duplicate string.  ##
@@ -53,3 +64,26 @@ exp: {};
 AT_CHECK([bison --defines union.y])

 AT_CLEANUP([union.*])
+
+
+## --------------------------------------- ##
+## Duplicate '/' in C comments in %union   ##
+## --------------------------------------- ##
+
+
+AT_SETUP([%union and C comments])
+
+AT_DATA([union-comment.y],
+[%union	
+{
+  /* The int.  */	int   integer;
+  /* The string.  */	char *string ;
+}
+%%
+exp: {};
+])
+
+AT_CHECK([bison union-comment.y])
+AT_CHECK([fgrep '//*' union-comment.tab.c], [1], [])
+
+AT_CLEANUP([union-comment.*])
@@ -1,61 +0,0 @@
-#! /bin/sh
-# -*- Autoconf -*-
-# Validation suite for Bison.
-# Copyright 2000 Free Software Foundation, Inc.
-
-AT_INIT([bison])
-
-## ---------------------------- ##
-## Checking output file names.  ##
-## ---------------------------- ##
-
-# AT_CHECK_BISON_FLAGS(FLAGS, EXPECTED-FILES-SORTED)
-# --------------------------------------------------
-AT_DEFINE([AT_CHECK_BISON_FLAGS],
-[AT_SETUP([Output files: $1.])
-AT_DATA([foo.y],
-[[%%
-foo: {}
-]])
-rm -rf $2
-AT_CHECK([bison -dv foo.y $1], 0, ignore, ignore)
-AT_CHECK([ls $2 | sort | tr '\n' ' ' | sed 's/.$//g'], 0, [$2])
-rm -f $2
-AT_CLEANUP
-])
-
-AT_CHECK_BISON_FLAGS([],             [foo.output foo.tab.c foo.tab.h])
-AT_CHECK_BISON_FLAGS([-o foo.c],     [foo.c foo.h foo.output])
-AT_CHECK_BISON_FLAGS([-o foo.tab.c], [foo.output foo.tab.c foo.tab.h])
-AT_CHECK_BISON_FLAGS([-y],           [y.output y.tab.c y.tab.h])
-AT_CHECK_BISON_FLAGS([-b bar],       [bar.output bar.tab.c bar.tab.h])
-
-
-
-# AT_CHECK_BISON_PERCENT(GRAMMAR-OPTIONS, EXPECTED-FILES-SORTED)
-# --------------------------------------------------------------
-AT_DEFINE([AT_CHECK_BISON_PERCENT],
-[AT_SETUP([Output files: $1.])
-AT_DATA([foo.y],
-[[$1
-%defines
-%verbose
-%%
-foo: {}
-]])
-rm -rf $2
-AT_CHECK([bison foo.y], 0, ignore, ignore)
-AT_CHECK([ls $2 | sort | tr '\n' ' ' | sed 's/.$//g'], 0, [$2])
-rm -f $2
-AT_CLEANUP
-])
-
-# The sames, but using the % directives.
-AT_CHECK_BISON_PERCENT([],                  [foo.output foo.tab.c foo.tab.h])
-# AT_CHECK_BISON_PERCENT([%output foo.c],     [foo.c foo.h foo.output])
-# AT_CHECK_BISON_PERCENT([%output foo.tab.c], [foo.output foo.tab.c foo.tab.h])
-AT_CHECK_BISON_PERCENT([%yacc],             [y.output y.tab.c y.tab.h])
-# AT_CHECK_BISON_PERCENT([%file_prefix bar],  [bar.output bar.tab.c bar.tab.h])
-
-AT_INCLUDE([calc.at])
-AT_INCLUDE([regression.at])
@@ -0,0 +1,30 @@
+# Process this file with autom4te to create testsuite. -*- Autotest -*-
+
+# Test suite for GNU Bison.
+# Copyright 2000, 2001 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# 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 Autotest.
+m4_version_prereq([2.52d])
+
+AT_INIT
+
+AT_VICTIMS([bison])
+
+m4_include([output.at])
+m4_include([calc.at])
+m4_include([regression.at])
Author	SHA1	Message	Date
Akim Demaille	9e42f7b625	Version 1.29b.	2001-09-27 08:54:51 +00:00
Akim Demaille	f87fc33f87	Regen.	2001-09-27 08:54:11 +00:00
Akim Demaille	7ba81a101f	* src/system.h: Include `xalloc.h'. Remove it from the C files. * src/files.c (output_files): Free the obstacks. * src/lex.c (init_lex): Rename as... (lex_init): this. (lex_free): New. * src/main.c (main): Use it.	2001-09-25 18:35:04 +00:00
Marc Autret	9190f3e726	* src/vcg.c (open_edge, close_edge, open_node, close_node): Change to output informations in fout (FILE). (open_graph, close_graph): Likewise. (output_graph, output_edge, output_node): Likewise. src/vcg.h: Update function prototypes. * src/print_graph.c (print_graph): Open output graph file. (print_actions): Adjust. * src/files.h: Remove extern declaration. * src/files.c: Remove graph_obstack declaration. (open_files): Remove graph_obstack initialization. (output_files): Remove graph_obstack saving.	2001-09-24 15:54:18 +00:00
Marc Autret	330de47708	* src/files.c (compute_output_file_names): Fix.	2001-09-24 14:14:58 +00:00
Akim Demaille	bb84601097	* src/reader.c (reader): Remove call to free_symtab (). * src/main.c (main): Call it here. Include symtab.h. * src/conflicts.c (initialize_conflicts): Rename as... (solve_conflicts): this. * src/print.c (print_core, print_actions, print_state) (print_grammar): Dump to a file instead a `output_obstack'. (print_results): Dump `output_obstack', and then proceed with the FILE . src/files.c (compute_output_file_names, close_files): New. (output_files): Adjust. * src/main.c (main): Adjust.	2001-09-24 08:15:53 +00:00
Marc Autret	9a96ccfa20	* src/files.c (compute_header_macro): Computes header macro name from spec_defines_file when given.	2001-09-23 14:49:30 +00:00
Marc Autret	6051d37287	* src/files.c (output_files): Add default extensions.	2001-09-23 14:09:59 +00:00
Akim Demaille	2aec1bc1de	* src/conflicts.c (finalize_conflicts): Rename as... (free_conflicts): this.	2001-09-22 18:13:24 +00:00
Akim Demaille	c6e1f6235a	* src/gram.c (gram_free): Rename back as... (dummy): this. (output_token_translations): Free `token_translations'. * src/symtab.c (free_symtab): Free the tag field.	2001-09-22 17:57:59 +00:00
Akim Demaille	ab6fbb02ad	Remove `translations' as it is always set to true. * src/gram.h: Adjust. * src/reader.c (packsymbols, parse_token_decl): Adjust * src/print.c (print_grammar): Adjust. * src/output.c (output_token_translations): Adjust. * src/lex.c (lex): Adjust. * src/gram.c: Be sure the set pointers to NULL. (dummy): Rename as... (gram_free): this.	2001-09-22 17:43:26 +00:00
Akim Demaille	f2632e420f	* configure.in: Invoke AM_LIB_DMALLOC. * src/system.h: Use dmalloc. * src/LR0.c: Be sure to have pointers initialized to NULL. (allocate_itemsets): Allocate kernel_items only if needed.	2001-09-22 17:19:03 +00:00
Akim Demaille	19f01e885f	* configure.in: Bump to 1.29b. * tests/Makefile.am (DISTCLEANFILES): Add package.m4. * tests/calc.at (_AT_DATA_CALC_Y): #undef malloc so that we don't need xmalloc.c in calc.y. From Pascal Bart.	2001-09-22 16:56:37 +00:00
Akim Demaille	6792619fa8	.	2001-09-22 16:23:53 +00:00
Akim Demaille	645ff8cdee	Regen.	2001-09-22 16:13:59 +00:00
Akim Demaille	a726df0b44	* configure.in (ALL_LINGUAS): Add "tr". * po/.cvsignore: Ignore GMO files.	2001-09-21 16:52:42 +00:00
Akim Demaille	ce209526ed	* tests/Makefile.am ($(srcdir)/$(TESTSUITE)): No longer depend upon package.m4.	2001-09-21 16:41:46 +00:00
Akim Demaille	b94bf14aac	More ignores.	2001-09-21 16:35:45 +00:00
Akim Demaille	2a4426474d	Version 1.29a. * Makefile.maint, config/config.guess, config/config.sub, * config/missing: Update from masters.	2001-09-21 16:28:06 +00:00
Marc Autret	9022c575cc	Update.	2001-09-21 15:45:54 +00:00
Akim Demaille	dae9263b7b	Adjust.	2001-09-21 14:45:03 +00:00
Akim Demaille	cdd11a9322	* tests/Makefile.am (package.m4): Move to... ($(srcdir)/$(TESTSUITE)): here.	2001-09-21 14:44:22 +00:00
Akim Demaille	da7ab9b7b0	* src/complain.c: No longer try to be standalone: use system.h. Don't assume __STDC__ is defined to 1. Just test if it is defined. * src/complain.h: Likewise. * src/reduce.c (useless_nonterminals, inaccessable_symbols): Remove the unused variable `n'. From Albert Chin-A-Young.	2001-09-20 17:08:42 +00:00
Akim Demaille	0899b02570	Regen.	2001-09-20 17:08:06 +00:00
Marc Autret	0f23d6d25b	* doc/bison.1: Update. * doc/bison.texinfo (Bison Options): Update --defines and --graph descriptions. (Option Cross Key): Update. Add --graph.	2001-09-19 13:09:32 +00:00
Marc Autret	47cef7a2ff	* tests/regression.at: New test (comment in %union).	2001-09-18 15:18:26 +00:00
Marc Autret	7972022dac	* src/reader.c (parse_union_decl): Do not output '/'. Let copy_comment do that. Reported by Keith Browne.	2001-09-18 11:37:11 +00:00
Marc Autret	ea4f4c4c1b	* tests/output.at: Add tests for --defines and --graph.	2001-09-18 11:14:21 +00:00
Marc Autret	d97207ad77	* tests/output.at: Removes tests of %{header,src}_extension features.	2001-09-18 11:04:29 +00:00
Akim Demaille	3068221b53	* 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 10:51:36 +00:00
Akim Demaille	6f0d1fd89d	Regen.	2001-09-18 10:44:11 +00:00
Marc Autret	6526f6dbf7	* 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-17 23:00:01 +00:00
Marc Autret	817e461c23	Update.	2001-09-17 22:21:16 +00:00
Marc Autret	c4e3dae3ac	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-17 22:20:08 +00:00
Akim Demaille	8cedc168fa	* 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 09:59:39 +00:00
Akim Demaille	3b14996787	* tests/calc.at: Use m4_match. (_AT_DATA_CALC_Y): Check `yyin != NULL', not `stdin != NULL'.	2001-09-10 09:31:50 +00:00
Akim Demaille	041cad1677	* 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 08:33:25 +00:00
Akim Demaille	31478b7ab7	* configure.in: Bump to 1.29a.	2001-09-10 08:23:56 +00:00
Akim Demaille	e957bbb7d4	.	2001-09-07 12:56:52 +00:00
Akim Demaille	b5f513ef2c	In config/ now.	2001-09-07 12:34:16 +00:00
Akim Demaille	3afa674b1d	Version 1.29.	2001-09-07 12:12:30 +00:00
Akim Demaille	ac481f3b08	Newer translations.	2001-08-31 14:11:48 +00:00
Marc Autret	010c94a243	Update	2001-08-31 00:08:57 +00:00
Akim Demaille	d37a7c45b3	Regen. and fix typo in configure.in.	2001-08-30 15:41:41 +00:00
Akim Demaille	d63e24071f	* 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-30 15:36:37 +00:00
Akim Demaille	afd36419df	Bump to 1.28e.	2001-08-29 12:54:26 +00:00
Akim Demaille	6918b5fcc9	Version 1.28d.	2001-08-29 12:32:10 +00:00
Robert Anisko	38e616f0f5	* 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-29 12:21:38 +00:00
Akim Demaille	db433e9db8	* doc/bison.texinfo (Location Tracking Calc): New node.	2001-08-29 12:16:04 +00:00
Robert Anisko	870f12c270	* src/output.c (output): Do not define const, as this now causes more problems than it cures.	2001-08-29 12:13:03 +00:00
Akim Demaille	e0a53a7f4a	More ignores.	2001-08-29 12:08:41 +00:00
Akim Demaille	27c1ceb8da	* doc/bison.texinfo: Modernize `@node' and` @top' use: just name the nodes. Be sure to tag the `detailmenu'.	2001-08-29 12:07:46 +00:00
Akim Demaille	8f5d3a2dd5	Update.	2001-08-29 10:46:39 +00:00
Akim Demaille	adfd774c80	* Makefile.maint (do-po-update): Wget refuses to overwrite files: download in a tmp dir.	2001-08-29 10:46:17 +00:00
Marc Autret	057194c61e	* config/depcomp: New file.	2001-08-28 16:25:45 +00:00
Marc Autret	a6f622cd50	* doc/bison.1 (mandoc): Adjust. From Juan Manuel Guerrero.	2001-08-28 13:58:27 +00:00
Marc Autret	2b8ce46775	* src/print_graph.c (print_state): Fix.	2001-08-28 11:33:36 +00:00
Marc Autret	19553c4e06	* 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 22:16:23 +00:00
Marc Autret	b1722803ec	* src/vcg.c: Include `xalloc.h'. (add_colorentry): New. (add_classname): New. (add_infoname): New. * src/vcg.h: Add new prototypes.	2001-08-27 12:02:47 +00:00
Akim Demaille	6f5e0eea04	Regen.	2001-08-27 10:50:12 +00:00
Akim Demaille	e4ad4676be	* Makefile.maint: Sync. again with CVS Autoconf.	2001-08-27 10:44:39 +00:00
Akim Demaille	7b50efe542	Run update.	2001-08-27 10:14:26 +00:00
Akim Demaille	cf90ca5d46	* Makefile.maint: Formatting changes. (po-update, cvs-update, update): New targets. (AMTAR): Remove.	2001-08-27 10:14:05 +00:00
Akim Demaille	e373aad966	* Makefile.am (AUTOMAKE_OPTIONS): 1.5. * Makefile.maint: Sync. with CVS Autoconf.	2001-08-27 09:33:34 +00:00
Marc Autret	3e4c37cf7b	* 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-26 23:48:50 +00:00
Marc Autret	dfaa776005	* src/reader.c (parse_dquoted_param): Rename variable `index' to` i'. This one shadowed a global parameter.	2001-08-26 23:36:42 +00:00
Marc Autret	aecd294cb0	Adjust	2001-08-26 23:31:49 +00:00
Marc Autret	52eddd8c33	* src/print_graph.c (node_output_size): Declared POSIX `size_t' type, instead of `unsigned'. (print_state): Donnot call obstack_object_size () in obstack_grow () to avoid macro variables shadowing.	2001-08-24 18:47:20 +00:00
Marc Autret	60403d1bc1	* src/lex.c (percent_table): Typo: s/naem/name/. Add graph option. Normalize new options declarations.	2001-08-24 18:36:50 +00:00
Pascal Bart	dd9f12de60	* tests/suite.at: Exercise %header_extension and %source_extension.	2001-08-21 07:30:37 +00:00
Marc Autret	6085f203e1	Update with new graph option.	2001-08-16 20:56:55 +00:00
Marc Autret	7a360eeaed	* src/reader.c (parse_dquoted_param): New. (parse_header_extension_decl): Use it. (parse_source_extension_decl): Likewise.	2001-08-16 20:48:02 +00:00
Marc Autret	af550e2927	* src/vcg.c: Remove includes of `complain.h' and` xalloc.h'. (get_xxxx_str): Use assert () instead of complain (). Remove return invokations in default cases. (get_decision_str): Modify default behaviour. Remove second argument. Echo modifications on calls. (output_graph): Fix.	2001-08-16 20:01:14 +00:00
Marc Autret	78632bbcdc	* src/getargs.c (usage): Update with ``-g, --graph''.	2001-08-16 18:50:04 +00:00
Marc Autret	483c899a17	* doc/bison.texinfo (Bison Options): Add items `-g',` --graph'. (Option Cross Key): Likewise. * doc/bison.1: Update.	2001-08-16 18:29:46 +00:00
@@ -1 +1 @@
 .28c
 .29a