* lib/malloc.c, lib/realloc.c: New, from the fileutils 4.0.37.

* lib/xalloc.h, lib/xmalloc.c@ Update.

diff --git a/ChangeLog b/ChangeLog
index 069e4fa98379fbac2646dbabbe87628fa6de17c8..d3362a91f7accbb567cc45a953b7806d57cfe3ff 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2001-02-02  Akim Demaille  <akim@epita.fr>
+
+       * lib/malloc.c, lib/realloc.c: New, from the fileutils 4.0.37.
+       * lib/xalloc.h, lib/xmalloc.c@ Update.
+
+2001-01-19  Akim Demaille  <akim@epita.fr>
+
+       * src/conflicts.c (conflict_report): Report the difference with
+       expected number of s/r conflicts.
+

 2001-01-19  Akim Demaille  <akim@epita.fr>
 
        Get rid of the ad hoc handling of token_buffer in the scanner: use
 2001-01-19  Akim Demaille  <akim@epita.fr>
 
        Get rid of the ad hoc handling of token_buffer in the scanner: use

diff --git a/lib/malloc.c b/lib/malloc.c
new file mode 100644 (file)
index 0000000..5e7674b
--- /dev/null
+++ b/lib/malloc.c
@@ -0,0 +1,38 @@
+/* Work around bug on some systems where malloc (0) fails.
+   Copyright (C) 1997, 1998 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.  */
+
+/* written by Jim Meyering */
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+#undef malloc
+
+#include <sys/types.h>
+
+char *malloc ();
+
+/* Allocate an N-byte block of memory from the heap.
+   If N is zero, allocate a 1-byte block.  */
+
+char *
+rpl_malloc (size_t n)
+{
+  if (n == 0)
+    n = 1;
+  return malloc (n);
+}

diff --git a/lib/realloc.c b/lib/realloc.c
new file mode 100644 (file)
index 0000000..d0d3e4a
--- /dev/null
+++ b/lib/realloc.c
@@ -0,0 +1,44 @@
+/* Work around bug on some systems where realloc (NULL, 0) fails.
+   Copyright (C) 1997 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.  */
+
+/* written by Jim Meyering */
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+#undef realloc
+
+#include <sys/types.h>
+
+char *malloc ();
+char *realloc ();
+
+/* Change the size of an allocated block of memory P to N bytes,
+   with error checking.  If N is zero, change it to 1.  If P is NULL,
+   use malloc.  */
+
+char *
+rpl_realloc (p, n)
+     char *p;
+     size_t n;
+{
+  if (n == 0)
+    n = 1;
+  if (p == 0)
+    return malloc (n);
+  return realloc (p, n);
+}

diff --git a/lib/xalloc.h b/lib/xalloc.h
index 8668e198b7222b773a7e48573cccd05ed88e2bd2..098a6c2e0730aaccda487400d1d51893257452f2 100644 (file)
--- a/lib/xalloc.h
+++ b/lib/xalloc.h
@@ -1,5 +1,5 @@
 /* xalloc.h -- malloc with out-of-memory checking
 /* xalloc.h -- malloc with out-of-memory checking

-   Copyright (C) 1990-1998, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1990-1998, 1999, 2000 Free Software Foundation, Inc.

 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
    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


@@ -46,9 +46,9 @@ extern int xalloc_exit_failure;
 extern void (*xalloc_fail_func) PARAMS ((void));
 
 /* If XALLOC_FAIL_FUNC is undefined or a function that returns, this
 extern void (*xalloc_fail_func) PARAMS ((void));
 
 /* If XALLOC_FAIL_FUNC is undefined or a function that returns, this

-   message must be non-NULL.  It is translated via gettext.
-   The default value is "Memory exhausted".  */
-extern char *const xalloc_msg_memory_exhausted;
+   message is output.  It is translated via gettext.
+   Its value is "memory exhausted".  */
+extern char const xalloc_msg_memory_exhausted[];

 
 /* This function is always triggered when memory is exhausted.  It is
    in charge of honoring the three previous items.  This is the
 
 /* This function is always triggered when memory is exhausted.  It is
    in charge of honoring the three previous items.  This is the

diff --git a/lib/xmalloc.c b/lib/xmalloc.c
index 8206a9473637cfb92b4c609f22163b6bf8202c76..e9cd47bc711f0f876078fc9d9fd74e19303c0a0f 100644 (file)
--- a/lib/xmalloc.c
+++ b/lib/xmalloc.c
@@ -1,5 +1,5 @@
 /* xmalloc.c -- malloc with out of memory checking
 /* xmalloc.c -- malloc with out of memory checking

-   Copyright (C) 1990-1997, 98, 99 Free Software Foundation, Inc.
+   Copyright (C) 1990-1999, 2000 Free Software Foundation, Inc.

 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
    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


@@ -63,7 +63,7 @@ void (*xalloc_fail_func) PARAMS ((void)) = 0;
 
 /* If XALLOC_FAIL_FUNC is NULL, or does return, display this message
    before exiting when memory is exhausted.  Goes through gettext. */
 
 /* If XALLOC_FAIL_FUNC is NULL, or does return, display this message
    before exiting when memory is exhausted.  Goes through gettext. */

