Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-19 17:23:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Check that `9foo.y' produces correct cpp guards.
* src/files.c (compute_header_macro): Prepend `BISON_' to CPP
guards.
Reported by Wwp.
This commit is contained in:
Akim Demaille
2001-11-01 18:29:36 +00:00
parent 705131d1de
commit 1d708336d4
17 changed files with 141 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

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

BIN
po/de.gmo
View File

Binary file not shown.

24
po/de.po
View File

@@ -5,7 +5,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: bison 1.25\n" "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" "PO-Revision-Date: 1996-10-10 17:54 MET DST\n"
"Last-Translator: Ulrich Drepper <drepper@gnu.ai.mit.edu>\n" "Last-Translator: Ulrich Drepper <drepper@gnu.ai.mit.edu>\n"
"Language-Team: German <de@li.org>\n" "Language-Team: German <de@li.org>\n"
@@ -129,12 +129,12 @@ msgstr ""
msgid "%s derives" msgid "%s derives"
msgstr "%s leitet ab" msgstr "%s leitet ab"
#: src/files.c:133 #: src/files.c:143
#, c-format #, c-format
msgid "cannot open file `%s'" msgid "cannot open file `%s'"
msgstr "" msgstr ""
#: src/files.c:152 #: src/files.c:162
msgid "cannot close file" msgid "cannot close file"
msgstr "" msgstr ""
@@ -208,7 +208,7 @@ msgid ""
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
msgstr "" msgstr ""
#: src/getargs.c:214 src/lex.c:650 #: src/getargs.c:214 src/lex.c:651
#, c-format #, c-format
msgid "`%s' is no longer supported" msgid "`%s' is no longer supported"
msgstr "" msgstr ""
@@ -233,35 +233,35 @@ msgstr "%s: zus
msgid "too many gotos (max %d)" msgid "too many gotos (max %d)"
msgstr "" msgstr ""
#: src/lex.c:78 #: src/lex.c:77
msgid "unexpected `/' found and ignored" msgid "unexpected `/' found and ignored"
msgstr "»/« wird hier nicht erwartet und wird deshalb ignoriert" 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" msgid "unterminated comment"
msgstr "unbeendeter Kommentar" msgstr "unbeendeter Kommentar"
#: src/lex.c:139 #: src/lex.c:138
#, fuzzy #, fuzzy
msgid "unexpected end of file" msgid "unexpected end of file"
msgstr "Datei endet unerwartet" msgstr "Datei endet unerwartet"
# Oder soll man den Begriff "Escapezeichen" verwenden? # Oder soll man den Begriff "Escapezeichen" verwenden?
#: src/lex.c:168 #: src/lex.c:167
msgid "unescaped newline in constant" msgid "unescaped newline in constant"
msgstr "nicht maskiertes Zeilenendezeichen in Konstante" msgstr "nicht maskiertes Zeilenendezeichen in Konstante"
#: src/lex.c:210 #: src/lex.c:209
#, c-format #, c-format
msgid "octal value outside range 0...255: `\\%o'" msgid "octal value outside range 0...255: `\\%o'"
msgstr "oktaler Zahlenwert außerhalb des Bereichs 0...255: »\\%o«" msgstr "oktaler Zahlenwert außerhalb des Bereichs 0...255: »\\%o«"
#: src/lex.c:235 #: src/lex.c:234
#, c-format #, c-format
msgid "hexadecimal value above 255: `\\x%x'" msgid "hexadecimal value above 255: `\\x%x'"
msgstr "hexadezimaler Zahlenwert größer als 255: »\\x%x«" msgstr "hexadezimaler Zahlenwert größer als 255: »\\x%x«"
#: src/lex.c:247 #: src/lex.c:246
#, c-format #, c-format
msgid "unknown escape sequence: `\\' followed by `%s'" msgid "unknown escape sequence: `\\' followed by `%s'"
msgstr "unbekanntes Fluchtzeichen: »\\« gefolgt von »%s«" msgstr "unbekanntes Fluchtzeichen: »\\« gefolgt von »%s«"
@@ -274,7 +274,7 @@ msgstr "unerwarteter Typname am Ende der Datei"
msgid "unterminated type name" msgid "unterminated type name"
msgstr "unerwarteter Typname" msgstr "unerwarteter Typname"
#: src/lex.c:437 #: src/lex.c:438
msgid "use \"...\" for multi-character literal tokens" msgid "use \"...\" for multi-character literal tokens"
msgstr "für Literal mit mehreren Zeichen bitte \"...\" verwenden" msgstr "für Literal mit mehreren Zeichen bitte \"...\" verwenden"

24
po/es.po
View File

