Add of %source_extension and %header_extension which specify

the source or/and the header output file extension.
* src/files.c (compute_base_names): Remove initialisation of
src_extension and header_extension.
(compute_exts_from_gf): Update.
(compute_exts_from_src): Update.
(output_files): Update.
* src/reader.c (parse_header_extension_decl): New.
(parse_source_extension_decl): New.
(read_declarations): New case statements for the new tokens.
* src/lex.c (percent_table): Add entries for %source_extension
and %header_extension.
* src/lex.h (token_e): New tokens tok_hdrext and tok_srcext.

diff --git a/ChangeLog b/ChangeLog
index 35f4e41..5f5a829 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,22 @@
 2001-08-06  Marc Autret  <autret_m@epita.fr>
 
+       Add of %source_extension and %header_extension which specify
+       the source or/and the header output file extension.
+
+       * src/files.c (compute_base_names): Remove initialisation of
+       src_extension and header_extension.
+       (compute_exts_from_gf): Update.
+       (compute_exts_from_src): Update.
+       (output_files): Update.
+       * src/reader.c (parse_header_extension_decl): New.
+       (parse_source_extension_decl): New.
+       (read_declarations): New case statements for the new tokens.
+       * src/lex.c (percent_table): Add entries for %source_extension
+       and %header_extension.
+       * src/lex.h (token_e): New tokens tok_hdrext and tok_srcext.
+
+2001-08-06  Marc Autret  <autret_m@epita.fr>
+
        * configure.in: Bump to 1.28c.
        * doc/bison.texinfo: Texinfo thingies.
 

diff --git a/NEWS b/NEWS
index fabc23b..7b8a71f 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,7 @@
 Bison News
 ----------
 
-Changes in version 1.28b:
+Changes in version 1.28c:
 
 * the input and the output files has automatically a similar extension.
 

diff --git a/po/de.gmo b/po/de.gmo
index 12bba58..933c2b8 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 7a0d6ad..8713ed2 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.25\n"
-"POT-Creation-Date: 2001-08-03 11:38+0200\n"
+"POT-Creation-Date: 2001-08-06 10:50+0200\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"
@@ -206,7 +206,7 @@ msgid ""
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
 
-#: src/getargs.c:202 src/lex.c:633
+#: src/getargs.c:202 src/lex.c:635
 #, c-format
 msgid "`%s' is no longer supported"
 msgstr ""
@@ -437,7 +437,7 @@ msgstr ""
 msgid "symbol %s redefined"
 msgstr "Symbol %s noch einmal definiert"
 
-#: src/reader.c:534 src/reader.c:613 src/reader.c:674 src/reader.c:1231
+#: src/reader.c:534 src/reader.c:613 src/reader.c:674 src/reader.c:1277
 #, c-format
 msgid "type redeclaration for %s"
 msgstr "erneute Deklaration des Typs für %s"
@@ -452,7 +452,7 @@ msgstr "
 msgid "multiple %s declarations"
 msgstr "mehr als eine %start Deklaration"
 
-#: src/reader.c:563 src/reader.c:1209
+#: src/reader.c:563 src/reader.c:1255
 #, fuzzy, c-format
 msgid "invalid %s declaration"
 msgstr "ungültige %start Deklaration"
@@ -481,7 +481,7 @@ msgstr "unzul
 msgid "unexpected item: %s"
 msgstr "unerwartetes Symbol: %s"
 
-#: src/reader.c:759 src/reader.c:1035 src/reader.c:1106
+#: src/reader.c:759 src/reader.c:1081 src/reader.c:1152
 #, fuzzy, c-format
 msgid "unmatched %s"
 msgstr "»{« hat kein Gegenstück"
@@ -501,105 +501,115 @@ msgstr "unerwartetes Symbol %s, hier wird ein Bezeichner erwartet"
 msgid "expected string constant instead of %s"
 msgstr "hier wird eine Zeichenkette erwartet, nicht %s"
 
-#: src/reader.c:951
+#: src/reader.c:888
+#, fuzzy, c-format
+msgid "multiple %%header_extension declarations"
+msgstr "erneute %union Definition"
+
+#: src/reader.c:908
+#, fuzzy, c-format
+msgid "multiple %%source_extension declarations"
+msgstr "erneute %union Definition"
+
+#: src/reader.c:997
 #, c-format
 msgid "unrecognized: %s"
 msgstr "unbekannt: %s"
 
-#: src/reader.c:956
+#: src/reader.c:1002
 msgid "no input grammar"
 msgstr "keine Eingabe-Grammatik"
 
-#: src/reader.c:961
+#: src/reader.c:1007
 #, c-format
 msgid "unknown character: %s"
 msgstr "unbekanntes Zeichen: %s"
 
-#: src/reader.c:1129
+#: src/reader.c:1175
 #, fuzzy, c-format
 msgid "unterminated %guard clause"
 msgstr "unbeendeter %%guard Fall"
 
-#: src/reader.c:1296
+#: src/reader.c:1342
 msgid "ill-formed rule: initial symbol not followed by colon"
 msgstr ""
 "falsch geformte Regel: führendes Symbol wird nicht von einem Semikolon "
 "gefolgt"
 
-#: src/reader.c:1303
+#: src/reader.c:1349
 msgid "grammar starts with vertical bar"
 msgstr "Grammatik fängt mit einem vertikalen Strich (»|«) an"
 
-#: src/reader.c:1334
+#: src/reader.c:1380
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "Regel für %s vorhanden, welches aber ein Token ist"
 
-#: src/reader.c:1436
+#: src/reader.c:1482
 msgid "two @prec's in a row"
 msgstr "zwei @prec Anweisungen nacheinander"
 
-#: src/reader.c:1444
+#: src/reader.c:1490
 #, fuzzy, c-format
 msgid "%%guard present but %%semantic_parser not specified"
 msgstr ""
 "%%guard Anweisung vorhanden, jedoch wird %%semantic_parser nicht angegeben"
 
-#: src/reader.c:1453
+#: src/reader.c:1499
 msgid "two actions at end of one rule"
 msgstr "Zwei Aktionen am Ende einer Regel"
 
-#: src/reader.c:1467
+#: src/reader.c:1513
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "Typkonflikt (»%s« »%s«) bei Default Aktion"
 
-#: src/reader.c:1473
+#: src/reader.c:1519
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "leere Regel für Nicht-Terminal vmit Typ und keine Aktion"
 
-#: src/reader.c:1517
+#: src/reader.c:1563
 #, c-format
 msgid "invalid input: %s"
 msgstr "ungültige Eingabe: %s"
 
-#: src/reader.c:1525
+#: src/reader.c:1571
 #, fuzzy, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "zu viele Symbols (Token plus Nicht-Terminal); Maximum %s"
 
-#: src/reader.c:1528
+#: src/reader.c:1574
 msgid "no rules in the input grammar"
 msgstr "Eingabegrammatik enthält keine Regeln"
 
-#: src/reader.c:1552
+#: src/reader.c:1598
 #, c-format
 msgid "symbol %s is used, but is not defined as a token and has no rules"
 msgstr ""
 "Symbol %s wird benutzt, ist aber nicht als Token definiert und hat keine "
 "Regel"
 
-#: src/reader.c:1657
+#: src/reader.c:1703
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "Vorrangwertigkeiten für %s und %s widersprechen sich"
 
-#: src/reader.c:1669
+#: src/reader.c:1715
 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "assoc Werte für %s nd %s widersprechen sich"
 