-char *const xalloc_msg_memory_exhausted = N_("Memory exhausted");
+char const xalloc_msg_memory_exhausted[] = N_("memory exhausted");

 
 void
 xalloc_die (void)
 
 void
 xalloc_die (void)


@@ -91,8 +91,7 @@ xmalloc (size_t n)
 }
 
 /* Change the size of an allocated block of memory P to N bytes,
 }
 
 /* Change the size of an allocated block of memory P to N bytes,

-   with error checking.
-   If P is NULL, run xmalloc.  */
+   with error checking.  */

 
 void *
 xrealloc (void *p, size_t n)
 
 void *
 xrealloc (void *p, size_t n)

diff --git a/po/cat-id-tbl.c b/po/cat-id-tbl.c
index ed269d5b94bcb0604e3fc60d66356ed3a8bfebf9..72696884886aa8a4598f9a73f7dbbdee04fac133 100644 (file)
--- a/po/cat-id-tbl.c
+++ b/po/cat-id-tbl.c
@@ -181,7 +181,6 @@ reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n", 126
   {"memory exhausted", 139},
   {"`", 140},
   {"'", 141},
   {"memory exhausted", 139},
   {"`", 140},
   {"'", 141},

-  {"Memory exhausted", 142},

 };
 
 };
 

-int _msg_tbl_length = 142;
+int _msg_tbl_length = 141;

diff --git a/po/de.gmo b/po/de.gmo
index 210d574f60b00a0ff424374e17fc7c1ce7123686..b366aadfe3b49a599d058304a18dfb6364d515fa 100644 (file)
Binary files a/po/de.gmo and b/po/de.gmo differ

diff --git a/po/de.po b/po/de.po
index dd1c0a0a08e880120ba78ec175cd580b521e7016..b7bca93d7e59a3f6684c75fe56ff55c17b663090 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.25\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.25\n"

-"POT-Creation-Date: 2001-01-18 17:53+0100\n"
+"POT-Creation-Date: 2001-02-01 17:25+0100\n"

 "PO-Revision-Date: 1996-10-10 17:54 MET DST\n"
 "Last-Translator: Ulrich Drepper <drepper@gnu.ai.mit.edu>\n"
 "Language-Team: German <de@li.org>\n"
 "PO-Revision-Date: 1996-10-10 17:54 MET DST\n"
 "Last-Translator: Ulrich Drepper <drepper@gnu.ai.mit.edu>\n"
 "Language-Team: German <de@li.org>\n"


@@ -217,34 +217,34 @@ msgid "unexpected end of file"
 msgstr "Datei endet unerwartet"
 
 # Oder soll man den Begriff "Escapezeichen" verwenden?
 msgstr "Datei endet unerwartet"
 
 # Oder soll man den Begriff "Escapezeichen" verwenden?

-#: src/lex.c:154
+#: src/lex.c:160

 msgid "unescaped newline in constant"
 msgstr "nicht maskiertes Zeilenendezeichen in Konstante"
 
 msgid "unescaped newline in constant"
 msgstr "nicht maskiertes Zeilenendezeichen in Konstante"
 

-#: src/lex.c:196
+#: src/lex.c:202

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

-#: src/lex.c:221
+#: src/lex.c:227

 #, c-format
 msgid "hexadecimal value above 255: `\\x%x'"
 msgstr "hexadezimaler Zahlenwert größer als 255: »\\x%x«"
 
 #, c-format
 msgid "hexadecimal value above 255: `\\x%x'"
 msgstr "hexadezimaler Zahlenwert größer als 255: »\\x%x«"
 

-#: src/lex.c:233
+#: src/lex.c:239

 #, c-format
 msgid "unknown escape sequence: `\\' followed by `%s'"
 msgstr "unbekanntes Fluchtzeichen: »\\« gefolgt von »%s«"
 
 #, c-format
 msgid "unknown escape sequence: `\\' followed by `%s'"
 msgstr "unbekanntes Fluchtzeichen: »\\« gefolgt von »%s«"
 

-#: src/lex.c:326
+#: src/lex.c:335

 msgid "unterminated type name at end of file"
 msgstr "unerwarteter Typname am Ende der Datei"
 
 msgid "unterminated type name at end of file"
 msgstr "unerwarteter Typname am Ende der Datei"
 

