* tests/regression.at (AT_TEST_CPP_GUARD_H): New.

Check that `9foo.y' produces correct cpp guards.
* src/files.c (compute_header_macro): Prepend `BISON_' to CPP
guards.
Reported by Wwp.

diff --git a/ChangeLog b/ChangeLog
index 728e3987289ee124ea6319d60490891e00f3c2f4..72910f55ad43e3cdff7ef23c4ab253ea1449a44d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2001-11-01  Akim Demaille  <akim@epita.fr>
+
+       * tests/regression.at (AT_TEST_CPP_GUARD_H): New.
+       Check that `9foo.y' produces correct cpp guards.
+       * src/files.c (compute_header_macro): Prepend `BISON_' to CPP
+       guards.
+       Reported by Wwp.
+

 2001-11-01  Akim Demaille  <akim@epita.fr>
 
        * tests/regression.at (Invalid input: 2): New.
 2001-11-01  Akim Demaille  <akim@epita.fr>
 
        * tests/regression.at (Invalid input: 2): New.

diff --git a/po/de.gmo b/po/de.gmo
index 57150e28339c33427d17db798b34e89bed66ddae..d916a5d5f9d6a264665410ef583ef6bdb0c16c73 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 d98cc1377864d8bc2b69284b5bdeef89ded6dfef..84fdba42aa81e6f2c32c154653e89fd71f08e68b 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-10-26 14:37+0200\n"
+"POT-Creation-Date: 2001-11-01 19:27+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"


@@ -129,12 +129,12 @@ msgstr ""
 msgid "%s derives"
 msgstr "%s leitet ab"
 
 msgid "%s derives"
 msgstr "%s leitet ab"
 

-#: src/files.c:133
+#: src/files.c:143

 #, c-format
 msgid "cannot open file `%s'"
 msgstr ""
 
 #, c-format
 msgid "cannot open file `%s'"
 msgstr ""
 

-#: src/files.c:152
+#: src/files.c:162

 msgid "cannot close file"
 msgstr ""
 
 msgid "cannot close file"
 msgstr ""
 


@@ -208,7 +208,7 @@ msgid ""
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
 
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
 

-#: src/getargs.c:214 src/lex.c:650
+#: src/getargs.c:214 src/lex.c:651

 #, c-format
 msgid "`%s' is no longer supported"
 msgstr ""
 #, c-format
 msgid "`%s' is no longer supported"
 msgstr ""


@@ -233,35 +233,35 @@ msgstr "%s: zus
 msgid "too many gotos (max %d)"
 msgstr ""
 
 msgid "too many gotos (max %d)"
 msgstr ""
 

-#: src/lex.c:78
+#: src/lex.c:77

 msgid "unexpected `/' found and ignored"
 msgstr "»/« wird hier nicht erwartet und wird deshalb ignoriert"
 
 msgid "unexpected `/' found and ignored"
 msgstr "»/« wird hier nicht erwartet und wird deshalb ignoriert"
 

-#: src/lex.c:107 src/reader.c:269
+#: src/lex.c:106 src/reader.c:269

 msgid "unterminated comment"
 msgstr "unbeendeter Kommentar"
 
 msgid "unterminated comment"
 msgstr "unbeendeter Kommentar"
 

-#: src/lex.c:139
+#: src/lex.c:138

 #, fuzzy
 msgid "unexpected end of file"
 msgstr "Datei endet unerwartet"
 
 # Oder soll man den Begriff "Escapezeichen" verwenden?
 #, fuzzy
 msgid "unexpected end of file"
 msgstr "Datei endet unerwartet"
 
 # Oder soll man den Begriff "Escapezeichen" verwenden?

-#: src/lex.c:168
+#: src/lex.c:167

 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:210
+#: src/lex.c:209

 #, 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:235
+#: src/lex.c:234

 #, 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:247
+#: src/lex.c:246

 #, 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«"


@@ -274,7 +274,7 @@ msgstr "unerwarteter Typname am Ende der Datei"
 msgid "unterminated type name"
 msgstr "unerwarteter Typname"
 
 msgid "unterminated type name"
 msgstr "unerwarteter Typname"
 

-#: src/lex.c:437
+#: src/lex.c:438

 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 10308f4c0c027f5e9831d81483c0a54a40b632a0..0bc8aa90a40715c8a4b8276d58b81bd809f5aaa3 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-10-26 14:37+0200\n"
+"POT-Creation-Date: 2001-11-01 19:27+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"


@@ -192,12 +192,12 @@ msgstr ""
 msgid "%s derives"
 msgstr "%s deriva"
 
 msgid "%s derives"
 msgstr "%s deriva"
 