@@ -30,7 +30,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: GNU bison 1.25\n" "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" "PO-Revision-Date: 1998-09-21 10:19+0200\n"
"Last-Translator: Nicolás García-Pedrajas <ngarcia-pedrajas@acm.org>\n" "Last-Translator: Nicolás García-Pedrajas <ngarcia-pedrajas@acm.org>\n"
"Language-Team: Spanish <es@li.org>\n" "Language-Team: Spanish <es@li.org>\n"
@@ -192,12 +192,12 @@ msgstr ""
msgid "%s derives" msgid "%s derives"
msgstr "%s deriva" msgstr "%s deriva"
#: src/files.c:133 #: src/files.c:143
#, c-format #, c-format
msgid "cannot open file `%s'" msgid "cannot open file `%s'"
msgstr "" msgstr ""
#: src/files.c:152 #: src/files.c:162
msgid "cannot close file" msgid "cannot close file"
msgstr "" msgstr ""
@@ -271,7 +271,7 @@ msgid ""
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
msgstr "" msgstr ""
#: src/getargs.c:214 src/lex.c:650 #: src/getargs.c:214 src/lex.c:651
#, c-format #, c-format
msgid "`%s' is no longer supported" msgid "`%s' is no longer supported"
msgstr "" msgstr ""
@@ -300,35 +300,35 @@ msgid "too many gotos (max %d)"
msgstr "" msgstr ""
# to ignore no es ignorar. Pon otra cosa, please. sv # to ignore no es ignorar. Pon otra cosa, please. sv
#: src/lex.c:78 #: src/lex.c:77
msgid "unexpected `/' found and ignored" msgid "unexpected `/' found and ignored"
msgstr "se ha encontrado `/' cuando no se esperaba, no se tendrán en cuenta" 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" msgid "unterminated comment"
msgstr "comentario sin terminar" msgstr "comentario sin terminar"
#: src/lex.c:139 #: src/lex.c:138
#, fuzzy #, fuzzy
msgid "unexpected end of file" msgid "unexpected end of file"
msgstr "Fin de fichero inesperado" msgstr "Fin de fichero inesperado"
# ¿unescaped? # ¿unescaped?
#: src/lex.c:168 #: src/lex.c:167
msgid "unescaped newline in constant" msgid "unescaped newline in constant"
msgstr "salto de línea en constante sin secuencia de escape" msgstr "salto de línea en constante sin secuencia de escape"
#: src/lex.c:210 #: src/lex.c:209
#, c-format #, c-format
msgid "octal value outside range 0...255: `\\%o'" msgid "octal value outside range 0...255: `\\%o'"
msgstr "valor octal fuera del rango 0...255: `\\%o'" msgstr "valor octal fuera del rango 0...255: `\\%o'"
#: src/lex.c:235 #: src/lex.c:234
#, c-format #, c-format
msgid "hexadecimal value above 255: `\\x%x'" msgid "hexadecimal value above 255: `\\x%x'"
msgstr "valor hexadecimal mayor que 255: `\\x%x'" msgstr "valor hexadecimal mayor que 255: `\\x%x'"
#: src/lex.c:247 #: src/lex.c:246
#, c-format #, c-format
msgid "unknown escape sequence: `\\' followed by `%s'" msgid "unknown escape sequence: `\\' followed by `%s'"
msgstr "secuencia de escape desconocida: `\\' seguido de `%s'" msgstr "secuencia de escape desconocida: `\\' seguido de `%s'"
@@ -342,7 +342,7 @@ msgid "unterminated type name"
msgstr "nombre de tipo sin terminar" msgstr "nombre de tipo sin terminar"
# ¿multicarácter o multicaracteres? sv # ¿multicarácter o multicaracteres? sv
#: src/lex.c:437 #: src/lex.c:438
msgid "use \"...\" for multi-character literal tokens" msgid "use \"...\" for multi-character literal tokens"
msgstr "use \"...\" para terminales literales multicarácter" msgstr "use \"...\" para terminales literales multicarácter"

BIN
po/et.gmo
View File

Binary file not shown.

24
po/et.po
View File