-#: src/lex.c:329
+#: src/lex.c:338

 msgid "unterminated type name"
 msgstr "unerwarteter Typname"
 
 msgid "unterminated type name"
 msgstr "unerwarteter Typname"
 

-#: src/lex.c:422
+#: src/lex.c:430

 msgid "use \"...\" for multi-character literal tokens"
 msgstr "für Literal mit mehreren Zeichen bitte \"...\" verwenden"
 
 msgid "use \"...\" for multi-character literal tokens"
 msgstr "für Literal mit mehreren Zeichen bitte \"...\" verwenden"
 

diff --git a/po/es.po b/po/es.po
index 15702bc791d001ef461631bf42d840124ee08bff..1d31f5123c5d5d86dc907b747759429efd49e852 100644 (file)
--- a/po/es.po
+++ b/po/es.po
@@ -30,7 +30,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU bison 1.25\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU bison 1.25\n"

-"POT-Creation-Date: 2001-01-18 17:53+0100\n"
+"POT-Creation-Date: 2001-02-01 17:25+0100\n"

 "PO-Revision-Date: 1998-09-21 10:19+0200\n"
 "Last-Translator: Nicolás García-Pedrajas <ngarcia-pedrajas@acm.org>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "PO-Revision-Date: 1998-09-21 10:19+0200\n"
 "Last-Translator: Nicolás García-Pedrajas <ngarcia-pedrajas@acm.org>\n"
 "Language-Team: Spanish <es@li.org>\n"


@@ -277,35 +277,35 @@ msgid "unexpected end of file"
 msgstr "Fin de fichero inesperado"
 
 # ¿unescaped?
 msgstr "Fin de fichero inesperado"
 
 # ¿unescaped?

-#: src/lex.c:154
+#: src/lex.c:160

 msgid "unescaped newline in constant"
 msgstr "salto de línea en constante sin secuencia de escape"
 
 msgid "unescaped newline in constant"
 msgstr "salto de línea en constante sin secuencia de escape"
 

-#: src/lex.c:196
+#: src/lex.c:202

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

-#: src/lex.c:221
+#: src/lex.c:227

 #, c-format
 msgid "hexadecimal value above 255: `\\x%x'"
 msgstr "valor hexadecimal mayor que 255: `\\x%x'"
 
 #, c-format
 msgid "hexadecimal value above 255: `\\x%x'"
 msgstr "valor hexadecimal mayor que 255: `\\x%x'"
 

-#: src/lex.c:233
+#: src/lex.c:239

 #, c-format
 msgid "unknown escape sequence: `\\' followed by `%s'"
 msgstr "secuencia de escape desconocida: `\\' seguido de `%s'"
 
 #, c-format
 msgid "unknown escape sequence: `\\' followed by `%s'"
 msgstr "secuencia de escape desconocida: `\\' seguido de `%s'"
 

-#: src/lex.c:326
+#: src/lex.c:335

 msgid "unterminated type name at end of file"
 msgstr "nombre de tipo sin terminar al final del fichero"
 
 msgid "unterminated type name at end of file"
 msgstr "nombre de tipo sin terminar al final del fichero"
 

-#: src/lex.c:329
+#: src/lex.c:338

 msgid "unterminated type name"
 msgstr "nombre de tipo sin terminar"
 
 # ¿multicarácter o multicaracteres? sv
 msgid "unterminated type name"
 msgstr "nombre de tipo sin terminar"
 
 # ¿multicarácter o multicaracteres? sv

-#: src/lex.c:422
+#: src/lex.c:430

 msgid "use \"...\" for multi-character literal tokens"
 msgstr "use \"...\" para terminales literales multicarácter"
 
 msgid "use \"...\" for multi-character literal tokens"
 msgstr "use \"...\" para terminales literales multicarácter"
 

diff --git a/po/et.gmo b/po/et.gmo
index 4707dff4efa8b8908a6dd4984bc66034b7b6f08e..40931051db113335cc201ed3595a0e3548821329 100644 (file)
Binary files a/po/et.gmo and b/po/et.gmo differ

diff --git a/po/et.po b/po/et.po
index 08f9ae470855a2aeec3c09fa5feb37cee2aa8d9b..a0f879a54ab018b294c9d507ec9f424ff827fd1b 100644 (file)
--- a/po/et.po
+++ b/po/et.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.25\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.25\n"

-"POT-Creation-Date: 2001-01-18 17:53+0100\n"
+"POT-Creation-Date: 2001-02-01 17:25+0100\n"

 "PO-Revision-Date: 2000-04-11 22:19+02:00\n"
 "Last-Translator: Toomas Soome <tsoome@ut.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
 "PO-Revision-Date: 2000-04-11 22:19+02:00\n"
 "Last-Translator: Toomas Soome <tsoome@ut.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"