-#: src/reader.c:1720
+#: src/reader.c:1766
 #, fuzzy, c-format
 msgid "tokens %s and %s both assigned number %d"
 msgstr "Token %s und %s haben die selbe nummer %s"
 
-#: src/reader.c:1733
+#: src/reader.c:1779
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "das Startsymbol %s ist undefiniert"
 
-#: src/reader.c:1735
+#: src/reader.c:1781
 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "das Startsymbol %s ist ein Token"
@@ -801,9 +811,6 @@ msgstr ""
 #~ msgid "unmatched right brace (`}')"
 #~ msgstr "schließende geschweifte Klammer (»}«) hat kein Gegenstück"
 
-#~ msgid "multiple %union declarations"
-#~ msgstr "erneute %union Definition"
-
 #~ msgid "unterminated comment at end of file"
 #~ msgstr "unbeendeter Kommentar am Dateiende"
 

diff --git a/po/es.po b/po/es.po
index 82ecae0..11366a6 100644 (file)
--- a/po/es.po
+++ b/po/es.po
@@ -30,7 +30,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU bison 1.25\n"
-"POT-Creation-Date: 2001-08-03 11:38+0200\n"
+"POT-Creation-Date: 2001-08-06 10:50+0200\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"
@@ -269,7 +269,7 @@ msgid ""
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
 
-#: src/getargs.c:202 src/lex.c:633
+#: src/getargs.c:202 src/lex.c:635
 #, c-format
 msgid "`%s' is no longer supported"
 msgstr ""
@@ -514,7 +514,7 @@ msgstr ""
 msgid "symbol %s redefined"
 msgstr "redefinido el símbolo %s"
 
-#: src/reader.c:534 src/reader.c:613 src/reader.c:674 src/reader.c:1231
+#: src/reader.c:534 src/reader.c:613 src/reader.c:674 src/reader.c:1277
 #, c-format
 msgid "type redeclaration for %s"
 msgstr "redeclaración del tipo de %s"
@@ -529,7 +529,7 @@ msgstr "`%s' no es v
 msgid "multiple %s declarations"
 msgstr "múltiples declaraciones de %start"
 
-#: src/reader.c:563 src/reader.c:1209
+#: src/reader.c:563 src/reader.c:1255
 #, fuzzy, c-format
 msgid "invalid %s declaration"
 msgstr "declaración de %start no válida"
@@ -568,7 +568,7 @@ msgid "unexpected item: %s"
 msgstr "ítem inesperado: %s"
 
 # Cambio el orden y el sexo. Ahora está "en español". sv
-#: src/reader.c:759 src/reader.c:1035 src/reader.c:1106
+#: src/reader.c:759 src/reader.c:1081 src/reader.c:1152
 #, fuzzy, c-format
 msgid "unmatched %s"
 msgstr "`{' desemparejada"
@@ -594,16 +594,26 @@ msgstr "no se reconoce el 
 msgid "expected string constant instead of %s"
 msgstr "se esperaba una cadena constante en lugar de %s"
 
-#: src/reader.c:951
+#: src/reader.c:888
+#, fuzzy, c-format
+msgid "multiple %%header_extension declarations"
+msgstr "declaraciones múltiples de %union"
+
+#: src/reader.c:908
+#, fuzzy, c-format
+msgid "multiple %%source_extension declarations"
+msgstr "declaraciones múltiples de %union"
+
+#: src/reader.c:997
 #, c-format
 msgid "unrecognized: %s"
 msgstr "no reconocido: %s"
 
-#: src/reader.c:956
+#: src/reader.c:1002
 msgid "no input grammar"
 msgstr "no hay gramática de entrada"
 
-#: src/reader.c:961
+#: src/reader.c:1007
 #, c-format
 msgid "unknown character: %s"
 msgstr "carácter desconocido: %s"
@@ -612,93 +622,93 @@ msgstr "car
 # mejor que `sin terminar' que me parece más "computerizado" - cll
 # quizás un poco cacofónico lo de claúsula inconclusa - ngp
 #
-#: src/reader.c:1129
+#: src/reader.c:1175
 #, fuzzy, c-format
 msgid "unterminated %guard clause"
 msgstr "cláusula %%guard sin terminar"
 
-#: src/reader.c:1296
+#: src/reader.c:1342
 msgid "ill-formed rule: initial symbol not followed by colon"
 msgstr "regla mal formada: el símbolo inicial no está seguido por :"
 
-#: src/reader.c:1303
+#: src/reader.c:1349
 msgid "grammar starts with vertical bar"
 msgstr "la gramática comienza con una barra vertical"
 
-#: src/reader.c:1334
+#: src/reader.c:1380
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "se ha dado una regla para %s, que es un terminal"
 
-#: src/reader.c:1436
+#: src/reader.c:1482
 msgid "two @prec's in a row"
 msgstr "dos @prec en una línea"
 
 # Insisto, el empleo de participios a secas me parece como hablar en
 # indio. Por favor, permíteme que añada un "está" :) - cll
 # ok - ngp
-#: src/reader.c:1444
+#: src/reader.c:1490
 #, fuzzy, c-format
 msgid "%%guard present but %%semantic_parser not specified"
 msgstr "%%guard presente pero %%semantic_parser está sin especificar"
 
-#: src/reader.c:1453
+#: src/reader.c:1499
 msgid "two actions at end of one rule"
 msgstr "dos acciones al final de una regla"
 
-#: src/reader.c:1467
+#: src/reader.c:1513
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "los tipos (`%s' `%s') no concuerdan en la acción por defecto"
 
-#: src/reader.c:1473
+#: src/reader.c:1519
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "regla vacía para un no terminal con tipo y no hay ninguna acción"
 
-#: src/reader.c:1517
+#: src/reader.c:1563
 #, c-format
 msgid "invalid input: %s"
 msgstr "entrada no válida: %s"
 
-#: src/reader.c:1525
+#: src/reader.c:1571
 #, fuzzy, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "demasiados símbolos (terminales y no terminales); máximo %s"
 
-#: src/reader.c:1528
+#: src/reader.c:1574
 msgid "no rules in the input grammar"
 msgstr "no hay reglas en la gramática de entrada"
 
 # `token' se debe traducir como `literal' - cll
 # en terminología de compiladores token es más un terminal - ngp
 #
-#: src/reader.c:1552
+#: src/reader.c:1598
 #, c-format
 msgid "symbol %s is used, but is not defined as a token and has no rules"
 msgstr ""
 "se usa el símbolo %s, pero no está definido como terminal y no tiene reglas"
 
-#: src/reader.c:1657
+#: src/reader.c:1703
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "precedencias en conflicto entre %s y %s"
 
-#: src/reader.c:1669
+#: src/reader.c:1715
 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "conflicto de valores assoc para %s y %s"
 
-#: src/reader.c:1720
+#: src/reader.c:1766
 #, fuzzy, c-format
 msgid "tokens %s and %s both assigned number %d"
 msgstr "los terminales %s y %s tienen asignados ambos el número %s"
 
-#: src/reader.c:1733
+#: src/reader.c:1779
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "el símbolo de inicio (axioma) %s no está definido"
 
-#: src/reader.c:1735
+#: src/reader.c:1781
 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "el símbolo de inicio (axioma) %s es un terminal"
@@ -936,9 +946,6 @@ msgstr ""
 #~ msgid "unmatched right brace (`}')"
 #~ msgstr "llave derecha (`}') desemparejada"
 
