* src/reader.c (reader): Remove call to free_symtab ().

* src/main.c (main): Call it here.
Include symtab.h.
* src/conflicts.c (initialize_conflicts): Rename as...
(solve_conflicts): this.
* src/print.c (print_core, print_actions, print_state)
(print_grammar): Dump to a file instead a `output_obstack'.
(print_results): Dump `output_obstack', and then proceed with the
FILE *.
* src/files.c (compute_output_file_names, close_files): New.
(output_files): Adjust.
* src/main.c (main): Adjust.

diff --git a/ChangeLog b/ChangeLog
index c29cd2d8d54d57b789fabd114b3be4a159abf6d4..a5985176258beacfffc8cf534deb89c0e7440024 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2001-09-24  Marc Autret  <autret_m@epita.fr>, Akim Demaille  <akim@epita.fr>
+
+       * src/reader.c (reader): Remove call to free_symtab ().
+       * src/main.c (main): Call it here.
+       Include symtab.h.
+       * src/conflicts.c (initialize_conflicts): Rename as...
+       (solve_conflicts): this.
+       * src/print.c (print_core, print_actions, print_state)
+       (print_grammar): Dump to a file instead a `output_obstack'.
+       (print_results): Dump `output_obstack', and then proceed with the
+       FILE *.
+       * src/files.c (compute_output_file_names, close_files): New.
+       (output_files): Adjust.
+       * src/main.c (main): Adjust.
+

 2001-09-23  Marc Autret  <autret_m@epita.fr>
 
        * src/files.c (compute_header_macro): Computes header macro name
 2001-09-23  Marc Autret  <autret_m@epita.fr>
 
        * src/files.c (compute_header_macro): Computes header macro name

diff --git a/po/de.gmo b/po/de.gmo
index 173101f639f2b11a9a5f77092283896e161518d2..caf86370e58d1d6556c91e7033b18578bb2a5c4e 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 eaa9355c2cc4855ebd319d1c570ac906222d6119..e47e5e4ee28610bf15493150a6c03fe56dc6d15c 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-09-22 18:19+0200\n"
+"POT-Creation-Date: 2001-09-24 10:22+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"
 "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"


@@ -13,7 +13,7 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 

-#: src/LR0.c:207
+#: src/LR0.c:208

 #, c-format
 msgid "too many states (max %d)"
 msgstr ""
 #, c-format
 msgid "too many states (max %d)"
 msgstr ""


@@ -77,31 +77,31 @@ msgstr "Zustand %d enth
 
 #. If invoked with `--yacc', use the output format specified by
 #. POSIX.
 
 #. If invoked with `--yacc', use the output format specified by
 #. POSIX.

-#: src/conflicts.c:493
+#: src/conflicts.c:492

 msgid "conflicts: "
 msgstr "Konflikte: "
 
 msgid "conflicts: "
 msgstr "Konflikte: "
 

-#: src/conflicts.c:495
+#: src/conflicts.c:494

 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d Schiebe/Reduziere"
 
 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d Schiebe/Reduziere"
 

-#: src/conflicts.c:499
+#: src/conflicts.c:498

 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d Reduziere/Reduziere"
 
 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d Reduziere/Reduziere"
 

-#: src/conflicts.c:504
+#: src/conflicts.c:503

 #, c-format
 msgid "%s contains"
 msgstr "%s enthält"
 
 #, c-format
 msgid "%s contains"
 msgstr "%s enthält"
 

-#: src/conflicts.c:590 src/conflicts.c:711
+#: src/conflicts.c:589 src/conflicts.c:710

 #, c-format
 msgid "    %-4s\t[reduce using rule %d (%s)]\n"
 msgstr "    %-4s\t[reduziere mit Regel %d (%s)]\n"
 
 #, c-format
 msgid "    %-4s\t[reduce using rule %d (%s)]\n"
 msgstr "    %-4s\t[reduziere mit Regel %d (%s)]\n"
 

-#: src/conflicts.c:602 src/print.c:173
+#: src/conflicts.c:601 src/print.c:172

 #, c-format
 msgid ""
 "    $default\treduce using rule %d (%s)\n"
 #, c-format
 msgid ""
 "    $default\treduce using rule %d (%s)\n"


@@ -110,12 +110,12 @@ msgstr ""
 "    $default\treduziere mit Regel %d (%s)\n"
 "\n"
 
 "    $default\treduziere mit Regel %d (%s)\n"
 "\n"
 

-#: src/conflicts.c:691 src/conflicts.c:705
+#: src/conflicts.c:690 src/conflicts.c:704

 #, c-format
 msgid "    %-4s\treduce using rule %d (%s)\n"
 msgstr "    %-4s\treduziere mit Tegel %d (%s)\n"
 
 #, c-format
 msgid "    %-4s\treduce using rule %d (%s)\n"
 msgstr "    %-4s\treduziere mit Tegel %d (%s)\n"
 

-#: src/conflicts.c:732
+#: src/conflicts.c:731

 #, c-format
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr "    $default\treduziere mit Regel %d (%s)\n"
 #, c-format
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr "    $default\treduziere mit Regel %d (%s)\n"


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

-#: src/files.c:132
+#: src/files.c:138

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

-#: src/files.c:151
+#: src/files.c:157

 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:635
+#: src/getargs.c:214 src/lex.c:633

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


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

-#: src/lex.c:432
+#: src/lex.c:431

 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"
 

-#: src/main.c:108
+#: src/main.c:122

 #, fuzzy, c-format
 msgid "%s: internal error: %s\n"
 msgstr "interner Fehler, %s\n"
 #, fuzzy, c-format
 msgid "%s: internal error: %s\n"
 msgstr "interner Fehler, %s\n"


@@ -287,7 +287,7 @@ msgstr "interner Fehler, %s\n"
 msgid "Entering set_nullable"
 msgstr "Führe »set_nullable« aus"
 
 msgid "Entering set_nullable"
 msgstr "Führe »set_nullable« aus"
 

-#: src/output.c:993
+#: src/output.c:987

 #, fuzzy, c-format
 msgid "maximum table size (%d) exceeded"
 msgstr "maximale Tabellengröße (%s) überschritten"
 #, fuzzy, c-format
 msgid "maximum table size (%d) exceeded"
 msgstr "maximale Tabellengröße (%s) überschritten"


@@ -325,12 +325,12 @@ msgstr "    %-4s\tSchiebe und gehe zu Zustand %d 
 msgid "    %-4s\terror (nonassociative)\n"
 msgstr "    %-4s\tFehler (nicht assoziativ)\n"
 
 msgid "    %-4s\terror (nonassociative)\n"
 msgstr "    %-4s\tFehler (nicht assoziativ)\n"
 

-#: src/print.c:190
+#: src/print.c:188

 #, c-format
 msgid "    %-4s\tgo to state %d\n"
 msgstr "    %-4s\tgehe zu Zustand %d über\n"
 
 #, c-format
 msgid "    %-4s\tgo to state %d\n"
 msgstr "    %-4s\tgehe zu Zustand %d über\n"
 

-#: src/print.c:202
+#: src/print.c:200

 #, fuzzy, c-format
 msgid "state %d"
 msgstr ""
 #, fuzzy, c-format
 msgid "state %d"
 msgstr ""


@@ -339,23 +339,25 @@ msgstr ""
 "Zustand %d\n"
 "\n"
 
 "Zustand %d\n"
 "\n"
 

-#: src/print.c:233
+#. rule # : LHS -> RHS
+#: src/print.c:230

 #, fuzzy
 msgid "Grammar"
 msgstr ""
 "\n"
 "Grammatik\n"
 
 #, fuzzy
 msgid "Grammar"
 msgstr ""
 "\n"
 "Grammatik\n"
 

-#: src/print.c:240
+#: src/print.c:235

 #, c-format
 msgid "rule %-4d %s ->"
 msgstr "Regel %-4d %s ->"
 
 #, c-format
 msgid "rule %-4d %s ->"
 msgstr "Regel %-4d %s ->"
 

-#: src/print.c:246
-msgid "\t\t/* empty */"
-msgstr "\t\t/* leer */"
+#: src/print.c:241
+msgid "empty"
+msgstr ""

 
 

-#: src/print.c:253
+#. TERMINAL (type #) : rule #s terminal is on RHS
+#: src/print.c:245

 #, fuzzy
 msgid "Terminals, with rules where they appear"
 msgstr ""
 #, fuzzy
 msgid "Terminals, with rules where they appear"
 msgstr ""


@@ -363,7 +365,7 @@ msgstr ""
 "Terminale und die Regeln un denen sie verwendet werden\n"
 "\n"
 
 "Terminale und die Regeln un denen sie verwendet werden\n"
 "\n"
 

-#: src/print.c:302
+#: src/print.c:269

 #, fuzzy
 msgid "Nonterminals, with rules where they appear"
 msgstr ""
 #, fuzzy
 msgid "Nonterminals, with rules where they appear"
 msgstr ""


@@ -371,11 +373,11 @@ msgstr ""
 "Nicht-Terminal und die Regeln in denen sie verwendet werden\n"
 "\n"
 
 "Nicht-Terminal und die Regeln in denen sie verwendet werden\n"
 "\n"
 

-#: src/print.c:329
+#: src/print.c:295

 msgid " on left:"
 msgstr " auf der linken Seite:"
 
 msgid " on left:"
 msgstr " auf der linken Seite:"
 

-#: src/print.c:344
+#: src/print.c:310

 msgid " on right:"
 msgstr " auf der rechten Seite:"
 
 msgid " on right:"
 msgstr " auf der rechten Seite:"
 


@@ -429,7 +431,7 @@ msgstr "
 msgid "unterminated `%{' definition"
 msgstr "unbeendete »%{« Definition"
 
 msgid "unterminated `%{' definition"
 msgstr "unbeendete »%{« Definition"
 

-#: src/reader.c:482 src/reader.c:598 src/reader.c:648
+#: src/reader.c:482 src/reader.c:596 src/reader.c:646

 #, c-format
 msgid "Premature EOF after %s"
 msgstr ""
 #, c-format
 msgid "Premature EOF after %s"
 msgstr ""


@@ -444,174 +446,174 @@ msgstr ""
 msgid "symbol `%s' given more than one literal string"
 msgstr ""
 
 msgid "symbol `%s' given more than one literal string"
 msgstr ""
 

-#: src/reader.c:524 src/reader.c:667
+#: src/reader.c:523 src/reader.c:665

 #, c-format
 msgid "symbol %s redefined"
 msgstr "Symbol %s noch einmal definiert"
 
 #, c-format
 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:1290
+#: src/reader.c:533 src/reader.c:611 src/reader.c:672 src/reader.c:1286

 #, c-format
 msgid "type redeclaration for %s"
 msgstr "erneute Deklaration des Typs für %s"
 
 #, c-format
 msgid "type redeclaration for %s"
 msgstr "erneute Deklaration des Typs für %s"
 

-#: src/reader.c:544
+#: src/reader.c:542

 #, c-format
 msgid "`%s' is invalid in %s"
 msgstr "»%s« ist in %s nicht erlaubt"
 
 #, c-format
 msgid "`%s' is invalid in %s"
 msgstr "»%s« ist in %s nicht erlaubt"
 

-#: src/reader.c:561 src/reader.c:721
+#: src/reader.c:559 src/reader.c:718

 #, fuzzy, c-format
 msgid "multiple %s declarations"
 msgstr "mehr als eine %start Deklaration"
 
 #, fuzzy, c-format
 msgid "multiple %s declarations"
 msgstr "mehr als eine %start Deklaration"
 

-#: src/reader.c:563 src/reader.c:902 src/reader.c:927 src/reader.c:1268
+#: src/reader.c:561 src/reader.c:898 src/reader.c:923 src/reader.c:1264

 #, fuzzy, c-format
 msgid "invalid %s declaration"
 msgstr "ungültige %start Deklaration"
 
 #, fuzzy, c-format
 msgid "invalid %s declaration"
 msgstr "ungültige %start Deklaration"
 

-#: src/reader.c:583
+#: src/reader.c:581

 msgid "%type declaration has no <typename>"
 msgstr "%type Deklaration hat keinen <Typ-Namen>"
 
 msgid "%type declaration has no <typename>"
 msgstr "%type Deklaration hat keinen <Typ-Namen>"
 

-#: src/reader.c:618
+#: src/reader.c:616

 #, fuzzy, c-format
 msgid "invalid %%type declaration due to item: %s"
 msgstr "ungültige %%type Deklaration wegen »%s«"
 
 #, fuzzy, c-format
 msgid "invalid %%type declaration due to item: %s"
 msgstr "ungültige %%type Deklaration wegen »%s«"
 

-#: src/reader.c:663
+#: src/reader.c:661

 #, c-format
 msgid "redefining precedence of %s"
 msgstr "Stellenwertigkeit von %s wird erneut definiert"
 
 #, c-format
 msgid "redefining precedence of %s"
 msgstr "Stellenwertigkeit von %s wird erneut definiert"
 

-#: src/reader.c:687
+#: src/reader.c:684

 #, c-format
 msgid "invalid text (%s) - number should be after identifier"
 msgstr "unzulässiger Text (%s) - Nummer sollte nach Bezeichner kommen"
 
 #, c-format
 msgid "invalid text (%s) - number should be after identifier"
 msgstr "unzulässiger Text (%s) - Nummer sollte nach Bezeichner kommen"
 

-#: src/reader.c:697
+#: src/reader.c:694

 #, c-format
 msgid "unexpected item: %s"
 msgstr "unerwartetes Symbol: %s"
 
 #, c-format
 msgid "unexpected item: %s"
 msgstr "unerwartetes Symbol: %s"
 

-#: src/reader.c:764 src/reader.c:1094 src/reader.c:1165
+#: src/reader.c:761 src/reader.c:1090 src/reader.c:1161

 #, fuzzy, c-format
 msgid "unmatched %s"
 msgstr "»{« hat kein Gegenstück"
 
 #, fuzzy, c-format
 msgid "unmatched %s"
 msgstr "»{« hat kein Gegenstück"
 

-#: src/reader.c:796
+#: src/reader.c:793

 #, fuzzy, c-format
 msgid "argument of %%expect is not an integer"
 msgstr "Argument von %expect ist keine ganze Zahl"
 
 #, fuzzy, c-format
 msgid "argument of %%expect is not an integer"
 msgstr "Argument von %expect ist keine ganze Zahl"
 

-#: src/reader.c:843
+#: src/reader.c:839

 #, c-format
 msgid "unrecognized item %s, expected an identifier"
 msgstr "unerwartetes Symbol %s, hier wird ein Bezeichner erwartet"
 
 #, c-format
 msgid "unrecognized item %s, expected an identifier"
 msgstr "unerwartetes Symbol %s, hier wird ein Bezeichner erwartet"
 

-#: src/reader.c:867
+#: src/reader.c:863

 #, c-format
 msgid "expected string constant instead of %s"
 msgstr "hier wird eine Zeichenkette erwartet, nicht %s"
 
 #, c-format
 msgid "expected string constant instead of %s"
 msgstr "hier wird eine Zeichenkette erwartet, nicht %s"
 

-#: src/reader.c:1010
+#: src/reader.c:1006

 #, c-format
 msgid "unrecognized: %s"
 msgstr "unbekannt: %s"
 
 #, c-format
 msgid "unrecognized: %s"
 msgstr "unbekannt: %s"
 

-#: src/reader.c:1015
+#: src/reader.c:1011

 msgid "no input grammar"
 msgstr "keine Eingabe-Grammatik"
 
 msgid "no input grammar"
 msgstr "keine Eingabe-Grammatik"
 

-#: src/reader.c:1020
+#: src/reader.c:1016

 #, c-format
 msgid "unknown character: %s"
 msgstr "unbekanntes Zeichen: %s"
 
 #, c-format
 msgid "unknown character: %s"
 msgstr "unbekanntes Zeichen: %s"
 

-#: src/reader.c:1188
+#: src/reader.c:1184

 #, fuzzy, c-format
 msgid "unterminated %guard clause"
 msgstr "unbeendeter %%guard Fall"
 
 #, fuzzy, c-format
 msgid "unterminated %guard clause"
 msgstr "unbeendeter %%guard Fall"
 

-#: src/reader.c:1355
+#: src/reader.c:1351

 msgid "ill-formed rule: initial symbol not followed by colon"
 msgstr ""
 "falsch geformte Regel: führendes Symbol wird nicht von einem Semikolon "
 "gefolgt"
 
 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:1362
+#: src/reader.c:1358

 msgid "grammar starts with vertical bar"
 msgstr "Grammatik fängt mit einem vertikalen Strich (»|«) an"
 
 msgid "grammar starts with vertical bar"
 msgstr "Grammatik fängt mit einem vertikalen Strich (»|«) an"
 

-#: src/reader.c:1393
+#: src/reader.c:1389

 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "Regel für %s vorhanden, welches aber ein Token ist"
 
 #, 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:1495
+#: src/reader.c:1491

 msgid "two @prec's in a row"
 msgstr "zwei @prec Anweisungen nacheinander"
 
 msgid "two @prec's in a row"
 msgstr "zwei @prec Anweisungen nacheinander"
 

-#: src/reader.c:1503
+#: src/reader.c:1499

 #, c-format
 msgid "%%guard present but %%semantic_parser not specified"
 msgstr ""
 "%%guard Anweisung vorhanden, jedoch wird %%semantic_parser nicht angegeben"
 
 #, c-format
 msgid "%%guard present but %%semantic_parser not specified"
 msgstr ""
 "%%guard Anweisung vorhanden, jedoch wird %%semantic_parser nicht angegeben"
 

-#: src/reader.c:1512
+#: src/reader.c:1508

 msgid "two actions at end of one rule"
 msgstr "Zwei Aktionen am Ende einer Regel"
 
 msgid "two actions at end of one rule"
 msgstr "Zwei Aktionen am Ende einer Regel"
 

-#: src/reader.c:1526
+#: src/reader.c:1522

 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "Typkonflikt (»%s« »%s«) bei Default Aktion"
 
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "Typkonflikt (»%s« »%s«) bei Default Aktion"
 

-#: src/reader.c:1532
+#: src/reader.c:1528

 msgid "empty rule for typed nonterminal, and no action"
 msgstr "leere Regel für Nicht-Terminal vmit Typ und keine Aktion"
 
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "leere Regel für Nicht-Terminal vmit Typ und keine Aktion"
 

-#: src/reader.c:1576
+#: src/reader.c:1572

 #, c-format
 msgid "invalid input: %s"
 msgstr "ungültige Eingabe: %s"
 
 #, c-format
 msgid "invalid input: %s"
 msgstr "ungültige Eingabe: %s"
 

-#: src/reader.c:1584
+#: src/reader.c:1580

 #, fuzzy, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "zu viele Symbols (Token plus Nicht-Terminal); Maximum %s"
 
 #, 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:1587
+#: src/reader.c:1583

 msgid "no rules in the input grammar"
 msgstr "Eingabegrammatik enthält keine Regeln"
 
 msgid "no rules in the input grammar"
 msgstr "Eingabegrammatik enthält keine Regeln"
 

-#: src/reader.c:1611
+#: src/reader.c:1607

 #, 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"
 
 #, 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:1716
+#: src/reader.c:1713

 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "Vorrangwertigkeiten für %s und %s widersprechen sich"
 
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "Vorrangwertigkeiten für %s und %s widersprechen sich"
 

-#: src/reader.c:1728
+#: src/reader.c:1725

 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "assoc Werte für %s nd %s widersprechen sich"
 
 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "assoc Werte für %s nd %s widersprechen sich"
 

-#: src/reader.c:1779
+#: src/reader.c:1771

 #, fuzzy, c-format
 msgid "tokens %s and %s both assigned number %d"
 msgstr "Token %s und %s haben die selbe nummer %s"
 
 #, 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:1792
+#: src/reader.c:1783

 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "das Startsymbol %s ist undefiniert"
 
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "das Startsymbol %s ist undefiniert"
 

-#: src/reader.c:1794
+#: src/reader.c:1785

 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "das Startsymbol %s ist ein Token"
 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "das Startsymbol %s ist ein Token"


@@ -800,6 +802,9 @@ msgstr ""
 msgid "'"
 msgstr ""
 
 msgid "'"
 msgstr ""
 

+#~ msgid "\t\t/* empty */"
+#~ msgstr "\t\t/* leer */"
+

 #~ msgid ""
 #~ "Usage: %s [-dhklntvyV] [-b file-prefix] [-o outfile] [-p name-prefix]\n"
 #~ "       [--debug] [--defines] [--fixed-output-files] [--no-lines]\n"
 #~ msgid ""
 #~ "Usage: %s [-dhklntvyV] [-b file-prefix] [-o outfile] [-p name-prefix]\n"
 #~ "       [--debug] [--defines] [--fixed-output-files] [--no-lines]\n"

diff --git a/po/es.gmo b/po/es.gmo
index eb3dc95e939e198ba365700ce2bd6451d82b1fee..e2aba02369f95bb1ab9b91045ee443dacf2b0f7c 100644 (file)
Binary files a/po/es.gmo and b/po/es.gmo differ

diff --git a/po/es.po b/po/es.po
index 39d0a9d9732dc05c34e61a10acdd54a836580ea4..e0fd5cd941e61693f01279251fdd02c686add65e 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-09-22 18:19+0200\n"
+"POT-Creation-Date: 2001-09-24 10:22+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"
 "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"


@@ -38,7 +38,7 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 

-#: src/LR0.c:207
+#: src/LR0.c:208

 #, c-format
 msgid "too many states (max %d)"
 msgstr ""
 #, c-format
 msgid "too many states (max %d)"
 msgstr ""


@@ -111,7 +111,7 @@ msgstr "El estado %d contiene"
 
 #. If invoked with `--yacc', use the output format specified by
 #. POSIX.
 
 #. If invoked with `--yacc', use the output format specified by
 #. POSIX.

-#: src/conflicts.c:493
+#: src/conflicts.c:492

 msgid "conflicts: "
 msgstr "conflictos: "
 
 msgid "conflicts: "
 msgstr "conflictos: "
 


@@ -127,7 +127,7 @@ msgstr "conflictos: "
 # ok
 # ngp
 #
 # ok
 # ngp
 #

-#: src/conflicts.c:495
+#: src/conflicts.c:494

 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d desplazamiento(s)/reducción(ones)"
 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d desplazamiento(s)/reducción(ones)"


@@ -144,22 +144,22 @@ msgstr " %d desplazamiento(s)/reducci
 #
 # ok
 # ngp
 #
 # ok
 # ngp

-#: src/conflicts.c:499
+#: src/conflicts.c:498

 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d reducción(ones)/reducción(ones)"
 
 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d reducción(ones)/reducción(ones)"
 

-#: src/conflicts.c:504
+#: src/conflicts.c:503

 #, c-format
 msgid "%s contains"
 msgstr "%s contiene"
 
 #, c-format
 msgid "%s contains"
 msgstr "%s contiene"
 

-#: src/conflicts.c:590 src/conflicts.c:711
+#: src/conflicts.c:589 src/conflicts.c:710

 #, c-format
 msgid "    %-4s\t[reduce using rule %d (%s)]\n"
 msgstr "    %-4s\t[reduce usando la regla  %d (%s)]\n"
 
 #, c-format
 msgid "    %-4s\t[reduce using rule %d (%s)]\n"
 msgstr "    %-4s\t[reduce usando la regla  %d (%s)]\n"
 

-#: src/conflicts.c:602 src/print.c:173
+#: src/conflicts.c:601 src/print.c:172

 #, c-format
 msgid ""
 "    $default\treduce using rule %d (%s)\n"
 #, c-format
 msgid ""
 "    $default\treduce using rule %d (%s)\n"


@@ -168,12 +168,12 @@ msgstr ""
 "    $default\treduce usando la regla %d (%s)\n"
 "\n"
 
 "    $default\treduce usando la regla %d (%s)\n"
 "\n"
 

-#: src/conflicts.c:691 src/conflicts.c:705
+#: src/conflicts.c:690 src/conflicts.c:704

 #, c-format
 msgid "    %-4s\treduce using rule %d (%s)\n"
 msgstr "    %-4s\treduce usando la regla  %d (%s)\n"
 
 #, c-format
 msgid "    %-4s\treduce using rule %d (%s)\n"
 msgstr "    %-4s\treduce usando la regla  %d (%s)\n"
 

-#: src/conflicts.c:732
+#: src/conflicts.c:731

 #, c-format
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr "    $default\treduce usando la regla %d (%s)\n"
 #, c-format
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr "    $default\treduce usando la regla %d (%s)\n"


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

-#: src/files.c:132
+#: src/files.c:138

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

-#: src/files.c:151
+#: src/files.c:157

 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:635
+#: src/getargs.c:214 src/lex.c:633

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


