Regen.

* po/.cvsignore: Ignore GMO files.

ChangeLog

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

Makefile.in

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

Makefile.maint

@@ -135,9 +135,8 @@ update: wget-update cvs-update po-update
 ## Sanity checks.  ##
 ## --------------- ##
 
-# Checks that don't require cvs.
+# Checks that don't require cvs.  Run `changelog-check' last as
-# Run `changelog-check' as previous test may reveal problems requiring
+# previous test may reveal problems requiring new ChangeLog entries.
-# new ChangeLog entries.
 local-check: po-check copyright-check writable-files changelog-check
 
 changelog-check:
@@ -223,6 +222,7 @@ cvs-dist: local-check cvs-check maintainer-distcheck
 null_AM_MAKEFLAGS = \
   ACLOCAL=false \
   AUTOCONF=false \
+  AUTOM4TE=false \
   AUTOMAKE=false \
   AUTOHEADER=false \
   MAKEINFO=false

NEWS

@@ -1,6 +1,19 @@
 Bison News
 ----------
 
+Changes in version 1.29a:
+
+* `--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.

THANKS

@@ -2,6 +2,7 @@ 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]
@@ -9,6 +10,7 @@ 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]

config/config.guess

@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 #   Free Software Foundation, Inc.
 
-timestamp='2001-09-04'
+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,12 +352,6 @@ EOF
     aushp:SunOS:*:*)
 	echo sparc-auspex-sunos${UNAME_RELEASE}
 	exit 0 ;;
-    sparc*:NetBSD:*)
-	echo `uname -p`-unknown-netbsd${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
@@ -365,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 ;;
@@ -664,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 ;;
@@ -718,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 ;;
@@ -733,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 ;;

config/config.sub

@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 #   Free Software Foundation, Inc.
 
-timestamp='2001-09-04'
+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
@@ -280,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-* \
@@ -294,8 +295,8 @@ case $basic_machine in
 	| m88110-* | m88k-* | mcore-* \
 	| mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \
 	| mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \
-	| mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipsel-* \
+	| mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \
-	| mipsle-* | mipstx39-* | mipstx39el-* \
+	| mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \

config/missing

@@ -78,7 +78,7 @@ Supported PROGRAM values:
     ;;
 
   -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing 0.3 - GNU automake"
+    echo "missing 0.4 - GNU automake"
     ;;
 
   -*)
@@ -88,6 +88,11 @@ 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_ac}'.  You might want
@@ -97,6 +102,11 @@ WARNING: \`$1' is missing on your system.  You should only need it if
     ;;
 
   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_ac}'.  You might want to install the
@@ -106,6 +116,11 @@ WARNING: \`$1' is missing on your system.  You should only need it if
     ;;
 
   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_ac}'.  You might want
@@ -125,6 +140,11 @@ 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_ac}'.
@@ -135,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
@@ -189,6 +237,11 @@ WARNING: \`$1' is missing on your system.  You should only need it if
     ;;
 
   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

config/prev-version.txt

@@ -1 +1 @@
-1.28d
+1.29

configure.in

@@ -18,10 +18,10 @@
 # We need a recent Autoconf to run a recent Autotest.
 AC_PREREQ(2.52c)
 
-AC_INIT([GNU Bison], [1.29], [[email protected]])
+AC_INIT([GNU Bison], [1.29a], [[email protected]])
 AC_CONFIG_AUX_DIR(config)
 
-AM_INIT_AUTOMAKE([bison], [1.29])
+AM_INIT_AUTOMAKE([bison], [1.29a])
 AM_CONFIG_HEADER(config.h:config.hin)
 
 # Initialize the test suite.
@@ -89,7 +89,7 @@ jm_FUNC_REALLOC
 jm_PREREQ_QUOTEARG
 jm_PREREQ_ERROR
 
-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

doc/bison.1

@@ -10,11 +10,11 @@ bison \- GNU Project parser generator (yacc replacement)
 ] [
 .B \-d
 ] [
-.B \-\-defines
+.BI \-\-defines= defines-file
 ] [
 .B \-g
 ] [
-.B \-\-graph
+.BI \-\-graph= graph-file
 ] [
 .B \-k
 ] [
@@ -127,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 ,
@@ -149,17 +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
-.TP
-.BI \-\-graph
 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

doc/bison.info

@@ -31,115 +31,115 @@ instead of in the original English.
 
 Indirect:
 bison.info-1: 1313
-bison.info-2: 50686
+bison.info-2: 50691
-bison.info-3: 100576
+bison.info-3: 100581
-bison.info-4: 150126
+bison.info-4: 150131
-bison.info-5: 197513
+bison.info-5: 197908
 
 Tag Table:
 (Indirect)
 Node: Top1313
-Node: Introduction8965
+Node: Introduction8969
-Node: Conditions10239
+Node: Conditions10244
-Node: Copying11703
+Node: Copying11708
-Node: Concepts30906
+Node: Concepts30911
-Node: Language and Grammar31985
+Node: Language and Grammar31990
-Node: Grammar in Bison37001
+Node: Grammar in Bison37006
-Node: Semantic Values38925
+Node: Semantic Values38930
-Node: Semantic Actions41026
+Node: Semantic Actions41031
-Node: Locations Overview42215
+Node: Locations Overview42220
-Node: Bison Parser43662
+Node: Bison Parser43667
-Node: Stages45974
+Node: Stages45979
-Node: Grammar Layout47257
+Node: Grammar Layout47262
-Node: Examples48514
+Node: Examples48519
-Node: RPN Calc49712
+Node: RPN Calc49717
-Node: Rpcalc Decls50686
+Node: Rpcalc Decls50691
-Node: Rpcalc Rules52273
+Node: Rpcalc Rules52278
-Node: Rpcalc Input54073
+Node: Rpcalc Input54078
-Node: Rpcalc Line55534
+Node: Rpcalc Line55539
-Node: Rpcalc Expr56649
+Node: Rpcalc Expr56654
-Node: Rpcalc Lexer58594
+Node: Rpcalc Lexer58599
-Node: Rpcalc Main61166
+Node: Rpcalc Main61171
-Node: Rpcalc Error61564
+Node: Rpcalc Error61569
-Node: Rpcalc Gen62572
+Node: Rpcalc Gen62577
-Node: Rpcalc Compile63721
+Node: Rpcalc Compile63726
-Node: Infix Calc64596
+Node: Infix Calc64601
-Node: Simple Error Recovery67303
+Node: Simple Error Recovery67308
-Node: Location Tracking Calc69192
+Node: Location Tracking Calc69197
-Node: Ltcalc Decls69922
+Node: Ltcalc Decls69927
-Node: Ltcalc Rules70831
+Node: Ltcalc Rules70836
-Node: Ltcalc Lexer72892
+Node: Ltcalc Lexer72897
-Node: Multi-function Calc75230
+Node: Multi-function Calc75235
-Node: Mfcalc Decl76797
+Node: Mfcalc Decl76802
-Node: Mfcalc Rules78820
+Node: Mfcalc Rules78825
-Node: Mfcalc Symtab80200
+Node: Mfcalc Symtab80205
-Node: Exercises86573
+Node: Exercises86578
-Node: Grammar File87079
+Node: Grammar File87084
-Node: Grammar Outline87927
+Node: Grammar Outline87932
-Node: C Declarations88661
+Node: C Declarations88666
-Node: Bison Declarations89241
+Node: Bison Declarations89246
-Node: Grammar Rules89653
+Node: Grammar Rules89658
-Node: C Code90113
+Node: C Code90118
-Node: Symbols91043
+Node: Symbols91048
-Node: Rules96124
+Node: Rules96129
-Node: Recursion97763
+Node: Recursion97768
-Node: Semantics99482
+Node: Semantics99487
-Node: Value Type100576
+Node: Value Type100581
-Node: Multiple Types101248
+Node: Multiple Types101253
-Node: Actions102265
+Node: Actions102270
-Node: Action Types105050
+Node: Action Types105055
-Node: Mid-Rule Actions106353
+Node: Mid-Rule Actions106358
-Node: Locations111923
+Node: Locations111928
-Node: Location Type112571
+Node: Location Type112576
-Node: Actions and Locations113129
+Node: Actions and Locations113134
-Node: Location Default Action115285
+Node: Location Default Action115290
-Node: Declarations116748
+Node: Declarations116753
-Node: Token Decl118067
+Node: Token Decl118072
-Node: Precedence Decl120080
+Node: Precedence Decl120085
-Node: Union Decl121631
+Node: Union Decl121636
-Node: Type Decl122475
+Node: Type Decl122480
-Node: Expect Decl123381
+Node: Expect Decl123386
-Node: Start Decl124927
+Node: Start Decl124932
-Node: Pure Decl125305
+Node: Pure Decl125310
-Node: Decl Summary126982
+Node: Decl Summary126987
-Node: Multiple Parsers132365
+Node: Multiple Parsers132370
-Node: Interface133859
+Node: Interface133864
-Node: Parser Function134731
+Node: Parser Function134736
-Node: Lexical135566
+Node: Lexical135571
-Node: Calling Convention136972
+Node: Calling Convention136977
-Node: Token Values139743
+Node: Token Values139748
-Node: Token Positions140892
+Node: Token Positions140897
-Node: Pure Calling141777
+Node: Pure Calling141782
-Node: Error Reporting144709
+Node: Error Reporting144714
-Node: Action Features146831
+Node: Action Features146836
-Node: Algorithm150126
+Node: Algorithm150131
-Node: Look-Ahead152419
+Node: Look-Ahead152424
-Node: Shift/Reduce154551
+Node: Shift/Reduce154556
-Node: Precedence157463
+Node: Precedence157468
-Node: Why Precedence158114
+Node: Why Precedence158119
-Node: Using Precedence159979
+Node: Using Precedence159984
-Node: Precedence Examples160947
+Node: Precedence Examples160952
-Node: How Precedence161648
+Node: How Precedence161653
-Node: Contextual Precedence162797
+Node: Contextual Precedence162802
-Node: Parser States164588
+Node: Parser States164593
-Node: Reduce/Reduce165831
+Node: Reduce/Reduce165836
-Node: Mystery Conflicts169392
+Node: Mystery Conflicts169397
-Node: Stack Overflow172778
+Node: Stack Overflow172783
-Node: Error Recovery174151
+Node: Error Recovery174156
-Node: Context Dependency179287
+Node: Context Dependency179292
-Node: Semantic Tokens180135
+Node: Semantic Tokens180140
-Node: Lexical Tie-ins183152
+Node: Lexical Tie-ins183157
-Node: Tie-in Recovery184700
+Node: Tie-in Recovery184705
-Node: Debugging186872
+Node: Debugging186877
-Node: Invocation190173
+Node: Invocation190178
-Node: Bison Options191425
+Node: Bison Options191430
-Node: Environment Variables195037
+Node: Environment Variables195398
-Node: Option Cross Key195885
+Node: Option Cross Key196246
-Node: VMS Invocation196729
+Node: VMS Invocation197124
-Node: Table of Symbols197513
+Node: Table of Symbols197908
-Node: Glossary205152
+Node: Glossary205547
-Node: Copying This Manual211456
+Node: Copying This Manual211851
-Node: GNU Free Documentation License211665
+Node: GNU Free Documentation License212060
-Node: Index231530
+Node: Index231925
 
 End Tag Table

doc/bison.info-1

@@ -34,7 +34,8 @@ File: bison.info,  Node: Top,  Next: Introduction,  Up: (dir)
 Bison
 *****
 
-   This manual documents version 1.29 of Bison, updated 29 August 2001.
+   This manual documents version 1.29a of Bison, updated 20 September
+2001.
 
 * Menu:
 
@@ -237,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.29 of Bison.
+   This edition corresponds to version 1.29a of Bison.
 
 
 File: bison.info,  Node: Conditions,  Next: Copying,  Prev: Introduction,  Up: Top

doc/bison.info-4

@@ -1152,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
@@ -1177,11 +1181,15 @@ Adjust the output:
      described under the `-v' and `-d' options.
 
 `-g'
-`--graph'
      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
 
@@ -1214,9 +1222,10 @@ Option Cross Key
 find the corresponding short option.
 
      --debug                               -t
-     --defines                             -d
+     --defines=DEFINES-FILE          -d
      --file-prefix=PREFIX                  -b FILE-PREFIX
      --fixed-output-files --yacc           -y
+     --graph=GRAPH-FILE              -d
      --help                                -h
      --name-prefix=PREFIX                  -p NAME-PREFIX
      --no-lines                            -l

doc/bison.texinfo

@@ -5085,12 +5085,16 @@ Adjust the output:
 
 @table @option
 @item -d
