From: Paul Eggert Date: Fri, 13 Dec 2002 12:20:19 +0000 (+0000) Subject: Regenerate. X-Git-Tag: BISON-1_875~65 X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/05d18c249342b25135c505907eb992707f5e0d65 Regenerate. --- diff --git a/po/de.po b/po/de.po index a7aa8716..5cfe831e 100644 --- a/po/de.po +++ b/po/de.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: bison 1.75b\n" -"POT-Creation-Date: 2002-11-24 23:54-0800\n" +"POT-Creation-Date: 2002-12-13 03:47-0800\n" "PO-Revision-Date: 2002-11-14 10:40:26+0100\n" "Last-Translator: Michael Piefel \n" "Language-Team: German \n" @@ -15,108 +15,108 @@ msgstr "" "Content-Transfer-Encoding: 8-bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: src/complain.c:78 lib/error.c:126 lib/error.c:154 +#: src/complain.c:56 lib/error.c:135 lib/error.c:163 msgid "Unknown system error" msgstr "Unbekannter Systemfehler" -#: src/complain.c:103 src/complain.c:120 +#: src/complain.c:80 src/complain.c:97 msgid "warning: " msgstr "Warnung: " -#: src/complain.c:182 src/complain.c:200 +#: src/complain.c:159 src/complain.c:177 msgid "fatal error: " msgstr "fataler Fehler: " -#: src/conflicts.c:72 +#: src/conflicts.c:75 #, c-format msgid " Conflict between rule %d and token %s resolved as shift" msgstr "" " Konflikt zwischen Regel %d and Token %s wurde durch Schieben gelöst" -#: src/conflicts.c:80 +#: src/conflicts.c:83 #, c-format msgid " Conflict between rule %d and token %s resolved as reduce" msgstr "" " Konflikt zwischen Regel %d and Token %s wurde durch Reduzierung gelöst" -#: src/conflicts.c:87 +#: src/conflicts.c:90 #, c-format msgid " Conflict between rule %d and token %s resolved as an error" msgstr "" " Konflikt zwischen Regel %d and Token %s wurde als Fehler betrachtet" -#: src/conflicts.c:401 +#: src/conflicts.c:403 #, c-format msgid "%d shift/reduce conflict" msgid_plural "%d shift/reduce conflicts" msgstr[0] "%d Schiebe/Reduziere-Konflikt" msgstr[1] "%d Schiebe/Reduziere-Konflikte" -#: src/conflicts.c:408 +#: src/conflicts.c:410 msgid "and" msgstr "und" -#: src/conflicts.c:414 +#: src/conflicts.c:416 #, c-format msgid "%d reduce/reduce conflict" msgid_plural "%d reduce/reduce conflicts" msgstr[0] "%d Reduziere/Reduziere-Konflikt" msgstr[1] "%d Reduziere/Reduziere-Konflikte" -#: src/conflicts.c:434 +#: src/conflicts.c:436 msgid "conflicts: " msgstr "Konflikte: " -#: src/conflicts.c:436 +#: src/conflicts.c:438 #, c-format msgid " %d shift/reduce" msgstr " %d Schiebe/Reduziere" -#: src/conflicts.c:440 +#: src/conflicts.c:442 #, c-format msgid " %d reduce/reduce" msgstr " %d Reduziere/Reduziere" -#: src/conflicts.c:459 +#: src/conflicts.c:461 #, c-format msgid "State %d contains " msgstr "Zustand %d enthält " -#: src/conflicts.c:536 +#: src/conflicts.c:538 #, c-format msgid "expected %d shift/reduce conflict" msgid_plural "expected %d shift/reduce conflicts" msgstr[0] "erwartete %d Schiebe/Reduziere-Konflikt" msgstr[1] "erwartete %d Schiebe/Reduziere-Konflikte" -#: src/files.c:111 +#: src/files.c:98 #, c-format msgid "cannot open file `%s'" msgstr "kann Datei »%s« nicht öffnen" -#: src/files.c:127 +#: src/files.c:114 msgid "I/O error" msgstr "E/A-Fehler" -#: src/files.c:130 +#: src/files.c:117 msgid "cannot close file" msgstr "kann Datei nicht schließen" -#: src/getargs.c:167 +#: src/getargs.c:182 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "»%s --help« gibt weitere Informationen.\n" -#: src/getargs.c:173 +#: src/getargs.c:188 msgid "GNU bison generates parsers for LALR(1) grammars.\n" msgstr "GNU bison generiert Parser für LALR(1)-Grammatiken.\n" -#: src/getargs.c:177 +#: src/getargs.c:192 #, c-format msgid "Usage: %s [OPTION]... FILE\n" msgstr "Aufruf: %s [OPTION]... DATEI\n" -#: src/getargs.c:181 +#: src/getargs.c:196 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" @@ -126,7 +126,7 @@ msgstr "" "für die äquivalente kurze Option erforderlich. Ähnlich für optionale " "Argumente.\n" -#: src/getargs.c:187 +#: src/getargs.c:202 msgid "" "Operation modes:\n" " -h, --help display this help and exit\n" @@ -138,7 +138,7 @@ msgstr "" " -v, --version Versionsinformation anzeigen und beenden.\n" " -y, --yacc POSIX' yacc emulieren\n" -#: src/getargs.c:194 +#: src/getargs.c:209 msgid "" "Parser:\n" " -S, --skeleton=FILE specify the skeleton to use\n" @@ -160,7 +160,7 @@ msgstr "" " -k, --token-table einer Tabellen der Token-Namen mit " "einschließen\n" -#: src/getargs.c:206 +#: src/getargs.c:221 msgid "" "Output:\n" " -d, --defines also produce a header file\n" @@ -180,7 +180,7 @@ msgstr "" " -g, --graph auch eine VCG-Beschreibung des Automaten " "herstellen\n" -#: src/getargs.c:217 +#: src/getargs.c:232 msgid "" "THINGS is a list of comma separated words that can include:\n" " `state' describe the states\n" @@ -198,26 +198,26 @@ msgstr "" " »all« alle oben genannten Informationen\n" " »none« den Report abschalten\n" -#: src/getargs.c:228 +#: src/getargs.c:243 msgid "Report bugs to .\n" msgstr "" "Berichten Sie Fehler (auf Englisch, mit LC_ALL=C) an .\n" -#: src/getargs.c:245 +#: src/getargs.c:260 #, c-format msgid "bison (GNU Bison) %s" msgstr "bison (GNU Bison) %s" -#: src/getargs.c:247 +#: src/getargs.c:262 msgid "Written by Robert Corbett and Richard Stallman.\n" msgstr "Geschrieben von Robert Corbett und Richard Stallman.\n" -#: src/getargs.c:251 +#: src/getargs.c:266 #, c-format msgid "Copyright (C) %d Free Software Foundation, Inc.\n" msgstr "Copyright © %d Free Software Foundation, Inc.\n" -#: src/getargs.c:253 +#: src/getargs.c:268 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" @@ -226,56 +226,60 @@ msgstr "" "gibt keine Garantie; auch nicht für VERKAUFBARKEIT oder FÜR SPEZIELLE " "ZWECKE.\n" -#: src/getargs.c:407 +#: src/getargs.c:423 #, c-format msgid "missing operand after `%s'" msgstr "fehlender Operand nach »%s«" -#: src/getargs.c:409 +#: src/getargs.c:425 #, c-format msgid "extra operand `%s'" msgstr "zusätzlicher Operand »%s«" -#: src/gram.c:139 +#: src/gram.c:142 msgid "empty" msgstr "leer" -#: src/gram.c:233 +#: src/gram.c:236 msgid "Grammar" msgstr "Grammatik" -#: src/gram.c:321 src/reduce.c:302 src/reduce.c:392 +#: src/gram.c:324 src/reduce.c:393 msgid "warning" msgstr "Warnung" -#: src/main.c:120 +#: src/main.c:124 msgid "rule never reduced because of conflicts" msgstr "Regel nie reduziert wegen Konflikten" -#: src/parse-gram.y:364 +#: src/parse-gram.y:336 msgid "POSIX forbids declarations in the grammar" msgstr "POSIX verbietet Deklarationen in der Grammatik" -#: src/print.c:46 +#: src/parse-gram.y:468 +msgid "missing identifier in parameter declaration" +msgstr "" + +#: src/print.c:48 #, c-format msgid " type %d is %s\n" msgstr " Typ %d ist %s\n" -#: src/print.c:162 +#: src/print.c:164 #, c-format msgid "shift, and go to state %d\n" msgstr "schiebe und gehe zu Zustand %d über\n" -#: src/print.c:164 +#: src/print.c:166 #, c-format msgid "go to state %d\n" msgstr "gehe zu Zustand %d über\n" -#: src/print.c:201 +#: src/print.c:203 msgid "error (nonassociative)\n" msgstr "Fehler (nicht assoziativ)\n" -#: src/print.c:290 +#: src/print.c:291 #, c-format msgid "reduce using rule %d (%s)" msgstr "reduziere mit Regel %d (%s)" @@ -293,56 +297,56 @@ msgstr "$default" msgid "state %d" msgstr "Zustand %d" -#: src/print.c:456 +#: src/print.c:455 msgid "Terminals, with rules where they appear" msgstr "Terminale und die Regeln, in denen sie verwendet werden" -#: src/print.c:483 +#: src/print.c:482 msgid "Nonterminals, with rules where they appear" msgstr "Nicht-Terminal und die Regeln, in denen sie verwendet werden" -#: src/print.c:512 +#: src/print.c:511 msgid " on left:" msgstr " auf der linken Seite:" -#: src/print.c:527 +#: src/print.c:526 msgid " on right:" msgstr " auf der rechten Seite:" -#: src/print.c:555 +#: src/print.c:554 msgid "Rules never reduced" msgstr "niemals reduzierte Regeln" -#: src/reader.c:51 +#: src/reader.c:53 #, c-format msgid "multiple %s declarations" msgstr "mehr als eine %s-Deklaration" -#: src/reader.c:137 +#: src/reader.c:138 #, c-format msgid "result type clash on merge function %s: <%s> != <%s>" msgstr "Rückgabetyp-Konflikt in merge-Funktion %s: <%s> != <%s>" -#: src/reader.c:235 +#: src/reader.c:236 #, 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:264 +#: src/reader.c:265 #, c-format msgid "type clash on default action: <%s> != <%s>" msgstr "Typkonflikt bei Default-Aktion: <%s> != <%s>) " -#: src/reader.c:270 +#: src/reader.c:271 msgid "empty rule for typed nonterminal, and no action" msgstr "leere Regel für Nicht-Terminal mit Typ und keine Aktion" -#: src/reader.c:340 src/reader.c:355 src/reader.c:368 +#: src/reader.c:341 src/reader.c:355 src/reader.c:368 #, c-format msgid "only one %s allowed per rule" msgstr "nur ein %s pro Regel erlaubt" -#: src/reader.c:350 src/reader.c:366 +#: src/reader.c:351 src/reader.c:366 #, c-format msgid "%s affects only GLR parsers" msgstr "%s betrifft nur GLR-Parser" @@ -352,172 +356,177 @@ msgstr "%s betrifft nur GLR-Parser" msgid "%s must be followed by positive number" msgstr "%s muss von positiver Zahl gefolgt sein" -#: src/reader.c:512 +#: src/reader.c:510 msgid "no rules in the input grammar" msgstr "Eingabegrammatik enthält keine Regeln" -#: src/reduce.c:239 +#: src/reduce.c:241 msgid "useless rule" msgstr "nutzlose Regel" #: src/reduce.c:302 -msgid "useless nonterminal" +#, fuzzy, c-format +msgid "useless nonterminal: %s" msgstr "nutzloses Nicht-Terminal" -#: src/reduce.c:349 +#: src/reduce.c:350 msgid "Useless nonterminals" msgstr "Nutzlose Nicht-Terminale" -#: src/reduce.c:362 +#: src/reduce.c:363 msgid "Terminals which are not used" msgstr "Nicht genutzte Terminale" -#: src/reduce.c:371 +#: src/reduce.c:372 msgid "Useless rules" msgstr "Nutzlose Regeln" -#: src/reduce.c:387 +#: src/reduce.c:388 #, c-format msgid "%d rule never reduced\n" msgid_plural "%d rules never reduced\n" msgstr[0] "%d Regel wurde niemals reduziert\n" msgstr[1] "%d Regeln wurden niemals reduziert\n" -#: src/reduce.c:395 +#: src/reduce.c:396 #, c-format msgid "%d useless nonterminal" msgid_plural "%d useless nonterminals" msgstr[0] "%d nutzloses Nicht-Terminal" msgstr[1] "%d nutzlose Nicht-Terminale" -#: src/reduce.c:401 +#: src/reduce.c:402 msgid " and " msgstr " und " -#: src/reduce.c:404 +#: src/reduce.c:405 #, c-format msgid "%d useless rule" msgid_plural "%d useless rules" msgstr[0] "%d nutzlose Regel" msgstr[1] "%d nutzlose Regeln" -#: src/reduce.c:435 +#: src/reduce.c:436 #, c-format msgid "start symbol %s does not derive any sentence" msgstr "es lassen sich keine Sätze vom Startsymbol %s ableiten" -#: src/scan-gram.l:258 +#: src/scan-gram.l:208 #, c-format msgid "invalid directive: %s" msgstr "ungültige Direktive: %s" -#: src/scan-gram.l:287 src/scan-gram.l:661 src/scan-gram.l:733 +#: src/scan-gram.l:216 +msgid "stray `,' treated as white space" +msgstr "" + +#: src/scan-gram.l:232 src/scan-gram.l:727 src/scan-gram.l:798 #, c-format msgid "integer out of range: %s" msgstr "Ganzzahl außerhalb des Wertebereichs: %s" -#: src/scan-gram.l:327 +#: src/scan-gram.l:276 #, c-format msgid "invalid character: %s" msgstr "ungültiges Zeichen: %s" -#: src/scan-gram.l:427 src/scan-gram.l:441 src/scan-gram.l:464 +#: src/scan-gram.l:400 src/scan-gram.l:410 src/scan-gram.l:429 #, c-format msgid "invalid escape sequence: %s" msgstr "unzulässiges Fluchtzeichen: %s" -#: src/scan-gram.l:472 +#: src/scan-gram.l:434 #, c-format msgid "unrecognized escape sequence: %s" msgstr "unbekanntes Fluchtzeichen: %s" -#: src/scan-gram.l:632 +#: src/scan-gram.l:699 #, c-format msgid "$$ of `%s' has no declared type" msgstr "$$ von »%s« hat keinen deklarierten Typ" -#: src/scan-gram.l:652 +#: src/scan-gram.l:718 #, c-format msgid "$%d of `%s' has no declared type" msgstr "$%d von »%s« hat keinen deklarierten Typ" -#: src/scan-gram.l:678 src/scan-gram.l:750 +#: src/scan-gram.l:744 src/scan-gram.l:815 #, c-format msgid "invalid value: %s" msgstr "unzulässiger Wert: %s" -#: src/scan-gram.l:861 +#: src/scan-gram.l:928 #, c-format msgid "missing `%s' at end of file" msgstr "fehlendes »%s« am Ende der Datei" -#: src/symlist.c:97 src/symlist.c:109 +#: src/symlist.c:97 src/symlist.c:108 msgid "invalid $ value" msgstr "unzulässiger $-Wert" -#: src/symtab.c:82 +#: src/symtab.c:84 #, c-format msgid "type redeclaration for %s" msgstr "erneute Deklaration des Typs für %s" -#: src/symtab.c:100 src/symtab.c:119 +#: src/symtab.c:101 src/symtab.c:119 #, c-format msgid "%s redeclaration for %s" msgstr "%s erneute Deklaration für %s" -#: src/symtab.c:140 +#: src/symtab.c:138 #, c-format msgid "redefining precedence of %s" msgstr "Vorrang von %s wird erneut definiert" -#: src/symtab.c:159 +#: src/symtab.c:156 #, c-format msgid "symbol %s redefined" msgstr "Symbol %s noch einmal definiert" -#: src/symtab.c:183 +#: src/symtab.c:179 #, c-format msgid "redefining user token number of %s" msgstr "Nutzertokennummer von %s erneut definiert" -#: src/symtab.c:222 +#: src/symtab.c:206 #, 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/symtab.c:241 +#: src/symtab.c:231 #, 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/symtab.c:244 +#: src/symtab.c:234 #, c-format msgid "symbol `%s' given more than one literal string" msgstr "Symbol »%s« wird mehr als eine literale Zeichenkette gegeben" -#: src/symtab.c:279 +#: src/symtab.c:269 #, c-format msgid "conflicting precedences for %s and %s" msgstr "Vorrang für %s und %s widersprechen sich" -#: src/symtab.c:291 +#: src/symtab.c:281 #, c-format msgid "conflicting associativities for %s (%s) and %s (%s)" msgstr "Assoziativitäts-Werte für %s (%s) und %s (%s) widersprechen sich" -#: src/symtab.c:363 +#: src/symtab.c:366 #, c-format msgid "tokens %s and %s both assigned number %d" msgstr "Token %s und %s haben die selbe Nummer %d" -#: src/symtab.c:570 +#: src/symtab.c:589 #, c-format msgid "the start symbol %s is undefined" msgstr "das Startsymbol %s ist undefiniert" -#: src/symtab.c:574 +#: src/symtab.c:593 #, c-format msgid "the start symbol %s is a token" msgstr "das Startsymbol %s ist ein Token" @@ -602,62 +611,62 @@ msgstr "Konnte Statistik-Datei nicht schreiben." msgid "Could not open stats file for writing." msgstr "Konnte Statistik-Datei nicht zum Schreiben öffnen." -#: lib/getopt.c:662 +#: lib/getopt.c:688 lib/getopt.c:700 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: Option »%s« ist mehrdeutig\n" -#: lib/getopt.c:687 +#: lib/getopt.c:733 lib/getopt.c:737 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: Option »--%s« erlaubt kein Argument\n" -#: lib/getopt.c:692 +#: lib/getopt.c:746 lib/getopt.c:751 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: Option »%c%s« erlaubt kein Argument\n" -#: lib/getopt.c:710 lib/getopt.c:883 +#: lib/getopt.c:787 lib/getopt.c:800 lib/getopt.c:1089 lib/getopt.c:1102 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: Option »%s« erfordert ein Argument\n" -#: lib/getopt.c:739 +#: lib/getopt.c:838 lib/getopt.c:841 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: unbekannte Option »--%s«\n" -#: lib/getopt.c:743 +#: lib/getopt.c:849 lib/getopt.c:852 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: unbekannte Option »%c%s«\n" -#: lib/getopt.c:769 +#: lib/getopt.c:899 lib/getopt.c:902 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: ungültige Option -- %c\n" -#: lib/getopt.c:772 +#: lib/getopt.c:908 lib/getopt.c:911 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: ungültige Option -- %c\n" -#: lib/getopt.c:802 lib/getopt.c:932 +#: lib/getopt.c:958 lib/getopt.c:969 lib/getopt.c:1155 lib/getopt.c:1168 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: Option erfordert ein Argument -- %c\n" -#: lib/getopt.c:849 +#: lib/getopt.c:1021 lib/getopt.c:1032 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: Option »-W %s« ist mehrdeutig\n" -#: lib/getopt.c:867 +#: lib/getopt.c:1056 lib/getopt.c:1068 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: Option »-W %s« erlaubt kein Argument\n" -#: lib/obstack.c:496 lib/obstack.c:499 lib/xmalloc.c:63 +#: lib/obstack.c:487 lib/obstack.c:490 lib/xmalloc.c:63 msgid "memory exhausted" msgstr "Speicher ausgeschöpft" diff --git a/po/es.po b/po/es.po index 113c8489..1fd452d3 100644 --- a/po/es.po +++ b/po/es.po @@ -29,7 +29,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU bison 1.49a\n" -"POT-Creation-Date: 2002-11-24 23:54-0800\n" +"POT-Creation-Date: 2002-12-13 03:47-0800\n" "PO-Revision-Date: 2002-05-02 10:19+0200\n" "Last-Translator: Nicolás García-Pedrajas \n" "Language-Team: Spanish \n" @@ -38,11 +38,11 @@ msgstr "" "Content-Transfer-Encoding: 8-bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: src/complain.c:78 lib/error.c:126 lib/error.c:154 +#: src/complain.c:56 lib/error.c:135 lib/error.c:163 msgid "Unknown system error" msgstr "Error del sistema desconocido" -#: src/complain.c:103 src/complain.c:120 +#: src/complain.c:80 src/complain.c:97 msgid "warning: " msgstr "aviso: " @@ -53,50 +53,50 @@ msgstr "aviso: " # La verdad es que a mi lo de error fatal me suena fatal # ngp # -#: src/complain.c:182 src/complain.c:200 +#: src/complain.c:159 src/complain.c:177 msgid "fatal error: " msgstr "error grave: " -#: src/conflicts.c:72 +#: src/conflicts.c:75 #, fuzzy, c-format msgid " Conflict between rule %d and token %s resolved as shift" msgstr "" "El conflicto en el estado %d entre la regla %d y el terminal %s se resuelve " "como %s.\n" -#: src/conflicts.c:80 +#: src/conflicts.c:83 #, fuzzy, c-format msgid " Conflict between rule %d and token %s resolved as reduce" msgstr "" "El conflicto en el estado %d entre la regla %d y el terminal %s se resuelve " "como %s.\n" -#: src/conflicts.c:87 +#: src/conflicts.c:90 #, fuzzy, c-format msgid " Conflict between rule %d and token %s resolved as an error" msgstr "" "El conflicto en el estado %d entre la regla %d y el terminal %s se resuelve " "como %s.\n" -#: src/conflicts.c:401 +#: src/conflicts.c:403 #, c-format msgid "%d shift/reduce conflict" msgid_plural "%d shift/reduce conflicts" msgstr[0] "%d conflicto desplazamiento/reducción" msgstr[1] "%d conflictos desplazamiento/reducción" -#: src/conflicts.c:408 +#: src/conflicts.c:410 msgid "and" msgstr "y" -#: src/conflicts.c:414 +#: src/conflicts.c:416 #, c-format msgid "%d reduce/reduce conflict" msgid_plural "%d reduce/reduce conflicts" msgstr[0] " %d conflicto reducción/reducción" msgstr[1] " %d conflictos reducción/reducción" -#: src/conflicts.c:434 +#: src/conflicts.c:436 msgid "conflicts: " msgstr "conflictos: " @@ -112,7 +112,7 @@ msgstr "conflictos: " # ok # ngp # -#: src/conflicts.c:436 +#: src/conflicts.c:438 #, c-format msgid " %d shift/reduce" msgstr " %d desplazamiento(s)/reducción(ones)" @@ -129,52 +129,52 @@ msgstr " %d desplazamiento(s)/reducci # # ok # ngp -#: src/conflicts.c:440 +#: src/conflicts.c:442 #, c-format msgid " %d reduce/reduce" msgstr " %d reducción(ones)/reducción(ones)" -#: src/conflicts.c:459 +#: src/conflicts.c:461 #, c-format msgid "State %d contains " msgstr "El estado %d contiene" -#: src/conflicts.c:536 +#: src/conflicts.c:538 #, fuzzy, c-format msgid "expected %d shift/reduce conflict" msgid_plural "expected %d shift/reduce conflicts" msgstr[0] "esperado: %d conflicto desplazamiento/reducción\n" msgstr[1] "esperados: %d conflictos desplazamiento/reducción\n" -#: src/files.c:111 +#: src/files.c:98 #, c-format msgid "cannot open file `%s'" msgstr "no se puede abrir el fichero `%s'" -#: src/files.c:127 +#: src/files.c:114 #, fuzzy msgid "I/O error" msgstr "un error" -#: src/files.c:130 +#: src/files.c:117 msgid "cannot close file" msgstr "no se puede cerrar el fichero" -#: src/getargs.c:167 +#: src/getargs.c:182 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Pruebe `%s --help' para más información.\n" -#: src/getargs.c:173 +#: src/getargs.c:188 msgid "GNU bison generates parsers for LALR(1) grammars.\n" msgstr "GNU bison genera analizadores para gramáticas LALR(1).\n" -#: src/getargs.c:177 +#: src/getargs.c:192 #, c-format msgid "Usage: %s [OPTION]... FILE\n" msgstr "Utilización: %s [OPCIÓN]... FICHERO\n" -#: src/getargs.c:181 +#: src/getargs.c:196 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" @@ -184,7 +184,7 @@ msgstr "" "para la opción corta equivalente también. De igual forma para los argumentos " "opcionales.\n" -#: src/getargs.c:187 +#: src/getargs.c:202 msgid "" "Operation modes:\n" " -h, --help display this help and exit\n" @@ -196,7 +196,7 @@ msgstr "" " -V, --version informa de la versión y termina\n" " -y, --yacc emula POSIX yacc\n" -#: src/getargs.c:194 +#: src/getargs.c:209 msgid "" "Parser:\n" " -S, --skeleton=FILE specify the skeleton to use\n" @@ -216,7 +216,7 @@ msgstr "" " -n, --no-parser solamente genera las tablas\n" " --k, --token-table incluye una tabla de nombres de terminales\n" -#: src/getargs.c:206 +#: src/getargs.c:221 #, fuzzy msgid "" "Output:\n" @@ -237,7 +237,7 @@ msgstr "" " -g, --graph también produce una descripción en VCG del " "automaton\n" -#: src/getargs.c:217 +#: src/getargs.c:232 msgid "" "THINGS is a list of comma separated words that can include:\n" " `state' describe the states\n" @@ -248,25 +248,25 @@ msgid "" " `none' disable the report\n" msgstr "" -#: src/getargs.c:228 +#: src/getargs.c:243 msgid "Report bugs to .\n" msgstr "Informe de los errores a .\n" -#: src/getargs.c:245 +#: src/getargs.c:260 #, c-format msgid "bison (GNU Bison) %s" msgstr "bison (GNU bison) %s" -#: src/getargs.c:247 +#: src/getargs.c:262 msgid "Written by Robert Corbett and Richard Stallman.\n" msgstr "Escrito por Robert Corbett y Richard Stallman.\n" -#: src/getargs.c:251 +#: src/getargs.c:266 #, c-format msgid "Copyright (C) %d Free Software Foundation, Inc.\n" msgstr "Copyright (C) %d Free Software Foundation, Inc.\n" -#: src/getargs.c:253 +#: src/getargs.c:268 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" @@ -276,58 +276,62 @@ msgstr "" "NINGUNA garantía; ni siquiera para COMERCIALIZACIÓN o ADAPTACIÓN PARA UN\n" "USO PARTICULAR\n" -#: src/getargs.c:407 +#: src/getargs.c:423 #, c-format msgid "missing operand after `%s'" msgstr "" -#: src/getargs.c:409 +#: src/getargs.c:425 #, c-format msgid "extra operand `%s'" msgstr "" -#: src/gram.c:139 +#: src/gram.c:142 msgid "empty" msgstr "vacío" -#: src/gram.c:233 +#: src/gram.c:236 msgid "Grammar" msgstr "Gramática" -#: src/gram.c:321 src/reduce.c:302 src/reduce.c:392 +#: src/gram.c:324 src/reduce.c:393 #, fuzzy msgid "warning" msgstr "aviso: " -#: src/main.c:120 +#: src/main.c:124 msgid "rule never reduced because of conflicts" msgstr "" -#: src/parse-gram.y:364 +#: src/parse-gram.y:336 msgid "POSIX forbids declarations in the grammar" msgstr "" -#: src/print.c:46 +#: src/parse-gram.y:468 +msgid "missing identifier in parameter declaration" +msgstr "" + +#: src/print.c:48 #, c-format msgid " type %d is %s\n" msgstr " el tipo %d es %s\n" -#: src/print.c:162 +#: src/print.c:164 #, fuzzy, c-format msgid "shift, and go to state %d\n" msgstr " %-4s\tdesplazar e ir al estado %d\n" -#: src/print.c:164 +#: src/print.c:166 #, fuzzy, c-format msgid "go to state %d\n" msgstr " %-4s\tir al estado %d\n" -#: src/print.c:201 +#: src/print.c:203 #, fuzzy msgid "error (nonassociative)\n" msgstr "%-4s\terror (no asociativo)" -#: src/print.c:290 +#: src/print.c:291 #, fuzzy, c-format msgid "reduce using rule %d (%s)" msgstr "$default\treduce usando la regla %d (%s)" @@ -345,57 +349,57 @@ msgstr "" msgid "state %d" msgstr "estado %d" -#: src/print.c:456 +#: src/print.c:455 msgid "Terminals, with rules where they appear" msgstr "Terminales con las reglas donde aparecen" -#: src/print.c:483 +#: src/print.c:482 msgid "Nonterminals, with rules where they appear" msgstr "No terminales con las reglas donde aparecen" -#: src/print.c:512 +#: src/print.c:511 msgid " on left:" msgstr " en la izquierda:" -#: src/print.c:527 +#: src/print.c:526 msgid " on right:" msgstr " en la derecha:" -#: src/print.c:555 +#: src/print.c:554 #, fuzzy msgid "Rules never reduced" msgstr "%d regla que nunca se ha reducido\n" -#: src/reader.c:51 +#: src/reader.c:53 #, c-format msgid "multiple %s declarations" msgstr "múltiples declaraciones de %s" -#: src/reader.c:137 +#: src/reader.c:138 #, c-format msgid "result type clash on merge function %s: <%s> != <%s>" msgstr "" -#: src/reader.c:235 +#: src/reader.c:236 #, 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:264 +#: src/reader.c:265 #, fuzzy, c-format msgid "type clash on default action: <%s> != <%s>" msgstr "los tipos (`%s' `%s') no concuerdan en la acción por defecto" -#: src/reader.c:270 +#: src/reader.c:271 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:340 src/reader.c:355 src/reader.c:368 +#: src/reader.c:341 src/reader.c:355 src/reader.c:368 #, c-format msgid "only one %s allowed per rule" msgstr "" -#: src/reader.c:350 src/reader.c:366 +#: src/reader.c:351 src/reader.c:366 #, c-format msgid "%s affects only GLR parsers" msgstr "" @@ -405,135 +409,139 @@ msgstr "" msgid "%s must be followed by positive number" msgstr "" -#: src/reader.c:512 +#: src/reader.c:510 msgid "no rules in the input grammar" msgstr "no hay reglas en la gramática de entrada" -#: src/reduce.c:239 +#: src/reduce.c:241 #, fuzzy msgid "useless rule" msgstr "%d regla sin uso" #: src/reduce.c:302 -#, fuzzy -msgid "useless nonterminal" -msgstr "%d no terminal sin uso" +#, fuzzy, c-format +msgid "useless nonterminal: %s" +msgstr "No terminales sin uso:" -#: src/reduce.c:349 +#: src/reduce.c:350 #, fuzzy msgid "Useless nonterminals" msgstr "No terminales sin uso:" -#: src/reduce.c:362 +#: src/reduce.c:363 #, fuzzy msgid "Terminals which are not used" msgstr "Terminales que no se usan:" -#: src/reduce.c:371 +#: src/reduce.c:372 #, fuzzy msgid "Useless rules" msgstr "Reglas sin uso:" -#: src/reduce.c:387 +#: src/reduce.c:388 #, c-format msgid "%d rule never reduced\n" msgid_plural "%d rules never reduced\n" msgstr[0] "%d regla que nunca se ha reducido\n" msgstr[1] "%d reglas que nunca se han reducido\n" -#: src/reduce.c:395 +#: src/reduce.c:396 #, c-format msgid "%d useless nonterminal" msgid_plural "%d useless nonterminals" msgstr[0] "%d no terminal sin uso" msgstr[1] "%d no terminales sin uso" -#: src/reduce.c:401 +#: src/reduce.c:402 msgid " and " msgstr " y " -#: src/reduce.c:404 +#: src/reduce.c:405 #, c-format msgid "%d useless rule" msgid_plural "%d useless rules" msgstr[0] "%d regla sin uso" msgstr[1] "%d reglas sin uso" -#: src/reduce.c:435 +#: src/reduce.c:436 #, fuzzy, c-format msgid "start symbol %s does not derive any sentence" msgstr "El símbolo de inicio (axioma) %s no deriva ninguna sentencia" -#: src/scan-gram.l:258 +#: src/scan-gram.l:208 #, fuzzy, c-format msgid "invalid directive: %s" msgstr "entrada no válida: %s" -#: src/scan-gram.l:287 src/scan-gram.l:661 src/scan-gram.l:733 +#: src/scan-gram.l:216 +msgid "stray `,' treated as white space" +msgstr "" + +#: src/scan-gram.l:232 src/scan-gram.l:727 src/scan-gram.l:798 #, c-format msgid "integer out of range: %s" msgstr "" -#: src/scan-gram.l:327 +#: src/scan-gram.l:276 #, fuzzy, c-format msgid "invalid character: %s" msgstr "carácter desconocido: %s" -#: src/scan-gram.l:427 src/scan-gram.l:441 src/scan-gram.l:464 +#: src/scan-gram.l:400 src/scan-gram.l:410 src/scan-gram.l:429 #, fuzzy, c-format msgid "invalid escape sequence: %s" msgstr "valor no válido: %s%d" -#: src/scan-gram.l:472 +#: src/scan-gram.l:434 #, fuzzy, c-format msgid "unrecognized escape sequence: %s" msgstr "no reconocido: %s" -#: src/scan-gram.l:632 +#: src/scan-gram.l:699 #, c-format msgid "$$ of `%s' has no declared type" msgstr "$$ de `%s' no tiene tipo declarado" -#: src/scan-gram.l:652 +#: src/scan-gram.l:718 #, c-format msgid "$%d of `%s' has no declared type" msgstr "$%d de `%s' no tiene tipo declarado" -#: src/scan-gram.l:678 src/scan-gram.l:750 +#: src/scan-gram.l:744 src/scan-gram.l:815 #, fuzzy, c-format msgid "invalid value: %s" msgstr "valor no válido: %s%d" -#: src/scan-gram.l:861 +#: src/scan-gram.l:928 #, fuzzy, c-format msgid "missing `%s' at end of file" msgstr "cadena sin terminar al final del fichero" -#: src/symlist.c:97 src/symlist.c:109 +#: src/symlist.c:97 src/symlist.c:108 msgid "invalid $ value" msgstr "valor $ no válido" -#: src/symtab.c:82 +#: src/symtab.c:84 #, c-format msgid "type redeclaration for %s" msgstr "redeclaración del tipo de %s" -#: src/symtab.c:100 src/symtab.c:119 +#: src/symtab.c:101 src/symtab.c:119 #, fuzzy, c-format msgid "%s redeclaration for %s" msgstr "redeclaración del tipo de %s" -#: src/symtab.c:140 +#: src/symtab.c:138 #, c-format msgid "redefining precedence of %s" msgstr "redefinición de la precedencia de %s" -#: src/symtab.c:159 +#: src/symtab.c:156 #, c-format msgid "symbol %s redefined" msgstr "redefinido el símbolo %s" -#: src/symtab.c:183 +#: src/symtab.c:179 #, fuzzy, c-format msgid "redefining user token number of %s" msgstr "redefinición de la precedencia de %s" @@ -541,43 +549,43 @@ msgstr "redefinici # `token' se debe traducir como `literal' - cll # en terminología de compiladores token es más un terminal - ngp # -#: src/symtab.c:222 +#: src/symtab.c:206 #, 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/symtab.c:241 +#: src/symtab.c:231 #, 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/symtab.c:244 +#: src/symtab.c:234 #, 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/symtab.c:279 +#: src/symtab.c:269 #, c-format msgid "conflicting precedences for %s and %s" msgstr "precedencias en conflicto entre %s y %s" -#: src/symtab.c:291 +#: src/symtab.c:281 #, fuzzy, c-format msgid "conflicting associativities for %s (%s) and %s (%s)" msgstr "conflicto de valores assoc para %s y %s" -#: src/symtab.c:363 +#: src/symtab.c:366 #, 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/symtab.c:570 +#: src/symtab.c:589 #, c-format msgid "the start symbol %s is undefined" msgstr "el símbolo de inicio (axioma) %s no está definido" -#: src/symtab.c:574 +#: src/symtab.c:593 #, c-format msgid "the start symbol %s is a token" msgstr "el símbolo de inicio (axioma) %s es un terminal" @@ -660,33 +668,33 @@ msgstr "" msgid "Could not open stats file for writing." msgstr "" -#: lib/getopt.c:662 +#: lib/getopt.c:688 lib/getopt.c:700 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: la opción `%s' es ambigua\n" # Pongo esto como en otros .po. sv -#: lib/getopt.c:687 +#: lib/getopt.c:733 lib/getopt.c:737 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: la opción `--%s' no admite ningún argumento\n" -#: lib/getopt.c:692 +#: lib/getopt.c:746 lib/getopt.c:751 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: la opción `%c%s' no admite ningún argumento\n" -#: lib/getopt.c:710 lib/getopt.c:883 +#: lib/getopt.c:787 lib/getopt.c:800 lib/getopt.c:1089 lib/getopt.c:1102 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: la opción `%s' requiere un argumento\n" -#: lib/getopt.c:739 +#: lib/getopt.c:838 lib/getopt.c:841 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: opción `--%s' no reconocida\n" -#: lib/getopt.c:743 +#: lib/getopt.c:849 lib/getopt.c:852 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: opción `%c%s' no reconocida\n" @@ -708,7 +716,7 @@ msgstr "%s: opci # haber opciones ilegales, digo yo, y no por eso las CPUs van # a la cárcel (como mucho se cuelgan, je, je, 0ff0 :-). sv # -#: lib/getopt.c:769 +#: lib/getopt.c:899 lib/getopt.c:902 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: opción -- %c ilegal\n" @@ -718,28 +726,28 @@ msgstr "%s: opci # Porque Enrique decía que le recordaba a disminuidos físicos. # Francamente, no creo que haya que andar con estas "fobias". # Pongo inválida. sv -#: lib/getopt.c:772 +#: lib/getopt.c:908 lib/getopt.c:911 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: opción -- %c no válida\n" -#: lib/getopt.c:802 lib/getopt.c:932 +#: lib/getopt.c:958 lib/getopt.c:969 lib/getopt.c:1155 lib/getopt.c:1168 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: la opción -- %c requiere un argumento\n" -#: lib/getopt.c:849 +#: lib/getopt.c:1021 lib/getopt.c:1032 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: la opción `-W %s' es ambigua\n" # Pongo esto como en otros .po. sv -#: lib/getopt.c:867 +#: lib/getopt.c:1056 lib/getopt.c:1068 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: la opción `-W %s' no admite ningún argumento\n" -#: lib/obstack.c:496 lib/obstack.c:499 lib/xmalloc.c:63 +#: lib/obstack.c:487 lib/obstack.c:490 lib/xmalloc.c:63 msgid "memory exhausted" msgstr "memoria agotada" diff --git a/po/et.po b/po/et.po index 51739177..11771bb8 100644 --- a/po/et.po +++ b/po/et.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: bison 1.75b\n" -"POT-Creation-Date: 2002-11-24 23:54-0800\n" +"POT-Creation-Date: 2002-12-13 03:47-0800\n" "PO-Revision-Date: 2002-11-13 23:33+0200\n" "Last-Translator: Toomas Soome \n" "Language-Team: Estonian \n" @@ -14,105 +14,105 @@ msgstr "" "Content-Transfer-Encoding: 8-bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: src/complain.c:78 lib/error.c:126 lib/error.c:154 +#: src/complain.c:56 lib/error.c:135 lib/error.c:163 msgid "Unknown system error" msgstr "Tundmatu süsteemi viga" -#: src/complain.c:103 src/complain.c:120 +#: src/complain.c:80 src/complain.c:97 msgid "warning: " msgstr "hoiatus: " -#: src/complain.c:182 src/complain.c:200 +#: src/complain.c:159 src/complain.c:177 msgid "fatal error: " msgstr "fataalne viga: " -#: src/conflicts.c:72 +#: src/conflicts.c:75 #, c-format msgid " Conflict between rule %d and token %s resolved as shift" msgstr " Konflikt reegli %d ja märgi %s vahel lahendatud nihkega" -#: src/conflicts.c:80 +#: src/conflicts.c:83 #, c-format msgid " Conflict between rule %d and token %s resolved as reduce" msgstr " Konflikt reegli %d ja märgi %s vahel lahendatud redutseerimisega" -#: src/conflicts.c:87 +#: src/conflicts.c:90 #, c-format msgid " Conflict between rule %d and token %s resolved as an error" msgstr " Konflikt reegli %d ja märgi %s vahel lahendatud veana" -#: src/conflicts.c:401 +#: src/conflicts.c:403 #, c-format msgid "%d shift/reduce conflict" msgid_plural "%d shift/reduce conflicts" msgstr[0] "%d nihutamine/redutseerimine konflikt" msgstr[1] "%d nihutamine/redutseerimine konflikti" -#: src/conflicts.c:408 +#: src/conflicts.c:410 msgid "and" msgstr "ja" -#: src/conflicts.c:414 +#: src/conflicts.c:416 #, c-format msgid "%d reduce/reduce conflict" msgid_plural "%d reduce/reduce conflicts" msgstr[0] "%d redutseerimine/redutseerimine konflikt" msgstr[1] "%d redutseerimine/redutseerimine konflikti" -#: src/conflicts.c:434 +#: src/conflicts.c:436 msgid "conflicts: " msgstr "konfliktid: " -#: src/conflicts.c:436 +#: src/conflicts.c:438 #, c-format msgid " %d shift/reduce" msgstr " %d nihutamine/redutseerimine" -#: src/conflicts.c:440 +#: src/conflicts.c:442 #, c-format msgid " %d reduce/reduce" msgstr " %d redutseerimine/redutseerimine" -#: src/conflicts.c:459 +#: src/conflicts.c:461 #, c-format msgid "State %d contains " msgstr "Olek %d sisaldab " -#: src/conflicts.c:536 +#: src/conflicts.c:538 #, c-format msgid "expected %d shift/reduce conflict" msgid_plural "expected %d shift/reduce conflicts" msgstr[0] "eeldasime %d nihutamine/redutseerimine konflikti" msgstr[1] "eeldasime %d nihutamine/redutseerimine konflikti" -#: src/files.c:111 +#: src/files.c:98 #, c-format msgid "cannot open file `%s'" msgstr "faili `%s' ei saa avada" -#: src/files.c:127 +#: src/files.c:114 msgid "I/O error" msgstr "S/V viga" -#: src/files.c:130 +#: src/files.c:117 msgid "cannot close file" msgstr "faili ei õnnestu sulgeda" -#: src/getargs.c:167 +#: src/getargs.c:182 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Lisainfo saamiseks proovige `%s --help'.\n" -#: src/getargs.c:173 +#: src/getargs.c:188 msgid "GNU bison generates parsers for LALR(1) grammars.\n" msgstr "GNU bison genereerib parsereid LALR(1) grammatikatele.\n" -#: src/getargs.c:177 +#: src/getargs.c:192 #, c-format msgid "Usage: %s [OPTION]... FILE\n" msgstr "Kasuta: %s [VÕTI]...FAIL\n" -#: src/getargs.c:181 +#: src/getargs.c:196 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" @@ -120,7 +120,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:187 +#: src/getargs.c:202 msgid "" "Operation modes:\n" " -h, --help display this help and exit\n" @@ -132,7 +132,7 @@ msgstr "" " -V, --version esita versiooniinfo ja lõpeta töö\n" " -y, --yacc emuleeri POSIX yacc\n" -#: src/getargs.c:194 +#: src/getargs.c:209 msgid "" "Parser:\n" " -S, --skeleton=FILE specify the skeleton to use\n" @@ -152,7 +152,7 @@ msgstr "" " -n, --no-parser genereeri ainult tabelid\n" " -k, --token-table lisa ka sümbolite nimede tabel\n" -#: src/getargs.c:206 +#: src/getargs.c:221 msgid "" "Output:\n" " -d, --defines also produce a header file\n" @@ -171,7 +171,7 @@ msgstr "" " -o, --output-file=FAIL jäta väljund FAILi\n" " -g, --graph loo automaadi kirjeldus VCG graafina\n" -#: src/getargs.c:217 +#: src/getargs.c:232 msgid "" "THINGS is a list of comma separated words that can include:\n" " `state' describe the states\n" @@ -189,25 +189,25 @@ msgstr "" " `all' kogu ülaltoodud info\n" " `none' blokeeri raport\n" -#: src/getargs.c:228 +#: src/getargs.c:243 msgid "Report bugs to .\n" msgstr "Teatage palun vigadest aadressil .\n" -#: src/getargs.c:245 +#: src/getargs.c:260 #, c-format msgid "bison (GNU Bison) %s" msgstr "bison (GNU Bison) %s" -#: src/getargs.c:247 +#: src/getargs.c:262 msgid "Written by Robert Corbett and Richard Stallman.\n" msgstr "Kirjutanud Robert Corbett ja Richard Stallman.\n" -#: src/getargs.c:251 +#: src/getargs.c:266 #, c-format msgid "Copyright (C) %d Free Software Foundation, Inc.\n" msgstr "Autoriõigus © %d Free Software Foundation, Inc.\n" -#: src/getargs.c:253 +#: src/getargs.c:268 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" @@ -215,56 +215,60 @@ msgstr "" "See on vaba tarkvara; kopeerimistingimused leiate lähtetekstidest. Garantii\n" "PUUDUB; ka müügiks või mingil eesmärgil kasutamiseks.\n" -#: src/getargs.c:407 +#: src/getargs.c:423 #, c-format msgid "missing operand after `%s'" msgstr "`%s' järel puudub operand" -#: src/getargs.c:409 +#: src/getargs.c:425 #, c-format msgid "extra operand `%s'" msgstr "Liigne operand `%s'" -#: src/gram.c:139 +#: src/gram.c:142 msgid "empty" msgstr "tühi" -#: src/gram.c:233 +#: src/gram.c:236 msgid "Grammar" msgstr "Grammatika" -#: src/gram.c:321 src/reduce.c:302 src/reduce.c:392 +#: src/gram.c:324 src/reduce.c:393 msgid "warning" msgstr "hoiatus" -#: src/main.c:120 +#: src/main.c:124 msgid "rule never reduced because of conflicts" msgstr "reeglit ei redutseerita konfliktide tõttu kunagi" -#: src/parse-gram.y:364 +#: src/parse-gram.y:336 msgid "POSIX forbids declarations in the grammar" msgstr "POSIX keelab deklareerimised grammatikas" -#: src/print.c:46 +#: src/parse-gram.y:468 +msgid "missing identifier in parameter declaration" +msgstr "" + +#: src/print.c:48 #, c-format msgid " type %d is %s\n" msgstr " tüüp %d on %s\n" -#: src/print.c:162 +#: src/print.c:164 #, c-format msgid "shift, and go to state %d\n" msgstr "nihuta ja liigu olekule %d\n" -#: src/print.c:164 +#: src/print.c:166 #, c-format msgid "go to state %d\n" msgstr "liigu olekule %d\n" -#: src/print.c:201 +#: src/print.c:203 msgid "error (nonassociative)\n" msgstr "viga (mitteassotsiatiivne)\n" -#: src/print.c:290 +#: src/print.c:291 #, c-format msgid "reduce using rule %d (%s)" msgstr "redutseerin kasutades reeglit %d (%s)" @@ -282,56 +286,56 @@ msgstr "$default" msgid "state %d" msgstr "olek %d" -#: src/print.c:456 +#: src/print.c:455 msgid "Terminals, with rules where they appear" msgstr "Terminalid, koos reeglitega kus nad ilmuvad" -#: src/print.c:483 +#: src/print.c:482 msgid "Nonterminals, with rules where they appear" msgstr "Mitteterminalid, koos reeglitega kus nad ilmuvad" -#: src/print.c:512 +#: src/print.c:511 msgid " on left:" msgstr " vasakul:" -#: src/print.c:527 +#: src/print.c:526 msgid " on right:" msgstr " paremal:" -#: src/print.c:555 +#: src/print.c:554 msgid "Rules never reduced" msgstr "Mitteredutseeruvad reeglid" -#: src/reader.c:51 +#: src/reader.c:53 #, c-format msgid "multiple %s declarations" msgstr "korduvad %s deklaratsioonid" -#: src/reader.c:137 +#: src/reader.c:138 #, c-format msgid "result type clash on merge function %s: <%s> != <%s>" msgstr "tulemuse tüübikonflikt mestimise funktsioonis %s: <%s> != <%s>" -#: src/reader.c:235 +#: src/reader.c:236 #, 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:264 +#: src/reader.c:265 #, c-format msgid "type clash on default action: <%s> != <%s>" msgstr "vaikimisi tegevuse tüübikonflikt: <%s> != <%s>" -#: src/reader.c:270 +#: src/reader.c:271 msgid "empty rule for typed nonterminal, and no action" msgstr "tüübiga mitteterminalil on tühi reegel ja puudub tegevus" -#: src/reader.c:340 src/reader.c:355 src/reader.c:368 +#: src/reader.c:341 src/reader.c:355 src/reader.c:368 #, c-format msgid "only one %s allowed per rule" msgstr "reeglis on lubatud ainult üks %s" -#: src/reader.c:350 src/reader.c:366 +#: src/reader.c:351 src/reader.c:366 #, c-format msgid "%s affects only GLR parsers" msgstr "%s puudutab ainult GLR parsereid" @@ -341,172 +345,177 @@ msgstr "%s puudutab ainult GLR parsereid" msgid "%s must be followed by positive number" msgstr "%s järel peab olema positiivne number" -#: src/reader.c:512 +#: src/reader.c:510 msgid "no rules in the input grammar" msgstr "sisendgrammatikas pole reegleid" -#: src/reduce.c:239 +#: src/reduce.c:241 msgid "useless rule" msgstr "kasutamata reegel" #: src/reduce.c:302 -msgid "useless nonterminal" +#, fuzzy, c-format +msgid "useless nonterminal: %s" msgstr "kasutamata mitteterminal" -#: src/reduce.c:349 +#: src/reduce.c:350 msgid "Useless nonterminals" msgstr "Kasutamata mitteterminalid" -#: src/reduce.c:362 +#: src/reduce.c:363 msgid "Terminals which are not used" msgstr "Terminalid, mida ei kasutatud" -#: src/reduce.c:371 +#: src/reduce.c:372 msgid "Useless rules" msgstr "Kasutamata reeglid" -#: src/reduce.c:387 +#: src/reduce.c:388 #, c-format msgid "%d rule never reduced\n" msgid_plural "%d rules never reduced\n" msgstr[0] "%d reegel ei redutseeru\n" msgstr[1] "%d reeglit ei redutseeru\n" -#: src/reduce.c:395 +#: src/reduce.c:396 #, c-format msgid "%d useless nonterminal" msgid_plural "%d useless nonterminals" msgstr[0] "%d kasutamata mitteterminal" msgstr[1] "%d kasutamata mitteterminali" -#: src/reduce.c:401 +#: src/reduce.c:402 msgid " and " msgstr " ja " -#: src/reduce.c:404 +#: src/reduce.c:405 #, c-format msgid "%d useless rule" msgid_plural "%d useless rules" msgstr[0] "%d kasutamata reegel" msgstr[1] "%d kasutamata reeglit" -#: src/reduce.c:435 +#: src/reduce.c:436 #, c-format msgid "start symbol %s does not derive any sentence" msgstr "stardisümbolist %s ei tuletata ühtegi lauset" -#: src/scan-gram.l:258 +#: src/scan-gram.l:208 #, c-format msgid "invalid directive: %s" msgstr "vigane juhus: %s" -#: src/scan-gram.l:287 src/scan-gram.l:661 src/scan-gram.l:733 +#: src/scan-gram.l:216 +msgid "stray `,' treated as white space" +msgstr "" + +#: src/scan-gram.l:232 src/scan-gram.l:727 src/scan-gram.l:798 #, c-format msgid "integer out of range: %s" msgstr "number piiridest väljas: %s" -#: src/scan-gram.l:327 +#: src/scan-gram.l:276 #, c-format msgid "invalid character: %s" msgstr "vigased sümbolid: %s" -#: src/scan-gram.l:427 src/scan-gram.l:441 src/scan-gram.l:464 +#: src/scan-gram.l:400 src/scan-gram.l:410 src/scan-gram.l:429 #, c-format msgid "invalid escape sequence: %s" msgstr "vigane paojada: %s" -#: src/scan-gram.l:472 +#: src/scan-gram.l:434 #, c-format msgid "unrecognized escape sequence: %s" msgstr "tundmatu paojada: %s" -#: src/scan-gram.l:632 +#: src/scan-gram.l:699 #, c-format msgid "$$ of `%s' has no declared type" msgstr "`%s' $$ ei oma deklareeritud tüüpi" -#: src/scan-gram.l:652 +#: src/scan-gram.l:718 #, c-format msgid "$%d of `%s' has no declared type" msgstr "$%d `%s' ei oma deklareeritud tüüpi" -#: src/scan-gram.l:678 src/scan-gram.l:750 +#: src/scan-gram.l:744 src/scan-gram.l:815 #, c-format msgid "invalid value: %s" msgstr "vigane väärtus: %s" -#: src/scan-gram.l:861 +#: src/scan-gram.l:928 #, c-format msgid "missing `%s' at end of file" msgstr "faili lõpus puudub `%s'" -#: src/symlist.c:97 src/symlist.c:109 +#: src/symlist.c:97 src/symlist.c:108 msgid "invalid $ value" msgstr "vigane $ väärtus" -#: src/symtab.c:82 +#: src/symtab.c:84 #, c-format msgid "type redeclaration for %s" msgstr "%s tüübi uuesti deklareerimine" -#: src/symtab.c:100 src/symtab.c:119 +#: src/symtab.c:101 src/symtab.c:119 #, c-format msgid "%s redeclaration for %s" msgstr "%s uuesti deklareerimine %s jaoks" -#: src/symtab.c:140 +#: src/symtab.c:138 #, c-format msgid "redefining precedence of %s" msgstr "%s prioriteedi uus definitsioon" -#: src/symtab.c:159 +#: src/symtab.c:156 #, c-format msgid "symbol %s redefined" msgstr "sümbol %s on uuesti defineeritud" -#: src/symtab.c:183 +#: src/symtab.c:179 #, c-format msgid "redefining user token number of %s" msgstr "%s kasutaja märgi numbri uuesti defineerimine" -#: src/symtab.c:222 +#: src/symtab.c:206 #, 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/symtab.c:241 +#: src/symtab.c:231 #, 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/symtab.c:244 +#: src/symtab.c:234 #, c-format msgid "symbol `%s' given more than one literal string" msgstr "sümbolile `%s' on antud enam kui üks literaal sõne" -#: src/symtab.c:279 +#: src/symtab.c:269 #, c-format msgid "conflicting precedences for %s and %s" msgstr "%s ja %s omavad konfliktseid prioriteete" -#: src/symtab.c:291 +#: src/symtab.c:281 #, c-format msgid "conflicting associativities for %s (%s) and %s (%s)" msgstr "%s (%s) ja %s (%s) omavad konfliktseid assotsiatiivseid väärtuseid" -#: src/symtab.c:363 +#: src/symtab.c:366 #, c-format msgid "tokens %s and %s both assigned number %d" msgstr "märkidele %s ja %s on mõlemale omistatud number %d" -#: src/symtab.c:570 +#: src/symtab.c:589 #, c-format msgid "the start symbol %s is undefined" msgstr "stardisümbol %s ei ole defineeritud" -#: src/symtab.c:574 +#: src/symtab.c:593 #, c-format msgid "the start symbol %s is a token" msgstr "stardisümbol %s on märk" @@ -591,62 +600,62 @@ msgstr "Statistika faili ei saa kirjutada." msgid "Could not open stats file for writing." msgstr "Statistika faili ei saa kirjutamiseks avada." -#: lib/getopt.c:662 +#: lib/getopt.c:688 lib/getopt.c:700 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: võti `%s' on segane\n" -#: lib/getopt.c:687 +#: lib/getopt.c:733 lib/getopt.c:737 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: võti `--%s' ei luba argumenti\n" -#: lib/getopt.c:692 +#: lib/getopt.c:746 lib/getopt.c:751 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: võti `%c%s' ei luba argumenti\n" -#: lib/getopt.c:710 lib/getopt.c:883 +#: lib/getopt.c:787 lib/getopt.c:800 lib/getopt.c:1089 lib/getopt.c:1102 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: võti `%s' nõuab argumenti\n" -#: lib/getopt.c:739 +#: lib/getopt.c:838 lib/getopt.c:841 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: tundmatu võti `--%s'\n" -#: lib/getopt.c:743 +#: lib/getopt.c:849 lib/getopt.c:852 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: tundmatu võti `%c%s'\n" -#: lib/getopt.c:769 +#: lib/getopt.c:899 lib/getopt.c:902 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: lubamatu võti -- %c\n" -#: lib/getopt.c:772 +#: lib/getopt.c:908 lib/getopt.c:911 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: vigane võti -- %c\n" -#: lib/getopt.c:802 lib/getopt.c:932 +#: lib/getopt.c:958 lib/getopt.c:969 lib/getopt.c:1155 lib/getopt.c:1168 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: võti nõuab argumenti -- %c\n" -#: lib/getopt.c:849 +#: lib/getopt.c:1021 lib/getopt.c:1032 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: võti `-W %s' on segane\n" -#: lib/getopt.c:867 +#: lib/getopt.c:1056 lib/getopt.c:1068 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: võti `-W %s' ei luba argumenti\n" -#: lib/obstack.c:496 lib/obstack.c:499 lib/xmalloc.c:63 +#: lib/obstack.c:487 lib/obstack.c:490 lib/xmalloc.c:63 msgid "memory exhausted" msgstr "mälu on otsas" diff --git a/po/fr.po b/po/fr.po index 8cd8a1ca..d737eed6 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU bison 1.75b\n" -"POT-Creation-Date: 2002-11-24 23:54-0800\n" +"POT-Creation-Date: 2002-12-13 03:47-0800\n" "PO-Revision-Date: 2002-11-13 08:00-0500\n" "Last-Translator: Michel Robitaille \n" "Language-Team: French \n" @@ -15,105 +15,105 @@ msgstr "" "Content-Transfer-Encoding: 8-bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: src/complain.c:78 lib/error.c:126 lib/error.c:154 +#: src/complain.c:56 lib/error.c:135 lib/error.c:163 msgid "Unknown system error" msgstr "Erreur système inconnue" -#: src/complain.c:103 src/complain.c:120 +#: src/complain.c:80 src/complain.c:97 msgid "warning: " msgstr "AVERTISSEMENT: " -#: src/complain.c:182 src/complain.c:200 +#: src/complain.c:159 src/complain.c:177 msgid "fatal error: " msgstr "erreur fatale: " -#: src/conflicts.c:72 +#: src/conflicts.c:75 #, c-format msgid " Conflict between rule %d and token %s resolved as shift" msgstr "Conflit entre la règle %d et le jeton %s résolu par décalage" -#: src/conflicts.c:80 +#: src/conflicts.c:83 #, c-format msgid " Conflict between rule %d and token %s resolved as reduce" msgstr "Conflit entre la règle %d et le jeton %s résolu par réduction" -#: src/conflicts.c:87 +#: src/conflicts.c:90 #, c-format msgid " Conflict between rule %d and token %s resolved as an error" msgstr "Conflit entre la règle %d et le jeton %s résolu comme étant une erreur" -#: src/conflicts.c:401 +#: src/conflicts.c:403 #, c-format msgid "%d shift/reduce conflict" msgid_plural "%d shift/reduce conflicts" msgstr[0] "%d conflit par décalage/réduction" msgstr[1] "%d conflits par décalage/réduction" -#: src/conflicts.c:408 +#: src/conflicts.c:410 msgid "and" msgstr "et" -#: src/conflicts.c:414 +#: src/conflicts.c:416 #, c-format msgid "%d reduce/reduce conflict" msgid_plural "%d reduce/reduce conflicts" msgstr[0] "%d conflit par réduction/réduction" msgstr[1] "%d conflits par réduction/réduction" -#: src/conflicts.c:434 +#: src/conflicts.c:436 msgid "conflicts: " msgstr "conflits: " -#: src/conflicts.c:436 +#: src/conflicts.c:438 #, c-format msgid " %d shift/reduce" msgstr " %d décalage/réduction" -#: src/conflicts.c:440 +#: src/conflicts.c:442 #, c-format msgid " %d reduce/reduce" msgstr " %d réduction/réduction" -#: src/conflicts.c:459 +#: src/conflicts.c:461 #, c-format msgid "State %d contains " msgstr "L'état %d contient " -#: src/conflicts.c:536 +#: src/conflicts.c:538 #, c-format msgid "expected %d shift/reduce conflict" msgid_plural "expected %d shift/reduce conflicts" msgstr[0] "attendait %d conflit par décalage/réduction" msgstr[1] "attendait %d conflits par décalage/réduction" -#: src/files.c:111 +#: src/files.c:98 #, c-format msgid "cannot open file `%s'" msgstr "ne peut ouvrir le fichier « %s »" -#: src/files.c:127 +#: src/files.c:114 msgid "I/O error" msgstr "une erreur d'E/S" -#: src/files.c:130 +#: src/files.c:117 msgid "cannot close file" msgstr "ne peut fermer le fichier" -#: src/getargs.c:167 +#: src/getargs.c:182 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Pour en savoir davantage, faites: « %s --help ».\n" -#: src/getargs.c:173 +#: src/getargs.c:188 msgid "GNU bison generates parsers for LALR(1) grammars.\n" msgstr "GNU bison génère des analyseurs pour les grammaires de type LALR(1).\n" -#: src/getargs.c:177 +#: src/getargs.c:192 #, c-format msgid "Usage: %s [OPTION]... FILE\n" msgstr "Usage: %s [OPTION]... FICHIER\n" -#: src/getargs.c:181 +#: src/getargs.c:196 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" @@ -122,7 +122,7 @@ msgstr "" "il est alors obligatoire également pour une option de forme courte.\n" "Il en est de même pour les arguments optionnels.\n" -#: src/getargs.c:187 +#: src/getargs.c:202 msgid "" "Operation modes:\n" " -h, --help display this help and exit\n" @@ -134,7 +134,7 @@ msgstr "" " -V, --version afficher le nom et la version du logiciel\n" " -y, --yacc émuler yacc en mode POSIX\n" -#: src/getargs.c:194 +#: src/getargs.c:209 msgid "" "Parser:\n" " -S, --skeleton=FILE specify the skeleton to use\n" @@ -156,7 +156,7 @@ msgstr "" " -r, --raw compter les jetons à partir de 3\n" " -k, --token-table inclure la table des noms de jetons\n" -#: src/getargs.c:206 +#: src/getargs.c:221 msgid "" "Output:\n" " -d, --defines also produce a header file\n" @@ -176,7 +176,7 @@ msgstr "" " -g, --graph produire aussi la description du graphe VCG de " "l'automate\n" -#: src/getargs.c:217 +#: src/getargs.c:232 msgid "" "THINGS is a list of comma separated words that can include:\n" " `state' describe the states\n" @@ -194,25 +194,25 @@ msgstr "" " `all' inclure toutes les informations ci-haut\n" " `none' désactiver la génération de rapport\n" -#: src/getargs.c:228 +#: src/getargs.c:243 msgid "Report bugs to .\n" msgstr "Rapporter toutes anomalies à .\n" -#: src/getargs.c:245 +#: src/getargs.c:260 #, c-format msgid "bison (GNU Bison) %s" msgstr "bison (GNU Bison) %s" -#: src/getargs.c:247 +#: src/getargs.c:262 msgid "Written by Robert Corbett and Richard Stallman.\n" msgstr "Écrit par Robert Corbett et Richard Stallman.\n" -#: src/getargs.c:251 +#: src/getargs.c:266 #, c-format msgid "Copyright (C) %d Free Software Foundation, Inc.\n" msgstr "Copyright © %d Free Software Foundation, Inc.\n" -#: src/getargs.c:253 +#: src/getargs.c:268 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" @@ -221,56 +221,60 @@ msgstr "" "reproduction. AUCUNE garantie n'est donnée; tant pour des raisons\n" "COMMERCIALES que pour RÉPONDRE À UN BESOIN PARTICULIER.\n" -#: src/getargs.c:407 +#: src/getargs.c:423 #, c-format msgid "missing operand after `%s'" msgstr "opérande manquante après « %s »" -#: src/getargs.c:409 +#: src/getargs.c:425 #, c-format msgid "extra operand `%s'" msgstr "opérande superflue « %s »" -#: src/gram.c:139 +#: src/gram.c:142 msgid "empty" msgstr "vide" -#: src/gram.c:233 +#: src/gram.c:236 msgid "Grammar" msgstr "Grammaire" -#: src/gram.c:321 src/reduce.c:302 src/reduce.c:392 +#: src/gram.c:324 src/reduce.c:393 msgid "warning" msgstr "AVERTISSEMENT" -#: src/main.c:120 +#: src/main.c:124 msgid "rule never reduced because of conflicts" msgstr "la règle n'a jamais fait de réduction en raison des conflits" -#: src/parse-gram.y:364 +#: src/parse-gram.y:336 msgid "POSIX forbids declarations in the grammar" msgstr "POSIX interdit les déclaration dans la grammaire" -#: src/print.c:46 +#: src/parse-gram.y:468 +msgid "missing identifier in parameter declaration" +msgstr "" + +#: src/print.c:48 #, c-format msgid " type %d is %s\n" msgstr " le type %d est %s\n" -#: src/print.c:162 +#: src/print.c:164 #, c-format msgid "shift, and go to state %d\n" msgstr "décalage et aller à l'état %d\n" -#: src/print.c:164 +#: src/print.c:166 #, c-format msgid "go to state %d\n" msgstr "aller à l'état %d\n" -#: src/print.c:201 +#: src/print.c:203 msgid "error (nonassociative)\n" msgstr "erreur (non-associative)\n" -#: src/print.c:290 +#: src/print.c:291 #, c-format msgid "reduce using rule %d (%s)" msgstr "réduction par utilisation de la règle %d (%s)" @@ -288,57 +292,57 @@ msgstr "$d msgid "state %d" msgstr "état %d" -#: src/print.c:456 +#: src/print.c:455 msgid "Terminals, with rules where they appear" msgstr "Terminaux, suivis des règles où ils apparaissent" -#: src/print.c:483 +#: src/print.c:482 msgid "Nonterminals, with rules where they appear" msgstr "Non-terminaux, suivis des règles où ils apparaissent" -#: src/print.c:512 +#: src/print.c:511 msgid " on left:" msgstr " à gauche:" -#: src/print.c:527 +#: src/print.c:526 msgid " on right:" msgstr " à droite:" -#: src/print.c:555 +#: src/print.c:554 msgid "Rules never reduced" msgstr "Règles jamais réduites" -#: src/reader.c:51 +#: src/reader.c:53 #, c-format msgid "multiple %s declarations" msgstr "déclarations multiples de %s" -#: src/reader.c:137 +#: src/reader.c:138 #, c-format msgid "result type clash on merge function %s: <%s> != <%s>" msgstr "" "conflit dans le type résultant de la fonction de fusion %s: <%s> != <%s>" -#: src/reader.c:235 +#: src/reader.c:236 #, c-format msgid "rule given for %s, which is a token" msgstr "la règle pour %s, qui est un terminal" -#: src/reader.c:264 +#: src/reader.c:265 #, c-format msgid "type clash on default action: <%s> != <%s>" msgstr "conflit de type pour l'action par défaut: <%s> != <%s>" -#: src/reader.c:270 +#: src/reader.c:271 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:340 src/reader.c:355 src/reader.c:368 +#: src/reader.c:341 src/reader.c:355 src/reader.c:368 #, c-format msgid "only one %s allowed per rule" msgstr "seul un %s est permis par règle" -#: src/reader.c:350 src/reader.c:366 +#: src/reader.c:351 src/reader.c:366 #, c-format msgid "%s affects only GLR parsers" msgstr "%s affecte seulement les analyseurs GLR" @@ -348,173 +352,178 @@ msgstr "%s affecte seulement les analyseurs GLR" msgid "%s must be followed by positive number" msgstr "%s doit être suivi d'un nombre positif" -#: src/reader.c:512 +#: src/reader.c:510 msgid "no rules in the input grammar" msgstr "la grammaire n'a pas de règles" -#: src/reduce.c:239 +#: src/reduce.c:241 msgid "useless rule" msgstr "règle inutilisable" #: src/reduce.c:302 -msgid "useless nonterminal" +#, fuzzy, c-format +msgid "useless nonterminal: %s" msgstr "non-terminal inutilisable" -#: src/reduce.c:349 +#: src/reduce.c:350 msgid "Useless nonterminals" msgstr "Non-terminaux inutiles" -#: src/reduce.c:362 +#: src/reduce.c:363 msgid "Terminals which are not used" msgstr "Terminaux qui ne sont utilisés" -#: src/reduce.c:371 +#: src/reduce.c:372 msgid "Useless rules" msgstr "Règles inutiles" -#: src/reduce.c:387 +#: src/reduce.c:388 #, c-format msgid "%d rule never reduced\n" msgid_plural "%d rules never reduced\n" msgstr[0] "%d règle n'a jamais été réduite\n" msgstr[1] "%d règles n'ont jamais été réduites\n" -#: src/reduce.c:395 +#: src/reduce.c:396 #, c-format msgid "%d useless nonterminal" msgid_plural "%d useless nonterminals" msgstr[0] "%d nonterminal inutilisable" msgstr[1] "%d nonterminals inutilisables" -#: src/reduce.c:401 +#: src/reduce.c:402 msgid " and " msgstr " et " -#: src/reduce.c:404 +#: src/reduce.c:405 #, c-format msgid "%d useless rule" msgid_plural "%d useless rules" msgstr[0] "%d règle inutilisable" msgstr[1] "%d règles inutilisables" -#: src/reduce.c:435 +#: src/reduce.c:436 #, c-format msgid "start symbol %s does not derive any sentence" msgstr "" "symbole de départ %s peut permettre la dérivation de n'importe quelle phrase" -#: src/scan-gram.l:258 +#: src/scan-gram.l:208 #, c-format msgid "invalid directive: %s" msgstr "directive invalide: %s" -#: src/scan-gram.l:287 src/scan-gram.l:661 src/scan-gram.l:733 +#: src/scan-gram.l:216 +msgid "stray `,' treated as white space" +msgstr "" + +#: src/scan-gram.l:232 src/scan-gram.l:727 src/scan-gram.l:798 #, c-format msgid "integer out of range: %s" msgstr "entier hors gamme: %s" -#: src/scan-gram.l:327 +#: src/scan-gram.l:276 #, c-format msgid "invalid character: %s" msgstr "caractère invalide: %s" -#: src/scan-gram.l:427 src/scan-gram.l:441 src/scan-gram.l:464 +#: src/scan-gram.l:400 src/scan-gram.l:410 src/scan-gram.l:429 #, c-format msgid "invalid escape sequence: %s" msgstr "séquence d'échappement invalide: %s" -#: src/scan-gram.l:472 +#: src/scan-gram.l:434 #, c-format msgid "unrecognized escape sequence: %s" msgstr "séquence d'échappement non reconnue: %s" -#: src/scan-gram.l:632 +#: src/scan-gram.l:699 #, c-format msgid "$$ of `%s' has no declared type" msgstr "$$ de « %s » n'a pas son type déclaré" -#: src/scan-gram.l:652 +#: src/scan-gram.l:718 #, c-format msgid "$%d of `%s' has no declared type" msgstr "$%d de « %s » n'a pas de type déclaré" -#: src/scan-gram.l:678 src/scan-gram.l:750 +#: src/scan-gram.l:744 src/scan-gram.l:815 #, c-format msgid "invalid value: %s" msgstr "valeur invalide: %s" -#: src/scan-gram.l:861 +#: src/scan-gram.l:928 #, c-format msgid "missing `%s' at end of file" msgstr "chaîne de caractères « %s » manquante en fin de fichier" -#: src/symlist.c:97 src/symlist.c:109 +#: src/symlist.c:97 src/symlist.c:108 msgid "invalid $ value" msgstr "la valeur de symbole $ n'est pas valide" -#: src/symtab.c:82 +#: src/symtab.c:84 #, c-format msgid "type redeclaration for %s" msgstr "redéclaration du type de %s" -#: src/symtab.c:100 src/symtab.c:119 +#: src/symtab.c:101 src/symtab.c:119 #, c-format msgid "%s redeclaration for %s" msgstr "redéclaration de %s pour %s" -#: src/symtab.c:140 +#: src/symtab.c:138 #, c-format msgid "redefining precedence of %s" msgstr "redéfinition du niveau de priorité de %s" -#: src/symtab.c:159 +#: src/symtab.c:156 #, c-format msgid "symbol %s redefined" msgstr "symbole %s redéfini" -#: src/symtab.c:183 +#: src/symtab.c:179 #, c-format msgid "redefining user token number of %s" msgstr "redéfinition du jeton usager numéro de %s" -#: src/symtab.c:222 +#: src/symtab.c:206 #, 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/symtab.c:241 +#: src/symtab.c:231 #, 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/symtab.c:244 +#: src/symtab.c:234 #, 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/symtab.c:279 +#: src/symtab.c:269 #, c-format msgid "conflicting precedences for %s and %s" msgstr "les priorités pour %s et %s entrent en conflit" -#: src/symtab.c:291 +#: src/symtab.c:281 #, c-format msgid "conflicting associativities for %s (%s) and %s (%s)" msgstr "conflits d'associativités pour %s (%s) et %s (%s)" -#: src/symtab.c:363 +#: src/symtab.c:366 #, 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/symtab.c:570 +#: src/symtab.c:589 #, c-format msgid "the start symbol %s is undefined" msgstr "le symbole de départ %s n'est pas défini" -#: src/symtab.c:574 +#: src/symtab.c:593 #, c-format msgid "the start symbol %s is a token" msgstr "le symbole de départ %s est un terminal" @@ -599,62 +608,62 @@ msgstr "Ne peut msgid "Could not open stats file for writing." msgstr "Ne ouvrir en écriture le fichier de stats." -#: lib/getopt.c:662 +#: lib/getopt.c:688 lib/getopt.c:700 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: l'option %s est ambigüe\n" -#: lib/getopt.c:687 +#: lib/getopt.c:733 lib/getopt.c:737 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: l'option « --%s » n'admet pas d'argument\n" -#: lib/getopt.c:692 +#: lib/getopt.c:746 lib/getopt.c:751 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: l'option « %c%s » n'admet pas d'argument\n" -#: lib/getopt.c:710 lib/getopt.c:883 +#: lib/getopt.c:787 lib/getopt.c:800 lib/getopt.c:1089 lib/getopt.c:1102 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: l'option « %s » requiert un argument\n" -#: lib/getopt.c:739 +#: lib/getopt.c:838 lib/getopt.c:841 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: l'option « --%s » est inconnue\n" -#: lib/getopt.c:743 +#: lib/getopt.c:849 lib/getopt.c:852 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: l'option « %c%s » est inconnue\n" -#: lib/getopt.c:769 +#: lib/getopt.c:899 lib/getopt.c:902 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: option illégale -- %c\n" -#: lib/getopt.c:772 +#: lib/getopt.c:908 lib/getopt.c:911 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: option non valide -- %c\n" -#: lib/getopt.c:802 lib/getopt.c:932 +#: lib/getopt.c:958 lib/getopt.c:969 lib/getopt.c:1155 lib/getopt.c:1168 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: l'option requiert un argument -- %c\n" -#: lib/getopt.c:849 +#: lib/getopt.c:1021 lib/getopt.c:1032 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: l'option « -W %s » est ambiguë\n" -#: lib/getopt.c:867 +#: lib/getopt.c:1056 lib/getopt.c:1068 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: l'option « -W %s » n'admet pas d'argument\n" -#: lib/obstack.c:496 lib/obstack.c:499 lib/xmalloc.c:63 +#: lib/obstack.c:487 lib/obstack.c:490 lib/xmalloc.c:63 msgid "memory exhausted" msgstr "mémoire épuisée" diff --git a/po/hr.po b/po/hr.po index df12354e..6cb5dbb3 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-11-24 23:54-0800\n" +"POT-Creation-Date: 2002-12-13 03:47-0800\n" "PO-Revision-Date: 2002-04-10 22:20+01\n" "Last-Translator: Denis Lackovic \n" "Language-Team: Croatian \n" @@ -16,106 +16,106 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n==1 ? 0 : 1);\n" -#: src/complain.c:78 lib/error.c:126 lib/error.c:154 +#: src/complain.c:56 lib/error.c:135 lib/error.c:163 msgid "Unknown system error" msgstr "Nepoznata sistemska gre¹ka" -#: src/complain.c:103 src/complain.c:120 +#: src/complain.c:80 src/complain.c:97 msgid "warning: " msgstr "upozorenje:" -#: src/complain.c:182 src/complain.c:200 +#: src/complain.c:159 src/complain.c:177 msgid "fatal error: " msgstr "fatalna gre¹ka:" -#: src/conflicts.c:72 +#: src/conflicts.c:75 #, fuzzy, c-format msgid " Conflict between rule %d and token %s resolved as shift" msgstr "Konflikt u stanju %d izmeðu pravila %d i znaka %s razrije¹en kao %s.\n" -#: src/conflicts.c:80 +#: src/conflicts.c:83 #, fuzzy, c-format msgid " Conflict between rule %d and token %s resolved as reduce" msgstr "Konflikt u stanju %d izmeðu pravila %d i znaka %s razrije¹en kao %s.\n" -#: src/conflicts.c:87 +#: src/conflicts.c:90 #, fuzzy, c-format msgid " Conflict between rule %d and token %s resolved as an error" msgstr "Konflikt u stanju %d izmeðu pravila %d i znaka %s razrije¹en kao %s.\n" -#: src/conflicts.c:401 +#: src/conflicts.c:403 #, c-format msgid "%d shift/reduce conflict" msgid_plural "%d shift/reduce conflicts" msgstr[0] "%d pomakni/reduciraj konflikat" msgstr[1] "%d pomakni/reduciraj konflikata" -#: src/conflicts.c:408 +#: src/conflicts.c:410 msgid "and" msgstr "i" -#: src/conflicts.c:414 +#: src/conflicts.c:416 #, c-format msgid "%d reduce/reduce conflict" msgid_plural "%d reduce/reduce conflicts" msgstr[0] "%d reduciraj/reduciraj konflikt" msgstr[1] "%d reduciraj/reduciraj konflikata" -#: src/conflicts.c:434 +#: src/conflicts.c:436 msgid "conflicts: " msgstr "konflikt:" -#: src/conflicts.c:436 +#: src/conflicts.c:438 #, c-format msgid " %d shift/reduce" msgstr " %d pomakni/reduciraj" -#: src/conflicts.c:440 +#: src/conflicts.c:442 #, c-format msgid " %d reduce/reduce" msgstr " %d reduviraj/reduciraj" -#: src/conflicts.c:459 +#: src/conflicts.c:461 #, c-format msgid "State %d contains " msgstr "Stanje %d sadr¾i" -#: src/conflicts.c:536 +#: src/conflicts.c:538 #, fuzzy, c-format msgid "expected %d shift/reduce conflict" msgid_plural "expected %d shift/reduce conflicts" msgstr[0] "oèekujem %d pomakni/reduciraj konflikt\n" msgstr[1] "oèekujem %d pomakni/reduciraj konflikata\n" -#: src/files.c:111 +#: src/files.c:98 #, c-format msgid "cannot open file `%s'" msgstr "ne mogu otvoriti datoteku `%s'" -#: src/files.c:127 +#: src/files.c:114 #, fuzzy msgid "I/O error" msgstr "gre¹ka" -#: src/files.c:130 +#: src/files.c:117 msgid "cannot close file" msgstr "ne mogu zatvoriti datoteku" -#: src/getargs.c:167 +#: src/getargs.c:182 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Poku¹aj `%s --help' za vi¹e informacija.\n" -#: src/getargs.c:173 +#: src/getargs.c:188 msgid "GNU bison generates parsers for LALR(1) grammars.\n" msgstr "GNU bison generira parsere za LALR(1) gramatike.\n" -#: src/getargs.c:177 +#: src/getargs.c:192 #, c-format msgid "Usage: %s [OPTION]... FILE\n" msgstr "Kori¹tenje: %s [OPCIJA]... DATOTEKA\n" -#: src/getargs.c:181 +#: src/getargs.c:196 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" @@ -123,7 +123,7 @@ msgstr "" "Ako duga opcija ka¾e da je argument obavezan, tada je on obavezan\n" "i za ekvivalentnu kratku opciju. Slièno je i za opcionalne argumente.\n" -#: src/getargs.c:187 +#: src/getargs.c:202 msgid "" "Operation modes:\n" " -h, --help display this help and exit\n" @@ -135,7 +135,7 @@ msgstr "" " -V, --version prika¾i verziju i izaði\n" " -y, --yacc emuliraj POSIX yacc\n" -#: src/getargs.c:194 +#: src/getargs.c:209 msgid "" "Parser:\n" " -S, --skeleton=FILE specify the skeleton to use\n" @@ -155,7 +155,7 @@ msgstr "" " -n, --no-parser generiraj samo tablice\n" " -k, --token-table ukljuèi tablicu imena znakova\n" -#: src/getargs.c:206 +#: src/getargs.c:221 #, fuzzy msgid "" "Output:\n" @@ -174,7 +174,7 @@ msgstr "" " -o, --output=DATOTEKA ispi¹i izlaz u DATOTEKU\n" " -g, --graph takoðer proizvedi VCG opis automata\n" -#: src/getargs.c:217 +#: src/getargs.c:232 msgid "" "THINGS is a list of comma separated words that can include:\n" " `state' describe the states\n" @@ -185,27 +185,27 @@ msgid "" " `none' disable the report\n" msgstr "" -#: src/getargs.c:228 +#: src/getargs.c:243 msgid "Report bugs to .\n" msgstr "Izvjesti o bugovima na .\n" -#: src/getargs.c:245 +#: src/getargs.c:260 #, c-format msgid "bison (GNU Bison) %s" msgstr "bison (GNU Bison) %s" -#: src/getargs.c:247 +#: src/getargs.c:262 msgid "Written by Robert Corbett and Richard Stallman.\n" msgstr "" -#: src/getargs.c:251 +#: src/getargs.c:266 #, fuzzy, c-format msgid "Copyright (C) %d Free Software Foundation, Inc.\n" msgstr "" "Copyright 1984, 1986, 1989, 1992, 2000, 2001, 2002\n" "Free Software Foundation, Inc.\n" -#: src/getargs.c:253 +#: src/getargs.c:268 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" @@ -214,58 +214,62 @@ msgstr "" "kopiranja. NEMA\n" "garancije; èak ni tvrdnje o ISPLATIVOSTI ili POGODNOSTI ZA NEKU SVRHU.\n" -#: src/getargs.c:407 +#: src/getargs.c:423 #, c-format msgid "missing operand after `%s'" msgstr "" -#: src/getargs.c:409 +#: src/getargs.c:425 #, c-format msgid "extra operand `%s'" msgstr "" -#: src/gram.c:139 +#: src/gram.c:142 msgid "empty" msgstr "prazno" -#: src/gram.c:233 +#: src/gram.c:236 msgid "Grammar" msgstr "Gramatika" -#: src/gram.c:321 src/reduce.c:302 src/reduce.c:392 +#: src/gram.c:324 src/reduce.c:393 #, fuzzy msgid "warning" msgstr "upozorenje:" -#: src/main.c:120 +#: src/main.c:124 msgid "rule never reduced because of conflicts" msgstr "" -#: src/parse-gram.y:364 +#: src/parse-gram.y:336 msgid "POSIX forbids declarations in the grammar" msgstr "" -#: src/print.c:46 +#: src/parse-gram.y:468 +msgid "missing identifier in parameter declaration" +msgstr "" + +#: src/print.c:48 #, c-format msgid " type %d is %s\n" msgstr " tip %d je %s\n" -#: src/print.c:162 +#: src/print.c:164 #, fuzzy, c-format msgid "shift, and go to state %d\n" msgstr " %-4s\tpomakni i idi u stanje %d\n" -#: src/print.c:164 +#: src/print.c:166 #, fuzzy, c-format msgid "go to state %d\n" msgstr " $ \tidu u stanje %d\n" -#: src/print.c:201 +#: src/print.c:203 #, fuzzy msgid "error (nonassociative)\n" msgstr "%-4s\tgre¹ka (nonassociative)" -#: src/print.c:290 +#: src/print.c:291 #, fuzzy, c-format msgid "reduce using rule %d (%s)" msgstr "$default\treduciraj koristeæi pravilo %d (%s)" @@ -283,57 +287,57 @@ msgstr "" msgid "state %d" msgstr "stanje %d" -#: src/print.c:456 +#: src/print.c:455 msgid "Terminals, with rules where they appear" msgstr "Zavr¹ni znakovi, sa pravilima gdje se pojavljuju" -#: src/print.c:483 +#: src/print.c:482 msgid "Nonterminals, with rules where they appear" msgstr "Nezavr¹ni znakovi, sa pravilima gdje se pojavljuju" -#: src/print.c:512 +#: src/print.c:511 msgid " on left:" msgstr "s lijeva:" -#: src/print.c:527 +#: src/print.c:526 msgid " on right:" msgstr "s desna:" -#: src/print.c:555 +#: src/print.c:554 #, fuzzy msgid "Rules never reduced" msgstr "%d pravilo nije nikad reducirano\n" -#: src/reader.c:51 +#: src/reader.c:53 #, c-format msgid "multiple %s declarations" msgstr "vi¹estruke %s deklaracije" -#: src/reader.c:137 +#: src/reader.c:138 #, c-format msgid "result type clash on merge function %s: <%s> != <%s>" msgstr "" -#: src/reader.c:235 +#: src/reader.c:236 #, c-format msgid "rule given for %s, which is a token" msgstr "pravilo dato za %s, a to je znak" -#: src/reader.c:264 +#: src/reader.c:265 #, fuzzy, c-format msgid "type clash on default action: <%s> != <%s>" msgstr "sudar tipova (`%s' `%s') na deaultnoj akciji" -#: src/reader.c:270 +#: src/reader.c:271 msgid "empty rule for typed nonterminal, and no action" msgstr "prazno pravilo za nezavr¹ni znak, i nema akcije" -#: src/reader.c:340 src/reader.c:355 src/reader.c:368 +#: src/reader.c:341 src/reader.c:355 src/reader.c:368 #, c-format msgid "only one %s allowed per rule" msgstr "" -#: src/reader.c:350 src/reader.c:366 +#: src/reader.c:351 src/reader.c:366 #, c-format msgid "%s affects only GLR parsers" msgstr "" @@ -343,175 +347,179 @@ msgstr "" msgid "%s must be followed by positive number" msgstr "" -#: src/reader.c:512 +#: src/reader.c:510 msgid "no rules in the input grammar" msgstr "nema pravila u ulaznoj gramatici" -#: src/reduce.c:239 +#: src/reduce.c:241 #, fuzzy msgid "useless rule" msgstr "%d beskorisno pravilo" #: src/reduce.c:302 -#, fuzzy -msgid "useless nonterminal" -msgstr "%d beskorisan nezavr¹ni znak" +#, fuzzy, c-format +msgid "useless nonterminal: %s" +msgstr "Beskorisni nezavr¹ni znakovi:" -#: src/reduce.c:349 +#: src/reduce.c:350 #, fuzzy msgid "Useless nonterminals" msgstr "Beskorisni nezavr¹ni znakovi:" -#: src/reduce.c:362 +#: src/reduce.c:363 #, fuzzy msgid "Terminals which are not used" msgstr "Zavr¹ni znakovi koji nisu kori¹teni:" -#: src/reduce.c:371 +#: src/reduce.c:372 #, fuzzy msgid "Useless rules" msgstr "Beskorisna pravila:" -#: src/reduce.c:387 +#: src/reduce.c:388 #, c-format msgid "%d rule never reduced\n" msgid_plural "%d rules never reduced\n" msgstr[0] "%d pravilo nije nikad reducirano\n" msgstr[1] "%d pravila nisu nikad reducirana\n" -#: src/reduce.c:395 +#: src/reduce.c:396 #, c-format msgid "%d useless nonterminal" msgid_plural "%d useless nonterminals" msgstr[0] "%d beskorisan nezavr¹ni znak" msgstr[1] "%d beskorisnih nezavr¹nih znakova" -#: src/reduce.c:401 +#: src/reduce.c:402 msgid " and " msgstr " i" -#: src/reduce.c:404 +#: src/reduce.c:405 #, c-format msgid "%d useless rule" msgid_plural "%d useless rules" msgstr[0] "%d beskorisno pravilo" msgstr[1] "%d beskorisnih pravila" -#: src/reduce.c:435 +#: src/reduce.c:436 #, fuzzy, c-format msgid "start symbol %s does not derive any sentence" msgstr "Poèetni simbol %s ne daje niti jednu reèenicu" -#: src/scan-gram.l:258 +#: src/scan-gram.l:208 #, fuzzy, c-format msgid "invalid directive: %s" msgstr "nedozvoljeni ulaz: %s" -#: src/scan-gram.l:287 src/scan-gram.l:661 src/scan-gram.l:733 +#: src/scan-gram.l:216 +msgid "stray `,' treated as white space" +msgstr "" + +#: src/scan-gram.l:232 src/scan-gram.l:727 src/scan-gram.l:798 #, c-format msgid "integer out of range: %s" msgstr "" -#: src/scan-gram.l:327 +#: src/scan-gram.l:276 #, fuzzy, c-format msgid "invalid character: %s" msgstr "nepoznati znak: %s" -#: src/scan-gram.l:427 src/scan-gram.l:441 src/scan-gram.l:464 +#: src/scan-gram.l:400 src/scan-gram.l:410 src/scan-gram.l:429 #, fuzzy, c-format msgid "invalid escape sequence: %s" msgstr "nedozvoljeni ulaz: %s" -#: src/scan-gram.l:472 +#: src/scan-gram.l:434 #, fuzzy, c-format msgid "unrecognized escape sequence: %s" msgstr "neprepoznati: %s" -#: src/scan-gram.l:632 +#: src/scan-gram.l:699 #, c-format msgid "$$ of `%s' has no declared type" msgstr "$$ od `%s' nema deklarirani tip" -#: src/scan-gram.l:652 +#: src/scan-gram.l:718 #, c-format msgid "$%d of `%s' has no declared type" msgstr "$%d od `%s' nema deklarirani tip" -#: src/scan-gram.l:678 src/scan-gram.l:750 +#: src/scan-gram.l:744 src/scan-gram.l:815 #, fuzzy, c-format msgid "invalid value: %s" msgstr "nedozvoljena $ vrijednost" -#: src/scan-gram.l:861 +#: src/scan-gram.l:928 #, fuzzy, c-format msgid "missing `%s' at end of file" msgstr "nezavr¹eni znakovni niz na kraju datoteke" -#: src/symlist.c:97 src/symlist.c:109 +#: src/symlist.c:97 src/symlist.c:108 msgid "invalid $ value" msgstr "nedozvoljena $ vrijednost" -#: src/symtab.c:82 +#: src/symtab.c:84 #, c-format msgid "type redeclaration for %s" msgstr "ponovna deklaracija za %s" -#: src/symtab.c:100 src/symtab.c:119 +#: src/symtab.c:101 src/symtab.c:119 #, fuzzy, c-format msgid "%s redeclaration for %s" msgstr "ponovna deklaracija za %s" -#: src/symtab.c:140 +#: src/symtab.c:138 #, c-format msgid "redefining precedence of %s" msgstr "ponovno definiran prethodnik od %s" -#: src/symtab.c:159 +#: src/symtab.c:156 #, c-format msgid "symbol %s redefined" msgstr "simbol %s ponovo definiran" -#: src/symtab.c:183 +#: src/symtab.c:179 #, fuzzy, c-format msgid "redefining user token number of %s" msgstr "ponovno definiran prethodnik od %s" -#: src/symtab.c:222 +#: src/symtab.c:206 #, 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/symtab.c:241 +#: src/symtab.c:231 #, 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/symtab.c:244 +#: src/symtab.c:234 #, c-format msgid "symbol `%s' given more than one literal string" msgstr "simbolz `%s' dat vi¹e od jednog znakovnog niza" -#: src/symtab.c:279 +#: src/symtab.c:269 #, c-format msgid "conflicting precedences for %s and %s" msgstr "konflikt u prethodnici za %s and %s" -#: src/symtab.c:291 +#: src/symtab.c:281 #, fuzzy, c-format msgid "conflicting associativities for %s (%s) and %s (%s)" msgstr "konfliktne asocijativne vrijednosti za %s i %s" -#: src/symtab.c:363 +#: src/symtab.c:366 #, c-format msgid "tokens %s and %s both assigned number %d" msgstr "objema znakovima %s i %s je pridru¾en broj %d" -#: src/symtab.c:570 +#: src/symtab.c:589 #, c-format msgid "the start symbol %s is undefined" msgstr "poèetni simbol %s nije definiran" -#: src/symtab.c:574 +#: src/symtab.c:593 #, c-format msgid "the start symbol %s is a token" msgstr "poèetni simbol %s je znak" @@ -594,62 +602,62 @@ msgstr "" msgid "Could not open stats file for writing." msgstr "" -#: lib/getopt.c:662 +#: lib/getopt.c:688 lib/getopt.c:700 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: opcija `%s' je nejednoznaèna\n" -#: lib/getopt.c:687 +#: lib/getopt.c:733 lib/getopt.c:737 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: opcija `--%s' ne dopu¹ta argument\n" -#: lib/getopt.c:692 +#: lib/getopt.c:746 lib/getopt.c:751 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: opcija `%c%s' ne dopu¹ta argument\n" -#: lib/getopt.c:710 lib/getopt.c:883 +#: lib/getopt.c:787 lib/getopt.c:800 lib/getopt.c:1089 lib/getopt.c:1102 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: opcija `%s' zahtijeva argument\n" -#: lib/getopt.c:739 +#: lib/getopt.c:838 lib/getopt.c:841 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: neprepoznata opcija `--%s'\n" -#: lib/getopt.c:743 +#: lib/getopt.c:849 lib/getopt.c:852 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: neprepoznata opcija `%c%s'\n" -#: lib/getopt.c:769 +#: lib/getopt.c:899 lib/getopt.c:902 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: nedozvoljena opcija -- %c\n" -#: lib/getopt.c:772 +#: lib/getopt.c:908 lib/getopt.c:911 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: nedozvoljena opcija -- %c\n" -#: lib/getopt.c:802 lib/getopt.c:932 +#: lib/getopt.c:958 lib/getopt.c:969 lib/getopt.c:1155 lib/getopt.c:1168 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: opcija zahtijeva argument -- %c\n" -#: lib/getopt.c:849 +#: lib/getopt.c:1021 lib/getopt.c:1032 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: opcija `-W %s' je nejednoznaèna\n" -#: lib/getopt.c:867 +#: lib/getopt.c:1056 lib/getopt.c:1068 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: opcija `-W %s' ne dopu¹ta argument\n" -#: lib/obstack.c:496 lib/obstack.c:499 lib/xmalloc.c:63 +#: lib/obstack.c:487 lib/obstack.c:490 lib/xmalloc.c:63 msgid "memory exhausted" msgstr "iscrpljeni memorijski resursi" diff --git a/po/id.po b/po/id.po index 2cce2649..d8f606c0 100644 --- a/po/id.po +++ b/po/id.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: bison 1.75b\n" -"POT-Creation-Date: 2002-11-24 23:54-0800\n" +"POT-Creation-Date: 2002-12-13 03:47-0800\n" "PO-Revision-Date: 2002-11-22 12:24GMT+0700\n" "Last-Translator: Tedi Heriyanto \n" "Language-Team: Indonesian \n" @@ -16,106 +16,106 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: KBabel 0.9.5\n" -#: src/complain.c:78 lib/error.c:126 lib/error.c:154 +#: src/complain.c:56 lib/error.c:135 lib/error.c:163 msgid "Unknown system error" msgstr "Kesalahan sistem tidak dikenal" -#: src/complain.c:103 src/complain.c:120 +#: src/complain.c:80 src/complain.c:97 msgid "warning: " msgstr "peringatan: " -#: src/complain.c:182 src/complain.c:200 +#: src/complain.c:159 src/complain.c:177 msgid "fatal error: " msgstr "kesalahan fatal: " -#: src/conflicts.c:72 +#: src/conflicts.c:75 #, c-format msgid " Conflict between rule %d and token %s resolved as shift" msgstr " Konflik antara aturan %d dan token %s diselesaikan sebagai shift" -#: src/conflicts.c:80 +#: src/conflicts.c:83 #, c-format msgid " Conflict between rule %d and token %s resolved as reduce" msgstr " Konflik antara aturan %d dan token %s diselesaikan sebagai reduce" -#: src/conflicts.c:87 +#: src/conflicts.c:90 #, c-format msgid " Conflict between rule %d and token %s resolved as an error" msgstr "" " Konflik antara aturan %d dan token %s diselesaikan sebagai kesalahan" -#: src/conflicts.c:401 +#: src/conflicts.c:403 #, c-format msgid "%d shift/reduce conflict" msgid_plural "%d shift/reduce conflicts" msgstr[0] "%d geser/kurangi konflik" msgstr[1] "%d geser/kurangi konflik" -#: src/conflicts.c:408 +#: src/conflicts.c:410 msgid "and" msgstr "dan" -#: src/conflicts.c:414 +#: src/conflicts.c:416 #, c-format msgid "%d reduce/reduce conflict" msgid_plural "%d reduce/reduce conflicts" msgstr[0] "%d geser/kurangi konflik" msgstr[1] "%d geser/kurangi konflik" -#: src/conflicts.c:434 +#: src/conflicts.c:436 msgid "conflicts: " msgstr "konflik: " -#: src/conflicts.c:436 +#: src/conflicts.c:438 #, c-format msgid " %d shift/reduce" msgstr " %d geser/kurangi" -#: src/conflicts.c:440 +#: src/conflicts.c:442 #, c-format msgid " %d reduce/reduce" msgstr " %d kurangi/kurangi" -#: src/conflicts.c:459 +#: src/conflicts.c:461 #, c-format msgid "State %d contains " msgstr "State %d berisi " -#: src/conflicts.c:536 +#: src/conflicts.c:538 #, c-format msgid "expected %d shift/reduce conflict" msgid_plural "expected %d shift/reduce conflicts" msgstr[0] "mengharapkan %d shift/reduce konflik" msgstr[1] "mengharapkan %d shift/reduce konflik" -#: src/files.c:111 +#: src/files.c:98 #, c-format msgid "cannot open file `%s'" msgstr "tidak dapat membuka file `%s'" -#: src/files.c:127 +#: src/files.c:114 msgid "I/O error" msgstr "Kesalahan I/O" -#: src/files.c:130 +#: src/files.c:117 msgid "cannot close file" msgstr "tidak dapat menutup file" -#: src/getargs.c:167 +#: src/getargs.c:182 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Coba `%s --help' untuk informasi lebih lanjut.\n" -#: src/getargs.c:173 +#: src/getargs.c:188 msgid "GNU bison generates parsers for LALR(1) grammars.\n" msgstr "GNU bison generates parsers for LALR(1) grammars.\n" -#: src/getargs.c:177 +#: src/getargs.c:192 #, c-format msgid "Usage: %s [OPTION]... FILE\n" msgstr "Penggunaan: %s [OPTION]... FILE\n" -#: src/getargs.c:181 +#: src/getargs.c:196 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" @@ -124,7 +124,7 @@ msgstr "" "juga\n" "untuk option pendek. Hal yang sama untuk argumen opsional.\n" -#: src/getargs.c:187 +#: src/getargs.c:202 msgid "" "Operation modes:\n" " -h, --help display this help and exit\n" @@ -136,7 +136,7 @@ msgstr "" " -V, --version tampilkan informasi versi dan keluar\n" " -y, --yacc emulasikan POSIX yacc\n" -#: src/getargs.c:194 +#: src/getargs.c:209 msgid "" "Parser:\n" " -S, --skeleton=FILE specify the skeleton to use\n" @@ -156,7 +156,7 @@ msgstr "" " -n, --no-parser hasilkan hanya tabel\n" " -k, --token-table sertakan tabel nama token\n" -#: src/getargs.c:206 +#: src/getargs.c:221 msgid "" "Output:\n" " -d, --defines also produce a header file\n" @@ -175,7 +175,7 @@ msgstr "" " -o, --output=FILE simpan output ke FILE\n" " -g, --graph juga hasilkan deskripsi VCG automaton\n" -#: src/getargs.c:217 +#: src/getargs.c:232 msgid "" "THINGS is a list of comma separated words that can include:\n" " `state' describe the states\n" @@ -193,25 +193,25 @@ msgstr "" " `all' sertakan semua informasi di atas\n" " `none' tiadakan laporan\n" -#: src/getargs.c:228 +#: src/getargs.c:243 msgid "Report bugs to .\n" msgstr "Laporkan kesalahan ke .\n" -#: src/getargs.c:245 +#: src/getargs.c:260 #, c-format msgid "bison (GNU Bison) %s" msgstr "bison (GNU Bison) %s" -#: src/getargs.c:247 +#: src/getargs.c:262 msgid "Written by Robert Corbett and Richard Stallman.\n" msgstr "Written by Robert Corbett and Richard Stallman.\n" -#: src/getargs.c:251 +#: src/getargs.c:266 #, c-format msgid "Copyright (C) %d Free Software Foundation, Inc.\n" msgstr "Copyright (C) %d Free Software Foundation, Inc.\n" -#: src/getargs.c:253 +#: src/getargs.c:268 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" @@ -219,56 +219,60 @@ msgstr "" "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" -#: src/getargs.c:407 +#: src/getargs.c:423 #, c-format msgid "missing operand after `%s'" msgstr "operand hilang setelah `%s'" -#: src/getargs.c:409 +#: src/getargs.c:425 #, c-format msgid "extra operand `%s'" msgstr "operand ekstra `%s'" -#: src/gram.c:139 +#: src/gram.c:142 msgid "empty" msgstr "kosong" -#: src/gram.c:233 +#: src/gram.c:236 msgid "Grammar" msgstr "Grammar" -#: src/gram.c:321 src/reduce.c:302 src/reduce.c:392 +#: src/gram.c:324 src/reduce.c:393 msgid "warning" msgstr "peringatan" -#: src/main.c:120 +#: src/main.c:124 msgid "rule never reduced because of conflicts" msgstr "aturan tidak pernah dikurangi karena konflik" -#: src/parse-gram.y:364 +#: src/parse-gram.y:336 msgid "POSIX forbids declarations in the grammar" msgstr "POSIX melarang deklarasi dalam grammar" -#: src/print.c:46 +#: src/parse-gram.y:468 +msgid "missing identifier in parameter declaration" +msgstr "" + +#: src/print.c:48 #, c-format msgid " type %d is %s\n" msgstr " tipe %d adalah %s\n" -#: src/print.c:162 +#: src/print.c:164 #, c-format msgid "shift, and go to state %d\n" msgstr "geser, dan ke state %d\n" -#: src/print.c:164 +#: src/print.c:166 #, c-format msgid "go to state %d\n" msgstr "ke state %d\n" -#: src/print.c:201 +#: src/print.c:203 msgid "error (nonassociative)\n" msgstr "kesalahan(nonasosiatif)\n" -#: src/print.c:290 +#: src/print.c:291 #, c-format msgid "reduce using rule %d (%s)" msgstr "kurangi gunakan aturan %d (%s)" @@ -286,56 +290,56 @@ msgstr "$default" msgid "state %d" msgstr "state %d" -#: src/print.c:456 +#: src/print.c:455 msgid "Terminals, with rules where they appear" msgstr "Terminal, dengan aturan tempat mereka muncul" -#: src/print.c:483 +#: src/print.c:482 msgid "Nonterminals, with rules where they appear" msgstr "Nonterminal, dengan aturan tempat mereka muncul" -#: src/print.c:512 +#: src/print.c:511 msgid " on left:" msgstr " di kiri:" -#: src/print.c:527 +#: src/print.c:526 msgid " on right:" msgstr " di kanan:" -#: src/print.c:555 +#: src/print.c:554 msgid "Rules never reduced" msgstr "Aturan tidak pernah dikurangi" -#: src/reader.c:51 +#: src/reader.c:53 #, c-format msgid "multiple %s declarations" msgstr "deklarasi ganda %s" -#: src/reader.c:137 +#: src/reader.c:138 #, c-format msgid "result type clash on merge function %s: <%s> != <%s>" msgstr "tipe hasil bentrok pada fungsi merge %s: <%s> != <%s>" -#: src/reader.c:235 +#: src/reader.c:236 #, c-format msgid "rule given for %s, which is a token" msgstr "aturan diberikan untuk %s, yang merupakan sebuah token" -#: src/reader.c:264 +#: src/reader.c:265 #, c-format msgid "type clash on default action: <%s> != <%s>" msgstr "bentrokan tipe pada aksi baku: <%s> != <%s>" -#: src/reader.c:270 +#: src/reader.c:271 msgid "empty rule for typed nonterminal, and no action" msgstr "aturan kosong untuk nonterminal typed, dan tidak ada aksi" -#: src/reader.c:340 src/reader.c:355 src/reader.c:368 +#: src/reader.c:341 src/reader.c:355 src/reader.c:368 #, c-format msgid "only one %s allowed per rule" msgstr "hanya satu %s yang dibolehkan per aturan" -#: src/reader.c:350 src/reader.c:366 +#: src/reader.c:351 src/reader.c:366 #, c-format msgid "%s affects only GLR parsers" msgstr "%s hanya mempengaruhi parser GLR" @@ -345,172 +349,177 @@ msgstr "%s hanya mempengaruhi parser GLR" msgid "%s must be followed by positive number" msgstr "%s harus diikuti angka positif" -#: src/reader.c:512 +#: src/reader.c:510 msgid "no rules in the input grammar" msgstr "tidak ada aturan dalam grammar input" -#: src/reduce.c:239 +#: src/reduce.c:241 msgid "useless rule" msgstr "aturan tidak berguna" #: src/reduce.c:302 -msgid "useless nonterminal" +#, fuzzy, c-format +msgid "useless nonterminal: %s" msgstr "nonterminal tidak berguna" -#: src/reduce.c:349 +#: src/reduce.c:350 msgid "Useless nonterminals" msgstr "Nonterminal tidak berguna" -#: src/reduce.c:362 +#: src/reduce.c:363 msgid "Terminals which are not used" msgstr "Terminal yang tidak digunakan" -#: src/reduce.c:371 +#: src/reduce.c:372 msgid "Useless rules" msgstr "Useless rules" -#: src/reduce.c:387 +#: src/reduce.c:388 #, c-format msgid "%d rule never reduced\n" msgid_plural "%d rules never reduced\n" msgstr[0] "Aturan %d tidak pernah dikurangi\n" msgstr[1] "Aturan %d tidak pernah dikurangi\n" -#: src/reduce.c:395 +#: src/reduce.c:396 #, c-format msgid "%d useless nonterminal" msgid_plural "%d useless nonterminals" msgstr[0] "nonterminal tidak berguna %d" msgstr[1] "nonterminal tidak berguna %d" -#: src/reduce.c:401 +#: src/reduce.c:402 msgid " and " msgstr " dan " -#: src/reduce.c:404 +#: src/reduce.c:405 #, c-format msgid "%d useless rule" msgid_plural "%d useless rules" msgstr[0] "aturan tidak berguna %d" msgstr[1] "aturan tidak berguna %d" -#: src/reduce.c:435 +#: src/reduce.c:436 #, c-format msgid "start symbol %s does not derive any sentence" msgstr "simbol awal %s tidak melahirkan kalimat" -#: src/scan-gram.l:258 +#: src/scan-gram.l:208 #, c-format msgid "invalid directive: %s" msgstr "direktif tidak valid: %s" -#: src/scan-gram.l:287 src/scan-gram.l:661 src/scan-gram.l:733 +#: src/scan-gram.l:216 +msgid "stray `,' treated as white space" +msgstr "" + +#: src/scan-gram.l:232 src/scan-gram.l:727 src/scan-gram.l:798 #, c-format msgid "integer out of range: %s" msgstr "integer ke luar batas: %s" -#: src/scan-gram.l:327 +#: src/scan-gram.l:276 #, c-format msgid "invalid character: %s" msgstr "karakter tidak valid: %s" -#: src/scan-gram.l:427 src/scan-gram.l:441 src/scan-gram.l:464 +#: src/scan-gram.l:400 src/scan-gram.l:410 src/scan-gram.l:429 #, c-format msgid "invalid escape sequence: %s" msgstr "urutan escape tidak valid: %s" -#: src/scan-gram.l:472 +#: src/scan-gram.l:434 #, c-format msgid "unrecognized escape sequence: %s" msgstr "urutan escape tidak dikenal: %s" -#: src/scan-gram.l:632 +#: src/scan-gram.l:699 #, c-format msgid "$$ of `%s' has no declared type" msgstr "$$ dari `%s' tidak memiliki tipe yang terdeklarasi" -#: src/scan-gram.l:652 +#: src/scan-gram.l:718 #, c-format msgid "$%d of `%s' has no declared type" msgstr "$%d dari `%s' tidak memiliki tipe terdeklarasi" -#: src/scan-gram.l:678 src/scan-gram.l:750 +#: src/scan-gram.l:744 src/scan-gram.l:815 #, c-format msgid "invalid value: %s" msgstr "nilai tidak valid: %s" -#: src/scan-gram.l:861 +#: src/scan-gram.l:928 #, c-format msgid "missing `%s' at end of file" msgstr "`%s' hilang di akhir file" -#: src/symlist.c:97 src/symlist.c:109 +#: src/symlist.c:97 src/symlist.c:108 msgid "invalid $ value" msgstr "nilai $ tidak valid" -#: src/symtab.c:82 +#: src/symtab.c:84 #, c-format msgid "type redeclaration for %s" msgstr "redeklarasi tipe untuk %s" -#: src/symtab.c:100 src/symtab.c:119 +#: src/symtab.c:101 src/symtab.c:119 #, c-format msgid "%s redeclaration for %s" msgstr "%s redeklarasi untuk %s" -#: src/symtab.c:140 +#: src/symtab.c:138 #, c-format msgid "redefining precedence of %s" msgstr "mendefinisikan kembali presedens %s" -#: src/symtab.c:159 +#: src/symtab.c:156 #, c-format msgid "symbol %s redefined" msgstr "simbol %s didefinisikan ulang" -#: src/symtab.c:183 +#: src/symtab.c:179 #, c-format msgid "redefining user token number of %s" msgstr "mendefinisikan ulang nomor token user %s" -#: src/symtab.c:222 +#: src/symtab.c:206 #, c-format msgid "symbol %s is used, but is not defined as a token and has no rules" msgstr "" "simbol %s digunakan, namun tidak didefinisikan sebagai token dan tidak " "memiliki aturan" -#: src/symtab.c:241 +#: src/symtab.c:231 #, c-format msgid "symbol `%s' used more than once as a literal string" msgstr "simbol `%s' digunakan lebih dari satu kali sebagai string literal" -#: src/symtab.c:244 +#: src/symtab.c:234 #, c-format msgid "symbol `%s' given more than one literal string" msgstr "simbol `%s' diberikan lebih dari satu string literal" -#: src/symtab.c:279 +#: src/symtab.c:269 #, c-format msgid "conflicting precedences for %s and %s" msgstr "presenden konflik untuk %s dan %s" -#: src/symtab.c:291 +#: src/symtab.c:281 #, c-format msgid "conflicting associativities for %s (%s) and %s (%s)" msgstr "asosiatif konflik untuk %s (%s) dan %s (%s)" -#: src/symtab.c:363 +#: src/symtab.c:366 #, c-format msgid "tokens %s and %s both assigned number %d" msgstr "token %s dan %s keduanya memiliki angka %d" -#: src/symtab.c:570 +#: src/symtab.c:589 #, c-format msgid "the start symbol %s is undefined" msgstr "simbol awal %s tidak didefinisikan" -#: src/symtab.c:574 +#: src/symtab.c:593 #, c-format msgid "the start symbol %s is a token" msgstr "simbol awal %s adalah sebuah token" @@ -595,62 +604,62 @@ msgstr "Tidak dapat menulis file stat." msgid "Could not open stats file for writing." msgstr "Tidak dapat membuka file stat untuk ditulisi." -#: lib/getopt.c:662 +#: lib/getopt.c:688 lib/getopt.c:700 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: option `%s' ambigu\n" -#: lib/getopt.c:687 +#: lib/getopt.c:733 lib/getopt.c:737 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: option `--%s' tidak membolehkan sebuah argumen\n" -#: lib/getopt.c:692 +#: lib/getopt.c:746 lib/getopt.c:751 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: option `%c%s' tidak membolehkan sebuah argumen\n" -#: lib/getopt.c:710 lib/getopt.c:883 +#: lib/getopt.c:787 lib/getopt.c:800 lib/getopt.c:1089 lib/getopt.c:1102 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: option `%s' membutuhkan sebuah argumen\n" -#: lib/getopt.c:739 +#: lib/getopt.c:838 lib/getopt.c:841 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: option tidak dikenal `--%s'\n" -#: lib/getopt.c:743 +#: lib/getopt.c:849 lib/getopt.c:852 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: option tidak dikenal `%c%s'\n" -#: lib/getopt.c:769 +#: lib/getopt.c:899 lib/getopt.c:902 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: option ilegal -- %c\n" -#: lib/getopt.c:772 +#: lib/getopt.c:908 lib/getopt.c:911 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: option tidak valid -- %c\n" -#: lib/getopt.c:802 lib/getopt.c:932 +#: lib/getopt.c:958 lib/getopt.c:969 lib/getopt.c:1155 lib/getopt.c:1168 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: option membutuhkan sebuah argumen -- %c\n" -#: lib/getopt.c:849 +#: lib/getopt.c:1021 lib/getopt.c:1032 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: option `-W %s' ambigu\n" -#: lib/getopt.c:867 +#: lib/getopt.c:1056 lib/getopt.c:1068 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: option `-W %s' tidak membolehkan sebuah argumen\n" -#: lib/obstack.c:496 lib/obstack.c:499 lib/xmalloc.c:63 +#: lib/obstack.c:487 lib/obstack.c:490 lib/xmalloc.c:63 msgid "memory exhausted" msgstr "memori habis" diff --git a/po/it.po b/po/it.po index 882062ac..01fa2959 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: bison 1.50\n" -"POT-Creation-Date: 2002-11-24 23:54-0800\n" +"POT-Creation-Date: 2002-12-13 03:47-0800\n" "PO-Revision-Date: 2002-10-17 14:37+0100\n" "Last-Translator: Paolo Bonzini \n" "Language-Team: Italian \n" @@ -14,105 +14,105 @@ msgstr "" "Content-Transfer-Encoding: 8-bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: src/complain.c:78 lib/error.c:126 lib/error.c:154 +#: src/complain.c:56 lib/error.c:135 lib/error.c:163 msgid "Unknown system error" msgstr "Errore di sistema sconosciuto" -#: src/complain.c:103 src/complain.c:120 +#: src/complain.c:80 src/complain.c:97 msgid "warning: " msgstr "attenzione: " -#: src/complain.c:182 src/complain.c:200 +#: src/complain.c:159 src/complain.c:177 msgid "fatal error: " msgstr "errore fatale: " -#: src/conflicts.c:72 +#: src/conflicts.c:75 #, c-format msgid " Conflict between rule %d and token %s resolved as shift" msgstr " Conflitto tra la regola %d e il token %s risolto come shift" -#: src/conflicts.c:80 +#: src/conflicts.c:83 #, c-format msgid " Conflict between rule %d and token %s resolved as reduce" msgstr " Conflitto tra la regola %d e il token %s risolto come riduzione" -#: src/conflicts.c:87 +#: src/conflicts.c:90 #, c-format msgid " Conflict between rule %d and token %s resolved as an error" msgstr " Conflitto tra la regola %d e il token %s risolto come errore" -#: src/conflicts.c:401 +#: src/conflicts.c:403 #, c-format msgid "%d shift/reduce conflict" msgid_plural "%d shift/reduce conflicts" msgstr[0] "%d conflitto shift/riduzione" msgstr[1] "%d conflitti shift/riduzione" -#: src/conflicts.c:408 +#: src/conflicts.c:410 msgid "and" msgstr "e" -#: src/conflicts.c:414 +#: src/conflicts.c:416 #, c-format msgid "%d reduce/reduce conflict" msgid_plural "%d reduce/reduce conflicts" msgstr[0] "%d conflitto riduzione/riduzione" msgstr[1] "%d conflitti riduzione/riduzione" -#: src/conflicts.c:434 +#: src/conflicts.c:436 msgid "conflicts: " msgstr "conflitti: " -#: src/conflicts.c:436 +#: src/conflicts.c:438 #, c-format msgid " %d shift/reduce" msgstr " %d shift/riduzione" -#: src/conflicts.c:440 +#: src/conflicts.c:442 #, c-format msgid " %d reduce/reduce" msgstr " %d riduzione/riduzione" -#: src/conflicts.c:459 +#: src/conflicts.c:461 #, c-format msgid "State %d contains " msgstr "Lo stato %d contiene" -#: src/conflicts.c:536 +#: src/conflicts.c:538 #, c-format msgid "expected %d shift/reduce conflict" msgid_plural "expected %d shift/reduce conflicts" msgstr[0] "atteso %d conflitto shift/riduzione" msgstr[1] "attesi %d conflitti shift/riduzione" -#: src/files.c:111 +#: src/files.c:98 #, c-format msgid "cannot open file `%s'" msgstr "impossibile aprire il file `%s'" -#: src/files.c:127 +#: src/files.c:114 msgid "I/O error" msgstr "" -#: src/files.c:130 +#: src/files.c:117 msgid "cannot close file" msgstr "impossibile chiudere il file `%s'" -#: src/getargs.c:167 +#: src/getargs.c:182 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Provare `%s --help' per ulteriori informazioni.\n" -#: src/getargs.c:173 +#: src/getargs.c:188 msgid "GNU bison generates parsers for LALR(1) grammars.\n" msgstr "GNU bison genera parser per grammatiche LALR(1).\n" -#: src/getargs.c:177 +#: src/getargs.c:192 #, c-format msgid "Usage: %s [OPTION]... FILE\n" msgstr "Utilizzo: %s [OPZIONE]... FILE\n" -#: src/getargs.c:181 +#: src/getargs.c:196 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" @@ -121,7 +121,7 @@ msgstr "" "è obbligatorio anche per l'equivalente opzione corta. Analogamente per\n" "gli argomenti opzionali.\n" -#: src/getargs.c:187 +#: src/getargs.c:202 msgid "" "Operation modes:\n" " -h, --help display this help and exit\n" @@ -133,7 +133,7 @@ msgstr "" " -V, --version mostra informazioni sulla versione ed esce\n" " -y, --yacc emula il comportamento di POSIX yacc\n" -#: src/getargs.c:194 +#: src/getargs.c:209 msgid "" "Parser:\n" " -S, --skeleton=FILE specify the skeleton to use\n" @@ -152,7 +152,7 @@ msgstr "" " -n, --no-parser genera le sole tabelle\n" " -k, --token-table include una tabella di nomi dei token\n" -#: src/getargs.c:206 +#: src/getargs.c:221 msgid "" "Output:\n" " -d, --defines also produce a header file\n" @@ -171,7 +171,7 @@ msgstr "" " -o, --output=FILE lascia l'output in FILE\n" " -g, --graph produce anche una descrizione VCG dell'automa\n" -#: src/getargs.c:217 +#: src/getargs.c:232 msgid "" "THINGS is a list of comma separated words that can include:\n" " `state' describe the states\n" @@ -190,25 +190,25 @@ msgstr "" " `all' include tutte queste informazioni\n" " `none' disabilita la produzione del rapporto\n" -#: src/getargs.c:228 +#: src/getargs.c:243 msgid "Report bugs to .\n" msgstr "Segnalare eventuali bug a .\n" -#: src/getargs.c:245 +#: src/getargs.c:260 #, c-format msgid "bison (GNU Bison) %s" msgstr "bison (GNU Bison) %s" -#: src/getargs.c:247 +#: src/getargs.c:262 msgid "Written by Robert Corbett and Richard Stallman.\n" msgstr "Scritto da Robert Corbett e Richard Stallman.\n" -#: src/getargs.c:251 +#: src/getargs.c:266 #, c-format msgid "Copyright (C) %d Free Software Foundation, Inc.\n" msgstr "Copyright (C) %d Free Software Foundation, Inc.\n" -#: src/getargs.c:253 +#: src/getargs.c:268 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" @@ -217,56 +217,60 @@ msgstr "" "sottoposta la copia. NON c'è ALCUNA garanzia, neanche di\n" "COMMERCIABILITA` o di ADEGUATEZZA AD UN PARTICOLARE SCOPO.\n" -#: src/getargs.c:407 +#: src/getargs.c:423 #, c-format msgid "missing operand after `%s'" msgstr "" -#: src/getargs.c:409 +#: src/getargs.c:425 #, c-format msgid "extra operand `%s'" msgstr "" -#: src/gram.c:139 +#: src/gram.c:142 msgid "empty" msgstr "vuoto" -#: src/gram.c:233 +#: src/gram.c:236 msgid "Grammar" msgstr "Grammatica" -#: src/gram.c:321 src/reduce.c:302 src/reduce.c:392 +#: src/gram.c:324 src/reduce.c:393 msgid "warning" msgstr "attenzione" -#: src/main.c:120 +#: src/main.c:124 msgid "rule never reduced because of conflicts" msgstr "regola mai ridotta a causa dei conflitti" -#: src/parse-gram.y:364 +#: src/parse-gram.y:336 msgid "POSIX forbids declarations in the grammar" msgstr "POSIX proibisce l'uso di dichiarazioni interne alla grammatica" -#: src/print.c:46 +#: src/parse-gram.y:468 +msgid "missing identifier in parameter declaration" +msgstr "" + +#: src/print.c:48 #, c-format msgid " type %d is %s\n" msgstr " il tipo %d è %s\n" -#: src/print.c:162 +#: src/print.c:164 #, c-format msgid "shift, and go to state %d\n" msgstr "shift e prosecuzione allo stato %d\n" -#: src/print.c:164 +#: src/print.c:166 #, c-format msgid "go to state %d\n" msgstr "prosecuzione allo stato %d\n" -#: src/print.c:201 +#: src/print.c:203 msgid "error (nonassociative)\n" msgstr "errore (non associativo)\n" -#: src/print.c:290 +#: src/print.c:291 #, c-format msgid "reduce using rule %d (%s)" msgstr "riduzione con la regola %d (%s)" @@ -284,57 +288,57 @@ msgstr "$default" msgid "state %d" msgstr "stato %d" -#: src/print.c:456 +#: src/print.c:455 msgid "Terminals, with rules where they appear" msgstr "Simboli terminali e regole in cui appaiono" -#: src/print.c:483 +#: src/print.c:482 msgid "Nonterminals, with rules where they appear" msgstr "Simboli nonterminali e regole in cui appaiono" -#: src/print.c:512 +#: src/print.c:511 msgid " on left:" msgstr " nel primo membro:" -#: src/print.c:527 +#: src/print.c:526 msgid " on right:" msgstr " nel secondo membro:" -#: src/print.c:555 +#: src/print.c:554 msgid "Rules never reduced" msgstr "Regole mai ridotte" -#: src/reader.c:51 +#: src/reader.c:53 #, c-format msgid "multiple %s declarations" msgstr "dichiarazioni multiple per %s" -#: src/reader.c:137 +#: src/reader.c:138 #, fuzzy, c-format msgid "result type clash on merge function %s: <%s> != <%s>" msgstr "" "conflitto nei tipi del risultato della funzione di merge %s: `%s' e `%s'" -#: src/reader.c:235 +#: src/reader.c:236 #, c-format msgid "rule given for %s, which is a token" msgstr "fornita una regola per il token %s" -#: src/reader.c:264 +#: src/reader.c:265 #, fuzzy, c-format msgid "type clash on default action: <%s> != <%s>" msgstr "conflitto di tipo (`%s' e `%s') nell'azione di default" -#: src/reader.c:270 +#: src/reader.c:271 msgid "empty rule for typed nonterminal, and no action" msgstr "regola vuota e nessuna azione per un nonterminale con tipo" -#: src/reader.c:340 src/reader.c:355 src/reader.c:368 +#: src/reader.c:341 src/reader.c:355 src/reader.c:368 #, fuzzy, c-format msgid "only one %s allowed per rule" msgstr "solo un %%dprec è permesso in una regola" -#: src/reader.c:350 src/reader.c:366 +#: src/reader.c:351 src/reader.c:366 #, fuzzy, c-format msgid "%s affects only GLR parsers" msgstr "%%dprec considerato solo nei parser GLR" @@ -344,170 +348,175 @@ msgstr "%%dprec considerato solo nei parser GLR" msgid "%s must be followed by positive number" msgstr "%%dprec deve essere seguito da un intero positivo" -#: src/reader.c:512 +#: src/reader.c:510 msgid "no rules in the input grammar" msgstr "nessuna regola nella grammatica di input" -#: src/reduce.c:239 +#: src/reduce.c:241 msgid "useless rule" msgstr "regola inutile" #: src/reduce.c:302 -msgid "useless nonterminal" +#, fuzzy, c-format +msgid "useless nonterminal: %s" msgstr "simbolo nonterminale inutilizzato" -#: src/reduce.c:349 +#: src/reduce.c:350 msgid "Useless nonterminals" msgstr "Simboli nonterminali inutili" -#: src/reduce.c:362 +#: src/reduce.c:363 msgid "Terminals which are not used" msgstr "Simboli terminali inutilizzati" -#: src/reduce.c:371 +#: src/reduce.c:372 msgid "Useless rules" msgstr "Regole inutili" -#: src/reduce.c:387 +#: src/reduce.c:388 #, c-format msgid "%d rule never reduced\n" msgid_plural "%d rules never reduced\n" msgstr[0] "%d regola non applicata\n" msgstr[1] "%d regole non applicate\n" -#: src/reduce.c:395 +#: src/reduce.c:396 #, c-format msgid "%d useless nonterminal" msgid_plural "%d useless nonterminals" msgstr[0] "%d simbolo nonterminale inutilizzato" msgstr[1] "%d simboli nonterminali inutilizzati" -#: src/reduce.c:401 +#: src/reduce.c:402 msgid " and " msgstr " e " -#: src/reduce.c:404 +#: src/reduce.c:405 #, c-format msgid "%d useless rule" msgid_plural "%d useless rules" msgstr[0] "%d regola inutile" msgstr[1] "%d regole inutili" -#: src/reduce.c:435 +#: src/reduce.c:436 #, c-format msgid "start symbol %s does not derive any sentence" msgstr "dal simbolo iniziale %s non deriva alcuna frase" -#: src/scan-gram.l:258 +#: src/scan-gram.l:208 #, fuzzy, c-format msgid "invalid directive: %s" msgstr ": escape non valido: %s\n" -#: src/scan-gram.l:287 src/scan-gram.l:661 src/scan-gram.l:733 +#: src/scan-gram.l:216 +msgid "stray `,' treated as white space" +msgstr "" + +#: src/scan-gram.l:232 src/scan-gram.l:727 src/scan-gram.l:798 #, c-format msgid "integer out of range: %s" msgstr "" -#: src/scan-gram.l:327 +#: src/scan-gram.l:276 #, fuzzy, c-format msgid "invalid character: %s" msgstr ": carattere non valido: `%c'\n" -#: src/scan-gram.l:427 src/scan-gram.l:441 src/scan-gram.l:464 +#: src/scan-gram.l:400 src/scan-gram.l:410 src/scan-gram.l:429 #, fuzzy, c-format msgid "invalid escape sequence: %s" msgstr ": escape non valido: %s\n" -#: src/scan-gram.l:472 +#: src/scan-gram.l:434 #, fuzzy, c-format msgid "unrecognized escape sequence: %s" msgstr ": escape non riconosciuto: %s\n" -#: src/scan-gram.l:632 +#: src/scan-gram.l:699 #, c-format msgid "$$ of `%s' has no declared type" msgstr "Manca una dichiarazione di tipo per $$ di `%s'" -#: src/scan-gram.l:652 +#: src/scan-gram.l:718 #, c-format msgid "$%d of `%s' has no declared type" msgstr "Manca una dichiarazione di tipo per $%d di `%s'" -#: src/scan-gram.l:678 src/scan-gram.l:750 +#: src/scan-gram.l:744 src/scan-gram.l:815 #, fuzzy, c-format msgid "invalid value: %s" msgstr "valore non valido: %s%d" -#: src/scan-gram.l:861 +#: src/scan-gram.l:928 #, c-format msgid "missing `%s' at end of file" msgstr "" -#: src/symlist.c:97 src/symlist.c:109 +#: src/symlist.c:97 src/symlist.c:108 msgid "invalid $ value" msgstr "valore $ non valido" -#: src/symtab.c:82 +#: src/symtab.c:84 #, c-format msgid "type redeclaration for %s" msgstr "tipo dichiarato due volte per %s" -#: src/symtab.c:100 src/symtab.c:119 +#: src/symtab.c:101 src/symtab.c:119 #, c-format msgid "%s redeclaration for %s" msgstr "dichiarazione due volte di %s per %s" -#: src/symtab.c:140 +#: src/symtab.c:138 #, c-format msgid "redefining precedence of %s" msgstr "precedenza di `%s' definita due volte" -#: src/symtab.c:159 +#: src/symtab.c:156 #, c-format msgid "symbol %s redefined" msgstr "simbolo %s ridefinito" -#: src/symtab.c:183 +#: src/symtab.c:179 #, c-format msgid "redefining user token number of %s" msgstr "numero di token definito dall'utente specificato due volte per %s" -#: src/symtab.c:222 +#: src/symtab.c:206 #, 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/symtab.c:241 +#: src/symtab.c:231 #, 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/symtab.c:244 +#: src/symtab.c:234 #, c-format msgid "symbol `%s' given more than one literal string" msgstr "il simbolo `%s' dà pi` di una stringa letterale" -#: src/symtab.c:279 +#: src/symtab.c:269 #, c-format msgid "conflicting precedences for %s and %s" msgstr "precedenze in conflitto per %s und %s" -#: src/symtab.c:291 +#: src/symtab.c:281 #, c-format msgid "conflicting associativities for %s (%s) and %s (%s)" msgstr "associatività in conflitto per %s (%s) e %s (%s)" -#: src/symtab.c:363 +#: src/symtab.c:366 #, c-format msgid "tokens %s and %s both assigned number %d" msgstr "i token %s e %s hanno lo stesso numero %d" -#: src/symtab.c:570 +#: src/symtab.c:589 #, c-format msgid "the start symbol %s is undefined" msgstr "simbolo iniziale %s non definito" -#: src/symtab.c:574 +#: src/symtab.c:593 #, c-format msgid "the start symbol %s is a token" msgstr "specificato il token %s come simbolo iniziale" @@ -592,62 +601,62 @@ msgstr "Impossibile scrivere il file delle statistiche." msgid "Could not open stats file for writing." msgstr "Impossibile aprire in scrittura il file delle statistiche." -#: lib/getopt.c:662 +#: lib/getopt.c:688 lib/getopt.c:700 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: l'opzione `%s' è ambigua\n" -#: lib/getopt.c:687 +#: lib/getopt.c:733 lib/getopt.c:737 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: l'opzione `--%s' non ammette argomenti\n" -#: lib/getopt.c:692 +#: lib/getopt.c:746 lib/getopt.c:751 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: l'opzione `%c%s' non ammette argomenti\n" -#: lib/getopt.c:710 lib/getopt.c:883 +#: lib/getopt.c:787 lib/getopt.c:800 lib/getopt.c:1089 lib/getopt.c:1102 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: l'opzione `%s' richiede un argomento\n" -#: lib/getopt.c:739 +#: lib/getopt.c:838 lib/getopt.c:841 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: opzione sconosciuta `--%s'\n" -#: lib/getopt.c:743 +#: lib/getopt.c:849 lib/getopt.c:852 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: opzione sconosciuta `%c%s'\n" -#: lib/getopt.c:769 +#: lib/getopt.c:899 lib/getopt.c:902 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: opzione non valida -- %c\n" -#: lib/getopt.c:772 +#: lib/getopt.c:908 lib/getopt.c:911 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: opzione non valida -- %c\n" -#: lib/getopt.c:802 lib/getopt.c:932 +#: lib/getopt.c:958 lib/getopt.c:969 lib/getopt.c:1155 lib/getopt.c:1168 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: l'opzione richiede un argomento -- %c\n" -#: lib/getopt.c:849 +#: lib/getopt.c:1021 lib/getopt.c:1032 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: l'opzione `-W %s' è ambigua\n" -#: lib/getopt.c:867 +#: lib/getopt.c:1056 lib/getopt.c:1068 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: l'opzione `-W %s' non ammette un argomento\n" -#: lib/obstack.c:496 lib/obstack.c:499 lib/xmalloc.c:63 +#: lib/obstack.c:487 lib/obstack.c:490 lib/xmalloc.c:63 msgid "memory exhausted" msgstr "memoria esaurita" diff --git a/po/ja.po b/po/ja.po index c8f8c438..40b92d28 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-11-24 23:54-0800\n" +"POT-Creation-Date: 2002-12-13 03:47-0800\n" "PO-Revision-Date: 2002-10-29 01:00-05:00\n" "Last-Translator: Daisuke Yamashita \n" "Language-Team: Japanese \n" @@ -14,103 +14,103 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: src/complain.c:78 lib/error.c:126 lib/error.c:154 +#: src/complain.c:56 lib/error.c:135 lib/error.c:163 msgid "Unknown system error" msgstr "ÉÔÌÀ¤Ê¥·¥¹¥Æ¥à¥¨¥é¡¼" -#: src/complain.c:103 src/complain.c:120 +#: src/complain.c:80 src/complain.c:97 msgid "warning: " msgstr "·Ù¹ð: " -#: src/complain.c:182 src/complain.c:200 +#: src/complain.c:159 src/complain.c:177 msgid "fatal error: " msgstr "Ã×̿Ū¥¨¥é¡¼: " -#: src/conflicts.c:72 +#: src/conflicts.c:75 #, fuzzy, c-format msgid " Conflict between rule %d and token %s resolved as shift" msgstr "¾õÂÖ %d ¤Îµ¬Â§ %d ¤È¥È¡¼¥¯¥ó %s ¤Î¶¥¹ç¤ò%s¤È¤·¤Æ²ò·è¡£\n" -#: src/conflicts.c:80 +#: src/conflicts.c:83 #, fuzzy, c-format msgid " Conflict between rule %d and token %s resolved as reduce" msgstr "¾õÂÖ %d ¤Îµ¬Â§ %d ¤È¥È¡¼¥¯¥ó %s ¤Î¶¥¹ç¤ò%s¤È¤·¤Æ²ò·è¡£\n" -#: src/conflicts.c:87 +#: src/conflicts.c:90 #, fuzzy, c-format msgid " Conflict between rule %d and token %s resolved as an error" msgstr "¾õÂÖ %d ¤Îµ¬Â§ %d ¤È¥È¡¼¥¯¥ó %s ¤Î¶¥¹ç¤ò%s¤È¤·¤Æ²ò·è¡£\n" -#: src/conflicts.c:401 +#: src/conflicts.c:403 #, c-format msgid "%d shift/reduce conflict" msgid_plural "%d shift/reduce conflicts" msgstr[0] "%d ¥·¥Õ¥È/´Ô¸µ¾×ÆÍ" -#: src/conflicts.c:408 +#: src/conflicts.c:410 msgid "and" msgstr "¤ª¤è¤Ó" -#: src/conflicts.c:414 +#: src/conflicts.c:416 #, c-format msgid "%d reduce/reduce conflict" msgid_plural "%d reduce/reduce conflicts" msgstr[0] "%d ´Ô¸µ/´Ô¸µ¾×ÆÍ" -#: src/conflicts.c:434 +#: src/conflicts.c:436 msgid "conflicts: " msgstr "¾×ÆÍ: " -#: src/conflicts.c:436 +#: src/conflicts.c:438 #, c-format msgid " %d shift/reduce" msgstr " %d ¥·¥Õ¥È/´Ô¸µ" -#: src/conflicts.c:440 +#: src/conflicts.c:442 #, c-format msgid " %d reduce/reduce" msgstr " %d ´Ô¸µ/´Ô¸µ" -#: src/conflicts.c:459 +#: src/conflicts.c:461 #, c-format msgid "State %d contains " msgstr "¾õÂÖ %d ¤¬´Þ¤à¤Î¤Ï " -#: src/conflicts.c:536 +#: src/conflicts.c:538 #, fuzzy, c-format msgid "expected %d shift/reduce conflict" msgid_plural "expected %d shift/reduce conflicts" msgstr[0] "ËÜÍè %d ¸Ä¤Î¥·¥Õ¥È/´Ô¸µ¾×ÆͤǤ¢¤ë¤Ï¤º¤Ç¤¹\n" -#: src/files.c:111 +#: src/files.c:98 #, c-format msgid "cannot open file `%s'" msgstr "¥Õ¥¡¥¤¥ë `%s' ¤ò³«¤±¤Þ¤»¤ó" -#: src/files.c:127 +#: src/files.c:114 #, fuzzy msgid "I/O error" msgstr "¥¨¥é¡¼" -#: src/files.c:130 +#: src/files.c:117 msgid "cannot close file" msgstr "¥Õ¥¡¥¤¥ë¤òÊĤ¸¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó" -#: src/getargs.c:167 +#: src/getargs.c:182 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "`%s --help' ¤Ç¾ÜºÙ¾ðÊó¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤\n" -#: src/getargs.c:173 +#: src/getargs.c:188 msgid "GNU bison generates parsers for LALR(1) grammars.\n" msgstr "GNU bison ¤Ï LALR(1) ʸˡ¤Î¹½Ê¸²òÀÏ´ï¤òÀ¸À®¤·¤Þ¤¹¡£\n" -#: src/getargs.c:177 +#: src/getargs.c:192 #, c-format msgid "Usage: %s [OPTION]... FILE\n" msgstr "»È¤¤Êý: %s [¥ª¥×¥·¥ç¥ó]... ¥Õ¥¡¥¤¥ë\n" -#: src/getargs.c:181 +#: src/getargs.c:196 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" @@ -118,7 +118,7 @@ msgstr "" "¥í¥ó¥°¥ª¥×¥·¥ç¥ó¤Çɬ¿Ü¤Î°ú¿ô¤¬¼¨¤µ¤ì¤Æ¤¤¤ì¤Ð¡¢Æ±¤¸°ÕÌ£¤Î¥·¥ç¡¼¥È¥ª¥×¥·¥ç¥ó\n" "¤Ç¤âƱÍͤËɬ¿Ü¤Î°ú¿ô¤È¤Ê¤ê¤Þ¤¹¡£É¬¿Ü¤Ç¤Ê¤¤ÁªÂòŪ°ú¿ô¤Ç¤âƱÍͤǤ¹¡£\n" -#: src/getargs.c:187 +#: src/getargs.c:202 msgid "" "Operation modes:\n" " -h, --help display this help and exit\n" @@ -130,7 +130,7 @@ msgstr "" " -V, --version ¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤òɽ¼¨¤·¤Æ½ªÎ»¤¹¤ë\n" " -y, --yacc POSIX yacc ¤ò¥¨¥ß¥å¥ì¥¤¥È¤¹¤ë\n" -#: src/getargs.c:194 +#: src/getargs.c:209 msgid "" "Parser:\n" " -S, --skeleton=FILE specify the skeleton to use\n" @@ -150,7 +150,7 @@ msgstr "" " -n, --no-parser ¥Æ¡¼¥Ö¥ë¤Î¤ß¤òÀ¸À®¤¹¤ë\n" " -k, --token-table ¥È¡¼¥¯¥ó̾¤Î¥Æ¡¼¥Ö¥ë¤ò´Þ¤á¤ë\n" -#: src/getargs.c:206 +#: src/getargs.c:221 #, fuzzy msgid "" "Output:\n" @@ -169,7 +169,7 @@ msgstr "" " -o, --output=FILE ½ÐÎÏÀè¤ò FILE ¤È¤¹¤ë\n" " -g, --graph ¥ª¡¼¥È¥Þ¥È¥ó¤Î VCG µ­½Ò»Ò¤âºîÀ®¤¹¤ë\n" -#: src/getargs.c:217 +#: src/getargs.c:232 msgid "" "THINGS is a list of comma separated words that can include:\n" " `state' describe the states\n" @@ -180,26 +180,26 @@ msgid "" " `none' disable the report\n" msgstr "" -#: src/getargs.c:228 +#: src/getargs.c:243 msgid "Report bugs to .\n" msgstr "¥Ð¥°¥ì¥Ý¡¼¥È¤Ï ¤Þ¤Ç¡£\n" -#: src/getargs.c:245 +#: src/getargs.c:260 #, c-format msgid "bison (GNU Bison) %s" msgstr "bison (GNU Bison) %s" -#: src/getargs.c:247 +#: src/getargs.c:262 msgid "Written by Robert Corbett and Richard Stallman.\n" msgstr "" -#: src/getargs.c:251 +#: src/getargs.c:266 #, fuzzy, c-format msgid "Copyright (C) %d Free Software Foundation, Inc.\n" msgstr "" "Copyright 1984, 1986, 1989, 1992, 2000, 2001 Free Software Foundation, Inc.\n" -#: src/getargs.c:253 +#: src/getargs.c:268 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" @@ -210,59 +210,63 @@ msgstr "" "¤³¤ì¤Ï¥Õ¥ê¡¼¥½¥Õ¥È¥¦¥§¥¢¤Ç¤¹ -- Ê£À½¤Ë¤Ä¤¤¤Æ¤Î¾ò·ï¤Ï¥½¡¼¥¹¤ò¸«¤Þ¤·¤ç¤¦¡£\n" "°ìÀÚ¤ÎÊݾڤϤ¢¤ê¤Þ¤»¤ó -- ¾¦¶ÈÀ­¤äÌÜŪŬ¹çÀ­¤Ë¤Ä¤¤¤Æ¤ÎÊݾڤ¹¤é¤¢¤ê¤Þ¤»¤ó¡£\n" -#: src/getargs.c:407 +#: src/getargs.c:423 #, c-format msgid "missing operand after `%s'" msgstr "" -#: src/getargs.c:409 +#: src/getargs.c:425 #, c-format msgid "extra operand `%s'" msgstr "" -#: src/gram.c:139 +#: src/gram.c:142 msgid "empty" msgstr "¶õ" -#: src/gram.c:233 +#: src/gram.c:236 msgid "Grammar" msgstr "ʸˡ" -#: src/gram.c:321 src/reduce.c:302 src/reduce.c:392 +#: src/gram.c:324 src/reduce.c:393 #, fuzzy msgid "warning" msgstr "·Ù¹ð: " -#: src/main.c:120 +#: src/main.c:124 #, fuzzy msgid "rule never reduced because of conflicts" msgstr " 1 ´Ô¸µ/´Ô¸µ¾×ÆÍ" -#: src/parse-gram.y:364 +#: src/parse-gram.y:336 msgid "POSIX forbids declarations in the grammar" msgstr "" -#: src/print.c:46 +#: src/parse-gram.y:468 +msgid "missing identifier in parameter declaration" +msgstr "" + +#: src/print.c:48 #, c-format msgid " type %d is %s\n" msgstr " ¥¿¥¤¥× %d ¤Ï %s ¤Ç¤¹\n" -#: src/print.c:162 +#: src/print.c:164 #, fuzzy, c-format msgid "shift, and go to state %d\n" msgstr " %-4s\t¥·¥Õ¥È¡¢¤ª¤è¤Ó¾õÂÖ %d ¤Ø\n" -#: src/print.c:164 +#: src/print.c:166 #, fuzzy, c-format msgid "go to state %d\n" msgstr " $ \t¾õÂÖ %d ¤Ø\n" -#: src/print.c:201 +#: src/print.c:203 #, fuzzy msgid "error (nonassociative)\n" msgstr "%-4s\t¥¨¥é¡¼ (Èó·ë¹ç)" -#: src/print.c:290 +#: src/print.c:291 #, fuzzy, c-format msgid "reduce using rule %d (%s)" msgstr "$default\tµ¬Â§ %d ¤òÍøÍѤ·¤Æ´Ô¸µ (%s)" @@ -280,57 +284,57 @@ msgstr "" msgid "state %d" msgstr "¾õÂÖ %d" -#: src/print.c:456 +#: src/print.c:455 msgid "Terminals, with rules where they appear" msgstr "½Ð¸½°ÌÃ֤ε¬Â§¤Ë¤è¤ë½ªÃ¼" -#: src/print.c:483 +#: src/print.c:482 msgid "Nonterminals, with rules where they appear" msgstr "½Ð¸½°ÌÃ֤ε¬Â§¤Ë¤è¤ëÈó½ªÃ¼" -#: src/print.c:512 +#: src/print.c:511 msgid " on left:" msgstr " º¸ÊÕ:" -#: src/print.c:527 +#: src/print.c:526 msgid " on right:" msgstr " ±¦ÊÕ:" -#: src/print.c:555 +#: src/print.c:554 #, fuzzy msgid "Rules never reduced" msgstr "%d ¸Ä¤Îµ¬Â§¤Ï·è¤·¤Æ´Ô¸µ¤µ¤ì¤Þ¤»¤ó\n" -#: src/reader.c:51 +#: src/reader.c:53 #, c-format msgid "multiple %s declarations" msgstr "%s ¤¬Ê£¿ô¸ÄÀë¸À¤µ¤ì¤Þ¤·¤¿" -#: src/reader.c:137 +#: src/reader.c:138 #, c-format msgid "result type clash on merge function %s: <%s> != <%s>" msgstr "" -#: src/reader.c:235 +#: src/reader.c:236 #, c-format msgid "rule given for %s, which is a token" msgstr "%s ¤Ëµ¬Â§¤¬Í¿¤¨¤é¤ì¡¢¤½¤ì¤Ï¥È¡¼¥¯¥ó¤È¤Ê¤ê¤Þ¤¹" -#: src/reader.c:264 +#: src/reader.c:265 #, fuzzy, c-format msgid "type clash on default action: <%s> != <%s>" msgstr "½é´ü¾õÂÖ¤ÎÆ°ºî¤Ç¤Ï·¿ (`%s' `%s') ¤¬¾×Æͤ·¤Þ¤¹" -#: src/reader.c:270 +#: src/reader.c:271 msgid "empty rule for typed nonterminal, and no action" msgstr "¶õ¤Î·¿ÉÕ¤­Èó½ªÃ¼¥¢¥¤¥Æ¥àÍѵ¬Â§¤Ç¤¢¤ê¡¢Æ°ºî¤¬µ¯¤ê¤Þ¤»¤ó" -#: src/reader.c:340 src/reader.c:355 src/reader.c:368 +#: src/reader.c:341 src/reader.c:355 src/reader.c:368 #, c-format msgid "only one %s allowed per rule" msgstr "" -#: src/reader.c:350 src/reader.c:366 +#: src/reader.c:351 src/reader.c:366 #, c-format msgid "%s affects only GLR parsers" msgstr "" @@ -340,174 +344,178 @@ msgstr "" msgid "%s must be followed by positive number" msgstr "" -#: src/reader.c:512 +#: src/reader.c:510 msgid "no rules in the input grammar" msgstr "ÆþÎϤ·¤¿Ê¸Ë¡¤Ëµ¬Â§¤¬ÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó" -#: src/reduce.c:239 +#: src/reduce.c:241 #, fuzzy msgid "useless rule" msgstr "%d ¸Ä¤Î̵°ÕÌ£¤Êµ¬Â§" #: src/reduce.c:302 -#, fuzzy -msgid "useless nonterminal" -msgstr "%d ¸Ä¤Î̵°ÕÌ£¤ÊÈó½ªÃ¼»Ò" +#, fuzzy, c-format +msgid "useless nonterminal: %s" +msgstr "̵°ÕÌ£¤ÊÈó½ªÃ¼»Ò:" -#: src/reduce.c:349 +#: src/reduce.c:350 #, fuzzy msgid "Useless nonterminals" msgstr "̵°ÕÌ£¤ÊÈó½ªÃ¼»Ò:" -#: src/reduce.c:362 +#: src/reduce.c:363 #, fuzzy msgid "Terminals which are not used" msgstr "ÍøÍѤµ¤ì¤Ê¤¤½ªÃ¼»Ò:" -#: src/reduce.c:371 +#: src/reduce.c:372 #, fuzzy msgid "Useless rules" msgstr "̵°ÕÌ£¤Êµ¬Â§:" -#: src/reduce.c:387 +#: src/reduce.c:388 #, c-format msgid "%d rule never reduced\n" msgid_plural "%d rules never reduced\n" msgstr[0] "%d ¸Ä¤Îµ¬Â§¤Ï·è¤·¤Æ´Ô¸µ¤µ¤ì¤Þ¤»¤ó\n" -#: src/reduce.c:395 +#: src/reduce.c:396 #, c-format msgid "%d useless nonterminal" msgid_plural "%d useless nonterminals" msgstr[0] "%d ¸Ä¤Î̵°ÕÌ£¤ÊÈó½ªÃ¼»Ò" -#: src/reduce.c:401 +#: src/reduce.c:402 msgid " and " msgstr "¤ª¤è¤Ó" -#: src/reduce.c:404 +#: src/reduce.c:405 #, c-format msgid "%d useless rule" msgid_plural "%d useless rules" msgstr[0] "%d ¸Ä¤Î̵°ÕÌ£¤Êµ¬Â§" -#: src/reduce.c:435 +#: src/reduce.c:436 #, fuzzy, c-format msgid "start symbol %s does not derive any sentence" msgstr "³«»Ï¥·¥ó¥Ü¥ë %s ¤Ï¤É¤Îʸ¤Ë¤âͳÍ褷¤Þ¤»¤ó" -#: src/scan-gram.l:258 +#: src/scan-gram.l:208 #, fuzzy, c-format msgid "invalid directive: %s" msgstr "ÉÔŬÀÚ¤ÊÆþÎÏ: %s" -#: src/scan-gram.l:287 src/scan-gram.l:661 src/scan-gram.l:733 +#: src/scan-gram.l:216 +msgid "stray `,' treated as white space" +msgstr "" + +#: src/scan-gram.l:232 src/scan-gram.l:727 src/scan-gram.l:798 #, c-format msgid "integer out of range: %s" msgstr "" -#: src/scan-gram.l:327 +#: src/scan-gram.l:276 #, fuzzy, c-format msgid "invalid character: %s" msgstr "̤ÃΤÎʸ»ú: %s" -#: src/scan-gram.l:427 src/scan-gram.l:441 src/scan-gram.l:464 +#: src/scan-gram.l:400 src/scan-gram.l:410 src/scan-gram.l:429 #, fuzzy, c-format msgid "invalid escape sequence: %s" msgstr "ÉÔŬÀÚ¤ÊÆþÎÏ: %s" -#: src/scan-gram.l:472 +#: src/scan-gram.l:434 #, fuzzy, c-format msgid "unrecognized escape sequence: %s" msgstr "ǧ¼±¤Ç¤­¤Ê¤¤: %s" -#: src/scan-gram.l:632 +#: src/scan-gram.l:699 #, c-format msgid "$$ of `%s' has no declared type" msgstr "`%s' ¤Î $$ ¤ËÀë¸À¤Î¤Ê¤¤·¿¤¬¤¢¤ê¤Þ¤¹" -#: src/scan-gram.l:652 +#: src/scan-gram.l:718 #, c-format msgid "$%d of `%s' has no declared type" msgstr "$%d ¸Ä¤Î `%s' ¤¬Àë¸À¤µ¤ì¤¿·¿¤ò»ý¤Ã¤Æ¤¤¤Þ¤»¤ó" -#: src/scan-gram.l:678 src/scan-gram.l:750 +#: src/scan-gram.l:744 src/scan-gram.l:815 #, fuzzy, c-format msgid "invalid value: %s" msgstr "ÉÔŬÀÚ¤Ê $ ¤ÎÃÍ" -#: src/scan-gram.l:861 +#: src/scan-gram.l:928 #, fuzzy, c-format msgid "missing `%s' at end of file" msgstr "ÊĤ¸¤é¤ì¤Æ¤¤¤Ê¤¤Ê¸»úÎ󤬥ե¡¥¤¥ëËöÈø¤Ë¤¢¤ê¤Þ¤¹" -#: src/symlist.c:97 src/symlist.c:109 +#: src/symlist.c:97 src/symlist.c:108 msgid "invalid $ value" msgstr "ÉÔŬÀÚ¤Ê $ ¤ÎÃÍ" -#: src/symtab.c:82 +#: src/symtab.c:84 #, c-format msgid "type redeclaration for %s" msgstr "%s ¤Î·¿¤¬ºÆÄêµÁ¤µ¤ì¤Þ¤·¤¿" -#: src/symtab.c:100 src/symtab.c:119 +#: src/symtab.c:101 src/symtab.c:119 #, fuzzy, c-format msgid "%s redeclaration for %s" msgstr "%s ¤Î·¿¤¬ºÆÄêµÁ¤µ¤ì¤Þ¤·¤¿" -#: src/symtab.c:140 +#: src/symtab.c:138 #, c-format msgid "redefining precedence of %s" msgstr "%s ¤ËÀè¹Ô¤·¤¿ºÆÄêµÁ¤Ç¤¹" -#: src/symtab.c:159 +#: src/symtab.c:156 #, c-format msgid "symbol %s redefined" msgstr "¥·¥ó¥Ü¥ë %s ¤¬ºÆÄêµÁ¤µ¤ì¤Þ¤·¤¿" -#: src/symtab.c:183 +#: src/symtab.c:179 #, fuzzy, c-format msgid "redefining user token number of %s" msgstr "%s ¤ËÀè¹Ô¤·¤¿ºÆÄêµÁ¤Ç¤¹" -#: src/symtab.c:222 +#: src/symtab.c:206 #, c-format msgid "symbol %s is used, but is not defined as a token and has no rules" msgstr "" "¥·¥ó¥Ü¥ë %s ¤¬»È¤ï¤ì¤Æ¤¤¤Þ¤¹¤¬¡¢¥È¡¼¥¯¥ó¤È¤·¤ÆÄêµÁ¤µ¤ì¤Æ¤ª¤é¤º¡¢µ¬Â§¤ò»ý¤Á¤Þ" "¤»¤ó" -#: src/symtab.c:241 +#: src/symtab.c:231 #, c-format msgid "symbol `%s' used more than once as a literal string" msgstr "¥·¥ó¥Ü¥ë `%s' ¤Ï¥ê¥Æ¥é¥ëʸ»úÎó¤È¤·¤ÆÊ£¿ô²ó»È¤ï¤ì¤Þ¤·¤¿" -#: src/symtab.c:244 +#: src/symtab.c:234 #, c-format msgid "symbol `%s' given more than one literal string" msgstr "¥·¥ó¥Ü¥ë `%s' ¤ÏÊ£¿ô¤Î¥ê¥Æ¥é¥ëʸ»úÎó¤¬Í¿¤¨¤é¤ì¤Þ¤·¤¿" -#: src/symtab.c:279 +#: src/symtab.c:269 #, c-format msgid "conflicting precedences for %s and %s" msgstr "Àè¹Ô¤·¤Æ¤¤¤ë %s ¤È %s ¤Ç¶¥¹ç¤¬À¸¤¸¤Æ¤¤¤Þ¤¹" -#: src/symtab.c:291 +#: src/symtab.c:281 #, fuzzy, c-format msgid "conflicting associativities for %s (%s) and %s (%s)" msgstr "Èó·ë¹çÃÍ %s ¤È %s ¤Ç¶¥¹ç¤¬À¸¤¸¤Æ¤¤¤Þ¤¹" -#: src/symtab.c:363 +#: src/symtab.c:366 #, c-format msgid "tokens %s and %s both assigned number %d" msgstr "¥È¡¼¥¯¥ó %s ¤È %s ¤ÎÁÐÊý¤¬ÈÖ¹æ %d ¤Ë³ä¤êÅö¤Æ¤é¤ì¤Þ¤·¤¿" -#: src/symtab.c:570 +#: src/symtab.c:589 #, c-format msgid "the start symbol %s is undefined" msgstr "³«»Ï¥·¥ó¥Ü¥ë %s ¤ÏÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó" -#: src/symtab.c:574 +#: src/symtab.c:593 #, c-format msgid "the start symbol %s is a token" msgstr "³«»Ï¥·¥ó¥Ü¥ë %s ¤Ï¥È¡¼¥¯¥ó¤Ç¤¹" @@ -590,62 +598,62 @@ msgstr "" msgid "Could not open stats file for writing." msgstr "" -#: lib/getopt.c:662 +#: lib/getopt.c:688 lib/getopt.c:700 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: ¥ª¥×¥·¥ç¥ó `%s' ¤ÏÛ£Ëæ¤Ç¤¹\n" -#: lib/getopt.c:687 +#: lib/getopt.c:733 lib/getopt.c:737 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: ¥ª¥×¥·¥ç¥ó `--%s' ¤Ï°ú¿ô¤òµö¤·¤Þ¤»¤ó\n" -#: lib/getopt.c:692 +#: lib/getopt.c:746 lib/getopt.c:751 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: ¥ª¥×¥·¥ç¥ó `%c%s' ¤Ï°ú¿ô¤òµö¤·¤Þ¤»¤ó\n" -#: lib/getopt.c:710 lib/getopt.c:883 +#: lib/getopt.c:787 lib/getopt.c:800 lib/getopt.c:1089 lib/getopt.c:1102 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: ¥ª¥×¥·¥ç¥ó `%s' ¤Ï°ú¿ô¤òÍ׵ᤷ¤Þ¤¹\n" -#: lib/getopt.c:739 +#: lib/getopt.c:838 lib/getopt.c:841 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: ǧ¼±¤Ç¤­¤Ê¤¤¥ª¥×¥·¥ç¥ó `--%s' ¤Ç¤¹\n" -#: lib/getopt.c:743 +#: lib/getopt.c:849 lib/getopt.c:852 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: ǧ¼±¤Ç¤­¤Ê¤¤¥ª¥×¥·¥ç¥ó `%c%s' ¤Ç¤¹\n" -#: lib/getopt.c:769 +#: lib/getopt.c:899 lib/getopt.c:902 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: Äê³Ê³°¤Î¥ª¥×¥·¥ç¥ó -- %c\n" -#: lib/getopt.c:772 +#: lib/getopt.c:908 lib/getopt.c:911 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: ÉÔŬÀڤʥª¥×¥·¥ç¥ó -- %c\n" -#: lib/getopt.c:802 lib/getopt.c:932 +#: lib/getopt.c:958 lib/getopt.c:969 lib/getopt.c:1155 lib/getopt.c:1168 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: ¥ª¥×¥·¥ç¥ó¤Ï°ú¿ô¤òÍ׵ᤷ¤Þ¤¹ -- %c\n" -#: lib/getopt.c:849 +#: lib/getopt.c:1021 lib/getopt.c:1032 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: ¥ª¥×¥·¥ç¥ó `-W %s' ¤ÏÛ£Ëæ¤Ç¤¹\n" -#: lib/getopt.c:867 +#: lib/getopt.c:1056 lib/getopt.c:1068 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: ¥ª¥×¥·¥ç¥ó `-W %s' ¤Ï°ú¿ô¤òµö¤·¤Þ¤»¤ó\n" -#: lib/obstack.c:496 lib/obstack.c:499 lib/xmalloc.c:63 +#: lib/obstack.c:487 lib/obstack.c:490 lib/xmalloc.c:63 msgid "memory exhausted" msgstr "¥á¥â¥ê¤ò»È¤¤²Ì¤¿¤·¤Þ¤·¤¿" diff --git a/po/nl.po b/po/nl.po index 06147183..7ae3c4af 100644 --- a/po/nl.po +++ b/po/nl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: bison 1.75b\n" -"POT-Creation-Date: 2002-11-24 23:54-0800\n" +"POT-Creation-Date: 2002-12-13 03:47-0800\n" "PO-Revision-Date: 2002-11-16 11:43+0100\n" "Last-Translator: Tim Van Holder \n" "Language-Team: Dutch \n" @@ -15,106 +15,106 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: src/complain.c:78 lib/error.c:126 lib/error.c:154 +#: src/complain.c:56 lib/error.c:135 lib/error.c:163 msgid "Unknown system error" msgstr "Onbekende systeemfout" -#: src/complain.c:103 src/complain.c:120 +#: src/complain.c:80 src/complain.c:97 msgid "warning: " msgstr "let op: " -#: src/complain.c:182 src/complain.c:200 +#: src/complain.c:159 src/complain.c:177 msgid "fatal error: " msgstr "fatale fout: " -#: src/conflicts.c:72 +#: src/conflicts.c:75 #, c-format msgid " Conflict between rule %d and token %s resolved as shift" msgstr " Conflict tussen regel %d en token %s opgelost als shift" -#: src/conflicts.c:80 +#: src/conflicts.c:83 #, c-format msgid " Conflict between rule %d and token %s resolved as reduce" msgstr " Conflict tussen regel %d en token %s opgelost als reductie" -#: src/conflicts.c:87 +#: src/conflicts.c:90 #, c-format msgid " Conflict between rule %d and token %s resolved as an error" msgstr " Conflict tussen regel %d en token %s opgelost als een fout" -#: src/conflicts.c:401 +#: src/conflicts.c:403 #, c-format msgid "%d shift/reduce conflict" msgid_plural "%d shift/reduce conflicts" msgstr[0] "%d shift/reductie conflict" msgstr[1] "%d shift/reductie conflicten" -#: src/conflicts.c:408 +#: src/conflicts.c:410 msgid "and" msgstr "en" -#: src/conflicts.c:414 +#: src/conflicts.c:416 #, c-format msgid "%d reduce/reduce conflict" msgid_plural "%d reduce/reduce conflicts" msgstr[0] "%d reductie/reductie conflict" msgstr[1] "%d reductie/reductie conflicten" -#: src/conflicts.c:434 +#: src/conflicts.c:436 msgid "conflicts: " msgstr "conflicten: " -#: src/conflicts.c:436 +#: src/conflicts.c:438 #, c-format msgid " %d shift/reduce" msgstr " %d shift/reductie" -#: src/conflicts.c:440 +#: src/conflicts.c:442 #, c-format msgid " %d reduce/reduce" msgstr " %d reductie/reductie" -#: src/conflicts.c:459 +#: src/conflicts.c:461 #, c-format msgid "State %d contains " msgstr "Staat %d bevat" -#: src/conflicts.c:536 +#: src/conflicts.c:538 #, c-format msgid "expected %d shift/reduce conflict" msgid_plural "expected %d shift/reduce conflicts" msgstr[0] "%d shift/reductie conflict werd verwacht" msgstr[1] "%d shift/reductie conflicten werden verwacht" -#: src/files.c:111 +#: src/files.c:98 #, c-format msgid "cannot open file `%s'" msgstr "kan bestand `%s' niet openen" -#: src/files.c:127 +#: src/files.c:114 msgid "I/O error" msgstr "I/O fout" -#: src/files.c:130 +#: src/files.c:117 msgid "cannot close file" msgstr "kan bestand niet sluiten" -#: src/getargs.c:167 +#: src/getargs.c:182 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Probeer `%s --help' voor meer informatie.\n" # Dank U, Akim :-) -#: src/getargs.c:173 +#: src/getargs.c:188 msgid "GNU bison generates parsers for LALR(1) grammars.\n" msgstr "GNU bison genereert parsers voor LALR(1) grammatica's.\n" -#: src/getargs.c:177 +#: src/getargs.c:192 #, c-format msgid "Usage: %s [OPTION]... FILE\n" msgstr "Gebruik: %s [OPTIE]... BESTAND\n" -#: src/getargs.c:181 +#: src/getargs.c:196 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" @@ -124,7 +124,7 @@ msgstr "" "optionele argumenten geldt dezelfde regel.\n" # Misschien beter 'een POSIX-compatibele yacc'? -#: src/getargs.c:187 +#: src/getargs.c:202 msgid "" "Operation modes:\n" " -h, --help display this help and exit\n" @@ -138,7 +138,7 @@ msgstr "" # Correcte vervoeging van 'voorvoegen'? # Betere vertaling voor 'directives'? -#: src/getargs.c:194 +#: src/getargs.c:209 msgid "" "Parser:\n" " -S, --skeleton=FILE specify the skeleton to use\n" @@ -158,7 +158,7 @@ msgstr "" " -n, --no-parser genereer alleen de tabellen\n" " -k, --token-table genereer ook een tabel van tokennamen\n" -#: src/getargs.c:206 +#: src/getargs.c:221 msgid "" "Output:\n" " -d, --defines also produce a header file\n" @@ -179,7 +179,7 @@ msgstr "" "automaat\n" # Verschillende dingen die beter zouden moeten kunnen - zeker de 'itemset' tekst -#: src/getargs.c:217 +#: src/getargs.c:232 msgid "" "THINGS is a list of comma separated words that can include:\n" " `state' describe the states\n" @@ -199,27 +199,27 @@ msgstr "" " `all' bevat al de bovenstaande keuzes\n" " `none' schakel de rapportering uit\n" -#: src/getargs.c:228 +#: src/getargs.c:243 msgid "Report bugs to .\n" msgstr "" "Meld bugs aan .\n" "Meld fouten in de vertaling aan .\n" -#: src/getargs.c:245 +#: src/getargs.c:260 #, c-format msgid "bison (GNU Bison) %s" msgstr "bison (GNU Bison) %s" -#: src/getargs.c:247 +#: src/getargs.c:262 msgid "Written by Robert Corbett and Richard Stallman.\n" msgstr "Geschreven door Robert Corbett en Richard Stallman.\n" -#: src/getargs.c:251 +#: src/getargs.c:266 #, c-format msgid "Copyright (C) %d Free Software Foundation, Inc.\n" msgstr "Copyright (C) %d Free Software Foundation, Inc.\n" -#: src/getargs.c:253 +#: src/getargs.c:268 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" @@ -228,56 +228,60 @@ msgstr "" "garantie; zelfs niet voor VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN BEPAALD\n" "DOEL.\n" -#: src/getargs.c:407 +#: src/getargs.c:423 #, c-format msgid "missing operand after `%s'" msgstr "operand ontbreekt na `%s'" -#: src/getargs.c:409 +#: src/getargs.c:425 #, c-format msgid "extra operand `%s'" msgstr "overtollige operand `%s'" -#: src/gram.c:139 +#: src/gram.c:142 msgid "empty" msgstr "leeg" -#: src/gram.c:233 +#: src/gram.c:236 msgid "Grammar" msgstr "Grammatica" -#: src/gram.c:321 src/reduce.c:302 src/reduce.c:392 +#: src/gram.c:324 src/reduce.c:393 msgid "warning" msgstr "let op" -#: src/main.c:120 +#: src/main.c:124 msgid "rule never reduced because of conflicts" msgstr "regel wordt nooit gereduceerd omwille van conflicten" -#: src/parse-gram.y:364 +#: src/parse-gram.y:336 msgid "POSIX forbids declarations in the grammar" msgstr "POSIX verbiedt declaraties binnen de grammatica" -#: src/print.c:46 +#: src/parse-gram.y:468 +msgid "missing identifier in parameter declaration" +msgstr "" + +#: src/print.c:48 #, c-format msgid " type %d is %s\n" msgstr " type %d is %s\n" -#: src/print.c:162 +#: src/print.c:164 #, c-format msgid "shift, and go to state %d\n" msgstr "shift, en ga naar staat %d\n" -#: src/print.c:164 +#: src/print.c:166 #, c-format msgid "go to state %d\n" msgstr "ga naar staat %d\n" -#: src/print.c:201 +#: src/print.c:203 msgid "error (nonassociative)\n" msgstr "fout (niet associatief)\n" -#: src/print.c:290 +#: src/print.c:291 #, c-format msgid "reduce using rule %d (%s)" msgstr "reduceren via regel %d (%s)" @@ -295,57 +299,57 @@ msgstr "$standaard" msgid "state %d" msgstr "staat %d" -#: src/print.c:456 +#: src/print.c:455 msgid "Terminals, with rules where they appear" msgstr "Eindsymbolen, met de regels waarin ze voorkomen" # Betere vertaling voor non-terminals? 'tussensymbolen'? -#: src/print.c:483 +#: src/print.c:482 msgid "Nonterminals, with rules where they appear" msgstr "Niet-eindsymbolen, met de regels waarin ze voorkomen" -#: src/print.c:512 +#: src/print.c:511 msgid " on left:" msgstr " links:" -#: src/print.c:527 +#: src/print.c:526 msgid " on right:" msgstr " rechts:" -#: src/print.c:555 +#: src/print.c:554 msgid "Rules never reduced" msgstr "Regels die nooit gereduceerd worden" -#: src/reader.c:51 +#: src/reader.c:53 #, c-format msgid "multiple %s declarations" msgstr "meerdere %s declaraties" -#: src/reader.c:137 +#: src/reader.c:138 #, c-format msgid "result type clash on merge function %s: <%s> != <%s>" msgstr "botsing tussen resultaattypes bij merge-functie %s: «%s» != «%s»" -#: src/reader.c:235 +#: src/reader.c:236 #, c-format msgid "rule given for %s, which is a token" msgstr "regel opgegeven voor token (%s)" -#: src/reader.c:264 +#: src/reader.c:265 #, c-format msgid "type clash on default action: <%s> != <%s>" msgstr "type-conflict bij standaardaktie: «%s» != «%s»" -#: src/reader.c:270 +#: src/reader.c:271 msgid "empty rule for typed nonterminal, and no action" msgstr "lege regel voor niet-eindsymbool met type, en geen actie" -#: src/reader.c:340 src/reader.c:355 src/reader.c:368 +#: src/reader.c:341 src/reader.c:355 src/reader.c:368 #, c-format msgid "only one %s allowed per rule" msgstr "slechts één %s toegestaan per regel" -#: src/reader.c:350 src/reader.c:366 +#: src/reader.c:351 src/reader.c:366 #, c-format msgid "%s affects only GLR parsers" msgstr "%s is enkel van toepassing op GLR parsers" @@ -355,49 +359,50 @@ msgstr "%s is enkel van toepassing op GLR parsers" msgid "%s must be followed by positive number" msgstr "%s moet gevolgd worden door een positief getal" -#: src/reader.c:512 +#: src/reader.c:510 msgid "no rules in the input grammar" msgstr "invoergrammatica bevat geen regels" -#: src/reduce.c:239 +#: src/reduce.c:241 msgid "useless rule" msgstr "nutteloze regel" #: src/reduce.c:302 -msgid "useless nonterminal" +#, fuzzy, c-format +msgid "useless nonterminal: %s" msgstr "nutteloos niet-eindsymbool" -#: src/reduce.c:349 +#: src/reduce.c:350 msgid "Useless nonterminals" msgstr "Nutteloze niet-eindsymbolen" -#: src/reduce.c:362 +#: src/reduce.c:363 msgid "Terminals which are not used" msgstr "Eindsymbolen die niet gebruikt worden" -#: src/reduce.c:371 +#: src/reduce.c:372 msgid "Useless rules" msgstr "Nutteloze regels" -#: src/reduce.c:387 +#: src/reduce.c:388 #, c-format msgid "%d rule never reduced\n" msgid_plural "%d rules never reduced\n" msgstr[0] "%d regel wordt nooit gereduceerd\n" msgstr[1] "%d regels worden nooit gereduceerd\n" -#: src/reduce.c:395 +#: src/reduce.c:396 #, c-format msgid "%d useless nonterminal" msgid_plural "%d useless nonterminals" msgstr[0] "%d nutteloos niet-eindsymbool" msgstr[1] "%d nutteloze niet-eindsymbolen" -#: src/reduce.c:401 +#: src/reduce.c:402 msgid " and " msgstr " en " -#: src/reduce.c:404 +#: src/reduce.c:405 #, c-format msgid "%d useless rule" msgid_plural "%d useless rules" @@ -405,125 +410,129 @@ msgstr[0] "%d nutteloze regel" msgstr[1] "%d nutteloze regels" # Ik _denk_ dat dit correct weergeeft wat er bedoeld wordt (m.a.w. er is geen regel voor het startsymbool) -#: src/reduce.c:435 +#: src/reduce.c:436 #, c-format msgid "start symbol %s does not derive any sentence" msgstr "uit startsymbool %s kan geen enkele zin afgeleid worden" -#: src/scan-gram.l:258 +#: src/scan-gram.l:208 #, c-format msgid "invalid directive: %s" msgstr "ongeldig commando: %s" +#: src/scan-gram.l:216 +msgid "stray `,' treated as white space" +msgstr "" + # Hier zou wel het bereik bij vermeld mogen worden... -#: src/scan-gram.l:287 src/scan-gram.l:661 src/scan-gram.l:733 +#: src/scan-gram.l:232 src/scan-gram.l:727 src/scan-gram.l:798 #, c-format msgid "integer out of range: %s" msgstr "integer buiten bereik: %s" -#: src/scan-gram.l:327 +#: src/scan-gram.l:276 #, c-format msgid "invalid character: %s" msgstr "ongeldig teken: %s" -#: src/scan-gram.l:427 src/scan-gram.l:441 src/scan-gram.l:464 +#: src/scan-gram.l:400 src/scan-gram.l:410 src/scan-gram.l:429 #, c-format msgid "invalid escape sequence: %s" msgstr "ongeldige escape: %s" -#: src/scan-gram.l:472 +#: src/scan-gram.l:434 #, c-format msgid "unrecognized escape sequence: %s" msgstr "onbekende escape: %s" -#: src/scan-gram.l:632 +#: src/scan-gram.l:699 #, c-format msgid "$$ of `%s' has no declared type" msgstr "$$ van `%s' heeft geen gedeclareerd type" -#: src/scan-gram.l:652 +#: src/scan-gram.l:718 #, c-format msgid "$%d of `%s' has no declared type" msgstr "$%d van `%s' heeft geen gedeclareerd type" -#: src/scan-gram.l:678 src/scan-gram.l:750 +#: src/scan-gram.l:744 src/scan-gram.l:815 #, c-format msgid "invalid value: %s" msgstr "ongeldige waarde: %s" -#: src/scan-gram.l:861 +#: src/scan-gram.l:928 #, c-format msgid "missing `%s' at end of file" msgstr "`%s' ontbreekt aan einde van bestand" -#: src/symlist.c:97 src/symlist.c:109 +#: src/symlist.c:97 src/symlist.c:108 msgid "invalid $ value" msgstr "ongeldige $-waarde" -#: src/symtab.c:82 +#: src/symtab.c:84 #, c-format msgid "type redeclaration for %s" msgstr "type herdeclaratie voor %s" # Dit ziet er een potentieel slechte originele string uit - wat kan er in die eerste '%s' staan? -#: src/symtab.c:100 src/symtab.c:119 +#: src/symtab.c:101 src/symtab.c:119 #, c-format msgid "%s redeclaration for %s" msgstr "%s herdeclaratie voor %s" -#: src/symtab.c:140 +#: src/symtab.c:138 #, c-format msgid "redefining precedence of %s" msgstr "herdefinitie van de voorrang van %s" -#: src/symtab.c:159 +#: src/symtab.c:156 #, c-format msgid "symbol %s redefined" msgstr "symbool %s opnieuw gedefinieerd" -#: src/symtab.c:183 +#: src/symtab.c:179 #, c-format msgid "redefining user token number of %s" msgstr "herdefinitie van het door de gebruiker gekozen tokennummer van %s" -#: src/symtab.c:222 +#: src/symtab.c:206 #, 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/symtab.c:241 +#: src/symtab.c:231 #, 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/symtab.c:244 +#: src/symtab.c:234 #, c-format msgid "symbol `%s' given more than one literal string" msgstr "symbool `%s' krijgt meer dan één letterlijke string toegewezen" -#: src/symtab.c:279 +#: src/symtab.c:269 #, c-format msgid "conflicting precedences for %s and %s" msgstr "voorrangen voor %s en %s geven conflicten" -#: src/symtab.c:291 +#: src/symtab.c:281 #, c-format msgid "conflicting associativities for %s (%s) and %s (%s)" msgstr "associativiteitswaarden voor %s (%s) en %s (%s) geven conflicten" -#: src/symtab.c:363 +#: src/symtab.c:366 #, c-format msgid "tokens %s and %s both assigned number %d" msgstr "tokens %s en %s hebben beide nummer %d toegewezen gekregen" -#: src/symtab.c:570 +#: src/symtab.c:589 #, c-format msgid "the start symbol %s is undefined" msgstr "het startsymbool %s is niet gedefinieerd" -#: src/symtab.c:574 +#: src/symtab.c:593 #, c-format msgid "the start symbol %s is a token" msgstr "het startsymbool %s is een token" @@ -608,62 +617,62 @@ msgstr "Kon niet schrijven naar het statistiekenbestand." msgid "Could not open stats file for writing." msgstr "Kon het statistiekenbestand niet openen voor schrijven." -#: lib/getopt.c:662 +#: lib/getopt.c:688 lib/getopt.c:700 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: optie `%s' is niet eenduidig\n" -#: lib/getopt.c:687 +#: lib/getopt.c:733 lib/getopt.c:737 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: optie `--%s' staat geen argument toe\n" -#: lib/getopt.c:692 +#: lib/getopt.c:746 lib/getopt.c:751 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: optie `%c%s' staat geen argument toe\n" -#: lib/getopt.c:710 lib/getopt.c:883 +#: lib/getopt.c:787 lib/getopt.c:800 lib/getopt.c:1089 lib/getopt.c:1102 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: optie `%s' vereist een argument\n" -#: lib/getopt.c:739 +#: lib/getopt.c:838 lib/getopt.c:841 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: onbekende optie `--%s'\n" -#: lib/getopt.c:743 +#: lib/getopt.c:849 lib/getopt.c:852 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: onbekende optie `%c%s'\n" -#: lib/getopt.c:769 +#: lib/getopt.c:899 lib/getopt.c:902 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: ongeldige optie -- %c\n" -#: lib/getopt.c:772 +#: lib/getopt.c:908 lib/getopt.c:911 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: ongeldige optie -- %c\n" -#: lib/getopt.c:802 lib/getopt.c:932 +#: lib/getopt.c:958 lib/getopt.c:969 lib/getopt.c:1155 lib/getopt.c:1168 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: optie vereist een argument -- %c\n" -#: lib/getopt.c:849 +#: lib/getopt.c:1021 lib/getopt.c:1032 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: optie `-W %s' is niet eenduidig\n" -#: lib/getopt.c:867 +#: lib/getopt.c:1056 lib/getopt.c:1068 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: optie `--%s' staat geen argument toe\n" -#: lib/obstack.c:496 lib/obstack.c:499 lib/xmalloc.c:63 +#: lib/obstack.c:487 lib/obstack.c:490 lib/xmalloc.c:63 msgid "memory exhausted" msgstr "geen geheugen meer beschikbaar" diff --git a/po/pt_BR.po b/po/pt_BR.po index bbb7c568..46cb6b78 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: bison 1.75b\n" -"POT-Creation-Date: 2002-11-24 23:54-0800\n" +"POT-Creation-Date: 2002-12-13 03:47-0800\n" "PO-Revision-Date: 2002-11-14 01:30-0300\n" "Last-Translator: Alexandre Folle de Menezes \n" "Language-Team: Brazilian Portuguese \n" @@ -14,105 +14,105 @@ msgstr "" "Content-Transfer-Encoding: 8-bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: src/complain.c:78 lib/error.c:126 lib/error.c:154 +#: src/complain.c:56 lib/error.c:135 lib/error.c:163 msgid "Unknown system error" msgstr "Erro de sistema desconhecido" -#: src/complain.c:103 src/complain.c:120 +#: src/complain.c:80 src/complain.c:97 msgid "warning: " msgstr "aviso: " -#: src/complain.c:182 src/complain.c:200 +#: src/complain.c:159 src/complain.c:177 msgid "fatal error: " msgstr "erro fatal: " -#: src/conflicts.c:72 +#: src/conflicts.c:75 #, c-format msgid " Conflict between rule %d and token %s resolved as shift" msgstr " Conflito entre a regra %d e a token %s resolvido como `shift`." -#: src/conflicts.c:80 +#: src/conflicts.c:83 #, c-format msgid " Conflict between rule %d and token %s resolved as reduce" msgstr " Conflito entre a regra %d e a token %s resolvido como `reduce`." -#: src/conflicts.c:87 +#: src/conflicts.c:90 #, c-format msgid " Conflict between rule %d and token %s resolved as an error" msgstr " Conflito entre a regra %d e a token %s resolvido como um erro." -#: src/conflicts.c:401 +#: src/conflicts.c:403 #, c-format msgid "%d shift/reduce conflict" msgid_plural "%d shift/reduce conflicts" msgstr[0] "%d conflito de deslocamento/redução" msgstr[1] "%d conflitos de deslocamento/redução" -#: src/conflicts.c:408 +#: src/conflicts.c:410 msgid "and" msgstr "e" -#: src/conflicts.c:414 +#: src/conflicts.c:416 #, c-format msgid "%d reduce/reduce conflict" msgid_plural "%d reduce/reduce conflicts" msgstr[0] "%d conflito de redução/redução" msgstr[1] "%d conflitos de redução/redução" -#: src/conflicts.c:434 +#: src/conflicts.c:436 msgid "conflicts: " msgstr "conflitos: " -#: src/conflicts.c:436 +#: src/conflicts.c:438 #, c-format msgid " %d shift/reduce" msgstr " %d deslocamento/redução" -#: src/conflicts.c:440 +#: src/conflicts.c:442 #, c-format msgid " %d reduce/reduce" msgstr " %d redução/redução" -#: src/conflicts.c:459 +#: src/conflicts.c:461 #, c-format msgid "State %d contains " msgstr "O estado %d contém " -#: src/conflicts.c:536 +#: src/conflicts.c:538 #, c-format msgid "expected %d shift/reduce conflict" msgid_plural "expected %d shift/reduce conflicts" msgstr[0] "esperado: %d conflito de deslocamento/redução" msgstr[1] "esperados: %d conflitos de deslocamento/redução" -#: src/files.c:111 +#: src/files.c:98 #, c-format msgid "cannot open file `%s'" msgstr "impossível abrir o arquivo `%s'" -#: src/files.c:127 +#: src/files.c:114 msgid "I/O error" msgstr "Erro de E/S" -#: src/files.c:130 +#: src/files.c:117 msgid "cannot close file" msgstr "impossível fechar o arquivo" -#: src/getargs.c:167 +#: src/getargs.c:182 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "tente `%s --help' para mais informações.\n" -#: src/getargs.c:173 +#: src/getargs.c:188 msgid "GNU bison generates parsers for LALR(1) grammars.\n" msgstr "GNU bison gera analisadores para gramáticas LALR(1).\n" -#: src/getargs.c:177 +#: src/getargs.c:192 #, c-format msgid "Usage: %s [OPTION]... FILE\n" msgstr "Uso: %s [OPCAO]... ARQUIVO\n" -#: src/getargs.c:181 +#: src/getargs.c:196 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" @@ -121,7 +121,7 @@ msgstr "" "obrigatório para a opção curta equivalente também. Igualmente para os\n" "argumentos opcionais.\n" -#: src/getargs.c:187 +#: src/getargs.c:202 msgid "" "Operation modes:\n" " -h, --help display this help and exit\n" @@ -133,7 +133,7 @@ msgstr "" " -V, --version mostra informações de versão e sai\n" " -y, --yacc emula o yacc POSIX\n" -#: src/getargs.c:194 +#: src/getargs.c:209 msgid "" "Parser:\n" " -S, --skeleton=FILE specify the skeleton to use\n" @@ -153,7 +153,7 @@ msgstr "" " -n, --no-parser apenas gera as tabelas\n" " --k, --token-table inclui uma tabela de nomes de tokens\n" -#: src/getargs.c:206 +#: src/getargs.c:221 msgid "" "Output:\n" " -d, --defines also produce a header file\n" @@ -172,7 +172,7 @@ msgstr "" " -o, --output=ARQUIVO armazena a saída em ARQUIVO\n" " -g, --graph também produz uma descrição em VCG do autômato\n" -#: src/getargs.c:217 +#: src/getargs.c:232 msgid "" "THINGS is a list of comma separated words that can include:\n" " `state' describe the states\n" @@ -191,25 +191,25 @@ msgstr "" " `all' inclui todas as informações acima\n" " `none' desabilita o relatório\n" -#: src/getargs.c:228 +#: src/getargs.c:243 msgid "Report bugs to .\n" msgstr "Informe os erros para .\n" -#: src/getargs.c:245 +#: src/getargs.c:260 #, c-format msgid "bison (GNU Bison) %s" msgstr "bison (GNU bison) %s" -#: src/getargs.c:247 +#: src/getargs.c:262 msgid "Written by Robert Corbett and Richard Stallman.\n" msgstr "Escrito por Robert Corbett e Richard Stallman.\n" -#: src/getargs.c:251 +#: src/getargs.c:266 #, c-format msgid "Copyright (C) %d Free Software Foundation, Inc.\n" msgstr "Copyright (C) %d Free Software Foundation, Inc.\n" -#: src/getargs.c:253 +#: src/getargs.c:268 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" @@ -220,56 +220,60 @@ msgstr "" "ou\n" "ADEQUAÇÃO À QUALQUER FINALIDADE PARTICULAR.\n" -#: src/getargs.c:407 +#: src/getargs.c:423 #, c-format msgid "missing operand after `%s'" msgstr "falta operando depois de `%s'" -#: src/getargs.c:409 +#: src/getargs.c:425 #, c-format msgid "extra operand `%s'" msgstr "operando `%s' sobrando" -#: src/gram.c:139 +#: src/gram.c:142 msgid "empty" msgstr "vazio" -#: src/gram.c:233 +#: src/gram.c:236 msgid "Grammar" msgstr "Gramática" -#: src/gram.c:321 src/reduce.c:302 src/reduce.c:392 +#: src/gram.c:324 src/reduce.c:393 msgid "warning" msgstr "aviso" -#: src/main.c:120 +#: src/main.c:124 msgid "rule never reduced because of conflicts" msgstr "regra não reduzida por causa de conflitos" -#: src/parse-gram.y:364 +#: src/parse-gram.y:336 msgid "POSIX forbids declarations in the grammar" msgstr "o POSIX proíbe declarações na gramática" -#: src/print.c:46 +#: src/parse-gram.y:468 +msgid "missing identifier in parameter declaration" +msgstr "" + +#: src/print.c:48 #, c-format msgid " type %d is %s\n" msgstr " tipo %d é %s\n" -#: src/print.c:162 +#: src/print.c:164 #, c-format msgid "shift, and go to state %d\n" msgstr "deslocar, e ir ao estado %d\n" -#: src/print.c:164 +#: src/print.c:166 #, c-format msgid "go to state %d\n" msgstr "ir ao estado %d\n" -#: src/print.c:201 +#: src/print.c:203 msgid "error (nonassociative)\n" msgstr "erro (não associativo)\n" -#: src/print.c:290 +#: src/print.c:291 #, c-format msgid "reduce using rule %d (%s)" msgstr "reduzir usando a regra %d (%s)" @@ -287,56 +291,56 @@ msgstr "$padr msgid "state %d" msgstr "estado %d" -#: src/print.c:456 +#: src/print.c:455 msgid "Terminals, with rules where they appear" msgstr "Terminais, com as regras onde eles aparecem" -#: src/print.c:483 +#: src/print.c:482 msgid "Nonterminals, with rules where they appear" msgstr "Não-terminais com as regras onde eles aparecem" -#: src/print.c:512 +#: src/print.c:511 msgid " on left:" msgstr " à esquerda:" -#: src/print.c:527 +#: src/print.c:526 msgid " on right:" msgstr " à direita:" -#: src/print.c:555 +#: src/print.c:554 msgid "Rules never reduced" msgstr "Regras nunca reduzidas" -#: src/reader.c:51 +#: src/reader.c:53 #, c-format msgid "multiple %s declarations" msgstr "declarações de %s múltiplas" -#: src/reader.c:137 +#: src/reader.c:138 #, c-format msgid "result type clash on merge function %s: <%s> != <%s>" msgstr "tipo de resultado conflita na fução de mescla %s: <%s> != <%s>" -#: src/reader.c:235 +#: src/reader.c:236 #, c-format msgid "rule given for %s, which is a token" msgstr "regra fornecida para %s, que é um token" -#: src/reader.c:264 +#: src/reader.c:265 #, c-format msgid "type clash on default action: <%s> != <%s>" msgstr "conflito de tipos na ação padrão: <%s> != <%s>" -#: src/reader.c:270 +#: src/reader.c:271 msgid "empty rule for typed nonterminal, and no action" msgstr "regra vazia para um não-terminal com tipo, e não há ações" -#: src/reader.c:340 src/reader.c:355 src/reader.c:368 +#: src/reader.c:341 src/reader.c:355 src/reader.c:368 #, c-format msgid "only one %s allowed per rule" msgstr "apenas um %s é permitido por regra" -#: src/reader.c:350 src/reader.c:366 +#: src/reader.c:351 src/reader.c:366 #, c-format msgid "%s affects only GLR parsers" msgstr "%s afeta apenas analisadores GLR" @@ -346,170 +350,175 @@ msgstr "%s afeta apenas analisadores GLR" msgid "%s must be followed by positive number" msgstr "%s deve ser seguido por um número positivo" -#: src/reader.c:512 +#: src/reader.c:510 msgid "no rules in the input grammar" msgstr "não há regras na gramática de entrada" -#: src/reduce.c:239 +#: src/reduce.c:241 msgid "useless rule" msgstr "regra inútil" #: src/reduce.c:302 -msgid "useless nonterminal" +#, fuzzy, c-format +msgid "useless nonterminal: %s" msgstr "não-terminal inútil" -#: src/reduce.c:349 +#: src/reduce.c:350 msgid "Useless nonterminals" msgstr "Não-terminais inúteis" -#: src/reduce.c:362 +#: src/reduce.c:363 msgid "Terminals which are not used" msgstr "Terminais que não foram usados" -#: src/reduce.c:371 +#: src/reduce.c:372 msgid "Useless rules" msgstr "Regras inúteis" -#: src/reduce.c:387 +#: src/reduce.c:388 #, c-format msgid "%d rule never reduced\n" msgid_plural "%d rules never reduced\n" msgstr[0] "%d regra que nunca foi reduzida\n" msgstr[1] "%d regras que nunca foram reduzidas\n" -#: src/reduce.c:395 +#: src/reduce.c:396 #, c-format msgid "%d useless nonterminal" msgid_plural "%d useless nonterminals" msgstr[0] "%d não-terminal inútil" msgstr[1] "%d não-terminal inútil" -#: src/reduce.c:401 +#: src/reduce.c:402 msgid " and " msgstr " e " -#: src/reduce.c:404 +#: src/reduce.c:405 #, c-format msgid "%d useless rule" msgid_plural "%d useless rules" msgstr[0] "%d regra inútil" msgstr[1] "%d regras inúteis" -#: src/reduce.c:435 +#: src/reduce.c:436 #, c-format msgid "start symbol %s does not derive any sentence" msgstr "símbolo de início %s não deriva nenhuma sentença" -#: src/scan-gram.l:258 +#: src/scan-gram.l:208 #, c-format msgid "invalid directive: %s" msgstr "diretiva inválida: %s" -#: src/scan-gram.l:287 src/scan-gram.l:661 src/scan-gram.l:733 +#: src/scan-gram.l:216 +msgid "stray `,' treated as white space" +msgstr "" + +#: src/scan-gram.l:232 src/scan-gram.l:727 src/scan-gram.l:798 #, c-format msgid "integer out of range: %s" msgstr "inteiro fora de faixa: %s" -#: src/scan-gram.l:327 +#: src/scan-gram.l:276 #, c-format msgid "invalid character: %s" msgstr "caractere inválido: %s" -#: src/scan-gram.l:427 src/scan-gram.l:441 src/scan-gram.l:464 +#: src/scan-gram.l:400 src/scan-gram.l:410 src/scan-gram.l:429 #, c-format msgid "invalid escape sequence: %s" msgstr "seqüência de escape inválida: %s" -#: src/scan-gram.l:472 +#: src/scan-gram.l:434 #, c-format msgid "unrecognized escape sequence: %s" msgstr "seqüência de escape não reconhecida: %s" -#: src/scan-gram.l:632 +#: src/scan-gram.l:699 #, c-format msgid "$$ of `%s' has no declared type" msgstr "$$ de `%s' não tem tipo declarado" -#: src/scan-gram.l:652 +#: src/scan-gram.l:718 #, c-format msgid "$%d of `%s' has no declared type" msgstr "$%d de `%s' não tem tipo declarado" -#: src/scan-gram.l:678 src/scan-gram.l:750 +#: src/scan-gram.l:744 src/scan-gram.l:815 #, c-format msgid "invalid value: %s" msgstr "valor inválido: %s" -#: src/scan-gram.l:861 +#: src/scan-gram.l:928 #, c-format msgid "missing `%s' at end of file" msgstr "`%s' faltando no final do arquivo" -#: src/symlist.c:97 src/symlist.c:109 +#: src/symlist.c:97 src/symlist.c:108 msgid "invalid $ value" msgstr "valor $ inválido" -#: src/symtab.c:82 +#: src/symtab.c:84 #, c-format msgid "type redeclaration for %s" msgstr "redeclaração de tipo para %s" -#: src/symtab.c:100 src/symtab.c:119 +#: src/symtab.c:101 src/symtab.c:119 #, c-format msgid "%s redeclaration for %s" msgstr "redeclaração de %s para %s" -#: src/symtab.c:140 +#: src/symtab.c:138 #, c-format msgid "redefining precedence of %s" msgstr "redefinindo precedência de %s" -#: src/symtab.c:159 +#: src/symtab.c:156 #, c-format msgid "symbol %s redefined" msgstr "símbolo %s redefinido" -#: src/symtab.c:183 +#: src/symtab.c:179 #, c-format msgid "redefining user token number of %s" msgstr "redefinindo número de token de usuário de %s" -#: src/symtab.c:222 +#: src/symtab.c:206 #, c-format msgid "symbol %s is used, but is not defined as a token and has no rules" msgstr "símbolo %s usado, mas não definido como uma token e não tem regras" -#: src/symtab.c:241 +#: src/symtab.c:231 #, c-format msgid "symbol `%s' used more than once as a literal string" msgstr "símbolo `%s' usado mais the uma vez como uma string literal" -#: src/symtab.c:244 +#: src/symtab.c:234 #, c-format msgid "symbol `%s' given more than one literal string" msgstr "símbolo `%s' associado a mais de uma string literal" -#: src/symtab.c:279 +#: src/symtab.c:269 #, c-format msgid "conflicting precedences for %s and %s" msgstr "precedências conflitantes para %s e %s" -#: src/symtab.c:291 +#: src/symtab.c:281 #, c-format msgid "conflicting associativities for %s (%s) and %s (%s)" msgstr "valores associativos conflitantes para %s (%s) e %s (%s)" -#: src/symtab.c:363 +#: src/symtab.c:366 #, c-format msgid "tokens %s and %s both assigned number %d" msgstr "tokens %s e %s associadas ao mesmo número %d" -#: src/symtab.c:570 +#: src/symtab.c:589 #, c-format msgid "the start symbol %s is undefined" msgstr "o símbolo de início %s não está definido" -#: src/symtab.c:574 +#: src/symtab.c:593 #, c-format msgid "the start symbol %s is a token" msgstr "o símbolo de início %s é um terminal" @@ -594,62 +603,62 @@ msgstr "Imposs msgid "Could not open stats file for writing." msgstr "Impossível abrir arquivo de estatísticas para escrita." -#: lib/getopt.c:662 +#: lib/getopt.c:688 lib/getopt.c:700 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: a opção `%s' é ambígua\n" -#: lib/getopt.c:687 +#: lib/getopt.c:733 lib/getopt.c:737 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: a opção `--%s' no admite nenhum argumento\n" -#: lib/getopt.c:692 +#: lib/getopt.c:746 lib/getopt.c:751 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: a opção `%c%s' não admite nenhum argumento\n" -#: lib/getopt.c:710 lib/getopt.c:883 +#: lib/getopt.c:787 lib/getopt.c:800 lib/getopt.c:1089 lib/getopt.c:1102 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: a opção `%s' exige um argumento\n" -#: lib/getopt.c:739 +#: lib/getopt.c:838 lib/getopt.c:841 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: opção `--%s' não reconhecida\n" -#: lib/getopt.c:743 +#: lib/getopt.c:849 lib/getopt.c:852 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: opção `%c%s' não reconhecida\n" -#: lib/getopt.c:769 +#: lib/getopt.c:899 lib/getopt.c:902 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: opção -- %c ilegal\n" -#: lib/getopt.c:772 +#: lib/getopt.c:908 lib/getopt.c:911 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: opção -- %c inválida\n" -#: lib/getopt.c:802 lib/getopt.c:932 +#: lib/getopt.c:958 lib/getopt.c:969 lib/getopt.c:1155 lib/getopt.c:1168 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: a opção -- %c exige um argumento\n" -#: lib/getopt.c:849 +#: lib/getopt.c:1021 lib/getopt.c:1032 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: a opção `-W %s' é ambígua\n" -#: lib/getopt.c:867 +#: lib/getopt.c:1056 lib/getopt.c:1068 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: a opção `-W %s' não admite nenhum argumento\n" -#: lib/obstack.c:496 lib/obstack.c:499 lib/xmalloc.c:63 +#: lib/obstack.c:487 lib/obstack.c:490 lib/xmalloc.c:63 msgid "memory exhausted" msgstr "memória esgotada" diff --git a/po/ru.po b/po/ru.po index dd322c35..fa0998bc 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: bison 1.49a\n" -"POT-Creation-Date: 2002-11-24 23:54-0800\n" +"POT-Creation-Date: 2002-12-13 03:47-0800\n" "PO-Revision-Date: 2002-07-20 13:23+0400\n" "Last-Translator: Dmitry S. Sivachenko \n" "Language-Team: Russian \n" @@ -15,37 +15,37 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: src/complain.c:78 lib/error.c:126 lib/error.c:154 +#: src/complain.c:56 lib/error.c:135 lib/error.c:163 msgid "Unknown system error" msgstr "îÅÉÚ×ÅÓÔÎÁÑ ÓÉÓÔÅÍÎÁÑ ÏÛÉÂËÁ" -#: src/complain.c:103 src/complain.c:120 +#: src/complain.c:80 src/complain.c:97 msgid "warning: " msgstr "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: " -#: src/complain.c:182 src/complain.c:200 +#: src/complain.c:159 src/complain.c:177 msgid "fatal error: " msgstr "ÆÁÔÁÌØÎÁÑ ÏÛÉÂËÁ: " -#: src/conflicts.c:72 +#: src/conflicts.c:75 #, fuzzy, c-format msgid " Conflict between rule %d and token %s resolved as shift" msgstr "" "ëÏÎÆÌÉËÔ × ÓÏÓÔÏÑÎÉÉ %d ÍÅÖÄÕ ÐÒÁ×ÉÌÏÍ %d É ÌÅËÓÅÍÏÊ %s ÒÁÚÒÅÛÅÎ ËÁË %s.\n" -#: src/conflicts.c:80 +#: src/conflicts.c:83 #, fuzzy, c-format msgid " Conflict between rule %d and token %s resolved as reduce" msgstr "" "ëÏÎÆÌÉËÔ × ÓÏÓÔÏÑÎÉÉ %d ÍÅÖÄÕ ÐÒÁ×ÉÌÏÍ %d É ÌÅËÓÅÍÏÊ %s ÒÁÚÒÅÛÅÎ ËÁË %s.\n" -#: src/conflicts.c:87 +#: src/conflicts.c:90 #, fuzzy, c-format msgid " Conflict between rule %d and token %s resolved as an error" msgstr "" "ëÏÎÆÌÉËÔ × ÓÏÓÔÏÑÎÉÉ %d ÍÅÖÄÕ ÐÒÁ×ÉÌÏÍ %d É ÌÅËÓÅÍÏÊ %s ÒÁÚÒÅÛÅÎ ËÁË %s.\n" -#: src/conflicts.c:401 +#: src/conflicts.c:403 #, c-format msgid "%d shift/reduce conflict" msgid_plural "%d shift/reduce conflicts" @@ -53,11 +53,11 @@ msgstr[0] "%d msgstr[1] "%d ËÏÎÆÌÉËÔÁ ÓÄ×ÉÇÁ/×Ù×ÏÄÁ" msgstr[2] "%d ËÏÎÆÌÉËÔÏ× ÓÄ×ÉÇÁ/×Ù×ÏÄÁ" -#: src/conflicts.c:408 +#: src/conflicts.c:410 msgid "and" msgstr "É" -#: src/conflicts.c:414 +#: src/conflicts.c:416 #, c-format msgid "%d reduce/reduce conflict" msgid_plural "%d reduce/reduce conflicts" @@ -65,26 +65,26 @@ msgstr[0] "%d msgstr[1] "%d ËÏÎÆÌÉËÔÁ ×Ù×ÏÄÁ/×Ù×ÏÄÁ" msgstr[2] "%d ËÏÎÆÌÉËÔÏ× ×Ù×ÏÄÁ/×Ù×ÏÄÁ" -#: src/conflicts.c:434 +#: src/conflicts.c:436 msgid "conflicts: " msgstr "ËÏÎÆÌÉËÔÙ: " -#: src/conflicts.c:436 +#: src/conflicts.c:438 #, c-format msgid " %d shift/reduce" msgstr " %d ÓÄ×ÉÇ/×Ù×ÏÄ" -#: src/conflicts.c:440 +#: src/conflicts.c:442 #, c-format msgid " %d reduce/reduce" msgstr " %d ×Ù×ÏÄ/×Ù×ÏÄ" -#: src/conflicts.c:459 +#: src/conflicts.c:461 #, c-format msgid "State %d contains " msgstr "óÏÓÔÏÑÎÉÅ %d ÓÏÄÅÒÖÉÔ " -#: src/conflicts.c:536 +#: src/conflicts.c:538 #, fuzzy, c-format msgid "expected %d shift/reduce conflict" msgid_plural "expected %d shift/reduce conflicts" @@ -92,35 +92,35 @@ msgstr[0] " msgstr[1] "ÏÖÉÄÁÌÏÓØ %d ËÏÎÆÌÉËÔÁ ÓÄ×ÉÇÁ/×Ù×ÏÄÁ\n" msgstr[2] "ÏÖÉÄÁÌÏÓØ %d ËÏÎÆÌÉËÔÏ× ÓÄ×ÉÇÁ/×Ù×ÏÄÁ\n" -#: src/files.c:111 +#: src/files.c:98 #, c-format msgid "cannot open file `%s'" msgstr "ÎÅ ÕÄÁÅÔÓÑ ÏÔËÒÙÔØ ÆÁÊÌ `%s'" -#: src/files.c:127 +#: src/files.c:114 #, fuzzy msgid "I/O error" msgstr "ÏÛÉÂËÁ" -#: src/files.c:130 +#: src/files.c:117 msgid "cannot close file" msgstr "ÎÅ ÕÄÁÅÔÓÑ ÚÁËÒÙÔØ ÆÁÊÌ" -#: src/getargs.c:167 +#: src/getargs.c:182 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "éÓÐÏÌØÚÕÊÔÅ `%s --help' ÄÌÑ ÄÏÐÏÌÎÉÔÅÌØÎÏÊ ÉÎÆÏÒÍÁÃÉÉ.\n" -#: src/getargs.c:173 +#: src/getargs.c:188 msgid "GNU bison generates parsers for LALR(1) grammars.\n" msgstr "GNU bison ÇÅÎÅÒÉÒÕÅÔ ÁÎÁÌÉÚÁÔÏÒÙ ÄÌÑ ÇÒÁÍÍÁÔÉË LALR(1).\n" -#: src/getargs.c:177 +#: src/getargs.c:192 #, c-format msgid "Usage: %s [OPTION]... FILE\n" msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþé]... æáêì\n" -#: src/getargs.c:181 +#: src/getargs.c:196 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" @@ -129,7 +129,7 @@ msgstr "" "Ñ×ÌÑÅÔÓÑ ÏÂÑÚÁÔÅÌØÎÙÍ ÄÌÑ ËÏÒÏÔËÏÊ ÆÏÒÍÙ. ôÏ ÖÅ ËÁÓÁÅÔÓÑ ÎÅÏÂÑÚÁÔÅÌØÎÙÈ\n" "ÁÒÇÕÍÅÎÔÏ×.\n" -#: src/getargs.c:187 +#: src/getargs.c:202 msgid "" "Operation modes:\n" " -h, --help display this help and exit\n" @@ -141,7 +141,7 @@ msgstr "" " -V, --version ×Ù×ÅÓÔÉ ÉÎÆÏÒÍÁÃÉÀ Ï ×ÅÒÓÉÉ É ×ÙÊÔÉ\n" " -y, --yacc ÜÍÕÌÉÒÏ×ÁÔØ POSIX yacc\n" -#: src/getargs.c:194 +#: src/getargs.c:209 msgid "" "Parser:\n" " -S, --skeleton=FILE specify the skeleton to use\n" @@ -161,7 +161,7 @@ msgstr "" " -n, --no-parser ÇÅÎÅÒÉÒÏ×ÁÔØ ÔÏÌØËÏ ÔÁÂÌÉÃÙ\n" " -k, --token-table ×ËÌÀÞÉÔØ ÔÁÂÌÉÃÕ ÉÍÅÎ ÌÅËÓÅÍ\n" -#: src/getargs.c:206 +#: src/getargs.c:221 #, fuzzy msgid "" "Output:\n" @@ -181,7 +181,7 @@ msgstr "" " -g, --graph ÓÏÚÄÁÔØ ÔÁËÖÅ ÐÏÑÓÎÅÎÉÑ Ë Á×ÔÏÍÁÔÕ × ×ÉÄÅ \n" "VCG-ÇÒÁÆÁ\n" -#: src/getargs.c:217 +#: src/getargs.c:232 msgid "" "THINGS is a list of comma separated words that can include:\n" " `state' describe the states\n" @@ -192,25 +192,25 @@ msgid "" " `none' disable the report\n" msgstr "" -#: src/getargs.c:228 +#: src/getargs.c:243 msgid "Report bugs to .\n" msgstr "ïÛÉÂËÉ ÓÏÏÂÝÁÊÔÅ ÐÏ ÁÄÒÅÓÕ .\n" -#: src/getargs.c:245 +#: src/getargs.c:260 #, c-format msgid "bison (GNU Bison) %s" msgstr "bison (GNU Bison) %s" -#: src/getargs.c:247 +#: src/getargs.c:262 msgid "Written by Robert Corbett and Richard Stallman.\n" msgstr "á×ÔÏÒÙ: òÏÂÅÒÔ ëÏÒÂÅÔ É òÉÞÁÒÄ óÔÏÌÍÅÎ.\n" -#: src/getargs.c:251 +#: src/getargs.c:266 #, c-format msgid "Copyright (C) %d Free Software Foundation, Inc.\n" msgstr "Copyright (C) %d Free Software Foundation, Inc.\n" -#: src/getargs.c:253 +#: src/getargs.c:268 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" @@ -221,59 +221,63 @@ msgstr "" "ðòéçïäîïóôé\n" "äìñ ïðòåäåìåîîïê ãåìé.\n" -#: src/getargs.c:407 +#: src/getargs.c:423 #, c-format msgid "missing operand after `%s'" msgstr "" -#: src/getargs.c:409 +#: src/getargs.c:425 #, c-format msgid "extra operand `%s'" msgstr "" -#: src/gram.c:139 +#: src/gram.c:142 msgid "empty" msgstr "ÐÕÓÔÏ" -#: src/gram.c:233 +#: src/gram.c:236 msgid "Grammar" msgstr "çÒÁÍÍÁÔÉËÁ" -#: src/gram.c:321 src/reduce.c:302 src/reduce.c:392 +#: src/gram.c:324 src/reduce.c:393 #, fuzzy msgid "warning" msgstr "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: " -#: src/main.c:120 +#: src/main.c:124 #, fuzzy msgid "rule never reduced because of conflicts" msgstr " 1 ËÏÎÆÌÉËÔ ×Ù×ÏÄÁ/×Ù×ÏÄÁ" -#: src/parse-gram.y:364 +#: src/parse-gram.y:336 msgid "POSIX forbids declarations in the grammar" msgstr "" -#: src/print.c:46 +#: src/parse-gram.y:468 +msgid "missing identifier in parameter declaration" +msgstr "" + +#: src/print.c:48 #, c-format msgid " type %d is %s\n" msgstr " ÔÉÐ %d Ñ×ÌÑÅÔÓÑ %s\n" -#: src/print.c:162 +#: src/print.c:164 #, fuzzy, c-format msgid "shift, and go to state %d\n" msgstr " %-4s\tÓÄ×ÉÇ, É ÐÅÒÅÈÏÄ × ÓÏÓÔÏÑÎÉÅ %d\n" -#: src/print.c:164 +#: src/print.c:166 #, fuzzy, c-format msgid "go to state %d\n" msgstr " %-4s\tÐÅÒÅÈÏÄ × ÓÏÓÔÏÑÎÉÅ %d\n" -#: src/print.c:201 +#: src/print.c:203 #, fuzzy msgid "error (nonassociative)\n" msgstr "%-4s\tÏÛÉÂËÁ (ÎÅÁÓÓÏÃÉÁÔÉ×ÎÁÑ)" -#: src/print.c:290 +#: src/print.c:291 #, fuzzy, c-format msgid "reduce using rule %d (%s)" msgstr "$default\t×Ù×ÏÄ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÐÒÁ×ÉÌÁ %d (%s)" @@ -291,58 +295,58 @@ msgstr "" msgid "state %d" msgstr "ÓÏÓÔÏÑÎÉÅ %d" -#: src/print.c:456 +#: src/print.c:455 msgid "Terminals, with rules where they appear" msgstr "ôÅÒÍÉÎÁÌØÎÙÅ ÓÉÍ×ÏÌÙ Ó ÐÒÁ×ÉÌÁÍÉ, × ËÏÔÏÒÙÈ ÏÎÉ ÐÏÑ×ÌÑÀÔÓÑ" -#: src/print.c:483 +#: src/print.c:482 msgid "Nonterminals, with rules where they appear" msgstr "îÅÔÅÒÍÉÎÁÌØÎÙÅ ÓÉÍ×ÏÌÙ Ó ÐÒÁ×ÉÌÁÍÉ, × ËÏÔÏÒÙÈ ÏÎÉ ÐÏÑ×ÌÑÀÔÓÑ" -#: src/print.c:512 +#: src/print.c:511 msgid " on left:" msgstr " ÎÁÌÅ×Ï:" -#: src/print.c:527 +#: src/print.c:526 msgid " on right:" msgstr " ÎÁÐÒÁ×Ï:" -#: src/print.c:555 +#: src/print.c:554 #, fuzzy msgid "Rules never reduced" msgstr "%d ÐÒÁ×ÉÌÏ ÎÅ Ó×ÅÄÅÎÏ\n" -#: src/reader.c:51 +#: src/reader.c:53 #, c-format msgid "multiple %s declarations" msgstr "ÍÎÏÖÅÓÔ×ÅÎÎÏÅ ÏÐÉÓÁÎÉÅ %s" -#: src/reader.c:137 +#: src/reader.c:138 #, c-format msgid "result type clash on merge function %s: <%s> != <%s>" msgstr "" -#: src/reader.c:235 +#: src/reader.c:236 #, c-format msgid "rule given for %s, which is a token" msgstr "ÐÒÁ×ÉÌÏ ÚÁÄÁÎÏ ÄÌÑ %s, ËÏÔÏÒÙÊ Ñ×ÌÑÅÔÓÑ ÌÅËÓÅÍÏÊ" -#: src/reader.c:264 +#: src/reader.c:265 #, fuzzy, c-format msgid "type clash on default action: <%s> != <%s>" msgstr "ËÏÎÆÌÉËÔ ÔÉÐÏ× (`%s' `%s') ÎÁ ÄÅÊÓÔ×ÉÉ ÐÏ ÕÍÏÌÞÁÎÉÀ" -#: src/reader.c:270 +#: src/reader.c:271 msgid "empty rule for typed nonterminal, and no action" msgstr "" "ÐÕÓÔÏÅ ÐÒÁ×ÉÌÏ ÄÌÑ ÔÉÐÉÚÉÒÏ×ÁÎÎÏÇÏ ÎÅÔÅÒÍÉÎÁÌØÎÏÇÏ ÓÉÍ×ÏÌÁ, É ÎÅÔ ÄÅÊÓÔ×ÉÑ" -#: src/reader.c:340 src/reader.c:355 src/reader.c:368 +#: src/reader.c:341 src/reader.c:355 src/reader.c:368 #, c-format msgid "only one %s allowed per rule" msgstr "" -#: src/reader.c:350 src/reader.c:366 +#: src/reader.c:351 src/reader.c:366 #, c-format msgid "%s affects only GLR parsers" msgstr "" @@ -352,36 +356,36 @@ msgstr "" msgid "%s must be followed by positive number" msgstr "" -#: src/reader.c:512 +#: src/reader.c:510 msgid "no rules in the input grammar" msgstr "ÏÔÓÕÔÓÔ×ÕÀÔ ÐÒÁ×ÉÌÁ ×Ï ×ÈÏÄÎÏÊ ÇÒÁÍÍÁÔÉËÅ" -#: src/reduce.c:239 +#: src/reduce.c:241 #, fuzzy msgid "useless rule" msgstr "%d ÂÅÓÐÏÌÅÚÎÏÅ ÐÒÁ×ÉÌÏ" #: src/reduce.c:302 -#, fuzzy -msgid "useless nonterminal" -msgstr "%d ÂÅÓÐÏÌÅÚÎÙÊ ÎÅÔÅÒÍÉÎÁÌ" +#, fuzzy, c-format +msgid "useless nonterminal: %s" +msgstr "âÅÓÐÏÌÅÚÎÙÅ ÎÅÔÅÒÍÉÎÁÌÙ:" -#: src/reduce.c:349 +#: src/reduce.c:350 #, fuzzy msgid "Useless nonterminals" msgstr "âÅÓÐÏÌÅÚÎÙÅ ÎÅÔÅÒÍÉÎÁÌÙ:" -#: src/reduce.c:362 +#: src/reduce.c:363 #, fuzzy msgid "Terminals which are not used" msgstr "îÅÉÓÐÏÌØÚÏ×ÁÎÎÙÅ ÔÅÒÍÉÎÁÌÙ:" -#: src/reduce.c:371 +#: src/reduce.c:372 #, fuzzy msgid "Useless rules" msgstr "âÅÓÐÏÌÅÚÎÙÅ ÐÒÁ×ÉÌÁ:" -#: src/reduce.c:387 +#: src/reduce.c:388 #, c-format msgid "%d rule never reduced\n" msgid_plural "%d rules never reduced\n" @@ -389,7 +393,7 @@ msgstr[0] "%d msgstr[1] "%d ÐÒÁ×ÉÌÁ ÎÅ Ó×ÅÄÅÎÏ\n" msgstr[2] "%d ÐÒÁ×ÉÌ ÎÅ Ó×ÅÄÅÎÏ\n" -#: src/reduce.c:395 +#: src/reduce.c:396 #, c-format msgid "%d useless nonterminal" msgid_plural "%d useless nonterminals" @@ -397,11 +401,11 @@ msgstr[0] "%d msgstr[1] "%d ÂÅÓÐÏÌÅÚÎÙÈ ÎÅÔÅÒÍÉÎÁÌÁ" msgstr[2] "%d ÂÅÓÐÏÌÅÚÎÙÈ ÎÅÔÅÒÍÉÎÁÌÏ×" -#: src/reduce.c:401 +#: src/reduce.c:402 msgid " and " msgstr " É " -#: src/reduce.c:404 +#: src/reduce.c:405 #, c-format msgid "%d useless rule" msgid_plural "%d useless rules" @@ -409,121 +413,125 @@ msgstr[0] "%d msgstr[1] "%d ÂÅÓÐÏÌÅÚÎÙÈ ÐÒÁ×ÉÌÁ" msgstr[2] "%d ÂÅÓÐÏÌÅÚÎÙÈ ÐÒÁ×ÉÌ" -#: src/reduce.c:435 +#: src/reduce.c:436 #, fuzzy, c-format msgid "start symbol %s does not derive any sentence" msgstr "îÁÞÁÌØÎÙÊ ÓÉÍ×ÏÌ %s ÎÅ ×Ù×ÏÄÉÔ ÎÉ ÏÄÎÏÇÏ ÐÒÅÄÌÏÖÅÎÉÑ" -#: src/scan-gram.l:258 +#: src/scan-gram.l:208 #, fuzzy, c-format msgid "invalid directive: %s" msgstr "ÎÅ×ÅÒÎÙÅ ×ÈÏÄÎÙÅ ÄÁÎÎÙÅ: %s" -#: src/scan-gram.l:287 src/scan-gram.l:661 src/scan-gram.l:733 +#: src/scan-gram.l:216 +msgid "stray `,' treated as white space" +msgstr "" + +#: src/scan-gram.l:232 src/scan-gram.l:727 src/scan-gram.l:798 #, c-format msgid "integer out of range: %s" msgstr "" -#: src/scan-gram.l:327 +#: src/scan-gram.l:276 #, fuzzy, c-format msgid "invalid character: %s" msgstr "ÎÅÉÚ×ÅÓÔÎÙÊ ÓÉÍ×ÏÌ: %s" -#: src/scan-gram.l:427 src/scan-gram.l:441 src/scan-gram.l:464 +#: src/scan-gram.l:400 src/scan-gram.l:410 src/scan-gram.l:429 #, fuzzy, c-format msgid "invalid escape sequence: %s" msgstr "ÎÅ×ÅÒÎÏÅ ÚÎÁÞÅÎÉÅ: %s%d" -#: src/scan-gram.l:472 +#: src/scan-gram.l:434 #, fuzzy, c-format msgid "unrecognized escape sequence: %s" msgstr "ÎÅÒÁÓÐÏÚÎÁÎÏ: %s" -#: src/scan-gram.l:632 +#: src/scan-gram.l:699 #, c-format msgid "$$ of `%s' has no declared type" msgstr "$$ × `%s' ÎÅ ÉÍÅÅÔ ÏÐÉÓÁÎÎÏÇÏ ÔÉÐÁ" -#: src/scan-gram.l:652 +#: src/scan-gram.l:718 #, c-format msgid "$%d of `%s' has no declared type" msgstr "$%d ÉÚ `%s' ÎÅ ÉÍÅÅÔ ÏÐÉÓÁÎÎÏÇÏ ÔÉÐÁ" -#: src/scan-gram.l:678 src/scan-gram.l:750 +#: src/scan-gram.l:744 src/scan-gram.l:815 #, fuzzy, c-format msgid "invalid value: %s" msgstr "ÎÅ×ÅÒÎÏÅ ÚÎÁÞÅÎÉÅ: %s%d" -#: src/scan-gram.l:861 +#: src/scan-gram.l:928 #, fuzzy, c-format msgid "missing `%s' at end of file" msgstr "ÎÅÚÁËÏÎÞÅÎÎÁÑ ÓÔÒÏËÁ × ËÏÎÃÅ ÆÁÊÌÁ" -#: src/symlist.c:97 src/symlist.c:109 +#: src/symlist.c:97 src/symlist.c:108 msgid "invalid $ value" msgstr "ÎÅ×ÅÒÎÏÅ $ ÚÎÁÞÅÎÉÅ" -#: src/symtab.c:82 +#: src/symtab.c:84 #, c-format msgid "type redeclaration for %s" msgstr "ÐÏ×ÔÏÒÎÏÅ ÏÐÉÓÁÎÉÅ ÔÉÐÁ ÄÌÑ %s" -#: src/symtab.c:100 src/symtab.c:119 +#: src/symtab.c:101 src/symtab.c:119 #, fuzzy, c-format msgid "%s redeclaration for %s" msgstr "ÐÏ×ÔÏÒÎÏÅ ÏÐÉÓÁÎÉÅ ÔÉÐÁ ÄÌÑ %s" -#: src/symtab.c:140 +#: src/symtab.c:138 #, c-format msgid "redefining precedence of %s" msgstr "ÐÅÒÅÏÐÒÅÄÅÌÅÎÉÅ ÐÒÉÏÒÉÔÅÔÁ ÄÌÑ %s" -#: src/symtab.c:159 +#: src/symtab.c:156 #, c-format msgid "symbol %s redefined" msgstr "ÐÏ×ÔÏÒÎÏÅ ÏÐÒÅÄÅÌÅÎÉÅ ÓÉÍ×ÏÌÁ %s" -#: src/symtab.c:183 +#: src/symtab.c:179 #, fuzzy, c-format msgid "redefining user token number of %s" msgstr "ÐÅÒÅÏÐÒÅÄÅÌÅÎÉÅ ÐÒÉÏÒÉÔÅÔÁ ÄÌÑ %s" -#: src/symtab.c:222 +#: src/symtab.c:206 #, c-format msgid "symbol %s is used, but is not defined as a token and has no rules" msgstr "ÓÉÍ×ÏÌ %s ÉÓÐÏÌØÚÕÅÔÓÑ, ÎÏ ÎÅ ÏÐÒÅÄÅÌÅÎ ËÁË ÌÅËÓÅÍÁ É ÎÅ ÉÍÅÅÔ ÐÒÁ×ÉÌ" -#: src/symtab.c:241 +#: src/symtab.c:231 #, c-format msgid "symbol `%s' used more than once as a literal string" msgstr "" -#: src/symtab.c:244 +#: src/symtab.c:234 #, c-format msgid "symbol `%s' given more than one literal string" msgstr "" -#: src/symtab.c:279 +#: src/symtab.c:269 #, c-format msgid "conflicting precedences for %s and %s" msgstr "ÐÒÏÔÉ×ÏÒÅÞÉ×ÙÅ ÐÒÉÏÒÉÔÅÔÙ ÄÌÑ %s É %s" -#: src/symtab.c:291 +#: src/symtab.c:281 #, fuzzy, c-format msgid "conflicting associativities for %s (%s) and %s (%s)" msgstr "ÐÒÏÔÉ×ÏÒÅÞÉ×ÙÅ ÚÎÁÞÅÎÉÑ ÁÓÓÏÃÉÁÔÉ×ÎÏÓÔÉ ÄÌÑ %s É %s" -#: src/symtab.c:363 +#: src/symtab.c:366 #, c-format msgid "tokens %s and %s both assigned number %d" msgstr "ÏÂÅÉÍ ÌÅËÓÅÍÁÍ %s É %s ÐÒÉÓ×ÏÅÎ ÎÏÍÅÒ %d" -#: src/symtab.c:570 +#: src/symtab.c:589 #, c-format msgid "the start symbol %s is undefined" msgstr "ÎÁÞÁÌØÎÙÊ ÓÉÍ×ÏÌ %s ÎÅÏÐÒÅÄÅÌÅÎ" -#: src/symtab.c:574 +#: src/symtab.c:593 #, c-format msgid "the start symbol %s is a token" msgstr "ÎÁÞÁÌØÎÙÊ ÓÉÍ×ÏÌ %s Ñ×ÌÑÅÔÓÑ ÌÅËÓÅÍÏÊ" @@ -606,62 +614,62 @@ msgstr "" msgid "Could not open stats file for writing." msgstr "" -#: lib/getopt.c:662 +#: lib/getopt.c:688 lib/getopt.c:700 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: ÎÅÏÄÎÏÚÎÁÞÎÙÊ ËÌÀÞ `%s'\n" -#: lib/getopt.c:687 +#: lib/getopt.c:733 lib/getopt.c:737 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: ËÌÀÞ `--%s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÂÅÚ ÁÒÇÕÍÅÎÔÁ\n" -#: lib/getopt.c:692 +#: lib/getopt.c:746 lib/getopt.c:751 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: ËÌÀÞ `%c%s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÂÅÚ ÁÒÇÕÍÅÎÔÁ\n" -#: lib/getopt.c:710 lib/getopt.c:883 +#: lib/getopt.c:787 lib/getopt.c:800 lib/getopt.c:1089 lib/getopt.c:1102 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: ËÌÀÞ `%s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ Ó ÁÒÇÕÍÅÎÔÏÍ\n" -#: lib/getopt.c:739 +#: lib/getopt.c:838 lib/getopt.c:841 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: ÎÅÉÚ×ÅÓÔÎÙÊ ËÌÀÞ `--%s'\n" -#: lib/getopt.c:743 +#: lib/getopt.c:849 lib/getopt.c:852 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: ÎÅÉÚ×ÅÓÔÎÙÊ ËÌÀÞ `%c%s'\n" -#: lib/getopt.c:769 +#: lib/getopt.c:899 lib/getopt.c:902 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: ÎÅÄÏÐÕÓÔÉÍÙÊ ËÌÀÞ -- %c\n" -#: lib/getopt.c:772 +#: lib/getopt.c:908 lib/getopt.c:911 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: ÎÅ×ÅÒÎÙÊ ËÌÀÞ -- %c\n" -#: lib/getopt.c:802 lib/getopt.c:932 +#: lib/getopt.c:958 lib/getopt.c:969 lib/getopt.c:1155 lib/getopt.c:1168 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: ËÌÀÞ ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ Ó ÁÒÇÕÍÅÎÔÏÍ -- %c\n" -#: lib/getopt.c:849 +#: lib/getopt.c:1021 lib/getopt.c:1032 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: ÎÅÏÄÎÏÚÎÁÞÎÙÊ ËÌÀÞ `-W %s'\n" -#: lib/getopt.c:867 +#: lib/getopt.c:1056 lib/getopt.c:1068 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: ËÌÀÞ `-W %s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÂÅÚ ÁÒÇÕÍÅÎÔÁ\n" -#: lib/obstack.c:496 lib/obstack.c:499 lib/xmalloc.c:63 +#: lib/obstack.c:487 lib/obstack.c:490 lib/xmalloc.c:63 msgid "memory exhausted" msgstr "ÐÁÍÑÔØ ÉÓÞÅÒÐÁÎÁ" diff --git a/po/sv.po b/po/sv.po index 6de9b801..3857b94b 100644 --- a/po/sv.po +++ b/po/sv.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: bison 1.75b\n" -"POT-Creation-Date: 2002-11-24 23:54-0800\n" +"POT-Creation-Date: 2002-12-13 03:47-0800\n" "PO-Revision-Date: 2002-11-23 14:19+0100\n" "Last-Translator: Göran Uddeborg \n" "Language-Team: Swedish \n" @@ -15,105 +15,105 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: src/complain.c:78 lib/error.c:126 lib/error.c:154 +#: src/complain.c:56 lib/error.c:135 lib/error.c:163 msgid "Unknown system error" msgstr "Okänt systemfel" -#: src/complain.c:103 src/complain.c:120 +#: src/complain.c:80 src/complain.c:97 msgid "warning: " msgstr "varning: " -#: src/complain.c:182 src/complain.c:200 +#: src/complain.c:159 src/complain.c:177 msgid "fatal error: " msgstr "ödesdigert fel: " -#: src/conflicts.c:72 +#: src/conflicts.c:75 #, c-format msgid " Conflict between rule %d and token %s resolved as shift" msgstr " Konflikt mellan regel %d och element %s löstes som skift" -#: src/conflicts.c:80 +#: src/conflicts.c:83 #, c-format msgid " Conflict between rule %d and token %s resolved as reduce" msgstr " Konflikt mellan regel %d och element %s löstes som reducera" -#: src/conflicts.c:87 +#: src/conflicts.c:90 #, c-format msgid " Conflict between rule %d and token %s resolved as an error" msgstr " Konflikt mellan regel %d och element %s löstes som ett fel" -#: src/conflicts.c:401 +#: src/conflicts.c:403 #, c-format msgid "%d shift/reduce conflict" msgid_plural "%d shift/reduce conflicts" msgstr[0] "%d skifta/reducerakonflikt" msgstr[1] "%d skifta/reducerakonflikter" -#: src/conflicts.c:408 +#: src/conflicts.c:410 msgid "and" msgstr "och" -#: src/conflicts.c:414 +#: src/conflicts.c:416 #, c-format msgid "%d reduce/reduce conflict" msgid_plural "%d reduce/reduce conflicts" msgstr[0] "%d reducera/reducerakonflikt" msgstr[1] "%d reducera/reducerakonflikter" -#: src/conflicts.c:434 +#: src/conflicts.c:436 msgid "conflicts: " msgstr "konflikter: " -#: src/conflicts.c:436 +#: src/conflicts.c:438 #, c-format msgid " %d shift/reduce" msgstr " %d skifta/reducera" -#: src/conflicts.c:440 +#: src/conflicts.c:442 #, c-format msgid " %d reduce/reduce" msgstr " %d reducera/reducera" -#: src/conflicts.c:459 +#: src/conflicts.c:461 #, c-format msgid "State %d contains " msgstr "Tillstånd %d innehåller " -#: src/conflicts.c:536 +#: src/conflicts.c:538 #, c-format msgid "expected %d shift/reduce conflict" msgid_plural "expected %d shift/reduce conflicts" msgstr[0] "förväntade %d skifta/reducerakonflikt" msgstr[1] "förväntade %d skifta/reducerakonflikter" -#: src/files.c:111 +#: src/files.c:98 #, c-format msgid "cannot open file `%s'" msgstr "kan inte öppna filen \"%s\"" -#: src/files.c:127 +#: src/files.c:114 msgid "I/O error" msgstr "I/O-fel" -#: src/files.c:130 +#: src/files.c:117 msgid "cannot close file" msgstr "kan inte stänga fil" -#: src/getargs.c:167 +#: src/getargs.c:182 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Försök med \"%s --help\" för mer information.\n" -#: src/getargs.c:173 +#: src/getargs.c:188 msgid "GNU bison generates parsers for LALR(1) grammars.\n" msgstr "GNU bison genererar parsrar för LALR(1)-grammatiker.\n" -#: src/getargs.c:177 +#: src/getargs.c:192 #, c-format msgid "Usage: %s [OPTION]... FILE\n" msgstr "Användning: %s [FLAGGA]... FIL\n" -#: src/getargs.c:181 +#: src/getargs.c:196 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" @@ -122,7 +122,7 @@ msgstr "" "obligatoriskt för den motsvarande korta flaggan också. Motsvarande\n" "för valfria argument.\n" -#: src/getargs.c:187 +#: src/getargs.c:202 msgid "" "Operation modes:\n" " -h, --help display this help and exit\n" @@ -134,7 +134,7 @@ msgstr "" " -V, --version visa versionsinformation och avsluta\n" " -y, --yacc emulera POSIX-yacc\n" -#: src/getargs.c:194 +#: src/getargs.c:209 msgid "" "Parser:\n" " -S, --skeleton=FILE specify the skeleton to use\n" @@ -154,7 +154,7 @@ msgstr "" " -n, --no-parser generera endast tabellerna\n" " -k, --token-table inkludera en tabell över elementnamn\n" -#: src/getargs.c:206 +#: src/getargs.c:221 msgid "" "Output:\n" " -d, --defines also produce a header file\n" @@ -173,7 +173,7 @@ msgstr "" " -o, --output=FIL lägg utdata i FIL\n" " -g, --graph skapa också en VCG-beskrivning av automaten\n" -#: src/getargs.c:217 +#: src/getargs.c:232 msgid "" "THINGS is a list of comma separated words that can include:\n" " `state' describe the states\n" @@ -191,27 +191,27 @@ msgstr "" " \"all\" inkludera all ovanstående information\n" " \"none\" avaktivera rapporten\n" -#: src/getargs.c:228 +#: src/getargs.c:243 msgid "Report bugs to .\n" msgstr "" "Rapportera fel till .\n" "Rapportera synpunkter på översättningen till .\n" -#: src/getargs.c:245 +#: src/getargs.c:260 #, c-format msgid "bison (GNU Bison) %s" msgstr "bison (GNU Bison) %s" -#: src/getargs.c:247 +#: src/getargs.c:262 msgid "Written by Robert Corbett and Richard Stallman.\n" msgstr "Skriven av Robert Corbett och Richard Stallman.\n" -#: src/getargs.c:251 +#: src/getargs.c:266 #, c-format msgid "Copyright (C) %d Free Software Foundation, Inc.\n" msgstr "Copyright © %d Free Software Foundation, Inc.\n" -#: src/getargs.c:253 +#: src/getargs.c:268 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" @@ -220,56 +220,60 @@ msgstr "" "finns INGEN garanti, inte ens för SÄLJBARHET eller LÄMPLIGHET FÖR ETT\n" "SPECIELLT ÄNDAMÅL.\n" -#: src/getargs.c:407 +#: src/getargs.c:423 #, c-format msgid "missing operand after `%s'" msgstr "saknad operand efter \"%s\"" -#: src/getargs.c:409 +#: src/getargs.c:425 #, c-format msgid "extra operand `%s'" msgstr "extra operand \"%s\"" -#: src/gram.c:139 +#: src/gram.c:142 msgid "empty" msgstr "tom" -#: src/gram.c:233 +#: src/gram.c:236 msgid "Grammar" msgstr "Grammatik" -#: src/gram.c:321 src/reduce.c:302 src/reduce.c:392 +#: src/gram.c:324 src/reduce.c:393 msgid "warning" msgstr "varning" -#: src/main.c:120 +#: src/main.c:124 msgid "rule never reduced because of conflicts" msgstr "regel aldrig reducerad på grund av konflikter" -#: src/parse-gram.y:364 +#: src/parse-gram.y:336 msgid "POSIX forbids declarations in the grammar" msgstr "POSIX förbjuder deklarationer i grammatiken" -#: src/print.c:46 +#: src/parse-gram.y:468 +msgid "missing identifier in parameter declaration" +msgstr "" + +#: src/print.c:48 #, c-format msgid " type %d is %s\n" msgstr " typ %d är %s\n" -#: src/print.c:162 +#: src/print.c:164 #, c-format msgid "shift, and go to state %d\n" msgstr "skifta, och gå till tillstånd %d\n" -#: src/print.c:164 +#: src/print.c:166 #, c-format msgid "go to state %d\n" msgstr "gå till tillstånd %d\n" -#: src/print.c:201 +#: src/print.c:203 msgid "error (nonassociative)\n" msgstr "fel (ickeassociativ)\n" -#: src/print.c:290 +#: src/print.c:291 #, c-format msgid "reduce using rule %d (%s)" msgstr "reducera med regel %d (%s)" @@ -287,56 +291,56 @@ msgstr "$standard" msgid "state %d" msgstr "tillstånd %d" -#: src/print.c:456 +#: src/print.c:455 msgid "Terminals, with rules where they appear" msgstr "Terminaler, med regler där de förekommer" -#: src/print.c:483 +#: src/print.c:482 msgid "Nonterminals, with rules where they appear" msgstr "Icketerminaler, med regler där de förekommer" -#: src/print.c:512 +#: src/print.c:511 msgid " on left:" msgstr " till vänster:" -#: src/print.c:527 +#: src/print.c:526 msgid " on right:" msgstr " till höger:" -#: src/print.c:555 +#: src/print.c:554 msgid "Rules never reduced" msgstr "Aldrig reducerade regler" -#: src/reader.c:51 +#: src/reader.c:53 #, c-format msgid "multiple %s declarations" msgstr "flera %s-deklarationer" -#: src/reader.c:137 +#: src/reader.c:138 #, c-format msgid "result type clash on merge function %s: <%s> != <%s>" msgstr "resultattypskonflikt vid sammanslagningsfunktion %s: <%s> != <%s>" -#: src/reader.c:235 +#: src/reader.c:236 #, c-format msgid "rule given for %s, which is a token" msgstr "regel given för %s, som är ett element" -#: src/reader.c:264 +#: src/reader.c:265 #, c-format msgid "type clash on default action: <%s> != <%s>" msgstr "typkonflikt för standardåtgärd: <%s> <%s>" -#: src/reader.c:270 +#: src/reader.c:271 msgid "empty rule for typed nonterminal, and no action" msgstr "tom regel för typad icketerminal, och ingen åtgärd" -#: src/reader.c:340 src/reader.c:355 src/reader.c:368 +#: src/reader.c:341 src/reader.c:355 src/reader.c:368 #, c-format msgid "only one %s allowed per rule" msgstr "endast en %s tillåts per regel" -#: src/reader.c:350 src/reader.c:366 +#: src/reader.c:351 src/reader.c:366 #, c-format msgid "%s affects only GLR parsers" msgstr "%s påverkar endast GLR-parsrar" @@ -346,172 +350,177 @@ msgstr "%s p msgid "%s must be followed by positive number" msgstr "%s måste följas av ett positivt tal" -#: src/reader.c:512 +#: src/reader.c:510 msgid "no rules in the input grammar" msgstr "inga regler i ingrammatiken" -#: src/reduce.c:239 +#: src/reduce.c:241 msgid "useless rule" msgstr "oanvändbar regel" #: src/reduce.c:302 -msgid "useless nonterminal" +#, fuzzy, c-format +msgid "useless nonterminal: %s" msgstr "oanvändbar icketerminal" -#: src/reduce.c:349 +#: src/reduce.c:350 msgid "Useless nonterminals" msgstr "Oanvändbara icketerminaler" -#: src/reduce.c:362 +#: src/reduce.c:363 msgid "Terminals which are not used" msgstr "Terminaler som inte används" -#: src/reduce.c:371 +#: src/reduce.c:372 msgid "Useless rules" msgstr "Oanvändbara regler" -#: src/reduce.c:387 +#: src/reduce.c:388 #, c-format msgid "%d rule never reduced\n" msgid_plural "%d rules never reduced\n" msgstr[0] "%d regel reduceras aldrig\n" msgstr[1] "%d regler reduceras aldrig\n" -#: src/reduce.c:395 +#: src/reduce.c:396 #, c-format msgid "%d useless nonterminal" msgid_plural "%d useless nonterminals" msgstr[0] "%d oanvändbar icketerminal" msgstr[1] "%d oanvändbara icketerminaler" -#: src/reduce.c:401 +#: src/reduce.c:402 msgid " and " msgstr " och " -#: src/reduce.c:404 +#: src/reduce.c:405 #, c-format msgid "%d useless rule" msgid_plural "%d useless rules" msgstr[0] "%d oanvändbar regel" msgstr[1] "%d oanvändbara regler" -#: src/reduce.c:435 +#: src/reduce.c:436 #, c-format msgid "start symbol %s does not derive any sentence" msgstr "startsymbolen %s genererar inga meningar" -#: src/scan-gram.l:258 +#: src/scan-gram.l:208 #, c-format msgid "invalid directive: %s" msgstr "ogiltigt direktiv: %s" -#: src/scan-gram.l:287 src/scan-gram.l:661 src/scan-gram.l:733 +#: src/scan-gram.l:216 +msgid "stray `,' treated as white space" +msgstr "" + +#: src/scan-gram.l:232 src/scan-gram.l:727 src/scan-gram.l:798 #, c-format msgid "integer out of range: %s" msgstr "heltal utanför intervall: %s" -#: src/scan-gram.l:327 +#: src/scan-gram.l:276 #, c-format msgid "invalid character: %s" msgstr "ogiltigt tecken: %s" -#: src/scan-gram.l:427 src/scan-gram.l:441 src/scan-gram.l:464 +#: src/scan-gram.l:400 src/scan-gram.l:410 src/scan-gram.l:429 #, c-format msgid "invalid escape sequence: %s" msgstr "ogiltig specialsekvens: %s" -#: src/scan-gram.l:472 +#: src/scan-gram.l:434 #, c-format msgid "unrecognized escape sequence: %s" msgstr "okänd specialsekvens: %s" -#: src/scan-gram.l:632 +#: src/scan-gram.l:699 #, c-format msgid "$$ of `%s' has no declared type" msgstr "$$ för \"%s\" har ingen deklarerad typ" -#: src/scan-gram.l:652 +#: src/scan-gram.l:718 #, c-format msgid "$%d of `%s' has no declared type" msgstr "$%d för \"%s\" har ingen deklarerad typ" -#: src/scan-gram.l:678 src/scan-gram.l:750 +#: src/scan-gram.l:744 src/scan-gram.l:815 #, c-format msgid "invalid value: %s" msgstr "felaktigt värde: %s" -#: src/scan-gram.l:861 +#: src/scan-gram.l:928 #, c-format msgid "missing `%s' at end of file" msgstr "saknat \"%s\" vid filslut" -#: src/symlist.c:97 src/symlist.c:109 +#: src/symlist.c:97 src/symlist.c:108 msgid "invalid $ value" msgstr "felaktigt $-värde" -#: src/symtab.c:82 +#: src/symtab.c:84 #, c-format msgid "type redeclaration for %s" msgstr "typen omdeklarerad för %s" -#: src/symtab.c:100 src/symtab.c:119 +#: src/symtab.c:101 src/symtab.c:119 #, c-format msgid "%s redeclaration for %s" msgstr "%s-omdeklaration för %s" -#: src/symtab.c:140 +#: src/symtab.c:138 #, c-format msgid "redefining precedence of %s" msgstr "omdefinition av precedens för %s" -#: src/symtab.c:159 +#: src/symtab.c:156 #, c-format msgid "symbol %s redefined" msgstr "symbolen %s omdefinierad" -#: src/symtab.c:183 +#: src/symtab.c:179 #, c-format msgid "redefining user token number of %s" msgstr "omdefinition av elementnummer för %s" -#: src/symtab.c:222 +#: src/symtab.c:206 #, 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/symtab.c:241 +#: src/symtab.c:231 #, 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/symtab.c:244 +#: src/symtab.c:234 #, c-format msgid "symbol `%s' given more than one literal string" msgstr "symbolen \"%s\" har fått mer än en bokstavlig sträng" -#: src/symtab.c:279 +#: src/symtab.c:269 #, c-format msgid "conflicting precedences for %s and %s" msgstr "motstridiga precedenser mellan %s och %s" -#: src/symtab.c:291 +#: src/symtab.c:281 #, c-format msgid "conflicting associativities for %s (%s) and %s (%s)" msgstr "motstridiga associativiteter för %s (%s) och %s (%s)" -#: src/symtab.c:363 +#: src/symtab.c:366 #, c-format msgid "tokens %s and %s both assigned number %d" msgstr "elementen %s och %s har båda fått nummer %d" -#: src/symtab.c:570 +#: src/symtab.c:589 #, c-format msgid "the start symbol %s is undefined" msgstr "startsymbolen %s är odefinierad" -#: src/symtab.c:574 +#: src/symtab.c:593 #, c-format msgid "the start symbol %s is a token" msgstr "startsymbolen %s är ett element" @@ -596,62 +605,62 @@ msgstr "Kunde inte skriva statistikfil." msgid "Could not open stats file for writing." msgstr "Kunde inte öppna statistikfil för skrivning." -#: lib/getopt.c:662 +#: lib/getopt.c:688 lib/getopt.c:700 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: flaggan \"%s\" är tvetydig\n" -#: lib/getopt.c:687 +#: lib/getopt.c:733 lib/getopt.c:737 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: flaggan \"--%s\" tar inget argument\n" -#: lib/getopt.c:692 +#: lib/getopt.c:746 lib/getopt.c:751 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: flaggan \"%c%s\" tar inget argument\n" -#: lib/getopt.c:710 lib/getopt.c:883 +#: lib/getopt.c:787 lib/getopt.c:800 lib/getopt.c:1089 lib/getopt.c:1102 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: flaggan \"%s\" behöver ett argument\n" -#: lib/getopt.c:739 +#: lib/getopt.c:838 lib/getopt.c:841 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: okänd flagga \"--%s\"\n" -#: lib/getopt.c:743 +#: lib/getopt.c:849 lib/getopt.c:852 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: okänd flagga \"%c%s\"\n" -#: lib/getopt.c:769 +#: lib/getopt.c:899 lib/getopt.c:902 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: otillåten flagga -- %c\n" -#: lib/getopt.c:772 +#: lib/getopt.c:908 lib/getopt.c:911 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: ogiltig flagga --%c\n" -#: lib/getopt.c:802 lib/getopt.c:932 +#: lib/getopt.c:958 lib/getopt.c:969 lib/getopt.c:1155 lib/getopt.c:1168 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: flaggan behöver ett argument -- %c\n" -#: lib/getopt.c:849 +#: lib/getopt.c:1021 lib/getopt.c:1032 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: flaggan \"-W %s\" är tvetydig\n" -#: lib/getopt.c:867 +#: lib/getopt.c:1056 lib/getopt.c:1068 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: flaggan \"-W %s\" tar inget argument\n" -#: lib/obstack.c:496 lib/obstack.c:499 lib/xmalloc.c:63 +#: lib/obstack.c:487 lib/obstack.c:490 lib/xmalloc.c:63 msgid "memory exhausted" msgstr "minnet slut" diff --git a/po/tr.po b/po/tr.po index ed40b5da..b6c63a3d 100644 --- a/po/tr.po +++ b/po/tr.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: bison 1.49a\n" -"POT-Creation-Date: 2002-11-24 23:54-0800\n" +"POT-Creation-Date: 2002-12-13 03:47-0800\n" "PO-Revision-Date: 2002-06-25 11:03GMT +02:00\n" "Last-Translator: Altuð Bayram \n" "Language-Team: Turkish \n" @@ -15,112 +15,112 @@ msgstr "" "X-Generator: KBabel 0.9.5\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: src/complain.c:78 lib/error.c:126 lib/error.c:154 +#: src/complain.c:56 lib/error.c:135 lib/error.c:163 msgid "Unknown system error" msgstr "Bilinmeyen sistem hatasý" -#: src/complain.c:103 src/complain.c:120 +#: src/complain.c:80 src/complain.c:97 msgid "warning: " msgstr "uyarý: " -#: src/complain.c:182 src/complain.c:200 +#: src/complain.c:159 src/complain.c:177 msgid "fatal error: " msgstr "ölümcül hata:" -#: src/conflicts.c:72 +#: src/conflicts.c:75 #, fuzzy, c-format msgid " Conflict between rule %d and token %s resolved as shift" msgstr "" "%d durumu içinde %d kuralý ve %s andaçý arasýndaki çeliþki %s olarak\n" "çözümlendi.\n" -#: src/conflicts.c:80 +#: src/conflicts.c:83 #, fuzzy, c-format msgid " Conflict between rule %d and token %s resolved as reduce" msgstr "" "%d durumu içinde %d kuralý ve %s andaçý arasýndaki çeliþki %s olarak\n" "çözümlendi.\n" -#: src/conflicts.c:87 +#: src/conflicts.c:90 #, fuzzy, c-format msgid " Conflict between rule %d and token %s resolved as an error" msgstr "" "%d durumu içinde %d kuralý ve %s andaçý arasýndaki çeliþki %s olarak\n" "çözümlendi.\n" -#: src/conflicts.c:401 +#: src/conflicts.c:403 #, c-format msgid "%d shift/reduce conflict" msgid_plural "%d shift/reduce conflicts" msgstr[0] "%d öteleme/indirgeme çeliþkisi" msgstr[1] "%d öteleme/indirgeme çeliþkisi" -#: src/conflicts.c:408 +#: src/conflicts.c:410 msgid "and" msgstr "ve" -#: src/conflicts.c:414 +#: src/conflicts.c:416 #, c-format msgid "%d reduce/reduce conflict" msgid_plural "%d reduce/reduce conflicts" msgstr[0] "%d indirgeme/indirgeme çeliþkisi" msgstr[1] "%d indirgeme/indirgeme çeliþkisi" -#: src/conflicts.c:434 +#: src/conflicts.c:436 msgid "conflicts: " msgstr "çeliþkiler: " -#: src/conflicts.c:436 +#: src/conflicts.c:438 #, c-format msgid " %d shift/reduce" msgstr " %d öteleme/indirgeme" -#: src/conflicts.c:440 +#: src/conflicts.c:442 #, c-format msgid " %d reduce/reduce" msgstr " %d indirgeme/indirgeme" -#: src/conflicts.c:459 +#: src/conflicts.c:461 #, c-format msgid "State %d contains " msgstr "%d durumu içerir" -#: src/conflicts.c:536 +#: src/conflicts.c:538 #, fuzzy, c-format msgid "expected %d shift/reduce conflict" msgid_plural "expected %d shift/reduce conflicts" msgstr[0] "beklenen %d öteleme/indirgeme çeliþkisi\n" msgstr[1] "beklenen %d öteleme/indirgeme çeliþkisi\n" -#: src/files.c:111 +#: src/files.c:98 #, c-format msgid "cannot open file `%s'" msgstr "`%s' dosyasý açýlamadý" -#: src/files.c:127 +#: src/files.c:114 #, fuzzy msgid "I/O error" msgstr "bir hata" -#: src/files.c:130 +#: src/files.c:117 msgid "cannot close file" msgstr "dosya kapatýlamýyor" -#: src/getargs.c:167 +#: src/getargs.c:182 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Daha fazla bilgi için `%s --help' yazýn.\n" -#: src/getargs.c:173 +#: src/getargs.c:188 msgid "GNU bison generates parsers for LALR(1) grammars.\n" msgstr "GNU bison LALR(1) gramerler için ayrýþtýrýcýlar üretir.\n" -#: src/getargs.c:177 +#: src/getargs.c:192 #, c-format msgid "Usage: %s [OPTION]... FILE\n" msgstr "Kullaným: %s [SEÇENEK]... DOSYA\n" -#: src/getargs.c:181 +#: src/getargs.c:196 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" @@ -130,7 +130,7 @@ msgstr "" "seçenek için de geçerlidir. Bu durum, seçimli argümanlar için de " "geçerlidir.\n" -#: src/getargs.c:187 +#: src/getargs.c:202 msgid "" "Operation modes:\n" " -h, --help display this help and exit\n" @@ -142,7 +142,7 @@ msgstr "" " -V, --version sürüm bilgisini ver ve çýk\n" " -y, --yacc POSIX yacc öykünmesi\n" -#: src/getargs.c:194 +#: src/getargs.c:209 msgid "" "Parser:\n" " -S, --skeleton=FILE specify the skeleton to use\n" @@ -162,7 +162,7 @@ msgstr "" " -n, --no-parser sadece tablolarý üret\n" " -k, --token-table andaç isimlerinin bir tablosunu içer\n" -#: src/getargs.c:206 +#: src/getargs.c:221 #, fuzzy msgid "" "Output:\n" @@ -181,7 +181,7 @@ msgstr "" " -o, --output=DOSYA çýktýyý dosyaya býrakýr\n" " -g, --graph otomatýn bir VCG grafik açýklamasýný da üretir\n" -#: src/getargs.c:217 +#: src/getargs.c:232 msgid "" "THINGS is a list of comma separated words that can include:\n" " `state' describe the states\n" @@ -192,27 +192,27 @@ msgid "" " `none' disable the report\n" msgstr "" -#: src/getargs.c:228 +#: src/getargs.c:243 msgid "Report bugs to .\n" msgstr "" "Hatalarý 'a,\n" "çeviri hatalarýný 'e bildir.\n" -#: src/getargs.c:245 +#: src/getargs.c:260 #, c-format msgid "bison (GNU Bison) %s" msgstr "bison (GNU Bison) %s" -#: src/getargs.c:247 +#: src/getargs.c:262 msgid "Written by Robert Corbett and Richard Stallman.\n" msgstr "Yazanlar: Robert Corbett ve Richard Stallman.\n" -#: src/getargs.c:251 +#: src/getargs.c:266 #, c-format msgid "Copyright (C) %d Free Software Foundation, Inc.\n" msgstr "Telif Hakký (C) %d Free Software Foundation, Inc.\n" -#: src/getargs.c:253 +#: src/getargs.c:268 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" @@ -221,58 +221,62 @@ msgstr "" "Hiçbir garantisi yoktur; hatta SATILABÝLÝRLÝÐÝ veya ÞAHSÝ KULLANIMINIZA\n" "UYGUNLUÐU için bile garanti verilmez.\n" -#: src/getargs.c:407 +#: src/getargs.c:423 #, c-format msgid "missing operand after `%s'" msgstr "" -#: src/getargs.c:409 +#: src/getargs.c:425 #, c-format msgid "extra operand `%s'" msgstr "" -#: src/gram.c:139 +#: src/gram.c:142 msgid "empty" msgstr "boþ" -#: src/gram.c:233 +#: src/gram.c:236 msgid "Grammar" msgstr "Gramer" -#: src/gram.c:321 src/reduce.c:302 src/reduce.c:392 +#: src/gram.c:324 src/reduce.c:393 #, fuzzy msgid "warning" msgstr "uyarý: " -#: src/main.c:120 +#: src/main.c:124 msgid "rule never reduced because of conflicts" msgstr "" -#: src/parse-gram.y:364 +#: src/parse-gram.y:336 msgid "POSIX forbids declarations in the grammar" msgstr "" -#: src/print.c:46 +#: src/parse-gram.y:468 +msgid "missing identifier in parameter declaration" +msgstr "" + +#: src/print.c:48 #, c-format msgid " type %d is %s\n" msgstr " tip %d %s'dir\n" -#: src/print.c:162 +#: src/print.c:164 #, fuzzy, c-format msgid "shift, and go to state %d\n" msgstr " %-4s\tötele, ve durum %d'ye git\n" -#: src/print.c:164 +#: src/print.c:166 #, fuzzy, c-format msgid "go to state %d\n" msgstr " %-4s\tdurum %d'ye git\n" -#: src/print.c:201 +#: src/print.c:203 #, fuzzy msgid "error (nonassociative)\n" msgstr "%-4s\thata (birleþmeli deðil)" -#: src/print.c:290 +#: src/print.c:291 #, fuzzy, c-format msgid "reduce using rule %d (%s)" msgstr "$default\tindirgeme kural %d (%s)'i kullanýyor" @@ -290,58 +294,58 @@ msgstr "" msgid "state %d" msgstr "durum %d" -#: src/print.c:456 +#: src/print.c:455 msgid "Terminals, with rules where they appear" msgstr "Sabit simgeler, kurallarýnýn bulunduklarý yerde" -#: src/print.c:483 +#: src/print.c:482 msgid "Nonterminals, with rules where they appear" msgstr "Deðiþken simgeler, kurallarýnýn bulunduklarý yerde" -#: src/print.c:512 +#: src/print.c:511 msgid " on left:" msgstr " solda:" -#: src/print.c:527 +#: src/print.c:526 msgid " on right:" msgstr " saðda:" -#: src/print.c:555 +#: src/print.c:554 #, fuzzy msgid "Rules never reduced" msgstr "%d kural asla indirgenmedi\n" -#: src/reader.c:51 +#: src/reader.c:53 #, c-format msgid "multiple %s declarations" msgstr "çoklu %s bildirimleri" -#: src/reader.c:137 +#: src/reader.c:138 #, c-format msgid "result type clash on merge function %s: <%s> != <%s>" msgstr "" -#: src/reader.c:235 +#: src/reader.c:236 #, c-format msgid "rule given for %s, which is a token" msgstr "bir andaç olan %s için verilen kural" -#: src/reader.c:264 +#: src/reader.c:265 #, fuzzy, c-format msgid "type clash on default action: <%s> != <%s>" msgstr "öntanýmlý eylem üzerinde (`%s' `%s') tip çatýþmasý" -#: src/reader.c:270 +#: src/reader.c:271 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:340 src/reader.c:355 src/reader.c:368 +#: src/reader.c:341 src/reader.c:355 src/reader.c:368 #, c-format msgid "only one %s allowed per rule" msgstr "" -#: src/reader.c:350 src/reader.c:366 +#: src/reader.c:351 src/reader.c:366 #, c-format msgid "%s affects only GLR parsers" msgstr "" @@ -351,176 +355,180 @@ msgstr "" msgid "%s must be followed by positive number" msgstr "" -#: src/reader.c:512 +#: src/reader.c:510 msgid "no rules in the input grammar" msgstr "girdi grameri içinde kurallar yok" -#: src/reduce.c:239 +#: src/reduce.c:241 #, fuzzy msgid "useless rule" msgstr "%d yararsýz kural" #: src/reduce.c:302 -#, fuzzy -msgid "useless nonterminal" -msgstr "%d yararsýz deðiþken simge" +#, fuzzy, c-format +msgid "useless nonterminal: %s" +msgstr "Yararsýz deðiþken simgeler:" -#: src/reduce.c:349 +#: src/reduce.c:350 #, fuzzy msgid "Useless nonterminals" msgstr "Yararsýz deðiþken simgeler:" -#: src/reduce.c:362 +#: src/reduce.c:363 #, fuzzy msgid "Terminals which are not used" msgstr "Kullanýlmayan sabit simgeler:" -#: src/reduce.c:371 +#: src/reduce.c:372 #, fuzzy msgid "Useless rules" msgstr "Yararsýz kurallar:" -#: src/reduce.c:387 +#: src/reduce.c:388 #, c-format msgid "%d rule never reduced\n" msgid_plural "%d rules never reduced\n" msgstr[0] "%d kural asla indirgenmedi\n" msgstr[1] "%d kural asla indirgenmedi\n" -#: src/reduce.c:395 +#: src/reduce.c:396 #, c-format msgid "%d useless nonterminal" msgid_plural "%d useless nonterminals" msgstr[0] "%d yararsýz deðiþken simge" msgstr[1] "%d yararsýz deðiþken simge" -#: src/reduce.c:401 +#: src/reduce.c:402 msgid " and " msgstr " ve " -#: src/reduce.c:404 +#: src/reduce.c:405 #, c-format msgid "%d useless rule" msgid_plural "%d useless rules" msgstr[0] "%d yararsýz kural" msgstr[1] "%d yararsýz kural" -#: src/reduce.c:435 +#: src/reduce.c:436 #, fuzzy, c-format msgid "start symbol %s does not derive any sentence" msgstr "Baþlangýç simgesi %s herhangi bir cümleden türemez" -#: src/scan-gram.l:258 +#: src/scan-gram.l:208 #, fuzzy, c-format msgid "invalid directive: %s" msgstr "geçersiz girdi: %s" -#: src/scan-gram.l:287 src/scan-gram.l:661 src/scan-gram.l:733 +#: src/scan-gram.l:216 +msgid "stray `,' treated as white space" +msgstr "" + +#: src/scan-gram.l:232 src/scan-gram.l:727 src/scan-gram.l:798 #, c-format msgid "integer out of range: %s" msgstr "" -#: src/scan-gram.l:327 +#: src/scan-gram.l:276 #, fuzzy, c-format msgid "invalid character: %s" msgstr "bilinmeyen karakter: %s" -#: src/scan-gram.l:427 src/scan-gram.l:441 src/scan-gram.l:464 +#: src/scan-gram.l:400 src/scan-gram.l:410 src/scan-gram.l:429 #, fuzzy, c-format msgid "invalid escape sequence: %s" msgstr "geçersiz deðer: %s%d" -#: src/scan-gram.l:472 +#: src/scan-gram.l:434 #, fuzzy, c-format msgid "unrecognized escape sequence: %s" msgstr "tanýnmayan: %s" -#: src/scan-gram.l:632 +#: src/scan-gram.l:699 #, c-format msgid "$$ of `%s' has no declared type" msgstr "`%s''in $$'ý bildirilmiþ tip deðil" -#: src/scan-gram.l:652 +#: src/scan-gram.l:718 #, c-format msgid "$%d of `%s' has no declared type" msgstr "`%2$s''in %1$d'i bildirilmiþ tip deðil" -#: src/scan-gram.l:678 src/scan-gram.l:750 +#: src/scan-gram.l:744 src/scan-gram.l:815 #, fuzzy, c-format msgid "invalid value: %s" msgstr "geçersiz deðer: %s%d" -#: src/scan-gram.l:861 +#: src/scan-gram.l:928 #, fuzzy, c-format msgid "missing `%s' at end of file" msgstr "dosyanýn sonunda sonlandýrýlmamýþ dizge" -#: src/symlist.c:97 src/symlist.c:109 +#: src/symlist.c:97 src/symlist.c:108 msgid "invalid $ value" msgstr "geçersiz $ deðeri" -#: src/symtab.c:82 +#: src/symtab.c:84 #, c-format msgid "type redeclaration for %s" msgstr "%s için yeniden tip bildirimi" -#: src/symtab.c:100 src/symtab.c:119 +#: src/symtab.c:101 src/symtab.c:119 #, fuzzy, c-format msgid "%s redeclaration for %s" msgstr "%s için yeniden tip bildirimi" -#: src/symtab.c:140 +#: src/symtab.c:138 #, c-format msgid "redefining precedence of %s" msgstr "%s'in önceliði tekrar tanýmlandý" -#: src/symtab.c:159 +#: src/symtab.c:156 #, c-format msgid "symbol %s redefined" msgstr "%s simgesi yeniden tanýmlandý" -#: src/symtab.c:183 +#: src/symtab.c:179 #, fuzzy, c-format msgid "redefining user token number of %s" msgstr "%s'in önceliði tekrar tanýmlandý" -#: src/symtab.c:222 +#: src/symtab.c:206 #, 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/symtab.c:241 +#: src/symtab.c:231 #, 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/symtab.c:244 +#: src/symtab.c:234 #, c-format msgid "symbol `%s' given more than one literal string" msgstr "simge `%s' bir harfiyen uyumlu dizgi gibi birden fazla verilmiþ" -#: src/symtab.c:279 +#: src/symtab.c:269 #, c-format msgid "conflicting precedences for %s and %s" msgstr "%s ve %s için çeliþen öncelikler" -#: src/symtab.c:291 +#: src/symtab.c:281 #, fuzzy, c-format msgid "conflicting associativities for %s (%s) and %s (%s)" msgstr "%s ve %s için çeliþen birleþmeli deðerler" -#: src/symtab.c:363 +#: src/symtab.c:366 #, 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/symtab.c:570 +#: src/symtab.c:589 #, c-format msgid "the start symbol %s is undefined" msgstr "baþlangýç simgesi %s tanýmlanmadý" -#: src/symtab.c:574 +#: src/symtab.c:593 #, c-format msgid "the start symbol %s is a token" msgstr "baþlangýç simgesi %s bir andaçtýr" @@ -603,62 +611,62 @@ msgstr "" msgid "Could not open stats file for writing." msgstr "" -#: lib/getopt.c:662 +#: lib/getopt.c:688 lib/getopt.c:700 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: `%s' seçeneði belirsiz\n" -#: lib/getopt.c:687 +#: lib/getopt.c:733 lib/getopt.c:737 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: `--%s' seçeneði argümansýz kullanýlýr\n" -#: lib/getopt.c:692 +#: lib/getopt.c:746 lib/getopt.c:751 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: seçenek `%c%s' argümansýz kullanýlýr\n" -#: lib/getopt.c:710 lib/getopt.c:883 +#: lib/getopt.c:787 lib/getopt.c:800 lib/getopt.c:1089 lib/getopt.c:1102 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: `%s' seçeneði bir argümanla kullanýlýr\n" -#: lib/getopt.c:739 +#: lib/getopt.c:838 lib/getopt.c:841 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: `--%s' seçeneði bilinmiyor\n" -#: lib/getopt.c:743 +#: lib/getopt.c:849 lib/getopt.c:852 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: `%c%s' seçeneði bilinmiyor\n" -#: lib/getopt.c:769 +#: lib/getopt.c:899 lib/getopt.c:902 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: kuraldýþý seçenek -- %c\n" -#: lib/getopt.c:772 +#: lib/getopt.c:908 lib/getopt.c:911 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: geçersiz seçenek -- %c\n" -#: lib/getopt.c:802 lib/getopt.c:932 +#: lib/getopt.c:958 lib/getopt.c:969 lib/getopt.c:1155 lib/getopt.c:1168 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: seçenek bir argümanla kullanýlýr -- %c\n" -#: lib/getopt.c:849 +#: lib/getopt.c:1021 lib/getopt.c:1032 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: `-W %s' seçeneði belirsiz\n" -#: lib/getopt.c:867 +#: lib/getopt.c:1056 lib/getopt.c:1068 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: `-W %s' seçeneði argümansýz kullanýlýr\n" -#: lib/obstack.c:496 lib/obstack.c:499 lib/xmalloc.c:63 +#: lib/obstack.c:487 lib/obstack.c:490 lib/xmalloc.c:63 msgid "memory exhausted" msgstr "bellek tükendi" diff --git a/src/parse-gram.c b/src/parse-gram.c index e5eac821..8e6e2c84 100644 --- a/src/parse-gram.c +++ b/src/parse-gram.c @@ -1,4 +1,4 @@ -/* A Bison parser, made by GNU Bison 1.75c. */ +/* A Bison parser, made by GNU Bison 1.75d. */ /* Skeleton parser for Yacc-like parsing with Bison, Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software Foundation, Inc. @@ -99,14 +99,13 @@ TYPE = 291, EQUAL = 292, SEMICOLON = 293, - COLON = 294, - COMMA = 295, - PIPE = 296, - ID = 297, - PERCENT_PERCENT = 298, - PROLOGUE = 299, - EPILOGUE = 300, - BRACED_CODE = 301 + PIPE = 294, + ID = 295, + ID_COLON = 296, + PERCENT_PERCENT = 297, + PROLOGUE = 298, + EPILOGUE = 299, + BRACED_CODE = 300 }; #endif #define GRAM_EOF 0 @@ -146,14 +145,13 @@ #define TYPE 291 #define EQUAL 292 #define SEMICOLON 293 -#define COLON 294 -#define COMMA 295 -#define PIPE 296 -#define ID 297 -#define PERCENT_PERCENT 298 -#define PROLOGUE 299 -#define EPILOGUE 300 -#define BRACED_CODE 301 +#define PIPE 294 +#define ID 295 +#define ID_COLON 296 +#define PERCENT_PERCENT 297 +#define PROLOGUE 298 +#define EPILOGUE 299 +#define BRACED_CODE 300 @@ -162,57 +160,43 @@ #line 31 "parse-gram.y" #include "system.h" + #include "complain.h" -#include "muscle_tab.h" +#include "conflicts.h" #include "files.h" #include "getargs.h" -#include "output.h" -#include "symlist.h" #include "gram.h" +#include "muscle_tab.h" +#include "output.h" #include "reader.h" -#include "conflicts.h" +#include "symlist.h" /* Produce verbose syntax errors. */ #define YYERROR_VERBOSE 1 -#define YYLLOC_DEFAULT(Current, Rhs, N) \ -do { \ - if (N) \ - { \ - Current.first_column = Rhs[1].first_column; \ - Current.first_line = Rhs[1].first_line; \ - Current.last_column = Rhs[N].last_column; \ - Current.last_line = Rhs[N].last_line; \ - } \ - else \ - { \ - Current = Rhs[0]; \ - } \ -} while (0) -/* Pass the control structure to YYPARSE and YYLEX. */ -#define YYPARSE_PARAM gram_control -#define YYLEX_PARAM gram_control -/* YYPARSE receives GRAM_CONTROL as a void *. Provide a - correctly typed access to it. */ -#define yycontrol ((gram_control_t *) gram_control) +#define YYLLOC_DEFAULT(Current, Rhs, N) (Current) = lloc_default (Rhs, N) +static YYLTYPE lloc_default (YYLTYPE const *, int); /* Request detailed syntax error messages, and pass them to GRAM_ERROR. - FIXME: depends on the undocumented availability of YYLLOC.t */ + FIXME: depends on the undocumented availability of YYLLOC. */ #undef yyerror #define yyerror(Msg) \ gram_error (&yylloc, Msg) +static void gram_error (location const *, char const *); #define YYPRINT(File, Type, Value) \ - yyprint (File, Type, &Value) -static void yyprint (FILE *file, int type, const yystype *value); + print_token_value (File, Type, &Value) +static void print_token_value (FILE *, int, YYSTYPE const *); + +static void add_param (char const *, char const *, location); symbol_class current_class = unknown_sym; -struniq_t current_type = 0; -symbol_t *current_lhs; -location_t current_lhs_location; -assoc_t current_assoc; +uniqstr current_type = 0; +symbol *current_lhs; +location current_lhs_location; +assoc current_assoc; int current_prec = 0; -braced_code_t current_braced_code = action_braced_code; +braced_code current_braced_code = action_braced_code; /* Enabling traces. */ @@ -229,17 +213,17 @@ braced_code_t current_braced_code = action_braced_code; #endif #ifndef YYSTYPE -#line 89 "parse-gram.y" +#line 75 "parse-gram.y" typedef union { - symbol_t *symbol; - symbol_list_t *list; + symbol *symbol; + symbol_list *list; int integer; - char *string; - assoc_t assoc; - struniq_t struniq; + char *chars; + assoc assoc; + uniqstr uniqstr; } yystype; -/* Line 195 of /usr/local/share/bison/yacc.c. */ -#line 242 "parse-gram.c" +/* Line 195 of yacc.c. */ +#line 226 "parse-gram.c" # define YYSTYPE yystype # define YYSTYPE_IS_TRIVIAL 1 #endif @@ -259,8 +243,8 @@ typedef struct yyltype /* Copy the second part of user declarations. */ -/* Line __line__ of __file__. */ -#line 263 "parse-gram.c" +/* Line 215 of yacc.c. */ +#line 247 "parse-gram.c" #if ! defined (yyoverflow) || YYERROR_VERBOSE @@ -307,13 +291,13 @@ union yyalloc }; /* The size of the maximum gap between one aligned stack and the next. */ -# define YYSTACK_GAP_MAX (sizeof (union yyalloc) - 1) +# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1) /* The size of an array large to enough to hold all stacks, each with N elements. */ # define YYSTACK_BYTES(N) \ ((N) * (sizeof (short) + sizeof (YYSTYPE) + sizeof (YYLTYPE)) \ - + 2 * YYSTACK_GAP_MAX) + + 2 * YYSTACK_GAP_MAXIMUM) /* Copy COUNT objects from FROM to TO. The source and destination do not overlap. */ @@ -344,7 +328,7 @@ union yyalloc YYSIZE_T yynewbytes; \ YYCOPY (&yyptr->Stack, Stack, yysize); \ Stack = &yyptr->Stack; \ - yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAX; \ + yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ yyptr += yynewbytes / sizeof (*yyptr); \ } \ while (0) @@ -360,20 +344,20 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 3 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 152 +#define YYLAST 153 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 47 +#define YYNTOKENS 46 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 29 +#define YYNNTS 28 /* YYNRULES -- Number of rules. */ #define YYNRULES 77 /* YYNRULES -- Number of states. */ -#define YYNSTATES 116 +#define YYNSTATES 109 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 301 +#define YYMAXUTOK 300 #define YYTRANSLATE(YYX) \ ((YYX <= 0) ? YYEOF : \ @@ -412,7 +396,7 @@ static const unsigned char yytranslate[] = 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, - 45, 46 + 45 }; #if YYDEBUG @@ -420,53 +404,52 @@ static const unsigned char yytranslate[] = YYRHS. */ static const unsigned char yyprhs[] = { - 0, 0, 3, 8, 9, 13, 15, 17, 19, 23, - 25, 27, 30, 34, 36, 41, 43, 47, 49, 53, - 58, 60, 63, 65, 67, 69, 71, 73, 76, 79, - 80, 85, 86, 91, 92, 96, 97, 101, 105, 109, - 111, 113, 115, 116, 118, 120, 123, 125, 127, 130, - 133, 137, 139, 142, 144, 147, 149, 152, 155, 156, - 162, 164, 168, 169, 172, 175, 179, 183, 187, 189, - 191, 193, 195, 197, 199, 200, 203, 204 + 0, 0, 3, 8, 9, 12, 14, 16, 18, 22, + 24, 26, 29, 33, 35, 38, 40, 44, 46, 50, + 53, 55, 58, 60, 62, 64, 66, 68, 70, 73, + 76, 77, 82, 83, 88, 89, 93, 94, 98, 102, + 106, 108, 110, 112, 113, 115, 117, 120, 122, 124, + 127, 130, 134, 136, 139, 141, 144, 146, 148, 151, + 153, 154, 158, 160, 164, 165, 168, 171, 175, 179, + 183, 185, 187, 189, 191, 193, 195, 196 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const yysigned_char yyrhs[] = { - 48, 0, -1, 49, 43, 63, 74, -1, -1, 49, - 50, 75, -1, 51, -1, 44, -1, 17, -1, 18, - 72, 72, -1, 19, -1, 20, -1, 21, 4, -1, - 22, 37, 72, -1, 23, -1, 24, 73, 40, 73, - -1, 25, -1, 26, 37, 72, -1, 27, -1, 28, - 37, 72, -1, 29, 73, 40, 73, -1, 30, -1, - 31, 72, -1, 33, -1, 34, -1, 35, -1, 57, - -1, 54, -1, 32, 69, -1, 10, 46, -1, -1, - 8, 52, 46, 60, -1, -1, 9, 53, 46, 60, - -1, -1, 6, 55, 62, -1, -1, 5, 56, 62, - -1, 7, 36, 60, -1, 58, 59, 60, -1, 11, - -1, 12, -1, 13, -1, -1, 36, -1, 69, -1, - 60, 69, -1, 36, -1, 42, -1, 42, 4, -1, - 42, 71, -1, 42, 4, 71, -1, 61, -1, 62, - 61, -1, 64, -1, 63, 64, -1, 65, -1, 51, - 38, -1, 1, 38, -1, -1, 42, 39, 66, 67, - 38, -1, 68, -1, 67, 41, 68, -1, -1, 68, - 69, -1, 68, 70, -1, 68, 14, 69, -1, 68, - 15, 4, -1, 68, 16, 36, -1, 42, -1, 71, - -1, 46, -1, 3, -1, 3, -1, 46, -1, -1, - 43, 45, -1, -1, 38, -1 + 47, 0, -1, 48, 42, 62, 73, -1, -1, 48, + 49, -1, 50, -1, 43, -1, 17, -1, 18, 71, + 71, -1, 19, -1, 20, -1, 21, 4, -1, 22, + 37, 71, -1, 23, -1, 24, 72, -1, 25, -1, + 26, 37, 71, -1, 27, -1, 28, 37, 71, -1, + 29, 72, -1, 30, -1, 31, 71, -1, 33, -1, + 34, -1, 35, -1, 38, -1, 56, -1, 53, -1, + 32, 68, -1, 10, 45, -1, -1, 8, 51, 45, + 59, -1, -1, 9, 52, 45, 59, -1, -1, 6, + 54, 61, -1, -1, 5, 55, 61, -1, 7, 36, + 59, -1, 57, 58, 59, -1, 11, -1, 12, -1, + 13, -1, -1, 36, -1, 68, -1, 59, 68, -1, + 36, -1, 40, -1, 40, 4, -1, 40, 70, -1, + 40, 4, 70, -1, 60, -1, 61, 60, -1, 63, + -1, 62, 63, -1, 64, -1, 50, -1, 1, 38, + -1, 38, -1, -1, 41, 65, 66, -1, 67, -1, + 66, 39, 67, -1, -1, 67, 68, -1, 67, 69, + -1, 67, 14, 68, -1, 67, 15, 4, -1, 67, + 16, 36, -1, 40, -1, 70, -1, 45, -1, 3, + -1, 3, -1, 45, -1, -1, 42, 44, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const unsigned short yyrline[] = { - 0, 170, 170, 182, 184, 187, 189, 190, 191, 192, - 193, 194, 195, 196, 197, 202, 203, 204, 205, 206, - 211, 212, 213, 214, 215, 218, 220, 221, 225, 232, - 231, 242, 241, 254, 253, 259, 259, 264, 273, 288, - 290, 291, 294, 296, 301, 303, 307, 312, 317, 323, - 329, 339, 342, 351, 353, 359, 361, 366, 373, 372, - 377, 379, 382, 385, 387, 389, 391, 393, 397, 399, - 402, 408, 417, 426, 434, 436, 443, 445 + 0, 156, 156, 164, 166, 170, 171, 172, 173, 174, + 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, + 185, 186, 187, 188, 189, 190, 194, 195, 196, 200, + 207, 206, 217, 216, 229, 229, 234, 234, 239, 249, + 264, 265, 266, 270, 271, 277, 278, 283, 287, 292, + 298, 304, 315, 316, 325, 326, 332, 333, 338, 342, + 346, 346, 350, 351, 356, 357, 359, 361, 363, 365, + 370, 371, 375, 381, 390, 399, 406, 408 }; #endif @@ -484,14 +467,14 @@ static const char *const yytname[] = "\"%locations\"", "\"%name-prefix\"", "\"%no-lines\"", "\"%output\"", "\"%parse-param\"", "\"%pure-parser\"", "\"%skeleton\"", "\"%start\"", "\"%token-table\"", "\"%verbose\"", "\"%yacc\"", "\"type\"", "\"=\"", - "\";\"", "\":\"", "\",\"", "\"|\"", "\"identifier\"", "\"%%\"", + "\";\"", "\"|\"", "\"identifier\"", "\"identifier:\"", "\"%%\"", "\"%{...%}\"", "\"epilogue\"", "\"{...}\"", "$accept", "input", "declarations", "declaration", "grammar_declaration", "@1", "@2", "symbol_declaration", "@3", "@4", "precedence_declaration", "precedence_declarator", "type.opt", "symbols.1", "symbol_def", "symbol_defs.1", "grammar", "rules_or_grammar_declaration", "rules", "@5", "rhses.1", "rhs", "symbol", "action", "string_as_id", - "string_content", "code_content", "epilogue.opt", "semi_colon.opt", 0 + "string_content", "code_content", "epilogue.opt", 0 }; #endif @@ -504,34 +487,34 @@ static const unsigned short yytoknum[] = 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, - 295, 296, 297, 298, 299, 300, 301 + 295, 296, 297, 298, 299, 300 }; # endif /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const unsigned char yyr1[] = { - 0, 47, 48, 49, 49, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 51, 51, 51, 51, 52, - 51, 53, 51, 55, 54, 56, 54, 54, 57, 58, - 58, 58, 59, 59, 60, 60, 61, 61, 61, 61, - 61, 62, 62, 63, 63, 64, 64, 64, 66, 65, - 67, 67, 68, 68, 68, 68, 68, 68, 69, 69, - 70, 71, 72, 73, 74, 74, 75, 75 + 0, 46, 47, 48, 48, 49, 49, 49, 49, 49, + 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, + 49, 49, 49, 49, 49, 49, 50, 50, 50, 50, + 51, 50, 52, 50, 54, 53, 55, 53, 53, 56, + 57, 57, 57, 58, 58, 59, 59, 60, 60, 60, + 60, 60, 61, 61, 62, 62, 63, 63, 63, 63, + 65, 64, 66, 66, 67, 67, 67, 67, 67, 67, + 68, 68, 69, 70, 71, 72, 73, 73 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ static const unsigned char yyr2[] = { - 0, 2, 4, 0, 3, 1, 1, 1, 3, 1, - 1, 2, 3, 1, 4, 1, 3, 1, 3, 4, - 1, 2, 1, 1, 1, 1, 1, 2, 2, 0, - 4, 0, 4, 0, 3, 0, 3, 3, 3, 1, - 1, 1, 0, 1, 1, 2, 1, 1, 2, 2, - 3, 1, 2, 1, 2, 1, 2, 2, 0, 5, - 1, 3, 0, 2, 2, 3, 3, 3, 1, 1, - 1, 1, 1, 1, 0, 2, 0, 1 + 0, 2, 4, 0, 2, 1, 1, 1, 3, 1, + 1, 2, 3, 1, 2, 1, 3, 1, 3, 2, + 1, 2, 1, 1, 1, 1, 1, 1, 2, 2, + 0, 4, 0, 4, 0, 3, 0, 3, 3, 3, + 1, 1, 1, 0, 1, 1, 2, 1, 1, 2, + 2, 3, 1, 2, 1, 2, 1, 1, 2, 1, + 0, 3, 1, 3, 0, 2, 2, 3, 3, 3, + 1, 1, 1, 1, 1, 1, 0, 2 }; /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state @@ -539,116 +522,113 @@ static const unsigned char yyr2[] = means the default is an error. */ static const unsigned char yydefact[] = { - 3, 0, 0, 1, 35, 33, 0, 29, 31, 0, - 39, 40, 41, 7, 0, 9, 10, 0, 0, 13, + 3, 0, 0, 1, 36, 34, 0, 30, 32, 0, + 40, 41, 42, 7, 0, 9, 10, 0, 0, 13, 0, 15, 0, 17, 0, 0, 20, 0, 0, 22, - 23, 24, 0, 6, 76, 5, 26, 25, 42, 0, - 0, 0, 0, 0, 28, 72, 0, 11, 0, 73, - 0, 0, 0, 0, 21, 71, 68, 27, 69, 0, - 0, 0, 0, 53, 55, 77, 4, 43, 0, 46, - 47, 51, 36, 34, 37, 44, 0, 0, 8, 12, - 0, 16, 18, 0, 57, 58, 56, 0, 54, 2, - 38, 48, 49, 52, 45, 30, 32, 14, 19, 62, - 75, 50, 0, 60, 59, 62, 0, 0, 0, 70, - 63, 64, 61, 65, 66, 67 + 23, 24, 25, 0, 6, 4, 5, 27, 26, 43, + 0, 0, 0, 0, 0, 29, 74, 0, 11, 0, + 75, 14, 0, 0, 19, 21, 73, 70, 28, 71, + 0, 59, 60, 57, 0, 54, 56, 44, 0, 47, + 48, 52, 37, 35, 38, 45, 0, 0, 8, 12, + 16, 18, 58, 64, 0, 55, 2, 39, 49, 50, + 53, 46, 31, 33, 61, 62, 77, 51, 64, 0, + 0, 0, 72, 65, 66, 63, 67, 68, 69 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yysigned_char yydefgoto[] = { - -1, 1, 2, 34, 61, 42, 43, 36, 40, 39, - 37, 38, 68, 74, 71, 72, 62, 63, 64, 99, - 102, 103, 75, 111, 58, 46, 50, 89, 66 + -1, 1, 2, 35, 63, 43, 44, 37, 41, 40, + 38, 39, 68, 74, 71, 72, 64, 65, 66, 83, + 94, 95, 75, 104, 59, 47, 51, 86 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -66 +#define YYPACT_NINF -67 static const yysigned_char yypact[] = { - -66, 6, 108, -66, -66, -66, -16, -66, -66, -21, - -66, -66, -66, -66, 19, -66, -66, 32, 5, -66, - 3, -66, 10, -66, 11, 3, -66, 19, 1, -66, - -66, -66, 80, -66, 12, -66, -66, -66, 16, -19, - -19, 1, 7, 8, -66, -66, 19, -66, 19, -66, - 18, 19, 19, 20, -66, -66, -66, -66, -66, 13, - 24, 17, 2, -66, -66, -66, -66, -66, 1, -66, - 29, -66, -19, -19, 1, -66, 1, 1, -66, -66, - 3, -66, -66, 3, -66, -66, -66, 21, -66, -66, - 1, 61, -66, -66, -66, 1, 1, -66, -66, -66, - -66, -66, -17, 15, -66, -66, 1, 65, 34, -66, - -66, -66, 15, -66, -66, -66 + -67, 5, 110, -67, -67, -67, -17, -67, -67, -14, + -67, -67, -67, -67, 29, -67, -67, 30, -1, -67, + -10, -67, 4, -67, 7, -10, -67, 29, 0, -67, + -67, -67, -67, 73, -67, -67, -67, -67, -67, 2, + -20, -20, 0, -8, 3, -67, -67, 29, -67, 29, + -67, -67, 29, 29, -67, -67, -67, -67, -67, -67, + 11, -67, -67, -67, 1, -67, -67, -67, 0, -67, + 14, -67, -20, -20, 0, -67, 0, 0, -67, -67, + -67, -67, -67, -67, 9, -67, -67, 0, 51, -67, + -67, -67, 0, 0, 16, 12, -67, -67, -67, 0, + 52, 22, -67, -67, -67, 12, -67, -67, -67 }; /* YYPGOTO[NTERM-NUM]. */ static const yysigned_char yypgoto[] = { - -66, -66, -66, -66, 63, -66, -66, -66, -66, -66, - -66, -66, -66, -49, -34, 31, -66, 14, -66, -66, - -66, -33, -28, -66, -65, -11, -24, -66, -66 + -67, -67, -67, -67, 58, -67, -67, -67, -67, -67, + -67, -67, -67, -47, -49, 20, -67, 6, -67, -67, + -67, -36, -28, -67, -66, -2, 38, -67 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If positive, shift that token. If negative, reduce the rule which number is the opposite. If zero, do what YYDEFACT says. If YYTABLE_NINF, syntax error. */ -#define YYTABLE_NINF -75 +#define YYTABLE_NINF -77 static const yysigned_char yytable[] = { - 57, 53, -74, 59, 55, 92, 3, 4, 5, 6, - 7, 8, 9, 10, 11, 12, 54, 69, 55, 90, - 41, 104, 45, 70, 105, 44, 101, 95, 96, 106, - 107, 108, 55, 91, 28, 78, 47, 79, 93, 93, - 81, 82, 48, 56, 60, 87, 94, 51, 52, 49, - 65, 84, 67, 76, 77, 86, 97, 56, 80, 98, - 83, 109, 94, 85, 55, 35, 100, 94, 94, 114, - 115, 73, 112, 0, 0, 110, 88, 0, 113, 0, - 0, 59, 0, 0, 110, 4, 5, 6, 7, 8, - 9, 10, 11, 12, 0, 0, 0, 0, 0, 0, + 58, -76, 60, 56, 89, 3, 4, 5, 6, 7, + 8, 9, 10, 11, 12, 56, 69, 56, 88, 42, + 70, 87, 97, 90, 90, 55, 99, 100, 101, 92, + 93, 45, 46, 28, 48, 50, 49, 76, 67, 61, + 57, 52, 62, 84, 53, 78, 91, 79, 77, 82, + 80, 81, 57, 96, 56, 98, 107, 102, 108, 91, + 36, 73, 105, 54, 91, 91, 0, 103, 0, 0, + 85, 106, 0, 0, 60, 0, 0, 103, 4, 5, + 6, 7, 8, 9, 10, 11, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 28, 4, 5, 6, 7, 8, 9, 10, - 11, 12, 60, 0, 0, 13, 14, 15, 16, 17, - 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, - 28, 29, 30, 31, 0, 0, 0, 0, 0, 0, - 0, 32, 33 + 0, 0, 0, 0, 0, 28, 0, 0, 0, 0, + 0, 61, 0, 0, 62, 4, 5, 6, 7, 8, + 9, 10, 11, 12, 0, 0, 0, 13, 14, 15, + 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, + 26, 27, 28, 29, 30, 31, 0, 0, 32, 0, + 0, 0, 33, 34 }; static const yysigned_char yycheck[] = { - 28, 25, 0, 1, 3, 70, 0, 5, 6, 7, - 8, 9, 10, 11, 12, 13, 27, 36, 3, 68, - 36, 38, 3, 42, 41, 46, 91, 76, 77, 14, - 15, 16, 3, 4, 32, 46, 4, 48, 72, 73, - 51, 52, 37, 42, 42, 43, 74, 37, 37, 46, - 38, 38, 36, 46, 46, 38, 80, 42, 40, 83, - 40, 46, 90, 39, 3, 2, 45, 95, 96, 4, - 36, 40, 105, -1, -1, 103, 62, -1, 106, -1, - -1, 1, -1, -1, 112, 5, 6, 7, 8, 9, - 10, 11, 12, 13, -1, -1, -1, -1, -1, -1, + 28, 0, 1, 3, 70, 0, 5, 6, 7, 8, + 9, 10, 11, 12, 13, 3, 36, 3, 4, 36, + 40, 68, 88, 72, 73, 27, 14, 15, 16, 76, + 77, 45, 3, 32, 4, 45, 37, 45, 36, 38, + 40, 37, 41, 42, 37, 47, 74, 49, 45, 38, + 52, 53, 40, 44, 3, 39, 4, 45, 36, 87, + 2, 41, 98, 25, 92, 93, -1, 95, -1, -1, + 64, 99, -1, -1, 1, -1, -1, 105, 5, 6, + 7, 8, 9, 10, 11, 12, 13, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 32, 5, 6, 7, 8, 9, 10, 11, - 12, 13, 42, -1, -1, 17, 18, 19, 20, 21, - 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, - 32, 33, 34, 35, -1, -1, -1, -1, -1, -1, - -1, 43, 44 + -1, -1, -1, -1, -1, 32, -1, -1, -1, -1, + -1, 38, -1, -1, 41, 5, 6, 7, 8, 9, + 10, 11, 12, 13, -1, -1, -1, 17, 18, 19, + 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, + 30, 31, 32, 33, 34, 35, -1, -1, 38, -1, + -1, -1, 42, 43 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ static const unsigned char yystos[] = { - 0, 48, 49, 0, 5, 6, 7, 8, 9, 10, + 0, 47, 48, 0, 5, 6, 7, 8, 9, 10, 11, 12, 13, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, - 34, 35, 43, 44, 50, 51, 54, 57, 58, 56, - 55, 36, 52, 53, 46, 3, 72, 4, 37, 46, - 73, 37, 37, 73, 72, 3, 42, 69, 71, 1, - 42, 51, 63, 64, 65, 38, 75, 36, 59, 36, - 42, 61, 62, 62, 60, 69, 46, 46, 72, 72, - 40, 72, 72, 40, 38, 39, 38, 43, 64, 74, - 60, 4, 71, 61, 69, 60, 60, 73, 73, 66, - 45, 71, 67, 68, 38, 41, 14, 15, 16, 46, - 69, 70, 68, 69, 4, 36 + 34, 35, 38, 42, 43, 49, 50, 53, 56, 57, + 55, 54, 36, 51, 52, 45, 3, 71, 4, 37, + 45, 72, 37, 37, 72, 71, 3, 40, 68, 70, + 1, 38, 41, 50, 62, 63, 64, 36, 58, 36, + 40, 60, 61, 61, 59, 68, 45, 45, 71, 71, + 71, 71, 38, 65, 42, 63, 73, 59, 4, 70, + 60, 68, 59, 59, 66, 67, 44, 70, 39, 14, + 15, 16, 45, 68, 69, 67, 68, 4, 36 }; #if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__) @@ -736,11 +716,13 @@ do { \ if (yydebug) \ YYFPRINTF Args; \ } while (0) + # define YYDSYMPRINT(Args) \ do { \ if (yydebug) \ yysymprint Args; \ } while (0) + # define YYDSYMPRINTF(Title, Token, Value, Location) \ do { \ if (yydebug) \ @@ -752,6 +734,63 @@ do { \ } \ } while (0) +/*------------------------------------------------------------------. +| yy_stack_print -- Print the state stack from its BOTTOM up to its | +| TOP (cinluded). | +`------------------------------------------------------------------*/ + +#if defined (__STDC__) || defined (__cplusplus) +static void +yy_stack_print (short *bottom, short *top) +#else +static void +yy_stack_print (bottom, top) + short *bottom; + short *top; +#endif +{ + YYFPRINTF (stderr, "Stack now"); + for (/* Nothing. */; bottom <= top; ++bottom) + YYFPRINTF (stderr, " %d", *bottom); + YYFPRINTF (stderr, "\n"); +} + +# define YY_STACK_PRINT(Bottom, Top) \ +do { \ + if (yydebug) \ + yy_stack_print ((Bottom), (Top)); \ +} while (0) + + +/*------------------------------------------------. +| Report that the YYRULE is going to be reduced. | +`------------------------------------------------*/ + +#if defined (__STDC__) || defined (__cplusplus) +static void +yy_reduce_print (int yyrule) +#else +static void +yy_reduce_print (yyrule) + int yyrule; +#endif +{ + int yyi; + unsigned int yylineno = yyrline[yyrule]; + YYFPRINTF (stderr, "Reducing stack by rule %d (line %u), ", + yyrule - 1, yylineno); + /* Print the symbols being reduced, and their result. */ + for (yyi = yyprhs[yyrule]; 0 <= yyrhs[yyi]; yyi++) + YYFPRINTF (stderr, "%s ", yytname [yyrhs[yyi]]); + YYFPRINTF (stderr, "-> %s\n", yytname [yyr1[yyrule]]); +} + +# define YY_REDUCE_PRINT(Rule) \ +do { \ + if (yydebug) \ + yy_reduce_print (Rule); \ +} while (0) + /* Nonzero means print parse trace. It is left uninitialized so that multiple parsers can coexist. */ int yydebug; @@ -759,8 +798,11 @@ int yydebug; # define YYDPRINTF(Args) # define YYDSYMPRINT(Args) # define YYDSYMPRINTF(Title, Token, Value, Location) +# define YY_STACK_PRINT(Bottom, Top) +# define YY_REDUCE_PRINT(Rule) #endif /* !YYDEBUG */ + /* YYINITDEPTH -- initial size of the parser's stacks. */ #ifndef YYINITDEPTH # define YYINITDEPTH 200 @@ -839,17 +881,17 @@ yystpcpy (yydest, yysrc) #if YYDEBUG -/*-----------------------------. -| Print this symbol on YYOUT. | -`-----------------------------*/ +/*--------------------------------. +| Print this symbol on YYOUTPUT. | +`--------------------------------*/ #if defined (__STDC__) || defined (__cplusplus) static void -yysymprint (FILE *yyout, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocationp) +yysymprint (FILE *yyoutput, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocationp) #else static void -yysymprint (yyout, yytype, yyvaluep, yylocationp) - FILE *yyout; +yysymprint (yyoutput, yytype, yyvaluep, yylocationp) + FILE *yyoutput; int yytype; YYSTYPE *yyvaluep; YYLTYPE *yylocationp; @@ -861,23 +903,23 @@ yysymprint (yyout, yytype, yyvaluep, yylocationp) if (yytype < YYNTOKENS) { - YYFPRINTF (yyout, "token %s (", yytname[yytype]); + YYFPRINTF (yyoutput, "token %s (", yytname[yytype]); # ifdef YYPRINT - YYPRINT (yyout, yytoknum[yytype], *yyvaluep); + YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); # endif } else - YYFPRINTF (yyout, "nterm %s (", yytname[yytype]); + YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]); switch (yytype) { default: break; } - YYFPRINTF (yyout, ")"); + YYFPRINTF (yyoutput, ")"); } -#endif /* YYDEBUG. */ +#endif /* ! YYDEBUG */ /*-----------------------------------------------. | Release the memory associated to this symbol. | `-----------------------------------------------*/ @@ -920,7 +962,7 @@ int yyparse (void); #else int yyparse (); #endif -#endif +#endif /* ! YYPARSE_PARAM */ @@ -1133,8 +1175,6 @@ yybackup: } else { - /* We have to keep this `#if YYDEBUG', since we use variables - which are defined only if `YYDEBUG' is set. */ YYDSYMPRINTF ("Next token is", yytoken, &yylval, &yylloc); } @@ -1203,221 +1243,192 @@ yyreduce: /* Default location. */ YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen); - -#if YYDEBUG - /* We have to keep this `#if YYDEBUG', since we use variables which - are defined only if `YYDEBUG' is set. */ - if (yydebug) - { - int yyi; - - YYFPRINTF (stderr, "Reducing by rule %d (line %d), ", - yyn - 1, yyrline[yyn]); - - /* Print the symbols being reduced, and their result. */ - for (yyi = yyprhs[yyn]; 0 <= yyrhs[yyi]; yyi++) - YYFPRINTF (stderr, "%s ", yytname[yyrhs[yyi]]); - YYFPRINTF (stderr, "-> %s\n", yytname[yyr1[yyn]]); - } -#endif + YY_REDUCE_PRINT (yyn); switch (yyn) { - case 2: -#line 172 "parse-gram.y" - { - yycontrol->errcode = 0; - } - break; - - case 6: -#line 189 "parse-gram.y" - { prologue_augment (yyvsp[0].string, yylsp[0]); } + case 6: +#line 171 "parse-gram.y" + { prologue_augment (yyvsp[0].chars, yylsp[0]); } break; case 7: -#line 190 "parse-gram.y" +#line 172 "parse-gram.y" { debug_flag = 1; } break; case 8: -#line 191 "parse-gram.y" - { muscle_insert (yyvsp[-1].string, yyvsp[0].string); } +#line 173 "parse-gram.y" + { muscle_insert (yyvsp[-1].chars, yyvsp[0].chars); } break; case 9: -#line 192 "parse-gram.y" +#line 174 "parse-gram.y" { defines_flag = 1; } break; case 10: -#line 193 "parse-gram.y" +#line 175 "parse-gram.y" { error_verbose = 1; } break; case 11: -#line 194 "parse-gram.y" +#line 176 "parse-gram.y" { expected_conflicts = yyvsp[0].integer; } break; case 12: -#line 195 "parse-gram.y" - { spec_file_prefix = yyvsp[0].string; } +#line 177 "parse-gram.y" + { spec_file_prefix = yyvsp[0].chars; } break; case 13: -#line 196 "parse-gram.y" +#line 178 "parse-gram.y" { glr_parser = 1; } break; case 14: -#line 198 "parse-gram.y" - { - muscle_pair_list_grow ("lex_param", yyvsp[-2].string, yyvsp[0].string); - scanner_last_string_free (); - } +#line 179 "parse-gram.y" + { add_param ("lex_param", yyvsp[0].chars, yylsp[0]); } break; case 15: -#line 202 "parse-gram.y" +#line 180 "parse-gram.y" { locations_flag = 1; } break; case 16: -#line 203 "parse-gram.y" - { spec_name_prefix = yyvsp[0].string; } +#line 181 "parse-gram.y" + { spec_name_prefix = yyvsp[0].chars; } break; case 17: -#line 204 "parse-gram.y" +#line 182 "parse-gram.y" { no_lines_flag = 1; } break; case 18: -#line 205 "parse-gram.y" - { spec_outfile = yyvsp[0].string; } +#line 183 "parse-gram.y" + { spec_outfile = yyvsp[0].chars; } break; case 19: -#line 207 "parse-gram.y" - { - muscle_pair_list_grow ("parse_param", yyvsp[-2].string, yyvsp[0].string); - scanner_last_string_free (); - } +#line 184 "parse-gram.y" + { add_param ("parse_param", yyvsp[0].chars, yylsp[0]); } break; case 20: -#line 211 "parse-gram.y" +#line 185 "parse-gram.y" { pure_parser = 1; } break; case 21: -#line 212 "parse-gram.y" - { skeleton = yyvsp[0].string; } +#line 186 "parse-gram.y" + { skeleton = yyvsp[0].chars; } break; case 22: -#line 213 "parse-gram.y" +#line 187 "parse-gram.y" { token_table_flag = 1; } break; case 23: -#line 214 "parse-gram.y" +#line 188 "parse-gram.y" { report_flag = 1; } break; case 24: -#line 215 "parse-gram.y" +#line 189 "parse-gram.y" { yacc_flag = 1; } break; - case 27: -#line 222 "parse-gram.y" + case 28: +#line 197 "parse-gram.y" { grammar_start_symbol_set (yyvsp[0].symbol, yylsp[0]); } break; - case 28: -#line 226 "parse-gram.y" + case 29: +#line 201 "parse-gram.y" { typed = 1; - MUSCLE_INSERT_INT ("stype_line", yylsp[0].first_line); - muscle_insert ("stype", yyvsp[0].string); + MUSCLE_INSERT_INT ("stype_line", yylsp[0].start.line); + muscle_insert ("stype", yyvsp[0].chars); } break; - case 29: -#line 232 "parse-gram.y" + case 30: +#line 207 "parse-gram.y" { current_braced_code = destructor_braced_code; } break; - case 30: -#line 234 "parse-gram.y" + case 31: +#line 209 "parse-gram.y" { - symbol_list_t *list; + symbol_list *list; for (list = yyvsp[0].list; list; list = list->next) - symbol_destructor_set (list->sym, yyvsp[-1].string, yylsp[-1]); + symbol_destructor_set (list->sym, yyvsp[-1].chars, yylsp[-1]); symbol_list_free (yyvsp[0].list); current_braced_code = action_braced_code; } break; - case 31: -#line 242 "parse-gram.y" + case 32: +#line 217 "parse-gram.y" { current_braced_code = printer_braced_code; } break; - case 32: -#line 244 "parse-gram.y" + case 33: +#line 219 "parse-gram.y" { - symbol_list_t *list; + symbol_list *list; for (list = yyvsp[0].list; list; list = list->next) - symbol_printer_set (list->sym, yyvsp[-1].string, list->location); + symbol_printer_set (list->sym, yyvsp[-1].chars, list->location); symbol_list_free (yyvsp[0].list); current_braced_code = action_braced_code; } break; - case 33: -#line 254 "parse-gram.y" + case 34: +#line 229 "parse-gram.y" { current_class = nterm_sym; } break; - case 34: -#line 255 "parse-gram.y" + case 35: +#line 230 "parse-gram.y" { current_class = unknown_sym; current_type = NULL; } break; - case 35: -#line 259 "parse-gram.y" + case 36: +#line 234 "parse-gram.y" { current_class = token_sym; } break; - case 36: -#line 260 "parse-gram.y" + case 37: +#line 235 "parse-gram.y" { current_class = unknown_sym; current_type = NULL; } break; - case 37: -#line 265 "parse-gram.y" + case 38: +#line 240 "parse-gram.y" { - symbol_list_t *list; + symbol_list *list; for (list = yyvsp[0].list; list; list = list->next) - symbol_type_set (list->sym, yyvsp[-1].struniq, yylsp[-1]); + symbol_type_set (list->sym, yyvsp[-1].uniqstr, yylsp[-1]); symbol_list_free (yyvsp[0].list); } break; - case 38: -#line 275 "parse-gram.y" + case 39: +#line 250 "parse-gram.y" { - symbol_list_t *list; + symbol_list *list; ++current_prec; for (list = yyvsp[0].list; list; list = list->next) { @@ -1429,58 +1440,58 @@ yyreduce: } break; - case 39: -#line 289 "parse-gram.y" + case 40: +#line 264 "parse-gram.y" { yyval.assoc = left_assoc; } break; - case 40: -#line 290 "parse-gram.y" + case 41: +#line 265 "parse-gram.y" { yyval.assoc = right_assoc; } break; - case 41: -#line 291 "parse-gram.y" + case 42: +#line 266 "parse-gram.y" { yyval.assoc = non_assoc; } break; - case 42: -#line 295 "parse-gram.y" + case 43: +#line 270 "parse-gram.y" { current_type = NULL; } break; - case 43: -#line 296 "parse-gram.y" - { current_type = yyvsp[0].struniq; } + case 44: +#line 271 "parse-gram.y" + { current_type = yyvsp[0].uniqstr; } break; - case 44: -#line 302 "parse-gram.y" + case 45: +#line 277 "parse-gram.y" { yyval.list = symbol_list_new (yyvsp[0].symbol, yylsp[0]); } break; - case 45: -#line 303 "parse-gram.y" + case 46: +#line 278 "parse-gram.y" { yyval.list = symbol_list_prepend (yyvsp[-1].list, yyvsp[0].symbol, yylsp[0]); } break; - case 46: -#line 309 "parse-gram.y" + case 47: +#line 284 "parse-gram.y" { - current_type = yyvsp[0].struniq; + current_type = yyvsp[0].uniqstr; } break; - case 47: -#line 313 "parse-gram.y" + case 48: +#line 288 "parse-gram.y" { symbol_class_set (yyvsp[0].symbol, current_class, yylsp[0]); symbol_type_set (yyvsp[0].symbol, current_type, yylsp[0]); } break; - case 48: -#line 318 "parse-gram.y" + case 49: +#line 293 "parse-gram.y" { symbol_class_set (yyvsp[-1].symbol, current_class, yylsp[-1]); symbol_type_set (yyvsp[-1].symbol, current_type, yylsp[-1]); @@ -1488,8 +1499,8 @@ yyreduce: } break; - case 49: -#line 324 "parse-gram.y" + case 50: +#line 299 "parse-gram.y" { symbol_class_set (yyvsp[-1].symbol, current_class, yylsp[-1]); symbol_type_set (yyvsp[-1].symbol, current_type, yylsp[-1]); @@ -1497,8 +1508,8 @@ yyreduce: } break; - case 50: -#line 330 "parse-gram.y" + case 51: +#line 305 "parse-gram.y" { symbol_class_set (yyvsp[-2].symbol, current_class, yylsp[-2]); symbol_type_set (yyvsp[-2].symbol, current_type, yylsp[-2]); @@ -1507,124 +1518,109 @@ yyreduce: } break; - case 51: -#line 341 "parse-gram.y" - {;} - break; - - case 52: -#line 343 "parse-gram.y" - {;} - break; - - case 56: -#line 362 "parse-gram.y" + case 57: +#line 334 "parse-gram.y" { if (yacc_flag) complain_at (yyloc, _("POSIX forbids declarations in the grammar")); } break; - case 57: -#line 367 "parse-gram.y" + case 58: +#line 339 "parse-gram.y" { yyerrok; } break; - case 58: -#line 373 "parse-gram.y" - { current_lhs = yyvsp[-1].symbol; current_lhs_location = yylsp[-1]; } - break; - - case 59: -#line 374 "parse-gram.y" - {;} + case 60: +#line 346 "parse-gram.y" + { current_lhs = yyvsp[0].symbol; current_lhs_location = yylsp[0]; } break; - case 60: -#line 378 "parse-gram.y" + case 62: +#line 350 "parse-gram.y" { grammar_rule_end (yylsp[0]); } break; - case 61: -#line 379 "parse-gram.y" + case 63: +#line 351 "parse-gram.y" { grammar_rule_end (yylsp[0]); } break; - case 62: -#line 384 "parse-gram.y" + case 64: +#line 356 "parse-gram.y" { grammar_rule_begin (current_lhs, current_lhs_location); } break; - case 63: -#line 386 "parse-gram.y" + case 65: +#line 358 "parse-gram.y" { grammar_current_rule_symbol_append (yyvsp[0].symbol, yylsp[0]); } break; - case 64: -#line 388 "parse-gram.y" - { grammar_current_rule_action_append (yyvsp[0].string, yylsp[0]); } + case 66: +#line 360 "parse-gram.y" + { grammar_current_rule_action_append (yyvsp[0].chars, yylsp[0]); } break; - case 65: -#line 390 "parse-gram.y" + case 67: +#line 362 "parse-gram.y" { grammar_current_rule_prec_set (yyvsp[0].symbol, yylsp[0]); } break; - case 66: -#line 392 "parse-gram.y" + case 68: +#line 364 "parse-gram.y" { grammar_current_rule_dprec_set (yyvsp[0].integer, yylsp[0]); } break; - case 67: -#line 394 "parse-gram.y" - { grammar_current_rule_merge_set (yyvsp[0].struniq, yylsp[0]); } + case 69: +#line 366 "parse-gram.y" + { grammar_current_rule_merge_set (yyvsp[0].uniqstr, yylsp[0]); } break; - case 68: -#line 398 "parse-gram.y" + case 70: +#line 370 "parse-gram.y" { yyval.symbol = yyvsp[0].symbol; } break; - case 69: -#line 399 "parse-gram.y" + case 71: +#line 371 "parse-gram.y" { yyval.symbol = yyvsp[0].symbol; } break; - case 70: -#line 404 "parse-gram.y" - { yyval.string = yyvsp[0].string; } + case 72: +#line 376 "parse-gram.y" + { yyval.chars = yyvsp[0].chars; } break; - case 71: -#line 410 "parse-gram.y" + case 73: +#line 382 "parse-gram.y" { - yyval.symbol = symbol_get (yyvsp[0].string, yylsp[0]); + yyval.symbol = symbol_get (yyvsp[0].chars, yylsp[0]); symbol_class_set (yyval.symbol, token_sym, yylsp[0]); } break; - case 72: -#line 419 "parse-gram.y" + case 74: +#line 391 "parse-gram.y" { - yyval.string = yyvsp[0].string + 1; - yyval.string[strlen (yyval.string) - 1] = '\0'; + yyval.chars = yyvsp[0].chars + 1; + yyval.chars[strlen (yyval.chars) - 1] = '\0'; } break; - case 73: -#line 428 "parse-gram.y" + case 75: +#line 400 "parse-gram.y" { - yyval.string = yyvsp[0].string + 1; - yyval.string[strlen (yyval.string) - 1] = '\0'; + yyval.chars = yyvsp[0].chars + 1; + yyval.chars[strlen (yyval.chars) - 1] = '\0'; } break; - case 75: -#line 437 "parse-gram.y" + case 77: +#line 409 "parse-gram.y" { - epilogue_augment (yyvsp[0].string, yylsp[0]); + epilogue_augment (yyvsp[0].chars, yylsp[0]); scanner_last_string_free (); } break; @@ -1632,23 +1628,14 @@ yyreduce: } -/* Line 959 of /usr/local/share/bison/yacc.c. */ -#line 1636 "parse-gram.c" +/* Line 991 of yacc.c. */ +#line 1632 "parse-gram.c" yyvsp -= yylen; yyssp -= yylen; yylsp -= yylen; -#if YYDEBUG - if (yydebug) - { - short *yyssp1 = yyss - 1; - YYFPRINTF (stderr, "state stack now"); - while (yyssp1 != yyssp) - YYFPRINTF (stderr, " %d", *++yyssp1); - YYFPRINTF (stderr, "\n"); - } -#endif + YY_STACK_PRINT (yyss, yyssp); *++yyvsp = yyval; *++yylsp = yyloc; @@ -1725,13 +1712,7 @@ yyerrlab: #endif /* YYERROR_VERBOSE */ yyerror ("syntax error"); } - goto yyerrlab1; - -/*----------------------------------------------------. -| yyerrlab1 -- error raised explicitly by an action. | -`----------------------------------------------------*/ -yyerrlab1: if (yyerrstatus == 3) { /* If just tried and failed to reuse lookahead token after an @@ -1759,7 +1740,13 @@ yyerrlab1: /* Else will try to reuse lookahead token after shifting the error token. */ + goto yyerrlab1; + +/*----------------------------------------------------. +| yyerrlab1 -- error raised explicitly by an action. | +`----------------------------------------------------*/ +yyerrlab1: yyerrstatus = 3; /* Each real token shifted decrements this. */ for (;;) @@ -1785,17 +1772,7 @@ yyerrlab1: yyvsp--; yystate = *--yyssp; yylsp--; - -#if YYDEBUG - if (yydebug) - { - short *yyssp1 = yyss - 1; - YYFPRINTF (stderr, "Error: state stack now"); - while (yyssp1 != yyssp) - YYFPRINTF (stderr, " %d", *++yyssp1); - YYFPRINTF (stderr, "\n"); - } -#endif + YY_STACK_PRINT (yyss, yyssp); } if (yyn == YYFINAL) @@ -1843,15 +1820,87 @@ yyreturn: } -#line 447 "parse-gram.y" +#line 415 "parse-gram.y" + + + +/* Return the location of the left-hand side of a rule whose + right-hand side is RHS[1] ... RHS[N]. Ignore empty nonterminals in + the right-hand side, and return an empty location equal to the end + boundary of RHS[0] if the right-hand side is empty. */ + +static YYLTYPE +lloc_default (YYLTYPE const *rhs, int n) +{ + int i; + int j; + YYLTYPE r; + r.start = r.end = rhs[n].end; + + for (i = 1; i <= n; i++) + if (! equal_boundaries (rhs[i].start, rhs[i].end)) + { + r.start = rhs[i].start; + + for (j = n; i < j; j--) + if (! equal_boundaries (rhs[j].start, rhs[j].end)) + break; + r.end = rhs[j].end; + + break; + } + + return r; +} + + +/* Add a lex-param or a parse-param (depending on TYPE) with + declaration DECL and location LOC. */ + +static void +add_param (char const *type, char const *decl, location loc) +{ + static char const alphanum[] = + "0123456789" + "abcdefghijklmnopqrstuvwxyz" + "ABCDEFGHIJKLMNOPQRSTUVWXYZ" + "_"; + char const *alpha = alphanum + 10; + char const *name_start = NULL; + char const *p; + + for (p = decl; *p; p++) + if ((p == decl || ! strchr (alphanum, p[-1])) && strchr (alpha, p[0])) + name_start = p; + + if (! name_start) + complain_at (loc, _("missing identifier in parameter declaration")); + else + { + char *name; + size_t name_len; + + for (name_len = 1; + name_start[name_len] && strchr (alphanum, name_start[name_len]); + name_len++) + continue; + + name = xmalloc (name_len + 1); + memcpy (name, name_start, name_len); + name[name_len] = '\0'; + muscle_pair_list_grow (type, decl, name); + free (name); + } + + scanner_last_string_free (); +} /*------------------------------------------------------------------. | When debugging the parser, display tokens' locations and values. | `------------------------------------------------------------------*/ static void -yyprint (FILE *file, - int type, const yystype *value) +print_token_value (FILE *file, int type, YYSTYPE const *value) { fputc (' ', file); switch (type) @@ -1865,17 +1914,17 @@ yyprint (FILE *file, break; case STRING: - fprintf (file, " = \"%s\"", value->string); + fprintf (file, " = \"%s\"", value->chars); break; case TYPE: - fprintf (file, " = <%s>", value->struniq); + fprintf (file, " = <%s>", value->uniqstr); break; case BRACED_CODE: case PROLOGUE: case EPILOGUE: - fprintf (file, " = {{ %s }}", value->string); + fprintf (file, " = {{ %s }}", value->chars); break; default: @@ -1884,9 +1933,9 @@ yyprint (FILE *file, } } -void -gram_error (location_t *yylloc, const char *msg) +static void +gram_error (location const *loc, char const *msg) { - complain_at (*yylloc, "%s", msg); + complain_at (*loc, "%s", msg); } diff --git a/src/parse-gram.h b/src/parse-gram.h index f62b4959..2e1b739c 100644 --- a/src/parse-gram.h +++ b/src/parse-gram.h @@ -1,4 +1,4 @@ -/* A Bison parser, made by GNU Bison 1.75b. */ +/* A Bison parser, made by GNU Bison 1.75d. */ /* Skeleton parser for Yacc-like parsing with Bison, Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software Foundation, Inc. @@ -66,14 +66,13 @@ TYPE = 291, EQUAL = 292, SEMICOLON = 293, - COLON = 294, - COMMA = 295, - PIPE = 296, - ID = 297, - PERCENT_PERCENT = 298, - PROLOGUE = 299, - EPILOGUE = 300, - BRACED_CODE = 301 + PIPE = 294, + ID = 295, + ID_COLON = 296, + PERCENT_PERCENT = 297, + PROLOGUE = 298, + EPILOGUE = 299, + BRACED_CODE = 300 }; #endif #define GRAM_EOF 0 @@ -113,30 +112,29 @@ #define TYPE 291 #define EQUAL 292 #define SEMICOLON 293 -#define COLON 294 -#define COMMA 295 -#define PIPE 296 -#define ID 297 -#define PERCENT_PERCENT 298 -#define PROLOGUE 299 -#define EPILOGUE 300 -#define BRACED_CODE 301 +#define PIPE 294 +#define ID 295 +#define ID_COLON 296 +#define PERCENT_PERCENT 297 +#define PROLOGUE 298 +#define EPILOGUE 299 +#define BRACED_CODE 300 #ifndef YYSTYPE -#line 89 "parse-gram.y" +#line 75 "parse-gram.y" typedef union { - symbol_t *symbol; - symbol_list_t *list; + symbol *symbol; + symbol_list *list; int integer; - char *string; - assoc_t assoc; - struniq_t struniq; + char *chars; + assoc assoc; + uniqstr uniqstr; } yystype; -/* Line 1212 of /usr/local/share/bison/yacc.c. */ -#line 139 "y.tab.h" +/* Line 1225 of yacc.c. */ +#line 137 "y.tab.h" # define YYSTYPE yystype # define YYSTYPE_IS_TRIVIAL 1 #endif