-#: src/files.c:133
+#: src/files.c:143

 #, c-format
 msgid "cannot open file `%s'"
 msgstr ""
 
 #, c-format
 msgid "cannot open file `%s'"
 msgstr ""
 

-#: src/files.c:152
+#: src/files.c:162

 msgid "cannot close file"
 msgstr ""
 
 msgid "cannot close file"
 msgstr ""
 


@@ -271,7 +271,7 @@ msgid ""
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
 
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
 

-#: src/getargs.c:214 src/lex.c:650
+#: src/getargs.c:214 src/lex.c:651

 #, c-format
 msgid "`%s' is no longer supported"
 msgstr ""
 #, c-format
 msgid "`%s' is no longer supported"
 msgstr ""


@@ -300,35 +300,35 @@ msgid "too many gotos (max %d)"
 msgstr ""
 
 # to ignore no es ignorar. Pon otra cosa, please. sv
 msgstr ""
 
 # to ignore no es ignorar. Pon otra cosa, please. sv

-#: src/lex.c:78
+#: src/lex.c:77

 msgid "unexpected `/' found and ignored"
 msgstr "se ha encontrado `/' cuando no se esperaba, no se tendrán en cuenta"
 
 msgid "unexpected `/' found and ignored"
 msgstr "se ha encontrado `/' cuando no se esperaba, no se tendrán en cuenta"
 

-#: src/lex.c:107 src/reader.c:269
+#: src/lex.c:106 src/reader.c:269

 msgid "unterminated comment"
 msgstr "comentario sin terminar"
 
 msgid "unterminated comment"
 msgstr "comentario sin terminar"
 

-#: src/lex.c:139
+#: src/lex.c:138

 #, fuzzy
 msgid "unexpected end of file"
 msgstr "Fin de fichero inesperado"
 
 # ¿unescaped?
 #, fuzzy
 msgid "unexpected end of file"
 msgstr "Fin de fichero inesperado"
 
 # ¿unescaped?

-#: src/lex.c:168
+#: src/lex.c:167

 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:210
+#: src/lex.c:209

 #, 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:235
+#: src/lex.c:234

 #, 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:247
+#: src/lex.c:246

 #, 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'"


@@ -342,7 +342,7 @@ msgid "unterminated type name"
 msgstr "nombre de tipo sin terminar"
 
 # ¿multicarácter o multicaracteres? sv
 msgstr "nombre de tipo sin terminar"
 
 # ¿multicarácter o multicaracteres? sv

-#: src/lex.c:437
+#: src/lex.c:438

 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 760f24ce8aa27df66d5fe4c6fc10fc47ccba9ffd..37acda5c78e9486f77efa1f5caa92f5acdd42a76 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 c0f21735cfc5b6648e42383658729c49699e25d5..917c6e73a6099a65316a02c4bd7189da047da1b3 100644 (file)
--- a/po/et.po
+++ b/po/et.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.29f\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.29f\n"

-"POT-Creation-Date: 2001-10-26 14:37+0200\n"
+"POT-Creation-Date: 2001-11-01 19:27+0100\n"

 "PO-Revision-Date: 2001-10-19 17:53+02:00\n"
 "Last-Translator: Toomas Soome <tsoome@ut.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
 "PO-Revision-Date: 2001-10-19 17:53+02:00\n"
 "Last-Translator: Toomas Soome <tsoome@ut.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"


@@ -128,12 +128,12 @@ msgstr "DERIVES"
 msgid "%s derives"
 msgstr "%s derives"
 
 msgid "%s derives"
 msgstr "%s derives"
 

-#: src/files.c:133
+#: src/files.c:143

 #, c-format
 msgid "cannot open file `%s'"
 msgstr "faili `%s' ei saa avada"
 
 #, c-format
 msgid "cannot open file `%s'"
 msgstr "faili `%s' ei saa avada"
 

-#: src/files.c:152
+#: src/files.c:162

 msgid "cannot close file"
 msgstr "faili ei õnnestu sulgeda"
 
 msgid "cannot close file"
 msgstr "faili ei õnnestu sulgeda"
 


@@ -231,7 +231,7 @@ msgstr ""
 "See on vaba tarkvara; kopeerimistingimused leiate lähtetekstidest. Garantii\n"
 "PUUDUB; ka müügiks või mingil eesmärgil kasutamiseks.\n"
 
 "See on vaba tarkvara; kopeerimistingimused leiate lähtetekstidest. Garantii\n"
 "PUUDUB; ka müügiks või mingil eesmärgil kasutamiseks.\n"
 