@@ -240,34 +240,34 @@ msgstr "l
 msgid "unexpected end of file"
 msgstr "ootamatu faililõpp"
 
 msgid "unexpected end of file"
 msgstr "ootamatu faililõpp"
 

-#: src/lex.c:154
+#: src/lex.c:160

 msgid "unescaped newline in constant"
 msgstr "paojadata reavahetus konstandis"
 
 msgid "unescaped newline in constant"
 msgstr "paojadata reavahetus konstandis"
 

-#: src/lex.c:196
+#: src/lex.c:202

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

-#: src/lex.c:221
+#: src/lex.c:227

 #, c-format
 msgid "hexadecimal value above 255: `\\x%x'"
 msgstr "kuueteistkümnendväärtus  suurem, kui above 255: `\\x%x'"
 
 #, c-format
 msgid "hexadecimal value above 255: `\\x%x'"
 msgstr "kuueteistkümnendväärtus  suurem, kui above 255: `\\x%x'"
 

-#: src/lex.c:233
+#: src/lex.c:239

 #, c-format
 msgid "unknown escape sequence: `\\' followed by `%s'"
 msgstr "tundmatu paojada: `\\' järgneb `%s'"
 
 #, c-format
 msgid "unknown escape sequence: `\\' followed by `%s'"
 msgstr "tundmatu paojada: `\\' järgneb `%s'"
 

-#: src/lex.c:326
+#: src/lex.c:335

 msgid "unterminated type name at end of file"
 msgstr "lõpetamata tüübinimi faili lõpus"
 
 msgid "unterminated type name at end of file"
 msgstr "lõpetamata tüübinimi faili lõpus"
 

-#: src/lex.c:329
+#: src/lex.c:338

 msgid "unterminated type name"
 msgstr "lõpetamata tüübinimi"
 
 msgid "unterminated type name"
 msgstr "lõpetamata tüübinimi"
 

-#: src/lex.c:422
+#: src/lex.c:430

 msgid "use \"...\" for multi-character literal tokens"
 msgstr "kasuta mitmesümboliliste literaalidega \"...\" konstruktsiooni"
 
 msgid "use \"...\" for multi-character literal tokens"
 msgstr "kasuta mitmesümboliliste literaalidega \"...\" konstruktsiooni"
 

diff --git a/po/fr.gmo b/po/fr.gmo
index eb697f73d2a430553437bf4696d004dfe84be313..75479f153914af93e2046b726af3a7aa5676a806 100644 (file)
Binary files a/po/fr.gmo and b/po/fr.gmo differ

diff --git a/po/fr.po b/po/fr.po
index c09869da1eb9e33dd67bd01a68170262072fabc1..819d4e74bd366a8ae6bca78cfdcfad8541b48870 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.25\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.25\n"

-"POT-Creation-Date: 2001-01-18 17:53+0100\n"
+"POT-Creation-Date: 2001-02-01 17:25+0100\n"

 "PO-Revision-Date: 1996-03-19 20:05 EST\n"
 "Last-Translator: Dominique Boucher <boucherd@IRO.UMontreal.CA>\n"
 "Language-Team: French <fr@li.org>\n"
 "PO-Revision-Date: 1996-03-19 20:05 EST\n"
 "Last-Translator: Dominique Boucher <boucherd@IRO.UMontreal.CA>\n"
 "Language-Team: French <fr@li.org>\n"


@@ -223,34 +223,34 @@ msgstr "le commentaire ne se termine pas"
 msgid "unexpected end of file"
 msgstr "Fin de fichier inattendue"
 
 msgid "unexpected end of file"
 msgstr "Fin de fichier inattendue"
 

-#: src/lex.c:154
+#: src/lex.c:160

 msgid "unescaped newline in constant"
 msgstr "retour de chariot sans échappement dans une constante"
 
 msgid "unescaped newline in constant"
 msgstr "retour de chariot sans échappement dans une constante"
 

-#: src/lex.c:196
+#: src/lex.c:202

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

-#: src/lex.c:221
+#: src/lex.c:227

 #, c-format
 msgid "hexadecimal value above 255: `\\x%x'"
 msgstr "valeur hexadécimale supérieure à 255: \\x%x"
 
 #, c-format
 msgid "hexadecimal value above 255: `\\x%x'"
 msgstr "valeur hexadécimale supérieure à 255: \\x%x"
 

-#: src/lex.c:233
+#: src/lex.c:239

 #, c-format
 msgid "unknown escape sequence: `\\' followed by `%s'"
 msgstr "séquence d'échappement inconnue: `\\' suivie de `%s'"
 
 #, c-format
 msgid "unknown escape sequence: `\\' followed by `%s'"
 msgstr "séquence d'échappement inconnue: `\\' suivie de `%s'"
 