-#~ msgid "multiple %union declarations"
-#~ msgstr "declaraciones múltiples de %union"
-
 #~ msgid "unterminated comment at end of file"
 #~ msgstr "comentario sin terminar al final del fichero"
 

diff --git a/po/et.gmo b/po/et.gmo
index 5154dc3..5955fa5 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 0893e5f..823eab1 100644 (file)
--- a/po/et.po
+++ b/po/et.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.25\n"
-"POT-Creation-Date: 2001-08-03 11:38+0200\n"
+"POT-Creation-Date: 2001-08-06 10:50+0200\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"
@@ -231,7 +231,7 @@ msgid ""
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
 
-#: src/getargs.c:202 src/lex.c:633
+#: src/getargs.c:202 src/lex.c:635
 #, c-format
 msgid "`%s' is no longer supported"
 msgstr ""
@@ -460,7 +460,7 @@ msgstr ""
 msgid "symbol %s redefined"
 msgstr "sümbol %s on uuesti defineeritud"
 
-#: src/reader.c:534 src/reader.c:613 src/reader.c:674 src/reader.c:1231
+#: src/reader.c:534 src/reader.c:613 src/reader.c:674 src/reader.c:1277
 #, c-format
 msgid "type redeclaration for %s"
 msgstr "%s tüübi uuesti deklareerimine"
@@ -475,7 +475,7 @@ msgstr "`%s' ei ole %s sees lubatud"
 msgid "multiple %s declarations"
 msgstr "korduvad %start deklaratsioonid"
 
-#: src/reader.c:563 src/reader.c:1209
+#: src/reader.c:563 src/reader.c:1255
 #, fuzzy, c-format
 msgid "invalid %s declaration"
 msgstr "vigane %start deklaratsioon"
@@ -504,7 +504,7 @@ msgstr "vigane tekst (%s) - number peab olema peale identifikaatorit"
 msgid "unexpected item: %s"
 msgstr "ootamatu element: %s"
 
-#: src/reader.c:759 src/reader.c:1035 src/reader.c:1106
+#: src/reader.c:759 src/reader.c:1081 src/reader.c:1152
 #, fuzzy, c-format
 msgid "unmatched %s"
 msgstr "puudub `{'"
@@ -524,102 +524,112 @@ msgstr "tundmatu element %s, eeldasin identifikaatorit"
 msgid "expected string constant instead of %s"
 msgstr "eeldasin %s asemel sõnekonstanti"
 
-#: src/reader.c:951
+#: src/reader.c:888
+#, fuzzy, c-format
+msgid "multiple %%header_extension declarations"
+msgstr "korduvad %union deklaratsioonid"
+
+#: src/reader.c:908
+#, fuzzy, c-format
+msgid "multiple %%source_extension declarations"
+msgstr "korduvad %union deklaratsioonid"
+
+#: src/reader.c:997
 #, c-format
 msgid "unrecognized: %s"
 msgstr "tundmatu: %s"
 
-#: src/reader.c:956
+#: src/reader.c:1002
 msgid "no input grammar"
 msgstr "sisendgrammatikat pole"
 
-#: src/reader.c:961
+#: src/reader.c:1007
 #, c-format
 msgid "unknown character: %s"
 msgstr "tundmatu sümbol: %s"
 
-#: src/reader.c:1129
+#: src/reader.c:1175
 #, c-format
 msgid "unterminated %guard clause"
 msgstr "lõpetamata %guard klausel"
 
-#: src/reader.c:1296
+#: src/reader.c:1342
 msgid "ill-formed rule: initial symbol not followed by colon"
 msgstr "vigaselt formeeritud reegel: algsümbolile ei järgne koolonit"
 
-#: src/reader.c:1303
+#: src/reader.c:1349
 msgid "grammar starts with vertical bar"
 msgstr "grammatika algab püstkriipsuga"
 
-#: src/reader.c:1334
+#: src/reader.c:1380
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "%s jaoks on antud reegel, aga see on märk"
 
-#: src/reader.c:1436
+#: src/reader.c:1482
 msgid "two @prec's in a row"
 msgstr "kaks @prec ühel real"
 
-#: src/reader.c:1444
+#: src/reader.c:1490
 #, fuzzy, c-format
 msgid "%%guard present but %%semantic_parser not specified"
 msgstr "%guard on määratud, aga %semantic_parser ei ole"
 
-#: src/reader.c:1453
+#: src/reader.c:1499
 msgid "two actions at end of one rule"
 msgstr "kaks tegevust ühe reegli lõpus"
 
-#: src/reader.c:1467
+#: src/reader.c:1513
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "vaikimisi tegevuse tüübikonflikt (`%s' `%s')"
 
-#: src/reader.c:1473
+#: src/reader.c:1519
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "tüübiga mitteterminalil on tühi reegel ja puudub tegevus"
 
-#: src/reader.c:1517
+#: src/reader.c:1563
 #, c-format
 msgid "invalid input: %s"
 msgstr "vigane sisend: %s"
 
-#: src/reader.c:1525
+#: src/reader.c:1571
 #, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "liiga palju sümboleid (märgid ja mitteterminalid); maksimaalne on %d"
 
-#: src/reader.c:1528
+#: src/reader.c:1574
 msgid "no rules in the input grammar"
 msgstr "sisendgrammatikas pole reegleid"
 
-#: src/reader.c:1552
+#: src/reader.c:1598
 #, c-format
 msgid "symbol %s is used, but is not defined as a token and has no rules"
 msgstr ""
 "kasutatakse sümbolit %s, mis ei ole defineeritud märgina ja millel puuduvad "
 "reeglid"
 
-#: src/reader.c:1657
+#: src/reader.c:1703
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "%s ja %s omavad konfliktseid prioriteete"
 
-#: src/reader.c:1669
+#: src/reader.c:1715
 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "%s ja %s omavad konfliktseid assotsiatiivseid väärtuseid"
 
-#: src/reader.c:1720
+#: src/reader.c:1766
 #, c-format
 msgid "tokens %s and %s both assigned number %d"
 msgstr "märkidele %s ja %s on mõlemale omistatud number %d"
 
-#: src/reader.c:1733
+#: src/reader.c:1779
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "stardisümbol %s ei ole defineeritud"
 
-#: src/reader.c:1735
+#: src/reader.c:1781
 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "stardisümbol %s on märk"
@@ -815,9 +825,6 @@ msgstr ""
 #~ msgid "$%s is invalid"
 #~ msgstr "$%s on vigane"
 
-#~ msgid "multiple %union declarations"
-#~ msgstr "korduvad %union deklaratsioonid"
-
 #~ msgid "unterminated comment at end of file"
 #~ msgstr "lõpetamata kommentaar faili lõpus"
 

diff --git a/po/fr.gmo b/po/fr.gmo
index a6bf261..ea632e5 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 509a021..ae0fbd5 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.25\n"
-"POT-Creation-Date: 2001-08-03 11:38+0200\n"
+"POT-Creation-Date: 2001-08-06 10:50+0200\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"
@@ -213,7 +213,7 @@ msgid ""
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
 
-#: src/getargs.c:202 src/lex.c:633
+#: src/getargs.c:202 src/lex.c:635
 #, c-format
 msgid "`%s' is no longer supported"
 msgstr ""
@@ -443,7 +443,7 @@ msgstr ""
 msgid "symbol %s redefined"
 msgstr "symbole %s redéfini"
 
-#: src/reader.c:534 src/reader.c:613 src/reader.c:674 src/reader.c:1231
+#: src/reader.c:534 src/reader.c:613 src/reader.c:674 src/reader.c:1277
 #, c-format
 msgid "type redeclaration for %s"
 msgstr "redéclaration du type de %s"