-#: src/getargs.c:214 src/lex.c:650
+#: src/getargs.c:214 src/lex.c:651

 #, c-format
 msgid "`%s' is no longer supported"
 msgstr "`%s' ei ole enam toetatud"
 #, c-format
 msgid "`%s' is no longer supported"
 msgstr "`%s' ei ole enam toetatud"


@@ -256,33 +256,33 @@ msgstr "%s: ignoreerin lisaargumente peale `%s'\n"
 msgid "too many gotos (max %d)"
 msgstr "liiga palju gotosid (maks %d)"
 
 msgid "too many gotos (max %d)"
 msgstr "liiga palju gotosid (maks %d)"
 

-#: src/lex.c:78
+#: src/lex.c:77

 msgid "unexpected `/' found and ignored"
 msgstr "leidsin ja ignoreerin ootamatu `/'"
 
 msgid "unexpected `/' found and ignored"
 msgstr "leidsin ja ignoreerin ootamatu `/'"
 

-#: src/lex.c:107 src/reader.c:269
+#: src/lex.c:106 src/reader.c:269

 msgid "unterminated comment"
 msgstr "lõpetamata kommentaar"
 
 msgid "unterminated comment"
 msgstr "lõpetamata kommentaar"
 

-#: src/lex.c:139
+#: src/lex.c:138

 msgid "unexpected end of file"
 msgstr "ootamatu faililõpp"
 
 msgid "unexpected end of file"
 msgstr "ootamatu faililõpp"
 

-#: src/lex.c:168
+#: src/lex.c:167

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

-#: src/lex.c:210
+#: src/lex.c:209

 #, 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:235
+#: src/lex.c:234

 #, 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:247
+#: src/lex.c:246

 #, 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'"


@@ -295,7 +295,7 @@ msgstr "l
 msgid "unterminated type name"
 msgstr "lõpetamata tüübinimi"
 
 msgid "unterminated type name"
 msgstr "lõpetamata tüübinimi"
 

-#: src/lex.c:437
+#: src/lex.c:438

 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 53f0bdd2b13a26a8ff2abb8ac1aa3333204414c7..a75a968d362ef00c11ab87ea02c13dd7664407e3 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 00a63a18555e6911d4cc208620e3c8db1b153ab7..198d889be5f0a52665d9947e452990bb10e33c22 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU bison 1.29f\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU bison 1.29f\n"

-"POT-Creation-Date: 2001-10-26 14:37+0200\n"
+"POT-Creation-Date: 2001-11-01 19:27+0100\n"

 "PO-Revision-Date: 2001-10-19 15:00-0500\n"
 "Last-Translator: Michel Robitaille <robitail@IRO.UMontreal.CA>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "PO-Revision-Date: 2001-10-19 15:00-0500\n"
 "Last-Translator: Michel Robitaille <robitail@IRO.UMontreal.CA>\n"
 "Language-Team: French <traduc@traduc.org>\n"


@@ -130,12 +130,12 @@ msgstr "D
 msgid "%s derives"
 msgstr "%s dérive"
 
 msgid "%s derives"
 msgstr "%s dérive"
 

-#: src/files.c:133
+#: src/files.c:143

 #, c-format
 msgid "cannot open file `%s'"
 msgstr "ne peut ouvrir le fichier `%s'"
 
 #, c-format
 msgid "cannot open file `%s'"
 msgstr "ne peut ouvrir le fichier `%s'"
 

-#: src/files.c:152
+#: src/files.c:162

 msgid "cannot close file"
 msgstr "ne peut fermer le fichier"
 
 msgid "cannot close file"
 msgstr "ne peut fermer le fichier"
 


@@ -237,7 +237,7 @@ msgstr ""
 "reproduction. AUCUNE garantie n'est donnée; tant pour des raisons\n"
 "COMMERCIALES que pour RÉPONDRE À UN BESOIN PARTICULIER.\n"
 
 "reproduction. AUCUNE garantie n'est donnée; tant pour des raisons\n"
 "COMMERCIALES que pour RÉPONDRE À UN BESOIN PARTICULIER.\n"
 

-#: src/getargs.c:214 src/lex.c:650
+#: src/getargs.c:214 src/lex.c:651

 #, c-format
 msgid "`%s' is no longer supported"
 msgstr "`%s' n'est plus supporté"
 #, c-format
 msgid "`%s' is no longer supported"
 msgstr "`%s' n'est plus supporté"