-#: src/lex.c:326
+#: src/lex.c:335

 msgid "unterminated type name at end of file"
 msgstr "le nom de type ne se termine pas avant la fin de fichier"
 
 msgid "unterminated type name at end of file"
 msgstr "le nom de type ne se termine pas avant la fin de fichier"
 

-#: src/lex.c:329
+#: src/lex.c:338

 msgid "unterminated type name"
 msgstr "le nom de type ne se termine pas"
 
 msgid "unterminated type name"
 msgstr "le nom de type ne se termine pas"
 

-#: src/lex.c:422
+#: src/lex.c:430

 msgid "use \"...\" for multi-character literal tokens"
 msgstr "utilisez \"...\" pour les terminaux litéraux de plusieurs caractères"
 
 msgid "use \"...\" for multi-character literal tokens"
 msgstr "utilisez \"...\" pour les terminaux litéraux de plusieurs caractères"
 

diff --git a/po/ja.gmo b/po/ja.gmo
index 89e8ae01f0c672e6c701895dfa9b4ddeb0e436a7..4e6531061268eaade9d61f791ac3302e982fba31 100644 (file)
Binary files a/po/ja.gmo and b/po/ja.gmo differ

diff --git a/po/ja.po b/po/ja.po
index 0bd83eb85532b56aad373b8e2ba635577ffc91d3..8e36b00cea62854e3cf42f513f2067d7dcbe26f2 100644 (file)
--- a/po/ja.po
+++ b/po/ja.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU bison 1.28\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU bison 1.28\n"

-"POT-Creation-Date: 2001-01-18 17:53+0100\n"
+"POT-Creation-Date: 2001-02-01 17:25+0100\n"

 "PO-Revision-Date: 1999-09-28 21:10+0900\n"
 "Last-Translator: Daisuke Yamashita <yamad@mb.infoweb.ne.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "PO-Revision-Date: 1999-09-28 21:10+0900\n"
 "Last-Translator: Daisuke Yamashita <yamad@mb.infoweb.ne.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"


@@ -222,34 +222,34 @@ msgstr "
 msgid "unexpected end of file"
 msgstr "ͽ´ü¤·¤Ê¤¤¥Õ¥¡¥¤¥ë¤Î½ªÃ¼¤Ç¤¹"
 
 msgid "unexpected end of file"
 msgstr "ͽ´ü¤·¤Ê¤¤¥Õ¥¡¥¤¥ë¤Î½ªÃ¼¤Ç¤¹"
 

-#: src/lex.c:154
+#: src/lex.c:160

 msgid "unescaped newline in constant"
 msgstr "Äê¿ô¤ÎÃæ¤Ë¥¨¥¹¥±¡¼¥×¤µ¤ì¤Æ¤¤¤Ê¤¤²þ¹Ô¤¬¤¢¤ê¤Þ¤¹"
 
 msgid "unescaped newline in constant"
 msgstr "Äê¿ô¤ÎÃæ¤Ë¥¨¥¹¥±¡¼¥×¤µ¤ì¤Æ¤¤¤Ê¤¤²þ¹Ô¤¬¤¢¤ê¤Þ¤¹"
 

-#: src/lex.c:196
+#: src/lex.c:202

 #, c-format
 msgid "octal value outside range 0...255: `\\%o'"
 msgstr "8 ¿Ê¿ô¤ÎÃͤ¬ 0...255 ¤ÎÈϰϳ°¤Ç¤¹: `\\%o'"
 
 #, c-format
 msgid "octal value outside range 0...255: `\\%o'"
 msgstr "8 ¿Ê¿ô¤ÎÃͤ¬ 0...255 ¤ÎÈϰϳ°¤Ç¤¹: `\\%o'"
 

-#: src/lex.c:221
+#: src/lex.c:227

 #, c-format
 msgid "hexadecimal value above 255: `\\x%x'"
 msgstr "16 ¿Ê¿ô¤ÎÃͤ¬ 255 ¤ò±Û¤¨¤Æ¤¤¤Þ¤¹: `\\x%x'"
 
 #, c-format
 msgid "hexadecimal value above 255: `\\x%x'"
 msgstr "16 ¿Ê¿ô¤ÎÃͤ¬ 255 ¤ò±Û¤¨¤Æ¤¤¤Þ¤¹: `\\x%x'"
 

-#: src/lex.c:233
+#: src/lex.c:239

 #, c-format
 msgid "unknown escape sequence: `\\' followed by `%s'"
 msgstr "̤ÃΤΥ¨¥¹¥±¡¼¥×¥·¡¼¥±¥ó¥¹: `\\' ¤Î¸å¤Ë `%s'"
 
 #, c-format
 msgid "unknown escape sequence: `\\' followed by `%s'"
 msgstr "̤ÃΤΥ¨¥¹¥±¡¼¥×¥·¡¼¥±¥ó¥¹: `\\' ¤Î¸å¤Ë `%s'"
 