-@itemx --defines
 Pretend that @code{%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 @code{YYSTYPE}, as well as a few
 @code{extern} variable declarations.  @xref{Decl Summary}.
 
+@item --defines=@var{defines-file}
+The behaviour of @var{--defines} is the same than @samp{-d}. The only 
+difference is that it has an optionnal argument which is the name of
+the output filename.
+
 @item -b @var{file-prefix}
 @itemx --file-prefix=@var{prefix}
 Specify a prefix to use for all Bison output file names.  The names are
@@ -5110,10 +5114,14 @@ The other output files' names are constructed from @var{outfile}
 as described under the @samp{-v} and @samp{-d} options.
 
 @item -g
-@itemx --graph
 Output a VCG definition of the LALR(1) grammar automaton computed by
 Bison. If the grammar file is @file{foo.y}, the VCG output file will
 be @file{foo.vcg}.
+
+@item --graph=@var{graph-file}
+The behaviour of @var{--graph} is the same than @samp{-g}. The only 
+difference is that it has an optionnal argument which is the name of
+the output graph filename.
 @end table
 
 @node Environment Variables
@@ -5171,9 +5179,10 @@ the corresponding short option.
 @ifinfo
 @example
 --debug                               -t
---defines                             -d
+--defines=@var{defines-file}          -d
 --file-prefix=@var{prefix}                  -b @var{file-prefix}
 --fixed-output-files --yacc           -y
+--graph=@var{graph-file}              -d
 --help                                -h
 --name-prefix=@var{prefix}                  -p @var{name-prefix}
 --no-lines                            -l

doc/stamp-vti

@@ -1,4 +1,4 @@
-@set UPDATED 29 August 2001
+@set UPDATED 20 September 2001
-@set UPDATED-MONTH August 2001
+@set UPDATED-MONTH September 2001
-@set EDITION 1.29
+@set EDITION 1.29a
-@set VERSION 1.29
+@set VERSION 1.29a

doc/version.texi

@@ -1,4 +1,4 @@
-@set UPDATED 29 August 2001
+@set UPDATED 20 September 2001
-@set UPDATED-MONTH August 2001
+@set UPDATED-MONTH September 2001
-@set EDITION 1.29
+@set EDITION 1.29a
-@set VERSION 1.29
+@set VERSION 1.29a

missing

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

mkinstalldirs

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

po/.cvsignore

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

po/de.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.25\n"
-"POT-Creation-Date: 2001-08-29 14:32+0200\n"
+"POT-Creation-Date: 2001-09-22 18:19+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,15 +18,15 @@ 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"
@@ -129,12 +129,12 @@ msgstr ""
 msgid "%s derives"
 msgstr "%s leitet ab"
 
-#: src/files.c:130
+#: src/files.c:132
 #, c-format
 msgid "cannot open file `%s'"
 msgstr ""
 
-#: src/files.c:149
+#: src/files.c:151
 msgid "cannot close file"
 msgstr ""
 
@@ -208,22 +208,22 @@ msgid ""
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
 
-#: src/getargs.c:210 src/lex.c:636
+#: src/getargs.c:214 src/lex.c:635
 #, c-format
 msgid "`%s' is no longer supported"
 msgstr ""
 
-#: src/getargs.c:234
+#: src/getargs.c:238
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: src/getargs.c:241
+#: src/getargs.c:245
 #, c-format
 msgid "%s: no grammar file given\n"
 msgstr "%s: keine Grammatik-Datei angegeben\n"
 
-#: src/getargs.c:245
+#: 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"
@@ -233,48 +233,48 @@ msgstr "%s: zus
 msgid "too many gotos (max %d)"
 msgstr ""
 
-#: src/lex.c:70
+#: src/lex.c:72
 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:101 src/reader.c:270
 msgid "unterminated comment"
 msgstr "unbeendeter Kommentar"
 
-#: src/lex.c:131
+#: src/lex.c:133
 #, fuzzy
 msgid "unexpected end of file"
 msgstr "Datei endet unerwartet"
 
 # Oder soll man den Begriff "Escapezeichen" verwenden?
-#: src/lex.c:160
+#: src/lex.c:162
 msgid "unescaped newline in constant"
 msgstr "nicht maskiertes Zeilenendezeichen in Konstante"
 
-#: src/lex.c:202
+#: src/lex.c:204
 #, 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:229
 #, 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:241
 #, c-format
 msgid "unknown escape sequence: `\\' followed by `%s'"
 msgstr "unbekanntes Fluchtzeichen: »\\« gefolgt von »%s«"
 
-#: src/lex.c:335
+#: src/lex.c:337
 msgid "unterminated type name at end of file"
 msgstr "unerwarteter Typname am Ende der Datei"
 
-#: src/lex.c:338
+#: src/lex.c:340
 msgid "unterminated type name"
 msgstr "unerwarteter Typname"
 
-#: src/lex.c:430
+#: src/lex.c:432
 msgid "use \"...\" for multi-character literal tokens"
 msgstr "für Literal mit mehreren Zeichen bitte \"...\" verwenden"
 
@@ -449,7 +449,7 @@ msgstr ""
 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:1306
+#: src/reader.c:534 src/reader.c:613 src/reader.c:674 src/reader.c:1290
 #, c-format
 msgid "type redeclaration for %s"
 msgstr "erneute Deklaration des Typs für %s"
@@ -464,7 +464,7 @@ msgstr "
 msgid "multiple %s declarations"
 msgstr "mehr als eine %start Deklaration"
 
-#: src/reader.c:563 src/reader.c:893 src/reader.c:918 src/reader.c:1284
+#: src/reader.c:563 src/reader.c:902 src/reader.c:927 src/reader.c:1268
 #, fuzzy, c-format
 msgid "invalid %s declaration"
 msgstr "ungültige %start Deklaration"
@@ -493,147 +493,137 @@ msgstr "unzul
 msgid "unexpected item: %s"
 msgstr "unerwartetes Symbol: %s"
 
-#: src/reader.c:759 src/reader.c:1110 src/reader.c:1181
+#: src/reader.c:764 src/reader.c:1094 src/reader.c:1165
 #, fuzzy, c-format
 msgid "unmatched %s"
 msgstr "»{« hat kein Gegenstück"
 
-#: src/reader.c:791
+#: src/reader.c:796
 #, fuzzy, c-format
 msgid "argument of %%expect is not an integer"
 msgstr "Argument von %expect ist keine ganze Zahl"
 
-#: src/reader.c:838
+#: src/reader.c:843
 #, c-format
 msgid "unrecognized item %s, expected an identifier"
 msgstr "unerwartetes Symbol %s, hier wird ein Bezeichner erwartet"
 
-#: src/reader.c:862
+#: src/reader.c:867
 #, c-format
 msgid "expected string constant instead of %s"
 msgstr "hier wird eine Zeichenkette erwartet, nicht %s"
 
-#: src/reader.c:930
+#: src/reader.c:1010
-#, fuzzy, c-format
-msgid "multiple %%header_extension declarations"
-msgstr "erneute %union Definition"
-
-#: src/reader.c:940
-#, fuzzy, c-format
-msgid "multiple %%source_extension declarations"
-msgstr "erneute %union Definition"
-
-#: src/reader.c:1026
 #, c-format
 msgid "unrecognized: %s"
 msgstr "unbekannt: %s"
 
-#: src/reader.c:1031
+#: src/reader.c:1015
 msgid "no input grammar"
 msgstr "keine Eingabe-Grammatik"
 
-#: src/reader.c:1036
+#: src/reader.c:1020
 #, c-format
 msgid "unknown character: %s"
 msgstr "unbekanntes Zeichen: %s"
 
-#: src/reader.c:1204
+#: src/reader.c:1188
 #, fuzzy, c-format
 msgid "unterminated %guard clause"
 msgstr "unbeendeter %%guard Fall"
 
-#: src/reader.c:1371
+#: src/reader.c:1355
 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:1378
+#: src/reader.c:1362
 msgid "grammar starts with vertical bar"
 msgstr "Grammatik fängt mit einem vertikalen Strich (»|«) an"
 
-#: src/reader.c:1409
+#: src/reader.c:1393
 #, 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:1511
+#: src/reader.c:1495
 msgid "two @prec's in a row"
 msgstr "zwei @prec Anweisungen nacheinander"
 
-#: src/reader.c:1519
+#: src/reader.c:1503
 #, c-format
 msgid "%%guard present but %%semantic_parser not specified"
 msgstr ""
 "%%guard Anweisung vorhanden, jedoch wird %%semantic_parser nicht angegeben"
 
-#: src/reader.c:1528
+#: src/reader.c:1512
 msgid "two actions at end of one rule"
 msgstr "Zwei Aktionen am Ende einer Regel"
 
-#: src/reader.c:1542
+#: src/reader.c:1526
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "Typkonflikt (»%s« »%s«) bei Default Aktion"
 
-#: src/reader.c:1548
+#: src/reader.c:1532
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "leere Regel für Nicht-Terminal vmit Typ und keine Aktion"
 
-#: src/reader.c:1592
+#: src/reader.c:1576
 #, c-format
 msgid "invalid input: %s"
 msgstr "ungültige Eingabe: %s"
 
-#: src/reader.c:1600
+#: src/reader.c:1584
 #, 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:1603
+#: src/reader.c:1587
 msgid "no rules in the input grammar"
 msgstr "Eingabegrammatik enthält keine Regeln"
 
-#: src/reader.c:1627
+#: src/reader.c:1611
 #, 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:1732
+#: src/reader.c:1716
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "Vorrangwertigkeiten für %s und %s widersprechen sich"
 
-#: src/reader.c:1744
+#: src/reader.c:1728
 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "assoc Werte für %s nd %s widersprechen sich"
 
-#: src/reader.c:1795
+#: src/reader.c:1779
 #, 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:1808
+#: src/reader.c:1792
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "das Startsymbol %s ist undefiniert"
 
-#: src/reader.c:1810
+#: src/reader.c:1794
 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "das Startsymbol %s ist ein Token"
 
-#: src/reduce.c:404
+#: src/reduce.c:402
 #, fuzzy
 msgid "Useless nonterminals:"
 msgstr ""
 "Nutzlose Nicht-Terminale:\n"
 "\n"
 
-#: src/reduce.c:419
+#: src/reduce.c:417
 #, fuzzy
 msgid "Terminals which are not used:"
 msgstr ""
@@ -642,7 +632,7 @@ msgstr ""
 "Nicht genutzte Terminale:\n"
 "\n"
 
-#: src/reduce.c:430
+#: src/reduce.c:428
 #, fuzzy
 msgid "Useless rules:"
 msgstr ""
@@ -651,7 +641,7 @@ msgstr ""
 "Ungenutzte Regeln:\n"
 "\n"
 
-#: src/reduce.c:459
+#: src/reduce.c:457
 msgid ""
 "Variables\n"
 "---------\n"
@@ -661,11 +651,11 @@ msgstr ""
 "---------\n"
 "\n"
 
-#: src/reduce.c:461
+#: src/reduce.c:459
 msgid "Value  Sprec    Sassoc    Tag\n"
 msgstr "Wert   Sprec    Sassoc    Tag\n"
 
-#: src/reduce.c:466
+#: src/reduce.c:464
 msgid ""
 "Rules\n"
 "-----\n"
@@ -675,7 +665,7 @@ msgstr ""
 "------\n"
 "\n"
 
-#: src/reduce.c:477
+#: src/reduce.c:475
 msgid ""
 "Rules interpreted\n"
 "-----------------\n"
@@ -685,36 +675,36 @@ msgstr ""
 "----------------------\n"
 "\n"
 
-#: src/reduce.c:494
+#: src/reduce.c:492
 #, c-format
 msgid "%d rules never reduced\n"
 msgstr "%d wurde niemals reduziert\n"
 
-#: src/reduce.c:496
+#: src/reduce.c:494
 #, c-format
 msgid "%s contains "
 msgstr "%s enthält "
 
-#: src/reduce.c:500
+#: src/reduce.c:498
 #, c-format
 msgid "%d useless nonterminal%s"
 msgstr "%d ungenutzte Nicht-Terminal"
 
-#: src/reduce.c:505
+#: src/reduce.c:503
 msgid " and "
 msgstr " und "
 
-#: src/reduce.c:509
+#: src/reduce.c:507
 #, c-format
 msgid "%d useless rule%s"
 msgstr "%d ungenutzte Regel"
 
-#: src/reduce.c:542
+#: src/reduce.c:540
 #, 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:553
 #, c-format
 msgid ""
 "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n"
@@ -844,6 +834,9 @@ msgstr ""
 #~ 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"
 

po/es.po

@@ -30,7 +30,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU bison 1.25\n"
-"POT-Creation-Date: 2001-08-29 14:32+0200\n"
+"POT-Creation-Date: 2001-09-22 18:19+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,7 +58,7 @@ 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"
@@ -192,12 +192,12 @@ msgstr ""
 msgid "%s derives"
 msgstr "%s deriva"
 
-#: src/files.c:130
+#: src/files.c:132
 #, c-format
 msgid "cannot open file `%s'"
 msgstr ""
 
-#: src/files.c:149
+#: src/files.c:151
 msgid "cannot close file"
 msgstr ""
 
@@ -271,25 +271,25 @@ msgid ""
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
 
-#: src/getargs.c:210 src/lex.c:636
+#: src/getargs.c:214 src/lex.c:635
 #, c-format
 msgid "`%s' is no longer supported"
 msgstr ""
 
-#: src/getargs.c:234
+#: 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:241
+#: 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:245
+#: 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"
@@ -300,49 +300,49 @@ msgid "too many gotos (max %d)"
 msgstr ""
 
 # to ignore no es ignorar. Pon otra cosa, please. sv
-#: src/lex.c:70
+#: src/lex.c:72
 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:101 src/reader.c:270
 msgid "unterminated comment"
 msgstr "comentario sin terminar"
 
-#: src/lex.c:131
+#: src/lex.c:133
 #, fuzzy
 msgid "unexpected end of file"
 msgstr "Fin de fichero inesperado"
 
 # ¿unescaped?
-#: src/lex.c:160
+#: src/lex.c:162
 msgid "unescaped newline in constant"
 msgstr "salto de línea en constante sin secuencia de escape"
 
-#: src/lex.c:202
+#: src/lex.c:204
 #, 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:229
 #, c-format
 msgid "hexadecimal value above 255: `\\x%x'"
 msgstr "valor hexadecimal mayor que 255: `\\x%x'"
 
-#: src/lex.c:239
+#: src/lex.c:241
 #, c-format
 msgid "unknown escape sequence: `\\' followed by `%s'"
 msgstr "secuencia de escape desconocida: `\\' seguido de `%s'"
 
-#: src/lex.c:335
+#: src/lex.c:337
 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:340
 msgid "unterminated type name"
 msgstr "nombre de tipo sin terminar"
 
 # ¿multicarácter o multicaracteres? sv
-#: src/lex.c:430
+#: src/lex.c:432
 msgid "use \"...\" for multi-character literal tokens"
 msgstr "use \"...\" para terminales literales multicarácter"
 
@@ -526,7 +526,7 @@ msgstr ""
 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:1306
+#: src/reader.c:534 src/reader.c:613 src/reader.c:674 src/reader.c:1290
 #, c-format
 msgid "type redeclaration for %s"
 msgstr "redeclaración del tipo de %s"
@@ -541,7 +541,7 @@ msgstr "`%s' no es v
 msgid "multiple %s declarations"
 msgstr "múltiples declaraciones de %start"
 
-#: src/reader.c:563 src/reader.c:893 src/reader.c:918 src/reader.c:1284
+#: src/reader.c:563 src/reader.c:902 src/reader.c:927 src/reader.c:1268
 #, fuzzy, c-format
 msgid "invalid %s declaration"
 msgstr "declaración de %start no válida"
@@ -580,12 +580,12 @@ 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:1110 src/reader.c:1181
+#: src/reader.c:764 src/reader.c:1094 src/reader.c:1165
 #, fuzzy, c-format
 msgid "unmatched %s"
 msgstr "`{' desemparejada"
 
-#: src/reader.c:791
+#: src/reader.c:796
 #, fuzzy, c-format
 msgid "argument of %%expect is not an integer"
 msgstr "el argumento de %expect no es un entero"
@@ -596,36 +596,26 @@ msgstr "el argumento de %expect no es un entero"
 # - cll
 # ok - ngp
 #
-#: src/reader.c:838
+#: src/reader.c:843
 #, c-format
 msgid "unrecognized item %s, expected an identifier"
 msgstr "no se reconoce el ítem %s, se esperaba un identificador"
 
-#: src/reader.c:862
+#: src/reader.c:867
 #, c-format
 msgid "expected string constant instead of %s"
 msgstr "se esperaba una cadena constante en lugar de %s"
 
-#: src/reader.c:930
+#: src/reader.c:1010
-#, fuzzy, c-format
-msgid "multiple %%header_extension declarations"
-msgstr "declaraciones múltiples de %union"
-
-#: src/reader.c:940
-#, fuzzy, c-format
-msgid "multiple %%source_extension declarations"
-msgstr "declaraciones múltiples de %union"
-
-#: src/reader.c:1026
 #, c-format
 msgid "unrecognized: %s"
 msgstr "no reconocido: %s"
 
-#: src/reader.c:1031
+#: src/reader.c:1015
 msgid "no input grammar"
 msgstr "no hay gramática de entrada"
 
-#: src/reader.c:1036
+#: src/reader.c:1020
 #, c-format
 msgid "unknown character: %s"
 msgstr "carácter desconocido: %s"
@@ -634,105 +624,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:1204
+#: src/reader.c:1188
 #, fuzzy, c-format
 msgid "unterminated %guard clause"
 msgstr "cláusula %%guard sin terminar"
 
-#: src/reader.c:1371
+#: src/reader.c:1355
 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:1378
+#: src/reader.c:1362
 msgid "grammar starts with vertical bar"
 msgstr "la gramática comienza con una barra vertical"
 
-#: src/reader.c:1409
+#: src/reader.c:1393
 #, 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:1511
+#: src/reader.c:1495
 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:1519
+#: src/reader.c:1503
 #, c-format
 msgid "%%guard present but %%semantic_parser not specified"
 msgstr "%%guard presente pero %%semantic_parser está sin especificar"
 
-#: src/reader.c:1528
+#: src/reader.c:1512
 msgid "two actions at end of one rule"
 msgstr "dos acciones al final de una regla"
 
-#: src/reader.c:1542
+#: src/reader.c:1526
 #, 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:1548
+#: src/reader.c:1532
 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:1592
+#: src/reader.c:1576
 #, c-format
 msgid "invalid input: %s"
 msgstr "entrada no válida: %s"
 
-#: src/reader.c:1600
+#: src/reader.c:1584
 #, 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:1603
+#: src/reader.c:1587
 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:1627
+#: src/reader.c:1611
 #, 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:1732
+#: src/reader.c:1716
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "precedencias en conflicto entre %s y %s"
 
-#: src/reader.c:1744
+#: src/reader.c:1728
 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "conflicto de valores assoc para %s y %s"
 
-#: src/reader.c:1795
+#: src/reader.c:1779
 #, 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:1808
+#: src/reader.c:1792
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "el símbolo de inicio (axioma) %s no está definido"
 
-#: src/reader.c:1810
+#: src/reader.c:1794
 #, 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:402
 #, fuzzy
 msgid "Useless nonterminals:"
 msgstr ""
 "No terminales sin uso:\n"
 "\n"
 
-#: src/reduce.c:419
+#: src/reduce.c:417
 #, fuzzy
 msgid "Terminals which are not used:"
 msgstr ""
@@ -741,7 +731,7 @@ msgstr ""
 "Terminales que no se usan:\n"
 "\n"
 
-#: src/reduce.c:430
+#: src/reduce.c:428
 #, fuzzy
 msgid "Useless rules:"
 msgstr ""
@@ -750,7 +740,7 @@ msgstr ""
 "Reglas sin uso:\n"
 "\n"
 
-#: src/reduce.c:459
+#: src/reduce.c:457
 msgid ""
 "Variables\n"
 "---------\n"
@@ -760,11 +750,11 @@ msgstr ""
 "---------\n"
 "\n"
 
-#: src/reduce.c:461
+#: src/reduce.c:459
 msgid "Value  Sprec    Sassoc    Tag\n"
 msgstr "Valor  Sprec    Sasoc     Tag\n"
 
-#: src/reduce.c:466
+#: src/reduce.c:464
 msgid ""
 "Rules\n"
 "-----\n"
@@ -774,7 +764,7 @@ msgstr ""
 "------\n"
 "\n"
 
-#: src/reduce.c:477
+#: src/reduce.c:475
 msgid ""
 "Rules interpreted\n"
 "-----------------\n"
@@ -784,31 +774,31 @@ msgstr ""
 "--------------------\n"
 "\n"
 
-#: src/reduce.c:494
+#: src/reduce.c:492
 #, c-format
 msgid "%d rules never reduced\n"
 msgstr "%d reglas que nunca se han reducido\n"
 
-#: src/reduce.c:496
+#: src/reduce.c:494
 #, c-format
 msgid "%s contains "
 msgstr "%s contiene "
 
-#: src/reduce.c:500
+#: src/reduce.c:498
 #, c-format
 msgid "%d useless nonterminal%s"
 msgstr "%d no terminales %s sin uso"
 
-#: src/reduce.c:505
+#: src/reduce.c:503
 msgid " and "
 msgstr " y "
 
-#: src/reduce.c:509
+#: src/reduce.c:507
 #, c-format
 msgid "%d useless rule%s"
 msgstr "%d regla%s sin uso"
 
-#: src/reduce.c:542
+#: src/reduce.c:540
 #, c-format
 msgid "Start symbol %s does not derive any sentence"
 msgstr "El símbolo de inicio (axioma) %s no deriva ninguna sentencia"
@@ -825,7 +815,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:553
 #, c-format
 msgid ""
 "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n"
@@ -1041,6 +1031,9 @@ msgstr ""
 #~ 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"
 

po/et.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.28d\n"
-"POT-Creation-Date: 2001-08-29 14:32+0200\n"
+"POT-Creation-Date: 2001-09-22 18:19+0200\n"
 "PO-Revision-Date: 2001-08-29 17:06+02:00\n"
 "Last-Translator: Toomas Soome <[email protected]>\n"
 "Language-Team: Estonian <[email protected]>\n"
@@ -18,15 +18,15 @@ msgstr ""
 msgid "too many states (max %d)"
 msgstr "liiga palju olekuid (maks %d)"
 
-#: lib/error.c:117 src/complain.c:100
+#: lib/error.c:117 src/complain.c:96
 msgid "Unknown system error"
 msgstr "Tundmatu süsteemi viga"
 
-#: src/complain.c:154
+#: src/complain.c:150
 msgid "warning: "
 msgstr "hoiatus: "
 
-#: src/complain.c:242 src/complain.c:283
+#: src/complain.c:238 src/complain.c:279
 msgid "fatal error: "
 msgstr "fataalne viga: "
 
@@ -128,12 +128,12 @@ msgstr "DERIVES"
 msgid "%s derives"
 msgstr "%s derives"
 
-#: src/files.c:130
+#: src/files.c:132
 #, c-format
 msgid "cannot open file `%s'"
 msgstr "faili `%s' ei saa avada"
 
-#: src/files.c:149
+#: src/files.c:151
 msgid "cannot close file"
 msgstr "faili ei õnnestu sulgeda"
 
@@ -231,22 +231,22 @@ msgstr ""
 "See on vaba tarkvara; kopeerimistingimused leiate lähtetekstidest. Garantii\n"
 "PUUDUB; ka müügiks või mingil eesmärgil kasutamiseks.\n"
 
-#: src/getargs.c:210 src/lex.c:636
+#: src/getargs.c:214 src/lex.c:635
 #, c-format
 msgid "`%s' is no longer supported"
 msgstr "`%s' ei ole enam toetatud"
 
-#: src/getargs.c:234
+#: src/getargs.c:238
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Lisainfo saamiseks proovige `%s --help'.\n"
 
-#: src/getargs.c:241
+#: src/getargs.c:245
 #, c-format
 msgid "%s: no grammar file given\n"
 msgstr "%s: puudub grammatikafail\n"
 
-#: src/getargs.c:245
+#: src/getargs.c:249
 #, c-format
 msgid "%s: extra arguments ignored after `%s'\n"
 msgstr "%s: ignoreerin lisaargumente peale `%s'\n"
@@ -256,46 +256,46 @@ msgstr "%s: ignoreerin lisaargumente peale `%s'\n"
 msgid "too many gotos (max %d)"
 msgstr "liiga palju gotosid (maks %d)"
 
-#: src/lex.c:70
+#: src/lex.c:72
 msgid "unexpected `/' found and ignored"
 msgstr "leidsin ja ignoreerin ootamatu `/'"
 
-#: src/lex.c:99 src/reader.c:270
+#: src/lex.c:101 src/reader.c:270
 msgid "unterminated comment"
 msgstr "lõpetamata kommentaar"
 
-#: src/lex.c:131
+#: src/lex.c:133
 msgid "unexpected end of file"
 msgstr "ootamatu faililõpp"
 
-#: src/lex.c:160
+#: src/lex.c:162
 msgid "unescaped newline in constant"
 msgstr "paojadata reavahetus konstandis"
 
-#: src/lex.c:202
+#: src/lex.c:204
 #, c-format
 msgid "octal value outside range 0...255: `\\%o'"
 msgstr "kaheksandväärtus väljaspool piire 0...255: `\\%o'"
 
-#: src/lex.c:227
+#: src/lex.c:229
 #, c-format
 msgid "hexadecimal value above 255: `\\x%x'"
 msgstr "kuueteistkümnendväärtus  suurem, kui above 255: `\\x%x'"
 
-#: src/lex.c:239
+#: src/lex.c:241
 #, c-format
 msgid "unknown escape sequence: `\\' followed by `%s'"
 msgstr "tundmatu paojada: `\\' järgneb `%s'"
 
-#: src/lex.c:335
+#: src/lex.c:337
 msgid "unterminated type name at end of file"
 msgstr "lõpetamata tüübinimi faili lõpus"
 
-#: src/lex.c:338
+#: src/lex.c:340
 msgid "unterminated type name"
 msgstr "lõpetamata tüübinimi"
 
-#: src/lex.c:430
+#: src/lex.c:432
 msgid "use \"...\" for multi-character literal tokens"
 msgstr "kasuta mitmesümboliliste literaalidega \"...\" konstruktsiooni"
 
@@ -455,7 +455,7 @@ msgstr "s
 msgid "symbol %s redefined"
 msgstr "sümbol %s on uuesti defineeritud"
 
-#: src/reader.c:534 src/reader.c:613 src/reader.c:674 src/reader.c:1306
+#: src/reader.c:534 src/reader.c:613 src/reader.c:674 src/reader.c:1290
 #, c-format
 msgid "type redeclaration for %s"
 msgstr "%s tüübi uuesti deklareerimine"
@@ -470,7 +470,7 @@ msgstr "`%s' ei ole %s sees lubatud"
 msgid "multiple %s declarations"
 msgstr "korduvad %s deklaratsioonid"
 
-#: src/reader.c:563 src/reader.c:893 src/reader.c:918 src/reader.c:1284
+#: src/reader.c:563 src/reader.c:902 src/reader.c:927 src/reader.c:1268
 #, c-format
 msgid "invalid %s declaration"
 msgstr "vigane %s deklaratsioon"
@@ -499,149 +499,139 @@ msgstr "vigane tekst (%s) - number peab olema peale identifikaatorit"
 msgid "unexpected item: %s"
 msgstr "ootamatu element: %s"
 
-#: src/reader.c:759 src/reader.c:1110 src/reader.c:1181
+#: src/reader.c:764 src/reader.c:1094 src/reader.c:1165
 #, c-format
 msgid "unmatched %s"
 msgstr "puudub %s"
 
-#: src/reader.c:791
+#: src/reader.c:796
 #, c-format
 msgid "argument of %%expect is not an integer"
 msgstr "%%expect argument ei ole täisarv"
 
-#: src/reader.c:838
+#: src/reader.c:843
 #, c-format
 msgid "unrecognized item %s, expected an identifier"
 msgstr "tundmatu element %s, eeldasin identifikaatorit"
 
-#: src/reader.c:862
+#: src/reader.c:867
 #, c-format
 msgid "expected string constant instead of %s"
 msgstr "eeldasin %s asemel sõnekonstanti"
 
-#: src/reader.c:930
+#: src/reader.c:1010
-#, c-format
-msgid "multiple %%header_extension declarations"
-msgstr "korduvad %%header_extension eklaratsioonid"
-
-#: src/reader.c:940
-#, c-format
-msgid "multiple %%source_extension declarations"
-msgstr "korduvad %%source_extension deklaratsioonid"
-
-#: src/reader.c:1026
 #, c-format
 msgid "unrecognized: %s"
 msgstr "tundmatu: %s"
 
-#: src/reader.c:1031
+#: src/reader.c:1015
 msgid "no input grammar"
 msgstr "sisendgrammatikat pole"
 
-#: src/reader.c:1036
+#: src/reader.c:1020
 #, c-format
 msgid "unknown character: %s"
 msgstr "tundmatu sümbol: %s"
 
-#: src/reader.c:1204
+#: src/reader.c:1188
 #, c-format
 msgid "unterminated %guard clause"
 msgstr "lõpetamata %guard klausel"
 
-#: src/reader.c:1371
+#: src/reader.c:1355
 msgid "ill-formed rule: initial symbol not followed by colon"
 msgstr "vigaselt formeeritud reegel: algsümbolile ei järgne koolonit"
 
-#: src/reader.c:1378
+#: src/reader.c:1362
 msgid "grammar starts with vertical bar"
 msgstr "grammatika algab püstkriipsuga"
 
-#: src/reader.c:1409
+#: src/reader.c:1393
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "%s jaoks on antud reegel, aga see on märk"
 
-#: src/reader.c:1511
+#: src/reader.c:1495
 msgid "two @prec's in a row"
 msgstr "kaks @prec ühel real"
 
-#: src/reader.c:1519
+#: src/reader.c:1503
 #, c-format
 msgid "%%guard present but %%semantic_parser not specified"
 msgstr "%%guard on määratud, aga %%semantic_parser ei ole"
 
-#: src/reader.c:1528
+#: src/reader.c:1512
 msgid "two actions at end of one rule"
 msgstr "kaks tegevust ühe reegli lõpus"
 
-#: src/reader.c:1542
+#: src/reader.c:1526
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "vaikimisi tegevuse tüübikonflikt (`%s' `%s')"
 
-#: src/reader.c:1548
+#: src/reader.c:1532
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "tüübiga mitteterminalil on tühi reegel ja puudub tegevus"
 
-#: src/reader.c:1592
+#: src/reader.c:1576
 #, c-format
 msgid "invalid input: %s"
 msgstr "vigane sisend: %s"
 
-#: src/reader.c:1600
+#: src/reader.c:1584
 #, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "liiga palju sümboleid (märgid ja mitteterminalid); maksimaalne on %d"
 
-#: src/reader.c:1603
+#: src/reader.c:1587
 msgid "no rules in the input grammar"
 msgstr "sisendgrammatikas pole reegleid"
 
-#: src/reader.c:1627
+#: src/reader.c:1611
 #, c-format
 msgid "symbol %s is used, but is not defined as a token and has no rules"
 msgstr ""
 "kasutatakse sümbolit %s, mis ei ole defineeritud märgina ja millel puuduvad "
 "reeglid"
 
-#: src/reader.c:1732
+#: src/reader.c:1716
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "%s ja %s omavad konfliktseid prioriteete"
 
-#: src/reader.c:1744
+#: src/reader.c:1728
 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "%s ja %s omavad konfliktseid assotsiatiivseid väärtuseid"
 
-#: src/reader.c:1795
+#: src/reader.c:1779
 #, c-format
 msgid "tokens %s and %s both assigned number %d"
 msgstr "märkidele %s ja %s on mõlemale omistatud number %d"
 
-#: src/reader.c:1808
+#: src/reader.c:1792
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "stardisümbol %s ei ole defineeritud"
 
-#: src/reader.c:1810
+#: src/reader.c:1794
 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "stardisümbol %s on märk"
 
-#: src/reduce.c:404
+#: src/reduce.c:402
 msgid "Useless nonterminals:"
 msgstr "Kasutamata mitteterminalid:"
 
-#: src/reduce.c:419
+#: src/reduce.c:417
 msgid "Terminals which are not used:"
 msgstr "Terminalid, mida ei kasutatud:"
 
-#: src/reduce.c:430
+#: src/reduce.c:428
 msgid "Useless rules:"
 msgstr "Kasutamata reeglid:"
 
-#: src/reduce.c:459
+#: src/reduce.c:457
 msgid ""
 "Variables\n"
 "---------\n"
@@ -651,11 +641,11 @@ msgstr ""
 "--------\n"
 "\n"
 
-#: src/reduce.c:461
+#: src/reduce.c:459
 msgid "Value  Sprec    Sassoc    Tag\n"
 msgstr "Value  Sprec    Sassoc    Tag\n"
 
-#: src/reduce.c:466
+#: src/reduce.c:464
 msgid ""
 "Rules\n"
 "-----\n"
@@ -665,7 +655,7 @@ msgstr ""
 "-------\n"
 "\n"
 
-#: src/reduce.c:477
+#: src/reduce.c:475
 msgid ""
 "Rules interpreted\n"
 "-----------------\n"
@@ -675,36 +665,36 @@ msgstr ""
 "------------------------\n"
 "\n"
 
-#: src/reduce.c:494
+#: src/reduce.c:492
 #, c-format
 msgid "%d rules never reduced\n"
 msgstr "%d reeglit ei redutseeritud\n"
 
-#: src/reduce.c:496
+#: src/reduce.c:494
 #, c-format
 msgid "%s contains "
 msgstr "%s sisaldab "
 
-#: src/reduce.c:500
+#: src/reduce.c:498
 #, c-format
 msgid "%d useless nonterminal%s"
 msgstr "%d kasutamata mitteterminali%s"
 
-#: src/reduce.c:505
+#: src/reduce.c:503
 msgid " and "
 msgstr " ja "
 
-#: src/reduce.c:509
+#: src/reduce.c:507
 #, c-format
 msgid "%d useless rule%s"
 msgstr "%d kasutamata reeglit%s"
 
-#: src/reduce.c:542
+#: src/reduce.c:540
 #, c-format
 msgid "Start symbol %s does not derive any sentence"
 msgstr "Stardisümbolist %s ei tuletata ühtegi lauset"
 
-#: src/reduce.c:555
+#: src/reduce.c:553
 #, c-format
 msgid ""
 "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n"
@@ -798,3 +788,9 @@ msgstr "`"
 #: lib/quotearg.c:260
 msgid "'"
 msgstr "'"
+
+#~ msgid "multiple %%header_extension declarations"
+#~ msgstr "korduvad %%header_extension eklaratsioonid"
+
+#~ msgid "multiple %%source_extension declarations"
+#~ msgstr "korduvad %%source_extension deklaratsioonid"

po/fr.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU bison 1.28d\n"
-"POT-Creation-Date: 2001-08-29 14:32+0200\n"
+"POT-Creation-Date: 2001-09-22 18:19+0200\n"
 "PO-Revision-Date: 2001-08-29 20:00-0500\n"
 "Last-Translator: Michel Robitaille <[email protected]>\n"
 "Language-Team: French <[email protected]>\n"
@@ -19,15 +19,15 @@ msgstr ""
 msgid "too many states (max %d)"
 msgstr "nombre trop grand d'états (max %d)"
 
-#: lib/error.c:117 src/complain.c:100
+#: lib/error.c:117 src/complain.c:96
 msgid "Unknown system error"
 msgstr "Erreur système inconnue"
 
-#: src/complain.c:154
+#: src/complain.c:150
 msgid "warning: "
 msgstr "AVERTISSEMENT: "
 
-#: src/complain.c:242 src/complain.c:283
+#: src/complain.c:238 src/complain.c:279
 msgid "fatal error: "
 msgstr "erreur fatale: "
 
@@ -130,12 +130,12 @@ msgstr "D
 msgid "%s derives"
 msgstr "%s dérive"
 
-#: src/files.c:130
+#: src/files.c:132
 #, c-format
 msgid "cannot open file `%s'"
 msgstr "ne peut ouvrir le fichier `%s'"
 
-#: src/files.c:149
+#: src/files.c:151
 msgid "cannot close file"
 msgstr "ne peut fermer le fichier"
 
@@ -237,22 +237,22 @@ msgstr ""
 "reproduction. AUCUNE garantie n'est donnée; tant pour des raisons\n"
 "COMMERCIALES que pour RÉPONDRE À UN BESOIN PARTICULIER.\n"
 
-#: src/getargs.c:210 src/lex.c:636
+#: src/getargs.c:214 src/lex.c:635
 #, c-format
 msgid "`%s' is no longer supported"
 msgstr "`%s' n'est plus supporté"
 
-#: src/getargs.c:234
+#: src/getargs.c:238
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Pour en savoir davantage, faites: `%s --help'.\n"
 
-#: src/getargs.c:241
+#: src/getargs.c:245
 #, c-format
 msgid "%s: no grammar file given\n"
 msgstr "%s: grammaire manquante\n"
 
-#: src/getargs.c:245
+#: src/getargs.c:249
 #, c-format
 msgid "%s: extra arguments ignored after `%s'\n"
 msgstr "%s: paramètres supplémentaires ignorés après `%s'\n"
@@ -262,46 +262,46 @@ msgstr "%s: param
 msgid "too many gotos (max %d)"
 msgstr "nombre trop grand de \"goto\" (Max %d)"
 
-#: src/lex.c:70
+#: src/lex.c:72
 msgid "unexpected `/' found and ignored"
 msgstr "`/' inattendu et ignoré"
 
-#: src/lex.c:99 src/reader.c:270
+#: src/lex.c:101 src/reader.c:270
 msgid "unterminated comment"
 msgstr "le commentaire ne se termine pas"
 
-#: src/lex.c:131
+#: src/lex.c:133
 msgid "unexpected end of file"
 msgstr "Fin de fichier inattendue"
 
-#: src/lex.c:160
+#: src/lex.c:162
 msgid "unescaped newline in constant"
 msgstr "retour de chariot sans échappement dans une constante"
 
-#: src/lex.c:202
+#: src/lex.c:204
 #, c-format
 msgid "octal value outside range 0...255: `\\%o'"
 msgstr "valeur octale à l'extérieur de l'intervalle 0...255: \\%o"
 
-#: src/lex.c:227
+#: src/lex.c:229
 #, c-format
 msgid "hexadecimal value above 255: `\\x%x'"
 msgstr "valeur hexadécimale supérieure à 255: \\x%x"
 
-#: src/lex.c:239
+#: src/lex.c:241
 #, c-format
 msgid "unknown escape sequence: `\\' followed by `%s'"
 msgstr "séquence d'échappement inconnue: `\\' suivie de `%s'"
 
-#: src/lex.c:335
+#: src/lex.c:337
 msgid "unterminated type name at end of file"
 msgstr "le nom de type ne se termine pas avant la fin de fichier"
 
-#: src/lex.c:338
+#: src/lex.c:340
 msgid "unterminated type name"
 msgstr "le nom de type ne se termine pas"
 
-#: src/lex.c:430
+#: src/lex.c:432
 msgid "use \"...\" for multi-character literal tokens"
 msgstr "utilisez \"...\" pour les terminaux litéraux de plusieurs caractères"
 
@@ -461,7 +461,7 @@ msgstr "symbole `%s' pr
 msgid "symbol %s redefined"
 msgstr "symbole %s redéfini"
 
-#: src/reader.c:534 src/reader.c:613 src/reader.c:674 src/reader.c:1306
+#: src/reader.c:534 src/reader.c:613 src/reader.c:674 src/reader.c:1290
 #, c-format
 msgid "type redeclaration for %s"
 msgstr "redéclaration du type de %s"
@@ -476,7 +476,7 @@ msgstr "`%s' n'est pas valide dans %s"
 msgid "multiple %s declarations"
 msgstr "multiples déclarations %s"
 
-#: src/reader.c:563 src/reader.c:893 src/reader.c:918 src/reader.c:1284
+#: src/reader.c:563 src/reader.c:902 src/reader.c:927 src/reader.c:1268
 #, c-format
 msgid "invalid %s declaration"
 msgstr "la déclaration %s n'est pas valide"
@@ -506,149 +506,139 @@ msgstr ""
 msgid "unexpected item: %s"
 msgstr "item inattendu: %s"
 
-#: src/reader.c:759 src/reader.c:1110 src/reader.c:1181
+#: src/reader.c:764 src/reader.c:1094 src/reader.c:1165
 #, c-format
 msgid "unmatched %s"
 msgstr "non appariement de %s"
 
-#: src/reader.c:791
+#: src/reader.c:796
 #, c-format
 msgid "argument of %%expect is not an integer"
 msgstr "le paramètre de %%expect n'est pas un entier"
 
-#: src/reader.c:838
+#: src/reader.c:843
 #, c-format
 msgid "unrecognized item %s, expected an identifier"
 msgstr "item %s non reconnu, un identificateur est attendu"
 
-#: src/reader.c:862
+#: src/reader.c:867
 #, c-format
 msgid "expected string constant instead of %s"
 msgstr "chaîne de caractères constante attendue plutôt que %s"
 
-#: src/reader.c:930
+#: src/reader.c:1010
-#, c-format
-msgid "multiple %%header_extension declarations"
-msgstr "multiples déclarations %%header_extension"
-
-#: src/reader.c:940
-#, c-format
-msgid "multiple %%source_extension declarations"
-msgstr "multiples déclarations %%source_extension"
-
-#: src/reader.c:1026
 #, c-format
 msgid "unrecognized: %s"
 msgstr "non reconnu: %s"
 
-#: src/reader.c:1031
+#: src/reader.c:1015
 msgid "no input grammar"
 msgstr "aucune grammaire en entrée"
 
-#: src/reader.c:1036
+#: src/reader.c:1020
 #, c-format
 msgid "unknown character: %s"
 msgstr "caractère inconnu: %s"
 
-#: src/reader.c:1204
+#: src/reader.c:1188
 #, c-format
 msgid "unterminated %guard clause"
 msgstr "clause %guard non terminée"
 
-#: src/reader.c:1371
+#: src/reader.c:1355
 msgid "ill-formed rule: initial symbol not followed by colon"
 msgstr "règle mal formée: le symbole initial n'est pas suivi de `:'"
 
-#: src/reader.c:1378
+#: src/reader.c:1362
 msgid "grammar starts with vertical bar"
 msgstr "la grammaire débute par une barre verticale"
 
-#: src/reader.c:1409
+#: src/reader.c:1393
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "la règle pour %s, qui est un terminal"
 
-#: src/reader.c:1511
+#: src/reader.c:1495
 msgid "two @prec's in a row"
 msgstr "deux @prec de suite"
 
-#: src/reader.c:1519
+#: src/reader.c:1503
 #, c-format
 msgid "%%guard present but %%semantic_parser not specified"
 msgstr "%%guard est présent mais %%semantic_parser n'est pas spécifié"
 
-#: src/reader.c:1528
+#: src/reader.c:1512
 msgid "two actions at end of one rule"
 msgstr "deux actions à la fin d'une même règle"
 
-#: src/reader.c:1542
+#: src/reader.c:1526
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "conflit de type (`%s' `%s') pour l'action par défaut"
 
-#: src/reader.c:1548
+#: src/reader.c:1532
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "règle vide pour une catégorie typée et aucune action"
 
-#: src/reader.c:1592
+#: src/reader.c:1576
 #, c-format
 msgid "invalid input: %s"
 msgstr "entrée non valide: %s"
 
-#: src/reader.c:1600
+#: src/reader.c:1584
 #, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "trop de symboles (jeton plus non terminaux); maximum %d"
 
-#: src/reader.c:1603
+#: src/reader.c:1587
 msgid "no rules in the input grammar"
 msgstr "la grammaire n'a pas de règles"
 
-#: src/reader.c:1627
+#: src/reader.c:1611
 #, c-format
 msgid "symbol %s is used, but is not defined as a token and has no rules"
 msgstr ""
 "le symbole %s est utilisé mais ce n'est pas un terminal et il ne possède pas "
 "de règle"
 
-#: src/reader.c:1732
+#: src/reader.c:1716
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "les priorités pour %s et %s entrent en conflit"
 
-#: src/reader.c:1744
+#: src/reader.c:1728
 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "les valeurs d'association de %s et %s entrent en conflit"
 
-#: src/reader.c:1795
+#: src/reader.c:1779
 #, c-format
 msgid "tokens %s and %s both assigned number %d"
 msgstr "les jetons %s et %s se sont vus assigner le nombre %d"
 
-#: src/reader.c:1808
+#: src/reader.c:1792
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "le symbole de départ %s n'est pas défini"
 
-#: src/reader.c:1810
+#: src/reader.c:1794
 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "le symbole de départ %s est un terminal"
 
-#: src/reduce.c:404
+#: src/reduce.c:402
 msgid "Useless nonterminals:"
 msgstr "Non-terminaux inutiles:"
 
-#: src/reduce.c:419
+#: src/reduce.c:417
 msgid "Terminals which are not used:"
 msgstr "Terminaux non utilisés:"
 
-#: src/reduce.c:430
+#: src/reduce.c:428
 msgid "Useless rules:"
 msgstr "Règles inutiles:"
 
-#: src/reduce.c:459
+#: src/reduce.c:457
 msgid ""
 "Variables\n"
 "---------\n"
@@ -658,11 +648,11 @@ msgstr ""
 "---------\n"
 "\n"
 
-#: src/reduce.c:461
+#: src/reduce.c:459
 msgid "Value  Sprec    Sassoc    Tag\n"
 msgstr "Valeur Spréc    Sassoc    Tag\n"
 
-#: src/reduce.c:466
+#: src/reduce.c:464
 msgid ""
 "Rules\n"
 "-----\n"
@@ -672,7 +662,7 @@ msgstr ""
 "------\n"
 "\n"
 
-#: src/reduce.c:477
+#: src/reduce.c:475
 msgid ""
 "Rules interpreted\n"
 "-----------------\n"
@@ -682,36 +672,36 @@ msgstr ""
 "-------------------\n"
 "\n"
 
-#: src/reduce.c:494
+#: src/reduce.c:492
 #, c-format
 msgid "%d rules never reduced\n"
 msgstr "%d règles jamais réduites\n"
 
-#: src/reduce.c:496
+#: src/reduce.c:494
 #, c-format
 msgid "%s contains "
 msgstr "%s contient "
 
-#: src/reduce.c:500
+#: src/reduce.c:498
 #, c-format
 msgid "%d useless nonterminal%s"
 msgstr "%d catégories non productives%s"
 
-#: src/reduce.c:505
+#: src/reduce.c:503
 msgid " and "
 msgstr " et "
 
-#: src/reduce.c:509
+#: src/reduce.c:507
 #, c-format
 msgid "%d useless rule%s"
 msgstr "%d règle(s) non productive(s)%s"
 
-#: src/reduce.c:542
+#: src/reduce.c:540
 #, c-format
 msgid "Start symbol %s does not derive any sentence"
 msgstr "Aucune phrase ne peut être dérivée du symbole de départ %s"
 
-#: src/reduce.c:555
+#: src/reduce.c:553
 #, c-format
 msgid ""
 "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n"
@@ -806,6 +796,12 @@ msgstr "`"
 msgid "'"
 msgstr "'"
 
+#~ msgid "multiple %%header_extension declarations"
+#~ msgstr "multiples déclarations %%header_extension"
+
+#~ msgid "multiple %%source_extension declarations"
+#~ msgstr "multiples déclarations %%source_extension"
+
 #~ msgid "vcg graph: no such color."
 #~ msgstr "graphe vcg: pas de telle couleur"
 

po/ja.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU bison 1.28\n"
-"POT-Creation-Date: 2001-08-29 14:32+0200\n"
+"POT-Creation-Date: 2001-09-22 18:19+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,15 +18,15 @@ 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: 致命的エラー: "
@@ -135,12 +135,12 @@ msgstr ""
 msgid "%s derives"
 msgstr "%s は以下から派生"
 
-#: src/files.c:130
+#: src/files.c:132
 #, c-format
 msgid "cannot open file `%s'"
 msgstr ""
 
-#: src/files.c:149
+#: src/files.c:151
 msgid "cannot close file"
 msgstr ""
 
@@ -214,22 +214,22 @@ msgid ""
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
 
-#: src/getargs.c:210 src/lex.c:636
+#: src/getargs.c:214 src/lex.c:635
 #, c-format
 msgid "`%s' is no longer supported"
 msgstr ""
 
-#: src/getargs.c:234
+#: src/getargs.c:238
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: src/getargs.c:241
+#: src/getargs.c:245
 #, c-format
 msgid "%s: no grammar file given\n"
 msgstr "%s: 文法ファイルが指定されていません\n"
 
-#: src/getargs.c:245
+#: src/getargs.c:249
 #, fuzzy, c-format
 msgid "%s: extra arguments ignored after `%s'\n"
 msgstr "%s: '%s' より後ろの余分な引数は無視されました\n"
@@ -239,47 +239,47 @@ msgstr "%s: '%s'
 msgid "too many gotos (max %d)"
 msgstr "%s の数が多すぎます (最大 %d)"
 
-#: src/lex.c:70
+#: src/lex.c:72
 msgid "unexpected `/' found and ignored"
 msgstr "予期しない `/' が見つかり、無視されました"
 
-#: src/lex.c:99 src/reader.c:270
+#: src/lex.c:101 src/reader.c:270
 msgid "unterminated comment"
 msgstr "閉じていないコメントです"
 
-#: src/lex.c:131
+#: src/lex.c:133
 #, fuzzy
 msgid "unexpected end of file"
 msgstr "予期しないファイルの終端です"
 
-#: src/lex.c:160
+#: src/lex.c:162
 msgid "unescaped newline in constant"
 msgstr "定数の中にエスケープされていない改行があります"
 
-#: src/lex.c:202
+#: src/lex.c:204
 #, c-format
 msgid "octal value outside range 0...255: `\\%o'"
 msgstr "8 進数の値が 0...255 の範囲外です: `\\%o'"
 
-#: src/lex.c:227
+#: src/lex.c:229
 #, c-format
 msgid "hexadecimal value above 255: `\\x%x'"
 msgstr "16 進数の値が 255 を越えています: `\\x%x'"
 
-#: src/lex.c:239
+#: src/lex.c:241
 #, c-format
 msgid "unknown escape sequence: `\\' followed by `%s'"
 msgstr "未知のエスケープシーケンス: `\\' の後に `%s'"
 
-#: src/lex.c:335
+#: src/lex.c:337
 msgid "unterminated type name at end of file"
 msgstr "閉じられていないタイプ名が、ファイル末尾にあります"
 
-#: src/lex.c:338
+#: src/lex.c:340
 msgid "unterminated type name"
 msgstr "閉じられていないタイプ名があります"
 
-#: src/lex.c:430
+#: src/lex.c:432
 msgid "use \"...\" for multi-character literal tokens"
 msgstr "複数文字のリテラルトークンには \"...\" を使いましょう"
 
@@ -454,7 +454,7 @@ msgstr ""
 msgid "symbol %s redefined"
 msgstr "シンボル %s が再定義されました"
 
-#: src/reader.c:534 src/reader.c:613 src/reader.c:674 src/reader.c:1306
+#: src/reader.c:534 src/reader.c:613 src/reader.c:674 src/reader.c:1290
 #, c-format
 msgid "type redeclaration for %s"
 msgstr "%s の型が再定義されました"
@@ -469,7 +469,7 @@ msgstr "%2$s
 msgid "multiple %s declarations"
 msgstr "複数の %start が宣言されました"
 
-#: src/reader.c:563 src/reader.c:893 src/reader.c:918 src/reader.c:1284
+#: src/reader.c:563 src/reader.c:902 src/reader.c:927 src/reader.c:1268
 #, fuzzy, c-format
 msgid "invalid %s declaration"
 msgstr "無効な %start が宣言されました"
@@ -498,144 +498,134 @@ msgstr "̵
 msgid "unexpected item: %s"
 msgstr "予期せぬアイテム: %s"
 
-#: src/reader.c:759 src/reader.c:1110 src/reader.c:1181
+#: src/reader.c:764 src/reader.c:1094 src/reader.c:1165
 #, fuzzy, c-format
 msgid "unmatched %s"
 msgstr "対応のない `{' です"
 
-#: src/reader.c:791
+#: src/reader.c:796
 #, fuzzy, c-format
 msgid "argument of %%expect is not an integer"
 msgstr "%expect の引数が整数値ではありません"
 
-#: src/reader.c:838
+#: src/reader.c:843
 #, c-format
 msgid "unrecognized item %s, expected an identifier"
 msgstr "認識できないアイテム %s、ここでは識別子が期待されます"
 
-#: src/reader.c:862
+#: src/reader.c:867
 #, c-format
 msgid "expected string constant instead of %s"
 msgstr "ここでは %s ではなく文字列定数が期待されます"
 
-#: src/reader.c:930
+#: src/reader.c:1010
-#, fuzzy, c-format
-msgid "multiple %%header_extension declarations"
-msgstr "複数の %union 宣言です"
-
-#: src/reader.c:940
-#, fuzzy, c-format
-msgid "multiple %%source_extension declarations"
-msgstr "複数の %union 宣言です"
-
-#: src/reader.c:1026
 #, c-format
 msgid "unrecognized: %s"
 msgstr "認識できない: %s"
 
-#: src/reader.c:1031
+#: src/reader.c:1015
 msgid "no input grammar"
 msgstr "文法の入力が無い"
 
-#: src/reader.c:1036
+#: src/reader.c:1020
 #, c-format
 msgid "unknown character: %s"
 msgstr "未知の文字: %s"
 
-#: src/reader.c:1204
+#: src/reader.c:1188
 #, fuzzy, c-format
 msgid "unterminated %guard clause"
 msgstr "閉じられていない %%guard 節です"
 
-#: src/reader.c:1371
+#: src/reader.c:1355
 msgid "ill-formed rule: initial symbol not followed by colon"
 msgstr "邪悪な規則: 初期化シンボルにコロン (:) が続いていません"
 
-#: src/reader.c:1378
+#: src/reader.c:1362
 msgid "grammar starts with vertical bar"
 msgstr "文法は縦棒 (|) で始めます"
 
-#: src/reader.c:1409
+#: src/reader.c:1393
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "%s に規則が与えられ、それはトークンとなります"
 
-#: src/reader.c:1511
+#: src/reader.c:1495
 msgid "two @prec's in a row"
 msgstr "@prec のもの二つが同列になっています"
 
-#: src/reader.c:1519
+#: src/reader.c:1503
 #, c-format
 msgid "%%guard present but %%semantic_parser not specified"
 msgstr "%%guard がありますが %%semantic_parser が指定されていません"
 
-#: src/reader.c:1528
+#: src/reader.c:1512
 msgid "two actions at end of one rule"
 msgstr "一つの規則の終りに二つの動作を指定しています"
 
-#: src/reader.c:1542
+#: src/reader.c:1526
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "初期状態の動作では型 (`%s' `%s') が衝突します"
 
-#: src/reader.c:1548
+#: src/reader.c:1532
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "空の型付き非終端アイテム用規則であり、動作が起りません"
 
-#: src/reader.c:1592
+#: src/reader.c:1576
 #, c-format
 msgid "invalid input: %s"
 msgstr "無効な入力: %s"
 
-#: src/reader.c:1600
+#: src/reader.c:1584
 #, fuzzy, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "シンボルが多すぎます (トークンと非終端アイテム) -- 最大 %s"
 
-#: src/reader.c:1603
+#: src/reader.c:1587
 msgid "no rules in the input grammar"
 msgstr "入力した文法に規則が定義されていません"
 
-#: src/reader.c:1627
+#: src/reader.c:1611
 #, c-format
 msgid "symbol %s is used, but is not defined as a token and has no rules"
 msgstr ""
 "シンボル %s が使われていますが、トークンとして定義されておらず、規則を持ちま"
 "せん"
 
-#: src/reader.c:1732
+#: src/reader.c:1716
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "先行している %s と %s で競合が生じています"
 
-#: src/reader.c:1744
+#: src/reader.c:1728
 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "非結合値 %s と %s で競合が生じています"
 
-#: src/reader.c:1795
+#: src/reader.c:1779
 #, fuzzy, c-format
 msgid "tokens %s and %s both assigned number %d"
 msgstr "トークン %s と %s の双方が番号 %s に割り当てられました"
 
-#: src/reader.c:1808
+#: src/reader.c:1792
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "開始シンボル %s は定義されていません"
 
-#: src/reader.c:1810
+#: src/reader.c:1794
 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "開始シンボル %s はトークンです"
 
-#: src/reduce.c:404
+#: src/reduce.c:402
 #, fuzzy
 msgid "Useless nonterminals:"
 msgstr ""
 "不使用非終端子:\n"
 "\n"
 
-#: src/reduce.c:419
+#: src/reduce.c:417
 #, fuzzy
 msgid "Terminals which are not used:"
 msgstr ""
@@ -644,7 +634,7 @@ msgstr ""
 "利用されない終端子:\n"
 "\n"
 
-#: src/reduce.c:430
+#: src/reduce.c:428
 #, fuzzy
 msgid "Useless rules:"
 msgstr ""
@@ -653,7 +643,7 @@ msgstr ""
 "不使用規則:\n"
 "\n"
 
-#: src/reduce.c:459
+#: src/reduce.c:457
 msgid ""
 "Variables\n"
 "---------\n"
@@ -663,11 +653,11 @@ msgstr ""
 "---------\n"
 "\n"
 
-#: src/reduce.c:461
+#: src/reduce.c:459
 msgid "Value  Sprec    Sassoc    Tag\n"
 msgstr "値     前置     結合      タグ\n"
 
-#: src/reduce.c:466
+#: src/reduce.c:464
 msgid ""
 "Rules\n"
 "-----\n"
@@ -677,7 +667,7 @@ msgstr ""
 "-----\n"
 "\n"
 
-#: src/reduce.c:477
+#: src/reduce.c:475
 msgid ""
 "Rules interpreted\n"
 "-----------------\n"
@@ -687,36 +677,36 @@ msgstr ""
 "-----------------\n"
 "\n"
 
-#: src/reduce.c:494
+#: src/reduce.c:492
 #, c-format
 msgid "%d rules never reduced\n"
 msgstr "%d 個の規則は決して還元されません\n"
 
-#: src/reduce.c:496
+#: src/reduce.c:494
 #, c-format
 msgid "%s contains "
 msgstr "%s には"
 
-#: src/reduce.c:500
+#: src/reduce.c:498
 #, c-format
 msgid "%d useless nonterminal%s"
 msgstr "%d 個の不使用非終端子%.0s"
 
-#: src/reduce.c:505
+#: src/reduce.c:503
 msgid " and "
 msgstr "および"
 
-#: src/reduce.c:509
+#: src/reduce.c:507
 #, c-format
 msgid "%d useless rule%s"
 msgstr "%d 個の不使用規則%.0s"
 
-#: src/reduce.c:542
+#: src/reduce.c:540
 #, c-format
 msgid "Start symbol %s does not derive any sentence"
 msgstr "開始シンボル %s はどの文にも由来しません"
 
-#: src/reduce.c:555
+#: src/reduce.c:553
 #, c-format
 msgid ""
 "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n"
@@ -892,6 +882,9 @@ msgstr ""
 #~ msgid "unterminated comment in `%{' definition"
 #~ msgstr "`%{' 定義 に閉じられていないコメントがあります"
 
+#~ msgid "multiple %union declarations"
+#~ msgstr "複数の %union 宣言です"
+
 #~ msgid "unterminated comment at end of file"
 #~ msgstr "ファイル末尾に閉じられていないコメントがあります"
 

po/nl.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.25\n"
-"POT-Creation-Date: 2001-08-29 14:32+0200\n"
+"POT-Creation-Date: 2001-09-22 18:19+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,15 +18,15 @@ 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"
@@ -135,12 +135,12 @@ msgstr ""
 msgid "%s derives"
 msgstr "%s afgeleiden"
 
-#: src/files.c:130
+#: src/files.c:132
 #, c-format
 msgid "cannot open file `%s'"
 msgstr ""
 
-#: src/files.c:149
+#: src/files.c:151
 msgid "cannot close file"
 msgstr ""
 
@@ -214,22 +214,22 @@ msgid ""
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
 
-#: src/getargs.c:210 src/lex.c:636
+#: src/getargs.c:214 src/lex.c:635
 #, c-format
 msgid "`%s' is no longer supported"
 msgstr ""
 
-#: src/getargs.c:234
+#: src/getargs.c:238
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: src/getargs.c:241
+#: src/getargs.c:245
 #, c-format
 msgid "%s: no grammar file given\n"
 msgstr "%s: geen grammatica bestand gegeven\n"
 
-#: src/getargs.c:245
+#: src/getargs.c:249
 #, fuzzy, c-format
 msgid "%s: extra arguments ignored after `%s'\n"
 msgstr "%s: extra argumenten genegeerd na '%s'\n"
@@ -239,47 +239,47 @@ msgstr "%s: extra argumenten genegeerd na '%s'\n"
 msgid "too many gotos (max %d)"
 msgstr ""
 
-#: src/lex.c:70
+#: src/lex.c:72
 msgid "unexpected `/' found and ignored"
 msgstr "onverwachte `/' gevonden en genegeerd"
 
-#: src/lex.c:99 src/reader.c:270
+#: src/lex.c:101 src/reader.c:270
 msgid "unterminated comment"
 msgstr "ongetermineerd commentaar"
 
-#: src/lex.c:131
+#: src/lex.c:133
 #, fuzzy
 msgid "unexpected end of file"
 msgstr "Onverwacht bestandseinde"
 
-#: src/lex.c:160
+#: src/lex.c:162
 msgid "unescaped newline in constant"
 msgstr "niet geescapete nieuwe regel in constante"
 
-#: src/lex.c:202
+#: src/lex.c:204
 #, 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:229
 #, c-format
 msgid "hexadecimal value above 255: `\\x%x'"
 msgstr "hexadecimale waarde boven 255: `\\x%x'"
 
-#: src/lex.c:239
+#: src/lex.c:241
 #, c-format
 msgid "unknown escape sequence: `\\' followed by `%s'"
 msgstr "onbekende escape reeks: `\\' gevolgd door `%s'"
 
-#: src/lex.c:335
+#: src/lex.c:337
 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:340
 msgid "unterminated type name"
 msgstr "niet getermineerd type naam"
 
-#: src/lex.c:430
+#: src/lex.c:432
 msgid "use \"...\" for multi-character literal tokens"
 msgstr "gebruik \"...\" voor meerdere karakters literal tekens"
 
@@ -456,7 +456,7 @@ msgstr ""
 msgid "symbol %s redefined"
 msgstr "symbool %s opnieuw gedefinieerd"
 
-#: src/reader.c:534 src/reader.c:613 src/reader.c:674 src/reader.c:1306
+#: src/reader.c:534 src/reader.c:613 src/reader.c:674 src/reader.c:1290
 #, c-format
 msgid "type redeclaration for %s"
 msgstr "type herdeclaratie voor %s"
@@ -471,7 +471,7 @@ msgstr "`%s' is onjuist in %s"
 msgid "multiple %s declarations"
 msgstr "meerdere %start declaraties"
 
-#: src/reader.c:563 src/reader.c:893 src/reader.c:918 src/reader.c:1284
+#: src/reader.c:563 src/reader.c:902 src/reader.c:927 src/reader.c:1268
 #, fuzzy, c-format
 msgid "invalid %s declaration"
 msgstr "onjuiste %start declaratie"
@@ -500,145 +500,135 @@ msgstr "onjuiste tekst (%s) - nummer hoort na de identifier"
 msgid "unexpected item: %s"
 msgstr "onbekend item: %s"
 
-#: src/reader.c:759 src/reader.c:1110 src/reader.c:1181
+#: src/reader.c:764 src/reader.c:1094 src/reader.c:1165
 #, fuzzy, c-format
 msgid "unmatched %s"
 msgstr "niet overeenkomstige `{'"
 
-#: src/reader.c:791
+#: src/reader.c:796
 #, fuzzy, c-format
 msgid "argument of %%expect is not an integer"
 msgstr "argument van %expect is niet een integer"
 
-#: src/reader.c:838
+#: src/reader.c:843
 #, c-format
 msgid "unrecognized item %s, expected an identifier"
 msgstr "onbekend item %s, verwacht een identifier"
 
-#: src/reader.c:862
+#: src/reader.c:867
 #, c-format
 msgid "expected string constant instead of %s"
 msgstr "verwacht string constante in plaats van %s"
 
-#: src/reader.c:930
+#: src/reader.c:1010
-#, fuzzy, c-format
-msgid "multiple %%header_extension declarations"
-msgstr "meerdere %union declaraties"
-
-#: src/reader.c:940
-#, fuzzy, c-format
-msgid "multiple %%source_extension declarations"
-msgstr "meerdere %union declaraties"
-
-#: src/reader.c:1026
 #, c-format
 msgid "unrecognized: %s"
 msgstr "onbekend: %s"
 
-#: src/reader.c:1031
+#: src/reader.c:1015
 msgid "no input grammar"
 msgstr "geen invoer grammatica"
 
-#: src/reader.c:1036
+#: src/reader.c:1020
 #, c-format
 msgid "unknown character: %s"
 msgstr "onbekend karakter: %s"
 
-#: src/reader.c:1204
+#: src/reader.c:1188
 #, fuzzy, c-format
 msgid "unterminated %guard clause"
 msgstr "niet getermineerde %%guard voorwaarde"
 
-#: src/reader.c:1371
+#: src/reader.c:1355
 msgid "ill-formed rule: initial symbol not followed by colon"
 msgstr ""
 "slecht geformuleerde regel: initieel symbool niet gevolgd door dubbele punt"
 
-#: src/reader.c:1378
+#: src/reader.c:1362
 msgid "grammar starts with vertical bar"
 msgstr "grammatica start met een verticale bar"
 
-#: src/reader.c:1409
+#: src/reader.c:1393
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "regel geven voor %s, welke een teken is"
 
-#: src/reader.c:1511
+#: src/reader.c:1495
 msgid "two @prec's in a row"
 msgstr "twee @prec's in een regel"
 
-#: src/reader.c:1519
+#: src/reader.c:1503
 #, c-format
 msgid "%%guard present but %%semantic_parser not specified"
 msgstr "%%guard aanwezig maar %%semantic_parser niet gespecificeerd"
 
-#: src/reader.c:1528
+#: src/reader.c:1512
 msgid "two actions at end of one rule"
 msgstr "twee akties aan het einde van een regel"
 
-#: src/reader.c:1542
+#: src/reader.c:1526
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "type clash (`%s' `%s') bij standaard aktie"
 
-#: src/reader.c:1548
+#: src/reader.c:1532
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "lege regel voor getypte niet terminal, en geen aktie"
 
-#: src/reader.c:1592
+#: src/reader.c:1576
 #, c-format
 msgid "invalid input: %s"
 msgstr "ongeldige invoer: %s"
 
-#: src/reader.c:1600
+#: src/reader.c:1584
 #, fuzzy, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "te veel symbolen (tekens plus nietterminals); maximum %s"
 
-#: src/reader.c:1603
+#: src/reader.c:1587
 msgid "no rules in the input grammar"
 msgstr "geen regels voor invoer grammatica"
 
-#: src/reader.c:1627
+#: src/reader.c:1611
 #, 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:1732
+#: src/reader.c:1716
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "conflictuerende precedentein voor %s en %s"
 
-#: src/reader.c:1744
+#: src/reader.c:1728
 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "conflictuerende associatieve waarden voor %s en %s"
 
-#: src/reader.c:1795
+#: src/reader.c:1779
 #, c-format
 msgid "tokens %s and %s both assigned number %d"
 msgstr ""
 
-#: src/reader.c:1808
+#: src/reader.c:1792
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr ""
 
-#: src/reader.c:1810
+#: src/reader.c:1794
 #, 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:402
 #, fuzzy
 msgid "Useless nonterminals:"
 msgstr ""
 "Onbruikbare niet terminals:\n"
 "\n"
 
-#: src/reduce.c:419
+#: src/reduce.c:417
 #, fuzzy
 msgid "Terminals which are not used:"
 msgstr ""
@@ -647,7 +637,7 @@ msgstr ""
 "Terminals welke niet worden gebruikt:\n"
 "\n"
 
-#: src/reduce.c:430
+#: src/reduce.c:428
 #, fuzzy
 msgid "Useless rules:"
 msgstr ""
@@ -656,7 +646,7 @@ msgstr ""
 "Onbruikbare regels:\n"
 "\n"
 
-#: src/reduce.c:459
+#: src/reduce.c:457
 msgid ""
 "Variables\n"
 "---------\n"
@@ -666,11 +656,11 @@ msgstr ""
 "----------\n"
 "\n"
 
-#: src/reduce.c:461
+#: src/reduce.c:459
 msgid "Value  Sprec    Sassoc    Tag\n"
 msgstr "Waarde  Sprec    Sassoc    Tag\n"
 
-#: src/reduce.c:466
+#: src/reduce.c:464
 msgid ""
 "Rules\n"
 "-----\n"
@@ -680,7 +670,7 @@ msgstr ""
 "------\n"
 "\n"
 
-#: src/reduce.c:477
+#: src/reduce.c:475
 msgid ""
 "Rules interpreted\n"
 "-----------------\n"
@@ -690,36 +680,36 @@ msgstr ""
 "-----------------------\n"
 "\n"
 
-#: src/reduce.c:494
+#: src/reduce.c:492
 #, c-format
 msgid "%d rules never reduced\n"
 msgstr "%d regels nooit gereduceerd\n"
 
-#: src/reduce.c:496
+#: src/reduce.c:494
 #, c-format
 msgid "%s contains "
 msgstr "%s bevat"
 
-#: src/reduce.c:500
+#: src/reduce.c:498
 #, c-format
 msgid "%d useless nonterminal%s"
 msgstr "%d onbruikbare niet terminal%s"
 
-#: src/reduce.c:505
+#: src/reduce.c:503
 msgid " and "
 msgstr " en "
 
-#: src/reduce.c:509
+#: src/reduce.c:507
 #, c-format
 msgid "%d useless rule%s"
 msgstr "%d onbruikbare regels%s"
 
-#: src/reduce.c:542
+#: src/reduce.c:540
 #, 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:553
 #, c-format
 msgid ""
 "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n"
@@ -894,6 +884,9 @@ msgstr ""
 #~ 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"
 

po/ru.po

@@ -1,12 +1,12 @@
 # ðÅÒÅ×ÏÄ ÓÏÏÂÝÅÎÉÊ bison.
 # Copyright (C) 1999 Free Software Foundation, Inc.
-# Dmitry S. Sivachenko <[email protected]>, 1999,2000.
+# Dmitry S. Sivachenko <[email protected]>, 1999,2000,2001.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: bison 1.28d\n"
+"Project-Id-Version: bison 1.29\n"
-"POT-Creation-Date: 2001-08-29 14:32+0200\n"
+"POT-Creation-Date: 2001-09-22 18:19+0200\n"
-"PO-Revision-Date: 2001-08-31 18:28+04:00\n"
+"PO-Revision-Date: 2001-09-09 13:49+04:00\n"
 "Last-Translator: Dmitry S. Sivachenko <[email protected]>\n"
 "Language-Team: Russian <[email protected]>\n"
 "MIME-Version: 1.0\n"
@@ -18,15 +18,15 @@ 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 "îÅÉÚ×ÅÓÔÎÁÑ ÓÉÓÔÅÍÎÁÑ ÏÛÉÂËÁ"
 
-#: 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
 msgid "fatal error: "
 msgstr "ÆÁÔÁÌØÎÁÑ ÏÛÉÂËÁ: "
 
@@ -129,12 +129,12 @@ msgstr "DERIVES"
 msgid "%s derives"
 msgstr "%s ×Ù×ÏÄÉÔ"
 
-#: src/files.c:130
+#: src/files.c:132
 #, c-format
 msgid "cannot open file `%s'"
 msgstr "ÎÅ ÕÄÁÅÔÓÑ ÏÔËÒÙÔØ ÆÁÊÌ `%s'"
 
-#: src/files.c:149
+#: src/files.c:151
 msgid "cannot close file"
 msgstr "ÎÅ ÕÄÁÅÔÓÑ ÚÁËÒÙÔØ ÆÁÊÌ"
 
@@ -236,22 +236,22 @@ msgstr ""
 "ðòéçïäîïóôé\n"
 "äìñ ïðòåäåìåîîïê ãåìé.\n"
 
-#: src/getargs.c:210 src/lex.c:636
+#: src/getargs.c:214 src/lex.c:635
 #, c-format
 msgid "`%s' is no longer supported"
 msgstr "`%s' ÂÏÌØÛÅ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ"
 
-#: src/getargs.c:234
+#: src/getargs.c:238
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "éÓÐÏÌØÚÕÊÔÅ `%s --help' ÄÌÑ ÄÏÐÏÌÎÉÔÅÌØÎÏÊ ÉÎÆÏÒÍÁÃÉÉ.\n"
 
-#: src/getargs.c:241
+#: src/getargs.c:245
 #, c-format
 msgid "%s: no grammar file given\n"
 msgstr "%s: ÎÅ ÚÁÄÁÎ ÆÁÊÌ Ó ÇÒÁÍÍÁÔÉËÏÊ\n"
 
-#: src/getargs.c:245
+#: src/getargs.c:249
 #, c-format
 msgid "%s: extra arguments ignored after `%s'\n"
 msgstr "%s: ÌÉÛÎÉÅ ÁÒÇÕÍÅÎÔÙ ÐÏÓÌÅ `%s' ÉÇÎÏÒÉÒÏ×ÁÎÙ\n"
@@ -261,46 +261,46 @@ msgstr "%s:
 msgid "too many gotos (max %d)"
 msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ goto (ÍÁËÓÉÍÁÌØÎÏ %d)"
 
-#: src/lex.c:70
+#: src/lex.c:72
 msgid "unexpected `/' found and ignored"
 msgstr "×ÓÔÒÅÞÅÎ É ÐÒÏÉÇÎÏÒÉÒÏ×ÁÎ ÎÅÏÖÉÄÁÎÎÙÊ ÓÉÍ×ÏÌ `/'"
 
-#: src/lex.c:99 src/reader.c:270
+#: src/lex.c:101 src/reader.c:270
 msgid "unterminated comment"
 msgstr "ÎÅÚÁËÏÎÞÅÎÎÙÊ ËÏÍÍÅÎÔÁÒÉÊ"
 
-#: src/lex.c:131
+#: src/lex.c:133
 msgid "unexpected end of file"
 msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ËÏÎÅÃ ÆÁÊÌÁ"
 
-#: src/lex.c:160
+#: src/lex.c:162
 msgid "unescaped newline in constant"
 msgstr "ÎÅÜËÒÁÎÉÒÏ×ÁÎÎÙÊ ÐÅÒÅ×ÏÄ ÓÔÒÏËÉ × ËÏÎÓÔÁÎÔÅ"
 
-#: src/lex.c:202
+#: src/lex.c:204
 #, c-format
 msgid "octal value outside range 0...255: `\\%o'"
 msgstr "×ÏÓØÍÅÒÉÞÎÁÑ ×ÅÌÉÞÉÎÁ ÚÁ ÐÒÅÄÅÌÁÍÉ ÄÉÁÐÁÚÏÎÁ 0...255: `\\%o'"
 
-#: src/lex.c:227
+#: src/lex.c:229
 #, c-format
 msgid "hexadecimal value above 255: `\\x%x'"
 msgstr "ÛÅÓÔÎÁÄÃÁÔÅÒÉÞÎÁÑ ×ÅÌÉÞÉÎÁ ÐÒÅ×ÙÛÁÅÔ 255: `\\x%x'"
 
-#: src/lex.c:239
+#: src/lex.c:241
 #, c-format
 msgid "unknown escape sequence: `\\' followed by `%s'"
 msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ escape-ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ: `%s' ÐÏÓÌÅ `\\'"
 
-#: src/lex.c:335
+#: src/lex.c:337
 msgid "unterminated type name at end of file"
 msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ ÉÍÑ ÔÉÐÁ × ËÏÎÃÅ ÆÁÊÌÁ"
 
-#: src/lex.c:338
+#: src/lex.c:340
 msgid "unterminated type name"
 msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ ÉÍÑ ÔÉÐÁ"
 
-#: src/lex.c:430
+#: src/lex.c:432
 msgid "use \"...\" for multi-character literal tokens"
 msgstr "ÉÓÐÏÌØÚÕÊÔÅ \"...\" ÄÌÑ ÍÎÏÇÏÓÉÍ×ÏÌØÎÙÈ ÌÉÔÅÒÁÌØÎÙÈ ÌÅËÓÅÍ"
 
@@ -460,7 +460,7 @@ msgstr ""
 msgid "symbol %s redefined"
 msgstr "ÐÏ×ÔÏÒÎÏÅ ÏÐÒÅÄÅÌÅÎÉÅ ÓÉÍ×ÏÌÁ %s"
 
-#: src/reader.c:534 src/reader.c:613 src/reader.c:674 src/reader.c:1306
+#: src/reader.c:534 src/reader.c:613 src/reader.c:674 src/reader.c:1290
 #, c-format
 msgid "type redeclaration for %s"
 msgstr "ÐÏ×ÔÏÒÎÏÅ ÏÐÉÓÁÎÉÅ ÔÉÐÁ ÄÌÑ %s"
@@ -475,7 +475,7 @@ msgstr "`%s'
 msgid "multiple %s declarations"
 msgstr "ÍÎÏÖÅÓÔ×ÅÎÎÏÅ ÏÐÉÓÁÎÉÅ %s"
 
-#: src/reader.c:563 src/reader.c:893 src/reader.c:918 src/reader.c:1284
+#: src/reader.c:563 src/reader.c:902 src/reader.c:927 src/reader.c:1268
 #, c-format
 msgid "invalid %s declaration"
 msgstr "ÎÅ×ÅÒÎÏÅ ÏÐÉÓÁÎÉÅ %s"
@@ -504,148 +504,138 @@ msgstr "
 msgid "unexpected item: %s"
 msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ÜÌÅÍÅÎÔ: %s"
 
-#: src/reader.c:759 src/reader.c:1110 src/reader.c:1181
+#: src/reader.c:764 src/reader.c:1094 src/reader.c:1165
 #, c-format
 msgid "unmatched %s"
 msgstr "ÎÅÐÁÒÎÁÑ %s"
 
-#: src/reader.c:791
+#: src/reader.c:796
 #, c-format
 msgid "argument of %%expect is not an integer"
 msgstr "ÁÒÇÕÍÅÎÔ %%expect ÎÅ Ñ×ÌÑÅÔÓÑ ÃÅÌÙÍ ÞÉÓÌÏÍ"
 
-#: src/reader.c:838
+#: src/reader.c:843
 #, c-format
 msgid "unrecognized item %s, expected an identifier"
 msgstr "ÎÅÒÁÓÐÏÚÎÁÎÎÙÊ ÜÌÅÍÅÎÔ %s, ÏÖÉÄÁÌÓÑ ÉÄÅÎÔÉÆÉËÁÔÏÒ"
 
-#: src/reader.c:862
+#: src/reader.c:867
 #, c-format
 msgid "expected string constant instead of %s"
 msgstr "×ÍÅÓÔÏ %s ÏÖÉÄÁÌÁÓØ ÓÔÒÏËÏ×ÁÑ ÐÏÓÔÏÑÎÎÁÑ"
 
-#: src/reader.c:930
+#: src/reader.c:1010
-#, c-format
-msgid "multiple %%header_extension declarations"
-msgstr "ÍÎÏÖÅÓÔ×ÅÎÎÙÅ ÏÐÉÓÁÎÉÑ %%header_extension"
-
-#: src/reader.c:940
-#, c-format
-msgid "multiple %%source_extension declarations"
-msgstr "ÍÎÏÖÅÓÔ×ÅÎÎÙÅ ÏÐÉÓÁÎÉÑ %%source_extension"
-
-#: src/reader.c:1026
 #, c-format
 msgid "unrecognized: %s"
 msgstr "ÎÅÒÁÓÐÏÚÎÁÎÏ: %s"
 
-#: src/reader.c:1031
+#: src/reader.c:1015
 msgid "no input grammar"
 msgstr "ÎÅÔ ×ÈÏÄÎÏÊ ÇÒÁÍÍÁÔÉËÉ"
 
-#: src/reader.c:1036
+#: src/reader.c:1020
 #, c-format
 msgid "unknown character: %s"
 msgstr "ÎÅÉÚ×ÅÓÔÎÙÊ ÓÉÍ×ÏÌ: %s"
 
-#: src/reader.c:1204
+#: src/reader.c:1188
 #, c-format
 msgid "unterminated %guard clause"
 msgstr "ÎÅÚÁËÏÎÞÅÎÎÙÊ ÏÐÅÒÁÔÏÒ %guard"
 
-#: src/reader.c:1371
+#: src/reader.c:1355
 msgid "ill-formed rule: initial symbol not followed by colon"
 msgstr "ÎÅ×ÅÒÎÏÅ ÐÒÁ×ÉÌÏ: Ä×ÏÅÔÏÞÉÅ ÎÅ ÓÌÅÄÕÅÔ ÚÁ ÎÁÞÁÌØÎÙÍ ÓÉÍ×ÏÌÏÍ"
 
-#: src/reader.c:1378
+#: src/reader.c:1362
 msgid "grammar starts with vertical bar"
 msgstr "ÇÒÁÍÍÁÔÉËÁ ÎÁÞÉÎÁÅÔÓÑ Ó ×ÅÒÔÉËÁÌØÎÏÊ ÞÅÒÔÙ"
 
-#: src/reader.c:1409
+#: src/reader.c:1393
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "ÐÒÁ×ÉÌÏ ÚÁÄÁÎÏ ÄÌÑ %s, ËÏÔÏÒÙÊ Ñ×ÌÑÅÔÓÑ ÌÅËÓÅÍÏÊ"
 
-#: src/reader.c:1511
+#: src/reader.c:1495
 msgid "two @prec's in a row"
 msgstr "Ä×Á @prec ÐÏÄÒÑÄ"
 
-#: src/reader.c:1519
+#: src/reader.c:1503
 #, c-format
 msgid "%%guard present but %%semantic_parser not specified"
 msgstr "%%guard ÐÒÉÓÕÔÓÔ×ÕÅÔ, Á %%semantic_parser ÎÅ ÚÁÄÁÎ"
 
-#: src/reader.c:1528
+#: src/reader.c:1512
 msgid "two actions at end of one rule"
 msgstr "Ä×Á ÄÅÊÓÔ×ÉÑ × ËÏÎÃÅ ÏÄÎÏÇÏ ÐÒÁ×ÉÌÁ"
 
-#: src/reader.c:1542
+#: src/reader.c:1526
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "ËÏÎÆÌÉËÔ ÔÉÐÏ× (`%s' `%s') ÎÁ ÄÅÊÓÔ×ÉÉ ÐÏ ÕÍÏÌÞÁÎÉÀ"
 
-#: src/reader.c:1548
+#: src/reader.c:1532
 msgid "empty rule for typed nonterminal, and no action"
 msgstr ""
 "ÐÕÓÔÏÅ ÐÒÁ×ÉÌÏ ÄÌÑ ÔÉÐÉÚÉÒÏ×ÁÎÎÏÇÏ ÎÅÔÅÒÍÉÎÁÌØÎÏÇÏ ÓÉÍ×ÏÌÁ, É ÎÅÔ ÄÅÊÓÔ×ÉÑ"
 
-#: src/reader.c:1592
+#: src/reader.c:1576
 #, c-format
 msgid "invalid input: %s"
 msgstr "ÎÅ×ÅÒÎÙÅ ×ÈÏÄÎÙÅ ÄÁÎÎÙÅ: %s"
 
-#: src/reader.c:1600
+#: src/reader.c:1584
 #, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ ÓÉÍ×ÏÌÏ× (ÌÅËÓÅÍÙ ÐÌÀÓ ÎÅÔÅÒÍÉÎÁÌÙ); ÍÁËÓÉÍÁÌØÎÏ %d"
 
-#: src/reader.c:1603
+#: src/reader.c:1587
 msgid "no rules in the input grammar"
 msgstr "ÏÔÓÕÔÓÔ×ÕÀÔ ÐÒÁ×ÉÌÁ ×Ï ×ÈÏÄÎÏÊ ÇÒÁÍÍÁÔÉËÅ"
 
-#: src/reader.c:1627
+#: src/reader.c:1611
 #, c-format
 msgid "symbol %s is used, but is not defined as a token and has no rules"
 msgstr "ÓÉÍ×ÏÌ %s ÉÓÐÏÌØÚÕÅÔÓÑ, ÎÏ ÎÅ ÏÐÒÅÄÅÌÅÎ ËÁË ÌÅËÓÅÍÁ É ÎÅ ÉÍÅÅÔ ÐÒÁ×ÉÌ"
 
-#: src/reader.c:1732
+#: src/reader.c:1716
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "ÐÒÏÔÉ×ÏÒÅÞÉ×ÙÅ ÐÒÉÏÒÉÔÅÔÙ ÄÌÑ %s É %s"
 
-#: src/reader.c:1744
+#: src/reader.c:1728
 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "ÐÒÏÔÉ×ÏÒÅÞÉ×ÙÅ ÚÎÁÞÅÎÉÑ ÁÓÓÏÃÉÁÔÉ×ÎÏÓÔÉ ÄÌÑ %s É %s"
 
-#: src/reader.c:1795
+#: src/reader.c:1779
 #, c-format
 msgid "tokens %s and %s both assigned number %d"
 msgstr "ÏÂÅÉÍ ÌÅËÓÅÍÁÍ %s É %s ÐÒÉÓ×ÏÅÎ ÎÏÍÅÒ %d"
 
-#: src/reader.c:1808
+#: src/reader.c:1792
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "ÎÁÞÁÌØÎÙÊ ÓÉÍ×ÏÌ %s ÎÅÏÐÒÅÄÅÌÅÎ"
 
-#: src/reader.c:1810
+#: src/reader.c:1794
 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "ÎÁÞÁÌØÎÙÊ ÓÉÍ×ÏÌ %s Ñ×ÌÑÅÔÓÑ ÌÅËÓÅÍÏÊ"
 
-#: src/reduce.c:404
+#: src/reduce.c:402
 msgid "Useless nonterminals:"
 msgstr "âÅÓÐÏÌÅÚÎÙÅ ÎÅÔÅÒÍÉÎÁÌÙ:"
 
-#: src/reduce.c:419
+#: src/reduce.c:417
 msgid "Terminals which are not used:"
 msgstr "îÅÉÓÐÏÌØÚÏ×ÁÎÎÙÅ ÔÅÒÍÉÎÁÌÙ:"
 
-#: src/reduce.c:430
+#: src/reduce.c:428
 msgid "Useless rules:"
 msgstr "âÅÓÐÏÌÅÚÎÙÅ ÐÒÁ×ÉÌÁ:"
 
-#: src/reduce.c:459
+#: src/reduce.c:457
 msgid ""
 "Variables\n"
 "---------\n"
@@ -655,11 +645,11 @@ msgstr ""
 "----------\n"
 "\n"
 
-#: src/reduce.c:461
+#: src/reduce.c:459
 msgid "Value  Sprec    Sassoc    Tag\n"
 msgstr "úÎÁÞ   ðÒÉÏÒ    áÓÓÏÃ     ôÅÇ\n"
 
-#: src/reduce.c:466
+#: src/reduce.c:464
 msgid ""
 "Rules\n"
 "-----\n"
@@ -669,7 +659,7 @@ msgstr ""
 "-------\n"
 "\n"
 
-#: src/reduce.c:477
+#: src/reduce.c:475
 msgid ""
 "Rules interpreted\n"
 "-----------------\n"
@@ -679,36 +669,36 @@ msgstr ""
 "--------------------------\n"
 "\n"
 
-#: src/reduce.c:494
+#: src/reduce.c:492
 #, c-format
 msgid "%d rules never reduced\n"
 msgstr "%d ÐÒÁ×ÉÌ ÎÅ Ó×ÅÄÅÎÏ\n"
 
-#: src/reduce.c:496
+#: src/reduce.c:494
 #, c-format
 msgid "%s contains "
 msgstr "%s ÓÏÄÅÒÖÉÔ "
 
-#: src/reduce.c:500
+#: src/reduce.c:498
 #, c-format
 msgid "%d useless nonterminal%s"
 msgstr "%d ÂÅÓÐÏÌÅÚÎÙÈ ÎÅÔÅÒÍÉÎÁÌÏ×%s"
 
-#: src/reduce.c:505
+#: src/reduce.c:503
 msgid " and "
 msgstr " É "
 
-#: src/reduce.c:509
+#: src/reduce.c:507
 #, c-format
 msgid "%d useless rule%s"
 msgstr "%d ÂÅÓÐÏÌÅÚÎÙÈ ÐÒÁ×ÉÌ%s"
 
-#: src/reduce.c:542
+#: src/reduce.c:540
 #, c-format
 msgid "Start symbol %s does not derive any sentence"
 msgstr "îÁÞÁÌØÎÙÊ ÓÉÍ×ÏÌ %s ÎÅ ×Ù×ÏÄÉÔ ÎÉ ÏÄÎÏÇÏ ÐÒÅÄÌÏÖÅÎÉÑ"
 
-#: src/reduce.c:555
+#: src/reduce.c:553
 #, c-format
 msgid ""
 "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n"
@@ -803,17 +793,11 @@ msgstr "`"
 msgid "'"
 msgstr "'"
 
-#~ msgid "unterminated comment at end of file"
+#~ msgid "multiple %%header_extension declarations"
-#~ msgstr "ÎÅÚÁËÏÎÞÅÎÎÙÊ ËÏÍÍÅÎÔÁÒÉÊ × ËÏÎÃÅ ÆÁÊÌÁ"
+#~ msgstr "ÍÎÏÖÅÓÔ×ÅÎÎÙÅ ÏÐÉÓÁÎÉÑ %%header_extension"
 
-#~ msgid "unmatched close-brace (`}')"
+#~ msgid "multiple %%source_extension declarations"
-#~ msgstr "ÎÅÐÁÒÎÁÑ ÚÁËÒÙ×ÁÀÝÁÑ ÆÉÇÕÒÎÁÑ ÓËÏÂËÁ (`}')"
+#~ msgstr "ÍÎÏÖÅÓÔ×ÅÎÎÙÅ ÏÐÉÓÁÎÉÑ %%source_extension"
 
 #~ msgid "@%s is invalid"
 #~ msgstr "ÎÅ×ÅÒÎÙÊ ÚÎÁË @%s"
-
-#~ msgid "unmatched right brace (`}')"
-#~ msgstr "ÎÅÐÁÒÎÁÑ ÐÒÁ×ÁÑ ÆÉÇÕÒÎÁÑ ÓËÏÂËÁ (`}')"
-
-#~ msgid "ill-formed %type declaration"
-#~ msgstr "ÎÅ×ÅÒÎÏÅ ÏÐÉÓÁÎÉÅ %type"

po/tr.po

@@ -0,0 +1,835 @@
+# 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-22 18:19+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:49
+#, c-format
+msgid "Conflict in state %d between rule %d and token %s resolved as %s.\n"
+msgstr ""
+"%d durumu içinde %d kuralý ve %s andaçý arasýndaki çeliþki %s "
+"olarakçözümlendi.\n"
+
+#: src/conflicts.c:115 src/conflicts.c:138
+msgid "reduce"
+msgstr "indirgeme"
+
+#: src/conflicts.c:121 src/conflicts.c:134
+msgid "shift"
+msgstr "öteleme"
+
+#: src/conflicts.c:142
+msgid "an error"
+msgstr "bir hata"
+
+#: src/conflicts.c:422
+msgid " 1 shift/reduce conflict"
+msgstr " 1 öteleme/indirgeme çeliþkisi"
+
+#: src/conflicts.c:427
+#, c-format
+msgid " %d shift/reduce conflicts"
+msgstr " %d öteleme/indirgeme çeliþkisi"
+
+#: src/conflicts.c:433
+msgid " and"
+msgstr " ve"
+
+#: src/conflicts.c:439
+msgid " 1 reduce/reduce conflict"
+msgstr " 1 indirgeme/indirgeme çeliþkisi"
+
+#: src/conflicts.c:444
+#, c-format
+msgid " %d reduce/reduce conflicts"
+msgstr " %d indirgeme/indirgeme çeliþkisi"
+
+#: src/conflicts.c:481
+#, c-format
+msgid "State %d contains"
+msgstr "%d durumu içerir"
+
+#. If invoked with `--yacc', use the output format specified by
+#. POSIX.
+#: src/conflicts.c:493
+msgid "conflicts: "
+msgstr "çeliþkiler: "
+
+#: src/conflicts.c:495
+#, c-format
+msgid " %d shift/reduce"
+msgstr " %d öteleme/indirgeme"
+
+#: src/conflicts.c:499
+#, c-format
+msgid " %d reduce/reduce"
+msgstr " %d indirgeme/indirgeme"
+
+#: src/conflicts.c:504
+#, c-format
+msgid "%s contains"
+msgstr "%s içerir"
+
+#: src/conflicts.c:590 src/conflicts.c:711
+#, c-format
+msgid "    %-4s\t[reduce using rule %d (%s)]\n"
+msgstr "    %-4s\t[indirgeme kural %d (%s)'i kullanýyor]\n"
+
+#: src/conflicts.c:602 src/print.c:173
+#, 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:691 src/conflicts.c:705
+#, c-format
+msgid "    %-4s\treduce using rule %d (%s)\n"
+msgstr "    %-4s\tindirgeme kural %d (%s)'i kullanýyor\n"
+
+#: src/conflicts.c:732
+#, c-format
+msgid "    $default\treduce using rule %d (%s)\n"
+msgstr "    $default\tindirgeme kural %d (%s)'i kullanýyor\n"
+
+#: src/derives.c:44
+msgid "DERIVES"
+msgstr "TÜRETÝLENLER"
+
+#: src/derives.c:49
+#, c-format
+msgid "%s derives"
+msgstr "%s türetildi"
+
+#: src/files.c:132
+#, c-format
+msgid "cannot open file `%s'"
+msgstr "`%s' dosyasý açýlamadý"
+
+#: src/files.c:151
+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:635
+#, 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:312
+#, c-format
+msgid "too many gotos (max %d)"
+msgstr "gotos çok fazla (en fazla %d)"
+
+#: src/lex.c:72
+msgid "unexpected `/' found and ignored"
+msgstr "beklenmeyen `/' bulundu ve yoksayýldý"
+
+#: src/lex.c:101 src/reader.c:270
+msgid "unterminated comment"
+msgstr "sonlandýrýlmamýþ açýklama"
+
+#: src/lex.c:133
+msgid "unexpected end of file"
+msgstr "beklenmeyen dosya sonu"
+
+#: src/lex.c:162
+msgid "unescaped newline in constant"
+msgstr "sabit içinde kaçýþsýz yeni satýr"
+
+#: src/lex.c:204
+#, c-format
+msgid "octal value outside range 0...255: `\\%o'"
+msgstr "sekizli deðer 0...255'in dýþýnda: `\\%o'"
+
+#: src/lex.c:229
+#, c-format
+msgid "hexadecimal value above 255: `\\x%x'"
+msgstr "onaltýlýk deðer 255'in üstünde: `\\x%x'"
+
+#: src/lex.c:241
+#, c-format
+msgid "unknown escape sequence: `\\' followed by `%s'"
+msgstr "bilinmeyen kaçýþ sýrasý: `\\' `%s' tarafýndan takip edildi"
+
+#: src/lex.c:337
+msgid "unterminated type name at end of file"
+msgstr "dosya sonunda sonlandýrýlmamýþ tip adý"
+
+#: src/lex.c:340
+msgid "unterminated type name"
+msgstr "sonlandýrýlmamýþ tip ismi"
+
+#: src/lex.c:432
+msgid "use \"...\" for multi-character literal tokens"
+msgstr "çok-karakterli yazýn andaçlarý için \"...\" kullan"
+
+#: src/main.c:108
+#, c-format
+msgid "%s: internal error: %s\n"
+msgstr "%s: iç hata: %s\n"
+
+#: src/nullable.c:52
+msgid "Entering set_nullable"
+msgstr "set_nullable'a girildi"
+
+#: src/output.c:993
+#, c-format
+msgid "maximum table size (%d) exceeded"
+msgstr "en büyük tablo uzunluðu (%d) aþýldý"
+
+#: src/print.c:38
+#, c-format
+msgid " type %d is %s\n"
+msgstr " tip %d %s'dir\n"
+
+#: src/print.c:86
+#, c-format
+msgid "   (rule %d)"
+msgstr "   (kural %d)"
+
+#: src/print.c:112
+msgid "    $default\taccept\n"
+msgstr "    $default\tonayla\n"
+
+#: src/print.c:114
+msgid "    NO ACTIONS\n"
+msgstr "    EYLEM YOK\n"
+
+#: src/print.c:133
+#, c-format
+msgid "    $   \tgo to state %d\n"
+msgstr "    $   \tdurum %d'ye git\n"
+
+#: src/print.c:136
+#, c-format
+msgid "    %-4s\tshift, and go to state %d\n"
+msgstr "    %-4s\tötele, ve durum %d'ye git\n"
+
+#: src/print.c:160
+#, c-format
+msgid "    %-4s\terror (nonassociative)\n"
+msgstr "    %-4s\thata (birleþmeli deðil)\n"
+
+#: src/print.c:190
+#, c-format
+msgid "    %-4s\tgo to state %d\n"
+msgstr "    %-4s\tdurum %d'ye git\n"
+
+#: src/print.c:202
+#, c-format
+msgid "state %d"
+msgstr "durum %d"
+
+#: src/print.c:233
+msgid "Grammar"
+msgstr "Gramer"
+
+#: src/print.c:240
+#, c-format
+msgid "rule %-4d %s ->"
+msgstr "kural %-4d %s ->"
+
+#: src/print.c:246
+msgid "\t\t/* empty */"
+msgstr "\t\t/* boþ */"
+
+#: src/print.c:253
+msgid "Terminals, with rules where they appear"
+msgstr "Sabit simgeler, kurallarýnýn bulunduklarý yerde"
+
+#: src/print.c:302
+msgid "Nonterminals, with rules where they appear"
+msgstr "Deðiþken simgeler, kurallarýnýn bulunduklarý yerde"
+
+#: src/print.c:329
+msgid " on left:"
+msgstr " solda:"
+
+#: src/print.c:344
+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:79
+msgid "   Skipping to next \\n"
+msgstr "   Sonrakine atlanýyor \\n"
+
+#: src/reader.c:81
+#, c-format
+msgid "   Skipping to next %c"
+msgstr "   Sonraki  %c'ye atlanýyor"
+
+#: src/reader.c:132 src/reader.c:144
+msgid "invalid $ value"
+msgstr "geçersiz $ deðeri"
+
+#: src/reader.c:170 src/reader.c:185
+msgid "unterminated string at end of file"
+msgstr "dosyanýn sonunda sonlandýrýlmamýþ dizge"
+
+#: src/reader.c:173
+msgid "unterminated string"
+msgstr "sonlandýrýlmamýþ dizge"
+
+#: src/reader.c:326 src/reader.c:390
+#, c-format
+msgid "%s is invalid"
+msgstr "%s geçersizdir"
+
+#: src/reader.c:366
+#, c-format
+msgid "$$ of `%s' has no declared type"
+msgstr "`%s''in $$'ý bildirilmiþ tip deðil"
+
+#: src/reader.c:383
+#, c-format
+msgid "$%d of `%s' has no declared type"
+msgstr "`%d''in $%s'i bildirilmiþ tip deðil"
+
+#: src/reader.c:437
+msgid "unterminated `%{' definition"
+msgstr "`%{' tanýmlamasý sonlandýrýlmamýþ"
+
+#: src/reader.c:482 src/reader.c:598 src/reader.c:648
+#, c-format
+msgid "Premature EOF after %s"
+msgstr "%s'den sonra erken EOF"
+
+#: src/reader.c:499
+#, c-format
+msgid "symbol `%s' used more than once as a literal string"
+msgstr "simge `%s' birden fazla defa sabit dizge olarak kullanýldý"
+
+#: src/reader.c:502
+#, c-format
+msgid "symbol `%s' given more than one literal string"
+msgstr "`%s' simgesine birden fazla sabit dizge verilmiþ"
+
+#: src/reader.c:524 src/reader.c:667
+#, c-format
+msgid "symbol %s redefined"
+msgstr "%s simgesi yeniden tanýmlandý"
+
+#: src/reader.c:534 src/reader.c:613 src/reader.c:674 src/reader.c:1290
+#, c-format
+msgid "type redeclaration for %s"
+msgstr "%s için yeniden tip bildirimi"
+
+#: src/reader.c:544
+#, c-format
+msgid "`%s' is invalid in %s"
+msgstr "`%s' %s içinde geçersizdir"
+
+#: src/reader.c:561 src/reader.c:721
+#, c-format
+msgid "multiple %s declarations"
+msgstr "çoklu %s bildirimleri"
+
+#: src/reader.c:563 src/reader.c:902 src/reader.c:927 src/reader.c:1268
+#, c-format
+msgid "invalid %s declaration"
+msgstr "geçersiz %s bildirimi"
+
+#: src/reader.c:583
+msgid "%type declaration has no <typename>"
+msgstr "%type bildirimi <tipadý>'na sahip deðil"
+
+#: src/reader.c:618
+#, c-format
+msgid "invalid %%type declaration due to item: %s"
+msgstr "geçersiz %%type bildirimine neden olan öðe: %s"
+
+#: src/reader.c:663
+#, c-format
+msgid "redefining precedence of %s"
+msgstr "%s'in önceliði tekrar tanýmlandý"
+
+#: src/reader.c:687
+#, c-format
+msgid "invalid text (%s) - number should be after identifier"
+msgstr "geçersiz metin (%s) - sayý tanýtýcýdan sonra olmalýdýr"
+
+#: src/reader.c:697
+#, c-format
+msgid "unexpected item: %s"
+msgstr "beklenmeyen öðe: %s"
+
+#: src/reader.c:764 src/reader.c:1094 src/reader.c:1165
+#, c-format
+msgid "unmatched %s"
+msgstr "eþlenemeyen %s"
+
+#: src/reader.c:796
+#, c-format
+msgid "argument of %%expect is not an integer"
+msgstr "%%expect'in argümaný bir tamsayý deðil"
+
+#: src/reader.c:843
+#, c-format
+msgid "unrecognized item %s, expected an identifier"
+msgstr "%s öðesi tanýnmadý, beklenen bir tanýtýcýdýr"
+
+#: src/reader.c:867
+#, c-format
+msgid "expected string constant instead of %s"
+msgstr "%s'in yerine sabit dizge beklendi"
+
+#: src/reader.c:1010
+#, c-format
+msgid "unrecognized: %s"
+msgstr "tanýnmayan: %s"
+
+#: src/reader.c:1015
+msgid "no input grammar"
+msgstr "girdi grameri yok"
+
+#: src/reader.c:1020
+#, c-format
+msgid "unknown character: %s"
+msgstr "bilinmeyen karakter: %s"
+
+#: src/reader.c:1188
+#, c-format
+msgid "unterminated %guard clause"
+msgstr "sonlandýrýlmamýþ %guard yantümcesi"
+
+#: src/reader.c:1355
+msgid "ill-formed rule: initial symbol not followed by colon"
+msgstr "kötü-biçemli kural: baþlangýç simgesini takip eden \":\" yok"
+
+#: src/reader.c:1362
+msgid "grammar starts with vertical bar"
+msgstr "gramer düþey çubuk ile baþlýyor"
+
+#: src/reader.c:1393
+#, c-format
+msgid "rule given for %s, which is a token"
+msgstr "bir andaç olan %s için verilen kural"
+
+#: src/reader.c:1495
+msgid "two @prec's in a row"
+msgstr "bir satýrda iki @prec"
+
+#: src/reader.c:1503
+#, c-format
+msgid "%%guard present but %%semantic_parser not specified"
+msgstr "%%guard sunulmuþ fakat %%semantic_parser belirlenmemiþ"
+
+#: src/reader.c:1512
+msgid "two actions at end of one rule"
+msgstr "bir kuralýn sonunda iki eylem"
+
+#: src/reader.c:1526
+#, c-format
+msgid "type clash (`%s' `%s') on default action"
+msgstr "öntanýmlý eylem üzerinde (`%s' `%s') tip çatýþmasý"
+
+#: src/reader.c:1532
+msgid "empty rule for typed nonterminal, and no action"
+msgstr "Tipli deðiþken simge için boþ kural tanýmlanmýþ, ve eylembelirtilmemiþ"
+
+#: src/reader.c:1576
+#, c-format
+msgid "invalid input: %s"
+msgstr "geçersiz girdi: %s"
+
+#: src/reader.c:1584
+#, c-format
+msgid "too many symbols (tokens plus nonterminals); maximum %d"
+msgstr "çok fazla simge var (andaçlar ve deðiþken simgeler); en fazla %d"
+
+#: src/reader.c:1587
+msgid "no rules in the input grammar"
+msgstr "girdi grameri içinde kurallar yok"
+
+#: src/reader.c:1611
+#, c-format
+msgid "symbol %s is used, but is not defined as a token and has no rules"
+msgstr ""
+"simge %s kullanýldý, fakat bir andaç olarak tanýmlanmadý vekurallarý yok"
+
+#: src/reader.c:1716
+#, c-format
+msgid "conflicting precedences for %s and %s"
+msgstr "%s ve %s için çeliþen öncelikler"
+
+#: src/reader.c:1728
+#, c-format
+msgid "conflicting assoc values for %s and %s"
+msgstr "%s ve %s için çeliþen birleþmeli deðerler"
+
+#: src/reader.c:1779
+#, c-format
+msgid "tokens %s and %s both assigned number %d"
+msgstr "%s ve %s andaçlarýnýn her ikisi %d sayýsýna atandý"
+
+#: src/reader.c:1792
+#, c-format
+msgid "the start symbol %s is undefined"
+msgstr "baþlangýç simgesi %s tanýmlanmadý"
+
+#: src/reader.c:1794
+#, c-format
+msgid "the start symbol %s is a token"
+msgstr "baþlangýç simgesi %s bir andaçtýr"
+
+#: src/reduce.c:402
+msgid "Useless nonterminals:"
+msgstr "Yararsýz kurallar:"
+
+#: src/reduce.c:417
+msgid "Terminals which are not used:"
+msgstr "Kullanýlmayan sabit simgeler:"
+
+#: src/reduce.c:428
+msgid "Useless rules:"
+msgstr "Yararsýz kurallar:"
+
+#: src/reduce.c:457
+msgid ""
+"Variables\n"
+"---------\n"
+"\n"
+msgstr ""
+"Deðiþkenler\n"
+"-----------\n"
+"\n"
+
+#: src/reduce.c:459
+msgid "Value  Sprec    Sassoc    Tag\n"
+msgstr "Deðer  Söncel   Sbirleþ   Etiket\n"
+
+#: src/reduce.c:464
+msgid ""
+"Rules\n"
+"-----\n"
+"\n"
+msgstr ""
+"Kurallar\n"
+"--------\n"
+"\n"
+
+#: src/reduce.c:475
+msgid ""
+"Rules interpreted\n"
+"-----------------\n"
+"\n"
+msgstr ""
+"Kurallar yorumlandý\n"
+"-------------------\n"
+"\n"
+
+#: src/reduce.c:492
+#, c-format
+msgid "%d rules never reduced\n"
+msgstr "%d kural asla indirgenmedi\n"
+
+#: src/reduce.c:494
+#, c-format
+msgid "%s contains "
+msgstr "%s içerir "
+
+#: src/reduce.c:498
+#, c-format
+msgid "%d useless nonterminal%s"
+msgstr "%d yararsýz deðiþken simge%s"
+
+#: src/reduce.c:503
+msgid " and "
+msgstr " ve "
+
+#: src/reduce.c:507
+#, c-format
+msgid "%d useless rule%s"
+msgstr "%d yararsýz kural%s"
+
+#: src/reduce.c:540
+#, c-format
+msgid "Start symbol %s does not derive any sentence"
+msgstr "Baþlangýç simgesi %s herhangi bir cümleden türemez"
+
+#: src/reduce.c:553
+#, 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 "multiple %%header_extension declarations"
+#~ msgstr "çoklu %%header_extension bildirimleri"
+
+#~ msgid "multiple %%source_extension declarations"
+#~ msgstr "çoklu %%source_extension bildirimleri"
+
+#~ msgid "vcg graph: no such color."
+#~ msgstr "vcg graph: böyle bir renk yok."
+
+#~ msgid "vcg graph: no such text mode"
+#~ msgstr "vcg graph: böyle bir metin kipi yok"
+
+#~ msgid "vcg graph: no such shape"
+#~ msgstr "vcg graph: böyle bir þekil yok"
+
+#~ msgid "vcg graph: no such decision"
+#~ msgstr "vcg graph: böyle bir karar yok"
+
+#~ msgid "vcg graph: no such an orientation"
+#~ msgstr "vcg graph: böyle bir konum yok"
+
+#~ msgid "vcg graph: no such an alignement"
+#~ msgstr "vcg graph: böyle bir hizalama yok"
+
+#~ msgid "vcg graph: no such an arrow mode"
+#~ msgstr "vcg graph: böyle bir yön kipi yok"
+
+#~ msgid "vcg graph: no such crossing_type"
+#~ msgstr "vcg graph: böyle bir kesme tipi yok"
+
+#~ msgid "vcg graph: no such view"
+#~ msgstr "vcg graph: böyle bir görünüm yok"
+
+#~ msgid "vcg graph: no such linestyle"
+#~ msgstr "vcg graph: böyle bir çizgi biçemi yok"
+
+#~ msgid "vcg graph: no such an arrowstyle"
+#~ msgstr "vcg graph: böyle bir yön biçemi yok"

src/complain.c

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

src/complain.h

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

src/files.c

@@ -39,6 +39,8 @@ 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_graph_file = NULL;   /* for -g. */
+char *spec_defines_file = NULL; /* for --defines. */
 
 char *infile = NULL;
 char *attrsfile = NULL;
@@ -260,20 +262,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
+  src_extension = tr (ext, 'y', 'c');
-     was specified in the grammar file.  */
+  src_extension = tr (src_extension, 'Y', 'C');
-  if (src_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');
-    }
-  /* 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');
-    }
 }
 
 /* Computes extensions from the given c source file extension. */
@@ -428,12 +420,14 @@ output_files (void)
 
   compute_base_names ();
 
-  /* Set default extensions */
+  /* It the defines filename if not given, we create it.  */
-  if (!src_extension)
+  if (!spec_defines_file)
-    src_extension = ".c";
+    spec_defines_file = stringappend (base_name, header_extension);
-  if (!header_extension)
+  
-    header_extension = ".h";
+  /* It the graph filename if not given, we create it.  */
-
+  if (!spec_graph_file)
+    spec_graph_file = stringappend (short_base_name, ".vcg");
+  
   attrsfile = stringappend (short_base_name, EXT_STYPE_H);
 #ifndef MSDOS
   stringappend (attrsfile, header_extension);
@@ -447,7 +441,7 @@ output_files (void)
 
   /* Output the header file if wanted. */
   if (defines_flag)
-    defines_obstack_save (stringappend (base_name, header_extension));
+    defines_obstack_save (spec_defines_file);
 
   /* If we output only the table, dump the actions in ACTFILE. */
   if (no_parser_flag)
@@ -474,5 +468,5 @@ output_files (void)
 		  stringappend (short_base_name, EXT_OUTPUT));
 
   if (graph_flag)