@@ -262,33 +262,33 @@ msgstr "%s: param
 msgid "too many gotos (max %d)"
 msgstr "nombre trop grand de \"goto\" (Max %d)"
 
 msgid "too many gotos (max %d)"
 msgstr "nombre trop grand de \"goto\" (Max %d)"
 

-#: src/lex.c:78
+#: src/lex.c:77

 msgid "unexpected `/' found and ignored"
 msgstr "`/' inattendu et ignoré"
 
 msgid "unexpected `/' found and ignored"
 msgstr "`/' inattendu et ignoré"
 

-#: src/lex.c:107 src/reader.c:269
+#: src/lex.c:106 src/reader.c:269

 msgid "unterminated comment"
 msgstr "le commentaire ne se termine pas"
 
 msgid "unterminated comment"
 msgstr "le commentaire ne se termine pas"
 

-#: src/lex.c:139
+#: src/lex.c:138

 msgid "unexpected end of file"
 msgstr "Fin de fichier inattendue"
 
 msgid "unexpected end of file"
 msgstr "Fin de fichier inattendue"
 

-#: src/lex.c:168
+#: src/lex.c:167

 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:210
+#: src/lex.c:209

 #, 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:235
+#: src/lex.c:234

 #, 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:247
+#: src/lex.c:246

 #, 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'"


@@ -301,7 +301,7 @@ msgstr "le nom de type ne se termine pas avant la fin de fichier"
 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:437
+#: src/lex.c:438

 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 b3f5c3cd850cedb6665a9c445687d9260516907c..b41b4d52021ec1ac0f7e4540cccd93ecdaf2d7b4 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 5540c9b659f44c9209deefacdd492c178eac6e73..fdef872878a2d2c9d87a27761cb88f8125c0a355 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-10-26 14:37+0200\n"
+"POT-Creation-Date: 2001-11-01 19:27+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"


@@ -135,12 +135,12 @@ msgstr ""
 msgid "%s derives"
 msgstr "%s ¤Ï°Ê²¼¤«¤éÇÉÀ¸"
 
 msgid "%s derives"
 msgstr "%s ¤Ï°Ê²¼¤«¤éÇÉÀ¸"
 

-#: src/files.c:133
+#: src/files.c:143

 #, c-format
 msgid "cannot open file `%s'"
 msgstr ""
 
 #, c-format
 msgid "cannot open file `%s'"
 msgstr ""
 

-#: src/files.c:152
+#: src/files.c:162

 msgid "cannot close file"
 msgstr ""
 
 msgid "cannot close file"
 msgstr ""
 


@@ -214,7 +214,7 @@ msgid ""
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
 
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
 

-#: src/getargs.c:214 src/lex.c:650
+#: src/getargs.c:214 src/lex.c:651

 #, c-format
 msgid "`%s' is no longer supported"
 msgstr ""
 #, c-format
 msgid "`%s' is no longer supported"
 msgstr ""


@@ -239,34 +239,34 @@ msgstr "%s: '%s' 
 msgid "too many gotos (max %d)"
 msgstr "%s ¤Î¿ô¤¬Â¿¤¹¤®¤Þ¤¹ (ºÇÂç %d)"
 
 msgid "too many gotos (max %d)"
 msgstr "%s ¤Î¿ô¤¬Â¿¤¹¤®¤Þ¤¹ (ºÇÂç %d)"
 

-#: src/lex.c:78
+#: src/lex.c:77

 msgid "unexpected `/' found and ignored"
 msgstr "ͽ´ü¤·¤Ê¤¤ `/' ¤¬¸«¤Ä¤«¤ê¡¢Ìµ»ë¤µ¤ì¤Þ¤·¤¿"
 
 msgid "unexpected `/' found and ignored"
 msgstr "ͽ´ü¤·¤Ê¤¤ `/' ¤¬¸«¤Ä¤«¤ê¡¢Ìµ»ë¤µ¤ì¤Þ¤·¤¿"
 

-#: src/lex.c:107 src/reader.c:269
+#: src/lex.c:106 src/reader.c:269

 msgid "unterminated comment"
 msgstr "ÊĤ¸¤Æ¤¤¤Ê¤¤¥³¥á¥ó¥È¤Ç¤¹"
 
 msgid "unterminated comment"
 msgstr "ÊĤ¸¤Æ¤¤¤Ê¤¤¥³¥á¥ó¥È¤Ç¤¹"
 

-#: src/lex.c:139
+#: src/lex.c:138

 #, fuzzy
 msgid "unexpected end of file"
 msgstr "ͽ´ü¤·¤Ê¤¤¥Õ¥¡¥¤¥ë¤Î½ªÃ¼¤Ç¤¹"
 
 #, fuzzy
 msgid "unexpected end of file"
 msgstr "ͽ´ü¤·¤Ê¤¤¥Õ¥¡¥¤¥ë¤Î½ªÃ¼¤Ç¤¹"
 