@@ -458,7 +458,7 @@ msgstr "`%s' n'est pas valide dans %s"
 msgid "multiple %s declarations"
 msgstr "multiples déclarations %start"
 
-#: src/reader.c:563 src/reader.c:1209
+#: src/reader.c:563 src/reader.c:1255
 #, fuzzy, c-format
 msgid "invalid %s declaration"
 msgstr "la déclaration %start n'est pas valide"
@@ -488,7 +488,7 @@ msgstr ""
 msgid "unexpected item: %s"
 msgstr "item inattendu: %s"
 
-#: src/reader.c:759 src/reader.c:1035 src/reader.c:1106
+#: src/reader.c:759 src/reader.c:1081 src/reader.c:1152
 #, fuzzy, c-format
 msgid "unmatched %s"
 msgstr "accolade ouvrante `{' non appariée"
@@ -508,102 +508,112 @@ msgstr "item %s non reconnu, un identificateur est attendu"
 msgid "expected string constant instead of %s"
 msgstr "chaîne de caractères constante attendue plutôt que %s"
 
-#: src/reader.c:951
+#: src/reader.c:888
+#, fuzzy, c-format
+msgid "multiple %%header_extension declarations"
+msgstr "multiples déclarations %union"
+
+#: src/reader.c:908
+#, fuzzy, c-format
+msgid "multiple %%source_extension declarations"
+msgstr "multiples déclarations %union"
+
+#: src/reader.c:997
 #, c-format
 msgid "unrecognized: %s"
 msgstr "non reconnu: %s"
 
-#: src/reader.c:956
+#: src/reader.c:1002
 msgid "no input grammar"
 msgstr "aucune grammaire en entrée"
 
-#: src/reader.c:961
+#: src/reader.c:1007
 #, c-format
 msgid "unknown character: %s"
 msgstr "caractère inconnu: %s"
 
-#: src/reader.c:1129
+#: src/reader.c:1175
 #, fuzzy, c-format
 msgid "unterminated %guard clause"
 msgstr "clause %%guard non terminée"
 
-#: src/reader.c:1296
+#: src/reader.c:1342
 msgid "ill-formed rule: initial symbol not followed by colon"
 msgstr "règle mal formée: le symbole initial n'est pas suivi de `:'"
 
-#: src/reader.c:1303
+#: src/reader.c:1349
 msgid "grammar starts with vertical bar"
 msgstr "la grammaire débute par une barre verticale"
 
-#: src/reader.c:1334
+#: src/reader.c:1380
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "la règle pour %s, qui est un terminal"
 
-#: src/reader.c:1436
+#: src/reader.c:1482
 msgid "two @prec's in a row"
 msgstr "deux @prec de suite"
 
-#: src/reader.c:1444
+#: src/reader.c:1490
 #, fuzzy, c-format
 msgid "%%guard present but %%semantic_parser not specified"
 msgstr "%%guard est présent mais %%semantic_parser n'est pas spécifié"
 
-#: src/reader.c:1453
+#: src/reader.c:1499
 msgid "two actions at end of one rule"
 msgstr "deux actions à la fin d'une même règle"
 
-#: src/reader.c:1467
+#: src/reader.c:1513
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "conflit de type (`%s' `%s') pour l'action par défaut"
 
-#: src/reader.c:1473
+#: src/reader.c:1519
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "règle vide pour une catégorie typée et aucune action"
 
-#: src/reader.c:1517
+#: src/reader.c:1563
 #, c-format
 msgid "invalid input: %s"
 msgstr "entrée non valide: %s"
 
-#: src/reader.c:1525
+#: src/reader.c:1571
 #, fuzzy, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "trop de symboles (terminaux et catégories); maximum de %s"
 
-#: src/reader.c:1528
+#: src/reader.c:1574
 msgid "no rules in the input grammar"
 msgstr "la grammaire n'a pas de règles"
 
-#: src/reader.c:1552
+#: src/reader.c:1598
 #, c-format
 msgid "symbol %s is used, but is not defined as a token and has no rules"
 msgstr ""
 "le symbole %s est utilisé mais ce n'est pas un terminal et il ne possède pas "
 "de règle"
 
-#: src/reader.c:1657
+#: src/reader.c:1703
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "les priorités pour %s et %s entrent en conflit"
 
-#: src/reader.c:1669
+#: src/reader.c:1715
 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "les valeurs d'association de %s et %s entrent en conflit"
 
-#: src/reader.c:1720
+#: src/reader.c:1766
 #, fuzzy, c-format
 msgid "tokens %s and %s both assigned number %d"
 msgstr "les terminaux %s et %s se sont vus assigner le nombre %s"
 
-#: src/reader.c:1733
+#: src/reader.c:1779
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "le symbole de départ %s n'est pas défini"
 
-#: src/reader.c:1735
+#: src/reader.c:1781
 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "le symbole de départ %s est un terminal"
@@ -805,9 +815,6 @@ msgstr ""
 #~ msgid "unmatched right brace (`}')"
 #~ msgstr "accolade fermante `}' non appariée"
 
-#~ msgid "multiple %union declarations"
-#~ msgstr "multiples déclarations %union"
-
 #~ msgid "unterminated comment at end of file"
 #~ msgstr "le commentaire ne se termine pas avant la fin du fichier"
 

diff --git a/po/ja.gmo b/po/ja.gmo
index 8974689..504a474 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 1556228..0e506b4 100644 (file)
--- a/po/ja.po
+++ b/po/ja.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU bison 1.28\n"
-"POT-Creation-Date: 2001-08-03 11:38+0200\n"
+"POT-Creation-Date: 2001-08-06 10:50+0200\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"
@@ -212,7 +212,7 @@ msgid ""
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
 
-#: src/getargs.c:202 src/lex.c:633
+#: src/getargs.c:202 src/lex.c:635
 #, c-format
 msgid "`%s' is no longer supported"
 msgstr ""
@@ -442,7 +442,7 @@ msgstr ""
 msgid "symbol %s redefined"
 msgstr "¥·¥ó¥Ü¥ë %s ¤¬ºÆÄêµÁ¤µ¤ì¤Þ¤·¤¿"
 
-#: src/reader.c:534 src/reader.c:613 src/reader.c:674 src/reader.c:1231
+#: src/reader.c:534 src/reader.c:613 src/reader.c:674 src/reader.c:1277
 #, c-format
 msgid "type redeclaration for %s"
 msgstr "%s ¤Î·¿¤¬ºÆÄêµÁ¤µ¤ì¤Þ¤·¤¿"
@@ -457,7 +457,7 @@ msgstr "%2$s 
 msgid "multiple %s declarations"
 msgstr "Ê£¿ô¤Î %start ¤¬Àë¸À¤µ¤ì¤Þ¤·¤¿"
 
-#: src/reader.c:563 src/reader.c:1209
+#: src/reader.c:563 src/reader.c:1255
 #, fuzzy, c-format
 msgid "invalid %s declaration"
 msgstr "̵¸ú¤Ê %start ¤¬Àë¸À¤µ¤ì¤Þ¤·¤¿"
@@ -486,7 +486,7 @@ msgstr "̵
 msgid "unexpected item: %s"
 msgstr "ͽ´ü¤»¤Ì¥¢¥¤¥Æ¥à: %s"
 