-#: src/lex.c:326
+#: src/lex.c:335

 msgid "unterminated type name at end of file"
 msgstr "ÊĤ¸¤é¤ì¤Æ¤¤¤Ê¤¤¥¿¥¤¥×̾¤¬¡¢¥Õ¥¡¥¤¥ëËöÈø¤Ë¤¢¤ê¤Þ¤¹"
 
 msgid "unterminated type name at end of file"
 msgstr "ÊĤ¸¤é¤ì¤Æ¤¤¤Ê¤¤¥¿¥¤¥×̾¤¬¡¢¥Õ¥¡¥¤¥ëËöÈø¤Ë¤¢¤ê¤Þ¤¹"
 

-#: src/lex.c:329
+#: src/lex.c:338

 msgid "unterminated type name"
 msgstr "ÊĤ¸¤é¤ì¤Æ¤¤¤Ê¤¤¥¿¥¤¥×̾¤¬¤¢¤ê¤Þ¤¹"
 
 msgid "unterminated type name"
 msgstr "ÊĤ¸¤é¤ì¤Æ¤¤¤Ê¤¤¥¿¥¤¥×̾¤¬¤¢¤ê¤Þ¤¹"
 

-#: src/lex.c:422
+#: src/lex.c:430

 msgid "use \"...\" for multi-character literal tokens"
 msgstr "Ê£¿ôʸ»ú¤Î¥ê¥Æ¥é¥ë¥È¡¼¥¯¥ó¤Ë¤Ï \"...\" ¤ò»È¤¤¤Þ¤·¤ç¤¦"
 
 msgid "use \"...\" for multi-character literal tokens"
 msgstr "Ê£¿ôʸ»ú¤Î¥ê¥Æ¥é¥ë¥È¡¼¥¯¥ó¤Ë¤Ï \"...\" ¤ò»È¤¤¤Þ¤·¤ç¤¦"
 

diff --git a/po/nl.gmo b/po/nl.gmo
index adf0728efa2b3b7aceaffd673b7b65fbef4c3270..225cdb8f75128f670cc9025a3abed24d52176b14 100644 (file)
Binary files a/po/nl.gmo and b/po/nl.gmo differ

diff --git a/po/nl.po b/po/nl.po
index 3f4bd0942c6214d18d6bdd4db2ad1d4b0b2befcd..6e78558b36e3d905757fce92a18ee91adecbfbe9 100644 (file)
--- a/po/nl.po
+++ b/po/nl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.25\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.25\n"

-"POT-Creation-Date: 2001-01-18 17:53+0100\n"
+"POT-Creation-Date: 2001-02-01 17:25+0100\n"

 "PO-Revision-Date: 1996-08-27 15:34 MET DST\n"
 "Last-Translator: Erick Branderhorst <branderh@debian.org>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "PO-Revision-Date: 1996-08-27 15:34 MET DST\n"
 "Last-Translator: Erick Branderhorst <branderh@debian.org>\n"
 "Language-Team: Dutch <nl@li.org>\n"


@@ -222,34 +222,34 @@ msgstr "ongetermineerd commentaar"
 msgid "unexpected end of file"
 msgstr "Onverwacht bestandseinde"
 
 msgid "unexpected end of file"
 msgstr "Onverwacht bestandseinde"
 

-#: src/lex.c:154
+#: src/lex.c:160

 msgid "unescaped newline in constant"
 msgstr "niet geescapete nieuwe regel in constante"
 
 msgid "unescaped newline in constant"
 msgstr "niet geescapete nieuwe regel in constante"
 

-#: src/lex.c:196
+#: src/lex.c:202

 #, c-format
 msgid "octal value outside range 0...255: `\\%o'"
 msgstr "octale waarde buiten domein 0...255: `\\%o'"
 
 #, c-format
 msgid "octal value outside range 0...255: `\\%o'"
 msgstr "octale waarde buiten domein 0...255: `\\%o'"
 

-#: src/lex.c:221
+#: src/lex.c:227

 #, c-format
 msgid "hexadecimal value above 255: `\\x%x'"
 msgstr "hexadecimale waarde boven 255: `\\x%x'"
 
 #, c-format
 msgid "hexadecimal value above 255: `\\x%x'"
 msgstr "hexadecimale waarde boven 255: `\\x%x'"
 

-#: src/lex.c:233
+#: src/lex.c:239

 #, c-format
 msgid "unknown escape sequence: `\\' followed by `%s'"
 msgstr "onbekende escape reeks: `\\' gevolgd door `%s'"
 
 #, c-format
 msgid "unknown escape sequence: `\\' followed by `%s'"
 msgstr "onbekende escape reeks: `\\' gevolgd door `%s'"
 