-#: src/lex.c:168
+#: src/lex.c:167

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

-#: src/lex.c:210
+#: src/lex.c:209

 #, 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:235
+#: src/lex.c:234

 #, 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:247
+#: src/lex.c:246

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


@@ -279,7 +279,7 @@ msgstr "
 msgid "unterminated type name"
 msgstr "ÊĤ¸¤é¤ì¤Æ¤¤¤Ê¤¤¥¿¥¤¥×̾¤¬¤¢¤ê¤Þ¤¹"
 
 msgid "unterminated type name"
 msgstr "ÊĤ¸¤é¤ì¤Æ¤¤¤Ê¤¤¥¿¥¤¥×̾¤¬¤¢¤ê¤Þ¤¹"
 

-#: src/lex.c:437
+#: src/lex.c:438

 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 67a03114b37b44a2d73f23a3831da2f1f026118c..0b0221755e2488fb0fc72b601e1c8248e262a6b2 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 d6d46907a52f4891c91df05d468a398f89bc557d..a5f0669322bf7389ce61c26faa6973cc9800cea4 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-10-26 14:37+0200\n"
+"POT-Creation-Date: 2001-11-01 19:27+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"


@@ -135,12 +135,12 @@ msgstr ""
 msgid "%s derives"
 msgstr "%s afgeleiden"
 
 msgid "%s derives"
 msgstr "%s afgeleiden"
 

-#: src/files.c:133
+#: src/files.c:143

 #, c-format
 msgid "cannot open file `%s'"
 msgstr ""
 
 #, c-format
 msgid "cannot open file `%s'"
 msgstr ""
 

-#: src/files.c:152
+#: src/files.c:162

 msgid "cannot close file"
 msgstr ""
 
 msgid "cannot close file"
 msgstr ""
 


@@ -214,7 +214,7 @@ msgid ""
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
 
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
 

-#: src/getargs.c:214 src/lex.c:650
+#: src/getargs.c:214 src/lex.c:651

 #, c-format
 msgid "`%s' is no longer supported"
 msgstr ""
 #, c-format
 msgid "`%s' is no longer supported"
 msgstr ""


@@ -239,34 +239,34 @@ msgstr "%s: extra argumenten genegeerd na '%s'\n"
 msgid "too many gotos (max %d)"
 msgstr ""
 
 msgid "too many gotos (max %d)"
 msgstr ""
 

-#: src/lex.c:78
+#: src/lex.c:77

 msgid "unexpected `/' found and ignored"
 msgstr "onverwachte `/' gevonden en genegeerd"
 
 msgid "unexpected `/' found and ignored"
 msgstr "onverwachte `/' gevonden en genegeerd"
 

-#: src/lex.c:107 src/reader.c:269
+#: src/lex.c:106 src/reader.c:269

 msgid "unterminated comment"
 msgstr "ongetermineerd commentaar"
 
 msgid "unterminated comment"
 msgstr "ongetermineerd commentaar"
 

-#: src/lex.c:139
+#: src/lex.c:138

 #, fuzzy
 msgid "unexpected end of file"
 msgstr "Onverwacht bestandseinde"
 
 #, fuzzy
 msgid "unexpected end of file"
 msgstr "Onverwacht bestandseinde"
 

-#: src/lex.c:168
+#: src/lex.c:167

 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:210
+#: src/lex.c:209

 #, 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:235
+#: src/lex.c:234

 #, 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:247
+#: src/lex.c:246

 #, 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'"


@@ -279,7 +279,7 @@ msgstr "niet getermineerd type naam aan het einde van bestand"
 msgid "unterminated type name"
 msgstr "niet getermineerd type naam"
 
 msgid "unterminated type name"
 msgstr "niet getermineerd type naam"
 

-#: src/lex.c:437
+#: src/lex.c:438

 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 a9a2d5bc0fc0fc844133e074a1fb72ec826254e3..dfda4d0acf9d71c1550be5980ea1420474a880e3 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 2239ccf7b42800f093b58bb1f8e5961a44fc53ef..d8d819260f6abcfa1130d26c7fdde2c149b01217 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.29\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.29\n"

-"POT-Creation-Date: 2001-10-26 14:37+0200\n"
+"POT-Creation-Date: 2001-11-01 19:27+0100\n"

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