-#: src/reader.c:759 src/reader.c:1035 src/reader.c:1106
+#: src/reader.c:759 src/reader.c:1081 src/reader.c:1152
 #, fuzzy, c-format
 msgid "unmatched %s"
 msgstr "Âбþ¤Î¤Ê¤¤ `{' ¤Ç¤¹"
@@ -506,102 +506,112 @@ msgstr "ǧ
 msgid "expected string constant instead of %s"
 msgstr "¤³¤³¤Ç¤Ï %s ¤Ç¤Ï¤Ê¤¯Ê¸»úÎóÄê¿ô¤¬´üÂÔ¤µ¤ì¤Þ¤¹"
 
-#: src/reader.c:951
+#: src/reader.c:888
+#, fuzzy, c-format
+msgid "multiple %%header_extension declarations"
+msgstr "Ê£¿ô¤Î %union Àë¸À¤Ç¤¹"
+
+#: src/reader.c:908
+#, fuzzy, c-format
+msgid "multiple %%source_extension declarations"
+msgstr "Ê£¿ô¤Î %union Àë¸À¤Ç¤¹"
+
+#: src/reader.c:997
 #, c-format
 msgid "unrecognized: %s"
 msgstr "ǧ¼±¤Ç¤­¤Ê¤¤: %s"
 
-#: src/reader.c:956
+#: src/reader.c:1002
 msgid "no input grammar"
 msgstr "ʸˡ¤ÎÆþÎϤ¬Ìµ¤¤"
 
-#: src/reader.c:961
+#: src/reader.c:1007
 #, c-format
 msgid "unknown character: %s"
 msgstr "̤ÃΤÎʸ»ú: %s"
 
-#: src/reader.c:1129
+#: src/reader.c:1175
 #, fuzzy, c-format
 msgid "unterminated %guard clause"
 msgstr "ÊĤ¸¤é¤ì¤Æ¤¤¤Ê¤¤ %%guard Àá¤Ç¤¹"
 
-#: src/reader.c:1296
+#: src/reader.c:1342
 msgid "ill-formed rule: initial symbol not followed by colon"
 msgstr "¼Ù°­¤Êµ¬Â§: ½é´ü²½¥·¥ó¥Ü¥ë¤Ë¥³¥í¥ó (:) ¤¬Â³¤¤¤Æ¤¤¤Þ¤»¤ó"
 
-#: src/reader.c:1303
+#: src/reader.c:1349
 msgid "grammar starts with vertical bar"
 msgstr "ʸˡ¤Ï½ÄËÀ (|) ¤Ç»Ï¤á¤Þ¤¹"
 
-#: src/reader.c:1334
+#: src/reader.c:1380
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "%s ¤Ëµ¬Â§¤¬Í¿¤¨¤é¤ì¡¢¤½¤ì¤Ï¥È¡¼¥¯¥ó¤È¤Ê¤ê¤Þ¤¹"
 
-#: src/reader.c:1436
+#: src/reader.c:1482
 msgid "two @prec's in a row"
 msgstr "@prec ¤Î¤â¤ÎÆó¤Ä¤¬Æ±Îó¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹"
 
-#: src/reader.c:1444
+#: src/reader.c:1490
 #, fuzzy, c-format
 msgid "%%guard present but %%semantic_parser not specified"
 msgstr "%%guard ¤¬¤¢¤ê¤Þ¤¹¤¬ %%semantic_parser ¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó"
 
-#: src/reader.c:1453
+#: src/reader.c:1499
 msgid "two actions at end of one rule"
 msgstr "°ì¤Ä¤Îµ¬Â§¤Î½ª¤ê¤ËÆó¤Ä¤ÎÆ°ºî¤ò»ØÄꤷ¤Æ¤¤¤Þ¤¹"
 
-#: src/reader.c:1467
+#: src/reader.c:1513
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "½é´ü¾õÂÖ¤ÎÆ°ºî¤Ç¤Ï·¿ (`%s' `%s') ¤¬¾×Æͤ·¤Þ¤¹"
 
-#: src/reader.c:1473
+#: src/reader.c:1519
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "¶õ¤Î·¿ÉÕ¤­Èó½ªÃ¼¥¢¥¤¥Æ¥àÍѵ¬Â§¤Ç¤¢¤ê¡¢Æ°ºî¤¬µ¯¤ê¤Þ¤»¤ó"
 
-#: src/reader.c:1517
+#: src/reader.c:1563
 #, c-format
 msgid "invalid input: %s"
 msgstr "̵¸ú¤ÊÆþÎÏ: %s"
 
-#: src/reader.c:1525
+#: src/reader.c:1571
 #, fuzzy, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "¥·¥ó¥Ü¥ë¤¬Â¿¤¹¤®¤Þ¤¹ (¥È¡¼¥¯¥ó¤ÈÈó½ªÃ¼¥¢¥¤¥Æ¥à) -- ºÇÂç %s"
 
-#: src/reader.c:1528
+#: src/reader.c:1574
 msgid "no rules in the input grammar"
 msgstr "ÆþÎϤ·¤¿Ê¸Ë¡¤Ëµ¬Â§¤¬ÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
 
-#: src/reader.c:1552
+#: src/reader.c:1598
 #, c-format
 msgid "symbol %s is used, but is not defined as a token and has no rules"
 msgstr ""
 "¥·¥ó¥Ü¥ë %s ¤¬»È¤ï¤ì¤Æ¤¤¤Þ¤¹¤¬¡¢¥È¡¼¥¯¥ó¤È¤·¤ÆÄêµÁ¤µ¤ì¤Æ¤ª¤é¤º¡¢µ¬Â§¤ò»ý¤Á¤Þ"
 "¤»¤ó"
 
-#: src/reader.c:1657
+#: src/reader.c:1703
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "Àè¹Ô¤·¤Æ¤¤¤ë %s ¤È %s ¤Ç¶¥¹ç¤¬À¸¤¸¤Æ¤¤¤Þ¤¹"
 
-#: src/reader.c:1669
+#: src/reader.c:1715
 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "Èó·ë¹çÃÍ %s ¤È %s ¤Ç¶¥¹ç¤¬À¸¤¸¤Æ¤¤¤Þ¤¹"
 
-#: src/reader.c:1720
+#: src/reader.c:1766
 #, fuzzy, c-format
 msgid "tokens %s and %s both assigned number %d"
 msgstr "¥È¡¼¥¯¥ó %s ¤È %s ¤ÎÁÐÊý¤¬ÈÖ¹æ %s ¤Ë³ä¤êÅö¤Æ¤é¤ì¤Þ¤·¤¿"
 
-#: src/reader.c:1733
+#: src/reader.c:1779
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "³«»Ï¥·¥ó¥Ü¥ë %s ¤ÏÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
 
-#: src/reader.c:1735
+#: src/reader.c:1781
 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "³«»Ï¥·¥ó¥Ü¥ë %s ¤Ï¥È¡¼¥¯¥ó¤Ç¤¹"
@@ -877,9 +887,6 @@ msgstr ""
 #~ msgid "unterminated comment in `%{' definition"
 #~ msgstr "`%{' ÄêµÁ ¤ËÊĤ¸¤é¤ì¤Æ¤¤¤Ê¤¤¥³¥á¥ó¥È¤¬¤¢¤ê¤Þ¤¹"
 
-#~ msgid "multiple %union declarations"
-#~ msgstr "Ê£¿ô¤Î %union Àë¸À¤Ç¤¹"
-
 #~ msgid "unterminated comment at end of file"
 #~ msgstr "¥Õ¥¡¥¤¥ëËöÈø¤ËÊĤ¸¤é¤ì¤Æ¤¤¤Ê¤¤¥³¥á¥ó¥È¤¬¤¢¤ê¤Þ¤¹"
 