@@ -5,7 +5,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: bison 1.29f\n" "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" "PO-Revision-Date: 2001-10-19 17:53+02:00\n"
"Last-Translator: Toomas Soome <tsoome@ut.ee>\n" "Last-Translator: Toomas Soome <tsoome@ut.ee>\n"
"Language-Team: Estonian <et@li.org>\n" "Language-Team: Estonian <et@li.org>\n"
@@ -128,12 +128,12 @@ msgstr "DERIVES"
msgid "%s derives" msgid "%s derives"
msgstr "%s derives" msgstr "%s derives"
#: src/files.c:133 #: src/files.c:143
#, c-format #, c-format
msgid "cannot open file `%s'" msgid "cannot open file `%s'"
msgstr "faili `%s' ei saa avada" msgstr "faili `%s' ei saa avada"
#: src/files.c:152 #: src/files.c:162
msgid "cannot close file" msgid "cannot close file"
msgstr "faili ei õnnestu sulgeda" msgstr "faili ei õnnestu sulgeda"
@@ -231,7 +231,7 @@ msgstr ""
"See on vaba tarkvara; kopeerimistingimused leiate lähtetekstidest. Garantii\n" "See on vaba tarkvara; kopeerimistingimused leiate lähtetekstidest. Garantii\n"
"PUUDUB; ka müügiks või mingil eesmärgil kasutamiseks.\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 #, c-format
msgid "`%s' is no longer supported" msgid "`%s' is no longer supported"
msgstr "`%s' ei ole enam toetatud" msgstr "`%s' ei ole enam toetatud"
@@ -256,33 +256,33 @@ msgstr "%s: ignoreerin lisaargumente peale `%s'\n"
msgid "too many gotos (max %d)" msgid "too many gotos (max %d)"
msgstr "liiga palju gotosid (maks %d)" msgstr "liiga palju gotosid (maks %d)"
#: src/lex.c:78 #: src/lex.c:77
msgid "unexpected `/' found and ignored" msgid "unexpected `/' found and ignored"
msgstr "leidsin ja ignoreerin ootamatu `/'" msgstr "leidsin ja ignoreerin ootamatu `/'"
#: src/lex.c:107 src/reader.c:269 #: src/lex.c:106 src/reader.c:269
msgid "unterminated comment" msgid "unterminated comment"
msgstr "lõpetamata kommentaar" msgstr "lõpetamata kommentaar"
#: src/lex.c:139 #: src/lex.c:138
msgid "unexpected end of file" msgid "unexpected end of file"
msgstr "ootamatu faililõpp" msgstr "ootamatu faililõpp"
#: src/lex.c:168 #: src/lex.c:167
msgid "unescaped newline in constant" msgid "unescaped newline in constant"
msgstr "paojadata reavahetus konstandis" msgstr "paojadata reavahetus konstandis"
#: src/lex.c:210 #: src/lex.c:209
#, c-format #, c-format
msgid "octal value outside range 0...255: `\\%o'" msgid "octal value outside range 0...255: `\\%o'"
msgstr "kaheksandväärtus väljaspool piire 0...255: `\\%o'" msgstr "kaheksandväärtus väljaspool piire 0...255: `\\%o'"
#: src/lex.c:235 #: src/lex.c:234
#, c-format #, c-format
msgid "hexadecimal value above 255: `\\x%x'" msgid "hexadecimal value above 255: `\\x%x'"
msgstr "kuueteistkümnendväärtus suurem, kui above 255: `\\x%x'" msgstr "kuueteistkümnendväärtus suurem, kui above 255: `\\x%x'"
#: src/lex.c:247 #: src/lex.c:246
#, c-format #, c-format
msgid "unknown escape sequence: `\\' followed by `%s'" msgid "unknown escape sequence: `\\' followed by `%s'"
msgstr "tundmatu paojada: `\\' järgneb `%s'" msgstr "tundmatu paojada: `\\' järgneb `%s'"
@@ -295,7 +295,7 @@ msgstr "l
msgid "unterminated type name" msgid "unterminated type name"
msgstr "lõpetamata tüübinimi" msgstr "lõpetamata tüübinimi"
#: src/lex.c:437 #: src/lex.c:438
msgid "use \"...\" for multi-character literal tokens" msgid "use \"...\" for multi-character literal tokens"
msgstr "kasuta mitmesümboliliste literaalidega \"...\" konstruktsiooni" msgstr "kasuta mitmesümboliliste literaalidega \"...\" konstruktsiooni"

BIN
po/fr.gmo
View File

Binary file not shown.

24
po/fr.po
View File