@@ -129,12 +129,12 @@ msgstr "DERIVES"
 msgid "%s derives"
 msgstr "%s ×Ù×ÏÄÉÔ"
 
 msgid "%s derives"
 msgstr "%s ×Ù×ÏÄÉÔ"
 

-#: src/files.c:133
+#: src/files.c:143

 #, c-format
 msgid "cannot open file `%s'"
 msgstr "ÎÅ ÕÄÁÅÔÓÑ ÏÔËÒÙÔØ ÆÁÊÌ `%s'"
 
 #, c-format
 msgid "cannot open file `%s'"
 msgstr "ÎÅ ÕÄÁÅÔÓÑ ÏÔËÒÙÔØ ÆÁÊÌ `%s'"
 

-#: src/files.c:152
+#: src/files.c:162

 msgid "cannot close file"
 msgstr "ÎÅ ÕÄÁÅÔÓÑ ÚÁËÒÙÔØ ÆÁÊÌ"
 
 msgid "cannot close file"
 msgstr "ÎÅ ÕÄÁÅÔÓÑ ÚÁËÒÙÔØ ÆÁÊÌ"
 


@@ -236,7 +236,7 @@ msgstr ""
 "ðòéçïäîïóôé\n"
 "äìñ ïðòåäåìåîîïê ãåìé.\n"
 
 "ðòéçïäîïóôé\n"
 "äìñ ïðòåäåìåîîïê ãåìé.\n"
 

-#: src/getargs.c:214 src/lex.c:650
+#: src/getargs.c:214 src/lex.c:651

 #, c-format
 msgid "`%s' is no longer supported"
 msgstr "`%s' ÂÏÌØÛÅ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ"
 #, c-format
 msgid "`%s' is no longer supported"
 msgstr "`%s' ÂÏÌØÛÅ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ"


@@ -261,33 +261,33 @@ msgstr "%s: 
 msgid "too many gotos (max %d)"
 msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ goto (ÍÁËÓÉÍÁÌØÎÏ %d)"
 
 msgid "too many gotos (max %d)"
 msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ goto (ÍÁËÓÉÍÁÌØÎÏ %d)"
 

-#: src/lex.c:78
+#: src/lex.c:77

 msgid "unexpected `/' found and ignored"
 msgstr "×ÓÔÒÅÞÅÎ É ÐÒÏÉÇÎÏÒÉÒÏ×ÁÎ ÎÅÏÖÉÄÁÎÎÙÊ ÓÉÍ×ÏÌ `/'"
 
 msgid "unexpected `/' found and ignored"
 msgstr "×ÓÔÒÅÞÅÎ É ÐÒÏÉÇÎÏÒÉÒÏ×ÁÎ ÎÅÏÖÉÄÁÎÎÙÊ ÓÉÍ×ÏÌ `/'"
 

-#: src/lex.c:107 src/reader.c:269
+#: src/lex.c:106 src/reader.c:269

 msgid "unterminated comment"
 msgstr "ÎÅÚÁËÏÎÞÅÎÎÙÊ ËÏÍÍÅÎÔÁÒÉÊ"
 
 msgid "unterminated comment"
 msgstr "ÎÅÚÁËÏÎÞÅÎÎÙÊ ËÏÍÍÅÎÔÁÒÉÊ"
 

-#: src/lex.c:139
+#: src/lex.c:138

 msgid "unexpected end of file"
 msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ËÏÎÅÃ ÆÁÊÌÁ"
 
 msgid "unexpected end of file"
 msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ËÏÎÅÃ ÆÁÊÌÁ"
 

-#: src/lex.c:168
+#: src/lex.c:167

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

-#: src/lex.c:210
+#: src/lex.c:209

 #, 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:235
+#: src/lex.c:234

 #, 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:247
+#: src/lex.c:246

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


@@ -300,7 +300,7 @@ msgstr "
 msgid "unterminated type name"
 msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ ÉÍÑ ÔÉÐÁ"
 
 msgid "unterminated type name"
 msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ ÉÍÑ ÔÉÐÁ"
 

-#: src/lex.c:437
+#: src/lex.c:438

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

diff --git a/po/tr.po b/po/tr.po
index c0e27496d7fd5479fdb391fb411378c0e7c9eb15..7311138cd0af2525ba54b50b1eb193a5745909ef 100644 (file)
--- a/po/tr.po
+++ b/po/tr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.28c\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.28c\n"

-"POT-Creation-Date: 2001-10-26 14:37+0200\n"
+"POT-Creation-Date: 2001-11-01 19:27+0100\n"

 "PO-Revision-Date: 2001-09-10 10:54GMT\n"
 "Last-Translator: Altug Bayram <altugbayram_2000@yahoo.com>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
 "PO-Revision-Date: 2001-09-10 10:54GMT\n"
 "Last-Translator: Altug Bayram <altugbayram_2000@yahoo.com>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"