diff --git a/po/nl.gmo b/po/nl.gmo
index 7b44446..ac6a24f 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 1aec041..a163f34 100644 (file)
--- a/po/nl.po
+++ b/po/nl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.25\n"
-"POT-Creation-Date: 2001-08-03 11:38+0200\n"
+"POT-Creation-Date: 2001-08-06 10:50+0200\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"
@@ -212,7 +212,7 @@ msgid ""
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
 
-#: src/getargs.c:202 src/lex.c:633
+#: src/getargs.c:202 src/lex.c:635
 #, c-format
 msgid "`%s' is no longer supported"
 msgstr ""
@@ -442,7 +442,7 @@ msgstr ""
 msgid "symbol %s redefined"
 msgstr "symbool %s opnieuw gedefinieerd"
 
-#: src/reader.c:534 src/reader.c:613 src/reader.c:674 src/reader.c:1231
+#: src/reader.c:534 src/reader.c:613 src/reader.c:674 src/reader.c:1277
 #, c-format
 msgid "type redeclaration for %s"
 msgstr "type herdeclaratie voor %s"
@@ -457,7 +457,7 @@ msgstr "`%s' is onjuist in %s"
 msgid "multiple %s declarations"
 msgstr "meerdere %start declaraties"
 
-#: src/reader.c:563 src/reader.c:1209
+#: src/reader.c:563 src/reader.c:1255
 #, fuzzy, c-format
 msgid "invalid %s declaration"
 msgstr "onjuiste %start declaratie"
@@ -486,7 +486,7 @@ msgstr "onjuiste tekst (%s) - nummer hoort na de identifier"
 msgid "unexpected item: %s"
 msgstr "onbekend item: %s"
 
-#: src/reader.c:759 src/reader.c:1035 src/reader.c:1106
+#: src/reader.c:759 src/reader.c:1081 src/reader.c:1152
 #, fuzzy, c-format
 msgid "unmatched %s"
 msgstr "niet overeenkomstige `{'"
@@ -506,103 +506,113 @@ msgstr "onbekend item %s, verwacht een identifier"
 msgid "expected string constant instead of %s"
 msgstr "verwacht string constante in plaats van %s"
 
-#: src/reader.c:951
+#: src/reader.c:888
+#, fuzzy, c-format
+msgid "multiple %%header_extension declarations"
+msgstr "meerdere %union declaraties"
+
+#: src/reader.c:908
+#, fuzzy, c-format
+msgid "multiple %%source_extension declarations"
+msgstr "meerdere %union declaraties"
+
+#: src/reader.c:997
 #, c-format
 msgid "unrecognized: %s"
 msgstr "onbekend: %s"
 
-#: src/reader.c:956
+#: src/reader.c:1002
 msgid "no input grammar"
 msgstr "geen invoer grammatica"
 
-#: src/reader.c:961
+#: src/reader.c:1007
 #, c-format
 msgid "unknown character: %s"
 msgstr "onbekend karakter: %s"
 
-#: src/reader.c:1129
+#: src/reader.c:1175
 #, fuzzy, c-format
 msgid "unterminated %guard clause"
 msgstr "niet getermineerde %%guard voorwaarde"
 
-#: src/reader.c:1296
+#: src/reader.c:1342
 msgid "ill-formed rule: initial symbol not followed by colon"
 msgstr ""
 "slecht geformuleerde regel: initieel symbool niet gevolgd door dubbele punt"
 
-#: src/reader.c:1303
+#: src/reader.c:1349
 msgid "grammar starts with vertical bar"
 msgstr "grammatica start met een verticale bar"
 
-#: src/reader.c:1334
+#: src/reader.c:1380
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "regel geven voor %s, welke een teken is"
 
-#: src/reader.c:1436
+#: src/reader.c:1482
 msgid "two @prec's in a row"
 msgstr "twee @prec's in een regel"
 
-#: src/reader.c:1444
+#: src/reader.c:1490
 #, fuzzy, c-format
 msgid "%%guard present but %%semantic_parser not specified"
 msgstr "%%guard aanwezig maar %%semantic_parser niet gespecificeerd"
 
-#: src/reader.c:1453
+#: src/reader.c:1499
 msgid "two actions at end of one rule"
 msgstr "twee akties aan het einde van een regel"
 
-#: src/reader.c:1467
+#: src/reader.c:1513
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "type clash (`%s' `%s') bij standaard aktie"
 
-#: src/reader.c:1473
+#: src/reader.c:1519
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "lege regel voor getypte niet terminal, en geen aktie"
 
-#: src/reader.c:1517
+#: src/reader.c:1563
 #, c-format
 msgid "invalid input: %s"
 msgstr "ongeldige invoer: %s"
 
-#: src/reader.c:1525
+#: src/reader.c:1571
 #, fuzzy, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "te veel symbolen (tekens plus nietterminals); maximum %s"
 
-#: src/reader.c:1528
+#: src/reader.c:1574
 msgid "no rules in the input grammar"
 msgstr "geen regels voor invoer grammatica"
 
-#: src/reader.c:1552
+#: src/reader.c:1598
 #, c-format
 msgid "symbol %s is used, but is not defined as a token and has no rules"
 msgstr ""
 "symbool %s is gebruikt, maar is niet gedefinieerd als een teken en\n"
 "heeft geen regels"
 
-#: src/reader.c:1657
+#: src/reader.c:1703
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "conflictuerende precedentein voor %s en %s"
 
-#: src/reader.c:1669
+#: src/reader.c:1715
 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "conflictuerende associatieve waarden voor %s en %s"
 
-#: src/reader.c:1720
+#: src/reader.c:1766
 #, c-format
 msgid "tokens %s and %s both assigned number %d"
 msgstr ""
 
-#: src/reader.c:1733
+#: src/reader.c:1779
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr ""
 
-#: src/reader.c:1735
+#: src/reader.c:1781
 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "het start symbool %s is een token"
@@ -804,9 +814,6 @@ msgstr ""
 #~ msgid "unmatched right brace (`}')"
 #~ msgstr "niet overeenkomstig rechter haakje (`}')"
 
-#~ msgid "multiple %union declarations"
-#~ msgstr "meerdere %union declaraties"
-
 #~ msgid "unterminated comment at end of file"
 #~ msgstr "niet getermineerd commentaar aan einde van bestand"
 

diff --git a/po/ru.gmo b/po/ru.gmo
index 34d7ee5..2000a56 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 27adb29..a924c17 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.28a\n"
-"POT-Creation-Date: 2001-08-03 11:38+0200\n"
+"POT-Creation-Date: 2001-08-06 10:50+0200\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"
@@ -233,7 +233,7 @@ msgid ""
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
 
-#: src/getargs.c:202 src/lex.c:633
+#: src/getargs.c:202 src/lex.c:635
 #, c-format
 msgid "`%s' is no longer supported"
 msgstr ""
@@ -462,7 +462,7 @@ msgstr ""
 msgid "symbol %s redefined"
 msgstr "ÐÏ×ÔÏÒÎÏÅ ÏÐÒÅÄÅÌÅÎÉÅ ÓÉÍ×ÏÌÁ %s"
 