@@ -342,11 +342,11 @@ 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:432
+#: src/lex.c:431

 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"
 

-#: src/main.c:108
+#: src/main.c:122

 #, fuzzy, c-format
 msgid "%s: internal error: %s\n"
 msgstr "error interno, %s\n"
 #, fuzzy, c-format
 msgid "%s: internal error: %s\n"
 msgstr "error interno, %s\n"


@@ -360,7 +360,7 @@ msgstr "Entrando set_nullable"
 # en inglés era así, pero quizás en español sea mejor como dices
 # ngp
 #
 # en inglés era así, pero quizás en español sea mejor como dices
 # ngp
 #

-#: src/output.c:993
+#: src/output.c:987

 #, fuzzy, c-format
 msgid "maximum table size (%d) exceeded"
 msgstr "excedido el tamaño máximo de la tabla (%s)"
 #, fuzzy, c-format
 msgid "maximum table size (%d) exceeded"
 msgstr "excedido el tamaño máximo de la tabla (%s)"


@@ -398,12 +398,12 @@ msgstr "    %-4s\tdesplazar e ir al estado %d\n"
 msgid "    %-4s\terror (nonassociative)\n"
 msgstr "    %-4s\terror (no asociativo)\n"
 
 msgid "    %-4s\terror (nonassociative)\n"
 msgstr "    %-4s\terror (no asociativo)\n"
 

-#: src/print.c:190
+#: src/print.c:188

 #, c-format
 msgid "    %-4s\tgo to state %d\n"
 msgstr "    %-4s\tir al estado %d\n"
 
 #, c-format
 msgid "    %-4s\tgo to state %d\n"
 msgstr "    %-4s\tir al estado %d\n"
 

-#: src/print.c:202
+#: src/print.c:200

 #, fuzzy, c-format
 msgid "state %d"
 msgstr ""
 #, fuzzy, c-format
 msgid "state %d"
 msgstr ""


@@ -412,28 +412,25 @@ msgstr ""
 "estado %d\n"
 "\n"
 
 "estado %d\n"
 "\n"
 

-#: src/print.c:233
+#. rule # : LHS -> RHS
+#: src/print.c:230

 #, fuzzy
 msgid "Grammar"
 msgstr ""
 "\n"
 "Gramática\n"
 
 #, fuzzy
 msgid "Grammar"
 msgstr ""
 "\n"
 "Gramática\n"
 

-#: src/print.c:240
+#: src/print.c:235

 #, c-format
 msgid "rule %-4d %s ->"
 msgstr "regla %-4d %s ->"
 
 #, c-format
 msgid "rule %-4d %s ->"
 msgstr "regla %-4d %s ->"
 

-# Duda: ¿Estás seguro de que no será `vacío'? Si no lo estás o, si por
-# el contrario, pudiera cualquiera de los casos, debieras traducirlo
-# como `vacía/o' - cll
-# según el código indica reglas vacías por eso lo puse así
-# ngp
-#: src/print.c:246
-msgid "\t\t/* empty */"
-msgstr "\t\t/* vacía */"
+#: src/print.c:241
+msgid "empty"
+msgstr ""

 
 

-#: src/print.c:253
+#. TERMINAL (type #) : rule #s terminal is on RHS
+#: src/print.c:245

 #, fuzzy
 msgid "Terminals, with rules where they appear"
 msgstr ""
 #, fuzzy
 msgid "Terminals, with rules where they appear"
 msgstr ""


@@ -441,18 +438,18 @@ msgstr ""
 "Terminales con las reglas donde aparecen\n"
 "\n"
 
 "Terminales con las reglas donde aparecen\n"
 "\n"
 

-#: src/print.c:302
+#: src/print.c:269

 #, fuzzy
 msgid "Nonterminals, with rules where they appear"
 msgstr ""
 "\n"
 "No terminales con las reglas donde aparecen\n"
 
 #, fuzzy
 msgid "Nonterminals, with rules where they appear"
 msgstr ""
 "\n"
 "No terminales con las reglas donde aparecen\n"
 

-#: src/print.c:329
+#: src/print.c:295

 msgid " on left:"
 msgstr " en la izquierda:"
 
 msgid " on left:"
 msgstr " en la izquierda:"
 

-#: src/print.c:344
+#: src/print.c:310

 msgid " on right:"
 msgstr " en la derecha:"
 
 msgid " on right:"
 msgstr " en la derecha:"
 


@@ -506,7 +503,7 @@ msgstr "$%s de `%s' no tiene tipo declarado"
 msgid "unterminated `%{' definition"
 msgstr "definición `%{' sin terminar"
 
 msgid "unterminated `%{' definition"
 msgstr "definición `%{' sin terminar"
 

-#: src/reader.c:482 src/reader.c:598 src/reader.c:648
+#: src/reader.c:482 src/reader.c:596 src/reader.c:646

 #, c-format
 msgid "Premature EOF after %s"
 msgstr ""
 #, c-format
 msgid "Premature EOF after %s"
 msgstr ""


@@ -521,41 +518,41 @@ msgstr ""
 msgid "symbol `%s' given more than one literal string"
 msgstr ""
 
 msgid "symbol `%s' given more than one literal string"
 msgstr ""
 

-#: src/reader.c:524 src/reader.c:667
+#: src/reader.c:523 src/reader.c:665

 #, c-format
 msgid "symbol %s redefined"
 msgstr "redefinido el símbolo %s"
 
 #, c-format
 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:1290
+#: src/reader.c:533 src/reader.c:611 src/reader.c:672 src/reader.c:1286

 #, c-format
 msgid "type redeclaration for %s"
 msgstr "redeclaración del tipo de %s"
 
 #, c-format
 msgid "type redeclaration for %s"
 msgstr "redeclaración del tipo de %s"
 

-#: src/reader.c:544
+#: src/reader.c:542

 #, c-format
 msgid "`%s' is invalid in %s"
 msgstr "`%s' no es válido en %s"
 
 #, c-format
 msgid "`%s' is invalid in %s"
 msgstr "`%s' no es válido en %s"
 

-#: src/reader.c:561 src/reader.c:721
+#: src/reader.c:559 src/reader.c:718

 #, fuzzy, c-format
 msgid "multiple %s declarations"
 msgstr "múltiples declaraciones de %start"
 
 #, fuzzy, c-format
 msgid "multiple %s declarations"
 msgstr "múltiples declaraciones de %start"
 

-#: src/reader.c:563 src/reader.c:902 src/reader.c:927 src/reader.c:1268
+#: src/reader.c:561 src/reader.c:898 src/reader.c:923 src/reader.c:1264

 #, fuzzy, c-format
 msgid "invalid %s declaration"
 msgstr "declaración de %start no válida"
 
 #, fuzzy, c-format
 msgid "invalid %s declaration"
 msgstr "declaración de %start no válida"
 

-#: src/reader.c:583
+#: src/reader.c:581

 msgid "%type declaration has no <typename>"
 msgstr "la declaración %type no tiene <nombre-tipo>"
 
 msgid "%type declaration has no <typename>"
 msgstr "la declaración %type no tiene <nombre-tipo>"
 

-#: src/reader.c:618
+#: src/reader.c:616

 #, fuzzy, c-format
 msgid "invalid %%type declaration due to item: %s"
 msgstr "declaración de %%type no válida debido al ítem: `%s'"
 
 #, fuzzy, c-format
 msgid "invalid %%type declaration due to item: %s"
 msgstr "declaración de %%type no válida debido al ítem: `%s'"
 

-#: src/reader.c:663
+#: src/reader.c:661

 #, c-format
 msgid "redefining precedence of %s"
 msgstr "redefinición de la precedencia de %s"
 #, c-format
 msgid "redefining precedence of %s"
 msgstr "redefinición de la precedencia de %s"


@@ -564,7 +561,7 @@ msgstr "redefinici
 # de "to must" y aquí se emplea en su forma condicional. Por eso, he
 # cambiado `debe' por `debería' - cll
 # ahí me has pillado en un olvido del inglés - ngp
 # de "to must" y aquí se emplea en su forma condicional. Por eso, he
 # cambiado `debe' por `debería' - cll
 # ahí me has pillado en un olvido del inglés - ngp

-#: src/reader.c:687
+#: src/reader.c:684

 #, c-format
 msgid "invalid text (%s) - number should be after identifier"
 msgstr ""
 #, c-format
 msgid "invalid text (%s) - number should be after identifier"
 msgstr ""


@@ -574,18 +571,18 @@ msgstr ""
 # otras, como `inesperado'. Cualquiera es correcta, por supuesto y, en
 # este caso, la segunda me parece más apropiada - cll
 # ok - ngp
 # otras, como `inesperado'. Cualquiera es correcta, por supuesto y, en
 # este caso, la segunda me parece más apropiada - cll
 # ok - ngp

-#: src/reader.c:697
+#: src/reader.c:694

 #, c-format
 msgid "unexpected item: %s"
 msgstr "ítem inesperado: %s"
 
 # Cambio el orden y el sexo. Ahora está "en español". sv
 #, c-format
 msgid "unexpected item: %s"
 msgstr "ítem inesperado: %s"
 
 # Cambio el orden y el sexo. Ahora está "en español". sv

-#: src/reader.c:764 src/reader.c:1094 src/reader.c:1165
+#: src/reader.c:761 src/reader.c:1090 src/reader.c:1161

 #, fuzzy, c-format
 msgid "unmatched %s"
 msgstr "`{' desemparejada"
 
 #, fuzzy, c-format
 msgid "unmatched %s"
 msgstr "`{' desemparejada"
 

-#: src/reader.c:796
+#: src/reader.c:793

 #, fuzzy, c-format
 msgid "argument of %%expect is not an integer"
 msgstr "el argumento de %expect no es un entero"
 #, fuzzy, c-format
 msgid "argument of %%expect is not an integer"
 msgstr "el argumento de %expect no es un entero"


@@ -596,26 +593,26 @@ msgstr "el argumento de %expect no es un entero"
 # - cll
 # ok - ngp
 #
 # - cll
 # ok - ngp
 #

-#: src/reader.c:843
+#: src/reader.c:839

 #, c-format
 msgid "unrecognized item %s, expected an identifier"
 msgstr "no se reconoce el ítem %s, se esperaba un identificador"
 
 #, c-format
 msgid "unrecognized item %s, expected an identifier"
 msgstr "no se reconoce el ítem %s, se esperaba un identificador"
 

-#: src/reader.c:867
+#: src/reader.c:863

 #, c-format
 msgid "expected string constant instead of %s"
 msgstr "se esperaba una cadena constante en lugar de %s"
 
 #, c-format
 msgid "expected string constant instead of %s"
 msgstr "se esperaba una cadena constante en lugar de %s"
 

-#: src/reader.c:1010
+#: src/reader.c:1006

 #, c-format
 msgid "unrecognized: %s"
 msgstr "no reconocido: %s"
 
 #, c-format
 msgid "unrecognized: %s"
 msgstr "no reconocido: %s"
 

-#: src/reader.c:1015
+#: src/reader.c:1011

 msgid "no input grammar"
 msgstr "no hay gramática de entrada"
 
 msgid "no input grammar"
 msgstr "no hay gramática de entrada"
 

-#: src/reader.c:1020
+#: src/reader.c:1016

 #, c-format
 msgid "unknown character: %s"
 msgstr "carácter desconocido: %s"
 #, c-format
 msgid "unknown character: %s"
 msgstr "carácter desconocido: %s"


@@ -624,93 +621,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
 #
 # 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:1188
+#: src/reader.c:1184

 #, fuzzy, c-format
 msgid "unterminated %guard clause"
 msgstr "cláusula %%guard sin terminar"
 
 #, fuzzy, c-format
 msgid "unterminated %guard clause"
 msgstr "cláusula %%guard sin terminar"
 

-#: src/reader.c:1355
+#: src/reader.c:1351

 msgid "ill-formed rule: initial symbol not followed by colon"
 msgstr "regla mal formada: el símbolo inicial no está seguido por :"
 
 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:1362
+#: src/reader.c:1358

 msgid "grammar starts with vertical bar"
 msgstr "la gramática comienza con una barra vertical"
 
 msgid "grammar starts with vertical bar"
 msgstr "la gramática comienza con una barra vertical"
 

-#: src/reader.c:1393
+#: src/reader.c:1389

 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "se ha dado una regla para %s, que es un terminal"
 
 #, 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:1495
+#: src/reader.c:1491

 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
 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:1503
+#: src/reader.c:1499

 #, c-format
 msgid "%%guard present but %%semantic_parser not specified"
 msgstr "%%guard presente pero %%semantic_parser está sin especificar"
 
 #, c-format
 msgid "%%guard present but %%semantic_parser not specified"
 msgstr "%%guard presente pero %%semantic_parser está sin especificar"
 

-#: src/reader.c:1512
+#: src/reader.c:1508

 msgid "two actions at end of one rule"
 msgstr "dos acciones al final de una regla"
 
 msgid "two actions at end of one rule"
 msgstr "dos acciones al final de una regla"
 

-#: src/reader.c:1526
+#: src/reader.c:1522

 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "los tipos (`%s' `%s') no concuerdan en la acción por defecto"
 
 #, 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:1532
+#: src/reader.c:1528

 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"
 
 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:1576
+#: src/reader.c:1572

 #, c-format
 msgid "invalid input: %s"
 msgstr "entrada no válida: %s"
 
 #, c-format
 msgid "invalid input: %s"
 msgstr "entrada no válida: %s"
 

-#: src/reader.c:1584
+#: src/reader.c:1580

 #, fuzzy, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "demasiados símbolos (terminales y no terminales); máximo %s"
 
 #, 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:1587
+#: src/reader.c:1583

 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
 #
 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:1611
+#: src/reader.c:1607

 #, 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"
 
 #, 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:1716
+#: src/reader.c:1713

 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "precedencias en conflicto entre %s y %s"
 
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "precedencias en conflicto entre %s y %s"
 

-#: src/reader.c:1728
+#: src/reader.c:1725

 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "conflicto de valores assoc para %s y %s"
 
 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "conflicto de valores assoc para %s y %s"
 

-#: src/reader.c:1779
+#: src/reader.c:1771

 #, 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"
 
 #, 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:1792
+#: src/reader.c:1783

 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "el símbolo de inicio (axioma) %s no está definido"
 
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "el símbolo de inicio (axioma) %s no está definido"
 

-#: src/reader.c:1794
+#: src/reader.c:1785

 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "el símbolo de inicio (axioma) %s es un terminal"
 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "el símbolo de inicio (axioma) %s es un terminal"


@@ -935,6 +932,14 @@ msgstr ""
 msgid "'"
 msgstr ""
 
 msgid "'"
 msgstr ""
 

+# Duda: ¿Estás seguro de que no será `vacío'? Si no lo estás o, si por
+# el contrario, pudiera cualquiera de los casos, debieras traducirlo
+# como `vacía/o' - cll
+# según el código indica reglas vacías por eso lo puse así
+# ngp
+#~ msgid "\t\t/* empty */"
+#~ msgstr "\t\t/* vacía */"
+

 # ¿Por qué no lo pones en mayúsculas? Al fin y al cabo, eso es lo que
 # haces luego con "FDERIVES" que traduces como "FDERIVACIONES", ... -
 # cll
 # ¿Por qué no lo pones en mayúsculas? Al fin y al cabo, eso es lo que
 # haces luego con "FDERIVES" que traduces como "FDERIVACIONES", ... -
 # cll

diff --git a/po/et.gmo b/po/et.gmo
index d97ad84e5e6f32daf5247f79681345a985ae4c62..7a9ac05f07eea7c306e8dd9f0e7da58534eefa03 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 c501dc19d68977e2d0d18bd615a7632e191efa1c..b6221ba7947668e66f07fc9899ee1d95cc66ca49 100644 (file)
--- a/po/et.po
+++ b/po/et.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.28d\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.28d\n"

-"POT-Creation-Date: 2001-09-22 18:19+0200\n"
+"POT-Creation-Date: 2001-09-24 10:22+0200\n"

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


@@ -13,7 +13,7 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8-bit\n"
 

-#: src/LR0.c:207
+#: src/LR0.c:208

 #, c-format
 msgid "too many states (max %d)"
 msgstr "liiga palju olekuid (maks %d)"
 #, c-format
 msgid "too many states (max %d)"
 msgstr "liiga palju olekuid (maks %d)"


@@ -76,31 +76,31 @@ msgstr "Olek %d sisaldab"
 
 #. If invoked with `--yacc', use the output format specified by
 #. POSIX.
 
 #. If invoked with `--yacc', use the output format specified by
 #. POSIX.

-#: src/conflicts.c:493
+#: src/conflicts.c:492

 msgid "conflicts: "
 msgstr "konfliktid: "
 
 msgid "conflicts: "
 msgstr "konfliktid: "
 

-#: src/conflicts.c:495
+#: src/conflicts.c:494

 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d nihutamine/redutseerimine"
 
 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d nihutamine/redutseerimine"
 

-#: src/conflicts.c:499
+#: src/conflicts.c:498

 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d redutseerimine/redutseerimine"
 
 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d redutseerimine/redutseerimine"
 

-#: src/conflicts.c:504
+#: src/conflicts.c:503

 #, c-format
 msgid "%s contains"
 msgstr "%s sisaldab"
 
 #, c-format
 msgid "%s contains"
 msgstr "%s sisaldab"
 

-#: src/conflicts.c:590 src/conflicts.c:711
+#: src/conflicts.c:589 src/conflicts.c:710

 #, c-format
 msgid "    %-4s\t[reduce using rule %d (%s)]\n"
 msgstr "    %-4s\t[redutseerin, kasutades reeglit %d (%s)]\n"
 
 #, c-format
 msgid "    %-4s\t[reduce using rule %d (%s)]\n"
 msgstr "    %-4s\t[redutseerin, kasutades reeglit %d (%s)]\n"
 

-#: src/conflicts.c:602 src/print.c:173
+#: src/conflicts.c:601 src/print.c:172

 #, c-format
 msgid ""
 "    $default\treduce using rule %d (%s)\n"
 #, c-format
 msgid ""
 "    $default\treduce using rule %d (%s)\n"


@@ -109,12 +109,12 @@ msgstr ""
 "    $default\tredutseerin kasutades reeglit %d (%s)\n"
 "\n"
 
 "    $default\tredutseerin kasutades reeglit %d (%s)\n"
 "\n"
 

-#: src/conflicts.c:691 src/conflicts.c:705
+#: src/conflicts.c:690 src/conflicts.c:704

 #, c-format
 msgid "    %-4s\treduce using rule %d (%s)\n"
 msgstr "    %-4s\tredutseerin kasutades reeglit %d (%s)\n"
 
 #, c-format
 msgid "    %-4s\treduce using rule %d (%s)\n"
 msgstr "    %-4s\tredutseerin kasutades reeglit %d (%s)\n"
 

-#: src/conflicts.c:732
+#: src/conflicts.c:731

 #, c-format
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr "    $default\tredutseerin kasutades reeglit %d (%s)\n"
 #, c-format
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr "    $default\tredutseerin kasutades reeglit %d (%s)\n"


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

-#: src/files.c:132
+#: src/files.c:138

 #, 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:151
+#: src/files.c:157

 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:635
+#: src/getargs.c:214 src/lex.c:633

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


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

-#: src/lex.c:432
+#: src/lex.c:431

 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"
 

-#: src/main.c:108
+#: src/main.c:122

 #, c-format
 msgid "%s: internal error: %s\n"
 msgstr "%s: sisemine viga: %s\n"
 #, c-format
 msgid "%s: internal error: %s\n"
 msgstr "%s: sisemine viga: %s\n"


@@ -308,7 +308,7 @@ msgstr "%s: sisemine viga: %s\n"
 msgid "Entering set_nullable"
 msgstr "Entering set_nullable"
 
 msgid "Entering set_nullable"
 msgstr "Entering set_nullable"
 

-#: src/output.c:993
+#: src/output.c:987

 #, c-format
 msgid "maximum table size (%d) exceeded"
 msgstr "ületati maksimaalset tabelisuurust (%d)"
 #, c-format
 msgid "maximum table size (%d) exceeded"
 msgstr "ületati maksimaalset tabelisuurust (%d)"


@@ -346,42 +346,44 @@ msgstr "    %-4s\tnihuta ja liigu olekule %d\n"
 msgid "    %-4s\terror (nonassociative)\n"
 msgstr "    %-4s\tviga (mitteassotsiatiivne)\n"
 
 msgid "    %-4s\terror (nonassociative)\n"
 msgstr "    %-4s\tviga (mitteassotsiatiivne)\n"
 

-#: src/print.c:190
+#: src/print.c:188

 #, c-format
 msgid "    %-4s\tgo to state %d\n"
 msgstr "    %-4s\tliigu olekule %d\n"
 
 #, c-format
 msgid "    %-4s\tgo to state %d\n"
 msgstr "    %-4s\tliigu olekule %d\n"
 

-#: src/print.c:202
+#: src/print.c:200

 #, c-format
 msgid "state %d"
 msgstr "olek %d"
 
 #, c-format
 msgid "state %d"
 msgstr "olek %d"
 

-#: src/print.c:233
+#. rule # : LHS -> RHS
+#: src/print.c:230

 msgid "Grammar"
 msgstr "Grammatika"
 
 msgid "Grammar"
 msgstr "Grammatika"
 

-#: src/print.c:240
+#: src/print.c:235

 #, c-format
 msgid "rule %-4d %s ->"
 msgstr "reegel %-4d %s ->"
 
 #, c-format
 msgid "rule %-4d %s ->"
 msgstr "reegel %-4d %s ->"
 

-#: src/print.c:246
-msgid "\t\t/* empty */"
-msgstr "\t\t/* tühi */"
+#: src/print.c:241
+msgid "empty"
+msgstr ""

 
 

-#: src/print.c:253
+#. TERMINAL (type #) : rule #s terminal is on RHS
+#: src/print.c:245

 msgid "Terminals, with rules where they appear"
 msgstr "Terminalid, koos reeglitega, kus nad ilmuvad"
 
 msgid "Terminals, with rules where they appear"
 msgstr "Terminalid, koos reeglitega, kus nad ilmuvad"
 

-#: src/print.c:302
+#: src/print.c:269

 msgid "Nonterminals, with rules where they appear"
 msgstr "Mitteterminalid, koos reeglitega, kus nad ilmuvad"
 
 msgid "Nonterminals, with rules where they appear"
 msgstr "Mitteterminalid, koos reeglitega, kus nad ilmuvad"
 

-#: src/print.c:329
+#: src/print.c:295

 msgid " on left:"
 msgstr " vasakul:"
 
 msgid " on left:"
 msgstr " vasakul:"
 

-#: src/print.c:344
+#: src/print.c:310

 msgid " on right:"
 msgstr " paremal:"
 
 msgid " on right:"
 msgstr " paremal:"
 


@@ -435,7 +437,7 @@ msgstr "$%d `%s' ei oma deklareeritud t
 msgid "unterminated `%{' definition"
 msgstr "lõpetamata `%{' definitsioon"
 
 msgid "unterminated `%{' definition"
 msgstr "lõpetamata `%{' definitsioon"
 

-#: src/reader.c:482 src/reader.c:598 src/reader.c:648
+#: src/reader.c:482 src/reader.c:596 src/reader.c:646

 #, c-format
 msgid "Premature EOF after %s"
 msgstr "Enneaegne EOF peale %s"
 #, c-format
 msgid "Premature EOF after %s"
 msgstr "Enneaegne EOF peale %s"


@@ -450,171 +452,171 @@ msgstr "s
 msgid "symbol `%s' given more than one literal string"
 msgstr "sümbolile `%s' on antud enam kui üks literaal sõne"
 
 msgid "symbol `%s' given more than one literal string"
 msgstr "sümbolile `%s' on antud enam kui üks literaal sõne"
 

-#: src/reader.c:524 src/reader.c:667
+#: src/reader.c:523 src/reader.c:665

 #, c-format
 msgid "symbol %s redefined"
 msgstr "sümbol %s on uuesti defineeritud"
 
 #, c-format
 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:1290
+#: src/reader.c:533 src/reader.c:611 src/reader.c:672 src/reader.c:1286

 #, c-format
 msgid "type redeclaration for %s"
 msgstr "%s tüübi uuesti deklareerimine"
 
 #, c-format
 msgid "type redeclaration for %s"
 msgstr "%s tüübi uuesti deklareerimine"
 

-#: src/reader.c:544
+#: src/reader.c:542

 #, c-format
 msgid "`%s' is invalid in %s"
 msgstr "`%s' ei ole %s sees lubatud"
 
 #, c-format
 msgid "`%s' is invalid in %s"
 msgstr "`%s' ei ole %s sees lubatud"
 