@@ -131,12 +131,12 @@ msgstr "T
 msgid "%s derives"
 msgstr "%s türetildi"
 
 msgid "%s derives"
 msgstr "%s türetildi"
 

-#: src/files.c:133
+#: src/files.c:143

 #, c-format
 msgid "cannot open file `%s'"
 msgstr "`%s' dosyasý açýlamadý"
 
 #, c-format
 msgid "cannot open file `%s'"
 msgstr "`%s' dosyasý açýlamadý"
 

-#: src/files.c:152
+#: src/files.c:162

 msgid "cannot close file"
 msgstr "dosya kapatýlamýyor"
 
 msgid "cannot close file"
 msgstr "dosya kapatýlamýyor"
 


@@ -238,7 +238,7 @@ msgstr ""
 "Hiçbir garantisi yoktur; hatta SATILABÝLÝRLÝÐÝ veya HERHANGÝ BÝR AMACA\n"
 "UYGUNLUÐU için bile garanti verilmez.\n"
 
 "Hiçbir garantisi yoktur; hatta SATILABÝLÝRLÝÐÝ veya HERHANGÝ BÝR AMACA\n"
 "UYGUNLUÐU için bile garanti verilmez.\n"
 

-#: src/getargs.c:214 src/lex.c:650
+#: src/getargs.c:214 src/lex.c:651

 #, c-format
 msgid "`%s' is no longer supported"
 msgstr "`%s' artýk desteklenmiyor"
 #, c-format
 msgid "`%s' is no longer supported"
 msgstr "`%s' artýk desteklenmiyor"


@@ -263,33 +263,33 @@ msgstr "%s: '%s' den sonraki arg
 msgid "too many gotos (max %d)"
 msgstr "gotos çok fazla (en fazla %d)"
 
 msgid "too many gotos (max %d)"
 msgstr "gotos çok fazla (en fazla %d)"
 

-#: src/lex.c:78
+#: src/lex.c:77

 msgid "unexpected `/' found and ignored"
 msgstr "beklenmeyen `/' bulundu ve yoksayýldý"
 
 msgid "unexpected `/' found and ignored"
 msgstr "beklenmeyen `/' bulundu ve yoksayýldý"
 

-#: src/lex.c:107 src/reader.c:269
+#: src/lex.c:106 src/reader.c:269

 msgid "unterminated comment"
 msgstr "sonlandýrýlmamýþ açýklama"
 
 msgid "unterminated comment"
 msgstr "sonlandýrýlmamýþ açýklama"
 

-#: src/lex.c:139
+#: src/lex.c:138

 msgid "unexpected end of file"
 msgstr "beklenmeyen dosya sonu"
 
 msgid "unexpected end of file"
 msgstr "beklenmeyen dosya sonu"
 

-#: src/lex.c:168
+#: src/lex.c:167

 msgid "unescaped newline in constant"
 msgstr "sabit içinde kaçýþsýz yeni satýr"
 
 msgid "unescaped newline in constant"
 msgstr "sabit içinde kaçýþsýz yeni satýr"
 

-#: src/lex.c:210
+#: src/lex.c:209

 #, c-format
 msgid "octal value outside range 0...255: `\\%o'"
 msgstr "sekizli deðer 0...255'in dýþýnda: `\\%o'"
 
 #, c-format
 msgid "octal value outside range 0...255: `\\%o'"
 msgstr "sekizli deðer 0...255'in dýþýnda: `\\%o'"
 

-#: src/lex.c:235
+#: src/lex.c:234

 #, c-format
 msgid "hexadecimal value above 255: `\\x%x'"
 msgstr "onaltýlýk deðer 255'in üstünde: `\\x%x'"
 
 #, c-format
 msgid "hexadecimal value above 255: `\\x%x'"
 msgstr "onaltýlýk deðer 255'in üstünde: `\\x%x'"
 

-#: src/lex.c:247
+#: src/lex.c:246

 #, c-format
 msgid "unknown escape sequence: `\\' followed by `%s'"
 msgstr "bilinmeyen kaçýþ sýrasý: `\\' `%s' tarafýndan takip edildi"
 #, c-format
 msgid "unknown escape sequence: `\\' followed by `%s'"
 msgstr "bilinmeyen kaçýþ sýrasý: `\\' `%s' tarafýndan takip edildi"