-#: src/reader.c:534 src/reader.c:613 src/reader.c:674 src/reader.c:1231
+#: src/reader.c:534 src/reader.c:613 src/reader.c:674 src/reader.c:1277
 #, c-format
 msgid "type redeclaration for %s"
 msgstr "ÐÏ×ÔÏÒÎÏÅ ÏÐÉÓÁÎÉÅ ÔÉÐÁ ÄÌÑ %s"
@@ -477,7 +477,7 @@ msgstr "`%s' 
 msgid "multiple %s declarations"
 msgstr "ÍÎÏÖÅÓÔ×ÅÎÎÏÅ ÏÐÉÓÁÎÉÅ %start"
 
-#: src/reader.c:563 src/reader.c:1209
+#: src/reader.c:563 src/reader.c:1255
 #, fuzzy, c-format
 msgid "invalid %s declaration"
 msgstr "ÎÅ×ÅÒÎÏÅ ÏÐÉÓÁÎÉÅ %start"
@@ -506,7 +506,7 @@ msgstr "
 msgid "unexpected item: %s"
 msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ÜÌÅÍÅÎÔ: %s"
 
-#: src/reader.c:759 src/reader.c:1035 src/reader.c:1106
+#: src/reader.c:759 src/reader.c:1081 src/reader.c:1152
 #, fuzzy, c-format
 msgid "unmatched %s"
 msgstr "ÎÅÐÁÒÎÁÑ `{'"
@@ -526,101 +526,111 @@ msgstr "
 msgid "expected string constant instead of %s"
 msgstr "×ÍÅÓÔÏ %s ÏÖÉÄÁÌÁÓØ ÓÔÒÏËÏ×ÁÑ ÐÏÓÔÏÑÎÎÁÑ"
 
-#: src/reader.c:951
+#: src/reader.c:888
+#, fuzzy, c-format
+msgid "multiple %%header_extension declarations"
+msgstr "ÍÎÏÖÅÓÔ×ÅÎÎÏÅ ÏÐÉÓÁÎÉÅ %union"
+
+#: src/reader.c:908
+#, fuzzy, c-format
+msgid "multiple %%source_extension declarations"
+msgstr "ÍÎÏÖÅÓÔ×ÅÎÎÏÅ ÏÐÉÓÁÎÉÅ %union"
+
+#: src/reader.c:997
 #, c-format
 msgid "unrecognized: %s"
 msgstr "ÎÅÒÁÓÐÏÚÎÁÎÏ: %s"
 
-#: src/reader.c:956
+#: src/reader.c:1002
 msgid "no input grammar"
 msgstr "ÎÅÔ ×ÈÏÄÎÏÊ ÇÒÁÍÍÁÔÉËÉ"
 
-#: src/reader.c:961
+#: src/reader.c:1007
 #, c-format
 msgid "unknown character: %s"
 msgstr "ÎÅÉÚ×ÅÓÔÎÙÊ ÓÉÍ×ÏÌ: %s"
 
-#: src/reader.c:1129
+#: src/reader.c:1175
 #, c-format
 msgid "unterminated %guard clause"
 msgstr "ÎÅÚÁËÏÎÞÅÎÎÙÊ ÏÐÅÒÁÔÏÒ %guard"
 
-#: src/reader.c:1296
+#: src/reader.c:1342
 msgid "ill-formed rule: initial symbol not followed by colon"
 msgstr "ÎÅ×ÅÒÎÏÅ ÐÒÁ×ÉÌÏ: Ä×ÏÅÔÏÞÉÅ ÎÅ ÓÌÅÄÕÅÔ ÚÁ ÎÁÞÁÌØÎÙÍ ÓÉÍ×ÏÌÏÍ"
 
-#: src/reader.c:1303
+#: src/reader.c:1349
 msgid "grammar starts with vertical bar"
 msgstr "ÇÒÁÍÍÁÔÉËÁ ÎÁÞÉÎÁÅÔÓÑ Ó ×ÅÒÔÉËÁÌØÎÏÊ ÞÅÒÔÙ"
 
-#: src/reader.c:1334
+#: src/reader.c:1380
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "ÐÒÁ×ÉÌÏ ÚÁÄÁÎÏ ÄÌÑ %s, ËÏÔÏÒÙÊ Ñ×ÌÑÅÔÓÑ ÌÅËÓÅÍÏÊ"
 
-#: src/reader.c:1436
+#: src/reader.c:1482
 msgid "two @prec's in a row"
 msgstr "Ä×Á @prec ÐÏÄÒÑÄ"
 
-#: src/reader.c:1444
+#: src/reader.c:1490
 #, fuzzy, c-format
 msgid "%%guard present but %%semantic_parser not specified"
 msgstr "%guard ÐÒÉÓÕÔÓÔ×ÕÅÔ, Á %semantic_parser ÎÅ ÚÁÄÁÎ"
 
-#: src/reader.c:1453
+#: src/reader.c:1499
 msgid "two actions at end of one rule"
 msgstr "Ä×Á ÄÅÊÓÔ×ÉÑ × ËÏÎÃÅ ÏÄÎÏÇÏ ÐÒÁ×ÉÌÁ"
 
-#: src/reader.c:1467
+#: src/reader.c:1513
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "ËÏÎÆÌÉËÔ ÔÉÐÏ× (`%s' `%s') ÎÁ ÄÅÊÓÔ×ÉÉ ÐÏ ÕÍÏÌÞÁÎÉÀ"
 
-#: src/reader.c:1473
+#: src/reader.c:1519
 msgid "empty rule for typed nonterminal, and no action"
 msgstr ""
 "ÐÕÓÔÏÅ ÐÒÁ×ÉÌÏ ÄÌÑ ÔÉÐÉÚÉÒÏ×ÁÎÎÏÇÏ ÎÅÔÅÒÍÉÎÁÌØÎÏÇÏ ÓÉÍ×ÏÌÁ, É ÎÅÔ ÄÅÊÓÔ×ÉÑ"
 
-#: src/reader.c:1517
+#: src/reader.c:1563
 #, c-format
 msgid "invalid input: %s"
 msgstr "ÎÅ×ÅÒÎÙÅ ×ÈÏÄÎÙÅ ÄÁÎÎÙÅ: %s"
 
-#: src/reader.c:1525
+#: src/reader.c:1571
 #, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ ÓÉÍ×ÏÌÏ× (ÌÅËÓÅÍÙ ÐÌÀÓ ÎÅÔÅÒÍÉÎÁÌÙ); ÍÁËÓÉÍÁÌØÎÏ %d"
 
-#: src/reader.c:1528
+#: src/reader.c:1574
 msgid "no rules in the input grammar"
 msgstr "ÏÔÓÕÔÓÔ×ÕÀÔ ÐÒÁ×ÉÌÁ ×Ï ×ÈÏÄÎÏÊ ÇÒÁÍÍÁÔÉËÅ"
 
-#: src/reader.c:1552
+#: src/reader.c:1598
 #, c-format
 msgid "symbol %s is used, but is not defined as a token and has no rules"
 msgstr "ÓÉÍ×ÏÌ %s ÉÓÐÏÌØÚÕÅÔÓÑ, ÎÏ ÎÅ ÏÐÒÅÄÅÌÅÎ ËÁË ÌÅËÓÅÍÁ É ÎÅ ÉÍÅÅÔ ÐÒÁ×ÉÌ"
 
-#: src/reader.c:1657
+#: src/reader.c:1703
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "ÐÒÏÔÉ×ÏÒÅÞÉ×ÙÅ ÐÒÉÏÒÉÔÅÔÙ ÄÌÑ %s É %s"
 
