From 2f1afb737f4b8e0a4ea3f5d02e25858cc709e466 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Mon, 10 Jun 2002 08:35:39 +0000 Subject: [PATCH] Move symbols handling code out of the reader. * src/reader.h, src/reader.c (errtoken, undeftoken, eoftoken) (axiom): Move to... * src/symtab.h, src/symtab.c: here. * src/gram.c (start_symbol): Remove: use startsymbol->number. * src/reader.c (startval): Rename as... * src/symtab.h, src/symtab.c (startsymbol): this. * src/reader.c: Adjust. * src/reader.c (symbol_check_defined, symbol_make_alias) (symbol_check_alias_consistence, symbol_pack, symbol_translation) (token_translations_init) Move to... * src/symtab.c: here. * src/reader.c (packsymbols): Move to... * src/symtab.h, src/symtab.c (symbols_pack): here. * src/symtab.h, src/symtab.c (symbol_make_alias): Takes SYMVAL as argument. --- ChangeLog | 23 +++++ po/de.po | 152 ++++++++++++++---------------- po/es.po | 157 ++++++++++++++----------------- po/et.po | 152 ++++++++++++++---------------- po/fr.po | 152 ++++++++++++++---------------- po/hr.po | 148 +++++++++++++---------------- po/it.po | 148 +++++++++++++---------------- po/ja.po | 152 ++++++++++++++---------------- po/nl.po | 152 ++++++++++++++---------------- po/ru.po | 143 ++++++++++++---------------- po/sv.po | 152 ++++++++++++++---------------- po/tr.po | 150 +++++++++++++---------------- src/gram.c | 2 - src/reader.c | 261 ++------------------------------------------------- src/reader.h | 5 - src/reduce.c | 10 +- src/symtab.c | 259 +++++++++++++++++++++++++++++++++++++++++++++++++- src/symtab.h | 45 ++++++++- 18 files changed, 1071 insertions(+), 1192 deletions(-) diff --git a/ChangeLog b/ChangeLog index a665ebd0..02a0e19d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,26 @@ +2002-06-09 Akim Demaille + + Move symbols handling code out of the reader. + + * src/reader.h, src/reader.c (errtoken, undeftoken, eoftoken) + (axiom): Move to... + * src/symtab.h, src/symtab.c: here. + + * src/gram.c (start_symbol): Remove: use startsymbol->number. + * src/reader.c (startval): Rename as... + * src/symtab.h, src/symtab.c (startsymbol): this. + * src/reader.c: Adjust. + + * src/reader.c (symbol_check_defined, symbol_make_alias) + (symbol_check_alias_consistence, symbol_pack, symbol_translation) + (token_translations_init) + Move to... + * src/symtab.c: here. + * src/reader.c (packsymbols): Move to... + * src/symtab.h, src/symtab.c (symbols_pack): here. + * src/symtab.h, src/symtab.c (symbol_make_alias): Takes SYMVAL as + argument. + 2002-06-03 Akim Demaille * src/muscle_tab.c (muscle_insert, muscle_find): Declarations, diff --git a/po/de.po b/po/de.po index 2c90fe6c..e3f20c80 100644 --- a/po/de.po +++ b/po/de.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: bison 1.35\n" -"POT-Creation-Date: 2002-06-03 09:28+0200\n" +"POT-Creation-Date: 2002-06-10 10:30+0200\n" "PO-Revision-Date: 2002-04-26 11:58:57+0200\n" "Last-Translator: Michael Piefel \n" "Language-Team: German \n" @@ -251,7 +251,7 @@ msgstr "zu viele Gotos (max %d)" msgid "unexpected `/' found and ignored" msgstr "»/« wird hier nicht erwartet und wird deshalb ignoriert" -#: src/lex.c:106 src/reader.c:480 +#: src/lex.c:106 src/reader.c:311 msgid "unterminated comment" msgstr "unbeendeter Kommentar" @@ -401,232 +401,190 @@ msgstr " auf der linken Seite:" msgid " on right:" msgstr " auf der rechten Seite:" -#: src/reader.c:100 -#, 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:119 -#, c-format -msgid "symbol `%s' used more than once as a literal string" -msgstr "Symbol »%s« wird mehr als einmal als literale Zeichenkette benutzt" - -#: src/reader.c:122 -#, c-format -msgid "symbol `%s' given more than one literal string" -msgstr "Symbol »%s« wird mehr als eine literale Zeichenkette gegeben" - -#: src/reader.c:157 -#, c-format -msgid "conflicting precedences for %s and %s" -msgstr "Vorrang für %s und %s widersprechen sich" - -#: src/reader.c:168 -#, c-format -msgid "conflicting assoc values for %s and %s" -msgstr "Assoziativitäts-Werte für %s und %s widersprechen sich" - -#: src/reader.c:236 -#, c-format -msgid "tokens %s and %s both assigned number %d" -msgstr "Token %s und %s haben die selbe Nummer %d" - -#: src/reader.c:256 +#: src/reader.c:87 msgid " Skipping to next \\n" msgstr " Überspringe Zeichen bis zum nächsten \\n" -#: src/reader.c:258 +#: src/reader.c:89 #, c-format msgid " Skipping to next %c" msgstr " Überspringe Zeichen bis zum nächten %c" -#: src/reader.c:309 src/reader.c:321 +#: src/reader.c:140 src/reader.c:152 msgid "invalid $ value" msgstr "unzulässiger $-Wert" -#: src/reader.c:370 src/reader.c:385 +#: src/reader.c:201 src/reader.c:216 msgid "unterminated string at end of file" msgstr "unbeendete Zeichenkette am Ende der Datei" -#: src/reader.c:373 +#: src/reader.c:204 msgid "unterminated string" msgstr "unbeendete Zeichenkette" -#: src/reader.c:514 src/reader.c:573 +#: src/reader.c:345 src/reader.c:404 #, fuzzy, c-format msgid "invalid value: %s%d" msgstr "unzulässiger @-Wert" -#: src/reader.c:523 src/reader.c:591 +#: src/reader.c:354 src/reader.c:422 #, c-format msgid "%s is invalid" msgstr "%s ist unzulässig" -#: src/reader.c:559 +#: src/reader.c:390 #, c-format msgid "$$ of `%s' has no declared type" msgstr "$$ von »%s« hat keinen deklarierten Typ" -#: src/reader.c:579 +#: src/reader.c:410 #, c-format msgid "$%d of `%s' has no declared type" msgstr "$%d von »%s« hat keinen deklarierten Typ" -#: src/reader.c:641 +#: src/reader.c:472 msgid "unterminated `%{' definition" msgstr "unbeendete »%{«-Definition" -#: src/reader.c:686 src/reader.c:796 src/reader.c:847 src/reader.c:1099 +#: src/reader.c:517 src/reader.c:627 src/reader.c:678 src/reader.c:930 #, c-format msgid "Premature EOF after %s" msgstr "Vorzeitiges EOF nach %s" -#: src/reader.c:711 src/reader.c:866 +#: src/reader.c:542 src/reader.c:697 #, c-format msgid "symbol %s redefined" msgstr "Symbol %s noch einmal definiert" -#: src/reader.c:723 src/reader.c:811 src/reader.c:877 +#: src/reader.c:554 src/reader.c:642 src/reader.c:708 #, c-format msgid "type redeclaration for %s" msgstr "erneute Deklaration des Typs für %s" -#: src/reader.c:741 +#: src/reader.c:572 #, c-format msgid "`%s' is invalid in %s" msgstr "»%s« ist in %s nicht erlaubt" -#: src/reader.c:759 src/reader.c:923 +#: src/reader.c:590 src/reader.c:754 #, c-format msgid "multiple %s declarations" msgstr "mehr als eine %s-Deklaration" -#: src/reader.c:761 src/reader.c:1079 src/reader.c:1094 src/reader.c:1127 -#: src/reader.c:1141 +#: src/reader.c:592 src/reader.c:910 src/reader.c:925 src/reader.c:958 +#: src/reader.c:972 #, c-format msgid "invalid %s declaration" msgstr "ungültige %s-Deklaration" -#: src/reader.c:781 +#: src/reader.c:612 msgid "%type declaration has no " msgstr "%type-Deklaration hat keinen " -#: src/reader.c:816 +#: src/reader.c:647 #, c-format msgid "invalid %%type declaration due to item: %s" msgstr "ungültige %%type-Deklaration wegen: %s" -#: src/reader.c:862 +#: src/reader.c:693 #, c-format msgid "redefining precedence of %s" msgstr "Vorrang von %s wird erneut definiert" -#: src/reader.c:889 +#: src/reader.c:720 #, c-format msgid "invalid text (%s) - number should be after identifier" msgstr "unzulässiger Text (%s) - Zahl sollte nach Bezeichner kommen" -#: src/reader.c:899 +#: src/reader.c:730 #, c-format msgid "unexpected item: %s" msgstr "unerwartetes Symbol: %s" -#: src/reader.c:956 src/reader.c:1316 +#: src/reader.c:787 src/reader.c:1147 #, c-format msgid "unmatched %s" msgstr "%s ohne Gegenstück" -#: src/reader.c:985 +#: src/reader.c:816 #, c-format msgid "argument of %%expect is not an integer" msgstr "Argument von %%expect ist keine ganze Zahl" -#: src/reader.c:1031 +#: src/reader.c:862 #, c-format msgid "unrecognized item %s, expected an identifier" msgstr "unerwartetes Symbol %s, hier wird ein Bezeichner erwartet" -#: src/reader.c:1053 +#: src/reader.c:884 #, c-format msgid "expected string constant instead of %s" msgstr "hier wird eine Zeichenkette erwartet, nicht %s" -#: src/reader.c:1249 +#: src/reader.c:1080 #, c-format msgid "unrecognized: %s" msgstr "unbekannt: %s" -#: src/reader.c:1254 +#: src/reader.c:1085 msgid "no input grammar" msgstr "keine Eingabe-Grammatik" -#: src/reader.c:1259 +#: src/reader.c:1090 #, c-format msgid "unknown character: %s" msgstr "unbekanntes Zeichen: %s" -#: src/reader.c:1411 +#: src/reader.c:1242 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:1418 +#: src/reader.c:1249 msgid "grammar starts with vertical bar" msgstr "Grammatik fängt mit einem vertikalen Strich (»|«) an" -#: src/reader.c:1446 +#: src/reader.c:1277 #, 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:1476 src/reader.c:1586 +#: src/reader.c:1307 src/reader.c:1417 msgid "previous rule lacks an ending `;'" msgstr "vorangehende Regel hat kein abschließendes »;«" -#: src/reader.c:1554 +#: src/reader.c:1385 msgid "two @prec's in a row" msgstr "zwei @prec-Anweisungen nacheinander" -#: src/reader.c:1564 +#: src/reader.c:1395 msgid "two actions at end of one rule" msgstr "Zwei Aktionen am Ende einer Regel" -#: src/reader.c:1578 +#: src/reader.c:1409 #, c-format msgid "type clash (`%s' `%s') on default action" msgstr "Typkonflikt (»%s« »%s«) bei Default-Aktion" -#: src/reader.c:1584 +#: src/reader.c:1415 msgid "empty rule for typed nonterminal, and no action" msgstr "leere Regel für Nicht-Terminal mit Typ und keine Aktion" -#: src/reader.c:1592 +#: src/reader.c:1423 #, c-format msgid "invalid input: %s" msgstr "ungültige Eingabe: %s" -#: src/reader.c:1599 +#: src/reader.c:1430 msgid "no rules in the input grammar" msgstr "Eingabegrammatik enthält keine Regeln" -#: src/reader.c:1620 +#: src/reader.c:1450 #, c-format msgid "too many symbols (tokens plus nonterminals); maximum %d" msgstr "zu viele Symbole (Token plus Nicht-Terminale); Maximum %d" -#: src/reader.c:1723 -#, c-format -msgid "the start symbol %s is undefined" -msgstr "das Startsymbol %s ist undefiniert" - -#: src/reader.c:1725 -#, c-format -msgid "the start symbol %s is a token" -msgstr "das Startsymbol %s ist ein Token" - #: src/reduce.c:338 msgid "Useless nonterminals:" msgstr "Nutzlose Nicht-Terminale:" @@ -736,6 +694,32 @@ msgstr "»" msgid "'" msgstr "«" +#~ 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" + +#~ msgid "symbol `%s' used more than once as a literal string" +#~ msgstr "Symbol »%s« wird mehr als einmal als literale Zeichenkette benutzt" + +#~ msgid "symbol `%s' given more than one literal string" +#~ msgstr "Symbol »%s« wird mehr als eine literale Zeichenkette gegeben" + +#~ msgid "conflicting precedences for %s and %s" +#~ msgstr "Vorrang für %s und %s widersprechen sich" + +#~ msgid "conflicting assoc values for %s and %s" +#~ msgstr "Assoziativitäts-Werte für %s und %s widersprechen sich" + +#~ msgid "tokens %s and %s both assigned number %d" +#~ msgstr "Token %s und %s haben die selbe Nummer %d" + +#~ msgid "the start symbol %s is undefined" +#~ msgstr "das Startsymbol %s ist undefiniert" + +#~ msgid "the start symbol %s is a token" +#~ msgstr "das Startsymbol %s ist ein Token" + #~ msgid "reduce" #~ msgstr "durch Reduzierung gelöst" diff --git a/po/es.po b/po/es.po index 03a4991a..f7520e99 100644 --- a/po/es.po +++ b/po/es.po @@ -29,7 +29,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU bison 1.35\n" -"POT-Creation-Date: 2002-06-03 09:28+0200\n" +"POT-Creation-Date: 2002-06-10 10:30+0200\n" "PO-Revision-Date: 2002-04-03 10:19+0200\n" "Last-Translator: Nicolás García-Pedrajas \n" "Language-Team: Spanish \n" @@ -315,7 +315,7 @@ msgstr "demasiados gotos (m msgid "unexpected `/' found and ignored" msgstr "se ha encontrado `/' cuando no se esperaba, no se tendrán en cuenta" -#: src/lex.c:106 src/reader.c:480 +#: src/lex.c:106 src/reader.c:311 msgid "unterminated comment" msgstr "comentario sin terminar" @@ -466,126 +466,92 @@ msgstr " en la izquierda:" msgid " on right:" msgstr " en la derecha:" -# `token' se debe traducir como `literal' - cll -# en terminología de compiladores token es más un terminal - ngp -# -#: src/reader.c:100 -#, 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:119 -#, c-format -msgid "symbol `%s' used more than once as a literal string" -msgstr "símbolo `%s' utilizado más de una vez como cadena literal" - -#: src/reader.c:122 -#, c-format -msgid "symbol `%s' given more than one literal string" -msgstr "al símbolo `%s' se le ha dado más de una cadena literal" - -#: src/reader.c:157 -#, c-format -msgid "conflicting precedences for %s and %s" -msgstr "precedencias en conflicto entre %s y %s" - -#: src/reader.c:168 -#, c-format -msgid "conflicting assoc values for %s and %s" -msgstr "conflicto de valores assoc para %s y %s" - -#: src/reader.c:236 -#, c-format -msgid "tokens %s and %s both assigned number %d" -msgstr "los terminales %s y %s tienen asignados ambos el número %d" - -#: src/reader.c:256 +#: src/reader.c:87 msgid " Skipping to next \\n" msgstr " Saltando al siguiente \\n" -#: src/reader.c:258 +#: src/reader.c:89 #, c-format msgid " Skipping to next %c" msgstr " Saltando al siguiente %c" -#: src/reader.c:309 src/reader.c:321 +#: src/reader.c:140 src/reader.c:152 msgid "invalid $ value" msgstr "valor $ no válido" -#: src/reader.c:370 src/reader.c:385 +#: src/reader.c:201 src/reader.c:216 msgid "unterminated string at end of file" msgstr "cadena sin terminar al final del fichero" -#: src/reader.c:373 +#: src/reader.c:204 msgid "unterminated string" msgstr "cadena sin terminar" -#: src/reader.c:514 src/reader.c:573 +#: src/reader.c:345 src/reader.c:404 #, fuzzy, c-format msgid "invalid value: %s%d" msgstr "valor @ no válido" -#: src/reader.c:523 src/reader.c:591 +#: src/reader.c:354 src/reader.c:422 #, c-format msgid "%s is invalid" msgstr "%s no es válido" -#: src/reader.c:559 +#: src/reader.c:390 #, c-format msgid "$$ of `%s' has no declared type" msgstr "$$ de `%s' no tiene tipo declarado" -#: src/reader.c:579 +#: src/reader.c:410 #, c-format msgid "$%d of `%s' has no declared type" msgstr "$%d de `%s' no tiene tipo declarado" -#: src/reader.c:641 +#: src/reader.c:472 msgid "unterminated `%{' definition" msgstr "definición `%{' sin terminar" -#: src/reader.c:686 src/reader.c:796 src/reader.c:847 src/reader.c:1099 +#: src/reader.c:517 src/reader.c:627 src/reader.c:678 src/reader.c:930 #, c-format msgid "Premature EOF after %s" msgstr "EOF prematuro después de %s" -#: src/reader.c:711 src/reader.c:866 +#: src/reader.c:542 src/reader.c:697 #, c-format msgid "symbol %s redefined" msgstr "redefinido el símbolo %s" -#: src/reader.c:723 src/reader.c:811 src/reader.c:877 +#: src/reader.c:554 src/reader.c:642 src/reader.c:708 #, c-format msgid "type redeclaration for %s" msgstr "redeclaración del tipo de %s" -#: src/reader.c:741 +#: src/reader.c:572 #, c-format msgid "`%s' is invalid in %s" msgstr "`%s' no es válido en %s" -#: src/reader.c:759 src/reader.c:923 +#: src/reader.c:590 src/reader.c:754 #, c-format msgid "multiple %s declarations" msgstr "múltiples declaraciones de %s" -#: src/reader.c:761 src/reader.c:1079 src/reader.c:1094 src/reader.c:1127 -#: src/reader.c:1141 +#: src/reader.c:592 src/reader.c:910 src/reader.c:925 src/reader.c:958 +#: src/reader.c:972 #, c-format msgid "invalid %s declaration" msgstr "declaración de %s no válida" -#: src/reader.c:781 +#: src/reader.c:612 msgid "%type declaration has no " msgstr "la declaración %type no tiene " -#: src/reader.c:816 +#: src/reader.c:647 #, 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:862 +#: src/reader.c:693 #, c-format msgid "redefining precedence of %s" msgstr "redefinición de la precedencia de %s" @@ -594,7 +560,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 -#: src/reader.c:889 +#: src/reader.c:720 #, c-format msgid "invalid text (%s) - number should be after identifier" msgstr "" @@ -604,18 +570,18 @@ msgstr "" # 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:899 +#: src/reader.c:730 #, 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:956 src/reader.c:1316 +#: src/reader.c:787 src/reader.c:1147 #, c-format msgid "unmatched %s" msgstr "%s desemparejado/a" -#: src/reader.c:985 +#: src/reader.c:816 #, c-format msgid "argument of %%expect is not an integer" msgstr "el argumento de %%expect no es un entero" @@ -626,88 +592,78 @@ msgstr "el argumento de %%expect no es un entero" # - cll # ok - ngp # -#: src/reader.c:1031 +#: src/reader.c:862 #, c-format msgid "unrecognized item %s, expected an identifier" msgstr "no se reconoce el ítem %s, se esperaba un identificador" -#: src/reader.c:1053 +#: src/reader.c:884 #, c-format msgid "expected string constant instead of %s" msgstr "se esperaba una cadena constante en lugar de %s" -#: src/reader.c:1249 +#: src/reader.c:1080 #, c-format msgid "unrecognized: %s" msgstr "no reconocido: %s" -#: src/reader.c:1254 +#: src/reader.c:1085 msgid "no input grammar" msgstr "no hay gramática de entrada" -#: src/reader.c:1259 +#: src/reader.c:1090 #, c-format msgid "unknown character: %s" msgstr "carácter desconocido: %s" -#: src/reader.c:1411 +#: src/reader.c:1242 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:1418 +#: src/reader.c:1249 msgid "grammar starts with vertical bar" msgstr "la gramática comienza con una barra vertical" -#: src/reader.c:1446 +#: src/reader.c:1277 #, 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:1476 src/reader.c:1586 +#: src/reader.c:1307 src/reader.c:1417 msgid "previous rule lacks an ending `;'" msgstr "a la regla previa le falta un `;' al final" -#: src/reader.c:1554 +#: src/reader.c:1385 msgid "two @prec's in a row" msgstr "dos @prec en una línea" -#: src/reader.c:1564 +#: src/reader.c:1395 msgid "two actions at end of one rule" msgstr "dos acciones al final de una regla" -#: src/reader.c:1578 +#: src/reader.c:1409 #, 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:1584 +#: src/reader.c:1415 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:1592 +#: src/reader.c:1423 #, c-format msgid "invalid input: %s" msgstr "entrada no válida: %s" -#: src/reader.c:1599 +#: src/reader.c:1430 msgid "no rules in the input grammar" msgstr "no hay reglas en la gramática de entrada" -#: src/reader.c:1620 +#: src/reader.c:1450 #, c-format msgid "too many symbols (tokens plus nonterminals); maximum %d" msgstr "demasiados símbolos (terminales y no terminales); máximo %d" -#: src/reader.c:1723 -#, c-format -msgid "the start symbol %s is undefined" -msgstr "el símbolo de inicio (axioma) %s no está definido" - -#: src/reader.c:1725 -#, c-format -msgid "the start symbol %s is a token" -msgstr "el símbolo de inicio (axioma) %s es un terminal" - #: src/reduce.c:338 msgid "Useless nonterminals:" msgstr "No terminales sin uso:" @@ -841,6 +797,35 @@ msgstr "`" msgid "'" msgstr "'" +# `token' se debe traducir como `literal' - cll +# en terminología de compiladores token es más un terminal - ngp +# +#~ 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" + +#~ msgid "symbol `%s' used more than once as a literal string" +#~ msgstr "símbolo `%s' utilizado más de una vez como cadena literal" + +#~ msgid "symbol `%s' given more than one literal string" +#~ msgstr "al símbolo `%s' se le ha dado más de una cadena literal" + +#~ msgid "conflicting precedences for %s and %s" +#~ msgstr "precedencias en conflicto entre %s y %s" + +#~ msgid "conflicting assoc values for %s and %s" +#~ msgstr "conflicto de valores assoc para %s y %s" + +#~ msgid "tokens %s and %s both assigned number %d" +#~ msgstr "los terminales %s y %s tienen asignados ambos el número %d" + +#~ msgid "the start symbol %s is undefined" +#~ msgstr "el símbolo de inicio (axioma) %s no está definido" + +#~ msgid "the start symbol %s is a token" +#~ msgstr "el símbolo de inicio (axioma) %s es un terminal" + #~ msgid "reduce" #~ msgstr "reduce" diff --git a/po/et.po b/po/et.po index 2904bbec..6ba2aea5 100644 --- a/po/et.po +++ b/po/et.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: bison 1.33b\n" -"POT-Creation-Date: 2002-06-03 09:28+0200\n" +"POT-Creation-Date: 2002-06-10 10:30+0200\n" "PO-Revision-Date: 2002-03-05 16:27+0200\n" "Last-Translator: Toomas Soome \n" "Language-Team: Estonian \n" @@ -242,7 +242,7 @@ msgstr "liiga palju gotosid (maks %d)" msgid "unexpected `/' found and ignored" msgstr "leidsin ja ignoreerin ootamatu `/'" -#: src/lex.c:106 src/reader.c:480 +#: src/lex.c:106 src/reader.c:311 msgid "unterminated comment" msgstr "lõpetamata kommentaar" @@ -391,230 +391,188 @@ msgstr " vasakul:" msgid " on right:" msgstr " paremal:" -#: src/reader.c:100 -#, 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:119 -#, c-format -msgid "symbol `%s' used more than once as a literal string" -msgstr "sümbolit `%s' on kasutatud enam kui kord literaal sõnena" - -#: src/reader.c:122 -#, c-format -msgid "symbol `%s' given more than one literal string" -msgstr "sümbolile `%s' on antud enam kui üks literaal sõne" - -#: src/reader.c:157 -#, c-format -msgid "conflicting precedences for %s and %s" -msgstr "%s ja %s omavad konfliktseid prioriteete" - -#: src/reader.c:168 -#, c-format -msgid "conflicting assoc values for %s and %s" -msgstr "%s ja %s omavad konfliktseid assotsiatiivseid väärtuseid" - -#: src/reader.c:236 -#, 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:256 +#: src/reader.c:87 msgid " Skipping to next \\n" msgstr " Liigun järgmisele \\n" -#: src/reader.c:258 +#: src/reader.c:89 #, c-format msgid " Skipping to next %c" msgstr " Liigun järgmisele %c" -#: src/reader.c:309 src/reader.c:321 +#: src/reader.c:140 src/reader.c:152 msgid "invalid $ value" msgstr "vigane $ väärtus" -#: src/reader.c:370 src/reader.c:385 +#: src/reader.c:201 src/reader.c:216 msgid "unterminated string at end of file" msgstr "lõpetamata sõne faili lõpus" -#: src/reader.c:373 +#: src/reader.c:204 msgid "unterminated string" msgstr "lõpetamata sõne" -#: src/reader.c:514 src/reader.c:573 +#: src/reader.c:345 src/reader.c:404 #, fuzzy, c-format msgid "invalid value: %s%d" msgstr "vigane @ väärtus" -#: src/reader.c:523 src/reader.c:591 +#: src/reader.c:354 src/reader.c:422 #, c-format msgid "%s is invalid" msgstr "%s on vigane" -#: src/reader.c:559 +#: src/reader.c:390 #, c-format msgid "$$ of `%s' has no declared type" msgstr "`%s' $$ ei oma deklareeritud tüüpi" -#: src/reader.c:579 +#: src/reader.c:410 #, c-format msgid "$%d of `%s' has no declared type" msgstr "$%d `%s' ei oma deklareeritud tüüpi" -#: src/reader.c:641 +#: src/reader.c:472 msgid "unterminated `%{' definition" msgstr "lõpetamata `%{' definitsioon" -#: src/reader.c:686 src/reader.c:796 src/reader.c:847 src/reader.c:1099 +#: src/reader.c:517 src/reader.c:627 src/reader.c:678 src/reader.c:930 #, c-format msgid "Premature EOF after %s" msgstr "Enneaegne EOF peale %s" -#: src/reader.c:711 src/reader.c:866 +#: src/reader.c:542 src/reader.c:697 #, c-format msgid "symbol %s redefined" msgstr "sümbol %s on uuesti defineeritud" -#: src/reader.c:723 src/reader.c:811 src/reader.c:877 +#: src/reader.c:554 src/reader.c:642 src/reader.c:708 #, c-format msgid "type redeclaration for %s" msgstr "%s tüübi uuesti deklareerimine" -#: src/reader.c:741 +#: src/reader.c:572 #, c-format msgid "`%s' is invalid in %s" msgstr "`%s' ei ole %s sees lubatud" -#: src/reader.c:759 src/reader.c:923 +#: src/reader.c:590 src/reader.c:754 #, c-format msgid "multiple %s declarations" msgstr "korduvad %s deklaratsioonid" -#: src/reader.c:761 src/reader.c:1079 src/reader.c:1094 src/reader.c:1127 -#: src/reader.c:1141 +#: src/reader.c:592 src/reader.c:910 src/reader.c:925 src/reader.c:958 +#: src/reader.c:972 #, c-format msgid "invalid %s declaration" msgstr "vigane %s deklaratsioon" -#: src/reader.c:781 +#: src/reader.c:612 msgid "%type declaration has no " msgstr "%type deklaratsioonis puudub " -#: src/reader.c:816 +#: src/reader.c:647 #, c-format msgid "invalid %%type declaration due to item: %s" msgstr "vigane %%type deklaratsioon, element: %s" -#: src/reader.c:862 +#: src/reader.c:693 #, c-format msgid "redefining precedence of %s" msgstr "%s prioriteedi uus definitsioon" -#: src/reader.c:889 +#: src/reader.c:720 #, c-format msgid "invalid text (%s) - number should be after identifier" msgstr "vigane tekst (%s) - number peab olema peale identifikaatorit" -#: src/reader.c:899 +#: src/reader.c:730 #, c-format msgid "unexpected item: %s" msgstr "ootamatu element: %s" -#: src/reader.c:956 src/reader.c:1316 +#: src/reader.c:787 src/reader.c:1147 #, c-format msgid "unmatched %s" msgstr "puudub %s" -#: src/reader.c:985 +#: src/reader.c:816 #, c-format msgid "argument of %%expect is not an integer" msgstr "%%expect argument ei ole täisarv" -#: src/reader.c:1031 +#: src/reader.c:862 #, c-format msgid "unrecognized item %s, expected an identifier" msgstr "tundmatu element %s, eeldasin identifikaatorit" -#: src/reader.c:1053 +#: src/reader.c:884 #, c-format msgid "expected string constant instead of %s" msgstr "eeldasin %s asemel sõnekonstanti" -#: src/reader.c:1249 +#: src/reader.c:1080 #, c-format msgid "unrecognized: %s" msgstr "tundmatu: %s" -#: src/reader.c:1254 +#: src/reader.c:1085 msgid "no input grammar" msgstr "sisendgrammatikat pole" -#: src/reader.c:1259 +#: src/reader.c:1090 #, c-format msgid "unknown character: %s" msgstr "tundmatu sümbol: %s" -#: src/reader.c:1411 +#: src/reader.c:1242 msgid "ill-formed rule: initial symbol not followed by colon" msgstr "vigaselt formeeritud reegel: algsümbolile ei järgne koolonit" -#: src/reader.c:1418 +#: src/reader.c:1249 msgid "grammar starts with vertical bar" msgstr "grammatika algab püstkriipsuga" -#: src/reader.c:1446 +#: src/reader.c:1277 #, 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:1476 src/reader.c:1586 +#: src/reader.c:1307 src/reader.c:1417 msgid "previous rule lacks an ending `;'" msgstr "eelmisel reeglil puudub lõpetav `;'" -#: src/reader.c:1554 +#: src/reader.c:1385 msgid "two @prec's in a row" msgstr "kaks @prec ühel real" -#: src/reader.c:1564 +#: src/reader.c:1395 msgid "two actions at end of one rule" msgstr "kaks tegevust ühe reegli lõpus" -#: src/reader.c:1578 +#: src/reader.c:1409 #, c-format msgid "type clash (`%s' `%s') on default action" msgstr "vaikimisi tegevuse tüübikonflikt (`%s' `%s')" -#: src/reader.c:1584 +#: src/reader.c:1415 msgid "empty rule for typed nonterminal, and no action" msgstr "tüübiga mitteterminalil on tühi reegel ja puudub tegevus" -#: src/reader.c:1592 +#: src/reader.c:1423 #, c-format msgid "invalid input: %s" msgstr "vigane sisend: %s" -#: src/reader.c:1599 +#: src/reader.c:1430 msgid "no rules in the input grammar" msgstr "sisendgrammatikas pole reegleid" -#: src/reader.c:1620 +#: src/reader.c:1450 #, 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:1723 -#, c-format -msgid "the start symbol %s is undefined" -msgstr "stardisümbol %s ei ole defineeritud" - -#: src/reader.c:1725 -#, c-format -msgid "the start symbol %s is a token" -msgstr "stardisümbol %s on märk" - #: src/reduce.c:338 msgid "Useless nonterminals:" msgstr "Kasutamata mitteterminalid:" @@ -724,6 +682,32 @@ msgstr "`" msgid "'" msgstr "'" +#~ 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" + +#~ msgid "symbol `%s' used more than once as a literal string" +#~ msgstr "sümbolit `%s' on kasutatud enam kui kord literaal sõnena" + +#~ msgid "symbol `%s' given more than one literal string" +#~ msgstr "sümbolile `%s' on antud enam kui üks literaal sõne" + +#~ msgid "conflicting precedences for %s and %s" +#~ msgstr "%s ja %s omavad konfliktseid prioriteete" + +#~ msgid "conflicting assoc values for %s and %s" +#~ msgstr "%s ja %s omavad konfliktseid assotsiatiivseid väärtuseid" + +#~ msgid "tokens %s and %s both assigned number %d" +#~ msgstr "märkidele %s ja %s on mõlemale omistatud number %d" + +#~ msgid "the start symbol %s is undefined" +#~ msgstr "stardisümbol %s ei ole defineeritud" + +#~ msgid "the start symbol %s is a token" +#~ msgstr "stardisümbol %s on märk" + #~ msgid "reduce" #~ msgstr "redutseerimine" diff --git a/po/fr.po b/po/fr.po index 8b1bc771..6ed90dc4 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU bison 1.34a\n" -"POT-Creation-Date: 2002-06-03 09:28+0200\n" +"POT-Creation-Date: 2002-06-10 10:30+0200\n" "PO-Revision-Date: 2002-03-21 15:00-0500\n" "Last-Translator: Michel Robitaille \n" "Language-Team: French \n" @@ -252,7 +252,7 @@ msgstr "nombre trop grand de msgid "unexpected `/' found and ignored" msgstr "« / » inattendu et ignoré" -#: src/lex.c:106 src/reader.c:480 +#: src/lex.c:106 src/reader.c:311 msgid "unterminated comment" msgstr "le commentaire ne se termine pas" @@ -401,231 +401,189 @@ msgstr " msgid " on right:" msgstr " à droite:" -#: src/reader.c:100 -#, 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:119 -#, c-format -msgid "symbol `%s' used more than once as a literal string" -msgstr "symbole « %s » utilisé plus d'une fois dans une chaîne litérale" - -#: src/reader.c:122 -#, c-format -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:157 -#, c-format -msgid "conflicting precedences for %s and %s" -msgstr "les priorités pour %s et %s entrent en conflit" - -#: src/reader.c:168 -#, 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:236 -#, 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:256 +#: src/reader.c:87 msgid " Skipping to next \\n" msgstr " Saut jusqu'au prochain \\n" -#: src/reader.c:258 +#: src/reader.c:89 #, c-format msgid " Skipping to next %c" msgstr " Saut jusqu'au prochain %c" -#: src/reader.c:309 src/reader.c:321 +#: src/reader.c:140 src/reader.c:152 msgid "invalid $ value" msgstr "la valeur de symbole $ n'est pas valide" -#: src/reader.c:370 src/reader.c:385 +#: src/reader.c:201 src/reader.c:216 msgid "unterminated string at end of file" msgstr "chaîne de caractères non terminée en fin de fichier" -#: src/reader.c:373 +#: src/reader.c:204 msgid "unterminated string" msgstr "chaîne de caractère non terminée" -#: src/reader.c:514 src/reader.c:573 +#: src/reader.c:345 src/reader.c:404 #, fuzzy, c-format msgid "invalid value: %s%d" msgstr "valeur @ invalide" -#: src/reader.c:523 src/reader.c:591 +#: src/reader.c:354 src/reader.c:422 #, c-format msgid "%s is invalid" msgstr "%s n'est pas valide" -#: src/reader.c:559 +#: src/reader.c:390 #, c-format msgid "$$ of `%s' has no declared type" msgstr "$$ de « %s » n'a pas son type déclaré" -#: src/reader.c:579 +#: src/reader.c:410 #, c-format msgid "$%d of `%s' has no declared type" msgstr "$%d de « %s » n'a pas de type déclaré" -#: src/reader.c:641 +#: src/reader.c:472 msgid "unterminated `%{' definition" msgstr "La section de définition « %{ » ne termine pas avant la fin du fichier" -#: src/reader.c:686 src/reader.c:796 src/reader.c:847 src/reader.c:1099 +#: src/reader.c:517 src/reader.c:627 src/reader.c:678 src/reader.c:930 #, c-format msgid "Premature EOF after %s" msgstr "Fin de fichier prématutée après %s" -#: src/reader.c:711 src/reader.c:866 +#: src/reader.c:542 src/reader.c:697 #, c-format msgid "symbol %s redefined" msgstr "symbole %s redéfini" -#: src/reader.c:723 src/reader.c:811 src/reader.c:877 +#: src/reader.c:554 src/reader.c:642 src/reader.c:708 #, c-format msgid "type redeclaration for %s" msgstr "redéclaration du type de %s" -#: src/reader.c:741 +#: src/reader.c:572 #, c-format msgid "`%s' is invalid in %s" msgstr "« %s » n'est pas valide dans %s" -#: src/reader.c:759 src/reader.c:923 +#: src/reader.c:590 src/reader.c:754 #, c-format msgid "multiple %s declarations" msgstr "multiples déclarations %s" -#: src/reader.c:761 src/reader.c:1079 src/reader.c:1094 src/reader.c:1127 -#: src/reader.c:1141 +#: src/reader.c:592 src/reader.c:910 src/reader.c:925 src/reader.c:958 +#: src/reader.c:972 #, c-format msgid "invalid %s declaration" msgstr "la déclaration %s n'est pas valide" -#: src/reader.c:781 +#: src/reader.c:612 msgid "%type declaration has no " msgstr "la déclaration %type n'a pas de " -#: src/reader.c:816 +#: src/reader.c:647 #, 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:862 +#: src/reader.c:693 #, c-format msgid "redefining precedence of %s" msgstr "redéfinition du niveau de priorité de %s" -#: src/reader.c:889 +#: src/reader.c:720 #, 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:899 +#: src/reader.c:730 #, c-format msgid "unexpected item: %s" msgstr "item inattendu: %s" -#: src/reader.c:956 src/reader.c:1316 +#: src/reader.c:787 src/reader.c:1147 #, c-format msgid "unmatched %s" msgstr "non appariement de %s" -#: src/reader.c:985 +#: src/reader.c:816 #, c-format msgid "argument of %%expect is not an integer" msgstr "l'argument de %%expect n'est pas un entier" -#: src/reader.c:1031 +#: src/reader.c:862 #, c-format msgid "unrecognized item %s, expected an identifier" msgstr "item %s non reconnu, un identificateur est attendu" -#: src/reader.c:1053 +#: src/reader.c:884 #, c-format msgid "expected string constant instead of %s" msgstr "chaîne de caractères constante attendue plutôt que %s" -#: src/reader.c:1249 +#: src/reader.c:1080 #, c-format msgid "unrecognized: %s" msgstr "non reconnu: %s" -#: src/reader.c:1254 +#: src/reader.c:1085 msgid "no input grammar" msgstr "aucune grammaire en entrée" -#: src/reader.c:1259 +#: src/reader.c:1090 #, c-format msgid "unknown character: %s" msgstr "caractère inconnu: %s" -#: src/reader.c:1411 +#: src/reader.c:1242 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:1418 +#: src/reader.c:1249 msgid "grammar starts with vertical bar" msgstr "la grammaire débute par une barre verticale" -#: src/reader.c:1446 +#: src/reader.c:1277 #, c-format msgid "rule given for %s, which is a token" msgstr "la règle pour %s, qui est un terminal" -#: src/reader.c:1476 src/reader.c:1586 +#: src/reader.c:1307 src/reader.c:1417 msgid "previous rule lacks an ending `;'" msgstr "règle précédente manque une terminaison « ; »" -#: src/reader.c:1554 +#: src/reader.c:1385 msgid "two @prec's in a row" msgstr "deux @prec de suite" -#: src/reader.c:1564 +#: src/reader.c:1395 msgid "two actions at end of one rule" msgstr "deux actions à la fin d'une même règle" -#: src/reader.c:1578 +#: src/reader.c:1409 #, 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:1584 +#: src/reader.c:1415 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:1592 +#: src/reader.c:1423 #, c-format msgid "invalid input: %s" msgstr "entrée non valide: %s" -#: src/reader.c:1599 +#: src/reader.c:1430 msgid "no rules in the input grammar" msgstr "la grammaire n'a pas de règles" -#: src/reader.c:1620 +#: src/reader.c:1450 #, c-format msgid "too many symbols (tokens plus nonterminals); maximum %d" msgstr "trop de symboles (jeton plus non terminaux); maximum %d" -#: src/reader.c:1723 -#, c-format -msgid "the start symbol %s is undefined" -msgstr "le symbole de départ %s n'est pas défini" - -#: src/reader.c:1725 -#, c-format -msgid "the start symbol %s is a token" -msgstr "le symbole de départ %s est un terminal" - #: src/reduce.c:338 msgid "Useless nonterminals:" msgstr "Non-terminaux inutiles:" @@ -735,6 +693,32 @@ msgstr "`" msgid "'" msgstr "'" +#~ 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" + +#~ msgid "symbol `%s' used more than once as a literal string" +#~ msgstr "symbole « %s » utilisé plus d'une fois dans 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" + +#~ msgid "conflicting precedences for %s and %s" +#~ msgstr "les priorités pour %s et %s entrent en conflit" + +#~ msgid "conflicting assoc values for %s and %s" +#~ msgstr "les valeurs d'association de %s et %s entrent en conflit" + +#~ msgid "tokens %s and %s both assigned number %d" +#~ msgstr "les jetons %s et %s se sont vus assigner le nombre %d" + +#~ msgid "the start symbol %s is undefined" +#~ msgstr "le symbole de départ %s n'est pas défini" + +#~ msgid "the start symbol %s is a token" +#~ msgstr "le symbole de départ %s est un terminal" + #~ msgid "reduce" #~ msgstr "réduction" diff --git a/po/hr.po b/po/hr.po index 66ad418d..77709c81 100644 --- a/po/hr.po +++ b/po/hr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: bison 1.34a\n" -"POT-Creation-Date: 2002-06-03 09:28+0200\n" +"POT-Creation-Date: 2002-06-10 10:30+0200\n" "PO-Revision-Date: 2002-04-10 22:20+01\n" "Last-Translator: Denis Lackovic \n" "Language-Team: Croatian \n" @@ -245,7 +245,7 @@ msgstr "previ msgid "unexpected `/' found and ignored" msgstr "neoèekivan `/' naðen i zanemaren" -#: src/lex.c:106 src/reader.c:480 +#: src/lex.c:106 src/reader.c:311 msgid "unterminated comment" msgstr "nezavr¹eni komentar" @@ -394,228 +394,188 @@ msgstr "s lijeva:" msgid " on right:" msgstr "s desna:" -#: src/reader.c:100 -#, c-format -msgid "symbol %s is used, but is not defined as a token and has no rules" -msgstr "simbol %s je kori¹ten, ali nije definiran kao znak i nema pravila" - -#: src/reader.c:119 -#, c-format -msgid "symbol `%s' used more than once as a literal string" -msgstr "simbol `%s' kori¹ten vi¹e puta kao znakovni niz" - -#: src/reader.c:122 -#, c-format -msgid "symbol `%s' given more than one literal string" -msgstr "simbolz `%s' dat vi¹e od jednog znakovnog niza" - -#: src/reader.c:157 -#, c-format -msgid "conflicting precedences for %s and %s" -msgstr "konflikt u prethodnici za %s and %s" - -#: src/reader.c:168 -#, c-format -msgid "conflicting assoc values for %s and %s" -msgstr "konfliktne asocijativne vrijednosti za %s i %s" - -#: src/reader.c:236 -#, c-format -msgid "tokens %s and %s both assigned number %d" -msgstr "objema znakovima %s i %s je pridru¾en broj %d" - -#: src/reader.c:256 +#: src/reader.c:87 msgid " Skipping to next \\n" msgstr " Preskaèem na slijedeæe \\n" -#: src/reader.c:258 +#: src/reader.c:89 #, c-format msgid " Skipping to next %c" msgstr " Preskaèem na slijedeæi %c" -#: src/reader.c:309 src/reader.c:321 +#: src/reader.c:140 src/reader.c:152 msgid "invalid $ value" msgstr "nedozvoljena $ vrijednost" -#: src/reader.c:370 src/reader.c:385 +#: src/reader.c:201 src/reader.c:216 msgid "unterminated string at end of file" msgstr "nezavr¹eni znakovni niz na kraju datoteke" -#: src/reader.c:373 +#: src/reader.c:204 msgid "unterminated string" msgstr "nezavr¹eni znakovni niz" -#: src/reader.c:514 src/reader.c:573 +#: src/reader.c:345 src/reader.c:404 #, fuzzy, c-format msgid "invalid value: %s%d" msgstr "nedozvoljena @ vrijednost" -#: src/reader.c:523 src/reader.c:591 +#: src/reader.c:354 src/reader.c:422 #, c-format msgid "%s is invalid" msgstr "%s je nedozvoljeno" -#: src/reader.c:559 +#: src/reader.c:390 #, c-format msgid "$$ of `%s' has no declared type" msgstr "$$ od `%s' nema deklarirani tip" -#: src/reader.c:579 +#: src/reader.c:410 #, c-format msgid "$%d of `%s' has no declared type" msgstr "$%d od `%s' nema deklarirani tip" -#: src/reader.c:641 +#: src/reader.c:472 msgid "unterminated `%{' definition" msgstr "nezavr¹ena `%{' definicija" -#: src/reader.c:686 src/reader.c:796 src/reader.c:847 src/reader.c:1099 +#: src/reader.c:517 src/reader.c:627 src/reader.c:678 src/reader.c:930 #, c-format msgid "Premature EOF after %s" msgstr "Preuranjeni EOF nakon %s" -#: src/reader.c:711 src/reader.c:866 +#: src/reader.c:542 src/reader.c:697 #, c-format msgid "symbol %s redefined" msgstr "simbol %s ponovo definiran" -#: src/reader.c:723 src/reader.c:811 src/reader.c:877 +#: src/reader.c:554 src/reader.c:642 src/reader.c:708 #, c-format msgid "type redeclaration for %s" msgstr "ponovna deklaracija za %s" -#: src/reader.c:741 +#: src/reader.c:572 #, c-format msgid "`%s' is invalid in %s" msgstr "`%s' je nedozvoljen u %s" -#: src/reader.c:759 src/reader.c:923 +#: src/reader.c:590 src/reader.c:754 #, c-format msgid "multiple %s declarations" msgstr "vi¹estruke %s deklaracije" -#: src/reader.c:761 src/reader.c:1079 src/reader.c:1094 src/reader.c:1127 -#: src/reader.c:1141 +#: src/reader.c:592 src/reader.c:910 src/reader.c:925 src/reader.c:958 +#: src/reader.c:972 #, c-format msgid "invalid %s declaration" msgstr "nedozvoljena %s deklaracija" -#: src/reader.c:781 +#: src/reader.c:612 msgid "%type declaration has no " msgstr "%type deklaracija nema " -#: src/reader.c:816 +#: src/reader.c:647 #, c-format msgid "invalid %%type declaration due to item: %s" msgstr "nedozvoljena %%type deklaracija zbog: %s" -#: src/reader.c:862 +#: src/reader.c:693 #, c-format msgid "redefining precedence of %s" msgstr "ponovno definiran prethodnik od %s" -#: src/reader.c:889 +#: src/reader.c:720 #, c-format msgid "invalid text (%s) - number should be after identifier" msgstr "nedozvoljeno tekst (%s) - broj bi trebao biti nakon identifikatora" -#: src/reader.c:899 +#: src/reader.c:730 #, c-format msgid "unexpected item: %s" msgstr "neoèekivani: %s" -#: src/reader.c:956 src/reader.c:1316 +#: src/reader.c:787 src/reader.c:1147 #, c-format msgid "unmatched %s" msgstr "nije pronaðen %s" -#: src/reader.c:985 +#: src/reader.c:816 #, c-format msgid "argument of %%expect is not an integer" msgstr "argument od %%expect nije cijeli broj" -#: src/reader.c:1031 +#: src/reader.c:862 #, c-format msgid "unrecognized item %s, expected an identifier" msgstr "neprepoznati %s, oèekivan nakon identifikatora" -#: src/reader.c:1053 +#: src/reader.c:884 #, c-format msgid "expected string constant instead of %s" msgstr "oèekivana znakovna konstana umjesto %s" -#: src/reader.c:1249 +#: src/reader.c:1080 #, c-format msgid "unrecognized: %s" msgstr "neprepoznati: %s" -#: src/reader.c:1254 +#: src/reader.c:1085 msgid "no input grammar" msgstr "nema ulazne gramatike" -#: src/reader.c:1259 +#: src/reader.c:1090 #, c-format msgid "unknown character: %s" msgstr "nepoznati znak: %s" -#: src/reader.c:1411 +#: src/reader.c:1242 msgid "ill-formed rule: initial symbol not followed by colon" msgstr "lo¹e pravilo: zarez ne bi trebao slijediti poèetni simbol" -#: src/reader.c:1418 +#: src/reader.c:1249 msgid "grammar starts with vertical bar" msgstr "gramatika poèinje sa okomitom crtom" -#: src/reader.c:1446 +#: src/reader.c:1277 #, c-format msgid "rule given for %s, which is a token" msgstr "pravilo dato za %s, a to je znak" -#: src/reader.c:1476 src/reader.c:1586 +#: src/reader.c:1307 src/reader.c:1417 msgid "previous rule lacks an ending `;'" msgstr "prethodnom pravilu nedostaje zavr¹etak `;'" -#: src/reader.c:1554 +#: src/reader.c:1385 msgid "two @prec's in a row" msgstr "dva @prec's u retku" -#: src/reader.c:1564 +#: src/reader.c:1395 msgid "two actions at end of one rule" msgstr "dvije akcije pri kraju jednog pravila" -#: src/reader.c:1578 +#: src/reader.c:1409 #, c-format msgid "type clash (`%s' `%s') on default action" msgstr "sudar tipova (`%s' `%s') na deaultnoj akciji" -#: src/reader.c:1584 +#: src/reader.c:1415 msgid "empty rule for typed nonterminal, and no action" msgstr "prazno pravilo za nezavr¹ni znak, i nema akcije" -#: src/reader.c:1592 +#: src/reader.c:1423 #, c-format msgid "invalid input: %s" msgstr "nedozvoljeni ulaz: %s" -#: src/reader.c:1599 +#: src/reader.c:1430 msgid "no rules in the input grammar" msgstr "nema pravila u ulaznoj gramatici" -#: src/reader.c:1620 +#: src/reader.c:1450 #, c-format msgid "too many symbols (tokens plus nonterminals); maximum %d" msgstr "previ¹e simbola (znakovi plus nezavr¹ni znakovi); maksimalno %d" -#: src/reader.c:1723 -#, c-format -msgid "the start symbol %s is undefined" -msgstr "poèetni simbol %s nije definiran" - -#: src/reader.c:1725 -#, c-format -msgid "the start symbol %s is a token" -msgstr "poèetni simbol %s je znak" - #: src/reduce.c:338 msgid "Useless nonterminals:" msgstr "Beskorisni nezavr¹ni znakovi:" @@ -725,6 +685,30 @@ msgstr "`" msgid "'" msgstr "'" +#~ msgid "symbol %s is used, but is not defined as a token and has no rules" +#~ msgstr "simbol %s je kori¹ten, ali nije definiran kao znak i nema pravila" + +#~ msgid "symbol `%s' used more than once as a literal string" +#~ msgstr "simbol `%s' kori¹ten vi¹e puta kao znakovni niz" + +#~ msgid "symbol `%s' given more than one literal string" +#~ msgstr "simbolz `%s' dat vi¹e od jednog znakovnog niza" + +#~ msgid "conflicting precedences for %s and %s" +#~ msgstr "konflikt u prethodnici za %s and %s" + +#~ msgid "conflicting assoc values for %s and %s" +#~ msgstr "konfliktne asocijativne vrijednosti za %s i %s" + +#~ msgid "tokens %s and %s both assigned number %d" +#~ msgstr "objema znakovima %s i %s je pridru¾en broj %d" + +#~ msgid "the start symbol %s is undefined" +#~ msgstr "poèetni simbol %s nije definiran" + +#~ msgid "the start symbol %s is a token" +#~ msgstr "poèetni simbol %s je znak" + #~ msgid "reduce" #~ msgstr "reduciraj" diff --git a/po/it.po b/po/it.po index 0e10af6c..fc8b0a5f 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: bison 1.31\n" -"POT-Creation-Date: 2002-06-03 09:28+0200\n" +"POT-Creation-Date: 2002-06-10 10:30+0200\n" "PO-Revision-Date: 2002-01-18 12:40 CET\n" "Last-Translator: Paolo Bonzini \n" "Language-Team: Italian \n" @@ -245,7 +245,7 @@ msgstr "troppi goto (max %d)" msgid "unexpected `/' found and ignored" msgstr "`/' inatteso, trovato e ignorato" -#: src/lex.c:106 src/reader.c:480 +#: src/lex.c:106 src/reader.c:311 msgid "unterminated comment" msgstr "commento non terminato" @@ -395,228 +395,188 @@ msgstr " nel primo membro:" msgid " on right:" msgstr " nel secondo membro:" -#: src/reader.c:100 -#, c-format -msgid "symbol %s is used, but is not defined as a token and has no rules" -msgstr "usato il simbolo %s, ma non è un token e non ha regole" - -#: src/reader.c:119 -#, c-format -msgid "symbol `%s' used more than once as a literal string" -msgstr "simbolo `%s' usato più di una volta in una stringa letterale" - -#: src/reader.c:122 -#, c-format -msgid "symbol `%s' given more than one literal string" -msgstr "il simbolo `%s' dà pi` di una stringa letterale" - -#: src/reader.c:157 -#, c-format -msgid "conflicting precedences for %s and %s" -msgstr "precedenze in conflitto per %s und %s" - -#: src/reader.c:168 -#, c-format -msgid "conflicting assoc values for %s and %s" -msgstr "associatività in conflitto per %s e %s" - -#: src/reader.c:236 -#, c-format -msgid "tokens %s and %s both assigned number %d" -msgstr "i token %s e %s hanno lo stesso numero %d" - -#: src/reader.c:256 +#: src/reader.c:87 msgid " Skipping to next \\n" msgstr " Passo al successivo \\n" -#: src/reader.c:258 +#: src/reader.c:89 #, c-format msgid " Skipping to next %c" msgstr " Passo al successivo %c" -#: src/reader.c:309 src/reader.c:321 +#: src/reader.c:140 src/reader.c:152 msgid "invalid $ value" msgstr "valore $ non valido" -#: src/reader.c:370 src/reader.c:385 +#: src/reader.c:201 src/reader.c:216 msgid "unterminated string at end of file" msgstr "stringa non terminata alla fine del file" -#: src/reader.c:373 +#: src/reader.c:204 msgid "unterminated string" msgstr "stringa non terminata" -#: src/reader.c:514 src/reader.c:573 +#: src/reader.c:345 src/reader.c:404 #, c-format msgid "invalid value: %s%d" msgstr "valore non valido: %s%d" -#: src/reader.c:523 src/reader.c:591 +#: src/reader.c:354 src/reader.c:422 #, c-format msgid "%s is invalid" msgstr "%s non è valido" -#: src/reader.c:559 +#: src/reader.c:390 #, c-format msgid "$$ of `%s' has no declared type" msgstr "Manca una dichiarazione di tipo per $$ di `%s'" -#: src/reader.c:579 +#: src/reader.c:410 #, c-format msgid "$%d of `%s' has no declared type" msgstr "Manca una dichiarazione di tipo per $%d di `%s'" -#: src/reader.c:641 +#: src/reader.c:472 msgid "unterminated `%{' definition" msgstr "definizione `%{' non terminata" -#: src/reader.c:686 src/reader.c:796 src/reader.c:847 src/reader.c:1099 +#: src/reader.c:517 src/reader.c:627 src/reader.c:678 src/reader.c:930 #, c-format msgid "Premature EOF after %s" msgstr "Fine di file prematura dopo %s" -#: src/reader.c:711 src/reader.c:866 +#: src/reader.c:542 src/reader.c:697 #, c-format msgid "symbol %s redefined" msgstr "simbolo %s ridefinito" -#: src/reader.c:723 src/reader.c:811 src/reader.c:877 +#: src/reader.c:554 src/reader.c:642 src/reader.c:708 #, c-format msgid "type redeclaration for %s" msgstr "tipo dichiarato due volte per %s" -#: src/reader.c:741 +#: src/reader.c:572 #, c-format msgid "`%s' is invalid in %s" msgstr "`%s' non è valido in %s" -#: src/reader.c:759 src/reader.c:923 +#: src/reader.c:590 src/reader.c:754 #, c-format msgid "multiple %s declarations" msgstr "dichiarazioni multiple per %s" -#: src/reader.c:761 src/reader.c:1079 src/reader.c:1094 src/reader.c:1127 -#: src/reader.c:1141 +#: src/reader.c:592 src/reader.c:910 src/reader.c:925 src/reader.c:958 +#: src/reader.c:972 #, c-format msgid "invalid %s declaration" msgstr "dichiarazione %s non valida" -#: src/reader.c:781 +#: src/reader.c:612 msgid "%type declaration has no " msgstr "dichiarazione %type senza " -#: src/reader.c:816 +#: src/reader.c:647 #, c-format msgid "invalid %%type declaration due to item: %s" msgstr "dichiarazione %%type non valida per la presenza di `%s'" -#: src/reader.c:862 +#: src/reader.c:693 #, c-format msgid "redefining precedence of %s" msgstr "precedenza di `%s' definita due volte" -#: src/reader.c:889 +#: src/reader.c:720 #, c-format msgid "invalid text (%s) - number should be after identifier" msgstr "testo non valido (%s) - il numero dovrebbe seguire l'identificatore" -#: src/reader.c:899 +#: src/reader.c:730 #, c-format msgid "unexpected item: %s" msgstr "elemento inatteso: %s" -#: src/reader.c:956 src/reader.c:1316 +#: src/reader.c:787 src/reader.c:1147 #, c-format msgid "unmatched %s" msgstr "%s non bilanciato" -#: src/reader.c:985 +#: src/reader.c:816 #, c-format msgid "argument of %%expect is not an integer" msgstr "L'argomento di %%expect non è un intero" -#: src/reader.c:1031 +#: src/reader.c:862 #, c-format msgid "unrecognized item %s, expected an identifier" msgstr "elemento %s non riconosciuto, atteso un identificatore" -#: src/reader.c:1053 +#: src/reader.c:884 #, c-format msgid "expected string constant instead of %s" msgstr "attesa una costante stringa invece di %s" -#: src/reader.c:1249 +#: src/reader.c:1080 #, c-format msgid "unrecognized: %s" msgstr "non riconosciuto: %s" -#: src/reader.c:1254 +#: src/reader.c:1085 msgid "no input grammar" msgstr "nessuna grammatica di input" -#: src/reader.c:1259 +#: src/reader.c:1090 #, c-format msgid "unknown character: %s" msgstr "carattere sconosciuto: %s" -#: src/reader.c:1411 +#: src/reader.c:1242 msgid "ill-formed rule: initial symbol not followed by colon" msgstr "regola malformata: simbolo iniziale non seguito da `:'" -#: src/reader.c:1418 +#: src/reader.c:1249 msgid "grammar starts with vertical bar" msgstr "la grammatica comincia con un `|'" -#: src/reader.c:1446 +#: src/reader.c:1277 #, c-format msgid "rule given for %s, which is a token" msgstr "fornita una regola per il token %s" -#: src/reader.c:1476 src/reader.c:1586 +#: src/reader.c:1307 src/reader.c:1417 msgid "previous rule lacks an ending `;'" msgstr "" -#: src/reader.c:1554 +#: src/reader.c:1385 msgid "two @prec's in a row" msgstr "due @prec di seguito" -#: src/reader.c:1564 +#: src/reader.c:1395 msgid "two actions at end of one rule" msgstr "due azioni alla fine di una regola" -#: src/reader.c:1578 +#: src/reader.c:1409 #, c-format msgid "type clash (`%s' `%s') on default action" msgstr "conflitto di tipo (`%s' e `%s') nell'azione di default" -#: src/reader.c:1584 +#: src/reader.c:1415 msgid "empty rule for typed nonterminal, and no action" msgstr "regola vuota e nessuna azione per un nonterminale con tipo" -#: src/reader.c:1592 +#: src/reader.c:1423 #, c-format msgid "invalid input: %s" msgstr "input non valido: %s" -#: src/reader.c:1599 +#: src/reader.c:1430 msgid "no rules in the input grammar" msgstr "nessuna regola nella grammatica di input" -#: src/reader.c:1620 +#: src/reader.c:1450 #, c-format msgid "too many symbols (tokens plus nonterminals); maximum %d" msgstr "troppi simboli (token e nonterminali); il massimo è %d" -#: src/reader.c:1723 -#, c-format -msgid "the start symbol %s is undefined" -msgstr "simbolo iniziale %s non definito" - -#: src/reader.c:1725 -#, c-format -msgid "the start symbol %s is a token" -msgstr "specificato il token %s come simbolo iniziale" - #: src/reduce.c:338 msgid "Useless nonterminals:" msgstr "Simboli nonterminali inutili:" @@ -726,6 +686,30 @@ msgstr "`" msgid "'" msgstr "'" +#~ msgid "symbol %s is used, but is not defined as a token and has no rules" +#~ msgstr "usato il simbolo %s, ma non è un token e non ha regole" + +#~ msgid "symbol `%s' used more than once as a literal string" +#~ msgstr "simbolo `%s' usato più di una volta in una stringa letterale" + +#~ msgid "symbol `%s' given more than one literal string" +#~ msgstr "il simbolo `%s' dà pi` di una stringa letterale" + +#~ msgid "conflicting precedences for %s and %s" +#~ msgstr "precedenze in conflitto per %s und %s" + +#~ msgid "conflicting assoc values for %s and %s" +#~ msgstr "associatività in conflitto per %s e %s" + +#~ msgid "tokens %s and %s both assigned number %d" +#~ msgstr "i token %s e %s hanno lo stesso numero %d" + +#~ msgid "the start symbol %s is undefined" +#~ msgstr "simbolo iniziale %s non definito" + +#~ msgid "the start symbol %s is a token" +#~ msgstr "specificato il token %s come simbolo iniziale" + #~ msgid "reduce" #~ msgstr "riduzione" diff --git a/po/ja.po b/po/ja.po index 91914ae1..b73ec847 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU bison 1.30f\n" -"POT-Creation-Date: 2002-06-03 09:28+0200\n" +"POT-Creation-Date: 2002-06-10 10:30+0200\n" "PO-Revision-Date: 2001-12-10 15:59+0900\n" "Last-Translator: Daisuke Yamashita \n" "Language-Team: Japanese \n" @@ -241,7 +241,7 @@ msgstr "goto msgid "unexpected `/' found and ignored" msgstr "ͽ´ü¤·¤Ê¤¤ `/' ¤¬¸«¤Ä¤«¤ê¡¢Ìµ»ë¤µ¤ì¤Þ¤·¤¿" -#: src/lex.c:106 src/reader.c:480 +#: src/lex.c:106 src/reader.c:311 msgid "unterminated comment" msgstr "ÊĤ¸¤Æ¤¤¤Ê¤¤¥³¥á¥ó¥È¤Ç¤¹" @@ -390,230 +390,188 @@ msgstr " msgid " on right:" msgstr " ±¦ÊÕ:" -#: src/reader.c:100 -#, c-format -msgid "symbol %s is used, but is not defined as a token and has no rules" -msgstr "" -"¥·¥ó¥Ü¥ë %s ¤¬»È¤ï¤ì¤Æ¤¤¤Þ¤¹¤¬¡¢¥È¡¼¥¯¥ó¤È¤·¤ÆÄêµÁ¤µ¤ì¤Æ¤ª¤é¤º¡¢µ¬Â§¤ò»ý¤Á¤Þ" -"¤»¤ó" - -#: src/reader.c:119 -#, c-format -msgid "symbol `%s' used more than once as a literal string" -msgstr "¥·¥ó¥Ü¥ë `%s' ¤Ï¥ê¥Æ¥é¥ëʸ»úÎó¤È¤·¤ÆÊ£¿ô²ó»È¤ï¤ì¤Þ¤·¤¿" - -#: src/reader.c:122 -#, c-format -msgid "symbol `%s' given more than one literal string" -msgstr "¥·¥ó¥Ü¥ë `%s' ¤ÏÊ£¿ô¤Î¥ê¥Æ¥é¥ëʸ»úÎó¤¬Í¿¤¨¤é¤ì¤Þ¤·¤¿" - -#: src/reader.c:157 -#, c-format -msgid "conflicting precedences for %s and %s" -msgstr "Àè¹Ô¤·¤Æ¤¤¤ë %s ¤È %s ¤Ç¶¥¹ç¤¬À¸¤¸¤Æ¤¤¤Þ¤¹" - -#: src/reader.c:168 -#, c-format -msgid "conflicting assoc values for %s and %s" -msgstr "Èó·ë¹çÃÍ %s ¤È %s ¤Ç¶¥¹ç¤¬À¸¤¸¤Æ¤¤¤Þ¤¹" - -#: src/reader.c:236 -#, c-format -msgid "tokens %s and %s both assigned number %d" -msgstr "¥È¡¼¥¯¥ó %s ¤È %s ¤ÎÁÐÊý¤¬ÈÖ¹æ %d ¤Ë³ä¤êÅö¤Æ¤é¤ì¤Þ¤·¤¿" - -#: src/reader.c:256 +#: src/reader.c:87 msgid " Skipping to next \\n" msgstr " ¼¡¤Î \\n ¤Ë¥¹¥­¥Ã¥×" -#: src/reader.c:258 +#: src/reader.c:89 #, c-format msgid " Skipping to next %c" msgstr " ¼¡¤Î %c ¤Ë¥¹¥­¥Ã¥×" -#: src/reader.c:309 src/reader.c:321 +#: src/reader.c:140 src/reader.c:152 msgid "invalid $ value" msgstr "ÉÔŬÀÚ¤Ê $ ¤ÎÃÍ" -#: src/reader.c:370 src/reader.c:385 +#: src/reader.c:201 src/reader.c:216 msgid "unterminated string at end of file" msgstr "ÊĤ¸¤é¤ì¤Æ¤¤¤Ê¤¤Ê¸»úÎ󤬥ե¡¥¤¥ëËöÈø¤Ë¤¢¤ê¤Þ¤¹" -#: src/reader.c:373 +#: src/reader.c:204 msgid "unterminated string" msgstr "ÊĤ¸¤é¤ì¤Æ¤¤¤Ê¤¤Ê¸»úÎó" -#: src/reader.c:514 src/reader.c:573 +#: src/reader.c:345 src/reader.c:404 #, fuzzy, c-format msgid "invalid value: %s%d" msgstr "ÉÔŬÀÚ¤Ê $ ¤ÎÃÍ" -#: src/reader.c:523 src/reader.c:591 +#: src/reader.c:354 src/reader.c:422 #, c-format msgid "%s is invalid" msgstr "%s ¤ÏÉÔŬÀڤǤ¹" -#: src/reader.c:559 +#: src/reader.c:390 #, c-format msgid "$$ of `%s' has no declared type" msgstr "`%s' ¤Î $$ ¤ËÀë¸À¤Î¤Ê¤¤·¿¤¬¤¢¤ê¤Þ¤¹" -#: src/reader.c:579 +#: src/reader.c:410 #, c-format msgid "$%d of `%s' has no declared type" msgstr "$%d ¸Ä¤Î `%s' ¤¬Àë¸À¤µ¤ì¤¿·¿¤ò»ý¤Ã¤Æ¤¤¤Þ¤»¤ó" -#: src/reader.c:641 +#: src/reader.c:472 msgid "unterminated `%{' definition" msgstr "`%{' ÄêµÁ ¤¬ÊĤ¸¤é¤ì¤Æ¤¤¤Þ¤»¤ó" -#: src/reader.c:686 src/reader.c:796 src/reader.c:847 src/reader.c:1099 +#: src/reader.c:517 src/reader.c:627 src/reader.c:678 src/reader.c:930 #, c-format msgid "Premature EOF after %s" msgstr "%s ¤Î¸å¤í¤ËÁ᤯¤â EOF ¤¬¤¢¤ê¤Þ¤¹" -#: src/reader.c:711 src/reader.c:866 +#: src/reader.c:542 src/reader.c:697 #, c-format msgid "symbol %s redefined" msgstr "¥·¥ó¥Ü¥ë %s ¤¬ºÆÄêµÁ¤µ¤ì¤Þ¤·¤¿" -#: src/reader.c:723 src/reader.c:811 src/reader.c:877 +#: src/reader.c:554 src/reader.c:642 src/reader.c:708 #, c-format msgid "type redeclaration for %s" msgstr "%s ¤Î·¿¤¬ºÆÄêµÁ¤µ¤ì¤Þ¤·¤¿" -#: src/reader.c:741 +#: src/reader.c:572 #, c-format msgid "`%s' is invalid in %s" msgstr "`%s' ¤Ï %s Æâ¤Ç¤ÏÉÔŬÀڤǤ¹" -#: src/reader.c:759 src/reader.c:923 +#: src/reader.c:590 src/reader.c:754 #, c-format msgid "multiple %s declarations" msgstr "%s ¤¬Ê£¿ô¸ÄÀë¸À¤µ¤ì¤Þ¤·¤¿" -#: src/reader.c:761 src/reader.c:1079 src/reader.c:1094 src/reader.c:1127 -#: src/reader.c:1141 +#: src/reader.c:592 src/reader.c:910 src/reader.c:925 src/reader.c:958 +#: src/reader.c:972 #, c-format msgid "invalid %s declaration" msgstr "%s ¤ÎÀë¸À¤¬ÉÔŬÀڤǤ¹" -#: src/reader.c:781 +#: src/reader.c:612 msgid "%type declaration has no " msgstr "%type Àë¸À¤Ë <¥¿¥¤¥×̾> ¤¬¤¢¤ê¤Þ¤»¤ó" -#: src/reader.c:816 +#: src/reader.c:647 #, c-format msgid "invalid %%type declaration due to item: %s" msgstr "¥¢¥¤¥Æ¥à¤Î°Ù¤Î %%type Àë¸À¤¬ÉÔŬÀڤǤ¹: %s" -#: src/reader.c:862 +#: src/reader.c:693 #, c-format msgid "redefining precedence of %s" msgstr "%s ¤ËÀè¹Ô¤·¤¿ºÆÄêµÁ¤Ç¤¹" -#: src/reader.c:889 +#: src/reader.c:720 #, c-format msgid "invalid text (%s) - number should be after identifier" msgstr "ÉÔŬÀڤʥƥ­¥¹¥È (%s) - ¿ôÃͤϼ±Ê̻Ҥθå¤í¤Ë¤¢¤ë¤Ù¤­¤Ç¤¹" -#: src/reader.c:899 +#: src/reader.c:730 #, c-format msgid "unexpected item: %s" msgstr "ͽ´ü¤»¤Ì¥¢¥¤¥Æ¥à: %s" -#: src/reader.c:956 src/reader.c:1316 +#: src/reader.c:787 src/reader.c:1147 #, c-format msgid "unmatched %s" msgstr "Âбþ¤Î¤Ê¤¤ %s ¤Ç¤¹" -#: src/reader.c:985 +#: src/reader.c:816 #, c-format msgid "argument of %%expect is not an integer" msgstr "%%expect ¤Î°ú¿ô¤¬À°¿ôÃͤǤϤ¢¤ê¤Þ¤»¤ó" -#: src/reader.c:1031 +#: src/reader.c:862 #, c-format msgid "unrecognized item %s, expected an identifier" msgstr "ǧ¼±¤Ç¤­¤Ê¤¤¥¢¥¤¥Æ¥à %s¡¢¤³¤³¤Ç¤Ï¼±Ê̻Ҥ¬´üÂÔ¤µ¤ì¤Þ¤¹" -#: src/reader.c:1053 +#: src/reader.c:884 #, c-format msgid "expected string constant instead of %s" msgstr "¤³¤³¤Ç¤Ï %s ¤Ç¤Ï¤Ê¤¯Ê¸»úÎóÄê¿ô¤¬´üÂÔ¤µ¤ì¤Þ¤¹" -#: src/reader.c:1249 +#: src/reader.c:1080 #, c-format msgid "unrecognized: %s" msgstr "ǧ¼±¤Ç¤­¤Ê¤¤: %s" -#: src/reader.c:1254 +#: src/reader.c:1085 msgid "no input grammar" msgstr "ʸˡ¤ÎÆþÎϤ¬Ìµ¤¤" -#: src/reader.c:1259 +#: src/reader.c:1090 #, c-format msgid "unknown character: %s" msgstr "̤ÃΤÎʸ»ú: %s" -#: src/reader.c:1411 +#: src/reader.c:1242 msgid "ill-formed rule: initial symbol not followed by colon" msgstr "¼Ù°­¤Êµ¬Â§: ½é´ü²½¥·¥ó¥Ü¥ë¤Ë¥³¥í¥ó (:) ¤¬Â³¤¤¤Æ¤¤¤Þ¤»¤ó" -#: src/reader.c:1418 +#: src/reader.c:1249 msgid "grammar starts with vertical bar" msgstr "ʸˡ¤Ï½ÄËÀ (|) ¤Ç»Ï¤á¤Þ¤¹" -#: src/reader.c:1446 +#: src/reader.c:1277 #, c-format msgid "rule given for %s, which is a token" msgstr "%s ¤Ëµ¬Â§¤¬Í¿¤¨¤é¤ì¡¢¤½¤ì¤Ï¥È¡¼¥¯¥ó¤È¤Ê¤ê¤Þ¤¹" -#: src/reader.c:1476 src/reader.c:1586 +#: src/reader.c:1307 src/reader.c:1417 msgid "previous rule lacks an ending `;'" msgstr "" -#: src/reader.c:1554 +#: src/reader.c:1385 msgid "two @prec's in a row" msgstr "@prec ¤Î¤â¤ÎÆó¤Ä¤¬Æ±Îó¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹" -#: src/reader.c:1564 +#: src/reader.c:1395 msgid "two actions at end of one rule" msgstr "°ì¤Ä¤Îµ¬Â§¤Î½ª¤ê¤ËÆó¤Ä¤ÎÆ°ºî¤ò»ØÄꤷ¤Æ¤¤¤Þ¤¹" -#: src/reader.c:1578 +#: src/reader.c:1409 #, c-format msgid "type clash (`%s' `%s') on default action" msgstr "½é´ü¾õÂÖ¤ÎÆ°ºî¤Ç¤Ï·¿ (`%s' `%s') ¤¬¾×Æͤ·¤Þ¤¹" -#: src/reader.c:1584 +#: src/reader.c:1415 msgid "empty rule for typed nonterminal, and no action" msgstr "¶õ¤Î·¿ÉÕ¤­Èó½ªÃ¼¥¢¥¤¥Æ¥àÍѵ¬Â§¤Ç¤¢¤ê¡¢Æ°ºî¤¬µ¯¤ê¤Þ¤»¤ó" -#: src/reader.c:1592 +#: src/reader.c:1423 #, c-format msgid "invalid input: %s" msgstr "ÉÔŬÀÚ¤ÊÆþÎÏ: %s" -#: src/reader.c:1599 +#: src/reader.c:1430 msgid "no rules in the input grammar" msgstr "ÆþÎϤ·¤¿Ê¸Ë¡¤Ëµ¬Â§¤¬ÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó" -#: src/reader.c:1620 +#: src/reader.c:1450 #, c-format msgid "too many symbols (tokens plus nonterminals); maximum %d" msgstr "¥·¥ó¥Ü¥ë¤¬Â¿¤¹¤®¤Þ¤¹ (¥È¡¼¥¯¥ó + Èó½ªÃ¼¥¢¥¤¥Æ¥à) -- ºÇÂç %d" -#: src/reader.c:1723 -#, c-format -msgid "the start symbol %s is undefined" -msgstr "³«»Ï¥·¥ó¥Ü¥ë %s ¤ÏÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó" - -#: src/reader.c:1725 -#, c-format -msgid "the start symbol %s is a token" -msgstr "³«»Ï¥·¥ó¥Ü¥ë %s ¤Ï¥È¡¼¥¯¥ó¤Ç¤¹" - #: src/reduce.c:338 msgid "Useless nonterminals:" msgstr "̵°ÕÌ£¤ÊÈó½ªÃ¼»Ò:" @@ -720,6 +678,32 @@ msgstr "`" msgid "'" msgstr "'" +#~ msgid "symbol %s is used, but is not defined as a token and has no rules" +#~ msgstr "" +#~ "¥·¥ó¥Ü¥ë %s ¤¬»È¤ï¤ì¤Æ¤¤¤Þ¤¹¤¬¡¢¥È¡¼¥¯¥ó¤È¤·¤ÆÄêµÁ¤µ¤ì¤Æ¤ª¤é¤º¡¢µ¬Â§¤ò»ý¤Á" +#~ "¤Þ¤»¤ó" + +#~ msgid "symbol `%s' used more than once as a literal string" +#~ msgstr "¥·¥ó¥Ü¥ë `%s' ¤Ï¥ê¥Æ¥é¥ëʸ»úÎó¤È¤·¤ÆÊ£¿ô²ó»È¤ï¤ì¤Þ¤·¤¿" + +#~ msgid "symbol `%s' given more than one literal string" +#~ msgstr "¥·¥ó¥Ü¥ë `%s' ¤ÏÊ£¿ô¤Î¥ê¥Æ¥é¥ëʸ»úÎó¤¬Í¿¤¨¤é¤ì¤Þ¤·¤¿" + +#~ msgid "conflicting precedences for %s and %s" +#~ msgstr "Àè¹Ô¤·¤Æ¤¤¤ë %s ¤È %s ¤Ç¶¥¹ç¤¬À¸¤¸¤Æ¤¤¤Þ¤¹" + +#~ msgid "conflicting assoc values for %s and %s" +#~ msgstr "Èó·ë¹çÃÍ %s ¤È %s ¤Ç¶¥¹ç¤¬À¸¤¸¤Æ¤¤¤Þ¤¹" + +#~ msgid "tokens %s and %s both assigned number %d" +#~ msgstr "¥È¡¼¥¯¥ó %s ¤È %s ¤ÎÁÐÊý¤¬ÈÖ¹æ %d ¤Ë³ä¤êÅö¤Æ¤é¤ì¤Þ¤·¤¿" + +#~ msgid "the start symbol %s is undefined" +#~ msgstr "³«»Ï¥·¥ó¥Ü¥ë %s ¤ÏÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó" + +#~ msgid "the start symbol %s is a token" +#~ msgstr "³«»Ï¥·¥ó¥Ü¥ë %s ¤Ï¥È¡¼¥¯¥ó¤Ç¤¹" + #~ msgid "reduce" #~ msgstr "´Ô¸µ" diff --git a/po/nl.po b/po/nl.po index 6359f82d..97998591 100644 --- a/po/nl.po +++ b/po/nl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: bison 1.34a\n" -"POT-Creation-Date: 2002-06-03 09:28+0200\n" +"POT-Creation-Date: 2002-06-10 10:30+0200\n" "PO-Revision-Date: 2002-03-20 12:54+0100\n" "Last-Translator: Tim Van Holder \n" "Language-Team: Dutch \n" @@ -256,7 +256,7 @@ msgstr "teveel gotos (maximum is %d)" msgid "unexpected `/' found and ignored" msgstr "onverwachte `/' gevonden en genegeerd" -#: src/lex.c:106 src/reader.c:480 +#: src/lex.c:106 src/reader.c:311 msgid "unterminated comment" msgstr "niet-beëindigde commentaar" @@ -408,233 +408,191 @@ msgstr " links:" msgid " on right:" msgstr " rechts:" -#: src/reader.c:100 -#, c-format -msgid "symbol %s is used, but is not defined as a token and has no rules" -msgstr "" -"symbool %s wordt gebruikt, maar is niet gedefinieerd als een teken en heeft " -"geen regels" - -#: src/reader.c:119 -#, c-format -msgid "symbol `%s' used more than once as a literal string" -msgstr "symbool `%s' meer dan eens gebruikt als een letterlijke string" - -#: src/reader.c:122 -#, c-format -msgid "symbol `%s' given more than one literal string" -msgstr "symbool `%s' krijgt meer dan één letterlijke string toegewezen" - -#: src/reader.c:157 -#, c-format -msgid "conflicting precedences for %s and %s" -msgstr "voorrangen voor %s en %s geven conflicten" - -#: src/reader.c:168 -#, c-format -msgid "conflicting assoc values for %s and %s" -msgstr "associativiteitswaarden voor %s en %s geven conflicten" - -#: src/reader.c:236 -#, c-format -msgid "tokens %s and %s both assigned number %d" -msgstr "tokens %s en %s hebben beide nummer %d toegewezen gekregen" - -#: src/reader.c:256 +#: src/reader.c:87 msgid " Skipping to next \\n" msgstr " Verder naar volgende \\n" -#: src/reader.c:258 +#: src/reader.c:89 #, c-format msgid " Skipping to next %c" msgstr " Verder naar volgende %c" -#: src/reader.c:309 src/reader.c:321 +#: src/reader.c:140 src/reader.c:152 msgid "invalid $ value" msgstr "ongeldige $-waarde" -#: src/reader.c:370 src/reader.c:385 +#: src/reader.c:201 src/reader.c:216 msgid "unterminated string at end of file" msgstr "niet-beëindigde string aan einde van bestand" -#: src/reader.c:373 +#: src/reader.c:204 msgid "unterminated string" msgstr "niet-beëindigde string" -#: src/reader.c:514 src/reader.c:573 +#: src/reader.c:345 src/reader.c:404 #, fuzzy, c-format msgid "invalid value: %s%d" msgstr "ongeldige @-waarde" -#: src/reader.c:523 src/reader.c:591 +#: src/reader.c:354 src/reader.c:422 #, c-format msgid "%s is invalid" msgstr "%s is ongeldig" -#: src/reader.c:559 +#: src/reader.c:390 #, c-format msgid "$$ of `%s' has no declared type" msgstr "$$ van `%s' heeft geen gedeclareerd type" -#: src/reader.c:579 +#: src/reader.c:410 #, c-format msgid "$%d of `%s' has no declared type" msgstr "$%d van `%s' heeft geen gedeclareerd type" -#: src/reader.c:641 +#: src/reader.c:472 msgid "unterminated `%{' definition" msgstr "niet-beëindigde `%{' definitie" -#: src/reader.c:686 src/reader.c:796 src/reader.c:847 src/reader.c:1099 +#: src/reader.c:517 src/reader.c:627 src/reader.c:678 src/reader.c:930 #, c-format msgid "Premature EOF after %s" msgstr "Voortijdig bestandseinde na %s" -#: src/reader.c:711 src/reader.c:866 +#: src/reader.c:542 src/reader.c:697 #, c-format msgid "symbol %s redefined" msgstr "symbool %s opnieuw gedefinieerd" -#: src/reader.c:723 src/reader.c:811 src/reader.c:877 +#: src/reader.c:554 src/reader.c:642 src/reader.c:708 #, c-format msgid "type redeclaration for %s" msgstr "type herdeclaratie voor %s" -#: src/reader.c:741 +#: src/reader.c:572 #, c-format msgid "`%s' is invalid in %s" msgstr "`%s' is ongeldig in %s" -#: src/reader.c:759 src/reader.c:923 +#: src/reader.c:590 src/reader.c:754 #, c-format msgid "multiple %s declarations" msgstr "meerdere %s declaraties" -#: src/reader.c:761 src/reader.c:1079 src/reader.c:1094 src/reader.c:1127 -#: src/reader.c:1141 +#: src/reader.c:592 src/reader.c:910 src/reader.c:925 src/reader.c:958 +#: src/reader.c:972 #, c-format msgid "invalid %s declaration" msgstr "ongeldige %s declaratie" -#: src/reader.c:781 +#: src/reader.c:612 msgid "%type declaration has no " msgstr "%type declaratie heeft geen " # Vertaling voor item? -#: src/reader.c:816 +#: src/reader.c:647 #, c-format msgid "invalid %%type declaration due to item: %s" msgstr "ongeldige %%type declaratie door element: %s" -#: src/reader.c:862 +#: src/reader.c:693 #, c-format msgid "redefining precedence of %s" msgstr "herdefinitie van de voorrang van %s" -#: src/reader.c:889 +#: src/reader.c:720 #, c-format msgid "invalid text (%s) - number should be after identifier" msgstr "ongeldige tekst (%s) - nummer moet achter de naam staan" -#: src/reader.c:899 +#: src/reader.c:730 #, c-format msgid "unexpected item: %s" msgstr "onverwacht element: %s" # Lichtjes vrij vertaald; maar klinkt wel beter dan 'niet overeenkomstige x' -#: src/reader.c:956 src/reader.c:1316 +#: src/reader.c:787 src/reader.c:1147 #, c-format msgid "unmatched %s" msgstr "%s zonder tegenhanger" -#: src/reader.c:985 +#: src/reader.c:816 #, c-format msgid "argument of %%expect is not an integer" msgstr "argument van %%expect is geen geheel getal" -#: src/reader.c:1031 +#: src/reader.c:862 #, c-format msgid "unrecognized item %s, expected an identifier" msgstr "onbekend element %s; een naam werd verwacht" -#: src/reader.c:1053 +#: src/reader.c:884 #, c-format msgid "expected string constant instead of %s" msgstr "in plaats van %s werd een stringconstante verwacht" -#: src/reader.c:1249 +#: src/reader.c:1080 #, c-format msgid "unrecognized: %s" msgstr "onbekend: %s" -#: src/reader.c:1254 +#: src/reader.c:1085 msgid "no input grammar" msgstr "geen invoergrammatica" -#: src/reader.c:1259 +#: src/reader.c:1090 #, c-format msgid "unknown character: %s" msgstr "onbekend karakter: %s" -#: src/reader.c:1411 +#: src/reader.c:1242 msgid "ill-formed rule: initial symbol not followed by colon" msgstr "" "slecht geformuleerde regel: beginsymbool wordt niet gevolgd door dubbele punt" -#: src/reader.c:1418 +#: src/reader.c:1249 msgid "grammar starts with vertical bar" msgstr "grammatica start met een verticale streep" -#: src/reader.c:1446 +#: src/reader.c:1277 #, c-format msgid "rule given for %s, which is a token" msgstr "regel opgegeven voor token (%s)" -#: src/reader.c:1476 src/reader.c:1586 +#: src/reader.c:1307 src/reader.c:1417 msgid "previous rule lacks an ending `;'" msgstr "`;' ontbreekt aan het einde van de voorgaande regel" -#: src/reader.c:1554 +#: src/reader.c:1385 msgid "two @prec's in a row" msgstr "twee @prec's na elkaar" -#: src/reader.c:1564 +#: src/reader.c:1395 msgid "two actions at end of one rule" msgstr "twee akties aan het einde van één regel" -#: src/reader.c:1578 +#: src/reader.c:1409 #, c-format msgid "type clash (`%s' `%s') on default action" msgstr "type-conflict (`%s' `%s') bij standaardaktie" -#: src/reader.c:1584 +#: src/reader.c:1415 msgid "empty rule for typed nonterminal, and no action" msgstr "lege regel voor niet-eindsymbool met type, en geen actie" -#: src/reader.c:1592 +#: src/reader.c:1423 #, c-format msgid "invalid input: %s" msgstr "ongeldige invoer: %s" -#: src/reader.c:1599 +#: src/reader.c:1430 msgid "no rules in the input grammar" msgstr "invoergrammatica bevat geen regels" -#: src/reader.c:1620 +#: src/reader.c:1450 #, c-format msgid "too many symbols (tokens plus nonterminals); maximum %d" msgstr "teveel symbolen (tokens plus niet-eindsymbolen); het maximum is %d" -#: src/reader.c:1723 -#, c-format -msgid "the start symbol %s is undefined" -msgstr "het startsymbool %s is niet gedefinieerd" - -#: src/reader.c:1725 -#, c-format -msgid "the start symbol %s is a token" -msgstr "het startsymbool %s is een token" - #: src/reduce.c:338 msgid "Useless nonterminals:" msgstr "Nutteloze niet-eindsymbolen:" @@ -745,6 +703,32 @@ msgstr "`" msgid "'" msgstr "'" +#~ msgid "symbol %s is used, but is not defined as a token and has no rules" +#~ msgstr "" +#~ "symbool %s wordt gebruikt, maar is niet gedefinieerd als een teken en " +#~ "heeft geen regels" + +#~ msgid "symbol `%s' used more than once as a literal string" +#~ msgstr "symbool `%s' meer dan eens gebruikt als een letterlijke string" + +#~ msgid "symbol `%s' given more than one literal string" +#~ msgstr "symbool `%s' krijgt meer dan één letterlijke string toegewezen" + +#~ msgid "conflicting precedences for %s and %s" +#~ msgstr "voorrangen voor %s en %s geven conflicten" + +#~ msgid "conflicting assoc values for %s and %s" +#~ msgstr "associativiteitswaarden voor %s en %s geven conflicten" + +#~ msgid "tokens %s and %s both assigned number %d" +#~ msgstr "tokens %s en %s hebben beide nummer %d toegewezen gekregen" + +#~ msgid "the start symbol %s is undefined" +#~ msgstr "het startsymbool %s is niet gedefinieerd" + +#~ msgid "the start symbol %s is a token" +#~ msgstr "het startsymbool %s is een token" + #~ msgid "reduce" #~ msgstr "reductie" diff --git a/po/ru.po b/po/ru.po index 6b073a0d..1b325a72 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: bison 1.32\n" -"POT-Creation-Date: 2002-06-03 09:28+0200\n" +"POT-Creation-Date: 2002-06-10 10:30+0200\n" "PO-Revision-Date: 2002-01-25 12:19+0300\n" "Last-Translator: Dmitry S. Sivachenko \n" "Language-Team: Russian \n" @@ -255,7 +255,7 @@ msgstr " msgid "unexpected `/' found and ignored" msgstr "×ÓÔÒÅÞÅÎ É ÐÒÏÉÇÎÏÒÉÒÏ×ÁÎ ÎÅÏÖÉÄÁÎÎÙÊ ÓÉÍ×ÏÌ `/'" -#: src/lex.c:106 src/reader.c:480 +#: src/lex.c:106 src/reader.c:311 msgid "unterminated comment" msgstr "ÎÅÚÁËÏÎÞÅÎÎÙÊ ËÏÍÍÅÎÔÁÒÉÊ" @@ -404,229 +404,189 @@ msgstr " msgid " on right:" msgstr " ÎÁÐÒÁ×Ï:" -#: src/reader.c:100 -#, c-format -msgid "symbol %s is used, but is not defined as a token and has no rules" -msgstr "ÓÉÍ×ÏÌ %s ÉÓÐÏÌØÚÕÅÔÓÑ, ÎÏ ÎÅ ÏÐÒÅÄÅÌÅÎ ËÁË ÌÅËÓÅÍÁ É ÎÅ ÉÍÅÅÔ ÐÒÁ×ÉÌ" - -#: src/reader.c:119 -#, c-format -msgid "symbol `%s' used more than once as a literal string" -msgstr "" - -#: src/reader.c:122 -#, c-format -msgid "symbol `%s' given more than one literal string" -msgstr "" - -#: src/reader.c:157 -#, c-format -msgid "conflicting precedences for %s and %s" -msgstr "ÐÒÏÔÉ×ÏÒÅÞÉ×ÙÅ ÐÒÉÏÒÉÔÅÔÙ ÄÌÑ %s É %s" - -#: src/reader.c:168 -#, c-format -msgid "conflicting assoc values for %s and %s" -msgstr "ÐÒÏÔÉ×ÏÒÅÞÉ×ÙÅ ÚÎÁÞÅÎÉÑ ÁÓÓÏÃÉÁÔÉ×ÎÏÓÔÉ ÄÌÑ %s É %s" - -#: src/reader.c:236 -#, c-format -msgid "tokens %s and %s both assigned number %d" -msgstr "ÏÂÅÉÍ ÌÅËÓÅÍÁÍ %s É %s ÐÒÉÓ×ÏÅÎ ÎÏÍÅÒ %d" - -#: src/reader.c:256 +#: src/reader.c:87 msgid " Skipping to next \\n" msgstr " ðÒÏÐÕÓË ÄÏ ÓÌÅÄÕÀÝÅÇÏ \\n" -#: src/reader.c:258 +#: src/reader.c:89 #, c-format msgid " Skipping to next %c" msgstr " ðÒÏÐÕÓË ÄÏ ÓÌÅÄÕÀÝÅÇÏ %c" -#: src/reader.c:309 src/reader.c:321 +#: src/reader.c:140 src/reader.c:152 msgid "invalid $ value" msgstr "ÎÅ×ÅÒÎÏÅ $ ÚÎÁÞÅÎÉÅ" -#: src/reader.c:370 src/reader.c:385 +#: src/reader.c:201 src/reader.c:216 msgid "unterminated string at end of file" msgstr "ÎÅÚÁËÏÎÞÅÎÎÁÑ ÓÔÒÏËÁ × ËÏÎÃÅ ÆÁÊÌÁ" -#: src/reader.c:373 +#: src/reader.c:204 msgid "unterminated string" msgstr "ÎÅÚÁËÏÎÞÅÎÎÁÑ ÓÔÒÏËÁ" -#: src/reader.c:514 src/reader.c:573 +#: src/reader.c:345 src/reader.c:404 #, fuzzy, c-format msgid "invalid value: %s%d" msgstr "ÎÅ×ÅÒÎÏÅ $ ÚÎÁÞÅÎÉÅ" -#: src/reader.c:523 src/reader.c:591 +#: src/reader.c:354 src/reader.c:422 #, c-format msgid "%s is invalid" msgstr "ÎÅ×ÅÒÎÙÊ ÚÎÁË %s" -#: src/reader.c:559 +#: src/reader.c:390 #, c-format msgid "$$ of `%s' has no declared type" msgstr "$$ × `%s' ÎÅ ÉÍÅÅÔ ÏÐÉÓÁÎÎÏÇÏ ÔÉÐÁ" -#: src/reader.c:579 +#: src/reader.c:410 #, c-format msgid "$%d of `%s' has no declared type" msgstr "$%d ÉÚ `%s' ÎÅ ÉÍÅÅÔ ÏÐÉÓÁÎÎÏÇÏ ÔÉÐÁ" -#: src/reader.c:641 +#: src/reader.c:472 msgid "unterminated `%{' definition" msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ ÏÐÒÅÄÅÌÅÎÉÅ `%{'" -#: src/reader.c:686 src/reader.c:796 src/reader.c:847 src/reader.c:1099 +#: src/reader.c:517 src/reader.c:627 src/reader.c:678 src/reader.c:930 #, c-format msgid "Premature EOF after %s" msgstr "ðÒÅÖÄÅ×ÒÅÍÅÎÎÙÊ ËÏÎÅà ÆÁÊÌÁ ÐÏÓÌÅ %s" -#: src/reader.c:711 src/reader.c:866 +#: src/reader.c:542 src/reader.c:697 #, c-format msgid "symbol %s redefined" msgstr "ÐÏ×ÔÏÒÎÏÅ ÏÐÒÅÄÅÌÅÎÉÅ ÓÉÍ×ÏÌÁ %s" -#: src/reader.c:723 src/reader.c:811 src/reader.c:877 +#: src/reader.c:554 src/reader.c:642 src/reader.c:708 #, c-format msgid "type redeclaration for %s" msgstr "ÐÏ×ÔÏÒÎÏÅ ÏÐÉÓÁÎÉÅ ÔÉÐÁ ÄÌÑ %s" -#: src/reader.c:741 +#: src/reader.c:572 #, c-format msgid "`%s' is invalid in %s" msgstr "`%s' ÎÅ×ÅÒÎÏ × %s" -#: src/reader.c:759 src/reader.c:923 +#: src/reader.c:590 src/reader.c:754 #, c-format msgid "multiple %s declarations" msgstr "ÍÎÏÖÅÓÔ×ÅÎÎÏÅ ÏÐÉÓÁÎÉÅ %s" -#: src/reader.c:761 src/reader.c:1079 src/reader.c:1094 src/reader.c:1127 -#: src/reader.c:1141 +#: src/reader.c:592 src/reader.c:910 src/reader.c:925 src/reader.c:958 +#: src/reader.c:972 #, c-format msgid "invalid %s declaration" msgstr "ÎÅ×ÅÒÎÏÅ ÏÐÉÓÁÎÉÅ %s" -#: src/reader.c:781 +#: src/reader.c:612 msgid "%type declaration has no " msgstr "ÏÐÉÓÁÎÉÅ %type ÎÅ ÉÍÅÅÔ <ÉÍÑ_ÔÉÐÁ>" -#: src/reader.c:816 +#: src/reader.c:647 #, c-format msgid "invalid %%type declaration due to item: %s" msgstr "ÎÅ×ÅÒÎÏÅ ÏÐÉÓÁÎÉÅ %%type ÉÚ-ÚÁ ÜÌÅÍÅÎÔÁ: %s" -#: src/reader.c:862 +#: src/reader.c:693 #, c-format msgid "redefining precedence of %s" msgstr "ÐÅÒÅÏÐÒÅÄÅÌÅÎÉÅ ÐÒÉÏÒÉÔÅÔÁ ÄÌÑ %s" -#: src/reader.c:889 +#: src/reader.c:720 #, c-format msgid "invalid text (%s) - number should be after identifier" msgstr "ÎÅ×ÅÒÎÙÊ ÔÅËÓÔ (%s) - ÞÉÓÌÏ ÄÏÌÖÎÏ ÓÌÅÄÏ×ÁÔØ ÚÁ ÉÄÅÎÔÉÆÉËÁÔÏÒÏÍ" -#: src/reader.c:899 +#: src/reader.c:730 #, c-format msgid "unexpected item: %s" msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ÜÌÅÍÅÎÔ: %s" -#: src/reader.c:956 src/reader.c:1316 +#: src/reader.c:787 src/reader.c:1147 #, c-format msgid "unmatched %s" msgstr "ÎÅÐÁÒÎÁÑ %s" -#: src/reader.c:985 +#: src/reader.c:816 #, c-format msgid "argument of %%expect is not an integer" msgstr "ÁÒÇÕÍÅÎÔ %%expect ÎÅ Ñ×ÌÑÅÔÓÑ ÃÅÌÙÍ ÞÉÓÌÏÍ" -#: src/reader.c:1031 +#: src/reader.c:862 #, c-format msgid "unrecognized item %s, expected an identifier" msgstr "ÎÅÒÁÓÐÏÚÎÁÎÎÙÊ ÜÌÅÍÅÎÔ %s, ÏÖÉÄÁÌÓÑ ÉÄÅÎÔÉÆÉËÁÔÏÒ" -#: src/reader.c:1053 +#: src/reader.c:884 #, c-format msgid "expected string constant instead of %s" msgstr "×ÍÅÓÔÏ %s ÏÖÉÄÁÌÁÓØ ÓÔÒÏËÏ×ÁÑ ÐÏÓÔÏÑÎÎÁÑ" -#: src/reader.c:1249 +#: src/reader.c:1080 #, c-format msgid "unrecognized: %s" msgstr "ÎÅÒÁÓÐÏÚÎÁÎÏ: %s" -#: src/reader.c:1254 +#: src/reader.c:1085 msgid "no input grammar" msgstr "ÎÅÔ ×ÈÏÄÎÏÊ ÇÒÁÍÍÁÔÉËÉ" -#: src/reader.c:1259 +#: src/reader.c:1090 #, c-format msgid "unknown character: %s" msgstr "ÎÅÉÚ×ÅÓÔÎÙÊ ÓÉÍ×ÏÌ: %s" -#: src/reader.c:1411 +#: src/reader.c:1242 msgid "ill-formed rule: initial symbol not followed by colon" msgstr "ÎÅ×ÅÒÎÏÅ ÐÒÁ×ÉÌÏ: Ä×ÏÅÔÏÞÉÅ ÎÅ ÓÌÅÄÕÅÔ ÚÁ ÎÁÞÁÌØÎÙÍ ÓÉÍ×ÏÌÏÍ" -#: src/reader.c:1418 +#: src/reader.c:1249 msgid "grammar starts with vertical bar" msgstr "ÇÒÁÍÍÁÔÉËÁ ÎÁÞÉÎÁÅÔÓÑ Ó ×ÅÒÔÉËÁÌØÎÏÊ ÞÅÒÔÙ" -#: src/reader.c:1446 +#: src/reader.c:1277 #, c-format msgid "rule given for %s, which is a token" msgstr "ÐÒÁ×ÉÌÏ ÚÁÄÁÎÏ ÄÌÑ %s, ËÏÔÏÒÙÊ Ñ×ÌÑÅÔÓÑ ÌÅËÓÅÍÏÊ" -#: src/reader.c:1476 src/reader.c:1586 +#: src/reader.c:1307 src/reader.c:1417 msgid "previous rule lacks an ending `;'" msgstr "" -#: src/reader.c:1554 +#: src/reader.c:1385 msgid "two @prec's in a row" msgstr "Ä×Á @prec ÐÏÄÒÑÄ" -#: src/reader.c:1564 +#: src/reader.c:1395 msgid "two actions at end of one rule" msgstr "Ä×Á ÄÅÊÓÔ×ÉÑ × ËÏÎÃÅ ÏÄÎÏÇÏ ÐÒÁ×ÉÌÁ" -#: src/reader.c:1578 +#: src/reader.c:1409 #, c-format msgid "type clash (`%s' `%s') on default action" msgstr "ËÏÎÆÌÉËÔ ÔÉÐÏ× (`%s' `%s') ÎÁ ÄÅÊÓÔ×ÉÉ ÐÏ ÕÍÏÌÞÁÎÉÀ" -#: src/reader.c:1584 +#: src/reader.c:1415 msgid "empty rule for typed nonterminal, and no action" msgstr "" "ÐÕÓÔÏÅ ÐÒÁ×ÉÌÏ ÄÌÑ ÔÉÐÉÚÉÒÏ×ÁÎÎÏÇÏ ÎÅÔÅÒÍÉÎÁÌØÎÏÇÏ ÓÉÍ×ÏÌÁ, É ÎÅÔ ÄÅÊÓÔ×ÉÑ" -#: src/reader.c:1592 +#: src/reader.c:1423 #, c-format msgid "invalid input: %s" msgstr "ÎÅ×ÅÒÎÙÅ ×ÈÏÄÎÙÅ ÄÁÎÎÙÅ: %s" -#: src/reader.c:1599 +#: src/reader.c:1430 msgid "no rules in the input grammar" msgstr "ÏÔÓÕÔÓÔ×ÕÀÔ ÐÒÁ×ÉÌÁ ×Ï ×ÈÏÄÎÏÊ ÇÒÁÍÍÁÔÉËÅ" -#: src/reader.c:1620 +#: src/reader.c:1450 #, c-format msgid "too many symbols (tokens plus nonterminals); maximum %d" msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ ÓÉÍ×ÏÌÏ× (ÌÅËÓÅÍÙ ÐÌÀÓ ÎÅÔÅÒÍÉÎÁÌÙ); ÍÁËÓÉÍÁÌØÎÏ %d" -#: src/reader.c:1723 -#, c-format -msgid "the start symbol %s is undefined" -msgstr "ÎÁÞÁÌØÎÙÊ ÓÉÍ×ÏÌ %s ÎÅÏÐÒÅÄÅÌÅÎ" - -#: src/reader.c:1725 -#, c-format -msgid "the start symbol %s is a token" -msgstr "ÎÁÞÁÌØÎÙÊ ÓÉÍ×ÏÌ %s Ñ×ÌÑÅÔÓÑ ÌÅËÓÅÍÏÊ" - #: src/reduce.c:338 msgid "Useless nonterminals:" msgstr "âÅÓÐÏÌÅÚÎÙÅ ÎÅÔÅÒÍÉÎÁÌÙ:" @@ -739,6 +699,25 @@ msgstr "`" msgid "'" msgstr "'" +#~ msgid "symbol %s is used, but is not defined as a token and has no rules" +#~ msgstr "" +#~ "ÓÉÍ×ÏÌ %s ÉÓÐÏÌØÚÕÅÔÓÑ, ÎÏ ÎÅ ÏÐÒÅÄÅÌÅÎ ËÁË ÌÅËÓÅÍÁ É ÎÅ ÉÍÅÅÔ ÐÒÁ×ÉÌ" + +#~ msgid "conflicting precedences for %s and %s" +#~ msgstr "ÐÒÏÔÉ×ÏÒÅÞÉ×ÙÅ ÐÒÉÏÒÉÔÅÔÙ ÄÌÑ %s É %s" + +#~ msgid "conflicting assoc values for %s and %s" +#~ msgstr "ÐÒÏÔÉ×ÏÒÅÞÉ×ÙÅ ÚÎÁÞÅÎÉÑ ÁÓÓÏÃÉÁÔÉ×ÎÏÓÔÉ ÄÌÑ %s É %s" + +#~ msgid "tokens %s and %s both assigned number %d" +#~ msgstr "ÏÂÅÉÍ ÌÅËÓÅÍÁÍ %s É %s ÐÒÉÓ×ÏÅÎ ÎÏÍÅÒ %d" + +#~ msgid "the start symbol %s is undefined" +#~ msgstr "ÎÁÞÁÌØÎÙÊ ÓÉÍ×ÏÌ %s ÎÅÏÐÒÅÄÅÌÅÎ" + +#~ msgid "the start symbol %s is a token" +#~ msgstr "ÎÁÞÁÌØÎÙÊ ÓÉÍ×ÏÌ %s Ñ×ÌÑÅÔÓÑ ÌÅËÓÅÍÏÊ" + #~ msgid "reduce" #~ msgstr "×Ù×ÏÄ" diff --git a/po/sv.po b/po/sv.po index 726a1de3..d67b6744 100644 --- a/po/sv.po +++ b/po/sv.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: bison 1.33b\n" -"POT-Creation-Date: 2002-06-03 09:28+0200\n" +"POT-Creation-Date: 2002-06-10 10:30+0200\n" "PO-Revision-Date: 2002-03-05 10:18+0100\n" "Last-Translator: Göran Uddeborg \n" "Language-Team: Swedish \n" @@ -249,7 +249,7 @@ msgstr "f msgid "unexpected `/' found and ignored" msgstr "oväntat \"/\" hittat och ignorerat" -#: src/lex.c:106 src/reader.c:480 +#: src/lex.c:106 src/reader.c:311 msgid "unterminated comment" msgstr "oavslutad kommentar" @@ -398,230 +398,188 @@ msgstr " till v msgid " on right:" msgstr " till höger:" -#: src/reader.c:100 -#, c-format -msgid "symbol %s is used, but is not defined as a token and has no rules" -msgstr "" -"symbolen %s används, men är inte definierad som ett element och har inga " -"regler" - -#: src/reader.c:119 -#, c-format -msgid "symbol `%s' used more than once as a literal string" -msgstr "symbolen \"%s\" används mer än en gång som en bokstavlig sträng" - -#: src/reader.c:122 -#, c-format -msgid "symbol `%s' given more than one literal string" -msgstr "symbolen \"%s\" har fått mer än en bokstavlig sträng" - -#: src/reader.c:157 -#, c-format -msgid "conflicting precedences for %s and %s" -msgstr "motstridiga precedenser mellan %s och %s" - -#: src/reader.c:168 -#, c-format -msgid "conflicting assoc values for %s and %s" -msgstr "motstridiga assoc-värden mellan %s och %s" - -#: src/reader.c:236 -#, c-format -msgid "tokens %s and %s both assigned number %d" -msgstr "elementen %s och %s har båda fått nummer %d" - -#: src/reader.c:256 +#: src/reader.c:87 msgid " Skipping to next \\n" msgstr " Hoppar över till nästa \\n" -#: src/reader.c:258 +#: src/reader.c:89 #, c-format msgid " Skipping to next %c" msgstr " Hoppar över till nästa %c" -#: src/reader.c:309 src/reader.c:321 +#: src/reader.c:140 src/reader.c:152 msgid "invalid $ value" msgstr "felaktigt $-värde" -#: src/reader.c:370 src/reader.c:385 +#: src/reader.c:201 src/reader.c:216 msgid "unterminated string at end of file" msgstr "oavslutad sträng vid filslut" -#: src/reader.c:373 +#: src/reader.c:204 msgid "unterminated string" msgstr "oavslutad sträng" -#: src/reader.c:514 src/reader.c:573 +#: src/reader.c:345 src/reader.c:404 #, fuzzy, c-format msgid "invalid value: %s%d" msgstr "felaktigt @-värde" -#: src/reader.c:523 src/reader.c:591 +#: src/reader.c:354 src/reader.c:422 #, c-format msgid "%s is invalid" msgstr "%s är felaktigt" -#: src/reader.c:559 +#: src/reader.c:390 #, c-format msgid "$$ of `%s' has no declared type" msgstr "$$ för \"%s\" har ingen deklarerad typ" -#: src/reader.c:579 +#: src/reader.c:410 #, c-format msgid "$%d of `%s' has no declared type" msgstr "$%d för \"%s\" har ingen deklarerad typ" -#: src/reader.c:641 +#: src/reader.c:472 msgid "unterminated `%{' definition" msgstr "oavslutad \"%{\"-definition" -#: src/reader.c:686 src/reader.c:796 src/reader.c:847 src/reader.c:1099 +#: src/reader.c:517 src/reader.c:627 src/reader.c:678 src/reader.c:930 #, c-format msgid "Premature EOF after %s" msgstr "Förtida filslut efter %s" -#: src/reader.c:711 src/reader.c:866 +#: src/reader.c:542 src/reader.c:697 #, c-format msgid "symbol %s redefined" msgstr "symbolen %s omdefinierad" -#: src/reader.c:723 src/reader.c:811 src/reader.c:877 +#: src/reader.c:554 src/reader.c:642 src/reader.c:708 #, c-format msgid "type redeclaration for %s" msgstr "typen omdeklarerad för %s" -#: src/reader.c:741 +#: src/reader.c:572 #, c-format msgid "`%s' is invalid in %s" msgstr "\"%s\" är felaktig i %s" -#: src/reader.c:759 src/reader.c:923 +#: src/reader.c:590 src/reader.c:754 #, c-format msgid "multiple %s declarations" msgstr "flera %s-deklarationer" -#: src/reader.c:761 src/reader.c:1079 src/reader.c:1094 src/reader.c:1127 -#: src/reader.c:1141 +#: src/reader.c:592 src/reader.c:910 src/reader.c:925 src/reader.c:958 +#: src/reader.c:972 #, c-format msgid "invalid %s declaration" msgstr "felaktig %s-deklaration" -#: src/reader.c:781 +#: src/reader.c:612 msgid "%type declaration has no " msgstr "%type-deklaration har inget " -#: src/reader.c:816 +#: src/reader.c:647 #, c-format msgid "invalid %%type declaration due to item: %s" msgstr "felaktig %%type-deklaration på grund av objekt: %s" -#: src/reader.c:862 +#: src/reader.c:693 #, c-format msgid "redefining precedence of %s" msgstr "omdefinition av precedens för %s" -#: src/reader.c:889 +#: src/reader.c:720 #, c-format msgid "invalid text (%s) - number should be after identifier" msgstr "felaktig text (%s) - tal skulle följa efter identifierare" -#: src/reader.c:899 +#: src/reader.c:730 #, c-format msgid "unexpected item: %s" msgstr "oväntat objekt: %s" -#: src/reader.c:956 src/reader.c:1316 +#: src/reader.c:787 src/reader.c:1147 #, c-format msgid "unmatched %s" msgstr "ensam %s" -#: src/reader.c:985 +#: src/reader.c:816 #, c-format msgid "argument of %%expect is not an integer" msgstr "argument till %%expect är inte ett heltal" -#: src/reader.c:1031 +#: src/reader.c:862 #, c-format msgid "unrecognized item %s, expected an identifier" msgstr "oväntat objekt %s, förväntade en identifierare" -#: src/reader.c:1053 +#: src/reader.c:884 #, c-format msgid "expected string constant instead of %s" msgstr "förväntade strängkonstant istället för %s" -#: src/reader.c:1249 +#: src/reader.c:1080 #, c-format msgid "unrecognized: %s" msgstr "okänt: %s" -#: src/reader.c:1254 +#: src/reader.c:1085 msgid "no input grammar" msgstr "ingen ingrammatik" -#: src/reader.c:1259 +#: src/reader.c:1090 #, c-format msgid "unknown character: %s" msgstr "okänt tecken: %s" -#: src/reader.c:1411 +#: src/reader.c:1242 msgid "ill-formed rule: initial symbol not followed by colon" msgstr "felskriven regel: första symbolen följs inte av ett kolon" -#: src/reader.c:1418 +#: src/reader.c:1249 msgid "grammar starts with vertical bar" msgstr "grammatiken startar med ett vertikalt streck" -#: src/reader.c:1446 +#: src/reader.c:1277 #, c-format msgid "rule given for %s, which is a token" msgstr "regel given för %s, som är ett element" -#: src/reader.c:1476 src/reader.c:1586 +#: src/reader.c:1307 src/reader.c:1417 msgid "previous rule lacks an ending `;'" msgstr "föregående regel saknar ett avslutande \";\"" -#: src/reader.c:1554 +#: src/reader.c:1385 msgid "two @prec's in a row" msgstr "två @prec i rad" -#: src/reader.c:1564 +#: src/reader.c:1395 msgid "two actions at end of one rule" msgstr "två åtgärder vid slutet av en regel" -#: src/reader.c:1578 +#: src/reader.c:1409 #, c-format msgid "type clash (`%s' `%s') on default action" msgstr "typkonflikt (\"%s\" \"%s\") för standardåtgärd" -#: src/reader.c:1584 +#: src/reader.c:1415 msgid "empty rule for typed nonterminal, and no action" msgstr "tom regel för typad icketerminal, och ingen åtgärd" -#: src/reader.c:1592 +#: src/reader.c:1423 #, c-format msgid "invalid input: %s" msgstr "felaktig indata: %s" -#: src/reader.c:1599 +#: src/reader.c:1430 msgid "no rules in the input grammar" msgstr "inga regler i ingrammatiken" -#: src/reader.c:1620 +#: src/reader.c:1450 #, c-format msgid "too many symbols (tokens plus nonterminals); maximum %d" msgstr "för många symboler (element plus icketerminaler); max %d" -#: src/reader.c:1723 -#, c-format -msgid "the start symbol %s is undefined" -msgstr "startsymbolen %s är odefinierad" - -#: src/reader.c:1725 -#, c-format -msgid "the start symbol %s is a token" -msgstr "startsymbolen %s är ett element" - #: src/reduce.c:338 msgid "Useless nonterminals:" msgstr "Oanvändbara icketerminaler:" @@ -734,6 +692,32 @@ msgstr "\"" msgid "'" msgstr "\"" +#~ msgid "symbol %s is used, but is not defined as a token and has no rules" +#~ msgstr "" +#~ "symbolen %s används, men är inte definierad som ett element och har inga " +#~ "regler" + +#~ msgid "symbol `%s' used more than once as a literal string" +#~ msgstr "symbolen \"%s\" används mer än en gång som en bokstavlig sträng" + +#~ msgid "symbol `%s' given more than one literal string" +#~ msgstr "symbolen \"%s\" har fått mer än en bokstavlig sträng" + +#~ msgid "conflicting precedences for %s and %s" +#~ msgstr "motstridiga precedenser mellan %s och %s" + +#~ msgid "conflicting assoc values for %s and %s" +#~ msgstr "motstridiga assoc-värden mellan %s och %s" + +#~ msgid "tokens %s and %s both assigned number %d" +#~ msgstr "elementen %s och %s har båda fått nummer %d" + +#~ msgid "the start symbol %s is undefined" +#~ msgstr "startsymbolen %s är odefinierad" + +#~ msgid "the start symbol %s is a token" +#~ msgstr "startsymbolen %s är ett element" + #~ msgid "reduce" #~ msgstr "reducera" diff --git a/po/tr.po b/po/tr.po index a34570a5..fd6fecb8 100644 --- a/po/tr.po +++ b/po/tr.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: bison 1.34\n" -"POT-Creation-Date: 2002-06-03 09:28+0200\n" +"POT-Creation-Date: 2002-06-10 10:30+0200\n" "PO-Revision-Date: 2002-03-14 11:03GMT +02:00\n" "Last-Translator: Altuð Bayram \n" "Language-Team: Turkish \n" @@ -254,7 +254,7 @@ msgstr "gotos msgid "unexpected `/' found and ignored" msgstr "beklenmeyen `/' bulundu ve yoksayýldý" -#: src/lex.c:106 src/reader.c:480 +#: src/lex.c:106 src/reader.c:311 msgid "unterminated comment" msgstr "sonlandýrýlmamýþ açýklama" @@ -403,230 +403,189 @@ msgstr " solda:" msgid " on right:" msgstr " saðda:" -#: src/reader.c:100 -#, 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ý ve kurallarý yok" - -#: src/reader.c:119 -#, c-format -msgid "symbol `%s' used more than once as a literal string" -msgstr "simge `%s' bir harfiyen uyumlu dizgi gibi birden fazla kullanýldý" - -#: src/reader.c:122 -#, c-format -msgid "symbol `%s' given more than one literal string" -msgstr "simge `%s' bir harfiyen uyumlu dizgi gibi birden fazla verilmiþ" - -#: src/reader.c:157 -#, c-format -msgid "conflicting precedences for %s and %s" -msgstr "%s ve %s için çeliþen öncelikler" - -#: src/reader.c:168 -#, 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:236 -#, 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:256 +#: src/reader.c:87 msgid " Skipping to next \\n" msgstr " Sonrakine atlanýyor \\n" -#: src/reader.c:258 +#: src/reader.c:89 #, c-format msgid " Skipping to next %c" msgstr " Sonraki %c'ye atlanýyor" -#: src/reader.c:309 src/reader.c:321 +#: src/reader.c:140 src/reader.c:152 msgid "invalid $ value" msgstr "geçersiz $ deðeri" -#: src/reader.c:370 src/reader.c:385 +#: src/reader.c:201 src/reader.c:216 msgid "unterminated string at end of file" msgstr "dosyanýn sonunda sonlandýrýlmamýþ dizge" -#: src/reader.c:373 +#: src/reader.c:204 msgid "unterminated string" msgstr "sonlandýrýlmamýþ dizge" -#: src/reader.c:514 src/reader.c:573 +#: src/reader.c:345 src/reader.c:404 #, fuzzy, c-format msgid "invalid value: %s%d" msgstr "geçersiz @ deðeri" -#: src/reader.c:523 src/reader.c:591 +#: src/reader.c:354 src/reader.c:422 #, c-format msgid "%s is invalid" msgstr "%s geçersizdir" -#: src/reader.c:559 +#: src/reader.c:390 #, c-format msgid "$$ of `%s' has no declared type" msgstr "`%s''in $$'ý bildirilmiþ tip deðil" -#: src/reader.c:579 +#: src/reader.c:410 #, c-format msgid "$%d of `%s' has no declared type" msgstr "`%2$s''in %1$d'i bildirilmiþ tip deðil" -#: src/reader.c:641 +#: src/reader.c:472 msgid "unterminated `%{' definition" msgstr "`%{' tanýmlamasý sonlandýrýlmamýþ" -#: src/reader.c:686 src/reader.c:796 src/reader.c:847 src/reader.c:1099 +#: src/reader.c:517 src/reader.c:627 src/reader.c:678 src/reader.c:930 #, c-format msgid "Premature EOF after %s" msgstr "%s'den sonra erken EOF" -#: src/reader.c:711 src/reader.c:866 +#: src/reader.c:542 src/reader.c:697 #, c-format msgid "symbol %s redefined" msgstr "%s simgesi yeniden tanýmlandý" -#: src/reader.c:723 src/reader.c:811 src/reader.c:877 +#: src/reader.c:554 src/reader.c:642 src/reader.c:708 #, c-format msgid "type redeclaration for %s" msgstr "%s için yeniden tip bildirimi" -#: src/reader.c:741 +#: src/reader.c:572 #, c-format msgid "`%s' is invalid in %s" msgstr "`%s' %s içinde geçersizdir" -#: src/reader.c:759 src/reader.c:923 +#: src/reader.c:590 src/reader.c:754 #, c-format msgid "multiple %s declarations" msgstr "çoklu %s bildirimleri" -#: src/reader.c:761 src/reader.c:1079 src/reader.c:1094 src/reader.c:1127 -#: src/reader.c:1141 +#: src/reader.c:592 src/reader.c:910 src/reader.c:925 src/reader.c:958 +#: src/reader.c:972 #, c-format msgid "invalid %s declaration" msgstr "geçersiz %s bildirimi" -#: src/reader.c:781 +#: src/reader.c:612 msgid "%type declaration has no " msgstr "%type bildirimi 'na sahip deðil" -#: src/reader.c:816 +#: src/reader.c:647 #, c-format msgid "invalid %%type declaration due to item: %s" msgstr "geçersiz %%type bildirimine neden olan öðe: `%s'" -#: src/reader.c:862 +#: src/reader.c:693 #, c-format msgid "redefining precedence of %s" msgstr "%s'in önceliði tekrar tanýmlandý" -#: src/reader.c:889 +#: src/reader.c:720 #, 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:899 +#: src/reader.c:730 #, c-format msgid "unexpected item: %s" msgstr "beklenmeyen öðe: %s" -#: src/reader.c:956 src/reader.c:1316 +#: src/reader.c:787 src/reader.c:1147 #, c-format msgid "unmatched %s" msgstr "eþlenemeyen %s" -#: src/reader.c:985 +#: src/reader.c:816 #, c-format msgid "argument of %%expect is not an integer" msgstr "%%expect'in argümaný bir tamsayý deðildir" -#: src/reader.c:1031 +#: src/reader.c:862 #, c-format msgid "unrecognized item %s, expected an identifier" msgstr "%s öðesi tanýnmadý, beklenen bir tanýtýcýdýr" -#: src/reader.c:1053 +#: src/reader.c:884 #, c-format msgid "expected string constant instead of %s" msgstr "%s'in yerine sabit dizge beklendi" -#: src/reader.c:1249 +#: src/reader.c:1080 #, c-format msgid "unrecognized: %s" msgstr "tanýnmayan: %s" -#: src/reader.c:1254 +#: src/reader.c:1085 msgid "no input grammar" msgstr "girdi grameri yok" -#: src/reader.c:1259 +#: src/reader.c:1090 #, c-format msgid "unknown character: %s" msgstr "bilinmeyen karakter: %s" -#: src/reader.c:1411 +#: src/reader.c:1242 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:1418 +#: src/reader.c:1249 msgid "grammar starts with vertical bar" msgstr "gramer düþey çubuk ile baþlýyor" -#: src/reader.c:1446 +#: src/reader.c:1277 #, c-format msgid "rule given for %s, which is a token" msgstr "bir andaç olan %s için verilen kural" -#: src/reader.c:1476 src/reader.c:1586 +#: src/reader.c:1307 src/reader.c:1417 msgid "previous rule lacks an ending `;'" msgstr "önceki kuralda bir bitiþ `;' eksik" -#: src/reader.c:1554 +#: src/reader.c:1385 msgid "two @prec's in a row" msgstr "bir satýrda iki @prec" -#: src/reader.c:1564 +#: src/reader.c:1395 msgid "two actions at end of one rule" msgstr "bir kuralýn sonunda iki eylem" -#: src/reader.c:1578 +#: src/reader.c:1409 #, c-format msgid "type clash (`%s' `%s') on default action" msgstr "öntanýmlý eylem üzerinde (`%s' `%s') tip çatýþmasý" -#: src/reader.c:1584 +#: src/reader.c:1415 msgid "empty rule for typed nonterminal, and no action" msgstr "" "Tipli deðiþken simge için boþ kural tanýmlanmýþ, ve eylem belirtilmemiþ" -#: src/reader.c:1592 +#: src/reader.c:1423 #, c-format msgid "invalid input: %s" msgstr "geçersiz girdi: %s" -#: src/reader.c:1599 +#: src/reader.c:1430 msgid "no rules in the input grammar" msgstr "girdi grameri içinde kurallar yok" -#: src/reader.c:1620 +#: src/reader.c:1450 #, 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:1723 -#, c-format -msgid "the start symbol %s is undefined" -msgstr "baþlangýç simgesi %s tanýmlanmadý" - -#: src/reader.c:1725 -#, c-format -msgid "the start symbol %s is a token" -msgstr "baþlangýç simgesi %s bir andaçtýr" - #: src/reduce.c:338 msgid "Useless nonterminals:" msgstr "Yararsýz deðiþken simgeler:" @@ -736,6 +695,31 @@ msgstr "`" msgid "'" msgstr "'" +#~ 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ý ve kurallarý yok" + +#~ msgid "symbol `%s' used more than once as a literal string" +#~ msgstr "simge `%s' bir harfiyen uyumlu dizgi gibi birden fazla kullanýldý" + +#~ msgid "symbol `%s' given more than one literal string" +#~ msgstr "simge `%s' bir harfiyen uyumlu dizgi gibi birden fazla verilmiþ" + +#~ msgid "conflicting precedences for %s and %s" +#~ msgstr "%s ve %s için çeliþen öncelikler" + +#~ msgid "conflicting assoc values for %s and %s" +#~ msgstr "%s ve %s için çeliþen birleþmeli deðerler" + +#~ msgid "tokens %s and %s both assigned number %d" +#~ msgstr "%s ve %s andaçlarýnýn her ikisi %d sayýsýna atandý" + +#~ msgid "the start symbol %s is undefined" +#~ msgstr "baþlangýç simgesi %s tanýmlanmadý" + +#~ msgid "the start symbol %s is a token" +#~ msgstr "baþlangýç simgesi %s bir andaçtýr" + #~ msgid "reduce" #~ msgstr "indirgeme" diff --git a/src/gram.c b/src/gram.c index 6b491e89..90a0b527 100644 --- a/src/gram.c +++ b/src/gram.c @@ -41,8 +41,6 @@ int nvars = 0; symbol_number_t *token_translations = NULL; -symbol_number_t start_symbol = 0; - int max_user_token_number = 256; int pure_parser = 0; diff --git a/src/reader.c b/src/reader.c index 185ca0fa..63d993f9 100644 --- a/src/reader.c +++ b/src/reader.c @@ -51,7 +51,6 @@ typedef struct symbol_list int lineno; static symbol_list *grammar = NULL; static int start_flag = 0; -static symbol_t *startval = NULL; /* Nonzero if components of semantic values are used, implying they must be unions. */ @@ -63,11 +62,6 @@ static int typed = 0; /* Incremented for each %left, %right or %nonassoc seen */ static int lastprec = 0; -symbol_t *errtoken = NULL; -symbol_t *undeftoken = NULL; -symbol_t *eoftoken = NULL; -symbol_t *axiom = NULL; - static symbol_list * symbol_list_new (symbol_t *sym) { @@ -81,169 +75,6 @@ symbol_list_new (symbol_t *sym) return res; } -/*------------------------. -| Operations on symbols. | -`------------------------*/ - - -/*-----------------------------------------------------------. -| If THIS is not defined, report an error, and consider it a | -| nonterminal. | -`-----------------------------------------------------------*/ - -static bool -symbol_check_defined (symbol_t *this) -{ - if (this->class == unknown_sym) - { - complain - (_("symbol %s is used, but is not defined as a token and has no rules"), - this->tag); - this->class = nterm_sym; - this->number = nvars++; - } - - return TRUE; -} - - -/*-------------------------------------------------------------------. -| Assign a symbol number, and write the definition of the token name | -| into FDEFINES. Put in SYMBOLS. | -`-------------------------------------------------------------------*/ - -static bool -symbol_make_alias (symbol_t *symbol, char *typename) -{ - if (symval->alias) - warn (_("symbol `%s' used more than once as a literal string"), - symval->tag); - else if (symbol->alias) - warn (_("symbol `%s' given more than one literal string"), - symbol->tag); - else - { - symval->class = token_sym; - symval->type_name = typename; - symval->user_token_number = symbol->user_token_number; - symbol->user_token_number = USER_NUMBER_ALIAS; - symval->alias = symbol; - symbol->alias = symval; - /* symbol and symval combined are only one symbol */ - nsyms--; - ntokens--; - assert (ntokens == symbol->number || ntokens == symval->number); - symbol->number = symval->number = - (symval->number < symbol->number) ? symval->number : symbol->number; - } - - return TRUE; -} - -/*---------------------------------------------------------. -| Check that THIS, and its alias, have same precedence and | -| associativity. | -`---------------------------------------------------------*/ - -static bool -symbol_check_alias_consistence (symbol_t *this) -{ - /* Check only those who _are_ the aliases. */ - if (this->alias && this->user_token_number == USER_NUMBER_ALIAS) - { - if (this->prec != this->alias->prec) - { - if (this->prec != 0 && this->alias->prec != 0) - complain (_("conflicting precedences for %s and %s"), - this->tag, this->alias->tag); - if (this->prec != 0) - this->alias->prec = this->prec; - else - this->prec = this->alias->prec; - } - - if (this->assoc != this->alias->assoc) - { - if (this->assoc != 0 && this->alias->assoc != 0) - complain (_("conflicting assoc values for %s and %s"), - this->tag, this->alias->tag); - if (this->assoc != 0) - this->alias->assoc = this->assoc; - else - this->assoc = this->alias->assoc; - } - } - return TRUE; -} - - -/*-------------------------------------------------------------------. -| Assign a symbol number, and write the definition of the token name | -| into FDEFINES. Put in SYMBOLS. | -`-------------------------------------------------------------------*/ - -static bool -symbol_pack (symbol_t *this) -{ - if (this->class == nterm_sym) - { - this->number += ntokens; - } - else if (this->alias) - { - /* This symbol and its alias are a single token defn. - Allocate a tokno, and assign to both check agreement of - prec and assoc fields and make both the same */ - if (this->number == NUMBER_UNDEFINED) - { - if (this == eoftoken || this->alias == eoftoken) - this->number = this->alias->number = 0; - else - { - assert (this->alias->number != NUMBER_UNDEFINED); - this->number = this->alias->number; - } - } - /* Do not do processing below for USER_NUMBER_ALIASs. */ - if (this->user_token_number == USER_NUMBER_ALIAS) - return TRUE; - } - else /* this->class == token_sym */ - { - assert (this->number != NUMBER_UNDEFINED); - } - - symbols[this->number] = this; - return TRUE; -} - - - - -/*--------------------------------------------------. -| Put THIS in TOKEN_TRANSLATIONS if it is a token. | -`--------------------------------------------------*/ - -static bool -symbol_translation (symbol_t *this) -{ - /* Non-terminal? */ - if (this->class == token_sym - && this->user_token_number != USER_NUMBER_ALIAS) - { - /* A token which translation has already been set? */ - if (token_translations[this->user_token_number] != undeftoken->number) - complain (_("tokens %s and %s both assigned number %d"), - symbols[token_translations[this->user_token_number]]->tag, - this->tag, this->user_token_number); - - token_translations[this->user_token_number] = this->number; - } - - return TRUE; -} - - /*===================\ | Low level lexing. | \===================*/ @@ -699,7 +530,7 @@ parse_token_decl (symbol_class what_is, symbol_class what_is_not) } else if (token == tok_identifier && *symval->tag == '\"' && symbol) { - symbol_make_alias (symbol, typename); + symbol_make_alias (symbol, symval, typename); symbol = NULL; } else if (token == tok_identifier) @@ -762,7 +593,7 @@ parse_start_decl (void) else { start_flag = 1; - startval = symval; + startsymbol = symval; } } @@ -1401,7 +1232,7 @@ readgram (void) if (!start_flag) { - startval = lhs; + startsymbol = lhs; start_flag = 1; } @@ -1599,7 +1430,7 @@ readgram (void) fatal (_("no rules in the input grammar")); /* Report any undefined symbols and consider them nonterminals. */ - symbols_do (symbol_check_defined, NULL); + symbols_check_defined (); /* Insert the initial rule, which line is that of the first rule (not that of the start symbol): @@ -1607,14 +1438,13 @@ readgram (void) axiom: %start EOF. */ p = symbol_list_new (axiom); p->line = grammar->line; - p->next = symbol_list_new (startval); + p->next = symbol_list_new (startsymbol); p->next->next = symbol_list_new (eoftoken); p->next->next->next = symbol_list_new (NULL); p->next->next->next->next = grammar; nrules += 1; nritems += 3; grammar = p; - startval = axiom; if (nsyms > SHRT_MAX) fatal (_("too many symbols (tokens plus nonterminals); maximum %d"), @@ -1649,85 +1479,6 @@ read_additionnal_code (void) } -/*------------------------------------------------------------------. -| Set TOKEN_TRANSLATIONS. Check that no two symbols share the same | -| number. | -`------------------------------------------------------------------*/ - -static void -token_translations_init (void) -{ - int num_256_available_p = TRUE; - int i; - - /* Find the highest user token number, and whether 256, the POSIX - preferred user token number for the error token, is used. */ - max_user_token_number = 0; - for (i = 0; i < ntokens; ++i) - { - symbol_t *this = symbols[i]; - if (this->user_token_number != USER_NUMBER_UNDEFINED) - { - if (this->user_token_number > max_user_token_number) - max_user_token_number = this->user_token_number; - if (this->user_token_number == 256) - num_256_available_p = FALSE; - } - } - - /* If 256 is not used, assign it to error, to follow POSIX. */ - if (num_256_available_p - && errtoken->user_token_number == USER_NUMBER_UNDEFINED) - errtoken->user_token_number = 256; - - /* Set the missing user numbers. */ - if (max_user_token_number < 256) - max_user_token_number = 256; - - for (i = 0; i < ntokens; ++i) - { - symbol_t *this = symbols[i]; - if (this->user_token_number == USER_NUMBER_UNDEFINED) - this->user_token_number = ++max_user_token_number; - if (this->user_token_number > max_user_token_number) - max_user_token_number = this->user_token_number; - } - - token_translations = XCALLOC (symbol_number_t, max_user_token_number + 1); - - /* Initialize all entries for literal tokens to 2, the internal - token number for $undefined., which represents all invalid - inputs. */ - for (i = 0; i < max_user_token_number + 1; i++) - token_translations[i] = undeftoken->number; - symbols_do (symbol_translation, NULL); -} - - -/*----------------------------------------------------------------. -| Assign symbol numbers, and write definition of token names into | -| FDEFINES. Set up vectors SYMBOL_TABLE, TAGS of symbols. | -`----------------------------------------------------------------*/ - -static void -packsymbols (void) -{ - symbols = XCALLOC (symbol_t *, nsyms); - - symbols_do (symbol_check_alias_consistence, NULL); - symbols_do (symbol_pack, NULL); - - token_translations_init (); - - if (startval->class == unknown_sym) - fatal (_("the start symbol %s is undefined"), startval->tag); - else if (startval->class == token_sym) - fatal (_("the start symbol %s is a token"), startval->tag); - - start_symbol = startval->number; -} - - /*---------------------------------------------------------------. | Convert the rules into the representation using RRHS, RLHS and | | RITEM. | @@ -1862,7 +1613,7 @@ reader (void) /* Assign the symbols their symbol numbers. Write #defines for the token symbols into FDEFINES if requested. */ - packsymbols (); + symbols_pack (); /* Convert the grammar into the format described in gram.h. */ packgram (); diff --git a/src/reader.h b/src/reader.h index 64abe4d4..f86d3c1b 100644 --- a/src/reader.h +++ b/src/reader.h @@ -30,9 +30,4 @@ void reader PARAMS ((void)); extern int lineno; -extern symbol_t *errtoken; -extern symbol_t *undeftoken; -extern symbol_t *eoftoken; -extern symbol_t *axiom; - #endif /* !READER_H_ */ diff --git a/src/reduce.c b/src/reduce.c index 4ac89197..59afff78 100644 --- a/src/reduce.c +++ b/src/reduce.c @@ -165,9 +165,9 @@ inaccessable_symbols (void) Pp = bitset_create (nrules + 1, BITSET_FIXED); /* If the start symbol isn't useful, then nothing will be useful. */ - if (bitset_test (N, start_symbol - ntokens)) + if (bitset_test (N, axiom->number - ntokens)) { - bitset_set (V, start_symbol); + bitset_set (V, axiom->number); while (1) { @@ -315,7 +315,7 @@ nonterminals_reduce (void) if (ISVAR (*rhsp)) *rhsp = symbol_number_as_item_number (nontermmap[*rhsp]); } - start_symbol = nontermmap[start_symbol]; + axiom->number = nontermmap[axiom->number]; } nsyms -= nuseless_nonterminals; @@ -435,9 +435,9 @@ reduce_grammar (void) reduce_print (); - if (!bitset_test (N, start_symbol - ntokens)) + if (!bitset_test (N, axiom->number - ntokens)) fatal (_("Start symbol %s does not derive any sentence"), - quotearg_style (escape_quoting_style, symbols[start_symbol]->tag)); + quotearg_style (escape_quoting_style, symbols[axiom->number]->tag)); /* First reduce the nonterminals, as they renumber themselves in the whole grammar. If you change the order, nonterms would be diff --git a/src/symtab.c b/src/symtab.c index c255a8f3..217b8e0a 100644 --- a/src/symtab.c +++ b/src/symtab.c @@ -21,9 +21,20 @@ #include "system.h" #include "hash.h" +#include "complain.h" #include "symtab.h" #include "gram.h" +/*------------------------. +| Distinguished symbols. | +`------------------------*/ + +symbol_t *errtoken = NULL; +symbol_t *undeftoken = NULL; +symbol_t *eoftoken = NULL; +symbol_t *axiom = NULL; +symbol_t *startsymbol = NULL; + /*---------------------------------. | Create a new symbol, named TAG. | `---------------------------------*/ @@ -65,9 +76,165 @@ symbol_free (symbol_t *this) } +/*-----------------------------------------------------------. +| If THIS is not defined, report an error, and consider it a | +| nonterminal. | +`-----------------------------------------------------------*/ + +static bool +symbol_check_defined (symbol_t *this) +{ + if (this->class == unknown_sym) + { + complain + (_("symbol %s is used, but is not defined as a token and has no rules"), + this->tag); + this->class = nterm_sym; + this->number = nvars++; + } + + return TRUE; +} + + +/*-------------------------------------------------------------------. +| Declare the new SYMBOL. Make it an alias of SYMVAL, and type them | +| with TYPENAME. | +`-------------------------------------------------------------------*/ + +void +symbol_make_alias (symbol_t *symbol, symbol_t *symval, char *typename) +{ + if (symval->alias) + warn (_("symbol `%s' used more than once as a literal string"), + symval->tag); + else if (symbol->alias) + warn (_("symbol `%s' given more than one literal string"), + symbol->tag); + else + { + symval->class = token_sym; + symval->type_name = typename; + symval->user_token_number = symbol->user_token_number; + symbol->user_token_number = USER_NUMBER_ALIAS; + symval->alias = symbol; + symbol->alias = symval; + /* symbol and symval combined are only one symbol */ + nsyms--; + ntokens--; + assert (ntokens == symbol->number || ntokens == symval->number); + symbol->number = symval->number = + (symval->number < symbol->number) ? symval->number : symbol->number; + } +} + + +/*---------------------------------------------------------. +| Check that THIS, and its alias, have same precedence and | +| associativity. | +`---------------------------------------------------------*/ + +static bool +symbol_check_alias_consistence (symbol_t *this) +{ + /* Check only those who _are_ the aliases. */ + if (this->alias && this->user_token_number == USER_NUMBER_ALIAS) + { + if (this->prec != this->alias->prec) + { + if (this->prec != 0 && this->alias->prec != 0) + complain (_("conflicting precedences for %s and %s"), + this->tag, this->alias->tag); + if (this->prec != 0) + this->alias->prec = this->prec; + else + this->prec = this->alias->prec; + } + + if (this->assoc != this->alias->assoc) + { + if (this->assoc != 0 && this->alias->assoc != 0) + complain (_("conflicting assoc values for %s and %s"), + this->tag, this->alias->tag); + if (this->assoc != 0) + this->alias->assoc = this->assoc; + else + this->assoc = this->alias->assoc; + } + } + return TRUE; +} + + +/*-------------------------------------------------------------------. +| Assign a symbol number, and write the definition of the token name | +| into FDEFINES. Put in SYMBOLS. | +`-------------------------------------------------------------------*/ + +static bool +symbol_pack (symbol_t *this) +{ + if (this->class == nterm_sym) + { + this->number += ntokens; + } + else if (this->alias) + { + /* This symbol and its alias are a single token defn. + Allocate a tokno, and assign to both check agreement of + prec and assoc fields and make both the same */ + if (this->number == NUMBER_UNDEFINED) + { + if (this == eoftoken || this->alias == eoftoken) + this->number = this->alias->number = 0; + else + { + assert (this->alias->number != NUMBER_UNDEFINED); + this->number = this->alias->number; + } + } + /* Do not do processing below for USER_NUMBER_ALIASs. */ + if (this->user_token_number == USER_NUMBER_ALIAS) + return TRUE; + } + else /* this->class == token_sym */ + { + assert (this->number != NUMBER_UNDEFINED); + } + + symbols[this->number] = this; + return TRUE; +} + + + + +/*--------------------------------------------------. +| Put THIS in TOKEN_TRANSLATIONS if it is a token. | +`--------------------------------------------------*/ + +static bool +symbol_translation (symbol_t *this) +{ + /* Non-terminal? */ + if (this->class == token_sym + && this->user_token_number != USER_NUMBER_ALIAS) + { + /* A token which translation has already been set? */ + if (token_translations[this->user_token_number] != undeftoken->number) + complain (_("tokens %s and %s both assigned number %d"), + symbols[token_translations[this->user_token_number]]->tag, + this->tag, this->user_token_number); + + token_translations[this->user_token_number] = this->number; + } + + return TRUE; +} + /*----------------------. -| A symbol_t hash table. | +| A symbol hash table. | `----------------------*/ /* Initial capacity of symbols hash table. */ @@ -89,7 +256,7 @@ hash_symbol_t (const symbol_t *m, unsigned int tablesize) /*-------------------------------. -| Create the symbol_t hash table. | +| Create the symbol hash table. | `-------------------------------*/ void @@ -150,3 +317,91 @@ symbols_do (symbol_processor processor, void *processor_data) (Hash_processor) processor, processor_data); } + + +/*--------------------------------------------------------------. +| Check that all the symbols are defined. Report any undefined | +| symbols and consider them nonterminals. | +`--------------------------------------------------------------*/ + +void +symbols_check_defined (void) +{ + symbols_do (symbol_check_defined, NULL); +} + +/*------------------------------------------------------------------. +| Set TOKEN_TRANSLATIONS. Check that no two symbols share the same | +| number. | +`------------------------------------------------------------------*/ + +static void +symbols_token_translations_init (void) +{ + int num_256_available_p = TRUE; + int i; + + /* Find the highest user token number, and whether 256, the POSIX + preferred user token number for the error token, is used. */ + max_user_token_number = 0; + for (i = 0; i < ntokens; ++i) + { + symbol_t *this = symbols[i]; + if (this->user_token_number != USER_NUMBER_UNDEFINED) + { + if (this->user_token_number > max_user_token_number) + max_user_token_number = this->user_token_number; + if (this->user_token_number == 256) + num_256_available_p = FALSE; + } + } + + /* If 256 is not used, assign it to error, to follow POSIX. */ + if (num_256_available_p + && errtoken->user_token_number == USER_NUMBER_UNDEFINED) + errtoken->user_token_number = 256; + + /* Set the missing user numbers. */ + if (max_user_token_number < 256) + max_user_token_number = 256; + + for (i = 0; i < ntokens; ++i) + { + symbol_t *this = symbols[i]; + if (this->user_token_number == USER_NUMBER_UNDEFINED) + this->user_token_number = ++max_user_token_number; + if (this->user_token_number > max_user_token_number) + max_user_token_number = this->user_token_number; + } + + token_translations = XCALLOC (symbol_number_t, max_user_token_number + 1); + + /* Initialize all entries for literal tokens to 2, the internal + token number for $undefined., which represents all invalid + inputs. */ + for (i = 0; i < max_user_token_number + 1; i++) + token_translations[i] = undeftoken->number; + symbols_do (symbol_translation, NULL); +} + + +/*----------------------------------------------------------------. +| Assign symbol numbers, and write definition of token names into | +| FDEFINES. Set up vectors SYMBOL_TABLE, TAGS of symbols. | +`----------------------------------------------------------------*/ + +void +symbols_pack (void) +{ + symbols = XCALLOC (symbol_t *, nsyms); + + symbols_do (symbol_check_alias_consistence, NULL); + symbols_do (symbol_pack, NULL); + + symbols_token_translations_init (); + + if (startsymbol->class == unknown_sym) + fatal (_("the start symbol %s is undefined"), startsymbol->tag); + else if (startsymbol->class == token_sym) + fatal (_("the start symbol %s is a token"), startsymbol->tag); +} diff --git a/src/symtab.h b/src/symtab.h index f95e7701..b7a9fbc8 100644 --- a/src/symtab.h +++ b/src/symtab.h @@ -22,7 +22,9 @@ #ifndef SYMTAB_H_ # define SYMTAB_H_ -#define TABSIZE 1009 +/*----------. +| Symbols. | +`----------*/ /* Associativity values for tokens and rules. */ typedef enum @@ -79,13 +81,48 @@ struct symbol_s #define NUMBER_UNDEFINED ((symbol_number_t) -1) -/* A function to apply to each symbol. */ -typedef bool (*symbol_processor) PARAMS ((symbol_t *)); +/* Fetch (or create) the symbol associated to KEY. */ +symbol_t *getsym PARAMS ((const char *key)); + +/* Declare the new SYMBOL. Make it an alias of SYMVAL, and type */ +/* them with TYPENAME. */ +void symbol_make_alias PARAMS ((symbol_t *symbol, symbol_t *symval, + char *typename)); + +/* Distinguished symbols. AXIOM is the real start symbol, that used + by the automaton. STARTSYMBOL is the one specified by the user. + */ +extern symbol_t *errtoken; +extern symbol_t *undeftoken; +extern symbol_t *eoftoken; +extern symbol_t *axiom; +extern symbol_t *startsymbol; -symbol_t *getsym PARAMS ((const char *)); +/*---------------. +| Symbol table. | +`---------------*/ + + +/* Create the symbol table. */ void symbols_new PARAMS ((void)); + +/* A function to apply to each symbol. */ +typedef bool (*symbol_processor) PARAMS ((symbol_t *)); + +/* Apply PROCESSOR to all the symbols. PROCESSOR must return TRUE: on + FALSE, the processing stops. */ void symbols_do PARAMS ((symbol_processor processor, void *processor_data)); + +/* Free all the memory allocated for symbols. */ void symbols_free PARAMS ((void)); +/* Check that all the symbols are defined. Report any undefined */ +/* symbols and consider them nonterminals. */ +void symbols_check_defined PARAMS ((void)); + +/* Perform various sanity checks, assign symbol numbers, and set up + TOKEN_TRANSLATIONS. */ +void symbols_pack PARAMS ((void)); + #endif /* !SYMTAB_H_ */ -- 2.45.2