@@ -6,7 +6,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: GNU bison 1.29f\n" "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" "PO-Revision-Date: 2001-10-19 15:00-0500\n"
"Last-Translator: Michel Robitaille <robitail@IRO.UMontreal.CA>\n" "Last-Translator: Michel Robitaille <robitail@IRO.UMontreal.CA>\n"
"Language-Team: French <traduc@traduc.org>\n" "Language-Team: French <traduc@traduc.org>\n"
@@ -130,12 +130,12 @@ msgstr "D
msgid "%s derives" msgid "%s derives"
msgstr "%s dérive" msgstr "%s dérive"
#: src/files.c:133 #: src/files.c:143
#, c-format #, c-format
msgid "cannot open file `%s'" msgid "cannot open file `%s'"
msgstr "ne peut ouvrir le fichier `%s'" msgstr "ne peut ouvrir le fichier `%s'"
#: src/files.c:152 #: src/files.c:162
msgid "cannot close file" msgid "cannot close file"
msgstr "ne peut fermer le fichier" msgstr "ne peut fermer le fichier"
@@ -237,7 +237,7 @@ msgstr ""
"reproduction. AUCUNE garantie n'est donnée; tant pour des raisons\n" "reproduction. AUCUNE garantie n'est donnée; tant pour des raisons\n"
"COMMERCIALES que pour RÉPONDRE À UN BESOIN PARTICULIER.\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 #, c-format
msgid "`%s' is no longer supported" msgid "`%s' is no longer supported"
msgstr "`%s' n'est plus supporté" msgstr "`%s' n'est plus supporté"
@@ -262,33 +262,33 @@ msgstr "%s: param
msgid "too many gotos (max %d)" msgid "too many gotos (max %d)"
msgstr "nombre trop grand de \"goto\" (Max %d)" msgstr "nombre trop grand de \"goto\" (Max %d)"
#: src/lex.c:78 #: src/lex.c:77
msgid "unexpected `/' found and ignored" msgid "unexpected `/' found and ignored"
msgstr "`/' inattendu et ignoré" msgstr "`/' inattendu et ignoré"
#: src/lex.c:107 src/reader.c:269 #: src/lex.c:106 src/reader.c:269
msgid "unterminated comment" msgid "unterminated comment"
msgstr "le commentaire ne se termine pas" msgstr "le commentaire ne se termine pas"
#: src/lex.c:139 #: src/lex.c:138
msgid "unexpected end of file" msgid "unexpected end of file"
msgstr "Fin de fichier inattendue" msgstr "Fin de fichier inattendue"
#: src/lex.c:168 #: src/lex.c:167
msgid "unescaped newline in constant" msgid "unescaped newline in constant"
msgstr "retour de chariot sans échappement dans une constante" msgstr "retour de chariot sans échappement dans une constante"
#: src/lex.c:210 #: src/lex.c:209
#, c-format #, c-format
msgid "octal value outside range 0...255: `\\%o'" msgid "octal value outside range 0...255: `\\%o'"
msgstr "valeur octale à l'extérieur de l'intervalle 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 #, c-format
msgid "hexadecimal value above 255: `\\x%x'" msgid "hexadecimal value above 255: `\\x%x'"
msgstr "valeur hexadécimale supérieure à 255: \\x%x" msgstr "valeur hexadécimale supérieure à 255: \\x%x"
#: src/lex.c:247 #: src/lex.c:246
#, c-format #, c-format
msgid "unknown escape sequence: `\\' followed by `%s'" msgid "unknown escape sequence: `\\' followed by `%s'"
msgstr "séquence d'échappement inconnue: `\\' suivie de `%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" msgid "unterminated type name"
msgstr "le nom de type ne se termine pas" msgstr "le nom de type ne se termine pas"
#: src/lex.c:437 #: src/lex.c:438
msgid "use \"...\" for multi-character literal tokens" msgid "use \"...\" for multi-character literal tokens"
msgstr "utilisez \"...\" pour les terminaux litéraux de plusieurs caractères" msgstr "utilisez \"...\" pour les terminaux litéraux de plusieurs caractères"

BIN
po/ja.gmo
View File

Binary file not shown.

24
po/ja.po
View File