-    obstack_save (&graph_obstack, stringappend (short_base_name, ".vcg"));
+    obstack_save (&graph_obstack, spec_graph_file);
 }

src/files.h

@@ -33,10 +33,16 @@ extern char *spec_name_prefix;
 /* File name pfx specified with -b, or 0 if no -b.  */
 extern char *spec_file_prefix;
 
+/* 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;
 
@@ -62,9 +68,6 @@ 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 output_files PARAMS((void));

src/getargs.c

@@ -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},
@@ -183,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':
@@ -195,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':

src/lex.c

@@ -36,15 +36,17 @@ const char *token_buffer = NULL;
 bucket *symval;
 int numval;
 
-static int unlexed;		/* these two describe a token to be reread */
+/* these two describe a token to be reread */
-static bucket *unlexed_symval;	/* by the next call to lex */
+static token_t unlexed = tok_undef;
+/* by the next call to lex */
+static bucket *unlexed_symval = NULL;
 
 
 void
 init_lex (void)
 {
   obstack_init (&token_obstack);
-  unlexed = -1;
+  unlexed = tok_undef;
 }
 
 
@@ -356,12 +358,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 = tok_undef;
-      unlexed = -1;
+      return res;
-      return c;
     }
 
   c = skip_white_space ();
@@ -516,7 +518,7 @@ struct percent_table_struct
 {
   const char *name;
   void *set_flag;
-  int retval;
+  token_t retval;
 };
 
 struct percent_table_struct percent_table[] =