-#: src/reader.c:561 src/reader.c:721
+#: src/reader.c:559 src/reader.c:718

 #, c-format
 msgid "multiple %s declarations"
 msgstr "korduvad %s deklaratsioonid"
 
 #, c-format
 msgid "multiple %s declarations"
 msgstr "korduvad %s deklaratsioonid"
 

-#: src/reader.c:563 src/reader.c:902 src/reader.c:927 src/reader.c:1268
+#: src/reader.c:561 src/reader.c:898 src/reader.c:923 src/reader.c:1264

 #, c-format
 msgid "invalid %s declaration"
 msgstr "vigane %s deklaratsioon"
 
 #, c-format
 msgid "invalid %s declaration"
 msgstr "vigane %s deklaratsioon"
 

-#: src/reader.c:583
+#: src/reader.c:581

 msgid "%type declaration has no <typename>"
 msgstr "%type deklaratsioonis puudub <tüübinimi>"
 
 msgid "%type declaration has no <typename>"
 msgstr "%type deklaratsioonis puudub <tüübinimi>"
 

-#: src/reader.c:618
+#: src/reader.c:616

 #, c-format
 msgid "invalid %%type declaration due to item: %s"
 msgstr "vigane %%type deklaratsioon, element: %s"
 
 #, c-format
 msgid "invalid %%type declaration due to item: %s"
 msgstr "vigane %%type deklaratsioon, element: %s"
 

-#: src/reader.c:663
+#: src/reader.c:661

 #, c-format
 msgid "redefining precedence of %s"
 msgstr "%s prioriteedi uus definitsioon"
 
 #, c-format
 msgid "redefining precedence of %s"
 msgstr "%s prioriteedi uus definitsioon"
 

-#: src/reader.c:687
+#: src/reader.c:684

 #, c-format
 msgid "invalid text (%s) - number should be after identifier"
 msgstr "vigane tekst (%s) - number peab olema peale identifikaatorit"
 
 #, c-format
 msgid "invalid text (%s) - number should be after identifier"
 msgstr "vigane tekst (%s) - number peab olema peale identifikaatorit"
 

-#: src/reader.c:697
+#: src/reader.c:694

 #, c-format
 msgid "unexpected item: %s"
 msgstr "ootamatu element: %s"
 
 #, c-format
 msgid "unexpected item: %s"
 msgstr "ootamatu element: %s"
 

-#: src/reader.c:764 src/reader.c:1094 src/reader.c:1165
+#: src/reader.c:761 src/reader.c:1090 src/reader.c:1161

 #, c-format
 msgid "unmatched %s"
 msgstr "puudub %s"
 
 #, c-format
 msgid "unmatched %s"
 msgstr "puudub %s"
 

-#: src/reader.c:796
+#: src/reader.c:793

 #, c-format
 msgid "argument of %%expect is not an integer"
 msgstr "%%expect argument ei ole täisarv"
 
 #, c-format
 msgid "argument of %%expect is not an integer"
 msgstr "%%expect argument ei ole täisarv"
 

-#: src/reader.c:843
+#: src/reader.c:839

 #, c-format
 msgid "unrecognized item %s, expected an identifier"
 msgstr "tundmatu element %s, eeldasin identifikaatorit"
 
 #, c-format
 msgid "unrecognized item %s, expected an identifier"
 msgstr "tundmatu element %s, eeldasin identifikaatorit"
 

-#: src/reader.c:867
+#: src/reader.c:863

 #, c-format
 msgid "expected string constant instead of %s"
 msgstr "eeldasin %s asemel sõnekonstanti"
 
 #, c-format
 msgid "expected string constant instead of %s"
 msgstr "eeldasin %s asemel sõnekonstanti"
 

-#: src/reader.c:1010
+#: src/reader.c:1006

 #, c-format
 msgid "unrecognized: %s"
 msgstr "tundmatu: %s"
 
 #, c-format
 msgid "unrecognized: %s"
 msgstr "tundmatu: %s"
 

-#: src/reader.c:1015
+#: src/reader.c:1011

 msgid "no input grammar"
 msgstr "sisendgrammatikat pole"
 
 msgid "no input grammar"
 msgstr "sisendgrammatikat pole"
 

-#: src/reader.c:1020
+#: src/reader.c:1016

 #, c-format
 msgid "unknown character: %s"
 msgstr "tundmatu sümbol: %s"
 
 #, c-format
 msgid "unknown character: %s"
 msgstr "tundmatu sümbol: %s"
 

-#: src/reader.c:1188
+#: src/reader.c:1184

 #, c-format
 msgid "unterminated %guard clause"
 msgstr "lõpetamata %guard klausel"
 
 #, c-format
 msgid "unterminated %guard clause"
 msgstr "lõpetamata %guard klausel"
 

-#: src/reader.c:1355
+#: src/reader.c:1351

 msgid "ill-formed rule: initial symbol not followed by colon"
 msgstr "vigaselt formeeritud reegel: algsümbolile ei järgne koolonit"
 
 msgid "ill-formed rule: initial symbol not followed by colon"
 msgstr "vigaselt formeeritud reegel: algsümbolile ei järgne koolonit"
 

-#: src/reader.c:1362
+#: src/reader.c:1358

 msgid "grammar starts with vertical bar"
 msgstr "grammatika algab püstkriipsuga"
 
 msgid "grammar starts with vertical bar"
 msgstr "grammatika algab püstkriipsuga"
 

-#: src/reader.c:1393
+#: src/reader.c:1389

 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "%s jaoks on antud reegel, aga see on märk"
 
 #, 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:1495
+#: src/reader.c:1491

 msgid "two @prec's in a row"
 msgstr "kaks @prec ühel real"
 
 msgid "two @prec's in a row"
 msgstr "kaks @prec ühel real"
 

-#: src/reader.c:1503
+#: src/reader.c:1499

 #, c-format
 msgid "%%guard present but %%semantic_parser not specified"
 msgstr "%%guard on määratud, aga %%semantic_parser ei ole"
 
 #, c-format
 msgid "%%guard present but %%semantic_parser not specified"
 msgstr "%%guard on määratud, aga %%semantic_parser ei ole"
 

-#: src/reader.c:1512
+#: src/reader.c:1508

 msgid "two actions at end of one rule"
 msgstr "kaks tegevust ühe reegli lõpus"
 
 msgid "two actions at end of one rule"
 msgstr "kaks tegevust ühe reegli lõpus"
 

-#: src/reader.c:1526
+#: src/reader.c:1522

 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "vaikimisi tegevuse tüübikonflikt (`%s' `%s')"
 
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "vaikimisi tegevuse tüübikonflikt (`%s' `%s')"
 

-#: src/reader.c:1532
+#: src/reader.c:1528

 msgid "empty rule for typed nonterminal, and no action"
 msgstr "tüübiga mitteterminalil on tühi reegel ja puudub tegevus"
 
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "tüübiga mitteterminalil on tühi reegel ja puudub tegevus"
 

-#: src/reader.c:1576
+#: src/reader.c:1572

 #, c-format
 msgid "invalid input: %s"
 msgstr "vigane sisend: %s"
 
 #, c-format
 msgid "invalid input: %s"
 msgstr "vigane sisend: %s"
 

-#: src/reader.c:1584
+#: src/reader.c:1580

 #, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "liiga palju sümboleid (märgid ja mitteterminalid); maksimaalne on %d"
 
 #, 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:1587
+#: src/reader.c:1583

 msgid "no rules in the input grammar"
 msgstr "sisendgrammatikas pole reegleid"
 
 msgid "no rules in the input grammar"
 msgstr "sisendgrammatikas pole reegleid"
 

-#: src/reader.c:1611
+#: src/reader.c:1607

 #, 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"
 
 #, 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:1716
+#: src/reader.c:1713

 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "%s ja %s omavad konfliktseid prioriteete"
 
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "%s ja %s omavad konfliktseid prioriteete"
 

-#: src/reader.c:1728
+#: src/reader.c:1725

 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "%s ja %s omavad konfliktseid assotsiatiivseid väärtuseid"
 
 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "%s ja %s omavad konfliktseid assotsiatiivseid väärtuseid"
 

-#: src/reader.c:1779
+#: src/reader.c:1771

 #, c-format
 msgid "tokens %s and %s both assigned number %d"
 msgstr "märkidele %s ja %s on mõlemale omistatud number %d"
 
 #, 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:1792
+#: src/reader.c:1783

 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "stardisümbol %s ei ole defineeritud"
 
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "stardisümbol %s ei ole defineeritud"
 

-#: src/reader.c:1794
+#: src/reader.c:1785

 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "stardisümbol %s on märk"
 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "stardisümbol %s on märk"


@@ -789,6 +791,9 @@ msgstr "`"
 msgid "'"
 msgstr "'"
 
 msgid "'"
 msgstr "'"
 

+#~ msgid "\t\t/* empty */"
+#~ msgstr "\t\t/* tühi */"
+

 #~ msgid "multiple %%header_extension declarations"
 #~ msgstr "korduvad %%header_extension eklaratsioonid"
 
 #~ msgid "multiple %%header_extension declarations"
 #~ msgstr "korduvad %%header_extension eklaratsioonid"
 

diff --git a/po/fr.gmo b/po/fr.gmo
index 2cc4b24e2c385bb1fc2eb14effff75685b605be0..47dd50648e04358d7af7fb7261cfdc3ecce911bb 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 d2615bf401c1d3bdf9128e50652a86a964db332d..4c244e2b029d6601438e1db555c5079de9abfc26 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU bison 1.28d\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU bison 1.28d\n"

-"POT-Creation-Date: 2001-09-22 18:19+0200\n"
+"POT-Creation-Date: 2001-09-24 10:22+0200\n"

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


@@ -14,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 

-#: src/LR0.c:207
+#: src/LR0.c:208

 #, c-format
 msgid "too many states (max %d)"
 msgstr "nombre trop grand d'états (max %d)"
 #, c-format
 msgid "too many states (max %d)"
 msgstr "nombre trop grand d'états (max %d)"


@@ -78,31 +78,31 @@ msgstr "L'
 
 #. If invoked with `--yacc', use the output format specified by
 #. POSIX.
 
 #. If invoked with `--yacc', use the output format specified by
 #. POSIX.

-#: src/conflicts.c:493
+#: src/conflicts.c:492

 msgid "conflicts: "
 msgstr "conflits: "
 
 msgid "conflicts: "
 msgstr "conflits: "
 

-#: src/conflicts.c:495
+#: src/conflicts.c:494

 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d décalage/réduction"
 
 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d décalage/réduction"
 

-#: src/conflicts.c:499
+#: src/conflicts.c:498

 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d réduction/réduction"
 
 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d réduction/réduction"
 

-#: src/conflicts.c:504
+#: src/conflicts.c:503

 #, c-format
 msgid "%s contains"
 msgstr "%s contient"
 
 #, c-format
 msgid "%s contains"
 msgstr "%s contient"
 

-#: src/conflicts.c:590 src/conflicts.c:711
+#: src/conflicts.c:589 src/conflicts.c:710

 #, c-format
 msgid "    %-4s\t[reduce using rule %d (%s)]\n"
 msgstr "    %-4s\t[réduction par la règle %d (%s)\n"
 
 #, c-format
 msgid "    %-4s\t[reduce using rule %d (%s)]\n"
 msgstr "    %-4s\t[réduction par la règle %d (%s)\n"
 

-#: src/conflicts.c:602 src/print.c:173
+#: src/conflicts.c:601 src/print.c:172

 #, c-format
 msgid ""
 "    $default\treduce using rule %d (%s)\n"
 #, c-format
 msgid ""
 "    $default\treduce using rule %d (%s)\n"


@@ -111,12 +111,12 @@ msgstr ""
 "    $défaut\tréduction par la règle %d (%s)\n"
 "\n"
 
 "    $défaut\tréduction par la règle %d (%s)\n"
 "\n"
 

-#: src/conflicts.c:691 src/conflicts.c:705
+#: src/conflicts.c:690 src/conflicts.c:704

 #, c-format
 msgid "    %-4s\treduce using rule %d (%s)\n"
 msgstr "    %-4s\tréduction par la règle %d (%s)\n"
 
 #, c-format
 msgid "    %-4s\treduce using rule %d (%s)\n"
 msgstr "    %-4s\tréduction par la règle %d (%s)\n"
 

-#: src/conflicts.c:732
+#: src/conflicts.c:731

 #, c-format
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr "    $défaut\tréduction par la règle %d (%s)\n"
 #, c-format
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr "    $défaut\tréduction par la règle %d (%s)\n"


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

-#: src/files.c:132
+#: src/files.c:138

 #, 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:151
+#: src/files.c:157

 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:635
+#: src/getargs.c:214 src/lex.c:633

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


@@ -301,11 +301,11 @@ 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:432
+#: src/lex.c:431

 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"
 

-#: src/main.c:108
+#: src/main.c:122

 #, c-format
 msgid "%s: internal error: %s\n"
 msgstr "%s: erreur interne: %s\n"
 #, c-format
 msgid "%s: internal error: %s\n"
 msgstr "%s: erreur interne: %s\n"


@@ -314,7 +314,7 @@ msgstr "%s: erreur interne: %s\n"
 msgid "Entering set_nullable"
 msgstr "Entré dans set_nullable"
 
 msgid "Entering set_nullable"
 msgstr "Entré dans set_nullable"
 

-#: src/output.c:993
+#: src/output.c:987

 #, c-format
 msgid "maximum table size (%d) exceeded"
 msgstr "taille maximale de la table (%d) dépassée"
 #, c-format
 msgid "maximum table size (%d) exceeded"
 msgstr "taille maximale de la table (%d) dépassée"


@@ -352,42 +352,44 @@ msgstr "    %-4s\td
 msgid "    %-4s\terror (nonassociative)\n"
 msgstr "    %-4s\terreur (non-associatif)\n"
 
 msgid "    %-4s\terror (nonassociative)\n"
 msgstr "    %-4s\terreur (non-associatif)\n"
 

-#: src/print.c:190
+#: src/print.c:188

 #, c-format
 msgid "    %-4s\tgo to state %d\n"
 msgstr "    %-4s\taller à l'état %d\n"
 
 #, c-format
 msgid "    %-4s\tgo to state %d\n"
 msgstr "    %-4s\taller à l'état %d\n"
 

-#: src/print.c:202
+#: src/print.c:200

 #, c-format
 msgid "state %d"
 msgstr "état %d"
 
 #, c-format
 msgid "state %d"
 msgstr "état %d"
 

-#: src/print.c:233
+#. rule # : LHS -> RHS
+#: src/print.c:230

 msgid "Grammar"
 msgstr "Grammaire"
 
 msgid "Grammar"
 msgstr "Grammaire"
 

-#: src/print.c:240
+#: src/print.c:235

 #, c-format
 msgid "rule %-4d %s ->"
 msgstr "règle %-4d %s ->"
 
 #, c-format
 msgid "rule %-4d %s ->"
 msgstr "règle %-4d %s ->"
 

-#: src/print.c:246
-msgid "\t\t/* empty */"
-msgstr "\t\t/* epsilon */"
+#: src/print.c:241
+msgid "empty"
+msgstr ""

 
 

-#: src/print.c:253
+#. TERMINAL (type #) : rule #s terminal is on RHS
+#: src/print.c:245

 msgid "Terminals, with rules where they appear"
 msgstr "Terminaux, suivis des règles où ils apparaissent"
 
 msgid "Terminals, with rules where they appear"
 msgstr "Terminaux, suivis des règles où ils apparaissent"
 

-#: src/print.c:302
+#: src/print.c:269

 msgid "Nonterminals, with rules where they appear"
 msgstr "Non-terminaux, suivis des règles où ils apparaissent"
 
 msgid "Nonterminals, with rules where they appear"
 msgstr "Non-terminaux, suivis des règles où ils apparaissent"
 

-#: src/print.c:329
+#: src/print.c:295

 msgid " on left:"
 msgstr " à gauche:"
 
 msgid " on left:"
 msgstr " à gauche:"
 

-#: src/print.c:344
+#: src/print.c:310

 msgid " on right:"
 msgstr " à droite:"
 
 msgid " on right:"
 msgstr " à droite:"
 


@@ -441,7 +443,7 @@ msgstr "$%d de `%s' n'a pas de type d
 msgid "unterminated `%{' definition"
 msgstr "La section de définition (%{) ne termine pas avant la fin du fichier"
 
 msgid "unterminated `%{' definition"
 msgstr "La section de définition (%{) ne termine pas avant la fin du fichier"
 

-#: src/reader.c:482 src/reader.c:598 src/reader.c:648
+#: src/reader.c:482 src/reader.c:596 src/reader.c:646

 #, c-format
 msgid "Premature EOF after %s"
 msgstr "Fin de fichier prématutée après %s"
 #, c-format
 msgid "Premature EOF after %s"
 msgstr "Fin de fichier prématutée après %s"


@@ -456,172 +458,172 @@ msgstr "symbole `%s' utilis
 msgid "symbol `%s' given more than one literal string"
 msgstr "symbole `%s' présent dans plus d'une chaîne litérale"
 
 msgid "symbol `%s' given more than one literal string"
 msgstr "symbole `%s' présent dans plus d'une chaîne litérale"
 

-#: src/reader.c:524 src/reader.c:667
+#: src/reader.c:523 src/reader.c:665

 #, c-format
 msgid "symbol %s redefined"
 msgstr "symbole %s redéfini"
 
 #, c-format
 msgid "symbol %s redefined"
 msgstr "symbole %s redéfini"
 

-#: src/reader.c:534 src/reader.c:613 src/reader.c:674 src/reader.c:1290
+#: src/reader.c:533 src/reader.c:611 src/reader.c:672 src/reader.c:1286

 #, c-format
 msgid "type redeclaration for %s"
 msgstr "redéclaration du type de %s"
 
 #, c-format
 msgid "type redeclaration for %s"
 msgstr "redéclaration du type de %s"
 

-#: src/reader.c:544
+#: src/reader.c:542

 #, c-format
 msgid "`%s' is invalid in %s"
 msgstr "`%s' n'est pas valide dans %s"
 
 #, c-format
 msgid "`%s' is invalid in %s"
 msgstr "`%s' n'est pas valide dans %s"
 

-#: src/reader.c:561 src/reader.c:721
+#: src/reader.c:559 src/reader.c:718

 #, c-format
 msgid "multiple %s declarations"
 msgstr "multiples déclarations %s"
 
 #, c-format
 msgid "multiple %s declarations"
 msgstr "multiples déclarations %s"
 

-#: src/reader.c:563 src/reader.c:902 src/reader.c:927 src/reader.c:1268
+#: src/reader.c:561 src/reader.c:898 src/reader.c:923 src/reader.c:1264

 #, c-format
 msgid "invalid %s declaration"
 msgstr "la déclaration %s n'est pas valide"
 
 #, c-format
 msgid "invalid %s declaration"
 msgstr "la déclaration %s n'est pas valide"
 

-#: src/reader.c:583
+#: src/reader.c:581

 msgid "%type declaration has no <typename>"
 msgstr "la déclaration %type n'a pas de <nom_de_type>"
 
 msgid "%type declaration has no <typename>"
 msgstr "la déclaration %type n'a pas de <nom_de_type>"
 

-#: src/reader.c:618
+#: src/reader.c:616

 #, c-format
 msgid "invalid %%type declaration due to item: %s"
 msgstr "la déclaration %%type n'est pas valide en raison de l'item: %s"
 
 #, c-format
 msgid "invalid %%type declaration due to item: %s"
 msgstr "la déclaration %%type n'est pas valide en raison de l'item: %s"
 

-#: src/reader.c:663
+#: src/reader.c:661

 #, c-format
 msgid "redefining precedence of %s"
 msgstr "redéfinition du niveau de priorité de %s"
 
 #, c-format
 msgid "redefining precedence of %s"
 msgstr "redéfinition du niveau de priorité de %s"
 

-#: src/reader.c:687
+#: src/reader.c:684

 #, c-format
 msgid "invalid text (%s) - number should be after identifier"
 msgstr ""
 "le texte n'est pas valide (%s) - le nombre devrait suivre l'identificateur"
 
 #, c-format
 msgid "invalid text (%s) - number should be after identifier"
 msgstr ""
 "le texte n'est pas valide (%s) - le nombre devrait suivre l'identificateur"
 

-#: src/reader.c:697
+#: src/reader.c:694

 #, c-format
 msgid "unexpected item: %s"
 msgstr "item inattendu: %s"
 
 #, c-format
 msgid "unexpected item: %s"
 msgstr "item inattendu: %s"
 

-#: src/reader.c:764 src/reader.c:1094 src/reader.c:1165
+#: src/reader.c:761 src/reader.c:1090 src/reader.c:1161

 #, c-format
 msgid "unmatched %s"
 msgstr "non appariement de %s"
 
 #, c-format
 msgid "unmatched %s"
 msgstr "non appariement de %s"
 

-#: src/reader.c:796
+#: src/reader.c:793

 #, c-format
 msgid "argument of %%expect is not an integer"
 msgstr "le paramètre de %%expect n'est pas un entier"
 
 #, c-format
 msgid "argument of %%expect is not an integer"
 msgstr "le paramètre de %%expect n'est pas un entier"
 

-#: src/reader.c:843
+#: src/reader.c:839

 #, c-format
 msgid "unrecognized item %s, expected an identifier"
 msgstr "item %s non reconnu, un identificateur est attendu"
 
 #, c-format
 msgid "unrecognized item %s, expected an identifier"
 msgstr "item %s non reconnu, un identificateur est attendu"
 

-#: src/reader.c:867
+#: src/reader.c:863

 #, c-format
 msgid "expected string constant instead of %s"
 msgstr "chaîne de caractères constante attendue plutôt que %s"
 
 #, c-format
 msgid "expected string constant instead of %s"
 msgstr "chaîne de caractères constante attendue plutôt que %s"
 

-#: src/reader.c:1010
+#: src/reader.c:1006

 #, c-format
 msgid "unrecognized: %s"
 msgstr "non reconnu: %s"
 
 #, c-format
 msgid "unrecognized: %s"
 msgstr "non reconnu: %s"
 

-#: src/reader.c:1015
+#: src/reader.c:1011

 msgid "no input grammar"
 msgstr "aucune grammaire en entrée"
 
 msgid "no input grammar"
 msgstr "aucune grammaire en entrée"
 

-#: src/reader.c:1020
+#: src/reader.c:1016

 #, c-format
 msgid "unknown character: %s"
 msgstr "caractère inconnu: %s"
 
 #, c-format
 msgid "unknown character: %s"
 msgstr "caractère inconnu: %s"
 

-#: src/reader.c:1188
+#: src/reader.c:1184

 #, c-format
 msgid "unterminated %guard clause"
 msgstr "clause %guard non terminée"
 
 #, c-format
 msgid "unterminated %guard clause"
 msgstr "clause %guard non terminée"
 

-#: src/reader.c:1355
+#: src/reader.c:1351

 msgid "ill-formed rule: initial symbol not followed by colon"
 msgstr "règle mal formée: le symbole initial n'est pas suivi de `:'"
 
 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:1362
+#: src/reader.c:1358

 msgid "grammar starts with vertical bar"
 msgstr "la grammaire débute par une barre verticale"
 
 msgid "grammar starts with vertical bar"
 msgstr "la grammaire débute par une barre verticale"
 

-#: src/reader.c:1393
+#: src/reader.c:1389

 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "la règle pour %s, qui est un terminal"
 
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "la règle pour %s, qui est un terminal"
 

-#: src/reader.c:1495
+#: src/reader.c:1491

 msgid "two @prec's in a row"
 msgstr "deux @prec de suite"
 
 msgid "two @prec's in a row"
 msgstr "deux @prec de suite"
 

-#: src/reader.c:1503
+#: src/reader.c:1499

 #, c-format
 msgid "%%guard present but %%semantic_parser not specified"
 msgstr "%%guard est présent mais %%semantic_parser n'est pas spécifié"
 
 #, 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:1512
+#: src/reader.c:1508

 msgid "two actions at end of one rule"
 msgstr "deux actions à la fin d'une même règle"
 
 msgid "two actions at end of one rule"
 msgstr "deux actions à la fin d'une même règle"
 

-#: src/reader.c:1526
+#: src/reader.c:1522

 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "conflit de type (`%s' `%s') pour l'action par défaut"
 
 #, 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:1532
+#: src/reader.c:1528

 msgid "empty rule for typed nonterminal, and no action"
 msgstr "règle vide pour une catégorie typée et aucune action"
 
 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:1576
+#: src/reader.c:1572

 #, c-format
 msgid "invalid input: %s"
 msgstr "entrée non valide: %s"
 
 #, c-format
 msgid "invalid input: %s"
 msgstr "entrée non valide: %s"
 