-#: src/lex.c:326
+#: src/lex.c:335

 msgid "unterminated type name at end of file"
 msgstr "niet getermineerd type naam aan het einde van bestand"
 
 msgid "unterminated type name at end of file"
 msgstr "niet getermineerd type naam aan het einde van bestand"
 

-#: src/lex.c:329
+#: src/lex.c:338

 msgid "unterminated type name"
 msgstr "niet getermineerd type naam"
 
 msgid "unterminated type name"
 msgstr "niet getermineerd type naam"
 

-#: src/lex.c:422
+#: src/lex.c:430

 msgid "use \"...\" for multi-character literal tokens"
 msgstr "gebruik \"...\" voor meerdere karakters literal tekens"
 
 msgid "use \"...\" for multi-character literal tokens"
 msgstr "gebruik \"...\" voor meerdere karakters literal tekens"
 

diff --git a/po/ru.gmo b/po/ru.gmo
index 2e56aa9c15e603d1ce0108ffb60036538e3741a3..31f5ad223f839304665d898c437718f078f9ad1b 100644 (file)
Binary files a/po/ru.gmo and b/po/ru.gmo differ

diff --git a/po/ru.po b/po/ru.po
index f923aea9fa8f6aec7e73a17dceaa30d79a1b728a..76657671d8da66bf3da455b1b3f2943f246888a2 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.28a\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.28a\n"

-"POT-Creation-Date: 2001-01-18 17:53+0100\n"
+"POT-Creation-Date: 2001-02-01 17:25+0100\n"

 "PO-Revision-Date: 2000-04-12 13:16+04:00\n"
 "Last-Translator: Dmitry S. Sivachenko <dima@Chg.RU>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "PO-Revision-Date: 2000-04-12 13:16+04:00\n"
 "Last-Translator: Dmitry S. Sivachenko <dima@Chg.RU>\n"
 "Language-Team: Russian <ru@li.org>\n"


@@ -242,34 +242,34 @@ msgstr "
 msgid "unexpected end of file"
 msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ËÏÎÅÃ ÆÁÊÌÁ"
 
 msgid "unexpected end of file"
 msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ËÏÎÅÃ ÆÁÊÌÁ"
 

-#: src/lex.c:154
+#: src/lex.c:160

 msgid "unescaped newline in constant"
 msgstr "ÎÅÜËÒÁÎÉÒÏ×ÁÎÎÙÊ ÐÅÒÅ×ÏÄ ÓÔÒÏËÉ × ËÏÎÓÔÁÎÔÅ"
 
 msgid "unescaped newline in constant"
 msgstr "ÎÅÜËÒÁÎÉÒÏ×ÁÎÎÙÊ ÐÅÒÅ×ÏÄ ÓÔÒÏËÉ × ËÏÎÓÔÁÎÔÅ"
 

-#: src/lex.c:196
+#: src/lex.c:202

 #, c-format
 msgid "octal value outside range 0...255: `\\%o'"
 msgstr "×ÏÓØÍÅÒÉÞÎÁÑ ×ÅÌÉÞÉÎÁ ÚÁ ÐÒÅÄÅÌÁÍÉ ÄÉÁÐÁÚÏÎÁ 0...255: `\\%o'"
 
 #, c-format
 msgid "octal value outside range 0...255: `\\%o'"
 msgstr "×ÏÓØÍÅÒÉÞÎÁÑ ×ÅÌÉÞÉÎÁ ÚÁ ÐÒÅÄÅÌÁÍÉ ÄÉÁÐÁÚÏÎÁ 0...255: `\\%o'"
 

-#: src/lex.c:221
+#: src/lex.c:227

 #, c-format
 msgid "hexadecimal value above 255: `\\x%x'"
 msgstr "ÛÅÓÔÎÁÄÃÁÔÅÒÉÞÎÁÑ ×ÅÌÉÞÉÎÁ ÐÒÅ×ÙÛÁÅÔ 255: `\\x%x'"
 
 #, c-format
 msgid "hexadecimal value above 255: `\\x%x'"
 msgstr "ÛÅÓÔÎÁÄÃÁÔÅÒÉÞÎÁÑ ×ÅÌÉÞÉÎÁ ÐÒÅ×ÙÛÁÅÔ 255: `\\x%x'"
 

-#: src/lex.c:233
+#: src/lex.c:239

 #, c-format
 msgid "unknown escape sequence: `\\' followed by `%s'"
 msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ escape-ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ: `%s' ÐÏÓÌÅ `\\'"
 
 #, c-format
 msgid "unknown escape sequence: `\\' followed by `%s'"
 msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ escape-ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ: `%s' ÐÏÓÌÅ `\\'"
 

