diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | lib/quotearg.c | 13 | ||||
| -rw-r--r-- | po/de.gmo | bin | 8417 -> 8417 bytes | |||
| -rw-r--r-- | po/de.po | 118 | ||||
| -rw-r--r-- | po/es.po | 118 | ||||
| -rw-r--r-- | po/et.gmo | bin | 10791 -> 10791 bytes | |||
| -rw-r--r-- | po/et.po | 118 | ||||
| -rw-r--r-- | po/fr.gmo | bin | 8356 -> 8356 bytes | |||
| -rw-r--r-- | po/fr.po | 118 | ||||
| -rw-r--r-- | po/ja.gmo | bin | 8255 -> 8255 bytes | |||
| -rw-r--r-- | po/ja.po | 118 | ||||
| -rw-r--r-- | po/nl.gmo | bin | 7374 -> 7374 bytes | |||
| -rw-r--r-- | po/nl.po | 118 | ||||
| -rw-r--r-- | po/ru.gmo | bin | 11087 -> 11087 bytes | |||
| -rw-r--r-- | po/ru.po | 118 | ||||
| -rw-r--r-- | src/files.c | 54 | ||||
| -rw-r--r-- | src/files.h | 3 | ||||
| -rw-r--r-- | src/getargs.c | 4 | ||||
| -rw-r--r-- | src/getargs.h | 2 | ||||
| -rw-r--r-- | src/lex.c | 8 | ||||
| -rw-r--r-- | src/lex.h | 2 | ||||
| -rw-r--r-- | src/reader.c | 3 |
22 files changed, 465 insertions, 458 deletions
@@ -1,5 +1,13 @@ 2001-08-03 Akim Demaille <akim@epita.fr> + * src/getargs.c, src/getarg.h (skeleton)): Constify. + * src/lex.c (literalchar): Avoid name clashes on `buf'. + * src/getargs.c: Include complain.h. + * src/files.c, src/files.h (skeleton_find): Avoid name clashes. + * lib/quotearg.c, lib/quotearg.h: Update from fileutils 4.1. + +2001-08-03 Akim Demaille <akim@epita.fr> + * src/reader.c (readgram): Display hidden chars in error messages. 2001-08-03 Akim Demaille <akim@epita.fr> diff --git a/lib/quotearg.c b/lib/quotearg.c index d5fbc9e6..2a7ba4c4 100644 --- a/lib/quotearg.c +++ b/lib/quotearg.c @@ -1,5 +1,5 @@ /* quotearg.c - quote arguments for output - Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -21,6 +21,9 @@ # include <config.h> #endif +#if HAVE_STDDEF_H +# include <stddef.h> /* For the definition of size_t on windows w/MSVC. */ +#endif #include <sys/types.h> #include <quotearg.h> #include <xalloc.h> @@ -63,13 +66,7 @@ # include <wchar.h> #endif -#if HAVE_MBRTOWC -size_t mbrtowc (); -# ifdef mbstate_t -# define mbrtowc(pwc, s, n, ps) (mbrtowc) (pwc, s, n, 0) -# define mbsinit(ps) 1 -# endif -#else +#if !HAVE_MBRTOWC /* Disable multibyte processing entirely. Since MB_CUR_MAX is 1, the other macros are defined only for documentation and to satisfy C syntax. */ Binary files differ@@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: bison 1.25\n" -"POT-Creation-Date: 2001-07-20 14:12+0200\n" +"POT-Creation-Date: 2001-08-03 10:49+0200\n" "PO-Revision-Date: 1996-10-10 17:54 MET DST\n" "Last-Translator: Ulrich Drepper <drepper@gnu.ai.mit.edu>\n" "Language-Team: German <de@li.org>\n" @@ -118,22 +118,22 @@ msgstr "%s leitet ab" #. Some efforts were made to ease the translators' task, please #. continue. -#: src/getargs.c:79 +#: src/getargs.c:81 msgid "GNU bison generates parsers for LALR(1) grammars.\n" msgstr "" -#: src/getargs.c:83 +#: src/getargs.c:85 #, c-format msgid "Usage: %s [OPTION]... FILE\n" msgstr "" -#: src/getargs.c:87 +#: src/getargs.c:89 msgid "" "If a long option shows an argument as mandatory, then it is mandatory\n" "for the equivalent short option also. Similarly for optional arguments.\n" msgstr "" -#: src/getargs.c:93 +#: src/getargs.c:95 msgid "" "Operation modes:\n" " -h, --help display this help and exit\n" @@ -141,7 +141,7 @@ msgid "" " -y, --yacc emulate POSIX yacc\n" msgstr "" -#: src/getargs.c:100 +#: src/getargs.c:102 msgid "" "Parser:\n" " -S, --skeleton=FILE specify the skeleton to use\n" @@ -153,7 +153,7 @@ msgid "" " -k, --token-table include a table of token names\n" msgstr "" -#: src/getargs.c:112 +#: src/getargs.c:114 msgid "" "Output:\n" " -d, --defines also produce a header file\n" @@ -162,44 +162,44 @@ msgid "" " -o, --output-file=FILE leave output to FILE\n" msgstr "" -#: src/getargs.c:120 +#: src/getargs.c:122 msgid "Report bugs to <bug-bison@gnu.org>.\n" msgstr "" #. Some efforts were made to ease the translators' task, please #. continue. -#: src/getargs.c:134 +#: src/getargs.c:136 #, c-format msgid "bison (GNU Bison) %s" msgstr "" -#: src/getargs.c:139 +#: src/getargs.c:141 msgid "" "Copyright 1984, 1986, 1989, 1992, 2000, 2001 Free Software Foundation, Inc.\n" msgstr "" -#: src/getargs.c:143 +#: src/getargs.c:145 msgid "" "This is free software; see the source for copying conditions. There is NO\n" "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" msgstr "" -#: src/getargs.c:200 src/lex.c:633 +#: src/getargs.c:202 src/lex.c:633 #, c-format msgid "`%s' is no longer supported" msgstr "" -#: src/getargs.c:224 +#: src/getargs.c:226 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" -#: src/getargs.c:231 +#: src/getargs.c:233 #, c-format msgid "%s: no grammar file given\n" msgstr "%s: keine Grammatik-Datei angegeben\n" -#: src/getargs.c:235 +#: src/getargs.c:237 #, fuzzy, c-format msgid "%s: extra arguments ignored after `%s'\n" msgstr "%s: zusätzliche Argumente nach »%s« werden ignoriert\n" @@ -376,208 +376,208 @@ msgstr "unbeendete Zeichenkette am Ende der Datei" msgid "unterminated string" msgstr "unbeendete Zeichenkette" -#: src/reader.c:327 src/reader.c:391 +#: src/reader.c:326 src/reader.c:390 #, fuzzy, c-format msgid "%s is invalid" msgstr "@%s ist unzulässig" -#: src/reader.c:367 +#: src/reader.c:366 #, c-format msgid "$$ of `%s' has no declared type" msgstr "$$ von »%s« hat keine deklarierten Wert" -#: src/reader.c:384 +#: src/reader.c:383 #, fuzzy, c-format msgid "$%d of `%s' has no declared type" msgstr "»%s« von »%s« hat keine deklarierten Wert" -#: src/reader.c:438 +#: src/reader.c:437 msgid "unterminated `%{' definition" msgstr "unbeendete »%{« Definition" -#: src/reader.c:483 src/reader.c:599 src/reader.c:649 +#: src/reader.c:482 src/reader.c:598 src/reader.c:648 #, c-format msgid "Premature EOF after %s" msgstr "" -#: src/reader.c:500 +#: src/reader.c:499 #, c-format msgid "symbol `%s' used more than once as a literal string" msgstr "" -#: src/reader.c:503 +#: src/reader.c:502 #, c-format msgid "symbol `%s' given more than one literal string" msgstr "" -#: src/reader.c:525 src/reader.c:668 +#: src/reader.c:524 src/reader.c:667 #, c-format msgid "symbol %s redefined" msgstr "Symbol %s noch einmal definiert" -#: src/reader.c:535 src/reader.c:614 src/reader.c:675 src/reader.c:1232 +#: src/reader.c:534 src/reader.c:613 src/reader.c:674 src/reader.c:1231 #, c-format msgid "type redeclaration for %s" msgstr "erneute Deklaration des Typs für %s" -#: src/reader.c:545 +#: src/reader.c:544 #, c-format msgid "`%s' is invalid in %s" msgstr "»%s« ist in %s nicht erlaubt" -#: src/reader.c:562 src/reader.c:722 +#: src/reader.c:561 src/reader.c:721 #, fuzzy, c-format msgid "multiple %s declarations" msgstr "mehr als eine %start Deklaration" -#: src/reader.c:564 src/reader.c:1210 +#: src/reader.c:563 src/reader.c:1209 #, fuzzy, c-format msgid "invalid %s declaration" msgstr "ungültige %start Deklaration" -#: src/reader.c:584 +#: src/reader.c:583 msgid "%type declaration has no <typename>" msgstr "%type Deklaration hat keinen <Typ-Namen>" -#: src/reader.c:619 +#: src/reader.c:618 #, fuzzy, c-format msgid "invalid %%type declaration due to item: %s" msgstr "ungültige %%type Deklaration wegen »%s«" -#: src/reader.c:664 +#: src/reader.c:663 #, c-format msgid "redefining precedence of %s" msgstr "Stellenwertigkeit von %s wird erneut definiert" -#: src/reader.c:688 +#: src/reader.c:687 #, c-format msgid "invalid text (%s) - number should be after identifier" msgstr "unzulässiger Text (%s) - Nummer sollte nach Bezeichner kommen" -#: src/reader.c:698 +#: src/reader.c:697 #, c-format msgid "unexpected item: %s" msgstr "unerwartetes Symbol: %s" -#: src/reader.c:760 src/reader.c:1036 src/reader.c:1107 +#: src/reader.c:759 src/reader.c:1035 src/reader.c:1106 #, fuzzy, c-format msgid "unmatched %s" msgstr "»{« hat kein Gegenstück" -#: src/reader.c:792 +#: src/reader.c:791 #, fuzzy, c-format msgid "argument of %%expect is not an integer" msgstr "Argument von %expect ist keine ganze Zahl" -#: src/reader.c:839 +#: src/reader.c:838 #, c-format msgid "unrecognized item %s, expected an identifier" msgstr "unerwartetes Symbol %s, hier wird ein Bezeichner erwartet" -#: src/reader.c:863 +#: src/reader.c:862 #, c-format msgid "expected string constant instead of %s" msgstr "hier wird eine Zeichenkette erwartet, nicht %s" -#: src/reader.c:952 +#: src/reader.c:951 #, c-format msgid "unrecognized: %s" msgstr "unbekannt: %s" -#: src/reader.c:957 +#: src/reader.c:956 msgid "no input grammar" msgstr "keine Eingabe-Grammatik" -#: src/reader.c:962 +#: src/reader.c:961 #, c-format msgid "unknown character: %s" msgstr "unbekanntes Zeichen: %s" -#: src/reader.c:1130 +#: src/reader.c:1129 #, fuzzy, c-format msgid "unterminated %guard clause" msgstr "unbeendeter %%guard Fall" -#: src/reader.c:1297 +#: src/reader.c:1296 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:1304 +#: src/reader.c:1303 msgid "grammar starts with vertical bar" msgstr "Grammatik fängt mit einem vertikalen Strich (»|«) an" -#: src/reader.c:1335 +#: src/reader.c:1334 #, 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:1437 +#: src/reader.c:1436 msgid "two @prec's in a row" msgstr "zwei @prec Anweisungen nacheinander" -#: src/reader.c:1445 +#: src/reader.c:1444 #, fuzzy, c-format msgid "%%guard present but %%semantic_parser not specified" msgstr "" "%%guard Anweisung vorhanden, jedoch wird %%semantic_parser nicht angegeben" -#: src/reader.c:1454 +#: src/reader.c:1453 msgid "two actions at end of one rule" msgstr "Zwei Aktionen am Ende einer Regel" -#: src/reader.c:1468 +#: src/reader.c:1467 #, c-format msgid "type clash (`%s' `%s') on default action" msgstr "Typkonflikt (»%s« »%s«) bei Default Aktion" -#: src/reader.c:1474 +#: src/reader.c:1473 msgid "empty rule for typed nonterminal, and no action" msgstr "leere Regel für Nicht-Terminal vmit Typ und keine Aktion" -#: src/reader.c:1518 +#: src/reader.c:1517 #, c-format msgid "invalid input: %s" msgstr "ungültige Eingabe: %s" -#: src/reader.c:1526 +#: src/reader.c:1525 #, fuzzy, c-format msgid "too many symbols (tokens plus nonterminals); maximum %d" msgstr "zu viele Symbols (Token plus Nicht-Terminal); Maximum %s" -#: src/reader.c:1529 +#: src/reader.c:1528 msgid "no rules in the input grammar" msgstr "Eingabegrammatik enthält keine Regeln" -#: src/reader.c:1553 +#: src/reader.c:1552 #, 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:1658 +#: src/reader.c:1657 #, c-format msgid "conflicting precedences for %s and %s" msgstr "Vorrangwertigkeiten für %s und %s widersprechen sich" -#: src/reader.c:1670 +#: src/reader.c:1669 #, c-format msgid "conflicting assoc values for %s and %s" msgstr "assoc Werte für %s nd %s widersprechen sich" -#: src/reader.c:1721 +#: src/reader.c:1720 #, fuzzy, c-format msgid "tokens %s and %s both assigned number %d" msgstr "Token %s und %s haben die selbe nummer %s" -#: src/reader.c:1734 +#: src/reader.c:1733 #, c-format msgid "the start symbol %s is undefined" msgstr "das Startsymbol %s ist undefiniert" -#: src/reader.c:1736 +#: src/reader.c:1735 #, c-format msgid "the start symbol %s is a token" msgstr "das Startsymbol %s ist ein Token" @@ -762,11 +762,11 @@ msgstr "%s: Hauptspeicher erschöpft\n" #. MARK). A British English Unicode locale should instead #. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and #. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively. -#: lib/quotearg.c:262 +#: lib/quotearg.c:259 msgid "`" msgstr "" -#: lib/quotearg.c:263 +#: lib/quotearg.c:260 msgid "'" msgstr "" @@ -30,7 +30,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU bison 1.25\n" -"POT-Creation-Date: 2001-07-20 14:12+0200\n" +"POT-Creation-Date: 2001-08-03 10:49+0200\n" "PO-Revision-Date: 1998-09-21 10:19+0200\n" "Last-Translator: Nicolás García-Pedrajas <ngarcia-pedrajas@acm.org>\n" "Language-Team: Spanish <es@li.org>\n" @@ -174,22 +174,22 @@ msgstr "%s deriva" #. Some efforts were made to ease the translators' task, please #. continue. -#: src/getargs.c:79 +#: src/getargs.c:81 msgid "GNU bison generates parsers for LALR(1) grammars.\n" msgstr "" -#: src/getargs.c:83 +#: src/getargs.c:85 #, c-format msgid "Usage: %s [OPTION]... FILE\n" msgstr "" -#: src/getargs.c:87 +#: src/getargs.c:89 msgid "" "If a long option shows an argument as mandatory, then it is mandatory\n" "for the equivalent short option also. Similarly for optional arguments.\n" msgstr "" -#: src/getargs.c:93 +#: src/getargs.c:95 msgid "" "Operation modes:\n" " -h, --help display this help and exit\n" @@ -197,7 +197,7 @@ msgid "" " -y, --yacc emulate POSIX yacc\n" msgstr "" -#: src/getargs.c:100 +#: src/getargs.c:102 msgid "" "Parser:\n" " -S, --skeleton=FILE specify the skeleton to use\n" @@ -209,7 +209,7 @@ msgid "" " -k, --token-table include a table of token names\n" msgstr "" -#: src/getargs.c:112 +#: src/getargs.c:114 msgid "" "Output:\n" " -d, --defines also produce a header file\n" @@ -218,47 +218,47 @@ msgid "" " -o, --output-file=FILE leave output to FILE\n" msgstr "" -#: src/getargs.c:120 +#: src/getargs.c:122 msgid "Report bugs to <bug-bison@gnu.org>.\n" msgstr "" #. Some efforts were made to ease the translators' task, please #. continue. -#: src/getargs.c:134 +#: src/getargs.c:136 #, c-format msgid "bison (GNU Bison) %s" msgstr "" -#: src/getargs.c:139 +#: src/getargs.c:141 msgid "" "Copyright 1984, 1986, 1989, 1992, 2000, 2001 Free Software Foundation, Inc.\n" msgstr "" -#: src/getargs.c:143 +#: src/getargs.c:145 msgid "" "This is free software; see the source for copying conditions. There is NO\n" "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" msgstr "" -#: src/getargs.c:200 src/lex.c:633 +#: src/getargs.c:202 src/lex.c:633 #, c-format msgid "`%s' is no longer supported" msgstr "" -#: src/getargs.c:224 +#: src/getargs.c:226 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" # Me parece menos "computadora" decir "ningún fichero de gramática" - cll # -#: src/getargs.c:231 +#: src/getargs.c:233 #, c-format msgid "%s: no grammar file given\n" msgstr "%s: no se ha especificado ningún fichero de gramática\n" # Ignorar es no saber, to ignore es no hacer caso, que no es lo mismo. sv -#: src/getargs.c:235 +#: src/getargs.c:237 #, fuzzy, c-format msgid "%s: extra arguments ignored after `%s'\n" msgstr "%s: los argumentos extra después de '%s' no se tendrán en cuenta\n" @@ -446,75 +446,75 @@ msgstr "cadena sin terminar al final del fichero" msgid "unterminated string" msgstr "cadena sin terminar" -#: src/reader.c:327 src/reader.c:391 +#: src/reader.c:326 src/reader.c:390 #, fuzzy, c-format msgid "%s is invalid" msgstr "@%s no es válido" -#: src/reader.c:367 +#: src/reader.c:366 #, c-format msgid "$$ of `%s' has no declared type" msgstr "$$ de `%s' no tiene tipo declarado" -#: src/reader.c:384 +#: src/reader.c:383 #, fuzzy, c-format msgid "$%d of `%s' has no declared type" msgstr "$%s de `%s' no tiene tipo declarado" -#: src/reader.c:438 +#: src/reader.c:437 msgid "unterminated `%{' definition" msgstr "definición `%{' sin terminar" -#: src/reader.c:483 src/reader.c:599 src/reader.c:649 +#: src/reader.c:482 src/reader.c:598 src/reader.c:648 #, c-format msgid "Premature EOF after %s" msgstr "" -#: src/reader.c:500 +#: src/reader.c:499 #, c-format msgid "symbol `%s' used more than once as a literal string" msgstr "" -#: src/reader.c:503 +#: src/reader.c:502 #, c-format msgid "symbol `%s' given more than one literal string" msgstr "" -#: src/reader.c:525 src/reader.c:668 +#: src/reader.c:524 src/reader.c:667 #, c-format msgid "symbol %s redefined" msgstr "redefinido el símbolo %s" -#: src/reader.c:535 src/reader.c:614 src/reader.c:675 src/reader.c:1232 +#: src/reader.c:534 src/reader.c:613 src/reader.c:674 src/reader.c:1231 #, c-format msgid "type redeclaration for %s" msgstr "redeclaración del tipo de %s" -#: src/reader.c:545 +#: src/reader.c:544 #, c-format msgid "`%s' is invalid in %s" msgstr "`%s' no es válido en %s" -#: src/reader.c:562 src/reader.c:722 +#: src/reader.c:561 src/reader.c:721 #, fuzzy, c-format msgid "multiple %s declarations" msgstr "múltiples declaraciones de %start" -#: src/reader.c:564 src/reader.c:1210 +#: src/reader.c:563 src/reader.c:1209 #, fuzzy, c-format msgid "invalid %s declaration" msgstr "declaración de %start no válida" -#: src/reader.c:584 +#: src/reader.c:583 msgid "%type declaration has no <typename>" msgstr "la declaración %type no tiene <nombre-tipo>" -#: src/reader.c:619 +#: src/reader.c:618 #, fuzzy, c-format msgid "invalid %%type declaration due to item: %s" msgstr "declaración de %%type no válida debido al ítem: `%s'" -#: src/reader.c:664 +#: src/reader.c:663 #, c-format msgid "redefining precedence of %s" msgstr "redefinición de la precedencia de %s" @@ -523,7 +523,7 @@ msgstr "redefinición de la precedencia de %s" # 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:688 +#: src/reader.c:687 #, c-format msgid "invalid text (%s) - number should be after identifier" msgstr "" @@ -533,18 +533,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:698 +#: src/reader.c:697 #, 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:760 src/reader.c:1036 src/reader.c:1107 +#: src/reader.c:759 src/reader.c:1035 src/reader.c:1106 #, fuzzy, c-format msgid "unmatched %s" msgstr "`{' desemparejada" -#: src/reader.c:792 +#: src/reader.c:791 #, fuzzy, c-format msgid "argument of %%expect is not an integer" msgstr "el argumento de %expect no es un entero" @@ -555,26 +555,26 @@ msgstr "el argumento de %expect no es un entero" # - cll # ok - ngp # -#: src/reader.c:839 +#: src/reader.c:838 #, c-format msgid "unrecognized item %s, expected an identifier" msgstr "no se reconoce el ítem %s, se esperaba un identificador" -#: src/reader.c:863 +#: src/reader.c:862 #, c-format msgid "expected string constant instead of %s" msgstr "se esperaba una cadena constante en lugar de %s" -#: src/reader.c:952 +#: src/reader.c:951 #, c-format msgid "unrecognized: %s" msgstr "no reconocido: %s" -#: src/reader.c:957 +#: src/reader.c:956 msgid "no input grammar" msgstr "no hay gramática de entrada" -#: src/reader.c:962 +#: src/reader.c:961 #, c-format msgid "unknown character: %s" msgstr "carácter desconocido: %s" @@ -583,93 +583,93 @@ msgstr "carácter desconocido: %s" # mejor que `sin terminar' que me parece más "computerizado" - cll # quizás un poco cacofónico lo de claúsula inconclusa - ngp # -#: src/reader.c:1130 +#: src/reader.c:1129 #, fuzzy, c-format msgid "unterminated %guard clause" msgstr "cláusula %%guard sin terminar" -#: src/reader.c:1297 +#: src/reader.c:1296 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:1304 +#: src/reader.c:1303 msgid "grammar starts with vertical bar" msgstr "la gramática comienza con una barra vertical" -#: src/reader.c:1335 +#: src/reader.c:1334 #, 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:1437 +#: src/reader.c:1436 msgid "two @prec's in a row" msgstr "dos @prec en una línea" # Insisto, el empleo de participios a secas me parece como hablar en # indio. Por favor, permíteme que añada un "está" :) - cll # ok - ngp -#: src/reader.c:1445 +#: src/reader.c:1444 #, fuzzy, c-format msgid "%%guard present but %%semantic_parser not specified" msgstr "%%guard presente pero %%semantic_parser está sin especificar" -#: src/reader.c:1454 +#: src/reader.c:1453 msgid "two actions at end of one rule" msgstr "dos acciones al final de una regla" -#: src/reader.c:1468 +#: src/reader.c:1467 #, 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:1474 +#: src/reader.c:1473 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:1518 +#: src/reader.c:1517 #, c-format msgid "invalid input: %s" msgstr "entrada no válida: %s" -#: src/reader.c:1526 +#: src/reader.c:1525 #, fuzzy, c-format msgid "too many symbols (tokens plus nonterminals); maximum %d" msgstr "demasiados símbolos (terminales y no terminales); máximo %s" -#: src/reader.c:1529 +#: src/reader.c:1528 msgid "no rules in the input grammar" msgstr "no hay reglas en la gramática de entrada" # `token' se debe traducir como `literal' - cll # en terminología de compiladores token es más un terminal - ngp # -#: src/reader.c:1553 +#: src/reader.c:1552 #, 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:1658 +#: src/reader.c:1657 #, c-format msgid "conflicting precedences for %s and %s" msgstr "precedencias en conflicto entre %s y %s" -#: src/reader.c:1670 +#: src/reader.c:1669 #, c-format msgid "conflicting assoc values for %s and %s" msgstr "conflicto de valores assoc para %s y %s" -#: src/reader.c:1721 +#: src/reader.c:1720 #, fuzzy, c-format msgid "tokens %s and %s both assigned number %d" msgstr "los terminales %s y %s tienen asignados ambos el número %s" -#: src/reader.c:1734 +#: src/reader.c:1733 #, c-format msgid "the start symbol %s is undefined" msgstr "el símbolo de inicio (axioma) %s no está definido" -#: src/reader.c:1736 +#: src/reader.c:1735 #, c-format msgid "the start symbol %s is a token" msgstr "el símbolo de inicio (axioma) %s es un terminal" @@ -890,11 +890,11 @@ msgstr "%s: memoria agotada\n" #. MARK). A British English Unicode locale should instead #. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and #. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively. -#: lib/quotearg.c:262 +#: lib/quotearg.c:259 msgid "`" msgstr "" -#: lib/quotearg.c:263 +#: lib/quotearg.c:260 msgid "'" msgstr "" @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: bison 1.25\n" -"POT-Creation-Date: 2001-07-20 14:12+0200\n" +"POT-Creation-Date: 2001-08-03 10:49+0200\n" "PO-Revision-Date: 2000-04-11 22:19+02:00\n" "Last-Translator: Toomas Soome <tsoome@ut.ee>\n" "Language-Team: Estonian <et@li.org>\n" @@ -124,16 +124,16 @@ msgstr "%s derives" #. Some efforts were made to ease the translators' task, please #. continue. -#: src/getargs.c:79 +#: src/getargs.c:81 msgid "GNU bison generates parsers for LALR(1) grammars.\n" msgstr "GNU bison genereerib parsereid LALR(1) grammatikatele.\n" -#: src/getargs.c:83 +#: src/getargs.c:85 #, c-format msgid "Usage: %s [OPTION]... FILE\n" msgstr "Kasuta: %s [VÕTI]...FAIL\n" -#: src/getargs.c:87 +#: src/getargs.c:89 msgid "" "If a long option shows an argument as mandatory, then it is mandatory\n" "for the equivalent short option also. Similarly for optional arguments.\n" @@ -141,7 +141,7 @@ msgstr "" "Kui pikk võti näitab, et argument on kohustuslik, siis on see kohustuslik \n" "ka lühikese võtme korral. Sama ka vabalt valitavate võtmete korral.\n" -#: src/getargs.c:93 +#: src/getargs.c:95 msgid "" "Operation modes:\n" " -h, --help display this help and exit\n" @@ -153,7 +153,7 @@ msgstr "" " -V, --version esita versiooniinfo ja lõpeta töö\n" " -y, --yacc emuleeri POSIX yacc\n" -#: src/getargs.c:100 +#: src/getargs.c:102 #, fuzzy msgid "" "Parser:\n" @@ -173,7 +173,7 @@ msgstr "" " -r, --raw sümbolite number alates 3\n" " -k, --token-table lisa ka sümbolite nimede tabel\n" -#: src/getargs.c:112 +#: src/getargs.c:114 msgid "" "Output:\n" " -d, --defines also produce a header file\n" @@ -187,44 +187,44 @@ msgstr "" " -b, --file-prefix=PREFIKS kasuta väljundfailide nimedes PREFIKSit\n" " -o, --output-file=FAIL jäta väljund FAILi\n" -#: src/getargs.c:120 +#: src/getargs.c:122 msgid "Report bugs to <bug-bison@gnu.org>.\n" msgstr "Teatage palun vigadest aadressil <bug-bison@gnu.org>.\n" #. Some efforts were made to ease the translators' task, please #. continue. -#: src/getargs.c:134 +#: src/getargs.c:136 #, c-format msgid "bison (GNU Bison) %s" msgstr "" -#: src/getargs.c:139 +#: src/getargs.c:141 msgid "" "Copyright 1984, 1986, 1989, 1992, 2000, 2001 Free Software Foundation, Inc.\n" msgstr "" -#: src/getargs.c:143 +#: src/getargs.c:145 msgid "" "This is free software; see the source for copying conditions. There is NO\n" "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" msgstr "" -#: src/getargs.c:200 src/lex.c:633 +#: src/getargs.c:202 src/lex.c:633 #, c-format msgid "`%s' is no longer supported" msgstr "" -#: src/getargs.c:224 +#: src/getargs.c:226 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" -#: src/getargs.c:231 +#: src/getargs.c:233 #, c-format msgid "%s: no grammar file given\n" msgstr "%s: puudub grammatikafail\n" -#: src/getargs.c:235 +#: src/getargs.c:237 #, c-format msgid "%s: extra arguments ignored after `%s'\n" msgstr "%s: ignoreerin lisaargumente peale `%s'\n" @@ -399,205 +399,205 @@ msgstr "lõpetamata sõne faili lõpus" msgid "unterminated string" msgstr "lõpetamata sõne" -#: src/reader.c:327 src/reader.c:391 +#: src/reader.c:326 src/reader.c:390 #, fuzzy, c-format msgid "%s is invalid" msgstr "@%s on vigane" -#: src/reader.c:367 +#: src/reader.c:366 #, c-format msgid "$$ of `%s' has no declared type" msgstr "`%s' $$ ei oma deklareeritud tüüpi" -#: src/reader.c:384 +#: src/reader.c:383 #, c-format msgid "$%d of `%s' has no declared type" msgstr "$%d `%s' ei oma deklareeritud tüüpi" -#: src/reader.c:438 +#: src/reader.c:437 msgid "unterminated `%{' definition" msgstr "lõpetamata `%{' definitsioon" -#: src/reader.c:483 src/reader.c:599 src/reader.c:649 +#: src/reader.c:482 src/reader.c:598 src/reader.c:648 #, c-format msgid "Premature EOF after %s" msgstr "Enneaegne EOF peale %s" -#: src/reader.c:500 +#: src/reader.c:499 #, c-format msgid "symbol `%s' used more than once as a literal string" msgstr "" -#: src/reader.c:503 +#: src/reader.c:502 #, c-format msgid "symbol `%s' given more than one literal string" msgstr "" -#: src/reader.c:525 src/reader.c:668 +#: src/reader.c:524 src/reader.c:667 #, c-format msgid "symbol %s redefined" msgstr "sümbol %s on uuesti defineeritud" -#: src/reader.c:535 src/reader.c:614 src/reader.c:675 src/reader.c:1232 +#: src/reader.c:534 src/reader.c:613 src/reader.c:674 src/reader.c:1231 #, c-format msgid "type redeclaration for %s" msgstr "%s tüübi uuesti deklareerimine" -#: src/reader.c:545 +#: src/reader.c:544 #, c-format msgid "`%s' is invalid in %s" msgstr "`%s' ei ole %s sees lubatud" -#: src/reader.c:562 src/reader.c:722 +#: src/reader.c:561 src/reader.c:721 #, fuzzy, c-format msgid "multiple %s declarations" msgstr "korduvad %start deklaratsioonid" -#: src/reader.c:564 src/reader.c:1210 +#: src/reader.c:563 src/reader.c:1209 #, fuzzy, c-format msgid "invalid %s declaration" msgstr "vigane %start deklaratsioon" -#: src/reader.c:584 +#: src/reader.c:583 msgid "%type declaration has no <typename>" msgstr "%type deklaratsioonis puudub <tüübinimi>" -#: src/reader.c:619 +#: src/reader.c:618 #, c-format msgid "invalid %%type declaration due to item: %s" msgstr "vigane %%type deklaratsioon, element: %s" -#: src/reader.c:664 +#: src/reader.c:663 #, c-format msgid "redefining precedence of %s" msgstr "%s prioriteedi uus definitsioon" -#: src/reader.c:688 +#: src/reader.c:687 #, c-format msgid "invalid text (%s) - number should be after identifier" msgstr "vigane tekst (%s) - number peab olema peale identifikaatorit" -#: src/reader.c:698 +#: src/reader.c:697 #, c-format msgid "unexpected item: %s" msgstr "ootamatu element: %s" -#: src/reader.c:760 src/reader.c:1036 src/reader.c:1107 +#: src/reader.c:759 src/reader.c:1035 src/reader.c:1106 #, fuzzy, c-format msgid "unmatched %s" msgstr "puudub `{'" -#: src/reader.c:792 +#: src/reader.c:791 #, fuzzy, c-format msgid "argument of %%expect is not an integer" msgstr "%expect argument ei ole täisarv" -#: src/reader.c:839 +#: src/reader.c:838 #, c-format msgid "unrecognized item %s, expected an identifier" msgstr "tundmatu element %s, eeldasin identifikaatorit" -#: src/reader.c:863 +#: src/reader.c:862 #, c-format msgid "expected string constant instead of %s" msgstr "eeldasin %s asemel sõnekonstanti" -#: src/reader.c:952 +#: src/reader.c:951 #, c-format msgid "unrecognized: %s" msgstr "tundmatu: %s" -#: src/reader.c:957 +#: src/reader.c:956 msgid "no input grammar" msgstr "sisendgrammatikat pole" -#: src/reader.c:962 +#: src/reader.c:961 #, c-format msgid "unknown character: %s" msgstr "tundmatu sümbol: %s" -#: src/reader.c:1130 +#: src/reader.c:1129 #, c-format msgid "unterminated %guard clause" msgstr "lõpetamata %guard klausel" -#: src/reader.c:1297 +#: src/reader.c:1296 msgid "ill-formed rule: initial symbol not followed by colon" msgstr "vigaselt formeeritud reegel: algsümbolile ei järgne koolonit" -#: src/reader.c:1304 +#: src/reader.c:1303 msgid "grammar starts with vertical bar" msgstr "grammatika algab püstkriipsuga" -#: src/reader.c:1335 +#: src/reader.c:1334 #, 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:1437 +#: src/reader.c:1436 msgid "two @prec's in a row" msgstr "kaks @prec ühel real" -#: src/reader.c:1445 +#: src/reader.c:1444 #, fuzzy, c-format msgid "%%guard present but %%semantic_parser not specified" msgstr "%guard on määratud, aga %semantic_parser ei ole" -#: src/reader.c:1454 +#: src/reader.c:1453 msgid "two actions at end of one rule" msgstr "kaks tegevust ühe reegli lõpus" -#: src/reader.c:1468 +#: src/reader.c:1467 #, c-format msgid "type clash (`%s' `%s') on default action" msgstr "vaikimisi tegevuse tüübikonflikt (`%s' `%s')" -#: src/reader.c:1474 +#: src/reader.c:1473 msgid "empty rule for typed nonterminal, and no action" msgstr "tüübiga mitteterminalil on tühi reegel ja puudub tegevus" -#: src/reader.c:1518 +#: src/reader.c:1517 #, c-format msgid "invalid input: %s" msgstr "vigane sisend: %s" -#: src/reader.c:1526 +#: src/reader.c:1525 #, 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:1529 +#: src/reader.c:1528 msgid "no rules in the input grammar" msgstr "sisendgrammatikas pole reegleid" -#: src/reader.c:1553 +#: src/reader.c:1552 #, 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:1658 +#: src/reader.c:1657 #, c-format msgid "conflicting precedences for %s and %s" msgstr "%s ja %s omavad konfliktseid prioriteete" -#: src/reader.c:1670 +#: src/reader.c:1669 #, c-format msgid "conflicting assoc values for %s and %s" msgstr "%s ja %s omavad konfliktseid assotsiatiivseid väärtuseid" -#: src/reader.c:1721 +#: src/reader.c:1720 #, 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:1734 +#: src/reader.c:1733 #, c-format msgid "the start symbol %s is undefined" msgstr "stardisümbol %s ei ole defineeritud" -#: src/reader.c:1736 +#: src/reader.c:1735 #, c-format msgid "the start symbol %s is a token" msgstr "stardisümbol %s on märk" @@ -782,11 +782,11 @@ msgstr "%s: mälu on otsas\n" #. MARK). A British English Unicode locale should instead #. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and #. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively. -#: lib/quotearg.c:262 +#: lib/quotearg.c:259 msgid "`" msgstr "" -#: lib/quotearg.c:263 +#: lib/quotearg.c:260 msgid "'" msgstr "" @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: bison 1.25\n" -"POT-Creation-Date: 2001-07-20 14:12+0200\n" +"POT-Creation-Date: 2001-08-03 10:49+0200\n" "PO-Revision-Date: 1996-03-19 20:05 EST\n" "Last-Translator: Dominique Boucher <boucherd@IRO.UMontreal.CA>\n" "Language-Team: French <fr@li.org>\n" @@ -125,22 +125,22 @@ msgstr "%s dérive" #. Some efforts were made to ease the translators' task, please #. continue. -#: src/getargs.c:79 +#: src/getargs.c:81 msgid "GNU bison generates parsers for LALR(1) grammars.\n" msgstr "" -#: src/getargs.c:83 +#: src/getargs.c:85 #, c-format msgid "Usage: %s [OPTION]... FILE\n" msgstr "" -#: src/getargs.c:87 +#: src/getargs.c:89 msgid "" "If a long option shows an argument as mandatory, then it is mandatory\n" "for the equivalent short option also. Similarly for optional arguments.\n" msgstr "" -#: src/getargs.c:93 +#: src/getargs.c:95 msgid "" "Operation modes:\n" " -h, --help display this help and exit\n" @@ -148,7 +148,7 @@ msgid "" " -y, --yacc emulate POSIX yacc\n" msgstr "" -#: src/getargs.c:100 +#: src/getargs.c:102 msgid "" "Parser:\n" " -S, --skeleton=FILE specify the skeleton to use\n" @@ -160,7 +160,7 @@ msgid "" " -k, --token-table include a table of token names\n" msgstr "" -#: src/getargs.c:112 +#: src/getargs.c:114 msgid "" "Output:\n" " -d, --defines also produce a header file\n" @@ -169,44 +169,44 @@ msgid "" " -o, --output-file=FILE leave output to FILE\n" msgstr "" -#: src/getargs.c:120 +#: src/getargs.c:122 msgid "Report bugs to <bug-bison@gnu.org>.\n" msgstr "" #. Some efforts were made to ease the translators' task, please #. continue. -#: src/getargs.c:134 +#: src/getargs.c:136 #, c-format msgid "bison (GNU Bison) %s" msgstr "" -#: src/getargs.c:139 +#: src/getargs.c:141 msgid "" "Copyright 1984, 1986, 1989, 1992, 2000, 2001 Free Software Foundation, Inc.\n" msgstr "" -#: src/getargs.c:143 +#: src/getargs.c:145 msgid "" "This is free software; see the source for copying conditions. There is NO\n" "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" msgstr "" -#: src/getargs.c:200 src/lex.c:633 +#: src/getargs.c:202 src/lex.c:633 #, c-format msgid "`%s' is no longer supported" msgstr "" -#: src/getargs.c:224 +#: src/getargs.c:226 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" -#: src/getargs.c:231 +#: src/getargs.c:233 #, c-format msgid "%s: no grammar file given\n" msgstr "%s: grammaire manquante\n" -#: src/getargs.c:235 +#: src/getargs.c:237 #, fuzzy, c-format msgid "%s: extra arguments ignored after `%s'\n" msgstr "%s: paramètres supplémentaires ignorés après «%s»\n" @@ -382,206 +382,206 @@ msgstr "chaîne de caractères non terminée en fin de fichier" msgid "unterminated string" msgstr "chaîne de caractère non terminée" -#: src/reader.c:327 src/reader.c:391 +#: src/reader.c:326 src/reader.c:390 #, fuzzy, c-format msgid "%s is invalid" msgstr "@%s n'est pas valide" -#: src/reader.c:367 +#: src/reader.c:366 #, c-format msgid "$$ of `%s' has no declared type" msgstr "$$ de `%s' n'a pas son type déclaré" -#: src/reader.c:384 +#: src/reader.c:383 #, fuzzy, c-format msgid "$%d of `%s' has no declared type" msgstr "$%s cd `%s' n'a pas son type déclaré" -#: src/reader.c:438 +#: src/reader.c:437 msgid "unterminated `%{' definition" msgstr "La section de définition (%{) ne termine pas avant la fin du fichier" -#: src/reader.c:483 src/reader.c:599 src/reader.c:649 +#: src/reader.c:482 src/reader.c:598 src/reader.c:648 #, c-format msgid "Premature EOF after %s" msgstr "" -#: src/reader.c:500 +#: src/reader.c:499 #, c-format msgid "symbol `%s' used more than once as a literal string" msgstr "" -#: src/reader.c:503 +#: src/reader.c:502 #, c-format msgid "symbol `%s' given more than one literal string" msgstr "" -#: src/reader.c:525 src/reader.c:668 +#: src/reader.c:524 src/reader.c:667 #, c-format msgid "symbol %s redefined" msgstr "symbole %s redéfini" -#: src/reader.c:535 src/reader.c:614 src/reader.c:675 src/reader.c:1232 +#: src/reader.c:534 src/reader.c:613 src/reader.c:674 src/reader.c:1231 #, c-format msgid "type redeclaration for %s" msgstr "redéclaration du type de %s" -#: src/reader.c:545 +#: src/reader.c:544 #, c-format msgid "`%s' is invalid in %s" msgstr "`%s' n'est pas valide dans %s" -#: src/reader.c:562 src/reader.c:722 +#: src/reader.c:561 src/reader.c:721 #, fuzzy, c-format msgid "multiple %s declarations" msgstr "multiples déclarations %start" -#: src/reader.c:564 src/reader.c:1210 +#: src/reader.c:563 src/reader.c:1209 #, fuzzy, c-format msgid "invalid %s declaration" msgstr "la déclaration %start n'est pas valide" -#: src/reader.c:584 +#: src/reader.c:583 msgid "%type declaration has no <typename>" msgstr "la déclaration %type n'a pas de <nom_de_type>" -#: src/reader.c:619 +#: src/reader.c:618 #, fuzzy, c-format msgid "invalid %%type declaration due to item: %s" msgstr "la déclaration %%type n'est pas valide à cause de l'item: %s" -#: src/reader.c:664 +#: src/reader.c:663 #, c-format msgid "redefining precedence of %s" msgstr "redéfinition du niveau de priorité de %s" -#: src/reader.c:688 +#: src/reader.c:687 #, 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:698 +#: src/reader.c:697 #, c-format msgid "unexpected item: %s" msgstr "item inattendu: %s" -#: src/reader.c:760 src/reader.c:1036 src/reader.c:1107 +#: src/reader.c:759 src/reader.c:1035 src/reader.c:1106 #, fuzzy, c-format msgid "unmatched %s" msgstr "accolade ouvrante `{' non appariée" -#: src/reader.c:792 +#: src/reader.c:791 #, fuzzy, c-format msgid "argument of %%expect is not an integer" msgstr "le paramètre de %expect n'est pas un entier" -#: src/reader.c:839 +#: src/reader.c:838 #, c-format msgid "unrecognized item %s, expected an identifier" msgstr "item %s non reconnu, un identificateur est attendu" -#: src/reader.c:863 +#: src/reader.c:862 #, c-format msgid "expected string constant instead of %s" msgstr "chaîne de caractères constante attendue plutôt que %s" -#: src/reader.c:952 +#: src/reader.c:951 #, c-format msgid "unrecognized: %s" msgstr "non reconnu: %s" -#: src/reader.c:957 +#: src/reader.c:956 msgid "no input grammar" msgstr "aucune grammaire en entrée" -#: src/reader.c:962 +#: src/reader.c:961 #, c-format msgid "unknown character: %s" msgstr "caractère inconnu: %s" -#: src/reader.c:1130 +#: src/reader.c:1129 #, fuzzy, c-format msgid "unterminated %guard clause" msgstr "clause %%guard non terminée" -#: src/reader.c:1297 +#: src/reader.c:1296 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:1304 +#: src/reader.c:1303 msgid "grammar starts with vertical bar" msgstr "la grammaire débute par une barre verticale" -#: src/reader.c:1335 +#: src/reader.c:1334 #, c-format msgid "rule given for %s, which is a token" msgstr "la règle pour %s, qui est un terminal" -#: src/reader.c:1437 +#: src/reader.c:1436 msgid "two @prec's in a row" msgstr "deux @prec de suite" -#: src/reader.c:1445 +#: src/reader.c:1444 #, fuzzy, c-format msgid "%%guard present but %%semantic_parser not specified" msgstr "%%guard est présent mais %%semantic_parser n'est pas spécifié" -#: src/reader.c:1454 +#: src/reader.c:1453 msgid "two actions at end of one rule" msgstr "deux actions à la fin d'une même règle" -#: src/reader.c:1468 +#: src/reader.c:1467 #, 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:1474 +#: src/reader.c:1473 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:1518 +#: src/reader.c:1517 #, c-format msgid "invalid input: %s" msgstr "entrée non valide: %s" -#: src/reader.c:1526 +#: src/reader.c:1525 #, fuzzy, c-format msgid "too many symbols (tokens plus nonterminals); maximum %d" msgstr "trop de symboles (terminaux et catégories); maximum de %s" -#: src/reader.c:1529 +#: src/reader.c:1528 msgid "no rules in the input grammar" msgstr "la grammaire n'a pas de règles" -#: src/reader.c:1553 +#: src/reader.c:1552 #, 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:1658 +#: src/reader.c:1657 #, c-format msgid "conflicting precedences for %s and %s" msgstr "les priorités pour %s et %s entrent en conflit" -#: src/reader.c:1670 +#: src/reader.c:1669 #, 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:1721 +#: src/reader.c:1720 #, fuzzy, c-format msgid "tokens %s and %s both assigned number %d" msgstr "les terminaux %s et %s se sont vus assigner le nombre %s" -#: src/reader.c:1734 +#: src/reader.c:1733 #, c-format msgid "the start symbol %s is undefined" msgstr "le symbole de départ %s n'est pas défini" -#: src/reader.c:1736 +#: src/reader.c:1735 #, c-format msgid "the start symbol %s is a token" msgstr "le symbole de départ %s est un terminal" @@ -766,11 +766,11 @@ msgstr "%s: mémoire épuisée\n" #. MARK). A British English Unicode locale should instead #. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and #. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively. -#: lib/quotearg.c:262 +#: lib/quotearg.c:259 msgid "`" msgstr "" -#: lib/quotearg.c:263 +#: lib/quotearg.c:260 msgid "'" msgstr "" @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU bison 1.28\n" -"POT-Creation-Date: 2001-07-20 14:12+0200\n" +"POT-Creation-Date: 2001-08-03 10:49+0200\n" "PO-Revision-Date: 1999-09-28 21:10+0900\n" "Last-Translator: Daisuke Yamashita <yamad@mb.infoweb.ne.jp>\n" "Language-Team: Japanese <ja@li.org>\n" @@ -124,22 +124,22 @@ msgstr "%s ¤Ï°Ê²¼¤«¤éÇÉÀ¸" #. Some efforts were made to ease the translators' task, please #. continue. -#: src/getargs.c:79 +#: src/getargs.c:81 msgid "GNU bison generates parsers for LALR(1) grammars.\n" msgstr "" -#: src/getargs.c:83 +#: src/getargs.c:85 #, c-format msgid "Usage: %s [OPTION]... FILE\n" msgstr "" -#: src/getargs.c:87 +#: src/getargs.c:89 msgid "" "If a long option shows an argument as mandatory, then it is mandatory\n" "for the equivalent short option also. Similarly for optional arguments.\n" msgstr "" -#: src/getargs.c:93 +#: src/getargs.c:95 msgid "" "Operation modes:\n" " -h, --help display this help and exit\n" @@ -147,7 +147,7 @@ msgid "" " -y, --yacc emulate POSIX yacc\n" msgstr "" -#: src/getargs.c:100 +#: src/getargs.c:102 msgid "" "Parser:\n" " -S, --skeleton=FILE specify the skeleton to use\n" @@ -159,7 +159,7 @@ msgid "" " -k, --token-table include a table of token names\n" msgstr "" -#: src/getargs.c:112 +#: src/getargs.c:114 msgid "" "Output:\n" " -d, --defines also produce a header file\n" @@ -168,44 +168,44 @@ msgid "" " -o, --output-file=FILE leave output to FILE\n" msgstr "" -#: src/getargs.c:120 +#: src/getargs.c:122 msgid "Report bugs to <bug-bison@gnu.org>.\n" msgstr "" #. Some efforts were made to ease the translators' task, please #. continue. -#: src/getargs.c:134 +#: src/getargs.c:136 #, c-format msgid "bison (GNU Bison) %s" msgstr "" -#: src/getargs.c:139 +#: src/getargs.c:141 msgid "" "Copyright 1984, 1986, 1989, 1992, 2000, 2001 Free Software Foundation, Inc.\n" msgstr "" -#: src/getargs.c:143 +#: src/getargs.c:145 msgid "" "This is free software; see the source for copying conditions. There is NO\n" "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" msgstr "" -#: src/getargs.c:200 src/lex.c:633 +#: src/getargs.c:202 src/lex.c:633 #, c-format msgid "`%s' is no longer supported" msgstr "" -#: src/getargs.c:224 +#: src/getargs.c:226 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" -#: src/getargs.c:231 +#: src/getargs.c:233 #, c-format msgid "%s: no grammar file given\n" msgstr "%s: ʸˡ¥Õ¥¡¥¤¥ë¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó\n" -#: src/getargs.c:235 +#: src/getargs.c:237 #, fuzzy, c-format msgid "%s: extra arguments ignored after `%s'\n" msgstr "%s: '%s' ¤è¤ê¸å¤í¤Î;ʬ¤Ê°ú¿ô¤Ï̵»ë¤µ¤ì¤Þ¤·¤¿\n" @@ -381,205 +381,205 @@ msgstr "ÊĤ¸¤é¤ì¤Æ¤¤¤Ê¤¤Ê¸»úÎ󤬥ե¡¥¤¥ëËöÈø¤Ë¤¢¤ê¤Þ¤¹" msgid "unterminated string" msgstr "ÊĤ¸¤é¤ì¤Æ¤¤¤Ê¤¤Ê¸»úÎó" -#: src/reader.c:327 src/reader.c:391 +#: src/reader.c:326 src/reader.c:390 #, fuzzy, c-format msgid "%s is invalid" msgstr "@%s ¤Ï̵¸ú¤Ç¤¹" -#: src/reader.c:367 +#: src/reader.c:366 #, c-format msgid "$$ of `%s' has no declared type" msgstr "`%s' ¤Î $$ ¤ËÀë¸À¤Î¤Ê¤¤·¿¤¬¤¢¤ê¤Þ¤¹" -#: src/reader.c:384 +#: src/reader.c:383 #, fuzzy, c-format msgid "$%d of `%s' has no declared type" msgstr "`%s' ¤Î $%s ¤ËÀë¸À¤Î¤Ê¤¤·¿¤¬¤¢¤ê¤Þ¤¹" -#: src/reader.c:438 +#: src/reader.c:437 msgid "unterminated `%{' definition" msgstr "`%{' ÄêµÁ ¤¬ÊĤ¸¤é¤ì¤Æ¤¤¤Þ¤»¤ó" -#: src/reader.c:483 src/reader.c:599 src/reader.c:649 +#: src/reader.c:482 src/reader.c:598 src/reader.c:648 #, c-format msgid "Premature EOF after %s" msgstr "" -#: src/reader.c:500 +#: src/reader.c:499 #, c-format msgid "symbol `%s' used more than once as a literal string" msgstr "" -#: src/reader.c:503 +#: src/reader.c:502 #, c-format msgid "symbol `%s' given more than one literal string" msgstr "" -#: src/reader.c:525 src/reader.c:668 +#: src/reader.c:524 src/reader.c:667 #, c-format msgid "symbol %s redefined" msgstr "¥·¥ó¥Ü¥ë %s ¤¬ºÆÄêµÁ¤µ¤ì¤Þ¤·¤¿" -#: src/reader.c:535 src/reader.c:614 src/reader.c:675 src/reader.c:1232 +#: src/reader.c:534 src/reader.c:613 src/reader.c:674 src/reader.c:1231 #, c-format msgid "type redeclaration for %s" msgstr "%s ¤Î·¿¤¬ºÆÄêµÁ¤µ¤ì¤Þ¤·¤¿" -#: src/reader.c:545 +#: src/reader.c:544 #, c-format msgid "`%s' is invalid in %s" msgstr "%2$s Æâ¤Î `%1$s' ¤Ï̵¸ú¤Ç¤¹" -#: src/reader.c:562 src/reader.c:722 +#: src/reader.c:561 src/reader.c:721 #, fuzzy, c-format msgid "multiple %s declarations" msgstr "Ê£¿ô¤Î %start ¤¬Àë¸À¤µ¤ì¤Þ¤·¤¿" -#: src/reader.c:564 src/reader.c:1210 +#: src/reader.c:563 src/reader.c:1209 #, fuzzy, c-format msgid "invalid %s declaration" msgstr "̵¸ú¤Ê %start ¤¬Àë¸À¤µ¤ì¤Þ¤·¤¿" -#: src/reader.c:584 +#: src/reader.c:583 msgid "%type declaration has no <typename>" msgstr "%type Àë¸À¤Ë <¥¿¥¤¥×̾> ¤¬¤¢¤ê¤Þ¤»¤ó" -#: src/reader.c:619 +#: src/reader.c:618 #, fuzzy, c-format msgid "invalid %%type declaration due to item: %s" msgstr "¥¢¥¤¥Æ¥à¤ËÍ¿¤¨¤é¤ì¤ë¤Ù¤ %%type Àë¸À¤¬Ìµ¸ú¤Ç¤¹: `%s'" -#: src/reader.c:664 +#: src/reader.c:663 #, c-format msgid "redefining precedence of %s" msgstr "%s ¤ËÀè¹Ô¤·¤¿ºÆÄêµÁ¤Ç¤¹" -#: src/reader.c:688 +#: src/reader.c:687 #, c-format msgid "invalid text (%s) - number should be after identifier" msgstr "̵¸ú¤Ê¥Æ¥¥¹¥È (%s) - ¿ôÃͤϼ±Ê̻Ҥθå¤í¤Ë¤¢¤ë¤Ù¤¤Ç¤¹" -#: src/reader.c:698 +#: src/reader.c:697 #, c-format msgid "unexpected item: %s" msgstr "ͽ´ü¤»¤Ì¥¢¥¤¥Æ¥à: %s" -#: src/reader.c:760 src/reader.c:1036 src/reader.c:1107 +#: src/reader.c:759 src/reader.c:1035 src/reader.c:1106 #, fuzzy, c-format msgid "unmatched %s" msgstr "Âбþ¤Î¤Ê¤¤ `{' ¤Ç¤¹" -#: src/reader.c:792 +#: src/reader.c:791 #, fuzzy, c-format msgid "argument of %%expect is not an integer" msgstr "%expect ¤Î°ú¿ô¤¬À°¿ôÃͤǤϤ¢¤ê¤Þ¤»¤ó" -#: src/reader.c:839 +#: src/reader.c:838 #, c-format msgid "unrecognized item %s, expected an identifier" msgstr "ǧ¼±¤Ç¤¤Ê¤¤¥¢¥¤¥Æ¥à %s¡¢¤³¤³¤Ç¤Ï¼±Ê̻Ҥ¬´üÂÔ¤µ¤ì¤Þ¤¹" -#: src/reader.c:863 +#: src/reader.c:862 #, c-format msgid "expected string constant instead of %s" msgstr "¤³¤³¤Ç¤Ï %s ¤Ç¤Ï¤Ê¤¯Ê¸»úÎóÄê¿ô¤¬´üÂÔ¤µ¤ì¤Þ¤¹" -#: src/reader.c:952 +#: src/reader.c:951 #, c-format msgid "unrecognized: %s" msgstr "ǧ¼±¤Ç¤¤Ê¤¤: %s" -#: src/reader.c:957 +#: src/reader.c:956 msgid "no input grammar" msgstr "ʸˡ¤ÎÆþÎϤ¬Ìµ¤¤" -#: src/reader.c:962 +#: src/reader.c:961 #, c-format msgid "unknown character: %s" msgstr "̤ÃΤÎʸ»ú: %s" -#: src/reader.c:1130 +#: src/reader.c:1129 #, fuzzy, c-format msgid "unterminated %guard clause" msgstr "ÊĤ¸¤é¤ì¤Æ¤¤¤Ê¤¤ %%guard Àá¤Ç¤¹" -#: src/reader.c:1297 +#: src/reader.c:1296 msgid "ill-formed rule: initial symbol not followed by colon" msgstr "¼Ù°¤Êµ¬Â§: ½é´ü²½¥·¥ó¥Ü¥ë¤Ë¥³¥í¥ó (:) ¤¬Â³¤¤¤Æ¤¤¤Þ¤»¤ó" -#: src/reader.c:1304 +#: src/reader.c:1303 msgid "grammar starts with vertical bar" msgstr "ʸˡ¤Ï½ÄËÀ (|) ¤Ç»Ï¤á¤Þ¤¹" -#: src/reader.c:1335 +#: src/reader.c:1334 #, c-format msgid "rule given for %s, which is a token" msgstr "%s ¤Ëµ¬Â§¤¬Í¿¤¨¤é¤ì¡¢¤½¤ì¤Ï¥È¡¼¥¯¥ó¤È¤Ê¤ê¤Þ¤¹" -#: src/reader.c:1437 +#: src/reader.c:1436 msgid "two @prec's in a row" msgstr "@prec ¤Î¤â¤ÎÆó¤Ä¤¬Æ±Îó¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹" -#: src/reader.c:1445 +#: src/reader.c:1444 #, fuzzy, c-format msgid "%%guard present but %%semantic_parser not specified" msgstr "%%guard ¤¬¤¢¤ê¤Þ¤¹¤¬ %%semantic_parser ¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó" -#: src/reader.c:1454 +#: src/reader.c:1453 msgid "two actions at end of one rule" msgstr "°ì¤Ä¤Îµ¬Â§¤Î½ª¤ê¤ËÆó¤Ä¤ÎÆ°ºî¤ò»ØÄꤷ¤Æ¤¤¤Þ¤¹" -#: src/reader.c:1468 +#: src/reader.c:1467 #, c-format msgid "type clash (`%s' `%s') on default action" msgstr "½é´ü¾õÂÖ¤ÎÆ°ºî¤Ç¤Ï·¿ (`%s' `%s') ¤¬¾×Æͤ·¤Þ¤¹" -#: src/reader.c:1474 +#: src/reader.c:1473 msgid "empty rule for typed nonterminal, and no action" msgstr "¶õ¤Î·¿ÉÕ¤Èó½ªÃ¼¥¢¥¤¥Æ¥àÍѵ¬Â§¤Ç¤¢¤ê¡¢Æ°ºî¤¬µ¯¤ê¤Þ¤»¤ó" -#: src/reader.c:1518 +#: src/reader.c:1517 #, c-format msgid "invalid input: %s" msgstr "̵¸ú¤ÊÆþÎÏ: %s" -#: src/reader.c:1526 +#: src/reader.c:1525 #, fuzzy, c-format msgid "too many symbols (tokens plus nonterminals); maximum %d" msgstr "¥·¥ó¥Ü¥ë¤¬Â¿¤¹¤®¤Þ¤¹ (¥È¡¼¥¯¥ó¤ÈÈó½ªÃ¼¥¢¥¤¥Æ¥à) -- ºÇÂç %s" -#: src/reader.c:1529 +#: src/reader.c:1528 msgid "no rules in the input grammar" msgstr "ÆþÎϤ·¤¿Ê¸Ë¡¤Ëµ¬Â§¤¬ÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó" -#: src/reader.c:1553 +#: src/reader.c:1552 #, c-format msgid "symbol %s is used, but is not defined as a token and has no rules" msgstr "" "¥·¥ó¥Ü¥ë %s ¤¬»È¤ï¤ì¤Æ¤¤¤Þ¤¹¤¬¡¢¥È¡¼¥¯¥ó¤È¤·¤ÆÄêµÁ¤µ¤ì¤Æ¤ª¤é¤º¡¢µ¬Â§¤ò»ý¤Á¤Þ" "¤»¤ó" -#: src/reader.c:1658 +#: src/reader.c:1657 #, c-format msgid "conflicting precedences for %s and %s" msgstr "Àè¹Ô¤·¤Æ¤¤¤ë %s ¤È %s ¤Ç¶¥¹ç¤¬À¸¤¸¤Æ¤¤¤Þ¤¹" -#: src/reader.c:1670 +#: src/reader.c:1669 #, c-format msgid "conflicting assoc values for %s and %s" msgstr "Èó·ë¹çÃÍ %s ¤È %s ¤Ç¶¥¹ç¤¬À¸¤¸¤Æ¤¤¤Þ¤¹" -#: src/reader.c:1721 +#: src/reader.c:1720 #, fuzzy, c-format msgid "tokens %s and %s both assigned number %d" msgstr "¥È¡¼¥¯¥ó %s ¤È %s ¤ÎÁÐÊý¤¬ÈÖ¹æ %s ¤Ë³ä¤êÅö¤Æ¤é¤ì¤Þ¤·¤¿" -#: src/reader.c:1734 +#: src/reader.c:1733 #, c-format msgid "the start symbol %s is undefined" msgstr "³«»Ï¥·¥ó¥Ü¥ë %s ¤ÏÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó" -#: src/reader.c:1736 +#: src/reader.c:1735 #, c-format msgid "the start symbol %s is a token" msgstr "³«»Ï¥·¥ó¥Ü¥ë %s ¤Ï¥È¡¼¥¯¥ó¤Ç¤¹" @@ -764,11 +764,11 @@ msgstr "%s: ¥á¥â¥ê¤ò»È¤¤²Ì¤¿¤·¤Þ¤·¤¿\n" #. MARK). A British English Unicode locale should instead #. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and #. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively. -#: lib/quotearg.c:262 +#: lib/quotearg.c:259 msgid "`" msgstr "" -#: lib/quotearg.c:263 +#: lib/quotearg.c:260 msgid "'" msgstr "" @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: bison 1.25\n" -"POT-Creation-Date: 2001-07-20 14:12+0200\n" +"POT-Creation-Date: 2001-08-03 10:49+0200\n" "PO-Revision-Date: 1996-08-27 15:34 MET DST\n" "Last-Translator: Erick Branderhorst <branderh@debian.org>\n" "Language-Team: Dutch <nl@li.org>\n" @@ -124,22 +124,22 @@ msgstr "%s afgeleiden" #. Some efforts were made to ease the translators' task, please #. continue. -#: src/getargs.c:79 +#: src/getargs.c:81 msgid "GNU bison generates parsers for LALR(1) grammars.\n" msgstr "" -#: src/getargs.c:83 +#: src/getargs.c:85 #, c-format msgid "Usage: %s [OPTION]... FILE\n" msgstr "" -#: src/getargs.c:87 +#: src/getargs.c:89 msgid "" "If a long option shows an argument as mandatory, then it is mandatory\n" "for the equivalent short option also. Similarly for optional arguments.\n" msgstr "" -#: src/getargs.c:93 +#: src/getargs.c:95 msgid "" "Operation modes:\n" " -h, --help display this help and exit\n" @@ -147,7 +147,7 @@ msgid "" " -y, --yacc emulate POSIX yacc\n" msgstr "" -#: src/getargs.c:100 +#: src/getargs.c:102 msgid "" "Parser:\n" " -S, --skeleton=FILE specify the skeleton to use\n" @@ -159,7 +159,7 @@ msgid "" " -k, --token-table include a table of token names\n" msgstr "" -#: src/getargs.c:112 +#: src/getargs.c:114 msgid "" "Output:\n" " -d, --defines also produce a header file\n" @@ -168,44 +168,44 @@ msgid "" " -o, --output-file=FILE leave output to FILE\n" msgstr "" -#: src/getargs.c:120 +#: src/getargs.c:122 msgid "Report bugs to <bug-bison@gnu.org>.\n" msgstr "" #. Some efforts were made to ease the translators' task, please #. continue. -#: src/getargs.c:134 +#: src/getargs.c:136 #, c-format msgid "bison (GNU Bison) %s" msgstr "" -#: src/getargs.c:139 +#: src/getargs.c:141 msgid "" "Copyright 1984, 1986, 1989, 1992, 2000, 2001 Free Software Foundation, Inc.\n" msgstr "" -#: src/getargs.c:143 +#: src/getargs.c:145 msgid "" "This is free software; see the source for copying conditions. There is NO\n" "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" msgstr "" -#: src/getargs.c:200 src/lex.c:633 +#: src/getargs.c:202 src/lex.c:633 #, c-format msgid "`%s' is no longer supported" msgstr "" -#: src/getargs.c:224 +#: src/getargs.c:226 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" -#: src/getargs.c:231 +#: src/getargs.c:233 #, c-format msgid "%s: no grammar file given\n" msgstr "%s: geen grammatica bestand gegeven\n" -#: src/getargs.c:235 +#: src/getargs.c:237 #, fuzzy, c-format msgid "%s: extra arguments ignored after `%s'\n" msgstr "%s: extra argumenten genegeerd na '%s'\n" @@ -381,206 +381,206 @@ msgstr "niet getermineerde string aan einde van bestand" msgid "unterminated string" msgstr "niet getermineerde string" -#: src/reader.c:327 src/reader.c:391 +#: src/reader.c:326 src/reader.c:390 #, fuzzy, c-format msgid "%s is invalid" msgstr "@%s is onjuist" -#: src/reader.c:367 +#: src/reader.c:366 #, c-format msgid "$$ of `%s' has no declared type" msgstr "$$ van `%s' heeft geen gedeclareerd type" -#: src/reader.c:384 +#: src/reader.c:383 #, fuzzy, c-format msgid "$%d of `%s' has no declared type" msgstr "$%s van `%s' heeft geen gedeclareerd type" -#: src/reader.c:438 +#: src/reader.c:437 msgid "unterminated `%{' definition" msgstr "niet getermineerde `%{' definitie" -#: src/reader.c:483 src/reader.c:599 src/reader.c:649 +#: src/reader.c:482 src/reader.c:598 src/reader.c:648 #, c-format msgid "Premature EOF after %s" msgstr "" -#: src/reader.c:500 +#: src/reader.c:499 #, c-format msgid "symbol `%s' used more than once as a literal string" msgstr "" -#: src/reader.c:503 +#: src/reader.c:502 #, c-format msgid "symbol `%s' given more than one literal string" msgstr "" -#: src/reader.c:525 src/reader.c:668 +#: src/reader.c:524 src/reader.c:667 #, c-format msgid "symbol %s redefined" msgstr "symbool %s opnieuw gedefinieerd" -#: src/reader.c:535 src/reader.c:614 src/reader.c:675 src/reader.c:1232 +#: src/reader.c:534 src/reader.c:613 src/reader.c:674 src/reader.c:1231 #, c-format msgid "type redeclaration for %s" msgstr "type herdeclaratie voor %s" -#: src/reader.c:545 +#: src/reader.c:544 #, c-format msgid "`%s' is invalid in %s" msgstr "`%s' is onjuist in %s" -#: src/reader.c:562 src/reader.c:722 +#: src/reader.c:561 src/reader.c:721 #, fuzzy, c-format msgid "multiple %s declarations" msgstr "meerdere %start declaraties" -#: src/reader.c:564 src/reader.c:1210 +#: src/reader.c:563 src/reader.c:1209 #, fuzzy, c-format msgid "invalid %s declaration" msgstr "onjuiste %start declaratie" -#: src/reader.c:584 +#: src/reader.c:583 msgid "%type declaration has no <typename>" msgstr "%type declaratie heeft geen <typenaam>" -#: src/reader.c:619 +#: src/reader.c:618 #, fuzzy, c-format msgid "invalid %%type declaration due to item: %s" msgstr "onjuist %%type declaratie door item: `%s'" -#: src/reader.c:664 +#: src/reader.c:663 #, c-format msgid "redefining precedence of %s" msgstr "herdefinieren voorganger van %s" -#: src/reader.c:688 +#: src/reader.c:687 #, c-format msgid "invalid text (%s) - number should be after identifier" msgstr "onjuiste tekst (%s) - nummer hoort na de identifier" -#: src/reader.c:698 +#: src/reader.c:697 #, c-format msgid "unexpected item: %s" msgstr "onbekend item: %s" -#: src/reader.c:760 src/reader.c:1036 src/reader.c:1107 +#: src/reader.c:759 src/reader.c:1035 src/reader.c:1106 #, fuzzy, c-format msgid "unmatched %s" msgstr "niet overeenkomstige `{'" -#: src/reader.c:792 +#: src/reader.c:791 #, fuzzy, c-format msgid "argument of %%expect is not an integer" msgstr "argument van %expect is niet een integer" -#: src/reader.c:839 +#: src/reader.c:838 #, c-format msgid "unrecognized item %s, expected an identifier" msgstr "onbekend item %s, verwacht een identifier" -#: src/reader.c:863 +#: src/reader.c:862 #, c-format msgid "expected string constant instead of %s" msgstr "verwacht string constante in plaats van %s" -#: src/reader.c:952 +#: src/reader.c:951 #, c-format msgid "unrecognized: %s" msgstr "onbekend: %s" -#: src/reader.c:957 +#: src/reader.c:956 msgid "no input grammar" msgstr "geen invoer grammatica" -#: src/reader.c:962 +#: src/reader.c:961 #, c-format msgid "unknown character: %s" msgstr "onbekend karakter: %s" -#: src/reader.c:1130 +#: src/reader.c:1129 #, fuzzy, c-format msgid "unterminated %guard clause" msgstr "niet getermineerde %%guard voorwaarde" -#: src/reader.c:1297 +#: src/reader.c:1296 msgid "ill-formed rule: initial symbol not followed by colon" msgstr "" "slecht geformuleerde regel: initieel symbool niet gevolgd door dubbele punt" -#: src/reader.c:1304 +#: src/reader.c:1303 msgid "grammar starts with vertical bar" msgstr "grammatica start met een verticale bar" -#: src/reader.c:1335 +#: src/reader.c:1334 #, c-format msgid "rule given for %s, which is a token" msgstr "regel geven voor %s, welke een teken is" -#: src/reader.c:1437 +#: src/reader.c:1436 msgid "two @prec's in a row" msgstr "twee @prec's in een regel" -#: src/reader.c:1445 +#: src/reader.c:1444 #, fuzzy, c-format msgid "%%guard present but %%semantic_parser not specified" msgstr "%%guard aanwezig maar %%semantic_parser niet gespecificeerd" -#: src/reader.c:1454 +#: src/reader.c:1453 msgid "two actions at end of one rule" msgstr "twee akties aan het einde van een regel" -#: src/reader.c:1468 +#: src/reader.c:1467 #, c-format msgid "type clash (`%s' `%s') on default action" msgstr "type clash (`%s' `%s') bij standaard aktie" -#: src/reader.c:1474 +#: src/reader.c:1473 msgid "empty rule for typed nonterminal, and no action" msgstr "lege regel voor getypte niet terminal, en geen aktie" -#: src/reader.c:1518 +#: src/reader.c:1517 #, c-format msgid "invalid input: %s" msgstr "ongeldige invoer: %s" -#: src/reader.c:1526 +#: src/reader.c:1525 #, fuzzy, c-format msgid "too many symbols (tokens plus nonterminals); maximum %d" msgstr "te veel symbolen (tekens plus nietterminals); maximum %s" -#: src/reader.c:1529 +#: src/reader.c:1528 msgid "no rules in the input grammar" msgstr "geen regels voor invoer grammatica" -#: src/reader.c:1553 +#: src/reader.c:1552 #, c-format msgid "symbol %s is used, but is not defined as a token and has no rules" msgstr "" "symbool %s is gebruikt, maar is niet gedefinieerd als een teken en\n" "heeft geen regels" -#: src/reader.c:1658 +#: src/reader.c:1657 #, c-format msgid "conflicting precedences for %s and %s" msgstr "conflictuerende precedentein voor %s en %s" -#: src/reader.c:1670 +#: src/reader.c:1669 #, c-format msgid "conflicting assoc values for %s and %s" msgstr "conflictuerende associatieve waarden voor %s en %s" -#: src/reader.c:1721 +#: src/reader.c:1720 #, c-format msgid "tokens %s and %s both assigned number %d" msgstr "" -#: src/reader.c:1734 +#: src/reader.c:1733 #, c-format msgid "the start symbol %s is undefined" msgstr "" -#: src/reader.c:1736 +#: src/reader.c:1735 #, c-format msgid "the start symbol %s is a token" msgstr "het start symbool %s is een token" @@ -765,11 +765,11 @@ msgstr "%s: geen geheugen meer beschikbaar\n" #. MARK). A British English Unicode locale should instead #. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and #. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively. -#: lib/quotearg.c:262 +#: lib/quotearg.c:259 msgid "`" msgstr "" -#: lib/quotearg.c:263 +#: lib/quotearg.c:260 msgid "'" msgstr "" @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: bison 1.28a\n" -"POT-Creation-Date: 2001-07-20 14:12+0200\n" +"POT-Creation-Date: 2001-08-03 10:49+0200\n" "PO-Revision-Date: 2000-04-12 13:16+04:00\n" "Last-Translator: Dmitry S. Sivachenko <dima@Chg.RU>\n" "Language-Team: Russian <ru@li.org>\n" @@ -125,16 +125,16 @@ msgstr "%s ×Ù×ÏÄÉÔ" #. Some efforts were made to ease the translators' task, please #. continue. -#: src/getargs.c:79 +#: src/getargs.c:81 msgid "GNU bison generates parsers for LALR(1) grammars.\n" msgstr "GNU bison ÇÅÎÅÒÉÒÕÅÔ ÁÎÁÌÉÚÁÔÏÒÙ ÄÌÑ ÇÒÁÍÍÁÔÉË LALR(1).\n" -#: src/getargs.c:83 +#: src/getargs.c:85 #, c-format msgid "Usage: %s [OPTION]... FILE\n" msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþé]... æáêì\n" -#: src/getargs.c:87 +#: src/getargs.c:89 msgid "" "If a long option shows an argument as mandatory, then it is mandatory\n" "for the equivalent short option also. Similarly for optional arguments.\n" @@ -143,7 +143,7 @@ msgstr "" "Ñ×ÌÑÅÔÓÑ ÏÂÑÚÁÔÅÌØÎÙÍ ÄÌÑ ËÏÒÏÔËÏÊ ÆÏÒÍÙ. ôÏ ÖÅ ËÁÓÁÅÔÓÑ ÎÅÏÂÑÚÁÔÅÌØÎÙÈ\n" "ÁÒÇÕÍÅÎÔÏ×.\n" -#: src/getargs.c:93 +#: src/getargs.c:95 msgid "" "Operation modes:\n" " -h, --help display this help and exit\n" @@ -155,7 +155,7 @@ msgstr "" " -V, --version ×Ù×ÅÓÔÉ ÉÎÆÏÒÍÁÃÉÀ Ï ×ÅÒÓÉÉ É ×ÙÊÔÉ\n" " -y, --yacc ÜÍÕÌÉÒÏ×ÁÔØ POSIX yacc\n" -#: src/getargs.c:100 +#: src/getargs.c:102 #, fuzzy msgid "" "Parser:\n" @@ -175,7 +175,7 @@ msgstr "" " -r, --raw ÎÕÍÅÒÏ×ÁÔØ ÌÅËÓÅÍÙ, ÎÁÞÉÎÁÑ Ó 3\n" " -k, --token-table ×ËÌÀÞÉÔØ ÔÁÂÌÉÃÕ ÉÍÅÎ ÌÅËÓÅÍ\n" -#: src/getargs.c:112 +#: src/getargs.c:114 msgid "" "Output:\n" " -d, --defines also produce a header file\n" @@ -189,44 +189,44 @@ msgstr "" " -b, --file-prefix=ðòåæéëó ÕËÁÚÁÔØ ðòåæéëó ÄÌÑ ×ÙÈÏÄÎÙÈ ÆÁÊÌÏ×\n" " -o, --output-file=æáêì ÐÏÍÅÓÔÉÔØ ÒÅÚÕÌØÔÁÔ × æáêì\n" -#: src/getargs.c:120 +#: src/getargs.c:122 msgid "Report bugs to <bug-bison@gnu.org>.\n" msgstr "ïÛÉÂËÉ ÓÏÏÂÝÁÊÔÅ ÐÏ ÁÄÒÅÓÕ <bug-bison@gnu.org>.\n" #. Some efforts were made to ease the translators' task, please #. continue. -#: src/getargs.c:134 +#: src/getargs.c:136 #, c-format msgid "bison (GNU Bison) %s" msgstr "" -#: src/getargs.c:139 +#: src/getargs.c:141 msgid "" "Copyright 1984, 1986, 1989, 1992, 2000, 2001 Free Software Foundation, Inc.\n" msgstr "" -#: src/getargs.c:143 +#: src/getargs.c:145 msgid "" "This is free software; see the source for copying conditions. There is NO\n" "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" msgstr "" -#: src/getargs.c:200 src/lex.c:633 +#: src/getargs.c:202 src/lex.c:633 #, c-format msgid "`%s' is no longer supported" msgstr "" -#: src/getargs.c:224 +#: src/getargs.c:226 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" -#: src/getargs.c:231 +#: src/getargs.c:233 #, c-format msgid "%s: no grammar file given\n" msgstr "%s: ÎÅ ÚÁÄÁÎ ÆÁÊÌ Ó ÇÒÁÍÍÁÔÉËÏÊ\n" -#: src/getargs.c:235 +#: src/getargs.c:237 #, c-format msgid "%s: extra arguments ignored after `%s'\n" msgstr "%s: ÌÉÛÎÉÅ ÁÒÇÕÍÅÎÔÙ ÐÏÓÌÅ `%s' ÉÇÎÏÒÉÒÏ×ÁÎÙ\n" @@ -401,204 +401,204 @@ msgstr "ÎÅÚÁËÏÎÞÅÎÎÁÑ ÓÔÒÏËÁ × ËÏÎÃÅ ÆÁÊÌÁ" msgid "unterminated string" msgstr "ÎÅÚÁËÏÎÞÅÎÎÁÑ ÓÔÒÏËÁ" -#: src/reader.c:327 src/reader.c:391 +#: src/reader.c:326 src/reader.c:390 #, fuzzy, c-format msgid "%s is invalid" msgstr "ÎÅ×ÅÒÎÙÊ ÚÎÁË $%s" -#: src/reader.c:367 +#: src/reader.c:366 #, c-format msgid "$$ of `%s' has no declared type" msgstr "$$ × `%s' ÎÅ ÉÍÅÅÔ ÏÐÉÓÁÎÎÏÇÏ ÔÉÐÁ" -#: src/reader.c:384 +#: src/reader.c:383 #, c-format msgid "$%d of `%s' has no declared type" msgstr "$%d ÉÚ `%s' ÎÅ ÉÍÅÅÔ ÏÐÉÓÁÎÎÏÇÏ ÔÉÐÁ" -#: src/reader.c:438 +#: src/reader.c:437 msgid "unterminated `%{' definition" msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ ÏÐÒÅÄÅÌÅÎÉÅ `%{'" -#: src/reader.c:483 src/reader.c:599 src/reader.c:649 +#: src/reader.c:482 src/reader.c:598 src/reader.c:648 #, c-format msgid "Premature EOF after %s" msgstr "ðÒÅÖÄÅ×ÒÅÍÅÎÎÙÊ ËÏÎÅà ÆÁÊÌÁ ÐÏÓÌÅ %s" -#: src/reader.c:500 +#: src/reader.c:499 #, c-format msgid "symbol `%s' used more than once as a literal string" msgstr "" -#: src/reader.c:503 +#: src/reader.c:502 #, c-format msgid "symbol `%s' given more than one literal string" msgstr "" -#: src/reader.c:525 src/reader.c:668 +#: src/reader.c:524 src/reader.c:667 #, c-format msgid "symbol %s redefined" msgstr "ÐÏ×ÔÏÒÎÏÅ ÏÐÒÅÄÅÌÅÎÉÅ ÓÉÍ×ÏÌÁ %s" -#: src/reader.c:535 src/reader.c:614 src/reader.c:675 src/reader.c:1232 +#: src/reader.c:534 src/reader.c:613 src/reader.c:674 src/reader.c:1231 #, c-format msgid "type redeclaration for %s" msgstr "ÐÏ×ÔÏÒÎÏÅ ÏÐÉÓÁÎÉÅ ÔÉÐÁ ÄÌÑ %s" -#: src/reader.c:545 +#: src/reader.c:544 #, c-format msgid "`%s' is invalid in %s" msgstr "`%s' ÎÅ×ÅÒÎÏ × %s" -#: src/reader.c:562 src/reader.c:722 +#: src/reader.c:561 src/reader.c:721 #, fuzzy, c-format msgid "multiple %s declarations" msgstr "ÍÎÏÖÅÓÔ×ÅÎÎÏÅ ÏÐÉÓÁÎÉÅ %start" -#: src/reader.c:564 src/reader.c:1210 +#: src/reader.c:563 src/reader.c:1209 #, fuzzy, c-format msgid "invalid %s declaration" msgstr "ÎÅ×ÅÒÎÏÅ ÏÐÉÓÁÎÉÅ %start" -#: src/reader.c:584 +#: src/reader.c:583 msgid "%type declaration has no <typename>" msgstr "ÏÐÉÓÁÎÉÅ %type ÎÅ ÉÍÅÅÔ <ÉÍÑ_ÔÉÐÁ>" -#: src/reader.c:619 +#: src/reader.c:618 #, c-format msgid "invalid %%type declaration due to item: %s" msgstr "ÎÅ×ÅÒÎÏÅ ÏÐÉÓÁÎÉÅ %%type ÉÚ-ÚÁ ÜÌÅÍÅÎÔÁ: %s" -#: src/reader.c:664 +#: src/reader.c:663 #, c-format msgid "redefining precedence of %s" msgstr "ÐÅÒÅÏÐÒÅÄÅÌÅÎÉÅ ÐÒÉÏÒÉÔÅÔÁ ÄÌÑ %s" -#: src/reader.c:688 +#: src/reader.c:687 #, c-format msgid "invalid text (%s) - number should be after identifier" msgstr "ÎÅ×ÅÒÎÙÊ ÔÅËÓÔ (%s) - ÞÉÓÌÏ ÄÏÌÖÎÏ ÓÌÅÄÏ×ÁÔØ ÚÁ ÉÄÅÎÔÉÆÉËÁÔÏÒÏÍ" -#: src/reader.c:698 +#: src/reader.c:697 #, c-format msgid "unexpected item: %s" msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ÜÌÅÍÅÎÔ: %s" -#: src/reader.c:760 src/reader.c:1036 src/reader.c:1107 +#: src/reader.c:759 src/reader.c:1035 src/reader.c:1106 #, fuzzy, c-format msgid "unmatched %s" msgstr "ÎÅÐÁÒÎÁÑ `{'" -#: src/reader.c:792 +#: src/reader.c:791 #, fuzzy, c-format msgid "argument of %%expect is not an integer" msgstr "ÁÒÇÕÍÅÎÔ %expect ÎÅ Ñ×ÌÑÅÔÓÑ ÃÅÌÙÍ ÞÉÓÌÏÍ" -#: src/reader.c:839 +#: src/reader.c:838 #, c-format msgid "unrecognized item %s, expected an identifier" msgstr "ÎÅÒÁÓÐÏÚÎÁÎÎÙÊ ÜÌÅÍÅÎÔ %s, ÏÖÉÄÁÌÓÑ ÉÄÅÎÔÉÆÉËÁÔÏÒ" -#: src/reader.c:863 +#: src/reader.c:862 #, c-format msgid "expected string constant instead of %s" msgstr "×ÍÅÓÔÏ %s ÏÖÉÄÁÌÁÓØ ÓÔÒÏËÏ×ÁÑ ÐÏÓÔÏÑÎÎÁÑ" -#: src/reader.c:952 +#: src/reader.c:951 #, c-format msgid "unrecognized: %s" msgstr "ÎÅÒÁÓÐÏÚÎÁÎÏ: %s" -#: src/reader.c:957 +#: src/reader.c:956 msgid "no input grammar" msgstr "ÎÅÔ ×ÈÏÄÎÏÊ ÇÒÁÍÍÁÔÉËÉ" -#: src/reader.c:962 +#: src/reader.c:961 #, c-format msgid "unknown character: %s" msgstr "ÎÅÉÚ×ÅÓÔÎÙÊ ÓÉÍ×ÏÌ: %s" -#: src/reader.c:1130 +#: src/reader.c:1129 #, c-format msgid "unterminated %guard clause" msgstr "ÎÅÚÁËÏÎÞÅÎÎÙÊ ÏÐÅÒÁÔÏÒ %guard" -#: src/reader.c:1297 +#: src/reader.c:1296 msgid "ill-formed rule: initial symbol not followed by colon" msgstr "ÎÅ×ÅÒÎÏÅ ÐÒÁ×ÉÌÏ: Ä×ÏÅÔÏÞÉÅ ÎÅ ÓÌÅÄÕÅÔ ÚÁ ÎÁÞÁÌØÎÙÍ ÓÉÍ×ÏÌÏÍ" -#: src/reader.c:1304 +#: src/reader.c:1303 msgid "grammar starts with vertical bar" msgstr "ÇÒÁÍÍÁÔÉËÁ ÎÁÞÉÎÁÅÔÓÑ Ó ×ÅÒÔÉËÁÌØÎÏÊ ÞÅÒÔÙ" -#: src/reader.c:1335 +#: src/reader.c:1334 #, c-format msgid "rule given for %s, which is a token" msgstr "ÐÒÁ×ÉÌÏ ÚÁÄÁÎÏ ÄÌÑ %s, ËÏÔÏÒÙÊ Ñ×ÌÑÅÔÓÑ ÌÅËÓÅÍÏÊ" -#: src/reader.c:1437 +#: src/reader.c:1436 msgid "two @prec's in a row" msgstr "Ä×Á @prec ÐÏÄÒÑÄ" -#: src/reader.c:1445 +#: src/reader.c:1444 #, fuzzy, c-format msgid "%%guard present but %%semantic_parser not specified" msgstr "%guard ÐÒÉÓÕÔÓÔ×ÕÅÔ, Á %semantic_parser ÎÅ ÚÁÄÁÎ" -#: src/reader.c:1454 +#: src/reader.c:1453 msgid "two actions at end of one rule" msgstr "Ä×Á ÄÅÊÓÔ×ÉÑ × ËÏÎÃÅ ÏÄÎÏÇÏ ÐÒÁ×ÉÌÁ" -#: src/reader.c:1468 +#: src/reader.c:1467 #, c-format msgid "type clash (`%s' `%s') on default action" msgstr "ËÏÎÆÌÉËÔ ÔÉÐÏ× (`%s' `%s') ÎÁ ÄÅÊÓÔ×ÉÉ ÐÏ ÕÍÏÌÞÁÎÉÀ" -#: src/reader.c:1474 +#: src/reader.c:1473 msgid "empty rule for typed nonterminal, and no action" msgstr "" "ÐÕÓÔÏÅ ÐÒÁ×ÉÌÏ ÄÌÑ ÔÉÐÉÚÉÒÏ×ÁÎÎÏÇÏ ÎÅÔÅÒÍÉÎÁÌØÎÏÇÏ ÓÉÍ×ÏÌÁ, É ÎÅÔ ÄÅÊÓÔ×ÉÑ" -#: src/reader.c:1518 +#: src/reader.c:1517 #, c-format msgid "invalid input: %s" msgstr "ÎÅ×ÅÒÎÙÅ ×ÈÏÄÎÙÅ ÄÁÎÎÙÅ: %s" -#: src/reader.c:1526 +#: src/reader.c:1525 #, c-format msgid "too many symbols (tokens plus nonterminals); maximum %d" msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ ÓÉÍ×ÏÌÏ× (ÌÅËÓÅÍÙ ÐÌÀÓ ÎÅÔÅÒÍÉÎÁÌÙ); ÍÁËÓÉÍÁÌØÎÏ %d" -#: src/reader.c:1529 +#: src/reader.c:1528 msgid "no rules in the input grammar" msgstr "ÏÔÓÕÔÓÔ×ÕÀÔ ÐÒÁ×ÉÌÁ ×Ï ×ÈÏÄÎÏÊ ÇÒÁÍÍÁÔÉËÅ" -#: src/reader.c:1553 +#: src/reader.c:1552 #, c-format msgid "symbol %s is used, but is not defined as a token and has no rules" msgstr "ÓÉÍ×ÏÌ %s ÉÓÐÏÌØÚÕÅÔÓÑ, ÎÏ ÎÅ ÏÐÒÅÄÅÌÅÎ ËÁË ÌÅËÓÅÍÁ É ÎÅ ÉÍÅÅÔ ÐÒÁ×ÉÌ" -#: src/reader.c:1658 +#: src/reader.c:1657 #, c-format msgid "conflicting precedences for %s and %s" msgstr "ÐÒÏÔÉ×ÏÒÅÞÉ×ÙÅ ÐÒÉÏÒÉÔÅÔÙ ÄÌÑ %s É %s" -#: src/reader.c:1670 +#: src/reader.c:1669 #, c-format msgid "conflicting assoc values for %s and %s" msgstr "ÐÒÏÔÉ×ÏÒÅÞÉ×ÙÅ ÚÎÁÞÅÎÉÑ ÁÓÓÏÃÉÁÔÉ×ÎÏÓÔÉ ÄÌÑ %s É %s" -#: src/reader.c:1721 +#: src/reader.c:1720 #, c-format msgid "tokens %s and %s both assigned number %d" msgstr "ÏÂÅÉÍ ÌÅËÓÅÍÁÍ %s É %s ÐÒÉÓ×ÏÅÎ ÎÏÍÅÒ %d" -#: src/reader.c:1734 +#: src/reader.c:1733 #, c-format msgid "the start symbol %s is undefined" msgstr "ÎÁÞÁÌØÎÙÊ ÓÉÍ×ÏÌ %s ÎÅÏÐÒÅÄÅÌÅÎ" -#: src/reader.c:1736 +#: src/reader.c:1735 #, c-format msgid "the start symbol %s is a token" msgstr "ÎÁÞÁÌØÎÙÊ ÓÉÍ×ÏÌ %s Ñ×ÌÑÅÔÓÑ ÌÅËÓÅÍÏÊ" @@ -783,11 +783,11 @@ msgstr "%s: ÐÁÍÑÔØ ÉÓÞÅÒÐÁÎÁ\n" #. MARK). A British English Unicode locale should instead #. translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and #. U+2019 (RIGHT SINGLE QUOTATION MARK), respectively. -#: lib/quotearg.c:262 +#: lib/quotearg.c:259 msgid "`" msgstr "" -#: lib/quotearg.c:263 +#: lib/quotearg.c:260 msgid "'" msgstr "" diff --git a/src/files.c b/src/files.c index 8ecb1f9f..2d289fee 100644 --- a/src/files.c +++ b/src/files.c @@ -35,20 +35,20 @@ struct obstack defines_obstack; struct obstack guard_obstack; struct obstack output_obstack; -char *spec_outfile; /* for -o. */ -char *spec_file_prefix; /* for -b. */ -char *spec_name_prefix; /* for -p. */ +char *spec_outfile = NULL; /* for -o. */ +char *spec_file_prefix = NULL; /* for -b. */ +char *spec_name_prefix = NULL; /* for -p. */ -char *infile; -char *attrsfile; +char *infile = NULL; +char *attrsfile = NULL; -static char *base_name; -static char *short_base_name; +static char *base_name = NULL; +static char *short_base_name = NULL; /* C source file extension (the parser source). */ -static char *src_extension; +static const char *src_extension = NULL; /* Header file extension (if option ``-d'' is specified). */ -static char *header_extension; +static const char *header_extension = NULL; /*--------------------------. @@ -135,11 +135,11 @@ obstack_save (struct obstack *obs, const char *filename) /*------------------------------------------------------------------. | Return the path to the skeleton which locaction might be given in | -| ENVVAR, otherwise return SKELETON. | +| ENVVAR, otherwise return SKELETON_NAME. | `------------------------------------------------------------------*/ const char * -skeleton_find (const char *envvar, const char *skeleton) +skeleton_find (const char *envvar, const char *skeleton_name) { const char *res = getenv (envvar); @@ -149,13 +149,13 @@ skeleton_find (const char *envvar, const char *skeleton) /* File doesn't exist in current directory; try in INIT directory. */ if (!res && (cp = getenv ("INIT"))) { - res = XMALLOC (char, strlen (cp) + strlen (skeleton) + 2); - sprintf (res, "%s%c%s", cp, '/', skeleton); + res = XMALLOC (char, strlen (cp) + strlen (skeleton_name) + 2); + sprintf (res, "%s%c%s", cp, '/', skeleton_name); } #endif /* !MSDOS */ if (!res) - res = skeleton; + res = skeleton_name; return res; } @@ -165,14 +165,14 @@ skeleton_find (const char *envvar, const char *skeleton) | Compute BASE_NAME, SHORT_BASE_NAME and output files extensions. | `----------------------------------------------------------------*/ -/* Replace all characters FROM by TO in the string IN. - and returns a new allocated string. */ +/* Replace all characters FROM by TO in the string IN. + and returns a new allocated string. */ static char * tr(const char *in, char from, char to) { char *temp; char *out; - + out = XMALLOC (char, strlen (in) + 1); for (temp = out; *in; in++, out++) @@ -184,15 +184,15 @@ tr(const char *in, char from, char to) return (temp); } -/* Gets the extension index in FILENAME. Returns 0 if fails to +/* Gets the extension index in FILENAME. Returns 0 if fails to find an extension. */ -static int +static int get_extension_index(const char *filename) { int len; len = strlen (filename); - + if (filename[len-- - 1] == '.') return (0); @@ -232,7 +232,7 @@ compute_base_names (void) size_t base_length; size_t short_base_length; size_t ext_index; - + /* Set default extensions */ src_extension = ".c"; header_extension = ".h"; @@ -252,9 +252,9 @@ compute_base_names (void) #endif /* MSDOS */ /* BASE_LENGTH includes ".tab" but not ".c". */ base_length = strlen (spec_outfile); - + ext_index = get_extension_index (spec_outfile); - /* if the initial segment of extension contains 'c' or a 'C', I assume + /* if the initial segment of extension contains 'c' or a 'C', I assume that it is a C or C++ source file */ if (ext_index) ext_index = (strspn(spec_outfile + ext_index + 1, "cC")) ? ext_index : 0; @@ -263,7 +263,7 @@ compute_base_names (void) base_length -= strlen (spec_outfile + ext_index); compute_exts_from_src(spec_outfile + ext_index); } - + base_name = strndup (spec_outfile, base_length); /* SHORT_BASE_LENGTH includes neither ".tab" nor ".c". */ short_base_length = base_length; @@ -302,9 +302,9 @@ compute_base_names (void) /* BASE_LENGTH gets length of BASE_NAME, sans ".y" suffix if any. */ base_length = strlen (name_base); - + ext_index = get_extension_index (name_base); - /* if the initial segment of extension contains a 'y' or a 'Y', I assume + /* if the initial segment of extension contains a 'y' or a 'Y', I assume that it is a yacc or bison grammar file */ if (ext_index) ext_index = (strspn(name_base + ext_index + 1, "yY")) ? ext_index : 0; @@ -360,7 +360,7 @@ output_files (void) attrsfile = stringappend (short_base_name, EXT_STYPE_H); #ifndef MSDOS stringappend (attrsfile, header_extension); -#endif /* MSDOS */ +#endif /* MSDOS */ /* Output the main file. */ if (spec_outfile) diff --git a/src/files.h b/src/files.h index 5ac8d04a..3015373d 100644 --- a/src/files.h +++ b/src/files.h @@ -67,5 +67,6 @@ void output_files PARAMS((void)); FILE *xfopen PARAMS ((const char *name, const char *mode)); int xfclose PARAMS ((FILE *ptr)); -const char *skeleton_find PARAMS ((const char *envvar, const char *skeleton)); +const char *skeleton_find PARAMS ((const char *envvar, + const char *skeleton_name)); #endif /* !FILES_H_ */ diff --git a/src/getargs.c b/src/getargs.c index 6c74d264..7595e7c5 100644 --- a/src/getargs.c +++ b/src/getargs.c @@ -22,6 +22,7 @@ #include "getopt.h" #include "system.h" #include "files.h" +#include "complain.h" #include "getargs.h" int debug_flag = 0; @@ -29,12 +30,13 @@ int defines_flag = 0; int locations_flag = 0; int no_lines_flag = 0; int no_parser_flag = 0; -char *skeleton = 0; int token_table_flag = 0; int verbose_flag = 0; int statistics_flag = 0; int yacc_flag = 0; /* for -y */ +const char *skeleton = NULL; + extern char *program_name; const char *shortopts = "yvdhrltknVo:b:p:S:"; static struct option longopts[] = diff --git a/src/getargs.h b/src/getargs.h index 4793f1a1..a8ff4559 100644 --- a/src/getargs.h +++ b/src/getargs.h @@ -24,7 +24,7 @@ /* flags set by % directives */ extern char *spec_file_prefix; /* for -b */ extern char *spec_name_prefix; /* for -p */ -extern char *skeleton; +extern const char *skeleton; extern int debug_flag; /* for -t */ extern int defines_flag; /* for -d */ @@ -31,7 +31,7 @@ /* Buffer for storing the current token. */ struct obstack token_obstack; -char *token_buffer = NULL; +const char *token_buffer = NULL; bucket *symval; int numval; @@ -234,10 +234,10 @@ literalchar (struct obstack *out, int *pcode, char term) } else { - char buf [] = "c"; - buf[0] = c; + char badchar [] = "c"; + badchar[0] = c; complain (_("unknown escape sequence: `\\' followed by `%s'"), - quote (buf)); + quote (badchar)); code = '?'; } } /* has \ */ @@ -53,7 +53,7 @@ typedef enum token_e tok_obsolete } token_t; -extern char *token_buffer; +extern const char *token_buffer; extern bucket *symval; extern int numval; diff --git a/src/reader.c b/src/reader.c index 540b5682..ee859b6a 100644 --- a/src/reader.c +++ b/src/reader.c @@ -312,7 +312,6 @@ copy_at (FILE *fin, struct obstack *oout, int stack_offset) else if (isdigit (c) || c == '-') { int n; - char buf[4096]; ungetc (c, fin); n = read_signed_integer (fin); @@ -344,7 +343,7 @@ copy_dollar (FILE *fin, struct obstack *oout, symbol_list *rule, int stack_offset) { int c = getc (fin); - char *type_name = NULL; + const char *type_name = NULL; /* Get the type name if explicit. */ if (c == '<') |