@@ -553,8 +555,6 @@ struct percent_table_struct percent_table[] =
   { "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 },
@@ -566,13 +566,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)
     {
@@ -635,6 +634,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;

src/lex.h

@@ -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,
@@ -71,6 +70,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_ */

src/print_graph.c

@@ -273,7 +273,7 @@ print_graph (void)
 #endif
 
   graph.display_edge_labels = yes;
-  graph.layoutalgorithm = 0;
+  graph.layoutalgorithm = normal;
 
   graph.port_sharing = no;
   graph.finetuning = yes;

src/reader.c

@@ -462,8 +462,8 @@ copy_definition (void)
 static void
 parse_token_decl (symbol_class what_is, symbol_class what_is_not)
 {
-  token_t token = 0;
+  token_t token = tok_undef;
-  char *typename = 0;
+  char *typename = NULL;
 
   /* The symbol being defined.  */
   struct bucket *symbol = NULL;
@@ -736,10 +736,15 @@ parse_union_decl (void)
 
   while (c != EOF)
     {
-      obstack_1grow (&attrs_obstack, c);
+      
-      if (defines_flag)
+      /* If C contains '/', it is output by copy_comment ().  */
-	obstack_1grow (&defines_obstack, c);
+      if (c != '/')
-
+	{
+	  obstack_1grow (&attrs_obstack, c);
+	  if (defines_flag)
+	    obstack_1grow (&defines_obstack, c);
+	}
+      
       switch (c)
 	{
 	case '\n':
@@ -874,9 +879,13 @@ parse_thong_decl (void)
   nsyms--;
 }
 
-/*--------------------------------------------------------------.
+
-| Parse what comes after %header_extension and %source_etension |
+/*-----------------------------------------------------------------------------.
-`--------------------------------------------------------------*/
+| 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)
@@ -884,7 +893,7 @@ parse_dquoted_param (const char *from)
   char buff[32];
   int c;
   int i;
-  
+
   c = skip_white_space ();
 
   if (c != '"')
@@ -893,7 +902,7 @@ parse_dquoted_param (const char *from)
       complain (_("invalid %s declaration"), from);
       return NULL;
     }
-  
+
   c = getc (finput);
   for (i = 0; (c >= '!') && (c <= '~'); i++)
     {
@@ -906,12 +915,12 @@ parse_dquoted_param (const char *from)
 	  if ((c < '!') && (c > '~'))
 	    break;
 	}
-      
+
       buff[i] = c;
       c = getc (finput);
     }
   buff[i] = '\0';
