Regen.

(Because of AC_LIBSOURCE).

ChangeLog

@@ -1,3 +1,112 @@
+2002-09-27  Akim Demaille  <[email protected]>
+
+	Version 1.49c.
+
+2002-09-27  Akim Demaille  <[email protected]>
+
+	* configure.ac (AM_INIT_AUTOMAKE): We _need_ 1.7.
+	(Because of AC_LIBSOURCE).
+
+2002-09-27  Akim Demaille  <[email protected]>
+
+	Playing with Autoscan.
+
+	* configure.ac: Remove the old LIBOBJ tweaks.
+	(AC_REPLACE_FUNCS): Add strrchr and strtol.
+	* lib/strrchr.c: New.
+	* lib/strtol.c: New, from the Coreutils 4.5.1.
+
+2002-09-27  Akim Demaille  <[email protected]>
+
+	Playing with Autoscan.
+
+	* m4/prereq.m4 (jm_PREREQ_ARGMATCH, jm_FUNC_ARGMATCH): New.
+	* lib/Makefile.am (libbison_a_SOURCES): No longer include
+	argmatch.c and argmatch.h, since they are AC_LIBSOURCE'd.
+	* lib/strcasecmp.c, lib/strncasecmp.c, lib/memcmp.c: New, from the
+	Coreutils 4.5.1.
+
+2002-09-24  Akim Demaille  <[email protected]>
+
+	* doc/bison.texinfo (Stack Overflow): xref to Recursion.
+	(Frequently Asked Questions, Parser Stack Overflow): New.
+
+2002-09-13  Akim Demaille  <[email protected]>
+
+	Playing with autoscan.
+
+	* src/reader.c (get_merge_function): Use xstrdup, not strdup.
+	* src/files.c (skeleton_find): Remove, unused.
+	* m4/memcmp.m4: New, from the Coreutils 4.5.1.
+	* m4/prereq.m4 (jm_PREREQ_QUOTEARG): Run jm_FUNC_MEMCMP.
+
+2002-09-13  Akim Demaille  <[email protected]>
+
+	* configure.ac (AM_INIT_AUTOMAKE): Require Automake 1.6.3.
+	* Makefile.am (AUTOMAKE_OPTIONS): Don't.
+
+2002-09-13  Akim Demaille  <[email protected]>
+
+	* configure.ac: Require 2.54.
+	s/jm_FUNC_MALLOC/AC_FUNC_MALLOC/.
+	s/jm_FUNC_REALLOC/AC_FUNC_REALLOC/.
+	* m4/c-bs-a.m4, m4/malloc.m4, m4/mbstate_t.m4, m4/realloc.m4:
+	Remove, provided by Autoconf macros.
+
+2002-09-12  Akim Demaille  <[email protected]>
+
+	* m4/prereq.m4: Update, from Coreutils 4.5.1.
+
+2002-09-12  Akim Demaille  <[email protected]>
+
+	* m4/prereq.m4: Update, from Fileutils 4.1.5.
+	* configure.ac (jm_PREREQ_TEMPNAME): Invoke it.
+	Reported by Martin Mokrejs.
+
+2002-09-10  Akim Demaille  <[email protected]>
+
+	* src/parse-gram.y: Associate a human readable string to each
+	token type.
+	* tests/regression.at (Invalid inputs): Adjust.
+
+2002-09-10  Gary V. Vaughan  <[email protected]>
+
+	* tests/Makefile.am ($(srcdir)/package.m4): Bison now ships
+	with an Autoconf-2.5x style configure.ac.
+
+2002-09-06  Paul Eggert  <[email protected]>
+
+	* doc/bison.texinfo (Conditions): Make explicit that the GPL
+	exception applies only to yacc.c.  This is a modification of a
+	patch originally suggested by Akim Demaille.
+
+2002-09-06  Akim Demaille  <[email protected]>
+
+	* data/c.m4 (b4_copyright): Move the GPL exception comment from
+	here to...
+	* data/yacc.c: here.
+
+	* data/lalr1.cc (struct yyltype): Don't define it, since we use
+	LocationType.
+	(b4_ltype): Default to yy::Location from location.hh.
+
+2002-09-04  Jim Meyering  <[email protected]>
+
+	* data/yacc.c: Guard the declaration of yytoknum also with
+	`#ifdef YYPRINT', so it is declared only when used.
+
+2002-09-04  Akim Demaille  <[email protected]>
+
+	* configure.in: Rename as...
+	* configure.ac: this.
+	Bump to 1.49c.
+
+2002-09-04  Akim Demaille  <[email protected]>
+
+	* src/assoc.c, src/closure.c, src/gram.c, src/injections.c,
+	* src/lalr.c, src/LR0.c, src/relation.c, src/tables.c: Don't
+	translate maintainer only messages.
+
 2002-08-12  Paul Eggert  <[email protected]>
 
 	Version 1.49b.

HACKING

@@ -4,6 +4,11 @@ This file attempts to describe the rules to use when hacking Bison.
 Don't put this file into the distribution.  Don't mention it in the
 ChangeLog.
 
+Everything related to the development of Bison is on Savannah:
+
+	http://savannah.gnu.org/projects/bison/
+
+
 * Administrivia
 
 ** If you incorporate a change from somebody on the net:
@@ -21,9 +26,18 @@ The correct response to most actual bugs is to write a new test case
 which demonstrates the bug.  Then fix the bug, re-run the test suite,
 and check everything in.
 
+
+* Hacking
+
 ** Visible changes
 Which include serious bug fixes, must be mentioned in NEWS.
 
+** Translations
+Only user visible strings are to be translated: error messages, bits
+of the .output file etc.  This excludes impossible error messages
+(comparable to assert/abort), and all the --trace output which is
+meant for the maintainers only.
+
 
 * Test suite
 

Makefile.am

@@ -1,3 +1,4 @@
+## Process this file with automake to produce Makefile.in -*-Makefile-*-
 ## Copyright (C) 2001, 2002 Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
@@ -15,9 +16,6 @@
 ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
 ## 02111-1307  USA
 
-## Process this file with automake to produce Makefile.in -*-Makefile-*-
-AUTOMAKE_OPTIONS = 1.6 check-news readme-alpha dist-bzip2
-
 ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = config po lib data src doc m4 tests

NEWS

@@ -1,6 +1,9 @@
 Bison News
 ----------
 
+Changes in version 1.49c:
+
+
 Changes in version 1.49b, 2002-08-12:
 
 * GLR parsing

README-cvs

@@ -9,14 +9,11 @@ Only the sources are installed in the CVS repository (to ease the
 maintenance, merges etc.), therefore you will have to the maintainer
 tools we depend upon:
 
-- Automake 1.6 or 1.6.1
+- Automake 1.7
 
-- Autoconf 2.53a or better
+- Autoconf 2.54
-  ftp://alpha.gnu.org/gnu/autoconf/autoconf-2.53a.tar.gz   (992 kB)
-  ftp://alpha.gnu.org/gnu/autoconf/autoconf-2.53a.tar.bz2  (756 kB)
 
-- Gettext 0.11.3 pre 2 or better
+- Gettext 0.11.5
-  http://www.lrde.epita.fr/~akim/download/gettext-0.11.3-pre2.tar.gz
 
 Only building the initial full source tree will be a bit painful,
 later, a plain `cvs update -P & make' should be sufficient.
@@ -51,12 +48,12 @@ Enjoy!
 Unfortunately the current Gettext still does not include all the
 needed tools so that the bootstrapping always perform successfully.
 
-If you experiment problems, I suggest the following:
+If you experience problems, I suggest the following:
 
 1. Do a regular CVS checkout
 
-2. Fetch a recent tarball.
+2. Fetch a recent tarball in:
-   http://www.lrde.epita.fr/~akim/download/bison-1.49b.tar.gz
+   http://www.lrde.epita.fr/~akim/download/
 
 3. Extract it
 

THANKS

@@ -21,13 +21,14 @@ Florian Krohm		[email protected]
 H. Merijn Brand		[email protected]
 Hans Aberg		[email protected]
 Jesse Thilo		[email protected]
-Jim Meyering		meyering@gnu.org
+Jim Meyering		jim@meyering.net
 Juan Manuel Guerrero	[email protected]
 Kees Zeelenberg		[email protected]
 Keith Browne		[email protected]
 Laurent Mascherpa	[email protected]
 Magnus Fromreide	[email protected]
 Marc Autret		[email protected]
+Martin Mokrejs          [email protected]
 Matt Kraai		[email protected]
 Michael Hayes		[email protected]
 Mike Castle		[email protected]

TODO

@@ -1,5 +1,65 @@
 -*- outline -*-
 
+* Header guards
+
+En rentrant chez moi, je relance un `make' sur un projet que j'ai avancé
+ailleurs durant la semaine.  Le système que j'utilise ici est un peu plus
+à jour que l'autre, et le Bison est probablement plus récent itou.  Ici,
+c'est la version 1.33.  J'obtiens, en montrant un peu plus que nécessaire:
+
+---------------------------------------------------------------------->
+cd ~/fpub/pyrexpp/Pyrexpp/
+LANGUAGE= /usr/bin/make MAKEFLAGS='-k -j2'
+/usr/bin/make -C .. install
+make[1]: Entre dans le répertoire `/bpi/titan/home/pinard/fpub/pyrexpp'
+install -g bpi -m 2775 -d Prépare-titan
+chmod g+sw Prépare-titan
+touch Prépare-titan/.estampille
+/usr/bin/gcc  -fPIC -I/usr/include/python2.2 -IPrépare-titan -g -c -o Prépare-titan/ctools.o ctools.c
+bison -d -o Prépare-titan/c-parser.c c-parser.y
+/usr/bin/gcc  -fPIC -I/usr/include/python2.2 -IPrépare-titan -g -c -o Prépare-titan/c-parser.o Prépare-titan/c-parser.c
+flex -t c-scanner.l | grep -v '^#line' > Prépare-titan/c-scanner.c
+/usr/bin/gcc  -fPIC -I/usr/include/python2.2 -IPrépare-titan -g -c -o Prépare-titan/c-scanner.o Prépare-titan/c-scanner.c
+In file included from Prépare-titan/c-scanner.c:547:
+Prépare-titan/c-parser.h:1: warning: garbage at end of `#ifndef' argument
+Prépare-titan/c-parser.h:2: warning: missing white space after `#define BISON_PR'
+/usr/bin/gcc -o Prépare-titan/ctools.so Prépare-titan/ctools.o Prépare-titan/c-scanner.o -shared -lm
+python setup.py --quiet build
+install -g bpi -m 664 Prépare-titan/ctools.so /bpi/titan/local/lib/python2.2/site-packages/Pyrexpp
+python setup.py --quiet install
+make[1]: Quitte le répertoire `/bpi/titan/home/pinard/fpub/pyrexpp'
+[...]
+----------------------------------------------------------------------<
+
+Diagnostics que je n'avais sûrement pas, plus tôt en journée, sur l'autre
+système.  En allant voir, je trouve:
+
+---------------------------------------------------------------------->
+#ifndef BISON_PRÉPARE_TITAN_C_PARSER_H
+# define BISON_PRÉPARE_TITAN_C_PARSER_H
+
+# ifndef YYSTYPE
+#  define YYSTYPE int
+# endif
+# define	IDENTIFIER	257
+[...]
+
+extern YYSTYPE yylval;
+
+#endif /* not BISON_PRÉPARE_TITAN_C_PARSER_H */
+----------------------------------------------------------------------<
+
+Le pré-processeur de C n'est pas à l'aise avec les caractères accentués
+dans les identificateurs.
+
+Bon, de mon expérience, il n'a jamais été nécessaire de protéger un fichier
+`.h' de Bison ou Yacc contre de multiples inclusions, mais si ça été
+fait, je présume qu'il y avait un problème réel et convaincant à régler,
+et qu'il ne s'agit pas d'une simple fantaisie: je ne mettrai donc pas
+ça en doute.  Mais le choix du nom de l'identificateur laisse à désirer,
+tu en conviendras :-).  Et faut-il vraiment y inclure le répertoire?
+
+
 * URGENT: Documenting C++ output
 Write a first documentation for C++ output.
 
@@ -53,7 +113,7 @@ a sample text exhibiting the (LALR) ambiguity.  See the paper from
 DeRemer and Penello: they already provide the algorithm.
 
 
-* Extentions
+* Extensions
 
 ** yyerror, yysymprint interface
 It should be improved, in particular when using Bison features such as
@@ -108,6 +168,25 @@ Are there any Texinfo standards for bibliography?
 
 
 
+* Java, Fortran, etc.
+
+
+** Java
+
+There are a couple of proposed outputs:
+
+- BYACC/J
+  which is based on Byacc.
+  <http://troi.lincom-asg.com/~rjamison/byacc/>
+
+- Bison Java
+  which is based on Bison.
+  <http://www.goice.co.jp/member/mo/hack-progs/bison-java.html>
+
+Sébastien Serrurier ([email protected]) is working on this: he is
+expected to contact the authors, design the output, and implement it
+into Bison.
+
 
 * Coding system independence
 Paul notes:
@@ -133,7 +212,7 @@ Show reductions.	[]
 ** %pure-parser		[]
 ** %token-table		[]
 ** Options which could use parse_dquoted_param ().
-Maybe transfered in lex.c.
+Maybe transferred in lex.c.
 *** %skeleton		[ok]
 *** %output		[]
 *** %file-prefix	[]
@@ -150,7 +229,7 @@ Find the best graph parameters.	[]
 * doc/bison.texinfo
 ** Update
 informations about ERROR_VERBOSE.	[]
-** Add explainations about
+** Add explanations about
 skeleton muscles.	[]
 %skeleton.		[]
 
@@ -171,7 +250,7 @@ First, analyze the differences between byacc and btyacc (I'm referring
 to the executables).  Find where the conflicts are preserved.
 
 ** Compare with the GLR tables
-See how isomorphic the way BTYacc and the way the GLR adjustements in
+See how isomorphic the way BTYacc and the way the GLR adjustments in
 Bison are compatible.  *As much as possible* one should try to use the
 same implementation in the Bison executables.  I insist: it should be
 very feasible to use the very same conflict tables.

configure.ac

@@ -18,12 +18,12 @@
 # 02111-1307  USA
 
 # We need a recent Autoconf to run a recent Autotest.
-AC_PREREQ(2.53)
+AC_PREREQ(2.54)
 
-AC_INIT([GNU Bison], [1.49b], [[email protected]])
+AC_INIT([GNU Bison], [1.49c], [[email protected]])
 AC_CONFIG_AUX_DIR(config)
 
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([1.7 check-news readme-alpha dist-bzip2])
 AM_CONFIG_HEADER(config.h:config.hin)
 
 # Initialize the test suite.
@@ -92,13 +92,17 @@ AC_FUNC_ERROR_AT_LINE
 AC_FUNC_STRNLEN
 UTILS_FUNC_MKSTEMP
 AC_CHECK_FUNCS(setlocale)
-AC_CHECK_DECLS([getenv, getopt, free, stpcpy, strchr, strspn, strnlen,
+AC_CHECK_DECLS([free, getenv, getopt,
+                stpcpy, strchr, strspn, strnlen,
                 malloc, memchr, memrchr])
-AC_REPLACE_FUNCS(stpcpy strchr strspn memchr memrchr)
+AC_REPLACE_FUNCS(memchr memrchr \
-jm_FUNC_MALLOC
+                 strchr stpcpy strrchr strspn strtol)
-jm_FUNC_REALLOC
+AC_FUNC_MALLOC
+AC_FUNC_REALLOC
 jm_PREREQ_QUOTEARG
+jm_FUNC_ARGMATCH
 jm_PREREQ_ERROR
+jm_PREREQ_TEMPNAME
 AM_WITH_DMALLOC
 BISON_PREREQ_TIMEVAR
 
@@ -106,11 +110,6 @@ BISON_PREREQ_TIMEVAR
 AM_GNU_GETTEXT(external, need-ngettext)
 AM_GNU_GETTEXT_VERSION(0.11.5)
 
-# This is necessary so that .o files in LIBOBJS are also built via
-# the ANSI2KNR-filtering rules.
-LIB@&t@OBJS=`echo $LIB@&t@OBJS|sed 's/\.o /\$U.o /g;s/\.o$/\$U.o/'`
-AC_SUBST(LIB@&t@OBJS)
-
 AC_OUTPUT([Makefile
            config/Makefile
            po/Makefile.in

data/c.m4

@@ -44,12 +44,7 @@ m4_define([b4_copyright],
    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.  */
+   Boston, MA 02111-1307, USA.  */])
-
-/* As a special exception, when this file is copied by Bison into a
-   Bison output file, you may use that output file without restriction.
-   This special exception was added by the Free Software Foundation
-   in version 1.24 of Bison.  */])
 
 
 ## ------------ ##

data/lalr1.cc

@@ -33,6 +33,7 @@ m4_define([b4_lhs_value],
 m4_define([b4_rhs_value],
 [semantic_stack_@<:@m4_eval([$1 - $2])@:>@m4_ifval([$3], [.$3])])
 
+m4_define_default([b4_ltype], [Location])
 
 # b4_lhs_location()
 # -----------------
@@ -143,18 +144,6 @@ b4_post_prologue
    Current.last_column = Rhs[[N]].last_column;
 #endif
 
-m4_if(b4_locations_flag, [0], [],
-[#ifndef YYLTYPE
-typedef struct yyltype
-{
-  int first_line;
-  int first_column;
-  int last_line;
-  int last_column;
-} yyltype;
-# define YYLTYPE yyltype
-#endif])
-
 namespace yy
 {
   class b4_name;
@@ -293,7 +282,7 @@ namespace yy
 }
 
 #endif /* not b4_header_guard */
-
+dnl
 #output "b4_output_prefix[]b4_output_infix[].cc"
 b4_copyright([C++ Skeleton parser for LALR(1) parsing with Bison],
              [2002])
@@ -772,7 +761,7 @@ const unsigned yy::b4_name::user_token_number_max_ = b4_user_token_number_max;
 const yy::b4_name::TokenNumberType yy::b4_name::undef_token_ = b4_undef_token_number;
 
 b4_epilogue
-
+dnl
 #output "stack.hh"
 b4_copyright([2002])
 
@@ -869,7 +858,7 @@ namespace yy
 }
 
 #endif // not BISON_STACK_HH
-
+dnl
 #output "location.hh"
 b4_copyright([2002])
 

data/yacc.c

@@ -130,6 +130,11 @@ m4_divert(0)dnl
 b4_copyright([Skeleton parser for Yacc-like parsing with Bison],
              [1984, 1989, 1990, 2000, 2001, 2002])
 
+/* As a special exception, when this file is copied by Bison into a
+   Bison output file, you may use that output file without restriction.
+   This special exception was added by the Free Software Foundation
+   in version 1.24 of Bison.  */
+
 /* Written by Richard Stallman by simplifying the original so called
    ``semantic'' parser.  */
 
@@ -358,12 +363,14 @@ static const char *const yytname[[]] =
 };
 #endif
 
+# ifdef YYPRINT
 /* YYTOKNUM[[YYLEX-NUM]] -- Internal token number corresponding to
    token YYLEX-NUM.  */
 static const b4_int_type_for([b4_toknum]) yytoknum[[]] =
 {
   b4_toknum
 };
+# endif
 
 /* YYR1[[YYN]] -- Symbol number of symbol that rule YYN derives.  */
 static const b4_int_type_for([b4_r1]) yyr1[[]] =
@@ -1253,7 +1260,12 @@ b4_epilogue
 m4_if(b4_defines_flag, 0, [],
 [#output "b4_output_header_name"
 b4_copyright([Skeleton parser for Yacc-like parsing with Bison],
-              [1984, 1989, 1990, 2000, 2001, 2002])
+             [1984, 1989, 1990, 2000, 2001, 2002])
+
+/* As a special exception, when this file is copied by Bison into a
+   Bison output file, you may use that output file without restriction.
+   This special exception was added by the Free Software Foundation
+   in version 1.24 of Bison.  */
 
 #ifndef b4_header_guard
 # define b4_header_guard

doc/bison.texinfo

@@ -114,6 +114,7 @@ Reference sections:
 * Invocation::        How to run Bison (to produce the parser source file).
 * Table of Symbols::  All the keywords of the Bison language are explained.
 * Glossary::          Basic concepts are explained.
+* FAQ::               Frequently Asked Questions
 * Copying This Manual::  License for copying this manual.
 * Index::             Cross-references to the text.
 
@@ -268,6 +269,10 @@ Invoking Bison
 * Option Cross Key::  Alphabetical list of long options.
 * VMS Invocation::    Bison command syntax on VMS.
 
+Frequently Asked Questions
+
+* Parser Stack Overflow::      Breaking the Stack Limits
+
 Copying This Manual
 
 * GNU Free Documentation License::  License for copying this manual.
@@ -305,9 +310,9 @@ This edition corresponds to version @value{VERSION} of Bison.
 @unnumbered Conditions for Using Bison
 
 As of Bison version 1.24, we have changed the distribution terms for
-@code{yyparse} to permit using Bison's output in nonfree programs.
+@code{yyparse} to permit using Bison's output in nonfree programs when
-Formerly, Bison parsers could be used only in programs that were free
+Bison is generating C code for LALR(1) parsers.  Formerly, these
-software.
+parsers could be used only in programs that were free software.
 
 The other GNU programming tools, such as the GNU C compiler, have never
 had such a requirement.  They could always be used for nonfree
@@ -329,6 +334,13 @@ encourage people to make other software free.  So we decided to make the
 practical conditions for using Bison match the practical conditions for
 using the other GNU tools.
 
+This exception applies only when Bison is generating C code for a
+LALR(1) parser; otherwise, the GPL terms operate as usual.  You can
+tell whether the exception applies to your @samp{.c} output file by
+inspecting it to see whether it says ``As a special exception, when
+this file is copied by Bison into a Bison output file, you may use
+that output file without restriction.''
+
 @include gpl.texi
 
 @node Concepts
@@ -4881,6 +4893,10 @@ not reduced.  When this happens, the parser function @code{yyparse}
 returns a nonzero value, pausing only to call @code{yyerror} to report
 the overflow.
 
+Becaue Bison parsers have growing stacks, hitting the upper limit
+usually results from using a right recursion instead of a left
+recursion, @xref{Recursion, ,Recursive Rules}.
+
 @vindex YYMAXDEPTH
 By defining the macro @code{YYMAXDEPTH}, you can control how deep the
 parser stack can become before a stack overflow occurs.  Define the
@@ -4904,6 +4920,13 @@ You can control how much stack is allocated initially by defining the
 macro @code{YYINITDEPTH}.  This value too must be a compile-time
 constant integer.  The default is 200.
 
+@c FIXME: C++ output.
+Because of semantical differences between C and C++, the LALR(1) parsers
+in C produced by Bison by compiled as C++ cannot grow.  In this precise
+case (compiling a C parser as C++) you are suggested to grow
+@code{YYINITDEPTH}.  In the near future, a C++ output output will be
+provided which addresses this issue.
+
 @node Error Recovery
 @chapter Error Recovery
 @cindex error recovery
@@ -5781,7 +5804,6 @@ bison -d @var{infile.y} -o @var{output.c++}
 @noindent
 will produce @file{output.c++} and @file{outfile.h++}.
 
-
 @menu
 * Bison Options::     All the options described in detail,
 			in alphabetical order by short options.
@@ -6005,6 +6027,33 @@ The VMS file system does not permit filenames such as
 @file{foo.tab.c}.  In the above example, the output file
 would instead be named @file{foo_tab.c}.
 
+@c ================================================= Invoking Bison
+
+@node FAQ
+@chapter Frequently Asked Questions
+@cindex frequently asked questions
+@cindex questions
+
+Several questions about Bison come up occasionally.  Here some of them
+are addressed.
+
+@menu
+* Parser Stack Overflow::      Breaking the Stack Limits
+@end menu
+
+@node Parser Stack Overflow
+@section Parser Stack Overflow
+
+@display
+My parser returns with error with a @samp{parser stack overflow}
+message.  What can I do?
+@end display
+
+This question is already addressed elsewhere, @xref{Recursion,
+,Recursive Rules}.
+
+@c ================================================= Table of Symbols
+
 @node Table of Symbols
 @appendix Bison Symbols
 @cindex Bison symbols, table of

lib/Makefile.am

@@ -32,7 +32,6 @@ INCLUDES = -I$(top_builddir)      \
 EXTRA_DIST = malloc.c realloc.c strnlen.c
 
 libbison_a_SOURCES = \
-  argmatch.h argmatch.c \
   gettext.h \
   basename.c dirname.h dirname.c \
   getopt.h getopt.c getopt1.c \

lib/memcmp.c

@@ -0,0 +1,386 @@
+/* Copyright (C) 1991, 1993, 1995, 1997, 1998 Free Software Foundation, Inc.
+   Contributed by Torbjorn Granlund ([email protected]).
+
+   NOTE: The canonical source of this file is maintained with the GNU C Library.
+   Bugs can be reported to [email protected].
+
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by the
+   Free Software Foundation; either version 2, 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.  */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#undef	__ptr_t
+#if defined __cplusplus || (defined __STDC__ && __STDC__)
+# define __ptr_t	void *
+#else /* Not C++ or ANSI C.  */
+# undef	const
+# define const
+# define __ptr_t	char *
+#endif /* C++ or ANSI C.  */
+
+#ifndef __P
+# if defined __GNUC__ || (defined __STDC__ && __STDC__)
+#  define __P(args) args
+# else
+#  define __P(args) ()
+# endif  /* GCC.  */
+#endif  /* Not __P.  */
+
+#if defined HAVE_STRING_H || defined _LIBC
+# include <string.h>
+#endif
+
+#undef memcmp
+
+#ifdef _LIBC
+
+# include <memcopy.h>
+# include <endian.h>
+
+# if __BYTE_ORDER == __BIG_ENDIAN
+#  define WORDS_BIGENDIAN
+# endif
+
+#else	/* Not in the GNU C library.  */
+
+# include <sys/types.h>
+
+/* Type to use for aligned memory operations.
+   This should normally be the biggest type supported by a single load
+   and store.  Must be an unsigned type.  */
+# define op_t	unsigned long int
+# define OPSIZ	(sizeof(op_t))
+
+/* Threshold value for when to enter the unrolled loops.  */
+# define OP_T_THRES	16
+
+/* Type to use for unaligned operations.  */
+typedef unsigned char byte;
+
+# ifndef WORDS_BIGENDIAN
+#  define MERGE(w0, sh_1, w1, sh_2) (((w0) >> (sh_1)) | ((w1) << (sh_2)))
+# else
+#  define MERGE(w0, sh_1, w1, sh_2) (((w0) << (sh_1)) | ((w1) >> (sh_2)))
+# endif
+
+#endif	/* In the GNU C library.  */
+
+#ifdef WORDS_BIGENDIAN
+# define CMP_LT_OR_GT(a, b) ((a) > (b) ? 1 : -1)
+#else
+# define CMP_LT_OR_GT(a, b) memcmp_bytes ((a), (b))
+#endif
+
+/* BE VERY CAREFUL IF YOU CHANGE THIS CODE!  */
+
+/* The strategy of this memcmp is:
+
+   1. Compare bytes until one of the block pointers is aligned.
+
+   2. Compare using memcmp_common_alignment or
+      memcmp_not_common_alignment, regarding the alignment of the other
+      block after the initial byte operations.  The maximum number of
+      full words (of type op_t) are compared in this way.
+
+   3. Compare the few remaining bytes.  */
+
+#ifndef WORDS_BIGENDIAN
+/* memcmp_bytes -- Compare A and B bytewise in the byte order of the machine.
+   A and B are known to be different.
+   This is needed only on little-endian machines.  */
+
+static int memcmp_bytes __P((op_t, op_t));
+
+# ifdef  __GNUC__
+__inline
+# endif
+static int
+memcmp_bytes (long unsigned int a, long unsigned int b)
+{
+  long int srcp1 = (long int) &a;
+  long int srcp2 = (long int) &b;
+  op_t a0, b0;
+
+  do
+    {
+      a0 = ((byte *) srcp1)[0];
+      b0 = ((byte *) srcp2)[0];
+      srcp1 += 1;
+      srcp2 += 1;
+    }
+  while (a0 == b0);
+  return a0 - b0;
+}
+#endif
+
+static int memcmp_common_alignment __P((long, long, size_t));
+
+/* memcmp_common_alignment -- Compare blocks at SRCP1 and SRCP2 with LEN `op_t'
+   objects (not LEN bytes!).  Both SRCP1 and SRCP2 should be aligned for
+   memory operations on `op_t's.  */
+#ifdef	__GNUC__
+__inline
+#endif
+static int
+memcmp_common_alignment (long int srcp1, long int srcp2, size_t len)
+{
+  op_t a0, a1;
+  op_t b0, b1;
+
+  switch (len % 4)
+    {
+    default: /* Avoid warning about uninitialized local variables.  */
+    case 2:
+      a0 = ((op_t *) srcp1)[0];
+      b0 = ((op_t *) srcp2)[0];
+      srcp1 -= 2 * OPSIZ;
+      srcp2 -= 2 * OPSIZ;
+      len += 2;
+      goto do1;
+    case 3:
+      a1 = ((op_t *) srcp1)[0];
+      b1 = ((op_t *) srcp2)[0];
+      srcp1 -= OPSIZ;
+      srcp2 -= OPSIZ;
+      len += 1;
+      goto do2;
+    case 0:
+      if (OP_T_THRES <= 3 * OPSIZ && len == 0)
+	return 0;
+      a0 = ((op_t *) srcp1)[0];
+      b0 = ((op_t *) srcp2)[0];
+      goto do3;
+    case 1:
+      a1 = ((op_t *) srcp1)[0];
+      b1 = ((op_t *) srcp2)[0];
+      srcp1 += OPSIZ;
+      srcp2 += OPSIZ;
+      len -= 1;
+      if (OP_T_THRES <= 3 * OPSIZ && len == 0)
+	goto do0;
+      /* Fall through.  */
+    }
+
+  do
+    {
+      a0 = ((op_t *) srcp1)[0];
+      b0 = ((op_t *) srcp2)[0];
+      if (a1 != b1)
+	return CMP_LT_OR_GT (a1, b1);
+
+    do3:
+      a1 = ((op_t *) srcp1)[1];
+      b1 = ((op_t *) srcp2)[1];
+      if (a0 != b0)
+	return CMP_LT_OR_GT (a0, b0);
+
+    do2:
+      a0 = ((op_t *) srcp1)[2];
+      b0 = ((op_t *) srcp2)[2];
+      if (a1 != b1)
+	return CMP_LT_OR_GT (a1, b1);
+
+    do1:
+      a1 = ((op_t *) srcp1)[3];
+      b1 = ((op_t *) srcp2)[3];
+      if (a0 != b0)
+	return CMP_LT_OR_GT (a0, b0);
+
+      srcp1 += 4 * OPSIZ;
+      srcp2 += 4 * OPSIZ;
+      len -= 4;
+    }
+  while (len != 0);
+
+  /* This is the right position for do0.  Please don't move
+     it into the loop.  */
+ do0:
+  if (a1 != b1)
+    return CMP_LT_OR_GT (a1, b1);
+  return 0;
+}
+
+static int memcmp_not_common_alignment __P((long, long, size_t));
+
+/* memcmp_not_common_alignment -- Compare blocks at SRCP1 and SRCP2 with LEN
+   `op_t' objects (not LEN bytes!).  SRCP2 should be aligned for memory
+   operations on `op_t', but SRCP1 *should be unaligned*.  */
+#ifdef	__GNUC__
+__inline
+#endif
+static int
+memcmp_not_common_alignment (long int srcp1, long int srcp2, size_t len)
+{
+  op_t a0, a1, a2, a3;
+  op_t b0, b1, b2, b3;
+  op_t x;
+  int shl, shr;
+
+  /* Calculate how to shift a word read at the memory operation
+     aligned srcp1 to make it aligned for comparison.  */
+
+  shl = 8 * (srcp1 % OPSIZ);
+  shr = 8 * OPSIZ - shl;
+
+  /* Make SRCP1 aligned by rounding it down to the beginning of the `op_t'
+     it points in the middle of.  */
+  srcp1 &= -OPSIZ;
+
+  switch (len % 4)
+    {
+    default: /* Avoid warning about uninitialized local variables.  */
+    case 2:
+      a1 = ((op_t *) srcp1)[0];
+      a2 = ((op_t *) srcp1)[1];
+      b2 = ((op_t *) srcp2)[0];
+      srcp1 -= 1 * OPSIZ;
+      srcp2 -= 2 * OPSIZ;
+      len += 2;
+      goto do1;
+    case 3:
+      a0 = ((op_t *) srcp1)[0];
+      a1 = ((op_t *) srcp1)[1];
+      b1 = ((op_t *) srcp2)[0];
+      srcp2 -= 1 * OPSIZ;
+      len += 1;
+      goto do2;
+    case 0:
+      if (OP_T_THRES <= 3 * OPSIZ && len == 0)
+	return 0;
+      a3 = ((op_t *) srcp1)[0];
+      a0 = ((op_t *) srcp1)[1];
+      b0 = ((op_t *) srcp2)[0];
+      srcp1 += 1 * OPSIZ;
+      goto do3;
+    case 1:
+      a2 = ((op_t *) srcp1)[0];
+      a3 = ((op_t *) srcp1)[1];
+      b3 = ((op_t *) srcp2)[0];
+      srcp1 += 2 * OPSIZ;
+      srcp2 += 1 * OPSIZ;
+      len -= 1;
+      if (OP_T_THRES <= 3 * OPSIZ && len == 0)
+	goto do0;
+      /* Fall through.  */
+    }
+
+  do
+    {
+      a0 = ((op_t *) srcp1)[0];
+      b0 = ((op_t *) srcp2)[0];
+      x = MERGE(a2, shl, a3, shr);
+      if (x != b3)
+	return CMP_LT_OR_GT (x, b3);
+
+    do3:
+      a1 = ((op_t *) srcp1)[1];
+      b1 = ((op_t *) srcp2)[1];
+      x = MERGE(a3, shl, a0, shr);
+      if (x != b0)
+	return CMP_LT_OR_GT (x, b0);
+
+    do2:
+      a2 = ((op_t *) srcp1)[2];
+      b2 = ((op_t *) srcp2)[2];
+      x = MERGE(a0, shl, a1, shr);
+      if (x != b1)
+	return CMP_LT_OR_GT (x, b1);
+
+    do1:
+      a3 = ((op_t *) srcp1)[3];
+      b3 = ((op_t *) srcp2)[3];
+      x = MERGE(a1, shl, a2, shr);
+      if (x != b2)
+	return CMP_LT_OR_GT (x, b2);
+
+      srcp1 += 4 * OPSIZ;
+      srcp2 += 4 * OPSIZ;
+      len -= 4;
+    }
+  while (len != 0);
+
+  /* This is the right position for do0.  Please don't move
+     it into the loop.  */
+ do0:
+  x = MERGE(a2, shl, a3, shr);
+  if (x != b3)
+    return CMP_LT_OR_GT (x, b3);
+  return 0;
+}
+
+int
+rpl_memcmp (const void *s1, const void *s2, size_t len)
+{
+  op_t a0;
+  op_t b0;
+  long int srcp1 = (long int) s1;
+  long int srcp2 = (long int) s2;
+  op_t res;
+
+  if (len >= OP_T_THRES)
+    {
+      /* There are at least some bytes to compare.  No need to test
+	 for LEN == 0 in this alignment loop.  */
+      while (srcp2 % OPSIZ != 0)
+	{
+	  a0 = ((byte *) srcp1)[0];
+	  b0 = ((byte *) srcp2)[0];
+	  srcp1 += 1;
+	  srcp2 += 1;
+	  res = a0 - b0;
+	  if (res != 0)
+	    return res;
+	  len -= 1;
+	}
+
+      /* SRCP2 is now aligned for memory operations on `op_t'.
+	 SRCP1 alignment determines if we can do a simple,
+	 aligned compare or need to shuffle bits.  */
+
+      if (srcp1 % OPSIZ == 0)
+	res = memcmp_common_alignment (srcp1, srcp2, len / OPSIZ);
+      else
+	res = memcmp_not_common_alignment (srcp1, srcp2, len / OPSIZ);
+      if (res != 0)
+	return res;
+
+      /* Number of bytes remaining in the interval [0..OPSIZ-1].  */
+      srcp1 += len & -OPSIZ;
+      srcp2 += len & -OPSIZ;
+      len %= OPSIZ;
+    }
+
+  /* There are just a few bytes to compare.  Use byte memory operations.  */
+  while (len != 0)
+    {
+      a0 = ((byte *) srcp1)[0];
+      b0 = ((byte *) srcp2)[0];
+      srcp1 += 1;
+      srcp2 += 1;
+      res = a0 - b0;
+      if (res != 0)
+	return res;
+      len -= 1;
+    }
+
+  return 0;
+}
+
+#ifdef weak_alias
+# undef bcmp
+weak_alias (memcmp, bcmp)
+#endif

lib/strcasecmp.c

@@ -0,0 +1,66 @@
+/* strcasecmp.c -- case insensitive string comparator
+   Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#ifdef LENGTH_LIMIT
+# define STRXCASECMP_FUNCTION strncasecmp
+# define STRXCASECMP_DECLARE_N , size_t n
+# define LENGTH_LIMIT_EXPR(Expr) Expr
+#else
+# define STRXCASECMP_FUNCTION strcasecmp
+# define STRXCASECMP_DECLARE_N /* empty */
+# define LENGTH_LIMIT_EXPR(Expr) 0
+#endif
+
+#include <sys/types.h>
+#include <ctype.h>
+
+#define TOLOWER(Ch) (isupper (Ch) ? tolower (Ch) : (Ch))
+
+/* Compare {{no more than N characters of }}strings S1 and S2,
+   ignoring case, returning less than, equal to or
+   greater than zero if S1 is lexicographically less
+   than, equal to or greater than S2.  */
+
+int
+STRXCASECMP_FUNCTION (const char *s1, const char *s2 STRXCASECMP_DECLARE_N)
+{
+  register const unsigned char *p1 = (const unsigned char *) s1;
+  register const unsigned char *p2 = (const unsigned char *) s2;
+  unsigned char c1, c2;
+
+  if (p1 == p2 || LENGTH_LIMIT_EXPR (n == 0))
+    return 0;
+
+  do
+    {
+      c1 = TOLOWER (*p1);
+      c2 = TOLOWER (*p2);
+
+      if (LENGTH_LIMIT_EXPR (--n == 0) || c1 == '\0')
+	break;
+
+      ++p1;
+      ++p2;
+    }
+  while (c1 == c2);
+
+  return c1 - c2;
+}

lib/strncasecmp.c

@@ -0,0 +1,2 @@
+#define LENGTH_LIMIT
+#include "strcasecmp.c"

lib/strrchr.c

@@ -0,0 +1,30 @@
+/* Portable version of strrchr().
+   This function is in the public domain. */
+
+/*
+
+@deftypefn Supplemental char* strrchr (const char *@var{s}, int @var{c})
+
+Returns a pointer to the last occurrence of the character @var{c} in
+the string @var{s}, or @code{NULL} if not found.  If @var{c} is itself the
+null character, the results are undefined.
+
+@end deftypefn
+
+*/
+
+#include <ansidecl.h>
+
+char *
+strrchr (s, c)
+  register const char *s;
+  int c;
+{
+  char *rtnval = 0;
+
+  do {
+    if (*s == c)
+      rtnval = (char*) s;
+  } while (*s++);
+  return (rtnval);
+}

lib/strtol.c

@@ -0,0 +1,472 @@
+/* Convert string representation of a number into an integer value.
+   Copyright (C) 1991, 92, 94, 95, 96, 97, 98, 99 Free Software Foundation, Inc.
+   NOTE: The canonical source of this file is maintained with the GNU C
+   Library.  Bugs can be reported to [email protected].
+
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by the
+   Free Software Foundation; either version 2, 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.  */
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#ifdef _LIBC
+# define USE_NUMBER_GROUPING
+# define STDC_HEADERS
+# define HAVE_LIMITS_H
+#endif
+
+#include <ctype.h>
+#include <errno.h>
+#ifndef errno
+extern int errno;
+#endif
+#ifndef __set_errno
+# define __set_errno(Val) errno = (Val)
+#endif
+
+#ifdef HAVE_LIMITS_H
+# include <limits.h>
+#endif
+
+#ifdef STDC_HEADERS
+# include <stddef.h>
+# include <stdlib.h>
+# include <string.h>
+#else
+# ifndef NULL
+#  define NULL 0
+# endif
+#endif
+
+#ifdef USE_NUMBER_GROUPING
+# include "../locale/localeinfo.h"
+#endif
+
+/* Nonzero if we are defining `strtoul' or `strtoull', operating on
+   unsigned integers.  */
+#ifndef UNSIGNED
+# define UNSIGNED 0
+# define INT LONG int
+#else
+# define INT unsigned LONG int
+#endif
+
+/* Determine the name.  */
+#ifdef USE_IN_EXTENDED_LOCALE_MODEL
+# if UNSIGNED
+#  ifdef USE_WIDE_CHAR
+#   ifdef QUAD
+#    define strtol __wcstoull_l
+#   else
+#    define strtol __wcstoul_l
+#   endif
+#  else
+#   ifdef QUAD
+#    define strtol __strtoull_l
+#   else
+#    define strtol __strtoul_l
+#   endif
+#  endif
+# else
+#  ifdef USE_WIDE_CHAR
+#   ifdef QUAD
+#    define strtol __wcstoll_l
+#   else
+#    define strtol __wcstol_l
+#   endif
+#  else
+#   ifdef QUAD
+#    define strtol __strtoll_l
+#   else
+#    define strtol __strtol_l
+#   endif
+#  endif
+# endif
+#else
+# if UNSIGNED
+#  ifdef USE_WIDE_CHAR
+#   ifdef QUAD
+#    define strtol wcstoull
+#   else
+#    define strtol wcstoul
+#   endif
+#  else
+#   ifdef QUAD
+#    define strtol strtoull
+#   else
+#    define strtol strtoul
+#   endif
+#  endif
+# else
+#  ifdef USE_WIDE_CHAR
+#   ifdef QUAD
+#    define strtol wcstoll
+#   else
+#    define strtol wcstol
+#   endif
+#  else
+#   ifdef QUAD
+#    define strtol strtoll
+#   endif
+#  endif
+# endif
+#endif
+
+/* If QUAD is defined, we are defining `strtoll' or `strtoull',
+   operating on `long long int's.  */
+#ifdef QUAD
+# define LONG long long
+# define STRTOL_LONG_MIN LONG_LONG_MIN
+# define STRTOL_LONG_MAX LONG_LONG_MAX
+# define STRTOL_ULONG_MAX ULONG_LONG_MAX
+
+/* The extra casts work around common compiler bugs,
+   e.g. Cray C 5.0.3.0 when t == time_t.  */
+# ifndef TYPE_SIGNED
+#  define TYPE_SIGNED(t) (! ((t) 0 < (t) -1))
+# endif
+# ifndef TYPE_MINIMUM
+#  define TYPE_MINIMUM(t) ((t) (TYPE_SIGNED (t) \
+				? ~ (t) 0 << (sizeof (t) * CHAR_BIT - 1) \
+				: (t) 0))
+# endif
+# ifndef TYPE_MAXIMUM
+#  define TYPE_MAXIMUM(t) ((t) (~ (t) 0 - TYPE_MINIMUM (t)))
+# endif
+
+# ifndef ULONG_LONG_MAX
+#  define ULONG_LONG_MAX TYPE_MAXIMUM (unsigned long long)
+# endif
+# ifndef LONG_LONG_MAX
+#  define LONG_LONG_MAX TYPE_MAXIMUM (long long int)
+# endif
+# ifndef LONG_LONG_MIN
+#  define LONG_LONG_MIN TYPE_MINIMUM (long long int)
+# endif
+
+# if __GNUC__ == 2 && __GNUC_MINOR__ < 7
+   /* Work around gcc bug with using this constant.  */
+   static const unsigned long long int maxquad = ULONG_LONG_MAX;
+#  undef STRTOL_ULONG_MAX
+#  define STRTOL_ULONG_MAX maxquad
+# endif
+#else
+# define LONG long
+
+# ifndef ULONG_MAX
+#  define ULONG_MAX ((unsigned long) ~(unsigned long) 0)
+# endif
+# ifndef LONG_MAX
+#  define LONG_MAX ((long int) (ULONG_MAX >> 1))
+# endif
+# define STRTOL_LONG_MIN LONG_MIN
+# define STRTOL_LONG_MAX LONG_MAX
+# define STRTOL_ULONG_MAX ULONG_MAX
+#endif
+
+
+/* We use this code also for the extended locale handling where the
+   function gets as an additional argument the locale which has to be
+   used.  To access the values we have to redefine the _NL_CURRENT
+   macro.  */
+#ifdef USE_IN_EXTENDED_LOCALE_MODEL
+# undef _NL_CURRENT
+# define _NL_CURRENT(category, item) \
+  (current->values[_NL_ITEM_INDEX (item)].string)
+# define LOCALE_PARAM , loc
+# define LOCALE_PARAM_DECL __locale_t loc;
+#else
+# define LOCALE_PARAM
+# define LOCALE_PARAM_DECL
+#endif
+
+#if defined _LIBC || defined HAVE_WCHAR_H
+# include <wchar.h>
+#endif
+
+#ifdef USE_WIDE_CHAR
+# include <wctype.h>
+# define L_(Ch) L##Ch
+# define UCHAR_TYPE wint_t
+# define STRING_TYPE wchar_t
+# ifdef USE_IN_EXTENDED_LOCALE_MODEL
+#  define ISSPACE(Ch) __iswspace_l ((Ch), loc)
+#  define ISALPHA(Ch) __iswalpha_l ((Ch), loc)
+#  define TOUPPER(Ch) __towupper_l ((Ch), loc)
+# else
+#  define ISSPACE(Ch) iswspace (Ch)
+#  define ISALPHA(Ch) iswalpha (Ch)
+#  define TOUPPER(Ch) towupper (Ch)
+# endif
+#else
+# if defined STDC_HEADERS || (!defined isascii && !defined HAVE_ISASCII)
+#  define IN_CTYPE_DOMAIN(c) 1
+# else
+#  define IN_CTYPE_DOMAIN(c) isascii(c)
+# endif
+# define L_(Ch) Ch
+# define UCHAR_TYPE unsigned char
+# define STRING_TYPE char
+# ifdef USE_IN_EXTENDED_LOCALE_MODEL
+#  define ISSPACE(Ch) __isspace_l ((Ch), loc)
+#  define ISALPHA(Ch) __isalpha_l ((Ch), loc)
+#  define TOUPPER(Ch) __toupper_l ((Ch), loc)
+# else
+#  define ISSPACE(Ch) (IN_CTYPE_DOMAIN (Ch) && isspace (Ch))
+#  define ISALPHA(Ch) (IN_CTYPE_DOMAIN (Ch) && isalpha (Ch))
+#  define TOUPPER(Ch) (IN_CTYPE_DOMAIN (Ch) ? toupper (Ch) : (Ch))
+# endif
+#endif
+
+/* For compilers which are ansi but don't define __STDC__, like SGI
+   Irix-4.0.5 cc, also check whether PROTOTYPES is defined. */
+#if defined (__STDC__) || defined (PROTOTYPES)
+# define INTERNAL(X) INTERNAL1(X)
+# define INTERNAL1(X) __##X##_internal
+# define WEAKNAME(X) WEAKNAME1(X)
+#else
+# define INTERNAL(X) __/**/X/**/_internal
+#endif
+
+#ifdef USE_NUMBER_GROUPING
+/* This file defines a function to check for correct grouping.  */
+# include "grouping.h"
+#endif
+
+
+
+/* Convert NPTR to an `unsigned long int' or `long int' in base BASE.
+   If BASE is 0 the base is determined by the presence of a leading
+   zero, indicating octal or a leading "0x" or "0X", indicating hexadecimal.
+   If BASE is < 2 or > 36, it is reset to 10.
+   If ENDPTR is not NULL, a pointer to the character after the last
+   one converted is stored in *ENDPTR.  */
+
+INT
+INTERNAL (strtol) (nptr, endptr, base, group LOCALE_PARAM)
+     const STRING_TYPE *nptr;
+     STRING_TYPE **endptr;
+     int base;
+     int group;
+     LOCALE_PARAM_DECL
+{
+  int negative;
+  register unsigned LONG int cutoff;
+  register unsigned int cutlim;
+  register unsigned LONG int i;
+  register const STRING_TYPE *s;
+  register UCHAR_TYPE c;
+  const STRING_TYPE *save, *end;
+  int overflow;
+
+#ifdef USE_NUMBER_GROUPING
+# ifdef USE_IN_EXTENDED_LOCALE_MODEL
+  struct locale_data *current = loc->__locales[LC_NUMERIC];
+# endif
+  /* The thousands character of the current locale.  */
+  wchar_t thousands = L'\0';
+  /* The numeric grouping specification of the current locale,
+     in the format described in <locale.h>.  */
+  const char *grouping;
+
+  if (group)
+    {
+      grouping = _NL_CURRENT (LC_NUMERIC, GROUPING);
+      if (*grouping <= 0 || *grouping == CHAR_MAX)
+	grouping = NULL;
+      else
+	{
+	  /* Figure out the thousands separator character.  */
+# if defined _LIBC || defined _HAVE_BTOWC
+	  thousands = __btowc (*_NL_CURRENT (LC_NUMERIC, THOUSANDS_SEP));
+	  if (thousands == WEOF)
+	    thousands = L'\0';
+# endif
+	  if (thousands == L'\0')
+	    grouping = NULL;
+	}
+    }
+  else
+    grouping = NULL;
+#endif
+
+  if (base < 0 || base == 1 || base > 36)
+    {
+      __set_errno (EINVAL);
+      return 0;
+    }
+
+  save = s = nptr;
+
+  /* Skip white space.  */
+  while (ISSPACE (*s))
+    ++s;
+  if (*s == L_('\0'))
+    goto noconv;
+
+  /* Check for a sign.  */
+  if (*s == L_('-'))
+    {
+      negative = 1;
+      ++s;
+    }
+  else if (*s == L_('+'))
+    {
+      negative = 0;
+      ++s;
+    }
+  else
+    negative = 0;
+
+  /* Recognize number prefix and if BASE is zero, figure it out ourselves.  */
+  if (*s == L_('0'))
+    {
+      if ((base == 0 || base == 16) && TOUPPER (s[1]) == L_('X'))
+	{
+	  s += 2;
+	  base = 16;
+	}
+      else if (base == 0)
+	base = 8;
+    }
+  else if (base == 0)
+    base = 10;
+
+  /* Save the pointer so we can check later if anything happened.  */
+  save = s;
+
+#ifdef USE_NUMBER_GROUPING
+  if (group)
+    {
+      /* Find the end of the digit string and check its grouping.  */
+      end = s;
+      for (c = *end; c != L_('\0'); c = *++end)
+	if ((wchar_t) c != thousands
+	    && ((wchar_t) c < L_('0') || (wchar_t) c > L_('9'))
+	    && (!ISALPHA (c) || (int) (TOUPPER (c) - L_('A') + 10) >= base))
+	  break;
+      if (*s == thousands)
+	end = s;
+      else
+	end = correctly_grouped_prefix (s, end, thousands, grouping);
+    }
+  else
+#endif
+    end = NULL;
+
+  cutoff = STRTOL_ULONG_MAX / (unsigned LONG int) base;
+  cutlim = STRTOL_ULONG_MAX % (unsigned LONG int) base;
+
+  overflow = 0;
+  i = 0;
+  for (c = *s; c != L_('\0'); c = *++s)
+    {
+      if (s == end)
+	break;
+      if (c >= L_('0') && c <= L_('9'))
+	c -= L_('0');
+      else if (ISALPHA (c))
+	c = TOUPPER (c) - L_('A') + 10;
+      else
+	break;
+      if ((int) c >= base)
+	break;
+      /* Check for overflow.  */
+      if (i > cutoff || (i == cutoff && c > cutlim))
+	overflow = 1;
+      else
+	{
+	  i *= (unsigned LONG int) base;
+	  i += c;
+	}
+    }
+
+  /* Check if anything actually happened.  */
+  if (s == save)
+    goto noconv;
+
+  /* Store in ENDPTR the address of one character
+     past the last character we converted.  */
+  if (endptr != NULL)
+    *endptr = (STRING_TYPE *) s;
+
+#if !UNSIGNED
+  /* Check for a value that is within the range of
+     `unsigned LONG int', but outside the range of `LONG int'.  */
+  if (overflow == 0
+      && i > (negative
+	      ? -((unsigned LONG int) (STRTOL_LONG_MIN + 1)) + 1
+	      : (unsigned LONG int) STRTOL_LONG_MAX))
+    overflow = 1;
+#endif
+
+  if (overflow)
+    {
+      __set_errno (ERANGE);
+#if UNSIGNED
+      return STRTOL_ULONG_MAX;
+#else
+      return negative ? STRTOL_LONG_MIN : STRTOL_LONG_MAX;
+#endif
+    }
+
+  /* Return the result of the appropriate sign.  */
+  return negative ? -i : i;
+
+noconv:
+  /* We must handle a special case here: the base is 0 or 16 and the
+     first two characters are '0' and 'x', but the rest are no
+     hexadecimal digits.  This is no error case.  We return 0 and
+     ENDPTR points to the `x`.  */
+  if (endptr != NULL)
+    {
+      if (save - nptr >= 2 && TOUPPER (save[-1]) == L_('X')
+	  && save[-2] == L_('0'))
+	*endptr = (STRING_TYPE *) &save[-1];
+      else
+	/*  There was no number to convert.  */
+	*endptr = (STRING_TYPE *) nptr;
+    }
+
+  return 0L;
+}
+
+/* External user entry point.  */
+
+#if _LIBC - 0 == 0
+# undef PARAMS
+# if defined (__STDC__) && __STDC__
+#  define PARAMS(Args) Args
+# else
+#  define PARAMS(Args) ()
+# endif
+
+/* Prototype.  */
+INT strtol PARAMS ((const STRING_TYPE *nptr, STRING_TYPE **endptr, int base));
+#endif
+
+
+INT
+#ifdef weak_function
+weak_function
+#endif
+strtol (nptr, endptr, base LOCALE_PARAM)
+     const STRING_TYPE *nptr;
+     STRING_TYPE **endptr;
+     int base;
+     LOCALE_PARAM_DECL
+{
+  return INTERNAL (strtol) (nptr, endptr, base, 0 LOCALE_PARAM);
+}

m4/.cvsignore

@@ -1,14 +1,2 @@
 Makefile
 Makefile.in
-
-# From Gettext
-codeset.m4
-gettext.m4
-glibc21.m4
-iconv.m4
-isc-posix.m4
-lcmessage.m4
-lib-ld.m4
-lib-link.m4
-lib-prefix.m4
-progtest.m4

m4/Makefile.am

@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-
 EXTRA_DIST = \
-  c-bs-a.m4 dmalloc.m4 error.m4 \
+  dmalloc.m4 error.m4 \
-  m4.m4 malloc.m4 mbrtowc.m4 mbstate_t.m4 mkstemp.m4 \
+  m4.m4 mbrtowc.m4 memcmp.m4 mkstemp.m4 \
-  prereq.m4 realloc.m4 strerror_r.m4 timevar.m4 warning.m4 \
+  prereq.m4 strerror_r.m4 timevar.m4 warning.m4 \
   gettext.m4 iconv.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 progtest.m4

m4/c-bs-a.m4

@@ -1,29 +0,0 @@
-# c-bs-a.m4 serial 4 (fileutils-4.1.3)
-dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Paul Eggert.
-
-AC_DEFUN([AC_C_BACKSLASH_A],
-[
-  AC_CACHE_CHECK([whether backslash-a works in strings], ac_cv_c_backslash_a,
-   [AC_TRY_COMPILE([],
-     [
-#if '\a' == 'a'
-      syntax error;
-#endif
-      char buf['\a' == 'a' ? -1 : 1];
-      buf[0] = '\a';
-      return buf[0] != "\a"[0];
-     ],
-     ac_cv_c_backslash_a=yes,
-     ac_cv_c_backslash_a=no)])
-  if test $ac_cv_c_backslash_a = yes; then
-    AC_DEFINE(HAVE_C_BACKSLASH_A, 1,
-      [Define if backslash-a works in C strings.])
-  fi
-])

m4/malloc.m4

@@ -1,40 +0,0 @@
-#serial 7
-
-dnl From Jim Meyering.
-dnl Determine whether malloc accepts 0 as its argument.
-dnl If it doesn't, arrange to use the replacement function.
-dnl
-
-AC_DEFUN([jm_FUNC_MALLOC],
-[
- dnl xmalloc.c requires that this symbol be defined so it doesn't
- dnl mistakenly use a broken malloc -- as it might if this test were omitted.
- AC_DEFINE(HAVE_DONE_WORKING_MALLOC_CHECK, 1,
-           [Define if the malloc check has been performed. ])
-
- AC_CACHE_CHECK([whether malloc(0) returns a non-NULL pointer],
-                jm_cv_func_working_malloc,
-  [AC_TRY_RUN([
-    char *malloc ();
-    int
-    main ()
-    {
-      exit (malloc (0) ? 0 : 1);
-    }
-	  ],
-	 jm_cv_func_working_malloc=yes,
-	 jm_cv_func_working_malloc=no,
-	 dnl When crosscompiling, assume malloc(0) returns NULL.
-	 jm_cv_func_working_malloc=no)
-  ])
-  if test $jm_cv_func_working_malloc = yes; then
-    AC_DEFINE([HAVE_MALLOC], 1,
-	      [Define to 1 if your system has a working `malloc' function,
-	       and to 0 otherwise.])
-  else
-    AC_DEFINE([HAVE_MALLOC], 0)
-    AC_LIBOBJ(malloc)
-    AC_DEFINE(malloc, rpl_malloc,
-      [Define to rpl_malloc if the replacement function should be used.])
-  fi
-])

m4/mbstate_t.m4

@@ -1,32 +0,0 @@
-# mbstate_t.m4 serial 9
-dnl Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-# From Paul Eggert.
-
-# BeOS 5 has <wchar.h> but does not define mbstate_t,
-# so you can't declare an object of that type.
-# Check for this incompatibility with Standard C.
-
-# AC_TYPE_MBSTATE_T
-# -----------------
-AC_DEFUN([AC_TYPE_MBSTATE_T],
-  [AC_CACHE_CHECK([for mbstate_t], ac_cv_type_mbstate_t,
-     [AC_COMPILE_IFELSE(
-	[AC_LANG_PROGRAM(
-	   [AC_INCLUDES_DEFAULT
-#	    include <wchar.h>],
-	   [mbstate_t x; return sizeof x;])],
-	[ac_cv_type_mbstate_t=yes],
-	[ac_cv_type_mbstate_t=no])])
-   if test $ac_cv_type_mbstate_t = yes; then
-     AC_DEFINE([HAVE_MBSTATE_T], 1,
-	       [Define to 1 if <wchar.h> declares mbstate_t.])
-   else
-     AC_DEFINE([mbstate_t], int,
-	       [Define to a type if <wchar.h> does not define.])
-   fi])

m4/memcmp.m4

@@ -0,0 +1,9 @@
+#serial 7
+
+AC_DEFUN([jm_FUNC_MEMCMP],
+[AC_REQUIRE([AC_FUNC_MEMCMP])dnl
+ if test $ac_cv_func_memcmp_working = no; then
+   AC_DEFINE(memcmp, rpl_memcmp,
+     [Define to rpl_memcmp if the replacement function should be used.])
+ fi
+])

m4/prereq.m4

@@ -1,15 +1,265 @@
-#serial 2
+#serial 28                                                         -*- Autoconf -*-
 
-dnl These are the prerequisite macros for files in the lib/
+dnl We use jm_ for non Autoconf macros.
-dnl directories of Bison.
+m4_pattern_forbid([^jm_[ABCDEFGHIJKLMNOPQRSTUVXYZ]])dnl
+
+# These are the prerequisite macros for files in the lib/
+# directories of the fileutils, sh-utils, and textutils packages.
+
+AC_DEFUN([jm_PREREQ],
+[
+  jm_PREREQ_ADDEXT
+  jm_PREREQ_C_STACK
+  jm_PREREQ_CANON_HOST
+  jm_PREREQ_DIRNAME
+  jm_PREREQ_ERROR
+  jm_PREREQ_EXCLUDE
+  jm_PREREQ_GETPAGESIZE
+  jm_PREREQ_HARD_LOCALE
+  jm_PREREQ_HASH
+  jm_PREREQ_HUMAN
+  jm_PREREQ_MBSWIDTH
+  jm_PREREQ_MEMCHR
+  jm_PREREQ_PHYSMEM
+  jm_PREREQ_POSIXVER
+  jm_PREREQ_QUOTEARG
+  jm_PREREQ_READUTMP
+  jm_PREREQ_REGEX
+  jm_PREREQ_STAT
+  jm_PREREQ_STRNLEN
+  jm_PREREQ_TEMPNAME # called by mkstemp
+  jm_PREREQ_XGETCWD
+  jm_PREREQ_XREADLINK
+])
+
+AC_DEFUN([jm_PREREQ_ARGMATCH],
+[
+  AC_REQUIRE([jm_PREREQ_QUOTEARG])
+  AC_REPLACE_FUNCS(strcasecmp strncasecmp)
+])
+
+# Ask for argmatch.[ch], and set it up.
+AC_DEFUN([jm_FUNC_ARGMATCH],
+[
+  AC_REQUIRE([jm_PREREQ_ARGMATCH])
+  AC_LIBOBJ([argmatch])
+  AC_LIBSOURCES([argmatch.c, argmatch.h])
+])
+
+AC_DEFUN([jm_PREREQ_ADDEXT],
+[
+  dnl For addext.c.
+  AC_SYS_LONG_FILE_NAMES
+  AC_CHECK_FUNCS(pathconf)
+  AC_CHECK_HEADERS(limits.h string.h unistd.h)
+])
+
+AC_DEFUN([jm_PREREQ_CANON_HOST],
+[
+  dnl Add any libraries as early as possible.
+  dnl In particular, inet_ntoa needs -lnsl at least on Solaris5.5.1,
+  dnl so we have to add -lnsl to LIBS before checking for that function.
+  AC_SEARCH_LIBS(gethostbyname, [inet nsl])
+
+  dnl These come from -lnsl on Solaris5.5.1.
+  AC_CHECK_FUNCS(gethostbyname gethostbyaddr inet_ntoa)
+
+  AC_CHECK_FUNCS(gethostbyname gethostbyaddr inet_ntoa)
+  AC_CHECK_HEADERS(unistd.h string.h netdb.h sys/socket.h \
+                   netinet/in.h arpa/inet.h)
+])
+
+AC_DEFUN([jm_PREREQ_DIRNAME],
+[
+  AC_HEADER_STDC
+  AC_CHECK_HEADERS(string.h)
+])
+
+AC_DEFUN([jm_PREREQ_EXCLUDE],
+[
+  AC_FUNC_FNMATCH_GNU
+  AC_HEADER_STDBOOL
+])
+
+AC_DEFUN([jm_PREREQ_GETPAGESIZE],
+[
+  AC_CHECK_FUNCS(getpagesize)
+  AC_CHECK_HEADERS(OS.h unistd.h)
+])
+
+AC_DEFUN([jm_PREREQ_HARD_LOCALE],
+[
+  AC_CHECK_HEADERS(locale.h stdlib.h string.h)
+  AC_CHECK_FUNCS(setlocale)
+  AM_C_PROTOTYPES
+])
+
+# AC_DEFUN([jm_PREREQ_HASH],
+# [
+#   AC_CHECK_HEADERS(stdlib.h)
+#   AC_HEADER_STDBOOL
+#   AC_REQUIRE([jm_CHECK_DECLS])
+# ])
+
+# If you use human.c, you need the following files:
+# inttypes.m4 ulonglong.m4
+AC_DEFUN([jm_PREREQ_HUMAN],
+[
+  AC_CHECK_HEADERS(limits.h stdlib.h string.h)
+  AC_CHECK_DECLS([getenv])
+  AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])
+])
+
+AC_DEFUN([jm_PREREQ_MEMCHR],
+[
+  AC_CHECK_HEADERS(limits.h stdlib.h bp-sym.h)
+])
+
+AC_DEFUN([jm_PREREQ_PHYSMEM],
+[
+  AC_CHECK_HEADERS(sys/pstat.h unistd.h)
+  AC_CHECK_FUNCS(pstat_getstatic pstat_getdynamic)
+])
+
+AC_DEFUN([jm_PREREQ_POSIXVER],
+[
+  AC_CHECK_HEADERS(unistd.h)
+  AC_CHECK_DECLS([getenv])
+])
 
 AC_DEFUN([jm_PREREQ_QUOTEARG],
 [
-  AC_CHECK_FUNCS(isascii iswprint mbsinit)
+  AC_CHECK_FUNCS(isascii iswprint)
   jm_FUNC_MBRTOWC
+  jm_FUNC_MEMCMP
   AC_CHECK_HEADERS(limits.h stddef.h stdlib.h string.h wchar.h wctype.h)
   AC_HEADER_STDC
   AC_C_BACKSLASH_A
   AC_TYPE_MBSTATE_T
   AM_C_PROTOTYPES
 ])
+
+AC_DEFUN([jm_PREREQ_READUTMP],
+[
+  AC_HEADER_STDC
+  AC_CHECK_HEADERS(string.h utmp.h utmpx.h sys/param.h)
+  AC_CHECK_FUNCS(utmpname)
+  AC_CHECK_FUNCS(utmpxname)
+  AM_C_PROTOTYPES
+
+  if test $ac_cv_header_utmp_h = yes || test $ac_cv_header_utmpx_h = yes; then
+    utmp_includes="\
+$ac_includes_default
+#ifdef HAVE_UTMPX_H
+# include <utmpx.h>
+#endif
+#ifdef HAVE_UTMP_H
+# include <utmp.h>
+#endif
+"
+    AC_CHECK_MEMBERS([struct utmpx.ut_user],,,[$utmp_includes])
+    AC_CHECK_MEMBERS([struct utmp.ut_user],,,[$utmp_includes])
+    AC_CHECK_MEMBERS([struct utmpx.ut_name],,,[$utmp_includes])
+    AC_CHECK_MEMBERS([struct utmp.ut_name],,,[$utmp_includes])
+    AC_CHECK_MEMBERS([struct utmpx.ut_type],,,[$utmp_includes])
+    AC_CHECK_MEMBERS([struct utmp.ut_type],,,[$utmp_includes])
+    AC_CHECK_MEMBERS([struct utmpx.ut_pid],,,[$utmp_includes])
+    AC_CHECK_MEMBERS([struct utmp.ut_pid],,,[$utmp_includes])
+    AC_CHECK_MEMBERS([struct utmpx.ut_id],,,[$utmp_includes])
+    AC_CHECK_MEMBERS([struct utmp.ut_id],,,[$utmp_includes])
+
+    AC_CHECK_MEMBERS([struct utmpx.ut_exit.ut_exit],,,[$utmp_includes])
+    AC_CHECK_MEMBERS([struct utmp.ut_exit.ut_exit],,,[$utmp_includes])
+    AC_CHECK_MEMBERS([struct utmpx.ut_exit.e_exit],,,[$utmp_includes])
+    AC_CHECK_MEMBERS([struct utmp.ut_exit.e_exit],,,[$utmp_includes])
+
+    AC_CHECK_MEMBERS([struct utmpx.ut_exit.ut_termination],,,[$utmp_includes])
+    AC_CHECK_MEMBERS([struct utmp.ut_exit.ut_termination],,,[$utmp_includes])
+    AC_CHECK_MEMBERS([struct utmpx.ut_exit.e_termination],,,[$utmp_includes])
+    AC_CHECK_MEMBERS([struct utmp.ut_exit.e_termination],,,[$utmp_includes])
+    AC_LIBOBJ(readutmp)
+  fi
+])
+
+AC_DEFUN([jm_PREREQ_REGEX],
+[
+  dnl FIXME: Maybe provide a btowc replacement someday: solaris-2.5.1 lacks it.
+  dnl FIXME: Check for wctype and iswctype, and and add -lw if necessary
+  dnl to get them.
+  AC_CHECK_FUNCS(bzero bcopy isascii btowc)
+  AC_CHECK_HEADERS(alloca.h libintl.h wctype.h wchar.h)
+  AC_HEADER_STDC
+  AC_FUNC_ALLOCA
+])
+
+AC_DEFUN([jm_PREREQ_STAT],
+[
+  AC_CHECK_HEADERS(sys/sysmacros.h sys/statvfs.h sys/vfs.h inttypes.h)
+  AC_CHECK_HEADERS(sys/param.h sys/mount.h)
+  AC_CHECK_FUNCS(statvfs)
+  jm_AC_TYPE_LONG_LONG
+
+  statxfs_includes="\
+$ac_includes_default
+#if HAVE_SYS_STATVFS_H
+# include <sys/statvfs.h>
+#endif
+#if HAVE_SYS_VFS_H
+# include <sys/vfs.h>
+#endif
+#if ( ! HAVE_SYS_STATVFS_H && ! HAVE_SYS_VFS_H && HAVE_SYS_MOUNT_H && HAVE_SYS_PARAM_H )
+/* NetBSD 1.5.2 needs these, for the declaration of struct statfs. */
+# include <sys/param.h>
+# include <sys/mount.h>
+#endif
+"
+  AC_CHECK_MEMBERS([struct statfs.f_basetype],,,[$statxfs_includes])
+  AC_CHECK_MEMBERS([struct statvfs.f_basetype],,,[$statxfs_includes])
+  AC_CHECK_MEMBERS([struct statfs.f_fstypename],,,[$statxfs_includes])
+  AC_CHECK_MEMBERS([struct statfs.f_type],,,[$statxfs_includes])
+  AC_CHECK_MEMBERS([struct statvfs.f_type],,,[$statxfs_includes])
+  AC_CHECK_MEMBERS([struct statfs.f_fsid.__val],,,[$statxfs_includes])
+  AC_CHECK_MEMBERS([struct statvfs.f_fsid.__val],,,[$statxfs_includes])
+  AC_CHECK_MEMBERS([struct statfs.f_namemax],,,[$statxfs_includes])
+  AC_CHECK_MEMBERS([struct statvfs.f_namemax],,,[$statxfs_includes])
+  AC_CHECK_MEMBERS([struct statfs.f_namelen],,,[$statxfs_includes])
+  AC_CHECK_MEMBERS([struct statvfs.f_namelen],,,[$statxfs_includes])
+])
+
+AC_DEFUN([jm_PREREQ_STRNLEN],
+[
+  AC_FUNC_STRNLEN
+  AC_HEADER_STDC
+  AC_CHECK_HEADERS(memory.h)
+  AC_CHECK_DECLS([memchr])
+
+  # This is necessary because automake-1.6.1 doesn't understand
+  # that the above use of AC_FUNC_STRNLEN means we may have to use
+  # lib/strnlen.c.
+  test $ac_cv_func_strnlen_working = yes \
+    && AC_LIBOBJ(strnlen)
+])
+
+AC_DEFUN([jm_PREREQ_TEMPNAME],
+[
+  AC_HEADER_STDC
+  AC_HEADER_STAT
+  AC_CHECK_HEADERS(fcntl.h sys/time.h stdint.h unistd.h)
+  AC_CHECK_FUNCS(__secure_getenv gettimeofday)
+  AC_CHECK_DECLS([getenv])
+  AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])
+])
+
+AC_DEFUN([jm_PREREQ_XGETCWD],
+[
+  AC_C_PROTOTYPES
+  AC_CHECK_HEADERS(limits.h stdlib.h sys/param.h unistd.h)
+  AC_CHECK_FUNCS(getcwd)
+  AC_FUNC_GETCWD_NULL
+])
+
+AC_DEFUN([jm_PREREQ_XREADLINK],
+[
+  AC_C_PROTOTYPES
+  AC_CHECK_HEADERS(limits.h stdlib.h sys/types.h unistd.h)
+])

m4/realloc.m4

@@ -1,40 +0,0 @@
-#serial 6
-
-dnl From Jim Meyering.
-dnl Determine whether realloc works when both arguments are 0.
-dnl If it doesn't, arrange to use the replacement function.
-dnl
-
-AC_DEFUN([jm_FUNC_REALLOC],
-[
- dnl xmalloc.c requires that this symbol be defined so it doesn't
- dnl mistakenly use a broken realloc -- as it might if this test were omitted.
- AC_DEFINE(HAVE_DONE_WORKING_REALLOC_CHECK, 1,
-           [Define if the realloc check has been performed. ])
-
- AC_CACHE_CHECK([whether realloc(0,0) returns a non-NULL pointer],
-                jm_cv_func_working_realloc,
-  [AC_TRY_RUN([
-    char *realloc ();
-    int
-    main ()
-    {
-      exit (realloc (0, 0) ? 0 : 1);
-    }
-	  ],
-	 jm_cv_func_working_realloc=yes,
-	 jm_cv_func_working_realloc=no,
-	 dnl When crosscompiling, assume realloc(0,0) returns NULL.
-	 jm_cv_func_working_realloc=no)
-  ])
-  if test $jm_cv_func_working_realloc = yes; then
-    AC_DEFINE([HAVE_REALLOC], 1,
-	      [Define to 1 if your system has a working `realloc' function,
-	       and to 0 otherwise.])
-  else
-    AC_DEFINE([HAVE_REALLOC], 0)
-    AC_LIBOBJ(realloc)
-    AC_DEFINE(realloc, rpl_realloc,
-      [Define to rpl_realloc if the replacement function should be used.])
-  fi
-])

m4/stage.m4

@@ -1,33 +0,0 @@
-# -*-Autoconf-*-
-# Checks required to run `stage', a nonportable memory/time tracker.
-#
-# Copyright (C) 2002 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307  USA
-
-# serial 1
-
-AC_DEFUN([BISON_PREREQ_STAGE],
-[AC_CHECK_HEADERS([malloc.h])
-AC_CHECK_FUNCS([mallinfo])
-
-AC_CHECK_TYPES([struct mallinfo], [], [],
-[$ac_includes_default
-#if HAVE_MALLOC_H
-# include <malloc.h>
-#endif
-])
-])

po/POTFILES.in

@@ -1,6 +1,3 @@
-src/LR0.c
-src/assoc.c
-src/closure.c
 src/complain.c
 src/conflicts.c
 src/files.c
@@ -8,16 +5,14 @@ src/getargs.c
 src/gram.c
 src/lalr.c
 src/main.c
-src/parse-gram.y
+src/parse-gram.c
 src/print.c
 src/reader.c
 src/reduce.c
-src/relation.c
+src/scan-gram.c
-src/scan-gram.l
 src/state.c
 src/symlist.c
 src/symtab.c
-src/tables.c
 
 lib/argmatch.c
 lib/bitset_stats.c

po/de.po

@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: bison 1.49a\n"
+"Project-Id-Version: bison 1.49b\n"
-"POT-Creation-Date: 2002-08-11 00:16-0700\n"
+"POT-Creation-Date: 2002-09-27 16:50+0200\n"
-"PO-Revision-Date: 2002-05-02 14:18:50+0200\n"
+"PO-Revision-Date: 2002-09-05 16:15:32+0200\n"
 "Last-Translator: Michael Piefel <[email protected]>\n"
 "Language-Team: German <[email protected]>\n"
 "MIME-Version: 1.0\n"
@@ -15,66 +15,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: src/LR0.c:63
-#, c-format
-msgid "state_list_append (state = %d, symbol = %d (%s))\n"
-msgstr ""
-
-#: src/LR0.c:181
-#, c-format
-msgid "Entering new_itemsets, state = %d\n"
-msgstr ""
-
-#: src/LR0.c:219
-#, c-format
-msgid "Entering get_state, symbol = %d (%s)\n"
-msgstr ""
-
-#: src/LR0.c:227
-#, fuzzy, c-format
-msgid "Exiting get_state => %d\n"
-msgstr "    %-4s\tgehe zu Zustand %d über\n"
-
-#: src/LR0.c:247
-#, c-format
-msgid "Entering append_states, state = %d\n"
-msgstr ""
-
-#: src/LR0.c:355
-#, c-format
-msgid "Processing state %d (reached by %s)\n"
-msgstr ""
-
-#: src/assoc.c:31
-msgid "undefined associativity"
-msgstr ""
-
-#: src/closure.c:56
-#, c-format
-msgid "Closure: %s\n"
-msgstr ""
-
-#: src/closure.c:63
-#, fuzzy, c-format
-msgid "  (rule %d)\n"
-msgstr "   (Regel %d)"
-
-#: src/closure.c:136
-msgid "RTC: Firsts Input"
-msgstr ""
-
-#: src/closure.c:139
-msgid "RTC: Firsts Output"
-msgstr ""
-
-#: src/closure.c:203
-msgid "input"
-msgstr ""
-
-#: src/closure.c:234
-msgid "output"
-msgstr ""
-
 #: src/complain.c:89 lib/error.c:128 lib/error.c:156
 msgid "Unknown system error"
 msgstr "Unbekannter Systemfehler"
@@ -88,19 +28,22 @@ msgid "fatal error: "
 msgstr "fataler Fehler: "
 
 #: src/conflicts.c:72
-#, fuzzy, c-format
+#, c-format
 msgid "    Conflict between rule %d and token %s resolved as shift"
-msgstr "Konflikt in Zustand %d zwischen Regel %d and Token %s wurde %s.\n"
+msgstr ""
+"    Konflikt zwischen Regel %d and Token %s wurde durch Schieben gelöst"
 
 #: src/conflicts.c:80
-#, fuzzy, c-format
+#, c-format
 msgid "    Conflict between rule %d and token %s resolved as reduce"
-msgstr "Konflikt in Zustand %d zwischen Regel %d and Token %s wurde %s.\n"
+msgstr ""
+"    Konflikt zwischen Regel %d and Token %s wurde durch Reduzierung gelöst"
 
 #: src/conflicts.c:87
-#, fuzzy, c-format
+#, c-format
 msgid "    Conflict between rule %d and token %s resolved as an error"
-msgstr "Konflikt in Zustand %d zwischen Regel %d and Token %s wurde %s.\n"
+msgstr ""
+"    Konflikt zwischen Regel %d and Token %s wurde als Fehler betrachtet"
 
 #: src/conflicts.c:402
 #, c-format
@@ -140,11 +83,11 @@ msgid "State %d contains "
 msgstr "Zustand %d enthält "
 
 #: src/conflicts.c:537
-#, fuzzy, c-format
+#, c-format
 msgid "expected %d shift/reduce conflict"
 msgid_plural "expected %d shift/reduce conflicts"
-msgstr[0] "erwartete %d Schiebe/Reduziere-Konflikt\n"
+msgstr[0] "erwartete %d Schiebe/Reduziere-Konflikt"
-msgstr[1] "erwartete %d Schiebe/Reduziere-Konflikte\n"
+msgstr[1] "erwartete %d Schiebe/Reduziere-Konflikte"
 
 #: src/files.c:114
 #, c-format
@@ -209,7 +152,6 @@ msgstr ""
 "einschließen\n"
 
 #: src/getargs.c:190
-#, fuzzy
 msgid ""
 "Output:\n"
 "  -d, --defines              also produce a header file\n"
@@ -222,6 +164,7 @@ msgid ""
 msgstr ""
 "Ausgabe:\n"
 "  -d, --defines              auch eine Header-Datei herstellen\n"
+"  -r, --report=DINGE         auch Details des Automaten ausgeben\n"
 "  -v, --verbose              auch eine Erklärung des Automaten herstellen\n"
 "  -b, --file-prefix=PRÄFIX   einen PRÄFIX für Ausgabe-Dateien angeben\n"
 "  -o, --output=DATEI         Ausgabe in DATEI schreiben\n"
@@ -238,6 +181,13 @@ msgid ""
 "  `all'          include all the above information\n"
 "  `none'         disable the report\n"
 msgstr ""
+"DINGE ist eine Liste kommagetrennter Wörter aus:\n"
+"  »state«        die Zustänge beschreiben\n"
+"  »itemset«      die Kernsybolmengen mit ihrem Abschluss vervollständigen\n"
+"  »lookahead«    explizit Vorschau mit Symbolen verbinden\n"
+"  »solved«       Schiebe-/Reduzier-Konfliktlösung beschreiben\n"
+"  »all«          alle oben genannten Informationen\n"
+"  »none«         den Report abschalten\n"
 
 #: src/getargs.c:212
 msgid "Report bugs to <[email protected]>.\n"
@@ -290,70 +240,22 @@ msgstr "leer"
 msgid "Grammar"
 msgstr "Grammatik"
 
-#: src/gram.c:250
-msgid ""
-"Variables\n"
-"---------\n"
-"\n"
-msgstr ""
-
-#: src/gram.c:253
-msgid "Value  Sprec  Sassoc  Tag\n"
-msgstr ""
-
-#: src/gram.c:263
-msgid ""
-"Rules\n"
-"-----\n"
-"\n"
-msgstr ""
-
-#: src/gram.c:266
-msgid "Num (Prec, Assoc, Useful, Ritem Range) Lhs -> Rhs (Ritem range) [Num]\n"
-msgstr ""
-
-#: src/gram.c:292
-msgid ""
-"Rules interpreted\n"
-"-----------------\n"
-"\n"
-msgstr ""
-
 #: src/gram.c:321 src/reduce.c:302 src/reduce.c:392
-#, fuzzy
 msgid "warning"
-msgstr "Warnung: "
+msgstr "Warnung"
 
 #: src/lalr.c:91
 #, c-format
 msgid "too many gotos (max %d)"
 msgstr "zu viele Gotos (max %d)"
 
-#: src/lalr.c:406
-msgid "Lookaheads: BEGIN\n"
-msgstr ""
-
-#: src/lalr.c:418
-#, c-format
-msgid "State %d: %d lookaheads\n"
-msgstr ""
-
-#: src/lalr.c:425
-#, c-format
-msgid "   on %d (%s) -> rule %d\n"
-msgstr ""
-
-#: src/lalr.c:430
-msgid "Lookaheads: END\n"
-msgstr ""
-
 #: src/main.c:117
 msgid "rule never reduced because of conflicts"
-msgstr ""
+msgstr "Regel nie reduziert wegen Konflikten"
 
-#: src/parse-gram.y:344
+#: parse-gram.y:347
 msgid "POSIX forbids declarations in the grammar"
-msgstr ""
+msgstr "POSIX verbietet Deklarationen in der Grammatik"
 
 #: src/print.c:46
 #, c-format
@@ -361,32 +263,32 @@ msgid " type %d is %s\n"
 msgstr " Typ %d ist %s\n"
 
 #: src/print.c:162
-#, fuzzy, c-format
+#, c-format
 msgid "shift, and go to state %d\n"
-msgstr "    %-4s\tschiebe und gehe zu Zustand %d über\n"
+msgstr "schiebe und gehe zu Zustand %d über\n"
 
 #: src/print.c:164
-#, fuzzy, c-format
+#, c-format
 msgid "go to state %d\n"
-msgstr "    %-4s\tgehe zu Zustand %d über\n"
+msgstr "gehe zu Zustand %d über\n"
 
+#
 #: src/print.c:201
-#, fuzzy
 msgid "error (nonassociative)\n"
-msgstr "%-4s\tFehler (nicht assoziativ)"
+msgstr "Fehler (nicht assoziativ)\n"
 
 #: src/print.c:290
-#, fuzzy, c-format
+#, c-format
 msgid "reduce using rule %d (%s)"
-msgstr "$default\treduziere mit Regel %d (%s)"
+msgstr "reduziere mit Regel %d (%s)"
 
 #: src/print.c:293
 msgid "accept"
-msgstr ""
+msgstr "annehmen"
 
 #: src/print.c:324 src/print.c:390
 msgid "$default"
-msgstr ""
+msgstr "$default"
 
 #: src/print.c:419
 #, c-format
@@ -410,9 +312,8 @@ msgid " on right:"
 msgstr " auf der rechten Seite:"
 
 #: src/print.c:552
-#, fuzzy
 msgid "Rules never reduced"
-msgstr "%d Regel wurde niemals reduziert\n"
+msgstr "niemals reduzierte Regeln"
 
 #: src/reader.c:52
 #, c-format
@@ -422,7 +323,7 @@ msgstr "mehr als eine %s-Deklaration"
 #: src/reader.c:141
 #, c-format
 msgid "result type clash on merge function %s: `%s' vs. `%s'"
-msgstr ""
+msgstr "Rückgabetyp-Konflikt in merge-Funktion %s: »%s« und »%s«"
 
 #: src/reader.c:239
 #, c-format
@@ -445,27 +346,27 @@ msgstr "zwei @prec-Anweisungen nacheinander"
 #: src/reader.c:353
 #, c-format
 msgid "%%dprec affects only GLR parsers"
-msgstr ""
+msgstr "%%dprec betrifft nur GLR-Parser"
 
 #: src/reader.c:355
 #, c-format
 msgid "%%dprec must be followed by positive number"
-msgstr ""
+msgstr "%%dprec muss von positiver Zahl gefolgt sein"
 
 #: src/reader.c:357
 #, c-format
 msgid "only one %%dprec allowed per rule"
-msgstr ""
+msgstr "nur ein %%dprec pro Regel erlaubt"
 
 #: src/reader.c:368
 #, c-format
 msgid "%%merge affects only GLR parsers"
-msgstr ""
+msgstr "%%merge betrifft nur GLR-Parser"
 
 #: src/reader.c:370
 #, c-format
 msgid "only one %%merge allowed per rule"
-msgstr ""
+msgstr "nur ein %%merge pro Regel erlaubt"
 
 #: src/reader.c:513
 msgid "no rules in the input grammar"
@@ -477,29 +378,24 @@ msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "zu viele Symbole (Token plus Nicht-Terminale); Maximum %d"
 
 #: src/reduce.c:239
-#, fuzzy
 msgid "useless rule"
-msgstr "%d nutzlose Regel"
+msgstr "nutzlose Regel"
 
 #: src/reduce.c:302
-#, fuzzy
 msgid "useless nonterminal"
-msgstr "%d nutzloses Nicht-Terminal"
+msgstr "nutzloses Nicht-Terminal"
 
 #: src/reduce.c:349
-#, fuzzy
 msgid "Useless nonterminals"
-msgstr "Nutzlose Nicht-Terminale:"
+msgstr "Nutzlose Nicht-Terminale"
 
 #: src/reduce.c:362
-#, fuzzy
 msgid "Terminals which are not used"
-msgstr "Nicht genutzte Terminale:"
+msgstr "Nicht genutzte Terminale"
 
 #: src/reduce.c:371
-#, fuzzy
 msgid "Useless rules"
-msgstr "Ungenutzte Regeln:"
+msgstr "Nutzlose Regeln"
 
 #: src/reduce.c:387
 #, c-format
@@ -527,75 +423,61 @@ msgstr[0] "%d nutzlose Regel"
 msgstr[1] "%d nutzlose Regeln"
 
 #: src/reduce.c:435
-#, fuzzy, c-format
+#, c-format
 msgid "start symbol %s does not derive any sentence"
 msgstr "es lassen sich keine Sätze vom Startsymbol %s ableiten"
 
-#: src/relation.c:137
+#: scan-gram.l:202
-msgid "relation_transpose: input\n"
-msgstr ""
-
-#: src/relation.c:176
-msgid "relation_transpose: output\n"
-msgstr ""
-
-#: src/scan-gram.l:202
 #, c-format
 msgid ": invalid character: `%c'\n"
-msgstr ""
+msgstr ": ungültiges Zeichen: »%c«\n"
 
-#: src/scan-gram.l:246
+#: scan-gram.l:246
-#, fuzzy
 msgid ": unexpected end of file in a comment\n"
-msgstr "Datei endet unerwartet"
+msgstr ": Datei endet unerwartet innerhalb eines Kommentars\n"
 
-#: src/scan-gram.l:274 src/scan-gram.l:412
+#: scan-gram.l:274 scan-gram.l:412
-#, fuzzy
 msgid ": unexpected end of file in a string\n"
-msgstr "Datei endet unerwartet"
+msgstr ": Datei endet unerwartet innerhalb einer Zeichenkette\n"
 
-#: src/scan-gram.l:311 src/scan-gram.l:383
+#: scan-gram.l:311 scan-gram.l:383
-#, fuzzy
 msgid ": unexpected end of file in a character\n"
-msgstr "Datei endet unerwartet"
+msgstr ": Datei endet unerwartet innerhalb eines Zeichens\n"
 
-#: src/scan-gram.l:332
+#: scan-gram.l:332
-#, fuzzy, c-format
+#, c-format
 msgid ": invalid escape: %s\n"
-msgstr "unzulässiger Wert: %s%d"
+msgstr ": unzulässiges Fluchtzeichen: %s\n"
 
-#: src/scan-gram.l:353
+#: scan-gram.l:353
-#, fuzzy, c-format
+#, c-format
 msgid ": unrecognized escape: %s\n"
-msgstr "unbekannt: %s"
+msgstr ": unbekannt Fluchtzeichen: %s\n"
 
-#: src/scan-gram.l:473
+#: scan-gram.l:473
-#, fuzzy
 msgid ": unexpected end of file in a braced code\n"
-msgstr "Datei endet unerwartet"
+msgstr ": Datei endet unerwartet innerhalb geklammerten Programmtexts\n"
 
-#: src/scan-gram.l:502
+#: scan-gram.l:502
-#, fuzzy
 msgid ": unexpected end of file in a prologue\n"
-msgstr "Datei endet unerwartet"
+msgstr ": Datei endet unerwartet innerhalb eines Prologs\n"
 
-#: src/scan-gram.l:560
+#: scan-gram.l:560
 #, c-format
 msgid "$$ of `%s' has no declared type"
 msgstr "$$ von »%s« hat keinen deklarierten Typ"
 
-#: src/scan-gram.l:577 src/scan-gram.l:664
+#: scan-gram.l:577 scan-gram.l:664
 #, c-format
 msgid "invalid value: %s%d"
 msgstr "unzulässiger Wert: %s%d"
 
-#: src/scan-gram.l:584
+#: scan-gram.l:584
 #, c-format
 msgid "$%d of `%s' has no declared type"
 msgstr "$%d von »%s« hat keinen deklarierten Typ"
 
-#: src/scan-gram.l:595 src/scan-gram.l:612 src/scan-gram.l:671
+#: scan-gram.l:595 scan-gram.l:612 scan-gram.l:671 scan-gram.l:688
-#: src/scan-gram.l:688
 #, c-format
 msgid "%s is invalid"
 msgstr "%s ist unzulässig"
@@ -615,9 +497,9 @@ msgid "type redeclaration for %s"
 msgstr "erneute Deklaration des Typs für %s"
 
 #: src/symtab.c:98 src/symtab.c:117
-#, fuzzy, c-format
+#, c-format
 msgid "%s redeclaration for %s"
-msgstr "erneute Deklaration des Typs für %s"
+msgstr "%s erneute Deklaration für %s"
 
 #: src/symtab.c:138
 #, c-format
@@ -630,9 +512,9 @@ msgid "symbol %s redefined"
 msgstr "Symbol %s noch einmal definiert"
 
 #: src/symtab.c:180
-#, fuzzy, c-format
+#, c-format
 msgid "redefining user token number of %s"
-msgstr "Vorrang von %s wird erneut definiert"
+msgstr "Nutzertokennummer von %s erneut definiert"
 
 #: src/symtab.c:225
 #, c-format
@@ -657,9 +539,9 @@ msgid "conflicting precedences for %s and %s"
 msgstr "Vorrang für %s und %s widersprechen sich"
 
 #: src/symtab.c:293
-#, fuzzy, c-format
+#, c-format
 msgid "conflicting associativities for %s (%s) and %s (%s)"
-msgstr "Assoziativitäts-Werte für %s und %s widersprechen sich"
+msgstr "Assoziativitäts-Werte für %s (%s) und %s (%s) widersprechen sich"
 
 #: src/symtab.c:363
 #, c-format
@@ -676,29 +558,19 @@ msgstr "das Startsymbol %s ist undefiniert"
 msgid "the start symbol %s is a token"
 msgstr "das Startsymbol %s ist ein Token"
 
-#: src/tables.c:210
-#, c-format
-msgid "growing table and check from: %lu to %lu\n"
-msgstr ""
-
-#: src/tables.c:757
-#, c-format
-msgid "base_t too small to hold %d\n"
-msgstr ""
-
 #: lib/argmatch.c:161
-#, fuzzy, c-format
+#, c-format
 msgid "invalid argument %s for %s"
-msgstr "unzulässiger Wert: %s%d"
+msgstr "unzulässiges Argument %s für %s"
 
 #: lib/argmatch.c:162
 #, c-format
 msgid "ambiguous argument %s for %s"
-msgstr ""
+msgstr "mehrdeutiges Argument %s für %s"
 
 #: lib/argmatch.c:181
 msgid "Valid arguments are:"
-msgstr ""
+msgstr "Gültige Argumente sind:"
 
 #: lib/bitset_stats.c:226
 #, c-format
@@ -846,6 +718,92 @@ msgstr ""
 msgid "time in %s: %ld.%06ld (%ld%%)\n"
 msgstr ""
 
+#~ msgid "state_list_append (state = %d, symbol = %d (%s))\n"
+#~ msgstr "state_list_append (Zustand = %d, Symbol = %d (%s))\n"
+
+#~ msgid "Entering new_itemsets, state = %d\n"
+#~ msgstr "Betrete new_itemsets, Zustand = %d\n"
+
+#~ msgid "Entering get_state, symbol = %d (%s)\n"
+#~ msgstr "Betrete get_state, Symbol = %d (%s)\n"
+
+#~ msgid "Exiting get_state => %d\n"
+#~ msgstr "Verlasse get_state => %d\n"
+
+#~ msgid "Entering append_states, state = %d\n"
+#~ msgstr "Betrete append_states, Zustand = %d\n"
+
+#~ msgid "Processing state %d (reached by %s)\n"
+#~ msgstr "Verarbeite Zustand %d (erreicht von %s)\n"
+
+#~ msgid "undefined associativity"
+#~ msgstr "undefinierte Assoziativität"
+
+#~ msgid "Closure: %s\n"
+#~ msgstr "Abschluss: %s\n"
+
+#~ msgid "  (rule %d)\n"
+#~ msgstr "  (Regel %d)\n"
+
+#~ msgid "input"
+#~ msgstr "Eingabe"
+
+#~ msgid "output"
+#~ msgstr "Ausgabe"
+
+#~ msgid ""
+#~ "Variables\n"
+#~ "---------\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Variablen\n"
+#~ "---------\n"
+#~ "\n"
+
+#~ msgid "Value  Sprec  Sassoc  Tag\n"
+#~ msgstr "Wert   Spräz  Sassoz  Tag\n"
+
+#~ msgid ""
+#~ "Rules\n"
+#~ "-----\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Regeln\n"
+#~ "-----\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Num (Prec, Assoc, Useful, Ritem Range) Lhs -> Rhs (Ritem range) [Num]\n"
+#~ msgstr ""
+#~ "Num (Präz, Assoz, Nützl., Ritem-Ber.)  LS  -> RS  (Ritem-Ber.)  [Num]\n"
+
+#~ msgid ""
+#~ "Rules interpreted\n"
+#~ "-----------------\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Regeln interpretiert\n"
+#~ "-----------------\n"
+#~ "\n"
+
+#~ msgid "Lookaheads: BEGIN\n"
+#~ msgstr "Vorschau: ANFANG\n"
+
+#~ msgid "State %d: %d lookaheads\n"
+#~ msgstr "Zustand %d: %d Vorschauen\n"
+
+#~ msgid "   on %d (%s) -> rule %d\n"
+#~ msgstr "   auf %d (%s) -> Regel %d\n"
+
+#~ msgid "Lookaheads: END\n"
+#~ msgstr "Vorschau: ENDE\n"
+
+#~ msgid "relation_transpose: input\n"
+#~ msgstr "relation_transpose: Eingabe\n"
+
+#~ msgid "relation_transpose: output\n"
+#~ msgstr "relation_transpose: Ausgabe\n"
+
 #~ msgid "reduce"
 #~ msgstr "durch Reduzierung gelöst"
 

po/es.po

@@ -29,7 +29,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU bison 1.49a\n"
-"POT-Creation-Date: 2002-08-11 00:16-0700\n"
+"POT-Creation-Date: 2002-09-27 16:50+0200\n"
 "PO-Revision-Date: 2002-05-02 10:19+0200\n"
 "Last-Translator: Nicolás García-Pedrajas <[email protected]>\n"
 "Language-Team: Spanish <[email protected]>\n"
@@ -38,66 +38,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/LR0.c:63
-#, c-format
-msgid "state_list_append (state = %d, symbol = %d (%s))\n"
-msgstr ""
-
-#: src/LR0.c:181
-#, c-format
-msgid "Entering new_itemsets, state = %d\n"
-msgstr ""
-
-#: src/LR0.c:219
-#, c-format
-msgid "Entering get_state, symbol = %d (%s)\n"
-msgstr ""
-
-#: src/LR0.c:227
-#, fuzzy, c-format
-msgid "Exiting get_state => %d\n"
-msgstr "    %-4s\tir al estado %d\n"
-
-#: src/LR0.c:247
-#, c-format
-msgid "Entering append_states, state = %d\n"
-msgstr ""
-
-#: src/LR0.c:355
-#, c-format
-msgid "Processing state %d (reached by %s)\n"
-msgstr ""
-
-#: src/assoc.c:31
-msgid "undefined associativity"
-msgstr ""
-
-#: src/closure.c:56
-#, c-format
-msgid "Closure: %s\n"
-msgstr ""
-
-#: src/closure.c:63
-#, fuzzy, c-format
-msgid "  (rule %d)\n"
-msgstr "   (regla %d)"
-
-#: src/closure.c:136
-msgid "RTC: Firsts Input"
-msgstr ""
-
-#: src/closure.c:139
-msgid "RTC: Firsts Output"
-msgstr ""
-
-#: src/closure.c:203
-msgid "input"
-msgstr ""
-
-#: src/closure.c:234
-msgid "output"
-msgstr ""
-
 #: src/complain.c:89 lib/error.c:128 lib/error.c:156
 msgid "Unknown system error"
 msgstr "Error del sistema desconocido"
@@ -352,35 +292,6 @@ msgstr "vac
 msgid "Grammar"
 msgstr "Gramática"
 
-#: src/gram.c:250
-msgid ""
-"Variables\n"
-"---------\n"
-"\n"
-msgstr ""
-
-#: src/gram.c:253
-msgid "Value  Sprec  Sassoc  Tag\n"
-msgstr ""
-
-#: src/gram.c:263
-msgid ""
-"Rules\n"
-"-----\n"
-"\n"
-msgstr ""
-
-#: src/gram.c:266
-msgid "Num (Prec, Assoc, Useful, Ritem Range) Lhs -> Rhs (Ritem range) [Num]\n"
-msgstr ""
-
-#: src/gram.c:292
-msgid ""
-"Rules interpreted\n"
-"-----------------\n"
-"\n"
-msgstr ""
-
 #: src/gram.c:321 src/reduce.c:302 src/reduce.c:392
 #, fuzzy
 msgid "warning"
@@ -391,29 +302,11 @@ msgstr "aviso: "
 msgid "too many gotos (max %d)"
 msgstr "demasiados gotos (máximo %d)"
 
-#: src/lalr.c:406
-msgid "Lookaheads: BEGIN\n"
-msgstr ""
-
-#: src/lalr.c:418
-#, c-format
-msgid "State %d: %d lookaheads\n"
-msgstr ""
-
-#: src/lalr.c:425
-#, c-format
-msgid "   on %d (%s) -> rule %d\n"
-msgstr ""
-
-#: src/lalr.c:430
-msgid "Lookaheads: END\n"
-msgstr ""
-
 #: src/main.c:117
 msgid "rule never reduced because of conflicts"
 msgstr ""
 
-#: src/parse-gram.y:344
+#: parse-gram.y:347
 msgid "POSIX forbids declarations in the grammar"
 msgstr ""
 
@@ -593,71 +486,62 @@ msgstr[1] "%d reglas sin uso"
 msgid "start symbol %s does not derive any sentence"
 msgstr "El símbolo de inicio (axioma) %s no deriva ninguna sentencia"
 
-#: src/relation.c:137
+#: scan-gram.l:202
-msgid "relation_transpose: input\n"
-msgstr ""
-
-#: src/relation.c:176
-msgid "relation_transpose: output\n"
-msgstr ""
-
-#: src/scan-gram.l:202
 #, c-format
 msgid ": invalid character: `%c'\n"
 msgstr ""
 
-#: src/scan-gram.l:246
+#: scan-gram.l:246
 #, fuzzy
 msgid ": unexpected end of file in a comment\n"
 msgstr "fin de fichero inesperado"
 
-#: src/scan-gram.l:274 src/scan-gram.l:412
+#: scan-gram.l:274 scan-gram.l:412
 #, fuzzy
 msgid ": unexpected end of file in a string\n"
 msgstr "fin de fichero inesperado"
 
-#: src/scan-gram.l:311 src/scan-gram.l:383
+#: scan-gram.l:311 scan-gram.l:383
 #, fuzzy
 msgid ": unexpected end of file in a character\n"
 msgstr "fin de fichero inesperado"
 
-#: src/scan-gram.l:332
+#: scan-gram.l:332
 #, fuzzy, c-format
 msgid ": invalid escape: %s\n"
 msgstr "valor no válido: %s%d"
 
-#: src/scan-gram.l:353
+#: scan-gram.l:353
 #, fuzzy, c-format
 msgid ": unrecognized escape: %s\n"
 msgstr "no reconocido: %s"
 
-#: src/scan-gram.l:473
+#: scan-gram.l:473
 #, fuzzy
 msgid ": unexpected end of file in a braced code\n"
 msgstr "fin de fichero inesperado"
 
-#: src/scan-gram.l:502
+#: scan-gram.l:502
 #, fuzzy
 msgid ": unexpected end of file in a prologue\n"
 msgstr "fin de fichero inesperado"
 
-#: src/scan-gram.l:560
+#: scan-gram.l:560
 #, c-format
 msgid "$$ of `%s' has no declared type"
 msgstr "$$ de `%s' no tiene tipo declarado"
 
-#: src/scan-gram.l:577 src/scan-gram.l:664
+#: scan-gram.l:577 scan-gram.l:664
 #, c-format
 msgid "invalid value: %s%d"
 msgstr "valor no válido: %s%d"
 
-#: src/scan-gram.l:584
+#: scan-gram.l:584
 #, c-format
 msgid "$%d of `%s' has no declared type"
 msgstr "$%d de `%s' no tiene tipo declarado"
 
-#: src/scan-gram.l:595 src/scan-gram.l:612 src/scan-gram.l:671
+#: scan-gram.l:595 scan-gram.l:612 scan-gram.l:671 scan-gram.l:688
-#: src/scan-gram.l:688
 #, c-format
 msgid "%s is invalid"
 msgstr "%s no es válido"
@@ -740,16 +624,6 @@ msgstr "el s
 msgid "the start symbol %s is a token"
 msgstr "el símbolo de inicio (axioma) %s es un terminal"
 
-#: src/tables.c:210
-#, c-format
-msgid "growing table and check from: %lu to %lu\n"
-msgstr ""
-
-#: src/tables.c:757
-#, c-format
-msgid "base_t too small to hold %d\n"
-msgstr ""
-
 #: lib/argmatch.c:161
 #, fuzzy, c-format
 msgid "invalid argument %s for %s"
@@ -985,6 +859,9 @@ msgstr ""
 #~ msgid "`%s' requires an argument"
 #~ msgstr "`%s' requiere un argumento"
 
+#~ msgid "   (rule %d)"
+#~ msgstr "   (regla %d)"
+
 #~ msgid "    %-4s\terror (nonassociative)\n"
 #~ msgstr "    %-4s\terror (no asociativo)\n"
 

po/et.po

@@ -4,76 +4,16 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: bison 1.49a\n"
+"Project-Id-Version: bison 1.49b\n"
-"POT-Creation-Date: 2002-08-11 00:16-0700\n"
+"POT-Creation-Date: 2002-09-27 16:50+0200\n"
-"PO-Revision-Date: 2002-05-02 12:45+0300\n"
+"PO-Revision-Date: 2002-08-13 01:35+0300\n"
-"Last-Translator: Toomas Soome <tsoome@ut.ee>\n"
+"Last-Translator: Toomas Soome <Toomas.Soome@microlink.ee>\n"
 "Language-Team: Estonian <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/LR0.c:63
-#, c-format
-msgid "state_list_append (state = %d, symbol = %d (%s))\n"
-msgstr ""
-
-#: src/LR0.c:181
-#, c-format
-msgid "Entering new_itemsets, state = %d\n"
-msgstr ""
-
-#: src/LR0.c:219
-#, c-format
-msgid "Entering get_state, symbol = %d (%s)\n"
-msgstr ""
-
-#: src/LR0.c:227
-#, fuzzy, c-format
-msgid "Exiting get_state => %d\n"
-msgstr "    %-4s\tliigu olekule %d\n"
-
-#: src/LR0.c:247
-#, c-format
-msgid "Entering append_states, state = %d\n"
-msgstr ""
-
-#: src/LR0.c:355
-#, c-format
-msgid "Processing state %d (reached by %s)\n"
-msgstr ""
-
-#: src/assoc.c:31
-msgid "undefined associativity"
-msgstr ""
-
-#: src/closure.c:56
-#, c-format
-msgid "Closure: %s\n"
-msgstr ""
-
-#: src/closure.c:63
-#, fuzzy, c-format
-msgid "  (rule %d)\n"
-msgstr "   (reegel %d)"
-
-#: src/closure.c:136
-msgid "RTC: Firsts Input"
-msgstr ""
-
-#: src/closure.c:139
-msgid "RTC: Firsts Output"
-msgstr ""
-
-#: src/closure.c:203
-msgid "input"
-msgstr ""
-
-#: src/closure.c:234
-msgid "output"
-msgstr ""
-
 #: src/complain.c:89 lib/error.c:128 lib/error.c:156
 msgid "Unknown system error"
 msgstr "Tundmatu süsteemi viga"
@@ -87,19 +27,19 @@ msgid "fatal error: "
 msgstr "fataalne viga: "
 
 #: src/conflicts.c:72
-#, fuzzy, c-format
+#, c-format
 msgid "    Conflict between rule %d and token %s resolved as shift"
-msgstr "Konflikt olekus %d reegli %d ja märgi %s vahel lahendatud, kui %s.\n"
+msgstr "    Konflikt reegli %d ja märgi %s vahel lahendatud nihkega"
 
 #: src/conflicts.c:80
-#, fuzzy, c-format
+#, c-format
 msgid "    Conflict between rule %d and token %s resolved as reduce"
-msgstr "Konflikt olekus %d reegli %d ja märgi %s vahel lahendatud, kui %s.\n"
+msgstr "    Konflikt reegli %d ja märgi %s vahel lahendatud redutseerimisega"
 
 #: src/conflicts.c:87
-#, fuzzy, c-format
+#, c-format
 msgid "    Conflict between rule %d and token %s resolved as an error"
-msgstr "Konflikt olekus %d reegli %d ja märgi %s vahel lahendatud, kui %s.\n"
+msgstr "    Konflikt reegli %d ja märgi %s vahel lahendatud veana"
 
 #: src/conflicts.c:402
 #, c-format
@@ -139,11 +79,11 @@ msgid "State %d contains "
 msgstr "Olek %d sisaldab "
 
 #: src/conflicts.c:537
-#, fuzzy, c-format
+#, c-format
 msgid "expected %d shift/reduce conflict"
 msgid_plural "expected %d shift/reduce conflicts"
-msgstr[0] "eeldasime %d nihutamine/redutseerimine konflikti\n"
+msgstr[0] "eeldasime %d nihutamine/redutseerimine konflikti"
-msgstr[1] "eeldasime %d nihutamine/redutseerimine konflikti\n"
+msgstr[1] "eeldasime %d nihutamine/redutseerimine konflikti"
 
 #: src/files.c:114
 #, c-format
@@ -204,7 +144,6 @@ msgstr ""
 "  -k, --token-table          lisa ka sümbolite nimede tabel\n"
 
 #: src/getargs.c:190
-#, fuzzy
 msgid ""
 "Output:\n"
 "  -d, --defines              also produce a header file\n"
@@ -217,7 +156,8 @@ msgid ""
 msgstr ""
 "Väljund:\n"
 "  -d, --defines              loo ka päisfail\n"
-"  -v, --verbose              väljasta automaadi kohta selgitusi\n"
+"  -r, --report=ASJAD         väljasta automaadi kohta selgitusi\n"
+"  -v, --verbose              sama, kui `--report=state'\n"
 "  -b, --file-prefix=PREFIKS  kasuta väljundfailide nimedes PREFIKSit\n"
 "  -o, --output-file=FAIL     jäta väljund FAILi\n"
 "  -g, --graph                loo automaadi kirjeldus VCG graafina\n"
@@ -232,6 +172,13 @@ msgid ""
 "  `all'          include all the above information\n"
 "  `none'         disable the report\n"
 msgstr ""
+"ASJAD on loend komadega eraldatud järgnevaid sõnu:\n"
+"  `state'        olekute kirjeldus\n"
+"  `itemset'      täienda põhilisi elemente nende sulunditega\n"
+"  `lookahead'    seo ettevaatamised elementidega\n"
+"  `solved'       kirjelda nihuta/redutseeri konfliktide lahendamisi\n"
+"  `all'          kogu ülaltoodud info\n"
+"  `none'         blokeeri raport\n"
 
 #: src/getargs.c:212
 msgid "Report bugs to <[email protected]>.\n"
@@ -282,70 +229,22 @@ msgstr "t
 msgid "Grammar"
 msgstr "Grammatika"
 
-#: src/gram.c:250
-msgid ""
-"Variables\n"
-"---------\n"
-"\n"
-msgstr ""
-
-#: src/gram.c:253
-msgid "Value  Sprec  Sassoc  Tag\n"
-msgstr ""
-
-#: src/gram.c:263
-msgid ""
-"Rules\n"
-"-----\n"
-"\n"
-msgstr ""
-
-#: src/gram.c:266
-msgid "Num (Prec, Assoc, Useful, Ritem Range) Lhs -> Rhs (Ritem range) [Num]\n"
-msgstr ""
-
-#: src/gram.c:292
-msgid ""
-"Rules interpreted\n"
-"-----------------\n"
-"\n"
-msgstr ""
-
 #: src/gram.c:321 src/reduce.c:302 src/reduce.c:392
-#, fuzzy
 msgid "warning"
-msgstr "hoiatus: "
+msgstr "hoiatus"
 
 #: src/lalr.c:91
 #, c-format
 msgid "too many gotos (max %d)"
-msgstr "liiga palju gotosid (maks %d)"
+msgstr "liiga palju gotosid (maks. %d)"
-
-#: src/lalr.c:406
-msgid "Lookaheads: BEGIN\n"
-msgstr ""
-
-#: src/lalr.c:418
-#, c-format
-msgid "State %d: %d lookaheads\n"
-msgstr ""
-
-#: src/lalr.c:425
-#, c-format
-msgid "   on %d (%s) -> rule %d\n"
-msgstr ""
-
-#: src/lalr.c:430
-msgid "Lookaheads: END\n"
-msgstr ""
 
 #: src/main.c:117
 msgid "rule never reduced because of conflicts"
-msgstr ""
+msgstr "reeglit ei redutseerita konfliktide tõttu kunagi"
 
-#: src/parse-gram.y:344
+#: parse-gram.y:347
 msgid "POSIX forbids declarations in the grammar"
-msgstr ""
+msgstr "POSIX keelab deklareerimised grammatikas"
 
 #: src/print.c:46
 #, c-format
@@ -353,32 +252,31 @@ msgid " type %d is %s\n"
 msgstr " tüüp %d on %s\n"
 
 #: src/print.c:162
-#, fuzzy, c-format
+#, c-format
 msgid "shift, and go to state %d\n"
-msgstr "    %-4s\tnihuta ja liigu olekule %d\n"
+msgstr "nihuta ja liigu olekule %d\n"
 
 #: src/print.c:164
-#, fuzzy, c-format
+#, c-format
 msgid "go to state %d\n"
-msgstr "    %-4s\tliigu olekule %d\n"
+msgstr "liigu olekule %d\n"
 
 #: src/print.c:201
-#, fuzzy
 msgid "error (nonassociative)\n"
-msgstr "    %-4s\tviga (mitteassotsiatiivne)\n"
+msgstr "viga (mitteassotsiatiivne)\n"
 
 #: src/print.c:290
-#, fuzzy, c-format
+#, c-format
 msgid "reduce using rule %d (%s)"
-msgstr "    %-4s\tredutseerin kasutades reeglit %d (%s)\n"
+msgstr "redutseerin kasutades reeglit %d (%s)"
 
 #: src/print.c:293
 msgid "accept"
-msgstr ""
+msgstr "nõustun"
 
 #: src/print.c:324 src/print.c:390
 msgid "$default"
-msgstr ""
+msgstr "$default"
 
 #: src/print.c:419
 #, c-format
@@ -387,11 +285,11 @@ msgstr "olek %d"
 
 #: src/print.c:453
 msgid "Terminals, with rules where they appear"
-msgstr "Terminalid, koos reeglitega, kus nad ilmuvad"
+msgstr "Terminalid, koos reeglitega kus nad ilmuvad"
 
 #: src/print.c:480
 msgid "Nonterminals, with rules where they appear"
-msgstr "Mitteterminalid, koos reeglitega, kus nad ilmuvad"
+msgstr "Mitteterminalid, koos reeglitega kus nad ilmuvad"
 
 #: src/print.c:509
 msgid " on left:"
@@ -402,9 +300,8 @@ msgid " on right:"
 msgstr " paremal:"
 
 #: src/print.c:552
-#, fuzzy
 msgid "Rules never reduced"
-msgstr "%d reegel ei redutseeru\n"
+msgstr "Mitteredutseeruvad reeglid"
 
 #: src/reader.c:52
 #, c-format
@@ -414,7 +311,7 @@ msgstr "korduvad %s deklaratsioonid"
 #: src/reader.c:141
 #, c-format
 msgid "result type clash on merge function %s: `%s' vs. `%s'"
-msgstr ""
+msgstr "tulemuse tüübikonflikt mestimise funktsioonis %s: `%s' versus `%s'"
 
 #: src/reader.c:239
 #, c-format
@@ -437,27 +334,27 @@ msgstr "kaks @prec
 #: src/reader.c:353
 #, c-format
 msgid "%%dprec affects only GLR parsers"
-msgstr ""
+msgstr "%%dprec puudutab ainult GLR parsereid"
 
 #: src/reader.c:355
 #, c-format
 msgid "%%dprec must be followed by positive number"
-msgstr ""
+msgstr "%%dprec järel peab olema positiivne number"
 
 #: src/reader.c:357
 #, c-format
 msgid "only one %%dprec allowed per rule"
-msgstr ""
+msgstr "reeglis on lubatud ainult üks %%dprec"
 
 #: src/reader.c:368
 #, c-format
 msgid "%%merge affects only GLR parsers"
-msgstr ""
+msgstr "%%merge puudutab ainult GLR parsereid"
 
 #: src/reader.c:370
 #, c-format
 msgid "only one %%merge allowed per rule"
-msgstr ""
+msgstr "reeglis on lubatud ainult üks %%merge"
 
 #: src/reader.c:513
 msgid "no rules in the input grammar"
@@ -469,29 +366,24 @@ msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "liiga palju sümboleid (märgid ja mitteterminalid); maksimaalne on %d"
 
 #: src/reduce.c:239
-#, fuzzy
 msgid "useless rule"
-msgstr "%d kasutamata reegel"
+msgstr "kasutamata reegel"
 
 #: src/reduce.c:302
-#, fuzzy
 msgid "useless nonterminal"
-msgstr "%d kasutamata mitteterminal"
+msgstr "kasutamata mitteterminal"
 
 #: src/reduce.c:349
-#, fuzzy
 msgid "Useless nonterminals"
-msgstr "Kasutamata mitteterminalid:"
+msgstr "Kasutamata mitteterminalid"
 
 #: src/reduce.c:362
-#, fuzzy
 msgid "Terminals which are not used"
-msgstr "Terminalid, mida ei kasutatud:"
+msgstr "Terminalid, mida ei kasutatud"
 
 #: src/reduce.c:371
-#, fuzzy
 msgid "Useless rules"
-msgstr "Kasutamata reeglid:"
+msgstr "Kasutamata reeglid"
 
 #: src/reduce.c:387
 #, c-format
@@ -519,75 +411,61 @@ msgstr[0] "%d kasutamata reegel"
 msgstr[1] "%d kasutamata reeglit"
 
 #: src/reduce.c:435
-#, fuzzy, c-format
+#, c-format
 msgid "start symbol %s does not derive any sentence"
-msgstr "Stardisümbolist %s ei tuletata ühtegi lauset"
+msgstr "stardisümbolist %s ei tuletata ühtegi lauset"
 
-#: src/relation.c:137
+#: scan-gram.l:202
-msgid "relation_transpose: input\n"
-msgstr ""
-
-#: src/relation.c:176
-msgid "relation_transpose: output\n"
-msgstr ""
-
-#: src/scan-gram.l:202
 #, c-format
 msgid ": invalid character: `%c'\n"
-msgstr ""
+msgstr ": vigane sümbol: `%c'\n"
 
-#: src/scan-gram.l:246
+#: scan-gram.l:246
-#, fuzzy
 msgid ": unexpected end of file in a comment\n"
-msgstr "ootamatu faililõpp"
+msgstr ": ootamatu faililõpp kommentaaris\n"
 
-#: src/scan-gram.l:274 src/scan-gram.l:412
+#: scan-gram.l:274 scan-gram.l:412
-#, fuzzy
 msgid ": unexpected end of file in a string\n"
-msgstr "ootamatu faililõpp"
+msgstr ": ootamatu faililõpp sõnes\n"
 
-#: src/scan-gram.l:311 src/scan-gram.l:383
+#: scan-gram.l:311 scan-gram.l:383
-#, fuzzy
 msgid ": unexpected end of file in a character\n"
-msgstr "ootamatu faililõpp"
+msgstr ": ootamatu faililõpp sümbolis\n"
 
-#: src/scan-gram.l:332
+#: scan-gram.l:332
-#, fuzzy, c-format
+#, c-format
 msgid ": invalid escape: %s\n"
-msgstr "vigane väärtus: %s%d"
+msgstr ": vigane paojada: %s\n"
 
-#: src/scan-gram.l:353
+#: scan-gram.l:353
-#, fuzzy, c-format
+#, c-format
 msgid ": unrecognized escape: %s\n"
-msgstr "tundmatu: %s"
+msgstr ": tundmatu paojada: %s\n"
 
-#: src/scan-gram.l:473
+#: scan-gram.l:473
-#, fuzzy
 msgid ": unexpected end of file in a braced code\n"
-msgstr "ootamatu faililõpp"
+msgstr ": ootamatu faililõpp sulgude vahelises koodis\n"
 
-#: src/scan-gram.l:502
+#: scan-gram.l:502
-#, fuzzy
 msgid ": unexpected end of file in a prologue\n"
-msgstr "ootamatu faililõpp"
+msgstr ": ootamatu faililõpp proloogis\n"
 
-#: src/scan-gram.l:560
+#: scan-gram.l:560
 #, c-format
 msgid "$$ of `%s' has no declared type"
 msgstr "`%s' $$ ei oma deklareeritud tüüpi"
 
-#: src/scan-gram.l:577 src/scan-gram.l:664
+#: scan-gram.l:577 scan-gram.l:664
 #, c-format
 msgid "invalid value: %s%d"
 msgstr "vigane väärtus: %s%d"
 
-#: src/scan-gram.l:584
+#: scan-gram.l:584
 #, c-format
 msgid "$%d of `%s' has no declared type"
 msgstr "$%d `%s' ei oma deklareeritud tüüpi"
 
-#: src/scan-gram.l:595 src/scan-gram.l:612 src/scan-gram.l:671
+#: scan-gram.l:595 scan-gram.l:612 scan-gram.l:671 scan-gram.l:688
-#: src/scan-gram.l:688
 #, c-format
 msgid "%s is invalid"
 msgstr "%s on vigane"
@@ -607,9 +485,9 @@ msgid "type redeclaration for %s"
 msgstr "%s tüübi uuesti deklareerimine"
 
 #: src/symtab.c:98 src/symtab.c:117
-#, fuzzy, c-format
+#, c-format
 msgid "%s redeclaration for %s"
-msgstr "%s tüübi uuesti deklareerimine"
+msgstr "%s uuesti deklareerimine %s jaoks"
 
 #: src/symtab.c:138
 #, c-format
@@ -622,9 +500,9 @@ msgid "symbol %s redefined"
 msgstr "sümbol %s on uuesti defineeritud"
 
 #: src/symtab.c:180
-#, fuzzy, c-format
+#, c-format
 msgid "redefining user token number of %s"
-msgstr "%s prioriteedi uus definitsioon"
+msgstr "%s kasutaja märgi numbri uuesti defineerimine"
 
 #: src/symtab.c:225
 #, c-format
@@ -649,9 +527,9 @@ msgid "conflicting precedences for %s and %s"
 msgstr "%s ja %s omavad konfliktseid prioriteete"
 
 #: src/symtab.c:293
-#, fuzzy, c-format
+#, c-format
 msgid "conflicting associativities for %s (%s) and %s (%s)"
-msgstr "%s ja %s omavad konfliktseid assotsiatiivseid väärtuseid"
+msgstr "%s (%s) ja %s (%s) omavad konfliktseid assotsiatiivseid väärtuseid"
 
 #: src/symtab.c:363
 #, c-format
@@ -668,93 +546,85 @@ msgstr "stardis
 msgid "the start symbol %s is a token"
 msgstr "stardisümbol %s on märk"
 
-#: src/tables.c:210
-#, c-format
-msgid "growing table and check from: %lu to %lu\n"
-msgstr ""
-
-#: src/tables.c:757
-#, c-format
-msgid "base_t too small to hold %d\n"
-msgstr ""
-
 #: lib/argmatch.c:161
-#, fuzzy, c-format
+#, c-format
 msgid "invalid argument %s for %s"
-msgstr "vigane väärtus: %s%d"
+msgstr "vigane argument %s %s'le"
 
 #: lib/argmatch.c:162
 #, c-format
 msgid "ambiguous argument %s for %s"
-msgstr ""
+msgstr "segane argument %s %s'le"
 
 #: lib/argmatch.c:181
 msgid "Valid arguments are:"
-msgstr ""
+msgstr "Lubatud argumendid on:"
 
 #: lib/bitset_stats.c:226
 #, c-format
 msgid "%d bitset_allocs, %d freed (%.2f%%).\n"
-msgstr ""
+msgstr "%d bitset_allocs, %d vabastatud (%.2f%%).\n"
 
 #: lib/bitset_stats.c:229
 #, c-format
 msgid "%d bitset_sets, %d cached (%.2f%%)\n"
-msgstr ""
+msgstr "%d bitset_sets, %d puhverdatud (%.2f%%)\n"
 
 #: lib/bitset_stats.c:232
 #, c-format
 msgid "%d bitset_resets, %d cached (%.2f%%)\n"
-msgstr ""
+msgstr "%d bitset_resets, %d puhverdatud (%.2f%%)\n"
 
 #: lib/bitset_stats.c:235
 #, c-format
 msgid "%d bitset_tests, %d cached (%.2f%%)\n"
-msgstr ""
+msgstr "%d bitset_tests, %d puhverdatud (%.2f%%)\n"
 
 #: lib/bitset_stats.c:239
 #, c-format
 msgid "%d bitset_lists\n"
-msgstr ""
+msgstr "%d bitset_lists\n"
 
 #: lib/bitset_stats.c:241
 msgid "count log histogram\n"
-msgstr ""
+msgstr "loenduri logi histogramm\n"
 
 #: lib/bitset_stats.c:244
 msgid "size log histogram\n"
-msgstr ""
+msgstr "suuruste logi histogramm\n"
 
 #: lib/bitset_stats.c:247
 msgid "density histogram\n"
-msgstr ""
+msgstr "tiheduse histogramm\n"
 
 #: lib/bitset_stats.c:264
 msgid ""
 "Bitset statistics:\n"
 "\n"
 msgstr ""
+"Bitset statistika:\n"
+"\n"
 
 #: lib/bitset_stats.c:267
 #, c-format
 msgid "Accumulated runs = %d\n"
-msgstr ""
+msgstr "Salvestatud läbimisi = %d\n"
 
 #: lib/bitset_stats.c:311
 msgid "Could not read stats file."
-msgstr ""
+msgstr "Statistika faili ei saa lugeda."
 
 #: lib/bitset_stats.c:313
 msgid "Bad stats file size.\n"
-msgstr ""
+msgstr "Vigane statistika faili suurus.\n"
 
 #: lib/bitset_stats.c:339
 msgid "Could not write stats file."
-msgstr ""
+msgstr "Statistika faili ei saa kirjutada."
 
 #: lib/bitset_stats.c:343
 msgid "Could not open stats file for writing."
-msgstr ""
+msgstr "Statistika faili ei saa kirjutamiseks avada."
 
 #: lib/getopt.c:662
 #, c-format
@@ -828,157 +698,112 @@ msgid ""
 "\n"
 "Execution times (seconds)\n"
 msgstr ""
+"\n"
+"Täitmise ajad (sekundites)\n"
 
 #: lib/timevar.c:516
 msgid " TOTAL                 :"
-msgstr ""
+msgstr " KOKKU                 :"
 
 #: lib/timevar.c:552
 #, c-format
 msgid "time in %s: %ld.%06ld (%ld%%)\n"
-msgstr ""
+msgstr "aeg %s: %ld.%06ld (%ld%%)\n"
 
-#~ msgid "reduce"
+#~ msgid "state_list_append (state = %d, symbol = %d (%s))\n"
-#~ msgstr "redutseerimine"
+#~ msgstr "state_list_append (olek = %d, sümbol = %d (%s))\n"
 
-#~ msgid "shift"
+#~ msgid "Entering new_itemsets, state = %d\n"
-#~ msgstr "nihutamine"
+#~ msgstr "Sisenen new_itemsets, olek = %d\n"
 
-#~ msgid "an error"
+#~ msgid "Entering get_state, symbol = %d (%s)\n"
-#~ msgstr "viga"
+#~ msgstr "Sisenen get_state, szmbol = %d (%s)\n"
 
-#~ msgid "%s contains "
+#~ msgid "Exiting get_state => %d\n"
-#~ msgstr "%s sisaldab "
+#~ msgstr "Väljun get_state => %d\n"
 
-#~ msgid "`%s' is no longer supported"
+#~ msgid "Entering append_states, state = %d\n"
-#~ msgstr "`%s' ei ole enam toetatud"
+#~ msgstr "Sisenen append_states, olek = %d\n"
 
-#~ msgid "unexpected `/' found and ignored"
+#~ msgid "Processing state %d (reached by %s)\n"
-#~ msgstr "leidsin ja ignoreerin ootamatu `/'"
+#~ msgstr "Töötlen olekut %d (olekust %s)\n"
 
-#~ msgid "unterminated comment"
+#~ msgid "undefined associativity"
-#~ msgstr "lõpetamata kommentaar"
+#~ msgstr "defineerimata assotsiatiivsus"
 
-#~ msgid "unescaped newline in constant"
+#~ msgid "Closure: %s\n"
-#~ msgstr "paojadata reavahetus konstandis"
+#~ msgstr "Sulund: %s\n"
 
-#~ msgid "octal value outside range 0...255: `\\%o'"
+#~ msgid "  (rule %d)\n"
-#~ msgstr "kaheksandväärtus väljaspool piire 0...255: `\\%o'"
+#~ msgstr "  (reegel %d)\n"
 
-#~ msgid "hexadecimal value above 255: `\\x%x'"
+#~ msgid "RTC: Firsts Input"
-#~ msgstr "kuueteistkümnendväärtus  suurem, kui above 255: `\\x%x'"
+#~ msgstr "RTC: Firsts Sisend"
 
-#~ msgid "unknown escape sequence: `\\' followed by `%s'"
+#~ msgid "RTC: Firsts Output"
-#~ msgstr "tundmatu paojada: `\\' järgneb `%s'"
+#~ msgstr "RTC: Firsts Väljund"
 
-#~ msgid "unterminated type name at end of file"
+#~ msgid "input"
-#~ msgstr "lõpetamata tüübinimi faili lõpus"
+#~ msgstr "sisend"
 
-#~ msgid "unterminated type name"
+#~ msgid "output"
-#~ msgstr "lõpetamata tüübinimi"
+#~ msgstr "väljund"
-
-#~ msgid "use \"...\" for multi-character literal tokens"
-#~ msgstr "kasuta mitmesümboliliste literaalidega \"...\" konstruktsiooni"
-
-#~ msgid "`%s' supports no argument: %s"
-#~ msgstr "`%s' ei toeta argumente: %s"
-
-#~ msgid "`%s' requires an argument"
-#~ msgstr "võti `%s' nõuab argumenti"
 
 #~ msgid ""
-#~ "    $default\treduce using rule %d (%s)\n"
+#~ "Variables\n"
+#~ "---------\n"
 #~ "\n"
 #~ msgstr ""
-#~ "    $default\tredutseerin kasutades reeglit %d (%s)\n"
+#~ "Muutujad\n"
+#~ "--------\n"
 #~ "\n"
 
-#~ msgid "    %-4s\t[reduce using rule %d (%s)]\n"
+#~ msgid "Value  Sprec  Sassoc  Tag\n"
-#~ msgstr "    %-4s\t[redutseerin, kasutades reeglit %d (%s)]\n"
+#~ msgstr "Väärtus  Sprec  Sassoc  Märk\n"
 
-#~ msgid "    $default\treduce using rule %d (%s)\n"
+#~ msgid ""
-#~ msgstr "    $default\tredutseerin kasutades reeglit %d (%s)\n"
+#~ "Rules\n"
+#~ "-----\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Reeglid\n"
+#~ "-------\n"
+#~ "\n"
 
-#~ msgid "    $default\taccept\n"
+#~ msgid ""
-#~ msgstr "    $default\taktsepteerin\n"
+#~ "Num (Prec, Assoc, Useful, Ritem Range) Lhs -> Rhs (Ritem range) [Num]\n"
+#~ msgstr ""
+#~ "Num (Prec, Assoc, Useful, Ritem Range) Lhs -> Rhs (Ritem range) [Num]\n"
 
-#~ msgid "    NO ACTIONS\n"
+#~ msgid ""
-#~ msgstr "    TEGEVUSI POLE\n"
+#~ "Rules interpreted\n"
+#~ "-----------------\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Interpreteeritud reeglid\n"
+#~ "------------------------\n"
+#~ "\n"
 
-#~ msgid "Number, Line, Rule"
+#~ msgid "Lookaheads: BEGIN\n"
-#~ msgstr "Number, rida, reegel"
+#~ msgstr "Ettevaatamine: ALGUS\n"
 
-#~ msgid "  %3d %3d %s ->"
+#~ msgid "State %d: %d lookaheads\n"
-#~ msgstr "  %3d %3d %s ->"
+#~ msgstr "Olek %d: %d ettevaatamist\n"
 
-#~ msgid "   Skipping to next \\n"
+#~ msgid "   on %d (%s) -> rule %d\n"
-#~ msgstr "   Liigun järgmisele \\n"
+#~ msgstr "   %d (%s) -> reegel %d\n"
 
-#~ msgid "   Skipping to next %c"
+#~ msgid "Lookaheads: END\n"
-#~ msgstr "   Liigun järgmisele %c"
+#~ msgstr "Ettevaatamine: LÕPP\n"
 
-#~ msgid "unterminated string at end of file"
+#~ msgid "relation_transpose: input\n"
-#~ msgstr "lõpetamata sõne faili lõpus"
+#~ msgstr "relation_transpose: sisend\n"
 
-#~ msgid "unterminated string"
+#~ msgid "relation_transpose: output\n"
-#~ msgstr "lõpetamata sõne"
+#~ msgstr "relation_transpose: väljund\n"
 
-#~ msgid "unterminated `%{' definition"
+#~ msgid "growing table and check from: %lu to %lu\n"
-#~ msgstr "lõpetamata `%{' definitsioon"
+#~ msgstr "kasvatan table ja check suuruselt: %lu suurusele %lu\n"
 
-#~ msgid "Premature EOF after %s"
+#~ msgid "base_t too small to hold %d\n"
-#~ msgstr "Enneaegne EOF peale %s"
+#~ msgstr "base_t on liiga väike hoidmaks %d\n"
-
-#~ msgid "`%s' is invalid in %s"
-#~ msgstr "`%s' ei ole %s sees lubatud"
-
-#~ msgid "invalid %s declaration"
-#~ msgstr "vigane %s deklaratsioon"
-
-#~ msgid "%type declaration has no <typename>"
-#~ msgstr "%type deklaratsioonis puudub <tüübinimi>"
-
-#~ msgid "invalid %%type declaration due to item: %s"
-#~ msgstr "vigane %%type deklaratsioon, element: %s"
-
-#~ msgid "invalid text (%s) - number should be after identifier"
-#~ msgstr "vigane tekst (%s) - number peab olema peale identifikaatorit"
-
-#~ msgid "unexpected item: %s"
-#~ msgstr "ootamatu element: %s"
-
-#~ msgid "unmatched %s"
-#~ msgstr "puudub %s"
-
-#~ msgid "argument of %%expect is not an integer"
-#~ msgstr "%%expect argument ei ole täisarv"
-
-#~ msgid "unrecognized item %s, expected an identifier"
-#~ msgstr "tundmatu element %s, eeldasin identifikaatorit"
-
-#~ msgid "expected string constant instead of %s"
-#~ msgstr "eeldasin %s asemel sõnekonstanti"
-
-#~ msgid "no input grammar"
-#~ msgstr "sisendgrammatikat pole"
-
-#~ msgid "unknown character: %s"
-#~ msgstr "tundmatu sümbol: %s"
-
-#~ msgid "ill-formed rule: initial symbol not followed by colon"
-#~ msgstr "vigaselt formeeritud reegel: algsümbolile ei järgne koolonit"
-
-#~ msgid "grammar starts with vertical bar"
-#~ msgstr "grammatika algab püstkriipsuga"
-
-#~ msgid "previous rule lacks an ending `;'"
-#~ msgstr "eelmisel reeglil puudub lõpetav `;'"
-
-#~ msgid "%%guard present but %%semantic_parser not specified"
-#~ msgstr "%%guard on määratud, aga %%semantic_parser ei ole"
-
-#~ msgid "two actions at end of one rule"
-#~ msgstr "kaks tegevust ühe reegli lõpus"
-
-#~ msgid "invalid input: %s"
-#~ msgstr "vigane sisend: %s"

po/fr.po

@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU bison 1.49a\n"
+"Project-Id-Version: GNU bison 1.49b\n"
-"POT-Creation-Date: 2002-08-11 00:16-0700\n"
+"POT-Creation-Date: 2002-09-27 16:50+0200\n"
-"PO-Revision-Date: 2002-08-06 08:00-0500\n"
+"PO-Revision-Date: 2002-08-12 12:00-0500\n"
 "Last-Translator: Michel Robitaille <[email protected]>\n"
 "Language-Team: French <[email protected]>\n"
 "MIME-Version: 1.0\n"
@@ -15,66 +15,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/LR0.c:63
-#, c-format
-msgid "state_list_append (state = %d, symbol = %d (%s))\n"
-msgstr ""
-
-#: src/LR0.c:181
-#, c-format
-msgid "Entering new_itemsets, state = %d\n"
-msgstr ""
-
-#: src/LR0.c:219
-#, c-format
-msgid "Entering get_state, symbol = %d (%s)\n"
-msgstr ""
-
-#: src/LR0.c:227
-#, fuzzy, c-format
-msgid "Exiting get_state => %d\n"
-msgstr "    %-4s\taller à l'état %d\n"
-
-#: src/LR0.c:247
-#, c-format
-msgid "Entering append_states, state = %d\n"
-msgstr ""
-
-#: src/LR0.c:355
-#, c-format
-msgid "Processing state %d (reached by %s)\n"
-msgstr ""
-
-#: src/assoc.c:31
-msgid "undefined associativity"
-msgstr ""
-
-#: src/closure.c:56
-#, fuzzy, c-format
-msgid "Closure: %s\n"
-msgstr "erreur: %s\n"
-
-#: src/closure.c:63
-#, fuzzy, c-format
-msgid "  (rule %d)\n"
-msgstr "   (règle %d)"
-
-#: src/closure.c:136
-msgid "RTC: Firsts Input"
-msgstr ""
-
-#: src/closure.c:139
-msgid "RTC: Firsts Output"
-msgstr ""
-
-#: src/closure.c:203
-msgid "input"
-msgstr ""
-
-#: src/closure.c:234
-msgid "output"
-msgstr ""
-
 #: src/complain.c:89 lib/error.c:128 lib/error.c:156
 msgid "Unknown system error"
 msgstr "Erreur système inconnue"
@@ -88,22 +28,19 @@ msgid "fatal error: "
 msgstr "erreur fatale: "
 
 #: src/conflicts.c:72
-#, fuzzy, c-format
+#, c-format
 msgid "    Conflict between rule %d and token %s resolved as shift"
-msgstr ""
+msgstr "Conflit entre la règle %d et le jeton %s résolu par décalage"
-"Conflit à l'état %d entre la règle %d et le terminal %s résolu par %s.\n"
 
 #: src/conflicts.c:80
-#, fuzzy, c-format
+#, c-format
 msgid "    Conflict between rule %d and token %s resolved as reduce"
-msgstr ""
+msgstr "Conflit entre la règle %d et le jeton %s résolu par réduction"
-"Conflit à l'état %d entre la règle %d et le terminal %s résolu par %s.\n"
 
 #: src/conflicts.c:87
-#, fuzzy, c-format
+#, c-format
 msgid "    Conflict between rule %d and token %s resolved as an error"
-msgstr ""
+msgstr "Conflit entre la règle %d et le jeton %s résolu comme étant une erreur"
-"Conflit à l'état %d entre la règle %d et le terminal %s résolu par %s.\n"
 
 #: src/conflicts.c:402
 #, c-format
@@ -143,11 +80,11 @@ msgid "State %d contains "
 msgstr "L'état %d contient "
 
 #: src/conflicts.c:537
-#, fuzzy, c-format
+#, c-format
 msgid "expected %d shift/reduce conflict"
 msgid_plural "expected %d shift/reduce conflicts"
-msgstr[0] "attendait %d conflit par décalage/réduction\n"
+msgstr[0] "attendait %d conflit par décalage/réduction"
-msgstr[1] "attendait %d conflits par décalage/réduction\n"
+msgstr[1] "attendait %d conflits par décalage/réduction"
 
 #: src/files.c:114
 #, c-format
@@ -211,7 +148,6 @@ msgstr ""
 "  -k, --token-table          inclure la table des noms de jetons\n"
 
 #: src/getargs.c:190
-#, fuzzy
 msgid ""
 "Output:\n"
 "  -d, --defines              also produce a header file\n"
@@ -224,6 +160,7 @@ msgid ""
 msgstr ""
 "Sortie:\n"
 "  -d, --defines              produire un fichier d'en-tête\n"
+"  -r, --report=CHOSES        générer les détails concernant l'automate\n"
 "  -v, --verbose              produire une explication de l'automate\n"
 "  -b, --file-prefix=PREFIXE  utiliser le PREFIXE pour le fichier de sortie\n"
 "  -o, --output=FICHIER       produire la sortie dans le FICHIER\n"
@@ -240,6 +177,13 @@ msgid ""
 "  `all'          include all the above information\n"
 "  `none'         disable the report\n"
 msgstr ""
+"CHOSES est une liste de mots séparés par des virgules par les suivants:\n"
+"  `state'        description des états\n"
+"  `itemset'      compléter le corps du jeu d'items avec leur fermeture\n"
+"  `lookahead'    explicitement associé les lookahead aux items\n"
+"  `solved'       décrirer la résolution des conflits décalage/réduction\n"
+"  `all'          inclure toutes les informations ci-haut\n"
+"  `none'         désactiver la génération de rapport\n"
 
 #: src/getargs.c:212
 msgid "Report bugs to <[email protected]>.\n"
@@ -291,81 +235,22 @@ msgstr "vide"
 msgid "Grammar"
 msgstr "Grammaire"
 
-#: src/gram.c:250
-msgid ""
-"Variables\n"
-"---------\n"
-"\n"
-msgstr ""
-"Variables\n"
-"---------\n"
-"\n"
-
-#: src/gram.c:253
-#, fuzzy
-msgid "Value  Sprec  Sassoc  Tag\n"
-msgstr "Valeur Spréc    Sassoc    Tag\n"
-
-#: src/gram.c:263
-msgid ""
-"Rules\n"
-"-----\n"
-"\n"
-msgstr ""
-"Règles\n"
-"------\n"
-"\n"
-
-#: src/gram.c:266
-msgid "Num (Prec, Assoc, Useful, Ritem Range) Lhs -> Rhs (Ritem range) [Num]\n"
-msgstr ""
-
-#: src/gram.c:292
-msgid ""
-"Rules interpreted\n"
-"-----------------\n"
-"\n"
-msgstr ""
-"Règles interprétées\n"
-"-------------------\n"
-"\n"
-
 #: src/gram.c:321 src/reduce.c:302 src/reduce.c:392
-#, fuzzy
 msgid "warning"
-msgstr "AVERTISSEMENT: "
+msgstr "AVERTISSEMENT"
 
 #: src/lalr.c:91
 #, c-format
 msgid "too many gotos (max %d)"
 msgstr "nombre trop grand de « goto » (Max %d)"
 
-#: src/lalr.c:406
-msgid "Lookaheads: BEGIN\n"
-msgstr ""
-
-#: src/lalr.c:418
-#, c-format
-msgid "State %d: %d lookaheads\n"
-msgstr ""
-
-#: src/lalr.c:425
-#, c-format
-msgid "   on %d (%s) -> rule %d\n"
-msgstr ""
-
-#: src/lalr.c:430
-msgid "Lookaheads: END\n"
-msgstr ""
-
 #: src/main.c:117
-#, fuzzy
 msgid "rule never reduced because of conflicts"
-msgstr "1 conflit réduction/réduction"
+msgstr "la règle n'a jamais fait de réduction en raison des conflits"
 
-#: src/parse-gram.y:344
+#: parse-gram.y:347
 msgid "POSIX forbids declarations in the grammar"
-msgstr ""
+msgstr "POSIX interdit les déclaration dans la grammaire"
 
 #: src/print.c:46
 #, c-format
@@ -373,32 +258,31 @@ msgid " type %d is %s\n"
 msgstr " le type %d est %s\n"
 
 #: src/print.c:162
-#, fuzzy, c-format
+#, c-format
 msgid "shift, and go to state %d\n"
-msgstr "    %-4s\tdécalage et aller à l'état %d\n"
+msgstr "décalage et aller à l'état %d\n"
 
 #: src/print.c:164
-#, fuzzy, c-format
+#, c-format
 msgid "go to state %d\n"
-msgstr "    %-4s\taller à l'état %d\n"
+msgstr "aller à l'état %d\n"
 
 #: src/print.c:201
-#, fuzzy
 msgid "error (nonassociative)\n"
-msgstr "%-4s\terreur (non-associatif)"
+msgstr "erreur (non-associative)\n"
 
 #: src/print.c:290
-#, fuzzy, c-format
+#, c-format
 msgid "reduce using rule %d (%s)"
-msgstr "$défaut\tréduction par la règle %d (%s)"
+msgstr "réduction par utilisation de la règle %d (%s)"
 
 #: src/print.c:293
 msgid "accept"
-msgstr ""
+msgstr "accepter"
 
 #: src/print.c:324 src/print.c:390
 msgid "$default"
-msgstr ""
+msgstr "$défaut"
 
 #: src/print.c:419
 #, c-format
@@ -422,19 +306,19 @@ msgid " on right:"
 msgstr " à droite:"
 
 #: src/print.c:552
-#, fuzzy
 msgid "Rules never reduced"
-msgstr "%d règle n'a jamais été réduite\n"
+msgstr "Règles jamais réduites"
 
 #: src/reader.c:52
 #, c-format
 msgid "multiple %s declarations"
-msgstr "multiples déclarations %s"
+msgstr "déclarations multiples de %s"
 
 #: src/reader.c:141
 #, c-format
 msgid "result type clash on merge function %s: `%s' vs. `%s'"
 msgstr ""
+"conflit dans le type résultant de la fonction de fusion %s: « %s » vs « %s »"
 
 #: src/reader.c:239
 #, c-format
@@ -457,27 +341,27 @@ msgstr "deux @prec de suite"
 #: src/reader.c:353
 #, c-format
 msgid "%%dprec affects only GLR parsers"
-msgstr ""
+msgstr "%%dprec affecte seulement les analyseurs GLR"
 
 #: src/reader.c:355
 #, c-format
 msgid "%%dprec must be followed by positive number"
-msgstr ""
+msgstr "%%dprec doit être suivi d'un nombre positif"
 
 #: src/reader.c:357
 #, c-format
 msgid "only one %%dprec allowed per rule"
-msgstr ""
+msgstr "seul un %%dprec est permis par règle"
 
 #: src/reader.c:368
 #, c-format
 msgid "%%merge affects only GLR parsers"
-msgstr ""
+msgstr "%%merge affecte seulement les analyseurs GLR"
 
 #: src/reader.c:370
 #, c-format
 msgid "only one %%merge allowed per rule"
-msgstr ""
+msgstr "seul un %%merge est permis par règle"
 
 #: src/reader.c:513
 msgid "no rules in the input grammar"
@@ -489,29 +373,24 @@ msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "trop de symboles (jeton plus non terminaux); maximum %d"
 
 #: src/reduce.c:239
-#, fuzzy
 msgid "useless rule"
-msgstr "%d règle inutilisable"
+msgstr "règle inutilisable"
 
 #: src/reduce.c:302
-#, fuzzy
 msgid "useless nonterminal"
-msgstr "%d nonterminal inutilisable"
+msgstr "non-terminal inutilisable"
 
 #: src/reduce.c:349
-#, fuzzy
 msgid "Useless nonterminals"
-msgstr "Non-terminaux inutiles:"
+msgstr "Non-terminaux inutiles"
 
 #: src/reduce.c:362
-#, fuzzy
 msgid "Terminals which are not used"
-msgstr "Terminaux non utilisés:"
+msgstr "Terminaux qui ne sont utilisés"
 
 #: src/reduce.c:371
-#, fuzzy
 msgid "Useless rules"
-msgstr "Règles inutiles:"
+msgstr "Règles inutiles"
 
 #: src/reduce.c:387
 #, c-format
@@ -539,75 +418,62 @@ msgstr[0] "%d r
 msgstr[1] "%d règles inutilisables"
 
 #: src/reduce.c:435
-#, fuzzy, c-format
+#, 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/relation.c:137
-msgid "relation_transpose: input\n"
 msgstr ""
+"symbole de départ %s peut permettre la dérivation de n'importe quelle phrase"
 
-#: src/relation.c:176
+#: scan-gram.l:202
-msgid "relation_transpose: output\n"
-msgstr ""
-
-#: src/scan-gram.l:202
 #, c-format
 msgid ": invalid character: `%c'\n"
-msgstr ""
+msgstr ": caractère invalide: `%c'\n"
 
-#: src/scan-gram.l:246
+#: scan-gram.l:246
-#, fuzzy
 msgid ": unexpected end of file in a comment\n"
-msgstr "Fin de fichier inattendue"
+msgstr ": fin de fichier inattendue dans un commentaire\n"
 
-#: src/scan-gram.l:274 src/scan-gram.l:412
+#: scan-gram.l:274 scan-gram.l:412
-#, fuzzy
 msgid ": unexpected end of file in a string\n"
-msgstr "Fin de fichier inattendue"
+msgstr ": fin de fichier inattendue dans une chaîne\n"
 
-#: src/scan-gram.l:311 src/scan-gram.l:383
+#: scan-gram.l:311 scan-gram.l:383
-#, fuzzy
 msgid ": unexpected end of file in a character\n"
-msgstr "Fin de fichier inattendue"
+msgstr ": fin de fichier inattendue dans un caractère\n"
 
-#: src/scan-gram.l:332
+#: scan-gram.l:332
-#, fuzzy, c-format
+#, c-format
 msgid ": invalid escape: %s\n"
-msgstr "valeur invalide: %s%d"
+msgstr ": séquence d'échappement invalide: %s\n"
 
-#: src/scan-gram.l:353
+#: scan-gram.l:353
-#, fuzzy, c-format
+#, c-format
 msgid ": unrecognized escape: %s\n"
-msgstr "non reconnu: %s"
+msgstr ": séquence d'échappement non reconnue: %s\n"
 
-#: src/scan-gram.l:473
+#: scan-gram.l:473
-#, fuzzy
 msgid ": unexpected end of file in a braced code\n"
-msgstr "Fin de fichier inattendue"
+msgstr ": fin de fichier inattendue dans du code entre accolades\n"
 
-#: src/scan-gram.l:502
+#: scan-gram.l:502
-#, fuzzy
 msgid ": unexpected end of file in a prologue\n"
-msgstr "Fin de fichier inattendue"
+msgstr ": fin de fichier inattendue dans un prologue\n"
 
-#: src/scan-gram.l:560
+#: scan-gram.l:560
 #, c-format
 msgid "$$ of `%s' has no declared type"
 msgstr "$$ de « %s » n'a pas son type déclaré"
 
-#: src/scan-gram.l:577 src/scan-gram.l:664
+#: scan-gram.l:577 scan-gram.l:664
 #, c-format
 msgid "invalid value: %s%d"
 msgstr "valeur invalide: %s%d"
 
-#: src/scan-gram.l:584
+#: scan-gram.l:584
 #, c-format
 msgid "$%d of `%s' has no declared type"
 msgstr "$%d de « %s » n'a pas de type déclaré"
 
-#: src/scan-gram.l:595 src/scan-gram.l:612 src/scan-gram.l:671
+#: scan-gram.l:595 scan-gram.l:612 scan-gram.l:671 scan-gram.l:688
-#: src/scan-gram.l:688
 #, c-format
 msgid "%s is invalid"
 msgstr "%s n'est pas valide"
@@ -627,9 +493,9 @@ msgid "type redeclaration for %s"
 msgstr "redéclaration du type de %s"
 
 #: src/symtab.c:98 src/symtab.c:117
-#, fuzzy, c-format
+#, c-format
 msgid "%s redeclaration for %s"
-msgstr "redéclaration du type de %s"
+msgstr "redéclaration de %s pour %s"
 
 #: src/symtab.c:138
 #, c-format
@@ -642,9 +508,9 @@ msgid "symbol %s redefined"
 msgstr "symbole %s redéfini"
 
 #: src/symtab.c:180
-#, fuzzy, c-format
+#, c-format
 msgid "redefining user token number of %s"
-msgstr "redéfinition du niveau de priorité de %s"
+msgstr "redéfinition du jeton usager numéro de %s"
 
 #: src/symtab.c:225
 #, c-format
@@ -669,9 +535,9 @@ msgid "conflicting precedences for %s and %s"
 msgstr "les priorités pour %s et %s entrent en conflit"
 
 #: src/symtab.c:293
-#, fuzzy, c-format
+#, c-format
 msgid "conflicting associativities for %s (%s) and %s (%s)"
-msgstr "les valeurs d'association de %s et %s entrent en conflit"
+msgstr "conflits d'associativités pour %s (%s) et %s (%s)"
 
 #: src/symtab.c:363
 #, c-format
@@ -688,93 +554,85 @@ msgstr "le symbole de d
 msgid "the start symbol %s is a token"
 msgstr "le symbole de départ %s est un terminal"
 
-#: src/tables.c:210
-#, c-format
-msgid "growing table and check from: %lu to %lu\n"
-msgstr ""
-
-#: src/tables.c:757
-#, c-format
-msgid "base_t too small to hold %d\n"
-msgstr ""
-
 #: lib/argmatch.c:161
-#, fuzzy, c-format
+#, c-format
 msgid "invalid argument %s for %s"
-msgstr "valeur invalide: %s%d"
+msgstr "argument invalide %s pour %s"
 
 #: lib/argmatch.c:162
 #, c-format
 msgid "ambiguous argument %s for %s"
-msgstr ""
+msgstr "argument ambiguë %s pour %s"
 
 #: lib/argmatch.c:181
 msgid "Valid arguments are:"
-msgstr ""
+msgstr "Arguments valides sont:"
 
 #: lib/bitset_stats.c:226
 #, c-format
 msgid "%d bitset_allocs, %d freed (%.2f%%).\n"
-msgstr ""
+msgstr "%d bitset_allocs, %d libérés (%.2f%%).\n"
 
 #: lib/bitset_stats.c:229
 #, c-format
 msgid "%d bitset_sets, %d cached (%.2f%%)\n"
-msgstr ""
+msgstr "%d bitset_sets, %d dans la cache (%.2f%%)\n"
 
 #: lib/bitset_stats.c:232
 #, c-format
 msgid "%d bitset_resets, %d cached (%.2f%%)\n"
-msgstr ""
+msgstr "%d bitset_resets, %d dans la cache (%.2f%%)\n"
 
 #: lib/bitset_stats.c:235
 #, c-format
 msgid "%d bitset_tests, %d cached (%.2f%%)\n"
-msgstr ""
+msgstr "%d bitset_tests, %d dans la cache (%.2f%%)\n"
 
 #: lib/bitset_stats.c:239
 #, c-format
 msgid "%d bitset_lists\n"
-msgstr ""
+msgstr "%d bitset_lists\n"
 
 #: lib/bitset_stats.c:241
 msgid "count log histogram\n"
-msgstr ""
+msgstr "histogramme des compteurs\n"
 
 #: lib/bitset_stats.c:244
 msgid "size log histogram\n"
-msgstr ""
+msgstr "taille de l'histogramme des compteurs\n"
 
 #: lib/bitset_stats.c:247
 msgid "density histogram\n"
-msgstr ""
+msgstr "densité de l'histogramme\n"
 
 #: lib/bitset_stats.c:264
 msgid ""
 "Bitset statistics:\n"
 "\n"
 msgstr ""
+"Statistiques des bitset:\n"
+"\n"
 
 #: lib/bitset_stats.c:267
 #, c-format
 msgid "Accumulated runs = %d\n"
-msgstr ""
+msgstr "Exécutions accumulées = %d\n"
 
 #: lib/bitset_stats.c:311
 msgid "Could not read stats file."
-msgstr ""
+msgstr "Ne peut lire le fichier de stats."
 
 #: lib/bitset_stats.c:313
 msgid "Bad stats file size.\n"
-msgstr ""
+msgstr "Taille erronée du fichier de stats.\n"
 
 #: lib/bitset_stats.c:339
 msgid "Could not write stats file."
-msgstr ""
+msgstr "Ne peut écrire le fichier de stats."
 
 #: lib/bitset_stats.c:343
 msgid "Could not open stats file for writing."
-msgstr ""
+msgstr "Ne ouvrir en écriture le fichier de stats."
 
 #: lib/getopt.c:662
 #, c-format
@@ -848,15 +706,116 @@ msgid ""
 "\n"
 "Execution times (seconds)\n"
 msgstr ""
+"\n"
+"Temps d'exécution (secondes)\n"
 
 #: lib/timevar.c:516
 msgid " TOTAL                 :"
-msgstr ""
+msgstr " TOTAL                 :"
 
 #: lib/timevar.c:552
 #, c-format
 msgid "time in %s: %ld.%06ld (%ld%%)\n"
-msgstr ""
+msgstr "temps dans %s: %ld.%06ld (%ld%%)\n"
+
+#~ msgid "state_list_append (state = %d, symbol = %d (%s))\n"
+#~ msgstr "state_list_append (état = %d, symbole = %d (%s))\n"
+
+#~ msgid "Entering new_itemsets, state = %d\n"
+#~ msgstr "Entrant dans new_itemsets, état = %d\n"
+
+#~ msgid "Entering get_state, symbol = %d (%s)\n"
+#~ msgstr "Entrant dans get_state, symbole = %d (%s)\n"
+
+#~ msgid "Exiting get_state => %d\n"
+#~ msgstr "Sortant de get_state => %d\n"
+
+#~ msgid "Entering append_states, state = %d\n"
+#~ msgstr "Entrant dans append_states, état = %d\n"
+
+#~ msgid "Processing state %d (reached by %s)\n"
+#~ msgstr "Traitement de l'état %d (atteint par %s)\n"
+
+#~ msgid "undefined associativity"
+#~ msgstr "associativité indéfinie"
+
+#~ msgid "Closure: %s\n"
+#~ msgstr "Fermeture: %s\n"
+
+#~ msgid "  (rule %d)\n"
+#~ msgstr "   (règle %d)\n"
+
+#~ msgid "RTC: Firsts Input"
+#~ msgstr "RTC: premières entrées"
+
+#~ msgid "RTC: Firsts Output"
+#~ msgstr "RTC: premières sorties"
+
+#~ msgid "input"
+#~ msgstr "entrée"
+
+#~ msgid "output"
+#~ msgstr "sortie"
+
+#~ msgid ""
+#~ "Variables\n"
+#~ "---------\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Variables\n"
+#~ "---------\n"
+#~ "\n"
+
+#~ msgid "Value  Sprec  Sassoc  Tag\n"
+#~ msgstr "Valeur Sprec  Sassoc  Étiquette\n"
+
+#~ msgid ""
+#~ "Rules\n"
+#~ "-----\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Règles\n"
+#~ "------\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Num (Prec, Assoc, Useful, Ritem Range) Lhs -> Rhs (Ritem range) [Num]\n"
+#~ msgstr ""
+#~ "Num (Prec, Assoc, Utile,  Ritem étendue) Lhs -> Rhs (Ritem étendue) "
+#~ "[Num]\n"
+
+#~ msgid ""
+#~ "Rules interpreted\n"
+#~ "-----------------\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Règles interprétées\n"
+#~ "-------------------\n"
+#~ "\n"
+
+#~ msgid "Lookaheads: BEGIN\n"
+#~ msgstr "Lookaheads: DÉBUT\n"
+
+#~ msgid "State %d: %d lookaheads\n"
+#~ msgstr "État %d: %d lookaheads\n"
+
+#~ msgid "   on %d (%s) -> rule %d\n"
+#~ msgstr "   sur %d (%s) -> règle %d\n"
+
+#~ msgid "Lookaheads: END\n"
+#~ msgstr "Lookaheads: FIN\n"
+
+#~ msgid "relation_transpose: input\n"
+#~ msgstr "relation_transpose: entrée\n"
+
+#~ msgid "relation_transpose: output\n"
+#~ msgstr "relation_transpose: sortie\n"
+
+#~ msgid "growing table and check from: %lu to %lu\n"
+#~ msgstr "table en croissance et vérification depuis %lu à %lu\n"
+
+#~ msgid "base_t too small to hold %d\n"
+#~ msgstr "base_t trop petite pour contenir %d\n"
 
 #~ msgid "reduce"
 #~ msgstr "réduction"

po/hr.po

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.34a\n"
-"POT-Creation-Date: 2002-07-09 14:54+0200\n"
+"POT-Creation-Date: 2002-09-27 16:50+0200\n"
 "PO-Revision-Date: 2002-04-10 22:20+01\n"
 "Last-Translator: Denis Lackovic <[email protected]>\n"
 "Language-Team: Croatian <[email protected]>\n"
@@ -16,15 +16,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n==1 ? 0 : 1);\n"
 
-#: src/complain.c:99 lib/error.c:128 lib/error.c:156
+#: src/complain.c:89 lib/error.c:128 lib/error.c:156
 msgid "Unknown system error"
 msgstr "Nepoznata sistemska gre¹ka"
 
-#: src/complain.c:148 src/complain.c:197
+#: src/complain.c:123 src/complain.c:152
 msgid "warning: "
 msgstr "upozorenje:"
 
-#: src/complain.c:329 src/complain.c:362
+#: src/complain.c:252 src/complain.c:282
 msgid "fatal error: "
 msgstr "fatalna gre¹ka:"
 
@@ -43,74 +43,69 @@ msgstr "Konflikt u stanju %d izme
 msgid "    Conflict between rule %d and token %s resolved as an error"
 msgstr "Konflikt u stanju %d izmeðu pravila %d i znaka %s razrije¹en kao %s.\n"
 
-#: src/conflicts.c:403
+#: src/conflicts.c:402
 #, c-format
 msgid "%d shift/reduce conflict"
 msgid_plural "%d shift/reduce conflicts"
 msgstr[0] "%d pomakni/reduciraj konflikat"
 msgstr[1] "%d pomakni/reduciraj konflikata"
 
-#: src/conflicts.c:410
+#: src/conflicts.c:409
 msgid "and"
 msgstr "i"
 
-#: src/conflicts.c:416
+#: src/conflicts.c:415
 #, c-format
 msgid "%d reduce/reduce conflict"
 msgid_plural "%d reduce/reduce conflicts"
 msgstr[0] "%d reduciraj/reduciraj konflikt"
 msgstr[1] "%d reduciraj/reduciraj konflikata"
 
-#: src/conflicts.c:441
+#: src/conflicts.c:435
-#, c-format
-msgid "State %d contains "
-msgstr "Stanje %d sadr¾i"
-
-#: src/conflicts.c:514
 msgid "conflicts: "
 msgstr "konflikt:"
 
-#: src/conflicts.c:516
+#: src/conflicts.c:437
 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d pomakni/reduciraj"
 
-#: src/conflicts.c:520
+#: src/conflicts.c:441
 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d reduviraj/reduciraj"
 
-#: src/conflicts.c:525
+#: src/conflicts.c:460
 #, c-format
-msgid "%s contains "
+msgid "State %d contains "
-msgstr "%s sadr¾i"
+msgstr "Stanje %d sadr¾i"
 
-#: src/conflicts.c:532
+#: src/conflicts.c:537
-#, c-format
+#, fuzzy, c-format
-msgid "expected %d shift/reduce conflict\n"
+msgid "expected %d shift/reduce conflict"
-msgid_plural "expected %d shift/reduce conflicts\n"
+msgid_plural "expected %d shift/reduce conflicts"
 msgstr[0] "oèekujem %d pomakni/reduciraj konflikt\n"
 msgstr[1] "oèekujem %d pomakni/reduciraj konflikata\n"
 
-#: src/files.c:157
+#: src/files.c:114
 #, c-format
 msgid "cannot open file `%s'"
 msgstr "ne mogu otvoriti datoteku `%s'"
 
-#: src/files.c:176
+#: src/files.c:133
 msgid "cannot close file"
 msgstr "ne mogu zatvoriti datoteku"
 
-#: src/getargs.c:99
+#: src/getargs.c:157
 msgid "GNU bison generates parsers for LALR(1) grammars.\n"
 msgstr "GNU bison generira parsere za LALR(1) gramatike.\n"
 
-#: src/getargs.c:103
+#: src/getargs.c:161
 #, c-format
 msgid "Usage: %s [OPTION]... FILE\n"
 msgstr "Kori¹tenje: %s [OPCIJA]... DATOTEKA\n"
 
-#: src/getargs.c:107
+#: src/getargs.c:165
 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"
@@ -118,7 +113,7 @@ msgstr ""
 "Ako duga opcija ka¾e da je argument obavezan, tada je on obavezan\n"
 "i za ekvivalentnu kratku opciju. Slièno je i za opcionalne argumente.\n"
 
-#: src/getargs.c:113
+#: src/getargs.c:171
 msgid ""
 "Operation modes:\n"
 "  -h, --help      display this help and exit\n"
@@ -130,7 +125,7 @@ msgstr ""
 "  -V, --version   prika¾i verziju i izaði\n"
 "  -y, --yacc      emuliraj POSIX yacc\n"
 
-#: src/getargs.c:120
+#: src/getargs.c:178
 msgid ""
 "Parser:\n"
 "  -S, --skeleton=FILE        specify the skeleton to use\n"
@@ -150,7 +145,7 @@ msgstr ""
 "  -n, --no-parser            generiraj samo tablice\n"
 "  -k, --token-table          ukljuèi tablicu imena znakova\n"
 
-#: src/getargs.c:132
+#: src/getargs.c:190
 #, fuzzy
 msgid ""
 "Output:\n"
@@ -169,7 +164,7 @@ msgstr ""
 "  -o, --output=DATOTEKA          ispi¹i izlaz u DATOTEKU\n"
 "  -g, --graph                takoðer proizvedi VCG opis automata\n"
 
-#: src/getargs.c:143
+#: src/getargs.c:201
 msgid ""
 "THINGS is a list of comma separated words that can include:\n"
 "  `state'        describe the states\n"
@@ -180,27 +175,27 @@ msgid ""
 "  `none'         disable the report\n"
 msgstr ""
 
-#: src/getargs.c:154
+#: src/getargs.c:212
 msgid "Report bugs to <[email protected]>.\n"
 msgstr "Izvjesti o bugovima na <[email protected]>.\n"
 
-#: src/getargs.c:168
+#: src/getargs.c:226
 #, c-format
 msgid "bison (GNU Bison) %s"
 msgstr "bison (GNU Bison) %s"
 
-#: src/getargs.c:170
+#: src/getargs.c:228
 msgid "Written by Robert Corbett and Richard Stallman.\n"
 msgstr ""
 
-#: src/getargs.c:174
+#: src/getargs.c:232
 #, fuzzy, c-format
 msgid "Copyright (C) %d Free Software Foundation, Inc.\n"
 msgstr ""
 "Copyright 1984, 1986, 1989, 1992, 2000, 2001, 2002\n"
 "Free Software Foundation, Inc.\n"
 
-#: src/getargs.c:176
+#: src/getargs.c:234
 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"
@@ -209,27 +204,44 @@ msgstr ""
 "kopiranja.  NEMA\n"
 "garancije; èak ni tvrdnje o ISPLATIVOSTI ili POGODNOSTI ZA NEKU SVRHU.\n"
 
-#: src/getargs.c:333
+#: src/getargs.c:395
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Poku¹aj `%s --help' za vi¹e informacija.\n"
 
-#: src/getargs.c:340
+#: src/getargs.c:402
 #, c-format
 msgid "%s: no grammar file given\n"
 msgstr "%s: nije data datoteka sa gramatikom\n"
 
-#: src/getargs.c:344
+#: src/getargs.c:406
 #, c-format
 msgid "%s: extra arguments ignored after `%s'\n"
 msgstr "%s: dodatni argumenti se ignoriraju nakon `%s'\n"
 
-#: src/lalr.c:110
+#: src/gram.c:139
+msgid "empty"
+msgstr "prazno"
+
+#: src/gram.c:233
+msgid "Grammar"
+msgstr "Gramatika"
+
+#: src/gram.c:321 src/reduce.c:302 src/reduce.c:392
+#, fuzzy
+msgid "warning"
+msgstr "upozorenje:"
+
+#: src/lalr.c:91
 #, c-format
 msgid "too many gotos (max %d)"
 msgstr "previ¹e goto-a (maksimalno %d)"
 
-#: parse-gram.y:344
+#: src/main.c:117
+msgid "rule never reduced because of conflicts"
+msgstr ""
+
+#: parse-gram.y:347
 msgid "POSIX forbids declarations in the grammar"
 msgstr ""
 
@@ -246,7 +258,7 @@ msgstr "    %-4s\tpomakni i idi u stanje %d\n"
 #: src/print.c:164
 #, fuzzy, c-format
 msgid "go to state %d\n"
-msgstr "    %-4s\tidu u stanje %d\n"
+msgstr "    $   \tidu u stanje %d\n"
 
 #: src/print.c:201
 #, fuzzy
@@ -258,235 +270,425 @@ msgstr "%-4s\tgre
 msgid "reduce using rule %d (%s)"
 msgstr "$default\treduciraj koristeæi pravilo %d (%s)"
 
-#: src/print.c:323 src/print.c:386
+#: src/print.c:293
+msgid "accept"
+msgstr ""
+
+#: src/print.c:324 src/print.c:390
 msgid "$default"
 msgstr ""
 
-#: src/print.c:405
+#: src/print.c:419
-msgid "    $default\taccept\n"
-msgstr "    $default\tprihvati\n"
-
-#: src/print.c:407
-msgid "    NO ACTIONS\n"
-msgstr "    NEMA AKCIJA\n"
-
-#: src/print.c:428
 #, c-format
 msgid "state %d"
 msgstr "stanje %d"
 
-#: src/print.c:462
+#: src/print.c:453
 msgid "Terminals, with rules where they appear"
 msgstr "Zavr¹ni znakovi, sa pravilima gdje se pojavljuju"
 
-#: src/print.c:489
+#: src/print.c:480
 msgid "Nonterminals, with rules where they appear"
 msgstr "Nezavr¹ni znakovi, sa pravilima gdje se pojavljuju"
 
-#: src/print.c:518
+#: src/print.c:509
 msgid " on left:"
 msgstr "s lijeva:"
 
-#: src/print.c:533
+#: src/print.c:524
 msgid " on right:"
 msgstr "s desna:"
 
-#: src/reader.c:53
+#: src/print.c:552
+#, fuzzy
+msgid "Rules never reduced"
+msgstr "%d pravilo nije nikad reducirano\n"
+
+#: src/reader.c:52
 #, c-format
 msgid "multiple %s declarations"
 msgstr "vi¹estruke %s deklaracije"
 
-#: src/reader.c:139
+#: src/reader.c:141
 #, c-format
 msgid "result type clash on merge function %s: `%s' vs. `%s'"
 msgstr ""
 
-#: src/reader.c:237
+#: src/reader.c:239
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "pravilo dato za %s, a to je znak"
 
-#: src/reader.c:262
+#: src/reader.c:264
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "sudar tipova (`%s' `%s') na deaultnoj akciji"
 
-#: src/reader.c:270
+#: src/reader.c:272
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "prazno pravilo za nezavr¹ni znak, i nema akcije"
 
-#: src/reader.c:341
+#: src/reader.c:343
 msgid "two @prec's in a row"
 msgstr "dva @prec's u retku"
 
-#: src/reader.c:351
+#: src/reader.c:353
 #, c-format
 msgid "%%dprec affects only GLR parsers"
 msgstr ""
 
-#: src/reader.c:353
+#: src/reader.c:355
 #, c-format
 msgid "%%dprec must be followed by positive number"
 msgstr ""
 
-#: src/reader.c:355
+#: src/reader.c:357
 #, c-format
 msgid "only one %%dprec allowed per rule"
 msgstr ""
 
-#: src/reader.c:366
+#: src/reader.c:368
 #, c-format
 msgid "%%merge affects only GLR parsers"
 msgstr ""
 
-#: src/reader.c:368
+#: src/reader.c:370
 #, c-format
 msgid "only one %%merge allowed per rule"
 msgstr ""
 
-#: src/reader.c:512
+#: src/reader.c:513
 msgid "no rules in the input grammar"
 msgstr "nema pravila u ulaznoj gramatici"
 
-#: src/reader.c:544
+#: src/reader.c:545
 #, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "previ¹e simbola (znakovi plus nezavr¹ni znakovi); maksimalno %d"
 
-#: src/reduce.c:243 src/reduce.c:309 src/reduce.c:400
+#: src/reduce.c:239
-#, fuzzy
-msgid "warning"
-msgstr "upozorenje:"
-
-#: src/reduce.c:243
 #, fuzzy
 msgid "useless rule"
 msgstr "%d beskorisno pravilo"
 
-#: src/reduce.c:309
+#: src/reduce.c:302
 #, fuzzy
 msgid "useless nonterminal"
 msgstr "%d beskorisan nezavr¹ni znak"
 
-#: src/reduce.c:356
+#: src/reduce.c:349
-msgid "Useless nonterminals:"
+#, fuzzy
+msgid "Useless nonterminals"
 msgstr "Beskorisni nezavr¹ni znakovi:"
 
-#: src/reduce.c:369
+#: src/reduce.c:362
-msgid "Terminals which are not used:"
+#, fuzzy
+msgid "Terminals which are not used"
 msgstr "Zavr¹ni znakovi koji nisu kori¹teni:"
 
-#: src/reduce.c:378
+#: src/reduce.c:371
 #, fuzzy
 msgid "Useless rules"
 msgstr "Beskorisna pravila:"
 
-#: src/reduce.c:395
+#: src/reduce.c:387
 #, c-format
 msgid "%d rule never reduced\n"
 msgid_plural "%d rules never reduced\n"
 msgstr[0] "%d pravilo nije nikad reducirano\n"
 msgstr[1] "%d pravila nisu nikad reducirana\n"
 
-#: src/reduce.c:403
+#: src/reduce.c:395
 #, c-format
 msgid "%d useless nonterminal"
 msgid_plural "%d useless nonterminals"
 msgstr[0] "%d beskorisan nezavr¹ni znak"
 msgstr[1] "%d beskorisnih nezavr¹nih znakova"
 
-#: src/reduce.c:409
+#: src/reduce.c:401
 msgid " and "
 msgstr " i"
 
-#: src/reduce.c:412
+#: src/reduce.c:404
 #, c-format
 msgid "%d useless rule"
 msgid_plural "%d useless rules"
 msgstr[0] "%d beskorisno pravilo"
 msgstr[1] "%d beskorisnih pravila"
 
-#: src/reduce.c:442
+#: src/reduce.c:435
-#, c-format
+#, fuzzy, c-format
-msgid "Start symbol %s does not derive any sentence"
+msgid "start symbol %s does not derive any sentence"
 msgstr "Poèetni simbol %s ne daje niti jednu reèenicu"
 
-#: scan-gram.l:559
+#: scan-gram.l:202
+#, c-format
+msgid ": invalid character: `%c'\n"
+msgstr ""
+
+#: scan-gram.l:246
+#, fuzzy
+msgid ": unexpected end of file in a comment\n"
+msgstr "neoèekivan kraj datoteke"
+
+#: scan-gram.l:274 scan-gram.l:412
+#, fuzzy
+msgid ": unexpected end of file in a string\n"
+msgstr "neoèekivan kraj datoteke"
+
+#: scan-gram.l:311 scan-gram.l:383
+#, fuzzy
+msgid ": unexpected end of file in a character\n"
+msgstr "neoèekivan kraj datoteke"
+
+#: scan-gram.l:332
+#, fuzzy, c-format
+msgid ": invalid escape: %s\n"
+msgstr "nedozvoljeni ulaz: %s"
+
+#: scan-gram.l:353
+#, fuzzy, c-format
+msgid ": unrecognized escape: %s\n"
+msgstr "neprepoznati: %s"
+
+#: scan-gram.l:473
+#, fuzzy
+msgid ": unexpected end of file in a braced code\n"
+msgstr "neoèekivan kraj datoteke"
+
+#: scan-gram.l:502
+#, fuzzy
+msgid ": unexpected end of file in a prologue\n"
+msgstr "neoèekivan kraj datoteke"
+
+#: scan-gram.l:560
 #, c-format
 msgid "$$ of `%s' has no declared type"
 msgstr "$$ od `%s' nema deklarirani tip"
 
-#: scan-gram.l:576 scan-gram.l:663
+#: scan-gram.l:577 scan-gram.l:664
 #, fuzzy, c-format
 msgid "invalid value: %s%d"
 msgstr "nedozvoljena  @ vrijednost"
 
-#: scan-gram.l:583
+#: scan-gram.l:584
 #, c-format
 msgid "$%d of `%s' has no declared type"
 msgstr "$%d od `%s' nema deklarirani tip"
 
-#: scan-gram.l:594 scan-gram.l:611 scan-gram.l:670 scan-gram.l:687
+#: scan-gram.l:595 scan-gram.l:612 scan-gram.l:671 scan-gram.l:688
 #, c-format
 msgid "%s is invalid"
 msgstr "%s je nedozvoljeno"
 
-#: lib/getopt.c:694
+#: src/state.c:145
+#, c-format
+msgid "too many states (max %d)"
+msgstr "previ¹e stanja (maks %d)"
+
+#: src/symlist.c:97 src/symlist.c:109
+msgid "invalid $ value"
+msgstr "nedozvoljena $ vrijednost"
+
+#: src/symtab.c:81
+#, c-format
+msgid "type redeclaration for %s"
+msgstr "ponovna deklaracija za %s"
+
+#: src/symtab.c:98 src/symtab.c:117
+#, fuzzy, c-format
+msgid "%s redeclaration for %s"
+msgstr "ponovna deklaracija za %s"
+
+#: src/symtab.c:138
+#, c-format
+msgid "redefining precedence of %s"
+msgstr "ponovno definiran prethodnik od %s"
+
+#: src/symtab.c:157
+#, c-format
+msgid "symbol %s redefined"
+msgstr "simbol %s ponovo definiran"
+
+#: src/symtab.c:180
+#, fuzzy, c-format
+msgid "redefining user token number of %s"
+msgstr "ponovno definiran prethodnik od %s"
+
+#: src/symtab.c:225
+#, c-format
+msgid "symbol %s is used, but is not defined as a token and has no rules"
+msgstr "simbol %s je kori¹ten, ali nije definiran kao znak i nema pravila"
+
+#: src/symtab.c:244
+#, c-format
+msgid "symbol `%s' used more than once as a literal string"
+msgstr "simbol `%s' kori¹ten vi¹e puta kao znakovni niz"
+
+#: src/symtab.c:247
+#, c-format
+msgid "symbol `%s' given more than one literal string"
+msgstr "simbolz `%s' dat vi¹e od jednog znakovnog niza"
+
+#: src/symtab.c:281
+#, c-format
+msgid "conflicting precedences for %s and %s"
+msgstr "konflikt u prethodnici za %s and %s"
+
+#: src/symtab.c:293
+#, fuzzy, c-format
+msgid "conflicting associativities for %s (%s) and %s (%s)"
+msgstr "konfliktne asocijativne vrijednosti za %s i %s"
+
+#: src/symtab.c:363
+#, c-format
+msgid "tokens %s and %s both assigned number %d"
+msgstr "objema znakovima %s i %s je pridru¾en broj %d"
+
+#: src/symtab.c:568
+#, c-format
+msgid "the start symbol %s is undefined"
+msgstr "poèetni simbol  %s nije definiran"
+
+#: src/symtab.c:572
+#, c-format
+msgid "the start symbol %s is a token"
+msgstr "poèetni simbol %s je znak"
+
+#: lib/argmatch.c:161
+#, fuzzy, c-format
+msgid "invalid argument %s for %s"
+msgstr "nedozvoljeni ulaz: %s"
+
+#: lib/argmatch.c:162
+#, c-format
+msgid "ambiguous argument %s for %s"
+msgstr ""
+
+#: lib/argmatch.c:181
+msgid "Valid arguments are:"
+msgstr ""
+
+#: lib/bitset_stats.c:226
+#, c-format
+msgid "%d bitset_allocs, %d freed (%.2f%%).\n"
+msgstr ""
+
+#: lib/bitset_stats.c:229
+#, c-format
+msgid "%d bitset_sets, %d cached (%.2f%%)\n"
+msgstr ""
+
+#: lib/bitset_stats.c:232
+#, c-format
+msgid "%d bitset_resets, %d cached (%.2f%%)\n"
+msgstr ""
+
+#: lib/bitset_stats.c:235
+#, c-format
+msgid "%d bitset_tests, %d cached (%.2f%%)\n"
+msgstr ""
+
+#: lib/bitset_stats.c:239
+#, c-format
+msgid "%d bitset_lists\n"
+msgstr ""
+
+#: lib/bitset_stats.c:241
+msgid "count log histogram\n"
+msgstr ""
+
+#: lib/bitset_stats.c:244
+msgid "size log histogram\n"
+msgstr ""
+
+#: lib/bitset_stats.c:247
+msgid "density histogram\n"
+msgstr ""
+
+#: lib/bitset_stats.c:264
+msgid ""
+"Bitset statistics:\n"
+"\n"
+msgstr ""
+
+#: lib/bitset_stats.c:267
+#, c-format
+msgid "Accumulated runs = %d\n"
+msgstr ""
+
+#: lib/bitset_stats.c:311
+msgid "Could not read stats file."
+msgstr ""
+
+#: lib/bitset_stats.c:313
+msgid "Bad stats file size.\n"
+msgstr ""
+
+#: lib/bitset_stats.c:339
+msgid "Could not write stats file."
+msgstr ""
+
+#: lib/bitset_stats.c:343
+msgid "Could not open stats file for writing."
+msgstr ""
+
+#: lib/getopt.c:662
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: opcija `%s' je nejednoznaèna\n"
 
-#: lib/getopt.c:719
+#: lib/getopt.c:687
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: opcija `--%s' ne dopu¹ta argument\n"
 
-#: lib/getopt.c:724
+#: lib/getopt.c:692
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: opcija `%c%s' ne dopu¹ta argument\n"
 
-#: lib/getopt.c:742 lib/getopt.c:915
+#: lib/getopt.c:710 lib/getopt.c:883
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: opcija `%s' zahtijeva argument\n"
 
-#: lib/getopt.c:771
+#: lib/getopt.c:739
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: neprepoznata opcija `--%s'\n"
 
-#: lib/getopt.c:775
+#: lib/getopt.c:743
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: neprepoznata opcija `%c%s'\n"
 
-#: lib/getopt.c:801
+#: lib/getopt.c:769
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: nedozvoljena opcija -- %c\n"
 
-#: lib/getopt.c:804
+#: lib/getopt.c:772
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: nedozvoljena opcija -- %c\n"
 
-#: lib/getopt.c:834 lib/getopt.c:964
+#: lib/getopt.c:802 lib/getopt.c:932
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: opcija zahtijeva argument -- %c\n"
 
-#: lib/getopt.c:881
+#: lib/getopt.c:849
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: opcija `-W %s' je nejednoznaèna\n"
 
-#: lib/getopt.c:899
+#: lib/getopt.c:867
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: opcija `-W %s' ne dopu¹ta argument\n"
 
-#: lib/obstack.c:494 lib/obstack.c:497 lib/xmalloc.c:66
+#: lib/obstack.c:496 lib/obstack.c:499 lib/xmalloc.c:66
 msgid "memory exhausted"
 msgstr "iscrpljeni memorijski resursi"
 
@@ -498,14 +700,35 @@ msgstr "`"
 msgid "'"
 msgstr "'"
 
-#~ msgid "too many states (max %d)"
+#: lib/timevar.c:466
-#~ msgstr "previ¹e stanja (maks %d)"
+msgid ""
+"\n"
+"Execution times (seconds)\n"
+msgstr ""
 
-#~ msgid "   (rule %d)"
+#: lib/timevar.c:516
-#~ msgstr "   (pravilo %d)"
+msgid " TOTAL                 :"
+msgstr ""
 
-#~ msgid "    %-4s\terror (nonassociative)\n"
+#: lib/timevar.c:552
-#~ msgstr "    %-4s\tgre¹ka (nonassociative)\n"
+#, c-format
+msgid "time in %s: %ld.%06ld (%ld%%)\n"
+msgstr ""
+
+#~ msgid "reduce"
+#~ msgstr "reduciraj"
+
+#~ msgid "shift"
+#~ msgstr "pomakni"
+
+#~ msgid "an error"
+#~ msgstr "gre¹ka"
+
+#~ msgid "%s contains "
+#~ msgstr "%s sadr¾i"
+
+#~ msgid "    %-4s\t[reduce using rule %d (%s)]\n"
+#~ msgstr "    %-4s\t[reduciraj koristeæi pravilo %d (%s)]\n"
 
 #~ msgid ""
 #~ "    $default\treduce using rule %d (%s)\n"
@@ -514,29 +737,14 @@ msgstr "'"
 #~ "    $default\treduciraj koristeæi pravilo %d (%s)\n"
 #~ "\n"
 
-#~ msgid "    %-4s\t[reduce using rule %d (%s)]\n"
-#~ msgstr "    %-4s\t[reduciraj koristeæi pravilo %d (%s)]\n"
-
 #~ msgid "    %-4s\treduce using rule %d (%s)\n"
 #~ msgstr "    %-4s\treduciraj koristeæi pravilo %d (%s)\n"
 
 #~ msgid "    $default\treduce using rule %d (%s)\n"
 #~ msgstr "    $default\treduciraj koristeæi pravilo %d (%s)\n"
 
-#~ msgid "invalid $ value"
+#~ msgid "`%s' is no longer supported"
-#~ msgstr "nedozvoljena $ vrijednost"
+#~ msgstr "`%s' vi¹e nije podr¾ano"
-
-#~ msgid "Grammar"
-#~ msgstr "Gramatika"
-
-#~ msgid "Number, Line, Rule"
-#~ msgstr "Broj, Linija, Pravilo"
-
-#~ msgid "  %3d %3d %s ->"
-#~ msgstr "  %3d %3d %s ->"
-
-#~ msgid "empty"
-#~ msgstr "prazno"
 
 #~ msgid "unexpected `/' found and ignored"
 #~ msgstr "neoèekivan  `/' naðen i zanemaren"
@@ -544,9 +752,6 @@ msgstr "'"
 #~ msgid "unterminated comment"
 #~ msgstr "nezavr¹eni komentar"
 
-#~ msgid "unexpected end of file"
-#~ msgstr "neoèekivan kraj datoteke"
-
 #~ msgid "unescaped newline in constant"
 #~ msgstr "neoèekivan znak za novu liniju u konstanti"
 
@@ -574,8 +779,29 @@ msgstr "'"
 #~ msgid "`%s' requires an argument"
 #~ msgstr "`%s' zahtijeva argument"
 
-#~ msgid "`%s' is no longer supported"
+#~ msgid "maximum table size (%d) exceeded"
-#~ msgstr "`%s' vi¹e nije podr¾ano"
+#~ msgstr "maksimalna velièina tablice (%d) prekoraèena"
+
+#~ msgid "   (rule %d)"
+#~ msgstr "   (pravilo %d)"
+
+#~ msgid "    $default\taccept\n"
+#~ msgstr "    $default\tprihvati\n"
+
+#~ msgid "    NO ACTIONS\n"
+#~ msgstr "    NEMA AKCIJA\n"
+
+#~ msgid "    %-4s\terror (nonassociative)\n"
+#~ msgstr "    %-4s\tgre¹ka (nonassociative)\n"
+
+#~ msgid "    %-4s\tgo to state %d\n"
+#~ msgstr "    %-4s\tidu u stanje %d\n"
+
+#~ msgid "Number, Line, Rule"
+#~ msgstr "Broj, Linija, Pravilo"
+
+#~ msgid "  %3d %3d %s ->"
+#~ msgstr "  %3d %3d %s ->"
 
 #~ msgid "   Skipping to next \\n"
 #~ msgstr "   Preskaèem na slijedeæe \\n"
@@ -589,12 +815,18 @@ msgstr "'"
 #~ msgid "unterminated string"
 #~ msgstr "nezavr¹eni znakovni niz"
 
+#~ msgid "unterminated `%{' definition"
+#~ msgstr "nezavr¹ena `%{' definicija"
+
 #~ msgid "Premature EOF after %s"
 #~ msgstr "Preuranjeni EOF nakon %s"
 
 #~ msgid "`%s' is invalid in %s"
 #~ msgstr "`%s' je nedozvoljen u %s"
 
+#~ msgid "invalid %s declaration"
+#~ msgstr "nedozvoljena %s deklaracija"
+
 #~ msgid "%type declaration has no <typename>"
 #~ msgstr "%type deklaracija nema  <typename>"
 
@@ -610,11 +842,14 @@ msgstr "'"
 #~ msgid "unmatched %s"
 #~ msgstr "nije pronaðen %s"
 
-#~ msgid "invalid %s declaration"
+#~ msgid "argument of %%expect is not an integer"
-#~ msgstr "nedozvoljena %s deklaracija"
+#~ msgstr "argument od %%expect nije cijeli broj"
 
-#~ msgid "unrecognized: %s"
+#~ msgid "unrecognized item %s, expected an identifier"
-#~ msgstr "neprepoznati: %s"
+#~ msgstr "neprepoznati %s, oèekivan nakon identifikatora"
+
+#~ msgid "expected string constant instead of %s"
+#~ msgstr "oèekivana znakovna konstana umjesto %s"
 
 #~ msgid "no input grammar"
 #~ msgstr "nema ulazne gramatike"
@@ -622,6 +857,9 @@ msgstr "'"
 #~ msgid "unknown character: %s"
 #~ msgstr "nepoznati znak: %s"
 
+#~ msgid "unterminated %guard clause"
+#~ msgstr "nezavr¹ena %guard klauzula"
+
 #~ msgid "ill-formed rule: initial symbol not followed by colon"
 #~ msgstr "lo¹e pravilo: zarez ne bi trebao slijediti poèetni simbol"
 
@@ -631,74 +869,8 @@ msgstr "'"
 #~ msgid "previous rule lacks an ending `;'"
 #~ msgstr "prethodnom pravilu nedostaje zavr¹etak `;'"
 
-#~ msgid "invalid input: %s"
+#~ msgid "%%guard present but %%semantic_parser not specified"
-#~ msgstr "nedozvoljeni ulaz: %s"
+#~ msgstr "%%guard prisutan ali %%semantic_parser nije specificiran"
 
 #~ msgid "two actions at end of one rule"
 #~ msgstr "dvije akcije pri kraju jednog pravila"
-
-#~ msgid "reduce"
-#~ msgstr "reduciraj"
-
-#~ msgid "shift"
-#~ msgstr "pomakni"
-
-#~ msgid "an error"
-#~ msgstr "gre¹ka"
-
-#~ msgid "symbol %s is used, but is not defined as a token and has no rules"
-#~ msgstr "simbol %s je kori¹ten, ali nije definiran kao znak i nema pravila"
-
-#~ msgid "symbol `%s' used more than once as a literal string"
-#~ msgstr "simbol `%s' kori¹ten vi¹e puta kao znakovni niz"
-
-#~ msgid "symbol `%s' given more than one literal string"
-#~ msgstr "simbolz `%s' dat vi¹e od jednog znakovnog niza"
-
-#~ msgid "conflicting precedences for %s and %s"
-#~ msgstr "konflikt u prethodnici za %s and %s"
-
-#~ msgid "conflicting assoc values for %s and %s"
-#~ msgstr "konfliktne asocijativne vrijednosti za %s i %s"
-
-#~ msgid "tokens %s and %s both assigned number %d"
-#~ msgstr "objema znakovima %s i %s je pridru¾en broj %d"
-
-#~ msgid "unterminated `%{' definition"
-#~ msgstr "nezavr¹ena `%{' definicija"
-
-#~ msgid "symbol %s redefined"
-#~ msgstr "simbol %s ponovo definiran"
-
-#~ msgid "type redeclaration for %s"
-#~ msgstr "ponovna deklaracija za %s"
-
-#~ msgid "redefining precedence of %s"
-#~ msgstr "ponovno definiran prethodnik od %s"
-
-#~ msgid "argument of %%expect is not an integer"
-#~ msgstr "argument od %%expect nije cijeli broj"
-
-#~ msgid "unrecognized item %s, expected an identifier"
-#~ msgstr "neprepoznati %s, oèekivan nakon identifikatora"
-
-#~ msgid "expected string constant instead of %s"
-#~ msgstr "oèekivana znakovna konstana umjesto %s"
-
-#~ msgid "the start symbol %s is undefined"
-#~ msgstr "poèetni simbol  %s nije definiran"
-
-#~ msgid "the start symbol %s is a token"
-#~ msgstr "poèetni simbol %s je znak"
-
-#~ msgid "maximum table size (%d) exceeded"
-#~ msgstr "maksimalna velièina tablice (%d) prekoraèena"
-
-#~ msgid "    $   \tgo to state %d\n"
-#~ msgstr "    $   \tidu u stanje %d\n"
-
-#~ msgid "unterminated %guard clause"
-#~ msgstr "nezavr¹ena %guard klauzula"
-
-#~ msgid "%%guard present but %%semantic_parser not specified"
-#~ msgstr "%%guard prisutan ali %%semantic_parser nije specificiran"

po/it.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.49a\n"
-"POT-Creation-Date: 2002-08-11 00:16-0700\n"
+"POT-Creation-Date: 2002-09-27 16:50+0200\n"
 "PO-Revision-Date: 2002-05-03 11:03+0100\n"
 "Last-Translator: Paolo Bonzini <[email protected]>\n"
 "Language-Team: Italian <[email protected]>\n"
@@ -14,66 +14,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/LR0.c:63
-#, c-format
-msgid "state_list_append (state = %d, symbol = %d (%s))\n"
-msgstr ""
-
-#: src/LR0.c:181
-#, c-format
-msgid "Entering new_itemsets, state = %d\n"
-msgstr ""
-
-#: src/LR0.c:219
-#, c-format
-msgid "Entering get_state, symbol = %d (%s)\n"
-msgstr ""
-
-#: src/LR0.c:227
-#, fuzzy, c-format
-msgid "Exiting get_state => %d\n"
-msgstr "    %-4s\tprosecuzione allo stato %d\n"
-
-#: src/LR0.c:247
-#, c-format
-msgid "Entering append_states, state = %d\n"
-msgstr ""
-
-#: src/LR0.c:355
-#, c-format
-msgid "Processing state %d (reached by %s)\n"
-msgstr ""
-
-#: src/assoc.c:31
-msgid "undefined associativity"
-msgstr ""
-
-#: src/closure.c:56
-#, c-format
-msgid "Closure: %s\n"
-msgstr ""
-
-#: src/closure.c:63
-#, fuzzy, c-format
-msgid "  (rule %d)\n"
-msgstr "   (regola %d)"
-
-#: src/closure.c:136
-msgid "RTC: Firsts Input"
-msgstr ""
-
-#: src/closure.c:139
-msgid "RTC: Firsts Output"
-msgstr ""
-
-#: src/closure.c:203
-msgid "input"
-msgstr ""
-
-#: src/closure.c:234
-msgid "output"
-msgstr ""
-
 #: src/complain.c:89 lib/error.c:128 lib/error.c:156
 msgid "Unknown system error"
 msgstr "Errore di sistema sconosciuto"
@@ -286,35 +226,6 @@ msgstr "vuoto"
 msgid "Grammar"
 msgstr "Grammatica"
 
-#: src/gram.c:250
-msgid ""
-"Variables\n"
-"---------\n"
-"\n"
-msgstr ""
-
-#: src/gram.c:253
-msgid "Value  Sprec  Sassoc  Tag\n"
-msgstr ""
-
-#: src/gram.c:263
-msgid ""
-"Rules\n"
-"-----\n"
-"\n"
-msgstr ""
-
-#: src/gram.c:266
-msgid "Num (Prec, Assoc, Useful, Ritem Range) Lhs -> Rhs (Ritem range) [Num]\n"
-msgstr ""
-
-#: src/gram.c:292
-msgid ""
-"Rules interpreted\n"
-"-----------------\n"
-"\n"
-msgstr ""
-
 #: src/gram.c:321 src/reduce.c:302 src/reduce.c:392
 #, fuzzy
 msgid "warning"
@@ -325,29 +236,11 @@ msgstr "attenzione: "
 msgid "too many gotos (max %d)"
 msgstr "troppi goto (max %d)"
 
-#: src/lalr.c:406
-msgid "Lookaheads: BEGIN\n"
-msgstr ""
-
-#: src/lalr.c:418
-#, c-format
-msgid "State %d: %d lookaheads\n"
-msgstr ""
-
-#: src/lalr.c:425
-#, c-format
-msgid "   on %d (%s) -> rule %d\n"
-msgstr ""
-
-#: src/lalr.c:430
-msgid "Lookaheads: END\n"
-msgstr ""
-
 #: src/main.c:117
 msgid "rule never reduced because of conflicts"
 msgstr ""
 
-#: src/parse-gram.y:344
+#: parse-gram.y:347
 msgid "POSIX forbids declarations in the grammar"
 msgstr ""
 
@@ -527,71 +420,62 @@ msgstr[1] "%d regole inutili"
 msgid "start symbol %s does not derive any sentence"
 msgstr "dal simbolo iniziale %s non deriva alcuna frase"
 
-#: src/relation.c:137
+#: scan-gram.l:202
-msgid "relation_transpose: input\n"
-msgstr ""
-
-#: src/relation.c:176
-msgid "relation_transpose: output\n"
-msgstr ""
-
-#: src/scan-gram.l:202
 #, c-format
 msgid ": invalid character: `%c'\n"
 msgstr ""
 
-#: src/scan-gram.l:246
+#: scan-gram.l:246
 #, fuzzy
 msgid ": unexpected end of file in a comment\n"
 msgstr "fine del file inattesa"
 
-#: src/scan-gram.l:274 src/scan-gram.l:412
+#: scan-gram.l:274 scan-gram.l:412
 #, fuzzy
 msgid ": unexpected end of file in a string\n"
 msgstr "fine del file inattesa"
 
-#: src/scan-gram.l:311 src/scan-gram.l:383
+#: scan-gram.l:311 scan-gram.l:383
 #, fuzzy
 msgid ": unexpected end of file in a character\n"
 msgstr "fine del file inattesa"
 
-#: src/scan-gram.l:332
+#: scan-gram.l:332
 #, fuzzy, c-format
 msgid ": invalid escape: %s\n"
 msgstr "valore non valido: %s%d"
 
-#: src/scan-gram.l:353
+#: scan-gram.l:353
 #, fuzzy, c-format
 msgid ": unrecognized escape: %s\n"
 msgstr "non riconosciuto: %s"
 
-#: src/scan-gram.l:473
+#: scan-gram.l:473
 #, fuzzy
 msgid ": unexpected end of file in a braced code\n"
 msgstr "fine del file inattesa"
 
-#: src/scan-gram.l:502
+#: scan-gram.l:502
 #, fuzzy
 msgid ": unexpected end of file in a prologue\n"
 msgstr "fine del file inattesa"
 
-#: src/scan-gram.l:560
+#: scan-gram.l:560
 #, c-format
 msgid "$$ of `%s' has no declared type"
 msgstr "Manca una dichiarazione di tipo per $$ di `%s'"
 
-#: src/scan-gram.l:577 src/scan-gram.l:664
+#: scan-gram.l:577 scan-gram.l:664
 #, c-format
 msgid "invalid value: %s%d"
 msgstr "valore non valido: %s%d"
 
-#: src/scan-gram.l:584
+#: scan-gram.l:584
 #, c-format
 msgid "$%d of `%s' has no declared type"
 msgstr "Manca una dichiarazione di tipo per $%d di `%s'"
 
-#: src/scan-gram.l:595 src/scan-gram.l:612 src/scan-gram.l:671
+#: scan-gram.l:595 scan-gram.l:612 scan-gram.l:671 scan-gram.l:688
-#: src/scan-gram.l:688
 #, c-format
 msgid "%s is invalid"
 msgstr "%s non è valido"
@@ -670,16 +554,6 @@ msgstr "simbolo iniziale %s non definito"
 msgid "the start symbol %s is a token"
 msgstr "specificato il token %s come simbolo iniziale"
 
-#: src/tables.c:210
-#, c-format
-msgid "growing table and check from: %lu to %lu\n"
-msgstr ""
-
-#: src/tables.c:757
-#, c-format
-msgid "base_t too small to hold %d\n"
-msgstr ""
-
 #: lib/argmatch.c:161
 #, fuzzy, c-format
 msgid "invalid argument %s for %s"
@@ -889,6 +763,9 @@ msgstr ""
 #~ msgid "`%s' requires an argument"
 #~ msgstr "`%s' richiede un argomento"
 
+#~ msgid "   (rule %d)"
+#~ msgstr "   (regola %d)"
+
 #~ msgid ""
 #~ "    $default\treduce using rule %d (%s)\n"
 #~ "\n"

po/ja.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU bison 1.30f\n"
-"POT-Creation-Date: 2002-07-09 14:54+0200\n"
+"POT-Creation-Date: 2002-09-27 16:50+0200\n"
 "PO-Revision-Date: 2001-12-10 15:59+0900\n"
 "Last-Translator: Daisuke Yamashita <[email protected]>\n"
 "Language-Team: Japanese <[email protected]>\n"
@@ -14,15 +14,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/complain.c:99 lib/error.c:128 lib/error.c:156
+#: src/complain.c:89 lib/error.c:128 lib/error.c:156
 msgid "Unknown system error"
 msgstr "不明なシステムエラー"
 
-#: src/complain.c:148 src/complain.c:197
+#: src/complain.c:123 src/complain.c:152
 msgid "warning: "
 msgstr "警告: "
 
-#: src/complain.c:329 src/complain.c:362
+#: src/complain.c:252 src/complain.c:282
 msgid "fatal error: "
 msgstr "致命的エラー: "
 
@@ -41,71 +41,66 @@ msgstr "
 msgid "    Conflict between rule %d and token %s resolved as an error"
 msgstr "状態 %d の規則 %d とトークン %s の競合を%sとして解決。\n"
 
-#: src/conflicts.c:403
+#: src/conflicts.c:402
 #, c-format
 msgid "%d shift/reduce conflict"
 msgid_plural "%d shift/reduce conflicts"
 msgstr[0] "%d シフト/還元衝突"
 
-#: src/conflicts.c:410
+#: src/conflicts.c:409
 msgid "and"
 msgstr "および"
 
-#: src/conflicts.c:416
+#: src/conflicts.c:415
 #, c-format
 msgid "%d reduce/reduce conflict"
 msgid_plural "%d reduce/reduce conflicts"
 msgstr[0] "%d 還元/還元衝突"
 
-#: src/conflicts.c:441
+#: src/conflicts.c:435
-#, c-format
-msgid "State %d contains "
-msgstr "状態 %d が含むのは "
-
-#: src/conflicts.c:514
 msgid "conflicts: "
 msgstr "衝突: "
 
-#: src/conflicts.c:516
+#: src/conflicts.c:437
 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d シフト/還元"
 
-#: src/conflicts.c:520
+#: src/conflicts.c:441
 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d 還元/還元"
 
-#: src/conflicts.c:525
+#: src/conflicts.c:460
 #, c-format
-msgid "%s contains "
+msgid "State %d contains "
-msgstr "%s の中身は"
+msgstr "状態 %d が含むのは "
 
-#: src/conflicts.c:532
+#: src/conflicts.c:537
-#, c-format
+#, fuzzy, c-format
-msgid "expected %d shift/reduce conflict\n"
+msgid "expected %d shift/reduce conflict"
-msgid_plural "expected %d shift/reduce conflicts\n"
+msgid_plural "expected %d shift/reduce conflicts"
 msgstr[0] "本来 %d 個のシフト/還元衝突であるはずです\n"
 
-#: src/files.c:157
+#: src/files.c:114
 #, c-format
 msgid "cannot open file `%s'"
 msgstr "ファイル `%s' を開けません"
 
-#: src/files.c:176
+#: src/files.c:133
 msgid "cannot close file"
 msgstr "ファイルを閉じることができません"
 
-#: src/getargs.c:99
+#: src/getargs.c:157
 msgid "GNU bison generates parsers for LALR(1) grammars.\n"
 msgstr "GNU bison は LALR(1) 文法の構文解析器を生成します。\n"
 
-#: src/getargs.c:103
+#: src/getargs.c:161
 #, c-format
 msgid "Usage: %s [OPTION]... FILE\n"
 msgstr "使い方: %s [オプション]... ファイル\n"
 
-#: src/getargs.c:107
+#: src/getargs.c:165
 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"
@@ -113,7 +108,7 @@ msgstr ""
 "ロングオプションで必須の引数が示されていれば、同じ意味のショートオプション\n"
 "でも同様に必須の引数となります。必須でない選択的引数でも同様です。\n"
 
-#: src/getargs.c:113
+#: src/getargs.c:171
 msgid ""
 "Operation modes:\n"
 "  -h, --help      display this help and exit\n"
@@ -125,7 +120,7 @@ msgstr ""
 "  -V, --version   バージョン情報を表示して終了する\n"
 "  -y, --yacc      POSIX yacc をエミュレイトする\n"
 
-#: src/getargs.c:120
+#: src/getargs.c:178
 msgid ""
 "Parser:\n"
 "  -S, --skeleton=FILE        specify the skeleton to use\n"
@@ -145,7 +140,7 @@ msgstr ""
 "  -n, --no-parser            テーブルのみを生成する\n"
 "  -k, --token-table          トークン名のテーブルを含める\n"
 
-#: src/getargs.c:132
+#: src/getargs.c:190
 #, fuzzy
 msgid ""
 "Output:\n"
@@ -164,7 +159,7 @@ msgstr ""
 "  -o, --output=FILE          出力先を FILE とする\n"
 "  -g, --graph                オートマトンの VCG 記述子も作成する\n"
 
-#: src/getargs.c:143
+#: src/getargs.c:201
 msgid ""
 "THINGS is a list of comma separated words that can include:\n"
 "  `state'        describe the states\n"
@@ -175,26 +170,26 @@ msgid ""
 "  `none'         disable the report\n"
 msgstr ""
 
-#: src/getargs.c:154
+#: src/getargs.c:212
 msgid "Report bugs to <[email protected]>.\n"
 msgstr "バグレポートは <[email protected]> まで。\n"
 
-#: src/getargs.c:168
+#: src/getargs.c:226
 #, c-format
 msgid "bison (GNU Bison) %s"
 msgstr "bison (GNU Bison) %s"
 
-#: src/getargs.c:170
+#: src/getargs.c:228
 msgid "Written by Robert Corbett and Richard Stallman.\n"
 msgstr ""
 
-#: src/getargs.c:174
+#: src/getargs.c:232
 #, fuzzy, c-format
 msgid "Copyright (C) %d Free Software Foundation, Inc.\n"
 msgstr ""
 "Copyright 1984, 1986, 1989, 1992, 2000, 2001 Free Software Foundation, Inc.\n"
 
-#: src/getargs.c:176
+#: src/getargs.c:234
 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"
@@ -205,27 +200,45 @@ msgstr ""
 "これはフリーソフトウェアです -- 複製についての条件はソースを見ましょう。\n"
 "一切の保証はありません -- 商業性や目的適合性についての保証すらありません。\n"
 
-#: src/getargs.c:333
+#: src/getargs.c:395
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "`%s --help' で詳細情報を参照してください\n"
 
-#: src/getargs.c:340
+#: src/getargs.c:402
 #, c-format
 msgid "%s: no grammar file given\n"
 msgstr "%s: 文法ファイルが指定されていません\n"
 
-#: src/getargs.c:344
+#: src/getargs.c:406
 #, c-format
 msgid "%s: extra arguments ignored after `%s'\n"
 msgstr "%s: `%s' の後ろの余分な引数は無視されました\n"
 
-#: src/lalr.c:110
+#: src/gram.c:139
+msgid "empty"
+msgstr "空"
+
+#: src/gram.c:233
+msgid "Grammar"
+msgstr "文法"
+
+#: src/gram.c:321 src/reduce.c:302 src/reduce.c:392
+#, fuzzy
+msgid "warning"
+msgstr "警告: "
+
+#: src/lalr.c:91
 #, c-format
 msgid "too many gotos (max %d)"
 msgstr "goto の数が多すぎます (最大 %d)"
 
-#: parse-gram.y:344
+#: src/main.c:117
+#, fuzzy
+msgid "rule never reduced because of conflicts"
+msgstr " 1 還元/還元衝突"
+
+#: parse-gram.y:347
 msgid "POSIX forbids declarations in the grammar"
 msgstr ""
 
@@ -242,7 +255,7 @@ msgstr "    %-4s\t
 #: src/print.c:164
 #, fuzzy, c-format
 msgid "go to state %d\n"
-msgstr "    %-4s\t状態 %d へ\n"
+msgstr "    $   \t状態 %d へ\n"
 
 #: src/print.c:201
 #, fuzzy
@@ -254,232 +267,424 @@ msgstr "%-4s\t
 msgid "reduce using rule %d (%s)"
 msgstr "$default\t規則 %d を利用して還元 (%s)"
 
-#: src/print.c:323 src/print.c:386
+#: src/print.c:293
+msgid "accept"
+msgstr ""
+
+#: src/print.c:324 src/print.c:390
 msgid "$default"
 msgstr ""
 
-#: src/print.c:405
+#: src/print.c:419
-msgid "    $default\taccept\n"
-msgstr "    $default\taccept\n"
-
-#: src/print.c:407
-msgid "    NO ACTIONS\n"
-msgstr "    動作無し\n"
-
-#: src/print.c:428
 #, c-format
 msgid "state %d"
 msgstr "状態 %d"
 
-#: src/print.c:462
+#: src/print.c:453
 msgid "Terminals, with rules where they appear"
 msgstr "出現位置の規則による終端"
 
-#: src/print.c:489
+#: src/print.c:480
 msgid "Nonterminals, with rules where they appear"
 msgstr "出現位置の規則による非終端"
 
-#: src/print.c:518
+#: src/print.c:509
 msgid " on left:"
 msgstr " 左辺:"
 
-#: src/print.c:533
+#: src/print.c:524
 msgid " on right:"
 msgstr " 右辺:"
 
-#: src/reader.c:53
+#: src/print.c:552
+#, fuzzy
+msgid "Rules never reduced"
+msgstr "%d 個の規則は決して還元されません\n"
+
+#: src/reader.c:52
 #, c-format
 msgid "multiple %s declarations"
 msgstr "%s が複数個宣言されました"
 
-#: src/reader.c:139
+#: src/reader.c:141
 #, c-format
 msgid "result type clash on merge function %s: `%s' vs. `%s'"
 msgstr ""
 
-#: src/reader.c:237
+#: src/reader.c:239
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "%s に規則が与えられ、それはトークンとなります"
 
-#: src/reader.c:262
+#: src/reader.c:264
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "初期状態の動作では型 (`%s' `%s') が衝突します"
 
-#: src/reader.c:270
+#: src/reader.c:272
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "空の型付き非終端アイテム用規則であり、動作が起りません"
 
-#: src/reader.c:341
+#: src/reader.c:343
 msgid "two @prec's in a row"
 msgstr "@prec のもの二つが同列になっています"
 
-#: src/reader.c:351
+#: src/reader.c:353
 #, c-format
 msgid "%%dprec affects only GLR parsers"
 msgstr ""
 
-#: src/reader.c:353
+#: src/reader.c:355
 #, c-format
 msgid "%%dprec must be followed by positive number"
 msgstr ""
 
-#: src/reader.c:355
+#: src/reader.c:357
 #, c-format
 msgid "only one %%dprec allowed per rule"
 msgstr ""
 
-#: src/reader.c:366
+#: src/reader.c:368
 #, c-format
 msgid "%%merge affects only GLR parsers"
 msgstr ""
 
-#: src/reader.c:368
+#: src/reader.c:370
 #, c-format
 msgid "only one %%merge allowed per rule"
 msgstr ""
 
-#: src/reader.c:512
+#: src/reader.c:513
 msgid "no rules in the input grammar"
 msgstr "入力した文法に規則が定義されていません"
 
-#: src/reader.c:544
+#: src/reader.c:545
 #, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "シンボルが多すぎます (トークン + 非終端アイテム) -- 最大 %d"
 
-#: src/reduce.c:243 src/reduce.c:309 src/reduce.c:400
+#: src/reduce.c:239
-#, fuzzy
-msgid "warning"
-msgstr "警告: "
-
-#: src/reduce.c:243
 #, fuzzy
 msgid "useless rule"
 msgstr "%d 個の無意味な規則"
 
-#: src/reduce.c:309
+#: src/reduce.c:302
 #, fuzzy
 msgid "useless nonterminal"
 msgstr "%d 個の無意味な非終端子"
 
-#: src/reduce.c:356
+#: src/reduce.c:349
-msgid "Useless nonterminals:"
+#, fuzzy
+msgid "Useless nonterminals"
 msgstr "無意味な非終端子:"
 
-#: src/reduce.c:369
+#: src/reduce.c:362
-msgid "Terminals which are not used:"
+#, fuzzy
+msgid "Terminals which are not used"
 msgstr "利用されない終端子:"
 
-#: src/reduce.c:378
+#: src/reduce.c:371
 #, fuzzy
 msgid "Useless rules"
 msgstr "無意味な規則:"
 
-#: src/reduce.c:395
+#: src/reduce.c:387
 #, c-format
 msgid "%d rule never reduced\n"
 msgid_plural "%d rules never reduced\n"
 msgstr[0] "%d 個の規則は決して還元されません\n"
 
-#: src/reduce.c:403
+#: src/reduce.c:395
 #, c-format
 msgid "%d useless nonterminal"
 msgid_plural "%d useless nonterminals"
 msgstr[0] "%d 個の無意味な非終端子"
 
-#: src/reduce.c:409
+#: src/reduce.c:401
 msgid " and "
 msgstr "および"
 
-#: src/reduce.c:412
+#: src/reduce.c:404
 #, c-format
 msgid "%d useless rule"
 msgid_plural "%d useless rules"
 msgstr[0] "%d 個の無意味な規則"
 
-#: src/reduce.c:442
+#: src/reduce.c:435
-#, c-format
+#, fuzzy, c-format
-msgid "Start symbol %s does not derive any sentence"
+msgid "start symbol %s does not derive any sentence"
 msgstr "開始シンボル %s はどの文にも由来しません"
 
-#: scan-gram.l:559
+#: scan-gram.l:202
+#, c-format
+msgid ": invalid character: `%c'\n"
+msgstr ""
+
+#: scan-gram.l:246
+#, fuzzy
+msgid ": unexpected end of file in a comment\n"
+msgstr "予期しないファイルの終端です"
+
+#: scan-gram.l:274 scan-gram.l:412
+#, fuzzy
+msgid ": unexpected end of file in a string\n"
+msgstr "予期しないファイルの終端です"
+
+#: scan-gram.l:311 scan-gram.l:383
+#, fuzzy
+msgid ": unexpected end of file in a character\n"
+msgstr "予期しないファイルの終端です"
+
+#: scan-gram.l:332
+#, fuzzy, c-format
+msgid ": invalid escape: %s\n"
+msgstr "不適切な入力: %s"
+
+#: scan-gram.l:353
+#, fuzzy, c-format
+msgid ": unrecognized escape: %s\n"
+msgstr "認識できない: %s"
+
+#: scan-gram.l:473
+#, fuzzy
+msgid ": unexpected end of file in a braced code\n"
+msgstr "予期しないファイルの終端です"
+
+#: scan-gram.l:502
+#, fuzzy
+msgid ": unexpected end of file in a prologue\n"
+msgstr "予期しないファイルの終端です"
+
+#: scan-gram.l:560
 #, c-format
 msgid "$$ of `%s' has no declared type"
 msgstr "`%s' の $$ に宣言のない型があります"
 
-#: scan-gram.l:576 scan-gram.l:663
+#: scan-gram.l:577 scan-gram.l:664
 #, fuzzy, c-format
 msgid "invalid value: %s%d"
 msgstr "不適切な $ の値"
 
-#: scan-gram.l:583
+#: scan-gram.l:584
 #, c-format
 msgid "$%d of `%s' has no declared type"
 msgstr "$%d 個の `%s' が宣言された型を持っていません"
 
-#: scan-gram.l:594 scan-gram.l:611 scan-gram.l:670 scan-gram.l:687
+#: scan-gram.l:595 scan-gram.l:612 scan-gram.l:671 scan-gram.l:688
 #, c-format
 msgid "%s is invalid"
 msgstr "%s は不適切です"
 
-#: lib/getopt.c:694
+#: src/state.c:145
+#, c-format
+msgid "too many states (max %d)"
+msgstr "状態が多すぎます (最大 %d)"
+
+#: src/symlist.c:97 src/symlist.c:109
+msgid "invalid $ value"
+msgstr "不適切な $ の値"
+
+#: src/symtab.c:81
+#, c-format
+msgid "type redeclaration for %s"
+msgstr "%s の型が再定義されました"
+
+#: src/symtab.c:98 src/symtab.c:117
+#, fuzzy, c-format
+msgid "%s redeclaration for %s"
+msgstr "%s の型が再定義されました"
+
+#: src/symtab.c:138
+#, c-format
+msgid "redefining precedence of %s"
+msgstr "%s に先行した再定義です"
+
+#: src/symtab.c:157
+#, c-format
+msgid "symbol %s redefined"
+msgstr "シンボル %s が再定義されました"
+
+#: src/symtab.c:180
+#, fuzzy, c-format
+msgid "redefining user token number of %s"
+msgstr "%s に先行した再定義です"
+
+#: src/symtab.c:225
+#, c-format
+msgid "symbol %s is used, but is not defined as a token and has no rules"
+msgstr ""
+"シンボル %s が使われていますが、トークンとして定義されておらず、規則を持ちま"
+"せん"
+
+#: src/symtab.c:244
+#, c-format
+msgid "symbol `%s' used more than once as a literal string"
+msgstr "シンボル `%s' はリテラル文字列として複数回使われました"
+
+#: src/symtab.c:247
+#, c-format
+msgid "symbol `%s' given more than one literal string"
+msgstr "シンボル `%s' は複数のリテラル文字列が与えられました"
+
+#: src/symtab.c:281
+#, c-format
+msgid "conflicting precedences for %s and %s"
+msgstr "先行している %s と %s で競合が生じています"
+
+#: src/symtab.c:293
+#, fuzzy, c-format
+msgid "conflicting associativities for %s (%s) and %s (%s)"
+msgstr "非結合値 %s と %s で競合が生じています"
+
+#: src/symtab.c:363
+#, c-format
+msgid "tokens %s and %s both assigned number %d"
+msgstr "トークン %s と %s の双方が番号 %d に割り当てられました"
+
+#: src/symtab.c:568
+#, c-format
+msgid "the start symbol %s is undefined"
+msgstr "開始シンボル %s は定義されていません"
+
+#: src/symtab.c:572
+#, c-format
+msgid "the start symbol %s is a token"
+msgstr "開始シンボル %s はトークンです"
+
+#: lib/argmatch.c:161
+#, fuzzy, c-format
+msgid "invalid argument %s for %s"
+msgstr "不適切な入力: %s"
+
+#: lib/argmatch.c:162
+#, c-format
+msgid "ambiguous argument %s for %s"
+msgstr ""
+
+#: lib/argmatch.c:181
+msgid "Valid arguments are:"
+msgstr ""
+
+#: lib/bitset_stats.c:226
+#, c-format
+msgid "%d bitset_allocs, %d freed (%.2f%%).\n"
+msgstr ""
+
+#: lib/bitset_stats.c:229
+#, c-format
+msgid "%d bitset_sets, %d cached (%.2f%%)\n"
+msgstr ""
+
+#: lib/bitset_stats.c:232
+#, c-format
+msgid "%d bitset_resets, %d cached (%.2f%%)\n"
+msgstr ""
+
+#: lib/bitset_stats.c:235
+#, c-format
+msgid "%d bitset_tests, %d cached (%.2f%%)\n"
+msgstr ""
+
+#: lib/bitset_stats.c:239
+#, c-format
+msgid "%d bitset_lists\n"
+msgstr ""
+
+#: lib/bitset_stats.c:241
+msgid "count log histogram\n"
+msgstr ""
+
+#: lib/bitset_stats.c:244
+msgid "size log histogram\n"
+msgstr ""
+
+#: lib/bitset_stats.c:247
+msgid "density histogram\n"
+msgstr ""
+
+#: lib/bitset_stats.c:264
+msgid ""
+"Bitset statistics:\n"
+"\n"
+msgstr ""
+
+#: lib/bitset_stats.c:267
+#, c-format
+msgid "Accumulated runs = %d\n"
+msgstr ""
+
+#: lib/bitset_stats.c:311
+msgid "Could not read stats file."
+msgstr ""
+
+#: lib/bitset_stats.c:313
+msgid "Bad stats file size.\n"
+msgstr ""
+
+#: lib/bitset_stats.c:339
+msgid "Could not write stats file."
+msgstr ""
+
+#: lib/bitset_stats.c:343
+msgid "Could not open stats file for writing."
+msgstr ""
+
+#: lib/getopt.c:662
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: オプション `%s' は曖昧です\n"
 
-#: lib/getopt.c:719
+#: lib/getopt.c:687
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: オプション `--%s' は引数を許しません\n"
 
-#: lib/getopt.c:724
+#: lib/getopt.c:692
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: オプション `%c%s' は引数を許しません\n"
 
-#: lib/getopt.c:742 lib/getopt.c:915
+#: lib/getopt.c:710 lib/getopt.c:883
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: オプション `%s' は引数を要求します\n"
 
-#: lib/getopt.c:771
+#: lib/getopt.c:739
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: 認識できないオプション `--%s' です\n"
 
-#: lib/getopt.c:775
+#: lib/getopt.c:743
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: 認識できないオプション `%c%s' です\n"
 
-#: lib/getopt.c:801
+#: lib/getopt.c:769
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: 定格外のオプション -- %c\n"
 
-#: lib/getopt.c:804
+#: lib/getopt.c:772
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: 不適切なオプション -- %c\n"
 
-#: lib/getopt.c:834 lib/getopt.c:964
+#: lib/getopt.c:802 lib/getopt.c:932
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: オプションは引数を要求します -- %c\n"
 
-#: lib/getopt.c:881
+#: lib/getopt.c:849
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: オプション `-W %s' は曖昧です\n"
 
-#: lib/getopt.c:899
+#: lib/getopt.c:867
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: オプション `-W %s' は引数を許しません\n"
 
-#: lib/obstack.c:494 lib/obstack.c:497 lib/xmalloc.c:66
+#: lib/obstack.c:496 lib/obstack.c:499 lib/xmalloc.c:66
 msgid "memory exhausted"
 msgstr "メモリを使い果たしました"
 
@@ -491,14 +696,35 @@ msgstr "`"
 msgid "'"
 msgstr "'"
 
-#~ msgid "too many states (max %d)"
+#: lib/timevar.c:466
-#~ msgstr "状態が多すぎます (最大 %d)"
+msgid ""
+"\n"
+"Execution times (seconds)\n"
+msgstr ""
 
-#~ msgid "   (rule %d)"
+#: lib/timevar.c:516
-#~ msgstr "   (規則 %d)"
+msgid " TOTAL                 :"
+msgstr ""
 
-#~ msgid "    %-4s\terror (nonassociative)\n"
+#: lib/timevar.c:552
-#~ msgstr "    %-4s\tエラー (非結合)\n"
+#, c-format
+msgid "time in %s: %ld.%06ld (%ld%%)\n"
+msgstr ""
+
+#~ msgid "reduce"
+#~ msgstr "還元"
+
+#~ msgid "shift"
+#~ msgstr "シフト"
+
+#~ msgid "an error"
+#~ msgstr "エラー"
+
+#~ msgid "%s contains "
+#~ msgstr "%s の中身は"
+
+#~ msgid "    %-4s\t[reduce using rule %d (%s)]\n"
+#~ msgstr "    %-4s\t[規則 %d を利用して還元 (%s)]\n"
 
 #~ msgid ""
 #~ "    $default\treduce using rule %d (%s)\n"
@@ -507,29 +733,14 @@ msgstr "'"
 #~ "    $default\t規則 %d を利用して還元 (%s)\n"
 #~ "\n"
 
-#~ msgid "    %-4s\t[reduce using rule %d (%s)]\n"
-#~ msgstr "    %-4s\t[規則 %d を利用して還元 (%s)]\n"
-
 #~ msgid "    %-4s\treduce using rule %d (%s)\n"
 #~ msgstr "    %-4s\t規則 %d を利用して還元 (%s)\n"
 
 #~ msgid "    $default\treduce using rule %d (%s)\n"
 #~ msgstr "    $default\t規則 %d を利用して還元 (%s)\n"
 
-#~ msgid "invalid $ value"
+#~ msgid "`%s' is no longer supported"
-#~ msgstr "不適切な $ の値"
+#~ msgstr "`%s' は最早サポートされません"
-
-#~ msgid "Grammar"
-#~ msgstr "文法"
-
-#~ msgid "Number, Line, Rule"
-#~ msgstr "番号,   行, 規則"
-
-#~ msgid "  %3d %3d %s ->"
-#~ msgstr "  %3d %3d %s ->"
-
-#~ msgid "empty"
-#~ msgstr "空"
 
 #~ msgid "unexpected `/' found and ignored"
 #~ msgstr "予期しない `/' が見つかり、無視されました"
@@ -537,9 +748,6 @@ msgstr "'"
 #~ msgid "unterminated comment"
 #~ msgstr "閉じていないコメントです"
 
-#~ msgid "unexpected end of file"
-#~ msgstr "予期しないファイルの終端です"
-
 #~ msgid "unescaped newline in constant"
 #~ msgstr "定数の中にエスケープされていない改行があります"
 
@@ -567,8 +775,29 @@ msgstr "'"
 #~ msgid "`%s' requires an argument"
 #~ msgstr "`%s' オプションは引数を要求します"
 
-#~ msgid "`%s' is no longer supported"
+#~ msgid "maximum table size (%d) exceeded"
-#~ msgstr "`%s' は最早サポートされません"
+#~ msgstr "最大テーブルサイズ (%d) を超えました"
+
+#~ msgid "   (rule %d)"
+#~ msgstr "   (規則 %d)"
+
+#~ msgid "    $default\taccept\n"
+#~ msgstr "    $default\taccept\n"
+
+#~ msgid "    NO ACTIONS\n"
+#~ msgstr "    動作無し\n"
+
+#~ msgid "    %-4s\terror (nonassociative)\n"
+#~ msgstr "    %-4s\tエラー (非結合)\n"
+
+#~ msgid "    %-4s\tgo to state %d\n"
+#~ msgstr "    %-4s\t状態 %d へ\n"
+
+#~ msgid "Number, Line, Rule"
+#~ msgstr "番号,   行, 規則"
+
+#~ msgid "  %3d %3d %s ->"
+#~ msgstr "  %3d %3d %s ->"
 
 #~ msgid "   Skipping to next \\n"
 #~ msgstr "   次の \\n にスキップ"
@@ -582,12 +811,18 @@ msgstr "'"
 #~ msgid "unterminated string"
 #~ msgstr "閉じられていない文字列"
 
+#~ msgid "unterminated `%{' definition"
+#~ msgstr "`%{' 定義 が閉じられていません"
+
 #~ msgid "Premature EOF after %s"
 #~ msgstr "%s の後ろに早くも EOF があります"
 
 #~ msgid "`%s' is invalid in %s"
 #~ msgstr "`%s' は %s 内では不適切です"
 
+#~ msgid "invalid %s declaration"
+#~ msgstr "%s の宣言が不適切です"
+
 #~ msgid "%type declaration has no <typename>"
 #~ msgstr "%type 宣言に <タイプ名> がありません"
 
@@ -603,71 +838,6 @@ msgstr "'"
 #~ msgid "unmatched %s"
 #~ msgstr "対応のない %s です"
 
-#~ msgid "invalid %s declaration"
-#~ msgstr "%s の宣言が不適切です"
-
-#~ msgid "unrecognized: %s"
-#~ msgstr "認識できない: %s"
-
-#~ msgid "no input grammar"
-#~ msgstr "文法の入力が無い"
-
-#~ msgid "unknown character: %s"
-#~ msgstr "未知の文字: %s"
-
-#~ msgid "ill-formed rule: initial symbol not followed by colon"
-#~ msgstr "邪悪な規則: 初期化シンボルにコロン (:) が続いていません"
-
-#~ msgid "grammar starts with vertical bar"
-#~ msgstr "文法は縦棒 (|) で始めます"
-
-#~ msgid "invalid input: %s"
-#~ msgstr "不適切な入力: %s"
-
-#~ msgid "two actions at end of one rule"
-#~ msgstr "一つの規則の終りに二つの動作を指定しています"
-
-#~ msgid "reduce"
-#~ msgstr "還元"
-
-#~ msgid "shift"
-#~ msgstr "シフト"
-
-#~ msgid "an error"
-#~ msgstr "エラー"
-
-#~ msgid "symbol %s is used, but is not defined as a token and has no rules"
-#~ msgstr ""
-#~ "シンボル %s が使われていますが、トークンとして定義されておらず、規則を持ち"
-#~ "ません"
-
-#~ msgid "symbol `%s' used more than once as a literal string"
-#~ msgstr "シンボル `%s' はリテラル文字列として複数回使われました"
-
-#~ msgid "symbol `%s' given more than one literal string"
-#~ msgstr "シンボル `%s' は複数のリテラル文字列が与えられました"
-
-#~ msgid "conflicting precedences for %s and %s"
-#~ msgstr "先行している %s と %s で競合が生じています"
-
-#~ msgid "conflicting assoc values for %s and %s"
-#~ msgstr "非結合値 %s と %s で競合が生じています"
-
-#~ msgid "tokens %s and %s both assigned number %d"
-#~ msgstr "トークン %s と %s の双方が番号 %d に割り当てられました"
-
-#~ msgid "unterminated `%{' definition"
-#~ msgstr "`%{' 定義 が閉じられていません"
-
-#~ msgid "symbol %s redefined"
-#~ msgstr "シンボル %s が再定義されました"
-
-#~ msgid "type redeclaration for %s"
-#~ msgstr "%s の型が再定義されました"
-
-#~ msgid "redefining precedence of %s"
-#~ msgstr "%s に先行した再定義です"
-
 #~ msgid "argument of %%expect is not an integer"
 #~ msgstr "%%expect の引数が整数値ではありません"
 
@@ -677,23 +847,26 @@ msgstr "'"
 #~ msgid "expected string constant instead of %s"
 #~ msgstr "ここでは %s ではなく文字列定数が期待されます"
 
-#~ msgid "the start symbol %s is undefined"
+#~ msgid "no input grammar"
-#~ msgstr "開始シンボル %s は定義されていません"
+#~ msgstr "文法の入力が無い"
 
-#~ msgid "the start symbol %s is a token"
+#~ msgid "unknown character: %s"
-#~ msgstr "開始シンボル %s はトークンです"
+#~ msgstr "未知の文字: %s"
+
+#~ msgid "unterminated %guard clause"
+#~ msgstr "%guard 節が閉じられていません"
+
+#~ msgid "ill-formed rule: initial symbol not followed by colon"
+#~ msgstr "邪悪な規則: 初期化シンボルにコロン (:) が続いていません"
+
+#~ msgid "grammar starts with vertical bar"
+#~ msgstr "文法は縦棒 (|) で始めます"
 
 #~ msgid "%%guard present but %%semantic_parser not specified"
 #~ msgstr "%%guard がありますが %%semantic_parser が指定されていません"
 
-#~ msgid "maximum table size (%d) exceeded"
+#~ msgid "two actions at end of one rule"
-#~ msgstr "最大テーブルサイズ (%d) を超えました"
+#~ msgstr "一つの規則の終りに二つの動作を指定しています"
-
-#~ msgid "    $   \tgo to state %d\n"
-#~ msgstr "    $   \t状態 %d へ\n"
-
-#~ msgid "unterminated %guard clause"
-#~ msgstr "%guard 節が閉じられていません"
 
 #~ msgid ""
 #~ "\n"
@@ -744,9 +917,6 @@ msgstr "'"
 #~ msgid " 1 shift/reduce conflict"
 #~ msgstr " 1 シフト/還元衝突"
 
-#~ msgid " 1 reduce/reduce conflict"
-#~ msgstr " 1 還元/還元衝突"
-
 #~ msgid "%s contains"
 #~ msgstr "%s には、"
 

po/nl.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.34a\n"
-"POT-Creation-Date: 2002-07-09 14:54+0200\n"
+"POT-Creation-Date: 2002-09-27 16:50+0200\n"
 "PO-Revision-Date: 2002-03-20 12:54+0100\n"
 "Last-Translator: Tim Van Holder <[email protected]>\n"
 "Language-Team: Dutch <[email protected]>\n"
@@ -15,15 +15,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/complain.c:99 lib/error.c:128 lib/error.c:156
+#: src/complain.c:89 lib/error.c:128 lib/error.c:156
 msgid "Unknown system error"
 msgstr "Onbekende systeemfout"
 
-#: src/complain.c:148 src/complain.c:197
+#: src/complain.c:123 src/complain.c:152
 msgid "warning: "
 msgstr "let op: "
 
-#: src/complain.c:329 src/complain.c:362
+#: src/complain.c:252 src/complain.c:282
 msgid "fatal error: "
 msgstr "fatale fout: "
 
@@ -45,75 +45,70 @@ msgid "    Conflict between rule %d and token %s resolved as an error"
 msgstr ""
 "Conflict in staat %d tussen regel %d en token %s opgelost als \"%s\".\n"
 
-#: src/conflicts.c:403
+#: src/conflicts.c:402
 #, c-format
 msgid "%d shift/reduce conflict"
 msgid_plural "%d shift/reduce conflicts"
 msgstr[0] "%d shift/reductie conflict"
 msgstr[1] "%d shift/reductie conflicten"
 
-#: src/conflicts.c:410
+#: src/conflicts.c:409
 msgid "and"
 msgstr "en"
 
-#: src/conflicts.c:416
+#: src/conflicts.c:415
 #, c-format
 msgid "%d reduce/reduce conflict"
 msgid_plural "%d reduce/reduce conflicts"
 msgstr[0] "%d reductie/reductie conflict"
 msgstr[1] "%d reductie/reductie conflicten"
 
-#: src/conflicts.c:441
+#: src/conflicts.c:435
-#, c-format
-msgid "State %d contains "
-msgstr "Staat %d bevat"
-
-#: src/conflicts.c:514
 msgid "conflicts: "
 msgstr "conflicten: "
 
-#: src/conflicts.c:516
+#: src/conflicts.c:437
 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d vershuif/reductie"
 
-#: src/conflicts.c:520
+#: src/conflicts.c:441
 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d reductie/reductie"
 
-#: src/conflicts.c:525
+#: src/conflicts.c:460
 #, c-format
-msgid "%s contains "
+msgid "State %d contains "
-msgstr "%s bevat"
+msgstr "Staat %d bevat"
 
-#: src/conflicts.c:532
+#: src/conflicts.c:537
-#, c-format
+#, fuzzy, c-format
-msgid "expected %d shift/reduce conflict\n"
+msgid "expected %d shift/reduce conflict"
-msgid_plural "expected %d shift/reduce conflicts\n"
+msgid_plural "expected %d shift/reduce conflicts"
 msgstr[0] "%d shift/reductie conflict werd verwacht\n"
 msgstr[1] "%d shift/reductie conflicten werden verwacht\n"
 
-#: src/files.c:157
+#: src/files.c:114
 #, c-format
 msgid "cannot open file `%s'"
 msgstr "kan bestand `%s' niet openen"
 
-#: src/files.c:176
+#: src/files.c:133
 msgid "cannot close file"
 msgstr "kan bestand niet sluiten"
 
 # Dank U, Akim :-)
-#: src/getargs.c:99
+#: src/getargs.c:157
 msgid "GNU bison generates parsers for LALR(1) grammars.\n"
 msgstr "GNU bison genereert parsers voor LALR(1) grammatica's.\n"
 
-#: src/getargs.c:103
+#: src/getargs.c:161
 #, c-format
 msgid "Usage: %s [OPTION]... FILE\n"
 msgstr "Gebruik: %s [OPTIE]... BESTAND\n"
 
-#: src/getargs.c:107
+#: src/getargs.c:165
 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"
@@ -123,7 +118,7 @@ msgstr ""
 "optionele argumenten geldt dezelfde regel.\n"
 
 # Misschien beter 'een POSIX-compatibele yacc'?
-#: src/getargs.c:113
+#: src/getargs.c:171
 msgid ""
 "Operation modes:\n"
 "  -h, --help      display this help and exit\n"
@@ -137,7 +132,7 @@ msgstr ""
 
 # Correcte vervoeging van 'voorvoegen'?
 # Betere vertaling voor 'directives'?
-#: src/getargs.c:120
+#: src/getargs.c:178
 msgid ""
 "Parser:\n"
 "  -S, --skeleton=FILE        specify the skeleton to use\n"
@@ -157,7 +152,7 @@ msgstr ""
 "  -n, --no-parser            genereer alleen de tabellen\n"
 "  -k, --token-table          genereer ook een tabel van tokennamen\n"
 
-#: src/getargs.c:132
+#: src/getargs.c:190
 #, fuzzy
 msgid ""
 "Output:\n"
@@ -177,7 +172,7 @@ msgstr ""
 "  -g, --graph                genereer ook een VCG beschrijving van de "
 "automaat\n"
 
-#: src/getargs.c:143
+#: src/getargs.c:201
 msgid ""
 "THINGS is a list of comma separated words that can include:\n"
 "  `state'        describe the states\n"
@@ -188,29 +183,29 @@ msgid ""
 "  `none'         disable the report\n"
 msgstr ""
 
-#: src/getargs.c:154
+#: src/getargs.c:212
 msgid "Report bugs to <[email protected]>.\n"
 msgstr ""
 "Meld bugs aan <[email protected]>.\n"
 "Meld fouten in de vertaling aan <[email protected]>.\n"
 
-#: src/getargs.c:168
+#: src/getargs.c:226
 #, c-format
 msgid "bison (GNU Bison) %s"
 msgstr "bison (GNU Bison) %s"
 
-#: src/getargs.c:170
+#: src/getargs.c:228
 msgid "Written by Robert Corbett and Richard Stallman.\n"
 msgstr ""
 
-#: src/getargs.c:174
+#: src/getargs.c:232
 #, fuzzy, c-format
 msgid "Copyright (C) %d Free Software Foundation, Inc.\n"
 msgstr ""
 "Copyright 1984, 1986, 1989, 1992, 2000, 2001, 2002\n"
 "Free Software Foundation, Inc.\n"
 
-#: src/getargs.c:176
+#: src/getargs.c:234
 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"
@@ -219,27 +214,44 @@ msgstr ""
 "garantie; zelfs niet voor VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN BEPAALD\n"
 "DOEL.\n"
 
-#: src/getargs.c:333
+#: src/getargs.c:395
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Probeer `%s --help' voor meer informatie.\n"
 
-#: src/getargs.c:340
+#: src/getargs.c:402
 #, c-format
 msgid "%s: no grammar file given\n"
 msgstr "%s: geen grammaticabestand opgegeven\n"
 
-#: src/getargs.c:344
+#: src/getargs.c:406
 #, c-format
 msgid "%s: extra arguments ignored after `%s'\n"
 msgstr "%s: extra argumenten na `%s' worden genegeerd\n"
 
-#: src/lalr.c:110
+#: src/gram.c:139
+msgid "empty"
+msgstr "leeg"
+
+#: src/gram.c:233
+msgid "Grammar"
+msgstr "Grammatica"
+
+#: src/gram.c:321 src/reduce.c:302 src/reduce.c:392
+#, fuzzy
+msgid "warning"
+msgstr "let op: "
+
+#: src/lalr.c:91
 #, c-format
 msgid "too many gotos (max %d)"
 msgstr "teveel gotos (maximum is %d)"
 
-#: parse-gram.y:344
+#: src/main.c:117
+msgid "rule never reduced because of conflicts"
+msgstr ""
+
+#: parse-gram.y:347
 msgid "POSIX forbids declarations in the grammar"
 msgstr ""
 
@@ -256,7 +268,7 @@ msgstr "    %-4s\tshift, en ga naar staat %d\n"
 #: src/print.c:164
 #, fuzzy, c-format
 msgid "go to state %d\n"
-msgstr "    %-4s\tga naar staat %d\n"
+msgstr "    $   \tga naar staat %d\n"
 
 #: src/print.c:201
 #, fuzzy
@@ -268,149 +280,147 @@ msgstr "%-4s\tfout (niet associatief)"
 msgid "reduce using rule %d (%s)"
 msgstr "$standaard\treduceren via regel %d (%s)"
 
-#: src/print.c:323 src/print.c:386
+#: src/print.c:293
+msgid "accept"
+msgstr ""
+
+#: src/print.c:324 src/print.c:390
 msgid "$default"
 msgstr ""
 
-#: src/print.c:405
+#: src/print.c:419
-msgid "    $default\taccept\n"
-msgstr "    $standaard\taccepteer\n"
-
-#: src/print.c:407
-msgid "    NO ACTIONS\n"
-msgstr "    GEEN AKTIES\n"
-
-#: src/print.c:428
 #, c-format
 msgid "state %d"
 msgstr "staat %d"
 
-#: src/print.c:462
+#: src/print.c:453
 msgid "Terminals, with rules where they appear"
 msgstr "Eindsymbolen, met de regels waarin ze voorkomen"
 
 # Betere vertaling voor non-terminals? 'tussensymbolen'?
-#: src/print.c:489
+#: src/print.c:480
 msgid "Nonterminals, with rules where they appear"
 msgstr "Niet-eindsymbolen, met de regels waarin ze voorkomen"
 
-#: src/print.c:518
+#: src/print.c:509
 msgid " on left:"
 msgstr " links:"
 
-#: src/print.c:533
+#: src/print.c:524
 msgid " on right:"
 msgstr " rechts:"
 
-#: src/reader.c:53
+#: src/print.c:552
+#, fuzzy
+msgid "Rules never reduced"
+msgstr "%d regel wordt nooit gereduceerd\n"
+
+#: src/reader.c:52
 #, c-format
 msgid "multiple %s declarations"
 msgstr "meerdere %s declaraties"
 
-#: src/reader.c:139
+#: src/reader.c:141
 #, c-format
 msgid "result type clash on merge function %s: `%s' vs. `%s'"
 msgstr ""
 
-#: src/reader.c:237
+#: src/reader.c:239
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "regel opgegeven voor token (%s)"
 
-#: src/reader.c:262
+#: src/reader.c:264
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "type-conflict (`%s' `%s') bij standaardaktie"
 
-#: src/reader.c:270
+#: src/reader.c:272
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "lege regel voor niet-eindsymbool met type, en geen actie"
 
-#: src/reader.c:341
+#: src/reader.c:343
 msgid "two @prec's in a row"
 msgstr "twee @prec's na elkaar"
 
-#: src/reader.c:351
+#: src/reader.c:353
 #, c-format
 msgid "%%dprec affects only GLR parsers"
 msgstr ""
 
-#: src/reader.c:353
+#: src/reader.c:355
 #, c-format
 msgid "%%dprec must be followed by positive number"
 msgstr ""
 
-#: src/reader.c:355
+#: src/reader.c:357
 #, c-format
 msgid "only one %%dprec allowed per rule"
 msgstr ""
 
-#: src/reader.c:366
+#: src/reader.c:368
 #, c-format
 msgid "%%merge affects only GLR parsers"
 msgstr ""
 
-#: src/reader.c:368
+#: src/reader.c:370
 #, c-format
 msgid "only one %%merge allowed per rule"
 msgstr ""
 
-#: src/reader.c:512
+#: src/reader.c:513
 msgid "no rules in the input grammar"
 msgstr "invoergrammatica bevat geen regels"
 
-#: src/reader.c:544
+#: src/reader.c:545
 #, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "teveel symbolen (tokens plus niet-eindsymbolen); het maximum is %d"
 
-#: src/reduce.c:243 src/reduce.c:309 src/reduce.c:400
+#: src/reduce.c:239
-#, fuzzy
-msgid "warning"
-msgstr "let op: "
-
-#: src/reduce.c:243
 #, fuzzy
 msgid "useless rule"
 msgstr "%d nutteloze regel"
 
-#: src/reduce.c:309
+#: src/reduce.c:302
 #, fuzzy
 msgid "useless nonterminal"
 msgstr "%d nutteloos niet-eindsymbool"
 
-#: src/reduce.c:356
+#: src/reduce.c:349
-msgid "Useless nonterminals:"
+#, fuzzy
+msgid "Useless nonterminals"
 msgstr "Nutteloze niet-eindsymbolen:"
 
-#: src/reduce.c:369
+#: src/reduce.c:362
-msgid "Terminals which are not used:"
+#, fuzzy
+msgid "Terminals which are not used"
 msgstr "Eindsymbolen die niet gebruikt worden:"
 
-#: src/reduce.c:378
+#: src/reduce.c:371
 #, fuzzy
 msgid "Useless rules"
 msgstr "Nutteloze regels:"
 
-#: src/reduce.c:395
+#: src/reduce.c:387
 #, c-format
 msgid "%d rule never reduced\n"
 msgid_plural "%d rules never reduced\n"
 msgstr[0] "%d regel wordt nooit gereduceerd\n"
 msgstr[1] "%d regels worden nooit gereduceerd\n"
 
-#: src/reduce.c:403
+#: src/reduce.c:395
 #, c-format
 msgid "%d useless nonterminal"
 msgid_plural "%d useless nonterminals"
 msgstr[0] "%d nutteloos niet-eindsymbool"
 msgstr[1] "%d nutteloze niet-eindsymbolen"
 
-#: src/reduce.c:409
+#: src/reduce.c:401
 msgid " and "
 msgstr " en "
 
-#: src/reduce.c:412
+#: src/reduce.c:404
 #, c-format
 msgid "%d useless rule"
 msgid_plural "%d useless rules"
@@ -418,87 +428,281 @@ msgstr[0] "%d nutteloze regel"
 msgstr[1] "%d nutteloze regels"
 
 # Ik _denk_ dat dit correct weergeeft wat er bedoeld wordt (m.a.w. er is geen regel voor het startsymbool)
-#: src/reduce.c:442
+#: src/reduce.c:435
-#, c-format
+#, fuzzy, c-format
-msgid "Start symbol %s does not derive any sentence"
+msgid "start symbol %s does not derive any sentence"
 msgstr "Startsymbool %s wordt vanuit geen enkele zin bereikt"
 
-#: scan-gram.l:559
+#: scan-gram.l:202
+#, c-format
+msgid ": invalid character: `%c'\n"
+msgstr ""
+
+#: scan-gram.l:246
+#, fuzzy
+msgid ": unexpected end of file in a comment\n"
+msgstr "onverwacht einde van bestand"
+
+#: scan-gram.l:274 scan-gram.l:412
+#, fuzzy
+msgid ": unexpected end of file in a string\n"
+msgstr "onverwacht einde van bestand"
+
+#: scan-gram.l:311 scan-gram.l:383
+#, fuzzy
+msgid ": unexpected end of file in a character\n"
+msgstr "onverwacht einde van bestand"
+
+#: scan-gram.l:332
+#, fuzzy, c-format
+msgid ": invalid escape: %s\n"
+msgstr "ongeldige invoer: %s"
+
+#: scan-gram.l:353
+#, fuzzy, c-format
+msgid ": unrecognized escape: %s\n"
+msgstr "onbekend: %s"
+
+#: scan-gram.l:473
+#, fuzzy
+msgid ": unexpected end of file in a braced code\n"
+msgstr "onverwacht einde van bestand"
+
+#: scan-gram.l:502
+#, fuzzy
+msgid ": unexpected end of file in a prologue\n"
+msgstr "onverwacht einde van bestand"
+
+#: scan-gram.l:560
 #, c-format
 msgid "$$ of `%s' has no declared type"
 msgstr "$$ van `%s' heeft geen gedeclareerd type"
 
-#: scan-gram.l:576 scan-gram.l:663
+#: scan-gram.l:577 scan-gram.l:664
 #, fuzzy, c-format
 msgid "invalid value: %s%d"
 msgstr "ongeldige @-waarde"
 
-#: scan-gram.l:583
+#: scan-gram.l:584
 #, c-format
 msgid "$%d of `%s' has no declared type"
 msgstr "$%d van `%s' heeft geen gedeclareerd type"
 
-#: scan-gram.l:594 scan-gram.l:611 scan-gram.l:670 scan-gram.l:687
+#: scan-gram.l:595 scan-gram.l:612 scan-gram.l:671 scan-gram.l:688
 #, c-format
 msgid "%s is invalid"
 msgstr "%s is ongeldig"
 
-#: lib/getopt.c:694
+#: src/state.c:145
+#, c-format
+msgid "too many states (max %d)"
+msgstr "teveel staten (maximum is %d)"
+
+#: src/symlist.c:97 src/symlist.c:109
+msgid "invalid $ value"
+msgstr "ongeldige $-waarde"
+
+#: src/symtab.c:81
+#, c-format
+msgid "type redeclaration for %s"
+msgstr "type herdeclaratie voor %s"
+
+#: src/symtab.c:98 src/symtab.c:117
+#, fuzzy, c-format
+msgid "%s redeclaration for %s"
+msgstr "type herdeclaratie voor %s"
+
+#: src/symtab.c:138
+#, c-format
+msgid "redefining precedence of %s"
+msgstr "herdefinitie van de voorrang van %s"
+
+#: src/symtab.c:157
+#, c-format
+msgid "symbol %s redefined"
+msgstr "symbool %s opnieuw gedefinieerd"
+
+#: src/symtab.c:180
+#, fuzzy, c-format
+msgid "redefining user token number of %s"
+msgstr "herdefinitie van de voorrang van %s"
+
+#: src/symtab.c:225
+#, c-format
+msgid "symbol %s is used, but is not defined as a token and has no rules"
+msgstr ""
+"symbool %s wordt gebruikt, maar is niet gedefinieerd als een teken en heeft "
+"geen regels"
+
+#: src/symtab.c:244
+#, c-format
+msgid "symbol `%s' used more than once as a literal string"
+msgstr "symbool `%s' meer dan eens gebruikt als een letterlijke string"
+
+#: src/symtab.c:247
+#, c-format
+msgid "symbol `%s' given more than one literal string"
+msgstr "symbool `%s' krijgt meer dan één letterlijke string toegewezen"
+
+#: src/symtab.c:281
+#, c-format
+msgid "conflicting precedences for %s and %s"
+msgstr "voorrangen voor %s en %s geven conflicten"
+
+#: src/symtab.c:293
+#, fuzzy, c-format
+msgid "conflicting associativities for %s (%s) and %s (%s)"
+msgstr "associativiteitswaarden voor %s en %s geven conflicten"
+
+#: src/symtab.c:363
+#, c-format
+msgid "tokens %s and %s both assigned number %d"
+msgstr "tokens %s en %s hebben beide nummer %d toegewezen gekregen"
+
+#: src/symtab.c:568
+#, c-format
+msgid "the start symbol %s is undefined"
+msgstr "het startsymbool %s is niet gedefinieerd"
+
+#: src/symtab.c:572
+#, c-format
+msgid "the start symbol %s is a token"
+msgstr "het startsymbool %s is een token"
+
+#: lib/argmatch.c:161
+#, fuzzy, c-format
+msgid "invalid argument %s for %s"
+msgstr "ongeldige invoer: %s"
+
+#: lib/argmatch.c:162
+#, c-format
+msgid "ambiguous argument %s for %s"
+msgstr ""
+
+#: lib/argmatch.c:181
+msgid "Valid arguments are:"
+msgstr ""
+
+#: lib/bitset_stats.c:226
+#, c-format
+msgid "%d bitset_allocs, %d freed (%.2f%%).\n"
+msgstr ""
+
+#: lib/bitset_stats.c:229
+#, c-format
+msgid "%d bitset_sets, %d cached (%.2f%%)\n"
+msgstr ""
+
+#: lib/bitset_stats.c:232
+#, c-format
+msgid "%d bitset_resets, %d cached (%.2f%%)\n"
+msgstr ""
+
+#: lib/bitset_stats.c:235
+#, c-format
+msgid "%d bitset_tests, %d cached (%.2f%%)\n"
+msgstr ""
+
+#: lib/bitset_stats.c:239
+#, c-format
+msgid "%d bitset_lists\n"
+msgstr ""
+
+#: lib/bitset_stats.c:241
+msgid "count log histogram\n"
+msgstr ""
+
+#: lib/bitset_stats.c:244
+msgid "size log histogram\n"
+msgstr ""
+
+#: lib/bitset_stats.c:247
+msgid "density histogram\n"
+msgstr ""
+
+#: lib/bitset_stats.c:264
+msgid ""
+"Bitset statistics:\n"
+"\n"
+msgstr ""
+
+#: lib/bitset_stats.c:267
+#, c-format
+msgid "Accumulated runs = %d\n"
+msgstr ""
+
+#: lib/bitset_stats.c:311
+msgid "Could not read stats file."
+msgstr ""
+
+#: lib/bitset_stats.c:313
+msgid "Bad stats file size.\n"
+msgstr ""
+
+#: lib/bitset_stats.c:339
+msgid "Could not write stats file."
+msgstr ""
+
+#: lib/bitset_stats.c:343
+msgid "Could not open stats file for writing."
+msgstr ""
+
+#: lib/getopt.c:662
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: optie `%s' is niet eenduidig\n"
 
-#: lib/getopt.c:719
+#: lib/getopt.c:687
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: optie `--%s' staat geen argument toe\n"
 
-#: lib/getopt.c:724
+#: lib/getopt.c:692
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: optie `%c%s' staat geen argument toe\n"
 
-#: lib/getopt.c:742 lib/getopt.c:915
+#: lib/getopt.c:710 lib/getopt.c:883
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: optie `%s' vereist een argument\n"
 
-#: lib/getopt.c:771
+#: lib/getopt.c:739
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: onbekende optie `--%s'\n"
 
-#: lib/getopt.c:775
+#: lib/getopt.c:743
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: onbekende optie `%c%s'\n"
 
-#: lib/getopt.c:801
+#: lib/getopt.c:769
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: ongeldige optie -- %c\n"
 
-#: lib/getopt.c:804
+#: lib/getopt.c:772
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: ongeldige optie -- %c\n"
 
-#: lib/getopt.c:834 lib/getopt.c:964
+#: lib/getopt.c:802 lib/getopt.c:932
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: optie vereist een argument -- %c\n"
 
-#: lib/getopt.c:881
+#: lib/getopt.c:849
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: optie `-W %s' is niet eenduidig\n"
 
-#: lib/getopt.c:899
+#: lib/getopt.c:867
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: optie `--%s' staat geen argument toe\n"
 
-#: lib/obstack.c:494 lib/obstack.c:497 lib/xmalloc.c:66
+#: lib/obstack.c:496 lib/obstack.c:499 lib/xmalloc.c:66
 msgid "memory exhausted"
 msgstr "geen geheugen meer beschikbaar"
 
@@ -510,14 +714,35 @@ msgstr "`"
 msgid "'"
 msgstr "'"
 
-#~ msgid "too many states (max %d)"
+#: lib/timevar.c:466
-#~ msgstr "teveel staten (maximum is %d)"
+msgid ""
+"\n"
+"Execution times (seconds)\n"
+msgstr ""
 
-#~ msgid "   (rule %d)"
+#: lib/timevar.c:516
-#~ msgstr "   (regel %d)"
+msgid " TOTAL                 :"
+msgstr ""
 
-#~ msgid "    %-4s\terror (nonassociative)\n"
+#: lib/timevar.c:552
-#~ msgstr "    %-4s\tfout (niet associatief)\n"
+#, c-format
+msgid "time in %s: %ld.%06ld (%ld%%)\n"
+msgstr ""
+
+#~ msgid "reduce"
+#~ msgstr "reductie"
+
+#~ msgid "shift"
+#~ msgstr "shift"
+
+#~ msgid "an error"
+#~ msgstr "een fout"
+
+#~ msgid "%s contains "
+#~ msgstr "%s bevat"
+
+#~ msgid "    %-4s\t[reduce using rule %d (%s)]\n"
+#~ msgstr "    %-4s\t[reductie via regel %d (%s)]\n"
 
 #~ msgid ""
 #~ "    $default\treduce using rule %d (%s)\n"
@@ -526,30 +751,14 @@ msgstr "'"
 #~ "    $standaard\treductie via regel %d (%s)\n"
 #~ "\n"
 
-#~ msgid "    %-4s\t[reduce using rule %d (%s)]\n"
-#~ msgstr "    %-4s\t[reductie via regel %d (%s)]\n"
-
 #~ msgid "    %-4s\treduce using rule %d (%s)\n"
 #~ msgstr "    %-4s\treductie via regel %d (%s)\n"
 
 #~ msgid "    $default\treduce using rule %d (%s)\n"
 #~ msgstr "    $standaard\treductie via regel %d (%s)\n"
 
-#~ msgid "invalid $ value"
+#~ msgid "`%s' is no longer supported"
-#~ msgstr "ongeldige $-waarde"
+#~ msgstr "`%s' wordt niet meer ondersteund"
-
-#~ msgid "Grammar"
-#~ msgstr "Grammatica"
-
-# Ik zou liever 'line' vertalen als 'regel', maar hoe zit het dan met 'rule'? :-)
-#~ msgid "Number, Line, Rule"
-#~ msgstr "Nummer, Lijn, Regel"
-
-#~ msgid "  %3d %3d %s ->"
-#~ msgstr "  %3d %3d %s ->"
-
-#~ msgid "empty"
-#~ msgstr "leeg"
 
 #~ msgid "unexpected `/' found and ignored"
 #~ msgstr "onverwachte `/' gevonden en genegeerd"
@@ -557,9 +766,6 @@ msgstr "'"
 #~ msgid "unterminated comment"
 #~ msgstr "niet-beëindigde commentaar"
 
-#~ msgid "unexpected end of file"
-#~ msgstr "onverwacht einde van bestand"
-
 # geen letterlijke vertaling, maar zegt wel waar het om gaat
 #~ msgid "unescaped newline in constant"
 #~ msgstr "newline-teken zonder voorafgaande `\\' in constante"
@@ -589,8 +795,30 @@ msgstr "'"
 #~ msgid "`%s' requires an argument"
 #~ msgstr "`%s' heeft een argument nodig"
 
-#~ msgid "`%s' is no longer supported"
+#~ msgid "maximum table size (%d) exceeded"
-#~ msgstr "`%s' wordt niet meer ondersteund"
+#~ msgstr "maximale tabelgrootte (%d) overschreden"
+
+#~ msgid "   (rule %d)"
+#~ msgstr "   (regel %d)"
+
+#~ msgid "    $default\taccept\n"
+#~ msgstr "    $standaard\taccepteer\n"
+
+#~ msgid "    NO ACTIONS\n"
+#~ msgstr "    GEEN AKTIES\n"
+
+#~ msgid "    %-4s\terror (nonassociative)\n"
+#~ msgstr "    %-4s\tfout (niet associatief)\n"
+
+#~ msgid "    %-4s\tgo to state %d\n"
+#~ msgstr "    %-4s\tga naar staat %d\n"
+
+# Ik zou liever 'line' vertalen als 'regel', maar hoe zit het dan met 'rule'? :-)
+#~ msgid "Number, Line, Rule"
+#~ msgstr "Nummer, Lijn, Regel"
+
+#~ msgid "  %3d %3d %s ->"
+#~ msgstr "  %3d %3d %s ->"
 
 #~ msgid "   Skipping to next \\n"
 #~ msgstr "   Verder naar volgende \\n"
@@ -604,12 +832,18 @@ msgstr "'"
 #~ msgid "unterminated string"
 #~ msgstr "niet-beëindigde string"
 
+#~ msgid "unterminated `%{' definition"
+#~ msgstr "niet-beëindigde `%{' definitie"
+
 #~ msgid "Premature EOF after %s"
 #~ msgstr "Voortijdig bestandseinde na %s"
 
 #~ msgid "`%s' is invalid in %s"
 #~ msgstr "`%s' is ongeldig in %s"
 
+#~ msgid "invalid %s declaration"
+#~ msgstr "ongeldige %s declaratie"
+
 #~ msgid "%type declaration has no <typename>"
 #~ msgstr "%type declaratie heeft geen <typenaam>"
 
@@ -627,11 +861,14 @@ msgstr "'"
 #~ msgid "unmatched %s"
 #~ msgstr "%s zonder tegenhanger"
 
-#~ msgid "invalid %s declaration"
+#~ msgid "argument of %%expect is not an integer"
-#~ msgstr "ongeldige %s declaratie"
+#~ msgstr "argument van %%expect is geen geheel getal"
 
-#~ msgid "unrecognized: %s"
+#~ msgid "unrecognized item %s, expected an identifier"
-#~ msgstr "onbekend: %s"
+#~ msgstr "onbekend element %s; een naam werd verwacht"
+
+#~ msgid "expected string constant instead of %s"
+#~ msgstr "in plaats van %s werd een stringconstante verwacht"
 
 #~ msgid "no input grammar"
 #~ msgstr "geen invoergrammatica"
@@ -639,6 +876,9 @@ msgstr "'"
 #~ msgid "unknown character: %s"
 #~ msgstr "onbekend karakter: %s"
 
+#~ msgid "unterminated %guard clause"
+#~ msgstr "niet-beëindigde %guard-clausule"
+
 #~ msgid "ill-formed rule: initial symbol not followed by colon"
 #~ msgstr ""
 #~ "slecht geformuleerde regel: beginsymbool wordt niet gevolgd door dubbele "
@@ -650,76 +890,8 @@ msgstr "'"
 #~ msgid "previous rule lacks an ending `;'"
 #~ msgstr "`;' ontbreekt aan het einde van de voorgaande regel"
 
-#~ msgid "invalid input: %s"
-#~ msgstr "ongeldige invoer: %s"
-
-#~ msgid "two actions at end of one rule"
-#~ msgstr "twee akties aan het einde van één regel"
-
-#~ msgid "reduce"
-#~ msgstr "reductie"
-
-#~ msgid "shift"
-#~ msgstr "shift"
-
-#~ msgid "an error"
-#~ msgstr "een fout"
-
-#~ msgid "symbol %s is used, but is not defined as a token and has no rules"
-#~ msgstr ""
-#~ "symbool %s wordt gebruikt, maar is niet gedefinieerd als een teken en "
-#~ "heeft geen regels"
-
-#~ msgid "symbol `%s' used more than once as a literal string"
-#~ msgstr "symbool `%s' meer dan eens gebruikt als een letterlijke string"
-
-#~ msgid "symbol `%s' given more than one literal string"
-#~ msgstr "symbool `%s' krijgt meer dan één letterlijke string toegewezen"
-
-#~ msgid "conflicting precedences for %s and %s"
-#~ msgstr "voorrangen voor %s en %s geven conflicten"
-
-#~ msgid "conflicting assoc values for %s and %s"
-#~ msgstr "associativiteitswaarden voor %s en %s geven conflicten"
-
-#~ msgid "tokens %s and %s both assigned number %d"
-#~ msgstr "tokens %s en %s hebben beide nummer %d toegewezen gekregen"
-
-#~ msgid "unterminated `%{' definition"
-#~ msgstr "niet-beëindigde `%{' definitie"
-
-#~ msgid "symbol %s redefined"
-#~ msgstr "symbool %s opnieuw gedefinieerd"
-
-#~ msgid "type redeclaration for %s"
-#~ msgstr "type herdeclaratie voor %s"
-
-#~ msgid "redefining precedence of %s"
-#~ msgstr "herdefinitie van de voorrang van %s"
-
-#~ msgid "argument of %%expect is not an integer"
-#~ msgstr "argument van %%expect is geen geheel getal"
-
-#~ msgid "unrecognized item %s, expected an identifier"
-#~ msgstr "onbekend element %s; een naam werd verwacht"
-
-#~ msgid "expected string constant instead of %s"
-#~ msgstr "in plaats van %s werd een stringconstante verwacht"
-
-#~ msgid "the start symbol %s is undefined"
-#~ msgstr "het startsymbool %s is niet gedefinieerd"
-
-#~ msgid "the start symbol %s is a token"
-#~ msgstr "het startsymbool %s is een token"
-
 #~ msgid "%%guard present but %%semantic_parser not specified"
 #~ msgstr "%%guard aanwezig maar %%semantic_parser niet opgegeven"
 
-#~ msgid "maximum table size (%d) exceeded"
+#~ msgid "two actions at end of one rule"
-#~ msgstr "maximale tabelgrootte (%d) overschreden"
+#~ msgstr "twee akties aan het einde van één regel"
-
-#~ msgid "    $   \tgo to state %d\n"
-#~ msgstr "    $   \tga naar staat %d\n"
-
-#~ msgid "unterminated %guard clause"
-#~ msgstr "niet-beëindigde %guard-clausule"

po/pt_BR.po

@@ -4,9 +4,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: bison 1.49a\n"
+"Project-Id-Version: bison 1.49b\n"
-"POT-Creation-Date: 2002-08-11 00:16-0700\n"
+"POT-Creation-Date: 2002-09-27 16:50+0200\n"
-"PO-Revision-Date: 2002-07-24 17:35-0300\n"
+"PO-Revision-Date: 2002-08-28 00:20-0300\n"
 "Last-Translator: Alexandre Folle de Menezes <[email protected]>\n"
 "Language-Team: Brazilian Portuguese <[email protected]>\n"
 "MIME-Version: 1.0\n"
@@ -14,66 +14,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/LR0.c:63
-#, c-format
-msgid "state_list_append (state = %d, symbol = %d (%s))\n"
-msgstr ""
-
-#: src/LR0.c:181
-#, c-format
-msgid "Entering new_itemsets, state = %d\n"
-msgstr ""
-
-#: src/LR0.c:219
-#, c-format
-msgid "Entering get_state, symbol = %d (%s)\n"
-msgstr ""
-
-#: src/LR0.c:227
-#, c-format
-msgid "Exiting get_state => %d\n"
-msgstr ""
-
-#: src/LR0.c:247
-#, c-format
-msgid "Entering append_states, state = %d\n"
-msgstr ""
-
-#: src/LR0.c:355
-#, c-format
-msgid "Processing state %d (reached by %s)\n"
-msgstr ""
-
-#: src/assoc.c:31
-msgid "undefined associativity"
-msgstr ""
-
-#: src/closure.c:56
-#, c-format
-msgid "Closure: %s\n"
-msgstr ""
-
-#: src/closure.c:63
-#, fuzzy, c-format
-msgid "  (rule %d)\n"
-msgstr "   (regra %d)"
-
-#: src/closure.c:136
-msgid "RTC: Firsts Input"
-msgstr ""
-
-#: src/closure.c:139
-msgid "RTC: Firsts Output"
-msgstr ""
-
-#: src/closure.c:203
-msgid "input"
-msgstr ""
-
-#: src/closure.c:234
-msgid "output"
-msgstr ""
-
 #: src/complain.c:89 lib/error.c:128 lib/error.c:156
 msgid "Unknown system error"
 msgstr "Erro de sistema desconhecido"
@@ -87,22 +27,19 @@ msgid "fatal error: "
 msgstr "erro fatal: "
 
 #: src/conflicts.c:72
-#, fuzzy, c-format
+#, c-format
 msgid "    Conflict between rule %d and token %s resolved as shift"
-msgstr ""
+msgstr "    Conflito entre a regra %d e a token %s resolvido como `shift`."
-"Conflito no estado %d entre a regra %d e a token %s resolvido como %s.\n"
 
 #: src/conflicts.c:80
-#, fuzzy, c-format
+#, c-format
 msgid "    Conflict between rule %d and token %s resolved as reduce"
-msgstr ""
+msgstr "    Conflito entre a regra %d e a token %s resolvido como `reduce`."
-"Conflito no estado %d entre a regra %d e a token %s resolvido como %s.\n"
 
 #: src/conflicts.c:87
-#, fuzzy, c-format
+#, c-format
 msgid "    Conflict between rule %d and token %s resolved as an error"
-msgstr ""
+msgstr "    Conflito entre a regra %d e a token %s resolvido como um erro."
-"Conflito no estado %d entre a regra %d e a token %s resolvido como %s.\n"
 
 #: src/conflicts.c:402
 #, c-format
@@ -142,11 +79,11 @@ msgid "State %d contains "
 msgstr "O estado %d contém "
 
 #: src/conflicts.c:537
-#, fuzzy, c-format
+#, c-format
 msgid "expected %d shift/reduce conflict"
 msgid_plural "expected %d shift/reduce conflicts"
-msgstr[0] "esperado: %d conflito de deslocamento/redução\n"
+msgstr[0] "esperado: %d conflito de deslocamento/redução"
-msgstr[1] "esperados: %d conflitos de deslocamento/redução\n"
+msgstr[1] "esperados: %d conflitos de deslocamento/redução"
 
 #: src/files.c:114
 #, c-format
@@ -208,7 +145,6 @@ msgstr ""
 " --k, --token-table          inclui uma tabela de nomes de tokens\n"
 
 #: src/getargs.c:190
-#, fuzzy
 msgid ""
 "Output:\n"
 "  -d, --defines              also produce a header file\n"
@@ -221,7 +157,8 @@ msgid ""
 msgstr ""
 "Saída:\n"
 "  -d, --defines              também produz um arquivo de cabeçalho\n"
-"  -v, --verbose              também produz uma explicação do autômato\n"
+"  -r, --report=ITENS         também produz detalhes do autômato\n"
+"  -v, --verbose              o mesmo que `--report=state'\n"
 "  -b, --file-prefix=PREFIXO  especifica o PREFIXO para os arquivos de saída\n"
 "  -o, --output=ARQUIVO       armazena a saída em ARQUIVO\n"
 "  -g, --graph                também produz uma descrição em VCG do autômato\n"
@@ -236,6 +173,14 @@ msgid ""
 "  `all'          include all the above information\n"
 "  `none'         disable the report\n"
 msgstr ""
+"ITENS é uma lista separada por vírgulas, que pode incluir:\n"
+"  `state'        descreve os estados\n"
+"  `itemset'      completa os conjuntos de ítens básicos com seus "
+"fechamentos\n"
+"  `lookahead'    associa explicitamente as previsões com os ítens\n"
+"  `solved'       descreve a solução de conflitos de deslocamento/redução\n"
+"  `all'          inclui todas as informações acima\n"
+"  `none'         desabilita o relatório\n"
 
 #: src/getargs.c:212
 msgid "Report bugs to <[email protected]>.\n"
@@ -289,70 +234,22 @@ msgstr "vazio"
 msgid "Grammar"
 msgstr "Gramática"
 
-#: src/gram.c:250
-msgid ""
-"Variables\n"
-"---------\n"
-"\n"
-msgstr ""
-
-#: src/gram.c:253
-msgid "Value  Sprec  Sassoc  Tag\n"
-msgstr ""
-
-#: src/gram.c:263
-msgid ""
-"Rules\n"
-"-----\n"
-"\n"
-msgstr ""
-
-#: src/gram.c:266
-msgid "Num (Prec, Assoc, Useful, Ritem Range) Lhs -> Rhs (Ritem range) [Num]\n"
-msgstr ""
-
-#: src/gram.c:292
-msgid ""
-"Rules interpreted\n"
-"-----------------\n"
-"\n"
-msgstr ""
-
 #: src/gram.c:321 src/reduce.c:302 src/reduce.c:392
-#, fuzzy
 msgid "warning"
-msgstr "aviso: "
+msgstr "aviso"
 
 #: src/lalr.c:91
 #, c-format
 msgid "too many gotos (max %d)"
 msgstr "muitos gotos (máximo %d)"
 
-#: src/lalr.c:406
-msgid "Lookaheads: BEGIN\n"
-msgstr ""
-
-#: src/lalr.c:418
-#, c-format
-msgid "State %d: %d lookaheads\n"
-msgstr ""
-
-#: src/lalr.c:425
-#, c-format
-msgid "   on %d (%s) -> rule %d\n"
-msgstr ""
-
-#: src/lalr.c:430
-msgid "Lookaheads: END\n"
-msgstr ""
-
 #: src/main.c:117
 msgid "rule never reduced because of conflicts"
-msgstr ""
+msgstr "regra não reduzida por causa de conflitos"
 
-#: src/parse-gram.y:344
+#: parse-gram.y:347
 msgid "POSIX forbids declarations in the grammar"
-msgstr ""
+msgstr "o POSIX proíbe declarações na gramática"
 
 #: src/print.c:46
 #, c-format
@@ -360,32 +257,31 @@ msgid " type %d is %s\n"
 msgstr " tipo %d é %s\n"
 
 #: src/print.c:162
-#, fuzzy, c-format
+#, c-format
 msgid "shift, and go to state %d\n"
-msgstr "    %-4s\tdeslocar e ir ao estado %d\n"
+msgstr "deslocar, e ir ao estado %d\n"
 
 #: src/print.c:164
-#, fuzzy, c-format
+#, c-format
 msgid "go to state %d\n"
-msgstr "    %-4s\tir ao estado %d\n"
+msgstr "ir ao estado %d\n"
 
 #: src/print.c:201
-#, fuzzy
 msgid "error (nonassociative)\n"
-msgstr "    %-4s\terro (não associativo)\n"
+msgstr "erro (não associativo)\n"
 
 #: src/print.c:290
-#, fuzzy, c-format
+#, c-format
 msgid "reduce using rule %d (%s)"
-msgstr "    %-4s\treduzir usando a regra %d (%s)\n"
+msgstr "reduzir usando a regra %d (%s)"
 
 #: src/print.c:293
 msgid "accept"
-msgstr ""
+msgstr "aceitar"
 
 #: src/print.c:324 src/print.c:390
 msgid "$default"
-msgstr ""
+msgstr "$padrão"
 
 #: src/print.c:419
 #, c-format
@@ -409,9 +305,8 @@ msgid " on right:"
 msgstr " à direita:"
 
 #: src/print.c:552
-#, fuzzy
 msgid "Rules never reduced"
-msgstr "%d regra que nunca foi reduzida\n"
+msgstr "Regras nunca reduzidas"
 
 #: src/reader.c:52
 #, c-format
@@ -421,7 +316,7 @@ msgstr "declara
 #: src/reader.c:141
 #, c-format
 msgid "result type clash on merge function %s: `%s' vs. `%s'"
-msgstr ""
+msgstr "tipo de resultado conflita na fução de mescla %s: `%s' vs. `%s'"
 
 #: src/reader.c:239
 #, c-format
@@ -444,27 +339,27 @@ msgstr "dois @prec em uma linha"
 #: src/reader.c:353
 #, c-format
 msgid "%%dprec affects only GLR parsers"
-msgstr ""
+msgstr "%%dprec afeta apenas analisadores GLR"
 
 #: src/reader.c:355
 #, c-format
 msgid "%%dprec must be followed by positive number"
-msgstr ""
+msgstr "%%dprec deve ser seguido por um número positivo"
 
 #: src/reader.c:357
 #, c-format
 msgid "only one %%dprec allowed per rule"
-msgstr ""
+msgstr "apenas um %%dprec é permitido por regra"
 
 #: src/reader.c:368
 #, c-format
 msgid "%%merge affects only GLR parsers"
-msgstr ""
+msgstr "%%merge afeta apenas analisadores GLR"
 
 #: src/reader.c:370
 #, c-format
 msgid "only one %%merge allowed per rule"
-msgstr ""
+msgstr "apenas um %%merge é permitido por regra"
 
 #: src/reader.c:513
 msgid "no rules in the input grammar"
@@ -476,29 +371,24 @@ msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "muitos símbolos (terminais e não-terminais); máximo %d"
 
 #: src/reduce.c:239
-#, fuzzy
 msgid "useless rule"
-msgstr "%d regra inútil"
+msgstr "regra inútil"
 
 #: src/reduce.c:302
-#, fuzzy
 msgid "useless nonterminal"
-msgstr "%d não-terminal inútil"
+msgstr "não-terminal inútil"
 
 #: src/reduce.c:349
-#, fuzzy
 msgid "Useless nonterminals"
-msgstr "Não-terminais inúteis:"
+msgstr "Não-terminais inúteis"
 
 #: src/reduce.c:362
-#, fuzzy
 msgid "Terminals which are not used"
-msgstr "Terminais não usados:"
+msgstr "Terminais que não foram usados"
 
 #: src/reduce.c:371
-#, fuzzy
 msgid "Useless rules"
-msgstr "Regras inúteis:"
+msgstr "Regras inúteis"
 
 #: src/reduce.c:387
 #, c-format
@@ -526,75 +416,61 @@ msgstr[0] "%d regra in
 msgstr[1] "%d regras inúteis"
 
 #: src/reduce.c:435
-#, fuzzy, c-format
+#, c-format
 msgid "start symbol %s does not derive any sentence"
-msgstr "O símbolo de início %s não deriva nenhuma sentença"
+msgstr "símbolo de início %s não deriva nenhuma sentença"
 
-#: src/relation.c:137
+#: scan-gram.l:202
-msgid "relation_transpose: input\n"
-msgstr ""
-
-#: src/relation.c:176
-msgid "relation_transpose: output\n"
-msgstr ""
-
-#: src/scan-gram.l:202
 #, c-format
 msgid ": invalid character: `%c'\n"
-msgstr ""
+msgstr ": caractere inválido: `%c'\n"
 
-#: src/scan-gram.l:246
+#: scan-gram.l:246
-#, fuzzy
 msgid ": unexpected end of file in a comment\n"
-msgstr "fim de arquivo inesperado"
+msgstr ": fim de arquivo inesperado em um comentário\n"
 
-#: src/scan-gram.l:274 src/scan-gram.l:412
+#: scan-gram.l:274 scan-gram.l:412
-#, fuzzy
 msgid ": unexpected end of file in a string\n"
-msgstr "fim de arquivo inesperado"
+msgstr ": fim de arquivo inesperado em uma string\n"
 
-#: src/scan-gram.l:311 src/scan-gram.l:383
+#: scan-gram.l:311 scan-gram.l:383
-#, fuzzy
 msgid ": unexpected end of file in a character\n"
-msgstr "fim de arquivo inesperado"
+msgstr ": fim de arquivo inesperado em um caractere\n"
 
-#: src/scan-gram.l:332
+#: scan-gram.l:332
-#, fuzzy, c-format
+#, c-format
 msgid ": invalid escape: %s\n"
-msgstr "valor inválido: %s%d"
+msgstr ": escape inválido: %s\n"
 
-#: src/scan-gram.l:353
+#: scan-gram.l:353
-#, fuzzy, c-format
+#, c-format
 msgid ": unrecognized escape: %s\n"
-msgstr "não reconhecido: %s"
+msgstr ": escape não reconhecido: %s\n"
 
-#: src/scan-gram.l:473
+#: scan-gram.l:473
-#, fuzzy
 msgid ": unexpected end of file in a braced code\n"
-msgstr "fim de arquivo inesperado"
+msgstr ": fim de arquivo inesperado em código entre chaves\n"
 
-#: src/scan-gram.l:502
+#: scan-gram.l:502
-#, fuzzy
 msgid ": unexpected end of file in a prologue\n"
-msgstr "fim de arquivo inesperado"
+msgstr ": fim de arquivo inesperado em um prólogo\n"
 
-#: src/scan-gram.l:560
+#: scan-gram.l:560
 #, c-format
 msgid "$$ of `%s' has no declared type"
 msgstr "$$ de `%s' não tem tipo declarado"
 
-#: src/scan-gram.l:577 src/scan-gram.l:664
+#: scan-gram.l:577 scan-gram.l:664
 #, c-format
 msgid "invalid value: %s%d"
 msgstr "valor inválido: %s%d"
 
-#: src/scan-gram.l:584
+#: scan-gram.l:584
 #, c-format
 msgid "$%d of `%s' has no declared type"
 msgstr "$%d de `%s' não tem tipo declarado"
 
-#: src/scan-gram.l:595 src/scan-gram.l:612 src/scan-gram.l:671
+#: scan-gram.l:595 scan-gram.l:612 scan-gram.l:671 scan-gram.l:688
-#: src/scan-gram.l:688
 #, c-format
 msgid "%s is invalid"
 msgstr "%s é inválido"
@@ -614,9 +490,9 @@ msgid "type redeclaration for %s"
 msgstr "redeclaração de tipo para %s"
 
 #: src/symtab.c:98 src/symtab.c:117
-#, fuzzy, c-format
+#, c-format
 msgid "%s redeclaration for %s"
-msgstr "redeclaração de tipo para %s"
+msgstr "redeclaração de %s para %s"
 
 #: src/symtab.c:138
 #, c-format
@@ -629,9 +505,9 @@ msgid "symbol %s redefined"
 msgstr "símbolo %s redefinido"
 
 #: src/symtab.c:180
-#, fuzzy, c-format
+#, c-format
 msgid "redefining user token number of %s"
-msgstr "redefinindo precedência de %s"
+msgstr "redefinindo número de token de usuário de %s"
 
 #: src/symtab.c:225
 #, c-format
@@ -654,9 +530,9 @@ msgid "conflicting precedences for %s and %s"
 msgstr "precedências conflitantes para  %s e %s"
 
 #: src/symtab.c:293
-#, fuzzy, c-format
+#, c-format
 msgid "conflicting associativities for %s (%s) and %s (%s)"
-msgstr "valores assoc conflitantes para %s e %s"
+msgstr "valores associativos conflitantes para %s (%s) e %s (%s)"
 
 #: src/symtab.c:363
 #, c-format
@@ -673,93 +549,85 @@ msgstr "o s
 msgid "the start symbol %s is a token"
 msgstr "o símbolo de início %s é um terminal"
 
-#: src/tables.c:210
-#, c-format
-msgid "growing table and check from: %lu to %lu\n"
-msgstr ""
-
-#: src/tables.c:757
-#, c-format
-msgid "base_t too small to hold %d\n"
-msgstr ""
-
 #: lib/argmatch.c:161
-#, fuzzy, c-format
+#, c-format
 msgid "invalid argument %s for %s"
-msgstr "valor inválido: %s%d"
+msgstr "argumento %s inválido para %s"
 
 #: lib/argmatch.c:162
 #, c-format
 msgid "ambiguous argument %s for %s"
-msgstr ""
+msgstr "argumento %s ambíguo para %s"
 
 #: lib/argmatch.c:181
 msgid "Valid arguments are:"
-msgstr ""
+msgstr "Argumentos válidos são:"
 
 #: lib/bitset_stats.c:226
 #, c-format
 msgid "%d bitset_allocs, %d freed (%.2f%%).\n"
-msgstr ""
+msgstr "%d bitset_allocs, %d liberados (%.2f%%).\n"
 
 #: lib/bitset_stats.c:229
 #, c-format
 msgid "%d bitset_sets, %d cached (%.2f%%)\n"
-msgstr ""
+msgstr "%d bitset_sets, %d em cache (%.2f%%)\n"
 
 #: lib/bitset_stats.c:232
 #, c-format
 msgid "%d bitset_resets, %d cached (%.2f%%)\n"
-msgstr ""
+msgstr "%d bitset_resets, %d em cache (%.2f%%)\n"
 
 #: lib/bitset_stats.c:235
 #, c-format
 msgid "%d bitset_tests, %d cached (%.2f%%)\n"
-msgstr ""
+msgstr "%d bitset_tests, %d em cache (%.2f%%)\n"
 
 #: lib/bitset_stats.c:239
 #, c-format
 msgid "%d bitset_lists\n"
-msgstr ""
+msgstr "%d bitset_lists\n"
 
 #: lib/bitset_stats.c:241
 msgid "count log histogram\n"
-msgstr ""
+msgstr "histograma de log de contagens\n"
 
 #: lib/bitset_stats.c:244
 msgid "size log histogram\n"
-msgstr ""
+msgstr "histograma de log de tamanhos\n"
 
 #: lib/bitset_stats.c:247
 msgid "density histogram\n"
-msgstr ""
+msgstr "histograma de densidades\n"
 
 #: lib/bitset_stats.c:264
 msgid ""
 "Bitset statistics:\n"
 "\n"
 msgstr ""
+"Estatísticas de bitset:\n"
+"\n"
 
 #: lib/bitset_stats.c:267
 #, c-format
 msgid "Accumulated runs = %d\n"
-msgstr ""
+msgstr "Execuções acumuladas = %d\n"
 
 #: lib/bitset_stats.c:311
 msgid "Could not read stats file."
-msgstr ""
+msgstr "Impossível ler o arquivo de estatísticas."
 
 #: lib/bitset_stats.c:313
 msgid "Bad stats file size.\n"
-msgstr ""
+msgstr "Tamanho do arquivo de estatísticas com erro.\n"
 
 #: lib/bitset_stats.c:339
 msgid "Could not write stats file."
-msgstr ""
+msgstr "Impossível de escrever no arquivo de estatísticas."
 
 #: lib/bitset_stats.c:343
 msgid "Could not open stats file for writing."
-msgstr ""
+msgstr "Impossível abrir arquivo de estatísticas para escrita."
 
 #: lib/getopt.c:662
 #, c-format
@@ -833,158 +701,112 @@ msgid ""
 "\n"
 "Execution times (seconds)\n"
 msgstr ""
+"\n"
+"Tempos de execução (segundos)\n"
 
 #: lib/timevar.c:516
 msgid " TOTAL                 :"
-msgstr ""
+msgstr " TOTAL                 :"
 
 #: lib/timevar.c:552
 #, c-format
 msgid "time in %s: %ld.%06ld (%ld%%)\n"
-msgstr ""
+msgstr "tempo em  %s: %ld.%06ld (%ld%%)\n"
 
-#~ msgid "reduce"
+#~ msgid "state_list_append (state = %d, symbol = %d (%s))\n"
-#~ msgstr "reduzir"
+#~ msgstr "state_list_append (estado = %d, símbolo = %d (%s))\n"
 
-#~ msgid "shift"
+#~ msgid "Entering new_itemsets, state = %d\n"
-#~ msgstr "deslocar"
+#~ msgstr "Entrando new_itemsets, estado = %d\n"
 
-#~ msgid "an error"
+#~ msgid "Entering get_state, symbol = %d (%s)\n"
-#~ msgstr "um erro"
+#~ msgstr "Entrando get_state, símbolo = %d (%s)\n"
 
-#~ msgid "%s contains "
+#~ msgid "Exiting get_state => %d\n"
-#~ msgstr "%s contém "
+#~ msgstr "Saindo get_state => %d\n"
 
-#~ msgid "`%s' is no longer supported"
+#~ msgid "Entering append_states, state = %d\n"
-#~ msgstr "`%s' não é mais suportado"
+#~ msgstr "Entrando append_states, estado = %d\n"
 
-#~ msgid "unexpected `/' found and ignored"
+#~ msgid "Processing state %d (reached by %s)\n"
-#~ msgstr "encontrado e ignorado um `/' inesperado"
+#~ msgstr "Processando estado %d (alcançado por %s)\n"
 
-#~ msgid "unterminated comment"
+#~ msgid "undefined associativity"
-#~ msgstr "comentario não terminado"
+#~ msgstr "associatividade indefinida"
 
-#~ msgid "unescaped newline in constant"
+#~ msgid "Closure: %s\n"
-#~ msgstr "salto de linha em constante sem escape"
+#~ msgstr "Fechamento: %s\n"
 
-#~ msgid "octal value outside range 0...255: `\\%o'"
+#~ msgid "  (rule %d)\n"
-#~ msgstr "valor octal fora da faixa 0...255: `\\%o'"
+#~ msgstr "   (regra %d)\n"
 
-#~ msgid "hexadecimal value above 255: `\\x%x'"
+#~ msgid "RTC: Firsts Input"
-#~ msgstr "valor hexadecimal maior que 255: `\\x%x'"
+#~ msgstr "RTC: Entradas Antes"
 
-#~ msgid "unknown escape sequence: `\\' followed by `%s'"
+#~ msgid "RTC: Firsts Output"
-#~ msgstr "seqüência de escape desconhecida: `\\' seguido de `%s'"
+#~ msgstr "RTC: Saídas Antes"
 
-#~ msgid "unterminated type name at end of file"
+#~ msgid "input"
-#~ msgstr "nome de tipo sem terminação no final do arquivo"
+#~ msgstr "entrada"
 
-#~ msgid "unterminated type name"
+#~ msgid "output"
-#~ msgstr "nome de tipo sem terminação"
+#~ msgstr "saída"
-
-#~ msgid "use \"...\" for multi-character literal tokens"
-#~ msgstr "use \"...\" para tokens literais multi-caracteres"
-
-#~ msgid "`%s' supports no argument: %s"
-#~ msgstr "`%s' não suporta o argumento: %s"
-
-#~ msgid "`%s' requires an argument"
-#~ msgstr "`%s' exige um argumento"
 
 #~ msgid ""
-#~ "    $default\treduce using rule %d (%s)\n"
+#~ "Variables\n"
+#~ "---------\n"
 #~ "\n"
 #~ msgstr ""
-#~ "    $default\treduzir usando a regra %d (%s)\n"
+#~ "Variáveis\n"
+#~ "---------\n"
 #~ "\n"
 
-#~ msgid "    %-4s\t[reduce using rule %d (%s)]\n"
+#~ msgid "Value  Sprec  Sassoc  Tag\n"
-#~ msgstr "    %-4s\t[reduzir usando a regra %d (%s)]\n"
+#~ msgstr "Valor  Sprec  Sassoc  Tag\n"
 
-#~ msgid "    $default\treduce using rule %d (%s)\n"
+#~ msgid ""
-#~ msgstr "    $default\treduzir usando a regra %d (%s)\n"
+#~ "Rules\n"
-
+#~ "-----\n"
-#~ msgid "    $default\taccept\n"
+#~ "\n"
-#~ msgstr "    $default\taceitar\n"
-
-#~ msgid "    NO ACTIONS\n"
-#~ msgstr "    SEM AÇÕES\n"
-
-#~ msgid "Number, Line, Rule"
-#~ msgstr "Número, Linha, Regra"
-
-#~ msgid "  %3d %3d %s ->"
-#~ msgstr "  %3d %3d %s ->"
-
-#~ msgid "   Skipping to next \\n"
-#~ msgstr "   Pulando para o próximo \\n"
-
-#~ msgid "   Skipping to next %c"
-#~ msgstr "   Pulando para o próximo %c"
-
-#~ msgid "unterminated string at end of file"
-#~ msgstr "string não terminada no final do arquivo"
-
-#~ msgid "unterminated string"
-#~ msgstr "string não terminada"
-
-#~ msgid "unterminated `%{' definition"
-#~ msgstr "definição `%{' não terminada"
-
-#~ msgid "Premature EOF after %s"
-#~ msgstr "EOF prematuor depois de %s"
-
-#~ msgid "`%s' is invalid in %s"
-#~ msgstr "`%s' é inválido em %s"
-
-#~ msgid "invalid %s declaration"
-#~ msgstr "declaração de %s inválida"
-
-#~ msgid "%type declaration has no <typename>"
-#~ msgstr "a declaração %type no tem <nome-de-tipo>"
-
-#~ msgid "invalid %%type declaration due to item: %s"
-#~ msgstr "declaração de %%type inválida devido ao ítem: %s"
-
-#~ msgid "invalid text (%s) - number should be after identifier"
 #~ msgstr ""
-#~ "texto inválido (%s) - o número deveria estar depois do identificador"
+#~ "Regras\n"
+#~ "------\n"
+#~ "\n"
 
-#~ msgid "unexpected item: %s"
+#~ msgid ""
-#~ msgstr "ítem inesperado: %s"
+#~ "Num (Prec, Assoc, Useful, Ritem Range) Lhs -> Rhs (Ritem range) [Num]\n"
+#~ msgstr ""
+#~ "Num (Prec, Assoc, Util, Faixa Ritem) Lhs -> Rhs (Faixa Ritem) [Num]\n"
 
-#~ msgid "unmatched %s"
+#~ msgid ""
-#~ msgstr "%s sem correspondência"
+#~ "Rules interpreted\n"
+#~ "-----------------\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Regras interpretadas\n"
+#~ "--------------------\n"
+#~ "\n"
 
-#~ msgid "argument of %%expect is not an integer"
+#~ msgid "Lookaheads: BEGIN\n"
-#~ msgstr "o argumento de %%expect não é um inteiro"
+#~ msgstr "Previsões: INICIO\n"
 
-#~ msgid "unrecognized item %s, expected an identifier"
+#~ msgid "State %d: %d lookaheads\n"
-#~ msgstr "ítem %s desconhecido, era esperado um identificador"
+#~ msgstr "Estado %d: %d previsões\n"
 
-#~ msgid "expected string constant instead of %s"
+#~ msgid "   on %d (%s) -> rule %d\n"
-#~ msgstr "era esperada uma string constante no lugar de %s"
+#~ msgstr "   em %d (%s) -> regra %d\n"
 
-#~ msgid "no input grammar"
+#~ msgid "Lookaheads: END\n"
-#~ msgstr "não há gramática de entrada"
+#~ msgstr "Previsões: FIM\n"
 
-#~ msgid "unknown character: %s"
+#~ msgid "relation_transpose: input\n"
-#~ msgstr "caractere desconhecido: %s"
+#~ msgstr "relation_transpose: entrada\n"
 
-#~ msgid "ill-formed rule: initial symbol not followed by colon"
+#~ msgid "relation_transpose: output\n"
-#~ msgstr "regra mal formada: o símbolo inicial não está seguido por :"
+#~ msgstr "relation_transpose: saída\n"
 
-#~ msgid "grammar starts with vertical bar"
+#~ msgid "growing table and check from: %lu to %lu\n"
-#~ msgstr "a gramática começa com uma barra vertical"
+#~ msgstr "aumentando a tabela e checando origem:  %lu para %lu\n"
 
-#~ msgid "previous rule lacks an ending `;'"
+#~ msgid "base_t too small to hold %d\n"
-#~ msgstr "falta um `;' no final da regra anterior"
+#~ msgstr "base_t muito pequeno para guardar %d\n"
-
-#~ msgid "%%guard present but %%semantic_parser not specified"
-#~ msgstr "%%guard presente mas %%semantic_parser não especificado"
-
-#~ msgid "two actions at end of one rule"
-#~ msgstr "duas ações no final de uma regra"
-
-#~ msgid "invalid input: %s"
-#~ msgstr "entrada inválida: %s"

po/ru.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.49a\n"
-"POT-Creation-Date: 2002-08-11 00:16-0700\n"
+"POT-Creation-Date: 2002-09-27 16:50+0200\n"
 "PO-Revision-Date: 2002-07-20 13:23+0400\n"
 "Last-Translator: Dmitry S. Sivachenko <[email protected]>\n"
 "Language-Team: Russian <[email protected]>\n"
@@ -15,66 +15,6 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: src/LR0.c:63
-#, c-format
-msgid "state_list_append (state = %d, symbol = %d (%s))\n"
-msgstr ""
-
-#: src/LR0.c:181
-#, c-format
-msgid "Entering new_itemsets, state = %d\n"
-msgstr ""
-
-#: src/LR0.c:219
-#, c-format
-msgid "Entering get_state, symbol = %d (%s)\n"
-msgstr ""
-
-#: src/LR0.c:227
-#, fuzzy, c-format
-msgid "Exiting get_state => %d\n"
-msgstr "    %-4s\tÐÅÒÅÈÏÄ × ÓÏÓÔÏÑÎÉÅ %d\n"
-
-#: src/LR0.c:247
-#, c-format
-msgid "Entering append_states, state = %d\n"
-msgstr ""
-
-#: src/LR0.c:355
-#, c-format
-msgid "Processing state %d (reached by %s)\n"
-msgstr ""
-
-#: src/assoc.c:31
-msgid "undefined associativity"
-msgstr ""
-
-#: src/closure.c:56
-#, c-format
-msgid "Closure: %s\n"
-msgstr ""
-
-#: src/closure.c:63
-#, fuzzy, c-format
-msgid "  (rule %d)\n"
-msgstr "   (ÐÒÁ×ÉÌÏ %d)"
-
-#: src/closure.c:136
-msgid "RTC: Firsts Input"
-msgstr ""
-
-#: src/closure.c:139
-msgid "RTC: Firsts Output"
-msgstr ""
-
-#: src/closure.c:203
-msgid "input"
-msgstr ""
-
-#: src/closure.c:234
-msgid "output"
-msgstr ""
-
 #: src/complain.c:89 lib/error.c:128 lib/error.c:156
 msgid "Unknown system error"
 msgstr "îÅÉÚ×ÅÓÔÎÁÑ ÓÉÓÔÅÍÎÁÑ ÏÛÉÂËÁ"
@@ -294,45 +234,6 @@ msgstr "
 msgid "Grammar"
 msgstr "çÒÁÍÍÁÔÉËÁ"
 
-#: src/gram.c:250
-msgid ""
-"Variables\n"
-"---------\n"
-"\n"
-msgstr ""
-"ðÅÒÅÍÅÎÎÙÅ\n"
-"----------\n"
-"\n"
-
-#: src/gram.c:253
-#, fuzzy
-msgid "Value  Sprec  Sassoc  Tag\n"
-msgstr "úÎÁÞ   ðÒÉÏÒ    áÓÓÏÃ     ôÅÇ\n"
-
-#: src/gram.c:263
-msgid ""
-"Rules\n"
-"-----\n"
-"\n"
-msgstr ""
-"ðÒÁ×ÉÌÁ\n"
-"-------\n"
-"\n"
-
-#: src/gram.c:266
-msgid "Num (Prec, Assoc, Useful, Ritem Range) Lhs -> Rhs (Ritem range) [Num]\n"
-msgstr ""
-
-#: src/gram.c:292
-msgid ""
-"Rules interpreted\n"
-"-----------------\n"
-"\n"
-msgstr ""
-"éÎÔÅÒÐÒÅÔÉÒÏ×ÁÎÎÙÅ ÐÒÁ×ÉÌÁ\n"
-"--------------------------\n"
-"\n"
-
 #: src/gram.c:321 src/reduce.c:302 src/reduce.c:392
 #, fuzzy
 msgid "warning"
@@ -343,30 +244,12 @@ msgstr "
 msgid "too many gotos (max %d)"
 msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ goto (ÍÁËÓÉÍÁÌØÎÏ %d)"
 
-#: src/lalr.c:406
-msgid "Lookaheads: BEGIN\n"
-msgstr ""
-
-#: src/lalr.c:418
-#, c-format
-msgid "State %d: %d lookaheads\n"
-msgstr ""
-
-#: src/lalr.c:425
-#, c-format
-msgid "   on %d (%s) -> rule %d\n"
-msgstr ""
-
-#: src/lalr.c:430
-msgid "Lookaheads: END\n"
-msgstr ""
-
 #: src/main.c:117
 #, fuzzy
 msgid "rule never reduced because of conflicts"
 msgstr " 1 ËÏÎÆÌÉËÔ ×Ù×ÏÄÁ/×Ù×ÏÄÁ"
 
-#: src/parse-gram.y:344
+#: parse-gram.y:347
 msgid "POSIX forbids declarations in the grammar"
 msgstr ""
 
@@ -550,71 +433,62 @@ msgstr[2] "%d
 msgid "start symbol %s does not derive any sentence"
 msgstr "îÁÞÁÌØÎÙÊ ÓÉÍ×ÏÌ %s ÎÅ ×Ù×ÏÄÉÔ ÎÉ ÏÄÎÏÇÏ ÐÒÅÄÌÏÖÅÎÉÑ"
 
-#: src/relation.c:137
+#: scan-gram.l:202
-msgid "relation_transpose: input\n"
-msgstr ""
-
-#: src/relation.c:176
-msgid "relation_transpose: output\n"
-msgstr ""
-
-#: src/scan-gram.l:202
 #, c-format
 msgid ": invalid character: `%c'\n"
 msgstr ""
 
-#: src/scan-gram.l:246
+#: scan-gram.l:246
 #, fuzzy
 msgid ": unexpected end of file in a comment\n"
 msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ËÏÎÅÃ ÆÁÊÌÁ"
 
-#: src/scan-gram.l:274 src/scan-gram.l:412
+#: scan-gram.l:274 scan-gram.l:412
 #, fuzzy
 msgid ": unexpected end of file in a string\n"
 msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ËÏÎÅÃ ÆÁÊÌÁ"
 
-#: src/scan-gram.l:311 src/scan-gram.l:383
+#: scan-gram.l:311 scan-gram.l:383
 #, fuzzy
 msgid ": unexpected end of file in a character\n"
 msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ËÏÎÅÃ ÆÁÊÌÁ"
 
-#: src/scan-gram.l:332
+#: scan-gram.l:332
 #, fuzzy, c-format
 msgid ": invalid escape: %s\n"
 msgstr "ÎÅ×ÅÒÎÏÅ ÚÎÁÞÅÎÉÅ: %s%d"
 
-#: src/scan-gram.l:353
+#: scan-gram.l:353
 #, fuzzy, c-format
 msgid ": unrecognized escape: %s\n"
 msgstr "ÎÅÒÁÓÐÏÚÎÁÎÏ: %s"
 
-#: src/scan-gram.l:473
+#: scan-gram.l:473
 #, fuzzy
 msgid ": unexpected end of file in a braced code\n"
 msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ËÏÎÅÃ ÆÁÊÌÁ"
 
-#: src/scan-gram.l:502
+#: scan-gram.l:502
 #, fuzzy
 msgid ": unexpected end of file in a prologue\n"
 msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ËÏÎÅÃ ÆÁÊÌÁ"
 
-#: src/scan-gram.l:560
+#: scan-gram.l:560
 #, c-format
 msgid "$$ of `%s' has no declared type"
 msgstr "$$ × `%s' ÎÅ ÉÍÅÅÔ ÏÐÉÓÁÎÎÏÇÏ ÔÉÐÁ"
 
-#: src/scan-gram.l:577 src/scan-gram.l:664
+#: scan-gram.l:577 scan-gram.l:664
 #, c-format
 msgid "invalid value: %s%d"
 msgstr "ÎÅ×ÅÒÎÏÅ ÚÎÁÞÅÎÉÅ: %s%d"
 
-#: src/scan-gram.l:584
+#: scan-gram.l:584
 #, c-format
 msgid "$%d of `%s' has no declared type"
 msgstr "$%d ÉÚ `%s' ÎÅ ÉÍÅÅÔ ÏÐÉÓÁÎÎÏÇÏ ÔÉÐÁ"
 
-#: src/scan-gram.l:595 src/scan-gram.l:612 src/scan-gram.l:671
+#: scan-gram.l:595 scan-gram.l:612 scan-gram.l:671 scan-gram.l:688
-#: src/scan-gram.l:688
 #, c-format
 msgid "%s is invalid"
 msgstr "ÎÅ×ÅÒÎÙÊ ÚÎÁË %s"
@@ -693,16 +567,6 @@ msgstr "
 msgid "the start symbol %s is a token"
 msgstr "ÎÁÞÁÌØÎÙÊ ÓÉÍ×ÏÌ %s Ñ×ÌÑÅÔÓÑ ÌÅËÓÅÍÏÊ"
 
-#: src/tables.c:210
-#, c-format
-msgid "growing table and check from: %lu to %lu\n"
-msgstr ""
-
-#: src/tables.c:757
-#, c-format
-msgid "base_t too small to hold %d\n"
-msgstr ""
-
 #: lib/argmatch.c:161
 #, fuzzy, c-format
 msgid "invalid argument %s for %s"
@@ -911,6 +775,9 @@ msgstr ""
 #~ msgid "`%s' requires an argument"
 #~ msgstr "ËÌÀÞ `%s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ Ó ÁÒÇÕÍÅÎÔÏÍ"
 
+#~ msgid "   (rule %d)"
+#~ msgstr "   (ÐÒÁ×ÉÌÏ %d)"
+
 #~ msgid "    %-4s\terror (nonassociative)\n"
 #~ msgstr "    %-4s\tÏÛÉÂËÁ (ÎÅÁÓÓÏÃÉÁÔÉ×ÎÁÑ)\n"
 
@@ -1050,6 +917,36 @@ msgstr ""
 #~ msgid "multiple %%source_extension declarations"
 #~ msgstr "ÍÎÏÖÅÓÔ×ÅÎÎÙÅ ÏÐÉÓÁÎÉÑ %%source_extension"
 
+#~ msgid ""
+#~ "Variables\n"
+#~ "---------\n"
+#~ "\n"
+#~ msgstr ""
+#~ "ðÅÒÅÍÅÎÎÙÅ\n"
+#~ "----------\n"
+#~ "\n"
+
+#~ msgid "Value  Sprec    Sassoc    Tag\n"
+#~ msgstr "úÎÁÞ   ðÒÉÏÒ    áÓÓÏÃ     ôÅÇ\n"
+
+#~ msgid ""
+#~ "Rules\n"
+#~ "-----\n"
+#~ "\n"
+#~ msgstr ""
+#~ "ðÒÁ×ÉÌÁ\n"
+#~ "-------\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Rules interpreted\n"
+#~ "-----------------\n"
+#~ "\n"
+#~ msgstr ""
+#~ "éÎÔÅÒÐÒÅÔÉÒÏ×ÁÎÎÙÅ ÐÒÁ×ÉÌÁ\n"
+#~ "--------------------------\n"
+#~ "\n"
+
 #~ msgid ""
 #~ "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n"
 #~ msgstr ""

po/sv.po

@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: bison 1.49a\n"
+"Project-Id-Version: bison 1.49b\n"
-"POT-Creation-Date: 2002-08-11 00:16-0700\n"
+"POT-Creation-Date: 2002-09-27 16:50+0200\n"
-"PO-Revision-Date: 2002-05-04 11:27+0200\n"
+"PO-Revision-Date: 2002-08-24 21:56+0200\n"
 "Last-Translator: Göran Uddeborg <[email protected]>\n"
 "Language-Team: Swedish <[email protected]>\n"
 "MIME-Version: 1.0\n"
@@ -15,66 +15,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/LR0.c:63
-#, c-format
-msgid "state_list_append (state = %d, symbol = %d (%s))\n"
-msgstr ""
-
-#: src/LR0.c:181
-#, c-format
-msgid "Entering new_itemsets, state = %d\n"
-msgstr ""
-
-#: src/LR0.c:219
-#, c-format
-msgid "Entering get_state, symbol = %d (%s)\n"
-msgstr ""
-
-#: src/LR0.c:227
-#, fuzzy, c-format
-msgid "Exiting get_state => %d\n"
-msgstr "    %-4s\tgå till tillstånd %d\n"
-
-#: src/LR0.c:247
-#, c-format
-msgid "Entering append_states, state = %d\n"
-msgstr ""
-
-#: src/LR0.c:355
-#, c-format
-msgid "Processing state %d (reached by %s)\n"
-msgstr ""
-
-#: src/assoc.c:31
-msgid "undefined associativity"
-msgstr ""
-
-#: src/closure.c:56
-#, c-format
-msgid "Closure: %s\n"
-msgstr ""
-
-#: src/closure.c:63
-#, fuzzy, c-format
-msgid "  (rule %d)\n"
-msgstr "   (regel %d)"
-
-#: src/closure.c:136
-msgid "RTC: Firsts Input"
-msgstr ""
-
-#: src/closure.c:139
-msgid "RTC: Firsts Output"
-msgstr ""
-
-#: src/closure.c:203
-msgid "input"
-msgstr ""
-
-#: src/closure.c:234
-msgid "output"
-msgstr ""
-
 #: src/complain.c:89 lib/error.c:128 lib/error.c:156
 msgid "Unknown system error"
 msgstr "Okänt systemfel"
@@ -88,22 +28,19 @@ msgid "fatal error: "
 msgstr "ödesdigert fel: "
 
 #: src/conflicts.c:72
-#, fuzzy, c-format
+#, c-format
 msgid "    Conflict between rule %d and token %s resolved as shift"
-msgstr ""
+msgstr "    Konflikt mellan regel %d och element %s löstes som skift"
-"Konflikt i tillstånd %d mellan regel %d och element %s, löstes med %s.\n"
 
 #: src/conflicts.c:80
-#, fuzzy, c-format
+#, c-format
 msgid "    Conflict between rule %d and token %s resolved as reduce"
-msgstr ""
+msgstr "    Konflikt mellan regel %d och element %s löstes som reducera"
-"Konflikt i tillstånd %d mellan regel %d och element %s, löstes med %s.\n"
 
 #: src/conflicts.c:87
-#, fuzzy, c-format
+#, c-format
 msgid "    Conflict between rule %d and token %s resolved as an error"
-msgstr ""
+msgstr "    Konflikt mellan regel %d och element %s löstes som ett fel"
-"Konflikt i tillstånd %d mellan regel %d och element %s, löstes med %s.\n"
 
 #: src/conflicts.c:402
 #, c-format
@@ -143,11 +80,11 @@ msgid "State %d contains "
 msgstr "Tillstånd %d innehåller "
 
 #: src/conflicts.c:537
-#, fuzzy, c-format
+#, c-format
 msgid "expected %d shift/reduce conflict"
 msgid_plural "expected %d shift/reduce conflicts"
-msgstr[0] "förväntade %d skifta/reducerakonflikt\n"
+msgstr[0] "förväntade %d skifta/reducerakonflikt"
-msgstr[1] "förväntade %d skifta/reducerakonflikter\n"
+msgstr[1] "förväntade %d skifta/reducerakonflikter"
 
 #: src/files.c:114
 #, c-format
@@ -209,7 +146,6 @@ msgstr ""
 "  -k, --token-table          inkludera en tabell över elementnamn\n"
 
 #: src/getargs.c:190
-#, fuzzy
 msgid ""
 "Output:\n"
 "  -d, --defines              also produce a header file\n"
@@ -222,7 +158,8 @@ msgid ""
 msgstr ""
 "Utdata:\n"
 "  -d, --defines              skapa också en huvudfil\n"
-"  -v, --verbose              skapa också en förklaring av automaten\n"
+"  -r, --report=SAKER         skapa också detaljer om automaten\n"
+"  -v, --verbose              samma som \"--report=state\"\n"
 "  -b, --file-prefix=PREFIX   ange ett PREFIX för utdatafiler\n"
 "  -o, --output=FIL           lägg utdata i FIL\n"
 "  -g, --graph                skapa också en VCG-beskrivning av automaten\n"
@@ -237,6 +174,13 @@ msgid ""
 "  `all'          include all the above information\n"
 "  `none'         disable the report\n"
 msgstr ""
+"SAKER är en lista med kommaseparerade ord som kan innehålla:\n"
+"  \"state\"        beskriv tillstånden\n"
+"  \"itemset\"      komplettera kärnobjektmängderna med sina höljen\n"
+"  \"lookahead\"    koppla uttryckligen framåtblickar till objekt\n"
+"  \"solved\"       beskriv lösningar av skifta/reducerakonflikter\n"
+"  \"all\"          inkludera all ovanstående information\n"
+"  \"none\"         avaktivera rapporten\n"
 
 #: src/getargs.c:212
 msgid "Report bugs to <[email protected]>.\n"
@@ -290,70 +234,22 @@ msgstr "tom"
 msgid "Grammar"
 msgstr "Grammatik"
 
-#: src/gram.c:250
-msgid ""
-"Variables\n"
-"---------\n"
-"\n"
-msgstr ""
-
-#: src/gram.c:253
-msgid "Value  Sprec  Sassoc  Tag\n"
-msgstr ""
-
-#: src/gram.c:263
-msgid ""
-"Rules\n"
-"-----\n"
-"\n"
-msgstr ""
-
-#: src/gram.c:266
-msgid "Num (Prec, Assoc, Useful, Ritem Range) Lhs -> Rhs (Ritem range) [Num]\n"
-msgstr ""
-
-#: src/gram.c:292
-msgid ""
-"Rules interpreted\n"
-"-----------------\n"
-"\n"
-msgstr ""
-
 #: src/gram.c:321 src/reduce.c:302 src/reduce.c:392
-#, fuzzy
 msgid "warning"
-msgstr "varning: "
+msgstr "varning"
 
 #: src/lalr.c:91
 #, c-format
 msgid "too many gotos (max %d)"
 msgstr "för många goto (max %d)"
 
-#: src/lalr.c:406
-msgid "Lookaheads: BEGIN\n"
-msgstr ""
-
-#: src/lalr.c:418
-#, c-format
-msgid "State %d: %d lookaheads\n"
-msgstr ""
-
-#: src/lalr.c:425
-#, c-format
-msgid "   on %d (%s) -> rule %d\n"
-msgstr ""
-
-#: src/lalr.c:430
-msgid "Lookaheads: END\n"
-msgstr ""
-
 #: src/main.c:117
 msgid "rule never reduced because of conflicts"
-msgstr ""
+msgstr "regel aldrig reducerad på grund av konflikter"
 
-#: src/parse-gram.y:344
+#: parse-gram.y:347
 msgid "POSIX forbids declarations in the grammar"
-msgstr ""
+msgstr "POSIX förbjuder deklarationer i grammatiken"
 
 #: src/print.c:46
 #, c-format
@@ -361,32 +257,31 @@ msgid " type %d is %s\n"
 msgstr " typ %d är %s\n"
 
 #: src/print.c:162
-#, fuzzy, c-format
+#, c-format
 msgid "shift, and go to state %d\n"
-msgstr "    %-4s\tskifta, och gå till tillstånd %d\n"
+msgstr "skifta, och gå till tillstånd %d\n"
 
 #: src/print.c:164
-#, fuzzy, c-format
+#, c-format
 msgid "go to state %d\n"
-msgstr "    %-4s\tgå till tillstånd %d\n"
+msgstr "gå till tillstånd %d\n"
 
 #: src/print.c:201
-#, fuzzy
 msgid "error (nonassociative)\n"
-msgstr "    %-4s\tfel (ickeassociativ)\n"
+msgstr "fel (ickeassociativ)\n"
 
 #: src/print.c:290
-#, fuzzy, c-format
+#, c-format
 msgid "reduce using rule %d (%s)"
-msgstr "    %-4s\treducera med regel %d (%s)\n"
+msgstr "reducera med regel %d (%s)"
 
 #: src/print.c:293
 msgid "accept"
-msgstr ""
+msgstr "acceptera"
 
 #: src/print.c:324 src/print.c:390
 msgid "$default"
-msgstr ""
+msgstr "$standard"
 
 #: src/print.c:419
 #, c-format
@@ -410,9 +305,8 @@ msgid " on right:"
 msgstr " till höger:"
 
 #: src/print.c:552
-#, fuzzy
 msgid "Rules never reduced"
-msgstr "%d regel reduceras aldrig\n"
+msgstr "Aldrig reducerade regler"
 
 #: src/reader.c:52
 #, c-format
@@ -422,7 +316,7 @@ msgstr "flera %s-deklarationer"
 #: src/reader.c:141
 #, c-format
 msgid "result type clash on merge function %s: `%s' vs. `%s'"
-msgstr ""
+msgstr "resultattypskonflikt vid sammanslagningsfunktion %s: \"%s\" mot \"%s\""
 
 #: src/reader.c:239
 #, c-format
@@ -445,27 +339,27 @@ msgstr "tv
 #: src/reader.c:353
 #, c-format
 msgid "%%dprec affects only GLR parsers"
-msgstr ""
+msgstr "%%dprec påverkar endast GLR-parsrar"
 
 #: src/reader.c:355
 #, c-format
 msgid "%%dprec must be followed by positive number"
-msgstr ""
+msgstr "%%dprec måste följas av ett positivt tal"
 
 #: src/reader.c:357
 #, c-format
 msgid "only one %%dprec allowed per rule"
-msgstr ""
+msgstr "endast en %%dprec tillåts per regel"
 
 #: src/reader.c:368
 #, c-format
 msgid "%%merge affects only GLR parsers"
-msgstr ""
+msgstr "%%merge påverkar endast GLR-parsrar"
 
 #: src/reader.c:370
 #, c-format
 msgid "only one %%merge allowed per rule"
-msgstr ""
+msgstr "endast en %%merge tillåts per regel"
 
 #: src/reader.c:513
 msgid "no rules in the input grammar"
@@ -477,29 +371,24 @@ msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "för många symboler (element plus icketerminaler); max %d"
 
 #: src/reduce.c:239
-#, fuzzy
 msgid "useless rule"
-msgstr "%d oanvändbar regel"
+msgstr "oanvändbar regel"
 
 #: src/reduce.c:302
-#, fuzzy
 msgid "useless nonterminal"
-msgstr "%d oanvändbar icketerminal"
+msgstr "oanvändbar icketerminal"
 
 #: src/reduce.c:349
-#, fuzzy
 msgid "Useless nonterminals"
-msgstr "Oanvändbara icketerminaler:"
+msgstr "Oanvändbara icketerminaler"
 
 #: src/reduce.c:362
-#, fuzzy
 msgid "Terminals which are not used"
-msgstr "Terminaler som inte används:"
+msgstr "Terminaler som inte används"
 
 #: src/reduce.c:371
-#, fuzzy
 msgid "Useless rules"
-msgstr "Oanvändbara regler:"
+msgstr "Oanvändbara regler"
 
 #: src/reduce.c:387
 #, c-format
@@ -527,75 +416,61 @@ msgstr[0] "%d oanv
 msgstr[1] "%d oanvändbara regler"
 
 #: src/reduce.c:435
-#, fuzzy, c-format
+#, c-format
 msgid "start symbol %s does not derive any sentence"
-msgstr "Startsymbolen %s genererar inga meningar"
+msgstr "startsymbolen %s genererar inga meningar"
 
-#: src/relation.c:137
+#: scan-gram.l:202
-msgid "relation_transpose: input\n"
-msgstr ""
-
-#: src/relation.c:176
-msgid "relation_transpose: output\n"
-msgstr ""
-
-#: src/scan-gram.l:202
 #, c-format
 msgid ": invalid character: `%c'\n"
-msgstr ""
+msgstr ": ogiltigt tecken: \"%c\"\n"
 
-#: src/scan-gram.l:246
+#: scan-gram.l:246
-#, fuzzy
 msgid ": unexpected end of file in a comment\n"
-msgstr "oväntat filslut"
+msgstr ": oväntat filslut i en kommentar\n"
 
-#: src/scan-gram.l:274 src/scan-gram.l:412
+#: scan-gram.l:274 scan-gram.l:412
-#, fuzzy
 msgid ": unexpected end of file in a string\n"
-msgstr "oväntat filslut"
+msgstr ": oväntat filslut i en sträng\n"
 
-#: src/scan-gram.l:311 src/scan-gram.l:383
+#: scan-gram.l:311 scan-gram.l:383
-#, fuzzy
 msgid ": unexpected end of file in a character\n"
-msgstr "oväntat filslut"
+msgstr ": oväntat filslut i ett tecken\n"
 
-#: src/scan-gram.l:332
+#: scan-gram.l:332
-#, fuzzy, c-format
+#, c-format
 msgid ": invalid escape: %s\n"
-msgstr "felaktigt värde: %s%d"
+msgstr ": ogiltig specialsekvens: %s\n"
 
-#: src/scan-gram.l:353
+#: scan-gram.l:353
-#, fuzzy, c-format
+#, c-format
 msgid ": unrecognized escape: %s\n"
-msgstr "okänt: %s"
+msgstr ": okänd specialsekvens: %s\n"
 
-#: src/scan-gram.l:473
+#: scan-gram.l:473
-#, fuzzy
 msgid ": unexpected end of file in a braced code\n"
-msgstr "oväntat filslut"
+msgstr ": oväntat filslut i kod inom klamrar\n"
 
-#: src/scan-gram.l:502
+#: scan-gram.l:502
-#, fuzzy
 msgid ": unexpected end of file in a prologue\n"
-msgstr "oväntat filslut"
+msgstr ": oväntat filslut i en prolog\n"
 
-#: src/scan-gram.l:560
+#: scan-gram.l:560
 #, c-format
 msgid "$$ of `%s' has no declared type"
 msgstr "$$ för \"%s\" har ingen deklarerad typ"
 
-#: src/scan-gram.l:577 src/scan-gram.l:664
+#: scan-gram.l:577 scan-gram.l:664
 #, c-format
 msgid "invalid value: %s%d"
 msgstr "felaktigt värde: %s%d"
 
-#: src/scan-gram.l:584
+#: scan-gram.l:584
 #, c-format
 msgid "$%d of `%s' has no declared type"
 msgstr "$%d för \"%s\" har ingen deklarerad typ"
 
-#: src/scan-gram.l:595 src/scan-gram.l:612 src/scan-gram.l:671
+#: scan-gram.l:595 scan-gram.l:612 scan-gram.l:671 scan-gram.l:688
-#: src/scan-gram.l:688
 #, c-format
 msgid "%s is invalid"
 msgstr "%s är felaktigt"
@@ -615,9 +490,9 @@ msgid "type redeclaration for %s"
 msgstr "typen omdeklarerad för %s"
 
 #: src/symtab.c:98 src/symtab.c:117
-#, fuzzy, c-format
+#, c-format
 msgid "%s redeclaration for %s"
-msgstr "typen omdeklarerad för %s"
+msgstr "%s-omdeklaration för %s"
 
 #: src/symtab.c:138
 #, c-format
@@ -630,9 +505,9 @@ msgid "symbol %s redefined"
 msgstr "symbolen %s omdefinierad"
 
 #: src/symtab.c:180
-#, fuzzy, c-format
+#, c-format
 msgid "redefining user token number of %s"
-msgstr "omdefinition av precedens för %s"
+msgstr "omdefinition av elementnummer för %s"
 
 #: src/symtab.c:225
 #, c-format
@@ -657,9 +532,9 @@ msgid "conflicting precedences for %s and %s"
 msgstr "motstridiga precedenser mellan %s och %s"
 
 #: src/symtab.c:293
-#, fuzzy, c-format
+#, c-format
 msgid "conflicting associativities for %s (%s) and %s (%s)"
-msgstr "motstridiga assoc-värden mellan %s och %s"
+msgstr "motstridiga associativiteter för %s (%s) och %s (%s)"
 
 #: src/symtab.c:363
 #, c-format
@@ -676,93 +551,85 @@ msgstr "startsymbolen %s
 msgid "the start symbol %s is a token"
 msgstr "startsymbolen %s är ett element"
 
-#: src/tables.c:210
-#, c-format
-msgid "growing table and check from: %lu to %lu\n"
-msgstr ""
-
-#: src/tables.c:757
-#, c-format
-msgid "base_t too small to hold %d\n"
-msgstr ""
-
 #: lib/argmatch.c:161
-#, fuzzy, c-format
+#, c-format
 msgid "invalid argument %s for %s"
-msgstr "felaktigt värde: %s%d"
+msgstr "ogiltigt argument %s till %s"
 
 #: lib/argmatch.c:162
 #, c-format
 msgid "ambiguous argument %s for %s"
-msgstr ""
+msgstr "tvetydigt argument %s till %s"
 
 #: lib/argmatch.c:181
 msgid "Valid arguments are:"
-msgstr ""
+msgstr "Giltiga argument är:"
 
 #: lib/bitset_stats.c:226
 #, c-format
 msgid "%d bitset_allocs, %d freed (%.2f%%).\n"
-msgstr ""
+msgstr "%d bitmängdallokeringar, %d frianden (%.2f%%).\n"
 
 #: lib/bitset_stats.c:229
 #, c-format
 msgid "%d bitset_sets, %d cached (%.2f%%)\n"
-msgstr ""
+msgstr "%d bitmängdmängder, %d cachade (%.2f%%)\n"
 
 #: lib/bitset_stats.c:232
 #, c-format
 msgid "%d bitset_resets, %d cached (%.2f%%)\n"
-msgstr ""
+msgstr "%d bitmängdåterställanden, %d cachade (%.2f%%)\n"
 
 #: lib/bitset_stats.c:235
 #, c-format
 msgid "%d bitset_tests, %d cached (%.2f%%)\n"
-msgstr ""
+msgstr "%d bitmängdtester, %d cachade (%.2f%%)\n"
 
 #: lib/bitset_stats.c:239
 #, c-format
 msgid "%d bitset_lists\n"
-msgstr ""
+msgstr "%d bitmängdlistor\n"
 
 #: lib/bitset_stats.c:241
 msgid "count log histogram\n"
-msgstr ""
+msgstr "anropslogghistogram\n"
 
 #: lib/bitset_stats.c:244
 msgid "size log histogram\n"
-msgstr ""
+msgstr "storlekslogghistogram\n"
 
 #: lib/bitset_stats.c:247
 msgid "density histogram\n"
-msgstr ""
+msgstr "densitetshistogram\n"
 
 #: lib/bitset_stats.c:264
 msgid ""
 "Bitset statistics:\n"
 "\n"
 msgstr ""
+"Bitmängdsstatistik:\n"
+"\n"
 
 #: lib/bitset_stats.c:267
 #, c-format
 msgid "Accumulated runs = %d\n"
-msgstr ""
+msgstr "Accumulerade körningar = %d\n"
 
 #: lib/bitset_stats.c:311
 msgid "Could not read stats file."
-msgstr ""
+msgstr "Kunde inte läsa statistikfil."
 
 #: lib/bitset_stats.c:313
 msgid "Bad stats file size.\n"
-msgstr ""
+msgstr "Dålig statistikfilstorlek.\n"
 
 #: lib/bitset_stats.c:339
 msgid "Could not write stats file."
-msgstr ""
+msgstr "Kunde inte skriva statistikfil."
 
 #: lib/bitset_stats.c:343
 msgid "Could not open stats file for writing."
-msgstr ""
+msgstr "Kunde inte öppna statistikfil för skrivning."
 
 #: lib/getopt.c:662
 #, c-format
@@ -839,157 +706,117 @@ msgid ""
 "\n"
 "Execution times (seconds)\n"
 msgstr ""
+"\n"
+"Exekveringstider (sekunder)\n"
 
 #: lib/timevar.c:516
 msgid " TOTAL                 :"
-msgstr ""
+msgstr " TOTALT                :"
 
 #: lib/timevar.c:552
 #, c-format
 msgid "time in %s: %ld.%06ld (%ld%%)\n"
-msgstr ""
+msgstr "tid i %s: %ld.%06ld (%ld%%)\n"
 
-#~ msgid "reduce"
+#~ msgid "state_list_append (state = %d, symbol = %d (%s))\n"
-#~ msgstr "reducera"
+#~ msgstr "state_list_append (tillstånd = %d, symbol = %d (%s))\n"
 
-#~ msgid "shift"
+#~ msgid "Entering new_itemsets, state = %d\n"
-#~ msgstr "skifta"
+#~ msgstr "Går in i new_itemsets, tillstånd = %d\n"
 
-#~ msgid "an error"
+#~ msgid "Entering get_state, symbol = %d (%s)\n"
-#~ msgstr "ett fel"
+#~ msgstr "Går in i get_state, symbol = %d (%s)\n"
 
-#~ msgid "%s contains "
+#~ msgid "Exiting get_state => %d\n"
-#~ msgstr "%s innehåller "
+#~ msgstr "Lämnar get_state => %d\n"
 
-#~ msgid "`%s' is no longer supported"
+#~ msgid "Entering append_states, state = %d\n"
-#~ msgstr "\"%s\" stöds inte längre"
+#~ msgstr "Går in i append_states, tillstånd = %d\n"
 
-#~ msgid "unexpected `/' found and ignored"
+#~ msgid "Processing state %d (reached by %s)\n"
-#~ msgstr "oväntat \"/\" hittat och ignorerat"
+#~ msgstr "Bearbetar tillstånd %d (nått av %s)\n"
 
-#~ msgid "unterminated comment"
+#~ msgid "undefined associativity"
-#~ msgstr "oavslutad kommentar"
+#~ msgstr "odefinierad associativitet"
 
-#~ msgid "unescaped newline in constant"
+#~ msgid "Closure: %s\n"
-#~ msgstr "oskyddat nyradstecken i konstant"
+#~ msgstr "Hölje: %s\n"
 
-#~ msgid "octal value outside range 0...255: `\\%o'"
+#~ msgid "  (rule %d)\n"
-#~ msgstr "oktalt värde utanför intervallet 0-255: \"\\%o\""
+#~ msgstr "   (regel %d)\n"
 
-#~ msgid "hexadecimal value above 255: `\\x%x'"
+# RTC betyder "reflexive transitive closure"
-#~ msgstr "hexadecimalt värde över 255: \"\\x%x\""
+# Firsts är ett variabelnamn
+#~ msgid "RTC: Firsts Input"
+#~ msgstr "RTH: Firsts-indata"
 
-#~ msgid "unknown escape sequence: `\\' followed by `%s'"
+#~ msgid "RTC: Firsts Output"
-#~ msgstr "okänd specialsekvens: \"\\\" följt av \"%s\""
+#~ msgstr "RTH: Firsts-utdata"
 
-#~ msgid "unterminated type name at end of file"
+#~ msgid "input"
-#~ msgstr "oavslutat typnamn vid filslut"
+#~ msgstr "indata"
 
-#~ msgid "unterminated type name"
+#~ msgid "output"
-#~ msgstr "oavslutat typnamn"
+#~ msgstr "utdata"
-
-#~ msgid "use \"...\" for multi-character literal tokens"
-#~ msgstr "använd \"...\" för bokstavliga element med mer än ett tecken"
-
-#~ msgid "`%s' supports no argument: %s"
-#~ msgstr "\"%s\" stödjer inga argument: %s"
-
-#~ msgid "`%s' requires an argument"
-#~ msgstr "\"%s\" behöver ett argument"
 
 #~ msgid ""
-#~ "    $default\treduce using rule %d (%s)\n"
+#~ "Variables\n"
+#~ "---------\n"
 #~ "\n"
 #~ msgstr ""
-#~ "    $standard\treducera med regel %d (%s)\n"
+#~ "Variabler\n"
+#~ "---------\n"
 #~ "\n"
 
-#~ msgid "    %-4s\t[reduce using rule %d (%s)]\n"
+#~ msgid "Value  Sprec  Sassoc  Tag\n"
-#~ msgstr "    %-4s\t[reducera med regel %d (%s)]\n"
+#~ msgstr "Värde  Sprec  Sassoc  Tagg\n"
 
-#~ msgid "    $default\treduce using rule %d (%s)\n"
+#~ msgid ""
-#~ msgstr "    $standard\treducera med regel %d (%s)\n"
+#~ "Rules\n"
+#~ "-----\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Regler\n"
+#~ "------\n"
+#~ "\n"
 
-#~ msgid "    $default\taccept\n"
+#~ msgid ""
-#~ msgstr "    $standard\tacceptera\n"
+#~ "Num (Prec, Assoc, Useful, Ritem Range) Lhs -> Rhs (Ritem range) [Num]\n"
+#~ msgstr ""
+#~ "Num (Prec, Assoc, Användbar, Robjektintervall) Vhs -> Hhs "
+#~ "(Hobjektintervall) [Num]\n"
 
-#~ msgid "    NO ACTIONS\n"
+#~ msgid ""
-#~ msgstr "    INGA ÅTGÄRDER\n"
+#~ "Rules interpreted\n"
+#~ "-----------------\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Tolkade regler\n"
+#~ "--------------\n"
+#~ "\n"
 
-#~ msgid "Number, Line, Rule"
+#~ msgid "Lookaheads: BEGIN\n"
-#~ msgstr "Nummer, Rad, Regel"
+#~ msgstr "Framåtblickar: START\n"
 
-#~ msgid "  %3d %3d %s ->"
+#~ msgid "State %d: %d lookaheads\n"
-#~ msgstr "  %3d %3d %s ->"
+#~ msgstr "Tillstånd %d: %d framåtblickar\n"
 
-#~ msgid "   Skipping to next \\n"
+#~ msgid "   on %d (%s) -> rule %d\n"
-#~ msgstr "   Hoppar över till nästa \\n"
+#~ msgstr "   vid %d (%s) -> regel %d\n"
 
-#~ msgid "   Skipping to next %c"
+#~ msgid "Lookaheads: END\n"
-#~ msgstr "   Hoppar över till nästa %c"
+#~ msgstr "Framåtblickar: SLUT\n"
 
-#~ msgid "unterminated string at end of file"
+#~ msgid "relation_transpose: input\n"
-#~ msgstr "oavslutad sträng vid filslut"
+#~ msgstr "relation_transpose: indata\n"
 
-#~ msgid "unterminated string"
+#~ msgid "relation_transpose: output\n"
-#~ msgstr "oavslutad sträng"
+#~ msgstr "relation_transpose: utdata\n"
 
-#~ msgid "unterminated `%{' definition"
+# "table" och "check" är variabelnamn, som bör vara bekanta för den som
-#~ msgstr "oavslutad \"%{\"-definition"
+# begär denna spårutskrift.
+#~ msgid "growing table and check from: %lu to %lu\n"
+#~ msgstr "utökar table och check från: %lu till %lu\n"
 
-#~ msgid "Premature EOF after %s"
+#~ msgid "base_t too small to hold %d\n"
-#~ msgstr "Förtida filslut efter %s"
+#~ msgstr "base_t för liten för att hålla %d\n"
-
-#~ msgid "`%s' is invalid in %s"
-#~ msgstr "\"%s\" är felaktig i %s"
-
-#~ msgid "invalid %s declaration"
-#~ msgstr "felaktig %s-deklaration"
-
-#~ msgid "%type declaration has no <typename>"
-#~ msgstr "%type-deklaration har inget <typnamn>"
-
-#~ msgid "invalid %%type declaration due to item: %s"
-#~ msgstr "felaktig %%type-deklaration på grund av objekt: %s"
-
-#~ msgid "invalid text (%s) - number should be after identifier"
-#~ msgstr "felaktig text (%s) - tal skulle följa efter identifierare"
-
-#~ msgid "unexpected item: %s"
-#~ msgstr "oväntat objekt: %s"
-
-#~ msgid "unmatched %s"
-#~ msgstr "ensam %s"
-
-#~ msgid "argument of %%expect is not an integer"
-#~ msgstr "argument till %%expect är inte ett heltal"
-
-#~ msgid "unrecognized item %s, expected an identifier"
-#~ msgstr "oväntat objekt %s, förväntade en identifierare"
-
-#~ msgid "expected string constant instead of %s"
-#~ msgstr "förväntade strängkonstant istället för %s"
-
-#~ msgid "no input grammar"
-#~ msgstr "ingen ingrammatik"
-
-#~ msgid "unknown character: %s"
-#~ msgstr "okänt tecken: %s"
-
-#~ msgid "ill-formed rule: initial symbol not followed by colon"
-#~ msgstr "felskriven regel: första symbolen följs inte av ett kolon"
-
-#~ msgid "grammar starts with vertical bar"
-#~ msgstr "grammatiken startar med ett vertikalt streck"
-
-#~ msgid "previous rule lacks an ending `;'"
-#~ msgstr "föregående regel saknar ett avslutande \";\""
-
-#~ msgid "%%guard present but %%semantic_parser not specified"
-#~ msgstr "%%guard finns men %%semantic_parser är inte angiven"
-
-#~ msgid "two actions at end of one rule"
-#~ msgstr "två åtgärder vid slutet av en regel"
-
-#~ msgid "invalid input: %s"
-#~ msgstr "felaktig indata: %s"

po/tr.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.49a\n"
-"POT-Creation-Date: 2002-08-11 00:16-0700\n"
+"POT-Creation-Date: 2002-09-27 16:50+0200\n"
 "PO-Revision-Date: 2002-06-25 11:03GMT +02:00\n"
 "Last-Translator: Altuð Bayram <[email protected]>\n"
 "Language-Team: Turkish <[email protected]>\n"
@@ -15,66 +15,6 @@ msgstr ""
 "X-Generator: KBabel 0.9.5\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/LR0.c:63
-#, c-format
-msgid "state_list_append (state = %d, symbol = %d (%s))\n"
-msgstr ""
-
-#: src/LR0.c:181
-#, c-format
-msgid "Entering new_itemsets, state = %d\n"
-msgstr ""
-
-#: src/LR0.c:219
-#, c-format
-msgid "Entering get_state, symbol = %d (%s)\n"
-msgstr ""
-
-#: src/LR0.c:227
-#, fuzzy, c-format
-msgid "Exiting get_state => %d\n"
-msgstr "    %-4s\tdurum %d'ye git\n"
-
-#: src/LR0.c:247
-#, c-format
-msgid "Entering append_states, state = %d\n"
-msgstr ""
-
-#: src/LR0.c:355
-#, c-format
-msgid "Processing state %d (reached by %s)\n"
-msgstr ""
-
-#: src/assoc.c:31
-msgid "undefined associativity"
-msgstr ""
-
-#: src/closure.c:56
-#, c-format
-msgid "Closure: %s\n"
-msgstr ""
-
-#: src/closure.c:63
-#, fuzzy, c-format
-msgid "  (rule %d)\n"
-msgstr "   (kural %d)"
-
-#: src/closure.c:136
-msgid "RTC: Firsts Input"
-msgstr ""
-
-#: src/closure.c:139
-msgid "RTC: Firsts Output"
-msgstr ""
-
-#: src/closure.c:203
-msgid "input"
-msgstr ""
-
-#: src/closure.c:234
-msgid "output"
-msgstr ""
-
 #: src/complain.c:89 lib/error.c:128 lib/error.c:156
 msgid "Unknown system error"
 msgstr "Bilinmeyen sistem hatasý"
@@ -294,35 +234,6 @@ msgstr "bo
 msgid "Grammar"
 msgstr "Gramer"
 
-#: src/gram.c:250
-msgid ""
-"Variables\n"
-"---------\n"
-"\n"
-msgstr ""
-
-#: src/gram.c:253
-msgid "Value  Sprec  Sassoc  Tag\n"
-msgstr ""
-
-#: src/gram.c:263
-msgid ""
-"Rules\n"
-"-----\n"
-"\n"
-msgstr ""
-
-#: src/gram.c:266
-msgid "Num (Prec, Assoc, Useful, Ritem Range) Lhs -> Rhs (Ritem range) [Num]\n"
-msgstr ""
-
-#: src/gram.c:292
-msgid ""
-"Rules interpreted\n"
-"-----------------\n"
-"\n"
-msgstr ""
-
 #: src/gram.c:321 src/reduce.c:302 src/reduce.c:392
 #, fuzzy
 msgid "warning"
@@ -333,29 +244,11 @@ msgstr "uyar
 msgid "too many gotos (max %d)"
 msgstr "gotos çok fazla (en fazla %d)"
 
-#: src/lalr.c:406
-msgid "Lookaheads: BEGIN\n"
-msgstr ""
-
-#: src/lalr.c:418
-#, c-format
-msgid "State %d: %d lookaheads\n"
-msgstr ""
-
-#: src/lalr.c:425
-#, c-format
-msgid "   on %d (%s) -> rule %d\n"
-msgstr ""
-
-#: src/lalr.c:430
-msgid "Lookaheads: END\n"
-msgstr ""
-
 #: src/main.c:117
 msgid "rule never reduced because of conflicts"
 msgstr ""
 
-#: src/parse-gram.y:344
+#: parse-gram.y:347
 msgid "POSIX forbids declarations in the grammar"
 msgstr ""
 
@@ -536,71 +429,62 @@ msgstr[1] "%d yarars
 msgid "start symbol %s does not derive any sentence"
 msgstr "Baþlangýç simgesi %s herhangi bir cümleden türemez"
 
-#: src/relation.c:137
+#: scan-gram.l:202
-msgid "relation_transpose: input\n"
-msgstr ""
-
-#: src/relation.c:176
-msgid "relation_transpose: output\n"
-msgstr ""
-
-#: src/scan-gram.l:202
 #, c-format
 msgid ": invalid character: `%c'\n"
 msgstr ""
 
-#: src/scan-gram.l:246
+#: scan-gram.l:246
 #, fuzzy
 msgid ": unexpected end of file in a comment\n"
 msgstr "beklenmeyen dosya sonu"
 
-#: src/scan-gram.l:274 src/scan-gram.l:412
+#: scan-gram.l:274 scan-gram.l:412
 #, fuzzy
 msgid ": unexpected end of file in a string\n"
 msgstr "beklenmeyen dosya sonu"
 
-#: src/scan-gram.l:311 src/scan-gram.l:383
+#: scan-gram.l:311 scan-gram.l:383
 #, fuzzy
 msgid ": unexpected end of file in a character\n"
 msgstr "beklenmeyen dosya sonu"
 
-#: src/scan-gram.l:332
+#: scan-gram.l:332
 #, fuzzy, c-format
 msgid ": invalid escape: %s\n"
 msgstr "geçersiz deðer: %s%d"
 
-#: src/scan-gram.l:353
+#: scan-gram.l:353
 #, fuzzy, c-format
 msgid ": unrecognized escape: %s\n"
 msgstr "tanýnmayan: %s"
 
-#: src/scan-gram.l:473
+#: scan-gram.l:473
 #, fuzzy
 msgid ": unexpected end of file in a braced code\n"
 msgstr "beklenmeyen dosya sonu"
 
-#: src/scan-gram.l:502
+#: scan-gram.l:502
 #, fuzzy
 msgid ": unexpected end of file in a prologue\n"
 msgstr "beklenmeyen dosya sonu"
 
-#: src/scan-gram.l:560
+#: scan-gram.l:560
 #, c-format
 msgid "$$ of `%s' has no declared type"
 msgstr "`%s''in $$'ý bildirilmiþ tip deðil"
 
-#: src/scan-gram.l:577 src/scan-gram.l:664
+#: scan-gram.l:577 scan-gram.l:664
 #, c-format
 msgid "invalid value: %s%d"
 msgstr "geçersiz deðer: %s%d"
 
-#: src/scan-gram.l:584
+#: scan-gram.l:584
 #, c-format
 msgid "$%d of `%s' has no declared type"
 msgstr "`%2$s''in %1$d'i bildirilmiþ tip deðil"
 
-#: src/scan-gram.l:595 src/scan-gram.l:612 src/scan-gram.l:671
+#: scan-gram.l:595 scan-gram.l:612 scan-gram.l:671 scan-gram.l:688
-#: src/scan-gram.l:688
 #, c-format
 msgid "%s is invalid"
 msgstr "%s geçersizdir"
@@ -680,16 +564,6 @@ msgstr "ba
 msgid "the start symbol %s is a token"
 msgstr "baþlangýç simgesi %s bir andaçtýr"
 
-#: src/tables.c:210
-#, c-format
-msgid "growing table and check from: %lu to %lu\n"
-msgstr ""
-
-#: src/tables.c:757
-#, c-format
-msgid "base_t too small to hold %d\n"
-msgstr ""
-
 #: lib/argmatch.c:161
 #, fuzzy, c-format
 msgid "invalid argument %s for %s"
@@ -898,6 +772,9 @@ msgstr ""
 #~ msgid "`%s' requires an argument"
 #~ msgstr "`%s' bir argüman gerektirir"
 
+#~ msgid "   (rule %d)"
+#~ msgstr "   (kural %d)"
+
 #~ msgid "    %-4s\terror (nonassociative)\n"
 #~ msgstr "    %-4s\thata (birleþmeli deðil)\n"
 

src/LR0.c

@@ -62,7 +62,7 @@ state_list_append (symbol_number_t symbol,
   state_t *state = state_new (symbol, core_size, core);
 
   if (trace_flag & trace_automaton)
-    fprintf (stderr, _("state_list_append (state = %d, symbol = %d (%s))\n"),
+    fprintf (stderr, "state_list_append (state = %d, symbol = %d (%s))\n",
 	     nstates, symbol, symbols[symbol]->tag);
 
   /* If this is the endtoken, and this is not the initial state, then
@@ -180,7 +180,7 @@ new_itemsets (state_t *state)
   int i;
 
   if (trace_flag & trace_automaton)
-    fprintf (stderr, _("Entering new_itemsets, state = %d\n"),
+    fprintf (stderr, "Entering new_itemsets, state = %d\n",
 	     state->number);
 
   for (i = 0; i < nsyms; i++)
@@ -218,7 +218,7 @@ get_state (symbol_number_t symbol, size_t core_size, item_number_t *core)
   state_t *sp;
 
   if (trace_flag & trace_automaton)
-    fprintf (stderr, _("Entering get_state, symbol = %d (%s)\n"),
+    fprintf (stderr, "Entering get_state, symbol = %d (%s)\n",
 	     symbol, symbols[symbol]->tag);
 
   sp = state_hash_lookup (core_size, core);
@@ -226,7 +226,7 @@ get_state (symbol_number_t symbol, size_t core_size, item_number_t *core)
     sp = state_list_append (symbol, core_size, core);
 
   if (trace_flag & trace_automaton)
-    fprintf (stderr, _("Exiting get_state => %d\n"), sp->number);
+    fprintf (stderr, "Exiting get_state => %d\n", sp->number);
 
   return sp;
 }
@@ -246,7 +246,7 @@ append_states (state_t *state)
   symbol_number_t symbol;
 
   if (trace_flag & trace_automaton)
-    fprintf (stderr, _("Entering append_states, state = %d\n"),
+    fprintf (stderr, "Entering append_states, state = %d\n",
 	     state->number);
 
   /* first sort shift_symbol into increasing order */
@@ -354,7 +354,7 @@ generate_states (void)
     {
       state_t *state = list->state;
       if (trace_flag & trace_automaton)
-	fprintf (stderr, _("Processing state %d (reached by %s)\n"),
+	fprintf (stderr, "Processing state %d (reached by %s)\n",
 		 state->number,
 		 symbols[state->accessing_symbol]->tag);
       /* Set up ruleset and itemset for the transitions out of this

src/assoc.c

@@ -28,7 +28,7 @@ assoc_to_string (assoc_t assoc)
   switch (assoc)
     {
     case undef_assoc:
-      return _("undefined associativity");
+      return "undefined associativity";
 
     case right_assoc:
       return "%right";

src/closure.c

@@ -53,14 +53,14 @@ static void
 print_closure (const char *title, item_number_t *array, size_t size)
 {
   size_t i;
-  fprintf (stderr, _("Closure: %s\n"), title);
+  fprintf (stderr, "Closure: %s\n", title);
   for (i = 0; i < size; ++i)
     {
       item_number_t *rp;
       fprintf (stderr, "  %2d: .", array[i]);
       for (rp = &ritem[array[i]]; *rp >= 0; ++rp)
 	fprintf (stderr, " %s", symbols[*rp]->tag);
-      fprintf (stderr, _("  (rule %d)\n"), -*rp - 1);
+      fprintf (stderr, "  (rule %d)\n", -*rp - 1);
     }
   fputs ("\n\n", stderr);
 }
@@ -133,10 +133,10 @@ set_firsts (void)
       }
 
   if (trace_flag & trace_sets)
-    bitsetv_matrix_dump (stderr, _("RTC: Firsts Input"), firsts);
+    bitsetv_matrix_dump (stderr, "RTC: Firsts Input", firsts);
   bitsetv_reflexive_transitive_closure (firsts);
   if (trace_flag & trace_sets)
-    bitsetv_matrix_dump (stderr, _("RTC: Firsts Output"), firsts);
+    bitsetv_matrix_dump (stderr, "RTC: Firsts Output", firsts);
 
   if (trace_flag & trace_sets)
     print_firsts ();
@@ -200,7 +200,7 @@ closure (item_number_t *core, int n)
   bitset_iterator iter;
 
   if (trace_flag & trace_sets)
-    print_closure (_("input"), core, n);
+    print_closure ("input", core, n);
 
   bitset_zero (ruleset);
 
@@ -231,7 +231,7 @@ closure (item_number_t *core, int n)
     }
 
   if (trace_flag & trace_sets)
-    print_closure (_("output"), itemset, nritemset);
+    print_closure ("output", itemset, nritemset);
 }
 
 

src/files.c

@@ -134,59 +134,6 @@ xfclose (FILE *ptr)
 
   return result;
 }
-
-
-/*------------------------------------------------------------------.
-| Return the path to the skeleton which locaction might be given in |
-| ENVVAR, otherwise return SKELETON_NAME.                           |
-`------------------------------------------------------------------*/
-
-const char *
-skeleton_find (const char *envvar, const char *skeleton_name)
-{
-  const char *res = getenv (envvar);
-
-#if defined (MSDOS) || defined (_WIN32)
-  const char *cp = getenv ("INIT");
-  if (!res)
-    {
-      /* Skeleton file name without path */
-      const char *skel_name = strrchr (skeleton_name, '/');
-      if (!skel_name)
-        skel_name = strrchr (skeleton_name, '\\');
-      if (!skel_name)
-        skel_name = skeleton_name;
-      else
-        ++skel_name;
-
-      /* File doesn't exist in current directory; try in INIT directory.  */
-      if (cp)
-	{
-	  res = XMALLOC (char, strlen (cp) + strlen (skel_name) + 2);
-	  sprintf (res, "%s%c%s", cp, '\\', skel_name);
-	}
-      else if (access (skel_name, 4) == 0) /* Look in current dir. */
-        res = skel_name;
-      else
-	{
-	  /* Look in program locations dir. */
-	  extern char *program_name;
-	  cp = strrchr(program_name, '\\');
-	  if (!cp)
-	    return skeleton_name;
-	  else
-	    ++cp;
-	  res = XMALLOC (char, cp - program_name + strlen (skel_name) + 1);
-	  strncpy (res, program_name, cp - program_name);
-	  strcpy (res + (cp - program_name), skel_name);
-	}
-    }
-#endif /* defined (MSDOS) || defined (_WIN32) */
-  if (!res)
-    res = skeleton_name;
-
-  return res;
-}
 
 
 /*----------------------------------------------------------------.

src/files.h

@@ -1,5 +1,5 @@
 /* File names and variables for bison,
-   Copyright 1984, 1989, 2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 2000, 2001, 2002 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -57,9 +57,6 @@ void compute_output_file_names PARAMS((void));
 FILE *xfopen PARAMS ((const char *name, const char *mode));
 int xfclose PARAMS ((FILE *ptr));
 
-const char *skeleton_find PARAMS ((const char *envvar,
-				   const char *skeleton_name));
-
 /* Is SUFFIX ending STRING?  */
 int strsuffix (const char* string, const char* suffix);
 

src/gram.c

@@ -247,10 +247,10 @@ grammar_dump (FILE *out, const char *title)
 	   ntokens, nvars, nsyms, nrules, nritems);
 
 
-  fprintf (out, _("Variables\n---------\n\n"));
+  fprintf (out, "Variables\n---------\n\n");
   {
     symbol_number_t i;
-    fprintf (out, _("Value  Sprec  Sassoc  Tag\n"));
+    fprintf (out, "Value  Sprec  Sassoc  Tag\n");
 
     for (i = ntokens; i < nsyms; i++)
       fprintf (out, "%5d  %5d   %5d  %s\n",
@@ -260,10 +260,10 @@ grammar_dump (FILE *out, const char *title)
     fprintf (out, "\n\n");
   }
 
-  fprintf (out, _("Rules\n-----\n\n"));
+  fprintf (out, "Rules\n-----\n\n");
   {
     rule_number_t i;
-    fprintf (out, _("Num (Prec, Assoc, Useful, Ritem Range) Lhs -> Rhs (Ritem range) [Num]\n"));
+    fprintf (out, "Num (Prec, Assoc, Useful, Ritem Range) Lhs -> Rhs (Ritem range) [Num]\n");
     for (i = 0; i < nrules + nuseless_productions; i++)
       {
 	rule_t *rule = &rules[i];
@@ -289,7 +289,7 @@ grammar_dump (FILE *out, const char *title)
   }
   fprintf (out, "\n\n");
 
-  fprintf (out, _("Rules interpreted\n-----------------\n\n"));
+  fprintf (out, "Rules interpreted\n-----------------\n\n");
   {
     rule_number_t r;
     for (r = 0; r < nrules + nuseless_productions; r++)

src/injections.c

@@ -1,126 +0,0 @@
-/* Grammar reduction for Bison.
-   Copyright (C) 2002  Free Software Foundation, Inc.
-
-   This file is part of Bison, the GNU Compiler Compiler.
-
-   Bison 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.
-
-   Bison 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 Bison; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-/* Reduce the grammar: Look for injections.  Akim Demaille.  */
-
-#include "system.h"
-#include "quotearg.h"
-#include "bitsetv.h"
-#include "bitsetv-print.h"
-#include "complain.h"
-#include "gram.h"
-#include "getargs.h"
-#include "derives.h"
-#include "injections.h"
-
-/* Set of all nonterminals which are not useless.  */
-static bitsetv injects;
-
-#define   INJECTS(Var)   injects[(Var) - ntokens]
-
-/*-----------------------------------------------------------.
-| Free the global sets used to compute the reduced grammar.  |
-`-----------------------------------------------------------*/
-
-void
-injections_new (void)
-{
-  if (!injects)
-    injects = bitsetv_create (nvars, nvars, BITSET_FIXED);
-  else
-    bitsetv_zero (injects);
-}
-
-void
-injections_free (void)
-{
-  bitsetv_free (injects);
-  injects = NULL;
-}
-
-
-/*------------------------------.
-| Dump the list of injections.  |
-`------------------------------*/
-
-static void
-injections_print (const char *title)
-{
-  int i, j;
-
-  fprintf (stderr, "%s\n", title);
-  for (i = ntokens; i < nsyms; i++)
-    if (bitset_count (INJECTS (i)))
-    {
-      fprintf (stderr, "\t%s injects\n",
-	       quotearg_style (escape_quoting_style, symbols[i]->tag));
-      for (j = 0; j < nvars; j++)
-	if (bitset_test (INJECTS (i), j))
-	  fprintf (stderr, "\t\t%s\n",
-		   quotearg_style (escape_quoting_style,
-				   symbols[j + ntokens]->tag));
-    }
-  fprintf (stderr, "\n\n");
-}
-
-
-/*-----------------------------------------------------------------.
-| Set INJECTS[i, j] if the nonterminal j derives the nonterminal j |
-| (typically, `i -> j' is a rule, plus transitive closure).        |
-`-----------------------------------------------------------------*/
-
-static void
-injections_compute (void)
-{
-  int i, j;
-
-  injections_new ();
-  for (i = ntokens; i < nsyms; i++)
-    for (j = 0; derives[i][j] >= 0; ++j)
-      {
-	int symbol = rules[derives[i][j]].rhs[0];
-	if (ISVAR (symbol) && rules[derives[i][j]].rhs[1] < 0)
-	  bitset_set (INJECTS (i), symbol - ntokens);
-      }
-
-  if (trace_flag & trace_sets)
-    injections_print (_("syntactic direct injections"));
-  bitsetv_transitive_closure (injects);
-  if (trace_flag & trace_sets)
-    injections_print (_("syntactic injections"));
-}
-
-
-
-/*--------------------------------------------------------------.
-| Look for infinitely ambiguous grammars: they contain cycles.  |
-`--------------------------------------------------------------*/
-
-void
-injections_check_cycles (void)
-{
-  int i;
-
-  injections_compute ();
-  for (i = ntokens; i < nsyms; i++)
-    if (bitset_test (INJECTS (i), i - ntokens))
-      complain (_("infinitely ambiguous grammar: %s derives itself"),
-		symbols[i]->tag);
-}

src/lalr.c

@@ -403,7 +403,7 @@ lookaheads_print (FILE *out)
 {
   state_number_t i;
   int j, k;
-  fprintf (out, _("Lookaheads: BEGIN\n"));
+  fprintf (out, "Lookaheads: BEGIN\n");
   for (i = 0; i < nstates; ++i)
     {
       reductions_t *reds = states[i]->reductions;
@@ -415,19 +415,19 @@ lookaheads_print (FILE *out)
 	  if (reds->lookaheads[k])
 	    ++nlookaheads;
 
-      fprintf (out, _("State %d: %d lookaheads\n"),
+      fprintf (out, "State %d: %d lookaheads\n",
 	       i, nlookaheads);
 
       if (reds->lookaheads)
 	for (j = 0; j < reds->num; ++j)
 	  BITSET_FOR_EACH (iter, reds->lookaheads[j], k, 0)
 	  {
-	    fprintf (out, _("   on %d (%s) -> rule %d\n"),
+	    fprintf (out, "   on %d (%s) -> rule %d\n",
 		     k, symbols[k]->tag,
 		     reds->rules[j]->number);
 	  };
     }
-  fprintf (out, _("Lookaheads: END\n"));
+  fprintf (out, "Lookaheads: END\n");
 }
 
 void

src/parse-gram.c

@@ -1,4 +1,4 @@
-/* A Bison parser, made from parse-gram.y, by GNU bison 1.49b.  */
+/* A Bison parser, made from parse-gram.y, by GNU bison 1.49c.  */
 
 /* Skeleton parser for Yacc-like parsing with Bison,
    Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software Foundation, Inc.
@@ -233,7 +233,7 @@ typedef union {
   char *string;
   assoc_t assoc;
 } yystype;
-/* Line 188 of /tmp/prefix/share/bison/yacc.c.  */
+/* Line 188 of /usr/local/share/bison/yacc.c.  */
 #line 238 "parse-gram.c"
 # define YYSTYPE yystype
 # define YYSTYPE_IS_TRIVIAL 1
@@ -254,7 +254,7 @@ typedef struct yyltype
 /* Copy the second part of user declarations.  */
 
 
-/* Line 208 of /tmp/prefix/share/bison/yacc.c.  */
+/* Line 208 of /usr/local/share/bison/yacc.c.  */
 #line 259 "parse-gram.c"
 
 #if ! defined (yyoverflow) || YYERROR_VERBOSE
@@ -444,14 +444,14 @@ static const signed char yyrhs[] =
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const unsigned short yyrline[] =
 {
-       0,   159,   159,   172,   174,   177,   179,   180,   181,   182,
+       0,   162,   162,   175,   177,   180,   182,   183,   184,   185,
-     183,   184,   185,   186,   187,   188,   189,   190,   191,   192,
+     186,   187,   188,   189,   190,   191,   192,   193,   194,   195,
-     193,   194,   195,   198,   200,   201,   205,   212,   211,   222,
+     196,   197,   198,   201,   203,   204,   208,   215,   214,   225,
-     221,   234,   233,   239,   239,   244,   253,   268,   270,   271,
+     224,   237,   236,   242,   242,   247,   256,   271,   273,   274,
-     274,   276,   281,   283,   287,   292,   297,   303,   309,   319,
+     277,   279,   284,   286,   290,   295,   300,   306,   312,   322,
-     322,   331,   333,   339,   341,   346,   353,   352,   357,   359,
+     325,   334,   336,   342,   344,   349,   356,   355,   360,   362,
-     362,   365,   367,   369,   371,   373,   377,   379,   380,   383,
+     365,   368,   370,   372,   374,   376,   380,   382,   383,   386,
-     389,   398,   406,   411,   417,   419
+     392,   401,   409,   414,   420,   422
 };
 #endif
 
@@ -460,16 +460,16 @@ static const unsigned short yyrline[] =
    First, the terminals, then, starting at YYNTOKENS, nonterminals. */
 static const char *const yytname[] =
 {
-  "\"end of string\"", "error", "$undefined", "STRING", "CHARACTER", "INT", 
+  "\"end of file\"", "error", "$undefined", "\"string\"", "\"character\"", 
-  "\"%token\"", "\"%nterm\"", "\"%type\"", "\"%destructor\"", 
+  "\"integer\"", "\"%token\"", "\"%nterm\"", "\"%type\"", 
-  "\"%printer\"", "\"%union\"", "\"%left\"", "\"%right\"", 
+  "\"%destructor\"", "\"%printer\"", "\"%union\"", "\"%left\"", 
-  "\"%nonassoc\"", "\"%expect\"", "\"%start\"", "\"%prec\"", "\"%dprec\"", 
+  "\"%right\"", "\"%nonassoc\"", "\"%expect\"", "\"%start\"", "\"%prec\"", 
-  "\"%merge\"", "\"%verbose\"", "\"%error-verbose\"", "\"%output\"", 
+  "\"%dprec\"", "\"%merge\"", "\"%verbose\"", "\"%error-verbose\"", 
-  "\"%file-prefix\"", "\"%name-prefix\"", "\"%define\"", 
+  "\"%output\"", "\"%file-prefix\"", "\"%name-prefix\"", "\"%define\"", 
   "\"%pure-parser\"", "\"%glr-parser\"", "\"%defines\"", "\"%yacc\"", 
   "\"%debug\"", "\"%locations\"", "\"%no-lines\"", "\"%skeleton\"", 
-  "\"%token-table\"", "TYPE", "\"=\"", "\";\"", "\":\"", "\"|\"", 
+  "\"%token-table\"", "\"type\"", "\"=\"", "\";\"", "\":\"", "\"|\"", 
-  "\"identifier\"", "\"%%\"", "PROLOGUE", "EPILOGUE", "BRACED_CODE", 
+  "\"identifier\"", "\"%%\"", "\"%{...%}\"", "\"epilogue\"", "\"{...}\"", 
   "$accept", "input", "declarations", "declaration", 
   "grammar_declaration", "@1", "@2", "symbol_declaration", "@3", "@4", 
   "precedence_declaration", "precedence_declarator", "type.opt", 
@@ -480,6 +480,7 @@ static const char *const yytname[] =
 };
 #endif
 
+# ifdef YYPRINT
 /* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
    token YYLEX-NUM.  */
 static const unsigned short yytoknum[] =
@@ -490,6 +491,7 @@ static const unsigned short yytoknum[] =
      285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
      295,   296,   297,   298,   299
 };
+# endif
 
 /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
 static const unsigned char yyr1[] =
@@ -1267,7 +1269,7 @@ yyreduce:
   switch (yyn)
     {
         case 2:
-#line 161 "parse-gram.y"
+#line 164 "parse-gram.y"
     {
       yycontrol->errcode = 0;
       epilogue_set (yyvsp[0].string, yylsp[0]);
@@ -1275,99 +1277,99 @@ yyreduce:
     break;
 
   case 6:
-#line 179 "parse-gram.y"
+#line 182 "parse-gram.y"
     { prologue_augment (yyvsp[0].string, yylsp[0]); }
     break;
 
   case 7:
-#line 180 "parse-gram.y"
+#line 183 "parse-gram.y"
     { debug_flag = 1; }
     break;
 
   case 8:
-#line 181 "parse-gram.y"
+#line 184 "parse-gram.y"
     { muscle_insert (yyvsp[-1].string, yyvsp[0].string); }
     break;
 
   case 9:
-#line 182 "parse-gram.y"
+#line 185 "parse-gram.y"
     { defines_flag = 1; }
     break;
 
   case 10:
-#line 183 "parse-gram.y"
+#line 186 "parse-gram.y"
     { error_verbose = 1; }
     break;
 
   case 11:
-#line 184 "parse-gram.y"
+#line 187 "parse-gram.y"
     { expected_conflicts = yyvsp[0].integer; }
     break;
 
   case 12:
-#line 185 "parse-gram.y"
+#line 188 "parse-gram.y"
     { spec_file_prefix = yyvsp[0].string; }
     break;
 
   case 13:
-#line 186 "parse-gram.y"
+#line 189 "parse-gram.y"
     { locations_flag = 1; }
     break;
 
   case 14:
-#line 187 "parse-gram.y"
+#line 190 "parse-gram.y"
     { spec_name_prefix = yyvsp[0].string; }
     break;
 
   case 15:
-#line 188 "parse-gram.y"
+#line 191 "parse-gram.y"
     { no_lines_flag = 1; }
     break;
 
   case 16:
-#line 189 "parse-gram.y"
+#line 192 "parse-gram.y"
     { spec_outfile = yyvsp[0].string; }
     break;
 
   case 17:
-#line 190 "parse-gram.y"
+#line 193 "parse-gram.y"
     { pure_parser = 1; }
     break;
 
   case 18:
-#line 191 "parse-gram.y"
+#line 194 "parse-gram.y"
     { glr_parser = 1; }
     break;
 
   case 19:
-#line 192 "parse-gram.y"
+#line 195 "parse-gram.y"
     { skeleton = yyvsp[0].string; }
     break;
 
   case 20:
-#line 193 "parse-gram.y"
+#line 196 "parse-gram.y"
     { token_table_flag = 1; }
     break;
 
   case 21:
-#line 194 "parse-gram.y"
+#line 197 "parse-gram.y"
     { report_flag = 1; }
     break;
 
   case 22:
-#line 195 "parse-gram.y"
+#line 198 "parse-gram.y"
     { yacc_flag = 1; }
     break;
 
   case 25:
-#line 202 "parse-gram.y"
+#line 205 "parse-gram.y"
     {
       grammar_start_symbol_set (yyvsp[0].symbol, yylsp[0]);
     }
     break;
 
   case 26:
-#line 206 "parse-gram.y"
+#line 209 "parse-gram.y"
     {
       typed = 1;
       MUSCLE_INSERT_INT ("stype_line", yylsp[0].first_line);
@@ -1376,12 +1378,12 @@ yyreduce:
     break;
 
   case 27:
-#line 212 "parse-gram.y"
+#line 215 "parse-gram.y"
     { current_braced_code = destructor_braced_code; }
     break;
 
   case 28:
-#line 214 "parse-gram.y"
+#line 217 "parse-gram.y"
     {
       symbol_list_t *list;
       for (list = yyvsp[0].list; list; list = list->next)
@@ -1392,12 +1394,12 @@ yyreduce:
     break;
 
   case 29:
-#line 222 "parse-gram.y"
+#line 225 "parse-gram.y"
     { current_braced_code = printer_braced_code; }
     break;
 
   case 30:
-#line 224 "parse-gram.y"
+#line 227 "parse-gram.y"
     {
       symbol_list_t *list;
       for (list = yyvsp[0].list; list; list = list->next)
@@ -1408,12 +1410,12 @@ yyreduce:
     break;
 
   case 31:
-#line 234 "parse-gram.y"
+#line 237 "parse-gram.y"
     { current_class = nterm_sym; }
     break;
 
   case 32:
-#line 235 "parse-gram.y"
+#line 238 "parse-gram.y"
     {
       current_class = unknown_sym;
       current_type = NULL;
@@ -1421,12 +1423,12 @@ yyreduce:
     break;
 
   case 33:
-#line 239 "parse-gram.y"
+#line 242 "parse-gram.y"
     { current_class = token_sym; }
     break;
 
   case 34:
-#line 240 "parse-gram.y"
+#line 243 "parse-gram.y"
     {
       current_class = unknown_sym;
       current_type = NULL;
@@ -1434,7 +1436,7 @@ yyreduce:
     break;
 
   case 35:
-#line 245 "parse-gram.y"
+#line 248 "parse-gram.y"
     {
       symbol_list_t *list;
       for (list = yyvsp[0].list; list; list = list->next)
@@ -1444,7 +1446,7 @@ yyreduce:
     break;
 
   case 36:
-#line 255 "parse-gram.y"
+#line 258 "parse-gram.y"
     {
       symbol_list_t *list;
       ++current_prec;
@@ -1459,49 +1461,49 @@ yyreduce:
     break;
 
   case 37:
-#line 269 "parse-gram.y"
+#line 272 "parse-gram.y"
     { yyval.assoc = left_assoc; }
     break;
 
   case 38:
-#line 270 "parse-gram.y"
+#line 273 "parse-gram.y"
     { yyval.assoc = right_assoc; }
     break;
 
   case 39:
-#line 271 "parse-gram.y"
+#line 274 "parse-gram.y"
     { yyval.assoc = non_assoc; }
     break;
 
   case 40:
-#line 275 "parse-gram.y"
+#line 278 "parse-gram.y"
     { current_type = NULL;}
     break;
 
   case 41:
-#line 276 "parse-gram.y"
+#line 279 "parse-gram.y"
     { current_type = yyvsp[0].string; }
     break;
 
   case 42:
-#line 282 "parse-gram.y"
+#line 285 "parse-gram.y"
     { yyval.list = symbol_list_new (yyvsp[0].symbol, yylsp[0]); }
     break;
 
   case 43:
-#line 283 "parse-gram.y"
+#line 286 "parse-gram.y"
     { yyval.list = symbol_list_prepend (yyvsp[-1].list, yyvsp[0].symbol, yylsp[0]); }
     break;
 
   case 44:
-#line 289 "parse-gram.y"
+#line 292 "parse-gram.y"
     {
        current_type = yyvsp[0].string;
      }
     break;
 
   case 45:
-#line 293 "parse-gram.y"
+#line 296 "parse-gram.y"
     {
        symbol_class_set (yyvsp[0].symbol, current_class, yylsp[0]);
        symbol_type_set (yyvsp[0].symbol, current_type, yylsp[0]);
@@ -1509,7 +1511,7 @@ yyreduce:
     break;
 
   case 46:
-#line 298 "parse-gram.y"
+#line 301 "parse-gram.y"
     {
       symbol_class_set (yyvsp[-1].symbol, current_class, yylsp[-1]);
       symbol_type_set (yyvsp[-1].symbol, current_type, yylsp[-1]);
@@ -1518,7 +1520,7 @@ yyreduce:
     break;
 
   case 47:
-#line 304 "parse-gram.y"
+#line 307 "parse-gram.y"
     {
       symbol_class_set (yyvsp[-1].symbol, current_class, yylsp[-1]);
       symbol_type_set (yyvsp[-1].symbol, current_type, yylsp[-1]);
@@ -1527,7 +1529,7 @@ yyreduce:
     break;
 
   case 48:
-#line 310 "parse-gram.y"
+#line 313 "parse-gram.y"
     {
       symbol_class_set (yyvsp[-2].symbol, current_class, yylsp[-2]);
       symbol_type_set (yyvsp[-2].symbol, current_type, yylsp[-2]);
@@ -1537,17 +1539,17 @@ yyreduce:
     break;
 
   case 49:
-#line 321 "parse-gram.y"
+#line 324 "parse-gram.y"
     {;}
     break;
 
   case 50:
-#line 323 "parse-gram.y"
+#line 326 "parse-gram.y"
     {;}
     break;
 
   case 54:
-#line 342 "parse-gram.y"
+#line 345 "parse-gram.y"
     {
       if (yacc_flag)
 	complain_at (yyloc, _("POSIX forbids declarations in the grammar"));
@@ -1555,84 +1557,84 @@ yyreduce:
     break;
 
   case 55:
-#line 347 "parse-gram.y"
+#line 350 "parse-gram.y"
     {
       yyerrok;
     }
     break;
 
   case 56:
-#line 353 "parse-gram.y"
+#line 356 "parse-gram.y"
     { current_lhs = yyvsp[-1].symbol; current_lhs_location = yylsp[-1]; }
     break;
 
   case 57:
-#line 354 "parse-gram.y"
+#line 357 "parse-gram.y"
     {;}
     break;
 
   case 58:
-#line 358 "parse-gram.y"
+#line 361 "parse-gram.y"
     { grammar_rule_end (yylsp[0]); }
     break;
 
   case 59:
-#line 359 "parse-gram.y"
+#line 362 "parse-gram.y"
     { grammar_rule_end (yylsp[0]); }
     break;
 
   case 60:
-#line 364 "parse-gram.y"
+#line 367 "parse-gram.y"
     { grammar_rule_begin (current_lhs, current_lhs_location); }
     break;
 
   case 61:
-#line 366 "parse-gram.y"
+#line 369 "parse-gram.y"
     { grammar_current_rule_symbol_append (yyvsp[0].symbol, yylsp[0]); }
     break;
 
   case 62:
-#line 368 "parse-gram.y"
+#line 371 "parse-gram.y"
     { grammar_current_rule_action_append (yyvsp[0].string, yylsp[0]); }
     break;
 
   case 63:
-#line 370 "parse-gram.y"
+#line 373 "parse-gram.y"
     { grammar_current_rule_prec_set (yyvsp[0].symbol, yylsp[0]); }
     break;
 
   case 64:
-#line 372 "parse-gram.y"
+#line 375 "parse-gram.y"
     { grammar_current_rule_dprec_set (yyvsp[0].integer, yylsp[0]); }
     break;
 
   case 65:
-#line 374 "parse-gram.y"
+#line 377 "parse-gram.y"
     { grammar_current_rule_merge_set (yyvsp[0].string, yylsp[0]); }
     break;
 
   case 66:
-#line 378 "parse-gram.y"
+#line 381 "parse-gram.y"
     { yyval.symbol = yyvsp[0].symbol; }
     break;
 
   case 67:
-#line 379 "parse-gram.y"
+#line 382 "parse-gram.y"
     { yyval.symbol = yyvsp[0].symbol; }
     break;
 
   case 68:
-#line 380 "parse-gram.y"
+#line 383 "parse-gram.y"
     { yyval.symbol = symbol_get (yyvsp[0].string, yylsp[0]); }
     break;
 
   case 69:
-#line 385 "parse-gram.y"
+#line 388 "parse-gram.y"
     { yyval.string = yyvsp[0].string; }
     break;
 
   case 70:
-#line 391 "parse-gram.y"
+#line 394 "parse-gram.y"
     {
       yyval.symbol = symbol_get (yyvsp[0].string, yylsp[0]);
       symbol_class_set (yyval.symbol, token_sym, yylsp[0]);
@@ -1640,7 +1642,7 @@ yyreduce:
     break;
 
   case 71:
-#line 400 "parse-gram.y"
+#line 403 "parse-gram.y"
     {
       yyval.string = yyvsp[0].string + 1;
       yyval.string[strlen (yyval.string) - 1] = '\0';
@@ -1648,14 +1650,14 @@ yyreduce:
     break;
 
   case 72:
-#line 408 "parse-gram.y"
+#line 411 "parse-gram.y"
     {
       yyval.string = xstrdup ("");
     }
     break;
 
   case 73:
-#line 412 "parse-gram.y"
+#line 415 "parse-gram.y"
     {
       yyval.string = yyvsp[0].string;
     }
@@ -1664,8 +1666,8 @@ yyreduce:
 
     }
 
-/* Line 1079 of /tmp/prefix/share/bison/yacc.c.  */
+/* Line 1081 of /usr/local/share/bison/yacc.c.  */
-#line 1669 "parse-gram.c"
+#line 1671 "parse-gram.c"
 
   yyvsp -= yylen;
   yyssp -= yylen;
@@ -1837,7 +1839,7 @@ yyreturn:
 }
 
 
-#line 421 "parse-gram.y"
+#line 424 "parse-gram.y"
 
 /*------------------------------------------------------------------.
 | When debugging the parser, display tokens' locations and values.  |

src/parse-gram.h

@@ -1,4 +1,4 @@
-/* A Bison parser, made from parse-gram.y, by GNU bison 1.49b.  */
+/* A Bison parser, made from parse-gram.y, by GNU bison 1.49c.  */
 
 /* Skeleton parser for Yacc-like parsing with Bison,
    Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software Foundation, Inc.
@@ -136,7 +136,7 @@ typedef union {
   char *string;
   assoc_t assoc;
 } yystype;
-/* Line 1292 of /tmp/prefix/share/bison/yacc.c.  */
+/* Line 1294 of /usr/local/share/bison/yacc.c.  */
 #line 141 "y.tab.h"
 # define YYSTYPE yystype
 #endif

src/parse-gram.y

@@ -95,9 +95,10 @@ braced_code_t current_braced_code = action_braced_code;
 };
 
 /* Define the tokens together with their human representation.  */
-%token GRAM_EOF 0 "end of string"
+%token GRAM_EOF 0 "end of file"
-%token STRING CHARACTER
+%token STRING     "string"
-%token INT
+%token CHARACTER  "character"
+%token INT        "integer"
 
 %token PERCENT_TOKEN       "%token"
 %token PERCENT_NTERM       "%nterm"
@@ -112,41 +113,43 @@ braced_code_t current_braced_code = action_braced_code;
 %token PERCENT_RIGHT       "%right"
 %token PERCENT_NONASSOC    "%nonassoc"
 
-%token PERCENT_EXPECT "%expect"
+%token PERCENT_EXPECT        "%expect"
-%token PERCENT_START "%start"
+%token PERCENT_START         "%start"
-%token PERCENT_PREC     "%prec"
+%token PERCENT_PREC          "%prec"
-%token PERCENT_DPREC    "%dprec"
+%token PERCENT_DPREC         "%dprec"
-%token PERCENT_MERGE    "%merge"
+%token PERCENT_MERGE         "%merge"
-%token PERCENT_VERBOSE  "%verbose"
+%token PERCENT_VERBOSE       "%verbose"
 %token PERCENT_ERROR_VERBOSE "%error-verbose"
 
-%token PERCENT_OUTPUT "%output"
+%token PERCENT_OUTPUT      "%output"
 %token PERCENT_FILE_PREFIX "%file-prefix"
 %token PERCENT_NAME_PREFIX "%name-prefix"
 
-%token PERCENT_DEFINE "%define"
+%token PERCENT_DEFINE      "%define"
 %token PERCENT_PURE_PARSER "%pure-parser"
-%token PERCENT_GLR_PARSER "%glr-parser"
+%token PERCENT_GLR_PARSER  "%glr-parser"
 
 %token PERCENT_DEFINES "%defines"
 
 %token PERCENT_YACC "%yacc"
 
-%token PERCENT_DEBUG "%debug"
+%token PERCENT_DEBUG       "%debug"
-%token PERCENT_LOCATIONS "%locations"
+%token PERCENT_LOCATIONS   "%locations"
-%token PERCENT_NO_LINES "%no-lines"
+%token PERCENT_NO_LINES    "%no-lines"
-%token PERCENT_SKELETON "%skeleton"
+%token PERCENT_SKELETON    "%skeleton"
 %token PERCENT_TOKEN_TABLE "%token-table"
 
-%token TYPE
+%token TYPE            "type"
-%token EQUAL "="
+%token EQUAL           "="
-%token SEMICOLON ";"
+%token SEMICOLON       ";"
-%token COLON ":"
+%token COLON           ":"
-%token PIPE "|"
+%token PIPE            "|"
-%token ID "identifier"
+%token ID              "identifier"
 %token PERCENT_PERCENT "%%"
-%token PROLOGUE EPILOGUE
+%token PROLOGUE        "%{...%}"
-%token BRACED_CODE
+%token EPILOGUE        "epilogue"
+%token BRACED_CODE     "{...}"
+
 
 %type <string> CHARACTER TYPE STRING string_content
                BRACED_CODE PROLOGUE EPILOGUE epilogue.opt action

src/reader.c

@@ -132,8 +132,8 @@ get_merge_function (const char* name, const char* type,
   if (syms->next == NULL)
     {
       syms->next = XMALLOC (merger_list, 1);
-      syms->next->name = strdup (name);
+      syms->next->name = xstrdup (name);
-      syms->next->type = strdup (type);
+      syms->next->type = xstrdup (type);
       syms->next->next = NULL;
       merge_functions = head.next;
     }

src/relation.c

@@ -134,7 +134,7 @@ relation_transpose (relation_t *R_arg, int n)
 
   if (trace_flag & trace_sets)
     {
-      fputs (_("relation_transpose: input\n"), stderr);
+      fputs ("relation_transpose: input\n", stderr);
       relation_print (*R_arg, n, stderr);
     }
 
@@ -173,7 +173,7 @@ relation_transpose (relation_t *R_arg, int n)
 
   if (trace_flag & trace_sets)
     {
-      fputs (_("relation_transpose: output\n"), stderr);
+      fputs ("relation_transpose: output\n", stderr);
       relation_print (new_R, n, stderr);
     }
 

src/scan-gram.c

@@ -15,7 +15,7 @@
 #define yyrestart gram_restart
 #define yytext gram_text
 
-#line 19 "scan-gram.c"
+#line 19 "lex.yy.c"
 /* A lexical scanner generated by flex */
 
 /* Scanner skeleton version:
@@ -27,7 +27,7 @@
 #define YY_FLEX_MINOR_VERSION 5
 
 #include <stdio.h>
-
+#include <errno.h>
 
 /* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
 #ifdef c_plusplus
@@ -40,7 +40,9 @@
 #ifdef __cplusplus
 
 #include <stdlib.h>
+#ifndef _WIN32
 #include <unistd.h>
+#endif
 
 /* Use prototypes in function declarations. */
 #define YY_USE_PROTOS
@@ -823,7 +825,7 @@ static void handle_at PARAMS ((braced_code_t code_kind,
 #define SC_PROLOGUE 7
 #define SC_EPILOGUE 8
 
-#line 827 "scan-gram.c"
+#line 829 "lex.yy.c"
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -923,9 +925,20 @@ YY_MALLOC_DECL
 			YY_FATAL_ERROR( "input in flex scanner failed" ); \
 		result = n; \
 		} \
-	else if ( ((result = fread( buf, 1, max_size, yyin )) == 0) \
+	else \
-		  && ferror( yyin ) ) \
+		{ \
-		YY_FATAL_ERROR( "input in flex scanner failed" );
+		errno=0; \
+		while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \
+			{ \
+			if( errno != EINTR) \
+				{ \
+				YY_FATAL_ERROR( "input in flex scanner failed" ); \
+				break; \
+				} \
+			errno=0; \
+			clearerr(yyin); \
+			} \
+		}
 #endif
 
 /* No semi-colon after return; correct usage is to write "yyterminate();" -
@@ -997,7 +1010,7 @@ YY_DECL
   /*----------------------------.
   | Scanning Bison directives.  |
   `----------------------------*/
-#line 1001 "scan-gram.c"
+#line 1014 "lex.yy.c"
 
 	if ( yy_init )
 		{
@@ -1858,7 +1871,7 @@ YY_RULE_SETUP
 #line 529 "scan-gram.l"
 YY_FATAL_ERROR( "flex scanner jammed" );
 	YY_BREAK
-#line 1862 "scan-gram.c"
+#line 1875 "lex.yy.c"
 case YY_STATE_EOF(INITIAL):
 	yyterminate();
 
@@ -2422,11 +2435,15 @@ YY_BUFFER_STATE b;
 	}
 
 
+#ifndef _WIN32
+#include <unistd.h>
+#else
 #ifndef YY_ALWAYS_INTERACTIVE
 #ifndef YY_NEVER_INTERACTIVE
 extern int isatty YY_PROTO(( int ));
 #endif
 #endif
+#endif
 
 #ifdef YY_USE_PROTOS
 void yy_init_buffer( YY_BUFFER_STATE b, FILE *file )

src/tables.c

@@ -207,8 +207,8 @@ table_grow (size_t desired)
     table_size *= 2;
 
   if (trace_flag & trace_resource)
-    fprintf (stderr, _("growing table and check from: %lu to %lu\n"),
+    fprintf (stderr, "growing table and check from: %d to %d\n",
-	     (unsigned long) old_size, (unsigned long) table_size);
+	     old_size, table_size);
 
   table = XREALLOC (table, base_t, table_size);
   check = XREALLOC (check, base_t, table_size);
@@ -754,7 +754,7 @@ pack_vector (vector_number_t vector)
 	    high = loc;
 
 	  if (j < BASE_MIN || BASE_MAX < j)
-	    fatal (_("base_t too small to hold %d\n"), j);
+	    fatal ("base_t too small to hold %d\n", j);
 	  return j;
 	}
     }

tests/Makefile.am

@@ -27,7 +27,7 @@ MAINTAINERCLEANFILES = Makefile.in $(TESTSUITE)
 ## package.m4.  ##
 ## ------------ ##
 
-$(srcdir)/package.m4: $(top_srcdir)/configure.in
+$(srcdir)/package.m4: $(top_srcdir)/configure.ac
 	{					\
 	  echo '# Signature of the current package.'; \
 	  echo 'm4_define([AT_PACKAGE_NAME],      [@PACKAGE_NAME@])'; \

tests/regression.at

@@ -298,7 +298,7 @@ input.y:5.1: invalid character: `%'
 input.y:6.1: invalid character: `%'
 input.y:6.2: invalid character: `-'
 input.y:7.1-8.0: unexpected end of file in a prologue
-input.y:7.1-8.0: parse error, unexpected PROLOGUE, expecting ";" or "|"
+input.y:7.1-8.0: parse error, unexpected "%{...%}", expecting ";" or "|"
 ]])
 
 AT_CLEANUP