-#: src/reader.c:1584
+#: src/reader.c:1580

 #, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "trop de symboles (jeton plus non terminaux); maximum %d"
 
 #, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "trop de symboles (jeton plus non terminaux); maximum %d"
 

-#: src/reader.c:1587
+#: src/reader.c:1583

 msgid "no rules in the input grammar"
 msgstr "la grammaire n'a pas de règles"
 
 msgid "no rules in the input grammar"
 msgstr "la grammaire n'a pas de règles"
 

-#: src/reader.c:1611
+#: src/reader.c:1607

 #, 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"
 
 #, 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:1716
+#: src/reader.c:1713

 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "les priorités pour %s et %s entrent en conflit"
 
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "les priorités pour %s et %s entrent en conflit"
 

-#: src/reader.c:1728
+#: src/reader.c:1725

 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "les valeurs d'association de %s et %s entrent en conflit"
 
 #, 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:1779
+#: src/reader.c:1771

 #, c-format
 msgid "tokens %s and %s both assigned number %d"
 msgstr "les jetons %s et %s se sont vus assigner le nombre %d"
 
 #, c-format
 msgid "tokens %s and %s both assigned number %d"
 msgstr "les jetons %s et %s se sont vus assigner le nombre %d"
 

-#: src/reader.c:1792
+#: src/reader.c:1783

 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "le symbole de départ %s n'est pas défini"
 
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "le symbole de départ %s n'est pas défini"
 

-#: src/reader.c:1794
+#: src/reader.c:1785

 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "le symbole de départ %s est un terminal"
 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "le symbole de départ %s est un terminal"


@@ -796,6 +798,9 @@ msgstr "`"
 msgid "'"
 msgstr "'"
 
 msgid "'"
 msgstr "'"
 

+#~ msgid "\t\t/* empty */"
+#~ msgstr "\t\t/* epsilon */"
+

 #~ msgid "multiple %%header_extension declarations"
 #~ msgstr "multiples déclarations %%header_extension"
 
 #~ msgid "multiple %%header_extension declarations"
 #~ msgstr "multiples déclarations %%header_extension"
 

diff --git a/po/ja.gmo b/po/ja.gmo
index 9ab1f8e4f8cf7f7330fce16096f71106823215dd..f677ff045b1ae9d94d9fbfe9a679e265bcee5e01 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 4bb86e73b35f1a29e1583092050249c302bef2c5..3ab330429b14ad103365d53824c25e34aeba0a28 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-09-22 18:19+0200\n"
+"POT-Creation-Date: 2001-09-24 10:22+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"
 "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"


@@ -13,7 +13,7 @@ msgstr ""
 "Content-Type: text/plain; charset=EUC-JP\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 "Content-Type: text/plain; charset=EUC-JP\n"
 "Content-Transfer-Encoding: 8bit\n"
 

-#: src/LR0.c:207
+#: src/LR0.c:208

 #, fuzzy, c-format
 msgid "too many states (max %d)"
 msgstr "%s ¤Î¿ô¤¬Â¿¤¹¤®¤Þ¤¹ (ºÇÂç %d)"
 #, fuzzy, c-format
 msgid "too many states (max %d)"
 msgstr "%s ¤Î¿ô¤¬Â¿¤¹¤®¤Þ¤¹ (ºÇÂç %d)"


@@ -77,31 +77,31 @@ msgstr "
 
 #. If invoked with `--yacc', use the output format specified by
 #. POSIX.
 
 #. If invoked with `--yacc', use the output format specified by
 #. POSIX.

-#: src/conflicts.c:493
+#: src/conflicts.c:492

 msgid "conflicts: "
 msgstr "¾×ÆÍ: "
 
 msgid "conflicts: "
 msgstr "¾×ÆÍ: "
 

-#: src/conflicts.c:495
+#: src/conflicts.c:494

 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d ¥·¥Õ¥È/´Ô¸µ"
 
 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d ¥·¥Õ¥È/´Ô¸µ"
 

-#: src/conflicts.c:499
+#: src/conflicts.c:498

 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d ´Ô¸µ/´Ô¸µ"
 
 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d ´Ô¸µ/´Ô¸µ"
 

-#: src/conflicts.c:504
+#: src/conflicts.c:503

 #, c-format
 msgid "%s contains"
 msgstr "%s ¤Ë¤Ï¡¢"
 
 #, c-format
 msgid "%s contains"
 msgstr "%s ¤Ë¤Ï¡¢"
 

-#: src/conflicts.c:590 src/conflicts.c:711
+#: src/conflicts.c:589 src/conflicts.c:710

 #, c-format
 msgid "    %-4s\t[reduce using rule %d (%s)]\n"
 msgstr "    %-4s\t[µ¬Â§ %d ¤òÍøÍѤ·¤Æ´Ô¸µ (%s)]\n"
 
 #, c-format
 msgid "    %-4s\t[reduce using rule %d (%s)]\n"
 msgstr "    %-4s\t[µ¬Â§ %d ¤òÍøÍѤ·¤Æ´Ô¸µ (%s)]\n"
 

-#: src/conflicts.c:602 src/print.c:173
+#: src/conflicts.c:601 src/print.c:172

 #, c-format
 msgid ""
 "    $default\treduce using rule %d (%s)\n"
 #, c-format
 msgid ""
 "    $default\treduce using rule %d (%s)\n"


@@ -110,12 +110,12 @@ msgstr ""
 "    $default\tµ¬Â§ %d ¤òÍøÍѤ·¤Æ´Ô¸µ (%s)\n"
 "\n"
 
 "    $default\tµ¬Â§ %d ¤òÍøÍѤ·¤Æ´Ô¸µ (%s)\n"
 "\n"
 

-#: src/conflicts.c:691 src/conflicts.c:705
+#: src/conflicts.c:690 src/conflicts.c:704

 #, c-format
 msgid "    %-4s\treduce using rule %d (%s)\n"
 msgstr "    %-4s\tµ¬Â§ %d ¤òÍøÍѤ·¤Æ´Ô¸µ (%s)\n"
 
 #, c-format
 msgid "    %-4s\treduce using rule %d (%s)\n"
 msgstr "    %-4s\tµ¬Â§ %d ¤òÍøÍѤ·¤Æ´Ô¸µ (%s)\n"
 

-#: src/conflicts.c:732
+#: src/conflicts.c:731

 #, c-format
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr "    $default\tµ¬Â§ %d ¤òÍøÍѤ·¤Æ´Ô¸µ (%s)\n"
 #, c-format
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr "    $default\tµ¬Â§ %d ¤òÍøÍѤ·¤Æ´Ô¸µ (%s)\n"


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

-#: src/files.c:132
+#: src/files.c:138

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

-#: src/files.c:151
+#: src/files.c:157

 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:635
+#: src/getargs.c:214 src/lex.c:633

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


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

-#: src/lex.c:432
+#: src/lex.c:431

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

-#: src/main.c:108
+#: src/main.c:122

 #, c-format
 msgid "%s: internal error: %s\n"
 msgstr "%s: ÆâÉô¥¨¥é¡¼: %s\n"
 #, c-format
 msgid "%s: internal error: %s\n"
 msgstr "%s: ÆâÉô¥¨¥é¡¼: %s\n"


@@ -292,7 +292,7 @@ msgstr "%s: 
 msgid "Entering set_nullable"
 msgstr "set_nullable ¤ËÆþ¤ê¤Þ¤¹"
 
 msgid "Entering set_nullable"
 msgstr "set_nullable ¤ËÆþ¤ê¤Þ¤¹"
 

-#: src/output.c:993
+#: src/output.c:987

 #, fuzzy, c-format
 msgid "maximum table size (%d) exceeded"
 msgstr "ºÇÂç¥Æ¡¼¥Ö¥ë¥µ¥¤¥º (%s) ¤òĶ¤¨¤Þ¤·¤¿"
 #, fuzzy, c-format
 msgid "maximum table size (%d) exceeded"
 msgstr "ºÇÂç¥Æ¡¼¥Ö¥ë¥µ¥¤¥º (%s) ¤òĶ¤¨¤Þ¤·¤¿"


@@ -330,12 +330,12 @@ msgstr "    %-4s\t
 msgid "    %-4s\terror (nonassociative)\n"
 msgstr "    %-4s\t¥¨¥é¡¼ (Èó·ë¹ç)\n"
 
 msgid "    %-4s\terror (nonassociative)\n"
 msgstr "    %-4s\t¥¨¥é¡¼ (Èó·ë¹ç)\n"
 

-#: src/print.c:190
+#: src/print.c:188

 #, c-format
 msgid "    %-4s\tgo to state %d\n"
 msgstr "    %-4s\t¾õÂÖ %d ¤Ø\n"
 
 #, c-format
 msgid "    %-4s\tgo to state %d\n"
 msgstr "    %-4s\t¾õÂÖ %d ¤Ø\n"
 

-#: src/print.c:202
+#: src/print.c:200

 #, fuzzy, c-format
 msgid "state %d"
 msgstr ""
 #, fuzzy, c-format
 msgid "state %d"
 msgstr ""


@@ -344,23 +344,25 @@ msgstr ""
 "¾õÂÖ %d\n"
 "\n"
 
 "¾õÂÖ %d\n"
 "\n"
 

-#: src/print.c:233
+#. rule # : LHS -> RHS
+#: src/print.c:230

 #, fuzzy
 msgid "Grammar"
 msgstr ""
 "\n"
 "ʸˡ\n"
 
 #, fuzzy
 msgid "Grammar"
 msgstr ""
 "\n"
 "ʸˡ\n"
 

-#: src/print.c:240
+#: src/print.c:235

 #, c-format
 msgid "rule %-4d %s ->"
 msgstr "µ¬Â§ %-4d %s ->"
 
 #, c-format
 msgid "rule %-4d %s ->"
 msgstr "µ¬Â§ %-4d %s ->"
 

-#: src/print.c:246
-msgid "\t\t/* empty */"
-msgstr "\t\t/* ¶õ */"
+#: src/print.c:241
+msgid "empty"
+msgstr ""

 
 

-#: src/print.c:253
+#. TERMINAL (type #) : rule #s terminal is on RHS
+#: src/print.c:245

 #, fuzzy
 msgid "Terminals, with rules where they appear"
 msgstr ""
 #, fuzzy
 msgid "Terminals, with rules where they appear"
 msgstr ""


@@ -368,7 +370,7 @@ msgstr ""
 "½ªÃ¼¥È¡¼¥¯¥ó¡¢¤ª¤è¤Ó¤½¤³¤Ë¸½¤ì¤¿µ¬Â§\n"
 "\n"
 
 "½ªÃ¼¥È¡¼¥¯¥ó¡¢¤ª¤è¤Ó¤½¤³¤Ë¸½¤ì¤¿µ¬Â§\n"
 "\n"
 

-#: src/print.c:302
+#: src/print.c:269

 #, fuzzy
 msgid "Nonterminals, with rules where they appear"
 msgstr ""
 #, fuzzy
 msgid "Nonterminals, with rules where they appear"
 msgstr ""


@@ -376,11 +378,11 @@ msgstr ""
 "Èó½ªÃ¼¥È¡¼¥¯¥ó¡¢¤ª¤è¤Ó¤½¤³¤Ë¸½¤ì¤¿µ¬Â§\n"
 "\n"
 
 "Èó½ªÃ¼¥È¡¼¥¯¥ó¡¢¤ª¤è¤Ó¤½¤³¤Ë¸½¤ì¤¿µ¬Â§\n"
 "\n"
 

-#: src/print.c:329
+#: src/print.c:295

 msgid " on left:"
 msgstr " º¸ÊÕ:"
 
 msgid " on left:"
 msgstr " º¸ÊÕ:"
 

-#: src/print.c:344
+#: src/print.c:310

 msgid " on right:"
 msgstr " ±¦ÊÕ:"
 
 msgid " on right:"
 msgstr " ±¦ÊÕ:"
 


@@ -434,7 +436,7 @@ msgstr "`%s' 
 msgid "unterminated `%{' definition"
 msgstr "`%{' ÄêµÁ ¤¬ÊĤ¸¤é¤ì¤Æ¤¤¤Þ¤»¤ó"
 
 msgid "unterminated `%{' definition"
 msgstr "`%{' ÄêµÁ ¤¬ÊĤ¸¤é¤ì¤Æ¤¤¤Þ¤»¤ó"
 

-#: src/reader.c:482 src/reader.c:598 src/reader.c:648
+#: src/reader.c:482 src/reader.c:596 src/reader.c:646

 #, c-format
 msgid "Premature EOF after %s"
 msgstr ""
 #, c-format
 msgid "Premature EOF after %s"
 msgstr ""


@@ -449,171 +451,171 @@ msgstr ""
 msgid "symbol `%s' given more than one literal string"
 msgstr ""
 
 msgid "symbol `%s' given more than one literal string"
 msgstr ""
 

-#: src/reader.c:524 src/reader.c:667
+#: src/reader.c:523 src/reader.c:665

 #, c-format
 msgid "symbol %s redefined"
 msgstr "¥·¥ó¥Ü¥ë %s ¤¬ºÆÄêµÁ¤µ¤ì¤Þ¤·¤¿"
 
 #, c-format
 msgid "symbol %s redefined"
 msgstr "¥·¥ó¥Ü¥ë %s ¤¬ºÆÄêµÁ¤µ¤ì¤Þ¤·¤¿"
 

-#: src/reader.c:534 src/reader.c:613 src/reader.c:674 src/reader.c:1290
+#: src/reader.c:533 src/reader.c:611 src/reader.c:672 src/reader.c:1286

 #, c-format
 msgid "type redeclaration for %s"
 msgstr "%s ¤Î·¿¤¬ºÆÄêµÁ¤µ¤ì¤Þ¤·¤¿"
 
 #, c-format
 msgid "type redeclaration for %s"
 msgstr "%s ¤Î·¿¤¬ºÆÄêµÁ¤µ¤ì¤Þ¤·¤¿"
 

-#: src/reader.c:544
+#: src/reader.c:542

 #, c-format
 msgid "`%s' is invalid in %s"
 msgstr "%2$s Æâ¤Î `%1$s' ¤Ï̵¸ú¤Ç¤¹"
 
 #, c-format
 msgid "`%s' is invalid in %s"
 msgstr "%2$s Æâ¤Î `%1$s' ¤Ï̵¸ú¤Ç¤¹"
 

-#: src/reader.c:561 src/reader.c:721
+#: src/reader.c:559 src/reader.c:718

 #, fuzzy, c-format
 msgid "multiple %s declarations"
 msgstr "Ê£¿ô¤Î %start ¤¬Àë¸À¤µ¤ì¤Þ¤·¤¿"
 
 #, fuzzy, c-format
 msgid "multiple %s declarations"
 msgstr "Ê£¿ô¤Î %start ¤¬Àë¸À¤µ¤ì¤Þ¤·¤¿"
 

-#: src/reader.c:563 src/reader.c:902 src/reader.c:927 src/reader.c:1268
+#: src/reader.c:561 src/reader.c:898 src/reader.c:923 src/reader.c:1264

 #, fuzzy, c-format
 msgid "invalid %s declaration"
 msgstr "̵¸ú¤Ê %start ¤¬Àë¸À¤µ¤ì¤Þ¤·¤¿"
 
 #, fuzzy, c-format
 msgid "invalid %s declaration"
 msgstr "̵¸ú¤Ê %start ¤¬Àë¸À¤µ¤ì¤Þ¤·¤¿"
 

-#: src/reader.c:583
+#: src/reader.c:581

 msgid "%type declaration has no <typename>"
 msgstr "%type Àë¸À¤Ë <¥¿¥¤¥×̾> ¤¬¤¢¤ê¤Þ¤»¤ó"
 
 msgid "%type declaration has no <typename>"
 msgstr "%type Àë¸À¤Ë <¥¿¥¤¥×̾> ¤¬¤¢¤ê¤Þ¤»¤ó"
 

-#: src/reader.c:618
+#: src/reader.c:616

 #, fuzzy, c-format
 msgid "invalid %%type declaration due to item: %s"
 msgstr "¥¢¥¤¥Æ¥à¤ËÍ¿¤¨¤é¤ì¤ë¤Ù¤­ %%type Àë¸À¤¬Ìµ¸ú¤Ç¤¹: `%s'"
 
 #, fuzzy, c-format
 msgid "invalid %%type declaration due to item: %s"
 msgstr "¥¢¥¤¥Æ¥à¤ËÍ¿¤¨¤é¤ì¤ë¤Ù¤­ %%type Àë¸À¤¬Ìµ¸ú¤Ç¤¹: `%s'"
 

-#: src/reader.c:663
+#: src/reader.c:661

 #, c-format
 msgid "redefining precedence of %s"
 msgstr "%s ¤ËÀè¹Ô¤·¤¿ºÆÄêµÁ¤Ç¤¹"
 
 #, c-format
 msgid "redefining precedence of %s"
 msgstr "%s ¤ËÀè¹Ô¤·¤¿ºÆÄêµÁ¤Ç¤¹"
 

-#: src/reader.c:687
+#: src/reader.c:684

 #, c-format
 msgid "invalid text (%s) - number should be after identifier"
 msgstr "̵¸ú¤Ê¥Æ¥­¥¹¥È (%s) - ¿ôÃͤϼ±Ê̻Ҥθå¤í¤Ë¤¢¤ë¤Ù¤­¤Ç¤¹"
 
 #, c-format
 msgid "invalid text (%s) - number should be after identifier"
 msgstr "̵¸ú¤Ê¥Æ¥­¥¹¥È (%s) - ¿ôÃͤϼ±Ê̻Ҥθå¤í¤Ë¤¢¤ë¤Ù¤­¤Ç¤¹"
 

-#: src/reader.c:697
+#: src/reader.c:694

 #, c-format
 msgid "unexpected item: %s"
 msgstr "ͽ´ü¤»¤Ì¥¢¥¤¥Æ¥à: %s"
 
 #, c-format
 msgid "unexpected item: %s"
 msgstr "ͽ´ü¤»¤Ì¥¢¥¤¥Æ¥à: %s"
 

-#: src/reader.c:764 src/reader.c:1094 src/reader.c:1165
+#: src/reader.c:761 src/reader.c:1090 src/reader.c:1161

 #, fuzzy, c-format
 msgid "unmatched %s"
 msgstr "Âбþ¤Î¤Ê¤¤ `{' ¤Ç¤¹"
 
 #, fuzzy, c-format
 msgid "unmatched %s"
 msgstr "Âбþ¤Î¤Ê¤¤ `{' ¤Ç¤¹"
 

-#: src/reader.c:796
+#: src/reader.c:793

 #, fuzzy, c-format
 msgid "argument of %%expect is not an integer"
 msgstr "%expect ¤Î°ú¿ô¤¬À°¿ôÃͤǤϤ¢¤ê¤Þ¤»¤ó"
 
 #, fuzzy, c-format
 msgid "argument of %%expect is not an integer"
 msgstr "%expect ¤Î°ú¿ô¤¬À°¿ôÃͤǤϤ¢¤ê¤Þ¤»¤ó"
 

-#: src/reader.c:843
+#: src/reader.c:839

 #, c-format
 msgid "unrecognized item %s, expected an identifier"
 msgstr "ǧ¼±¤Ç¤­¤Ê¤¤¥¢¥¤¥Æ¥à %s¡¢¤³¤³¤Ç¤Ï¼±Ê̻Ҥ¬´üÂÔ¤µ¤ì¤Þ¤¹"
 
 #, c-format
 msgid "unrecognized item %s, expected an identifier"
 msgstr "ǧ¼±¤Ç¤­¤Ê¤¤¥¢¥¤¥Æ¥à %s¡¢¤³¤³¤Ç¤Ï¼±Ê̻Ҥ¬´üÂÔ¤µ¤ì¤Þ¤¹"
 

-#: src/reader.c:867
+#: src/reader.c:863

 #, c-format
 msgid "expected string constant instead of %s"
 msgstr "¤³¤³¤Ç¤Ï %s ¤Ç¤Ï¤Ê¤¯Ê¸»úÎóÄê¿ô¤¬´üÂÔ¤µ¤ì¤Þ¤¹"
 
 #, c-format
 msgid "expected string constant instead of %s"
 msgstr "¤³¤³¤Ç¤Ï %s ¤Ç¤Ï¤Ê¤¯Ê¸»úÎóÄê¿ô¤¬´üÂÔ¤µ¤ì¤Þ¤¹"
 

-#: src/reader.c:1010
+#: src/reader.c:1006

 #, c-format
 msgid "unrecognized: %s"
 msgstr "ǧ¼±¤Ç¤­¤Ê¤¤: %s"
 
 #, c-format
 msgid "unrecognized: %s"
 msgstr "ǧ¼±¤Ç¤­¤Ê¤¤: %s"
 

-#: src/reader.c:1015
+#: src/reader.c:1011

 msgid "no input grammar"
 msgstr "ʸˡ¤ÎÆþÎϤ¬Ìµ¤¤"
 
 msgid "no input grammar"
 msgstr "ʸˡ¤ÎÆþÎϤ¬Ìµ¤¤"
 

-#: src/reader.c:1020
+#: src/reader.c:1016

 #, c-format
 msgid "unknown character: %s"
 msgstr "̤ÃΤÎʸ»ú: %s"
 
 #, c-format
 msgid "unknown character: %s"
 msgstr "̤ÃΤÎʸ»ú: %s"
 

-#: src/reader.c:1188
+#: src/reader.c:1184

 #, fuzzy, c-format
 msgid "unterminated %guard clause"
 msgstr "ÊĤ¸¤é¤ì¤Æ¤¤¤Ê¤¤ %%guard Àá¤Ç¤¹"
 
 #, fuzzy, c-format
 msgid "unterminated %guard clause"
 msgstr "ÊĤ¸¤é¤ì¤Æ¤¤¤Ê¤¤ %%guard Àá¤Ç¤¹"
 

-#: src/reader.c:1355
+#: src/reader.c:1351

 msgid "ill-formed rule: initial symbol not followed by colon"
 msgstr "¼Ù°­¤Êµ¬Â§: ½é´ü²½¥·¥ó¥Ü¥ë¤Ë¥³¥í¥ó (:) ¤¬Â³¤¤¤Æ¤¤¤Þ¤»¤ó"
 
 msgid "ill-formed rule: initial symbol not followed by colon"
 msgstr "¼Ù°­¤Êµ¬Â§: ½é´ü²½¥·¥ó¥Ü¥ë¤Ë¥³¥í¥ó (:) ¤¬Â³¤¤¤Æ¤¤¤Þ¤»¤ó"
 

-#: src/reader.c:1362
+#: src/reader.c:1358

 msgid "grammar starts with vertical bar"
 msgstr "ʸˡ¤Ï½ÄËÀ (|) ¤Ç»Ï¤á¤Þ¤¹"
 
 msgid "grammar starts with vertical bar"
 msgstr "ʸˡ¤Ï½ÄËÀ (|) ¤Ç»Ï¤á¤Þ¤¹"
 

-#: src/reader.c:1393
+#: src/reader.c:1389

 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "%s ¤Ëµ¬Â§¤¬Í¿¤¨¤é¤ì¡¢¤½¤ì¤Ï¥È¡¼¥¯¥ó¤È¤Ê¤ê¤Þ¤¹"
 
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "%s ¤Ëµ¬Â§¤¬Í¿¤¨¤é¤ì¡¢¤½¤ì¤Ï¥È¡¼¥¯¥ó¤È¤Ê¤ê¤Þ¤¹"
 

-#: src/reader.c:1495
+#: src/reader.c:1491

 msgid "two @prec's in a row"
 msgstr "@prec ¤Î¤â¤ÎÆó¤Ä¤¬Æ±Îó¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹"
 
 msgid "two @prec's in a row"
 msgstr "@prec ¤Î¤â¤ÎÆó¤Ä¤¬Æ±Îó¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹"
 

-#: src/reader.c:1503
+#: src/reader.c:1499

 #, c-format
 msgid "%%guard present but %%semantic_parser not specified"
 msgstr "%%guard ¤¬¤¢¤ê¤Þ¤¹¤¬ %%semantic_parser ¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó"
 
 #, c-format
 msgid "%%guard present but %%semantic_parser not specified"
 msgstr "%%guard ¤¬¤¢¤ê¤Þ¤¹¤¬ %%semantic_parser ¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó"
 

-#: src/reader.c:1512
+#: src/reader.c:1508

 msgid "two actions at end of one rule"
 msgstr "°ì¤Ä¤Îµ¬Â§¤Î½ª¤ê¤ËÆó¤Ä¤ÎÆ°ºî¤ò»ØÄꤷ¤Æ¤¤¤Þ¤¹"
 
 msgid "two actions at end of one rule"
 msgstr "°ì¤Ä¤Îµ¬Â§¤Î½ª¤ê¤ËÆó¤Ä¤ÎÆ°ºî¤ò»ØÄꤷ¤Æ¤¤¤Þ¤¹"
 