-  
+
   if (c != '"')
     {
       ungetc (c, finput);
@@ -922,25 +931,8 @@ parse_dquoted_param (const char *from)
   return xstrdup (buff);
 }
 
-/* %header_extension case.  */
+#endif
-static void
-parse_header_extension_decl (void)
-{
-  if (header_extension)
-    complain (_("multiple %%header_extension declarations"));
 
-  header_extension = parse_dquoted_param ("%header_extension");
-}
-
-/* %source_extension case.  */
-static void
-parse_source_extension_decl (void)
-{
-  if (src_extension)
-    complain (_("multiple %%source_extension declarations"));
-  
-  src_extension = parse_dquoted_param ("%source_extension");
-}
 
 /*----------------------------------------------------------------.
 | Read from finput until `%%' is seen.  Discard the `%%'.  Handle |
@@ -1011,14 +1003,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;
 

src/reduce.c

@@ -117,7 +117,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 +140,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 +170,7 @@ static void
 inaccessable_symbols (void)
 {
   BSet Vp, Vs, Pp;
-  int i, n;
+  int i;
   short t;
   rule r;
 
@@ -207,7 +206,6 @@ inaccessable_symbols (void)
 
   SETBIT (V, start_symbol);
 
-  n = 0;
   while (1)
     {
       for (i = WORDSIZE (nsyms) - 1; i >= 0; i--)

src/vcg.h

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

tests/.cvsignore

@@ -1,7 +1,6 @@
 Makefile
 Makefile.in
 at-*
-debug-*
 atconfig
 empty
 experr
@@ -9,6 +8,9 @@ expout
 stderr
 stdout
 testsuite
+testsuite.[0-9]
+testsuite.[0-9][0-9]
+package.m4
 calc.[chy]
 calc.tab.*
 calc

tests/Makefile.am

@@ -31,6 +31,14 @@ TESTSUITE = $(srcdir)/testsuite
 AUTOM4TE = autom4te
 AUTOTEST = $(AUTOM4TE) --language=autotest
 $(srcdir)/$(TESTSUITE): $(TESTSUITE_AT)
+	{					\
+	  echo '# Signature of the current package.'; \
+	  echo 'm4_define([PACKAGE_NAME],      [@PACKAGE_NAME@])'; \
+	  echo 'm4_define([PACKAGE_TARNAME],   [@PACKAGE_TARNAME@])'; \
+	  echo 'm4_define([PACKAGE_VERSION],   [@PACKAGE_VERSION@])'; \
+	  echo 'm4_define([PACKAGE_STRING],    [@PACKAGE_STRING@])'; \
+	  echo 'm4_define([PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \
+	} >package.m4
 	$(AUTOTEST) -I $(srcdir) testsuite.at -o $@.tmp
 	mv $@.tmp $@
 

tests/Makefile.in

@@ -229,6 +229,14 @@ uninstall-am: uninstall-info-am
 	uninstall uninstall-am uninstall-info-am
 
 $(srcdir)/$(TESTSUITE): $(TESTSUITE_AT)
+	{					\
+	  echo '# Signature of the current package.'; \
+	  echo 'm4_define([PACKAGE_NAME],      [@PACKAGE_NAME@])'; \
+	  echo 'm4_define([PACKAGE_TARNAME],   [@PACKAGE_TARNAME@])'; \
+	  echo 'm4_define([PACKAGE_VERSION],   [@PACKAGE_VERSION@])'; \
+	  echo 'm4_define([PACKAGE_STRING],    [@PACKAGE_STRING@])'; \
+	  echo 'm4_define([PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \
+	} >package.m4
 	$(AUTOTEST) -I $(srcdir) testsuite.at -o $@.tmp
 	mv $@.tmp $@
 

tests/calc.at

@@ -220,14 +220,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);
@@ -252,46 +254,43 @@ main (int argn, const char **argv)
 # Produce `calc.y'.
 m4_define([AT_DATA_CALC_Y],
 [_AT_DATA_CALC_Y($[1], $[2], $[3],
-                 [m4_if(m4_regexp([$1], [--yyerror-verbose]),
+                 [m4_match([$1], [--yyerror-verbose],
-                        [-1], [],
+                           [[#define 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.
 m4_define([_AT_CHECK_CALC],
 [AT_DATA([[input]],
 [[$2
 ]])
-m4_if(m4_regexp([$1], [--debug]),
+AT_CHECK([calc input])dnl
-  [-1],
+])
-     [AT_CHECK([./calc <input],
-               [0], [], [])],
-     [AT_CHECK([calc ./input 2>&1 >/dev/null | grep 'parse error' >&2],
-               [1], [], [])])])
 
 
 # _AT_CHECK_CALC_ERROR(BISON-OPTIONS, INPUT,
 #                      [ERROR-LOCATION], [IF-YYERROR-VERBOSE])
 # ------------------------------------------------------------
-# Run `calc' on INPUT, and expect STDERR.
+# 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 2>&1 >/dev/null | grep 'parse error' >&2], 0,
+AT_CHECK([calc input], 0,
-          [],
+         [],
-[m4_if(m4_regexp([$1], [--location]),
+[m4_match([$1], [--location], [$3: ])[]dnl
-       [-1], [], [$3: ])[]dnl
 parse error[]dnl
-m4_if(m4_regexp([$1], [--yyerror-verbose]),
+m4_match([$1], [--yyerror-verbose], [, $4])[]dnl
-      [-1], [], [$4])[]dnl
 
 ])])
 
@@ -330,21 +329,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

tests/output.at

@@ -19,85 +19,52 @@
 AT_BANNER([[Output file names.]])
 
 
-# AT_CHECK_BISON_FLAGS(FLAGS, EXPECTED-FILES-SORTED)
+# AT_CHECK_OUTPUT(INPUT-FILE, [DIRECTIVES], [FLAGS], EXPECTED-FILES)
-# --------------------------------------------------
+# ------------------------------------------------------------------
-m4_define([AT_CHECK_BISON_FLAGS],
+m4_define([AT_CHECK_OUTPUT],
-[AT_SETUP([Output files: $1.])
+[AT_SETUP([Output files: $2 & $3.])
-AT_DATA([foo.y],
+AT_DATA([$1],
-[[%%
+[[$2
-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_FLAGS([-g -o foo.c],  [foo.c foo.h foo.output foo.vcg])
-
-# AT_CHECK_BISON_PERCENT(GRAMMAR-OPTIONS, EXPECTED-FILES-SORTED)
-# --------------------------------------------------------------
-m4_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([bison $3 $1], 0)
-AT_CHECK([ls $2 | sort | tr '\n' ' ' | sed 's/.$//g'], 0, [$2])
+AT_CHECK([ls $4], [], [ignore])
-rm -f $2
+AT_CLEANUP($4)
-AT_CLEANUP
 ])
 
-# The sames, but using the % directives.
+AT_CHECK_OUTPUT([foo.y], [], [-dv],
-AT_CHECK_BISON_PERCENT([],                  [foo.output foo.tab.c foo.tab.h])
+                [foo.output foo.tab.c foo.tab.h])
-# AT_CHECK_BISON_PERCENT([%output foo.c],     [foo.c foo.h foo.output])
+AT_CHECK_OUTPUT([foo.y], [], [-dv -o foo.c],
-# AT_CHECK_BISON_PERCENT([%output foo.tab.c], [foo.output foo.tab.c foo.tab.h])
+                [foo.c foo.h foo.output])
-AT_CHECK_BISON_PERCENT([%yacc],             [y.output y.tab.c y.tab.h])
+AT_CHECK_OUTPUT([foo.y], [], [-dv -o foo.tab.c],
-# AT_CHECK_BISON_PERCENT([%file_prefix bar],  [bar.output bar.tab.c bar.tab.h])
+                [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])
 
-# AT_CHECK_BISON_PERCENT_FLAGS(GRAMMAR_OPTIONS, FLAGS, EXPECTED-FILES-SORTED)
-# ---------------------------------------------------------------------------
-m4_define([AT_CHECK_BISON_PERCENT_FLAGS],
-[AT_SETUP([Output files: $1.])
-AT_DATA([foo.yy],
-[[$1
-%defines
-%verbose
-%%
-foo: {}
-]])
-rm -rf $3
-AT_CHECK([bison foo.yy $2], 0, ignore, ignore)
-AT_CHECK([ls $3 | sort | tr '\n' ' ' | sed 's/.$//g'], 0, [$3])
-rm -f $3
-AT_CLEANUP
-])
 
 # Check priorities of extension control.
-AT_CHECK_BISON_PERCENT_FLAGS(
+AT_CHECK_OUTPUT([foo.yy], [%defines %verbose], [],
-[],
+                [foo.output foo.tab.cc foo.tab.hh])
-[],
+
-[foo.output foo.tab.cc foo.tab.hh])
+AT_CHECK_OUTPUT([foo.yy], [%defines %verbose ], [-o foo.c],
-AT_CHECK_BISON_PERCENT_FLAGS(
+                [foo.c foo.h foo.output])
-[],
+
-[-o foo.c],
+AT_CHECK_OUTPUT([foo.yy], [],
-[foo.c foo.h foo.output])
+                [--defines=foo.hpp -o foo.c++],
-AT_CHECK_BISON_PERCENT_FLAGS(
+                [foo.c++ foo.hpp])
-[%source_extension ".cpp"] [%header_extension ".hhh"],
+
-[],
+AT_CHECK_OUTPUT([foo.yy], [],
-[foo.output foo.tab.cpp foo.tab.hhh])
+                [-o foo.c++ --graph=foo.gph],
-AT_CHECK_BISON_PERCENT_FLAGS(
+                [foo.c++ foo.gph])
-[%source_extension ".cc"] [%header_extension ".hh"],
-[-o foo.c],
-[foo.c foo.h foo.output])

tests/regression.at

@@ -64,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.*])

tests/testsuite.at

@@ -19,9 +19,11 @@
 # 02111-1307, USA.
 
 # We need a recent Autotest.
-m4_version_prereq([2.52c])
+m4_version_prereq([2.52d])
 
-AT_INIT([bison])
+AT_INIT
+
+AT_VICTIMS([bison])
 
 m4_include([output.at])
 m4_include([calc.at])