@@ -5,7 +5,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: GNU bison 1.28\n" "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" "PO-Revision-Date: 1999-09-28 21:10+0900\n"
"Last-Translator: Daisuke Yamashita <yamad@mb.infoweb.ne.jp>\n" "Last-Translator: Daisuke Yamashita <yamad@mb.infoweb.ne.jp>\n"
"Language-Team: Japanese <ja@li.org>\n" "Language-Team: Japanese <ja@li.org>\n"
@@ -135,12 +135,12 @@ msgstr ""
msgid "%s derives" msgid "%s derives"
msgstr "%s は以下から派生" msgstr "%s は以下から派生"
#: src/files.c:133 #: src/files.c:143
#, c-format #, c-format
msgid "cannot open file `%s'" msgid "cannot open file `%s'"
msgstr "" msgstr ""
#: src/files.c:152 #: src/files.c:162
msgid "cannot close file" msgid "cannot close file"
msgstr "" msgstr ""
@@ -214,7 +214,7 @@ msgid ""
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
msgstr "" msgstr ""
#: src/getargs.c:214 src/lex.c:650 #: src/getargs.c:214 src/lex.c:651
#, c-format #, c-format
msgid "`%s' is no longer supported" msgid "`%s' is no longer supported"
msgstr "" msgstr ""
@@ -239,34 +239,34 @@ msgstr "%s: '%s'
msgid "too many gotos (max %d)" msgid "too many gotos (max %d)"
msgstr "%s の数が多すぎます (最大 %d)" msgstr "%s の数が多すぎます (最大 %d)"
#: src/lex.c:78 #: src/lex.c:77
msgid "unexpected `/' found and ignored" msgid "unexpected `/' found and ignored"
msgstr "予期しない `/' が見つかり、無視されました" msgstr "予期しない `/' が見つかり、無視されました"
#: src/lex.c:107 src/reader.c:269 #: src/lex.c:106 src/reader.c:269
msgid "unterminated comment" msgid "unterminated comment"
msgstr "閉じていないコメントです" msgstr "閉じていないコメントです"
#: src/lex.c:139 #: src/lex.c:138
#, fuzzy #, fuzzy
msgid "unexpected end of file" msgid "unexpected end of file"
msgstr "予期しないファイルの終端です" msgstr "予期しないファイルの終端です"
#: src/lex.c:168 #: src/lex.c:167
msgid "unescaped newline in constant" msgid "unescaped newline in constant"
msgstr "定数の中にエスケープされていない改行があります" msgstr "定数の中にエスケープされていない改行があります"
#: src/lex.c:210 #: src/lex.c:209
#, c-format #, c-format
msgid "octal value outside range 0...255: `\\%o'" msgid "octal value outside range 0...255: `\\%o'"
msgstr "8 進数の値が 0...255 の範囲外です: `\\%o'" msgstr "8 進数の値が 0...255 の範囲外です: `\\%o'"
#: src/lex.c:235 #: src/lex.c:234
#, c-format #, c-format
msgid "hexadecimal value above 255: `\\x%x'" msgid "hexadecimal value above 255: `\\x%x'"
msgstr "16 進数の値が 255 を越えています: `\\x%x'" msgstr "16 進数の値が 255 を越えています: `\\x%x'"
#: src/lex.c:247 #: src/lex.c:246
#, c-format #, c-format
msgid "unknown escape sequence: `\\' followed by `%s'" msgid "unknown escape sequence: `\\' followed by `%s'"
msgstr "未知のエスケープシーケンス: `\\' の後に `%s'" msgstr "未知のエスケープシーケンス: `\\' の後に `%s'"
@@ -279,7 +279,7 @@ msgstr "
msgid "unterminated type name" msgid "unterminated type name"
msgstr "閉じられていないタイプ名があります" msgstr "閉じられていないタイプ名があります"
#: src/lex.c:437 #: src/lex.c:438
msgid "use \"...\" for multi-character literal tokens" msgid "use \"...\" for multi-character literal tokens"
msgstr "複数文字のリテラルトークンには \"...\" を使いましょう" msgstr "複数文字のリテラルトークンには \"...\" を使いましょう"

BIN
po/nl.gmo
View File

Binary file not shown.

24
po/nl.po
View File

@@ -5,7 +5,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: bison 1.25\n" "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" "PO-Revision-Date: 1996-08-27 15:34 MET DST\n"
"Last-Translator: Erick Branderhorst <branderh@debian.org>\n" "Last-Translator: Erick Branderhorst <branderh@debian.org>\n"
"Language-Team: Dutch <nl@li.org>\n" "Language-Team: Dutch <nl@li.org>\n"
@@ -135,12 +135,12 @@ msgstr ""
msgid "%s derives" msgid "%s derives"
msgstr "%s afgeleiden" msgstr "%s afgeleiden"
#: src/files.c:133 #: src/files.c:143
#, c-format #, c-format
msgid "cannot open file `%s'" msgid "cannot open file `%s'"
msgstr "" msgstr ""
#: src/files.c:152 #: src/files.c:162
msgid "cannot close file" msgid "cannot close file"
msgstr "" msgstr ""
@@ -214,7 +214,7 @@ msgid ""
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
msgstr "" msgstr ""
#: src/getargs.c:214 src/lex.c:650 #: src/getargs.c:214 src/lex.c:651
#, c-format #, c-format
msgid "`%s' is no longer supported" msgid "`%s' is no longer supported"
msgstr "" msgstr ""
@@ -239,34 +239,34 @@ msgstr "%s: extra argumenten genegeerd na '%s'\n"
msgid "too many gotos (max %d)" msgid "too many gotos (max %d)"
msgstr "" msgstr ""
#: src/lex.c:78 #: src/lex.c:77
msgid "unexpected `/' found and ignored" msgid "unexpected `/' found and ignored"
msgstr "onverwachte `/' gevonden en genegeerd" msgstr "onverwachte `/' gevonden en genegeerd"
#: src/lex.c:107 src/reader.c:269 #: src/lex.c:106 src/reader.c:269
msgid "unterminated comment" msgid "unterminated comment"
msgstr "ongetermineerd commentaar" msgstr "ongetermineerd commentaar"
#: src/lex.c:139 #: src/lex.c:138
#, fuzzy #, fuzzy
msgid "unexpected end of file" msgid "unexpected end of file"
msgstr "Onverwacht bestandseinde" msgstr "Onverwacht bestandseinde"
#: src/lex.c:168 #: src/lex.c:167
msgid "unescaped newline in constant" msgid "unescaped newline in constant"
msgstr "niet geescapete nieuwe regel in constante" msgstr "niet geescapete nieuwe regel in constante"
#: src/lex.c:210 #: src/lex.c:209
#, c-format #, c-format
msgid "octal value outside range 0...255: `\\%o'" msgid "octal value outside range 0...255: `\\%o'"
msgstr "octale waarde buiten domein 0...255: `\\%o'" msgstr "octale waarde buiten domein 0...255: `\\%o'"
#: src/lex.c:235 #: src/lex.c:234
#, c-format #, c-format
msgid "hexadecimal value above 255: `\\x%x'" msgid "hexadecimal value above 255: `\\x%x'"
msgstr "hexadecimale waarde boven 255: `\\x%x'" msgstr "hexadecimale waarde boven 255: `\\x%x'"
#: src/lex.c:247 #: src/lex.c:246
#, c-format #, c-format
msgid "unknown escape sequence: `\\' followed by `%s'" msgid "unknown escape sequence: `\\' followed by `%s'"
msgstr "onbekende escape reeks: `\\' gevolgd door `%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" msgid "unterminated type name"
msgstr "niet getermineerd type naam" msgstr "niet getermineerd type naam"
#: src/lex.c:437 #: src/lex.c:438
msgid "use \"...\" for multi-character literal tokens" msgid "use \"...\" for multi-character literal tokens"
msgstr "gebruik \"...\" voor meerdere karakters literal tekens" msgstr "gebruik \"...\" voor meerdere karakters literal tekens"