-#: src/reader.c:1526
+#: src/reader.c:1522

 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "½é´ü¾õÂÖ¤ÎÆ°ºî¤Ç¤Ï·¿ (`%s' `%s') ¤¬¾×Æͤ·¤Þ¤¹"
 
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "½é´ü¾õÂÖ¤ÎÆ°ºî¤Ç¤Ï·¿ (`%s' `%s') ¤¬¾×Æͤ·¤Þ¤¹"
 

-#: src/reader.c:1532
+#: src/reader.c:1528

 msgid "empty rule for typed nonterminal, and no action"
 msgstr "¶õ¤Î·¿ÉÕ¤­Èó½ªÃ¼¥¢¥¤¥Æ¥àÍѵ¬Â§¤Ç¤¢¤ê¡¢Æ°ºî¤¬µ¯¤ê¤Þ¤»¤ó"
 
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "¶õ¤Î·¿ÉÕ¤­Èó½ªÃ¼¥¢¥¤¥Æ¥àÍѵ¬Â§¤Ç¤¢¤ê¡¢Æ°ºî¤¬µ¯¤ê¤Þ¤»¤ó"
 

-#: src/reader.c:1576
+#: src/reader.c:1572

 #, c-format
 msgid "invalid input: %s"
 msgstr "̵¸ú¤ÊÆþÎÏ: %s"
 
 #, c-format
 msgid "invalid input: %s"
 msgstr "̵¸ú¤ÊÆþÎÏ: %s"
 

-#: src/reader.c:1584
+#: src/reader.c:1580

 #, fuzzy, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "¥·¥ó¥Ü¥ë¤¬Â¿¤¹¤®¤Þ¤¹ (¥È¡¼¥¯¥ó¤ÈÈó½ªÃ¼¥¢¥¤¥Æ¥à) -- ºÇÂç %s"
 
 #, fuzzy, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "¥·¥ó¥Ü¥ë¤¬Â¿¤¹¤®¤Þ¤¹ (¥È¡¼¥¯¥ó¤ÈÈó½ªÃ¼¥¢¥¤¥Æ¥à) -- ºÇÂç %s"
 

-#: src/reader.c:1587
+#: src/reader.c:1583

 msgid "no rules in the input grammar"
 msgstr "ÆþÎϤ·¤¿Ê¸Ë¡¤Ëµ¬Â§¤¬ÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
 
 msgid "no rules in the input grammar"
 msgstr "ÆþÎϤ·¤¿Ê¸Ë¡¤Ëµ¬Â§¤¬ÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
 

-#: src/reader.c:1611
+#: src/reader.c:1607

 #, c-format
 msgid "symbol %s is used, but is not defined as a token and has no rules"
 msgstr ""
 "¥·¥ó¥Ü¥ë %s ¤¬»È¤ï¤ì¤Æ¤¤¤Þ¤¹¤¬¡¢¥È¡¼¥¯¥ó¤È¤·¤ÆÄêµÁ¤µ¤ì¤Æ¤ª¤é¤º¡¢µ¬Â§¤ò»ý¤Á¤Þ"
 "¤»¤ó"
 
 #, c-format
 msgid "symbol %s is used, but is not defined as a token and has no rules"
 msgstr ""
 "¥·¥ó¥Ü¥ë %s ¤¬»È¤ï¤ì¤Æ¤¤¤Þ¤¹¤¬¡¢¥È¡¼¥¯¥ó¤È¤·¤ÆÄêµÁ¤µ¤ì¤Æ¤ª¤é¤º¡¢µ¬Â§¤ò»ý¤Á¤Þ"
 "¤»¤ó"
 

-#: src/reader.c:1716
+#: src/reader.c:1713

 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "Àè¹Ô¤·¤Æ¤¤¤ë %s ¤È %s ¤Ç¶¥¹ç¤¬À¸¤¸¤Æ¤¤¤Þ¤¹"
 
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "Àè¹Ô¤·¤Æ¤¤¤ë %s ¤È %s ¤Ç¶¥¹ç¤¬À¸¤¸¤Æ¤¤¤Þ¤¹"
 

-#: src/reader.c:1728
+#: src/reader.c:1725

 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "Èó·ë¹çÃÍ %s ¤È %s ¤Ç¶¥¹ç¤¬À¸¤¸¤Æ¤¤¤Þ¤¹"
 
 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "Èó·ë¹çÃÍ %s ¤È %s ¤Ç¶¥¹ç¤¬À¸¤¸¤Æ¤¤¤Þ¤¹"
 

-#: src/reader.c:1779
+#: src/reader.c:1771

 #, fuzzy, c-format
 msgid "tokens %s and %s both assigned number %d"
 msgstr "¥È¡¼¥¯¥ó %s ¤È %s ¤ÎÁÐÊý¤¬ÈÖ¹æ %s ¤Ë³ä¤êÅö¤Æ¤é¤ì¤Þ¤·¤¿"
 
 #, fuzzy, c-format
 msgid "tokens %s and %s both assigned number %d"
 msgstr "¥È¡¼¥¯¥ó %s ¤È %s ¤ÎÁÐÊý¤¬ÈÖ¹æ %s ¤Ë³ä¤êÅö¤Æ¤é¤ì¤Þ¤·¤¿"
 

-#: src/reader.c:1792
+#: src/reader.c:1783

 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "³«»Ï¥·¥ó¥Ü¥ë %s ¤ÏÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
 
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "³«»Ï¥·¥ó¥Ü¥ë %s ¤ÏÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
 

-#: src/reader.c:1794
+#: src/reader.c:1785

 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "³«»Ï¥·¥ó¥Ü¥ë %s ¤Ï¥È¡¼¥¯¥ó¤Ç¤¹"
 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "³«»Ï¥·¥ó¥Ü¥ë %s ¤Ï¥È¡¼¥¯¥ó¤Ç¤¹"


@@ -802,6 +804,9 @@ msgstr ""
 msgid "'"
 msgstr ""
 
 msgid "'"
 msgstr ""
 

+#~ msgid "\t\t/* empty */"
+#~ msgstr "\t\t/* ¶õ */"
+

 #~ msgid ""
 #~ "\n"
 #~ "\n"
 #~ msgid ""
 #~ "\n"
 #~ "\n"

diff --git a/po/nl.gmo b/po/nl.gmo
index bee3585bc673860f5d4f0dcf1f3b3e67596ac78f..c1c28aa4e0e4c5aec6e2483b1d1f6531d223155b 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 e1e14c3654b4f07550d58156fd68a7f4f2dbe321..211c11e7fb7204104eacfeb8b169491c0acfd34f 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-09-22 18:19+0200\n"
+"POT-Creation-Date: 2001-09-24 10:22+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"
 "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"


@@ -13,7 +13,7 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 

-#: src/LR0.c:207
+#: src/LR0.c:208

 #, c-format
 msgid "too many states (max %d)"
 msgstr ""
 #, c-format
 msgid "too many states (max %d)"
 msgstr ""


@@ -77,31 +77,31 @@ msgstr "Stadium %d bevat"
 
 #. If invoked with `--yacc', use the output format specified by
 #. POSIX.
 
 #. If invoked with `--yacc', use the output format specified by
 #. POSIX.

-#: src/conflicts.c:493
+#: src/conflicts.c:492

 msgid "conflicts: "
 msgstr "conflictueerd: "
 
 msgid "conflicts: "
 msgstr "conflictueerd: "
 

-#: src/conflicts.c:495
+#: src/conflicts.c:494

 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d vershuif/reduceer"
 
 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d vershuif/reduceer"
 

-#: src/conflicts.c:499
+#: src/conflicts.c:498

 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d reduceer/reduceer"
 
 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d reduceer/reduceer"
 

-#: src/conflicts.c:504
+#: src/conflicts.c:503

 #, c-format
 msgid "%s contains"
 msgstr "%s bevat"
 
 #, c-format
 msgid "%s contains"
 msgstr "%s bevat"
 

-#: src/conflicts.c:590 src/conflicts.c:711
+#: src/conflicts.c:589 src/conflicts.c:710

 #, c-format
 msgid "    %-4s\t[reduce using rule %d (%s)]\n"
 msgstr "    %-4s\t[reduceer gebruikt regel %d (%s)]\n"
 
 #, c-format
 msgid "    %-4s\t[reduce using rule %d (%s)]\n"
 msgstr "    %-4s\t[reduceer gebruikt regel %d (%s)]\n"
 

-#: src/conflicts.c:602 src/print.c:173
+#: src/conflicts.c:601 src/print.c:172

 #, c-format
 msgid ""
 "    $default\treduce using rule %d (%s)\n"
 #, c-format
 msgid ""
 "    $default\treduce using rule %d (%s)\n"


@@ -110,12 +110,12 @@ msgstr ""
 "    $default\treduce using rule %d (%s)\n"
 "\n"
 
 "    $default\treduce using rule %d (%s)\n"
 "\n"
 

-#: src/conflicts.c:691 src/conflicts.c:705
+#: src/conflicts.c:690 src/conflicts.c:704

 #, c-format
 msgid "    %-4s\treduce using rule %d (%s)\n"
 msgstr ""
 
 #, c-format
 msgid "    %-4s\treduce using rule %d (%s)\n"
 msgstr ""
 

-#: src/conflicts.c:732
+#: src/conflicts.c:731

 #, c-format
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr ""
 #, c-format
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr ""


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

-#: src/files.c:132
+#: src/files.c:138

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

-#: src/files.c:151
+#: src/files.c:157

 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:635
+#: src/getargs.c:214 src/lex.c:633

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


@@ -279,11 +279,11 @@ 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:432
+#: src/lex.c:431

 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"
 

-#: src/main.c:108
+#: src/main.c:122

 #, fuzzy, c-format
 msgid "%s: internal error: %s\n"
 msgstr "interne fout, %s\n"
 #, fuzzy, c-format
 msgid "%s: internal error: %s\n"
 msgstr "interne fout, %s\n"


@@ -292,7 +292,7 @@ msgstr "interne fout, %s\n"
 msgid "Entering set_nullable"
 msgstr "Inkomende set nullable"
 
 msgid "Entering set_nullable"
 msgstr "Inkomende set nullable"
 

-#: src/output.c:993
+#: src/output.c:987

 #, fuzzy, c-format
 msgid "maximum table size (%d) exceeded"
 msgstr "maximale tabel grootte (%s) overschreden"
 #, fuzzy, c-format
 msgid "maximum table size (%d) exceeded"
 msgstr "maximale tabel grootte (%s) overschreden"


@@ -330,12 +330,12 @@ msgstr ""
 msgid "    %-4s\terror (nonassociative)\n"
 msgstr ""
 
 msgid "    %-4s\terror (nonassociative)\n"
 msgstr ""
 

-#: src/print.c:190
+#: src/print.c:188

 #, c-format
 msgid "    %-4s\tgo to state %d\n"
 msgstr ""
 
 #, c-format
 msgid "    %-4s\tgo to state %d\n"
 msgstr ""
 

-#: src/print.c:202
+#: src/print.c:200

 #, fuzzy, c-format
 msgid "state %d"
 msgstr ""
 #, fuzzy, c-format
 msgid "state %d"
 msgstr ""


@@ -344,23 +344,25 @@ msgstr ""
 "stadium %d\n"
 "\n"
 
 "stadium %d\n"
 "\n"
 

-#: src/print.c:233
+#. rule # : LHS -> RHS
+#: src/print.c:230

 #, fuzzy
 msgid "Grammar"
 msgstr ""
 "\n"
 "Grammatica\n"
 
 #, fuzzy
 msgid "Grammar"
 msgstr ""
 "\n"
 "Grammatica\n"
 

-#: src/print.c:240
+#: src/print.c:235

 #, c-format
 msgid "rule %-4d %s ->"
 msgstr "regel %-4d %s ->"
 
 #, c-format
 msgid "rule %-4d %s ->"
 msgstr "regel %-4d %s ->"
 

-#: src/print.c:246
-msgid "\t\t/* empty */"
+#: src/print.c:241
+msgid "empty"

 msgstr ""
 
 msgstr ""
 

-#: src/print.c:253
+#. TERMINAL (type #) : rule #s terminal is on RHS
+#: src/print.c:245

 #, fuzzy
 msgid "Terminals, with rules where they appear"
 msgstr ""
 #, fuzzy
 msgid "Terminals, with rules where they appear"
 msgstr ""


@@ -368,7 +370,7 @@ msgstr ""
 "Terminals, met regels waar ze voorkomen\n"
 "\n"
 
 "Terminals, met regels waar ze voorkomen\n"
 "\n"
 

-#: src/print.c:302
+#: src/print.c:269

 #, fuzzy
 msgid "Nonterminals, with rules where they appear"
 msgstr ""
 #, fuzzy
 msgid "Nonterminals, with rules where they appear"
 msgstr ""


@@ -376,11 +378,11 @@ msgstr ""
 "Geen terminals, met regels waar ze voorkomen\n"
 "\n"
 
 "Geen terminals, met regels waar ze voorkomen\n"
 "\n"
 

-#: src/print.c:329
+#: src/print.c:295

 msgid " on left:"
 msgstr " links:"
 
 msgid " on left:"
 msgstr " links:"
 

-#: src/print.c:344
+#: src/print.c:310

 msgid " on right:"
 msgstr " rechts:"
 
 msgid " on right:"
 msgstr " rechts:"
 


@@ -436,7 +438,7 @@ msgstr "$%s van `%s' heeft geen gedeclareerd type"
 msgid "unterminated `%{' definition"
 msgstr "niet getermineerde `%{' definitie"
 
 msgid "unterminated `%{' definition"
 msgstr "niet getermineerde `%{' definitie"
 

-#: src/reader.c:482 src/reader.c:598 src/reader.c:648
+#: src/reader.c:482 src/reader.c:596 src/reader.c:646

 #, c-format
 msgid "Premature EOF after %s"
 msgstr ""
 #, c-format
 msgid "Premature EOF after %s"
 msgstr ""


@@ -451,172 +453,172 @@ msgstr ""
 msgid "symbol `%s' given more than one literal string"
 msgstr ""
 
 msgid "symbol `%s' given more than one literal string"
 msgstr ""
 

-#: src/reader.c:524 src/reader.c:667
+#: src/reader.c:523 src/reader.c:665

 #, c-format
 msgid "symbol %s redefined"
 msgstr "symbool %s opnieuw gedefinieerd"
 
 #, c-format
 msgid "symbol %s redefined"
 msgstr "symbool %s opnieuw gedefinieerd"
 

-#: src/reader.c:534 src/reader.c:613 src/reader.c:674 src/reader.c:1290
+#: src/reader.c:533 src/reader.c:611 src/reader.c:672 src/reader.c:1286

 #, c-format
 msgid "type redeclaration for %s"
 msgstr "type herdeclaratie voor %s"
 
 #, c-format
 msgid "type redeclaration for %s"
 msgstr "type herdeclaratie voor %s"
 

-#: src/reader.c:544
+#: src/reader.c:542

 #, c-format
 msgid "`%s' is invalid in %s"
 msgstr "`%s' is onjuist in %s"
 
 #, c-format
 msgid "`%s' is invalid in %s"
 msgstr "`%s' is onjuist in %s"
 

-#: src/reader.c:561 src/reader.c:721
+#: src/reader.c:559 src/reader.c:718

 #, fuzzy, c-format
 msgid "multiple %s declarations"
 msgstr "meerdere %start declaraties"
 
 #, fuzzy, c-format
 msgid "multiple %s declarations"
 msgstr "meerdere %start declaraties"
 

-#: src/reader.c:563 src/reader.c:902 src/reader.c:927 src/reader.c:1268
+#: src/reader.c:561 src/reader.c:898 src/reader.c:923 src/reader.c:1264

 #, fuzzy, c-format
 msgid "invalid %s declaration"
 msgstr "onjuiste %start declaratie"
 
 #, fuzzy, c-format
 msgid "invalid %s declaration"
 msgstr "onjuiste %start declaratie"
 

-#: src/reader.c:583
+#: src/reader.c:581

 msgid "%type declaration has no <typename>"
 msgstr "%type declaratie heeft geen <typenaam>"
 
 msgid "%type declaration has no <typename>"
 msgstr "%type declaratie heeft geen <typenaam>"
 

-#: src/reader.c:618
+#: src/reader.c:616

 #, fuzzy, c-format
 msgid "invalid %%type declaration due to item: %s"
 msgstr "onjuist %%type declaratie door item: `%s'"
 
 #, fuzzy, c-format
 msgid "invalid %%type declaration due to item: %s"
 msgstr "onjuist %%type declaratie door item: `%s'"
 

-#: src/reader.c:663
+#: src/reader.c:661

 #, c-format
 msgid "redefining precedence of %s"
 msgstr "herdefinieren voorganger van %s"
 
 #, c-format
 msgid "redefining precedence of %s"
 msgstr "herdefinieren voorganger van %s"
 

-#: src/reader.c:687
+#: src/reader.c:684

 #, c-format
 msgid "invalid text (%s) - number should be after identifier"
 msgstr "onjuiste tekst (%s) - nummer hoort na de identifier"
 
 #, c-format
 msgid "invalid text (%s) - number should be after identifier"
 msgstr "onjuiste tekst (%s) - nummer hoort na de identifier"
 

-#: src/reader.c:697
+#: src/reader.c:694

 #, c-format
 msgid "unexpected item: %s"
 msgstr "onbekend item: %s"
 
 #, c-format
 msgid "unexpected item: %s"
 msgstr "onbekend item: %s"
 

-#: src/reader.c:764 src/reader.c:1094 src/reader.c:1165
+#: src/reader.c:761 src/reader.c:1090 src/reader.c:1161

 #, fuzzy, c-format
 msgid "unmatched %s"
 msgstr "niet overeenkomstige `{'"
 
 #, fuzzy, c-format
 msgid "unmatched %s"
 msgstr "niet overeenkomstige `{'"
 

-#: src/reader.c:796
+#: src/reader.c:793

 #, fuzzy, c-format
 msgid "argument of %%expect is not an integer"
 msgstr "argument van %expect is niet een integer"
 
 #, fuzzy, c-format
 msgid "argument of %%expect is not an integer"
 msgstr "argument van %expect is niet een integer"
 

-#: src/reader.c:843
+#: src/reader.c:839

 #, c-format
 msgid "unrecognized item %s, expected an identifier"
 msgstr "onbekend item %s, verwacht een identifier"
 
 #, c-format
 msgid "unrecognized item %s, expected an identifier"
 msgstr "onbekend item %s, verwacht een identifier"
 

-#: src/reader.c:867
+#: src/reader.c:863

 #, c-format
 msgid "expected string constant instead of %s"
 msgstr "verwacht string constante in plaats van %s"
 
 #, c-format
 msgid "expected string constant instead of %s"
 msgstr "verwacht string constante in plaats van %s"
 

-#: src/reader.c:1010
+#: src/reader.c:1006

 #, c-format
 msgid "unrecognized: %s"
 msgstr "onbekend: %s"
 
 #, c-format
 msgid "unrecognized: %s"
 msgstr "onbekend: %s"
 

-#: src/reader.c:1015
+#: src/reader.c:1011

 msgid "no input grammar"
 msgstr "geen invoer grammatica"
 
 msgid "no input grammar"
 msgstr "geen invoer grammatica"
 

-#: src/reader.c:1020
+#: src/reader.c:1016

 #, c-format
 msgid "unknown character: %s"
 msgstr "onbekend karakter: %s"
 
 #, c-format
 msgid "unknown character: %s"
 msgstr "onbekend karakter: %s"
 

-#: src/reader.c:1188
+#: src/reader.c:1184

 #, fuzzy, c-format
 msgid "unterminated %guard clause"
 msgstr "niet getermineerde %%guard voorwaarde"
 
 #, fuzzy, c-format
 msgid "unterminated %guard clause"
 msgstr "niet getermineerde %%guard voorwaarde"
 

-#: src/reader.c:1355
+#: src/reader.c:1351

 msgid "ill-formed rule: initial symbol not followed by colon"
 msgstr ""
 "slecht geformuleerde regel: initieel symbool niet gevolgd door dubbele punt"
 
 msgid "ill-formed rule: initial symbol not followed by colon"
 msgstr ""
 "slecht geformuleerde regel: initieel symbool niet gevolgd door dubbele punt"
 

-#: src/reader.c:1362
+#: src/reader.c:1358

 msgid "grammar starts with vertical bar"
 msgstr "grammatica start met een verticale bar"
 
 msgid "grammar starts with vertical bar"
 msgstr "grammatica start met een verticale bar"
 

-#: src/reader.c:1393
+#: src/reader.c:1389

 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "regel geven voor %s, welke een teken is"
 
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "regel geven voor %s, welke een teken is"
 

-#: src/reader.c:1495
+#: src/reader.c:1491

 msgid "two @prec's in a row"
 msgstr "twee @prec's in een regel"
 
 msgid "two @prec's in a row"
 msgstr "twee @prec's in een regel"
 

-#: src/reader.c:1503
+#: src/reader.c:1499

 #, c-format
 msgid "%%guard present but %%semantic_parser not specified"
 msgstr "%%guard aanwezig maar %%semantic_parser niet gespecificeerd"
 
 #, c-format
 msgid "%%guard present but %%semantic_parser not specified"
 msgstr "%%guard aanwezig maar %%semantic_parser niet gespecificeerd"
 

-#: src/reader.c:1512
+#: src/reader.c:1508

 msgid "two actions at end of one rule"
 msgstr "twee akties aan het einde van een regel"
 
 msgid "two actions at end of one rule"
 msgstr "twee akties aan het einde van een regel"
 

-#: src/reader.c:1526
+#: src/reader.c:1522

 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "type clash (`%s' `%s') bij standaard aktie"
 
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "type clash (`%s' `%s') bij standaard aktie"
 

-#: src/reader.c:1532
+#: src/reader.c:1528

 msgid "empty rule for typed nonterminal, and no action"
 msgstr "lege regel voor getypte niet terminal, en geen aktie"
 
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "lege regel voor getypte niet terminal, en geen aktie"
 

-#: src/reader.c:1576
+#: src/reader.c:1572

 #, c-format
 msgid "invalid input: %s"
 msgstr "ongeldige invoer: %s"
 
 #, c-format
 msgid "invalid input: %s"
 msgstr "ongeldige invoer: %s"
 

-#: src/reader.c:1584
+#: src/reader.c:1580

 #, fuzzy, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "te veel symbolen (tekens plus nietterminals); maximum %s"
 
 #, fuzzy, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "te veel symbolen (tekens plus nietterminals); maximum %s"
 

-#: src/reader.c:1587
+#: src/reader.c:1583

 msgid "no rules in the input grammar"
 msgstr "geen regels voor invoer grammatica"
 
 msgid "no rules in the input grammar"
 msgstr "geen regels voor invoer grammatica"
 

-#: src/reader.c:1611
+#: src/reader.c:1607

 #, 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"
 
 #, 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:1716
+#: src/reader.c:1713

 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "conflictuerende precedentein voor %s en %s"
 
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "conflictuerende precedentein voor %s en %s"
 

-#: src/reader.c:1728
+#: src/reader.c:1725

 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "conflictuerende associatieve waarden voor %s en %s"
 
 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "conflictuerende associatieve waarden voor %s en %s"
 

-#: src/reader.c:1779
+#: src/reader.c:1771

 #, c-format
 msgid "tokens %s and %s both assigned number %d"
 msgstr ""
 
 #, c-format
 msgid "tokens %s and %s both assigned number %d"
 msgstr ""
 

-#: src/reader.c:1792
+#: src/reader.c:1783

 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr ""
 
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr ""
 

-#: src/reader.c:1794
+#: src/reader.c:1785

 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "het start symbool %s is een token"
 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "het start symbool %s is een token"

diff --git a/po/ru.gmo b/po/ru.gmo
index e4f6babfba7e3c07abb2e3593ff205c72d85374a..4d90c945033df19a228bfc12af4a16de7cfadb98 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 f50475388ceb4e73109a6928f80054591bbd9efb..8159449496aaa59b1c049c22f3de8a289cfcbd81 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-09-22 18:19+0200\n"
+"POT-Creation-Date: 2001-09-24 10:22+0200\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"


@@ -13,7 +13,7 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8-bit\n"
 

-#: src/LR0.c:207
+#: src/LR0.c:208

 #, c-format
 msgid "too many states (max %d)"
 msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ ÓÏÓÔÏÑÎÉÊ (ÍÁËÓÉÍÁÌØÎÏ %d)"
 #, c-format
 msgid "too many states (max %d)"
 msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ ÓÏÓÔÏÑÎÉÊ (ÍÁËÓÉÍÁÌØÎÏ %d)"