@@ -302,7 +302,7 @@ msgstr "dosya sonunda sonland
 msgid "unterminated type name"
 msgstr "sonlandýrýlmamýþ tip ismi"
 
 msgid "unterminated type name"
 msgstr "sonlandýrýlmamýþ tip ismi"
 

-#: src/lex.c:437
+#: src/lex.c:438

 msgid "use \"...\" for multi-character literal tokens"
 msgstr "çok-karakterli yazýn andaçlarý için \"...\" kullan"
 
 msgid "use \"...\" for multi-character literal tokens"
 msgstr "çok-karakterli yazýn andaçlarý için \"...\" kullan"
 

diff --git a/src/files.c b/src/files.c
index 19d14c157ea0c45efb32ca6719a33c99a4bb733a..ce70fa62a8f433ce0bd91cdb6a0106edcf4ac181 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -86,26 +86,36 @@ stringappend (const char *string1, const char *string2)
 }
 
 
 }
 
 

-/*---------------------------------------------------------------.
-|  Computes the macro name used to avoid double inclusion in the |
-|  header of the parser and store it in header_macro_name.       |
-`---------------------------------------------------------------*/
+/*-----------------------------------------------------------------.
+| Computes the macro name used to avoid double inclusion in the    |
+| header of the parser and store it in header_macro_name.  Be sure |
+| to produce valid CPP names (don't start with digit, remain       |
+| alphanumerical + underscore).                                    |
+`-----------------------------------------------------------------*/

 
 static char *
 compute_header_macro (void)
 {
 
 static char *
 compute_header_macro (void)
 {

+  const char *prefix = "BISON_";

   char *macro_name, *cp;
 
   if (spec_defines_file)
   char *macro_name, *cp;
 
   if (spec_defines_file)

-    macro_name = xstrdup (spec_defines_file);
+    {
+      macro_name = XMALLOC (char,
+                           strlen (prefix) +
+                           strlen (spec_defines_file) + 1);
+      cp = stpcpy (macro_name, prefix);
+      cp = stpcpy (cp, spec_defines_file);
+    }

   else
     {
       macro_name = XMALLOC (char,
   else
     {
       macro_name = XMALLOC (char,

+                           strlen (prefix) +

                            strlen (base_name) +
                            strlen (header_extension) + 1);
                            strlen (base_name) +
                            strlen (header_extension) + 1);

-
-      stpcpy (macro_name, base_name);
-      strcat (macro_name, header_extension);
+      cp = stpcpy (macro_name, prefix);
+      cp = stpcpy (cp, base_name);
+      cp = stpcpy (cp, header_extension);

     }
 
   for (cp = macro_name; *cp; ++cp)
     }
 
   for (cp = macro_name; *cp; ++cp)

diff --git a/tests/regression.at b/tests/regression.at
index 8981874542b14b9f01e6083b22038d0a683d7f2e..f37f2c085bafb5a9187778aa200b0fd782021b1f 100644 (file)
--- a/tests/regression.at
+++ b/tests/regression.at
@@ -148,23 +148,34 @@ AT_CHECK([bison input.y], [1], [],
 AT_CLEANUP
 
 
 AT_CLEANUP
 
 

+

 ## --------------------- ##
 ## Invalid CPP headers.  ##
 ## --------------------- ##
 
 ## --------------------- ##
 ## Invalid CPP headers.  ##
 ## --------------------- ##
 

-AT_SETUP([Invalid CPP headers])
+# AT_TEST_CPP_GUARD_H([INPUT-FILE-BASE)
+# -------------------------------------
+m4_define([AT_TEST_CPP_GUARD_H],
+[AT_SETUP([Invalid CPP guards: $1])

 
 

-mkdir input
+# possibly create and nuke inner directories.
+m4_bmatch([$1], [[/]],
+[dirname=`AS_DIRNAME([$1])`
+AS_MKDIR_P([$dirname])
+AT_CLEANUP_FILES([$dirname])])

 
 

-AT_DATA([input/input.y],
+AT_DATA([$1.y],

 [%%
 dummy:
 ])
 
 [%%
 dummy:
 ])
 

-AT_CHECK([bison --defines input/input.y])
+AT_CHECK([bison --defines=$1.h $1.y])

 
 

-AT_CHECK([sed 1q input/input.tab.h], 0,
-[[#ifndef INPUT_INPUT_TAB_H
-]])
+# CPP should be happy with it.
+AT_CHECK([$CC -E $1.h], 0, [ignore])
+
+AT_CLEANUP($1.y)
+])

 
 

-AT_CLEANUP(input)
+AT_TEST_CPP_GUARD_H([input/input])
+AT_TEST_CPP_GUARD_H([9foo])