-#: src/lex.c:326
+#: src/lex.c:335

 msgid "unterminated type name at end of file"
 msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ ÉÍÑ ÔÉÐÁ × ËÏÎÃÅ ÆÁÊÌÁ"
 
 msgid "unterminated type name at end of file"
 msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ ÉÍÑ ÔÉÐÁ × ËÏÎÃÅ ÆÁÊÌÁ"
 

-#: src/lex.c:329
+#: src/lex.c:338

 msgid "unterminated type name"
 msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ ÉÍÑ ÔÉÐÁ"
 
 msgid "unterminated type name"
 msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ ÉÍÑ ÔÉÐÁ"
 

-#: src/lex.c:422
+#: src/lex.c:430

 msgid "use \"...\" for multi-character literal tokens"
 msgstr "ÉÓÐÏÌØÚÕÊÔÅ \"...\" ÄÌÑ ÍÎÏÇÏÓÉÍ×ÏÌØÎÙÈ ÌÉÔÅÒÁÌØÎÙÈ ÌÅËÓÅÍ"
 
 msgid "use \"...\" for multi-character literal tokens"
 msgstr "ÉÓÐÏÌØÚÕÊÔÅ \"...\" ÄÌÑ ÍÎÏÇÏÓÉÍ×ÏÌØÎÙÈ ÌÉÔÅÒÁÌØÎÙÈ ÌÅËÓÅÍ"
 

diff --git a/src/lex.c b/src/lex.c
index 987777be5b39f7302beb5bf94251e3164277c3ca..4eefa737abb4e1a9ca24d3104c8de7f72bace11d 100644 (file)
--- a/src/lex.c
+++ b/src/lex.c
@@ -535,14 +535,14 @@ struct percent_table_struct percent_table[] =
   { "nonassoc",                NULL,                   tok_nonassoc },
   { "binary",          NULL,                   tok_nonassoc },
   { "prec",            NULL,                   tok_prec },
   { "nonassoc",                NULL,                   tok_nonassoc },
   { "binary",          NULL,                   tok_nonassoc },
   { "prec",            NULL,                   tok_prec },

-  { "locations",       &locations_flag,        tok_noop },             /* -l */
-  { "no_lines",                &no_lines_flag,         tok_noop },             /* -l */
-  { "raw",             &raw_flag,              tok_noop },             /* -r */
-  { "token_table",     &token_table_flag,      tok_noop },             /* -k */
-  { "yacc",            &yacc_flag,             tok_noop },             /* -y */
-  { "fixed_output_files",&yacc_flag,           tok_noop },             /* -y */
-  { "defines",         &defines_flag,          tok_noop },             /* -d */
-  { "no_parser",       &no_parser_flag,        tok_noop },             /* -n */
+  { "locations",       &locations_flag,        tok_noop },     /* -l */
+  { "no_lines",                &no_lines_flag,         tok_noop },     /* -l */
+  { "raw",             &raw_flag,              tok_noop },     /* -r */
+  { "token_table",     &token_table_flag,      tok_noop },     /* -k */
+  { "yacc",            &yacc_flag,             tok_noop },     /* -y */
+  { "fixed_output_files",&yacc_flag,           tok_noop },     /* -y */
+  { "defines",         &defines_flag,          tok_noop },     /* -d */
+  { "no_parser",       &no_parser_flag,        tok_noop },     /* -n */

 #if 0
   /* For the time being, this is not enabled yet, while it's possible
      though, since we use obstacks.  The only risk is with semantic
 #if 0
   /* For the time being, this is not enabled yet, while it's possible
      though, since we use obstacks.  The only risk is with semantic


@@ -552,12 +552,11 @@ struct percent_table_struct percent_table[] =
   { "file_prefix",     &spec_file_prefix,      tok_setopt },   /* -b */
   { "name_prefix",     &spec_name_prefix,      tok_setopt },   /* -p */
 #endif
   { "file_prefix",     &spec_file_prefix,      tok_setopt },   /* -b */
   { "name_prefix",     &spec_name_prefix,      tok_setopt },   /* -p */
 #endif

-  { "verbose",         &verbose_flag,          tok_noop },             /* -v */
-  { "debug",           &debug_flag,            tok_noop },             /* -t */
+  { "verbose",         &verbose_flag,          tok_noop },     /* -v */
+  { "debug",           &debug_flag,            tok_noop },     /* -t */

   { "semantic_parser", &semantic_parser,       tok_noop },
   { "pure_parser",     &pure_parser,           tok_noop },
   { "semantic_parser", &semantic_parser,       tok_noop },
   { "pure_parser",     &pure_parser,           tok_noop },

-/*    {"help", <print usage stmt>, tok_noop}, *//* -h */
-/*    {"version", <print version number> ,  tok_noop}, *//* -V */
+

   { NULL, NULL, tok_illegal}
 };
 
   { NULL, NULL, tok_illegal}
 };