@@ -77,31 +77,31 @@ msgstr "
 
 #. If invoked with `--yacc', use the output format specified by
 #. POSIX.
 
 #. If invoked with `--yacc', use the output format specified by
 #. POSIX.

-#: src/conflicts.c:493
+#: src/conflicts.c:492

 msgid "conflicts: "
 msgstr "ËÏÎÆÌÉËÔÙ: "
 
 msgid "conflicts: "
 msgstr "ËÏÎÆÌÉËÔÙ: "
 

-#: src/conflicts.c:495
+#: src/conflicts.c:494

 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d ÓÄ×ÉÇ/×Ù×ÏÄ"
 
 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d ÓÄ×ÉÇ/×Ù×ÏÄ"
 

-#: src/conflicts.c:499
+#: src/conflicts.c:498

 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d ×Ù×ÏÄ/×Ù×ÏÄ"
 
 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d ×Ù×ÏÄ/×Ù×ÏÄ"
 

-#: src/conflicts.c:504
+#: src/conflicts.c:503

 #, c-format
 msgid "%s contains"
 msgstr "%s ÓÏÄÅÒÖÉÔ"
 
 #, c-format
 msgid "%s contains"
 msgstr "%s ÓÏÄÅÒÖÉÔ"
 

-#: src/conflicts.c:590 src/conflicts.c:711
+#: src/conflicts.c:589 src/conflicts.c:710

 #, c-format
 msgid "    %-4s\t[reduce using rule %d (%s)]\n"
 msgstr "    %-4s\t[×Ù×ÏÄ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÐÒÁ×ÉÌÁ %d (%s)]\n"
 
 #, c-format
 msgid "    %-4s\t[reduce using rule %d (%s)]\n"
 msgstr "    %-4s\t[×Ù×ÏÄ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÐÒÁ×ÉÌÁ %d (%s)]\n"
 

-#: src/conflicts.c:602 src/print.c:173
+#: src/conflicts.c:601 src/print.c:172

 #, c-format
 msgid ""
 "    $default\treduce using rule %d (%s)\n"
 #, c-format
 msgid ""
 "    $default\treduce using rule %d (%s)\n"


@@ -110,12 +110,12 @@ msgstr ""
 "    $default\t×Ù×ÏÄ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÐÒÁ×ÉÌÁ %d (%s)\n"
 "\n"
 
 "    $default\t×Ù×ÏÄ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÐÒÁ×ÉÌÁ %d (%s)\n"
 "\n"
 

-#: src/conflicts.c:691 src/conflicts.c:705
+#: src/conflicts.c:690 src/conflicts.c:704

 #, c-format
 msgid "    %-4s\treduce using rule %d (%s)\n"
 msgstr "    %-4s\t×Ù×ÏÄ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÐÒÁ×ÉÌÁ %d (%s)\n"
 
 #, c-format
 msgid "    %-4s\treduce using rule %d (%s)\n"
 msgstr "    %-4s\t×Ù×ÏÄ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÐÒÁ×ÉÌÁ %d (%s)\n"
 

-#: src/conflicts.c:732
+#: src/conflicts.c:731

 #, c-format
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr "    $default\t×Ù×ÏÄ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÐÒÁ×ÉÌÁ %d (%s)\n"
 #, c-format
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr "    $default\t×Ù×ÏÄ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÐÒÁ×ÉÌÁ %d (%s)\n"


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

-#: src/files.c:132
+#: src/files.c:138

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

-#: src/files.c:151
+#: src/files.c:157

 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:635
+#: src/getargs.c:214 src/lex.c:633

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


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

-#: src/lex.c:432
+#: src/lex.c:431

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

-#: src/main.c:108
+#: src/main.c:122

 #, c-format
 msgid "%s: internal error: %s\n"
 msgstr "%s: ×ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ: %s\n"
 #, c-format
 msgid "%s: internal error: %s\n"
 msgstr "%s: ×ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ: %s\n"


@@ -313,7 +313,7 @@ msgstr "%s: 
 msgid "Entering set_nullable"
 msgstr "÷ÈÏÄ × set_nullable"
 
 msgid "Entering set_nullable"
 msgstr "÷ÈÏÄ × set_nullable"
 

-#: src/output.c:993
+#: src/output.c:987

 #, c-format
 msgid "maximum table size (%d) exceeded"
 msgstr "ÐÒÅ×ÙÛÅÎ ÍÁËÓÉÍÁÌØÎÙÊ ÒÁÚÍÅÒ ÔÁÂÌÉÃÙ (%d)"
 #, c-format
 msgid "maximum table size (%d) exceeded"
 msgstr "ÐÒÅ×ÙÛÅÎ ÍÁËÓÉÍÁÌØÎÙÊ ÒÁÚÍÅÒ ÔÁÂÌÉÃÙ (%d)"


@@ -351,42 +351,44 @@ msgstr "    %-4s\t
 msgid "    %-4s\terror (nonassociative)\n"
 msgstr "    %-4s\tÏÛÉÂËÁ (ÎÅÁÓÓÏÃÉÁÔÉ×ÎÁÑ)\n"
 
 msgid "    %-4s\terror (nonassociative)\n"
 msgstr "    %-4s\tÏÛÉÂËÁ (ÎÅÁÓÓÏÃÉÁÔÉ×ÎÁÑ)\n"
 

-#: src/print.c:190
+#: src/print.c:188

 #, c-format
 msgid "    %-4s\tgo to state %d\n"
 msgstr "    %-4s\tÐÅÒÅÈÏÄ × ÓÏÓÔÏÑÎÉÅ %d\n"
 
 #, c-format
 msgid "    %-4s\tgo to state %d\n"
 msgstr "    %-4s\tÐÅÒÅÈÏÄ × ÓÏÓÔÏÑÎÉÅ %d\n"
 

-#: src/print.c:202
+#: src/print.c:200

 #, c-format
 msgid "state %d"
 msgstr "ÓÏÓÔÏÑÎÉÅ %d"
 
 #, c-format
 msgid "state %d"
 msgstr "ÓÏÓÔÏÑÎÉÅ %d"
 

-#: src/print.c:233
+#. rule # : LHS -> RHS
+#: src/print.c:230

 msgid "Grammar"
 msgstr "çÒÁÍÍÁÔÉËÁ"
 
 msgid "Grammar"
 msgstr "çÒÁÍÍÁÔÉËÁ"
 

-#: src/print.c:240
+#: src/print.c:235

 #, c-format
 msgid "rule %-4d %s ->"
 msgstr "ÐÒÁ×ÉÌÏ %-4d %s ->"
 
 #, c-format
 msgid "rule %-4d %s ->"
 msgstr "ÐÒÁ×ÉÌÏ %-4d %s ->"
 

-#: src/print.c:246
-msgid "\t\t/* empty */"
-msgstr "\t\t/* ÐÕÓÔÏ */"
+#: src/print.c:241
+msgid "empty"
+msgstr ""

 
 

-#: src/print.c:253
+#. TERMINAL (type #) : rule #s terminal is on RHS
+#: src/print.c:245

 msgid "Terminals, with rules where they appear"
 msgstr "ôÅÒÍÉÎÁÌØÎÙÅ ÓÉÍ×ÏÌÙ Ó ÐÒÁ×ÉÌÁÍÉ, × ËÏÔÏÒÙÈ ÏÎÉ ÐÏÑ×ÌÑÀÔÓÑ"
 
 msgid "Terminals, with rules where they appear"
 msgstr "ôÅÒÍÉÎÁÌØÎÙÅ ÓÉÍ×ÏÌÙ Ó ÐÒÁ×ÉÌÁÍÉ, × ËÏÔÏÒÙÈ ÏÎÉ ÐÏÑ×ÌÑÀÔÓÑ"
 

-#: src/print.c:302
+#: src/print.c:269

 msgid "Nonterminals, with rules where they appear"
 msgstr "îÅÔÅÒÍÉÎÁÌØÎÙÅ ÓÉÍ×ÏÌÙ Ó ÐÒÁ×ÉÌÁÍÉ, × ËÏÔÏÒÙÈ ÏÎÉ ÐÏÑ×ÌÑÀÔÓÑ"
 
 msgid "Nonterminals, with rules where they appear"
 msgstr "îÅÔÅÒÍÉÎÁÌØÎÙÅ ÓÉÍ×ÏÌÙ Ó ÐÒÁ×ÉÌÁÍÉ, × ËÏÔÏÒÙÈ ÏÎÉ ÐÏÑ×ÌÑÀÔÓÑ"
 

-#: src/print.c:329
+#: src/print.c:295

 msgid " on left:"
 msgstr " ÎÁÌÅ×Ï:"
 
 msgid " on left:"
 msgstr " ÎÁÌÅ×Ï:"
 

-#: src/print.c:344
+#: src/print.c:310

 msgid " on right:"
 msgstr " ÎÁÐÒÁ×Ï:"
 
 msgid " on right:"
 msgstr " ÎÁÐÒÁ×Ï:"
 