BIN
po/ru.gmo
View File

Binary file not shown.

24
po/ru.po
View File

@@ -5,7 +5,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: bison 1.29\n" "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" "PO-Revision-Date: 2001-09-09 13:49+04:00\n"
"Last-Translator: Dmitry S. Sivachenko <dima@Chg.RU>\n" "Last-Translator: Dmitry S. Sivachenko <dima@Chg.RU>\n"
"Language-Team: Russian <ru@li.org>\n" "Language-Team: Russian <ru@li.org>\n"
@@ -129,12 +129,12 @@ msgstr "DERIVES"
msgid "%s derives" msgid "%s derives"
msgstr "%s ×Ù×ÏÄÉÔ" msgstr "%s ×Ù×ÏÄÉÔ"
#: src/files.c:133 #: src/files.c:143
#, c-format #, c-format
msgid "cannot open file `%s'" msgid "cannot open file `%s'"
msgstr "ÎÅ ÕÄÁÅÔÓÑ ÏÔËÒÙÔØ ÆÁÊÌ `%s'" msgstr "ÎÅ ÕÄÁÅÔÓÑ ÏÔËÒÙÔØ ÆÁÊÌ `%s'"
#: src/files.c:152 #: src/files.c:162
msgid "cannot close file" msgid "cannot close file"
msgstr "ÎÅ ÕÄÁÅÔÓÑ ÚÁËÒÙÔØ ÆÁÊÌ" 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 #, c-format
msgid "`%s' is no longer supported" msgid "`%s' is no longer supported"
msgstr "`%s' ÂÏÌØÛÅ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ" msgstr "`%s' ÂÏÌØÛÅ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ"
@@ -261,33 +261,33 @@ msgstr "%s:
msgid "too many gotos (max %d)" msgid "too many gotos (max %d)"
msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ goto (ÍÁËÓÉÍÁÌØÎÏ %d)" msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ goto (ÍÁËÓÉÍÁÌØÎÏ %d)"
#: src/lex.c:78 #: src/lex.c:77
msgid "unexpected `/' found and ignored" msgid "unexpected `/' found and ignored"
msgstr "×ÓÔÒÅÞÅÎ É ÐÒÏÉÇÎÏÒÉÒÏ×ÁÎ ÎÅÏÖÉÄÁÎÎÙÊ ÓÉÍ×ÏÌ `/'" msgstr "×ÓÔÒÅÞÅÎ É ÐÒÏÉÇÎÏÒÉÒÏ×ÁÎ ÎÅÏÖÉÄÁÎÎÙÊ ÓÉÍ×ÏÌ `/'"
#: src/lex.c:107 src/reader.c:269 #: src/lex.c:106 src/reader.c:269
msgid "unterminated comment" msgid "unterminated comment"
msgstr "ÎÅÚÁËÏÎÞÅÎÎÙÊ ËÏÍÍÅÎÔÁÒÉÊ" msgstr "ÎÅÚÁËÏÎÞÅÎÎÙÊ ËÏÍÍÅÎÔÁÒÉÊ"
#: src/lex.c:139 #: src/lex.c:138
msgid "unexpected end of file" msgid "unexpected end of file"
msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ËÏÎÅÃ ÆÁÊÌÁ" msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ËÏÎÅÃ ÆÁÊÌÁ"
#: src/lex.c:168 #: src/lex.c:167
msgid "unescaped newline in constant" msgid "unescaped newline in constant"
msgstr "ÎÅÜËÒÁÎÉÒÏ×ÁÎÎÙÊ ÐÅÒÅ×ÏÄ ÓÔÒÏËÉ × ËÏÎÓÔÁÎÔÅ" msgstr "ÎÅÜËÒÁÎÉÒÏ×ÁÎÎÙÊ ÐÅÒÅ×ÏÄ ÓÔÒÏËÉ × ËÏÎÓÔÁÎÔÅ"
#: src/lex.c:210 #: src/lex.c:209
#, c-format #, c-format
msgid "octal value outside range 0...255: `\\%o'" msgid "octal value outside range 0...255: `\\%o'"
msgstr "×ÏÓØÍÅÒÉÞÎÁÑ ×ÅÌÉÞÉÎÁ ÚÁ ÐÒÅÄÅÌÁÍÉ ÄÉÁÐÁÚÏÎÁ 0...255: `\\%o'" msgstr "×ÏÓØÍÅÒÉÞÎÁÑ ×ÅÌÉÞÉÎÁ ÚÁ ÐÒÅÄÅÌÁÍÉ ÄÉÁÐÁÚÏÎÁ 0...255: `\\%o'"
#: src/lex.c:235 #: src/lex.c:234
#, c-format #, c-format
msgid "hexadecimal value above 255: `\\x%x'" msgid "hexadecimal value above 255: `\\x%x'"
msgstr "ÛÅÓÔÎÁÄÃÁÔÅÒÉÞÎÁÑ ×ÅÌÉÞÉÎÁ ÐÒÅ×ÙÛÁÅÔ 255: `\\x%x'" msgstr "ÛÅÓÔÎÁÄÃÁÔÅÒÉÞÎÁÑ ×ÅÌÉÞÉÎÁ ÐÒÅ×ÙÛÁÅÔ 255: `\\x%x'"
#: src/lex.c:247 #: src/lex.c:246
#, c-format #, c-format
msgid "unknown escape sequence: `\\' followed by `%s'" msgid "unknown escape sequence: `\\' followed by `%s'"
msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ escape-ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ: `%s' ÐÏÓÌÅ `\\'" msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ escape-ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ: `%s' ÐÏÓÌÅ `\\'"
@@ -300,7 +300,7 @@ msgstr "
msgid "unterminated type name" msgid "unterminated type name"
msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ ÉÍÑ ÔÉÐÁ" msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ ÉÍÑ ÔÉÐÁ"
#: src/lex.c:437 #: src/lex.c:438
msgid "use \"...\" for multi-character literal tokens" msgid "use \"...\" for multi-character literal tokens"
msgstr "ÉÓÐÏÌØÚÕÊÔÅ \"...\" ÄÌÑ ÍÎÏÇÏÓÉÍ×ÏÌØÎÙÈ ÌÉÔÅÒÁÌØÎÙÈ ÌÅËÓÅÍ" msgstr "ÉÓÐÏÌØÚÕÊÔÅ \"...\" ÄÌÑ ÍÎÏÇÏÓÉÍ×ÏÌØÎÙÈ ÌÉÔÅÒÁÌØÎÙÈ ÌÅËÓÅÍ"

24
po/tr.po
View File

@@ -5,7 +5,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: bison 1.28c\n" "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" "PO-Revision-Date: 2001-09-10 10:54GMT\n"
"Last-Translator: Altug Bayram <altugbayram_2000@yahoo.com>\n" "Last-Translator: Altug Bayram <altugbayram_2000@yahoo.com>\n"
"Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n" "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
@@ -131,12 +131,12 @@ msgstr "T
msgid "%s derives" msgid "%s derives"
msgstr "%s türetildi" msgstr "%s türetildi"
#: src/files.c:133 #: src/files.c:143
#, c-format #, c-format
msgid "cannot open file `%s'" msgid "cannot open file `%s'"
msgstr "`%s' dosyasý açýlamadý" msgstr "`%s' dosyasý açýlamadý"
#: src/files.c:152 #: src/files.c:162
msgid "cannot close file" msgid "cannot close file"
msgstr "dosya kapatýlamýyor" msgstr "dosya kapatýlamýyor"
@@ -238,7 +238,7 @@ msgstr ""
"Hiçbir garantisi yoktur; hatta SATILABÝLÝRLÝÐÝ veya HERHANGÝ BÝR AMACA\n" "Hiçbir garantisi yoktur; hatta SATILABÝLÝRLÝÐÝ veya HERHANGÝ BÝR AMACA\n"
"UYGUNLUÐU için bile garanti verilmez.\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 #, c-format
msgid "`%s' is no longer supported" msgid "`%s' is no longer supported"
msgstr "`%s' artýk desteklenmiyor" msgstr "`%s' artýk desteklenmiyor"
@@ -263,33 +263,33 @@ msgstr "%s: '%s' den sonraki arg
msgid "too many gotos (max %d)" msgid "too many gotos (max %d)"
msgstr "gotos çok fazla (en fazla %d)" msgstr "gotos çok fazla (en fazla %d)"
#: src/lex.c:78 #: src/lex.c:77
msgid "unexpected `/' found and ignored" msgid "unexpected `/' found and ignored"
msgstr "beklenmeyen `/' bulundu ve yoksayýldý" 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" msgid "unterminated comment"
msgstr "sonlandýrýlmamýþ açýklama" msgstr "sonlandýrýlmamýþ açýklama"
#: src/lex.c:139 #: src/lex.c:138
msgid "unexpected end of file" msgid "unexpected end of file"
msgstr "beklenmeyen dosya sonu" msgstr "beklenmeyen dosya sonu"
#: src/lex.c:168 #: src/lex.c:167
msgid "unescaped newline in constant" msgid "unescaped newline in constant"
msgstr "sabit içinde kaçýþsýz yeni satýr" msgstr "sabit içinde kaçýþsýz yeni satýr"
#: src/lex.c:210 #: src/lex.c:209
#, c-format #, c-format
msgid "octal value outside range 0...255: `\\%o'" msgid "octal value outside range 0...255: `\\%o'"
msgstr "sekizli deðer 0...255'in dýþýnda: `\\%o'" msgstr "sekizli deðer 0...255'in dýþýnda: `\\%o'"
#: src/lex.c:235 #: src/lex.c:234
#, c-format #, c-format
msgid "hexadecimal value above 255: `\\x%x'" msgid "hexadecimal value above 255: `\\x%x'"
msgstr "onaltýlýk deðer 255'in üstünde: `\\x%x'" msgstr "onaltýlýk deðer 255'in üstünde: `\\x%x'"
#: src/lex.c:247 #: src/lex.c:246
#, c-format #, c-format
msgid "unknown escape sequence: `\\' followed by `%s'" msgid "unknown escape sequence: `\\' followed by `%s'"
msgstr "bilinmeyen kaçýþ sýrasý: `\\' `%s' tarafýndan takip edildi" msgstr "bilinmeyen kaçýþ sýrasý: `\\' `%s' tarafýndan takip edildi"
@@ -302,7 +302,7 @@ msgstr "dosya sonunda sonland
msgid "unterminated type name" msgid "unterminated type name"
msgstr "sonlandýrýlmamýþ tip ismi" msgstr "sonlandýrýlmamýþ tip ismi"
#: src/lex.c:437 #: src/lex.c:438
msgid "use \"...\" for multi-character literal tokens" msgid "use \"...\" for multi-character literal tokens"
msgstr "çok-karakterli yazýn andaçlarý için \"...\" kullan" msgstr "çok-karakterli yazýn andaçlarý için \"...\" kullan"