-#: src/reader.c:1669
+#: src/reader.c:1715
 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "ÐÒÏÔÉ×ÏÒÅÞÉ×ÙÅ ÚÎÁÞÅÎÉÑ ÁÓÓÏÃÉÁÔÉ×ÎÏÓÔÉ ÄÌÑ %s É %s"
 
-#: src/reader.c:1720
+#: src/reader.c:1766
 #, c-format
 msgid "tokens %s and %s both assigned number %d"
 msgstr "ÏÂÅÉÍ ÌÅËÓÅÍÁÍ %s É %s ÐÒÉÓ×ÏÅÎ ÎÏÍÅÒ %d"
 
-#: src/reader.c:1733
+#: src/reader.c:1779
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "ÎÁÞÁÌØÎÙÊ ÓÉÍ×ÏÌ %s ÎÅÏÐÒÅÄÅÌÅÎ"
 
-#: src/reader.c:1735
+#: src/reader.c:1781
 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "ÎÁÞÁÌØÎÙÊ ÓÉÍ×ÏÌ %s Ñ×ÌÑÅÔÓÑ ÌÅËÓÅÍÏÊ"
@@ -809,9 +819,6 @@ msgstr ""
 msgid "'"
 msgstr ""
 
-#~ msgid "multiple %union declarations"
-#~ msgstr "ÍÎÏÖÅÓÔ×ÅÎÎÏÅ ÏÐÉÓÁÎÉÅ %union"
-
 #~ msgid "unterminated comment at end of file"
 #~ msgstr "ÎÅÚÁËÏÎÞÅÎÎÙÊ ËÏÍÍÅÎÔÁÒÉÊ × ËÏÎÃÅ ÆÁÊÌÁ"
 

diff --git a/src/files.c b/src/files.c
index 2d289fe..4946477 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -46,9 +46,9 @@ static char *base_name = NULL;
 static char *short_base_name = NULL;
 
 /* C source file extension (the parser source). */
-static const char *src_extension = NULL;
+const char *src_extension = NULL;
 /* Header file extension (if option ``-d'' is specified). */
-static const char *header_extension = NULL;
+const char *header_extension = NULL;
 
 \f
 /*--------------------------.
@@ -209,19 +209,29 @@ get_extension_index(const char *filename)
 static void
 compute_exts_from_gf(const char *ext)
 {
-  src_extension = tr(ext, 'y', 'c');
-  src_extension = tr(src_extension, 'Y', 'C');
-  header_extension = tr(ext, 'y', 'h');
-  header_extension = tr(header_extension, 'Y', 'H');
+  if (!src_extension)
+    {
+      src_extension = tr(ext, 'y', 'c');
+      src_extension = tr(src_extension, 'Y', 'C');
+    } 
+  if (!header_extension)
+    {
+      header_extension = tr(ext, 'y', 'h');
+      header_extension = tr(header_extension, 'Y', 'H');
+    }
 }
 
 /* Computes extensions from the given c source file extension. */
 static void
 compute_exts_from_src(const char *ext)
 {
-  src_extension = xstrdup(ext);
-  header_extension = tr(ext, 'c', 'h');
-  header_extension = tr(header_extension, 'C', 'H');
+  if (!src_extension)
+    src_extension = xstrdup(ext);
+  if (!header_extension)
+    {     
+      header_extension = tr(ext, 'c', 'h');
+      header_extension = tr(header_extension, 'C', 'H');
+    }
 }
 
 /* FIXME: Should use xstrndup. */
@@ -233,10 +243,6 @@ compute_base_names (void)
   size_t short_base_length;
   size_t ext_index;
 
-  /* Set default extensions */
-  src_extension = ".c";
-  header_extension = ".h";
-
   /* If --output=foo.c was specified (SPEC_OUTFILE == foo.c),
      BASE_NAME and SHORT_BASE_NAME are `foo'.
 
@@ -357,6 +363,12 @@ output_files (void)
 
   compute_base_names ();
 
+  /* Set default extensions */
+  if (!src_extension)
+    src_extension = ".c";
+  if (!header_extension)
+    header_extension = ".h";
+
   attrsfile = stringappend (short_base_name, EXT_STYPE_H);
 #ifndef MSDOS
   stringappend (attrsfile, header_extension);

diff --git a/src/files.h b/src/files.h
index 3015373..564af1c 100644 (file)
--- a/src/files.h
+++ b/src/files.h
@@ -60,6 +60,9 @@ extern struct obstack output_obstack;
 extern char *infile;
 extern char *attrsfile;
 
+extern const char *src_extension;
+extern const char *header_extension;
+
 void open_files PARAMS((void));
 
 void output_files PARAMS((void));

diff --git a/src/lex.c b/src/lex.c
index 2c7b379..0559998 100644 (file)
--- a/src/lex.c
+++ b/src/lex.c
@@ -551,6 +551,8 @@ struct percent_table_struct percent_table[] =
   { "output_file",     &spec_outfile,          tok_setopt },   /* -o */
   { "file_prefix",     &spec_file_prefix,      tok_setopt },   /* -b */
   { "name_prefix",     &spec_name_prefix,      tok_setopt },   /* -p */
+  { "header_extension",        NULL,                   tok_hdrext},
+  { "source_extension",        NULL,                   tok_srcext},
 #endif
   { "verbose",         &verbose_flag,          tok_noop },     /* -v */
   { "debug",           &debug_flag,            tok_noop },     /* -t */

diff --git a/src/lex.h b/src/lex.h
index 4947a4d..c633096 100644 (file)
--- a/src/lex.h
+++ b/src/lex.h
@@ -47,6 +47,8 @@ typedef enum token_e
     tok_number,
     tok_expect,
     tok_thong,
+    tok_hdrext,
+    tok_srcext,
     tok_noop,
     tok_setopt,
     tok_illegal,

diff --git a/src/reader.c b/src/reader.c
index ee859b6..93fe353 100644 (file)
--- a/src/reader.c
+++ b/src/reader.c
@@ -874,6 +874,45 @@ parse_thong_decl (void)
   nsyms--;
 }
 
+/*------------------------------------------.
+| Parse what comes after %header_extension. |
+`------------------------------------------*/
+
+static void
+parse_header_extension_decl (void)
+{
+  char buff[32];
+  int len;
+  
+  if (header_extension)
+    complain (_("multiple %%header_extension declarations"));
+  fscanf (finput, "%s", buff);
+  printf("-> %s\n", buff);
+  len = strlen (buff);
+  buff[len] = '\0';
+  src_extension = XMALLOC (char, len + 1);
+  stpcpy (header_extension, buff);
+}
+
+/*------------------------------------------.
+| Parse what comes after %source_extension. |
+`------------------------------------------*/
+
+static void
+parse_source_extension_decl (void)
+{
+  char buff[32];
+  int len;
+  
+  if (src_extension)
+    complain (_("multiple %%source_extension declarations"));
+  fscanf (finput, "%s", buff);
+  printf("-> %s\n", buff);
+  len = strlen (buff);
+  buff[len] = '\0';
+  src_extension = XMALLOC (char, len + 1);
+  stpcpy (src_extension, buff);
+}
 
 /*----------------------------------------------------------------.
 | Read from finput until `%%' is seen.  Discard the `%%'.  Handle |
@@ -944,6 +983,13 @@ read_declarations (void)
              parse_assoc_decl (non_assoc);
              break;
 
+           case tok_hdrext:
+             break;
+
+           case tok_srcext:
+             parse_source_extension_decl();
+             break;
+
            case tok_noop:
              break;