@@ -440,7 +442,7 @@ msgstr "$%d 
 msgid "unterminated `%{' definition"
 msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ ÏÐÒÅÄÅÌÅÎÉÅ `%{'"
 
 msgid "unterminated `%{' definition"
 msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ ÏÐÒÅÄÅÌÅÎÉÅ `%{'"
 

-#: src/reader.c:482 src/reader.c:598 src/reader.c:648
+#: src/reader.c:482 src/reader.c:596 src/reader.c:646

 #, c-format
 msgid "Premature EOF after %s"
 msgstr "ðÒÅÖÄÅ×ÒÅÍÅÎÎÙÊ ËÏÎÅà ÆÁÊÌÁ ÐÏÓÌÅ %s"
 #, c-format
 msgid "Premature EOF after %s"
 msgstr "ðÒÅÖÄÅ×ÒÅÍÅÎÎÙÊ ËÏÎÅà ÆÁÊÌÁ ÐÏÓÌÅ %s"


@@ -455,170 +457,170 @@ msgstr ""
 msgid "symbol `%s' given more than one literal string"
 msgstr ""
 
 msgid "symbol `%s' given more than one literal string"
 msgstr ""
 

-#: src/reader.c:524 src/reader.c:667
+#: src/reader.c:523 src/reader.c:665

 #, c-format
 msgid "symbol %s redefined"
 msgstr "ÐÏ×ÔÏÒÎÏÅ ÏÐÒÅÄÅÌÅÎÉÅ ÓÉÍ×ÏÌÁ %s"
 
 #, c-format
 msgid "symbol %s redefined"
 msgstr "ÐÏ×ÔÏÒÎÏÅ ÏÐÒÅÄÅÌÅÎÉÅ ÓÉÍ×ÏÌÁ %s"
 

-#: src/reader.c:534 src/reader.c:613 src/reader.c:674 src/reader.c:1290
+#: src/reader.c:533 src/reader.c:611 src/reader.c:672 src/reader.c:1286

 #, c-format
 msgid "type redeclaration for %s"
 msgstr "ÐÏ×ÔÏÒÎÏÅ ÏÐÉÓÁÎÉÅ ÔÉÐÁ ÄÌÑ %s"
 
 #, c-format
 msgid "type redeclaration for %s"
 msgstr "ÐÏ×ÔÏÒÎÏÅ ÏÐÉÓÁÎÉÅ ÔÉÐÁ ÄÌÑ %s"
 

-#: src/reader.c:544
+#: src/reader.c:542

 #, c-format
 msgid "`%s' is invalid in %s"
 msgstr "`%s' ÎÅ×ÅÒÎÏ × %s"
 
 #, c-format
 msgid "`%s' is invalid in %s"
 msgstr "`%s' ÎÅ×ÅÒÎÏ × %s"
 

-#: src/reader.c:561 src/reader.c:721
+#: src/reader.c:559 src/reader.c:718

 #, c-format
 msgid "multiple %s declarations"
 msgstr "ÍÎÏÖÅÓÔ×ÅÎÎÏÅ ÏÐÉÓÁÎÉÅ %s"
 
 #, c-format
 msgid "multiple %s declarations"
 msgstr "ÍÎÏÖÅÓÔ×ÅÎÎÏÅ ÏÐÉÓÁÎÉÅ %s"
 

-#: src/reader.c:563 src/reader.c:902 src/reader.c:927 src/reader.c:1268
+#: src/reader.c:561 src/reader.c:898 src/reader.c:923 src/reader.c:1264

 #, c-format
 msgid "invalid %s declaration"
 msgstr "ÎÅ×ÅÒÎÏÅ ÏÐÉÓÁÎÉÅ %s"
 
 #, c-format
 msgid "invalid %s declaration"
 msgstr "ÎÅ×ÅÒÎÏÅ ÏÐÉÓÁÎÉÅ %s"
 

-#: src/reader.c:583
+#: src/reader.c:581

 msgid "%type declaration has no <typename>"
 msgstr "ÏÐÉÓÁÎÉÅ %type ÎÅ ÉÍÅÅÔ <ÉÍÑ_ÔÉÐÁ>"
 
 msgid "%type declaration has no <typename>"
 msgstr "ÏÐÉÓÁÎÉÅ %type ÎÅ ÉÍÅÅÔ <ÉÍÑ_ÔÉÐÁ>"
 

-#: src/reader.c:618
+#: src/reader.c:616

 #, c-format
 msgid "invalid %%type declaration due to item: %s"
 msgstr "ÎÅ×ÅÒÎÏÅ ÏÐÉÓÁÎÉÅ %%type ÉÚ-ÚÁ ÜÌÅÍÅÎÔÁ: %s"
 
 #, c-format
 msgid "invalid %%type declaration due to item: %s"
 msgstr "ÎÅ×ÅÒÎÏÅ ÏÐÉÓÁÎÉÅ %%type ÉÚ-ÚÁ ÜÌÅÍÅÎÔÁ: %s"
 

-#: src/reader.c:663
+#: src/reader.c:661

 #, c-format
 msgid "redefining precedence of %s"
 msgstr "ÐÅÒÅÏÐÒÅÄÅÌÅÎÉÅ ÐÒÉÏÒÉÔÅÔÁ ÄÌÑ %s"
 
 #, c-format
 msgid "redefining precedence of %s"
 msgstr "ÐÅÒÅÏÐÒÅÄÅÌÅÎÉÅ ÐÒÉÏÒÉÔÅÔÁ ÄÌÑ %s"
 

-#: src/reader.c:687
+#: src/reader.c:684

 #, c-format
 msgid "invalid text (%s) - number should be after identifier"
 msgstr "ÎÅ×ÅÒÎÙÊ ÔÅËÓÔ (%s) - ÞÉÓÌÏ ÄÏÌÖÎÏ ÓÌÅÄÏ×ÁÔØ ÚÁ ÉÄÅÎÔÉÆÉËÁÔÏÒÏÍ"
 
 #, c-format
 msgid "invalid text (%s) - number should be after identifier"
 msgstr "ÎÅ×ÅÒÎÙÊ ÔÅËÓÔ (%s) - ÞÉÓÌÏ ÄÏÌÖÎÏ ÓÌÅÄÏ×ÁÔØ ÚÁ ÉÄÅÎÔÉÆÉËÁÔÏÒÏÍ"
 

-#: src/reader.c:697
+#: src/reader.c:694

 #, c-format
 msgid "unexpected item: %s"
 msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ÜÌÅÍÅÎÔ: %s"
 
 #, c-format
 msgid "unexpected item: %s"
 msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ÜÌÅÍÅÎÔ: %s"
 

-#: src/reader.c:764 src/reader.c:1094 src/reader.c:1165
+#: src/reader.c:761 src/reader.c:1090 src/reader.c:1161

 #, c-format
 msgid "unmatched %s"
 msgstr "ÎÅÐÁÒÎÁÑ %s"
 
 #, c-format
 msgid "unmatched %s"
 msgstr "ÎÅÐÁÒÎÁÑ %s"
 

-#: src/reader.c:796
+#: src/reader.c:793

 #, c-format
 msgid "argument of %%expect is not an integer"
 msgstr "ÁÒÇÕÍÅÎÔ %%expect ÎÅ Ñ×ÌÑÅÔÓÑ ÃÅÌÙÍ ÞÉÓÌÏÍ"
 
 #, c-format
 msgid "argument of %%expect is not an integer"
 msgstr "ÁÒÇÕÍÅÎÔ %%expect ÎÅ Ñ×ÌÑÅÔÓÑ ÃÅÌÙÍ ÞÉÓÌÏÍ"
 

-#: src/reader.c:843
+#: src/reader.c:839

 #, c-format
 msgid "unrecognized item %s, expected an identifier"
 msgstr "ÎÅÒÁÓÐÏÚÎÁÎÎÙÊ ÜÌÅÍÅÎÔ %s, ÏÖÉÄÁÌÓÑ ÉÄÅÎÔÉÆÉËÁÔÏÒ"
 
 #, c-format
 msgid "unrecognized item %s, expected an identifier"
 msgstr "ÎÅÒÁÓÐÏÚÎÁÎÎÙÊ ÜÌÅÍÅÎÔ %s, ÏÖÉÄÁÌÓÑ ÉÄÅÎÔÉÆÉËÁÔÏÒ"
 

-#: src/reader.c:867
+#: src/reader.c:863

 #, c-format
 msgid "expected string constant instead of %s"
 msgstr "×ÍÅÓÔÏ %s ÏÖÉÄÁÌÁÓØ ÓÔÒÏËÏ×ÁÑ ÐÏÓÔÏÑÎÎÁÑ"
 
 #, c-format
 msgid "expected string constant instead of %s"
 msgstr "×ÍÅÓÔÏ %s ÏÖÉÄÁÌÁÓØ ÓÔÒÏËÏ×ÁÑ ÐÏÓÔÏÑÎÎÁÑ"
 

-#: src/reader.c:1010
+#: src/reader.c:1006

 #, c-format
 msgid "unrecognized: %s"
 msgstr "ÎÅÒÁÓÐÏÚÎÁÎÏ: %s"
 
 #, c-format
 msgid "unrecognized: %s"
 msgstr "ÎÅÒÁÓÐÏÚÎÁÎÏ: %s"
 

-#: src/reader.c:1015
+#: src/reader.c:1011

 msgid "no input grammar"
 msgstr "ÎÅÔ ×ÈÏÄÎÏÊ ÇÒÁÍÍÁÔÉËÉ"
 
 msgid "no input grammar"
 msgstr "ÎÅÔ ×ÈÏÄÎÏÊ ÇÒÁÍÍÁÔÉËÉ"
 

-#: src/reader.c:1020
+#: src/reader.c:1016

 #, c-format
 msgid "unknown character: %s"
 msgstr "ÎÅÉÚ×ÅÓÔÎÙÊ ÓÉÍ×ÏÌ: %s"
 
 #, c-format
 msgid "unknown character: %s"
 msgstr "ÎÅÉÚ×ÅÓÔÎÙÊ ÓÉÍ×ÏÌ: %s"
 

-#: src/reader.c:1188
+#: src/reader.c:1184

 #, c-format
 msgid "unterminated %guard clause"
 msgstr "ÎÅÚÁËÏÎÞÅÎÎÙÊ ÏÐÅÒÁÔÏÒ %guard"
 
 #, c-format
 msgid "unterminated %guard clause"
 msgstr "ÎÅÚÁËÏÎÞÅÎÎÙÊ ÏÐÅÒÁÔÏÒ %guard"
 

-#: src/reader.c:1355
+#: src/reader.c:1351

 msgid "ill-formed rule: initial symbol not followed by colon"
 msgstr "ÎÅ×ÅÒÎÏÅ ÐÒÁ×ÉÌÏ: Ä×ÏÅÔÏÞÉÅ ÎÅ ÓÌÅÄÕÅÔ ÚÁ ÎÁÞÁÌØÎÙÍ ÓÉÍ×ÏÌÏÍ"
 
 msgid "ill-formed rule: initial symbol not followed by colon"
 msgstr "ÎÅ×ÅÒÎÏÅ ÐÒÁ×ÉÌÏ: Ä×ÏÅÔÏÞÉÅ ÎÅ ÓÌÅÄÕÅÔ ÚÁ ÎÁÞÁÌØÎÙÍ ÓÉÍ×ÏÌÏÍ"
 

-#: src/reader.c:1362
+#: src/reader.c:1358

 msgid "grammar starts with vertical bar"
 msgstr "ÇÒÁÍÍÁÔÉËÁ ÎÁÞÉÎÁÅÔÓÑ Ó ×ÅÒÔÉËÁÌØÎÏÊ ÞÅÒÔÙ"
 
 msgid "grammar starts with vertical bar"
 msgstr "ÇÒÁÍÍÁÔÉËÁ ÎÁÞÉÎÁÅÔÓÑ Ó ×ÅÒÔÉËÁÌØÎÏÊ ÞÅÒÔÙ"
 

-#: src/reader.c:1393
+#: src/reader.c:1389

 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "ÐÒÁ×ÉÌÏ ÚÁÄÁÎÏ ÄÌÑ %s, ËÏÔÏÒÙÊ Ñ×ÌÑÅÔÓÑ ÌÅËÓÅÍÏÊ"
 
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "ÐÒÁ×ÉÌÏ ÚÁÄÁÎÏ ÄÌÑ %s, ËÏÔÏÒÙÊ Ñ×ÌÑÅÔÓÑ ÌÅËÓÅÍÏÊ"
 

-#: src/reader.c:1495
+#: src/reader.c:1491

 msgid "two @prec's in a row"
 msgstr "Ä×Á @prec ÐÏÄÒÑÄ"
 
 msgid "two @prec's in a row"
 msgstr "Ä×Á @prec ÐÏÄÒÑÄ"
 

-#: src/reader.c:1503
+#: src/reader.c:1499

 #, c-format
 msgid "%%guard present but %%semantic_parser not specified"
 msgstr "%%guard ÐÒÉÓÕÔÓÔ×ÕÅÔ, Á %%semantic_parser ÎÅ ÚÁÄÁÎ"
 
 #, c-format
 msgid "%%guard present but %%semantic_parser not specified"
 msgstr "%%guard ÐÒÉÓÕÔÓÔ×ÕÅÔ, Á %%semantic_parser ÎÅ ÚÁÄÁÎ"
 

-#: src/reader.c:1512
+#: src/reader.c:1508

 msgid "two actions at end of one rule"
 msgstr "Ä×Á ÄÅÊÓÔ×ÉÑ × ËÏÎÃÅ ÏÄÎÏÇÏ ÐÒÁ×ÉÌÁ"
 
 msgid "two actions at end of one rule"
 msgstr "Ä×Á ÄÅÊÓÔ×ÉÑ × ËÏÎÃÅ ÏÄÎÏÇÏ ÐÒÁ×ÉÌÁ"
 

-#: src/reader.c:1526
+#: src/reader.c:1522

 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "ËÏÎÆÌÉËÔ ÔÉÐÏ× (`%s' `%s') ÎÁ ÄÅÊÓÔ×ÉÉ ÐÏ ÕÍÏÌÞÁÎÉÀ"
 
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "ËÏÎÆÌÉËÔ ÔÉÐÏ× (`%s' `%s') ÎÁ ÄÅÊÓÔ×ÉÉ ÐÏ ÕÍÏÌÞÁÎÉÀ"
 

-#: src/reader.c:1532
+#: src/reader.c:1528

 msgid "empty rule for typed nonterminal, and no action"
 msgstr ""
 "ÐÕÓÔÏÅ ÐÒÁ×ÉÌÏ ÄÌÑ ÔÉÐÉÚÉÒÏ×ÁÎÎÏÇÏ ÎÅÔÅÒÍÉÎÁÌØÎÏÇÏ ÓÉÍ×ÏÌÁ, É ÎÅÔ ÄÅÊÓÔ×ÉÑ"
 
 msgid "empty rule for typed nonterminal, and no action"
 msgstr ""
 "ÐÕÓÔÏÅ ÐÒÁ×ÉÌÏ ÄÌÑ ÔÉÐÉÚÉÒÏ×ÁÎÎÏÇÏ ÎÅÔÅÒÍÉÎÁÌØÎÏÇÏ ÓÉÍ×ÏÌÁ, É ÎÅÔ ÄÅÊÓÔ×ÉÑ"
 

-#: src/reader.c:1576
+#: src/reader.c:1572

 #, c-format
 msgid "invalid input: %s"
 msgstr "ÎÅ×ÅÒÎÙÅ ×ÈÏÄÎÙÅ ÄÁÎÎÙÅ: %s"
 
 #, c-format
 msgid "invalid input: %s"
 msgstr "ÎÅ×ÅÒÎÙÅ ×ÈÏÄÎÙÅ ÄÁÎÎÙÅ: %s"
 

-#: src/reader.c:1584
+#: src/reader.c:1580

 #, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ ÓÉÍ×ÏÌÏ× (ÌÅËÓÅÍÙ ÐÌÀÓ ÎÅÔÅÒÍÉÎÁÌÙ); ÍÁËÓÉÍÁÌØÎÏ %d"
 
 #, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ ÓÉÍ×ÏÌÏ× (ÌÅËÓÅÍÙ ÐÌÀÓ ÎÅÔÅÒÍÉÎÁÌÙ); ÍÁËÓÉÍÁÌØÎÏ %d"
 

-#: src/reader.c:1587
+#: src/reader.c:1583

 msgid "no rules in the input grammar"
 msgstr "ÏÔÓÕÔÓÔ×ÕÀÔ ÐÒÁ×ÉÌÁ ×Ï ×ÈÏÄÎÏÊ ÇÒÁÍÍÁÔÉËÅ"
 
 msgid "no rules in the input grammar"
 msgstr "ÏÔÓÕÔÓÔ×ÕÀÔ ÐÒÁ×ÉÌÁ ×Ï ×ÈÏÄÎÏÊ ÇÒÁÍÍÁÔÉËÅ"
 

-#: src/reader.c:1611
+#: src/reader.c:1607

 #, c-format
 msgid "symbol %s is used, but is not defined as a token and has no rules"
 msgstr "ÓÉÍ×ÏÌ %s ÉÓÐÏÌØÚÕÅÔÓÑ, ÎÏ ÎÅ ÏÐÒÅÄÅÌÅÎ ËÁË ÌÅËÓÅÍÁ É ÎÅ ÉÍÅÅÔ ÐÒÁ×ÉÌ"
 
 #, c-format
 msgid "symbol %s is used, but is not defined as a token and has no rules"
 msgstr "ÓÉÍ×ÏÌ %s ÉÓÐÏÌØÚÕÅÔÓÑ, ÎÏ ÎÅ ÏÐÒÅÄÅÌÅÎ ËÁË ÌÅËÓÅÍÁ É ÎÅ ÉÍÅÅÔ ÐÒÁ×ÉÌ"
 

-#: src/reader.c:1716
+#: src/reader.c:1713

 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "ÐÒÏÔÉ×ÏÒÅÞÉ×ÙÅ ÐÒÉÏÒÉÔÅÔÙ ÄÌÑ %s É %s"
 
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "ÐÒÏÔÉ×ÏÒÅÞÉ×ÙÅ ÐÒÉÏÒÉÔÅÔÙ ÄÌÑ %s É %s"
 

-#: src/reader.c:1728
+#: src/reader.c:1725

 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "ÐÒÏÔÉ×ÏÒÅÞÉ×ÙÅ ÚÎÁÞÅÎÉÑ ÁÓÓÏÃÉÁÔÉ×ÎÏÓÔÉ ÄÌÑ %s É %s"
 
 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "ÐÒÏÔÉ×ÏÒÅÞÉ×ÙÅ ÚÎÁÞÅÎÉÑ ÁÓÓÏÃÉÁÔÉ×ÎÏÓÔÉ ÄÌÑ %s É %s"
 

-#: src/reader.c:1779
+#: src/reader.c:1771

 #, c-format
 msgid "tokens %s and %s both assigned number %d"
 msgstr "ÏÂÅÉÍ ÌÅËÓÅÍÁÍ %s É %s ÐÒÉÓ×ÏÅÎ ÎÏÍÅÒ %d"
 
 #, c-format
 msgid "tokens %s and %s both assigned number %d"
 msgstr "ÏÂÅÉÍ ÌÅËÓÅÍÁÍ %s É %s ÐÒÉÓ×ÏÅÎ ÎÏÍÅÒ %d"
 

-#: src/reader.c:1792
+#: src/reader.c:1783

 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "ÎÁÞÁÌØÎÙÊ ÓÉÍ×ÏÌ %s ÎÅÏÐÒÅÄÅÌÅÎ"
 
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "ÎÁÞÁÌØÎÙÊ ÓÉÍ×ÏÌ %s ÎÅÏÐÒÅÄÅÌÅÎ"
 

-#: src/reader.c:1794
+#: src/reader.c:1785

 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "ÎÁÞÁÌØÎÙÊ ÓÉÍ×ÏÌ %s Ñ×ÌÑÅÔÓÑ ÌÅËÓÅÍÏÊ"
 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "ÎÁÞÁÌØÎÙÊ ÓÉÍ×ÏÌ %s Ñ×ÌÑÅÔÓÑ ÌÅËÓÅÍÏÊ"


@@ -793,6 +795,9 @@ msgstr "`"
 msgid "'"
 msgstr "'"
 
 msgid "'"
 msgstr "'"
 

+#~ msgid "\t\t/* empty */"
+#~ msgstr "\t\t/* ÐÕÓÔÏ */"
+

 #~ msgid "multiple %%header_extension declarations"
 #~ msgstr "ÍÎÏÖÅÓÔ×ÅÎÎÙÅ ÏÐÉÓÁÎÉÑ %%header_extension"
 
 #~ msgid "multiple %%header_extension declarations"
 #~ msgstr "ÍÎÏÖÅÓÔ×ÅÎÎÙÅ ÏÐÉÓÁÎÉÑ %%header_extension"
 

diff --git a/po/tr.po b/po/tr.po
index 61852a6fe9aef681ef4e263e821527973ca51596..eb94436c30efec3a0d74cd8388fdca9aec160fc9 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-09-22 18:19+0200\n"
+"POT-Creation-Date: 2001-09-24 10:22+0200\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"


@@ -14,7 +14,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.5\n"
 
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.5\n"
 

-#: src/LR0.c:207
+#: src/LR0.c:208

 #, c-format
 msgid "too many states (max %d)"
 msgstr "çok fazla durum (en fazla %d)"
 #, c-format
 msgid "too many states (max %d)"
 msgstr "çok fazla durum (en fazla %d)"


@@ -79,31 +79,31 @@ msgstr "%d durumu i
 
 #. If invoked with `--yacc', use the output format specified by
 #. POSIX.
 
 #. If invoked with `--yacc', use the output format specified by
 #. POSIX.

-#: src/conflicts.c:493
+#: src/conflicts.c:492

 msgid "conflicts: "
 msgstr "çeliþkiler: "
 
 msgid "conflicts: "
 msgstr "çeliþkiler: "
 

-#: src/conflicts.c:495
+#: src/conflicts.c:494

 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d öteleme/indirgeme"
 
 #, c-format
 msgid " %d shift/reduce"
 msgstr " %d öteleme/indirgeme"
 

-#: src/conflicts.c:499
+#: src/conflicts.c:498

 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d indirgeme/indirgeme"
 
 #, c-format
 msgid " %d reduce/reduce"
 msgstr " %d indirgeme/indirgeme"
 

-#: src/conflicts.c:504
+#: src/conflicts.c:503

 #, c-format
 msgid "%s contains"
 msgstr "%s içerir"
 
 #, c-format
 msgid "%s contains"
 msgstr "%s içerir"
 

-#: src/conflicts.c:590 src/conflicts.c:711
+#: src/conflicts.c:589 src/conflicts.c:710

 #, c-format
 msgid "    %-4s\t[reduce using rule %d (%s)]\n"
 msgstr "    %-4s\t[indirgeme kural %d (%s)'i kullanýyor]\n"
 
 #, c-format
 msgid "    %-4s\t[reduce using rule %d (%s)]\n"
 msgstr "    %-4s\t[indirgeme kural %d (%s)'i kullanýyor]\n"
 

-#: src/conflicts.c:602 src/print.c:173
+#: src/conflicts.c:601 src/print.c:172

 #, c-format
 msgid ""
 "    $default\treduce using rule %d (%s)\n"
 #, c-format
 msgid ""
 "    $default\treduce using rule %d (%s)\n"


@@ -112,12 +112,12 @@ msgstr ""
 "    $default\tindirgeme kural %d (%s)'i kullanýyor\n"
 "\n"
 
 "    $default\tindirgeme kural %d (%s)'i kullanýyor\n"
 "\n"
 

-#: src/conflicts.c:691 src/conflicts.c:705
+#: src/conflicts.c:690 src/conflicts.c:704

 #, c-format
 msgid "    %-4s\treduce using rule %d (%s)\n"
 msgstr "    %-4s\tindirgeme kural %d (%s)'i kullanýyor\n"
 
 #, c-format
 msgid "    %-4s\treduce using rule %d (%s)\n"
 msgstr "    %-4s\tindirgeme kural %d (%s)'i kullanýyor\n"
 

-#: src/conflicts.c:732
+#: src/conflicts.c:731

 #, c-format
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr "    $default\tindirgeme kural %d (%s)'i kullanýyor\n"
 #, c-format
 msgid "    $default\treduce using rule %d (%s)\n"
 msgstr "    $default\tindirgeme kural %d (%s)'i kullanýyor\n"


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

-#: src/files.c:132
+#: src/files.c:138

 #, 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:151
+#: src/files.c:157

 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:635
+#: src/getargs.c:214 src/lex.c:633

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


@@ -302,11 +302,11 @@ 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:432
+#: src/lex.c:431

 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"
 

-#: src/main.c:108
+#: src/main.c:122

 #, c-format
 msgid "%s: internal error: %s\n"
 msgstr "%s: iç hata: %s\n"
 #, c-format
 msgid "%s: internal error: %s\n"
 msgstr "%s: iç hata: %s\n"


@@ -315,7 +315,7 @@ msgstr "%s: i
 msgid "Entering set_nullable"
 msgstr "set_nullable'a girildi"
 
 msgid "Entering set_nullable"
 msgstr "set_nullable'a girildi"
 

-#: src/output.c:993
+#: src/output.c:987

 #, c-format
 msgid "maximum table size (%d) exceeded"
 msgstr "en büyük tablo uzunluðu (%d) aþýldý"
 #, c-format
 msgid "maximum table size (%d) exceeded"
 msgstr "en büyük tablo uzunluðu (%d) aþýldý"


@@ -353,42 +353,44 @@ msgstr "    %-4s\t
 msgid "    %-4s\terror (nonassociative)\n"
 msgstr "    %-4s\thata (birleþmeli deðil)\n"
 
 msgid "    %-4s\terror (nonassociative)\n"
 msgstr "    %-4s\thata (birleþmeli deðil)\n"
 

-#: src/print.c:190
+#: src/print.c:188

 #, c-format
 msgid "    %-4s\tgo to state %d\n"
 msgstr "    %-4s\tdurum %d'ye git\n"
 
 #, c-format
 msgid "    %-4s\tgo to state %d\n"
 msgstr "    %-4s\tdurum %d'ye git\n"
 

-#: src/print.c:202
+#: src/print.c:200

 #, c-format
 msgid "state %d"
 msgstr "durum %d"
 
 #, c-format
 msgid "state %d"
 msgstr "durum %d"
 

-#: src/print.c:233
+#. rule # : LHS -> RHS
+#: src/print.c:230

 msgid "Grammar"
 msgstr "Gramer"
 
 msgid "Grammar"
 msgstr "Gramer"
 

-#: src/print.c:240
+#: src/print.c:235

 #, c-format
 msgid "rule %-4d %s ->"
 msgstr "kural %-4d %s ->"
 
 #, c-format
 msgid "rule %-4d %s ->"
 msgstr "kural %-4d %s ->"
 

-#: src/print.c:246
-msgid "\t\t/* empty */"
-msgstr "\t\t/* boþ */"
+#: src/print.c:241
+msgid "empty"
+msgstr ""

 
 

-#: src/print.c:253
+#. TERMINAL (type #) : rule #s terminal is on RHS
+#: src/print.c:245

 msgid "Terminals, with rules where they appear"
 msgstr "Sabit simgeler, kurallarýnýn bulunduklarý yerde"
 
 msgid "Terminals, with rules where they appear"
 msgstr "Sabit simgeler, kurallarýnýn bulunduklarý yerde"
 

-#: src/print.c:302
+#: src/print.c:269

 msgid "Nonterminals, with rules where they appear"
 msgstr "Deðiþken simgeler, kurallarýnýn bulunduklarý yerde"
 
 msgid "Nonterminals, with rules where they appear"
 msgstr "Deðiþken simgeler, kurallarýnýn bulunduklarý yerde"
 

-#: src/print.c:329
+#: src/print.c:295

 msgid " on left:"
 msgstr " solda:"
 
 msgid " on left:"
 msgstr " solda:"
 

-#: src/print.c:344
+#: src/print.c:310

 msgid " on right:"
 msgstr " saðda:"
 
 msgid " on right:"
 msgstr " saðda:"
 


@@ -442,7 +444,7 @@ msgstr "`%d''in $%s'i bildirilmi
 msgid "unterminated `%{' definition"
 msgstr "`%{' tanýmlamasý sonlandýrýlmamýþ"
 
 msgid "unterminated `%{' definition"
 msgstr "`%{' tanýmlamasý sonlandýrýlmamýþ"
 

-#: src/reader.c:482 src/reader.c:598 src/reader.c:648
+#: src/reader.c:482 src/reader.c:596 src/reader.c:646

 #, c-format
 msgid "Premature EOF after %s"
 msgstr "%s'den sonra erken EOF"
 #, c-format
 msgid "Premature EOF after %s"
 msgstr "%s'den sonra erken EOF"


@@ -457,170 +459,170 @@ msgstr "simge `%s' birden fazla defa sabit dizge olarak kullan
 msgid "symbol `%s' given more than one literal string"
 msgstr "`%s' simgesine birden fazla sabit dizge verilmiþ"
 
 msgid "symbol `%s' given more than one literal string"
 msgstr "`%s' simgesine birden fazla sabit dizge verilmiþ"
 

-#: src/reader.c:524 src/reader.c:667
+#: src/reader.c:523 src/reader.c:665

 #, c-format
 msgid "symbol %s redefined"
 msgstr "%s simgesi yeniden tanýmlandý"
 
 #, c-format
 msgid "symbol %s redefined"
 msgstr "%s simgesi yeniden tanýmlandý"
 

-#: src/reader.c:534 src/reader.c:613 src/reader.c:674 src/reader.c:1290
+#: src/reader.c:533 src/reader.c:611 src/reader.c:672 src/reader.c:1286

 #, c-format
 msgid "type redeclaration for %s"
 msgstr "%s için yeniden tip bildirimi"
 
 #, c-format
 msgid "type redeclaration for %s"
 msgstr "%s için yeniden tip bildirimi"
 

-#: src/reader.c:544
+#: src/reader.c:542

 #, c-format
 msgid "`%s' is invalid in %s"
 msgstr "`%s' %s içinde geçersizdir"
 
 #, c-format
 msgid "`%s' is invalid in %s"
 msgstr "`%s' %s içinde geçersizdir"
 

-#: src/reader.c:561 src/reader.c:721
+#: src/reader.c:559 src/reader.c:718

 #, c-format
 msgid "multiple %s declarations"
 msgstr "çoklu %s bildirimleri"
 
 #, c-format
 msgid "multiple %s declarations"
 msgstr "çoklu %s bildirimleri"
 

-#: src/reader.c:563 src/reader.c:902 src/reader.c:927 src/reader.c:1268
+#: src/reader.c:561 src/reader.c:898 src/reader.c:923 src/reader.c:1264

 #, c-format
 msgid "invalid %s declaration"
 msgstr "geçersiz %s bildirimi"
 
 #, c-format
 msgid "invalid %s declaration"
 msgstr "geçersiz %s bildirimi"
 

-#: src/reader.c:583
+#: src/reader.c:581

 msgid "%type declaration has no <typename>"
 msgstr "%type bildirimi <tipadý>'na sahip deðil"
 
 msgid "%type declaration has no <typename>"
 msgstr "%type bildirimi <tipadý>'na sahip deðil"
 

-#: src/reader.c:618
+#: src/reader.c:616

 #, c-format
 msgid "invalid %%type declaration due to item: %s"
 msgstr "geçersiz %%type bildirimine neden olan öðe: %s"
 
 #, c-format
 msgid "invalid %%type declaration due to item: %s"
 msgstr "geçersiz %%type bildirimine neden olan öðe: %s"
 

-#: src/reader.c:663
+#: src/reader.c:661

 #, c-format
 msgid "redefining precedence of %s"
 msgstr "%s'in önceliði tekrar tanýmlandý"
 
 #, c-format
 msgid "redefining precedence of %s"
 msgstr "%s'in önceliði tekrar tanýmlandý"
 

-#: src/reader.c:687
+#: src/reader.c:684

 #, c-format
 msgid "invalid text (%s) - number should be after identifier"
 msgstr "geçersiz metin (%s) - sayý tanýtýcýdan sonra olmalýdýr"
 
 #, c-format
 msgid "invalid text (%s) - number should be after identifier"
 msgstr "geçersiz metin (%s) - sayý tanýtýcýdan sonra olmalýdýr"
 

-#: src/reader.c:697
+#: src/reader.c:694

 #, c-format
 msgid "unexpected item: %s"
 msgstr "beklenmeyen öðe: %s"
 
 #, c-format
 msgid "unexpected item: %s"
 msgstr "beklenmeyen öðe: %s"
 

-#: src/reader.c:764 src/reader.c:1094 src/reader.c:1165
+#: src/reader.c:761 src/reader.c:1090 src/reader.c:1161

 #, c-format
 msgid "unmatched %s"
 msgstr "eþlenemeyen %s"
 
 #, c-format
 msgid "unmatched %s"
 msgstr "eþlenemeyen %s"
 

-#: src/reader.c:796
+#: src/reader.c:793

 #, c-format
 msgid "argument of %%expect is not an integer"
 msgstr "%%expect'in argümaný bir tamsayý deðil"
 
 #, c-format
 msgid "argument of %%expect is not an integer"
 msgstr "%%expect'in argümaný bir tamsayý deðil"
 

-#: src/reader.c:843
+#: src/reader.c:839

 #, c-format
 msgid "unrecognized item %s, expected an identifier"
 msgstr "%s öðesi tanýnmadý, beklenen bir tanýtýcýdýr"
 
 #, c-format
 msgid "unrecognized item %s, expected an identifier"
 msgstr "%s öðesi tanýnmadý, beklenen bir tanýtýcýdýr"
 

-#: src/reader.c:867
+#: src/reader.c:863

 #, c-format
 msgid "expected string constant instead of %s"
 msgstr "%s'in yerine sabit dizge beklendi"
 
 #, c-format
 msgid "expected string constant instead of %s"
 msgstr "%s'in yerine sabit dizge beklendi"
 

-#: src/reader.c:1010
+#: src/reader.c:1006

 #, c-format
 msgid "unrecognized: %s"
 msgstr "tanýnmayan: %s"
 
 #, c-format
 msgid "unrecognized: %s"
 msgstr "tanýnmayan: %s"
 

-#: src/reader.c:1015
+#: src/reader.c:1011

 msgid "no input grammar"
 msgstr "girdi grameri yok"
 
 msgid "no input grammar"
 msgstr "girdi grameri yok"
 

-#: src/reader.c:1020
+#: src/reader.c:1016

 #, c-format
 msgid "unknown character: %s"
 msgstr "bilinmeyen karakter: %s"
 
 #, c-format
 msgid "unknown character: %s"
 msgstr "bilinmeyen karakter: %s"
 

-#: src/reader.c:1188
+#: src/reader.c:1184

 #, c-format
 msgid "unterminated %guard clause"
 msgstr "sonlandýrýlmamýþ %guard yantümcesi"
 
 #, c-format
 msgid "unterminated %guard clause"
 msgstr "sonlandýrýlmamýþ %guard yantümcesi"
 

-#: src/reader.c:1355
+#: src/reader.c:1351

 msgid "ill-formed rule: initial symbol not followed by colon"
 msgstr "kötü-biçemli kural: baþlangýç simgesini takip eden \":\" yok"
 
 msgid "ill-formed rule: initial symbol not followed by colon"
 msgstr "kötü-biçemli kural: baþlangýç simgesini takip eden \":\" yok"
 

-#: src/reader.c:1362
+#: src/reader.c:1358

 msgid "grammar starts with vertical bar"
 msgstr "gramer düþey çubuk ile baþlýyor"
 
 msgid "grammar starts with vertical bar"
 msgstr "gramer düþey çubuk ile baþlýyor"
 

-#: src/reader.c:1393
+#: src/reader.c:1389

 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "bir andaç olan %s için verilen kural"
 
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "bir andaç olan %s için verilen kural"
 

-#: src/reader.c:1495
+#: src/reader.c:1491

 msgid "two @prec's in a row"
 msgstr "bir satýrda iki @prec"
 
 msgid "two @prec's in a row"
 msgstr "bir satýrda iki @prec"
 

-#: src/reader.c:1503
+#: src/reader.c:1499

 #, c-format
 msgid "%%guard present but %%semantic_parser not specified"
 msgstr "%%guard sunulmuþ fakat %%semantic_parser belirlenmemiþ"
 
 #, c-format
 msgid "%%guard present but %%semantic_parser not specified"
 msgstr "%%guard sunulmuþ fakat %%semantic_parser belirlenmemiþ"
 

-#: src/reader.c:1512
+#: src/reader.c:1508

 msgid "two actions at end of one rule"
 msgstr "bir kuralýn sonunda iki eylem"
 
 msgid "two actions at end of one rule"
 msgstr "bir kuralýn sonunda iki eylem"
 

-#: src/reader.c:1526
+#: src/reader.c:1522

 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "öntanýmlý eylem üzerinde (`%s' `%s') tip çatýþmasý"
 
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "öntanýmlý eylem üzerinde (`%s' `%s') tip çatýþmasý"
 

-#: src/reader.c:1532
+#: src/reader.c:1528

 msgid "empty rule for typed nonterminal, and no action"
 msgstr "Tipli deðiþken simge için boþ kural tanýmlanmýþ, ve eylembelirtilmemiþ"
 
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "Tipli deðiþken simge için boþ kural tanýmlanmýþ, ve eylembelirtilmemiþ"
 

-#: src/reader.c:1576
+#: src/reader.c:1572

 #, c-format
 msgid "invalid input: %s"
 msgstr "geçersiz girdi: %s"
 
 #, c-format
 msgid "invalid input: %s"
 msgstr "geçersiz girdi: %s"
 

-#: src/reader.c:1584
+#: src/reader.c:1580

 #, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "çok fazla simge var (andaçlar ve deðiþken simgeler); en fazla %d"
 
 #, c-format
 msgid "too many symbols (tokens plus nonterminals); maximum %d"
 msgstr "çok fazla simge var (andaçlar ve deðiþken simgeler); en fazla %d"
 

-#: src/reader.c:1587
+#: src/reader.c:1583

 msgid "no rules in the input grammar"
 msgstr "girdi grameri içinde kurallar yok"
 
 msgid "no rules in the input grammar"
 msgstr "girdi grameri içinde kurallar yok"
 

-#: src/reader.c:1611
+#: src/reader.c:1607

 #, c-format
 msgid "symbol %s is used, but is not defined as a token and has no rules"
 msgstr ""
 "simge %s kullanýldý, fakat bir andaç olarak tanýmlanmadý vekurallarý yok"
 
 #, c-format
 msgid "symbol %s is used, but is not defined as a token and has no rules"
 msgstr ""
 "simge %s kullanýldý, fakat bir andaç olarak tanýmlanmadý vekurallarý yok"
 

-#: src/reader.c:1716
+#: src/reader.c:1713

 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "%s ve %s için çeliþen öncelikler"
 
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "%s ve %s için çeliþen öncelikler"
 

-#: src/reader.c:1728
+#: src/reader.c:1725

 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "%s ve %s için çeliþen birleþmeli deðerler"
 
 #, c-format
 msgid "conflicting assoc values for %s and %s"
 msgstr "%s ve %s için çeliþen birleþmeli deðerler"
 

-#: src/reader.c:1779
+#: src/reader.c:1771

 #, c-format
 msgid "tokens %s and %s both assigned number %d"
 msgstr "%s ve %s andaçlarýnýn her ikisi %d sayýsýna atandý"
 
 #, c-format
 msgid "tokens %s and %s both assigned number %d"
 msgstr "%s ve %s andaçlarýnýn her ikisi %d sayýsýna atandý"
 

-#: src/reader.c:1792
+#: src/reader.c:1783

 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "baþlangýç simgesi %s tanýmlanmadý"
 
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "baþlangýç simgesi %s tanýmlanmadý"
 

-#: src/reader.c:1794
+#: src/reader.c:1785

 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "baþlangýç simgesi %s bir andaçtýr"
 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "baþlangýç simgesi %s bir andaçtýr"


@@ -795,6 +797,9 @@ msgstr "`"
 msgid "'"
 msgstr "'"
 
 msgid "'"
 msgstr "'"
 

+#~ msgid "\t\t/* empty */"
+#~ msgstr "\t\t/* boþ */"
+

 #~ msgid "multiple %%header_extension declarations"
 #~ msgstr "çoklu %%header_extension bildirimleri"
 
 #~ msgid "multiple %%header_extension declarations"
 #~ msgstr "çoklu %%header_extension bildirimleri"
 

diff --git a/src/conflicts.c b/src/conflicts.c
index 48d679b7d075694701c84d69d97584cf157f0b3d..dc9ee3d6a2aa5f4b4617275ce5f6b0df61e3770b 100644 (file)
--- a/src/conflicts.c
+++ b/src/conflicts.c
@@ -30,12 +30,12 @@
 #include "LR0.h"
 
 int any_conflicts = 0;
 #include "LR0.h"
 
 int any_conflicts = 0;

-errs **err_table;
+errs **err_table = NULL;

 int expected_conflicts;
 int expected_conflicts;

-static char *conflicts;
+static char *conflicts = NULL;

 
 

-static unsigned *shiftset;
-static unsigned *lookaheadset;
+static unsigned *shiftset = NULL;
+static unsigned *lookaheadset = NULL;

 static int src_total;
 static int rrc_total;
 static int src_count;
 static int src_total;
 static int rrc_total;
 static int src_count;


@@ -264,7 +264,7 @@ set_conflicts (int state)
 }
 
 void
 }
 
 void