26
src/files.c
View File

@@ -86,26 +86,36 @@ stringappend (const char *string1, const char *string2)
} }
/*---------------------------------------------------------------. /*-----------------------------------------------------------------.
| Computes the macro name used to avoid double inclusion in the | | Computes the macro name used to avoid double inclusion in the |
| header of the parser and store it in header_macro_name. | | 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 * static char *
compute_header_macro (void) compute_header_macro (void)
{ {
const char *prefix = "BISON_";
char *macro_name, *cp; char *macro_name, *cp;
if (spec_defines_file) 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 else
{ {
macro_name = XMALLOC (char, macro_name = XMALLOC (char,
strlen (prefix) +
strlen (base_name) + strlen (base_name) +
strlen (header_extension) + 1); strlen (header_extension) + 1);
cp = stpcpy (macro_name, prefix);
stpcpy (macro_name, base_name); cp = stpcpy (cp, base_name);
strcat (macro_name, header_extension); cp = stpcpy (cp, header_extension);
} }
for (cp = macro_name; *cp; ++cp) for (cp = macro_name; *cp; ++cp)

27
tests/regression.at
View File

@@ -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, # CPP should be happy with it.
[[#ifndef INPUT_INPUT_TAB_H AT_CHECK([$CC -E $1.h], 0, [ignore])
]])
AT_CLEANUP(input) AT_CLEANUP($1.y)
])
AT_TEST_CPP_GUARD_H([input/input])
AT_TEST_CPP_GUARD_H([9foo])