From: Akim Demaille Date: Mon, 26 Nov 2001 15:24:06 +0000 (+0000) Subject: * src/reader.c (readgram): Make sure rules for mid-rule actions X-Git-Tag: BISON-1_30e~2 X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/674fd9acbca7f6b1c08e98eb31bdc420c1641148?ds=sidebyside * src/reader.c (readgram): Make sure rules for mid-rule actions have a lineno equal to that of their host rule. Reported by Hans Aberg. * tests/regression.at (Rule Line Numbers): New. --- diff --git a/ChangeLog b/ChangeLog index 546eead1..39b7f5f9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2001-11-26 Akim Demaille + + * src/reader.c (readgram): Make sure rules for mid-rule actions + have a lineno equal to that of their host rule. + Reported by Hans Aberg. + * tests/regression.at (Rule Line Numbers): New. + 2001-11-26 Akim Demaille * src/LR0.c (allocate_itemsets): kernel_size contains ints, not diff --git a/po/de.po b/po/de.po index dadacf57..e6332431 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: 2001-11-23 15:16+0100\n" +"POT-Creation-Date: 2001-11-26 16:23+0100\n" "PO-Revision-Date: 1996-10-10 17:54 MET DST\n" "Last-Translator: Ulrich Drepper \n" "Language-Team: German \n" @@ -26,7 +26,7 @@ msgstr "" msgid "warning: " msgstr "" -#: src/complain.c:238 src/complain.c:279 +#: src/complain.c:238 #, fuzzy msgid "fatal error: " msgstr "fataler Fehler: %s\n" @@ -72,37 +72,37 @@ msgstr "Zustand %d enth #. If invoked with `--yacc', use the output format specified by #. POSIX. -#: src/conflicts.c:460 +#: src/conflicts.c:470 msgid "conflicts: " msgstr "Konflikte: " -#: src/conflicts.c:462 +#: src/conflicts.c:472 #, c-format msgid " %d shift/reduce" msgstr " %d Schiebe/Reduziere" -#: src/conflicts.c:466 +#: src/conflicts.c:476 #, c-format msgid " %d reduce/reduce" msgstr " %d Reduziere/Reduziere" -#: src/conflicts.c:471 src/reduce.c:493 +#: src/conflicts.c:481 src/reduce.c:493 #, c-format msgid "%s contains " msgstr "%s enthält " -#: src/conflicts.c:480 +#: src/conflicts.c:488 #, fuzzy, c-format msgid "expected %d shift/reduce conflict\n" msgid_plural "expected %d shift/reduce conflicts\n" msgstr[0] " %d Schiebe/Reduziere Konflikte" -#: src/conflicts.c:567 src/conflicts.c:688 +#: src/conflicts.c:575 src/conflicts.c:696 #, c-format msgid " %-4s\t[reduce using rule %d (%s)]\n" msgstr " %-4s\t[reduziere mit Regel %d (%s)]\n" -#: src/conflicts.c:579 src/print.c:156 +#: src/conflicts.c:587 src/print.c:156 #, c-format msgid "" " $default\treduce using rule %d (%s)\n" @@ -111,12 +111,12 @@ msgstr "" " $default\treduziere mit Regel %d (%s)\n" "\n" -#: src/conflicts.c:668 src/conflicts.c:682 +#: src/conflicts.c:676 src/conflicts.c:690 #, c-format msgid " %-4s\treduce using rule %d (%s)\n" msgstr " %-4s\treduziere mit Tegel %d (%s)\n" -#: src/conflicts.c:708 +#: src/conflicts.c:716 #, c-format msgid " $default\treduce using rule %d (%s)\n" msgstr " $default\treduziere mit Regel %d (%s)\n" @@ -560,71 +560,71 @@ msgstr "Grammatik f msgid "rule given for %s, which is a token" msgstr "Regel für %s vorhanden, welches aber ein Token ist" -#: src/reader.c:1490 +#: src/reader.c:1492 msgid "two @prec's in a row" msgstr "zwei @prec Anweisungen nacheinander" -#: src/reader.c:1498 +#: src/reader.c:1500 #, c-format msgid "%%guard present but %%semantic_parser not specified" msgstr "" "%%guard Anweisung vorhanden, jedoch wird %%semantic_parser nicht angegeben" -#: src/reader.c:1507 +#: src/reader.c:1509 msgid "two actions at end of one rule" msgstr "Zwei Aktionen am Ende einer Regel" -#: src/reader.c:1521 +#: src/reader.c:1523 #, c-format msgid "type clash (`%s' `%s') on default action" msgstr "Typkonflikt (»%s« »%s«) bei Default Aktion" -#: src/reader.c:1527 +#: src/reader.c:1529 msgid "empty rule for typed nonterminal, and no action" msgstr "leere Regel für Nicht-Terminal vmit Typ und keine Aktion" -#: src/reader.c:1571 +#: src/reader.c:1573 #, c-format msgid "invalid input: %s" msgstr "ungültige Eingabe: %s" -#: src/reader.c:1579 +#: src/reader.c:1581 #, 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:1582 +#: src/reader.c:1584 msgid "no rules in the input grammar" msgstr "Eingabegrammatik enthält keine Regeln" -#: src/reader.c:1606 +#: src/reader.c:1608 #, 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:1741 +#: src/reader.c:1743 #, 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:1794 +#: src/reader.c:1796 #, c-format msgid "conflicting precedences for %s and %s" msgstr "Vorrangwertigkeiten für %s und %s widersprechen sich" -#: src/reader.c:1806 +#: src/reader.c:1808 #, c-format msgid "conflicting assoc values for %s and %s" msgstr "assoc Werte für %s nd %s widersprechen sich" -#: src/reader.c:1845 +#: src/reader.c:1847 #, c-format msgid "the start symbol %s is undefined" msgstr "das Startsymbol %s ist undefiniert" -#: src/reader.c:1847 +#: src/reader.c:1849 #, 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 03c8649d..a5355dc2 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: 2001-11-23 15:16+0100\n" +"POT-Creation-Date: 2001-11-26 16:23+0100\n" "PO-Revision-Date: 1998-09-21 10:19+0200\n" "Last-Translator: Nicolás García-Pedrajas \n" "Language-Team: Spanish \n" @@ -58,7 +58,7 @@ msgstr "" # La verdad es que a mi lo de error fatal me suena fatal # ngp # -#: src/complain.c:238 src/complain.c:279 +#: src/complain.c:238 #, fuzzy msgid "fatal error: " msgstr "error grave: %s\n" @@ -106,7 +106,7 @@ msgstr "El estado %d contiene" #. If invoked with `--yacc', use the output format specified by #. POSIX. -#: src/conflicts.c:460 +#: src/conflicts.c:470 msgid "conflicts: " msgstr "conflictos: " @@ -122,7 +122,7 @@ msgstr "conflictos: " # ok # ngp # -#: src/conflicts.c:462 +#: src/conflicts.c:472 #, c-format msgid " %d shift/reduce" msgstr " %d desplazamiento(s)/reducción(ones)" @@ -139,28 +139,28 @@ msgstr " %d desplazamiento(s)/reducci # # ok # ngp -#: src/conflicts.c:466 +#: src/conflicts.c:476 #, c-format msgid " %d reduce/reduce" msgstr " %d reducción(ones)/reducción(ones)" -#: src/conflicts.c:471 src/reduce.c:493 +#: src/conflicts.c:481 src/reduce.c:493 #, c-format msgid "%s contains " msgstr "%s contiene " -#: src/conflicts.c:480 +#: src/conflicts.c:488 #, fuzzy, c-format msgid "expected %d shift/reduce conflict\n" msgid_plural "expected %d shift/reduce conflicts\n" msgstr[0] " %d conflictos desplazamiento/reducción" -#: src/conflicts.c:567 src/conflicts.c:688 +#: src/conflicts.c:575 src/conflicts.c:696 #, c-format msgid " %-4s\t[reduce using rule %d (%s)]\n" msgstr " %-4s\t[reduce usando la regla %d (%s)]\n" -#: src/conflicts.c:579 src/print.c:156 +#: src/conflicts.c:587 src/print.c:156 #, c-format msgid "" " $default\treduce using rule %d (%s)\n" @@ -169,12 +169,12 @@ msgstr "" " $default\treduce usando la regla %d (%s)\n" "\n" -#: src/conflicts.c:668 src/conflicts.c:682 +#: src/conflicts.c:676 src/conflicts.c:690 #, c-format msgid " %-4s\treduce using rule %d (%s)\n" msgstr " %-4s\treduce usando la regla %d (%s)\n" -#: src/conflicts.c:708 +#: src/conflicts.c:716 #, c-format msgid " $default\treduce using rule %d (%s)\n" msgstr " $default\treduce usando la regla %d (%s)\n" @@ -645,75 +645,75 @@ msgstr "la gram msgid "rule given for %s, which is a token" msgstr "se ha dado una regla para %s, que es un terminal" -#: src/reader.c:1490 +#: src/reader.c:1492 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:1498 +#: src/reader.c:1500 #, c-format msgid "%%guard present but %%semantic_parser not specified" msgstr "%%guard presente pero %%semantic_parser está sin especificar" -#: src/reader.c:1507 +#: src/reader.c:1509 msgid "two actions at end of one rule" msgstr "dos acciones al final de una regla" -#: src/reader.c:1521 +#: src/reader.c:1523 #, 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:1527 +#: src/reader.c:1529 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:1571 +#: src/reader.c:1573 #, c-format msgid "invalid input: %s" msgstr "entrada no válida: %s" -#: src/reader.c:1579 +#: src/reader.c:1581 #, 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:1582 +#: src/reader.c:1584 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:1606 +#: src/reader.c:1608 #, 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:1741 +#: src/reader.c:1743 #, 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:1794 +#: src/reader.c:1796 #, c-format msgid "conflicting precedences for %s and %s" msgstr "precedencias en conflicto entre %s y %s" -#: src/reader.c:1806 +#: src/reader.c:1808 #, c-format msgid "conflicting assoc values for %s and %s" msgstr "conflicto de valores assoc para %s y %s" -#: src/reader.c:1845 +#: src/reader.c:1847 #, c-format msgid "the start symbol %s is undefined" msgstr "el símbolo de inicio (axioma) %s no está definido" -#: src/reader.c:1847 +#: src/reader.c:1849 #, 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 1741ed39..92359384 100644 --- a/po/et.po +++ b/po/et.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: bison 1.30b\n" -"POT-Creation-Date: 2001-11-23 15:16+0100\n" +"POT-Creation-Date: 2001-11-26 16:23+0100\n" "PO-Revision-Date: 2001-11-13 10:42+02:00\n" "Last-Translator: Toomas Soome \n" "Language-Team: Estonian \n" @@ -26,7 +26,7 @@ msgstr "Tundmatu s msgid "warning: " msgstr "hoiatus: " -#: src/complain.c:238 src/complain.c:279 +#: src/complain.c:238 msgid "fatal error: " msgstr "fataalne viga: " @@ -72,38 +72,38 @@ msgstr "Olek %d sisaldab " #. If invoked with `--yacc', use the output format specified by #. POSIX. -#: src/conflicts.c:460 +#: src/conflicts.c:470 msgid "conflicts: " msgstr "konfliktid: " -#: src/conflicts.c:462 +#: src/conflicts.c:472 #, c-format msgid " %d shift/reduce" msgstr " %d nihutamine/redutseerimine" -#: src/conflicts.c:466 +#: src/conflicts.c:476 #, c-format msgid " %d reduce/reduce" msgstr " %d redutseerimine/redutseerimine" -#: src/conflicts.c:471 src/reduce.c:493 +#: src/conflicts.c:481 src/reduce.c:493 #, c-format msgid "%s contains " msgstr "%s sisaldab " -#: src/conflicts.c:480 +#: src/conflicts.c:488 #, fuzzy, c-format msgid "expected %d shift/reduce conflict\n" msgid_plural "expected %d shift/reduce conflicts\n" msgstr[0] "eeldasime %d nihutamine/redutseerimine konflikti" msgstr[1] "eeldasime %d nihutamine/redutseerimine konflikti" -#: src/conflicts.c:567 src/conflicts.c:688 +#: src/conflicts.c:575 src/conflicts.c:696 #, c-format msgid " %-4s\t[reduce using rule %d (%s)]\n" msgstr " %-4s\t[redutseerin, kasutades reeglit %d (%s)]\n" -#: src/conflicts.c:579 src/print.c:156 +#: src/conflicts.c:587 src/print.c:156 #, c-format msgid "" " $default\treduce using rule %d (%s)\n" @@ -112,12 +112,12 @@ msgstr "" " $default\tredutseerin kasutades reeglit %d (%s)\n" "\n" -#: src/conflicts.c:668 src/conflicts.c:682 +#: src/conflicts.c:676 src/conflicts.c:690 #, c-format msgid " %-4s\treduce using rule %d (%s)\n" msgstr " %-4s\tredutseerin kasutades reeglit %d (%s)\n" -#: src/conflicts.c:708 +#: src/conflicts.c:716 #, c-format msgid " $default\treduce using rule %d (%s)\n" msgstr " $default\tredutseerin kasutades reeglit %d (%s)\n" @@ -566,70 +566,70 @@ msgstr "grammatika algab p msgid "rule given for %s, which is a token" msgstr "%s jaoks on antud reegel, aga see on märk" -#: src/reader.c:1490 +#: src/reader.c:1492 msgid "two @prec's in a row" msgstr "kaks @prec ühel real" -#: src/reader.c:1498 +#: src/reader.c:1500 #, c-format msgid "%%guard present but %%semantic_parser not specified" msgstr "%%guard on määratud, aga %%semantic_parser ei ole" -#: src/reader.c:1507 +#: src/reader.c:1509 msgid "two actions at end of one rule" msgstr "kaks tegevust ühe reegli lõpus" -#: src/reader.c:1521 +#: src/reader.c:1523 #, c-format msgid "type clash (`%s' `%s') on default action" msgstr "vaikimisi tegevuse tüübikonflikt (`%s' `%s')" -#: src/reader.c:1527 +#: src/reader.c:1529 msgid "empty rule for typed nonterminal, and no action" msgstr "tüübiga mitteterminalil on tühi reegel ja puudub tegevus" -#: src/reader.c:1571 +#: src/reader.c:1573 #, c-format msgid "invalid input: %s" msgstr "vigane sisend: %s" -#: src/reader.c:1579 +#: src/reader.c:1581 #, 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:1582 +#: src/reader.c:1584 msgid "no rules in the input grammar" msgstr "sisendgrammatikas pole reegleid" -#: src/reader.c:1606 +#: src/reader.c:1608 #, 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:1741 +#: src/reader.c:1743 #, 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:1794 +#: src/reader.c:1796 #, c-format msgid "conflicting precedences for %s and %s" msgstr "%s ja %s omavad konfliktseid prioriteete" -#: src/reader.c:1806 +#: src/reader.c:1808 #, c-format msgid "conflicting assoc values for %s and %s" msgstr "%s ja %s omavad konfliktseid assotsiatiivseid väärtuseid" -#: src/reader.c:1845 +#: src/reader.c:1847 #, c-format msgid "the start symbol %s is undefined" msgstr "stardisümbol %s ei ole defineeritud" -#: src/reader.c:1847 +#: src/reader.c:1849 #, 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 70aedec2..bd882900 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU bison 1.30c\n" -"POT-Creation-Date: 2001-11-23 15:16+0100\n" +"POT-Creation-Date: 2001-11-26 16:23+0100\n" "PO-Revision-Date: 2001-11-19 12:00-0500\n" "Last-Translator: Michel Robitaille \n" "Language-Team: French \n" @@ -27,7 +27,7 @@ msgstr "Erreur syst msgid "warning: " msgstr "AVERTISSEMENT: " -#: src/complain.c:238 src/complain.c:279 +#: src/complain.c:238 msgid "fatal error: " msgstr "erreur fatale: " @@ -72,37 +72,37 @@ msgstr "L' #. If invoked with `--yacc', use the output format specified by #. POSIX. -#: src/conflicts.c:460 +#: src/conflicts.c:470 msgid "conflicts: " msgstr "conflits: " -#: src/conflicts.c:462 +#: src/conflicts.c:472 #, c-format msgid " %d shift/reduce" msgstr " %d décalage/réduction" -#: src/conflicts.c:466 +#: src/conflicts.c:476 #, c-format msgid " %d reduce/reduce" msgstr " %d réduction/réduction" -#: src/conflicts.c:471 src/reduce.c:493 +#: src/conflicts.c:481 src/reduce.c:493 #, c-format msgid "%s contains " msgstr "%s contient " -#: src/conflicts.c:480 +#: src/conflicts.c:488 #, fuzzy, c-format msgid "expected %d shift/reduce conflict\n" msgid_plural "expected %d shift/reduce conflicts\n" msgstr[0] "attendu %d conflits décalage/réduction" -#: src/conflicts.c:567 src/conflicts.c:688 +#: src/conflicts.c:575 src/conflicts.c:696 #, c-format msgid " %-4s\t[reduce using rule %d (%s)]\n" msgstr " %-4s\t[réduction par la règle %d (%s)\n" -#: src/conflicts.c:579 src/print.c:156 +#: src/conflicts.c:587 src/print.c:156 #, c-format msgid "" " $default\treduce using rule %d (%s)\n" @@ -111,12 +111,12 @@ msgstr "" " $défaut\tréduction par la règle %d (%s)\n" "\n" -#: src/conflicts.c:668 src/conflicts.c:682 +#: src/conflicts.c:676 src/conflicts.c:690 #, c-format msgid " %-4s\treduce using rule %d (%s)\n" msgstr " %-4s\tréduction par la règle %d (%s)\n" -#: src/conflicts.c:708 +#: src/conflicts.c:716 #, c-format msgid " $default\treduce using rule %d (%s)\n" msgstr " $défaut\tréduction par la règle %d (%s)\n" @@ -570,70 +570,70 @@ msgstr "la grammaire d msgid "rule given for %s, which is a token" msgstr "la règle pour %s, qui est un terminal" -#: src/reader.c:1490 +#: src/reader.c:1492 msgid "two @prec's in a row" msgstr "deux @prec de suite" -#: src/reader.c:1498 +#: src/reader.c:1500 #, c-format msgid "%%guard present but %%semantic_parser not specified" msgstr "%%guard est présent mais %%semantic_parser n'est pas spécifié" -#: src/reader.c:1507 +#: src/reader.c:1509 msgid "two actions at end of one rule" msgstr "deux actions à la fin d'une même règle" -#: src/reader.c:1521 +#: src/reader.c:1523 #, 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:1527 +#: src/reader.c:1529 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:1571 +#: src/reader.c:1573 #, c-format msgid "invalid input: %s" msgstr "entrée non valide: %s" -#: src/reader.c:1579 +#: src/reader.c:1581 #, c-format msgid "too many symbols (tokens plus nonterminals); maximum %d" msgstr "trop de symboles (jeton plus non terminaux); maximum %d" -#: src/reader.c:1582 +#: src/reader.c:1584 msgid "no rules in the input grammar" msgstr "la grammaire n'a pas de règles" -#: src/reader.c:1606 +#: src/reader.c:1608 #, 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:1741 +#: src/reader.c:1743 #, c-format msgid "tokens %s and %s both assigned number %d" msgstr "les jetons %s et %s se sont vus assigner le nombre %d" -#: src/reader.c:1794 +#: src/reader.c:1796 #, c-format msgid "conflicting precedences for %s and %s" msgstr "les priorités pour %s et %s entrent en conflit" -#: src/reader.c:1806 +#: src/reader.c:1808 #, 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:1845 +#: src/reader.c:1847 #, c-format msgid "the start symbol %s is undefined" msgstr "le symbole de départ %s n'est pas défini" -#: src/reader.c:1847 +#: src/reader.c:1849 #, 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 19d5f3e4..29a04903 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: 2001-11-23 15:16+0100\n" +"POT-Creation-Date: 2001-11-26 16:23+0100\n" "PO-Revision-Date: 1999-09-28 21:10+0900\n" "Last-Translator: Daisuke Yamashita \n" "Language-Team: Japanese \n" @@ -26,7 +26,7 @@ msgstr "" msgid "warning: " msgstr "" -#: src/complain.c:238 src/complain.c:279 +#: src/complain.c:238 #, fuzzy msgid "fatal error: " msgstr "%s: Ã×̿Ū¥¨¥é¡¼: " @@ -72,37 +72,37 @@ msgstr " #. If invoked with `--yacc', use the output format specified by #. POSIX. -#: src/conflicts.c:460 +#: src/conflicts.c:470 msgid "conflicts: " msgstr "¾×ÆÍ: " -#: src/conflicts.c:462 +#: src/conflicts.c:472 #, c-format msgid " %d shift/reduce" msgstr " %d ¥·¥Õ¥È/´Ô¸µ" -#: src/conflicts.c:466 +#: src/conflicts.c:476 #, c-format msgid " %d reduce/reduce" msgstr " %d ´Ô¸µ/´Ô¸µ" -#: src/conflicts.c:471 src/reduce.c:493 +#: src/conflicts.c:481 src/reduce.c:493 #, c-format msgid "%s contains " msgstr "%s ¤Ë¤Ï" -#: src/conflicts.c:480 +#: src/conflicts.c:488 #, fuzzy, c-format msgid "expected %d shift/reduce conflict\n" msgid_plural "expected %d shift/reduce conflicts\n" msgstr[0] " %d ¥·¥Õ¥È/´Ô¸µ¾×ÆÍ" -#: src/conflicts.c:567 src/conflicts.c:688 +#: src/conflicts.c:575 src/conflicts.c:696 #, c-format msgid " %-4s\t[reduce using rule %d (%s)]\n" msgstr " %-4s\t[µ¬Â§ %d ¤òÍøÍѤ·¤Æ´Ô¸µ (%s)]\n" -#: src/conflicts.c:579 src/print.c:156 +#: src/conflicts.c:587 src/print.c:156 #, c-format msgid "" " $default\treduce using rule %d (%s)\n" @@ -111,12 +111,12 @@ msgstr "" " $default\tµ¬Â§ %d ¤òÍøÍѤ·¤Æ´Ô¸µ (%s)\n" "\n" -#: src/conflicts.c:668 src/conflicts.c:682 +#: src/conflicts.c:676 src/conflicts.c:690 #, c-format msgid " %-4s\treduce using rule %d (%s)\n" msgstr " %-4s\tµ¬Â§ %d ¤òÍøÍѤ·¤Æ´Ô¸µ (%s)\n" -#: src/conflicts.c:708 +#: src/conflicts.c:716 #, c-format msgid " $default\treduce using rule %d (%s)\n" msgstr " $default\tµ¬Â§ %d ¤òÍøÍѤ·¤Æ´Ô¸µ (%s)\n" @@ -557,70 +557,70 @@ msgstr "ʸˡ msgid "rule given for %s, which is a token" msgstr "%s ¤Ëµ¬Â§¤¬Í¿¤¨¤é¤ì¡¢¤½¤ì¤Ï¥È¡¼¥¯¥ó¤È¤Ê¤ê¤Þ¤¹" -#: src/reader.c:1490 +#: src/reader.c:1492 msgid "two @prec's in a row" msgstr "@prec ¤Î¤â¤ÎÆó¤Ä¤¬Æ±Îó¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹" -#: src/reader.c:1498 +#: src/reader.c:1500 #, c-format msgid "%%guard present but %%semantic_parser not specified" msgstr "%%guard ¤¬¤¢¤ê¤Þ¤¹¤¬ %%semantic_parser ¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó" -#: src/reader.c:1507 +#: src/reader.c:1509 msgid "two actions at end of one rule" msgstr "°ì¤Ä¤Îµ¬Â§¤Î½ª¤ê¤ËÆó¤Ä¤ÎÆ°ºî¤ò»ØÄꤷ¤Æ¤¤¤Þ¤¹" -#: src/reader.c:1521 +#: src/reader.c:1523 #, c-format msgid "type clash (`%s' `%s') on default action" msgstr "½é´ü¾õÂÖ¤ÎÆ°ºî¤Ç¤Ï·¿ (`%s' `%s') ¤¬¾×Æͤ·¤Þ¤¹" -#: src/reader.c:1527 +#: src/reader.c:1529 msgid "empty rule for typed nonterminal, and no action" msgstr "¶õ¤Î·¿ÉÕ¤­Èó½ªÃ¼¥¢¥¤¥Æ¥àÍѵ¬Â§¤Ç¤¢¤ê¡¢Æ°ºî¤¬µ¯¤ê¤Þ¤»¤ó" -#: src/reader.c:1571 +#: src/reader.c:1573 #, c-format msgid "invalid input: %s" msgstr "̵¸ú¤ÊÆþÎÏ: %s" -#: src/reader.c:1579 +#: src/reader.c:1581 #, fuzzy, c-format msgid "too many symbols (tokens plus nonterminals); maximum %d" msgstr "¥·¥ó¥Ü¥ë¤¬Â¿¤¹¤®¤Þ¤¹ (¥È¡¼¥¯¥ó¤ÈÈó½ªÃ¼¥¢¥¤¥Æ¥à) -- ºÇÂç %s" -#: src/reader.c:1582 +#: src/reader.c:1584 msgid "no rules in the input grammar" msgstr "ÆþÎϤ·¤¿Ê¸Ë¡¤Ëµ¬Â§¤¬ÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó" -#: src/reader.c:1606 +#: src/reader.c:1608 #, c-format msgid "symbol %s is used, but is not defined as a token and has no rules" msgstr "" "¥·¥ó¥Ü¥ë %s ¤¬»È¤ï¤ì¤Æ¤¤¤Þ¤¹¤¬¡¢¥È¡¼¥¯¥ó¤È¤·¤ÆÄêµÁ¤µ¤ì¤Æ¤ª¤é¤º¡¢µ¬Â§¤ò»ý¤Á¤Þ" "¤»¤ó" -#: src/reader.c:1741 +#: src/reader.c:1743 #, fuzzy, c-format msgid "tokens %s and %s both assigned number %d" msgstr "¥È¡¼¥¯¥ó %s ¤È %s ¤ÎÁÐÊý¤¬ÈÖ¹æ %s ¤Ë³ä¤êÅö¤Æ¤é¤ì¤Þ¤·¤¿" -#: src/reader.c:1794 +#: src/reader.c:1796 #, c-format msgid "conflicting precedences for %s and %s" msgstr "Àè¹Ô¤·¤Æ¤¤¤ë %s ¤È %s ¤Ç¶¥¹ç¤¬À¸¤¸¤Æ¤¤¤Þ¤¹" -#: src/reader.c:1806 +#: src/reader.c:1808 #, c-format msgid "conflicting assoc values for %s and %s" msgstr "Èó·ë¹çÃÍ %s ¤È %s ¤Ç¶¥¹ç¤¬À¸¤¸¤Æ¤¤¤Þ¤¹" -#: src/reader.c:1845 +#: src/reader.c:1847 #, c-format msgid "the start symbol %s is undefined" msgstr "³«»Ï¥·¥ó¥Ü¥ë %s ¤ÏÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó" -#: src/reader.c:1847 +#: src/reader.c:1849 #, c-format msgid "the start symbol %s is a token" msgstr "³«»Ï¥·¥ó¥Ü¥ë %s ¤Ï¥È¡¼¥¯¥ó¤Ç¤¹" diff --git a/po/nl.po b/po/nl.po index ecb94f4c..d53b8d86 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: 2001-11-23 15:16+0100\n" +"POT-Creation-Date: 2001-11-26 16:23+0100\n" "PO-Revision-Date: 1996-08-27 15:34 MET DST\n" "Last-Translator: Erick Branderhorst \n" "Language-Team: Dutch \n" @@ -26,7 +26,7 @@ msgstr "" msgid "warning: " msgstr "" -#: src/complain.c:238 src/complain.c:279 +#: src/complain.c:238 #, fuzzy msgid "fatal error: " msgstr "fatale fout: %s\n" @@ -72,37 +72,37 @@ msgstr "Stadium %d bevat" #. If invoked with `--yacc', use the output format specified by #. POSIX. -#: src/conflicts.c:460 +#: src/conflicts.c:470 msgid "conflicts: " msgstr "conflictueerd: " -#: src/conflicts.c:462 +#: src/conflicts.c:472 #, c-format msgid " %d shift/reduce" msgstr " %d vershuif/reduceer" -#: src/conflicts.c:466 +#: src/conflicts.c:476 #, c-format msgid " %d reduce/reduce" msgstr " %d reduceer/reduceer" -#: src/conflicts.c:471 src/reduce.c:493 +#: src/conflicts.c:481 src/reduce.c:493 #, c-format msgid "%s contains " msgstr "%s bevat" -#: src/conflicts.c:480 +#: src/conflicts.c:488 #, fuzzy, c-format msgid "expected %d shift/reduce conflict\n" msgid_plural "expected %d shift/reduce conflicts\n" msgstr[0] " %d verschuif/reduceer conflicten" -#: src/conflicts.c:567 src/conflicts.c:688 +#: src/conflicts.c:575 src/conflicts.c:696 #, c-format msgid " %-4s\t[reduce using rule %d (%s)]\n" msgstr " %-4s\t[reduceer gebruikt regel %d (%s)]\n" -#: src/conflicts.c:579 src/print.c:156 +#: src/conflicts.c:587 src/print.c:156 #, c-format msgid "" " $default\treduce using rule %d (%s)\n" @@ -111,12 +111,12 @@ msgstr "" " $default\treduce using rule %d (%s)\n" "\n" -#: src/conflicts.c:668 src/conflicts.c:682 +#: src/conflicts.c:676 src/conflicts.c:690 #, c-format msgid " %-4s\treduce using rule %d (%s)\n" msgstr "" -#: src/conflicts.c:708 +#: src/conflicts.c:716 #, c-format msgid " $default\treduce using rule %d (%s)\n" msgstr "" @@ -560,70 +560,70 @@ msgstr "grammatica start met een verticale bar" msgid "rule given for %s, which is a token" msgstr "regel geven voor %s, welke een teken is" -#: src/reader.c:1490 +#: src/reader.c:1492 msgid "two @prec's in a row" msgstr "twee @prec's in een regel" -#: src/reader.c:1498 +#: src/reader.c:1500 #, c-format msgid "%%guard present but %%semantic_parser not specified" msgstr "%%guard aanwezig maar %%semantic_parser niet gespecificeerd" -#: src/reader.c:1507 +#: src/reader.c:1509 msgid "two actions at end of one rule" msgstr "twee akties aan het einde van een regel" -#: src/reader.c:1521 +#: src/reader.c:1523 #, c-format msgid "type clash (`%s' `%s') on default action" msgstr "type clash (`%s' `%s') bij standaard aktie" -#: src/reader.c:1527 +#: src/reader.c:1529 msgid "empty rule for typed nonterminal, and no action" msgstr "lege regel voor getypte niet terminal, en geen aktie" -#: src/reader.c:1571 +#: src/reader.c:1573 #, c-format msgid "invalid input: %s" msgstr "ongeldige invoer: %s" -#: src/reader.c:1579 +#: src/reader.c:1581 #, fuzzy, c-format msgid "too many symbols (tokens plus nonterminals); maximum %d" msgstr "te veel symbolen (tekens plus nietterminals); maximum %s" -#: src/reader.c:1582 +#: src/reader.c:1584 msgid "no rules in the input grammar" msgstr "geen regels voor invoer grammatica" -#: src/reader.c:1606 +#: src/reader.c:1608 #, 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:1741 +#: src/reader.c:1743 #, c-format msgid "tokens %s and %s both assigned number %d" msgstr "" -#: src/reader.c:1794 +#: src/reader.c:1796 #, c-format msgid "conflicting precedences for %s and %s" msgstr "conflictuerende precedentein voor %s en %s" -#: src/reader.c:1806 +#: src/reader.c:1808 #, c-format msgid "conflicting assoc values for %s and %s" msgstr "conflictuerende associatieve waarden voor %s en %s" -#: src/reader.c:1845 +#: src/reader.c:1847 #, c-format msgid "the start symbol %s is undefined" msgstr "" -#: src/reader.c:1847 +#: src/reader.c:1849 #, 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 d0d0334b..adbe2abe 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: bison 1.29\n" -"POT-Creation-Date: 2001-11-23 15:16+0100\n" +"POT-Creation-Date: 2001-11-26 16:23+0100\n" "PO-Revision-Date: 2001-09-09 13:49+04:00\n" "Last-Translator: Dmitry S. Sivachenko \n" "Language-Team: Russian \n" @@ -26,7 +26,7 @@ msgstr " msgid "warning: " msgstr "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: " -#: src/complain.c:238 src/complain.c:279 +#: src/complain.c:238 msgid "fatal error: " msgstr "ÆÁÔÁÌØÎÁÑ ÏÛÉÂËÁ: " @@ -72,37 +72,37 @@ msgstr " #. If invoked with `--yacc', use the output format specified by #. POSIX. -#: src/conflicts.c:460 +#: src/conflicts.c:470 msgid "conflicts: " msgstr "ËÏÎÆÌÉËÔÙ: " -#: src/conflicts.c:462 +#: src/conflicts.c:472 #, c-format msgid " %d shift/reduce" msgstr " %d ÓÄ×ÉÇ/×Ù×ÏÄ" -#: src/conflicts.c:466 +#: src/conflicts.c:476 #, c-format msgid " %d reduce/reduce" msgstr " %d ×Ù×ÏÄ/×Ù×ÏÄ" -#: src/conflicts.c:471 src/reduce.c:493 +#: src/conflicts.c:481 src/reduce.c:493 #, c-format msgid "%s contains " msgstr "%s ÓÏÄÅÒÖÉÔ " -#: src/conflicts.c:480 +#: src/conflicts.c:488 #, fuzzy, c-format msgid "expected %d shift/reduce conflict\n" msgid_plural "expected %d shift/reduce conflicts\n" msgstr[0] " %d ËÏÎÆÌÉËÔÏ× ÓÄ×ÉÇÁ/×Ù×ÏÄÁ" -#: src/conflicts.c:567 src/conflicts.c:688 +#: src/conflicts.c:575 src/conflicts.c:696 #, c-format msgid " %-4s\t[reduce using rule %d (%s)]\n" msgstr " %-4s\t[×Ù×ÏÄ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÐÒÁ×ÉÌÁ %d (%s)]\n" -#: src/conflicts.c:579 src/print.c:156 +#: src/conflicts.c:587 src/print.c:156 #, c-format msgid "" " $default\treduce using rule %d (%s)\n" @@ -111,12 +111,12 @@ msgstr "" " $default\t×Ù×ÏÄ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÐÒÁ×ÉÌÁ %d (%s)\n" "\n" -#: src/conflicts.c:668 src/conflicts.c:682 +#: src/conflicts.c:676 src/conflicts.c:690 #, c-format msgid " %-4s\treduce using rule %d (%s)\n" msgstr " %-4s\t×Ù×ÏÄ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÐÒÁ×ÉÌÁ %d (%s)\n" -#: src/conflicts.c:708 +#: src/conflicts.c:716 #, c-format msgid " $default\treduce using rule %d (%s)\n" msgstr " $default\t×Ù×ÏÄ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÐÒÁ×ÉÌÁ %d (%s)\n" @@ -570,69 +570,69 @@ msgstr " msgid "rule given for %s, which is a token" msgstr "ÐÒÁ×ÉÌÏ ÚÁÄÁÎÏ ÄÌÑ %s, ËÏÔÏÒÙÊ Ñ×ÌÑÅÔÓÑ ÌÅËÓÅÍÏÊ" -#: src/reader.c:1490 +#: src/reader.c:1492 msgid "two @prec's in a row" msgstr "Ä×Á @prec ÐÏÄÒÑÄ" -#: src/reader.c:1498 +#: src/reader.c:1500 #, c-format msgid "%%guard present but %%semantic_parser not specified" msgstr "%%guard ÐÒÉÓÕÔÓÔ×ÕÅÔ, Á %%semantic_parser ÎÅ ÚÁÄÁÎ" -#: src/reader.c:1507 +#: src/reader.c:1509 msgid "two actions at end of one rule" msgstr "Ä×Á ÄÅÊÓÔ×ÉÑ × ËÏÎÃÅ ÏÄÎÏÇÏ ÐÒÁ×ÉÌÁ" -#: src/reader.c:1521 +#: src/reader.c:1523 #, c-format msgid "type clash (`%s' `%s') on default action" msgstr "ËÏÎÆÌÉËÔ ÔÉÐÏ× (`%s' `%s') ÎÁ ÄÅÊÓÔ×ÉÉ ÐÏ ÕÍÏÌÞÁÎÉÀ" -#: src/reader.c:1527 +#: src/reader.c:1529 msgid "empty rule for typed nonterminal, and no action" msgstr "" "ÐÕÓÔÏÅ ÐÒÁ×ÉÌÏ ÄÌÑ ÔÉÐÉÚÉÒÏ×ÁÎÎÏÇÏ ÎÅÔÅÒÍÉÎÁÌØÎÏÇÏ ÓÉÍ×ÏÌÁ, É ÎÅÔ ÄÅÊÓÔ×ÉÑ" -#: src/reader.c:1571 +#: src/reader.c:1573 #, c-format msgid "invalid input: %s" msgstr "ÎÅ×ÅÒÎÙÅ ×ÈÏÄÎÙÅ ÄÁÎÎÙÅ: %s" -#: src/reader.c:1579 +#: src/reader.c:1581 #, c-format msgid "too many symbols (tokens plus nonterminals); maximum %d" msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ ÓÉÍ×ÏÌÏ× (ÌÅËÓÅÍÙ ÐÌÀÓ ÎÅÔÅÒÍÉÎÁÌÙ); ÍÁËÓÉÍÁÌØÎÏ %d" -#: src/reader.c:1582 +#: src/reader.c:1584 msgid "no rules in the input grammar" msgstr "ÏÔÓÕÔÓÔ×ÕÀÔ ÐÒÁ×ÉÌÁ ×Ï ×ÈÏÄÎÏÊ ÇÒÁÍÍÁÔÉËÅ" -#: src/reader.c:1606 +#: src/reader.c:1608 #, c-format msgid "symbol %s is used, but is not defined as a token and has no rules" msgstr "ÓÉÍ×ÏÌ %s ÉÓÐÏÌØÚÕÅÔÓÑ, ÎÏ ÎÅ ÏÐÒÅÄÅÌÅÎ ËÁË ÌÅËÓÅÍÁ É ÎÅ ÉÍÅÅÔ ÐÒÁ×ÉÌ" -#: src/reader.c:1741 +#: src/reader.c:1743 #, c-format msgid "tokens %s and %s both assigned number %d" msgstr "ÏÂÅÉÍ ÌÅËÓÅÍÁÍ %s É %s ÐÒÉÓ×ÏÅÎ ÎÏÍÅÒ %d" -#: src/reader.c:1794 +#: src/reader.c:1796 #, c-format msgid "conflicting precedences for %s and %s" msgstr "ÐÒÏÔÉ×ÏÒÅÞÉ×ÙÅ ÐÒÉÏÒÉÔÅÔÙ ÄÌÑ %s É %s" -#: src/reader.c:1806 +#: src/reader.c:1808 #, c-format msgid "conflicting assoc values for %s and %s" msgstr "ÐÒÏÔÉ×ÏÒÅÞÉ×ÙÅ ÚÎÁÞÅÎÉÑ ÁÓÓÏÃÉÁÔÉ×ÎÏÓÔÉ ÄÌÑ %s É %s" -#: src/reader.c:1845 +#: src/reader.c:1847 #, c-format msgid "the start symbol %s is undefined" msgstr "ÎÁÞÁÌØÎÙÊ ÓÉÍ×ÏÌ %s ÎÅÏÐÒÅÄÅÌÅÎ" -#: src/reader.c:1847 +#: src/reader.c:1849 #, c-format msgid "the start symbol %s is a token" msgstr "ÎÁÞÁÌØÎÙÊ ÓÉÍ×ÏÌ %s Ñ×ÌÑÅÔÓÑ ÌÅËÓÅÍÏÊ" diff --git a/po/sv.po b/po/sv.po index cf7b84f3..46a16a12 100644 --- a/po/sv.po +++ b/po/sv.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: bison 1.30c\n" -"POT-Creation-Date: 2001-11-23 15:16+0100\n" +"POT-Creation-Date: 2001-11-26 16:23+0100\n" "PO-Revision-Date: 2001-11-18 15:17+0100\n" "Last-Translator: Göran Uddeborg \n" "Language-Team: Swedish \n" @@ -28,7 +28,7 @@ msgstr "Ok msgid "warning: " msgstr "varning: " -#: src/complain.c:238 src/complain.c:279 +#: src/complain.c:238 msgid "fatal error: " msgstr "ödesdigert fel: " @@ -75,38 +75,38 @@ msgstr "Tillst #. If invoked with `--yacc', use the output format specified by #. POSIX. -#: src/conflicts.c:460 +#: src/conflicts.c:470 msgid "conflicts: " msgstr "konflikter: " -#: src/conflicts.c:462 +#: src/conflicts.c:472 #, c-format msgid " %d shift/reduce" msgstr " %d skifta/reducera" -#: src/conflicts.c:466 +#: src/conflicts.c:476 #, c-format msgid " %d reduce/reduce" msgstr " %d reducera/reducera" -#: src/conflicts.c:471 src/reduce.c:493 +#: src/conflicts.c:481 src/reduce.c:493 #, c-format msgid "%s contains " msgstr "%s innehåller " -#: src/conflicts.c:480 +#: src/conflicts.c:488 #, fuzzy, c-format msgid "expected %d shift/reduce conflict\n" msgid_plural "expected %d shift/reduce conflicts\n" msgstr[0] "förväntade %d skifta/reducerakonflikt" msgstr[1] "förväntade %d skifta/reducerakonflikter" -#: src/conflicts.c:567 src/conflicts.c:688 +#: src/conflicts.c:575 src/conflicts.c:696 #, c-format msgid " %-4s\t[reduce using rule %d (%s)]\n" msgstr " %-4s\t[reducera med regel %d (%s)]\n" -#: src/conflicts.c:579 src/print.c:156 +#: src/conflicts.c:587 src/print.c:156 #, c-format msgid "" " $default\treduce using rule %d (%s)\n" @@ -115,12 +115,12 @@ msgstr "" " $standard\treducera med regel %d (%s)\n" "\n" -#: src/conflicts.c:668 src/conflicts.c:682 +#: src/conflicts.c:676 src/conflicts.c:690 #, c-format msgid " %-4s\treduce using rule %d (%s)\n" msgstr " %-4s\treducera med regel %d (%s)\n" -#: src/conflicts.c:708 +#: src/conflicts.c:716 #, c-format msgid " $default\treduce using rule %d (%s)\n" msgstr " $standard\treducera med regel %d (%s)\n" @@ -572,70 +572,70 @@ msgstr "grammatiken startar med ett vertikalt streck" msgid "rule given for %s, which is a token" msgstr "regel given för %s, som är ett element" -#: src/reader.c:1490 +#: src/reader.c:1492 msgid "two @prec's in a row" msgstr "två @prec i rad" -#: src/reader.c:1498 +#: src/reader.c:1500 #, c-format msgid "%%guard present but %%semantic_parser not specified" msgstr "%%guard finns men %%semantic_parser är inte angiven" -#: src/reader.c:1507 +#: src/reader.c:1509 msgid "two actions at end of one rule" msgstr "två åtgärder vid slutet av en regel" -#: src/reader.c:1521 +#: src/reader.c:1523 #, c-format msgid "type clash (`%s' `%s') on default action" msgstr "typkonflikt (\"%s\" \"%s\") för standardåtgärd" -#: src/reader.c:1527 +#: src/reader.c:1529 msgid "empty rule for typed nonterminal, and no action" msgstr "tom regel för typad icketerminal, och ingen åtgärd" -#: src/reader.c:1571 +#: src/reader.c:1573 #, c-format msgid "invalid input: %s" msgstr "felaktig indata: %s" -#: src/reader.c:1579 +#: src/reader.c:1581 #, c-format msgid "too many symbols (tokens plus nonterminals); maximum %d" msgstr "för många symboler (element plus icketerminaler); max %d" -#: src/reader.c:1582 +#: src/reader.c:1584 msgid "no rules in the input grammar" msgstr "inga regler i ingrammatiken" -#: src/reader.c:1606 +#: src/reader.c:1608 #, c-format msgid "symbol %s is used, but is not defined as a token and has no rules" msgstr "" "symbolen %s används, men är inte definierad som ett element och har inga " "regler" -#: src/reader.c:1741 +#: src/reader.c:1743 #, c-format msgid "tokens %s and %s both assigned number %d" msgstr "elementen %s och %s har båda fått nummer %d" -#: src/reader.c:1794 +#: src/reader.c:1796 #, c-format msgid "conflicting precedences for %s and %s" msgstr "motstridiga precedenser mellan %s och %s" -#: src/reader.c:1806 +#: src/reader.c:1808 #, c-format msgid "conflicting assoc values for %s and %s" msgstr "motstridiga assoc-värden mellan %s och %s" -#: src/reader.c:1845 +#: src/reader.c:1847 #, c-format msgid "the start symbol %s is undefined" msgstr "startsymbolen %s är odefinierad" -#: src/reader.c:1847 +#: src/reader.c:1849 #, c-format msgid "the start symbol %s is a token" msgstr "startsymbolen %s är ett element" diff --git a/po/tr.po b/po/tr.po index b01d5c55..903f05e7 100644 --- a/po/tr.po +++ b/po/tr.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: bison 1.30\n" -"POT-Creation-Date: 2001-11-23 15:16+0100\n" +"POT-Creation-Date: 2001-11-26 16:23+0100\n" "PO-Revision-Date: 2001-11-02 14:49GMT\n" "Last-Translator: Altug Bayram \n" "Language-Team: Turkish \n" @@ -27,7 +27,7 @@ msgstr "Bilinmeyen sistem hatas msgid "warning: " msgstr "uyarý: " -#: src/complain.c:238 src/complain.c:279 +#: src/complain.c:238 msgid "fatal error: " msgstr "ölümcül hata:" @@ -74,37 +74,37 @@ msgstr "%d durumu i #. If invoked with `--yacc', use the output format specified by #. POSIX. -#: src/conflicts.c:460 +#: src/conflicts.c:470 msgid "conflicts: " msgstr "çeliþkiler: " -#: src/conflicts.c:462 +#: src/conflicts.c:472 #, c-format msgid " %d shift/reduce" msgstr " %d öteleme/indirgeme" -#: src/conflicts.c:466 +#: src/conflicts.c:476 #, c-format msgid " %d reduce/reduce" msgstr " %d indirgeme/indirgeme" -#: src/conflicts.c:471 src/reduce.c:493 +#: src/conflicts.c:481 src/reduce.c:493 #, c-format msgid "%s contains " msgstr "%s içerir " -#: src/conflicts.c:480 +#: src/conflicts.c:488 #, fuzzy, c-format msgid "expected %d shift/reduce conflict\n" msgid_plural "expected %d shift/reduce conflicts\n" msgstr[0] " %d öteleme/indirgeme çeliþkisi" -#: src/conflicts.c:567 src/conflicts.c:688 +#: src/conflicts.c:575 src/conflicts.c:696 #, c-format msgid " %-4s\t[reduce using rule %d (%s)]\n" msgstr " %-4s\t[indirgeme kural %d (%s)'i kullanýyor]\n" -#: src/conflicts.c:579 src/print.c:156 +#: src/conflicts.c:587 src/print.c:156 #, c-format msgid "" " $default\treduce using rule %d (%s)\n" @@ -113,12 +113,12 @@ msgstr "" " $default\tindirgeme kural %d (%s)'i kullanýyor\n" "\n" -#: src/conflicts.c:668 src/conflicts.c:682 +#: src/conflicts.c:676 src/conflicts.c:690 #, c-format msgid " %-4s\treduce using rule %d (%s)\n" msgstr " %-4s\tindirgeme kural %d (%s)'i kullanýyor\n" -#: src/conflicts.c:708 +#: src/conflicts.c:716 #, c-format msgid " $default\treduce using rule %d (%s)\n" msgstr " $default\tindirgeme kural %d (%s)'i kullanýyor\n" @@ -570,71 +570,71 @@ msgstr "gramer d msgid "rule given for %s, which is a token" msgstr "bir andaç olan %s için verilen kural" -#: src/reader.c:1490 +#: src/reader.c:1492 msgid "two @prec's in a row" msgstr "bir satýrda iki @prec" -#: src/reader.c:1498 +#: src/reader.c:1500 #, c-format msgid "%%guard present but %%semantic_parser not specified" msgstr "%%guard sunulmuþ fakat %%semantic_parser belirlenmemiþ" -#: src/reader.c:1507 +#: src/reader.c:1509 msgid "two actions at end of one rule" msgstr "bir kuralýn sonunda iki eylem" -#: src/reader.c:1521 +#: src/reader.c:1523 #, c-format msgid "type clash (`%s' `%s') on default action" msgstr "öntanýmlý eylem üzerinde (`%s' `%s') tip çatýþmasý" -#: src/reader.c:1527 +#: src/reader.c:1529 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:1571 +#: src/reader.c:1573 #, c-format msgid "invalid input: %s" msgstr "geçersiz girdi: %s" -#: src/reader.c:1579 +#: src/reader.c:1581 #, c-format msgid "too many symbols (tokens plus nonterminals); maximum %d" msgstr "çok fazla simge var (andaçlar ve deðiþken simgeler); en fazla %d" -#: src/reader.c:1582 +#: src/reader.c:1584 msgid "no rules in the input grammar" msgstr "girdi grameri içinde kurallar yok" -#: src/reader.c:1606 +#: src/reader.c:1608 #, 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ç gibi tanýmlanmadý ve kurallara " "sahipdeðil" -#: src/reader.c:1741 +#: src/reader.c:1743 #, c-format msgid "tokens %s and %s both assigned number %d" msgstr "%s ve %s andaçlarýnýn her ikisi %d sayýsýna atandý" -#: src/reader.c:1794 +#: src/reader.c:1796 #, c-format msgid "conflicting precedences for %s and %s" msgstr "%s ve %s için çeliþen öncelikler" -#: src/reader.c:1806 +#: src/reader.c:1808 #, c-format msgid "conflicting assoc values for %s and %s" msgstr "%s ve %s için çeliþen birleþmeli deðerler" -#: src/reader.c:1845 +#: src/reader.c:1847 #, c-format msgid "the start symbol %s is undefined" msgstr "baþlangýç simgesi %s tanýmlanmadý" -#: src/reader.c:1847 +#: src/reader.c:1849 #, c-format msgid "the start symbol %s is a token" msgstr "baþlangýç simgesi %s bir andaçtýr" diff --git a/src/reader.c b/src/reader.c index f693b965..f8693da0 100644 --- a/src/reader.c +++ b/src/reader.c @@ -1438,12 +1438,14 @@ readgram (void) /* Make a dummy nonterminal, a gensym. */ bucket *sdummy = gensym (); - /* Make a new rule, whose body is empty, - before the current one, so that the action - just read can belong to it. */ + /* Make a new rule, whose body is empty, before the + current one, so that the action just read can + belong to it. */ nrules++; nitems++; p = symbol_list_new (sdummy); + /* Attach its lineno to that of the host rule. */ + p->line = crule->line; if (crule1) crule1->next = p; else diff --git a/tests/regression.at b/tests/regression.at index 68f02adc..046459bc 100644 --- a/tests/regression.at +++ b/tests/regression.at @@ -242,6 +242,148 @@ AT_CLEANUP + +## ------------------- ## +## Rule Line Numbers. ## +## ------------------- ## + +AT_SETUP([Rule Line Numbers]) + +AT_DATA([input.y], +[[%% +expr: +'a' + +{ + +} + +'b' + +{ + +} + +| + + +{ + + +} + +'c' + +{ + +} +]]) + +AT_CHECK([bison input.y input.c -v], 0, [], []) + +# Check the contents of the report. +AT_CHECK([cat input.output], [], +[[ +Grammar + + Number, Line, Rule + 1 2 @1 -> /* empty */ + 2 2 expr -> 'a' @1 'b' + 3 15 @2 -> /* empty */ + 4 15 expr -> @2 'c' + +Terminals, with rules where they appear + +$ (-1) +'a' (97) 2 +'b' (98) 2 +'c' (99) 4 +error (256) + +Nonterminals, with rules where they appear + +expr (6) + on left: 2 4 +@1 (7) + on left: 1, on right: 2 +@2 (8) + on left: 3, on right: 4 + + +state 0 + + 'a' shift, and go to state 1 + + $default reduce using rule 3 (@2) + + expr go to state 6 + @2 go to state 2 + + + +state 1 + + expr -> 'a' . @1 'b' (rule 2) + + $default reduce using rule 1 (@1) + + @1 go to state 3 + + + +state 2 + + expr -> @2 . 'c' (rule 4) + + 'c' shift, and go to state 4 + + + +state 3 + + expr -> 'a' @1 . 'b' (rule 2) + + 'b' shift, and go to state 5 + + + +state 4 + + expr -> @2 'c' . (rule 4) + + $default reduce using rule 4 (expr) + + + +state 5 + + expr -> 'a' @1 'b' . (rule 2) + + $default reduce using rule 2 (expr) + + + +state 6 + + $ go to state 7 + + + +state 7 + + $ go to state 8 + + + +state 8 + + $default accept +]]) + +AT_CLEANUP + + + ## -------------------- ## ## %expect not enough. ## ## -------------------- ##