-initialize_conflicts (void)
+solve_conflicts (void)

 {
   int i;
 
 {
   int i;
 


@@ -458,7 +458,7 @@ conflict_report (int src_num, int rrc_num)
 `---------------------------------------------*/
 
 void
 `---------------------------------------------*/
 
 void

-print_conflicts (void)
+print_conflicts (FILE *out)

 {
   int i;
 
 {
   int i;
 


@@ -478,9 +478,8 @@ print_conflicts (void)
 
          if (verbose_flag)
            {
 
          if (verbose_flag)
            {

-             obstack_fgrow1 (&output_obstack, _("State %d contains"), i);
-             obstack_sgrow (&output_obstack,
-                            conflict_report (src_count, rrc_count));
+             fprintf (out, _("State %d contains"), i);
+             fputs (conflict_report (src_count, rrc_count), out);

            }
        }
     }
            }
        }
     }

diff --git a/src/conflicts.h b/src/conflicts.h
index 205e42f520fe13a597e4dbba50531213ad12db1c..99a504c82304f31d8558db8fdf4491273a5b7735 100644 (file)
--- a/src/conflicts.h
+++ b/src/conflicts.h
@@ -22,8 +22,8 @@
 # define CONFLICTS_H_
 # include "state.h"
 
 # define CONFLICTS_H_
 # include "state.h"
 

-void initialize_conflicts PARAMS ((void));
-void print_conflicts PARAMS ((void));
+void solve_conflicts PARAMS ((void));
+void print_conflicts PARAMS ((FILE *out));

 void print_reductions PARAMS ((int));
 void free_conflicts PARAMS ((void));
 
 void print_reductions PARAMS ((int));
 void free_conflicts PARAMS ((void));
 

diff --git a/src/files.c b/src/files.c
index 6084140c02fcca11986945208f59f958ac904538..03ca07a23aeb890380fcf3c31caaa287af492bea 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -39,6 +39,7 @@ struct obstack graph_obstack;
 char *spec_outfile = NULL;     /* for -o. */
 char *spec_file_prefix = NULL; /* for -b. */
 char *spec_name_prefix = NULL; /* for -p. */
 char *spec_outfile = NULL;     /* for -o. */
 char *spec_file_prefix = NULL; /* for -b. */
 char *spec_name_prefix = NULL; /* for -p. */

+char *spec_verbose_file = NULL;   /* for --verbose. */

 char *spec_graph_file = NULL;   /* for -g. */
 char *spec_defines_file = NULL; /* for --defines. */
 
 char *spec_graph_file = NULL;   /* for -g. */
 char *spec_defines_file = NULL; /* for --defines. */
 


@@ -97,7 +98,7 @@ compute_header_macro (void)
 {
   int ite;
   char *macro_name;
 {
   int ite;
   char *macro_name;

-  
+

   if (spec_defines_file)
     macro_name = xstrdup (spec_defines_file);
   else
   if (spec_defines_file)
     macro_name = xstrdup (spec_defines_file);
   else


@@ -105,7 +106,7 @@ compute_header_macro (void)
       macro_name = XMALLOC (char,
                            strlen (base_name) +
                            strlen (header_extension) + 1);
       macro_name = XMALLOC (char,
                            strlen (base_name) +
                            strlen (header_extension) + 1);

-      
+

       stpcpy (macro_name, base_name);
       strcat (macro_name, header_extension);
     }
       stpcpy (macro_name, base_name);
       strcat (macro_name, header_extension);
     }


@@ -392,6 +393,38 @@ compute_base_names (void)
   }
 }
 
   }
 }
 

+/*-------------------------------------------------------.
+| Close the open files, compute the output files names.  |
+`-------------------------------------------------------*/
+
+void
+compute_output_file_names (void)
+{
+  compute_base_names ();
+
+  /* If not yet done. */
+  if (!src_extension)
+    src_extension = ".c";
+  if (!header_extension)
+    header_extension = ".h";
+
+  /* It the defines filename if not given, we create it.  */
+  if (!spec_defines_file)
+    spec_defines_file = stringappend (base_name, header_extension);
+
+  /* It the graph filename if not given, we create it.  */
+  if (!spec_graph_file)
+    spec_graph_file = stringappend (short_base_name, ".vcg");
+
+  spec_verbose_file = stringappend (short_base_name, EXT_OUTPUT);
+
+  attrsfile = stringappend (short_base_name, EXT_STYPE_H);
+#ifndef MSDOS
+  stringappend (attrsfile, header_extension);
+#endif /* MSDOS */
+
+}
+

 /*-----------------------------------------------------------------.
 | Open the input file.  Look for the skeletons.  Find the names of |
 | the output files.  Prepare the obstacks.                         |
 /*-----------------------------------------------------------------.
 | Open the input file.  Look for the skeletons.  Find the names of |
 | the output files.  Prepare the obstacks.                         |


@@ -414,36 +447,23 @@ open_files (void)
 
 
 
 
 
 

-/*-----------------------------------------------------.
-| Close the open files, produce all the output files.  |
-`-----------------------------------------------------*/
+/*-----------------------.
+| Close the open file..  |
+`-----------------------*/

 
 void
 
 void

-output_files (void)
+close_files (void)

 {
   xfclose (finput);
 {
   xfclose (finput);

+}

 
 

-  compute_base_names ();
-
-  /* If not yet done. */
-  if (!src_extension)
-    src_extension = ".c";
-  if (!header_extension)
-    header_extension = ".h";
-
-  /* It the defines filename if not given, we create it.  */
-  if (!spec_defines_file)
-    spec_defines_file = stringappend (base_name, header_extension);
-  
-  /* It the graph filename if not given, we create it.  */
-  if (!spec_graph_file)
-    spec_graph_file = stringappend (short_base_name, ".vcg");
-  
-  attrsfile = stringappend (short_base_name, EXT_STYPE_H);
-#ifndef MSDOS
-  stringappend (attrsfile, header_extension);
-#endif /* MSDOS */
+/*---------------------------.
+| Produce the output files.  |
+`---------------------------*/

 
 

+void
+output_files (void)
+{

   /* Output the main file.  */
   if (spec_outfile)
     obstack_save (&table_obstack, spec_outfile);
   /* Output the main file.  */
   if (spec_outfile)
     obstack_save (&table_obstack, spec_outfile);


@@ -472,12 +492,6 @@ output_files (void)
       obstack_save (&guard_obstack, temp_name);
     }
 
       obstack_save (&guard_obstack, temp_name);
     }
 

-  if (verbose_flag)
-    /* We used to use just .out if spec_name_prefix (-p) was used, but
-       that conflicts with Posix.  */
-    obstack_save (&output_obstack,
-                 stringappend (short_base_name, EXT_OUTPUT));
-

   if (graph_flag)
     obstack_save (&graph_obstack, spec_graph_file);
 }
   if (graph_flag)
     obstack_save (&graph_obstack, spec_graph_file);
 }

diff --git a/src/files.h b/src/files.h
index 1d540f2c2b6188544e7cb8d53a69e4089df9ddbb..cf9f721dc4b99f0602db5c37576e6e4849e34b18 100644 (file)
--- a/src/files.h
+++ b/src/files.h
@@ -33,9 +33,12 @@ extern char *spec_name_prefix;
 /* File name pfx specified with -b, or 0 if no -b.  */
 extern char *spec_file_prefix;
 
 /* File name pfx specified with -b, or 0 if no -b.  */
 extern char *spec_file_prefix;
 

+/* --verbose. */
+extern char *spec_verbose_file;
+

 /* File name specified for the output VCG graph.  */
 extern char *spec_graph_file;
 /* File name specified for the output VCG graph.  */
 extern char *spec_graph_file;

- 
+

 /* File name specified with --defines.  */
 extern char *spec_defines_file;
 
 /* File name specified with --defines.  */
 extern char *spec_defines_file;
 


@@ -69,7 +72,9 @@ extern char *infile;
 extern char *attrsfile;
 
 void open_files PARAMS((void));
 extern char *attrsfile;
 
 void open_files PARAMS((void));

+void close_files PARAMS((void));

 
 

+void compute_output_file_names PARAMS((void));

 void output_files PARAMS((void));
 
 FILE *xfopen PARAMS ((const char *name, const char *mode));
 void output_files PARAMS((void));
 
 FILE *xfopen PARAMS ((const char *name, const char *mode));

diff --git a/src/main.c b/src/main.c
index 0e710920a2a73fdb5718b1485ca74d7b4a30abed..6e7a87c0f333fdcd6850c6ca7e264a52a1c05223 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -34,6 +34,7 @@
 #include "LR0.h"
 #include "conflicts.h"
 #include "print_graph.h"
 #include "LR0.h"
 #include "conflicts.h"
 #include "print_graph.h"

+#include "symtab.h"

 
 /* The name this program was run with, for messages.  */
 char *program_name;
 
 /* The name this program was run with, for messages.  */
 char *program_name;


@@ -79,7 +80,15 @@ main (int argc, char *argv[])
      lookahead is not enough to disambiguate the parsing.  In file
      conflicts.  Also resolve s/r conflicts based on precedence
      declarations.  */
      lookahead is not enough to disambiguate the parsing.  In file
      conflicts.  Also resolve s/r conflicts based on precedence
      declarations.  */

-  initialize_conflicts ();
+  solve_conflicts ();
+
+  /* Output file names. */
+  compute_output_file_names ();
+
+  /* Stop if there were errors, to avoid trashing previous output
+     files.  */
+  if (complain_message_count)
+    exit (1);

 
   /* Print information about results, if requested.  */
   print_results ();
 
   /* Print information about results, if requested.  */
   print_results ();


@@ -90,12 +99,17 @@ main (int argc, char *argv[])
   /* Output the tables and the parser to ftable.  In file output.  */
   output ();
 
   /* Output the tables and the parser to ftable.  In file output.  */
   output ();
 

+  /* Free the symbol table data structure.  */
+  free_symtab ();
+
+  /* Close the input files. */
+  close_files ();
+

   free_conflicts ();
   free_nullable ();
   free_derives ();
 
   free_conflicts ();
   free_nullable ();
   free_derives ();
 

-  if (!complain_message_count)
-    output_files ();
+  output_files ();

 
   exit (complain_message_count ? 1 : 0);
 }
 
   exit (complain_message_count ? 1 : 0);
 }

diff --git a/src/print.c b/src/print.c
index 6aa4c711e4f6d8356c11fc3a5b362c7b8f72d654..619b8a7614feda6946b35f48a1c6a75de798bb38 100644 (file)
--- a/src/print.c
+++ b/src/print.c
@@ -35,17 +35,17 @@
 static void
 print_token (int extnum, int token)
 {
 static void
 print_token (int extnum, int token)
 {

-  obstack_fgrow2 (&output_obstack, _(" type %d is %s\n"), extnum, tags[token]);
+  fprintf (out, _(" type %d is %s\n"), extnum, tags[token]);

 }
 #endif
 
 \f
 }
 #endif
 
 \f

-/*================================\
+/*--------------------------------.

 | Report information on a state.  |
 | Report information on a state.  |

-\================================*/
+`--------------------------------*/

 
 static void
 
 static void

-print_core (int state)
+print_core (FILE *out, int state)

 {
   int i;
   int k;
 {
   int i;
   int k;


@@ -68,30 +68,30 @@ print_core (int state)
        sp++;
 
       rule = -(*sp);
        sp++;
 
       rule = -(*sp);

-      obstack_fgrow1 (&output_obstack, "    %s  ->  ", tags[rlhs[rule]]);
+      fprintf (out, "    %s  ->  ", tags[rlhs[rule]]);

 
       for (sp = ritem + rrhs[rule]; sp < sp1; sp++)
        {
 
       for (sp = ritem + rrhs[rule]; sp < sp1; sp++)
        {

-         obstack_fgrow1 (&output_obstack, "%s ", tags[*sp]);
+         fprintf (out, "%s ", tags[*sp]);

        }
 
        }
 

-      obstack_1grow (&output_obstack, '.');
+      fputc ('.', out);

 
       while (*sp > 0)
        {
 
       while (*sp > 0)
        {

-         obstack_fgrow1 (&output_obstack, " %s", tags[*sp]);
+         fprintf (out, " %s", tags[*sp]);

          sp++;
        }
 
          sp++;
        }
 

-      obstack_fgrow1 (&output_obstack, _("   (rule %d)"), rule);
-      obstack_1grow (&output_obstack, '\n');
+      fprintf (out, _("   (rule %d)"), rule);
+      fputc ('\n', out);

     }
 
     }
 

-  obstack_1grow (&output_obstack, '\n');
+  fputc ('\n', out);

 }
 
 static void
 }
 
 static void

-print_actions (int state)
+print_actions (FILE *out, int state)

 {
   int i;
   int k;
 {
   int i;
   int k;


@@ -109,9 +109,9 @@ print_actions (int state)
   if (!shiftp && !redp)
     {
       if (final_state == state)
   if (!shiftp && !redp)
     {
       if (final_state == state)

-       obstack_sgrow (&output_obstack, _("    $default\taccept\n"));
+       fprintf (out, _("    $default\taccept\n"));

       else
       else

-       obstack_sgrow (&output_obstack, _("    NO ACTIONS\n"));
+       fprintf (out, _("    NO ACTIONS\n"));

       return;
     }
 
       return;
     }
 


@@ -129,16 +129,16 @@ print_actions (int state)
          if (ISVAR (symbol))
            break;
          if (symbol == 0)      /* I.e. strcmp(tags[symbol],"$")==0 */
          if (ISVAR (symbol))
            break;
          if (symbol == 0)      /* I.e. strcmp(tags[symbol],"$")==0 */

-           obstack_fgrow1 (&output_obstack,
-                           _("    $   \tgo to state %d\n"), state1);
+           fprintf (out,
+                    _("    $   \tgo to state %d\n"), state1);

          else
          else

-           obstack_fgrow2 (&output_obstack,
-                           _("    %-4s\tshift, and go to state %d\n"),
-                           tags[symbol], state1);
+           fprintf (out,
+                    _("    %-4s\tshift, and go to state %d\n"),
+                    tags[symbol], state1);

        }
 
       if (i > 0)
        }
 
       if (i > 0)

-       obstack_1grow (&output_obstack, '\n');
+       fputc ('\n', out);

     }
   else
     {
     }
   else
     {


@@ -157,21 +157,20 @@ print_actions (int state)
          if (!errp->errs[j])
            continue;
          symbol = errp->errs[j];
          if (!errp->errs[j])
            continue;
          symbol = errp->errs[j];

-         obstack_fgrow1 (&output_obstack, _("    %-4s\terror (nonassociative)\n"),
+         fprintf (out, _("    %-4s\terror (nonassociative)\n"),

                   tags[symbol]);
        }
 
       if (j > 0)
                   tags[symbol]);
        }
 
       if (j > 0)

-       obstack_1grow (&output_obstack, '\n');
+       fputc ('\n', out);

     }
 
   if (consistent[state] && redp)
     {
       rule = redp->rules[0];
       symbol = rlhs[rule];
     }
 
   if (consistent[state] && redp)
     {
       rule = redp->rules[0];
       symbol = rlhs[rule];

-      obstack_fgrow2 (&output_obstack,
-                     _("    $default\treduce using rule %d (%s)\n\n"),
-                     rule, tags[symbol]);
+      fprintf (out, _("    $default\treduce using rule %d (%s)\n\n"),
+              rule, tags[symbol]);

     }
   else if (redp)
     {
     }
   else if (redp)
     {


@@ -186,42 +185,41 @@ print_actions (int state)
            continue;
          state1 = shiftp->shifts[i];
          symbol = accessing_symbol[state1];
            continue;
          state1 = shiftp->shifts[i];
          symbol = accessing_symbol[state1];

-         obstack_fgrow2 (&output_obstack,
-                         _("    %-4s\tgo to state %d\n"),
-                         tags[symbol], state1);
+         fprintf (out, _("    %-4s\tgo to state %d\n"),
+                  tags[symbol], state1);

        }
 
        }
 

-      obstack_1grow (&output_obstack, '\n');
+      fputc ('\n', out);

     }
 }
 
 static void
     }
 }
 
 static void

-print_state (int state)
+print_state (FILE *out, int state)

 {
 {

-  obstack_sgrow (&output_obstack, "\n\n");
-  obstack_fgrow1 (&output_obstack, _("state %d"), state);
-  obstack_sgrow (&output_obstack, "\n\n");
-  print_core (state);
-  print_actions (state);
+  fputs ("\n\n", out);
+  fprintf (out, _("state %d"), state);
+  fputs ("\n\n", out);
+  print_core (out, state);
+  print_actions (out, state);

 }
 \f
 /*-----------------------------------------.
 | Print information on the whole grammar.  |
 `-----------------------------------------*/
 
 }
 \f
 /*-----------------------------------------.
 | Print information on the whole grammar.  |
 `-----------------------------------------*/
 

-#define END_TEST(End)                                          \
-do {                                                           \
-  if (column + strlen(buffer) > (End))                         \
-    {                                                          \
-      obstack_fgrow1 (&output_obstack, "%s\n   ", buffer);     \
-      column = 3;                                              \
-      buffer[0] = 0;                                           \
-    }                                                          \
+#define END_TEST(End)                          \
+do {                                           \
+  if (column + strlen(buffer) > (End))         \
+    {                                          \
+      fprintf (out, "%s\n   ", buffer);                \
+      column = 3;                              \
+      buffer[0] = 0;                           \
+    }                                          \

 } while (0)
 
 
 static void
 } while (0)
 
 
 static void

-print_grammar (void)
+print_grammar (FILE *out)

 {
   int i, j;
   short *rule;
 {
   int i, j;
   short *rule;


@@ -229,37 +227,30 @@ print_grammar (void)
   int column = 0;
 
   /* rule # : LHS -> RHS */
   int column = 0;
 
   /* rule # : LHS -> RHS */

-  obstack_1grow (&output_obstack, '\n');
-  obstack_sgrow (&output_obstack, _("Grammar"));
-  obstack_1grow (&output_obstack, '\n');
+  fprintf (out, "\n%s\n", _("Grammar"));

   for (i = 1; i <= nrules; i++)
     /* Don't print rules disabled in reduce_grammar_tables.  */
     if (rlhs[i] >= 0)
       {
   for (i = 1; i <= nrules; i++)
     /* Don't print rules disabled in reduce_grammar_tables.  */
     if (rlhs[i] >= 0)
       {

-       obstack_fgrow2 (&output_obstack,
-                       _("rule %-4d %s ->"), i, tags[rlhs[i]]);
+       fprintf (out, _("rule %-4d %s ->"), i, tags[rlhs[i]]);

        rule = &ritem[rrhs[i]];
        if (*rule > 0)
          while (*rule > 0)
        rule = &ritem[rrhs[i]];
        if (*rule > 0)
          while (*rule > 0)

-           obstack_fgrow1 (&output_obstack, " %s", tags[*rule++]);
+           fprintf (out, " %s", tags[*rule++]);

        else
        else

-         obstack_sgrow (&output_obstack, _("           /* empty */"));
-       obstack_1grow (&output_obstack, '\n');
+         fprintf (out, "               /* %s */\n", _("empty"));

       }
 
   /* TERMINAL (type #) : rule #s terminal is on RHS */
       }
 
   /* TERMINAL (type #) : rule #s terminal is on RHS */

-  obstack_sgrow (&output_obstack, "\n");
-  obstack_sgrow (&output_obstack,
-                _("Terminals, with rules where they appear"));
-  obstack_sgrow (&output_obstack, "\n\n");
-  obstack_fgrow1 (&output_obstack, "%s (-1)\n", tags[0]);
+  fprintf (out, "\n%s\n\n", _("Terminals, with rules where they appear"));
+  fprintf (out, "%s (-1)\n", tags[0]);

 
   for (i = 0; i <= max_user_token_number; i++)
     if (token_translations[i] != 2)
       {
        buffer[0] = 0;
        column = strlen (tags[token_translations[i]]);
 
   for (i = 0; i <= max_user_token_number; i++)
     if (token_translations[i] != 2)
       {
        buffer[0] = 0;
        column = strlen (tags[token_translations[i]]);

-       obstack_sgrow (&output_obstack, tags[token_translations[i]]);
+       fputs (tags[token_translations[i]], out);

        END_TEST (50);
        sprintf (buffer, " (%d)", i);
 
        END_TEST (50);
        sprintf (buffer, " (%d)", i);
 


@@ -271,13 +262,11 @@ print_grammar (void)
                sprintf (buffer + strlen (buffer), " %d", j);
                break;
              }
                sprintf (buffer + strlen (buffer), " %d", j);
                break;
              }

-       obstack_fgrow1 (&output_obstack, "%s\n", buffer);
+       fprintf (out, "%s\n", buffer);

       }
 
       }
 

-  obstack_sgrow (&output_obstack, "\n");
-  obstack_sgrow (&output_obstack,
-                _("Nonterminals, with rules where they appear"));
-  obstack_sgrow (&output_obstack, "\n\n");
+  fprintf (out, "\n%s\n\n",
+          _("Nonterminals, with rules where they appear"));

   for (i = ntokens; i <= nsyms - 1; i++)
     {
       int left_count = 0, right_count = 0;
   for (i = ntokens; i <= nsyms - 1; i++)
     {
       int left_count = 0, right_count = 0;


@@ -295,7 +284,7 @@ print_grammar (void)
        }
 
       buffer[0] = 0;
        }
 
       buffer[0] = 0;

-      obstack_sgrow (&output_obstack, tags[i]);
+      fputs (tags[i], out);

       column = strlen (tags[i]);
       sprintf (buffer, " (%d)", i);
       END_TEST (0);
       column = strlen (tags[i]);
       sprintf (buffer, " (%d)", i);
       END_TEST (0);


@@ -330,22 +319,33 @@ print_grammar (void)
                  }
            }
        }
                  }
            }
        }

-      obstack_fgrow1 (&output_obstack, "%s\n", buffer);
+      fprintf (out, "%s\n", buffer);

     }
 }
 \f
 void
 print_results (void)
 {
     }
 }
 \f
 void
 print_results (void)
 {

-  int i;
+  if (verbose_flag)
+    {
+      int i;

 
 

-  if (any_conflicts)
-    print_conflicts ();
+      /* We used to use just .out if spec_name_prefix (-p) was used, but
+        that conflicts with Posix.  */
+      FILE *out = xfopen (spec_verbose_file, "w");

 
 

-  if (verbose_flag)
-    print_grammar ();
+      size_t size = obstack_object_size (&output_obstack);
+      fwrite (obstack_finish (&output_obstack), 1, size, out);

 
 

-  if (verbose_flag)
-    for (i = 0; i < nstates; i++)
-      print_state (i);
+      if (any_conflicts)
+       print_conflicts (out);
+
+      print_grammar (out);
+
+      for (i = 0; i < nstates; i++)
+       print_state (out, i);
+
+      xfclose (out);
+    }
+  obstack_free (&output_obstack, NULL);

 }
 }

diff --git a/src/reader.c b/src/reader.c
index 0517abdc961fdedbd22bfd3899753dbb6ddab12e..2e4898467012f06a90980b26a58283fc807a99c8 100644 (file)
--- a/src/reader.c
+++ b/src/reader.c
@@ -1959,9 +1959,6 @@ reader (void)
   packsymbols ();
   /* Convert the grammar into the format described in gram.h.  */
   packgram ();
   packsymbols ();
   /* Convert the grammar into the format described in gram.h.  */
   packgram ();

-  /* Free the symbol table data structure since symbols are now all
-     referred to by symbol number.  */
-  free_symtab ();

 }
 
 
 }