From 29092a5740454c97cdab9f74dc524e69057427d7 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Wed, 20 Dec 2000 10:38:51 +0000 Subject: [PATCH] * src/bison.s1: Remove, we now use directly... * src/bison.simple: this. * src/Makefile.am: Use pkgdata instead of data. --- ChangeLog | 6 + po/de.po | 78 ++--- po/es.po | 78 ++--- po/et.po | 78 ++--- po/fr.po | 78 ++--- po/ja.po | 78 ++--- po/nl.po | 78 ++--- po/ru.po | 78 ++--- src/Makefile.am | 16 +- src/bison.s1 | 843 ---------------------------------------------- tests/atconfig.in | 4 +- 11 files changed, 286 insertions(+), 1129 deletions(-) delete mode 100644 src/bison.s1 diff --git a/ChangeLog b/ChangeLog index 4ebe4a5f..7713986e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2000-12-20 Akim Demaille + + * src/bison.s1: Remove, we now use directly... + * src/bison.simple: this. + * src/Makefile.am: Use pkgdata instead of data. + 2000-12-20 Akim Demaille * src/files.c (guard_obstack): New. diff --git a/po/de.po b/po/de.po index 91545def..03784e81 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: bison 1.25\n" -"POT-Creation-Date: 2000-12-19 15:49+0100\n" +"POT-Creation-Date: 2000-12-20 11:28+0100\n" "PO-Revision-Date: 1996-10-10 17:54 MET DST\n" "Last-Translator: Ulrich Drepper \n" "Language-Team: German \n" @@ -118,22 +118,22 @@ msgstr "%s leitet ab" #. Some efforts were made to ease the translators' task, please #. continue. -#: src/getargs.c:74 +#: src/getargs.c:71 msgid "GNU bison generates parsers for LALR(1) grammars.\n" msgstr "" -#: src/getargs.c:78 +#: src/getargs.c:75 #, c-format msgid "Usage: %s [OPTION]... FILE\n" msgstr "" -#: src/getargs.c:82 +#: src/getargs.c:79 msgid "" "If a long option shows an argument as mandatory, then it is mandatory\n" "for the equivalent short option also. Similarly for optional arguments.\n" msgstr "" -#: src/getargs.c:88 +#: src/getargs.c:85 msgid "" "Operation modes:\n" " -h, --help display this help and exit\n" @@ -141,7 +141,7 @@ msgid "" " -y, --yacc emulate POSIX yacc\n" msgstr "" -#: src/getargs.c:95 +#: src/getargs.c:92 msgid "" "Parser:\n" " -t, --debug instrument the parser for debugging\n" @@ -153,7 +153,7 @@ msgid "" " -k, --token-table include a table of token names\n" msgstr "" -#: src/getargs.c:107 +#: src/getargs.c:104 msgid "" "Output:\n" " -d, --defines also produce a header file\n" @@ -162,38 +162,38 @@ msgid "" " -o, --output-file=FILE leave output to FILE\n" msgstr "" -#: src/getargs.c:115 +#: src/getargs.c:112 msgid "Report bugs to .\n" msgstr "" #. Some efforts were made to ease the translators' task, please #. continue. -#: src/getargs.c:129 +#: src/getargs.c:126 #, c-format msgid "bison (GNU Bison) %s" msgstr "" -#: src/getargs.c:134 +#: src/getargs.c:131 msgid "Copyright 1984, 1986, 1989, 1992, 2000 Free Software Foundation, Inc.\n" msgstr "" -#: src/getargs.c:138 +#: src/getargs.c:135 msgid "" "This is free software; see the source for copying conditions. There is NO\n" "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" msgstr "" -#: src/getargs.c:217 +#: src/getargs.c:214 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" -#: src/getargs.c:225 +#: src/getargs.c:222 #, c-format msgid "%s: no grammar file given\n" msgstr "%s: keine Grammatik-Datei angegeben\n" -#: src/getargs.c:229 +#: src/getargs.c:226 #, fuzzy, c-format msgid "%s: extra arguments ignored after `%s'\n" msgstr "%s: zusätzliche Argumente nach »%s« werden ignoriert\n" @@ -257,7 +257,7 @@ msgstr "interner Fehler, %s\n" msgid "Entering set_nullable" msgstr "Führe »set_nullable« aus" -#: src/output.c:990 +#: src/output.c:985 #, fuzzy, c-format msgid "maximum table size (%d) exceeded" msgstr "maximale Tabellengröße (%s) überschritten" @@ -410,7 +410,7 @@ msgstr "" msgid "symbol %s redefined" msgstr "Symbol %s noch einmal definiert" -#: src/reader.c:592 src/reader.c:671 src/reader.c:732 src/reader.c:1293 +#: src/reader.c:592 src/reader.c:671 src/reader.c:732 src/reader.c:1291 #, c-format msgid "type redeclaration for %s" msgstr "erneute Deklaration des Typs für %s" @@ -425,7 +425,7 @@ msgstr " msgid "multiple %s declarations" msgstr "mehr als eine %start Deklaration" -#: src/reader.c:621 src/reader.c:1271 +#: src/reader.c:621 src/reader.c:1269 #, fuzzy, c-format msgid "invalid %s declaration" msgstr "ungültige %start Deklaration" @@ -454,7 +454,7 @@ msgstr "unzul msgid "unexpected item: %s" msgstr "unerwartetes Symbol: %s" -#: src/reader.c:817 src/reader.c:1102 src/reader.c:1173 +#: src/reader.c:817 src/reader.c:1100 src/reader.c:1171 #, fuzzy, c-format msgid "unmatched %s" msgstr "»{« hat kein Gegenstück" @@ -474,105 +474,105 @@ msgstr "unerwartetes Symbol %s, hier wird ein Bezeichner erwartet" msgid "expected string constant instead of %s" msgstr "hier wird eine Zeichenkette erwartet, nicht %s" -#: src/reader.c:1018 +#: src/reader.c:1016 #, c-format msgid "unrecognized: %s" msgstr "unbekannt: %s" -#: src/reader.c:1023 +#: src/reader.c:1021 msgid "no input grammar" msgstr "keine Eingabe-Grammatik" -#: src/reader.c:1028 +#: src/reader.c:1026 #, c-format msgid "unknown character: %s" msgstr "unbekanntes Zeichen: %s" -#: src/reader.c:1196 +#: src/reader.c:1194 #, fuzzy, c-format msgid "unterminated %guard clause" msgstr "unbeendeter %%guard Fall" -#: src/reader.c:1358 +#: src/reader.c:1356 msgid "ill-formed rule: initial symbol not followed by colon" msgstr "" "falsch geformte Regel: führendes Symbol wird nicht von einem Semikolon " "gefolgt" -#: src/reader.c:1365 +#: src/reader.c:1363 msgid "grammar starts with vertical bar" msgstr "Grammatik fängt mit einem vertikalen Strich (»|«) an" -#: src/reader.c:1396 +#: src/reader.c:1394 #, 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:1498 +#: src/reader.c:1496 msgid "two @prec's in a row" msgstr "zwei @prec Anweisungen nacheinander" -#: src/reader.c:1506 +#: src/reader.c:1504 #, fuzzy msgid "%%guard present but %%semantic_parser not specified" msgstr "" "%%guard Anweisung vorhanden, jedoch wird %%semantic_parser nicht angegeben" -#: src/reader.c:1515 +#: src/reader.c:1513 msgid "two actions at end of one rule" msgstr "Zwei Aktionen am Ende einer Regel" -#: src/reader.c:1529 +#: src/reader.c:1527 #, c-format msgid "type clash (`%s' `%s') on default action" msgstr "Typkonflikt (»%s« »%s«) bei Default Aktion" -#: src/reader.c:1535 +#: src/reader.c:1533 msgid "empty rule for typed nonterminal, and no action" msgstr "leere Regel für Nicht-Terminal vmit Typ und keine Aktion" -#: src/reader.c:1579 +#: src/reader.c:1577 #, c-format msgid "invalid input: %s" msgstr "ungültige Eingabe: %s" -#: src/reader.c:1587 +#: src/reader.c:1585 #, fuzzy, c-format msgid "too many symbols (tokens plus nonterminals); maximum %d" msgstr "zu viele Symbols (Token plus Nicht-Terminal); Maximum %s" -#: src/reader.c:1590 +#: src/reader.c:1588 msgid "no rules in the input grammar" msgstr "Eingabegrammatik enthält keine Regeln" -#: src/reader.c:1614 +#: src/reader.c:1612 #, c-format msgid "symbol %s is used, but is not defined as a token and has no rules" msgstr "" "Symbol %s wird benutzt, ist aber nicht als Token definiert und hat keine " "Regel" -#: src/reader.c:1720 +#: src/reader.c:1718 #, c-format msgid "conflicting precedences for %s and %s" msgstr "Vorrangwertigkeiten für %s und %s widersprechen sich" -#: src/reader.c:1732 +#: src/reader.c:1730 #, c-format msgid "conflicting assoc values for %s and %s" msgstr "assoc Werte für %s nd %s widersprechen sich" -#: src/reader.c:1783 +#: src/reader.c:1781 #, fuzzy, c-format msgid "tokens %s and %s both assigned number %d" msgstr "Token %s und %s haben die selbe nummer %s" -#: src/reader.c:1796 +#: src/reader.c:1794 #, c-format msgid "the start symbol %s is undefined" msgstr "das Startsymbol %s ist undefiniert" -#: src/reader.c:1798 +#: src/reader.c:1796 #, c-format msgid "the start symbol %s is a token" msgstr "das Startsymbol %s ist ein Token" diff --git a/po/es.po b/po/es.po index a2847bdb..17908538 100644 --- a/po/es.po +++ b/po/es.po @@ -30,7 +30,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU bison 1.25\n" -"POT-Creation-Date: 2000-12-19 15:49+0100\n" +"POT-Creation-Date: 2000-12-20 11:28+0100\n" "PO-Revision-Date: 1998-09-21 10:19+0200\n" "Last-Translator: Nicolás García-Pedrajas \n" "Language-Team: Spanish \n" @@ -174,22 +174,22 @@ msgstr "%s deriva" #. Some efforts were made to ease the translators' task, please #. continue. -#: src/getargs.c:74 +#: src/getargs.c:71 msgid "GNU bison generates parsers for LALR(1) grammars.\n" msgstr "" -#: src/getargs.c:78 +#: src/getargs.c:75 #, c-format msgid "Usage: %s [OPTION]... FILE\n" msgstr "" -#: src/getargs.c:82 +#: src/getargs.c:79 msgid "" "If a long option shows an argument as mandatory, then it is mandatory\n" "for the equivalent short option also. Similarly for optional arguments.\n" msgstr "" -#: src/getargs.c:88 +#: src/getargs.c:85 msgid "" "Operation modes:\n" " -h, --help display this help and exit\n" @@ -197,7 +197,7 @@ msgid "" " -y, --yacc emulate POSIX yacc\n" msgstr "" -#: src/getargs.c:95 +#: src/getargs.c:92 msgid "" "Parser:\n" " -t, --debug instrument the parser for debugging\n" @@ -209,7 +209,7 @@ msgid "" " -k, --token-table include a table of token names\n" msgstr "" -#: src/getargs.c:107 +#: src/getargs.c:104 msgid "" "Output:\n" " -d, --defines also produce a header file\n" @@ -218,41 +218,41 @@ msgid "" " -o, --output-file=FILE leave output to FILE\n" msgstr "" -#: src/getargs.c:115 +#: src/getargs.c:112 msgid "Report bugs to .\n" msgstr "" #. Some efforts were made to ease the translators' task, please #. continue. -#: src/getargs.c:129 +#: src/getargs.c:126 #, c-format msgid "bison (GNU Bison) %s" msgstr "" -#: src/getargs.c:134 +#: src/getargs.c:131 msgid "Copyright 1984, 1986, 1989, 1992, 2000 Free Software Foundation, Inc.\n" msgstr "" -#: src/getargs.c:138 +#: src/getargs.c:135 msgid "" "This is free software; see the source for copying conditions. There is NO\n" "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" msgstr "" -#: src/getargs.c:217 +#: src/getargs.c:214 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" # Me parece menos "computadora" decir "ningún fichero de gramática" - cll # -#: src/getargs.c:225 +#: src/getargs.c:222 #, c-format msgid "%s: no grammar file given\n" msgstr "%s: no se ha especificado ningún fichero de gramática\n" # Ignorar es no saber, to ignore es no hacer caso, que no es lo mismo. sv -#: src/getargs.c:229 +#: src/getargs.c:226 #, fuzzy, c-format msgid "%s: extra arguments ignored after `%s'\n" msgstr "%s: los argumentos extra después de '%s' no se tendrán en cuenta\n" @@ -323,7 +323,7 @@ msgstr "Entrando set_nullable" # en inglés era así, pero quizás en español sea mejor como dices # ngp # -#: src/output.c:990 +#: src/output.c:985 #, fuzzy, c-format msgid "maximum table size (%d) exceeded" msgstr "excedido el tamaño máximo de la tabla (%s)" @@ -480,7 +480,7 @@ msgstr "" msgid "symbol %s redefined" msgstr "redefinido el símbolo %s" -#: src/reader.c:592 src/reader.c:671 src/reader.c:732 src/reader.c:1293 +#: src/reader.c:592 src/reader.c:671 src/reader.c:732 src/reader.c:1291 #, c-format msgid "type redeclaration for %s" msgstr "redeclaración del tipo de %s" @@ -495,7 +495,7 @@ msgstr "`%s' no es v msgid "multiple %s declarations" msgstr "múltiples declaraciones de %start" -#: src/reader.c:621 src/reader.c:1271 +#: src/reader.c:621 src/reader.c:1269 #, fuzzy, c-format msgid "invalid %s declaration" msgstr "declaración de %start no válida" @@ -534,7 +534,7 @@ msgid "unexpected item: %s" msgstr "ítem inesperado: %s" # Cambio el orden y el sexo. Ahora está "en español". sv -#: src/reader.c:817 src/reader.c:1102 src/reader.c:1173 +#: src/reader.c:817 src/reader.c:1100 src/reader.c:1171 #, fuzzy, c-format msgid "unmatched %s" msgstr "`{' desemparejada" @@ -560,16 +560,16 @@ msgstr "no se reconoce el msgid "expected string constant instead of %s" msgstr "se esperaba una cadena constante en lugar de %s" -#: src/reader.c:1018 +#: src/reader.c:1016 #, c-format msgid "unrecognized: %s" msgstr "no reconocido: %s" -#: src/reader.c:1023 +#: src/reader.c:1021 msgid "no input grammar" msgstr "no hay gramática de entrada" -#: src/reader.c:1028 +#: src/reader.c:1026 #, c-format msgid "unknown character: %s" msgstr "carácter desconocido: %s" @@ -578,93 +578,93 @@ msgstr "car # mejor que `sin terminar' que me parece más "computerizado" - cll # quizás un poco cacofónico lo de claúsula inconclusa - ngp # -#: src/reader.c:1196 +#: src/reader.c:1194 #, fuzzy, c-format msgid "unterminated %guard clause" msgstr "cláusula %%guard sin terminar" -#: src/reader.c:1358 +#: src/reader.c:1356 msgid "ill-formed rule: initial symbol not followed by colon" msgstr "regla mal formada: el símbolo inicial no está seguido por :" -#: src/reader.c:1365 +#: src/reader.c:1363 msgid "grammar starts with vertical bar" msgstr "la gramática comienza con una barra vertical" -#: src/reader.c:1396 +#: src/reader.c:1394 #, 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:1498 +#: src/reader.c:1496 msgid "two @prec's in a row" msgstr "dos @prec en una línea" # Insisto, el empleo de participios a secas me parece como hablar en # indio. Por favor, permíteme que añada un "está" :) - cll # ok - ngp -#: src/reader.c:1506 +#: src/reader.c:1504 #, fuzzy msgid "%%guard present but %%semantic_parser not specified" msgstr "%%guard presente pero %%semantic_parser está sin especificar" -#: src/reader.c:1515 +#: src/reader.c:1513 msgid "two actions at end of one rule" msgstr "dos acciones al final de una regla" -#: src/reader.c:1529 +#: src/reader.c:1527 #, c-format msgid "type clash (`%s' `%s') on default action" msgstr "los tipos (`%s' `%s') no concuerdan en la acción por defecto" -#: src/reader.c:1535 +#: src/reader.c:1533 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:1579 +#: src/reader.c:1577 #, c-format msgid "invalid input: %s" msgstr "entrada no válida: %s" -#: src/reader.c:1587 +#: src/reader.c:1585 #, fuzzy, c-format msgid "too many symbols (tokens plus nonterminals); maximum %d" msgstr "demasiados símbolos (terminales y no terminales); máximo %s" -#: src/reader.c:1590 +#: src/reader.c:1588 msgid "no rules in the input grammar" msgstr "no hay reglas en la gramática de entrada" # `token' se debe traducir como `literal' - cll # en terminología de compiladores token es más un terminal - ngp # -#: src/reader.c:1614 +#: src/reader.c:1612 #, c-format msgid "symbol %s is used, but is not defined as a token and has no rules" msgstr "" "se usa el símbolo %s, pero no está definido como terminal y no tiene reglas" -#: src/reader.c:1720 +#: src/reader.c:1718 #, c-format msgid "conflicting precedences for %s and %s" msgstr "precedencias en conflicto entre %s y %s" -#: src/reader.c:1732 +#: src/reader.c:1730 #, c-format msgid "conflicting assoc values for %s and %s" msgstr "conflicto de valores assoc para %s y %s" -#: src/reader.c:1783 +#: src/reader.c:1781 #, fuzzy, c-format msgid "tokens %s and %s both assigned number %d" msgstr "los terminales %s y %s tienen asignados ambos el número %s" -#: src/reader.c:1796 +#: src/reader.c:1794 #, c-format msgid "the start symbol %s is undefined" msgstr "el símbolo de inicio (axioma) %s no está definido" -#: src/reader.c:1798 +#: src/reader.c:1796 #, c-format msgid "the start symbol %s is a token" msgstr "el símbolo de inicio (axioma) %s es un terminal" diff --git a/po/et.po b/po/et.po index 07658223..633f8d76 100644 --- a/po/et.po +++ b/po/et.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: bison 1.25\n" -"POT-Creation-Date: 2000-12-19 15:49+0100\n" +"POT-Creation-Date: 2000-12-20 11:28+0100\n" "PO-Revision-Date: 2000-04-11 22:19+02:00\n" "Last-Translator: Toomas Soome \n" "Language-Team: Estonian \n" @@ -124,16 +124,16 @@ msgstr "%s derives" #. Some efforts were made to ease the translators' task, please #. continue. -#: src/getargs.c:74 +#: src/getargs.c:71 msgid "GNU bison generates parsers for LALR(1) grammars.\n" msgstr "GNU bison genereerib parsereid LALR(1) grammatikatele.\n" -#: src/getargs.c:78 +#: src/getargs.c:75 #, c-format msgid "Usage: %s [OPTION]... FILE\n" msgstr "Kasuta: %s [VÕTI]...FAIL\n" -#: src/getargs.c:82 +#: src/getargs.c:79 msgid "" "If a long option shows an argument as mandatory, then it is mandatory\n" "for the equivalent short option also. Similarly for optional arguments.\n" @@ -141,7 +141,7 @@ msgstr "" "Kui pikk võti näitab, et argument on kohustuslik, siis on see kohustuslik \n" "ka lühikese võtme korral. Sama ka vabalt valitavate võtmete korral.\n" -#: src/getargs.c:88 +#: src/getargs.c:85 msgid "" "Operation modes:\n" " -h, --help display this help and exit\n" @@ -153,7 +153,7 @@ msgstr "" " -V, --version esita versiooniinfo ja lõpeta töö\n" " -y, --yacc emuleeri POSIX yacc\n" -#: src/getargs.c:95 +#: src/getargs.c:92 #, fuzzy msgid "" "Parser:\n" @@ -173,7 +173,7 @@ msgstr "" " -r, --raw sümbolite number alates 3\n" " -k, --token-table lisa ka sümbolite nimede tabel\n" -#: src/getargs.c:107 +#: src/getargs.c:104 msgid "" "Output:\n" " -d, --defines also produce a header file\n" @@ -187,38 +187,38 @@ msgstr "" " -b, --file-prefix=PREFIKS kasuta väljundfailide nimedes PREFIKSit\n" " -o, --output-file=FAIL jäta väljund FAILi\n" -#: src/getargs.c:115 +#: src/getargs.c:112 msgid "Report bugs to .\n" msgstr "Teatage palun vigadest aadressil .\n" #. Some efforts were made to ease the translators' task, please #. continue. -#: src/getargs.c:129 +#: src/getargs.c:126 #, c-format msgid "bison (GNU Bison) %s" msgstr "" -#: src/getargs.c:134 +#: src/getargs.c:131 msgid "Copyright 1984, 1986, 1989, 1992, 2000 Free Software Foundation, Inc.\n" msgstr "" -#: src/getargs.c:138 +#: src/getargs.c:135 msgid "" "This is free software; see the source for copying conditions. There is NO\n" "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" msgstr "" -#: src/getargs.c:217 +#: src/getargs.c:214 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" -#: src/getargs.c:225 +#: src/getargs.c:222 #, c-format msgid "%s: no grammar file given\n" msgstr "%s: puudub grammatikafail\n" -#: src/getargs.c:229 +#: src/getargs.c:226 #, c-format msgid "%s: extra arguments ignored after `%s'\n" msgstr "%s: ignoreerin lisaargumente peale `%s'\n" @@ -280,7 +280,7 @@ msgstr "%s: sisemine viga: %s\n" msgid "Entering set_nullable" msgstr "Entering set_nullable" -#: src/output.c:990 +#: src/output.c:985 #, c-format msgid "maximum table size (%d) exceeded" msgstr "ületati maksimaalset tabelisuurust (%d)" @@ -433,7 +433,7 @@ msgstr "" msgid "symbol %s redefined" msgstr "sümbol %s on uuesti defineeritud" -#: src/reader.c:592 src/reader.c:671 src/reader.c:732 src/reader.c:1293 +#: src/reader.c:592 src/reader.c:671 src/reader.c:732 src/reader.c:1291 #, c-format msgid "type redeclaration for %s" msgstr "%s tüübi uuesti deklareerimine" @@ -448,7 +448,7 @@ msgstr "`%s' ei ole %s sees lubatud" msgid "multiple %s declarations" msgstr "korduvad %start deklaratsioonid" -#: src/reader.c:621 src/reader.c:1271 +#: src/reader.c:621 src/reader.c:1269 #, fuzzy, c-format msgid "invalid %s declaration" msgstr "vigane %start deklaratsioon" @@ -476,7 +476,7 @@ msgstr "vigane tekst (%s) - number peab olema peale identifikaatorit" msgid "unexpected item: %s" msgstr "ootamatu element: %s" -#: src/reader.c:817 src/reader.c:1102 src/reader.c:1173 +#: src/reader.c:817 src/reader.c:1100 src/reader.c:1171 #, fuzzy, c-format msgid "unmatched %s" msgstr "puudub `{'" @@ -496,102 +496,102 @@ msgstr "tundmatu element %s, eeldasin identifikaatorit" msgid "expected string constant instead of %s" msgstr "eeldasin %s asemel sõnekonstanti" -#: src/reader.c:1018 +#: src/reader.c:1016 #, c-format msgid "unrecognized: %s" msgstr "tundmatu: %s" -#: src/reader.c:1023 +#: src/reader.c:1021 msgid "no input grammar" msgstr "sisendgrammatikat pole" -#: src/reader.c:1028 +#: src/reader.c:1026 #, c-format msgid "unknown character: %s" msgstr "tundmatu sümbol: %s" -#: src/reader.c:1196 +#: src/reader.c:1194 #, c-format msgid "unterminated %guard clause" msgstr "lõpetamata %guard klausel" -#: src/reader.c:1358 +#: src/reader.c:1356 msgid "ill-formed rule: initial symbol not followed by colon" msgstr "vigaselt formeeritud reegel: algsümbolile ei järgne koolonit" -#: src/reader.c:1365 +#: src/reader.c:1363 msgid "grammar starts with vertical bar" msgstr "grammatika algab püstkriipsuga" -#: src/reader.c:1396 +#: src/reader.c:1394 #, 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:1498 +#: src/reader.c:1496 msgid "two @prec's in a row" msgstr "kaks @prec ühel real" -#: src/reader.c:1506 +#: src/reader.c:1504 #, fuzzy msgid "%%guard present but %%semantic_parser not specified" msgstr "%guard on määratud, aga %semantic_parser ei ole" -#: src/reader.c:1515 +#: src/reader.c:1513 msgid "two actions at end of one rule" msgstr "kaks tegevust ühe reegli lõpus" -#: src/reader.c:1529 +#: src/reader.c:1527 #, c-format msgid "type clash (`%s' `%s') on default action" msgstr "vaikimisi tegevuse tüübikonflikt (`%s' `%s')" -#: src/reader.c:1535 +#: src/reader.c:1533 msgid "empty rule for typed nonterminal, and no action" msgstr "tüübiga mitteterminalil on tühi reegel ja puudub tegevus" -#: src/reader.c:1579 +#: src/reader.c:1577 #, c-format msgid "invalid input: %s" msgstr "vigane sisend: %s" -#: src/reader.c:1587 +#: src/reader.c:1585 #, c-format msgid "too many symbols (tokens plus nonterminals); maximum %d" msgstr "liiga palju sümboleid (märgid ja mitteterminalid); maksimaalne on %d" -#: src/reader.c:1590 +#: src/reader.c:1588 msgid "no rules in the input grammar" msgstr "sisendgrammatikas pole reegleid" -#: src/reader.c:1614 +#: src/reader.c:1612 #, c-format msgid "symbol %s is used, but is not defined as a token and has no rules" msgstr "" "kasutatakse sümbolit %s, mis ei ole defineeritud märgina ja millel puuduvad " "reeglid" -#: src/reader.c:1720 +#: src/reader.c:1718 #, c-format msgid "conflicting precedences for %s and %s" msgstr "%s ja %s omavad konfliktseid prioriteete" -#: src/reader.c:1732 +#: src/reader.c:1730 #, c-format msgid "conflicting assoc values for %s and %s" msgstr "%s ja %s omavad konfliktseid assotsiatiivseid väärtuseid" -#: src/reader.c:1783 +#: src/reader.c:1781 #, c-format msgid "tokens %s and %s both assigned number %d" msgstr "märkidele %s ja %s on mõlemale omistatud number %d" -#: src/reader.c:1796 +#: src/reader.c:1794 #, c-format msgid "the start symbol %s is undefined" msgstr "stardisümbol %s ei ole defineeritud" -#: src/reader.c:1798 +#: src/reader.c:1796 #, c-format msgid "the start symbol %s is a token" msgstr "stardisümbol %s on märk" diff --git a/po/fr.po b/po/fr.po index f44fde9f..96937977 100644 --- a/po/fr.po +++ b/po/fr.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: bison 1.25\n" -"POT-Creation-Date: 2000-12-19 15:49+0100\n" +"POT-Creation-Date: 2000-12-20 11:28+0100\n" "PO-Revision-Date: 1996-03-19 20:05 EST\n" "Last-Translator: Dominique Boucher \n" "Language-Team: French \n" @@ -125,22 +125,22 @@ msgstr "%s d #. Some efforts were made to ease the translators' task, please #. continue. -#: src/getargs.c:74 +#: src/getargs.c:71 msgid "GNU bison generates parsers for LALR(1) grammars.\n" msgstr "" -#: src/getargs.c:78 +#: src/getargs.c:75 #, c-format msgid "Usage: %s [OPTION]... FILE\n" msgstr "" -#: src/getargs.c:82 +#: src/getargs.c:79 msgid "" "If a long option shows an argument as mandatory, then it is mandatory\n" "for the equivalent short option also. Similarly for optional arguments.\n" msgstr "" -#: src/getargs.c:88 +#: src/getargs.c:85 msgid "" "Operation modes:\n" " -h, --help display this help and exit\n" @@ -148,7 +148,7 @@ msgid "" " -y, --yacc emulate POSIX yacc\n" msgstr "" -#: src/getargs.c:95 +#: src/getargs.c:92 msgid "" "Parser:\n" " -t, --debug instrument the parser for debugging\n" @@ -160,7 +160,7 @@ msgid "" " -k, --token-table include a table of token names\n" msgstr "" -#: src/getargs.c:107 +#: src/getargs.c:104 msgid "" "Output:\n" " -d, --defines also produce a header file\n" @@ -169,38 +169,38 @@ msgid "" " -o, --output-file=FILE leave output to FILE\n" msgstr "" -#: src/getargs.c:115 +#: src/getargs.c:112 msgid "Report bugs to .\n" msgstr "" #. Some efforts were made to ease the translators' task, please #. continue. -#: src/getargs.c:129 +#: src/getargs.c:126 #, c-format msgid "bison (GNU Bison) %s" msgstr "" -#: src/getargs.c:134 +#: src/getargs.c:131 msgid "Copyright 1984, 1986, 1989, 1992, 2000 Free Software Foundation, Inc.\n" msgstr "" -#: src/getargs.c:138 +#: src/getargs.c:135 msgid "" "This is free software; see the source for copying conditions. There is NO\n" "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" msgstr "" -#: src/getargs.c:217 +#: src/getargs.c:214 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" -#: src/getargs.c:225 +#: src/getargs.c:222 #, c-format msgid "%s: no grammar file given\n" msgstr "%s: grammaire manquante\n" -#: src/getargs.c:229 +#: src/getargs.c:226 #, fuzzy, c-format msgid "%s: extra arguments ignored after `%s'\n" msgstr "%s: paramètres supplémentaires ignorés après «%s»\n" @@ -263,7 +263,7 @@ msgstr "erreur interne, %s\n" msgid "Entering set_nullable" msgstr "Entré dans set_nullable" -#: src/output.c:990 +#: src/output.c:985 #, fuzzy, c-format msgid "maximum table size (%d) exceeded" msgstr "taille maximum des tables (%s) dépassée" @@ -416,7 +416,7 @@ msgstr "" msgid "symbol %s redefined" msgstr "symbole %s redéfini" -#: src/reader.c:592 src/reader.c:671 src/reader.c:732 src/reader.c:1293 +#: src/reader.c:592 src/reader.c:671 src/reader.c:732 src/reader.c:1291 #, c-format msgid "type redeclaration for %s" msgstr "redéclaration du type de %s" @@ -431,7 +431,7 @@ msgstr "`%s' n'est pas valide dans %s" msgid "multiple %s declarations" msgstr "multiples déclarations %start" -#: src/reader.c:621 src/reader.c:1271 +#: src/reader.c:621 src/reader.c:1269 #, fuzzy, c-format msgid "invalid %s declaration" msgstr "la déclaration %start n'est pas valide" @@ -461,7 +461,7 @@ msgstr "" msgid "unexpected item: %s" msgstr "item inattendu: %s" -#: src/reader.c:817 src/reader.c:1102 src/reader.c:1173 +#: src/reader.c:817 src/reader.c:1100 src/reader.c:1171 #, fuzzy, c-format msgid "unmatched %s" msgstr "accolade ouvrante `{' non appariée" @@ -481,102 +481,102 @@ msgstr "item %s non reconnu, un identificateur est attendu" msgid "expected string constant instead of %s" msgstr "chaîne de caractères constante attendue plutôt que %s" -#: src/reader.c:1018 +#: src/reader.c:1016 #, c-format msgid "unrecognized: %s" msgstr "non reconnu: %s" -#: src/reader.c:1023 +#: src/reader.c:1021 msgid "no input grammar" msgstr "aucune grammaire en entrée" -#: src/reader.c:1028 +#: src/reader.c:1026 #, c-format msgid "unknown character: %s" msgstr "caractère inconnu: %s" -#: src/reader.c:1196 +#: src/reader.c:1194 #, fuzzy, c-format msgid "unterminated %guard clause" msgstr "clause %%guard non terminée" -#: src/reader.c:1358 +#: src/reader.c:1356 msgid "ill-formed rule: initial symbol not followed by colon" msgstr "règle mal formée: le symbole initial n'est pas suivi de `:'" -#: src/reader.c:1365 +#: src/reader.c:1363 msgid "grammar starts with vertical bar" msgstr "la grammaire débute par une barre verticale" -#: src/reader.c:1396 +#: src/reader.c:1394 #, c-format msgid "rule given for %s, which is a token" msgstr "la règle pour %s, qui est un terminal" -#: src/reader.c:1498 +#: src/reader.c:1496 msgid "two @prec's in a row" msgstr "deux @prec de suite" -#: src/reader.c:1506 +#: src/reader.c:1504 #, fuzzy msgid "%%guard present but %%semantic_parser not specified" msgstr "%%guard est présent mais %%semantic_parser n'est pas spécifié" -#: src/reader.c:1515 +#: src/reader.c:1513 msgid "two actions at end of one rule" msgstr "deux actions à la fin d'une même règle" -#: src/reader.c:1529 +#: src/reader.c:1527 #, c-format msgid "type clash (`%s' `%s') on default action" msgstr "conflit de type (`%s' `%s') pour l'action par défaut" -#: src/reader.c:1535 +#: src/reader.c:1533 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:1579 +#: src/reader.c:1577 #, c-format msgid "invalid input: %s" msgstr "entrée non valide: %s" -#: src/reader.c:1587 +#: src/reader.c:1585 #, fuzzy, c-format msgid "too many symbols (tokens plus nonterminals); maximum %d" msgstr "trop de symboles (terminaux et catégories); maximum de %s" -#: src/reader.c:1590 +#: src/reader.c:1588 msgid "no rules in the input grammar" msgstr "la grammaire n'a pas de règles" -#: src/reader.c:1614 +#: src/reader.c:1612 #, c-format msgid "symbol %s is used, but is not defined as a token and has no rules" msgstr "" "le symbole %s est utilisé mais ce n'est pas un terminal et il ne possède pas " "de règle" -#: src/reader.c:1720 +#: src/reader.c:1718 #, c-format msgid "conflicting precedences for %s and %s" msgstr "les priorités pour %s et %s entrent en conflit" -#: src/reader.c:1732 +#: src/reader.c:1730 #, c-format msgid "conflicting assoc values for %s and %s" msgstr "les valeurs d'association de %s et %s entrent en conflit" -#: src/reader.c:1783 +#: src/reader.c:1781 #, fuzzy, c-format msgid "tokens %s and %s both assigned number %d" msgstr "les terminaux %s et %s se sont vus assigner le nombre %s" -#: src/reader.c:1796 +#: src/reader.c:1794 #, c-format msgid "the start symbol %s is undefined" msgstr "le symbole de départ %s n'est pas défini" -#: src/reader.c:1798 +#: src/reader.c:1796 #, c-format msgid "the start symbol %s is a token" msgstr "le symbole de départ %s est un terminal" diff --git a/po/ja.po b/po/ja.po index aab9a7f6..cd76a3ee 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU bison 1.28\n" -"POT-Creation-Date: 2000-12-19 15:49+0100\n" +"POT-Creation-Date: 2000-12-20 11:28+0100\n" "PO-Revision-Date: 1999-09-28 21:10+0900\n" "Last-Translator: Daisuke Yamashita \n" "Language-Team: Japanese \n" @@ -124,22 +124,22 @@ msgstr "%s #. Some efforts were made to ease the translators' task, please #. continue. -#: src/getargs.c:74 +#: src/getargs.c:71 msgid "GNU bison generates parsers for LALR(1) grammars.\n" msgstr "" -#: src/getargs.c:78 +#: src/getargs.c:75 #, c-format msgid "Usage: %s [OPTION]... FILE\n" msgstr "" -#: src/getargs.c:82 +#: src/getargs.c:79 msgid "" "If a long option shows an argument as mandatory, then it is mandatory\n" "for the equivalent short option also. Similarly for optional arguments.\n" msgstr "" -#: src/getargs.c:88 +#: src/getargs.c:85 msgid "" "Operation modes:\n" " -h, --help display this help and exit\n" @@ -147,7 +147,7 @@ msgid "" " -y, --yacc emulate POSIX yacc\n" msgstr "" -#: src/getargs.c:95 +#: src/getargs.c:92 msgid "" "Parser:\n" " -t, --debug instrument the parser for debugging\n" @@ -159,7 +159,7 @@ msgid "" " -k, --token-table include a table of token names\n" msgstr "" -#: src/getargs.c:107 +#: src/getargs.c:104 msgid "" "Output:\n" " -d, --defines also produce a header file\n" @@ -168,38 +168,38 @@ msgid "" " -o, --output-file=FILE leave output to FILE\n" msgstr "" -#: src/getargs.c:115 +#: src/getargs.c:112 msgid "Report bugs to .\n" msgstr "" #. Some efforts were made to ease the translators' task, please #. continue. -#: src/getargs.c:129 +#: src/getargs.c:126 #, c-format msgid "bison (GNU Bison) %s" msgstr "" -#: src/getargs.c:134 +#: src/getargs.c:131 msgid "Copyright 1984, 1986, 1989, 1992, 2000 Free Software Foundation, Inc.\n" msgstr "" -#: src/getargs.c:138 +#: src/getargs.c:135 msgid "" "This is free software; see the source for copying conditions. There is NO\n" "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" msgstr "" -#: src/getargs.c:217 +#: src/getargs.c:214 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" -#: src/getargs.c:225 +#: src/getargs.c:222 #, c-format msgid "%s: no grammar file given\n" msgstr "%s: ʸˡ¥Õ¥¡¥¤¥ë¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó\n" -#: src/getargs.c:229 +#: src/getargs.c:226 #, fuzzy, c-format msgid "%s: extra arguments ignored after `%s'\n" msgstr "%s: '%s' ¤è¤ê¸å¤í¤Î;ʬ¤Ê°ú¿ô¤Ï̵»ë¤µ¤ì¤Þ¤·¤¿\n" @@ -262,7 +262,7 @@ msgstr "%s: msgid "Entering set_nullable" msgstr "set_nullable ¤ËÆþ¤ê¤Þ¤¹" -#: src/output.c:990 +#: src/output.c:985 #, fuzzy, c-format msgid "maximum table size (%d) exceeded" msgstr "ºÇÂç¥Æ¡¼¥Ö¥ë¥µ¥¤¥º (%s) ¤òĶ¤¨¤Þ¤·¤¿" @@ -415,7 +415,7 @@ msgstr "" msgid "symbol %s redefined" msgstr "¥·¥ó¥Ü¥ë %s ¤¬ºÆÄêµÁ¤µ¤ì¤Þ¤·¤¿" -#: src/reader.c:592 src/reader.c:671 src/reader.c:732 src/reader.c:1293 +#: src/reader.c:592 src/reader.c:671 src/reader.c:732 src/reader.c:1291 #, c-format msgid "type redeclaration for %s" msgstr "%s ¤Î·¿¤¬ºÆÄêµÁ¤µ¤ì¤Þ¤·¤¿" @@ -430,7 +430,7 @@ msgstr "%2$s msgid "multiple %s declarations" msgstr "Ê£¿ô¤Î %start ¤¬Àë¸À¤µ¤ì¤Þ¤·¤¿" -#: src/reader.c:621 src/reader.c:1271 +#: src/reader.c:621 src/reader.c:1269 #, fuzzy, c-format msgid "invalid %s declaration" msgstr "̵¸ú¤Ê %start ¤¬Àë¸À¤µ¤ì¤Þ¤·¤¿" @@ -459,7 +459,7 @@ msgstr "̵ msgid "unexpected item: %s" msgstr "ͽ´ü¤»¤Ì¥¢¥¤¥Æ¥à: %s" -#: src/reader.c:817 src/reader.c:1102 src/reader.c:1173 +#: src/reader.c:817 src/reader.c:1100 src/reader.c:1171 #, fuzzy, c-format msgid "unmatched %s" msgstr "Âбþ¤Î¤Ê¤¤ `{' ¤Ç¤¹" @@ -479,102 +479,102 @@ msgstr "ǧ msgid "expected string constant instead of %s" msgstr "¤³¤³¤Ç¤Ï %s ¤Ç¤Ï¤Ê¤¯Ê¸»úÎóÄê¿ô¤¬´üÂÔ¤µ¤ì¤Þ¤¹" -#: src/reader.c:1018 +#: src/reader.c:1016 #, c-format msgid "unrecognized: %s" msgstr "ǧ¼±¤Ç¤­¤Ê¤¤: %s" -#: src/reader.c:1023 +#: src/reader.c:1021 msgid "no input grammar" msgstr "ʸˡ¤ÎÆþÎϤ¬Ìµ¤¤" -#: src/reader.c:1028 +#: src/reader.c:1026 #, c-format msgid "unknown character: %s" msgstr "̤ÃΤÎʸ»ú: %s" -#: src/reader.c:1196 +#: src/reader.c:1194 #, fuzzy, c-format msgid "unterminated %guard clause" msgstr "ÊĤ¸¤é¤ì¤Æ¤¤¤Ê¤¤ %%guard Àá¤Ç¤¹" -#: src/reader.c:1358 +#: src/reader.c:1356 msgid "ill-formed rule: initial symbol not followed by colon" msgstr "¼Ù°­¤Êµ¬Â§: ½é´ü²½¥·¥ó¥Ü¥ë¤Ë¥³¥í¥ó (:) ¤¬Â³¤¤¤Æ¤¤¤Þ¤»¤ó" -#: src/reader.c:1365 +#: src/reader.c:1363 msgid "grammar starts with vertical bar" msgstr "ʸˡ¤Ï½ÄËÀ (|) ¤Ç»Ï¤á¤Þ¤¹" -#: src/reader.c:1396 +#: src/reader.c:1394 #, c-format msgid "rule given for %s, which is a token" msgstr "%s ¤Ëµ¬Â§¤¬Í¿¤¨¤é¤ì¡¢¤½¤ì¤Ï¥È¡¼¥¯¥ó¤È¤Ê¤ê¤Þ¤¹" -#: src/reader.c:1498 +#: src/reader.c:1496 msgid "two @prec's in a row" msgstr "@prec ¤Î¤â¤ÎÆó¤Ä¤¬Æ±Îó¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹" -#: src/reader.c:1506 +#: src/reader.c:1504 #, fuzzy msgid "%%guard present but %%semantic_parser not specified" msgstr "%%guard ¤¬¤¢¤ê¤Þ¤¹¤¬ %%semantic_parser ¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó" -#: src/reader.c:1515 +#: src/reader.c:1513 msgid "two actions at end of one rule" msgstr "°ì¤Ä¤Îµ¬Â§¤Î½ª¤ê¤ËÆó¤Ä¤ÎÆ°ºî¤ò»ØÄꤷ¤Æ¤¤¤Þ¤¹" -#: src/reader.c:1529 +#: src/reader.c:1527 #, c-format msgid "type clash (`%s' `%s') on default action" msgstr "½é´ü¾õÂÖ¤ÎÆ°ºî¤Ç¤Ï·¿ (`%s' `%s') ¤¬¾×Æͤ·¤Þ¤¹" -#: src/reader.c:1535 +#: src/reader.c:1533 msgid "empty rule for typed nonterminal, and no action" msgstr "¶õ¤Î·¿ÉÕ¤­Èó½ªÃ¼¥¢¥¤¥Æ¥àÍѵ¬Â§¤Ç¤¢¤ê¡¢Æ°ºî¤¬µ¯¤ê¤Þ¤»¤ó" -#: src/reader.c:1579 +#: src/reader.c:1577 #, c-format msgid "invalid input: %s" msgstr "̵¸ú¤ÊÆþÎÏ: %s" -#: src/reader.c:1587 +#: src/reader.c:1585 #, fuzzy, c-format msgid "too many symbols (tokens plus nonterminals); maximum %d" msgstr "¥·¥ó¥Ü¥ë¤¬Â¿¤¹¤®¤Þ¤¹ (¥È¡¼¥¯¥ó¤ÈÈó½ªÃ¼¥¢¥¤¥Æ¥à) -- ºÇÂç %s" -#: src/reader.c:1590 +#: src/reader.c:1588 msgid "no rules in the input grammar" msgstr "ÆþÎϤ·¤¿Ê¸Ë¡¤Ëµ¬Â§¤¬ÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó" -#: src/reader.c:1614 +#: src/reader.c:1612 #, c-format msgid "symbol %s is used, but is not defined as a token and has no rules" msgstr "" "¥·¥ó¥Ü¥ë %s " "¤¬»È¤ï¤ì¤Æ¤¤¤Þ¤¹¤¬¡¢¥È¡¼¥¯¥ó¤È¤·¤ÆÄêµÁ¤µ¤ì¤Æ¤ª¤é¤º¡¢µ¬Â§¤ò»ý¤Á¤Þ¤»¤ó" -#: src/reader.c:1720 +#: src/reader.c:1718 #, c-format msgid "conflicting precedences for %s and %s" msgstr "Àè¹Ô¤·¤Æ¤¤¤ë %s ¤È %s ¤Ç¶¥¹ç¤¬À¸¤¸¤Æ¤¤¤Þ¤¹" -#: src/reader.c:1732 +#: src/reader.c:1730 #, c-format msgid "conflicting assoc values for %s and %s" msgstr "Èó·ë¹çÃÍ %s ¤È %s ¤Ç¶¥¹ç¤¬À¸¤¸¤Æ¤¤¤Þ¤¹" -#: src/reader.c:1783 +#: src/reader.c:1781 #, fuzzy, c-format msgid "tokens %s and %s both assigned number %d" msgstr "¥È¡¼¥¯¥ó %s ¤È %s ¤ÎÁÐÊý¤¬ÈÖ¹æ %s ¤Ë³ä¤êÅö¤Æ¤é¤ì¤Þ¤·¤¿" -#: src/reader.c:1796 +#: src/reader.c:1794 #, c-format msgid "the start symbol %s is undefined" msgstr "³«»Ï¥·¥ó¥Ü¥ë %s ¤ÏÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó" -#: src/reader.c:1798 +#: src/reader.c:1796 #, c-format msgid "the start symbol %s is a token" msgstr "³«»Ï¥·¥ó¥Ü¥ë %s ¤Ï¥È¡¼¥¯¥ó¤Ç¤¹" diff --git a/po/nl.po b/po/nl.po index cbbfb4f4..ca5ab0ba 100644 --- a/po/nl.po +++ b/po/nl.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: bison 1.25\n" -"POT-Creation-Date: 2000-12-19 15:49+0100\n" +"POT-Creation-Date: 2000-12-20 11:28+0100\n" "PO-Revision-Date: 1996-08-27 15:34 MET DST\n" "Last-Translator: Erick Branderhorst \n" "Language-Team: Dutch \n" @@ -124,22 +124,22 @@ msgstr "%s afgeleiden" #. Some efforts were made to ease the translators' task, please #. continue. -#: src/getargs.c:74 +#: src/getargs.c:71 msgid "GNU bison generates parsers for LALR(1) grammars.\n" msgstr "" -#: src/getargs.c:78 +#: src/getargs.c:75 #, c-format msgid "Usage: %s [OPTION]... FILE\n" msgstr "" -#: src/getargs.c:82 +#: src/getargs.c:79 msgid "" "If a long option shows an argument as mandatory, then it is mandatory\n" "for the equivalent short option also. Similarly for optional arguments.\n" msgstr "" -#: src/getargs.c:88 +#: src/getargs.c:85 msgid "" "Operation modes:\n" " -h, --help display this help and exit\n" @@ -147,7 +147,7 @@ msgid "" " -y, --yacc emulate POSIX yacc\n" msgstr "" -#: src/getargs.c:95 +#: src/getargs.c:92 msgid "" "Parser:\n" " -t, --debug instrument the parser for debugging\n" @@ -159,7 +159,7 @@ msgid "" " -k, --token-table include a table of token names\n" msgstr "" -#: src/getargs.c:107 +#: src/getargs.c:104 msgid "" "Output:\n" " -d, --defines also produce a header file\n" @@ -168,38 +168,38 @@ msgid "" " -o, --output-file=FILE leave output to FILE\n" msgstr "" -#: src/getargs.c:115 +#: src/getargs.c:112 msgid "Report bugs to .\n" msgstr "" #. Some efforts were made to ease the translators' task, please #. continue. -#: src/getargs.c:129 +#: src/getargs.c:126 #, c-format msgid "bison (GNU Bison) %s" msgstr "" -#: src/getargs.c:134 +#: src/getargs.c:131 msgid "Copyright 1984, 1986, 1989, 1992, 2000 Free Software Foundation, Inc.\n" msgstr "" -#: src/getargs.c:138 +#: src/getargs.c:135 msgid "" "This is free software; see the source for copying conditions. There is NO\n" "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" msgstr "" -#: src/getargs.c:217 +#: src/getargs.c:214 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" -#: src/getargs.c:225 +#: src/getargs.c:222 #, c-format msgid "%s: no grammar file given\n" msgstr "%s: geen grammatica bestand gegeven\n" -#: src/getargs.c:229 +#: src/getargs.c:226 #, fuzzy, c-format msgid "%s: extra arguments ignored after `%s'\n" msgstr "%s: extra argumenten genegeerd na '%s'\n" @@ -262,7 +262,7 @@ msgstr "interne fout, %s\n" msgid "Entering set_nullable" msgstr "Inkomende set nullable" -#: src/output.c:990 +#: src/output.c:985 #, fuzzy, c-format msgid "maximum table size (%d) exceeded" msgstr "maximale tabel grootte (%s) overschreden" @@ -415,7 +415,7 @@ msgstr "" msgid "symbol %s redefined" msgstr "symbool %s opnieuw gedefinieerd" -#: src/reader.c:592 src/reader.c:671 src/reader.c:732 src/reader.c:1293 +#: src/reader.c:592 src/reader.c:671 src/reader.c:732 src/reader.c:1291 #, c-format msgid "type redeclaration for %s" msgstr "type herdeclaratie voor %s" @@ -430,7 +430,7 @@ msgstr "`%s' is onjuist in %s" msgid "multiple %s declarations" msgstr "meerdere %start declaraties" -#: src/reader.c:621 src/reader.c:1271 +#: src/reader.c:621 src/reader.c:1269 #, fuzzy, c-format msgid "invalid %s declaration" msgstr "onjuiste %start declaratie" @@ -459,7 +459,7 @@ msgstr "onjuiste tekst (%s) - nummer hoort na de identifier" msgid "unexpected item: %s" msgstr "onbekend item: %s" -#: src/reader.c:817 src/reader.c:1102 src/reader.c:1173 +#: src/reader.c:817 src/reader.c:1100 src/reader.c:1171 #, fuzzy, c-format msgid "unmatched %s" msgstr "niet overeenkomstige `{'" @@ -479,103 +479,103 @@ msgstr "onbekend item %s, verwacht een identifier" msgid "expected string constant instead of %s" msgstr "verwacht string constante in plaats van %s" -#: src/reader.c:1018 +#: src/reader.c:1016 #, c-format msgid "unrecognized: %s" msgstr "onbekend: %s" -#: src/reader.c:1023 +#: src/reader.c:1021 msgid "no input grammar" msgstr "geen invoer grammatica" -#: src/reader.c:1028 +#: src/reader.c:1026 #, c-format msgid "unknown character: %s" msgstr "onbekend karakter: %s" -#: src/reader.c:1196 +#: src/reader.c:1194 #, fuzzy, c-format msgid "unterminated %guard clause" msgstr "niet getermineerde %%guard voorwaarde" -#: src/reader.c:1358 +#: src/reader.c:1356 msgid "ill-formed rule: initial symbol not followed by colon" msgstr "" "slecht geformuleerde regel: initieel symbool niet gevolgd door dubbele punt" -#: src/reader.c:1365 +#: src/reader.c:1363 msgid "grammar starts with vertical bar" msgstr "grammatica start met een verticale bar" -#: src/reader.c:1396 +#: src/reader.c:1394 #, c-format msgid "rule given for %s, which is a token" msgstr "regel geven voor %s, welke een teken is" -#: src/reader.c:1498 +#: src/reader.c:1496 msgid "two @prec's in a row" msgstr "twee @prec's in een regel" -#: src/reader.c:1506 +#: src/reader.c:1504 #, fuzzy msgid "%%guard present but %%semantic_parser not specified" msgstr "%%guard aanwezig maar %%semantic_parser niet gespecificeerd" -#: src/reader.c:1515 +#: src/reader.c:1513 msgid "two actions at end of one rule" msgstr "twee akties aan het einde van een regel" -#: src/reader.c:1529 +#: src/reader.c:1527 #, c-format msgid "type clash (`%s' `%s') on default action" msgstr "type clash (`%s' `%s') bij standaard aktie" -#: src/reader.c:1535 +#: src/reader.c:1533 msgid "empty rule for typed nonterminal, and no action" msgstr "lege regel voor getypte niet terminal, en geen aktie" -#: src/reader.c:1579 +#: src/reader.c:1577 #, c-format msgid "invalid input: %s" msgstr "ongeldige invoer: %s" -#: src/reader.c:1587 +#: src/reader.c:1585 #, fuzzy, c-format msgid "too many symbols (tokens plus nonterminals); maximum %d" msgstr "te veel symbolen (tekens plus nietterminals); maximum %s" -#: src/reader.c:1590 +#: src/reader.c:1588 msgid "no rules in the input grammar" msgstr "geen regels voor invoer grammatica" -#: src/reader.c:1614 +#: src/reader.c:1612 #, c-format msgid "symbol %s is used, but is not defined as a token and has no rules" msgstr "" "symbool %s is gebruikt, maar is niet gedefinieerd als een teken en\n" "heeft geen regels" -#: src/reader.c:1720 +#: src/reader.c:1718 #, c-format msgid "conflicting precedences for %s and %s" msgstr "conflictuerende precedentein voor %s en %s" -#: src/reader.c:1732 +#: src/reader.c:1730 #, c-format msgid "conflicting assoc values for %s and %s" msgstr "conflictuerende associatieve waarden voor %s en %s" -#: src/reader.c:1783 +#: src/reader.c:1781 #, c-format msgid "tokens %s and %s both assigned number %d" msgstr "" -#: src/reader.c:1796 +#: src/reader.c:1794 #, c-format msgid "the start symbol %s is undefined" msgstr "" -#: src/reader.c:1798 +#: src/reader.c:1796 #, c-format msgid "the start symbol %s is a token" msgstr "het start symbool %s is een token" diff --git a/po/ru.po b/po/ru.po index 5c28c055..4dbc4cd7 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: bison 1.28a\n" -"POT-Creation-Date: 2000-12-19 15:49+0100\n" +"POT-Creation-Date: 2000-12-20 11:28+0100\n" "PO-Revision-Date: 2000-04-12 13:16+04:00\n" "Last-Translator: Dmitry S. Sivachenko \n" "Language-Team: Russian \n" @@ -125,16 +125,16 @@ msgstr "%s #. Some efforts were made to ease the translators' task, please #. continue. -#: src/getargs.c:74 +#: src/getargs.c:71 msgid "GNU bison generates parsers for LALR(1) grammars.\n" msgstr "GNU bison ÇÅÎÅÒÉÒÕÅÔ ÁÎÁÌÉÚÁÔÏÒÙ ÄÌÑ ÇÒÁÍÍÁÔÉË LALR(1).\n" -#: src/getargs.c:78 +#: src/getargs.c:75 #, c-format msgid "Usage: %s [OPTION]... FILE\n" msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþé]... æáêì\n" -#: src/getargs.c:82 +#: src/getargs.c:79 msgid "" "If a long option shows an argument as mandatory, then it is mandatory\n" "for the equivalent short option also. Similarly for optional arguments.\n" @@ -143,7 +143,7 @@ msgstr "" "Ñ×ÌÑÅÔÓÑ ÏÂÑÚÁÔÅÌØÎÙÍ ÄÌÑ ËÏÒÏÔËÏÊ ÆÏÒÍÙ. ôÏ ÖÅ ËÁÓÁÅÔÓÑ ÎÅÏÂÑÚÁÔÅÌØÎÙÈ\n" "ÁÒÇÕÍÅÎÔÏ×.\n" -#: src/getargs.c:88 +#: src/getargs.c:85 msgid "" "Operation modes:\n" " -h, --help display this help and exit\n" @@ -155,7 +155,7 @@ msgstr "" " -V, --version ×Ù×ÅÓÔÉ ÉÎÆÏÒÍÁÃÉÀ Ï ×ÅÒÓÉÉ É ×ÙÊÔÉ\n" " -y, --yacc ÜÍÕÌÉÒÏ×ÁÔØ POSIX yacc\n" -#: src/getargs.c:95 +#: src/getargs.c:92 #, fuzzy msgid "" "Parser:\n" @@ -175,7 +175,7 @@ msgstr "" " -r, --raw ÎÕÍÅÒÏ×ÁÔØ ÌÅËÓÅÍÙ, ÎÁÞÉÎÁÑ Ó 3\n" " -k, --token-table ×ËÌÀÞÉÔØ ÔÁÂÌÉÃÕ ÉÍÅÎ ÌÅËÓÅÍ\n" -#: src/getargs.c:107 +#: src/getargs.c:104 msgid "" "Output:\n" " -d, --defines also produce a header file\n" @@ -189,38 +189,38 @@ msgstr "" " -b, --file-prefix=ðòåæéëó ÕËÁÚÁÔØ ðòåæéëó ÄÌÑ ×ÙÈÏÄÎÙÈ ÆÁÊÌÏ×\n" " -o, --output-file=æáêì ÐÏÍÅÓÔÉÔØ ÒÅÚÕÌØÔÁÔ × æáêì\n" -#: src/getargs.c:115 +#: src/getargs.c:112 msgid "Report bugs to .\n" msgstr "ïÛÉÂËÉ ÓÏÏÂÝÁÊÔÅ ÐÏ ÁÄÒÅÓÕ .\n" #. Some efforts were made to ease the translators' task, please #. continue. -#: src/getargs.c:129 +#: src/getargs.c:126 #, c-format msgid "bison (GNU Bison) %s" msgstr "" -#: src/getargs.c:134 +#: src/getargs.c:131 msgid "Copyright 1984, 1986, 1989, 1992, 2000 Free Software Foundation, Inc.\n" msgstr "" -#: src/getargs.c:138 +#: src/getargs.c:135 msgid "" "This is free software; see the source for copying conditions. There is NO\n" "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" msgstr "" -#: src/getargs.c:217 +#: src/getargs.c:214 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" -#: src/getargs.c:225 +#: src/getargs.c:222 #, c-format msgid "%s: no grammar file given\n" msgstr "%s: ÎÅ ÚÁÄÁÎ ÆÁÊÌ Ó ÇÒÁÍÍÁÔÉËÏÊ\n" -#: src/getargs.c:229 +#: src/getargs.c:226 #, c-format msgid "%s: extra arguments ignored after `%s'\n" msgstr "%s: ÌÉÛÎÉÅ ÁÒÇÕÍÅÎÔÙ ÐÏÓÌÅ `%s' ÉÇÎÏÒÉÒÏ×ÁÎÙ\n" @@ -282,7 +282,7 @@ msgstr "%s: msgid "Entering set_nullable" msgstr "÷ÈÏÄ × set_nullable" -#: src/output.c:990 +#: src/output.c:985 #, c-format msgid "maximum table size (%d) exceeded" msgstr "ÐÒÅ×ÙÛÅÎ ÍÁËÓÉÍÁÌØÎÙÊ ÒÁÚÍÅÒ ÔÁÂÌÉÃÙ (%d)" @@ -435,7 +435,7 @@ msgstr "" msgid "symbol %s redefined" msgstr "ÐÏ×ÔÏÒÎÏÅ ÏÐÒÅÄÅÌÅÎÉÅ ÓÉÍ×ÏÌÁ %s" -#: src/reader.c:592 src/reader.c:671 src/reader.c:732 src/reader.c:1293 +#: src/reader.c:592 src/reader.c:671 src/reader.c:732 src/reader.c:1291 #, c-format msgid "type redeclaration for %s" msgstr "ÐÏ×ÔÏÒÎÏÅ ÏÐÉÓÁÎÉÅ ÔÉÐÁ ÄÌÑ %s" @@ -450,7 +450,7 @@ msgstr "`%s' msgid "multiple %s declarations" msgstr "ÍÎÏÖÅÓÔ×ÅÎÎÏÅ ÏÐÉÓÁÎÉÅ %start" -#: src/reader.c:621 src/reader.c:1271 +#: src/reader.c:621 src/reader.c:1269 #, fuzzy, c-format msgid "invalid %s declaration" msgstr "ÎÅ×ÅÒÎÏÅ ÏÐÉÓÁÎÉÅ %start" @@ -478,7 +478,7 @@ msgstr " msgid "unexpected item: %s" msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ÜÌÅÍÅÎÔ: %s" -#: src/reader.c:817 src/reader.c:1102 src/reader.c:1173 +#: src/reader.c:817 src/reader.c:1100 src/reader.c:1171 #, fuzzy, c-format msgid "unmatched %s" msgstr "ÎÅÐÁÒÎÁÑ `{'" @@ -498,101 +498,101 @@ msgstr " msgid "expected string constant instead of %s" msgstr "×ÍÅÓÔÏ %s ÏÖÉÄÁÌÁÓØ ÓÔÒÏËÏ×ÁÑ ÐÏÓÔÏÑÎÎÁÑ" -#: src/reader.c:1018 +#: src/reader.c:1016 #, c-format msgid "unrecognized: %s" msgstr "ÎÅÒÁÓÐÏÚÎÁÎÏ: %s" -#: src/reader.c:1023 +#: src/reader.c:1021 msgid "no input grammar" msgstr "ÎÅÔ ×ÈÏÄÎÏÊ ÇÒÁÍÍÁÔÉËÉ" -#: src/reader.c:1028 +#: src/reader.c:1026 #, c-format msgid "unknown character: %s" msgstr "ÎÅÉÚ×ÅÓÔÎÙÊ ÓÉÍ×ÏÌ: %s" -#: src/reader.c:1196 +#: src/reader.c:1194 #, c-format msgid "unterminated %guard clause" msgstr "ÎÅÚÁËÏÎÞÅÎÎÙÊ ÏÐÅÒÁÔÏÒ %guard" -#: src/reader.c:1358 +#: src/reader.c:1356 msgid "ill-formed rule: initial symbol not followed by colon" msgstr "ÎÅ×ÅÒÎÏÅ ÐÒÁ×ÉÌÏ: Ä×ÏÅÔÏÞÉÅ ÎÅ ÓÌÅÄÕÅÔ ÚÁ ÎÁÞÁÌØÎÙÍ ÓÉÍ×ÏÌÏÍ" -#: src/reader.c:1365 +#: src/reader.c:1363 msgid "grammar starts with vertical bar" msgstr "ÇÒÁÍÍÁÔÉËÁ ÎÁÞÉÎÁÅÔÓÑ Ó ×ÅÒÔÉËÁÌØÎÏÊ ÞÅÒÔÙ" -#: src/reader.c:1396 +#: src/reader.c:1394 #, c-format msgid "rule given for %s, which is a token" msgstr "ÐÒÁ×ÉÌÏ ÚÁÄÁÎÏ ÄÌÑ %s, ËÏÔÏÒÙÊ Ñ×ÌÑÅÔÓÑ ÌÅËÓÅÍÏÊ" -#: src/reader.c:1498 +#: src/reader.c:1496 msgid "two @prec's in a row" msgstr "Ä×Á @prec ÐÏÄÒÑÄ" -#: src/reader.c:1506 +#: src/reader.c:1504 #, fuzzy msgid "%%guard present but %%semantic_parser not specified" msgstr "%guard ÐÒÉÓÕÔÓÔ×ÕÅÔ, Á %semantic_parser ÎÅ ÚÁÄÁÎ" -#: src/reader.c:1515 +#: src/reader.c:1513 msgid "two actions at end of one rule" msgstr "Ä×Á ÄÅÊÓÔ×ÉÑ × ËÏÎÃÅ ÏÄÎÏÇÏ ÐÒÁ×ÉÌÁ" -#: src/reader.c:1529 +#: src/reader.c:1527 #, c-format msgid "type clash (`%s' `%s') on default action" msgstr "ËÏÎÆÌÉËÔ ÔÉÐÏ× (`%s' `%s') ÎÁ ÄÅÊÓÔ×ÉÉ ÐÏ ÕÍÏÌÞÁÎÉÀ" -#: src/reader.c:1535 +#: src/reader.c:1533 msgid "empty rule for typed nonterminal, and no action" msgstr "" "ÐÕÓÔÏÅ ÐÒÁ×ÉÌÏ ÄÌÑ ÔÉÐÉÚÉÒÏ×ÁÎÎÏÇÏ ÎÅÔÅÒÍÉÎÁÌØÎÏÇÏ ÓÉÍ×ÏÌÁ, É ÎÅÔ ÄÅÊÓÔ×ÉÑ" -#: src/reader.c:1579 +#: src/reader.c:1577 #, c-format msgid "invalid input: %s" msgstr "ÎÅ×ÅÒÎÙÅ ×ÈÏÄÎÙÅ ÄÁÎÎÙÅ: %s" -#: src/reader.c:1587 +#: src/reader.c:1585 #, c-format msgid "too many symbols (tokens plus nonterminals); maximum %d" msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ ÓÉÍ×ÏÌÏ× (ÌÅËÓÅÍÙ ÐÌÀÓ ÎÅÔÅÒÍÉÎÁÌÙ); ÍÁËÓÉÍÁÌØÎÏ %d" -#: src/reader.c:1590 +#: src/reader.c:1588 msgid "no rules in the input grammar" msgstr "ÏÔÓÕÔÓÔ×ÕÀÔ ÐÒÁ×ÉÌÁ ×Ï ×ÈÏÄÎÏÊ ÇÒÁÍÍÁÔÉËÅ" -#: src/reader.c:1614 +#: src/reader.c:1612 #, c-format msgid "symbol %s is used, but is not defined as a token and has no rules" msgstr "ÓÉÍ×ÏÌ %s ÉÓÐÏÌØÚÕÅÔÓÑ, ÎÏ ÎÅ ÏÐÒÅÄÅÌÅÎ ËÁË ÌÅËÓÅÍÁ É ÎÅ ÉÍÅÅÔ ÐÒÁ×ÉÌ" -#: src/reader.c:1720 +#: src/reader.c:1718 #, c-format msgid "conflicting precedences for %s and %s" msgstr "ÐÒÏÔÉ×ÏÒÅÞÉ×ÙÅ ÐÒÉÏÒÉÔÅÔÙ ÄÌÑ %s É %s" -#: src/reader.c:1732 +#: src/reader.c:1730 #, c-format msgid "conflicting assoc values for %s and %s" msgstr "ÐÒÏÔÉ×ÏÒÅÞÉ×ÙÅ ÚÎÁÞÅÎÉÑ ÁÓÓÏÃÉÁÔÉ×ÎÏÓÔÉ ÄÌÑ %s É %s" -#: src/reader.c:1783 +#: src/reader.c:1781 #, c-format msgid "tokens %s and %s both assigned number %d" msgstr "ÏÂÅÉÍ ÌÅËÓÅÍÁÍ %s É %s ÐÒÉÓ×ÏÅÎ ÎÏÍÅÒ %d" -#: src/reader.c:1796 +#: src/reader.c:1794 #, c-format msgid "the start symbol %s is undefined" msgstr "ÎÁÞÁÌØÎÙÊ ÓÉÍ×ÏÌ %s ÎÅÏÐÒÅÄÅÌÅÎ" -#: src/reader.c:1798 +#: src/reader.c:1796 #, c-format msgid "the start symbol %s is a token" msgstr "ÎÁÞÁÌØÎÙÊ ÓÉÍ×ÏÌ %s Ñ×ÌÑÅÔÓÑ ÌÅËÓÅÍÏÊ" diff --git a/src/Makefile.am b/src/Makefile.am index 5fe87968..30248f86 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,10 +1,9 @@ ## Process this file with automake to produce Makefile.in -*-Makefile-*- AUTOMAKE_OPTIONS = 1.4 ../lib/ansi2knr - DEFS = @DEFS@ \ - -DBISON_SIMPLE=\"${datadir}/bison.simple\" \ - -DBISON_HAIRY=\"${datadir}/bison.hairy\" \ - -DLOCALEDIR=\"${datadir}/locale\" + -DBISON_SIMPLE=\"$(pkgdatadir)/bison.simple\" \ + -DBISON_HAIRY=\"$(pkgdatadir)/bison.hairy\" \ + -DLOCALEDIR=\"$(datadir)/locale\" INCLUDES = -I../intl -I$(top_srcdir)/lib -I.. LDADD = @INTLLIBS@ ../lib/libbison.a @@ -25,11 +24,6 @@ noinst_HEADERS = LR0.h closure.h complain.h conflicts.h \ output.h state.h \ print.h reader.h reduce.h symtab.h warshall.h system.h types.h -data_DATA = bison.simple bison.hairy - -EXTRA_DIST = bison.s1 bison.hairy build.com bison.cld vmshlp.mar - -bison.simple: bison.s1 - cp $(srcdir)/bison.s1 $@ +pkgdata_DATA = bison.simple bison.hairy -DISTCLEANFILES = bison.simple +EXTRA_DIST = $(pkgdata_DATA) build.com bison.cld vmshlp.mar diff --git a/src/bison.s1 b/src/bison.s1 deleted file mode 100644 index 2a0f0b19..00000000 --- a/src/bison.s1 +++ /dev/null @@ -1,843 +0,0 @@ -/* -*-C-*- Note some compilers choke on comments on `#line' lines. */ -#line -/* Skeleton output parser for bison, - Copyright 1984, 1989, 1990, 2000 Free Software Foundation, Inc. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -/* As a special exception, when this file is copied by Bison into a - Bison output file, you may use that output file without restriction. - This special exception was added by the Free Software Foundation - in version 1.24 of Bison. */ - -/* This is the parser code that is written into each bison parser when - the %semantic_parser declaration is not specified in the grammar. - It was written by Richard Stallman by simplifying the hairy parser - used when %semantic_parser is specified. */ - -#ifndef YYSTACK_USE_ALLOCA -# ifdef alloca -# define YYSTACK_USE_ALLOCA -# else /* alloca not defined */ -# ifdef __GNUC__ -# define YYSTACK_USE_ALLOCA -# define alloca __builtin_alloca -# else /* not GNU C. */ -# if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi) || (defined (__sun) && defined (__i386)) -# define YYSTACK_USE_ALLOCA -# include -# else /* not sparc */ - /* We think this test detects Watcom and Microsoft C. */ - /* This used to test MSDOS, but that is a bad idea since that - symbol is in the user namespace. */ -# if (defined (_MSDOS) || defined (_MSDOS_)) && !defined (__TURBOC__) -# if 0 - /* No need for malloc.h, which pollutes the namespace; instead, - just don't use alloca. */ -# include -# endif -# else /* not MSDOS, or __TURBOC__ */ -# if defined(_AIX) - /* I don't know what this was needed for, but it pollutes the - namespace. So I turned it off. rms, 2 May 1997. */ - /* #include */ - #pragma alloca -# define YYSTACK_USE_ALLOCA -# else /* not MSDOS, or __TURBOC__, or _AIX */ -# if 0 - /* haible@ilog.fr says this works for HPUX 9.05 and up, and on - HPUX 10. Eventually we can turn this on. */ -# ifdef __hpux -# define YYSTACK_USE_ALLOCA -# define alloca __builtin_alloca -# endif /* __hpux */ -# endif -# endif /* not _AIX */ -# endif /* not MSDOS, or __TURBOC__ */ -# endif /* not sparc */ -# endif /* not GNU C */ -# endif /* alloca not defined */ -#endif /* YYSTACK_USE_ALLOCA not defined */ - -#ifdef YYSTACK_USE_ALLOCA -# define YYSTACK_ALLOC alloca -#else -# define YYSTACK_ALLOC malloc -#endif - -#define yyerrok (yyerrstatus = 0) -#define yyclearin (yychar = YYEMPTY) -#define YYEMPTY -2 -#define YYEOF 0 -#define YYACCEPT goto yyacceptlab -#define YYABORT goto yyabortlab -#define YYERROR goto yyerrlab1 -/* Like YYERROR except do call yyerror. This remains here temporarily - to ease the transition to the new meaning of YYERROR, for GCC. - Once GCC version 2 has supplanted version 1, this can go. */ -#define YYFAIL goto yyerrlab -#define YYRECOVERING() (!!yyerrstatus) -#define YYBACKUP(Token, Value) \ -do \ - if (yychar == YYEMPTY && yylen == 1) \ - { \ - yychar = (Token); \ - yylval = (Value); \ - yychar1 = YYTRANSLATE (yychar); \ - YYPOPSTACK; \ - goto yybackup; \ - } \ - else \ - { \ - yyerror ("syntax error: cannot back up"); \ - YYERROR; \ - } \ -while (0) - -#define YYTERROR 1 -#define YYERRCODE 256 - - -/* YYLLOC_DEFAULT -- Compute the default location (before the actions - are run). - - When YYLLOC_DEFAULT is run, CURRENT is set the location of the - first token. By default, to implement support for ranges, extend - its range to the last symbol. */ - -#ifndef YYLLOC_DEFAULT -# define YYLLOC_DEFAULT(Current, Last) \ - Current.last_line = Last.last_line; \ - Current.last_column = Last.last_column; -#endif - - -/* YYLEX -- calling `yylex' with the right arguments. */ - -#if YYPURE -# if YYLSP_NEEDED -# ifdef YYLEX_PARAM -# define YYLEX yylex (&yylval, &yylloc, YYLEX_PARAM) -# else -# define YYLEX yylex (&yylval, &yylloc) -# endif -# else /* !YYLSP_NEEDED */ -# ifdef YYLEX_PARAM -# define YYLEX yylex (&yylval, YYLEX_PARAM) -# else -# define YYLEX yylex (&yylval) -# endif -# endif /* !YYLSP_NEEDED */ -#else /* !YYPURE */ -# define YYLEX yylex () -#endif /* !YYPURE */ - - -/* Enable debugging if requested. */ -#if YYDEBUG -# define YYDPRINTF(Args) \ -do { \ - if (yydebug) \ - fprintf Args; \ -} while (0) -/* Nonzero means print parse trace. [The following comment makes no - sense to me. Could someone clarify it? --akim] Since this is - uninitialized, it does not stop multiple parsers from coexisting. - */ -int yydebug; -#else /* !YYDEBUG */ -# define YYDPRINTF(Args) -#endif /* !YYDEBUG */ - -/* YYINITDEPTH -- initial size of the parser's stacks. */ -#ifndef YYINITDEPTH -# define YYINITDEPTH 200 -#endif - -/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only - if the built-in stack extension method is used). */ -#if YYMAXDEPTH == 0 -# undef YYMAXDEPTH -#endif - -#ifndef YYMAXDEPTH -# define YYMAXDEPTH 10000 -#endif - -/* Define __yy_memcpy. Note that the size argument - should be passed with type unsigned int, because that is what the non-GCC - definitions require. With GCC, __builtin_memcpy takes an arg - of type size_t, but it can handle unsigned int. */ - -#if __GNUC__ > 1 /* GNU C and GNU C++ define this. */ -# define __yy_memcpy(To, From, Count) __builtin_memcpy (To, From, Count) -#else /* not GNU C or C++ */ -# ifndef __cplusplus - -/* This is the most reliable way to avoid incompatibilities - in available built-in functions on various systems. */ -static void -__yy_memcpy (to, from, count) - char *to; - char *from; - unsigned int count; -{ - register char *f = from; - register char *t = to; - register int i = count; - - while (i-- > 0) - *t++ = *f++; -} - -# else /* __cplusplus */ - -/* This is the most reliable way to avoid incompatibilities - in available built-in functions on various systems. */ -static void -__yy_memcpy (char *to, char *from, unsigned int count) -{ - register char *t = to; - register char *f = from; - register int i = count; - - while (i-- > 0) - *t++ = *f++; -} - -# endif -#endif - -#line - -/* The user can define YYPARSE_PARAM as the name of an argument to be passed - into yyparse. The argument should have type void *. - It should actually point to an object. - Grammar actions can access the variable by casting it - to the proper pointer type. */ - -#ifdef YYPARSE_PARAM -# ifdef __cplusplus -# define YYPARSE_PARAM_ARG void *YYPARSE_PARAM -# define YYPARSE_PARAM_DECL -# else /* !__cplusplus */ -# define YYPARSE_PARAM_ARG YYPARSE_PARAM -# define YYPARSE_PARAM_DECL void *YYPARSE_PARAM; -# endif /* !__cplusplus */ -#else /* !YYPARSE_PARAM */ -# define YYPARSE_PARAM_ARG -# define YYPARSE_PARAM_DECL -#endif /* !YYPARSE_PARAM */ - -/* Prevent warning if -Wstrict-prototypes. */ -#ifdef __GNUC__ -# ifdef YYPARSE_PARAM -int yyparse (void *); -# else -int yyparse (void); -# endif -#endif - -/* YY_DECL_VARIABLES -- depending whether we use a pure parser, - variables are global, or local to YYPARSE. */ - -#define _YY_DECL_VARIABLES \ -/* The lookahead symbol. */ \ -int yychar; \ - \ -/* The semantic value of the lookahead symbol. */ \ -YYSTYPE yylval; \ - \ -/* Number of parse errors so far. */ \ -int yynerrs; - -#if YYLSP_NEEDED -# define YY_DECL_VARIABLES \ -_YY_DECL_VARIABLES \ - \ -/* Location data for the lookahead symbol. */ \ -YYLTYPE yylloc; -#else -# define YY_DECL_VARIABLES \ -_YY_DECL_VARIABLES -#endif - - -/* If nonreentrant, generate the variables here. */ - -#if !YYPURE -YY_DECL_VARIABLES -#endif /* !YYPURE */ - -int -yyparse (YYPARSE_PARAM_ARG) - YYPARSE_PARAM_DECL -{ - /* If reentrant, generate the variables here. */ -#if YYPURE - YY_DECL_VARIABLES -#endif /* !YYPURE */ - - register int yystate; - register int yyn; - /* Number of tokens to shift before error messages enabled. */ - int yyerrstatus; - /* Lookahead token as an internal (translated) token number. */ - int yychar1 = 0; - - /* Three stacks and their tools: - `yyss': related to states, - `yysv': related to semantic values, - `yyls': related to locations. - - Refer to the stacks thru separate pointers, to allow yyoverflow - to reallocate them elsewhere. */ - - /* The state stack. */ - short yyssa[YYINITDEPTH]; - short *yyss = yyssa; - register short *yyssp; - - /* The semantic value stack. */ - YYSTYPE yyvsa[YYINITDEPTH]; - YYSTYPE *yyvs = yyvsa; - register YYSTYPE *yyvsp; - -#if YYLSP_NEEDED - /* The location stack. */ - YYLTYPE yylsa[YYINITDEPTH]; - YYLTYPE *yyls = yylsa; - YYLTYPE *yylsp; -#endif - -#if YYLSP_NEEDED -# define YYPOPSTACK (yyvsp--, yyssp--, yylsp--) -#else -# define YYPOPSTACK (yyvsp--, yyssp--) -#endif - - int yystacksize = YYINITDEPTH; - int yyfree_stacks = 0; - - - /* The variables used to return semantic value and location from the - action routines. */ - YYSTYPE yyval; -# if YYLSP_NEEDED - YYLTYPE yyloc; -# endif - - /* When reducing, the number of symbols on the RHS of the reduced - rule. */ - int yylen; - - YYDPRINTF ((stderr, "Starting parse\n")); - - yystate = 0; - yyerrstatus = 0; - yynerrs = 0; - yychar = YYEMPTY; /* Cause a token to be read. */ - - /* Initialize stack pointers. - Waste one element of value and location stack - so that they stay on the same level as the state stack. - The wasted elements are never initialized. */ - - yyssp = yyss - 1; - yyvsp = yyvs; -#if YYLSP_NEEDED - yylsp = yyls; -#endif - - -/*------------------------------------------------------------. -| yynewstate -- Push a new state, which is found in yystate. | -`------------------------------------------------------------*/ -yynewstate: - /* In all cases, when you get here, the value and location stacks - have just been pushed. so pushing a state here evens the stacks. - */ - *++yyssp = yystate; - - if (yyssp >= yyss + yystacksize - 1) - { - /* Give user a chance to reallocate the stack. Use copies of - these so that the &'s don't force the real ones into memory. - */ - YYSTYPE *yyvs1 = yyvs; - short *yyss1 = yyss; -#if YYLSP_NEEDED - YYLTYPE *yyls1 = yyls; -#endif - - /* Get the current used size of the three stacks, in elements. */ - int size = yyssp - yyss + 1; - -#ifdef yyoverflow - /* Each stack pointer address is followed by the size of the - data in use in that stack, in bytes. */ -# if YYLSP_NEEDED - /* This used to be a conditional around just the two extra args, - but that might be undefined if yyoverflow is a macro. */ - yyoverflow ("parser stack overflow", - &yyss1, size * sizeof (*yyssp), - &yyvs1, size * sizeof (*yyvsp), - &yyls1, size * sizeof (*yylsp), - &yystacksize); -# else - yyoverflow ("parser stack overflow", - &yyss1, size * sizeof (*yyssp), - &yyvs1, size * sizeof (*yyvsp), - &yystacksize); -# endif - - yyss = yyss1; yyvs = yyvs1; -# if YYLSP_NEEDED - yyls = yyls1; -# endif -#else /* no yyoverflow */ - /* Extend the stack our own way. */ - if (yystacksize >= YYMAXDEPTH) - { - yyerror ("parser stack overflow"); - if (yyfree_stacks) - { - free (yyss); - free (yyvs); -# if YYLSP_NEEDED - free (yyls); -# endif - } - return 2; - } - yystacksize *= 2; - if (yystacksize > YYMAXDEPTH) - yystacksize = YYMAXDEPTH; -# ifndef YYSTACK_USE_ALLOCA - yyfree_stacks = 1; -# endif - yyss = (short *) YYSTACK_ALLOC (yystacksize * sizeof (*yyssp)); - __yy_memcpy ((char *)yyss, (char *)yyss1, - size * (unsigned int) sizeof (*yyssp)); - yyvs = (YYSTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yyvsp)); - __yy_memcpy ((char *)yyvs, (char *)yyvs1, - size * (unsigned int) sizeof (*yyvsp)); -# if YYLSP_NEEDED - yyls = (YYLTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yylsp)); - __yy_memcpy ((char *)yyls, (char *)yyls1, - size * (unsigned int) sizeof (*yylsp)); -# endif -#endif /* no yyoverflow */ - - yyssp = yyss + size - 1; - yyvsp = yyvs + size - 1; -#if YYLSP_NEEDED - yylsp = yyls + size - 1; -#endif - - YYDPRINTF ((stderr, "Stack size increased to %d\n", yystacksize)); - - if (yyssp >= yyss + yystacksize - 1) - YYABORT; - } - - YYDPRINTF ((stderr, "Entering state %d\n", yystate)); - - goto yybackup; - - -/*-----------. -| yybackup. | -`-----------*/ -yybackup: - -/* Do appropriate processing given the current state. */ -/* Read a lookahead token if we need one and don't already have one. */ -/* yyresume: */ - - /* First try to decide what to do without reference to lookahead token. */ - - yyn = yypact[yystate]; - if (yyn == YYFLAG) - goto yydefault; - - /* Not known => get a lookahead token if don't already have one. */ - - /* yychar is either YYEMPTY or YYEOF - or a valid token in external form. */ - - if (yychar == YYEMPTY) - { - YYDPRINTF ((stderr, "Reading a token: ")); - yychar = YYLEX; - } - - /* Convert token to internal form (in yychar1) for indexing tables with */ - - if (yychar <= 0) /* This means end of input. */ - { - yychar1 = 0; - yychar = YYEOF; /* Don't call YYLEX any more */ - - YYDPRINTF ((stderr, "Now at end of input.\n")); - } - else - { - yychar1 = YYTRANSLATE (yychar); - -#if YYDEBUG - /* We have to keep this `#if YYDEBUG', since we use variables - which are defined only if `YYDEBUG' is set. */ - if (yydebug) - { - fprintf (stderr, "Next token is %d (%s", yychar, yytname[yychar1]); - /* Give the individual parser a way to print the precise - meaning of a token, for further debugging info. */ -# ifdef YYPRINT - YYPRINT (stderr, yychar, yylval); -# endif - fprintf (stderr, ")\n"); - } -#endif - } - - yyn += yychar1; - if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != yychar1) - goto yydefault; - - yyn = yytable[yyn]; - - /* yyn is what to do for this token type in this state. - Negative => reduce, -yyn is rule number. - Positive => shift, yyn is new state. - New state is final state => don't bother to shift, - just return success. - 0, or most negative number => error. */ - - if (yyn < 0) - { - if (yyn == YYFLAG) - goto yyerrlab; - yyn = -yyn; - goto yyreduce; - } - else if (yyn == 0) - goto yyerrlab; - - if (yyn == YYFINAL) - YYACCEPT; - - /* Shift the lookahead token. */ - YYDPRINTF ((stderr, "Shifting token %d (%s), ", yychar, yytname[yychar1])); - - /* Discard the token being shifted unless it is eof. */ - if (yychar != YYEOF) - yychar = YYEMPTY; - - *++yyvsp = yylval; -#if YYLSP_NEEDED - *++yylsp = yylloc; -#endif - - /* Count tokens shifted since error; after three, turn off error - status. */ - if (yyerrstatus) - yyerrstatus--; - - yystate = yyn; - goto yynewstate; - - -/*-----------------------------------------------------------. -| yydefault -- do the default action for the current state. | -`-----------------------------------------------------------*/ -yydefault: - yyn = yydefact[yystate]; - if (yyn == 0) - goto yyerrlab; - goto yyreduce; - - -/*-----------------------------. -| yyreduce -- Do a reduction. | -`-----------------------------*/ -yyreduce: - /* yyn is the number of a rule to reduce with. */ - yylen = yyr2[yyn]; - - /* If YYLEN is nonzero, implement the default value of the action: - `$$ = $1'. - - Otherwise, the following line sets YYVAL to the semantic value of - the lookahead token. This behavior is undocumented and Bison - users should not rely upon it. Assigning to YYVAL - unconditionally makes the parser a bit smaller, and it avoids a - GCC warning that YYVAL may be used uninitialized. */ - yyval = yyvsp[1-yylen]; - -#if YYLSP_NEEDED - /* Similarly for the default location. Let the user run additional - commands if for instance locations are ranges. */ - yyloc = yylsp[1-yylen]; - YYLLOC_DEFAULT (yyloc, yylsp[0]); -#endif - -#if YYDEBUG - /* We have to keep this `#if YYDEBUG', since we use variables which - are defined only if `YYDEBUG' is set. */ - if (yydebug) - { - int i; - - fprintf (stderr, "Reducing via rule %d (line %d), ", - yyn, yyrline[yyn]); - - /* Print the symbols being reduced, and their result. */ - for (i = yyprhs[yyn]; yyrhs[i] > 0; i++) - fprintf (stderr, "%s ", yytname[yyrhs[i]]); - fprintf (stderr, " -> %s\n", yytname[yyr1[yyn]]); - } -#endif -%% actions /* The action file replaces this line. */ -#line - - yyvsp -= yylen; - yyssp -= yylen; -#if YYLSP_NEEDED - yylsp -= yylen; -#endif - -#if YYDEBUG - if (yydebug) - { - short *ssp1 = yyss - 1; - fprintf (stderr, "state stack now"); - while (ssp1 != yyssp) - fprintf (stderr, " %d", *++ssp1); - fprintf (stderr, "\n"); - } -#endif - - *++yyvsp = yyval; -#if YYLSP_NEEDED - *++yylsp = yyloc; -#endif - - /* Now `shift' the result of the reduction. Determine what state - that goes to, based on the state we popped back to and the rule - number reduced by. */ - - yyn = yyr1[yyn]; - - yystate = yypgoto[yyn - YYNTBASE] + *yyssp; - if (yystate >= 0 && yystate <= YYLAST && yycheck[yystate] == *yyssp) - yystate = yytable[yystate]; - else - yystate = yydefgoto[yyn - YYNTBASE]; - - goto yynewstate; - - -/*------------------------------------. -| yyerrlab -- here on detecting error | -`------------------------------------*/ -yyerrlab: - /* If not already recovering from an error, report this error. */ - if (!yyerrstatus) - { - ++yynerrs; - -#ifdef YYERROR_VERBOSE - yyn = yypact[yystate]; - - if (yyn > YYFLAG && yyn < YYLAST) - { - int size = 0; - char *msg; - int x, count; - - count = 0; - /* Start X at -yyn if nec to avoid negative indexes in yycheck. */ - for (x = (yyn < 0 ? -yyn : 0); - x < (sizeof (yytname) / sizeof (char *)); x++) - if (yycheck[x + yyn] == x) - size += strlen (yytname[x]) + 15, count++; - size += strlen ("parse error, unexpected `") + 1; - size += strlen (yytname[YYTRANSLATE (yychar)]); - msg = (char *) malloc (size); - if (msg != 0) - { - strcpy (msg, "parse error, unexpected `"); - strcat (msg, yytname[YYTRANSLATE (yychar)]); - strcat (msg, "'"); - - if (count < 5) - { - count = 0; - for (x = (yyn < 0 ? -yyn : 0); - x < (sizeof (yytname) / sizeof (char *)); x++) - if (yycheck[x + yyn] == x) - { - strcat (msg, count == 0 ? ", expecting `" : " or `"); - strcat (msg, yytname[x]); - strcat (msg, "'"); - count++; - } - } - yyerror (msg); - free (msg); - } - else - yyerror ("parse error; also virtual memory exceeded"); - } - else -#endif /* YYERROR_VERBOSE */ - yyerror ("parse 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 - error, discard it. */ - - /* return failure if at end of input */ - if (yychar == YYEOF) - YYABORT; - YYDPRINTF ((stderr, "Discarding token %d (%s).\n", - yychar, yytname[yychar1])); - yychar = YYEMPTY; - } - - /* Else will try to reuse lookahead token after shifting the error - token. */ - - yyerrstatus = 3; /* Each real token shifted decrements this */ - - goto yyerrhandle; - - -/*-------------------------------------------------------------------. -| yyerrdefault -- current state does not do anything special for the | -| error token. | -`-------------------------------------------------------------------*/ -yyerrdefault: -#if 0 - /* This is wrong; only states that explicitly want error tokens - should shift them. */ - - /* If its default is to accept any token, ok. Otherwise pop it. */ - yyn = yydefact[yystate]; - if (yyn) - goto yydefault; -#endif - - -/*---------------------------------------------------------------. -| yyerrpop -- pop the current state because it cannot handle the | -| error token | -`---------------------------------------------------------------*/ -yyerrpop: - if (yyssp == yyss) - YYABORT; - yyvsp--; - yystate = *--yyssp; -#if YYLSP_NEEDED - yylsp--; -#endif - -#if YYDEBUG - if (yydebug) - { - short *ssp1 = yyss - 1; - fprintf (stderr, "Error: state stack now"); - while (ssp1 != yyssp) - fprintf (stderr, " %d", *++ssp1); - fprintf (stderr, "\n"); - } -#endif - -/*--------------. -| yyerrhandle. | -`--------------*/ -yyerrhandle: - yyn = yypact[yystate]; - if (yyn == YYFLAG) - goto yyerrdefault; - - yyn += YYTERROR; - if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != YYTERROR) - goto yyerrdefault; - - yyn = yytable[yyn]; - if (yyn < 0) - { - if (yyn == YYFLAG) - goto yyerrpop; - yyn = -yyn; - goto yyreduce; - } - else if (yyn == 0) - goto yyerrpop; - - if (yyn == YYFINAL) - YYACCEPT; - - YYDPRINTF ((stderr, "Shifting error token, ")); - - *++yyvsp = yylval; -#if YYLSP_NEEDED - *++yylsp = yylloc; -#endif - - yystate = yyn; - goto yynewstate; - - -/*-------------------------------------. -| yyacceptlab -- YYACCEPT comes here. | -`-------------------------------------*/ -yyacceptlab: - if (yyfree_stacks) - { - free (yyss); - free (yyvs); -#if YYLSP_NEEDED - free (yyls); -#endif - } - return 0; - - -/*-----------------------------------. -| yyabortlab -- YYABORT comes here. | -`-----------------------------------*/ -yyabortlab: - if (yyfree_stacks) - { - free (yyss); - free (yyvs); -#if YYLSP_NEEDED - free (yyls); -#endif - } - return 1; -} diff --git a/tests/atconfig.in b/tests/atconfig.in index 3c52256d..1ca75cea 100644 --- a/tests/atconfig.in +++ b/tests/atconfig.in @@ -87,8 +87,8 @@ CC='@CC@' CFLAGS='@CFLAGS@' # We want to use the files shipped with Bison. -BISON_SIMPLE=$at_top_builddir/src/bison.simple +BISON_SIMPLE=$at_top_srcdir/src/bison.simple export BISON_SIMPLE -BISON_HAIRY=$at_top_builddir/src/bison.hairy +BISON_HAIRY=$at_top_srcdir/src/bison.hairy export BISON_HAIRY # Snippet )2 -- 2.45.2