* src/reader.c (copy_comment2): New function, same as former

`copy_comment', but outputs into two FILE *.
(copy_comment): Use it.
(parse_union_decl): Use it.
(get_type, parse_start_decl): Use the same `invalid' message.
(parse_start_decl, parse_union_decl): Use the same `multiple'
message.
(parse_union_decl, copy_guard, copy_action): Use the same
`unmatched' message.
* m4/Makefile.am (EXTRA_DIST): Add `warning.m4'.

po/fr.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.25\n"
-"POT-Creation-Date: 2000-03-31 16:02+0200\n"
+"POT-Creation-Date: 2000-04-14 15:35+0200\n"
 "PO-Revision-Date: 1996-03-19 20:05 EST\n"
 "Last-Translator: Dominique Boucher <boucherd@IRO.UMontreal.CA>\n"
 "Language-Team: French <fr@li.org>\n"
@@ -200,7 +200,7 @@ msgstr ""
 msgid "unexpected `/' found and ignored"
 msgstr "`/' inattendu et ignoré"
 
-#: src/lex.c:144 src/reader.c:248
+#: src/lex.c:144 src/reader.c:256
 msgid "unterminated comment"
 msgstr "le commentaire ne se termine pas"
 
@@ -240,7 +240,7 @@ msgstr "le nom de type ne se termine pas avant la fin de fichier"
 msgid "unterminated type name"
 msgstr "le nom de type ne se termine pas"
 
-#: src/main.c:137
+#: src/main.c:136
 #, fuzzy, c-format
 msgid "%s: internal error: %s\n"
 msgstr "erreur interne, %s\n"
@@ -249,7 +249,7 @@ msgstr "erreur interne, %s\n"
 msgid "Entering set_nullable"
 msgstr "Entré dans set_nullable"
 
-#: src/output.c:1199
+#: src/output.c:1207
 #, fuzzy, c-format
 msgid "maximum table size (%d) exceeded"
 msgstr "taille maximum des tables (%s) dépassée"
@@ -370,225 +370,205 @@ msgstr "cha
 msgid "unterminated string"
 msgstr "chaîne de caractère non terminée"
 
-#: src/reader.c:424
+#: src/reader.c:444
 #, c-format
 msgid "unrecognized: %s"
 msgstr "non reconnu: %s"
 
-#: src/reader.c:429
+#: src/reader.c:449
 msgid "no input grammar"
 msgstr "aucune grammaire en entrée"
 
-#: src/reader.c:432
+#: src/reader.c:452
 #, c-format
 msgid "unknown character: %s"
 msgstr "caractère inconnu: %s"
 
-#: src/reader.c:484
+#: src/reader.c:504
 msgid "unterminated `%{' definition"
 msgstr "La section de définition (%{) ne termine pas avant la fin du fichier"
 
-#: src/reader.c:525 src/reader.c:713 src/reader.c:762
+#: src/reader.c:545 src/reader.c:733 src/reader.c:782
 #, c-format
 msgid "Premature EOF after %s"
 msgstr ""
 
-#: src/reader.c:562 src/reader.c:784
+#: src/reader.c:582 src/reader.c:804
 #, c-format
 msgid "symbol %s redefined"
 msgstr "symbole %s redéfini"
 
-#: src/reader.c:572 src/reader.c:728 src/reader.c:791 src/reader.c:1697
+#: src/reader.c:592 src/reader.c:748 src/reader.c:811 src/reader.c:1673
 #, c-format
 msgid "type redeclaration for %s"
 msgstr "redéclaration du type de %s"
 
-#: src/reader.c:582
+#: src/reader.c:602
 #, c-format
 msgid "`%s' is invalid in %s"
 msgstr "`%s' n'est pas valide dans %s"
 
-#: src/reader.c:630
+#: src/reader.c:650
 #, c-format
 msgid "unrecognized item %s, expected an identifier"
 msgstr "item %s non reconnu, un identificateur est attendu"
 
-#: src/reader.c:652
+#: src/reader.c:672
 #, c-format
 msgid "expected string constant instead of %s"
 msgstr "chaîne de caractères constante attendue plutôt que %s"
 
-#: src/reader.c:674
-#, c-format
-msgid "multiple %start declarations"
+#: src/reader.c:694 src/reader.c:855
+#, fuzzy, c-format
+msgid "multiple %s declarations"
 msgstr "multiples déclarations %start"
 
-#: src/reader.c:676
-#, c-format
-msgid "invalid %start declaration"
+#: src/reader.c:696 src/reader.c:1649
+#, fuzzy, c-format
+msgid "invalid %s declaration"
 msgstr "la déclaration %start n'est pas valide"
 
-#: src/reader.c:696
+#: src/reader.c:716
 msgid "%type declaration has no <typename>"
 msgstr "la déclaration %type n'a pas de <nom_de_type>"
 
-#: src/reader.c:733
+#: src/reader.c:753
 #, fuzzy
 msgid "invalid %%type declaration due to item: %s"
 msgstr "la déclaration %%type n'est pas valide à cause de l'item: %s"
 
-#: src/reader.c:780
+#: src/reader.c:800
 #, c-format
 msgid "redefining precedence of %s"
 msgstr "redéfinition du niveau de priorité de %s"
 
-#: src/reader.c:803
+#: src/reader.c:823
 #, c-format
 msgid "invalid text (%s) - number should be after identifier"
 msgstr ""
 "le texte n'est pas valide (%s) - le nombre devrait suivre l'identificateur"
 
-#: src/reader.c:813
+#: src/reader.c:833
 #, c-format
 msgid "unexpected item: %s"
 msgstr "item inattendu: %s"
 
-#: src/reader.c:837
-#, c-format
-msgid "multiple %union declarations"
-msgstr "multiples déclarations %union"
+#: src/reader.c:896 src/reader.c:1059 src/reader.c:1276
+#, fuzzy, c-format
+msgid "unmatched %s"
+msgstr "accolade ouvrante `{' non appariée"
 
-#: src/reader.c:895
-msgid "unterminated comment at end of file"
-msgstr "le commentaire ne se termine pas avant la fin du fichier"
-
-#: src/reader.c:921
-msgid "unmatched close-brace (`}')"
-msgstr "accolade fermante `}' non appariée"
-
-#: src/reader.c:965
+#: src/reader.c:941
 #, c-format
 msgid "argument of %expect is not an integer"
 msgstr "le paramètre de %expect n'est pas un entier"
 
-#: src/reader.c:997
+#: src/reader.c:973
 #, c-format
 msgid "@%s is invalid"
 msgstr "@%s n'est pas valide"
 
-#: src/reader.c:1012 src/reader.c:1024
+#: src/reader.c:988 src/reader.c:1000
 msgid "invalid $ value"
 msgstr "la valeur de symbole $ n'est pas valide"
 
-#: src/reader.c:1083
-msgid "unmatched right brace (`}')"
-msgstr "accolade fermante `}' non appariée"
-
-#: src/reader.c:1130 src/reader.c:1270
+#: src/reader.c:1106 src/reader.c:1246
 #, c-format
 msgid "$$ of `%s' has no declared type"
 msgstr "$$ de `%s' n'a pas son type déclaré"
 
-#: src/reader.c:1146 src/reader.c:1286
+#: src/reader.c:1122 src/reader.c:1262
 #, fuzzy, c-format
 msgid "$%d of `%s' has no declared type"
 msgstr "$%s cd `%s' n'a pas son type déclaré"
 
-#: src/reader.c:1151 src/reader.c:1291
+#: src/reader.c:1127 src/reader.c:1267
 #, c-format
 msgid "$%s is invalid"
 msgstr "$%s n'est pas valide"
 
-#: src/reader.c:1160
+#: src/reader.c:1136
 #, fuzzy, c-format
 msgid "unterminated %guard clause"
 msgstr "clause %%guard non terminée"
 
-#: src/reader.c:1300
-msgid "unmatched `{'"
-msgstr "accolade ouvrante `{' non appariée"
-
-#: src/reader.c:1386
+#: src/reader.c:1362
 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:1393
+#: src/reader.c:1369
 msgid "grammar starts with vertical bar"
 msgstr "la grammaire débute par une barre verticale"
 
-#: src/reader.c:1424
+#: src/reader.c:1400
 #, c-format
 msgid "rule given for %s, which is a token"
 msgstr "la règle pour %s, qui est un terminal"
 
-#: src/reader.c:1522
+#: src/reader.c:1498
 msgid "two @prec's in a row"
 msgstr "deux @prec de suite"
 
-#: src/reader.c:1531
+#: src/reader.c:1507
 #, fuzzy, c-format
 msgid "%guard present but %semantic_parser not specified"
 msgstr "%%guard est présent mais %%semantic_parser n'est pas spécifié"
 
-#: src/reader.c:1540
+#: src/reader.c:1516
 msgid "two actions at end of one rule"
 msgstr "deux actions à la fin d'une même règle"
 
-#: src/reader.c:1555
+#: src/reader.c:1531
 #, 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:1561
+#: src/reader.c:1537
 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:1605
+#: src/reader.c:1581
 #, c-format
 msgid "invalid input: %s"
 msgstr "entrée non valide: %s"
 
-#: src/reader.c:1613
+#: src/reader.c:1589
 #, 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:1616
+#: src/reader.c:1592
 msgid "no rules in the input grammar"
 msgstr "la grammaire n'a pas de règles"
 
-#: src/reader.c:1634
+#: src/reader.c:1610
 #, 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:1673
-msgid "ill-formed %type declaration"
-msgstr "déclaration %type mal formée"
-
-#: src/reader.c:1752
+#: src/reader.c:1728
 #, c-format
 msgid "conflicting precedences for %s and %s"
 msgstr "les priorités pour %s et %s entrent en conflit"
 
-#: src/reader.c:1764
+#: src/reader.c:1740
 #, 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:1815
+#: src/reader.c:1791
 #, 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:1829
+#: src/reader.c:1805
 #, c-format
 msgid "the start symbol %s is undefined"
 msgstr "le symbole de départ %s n'est pas défini"
 
-#: src/reader.c:1831
+#: src/reader.c:1807
 #, c-format
 msgid "the start symbol %s is a token"
 msgstr "le symbole de départ %s est un terminal"
@@ -598,7 +578,7 @@ msgstr "le symbole de d
 msgid "Start symbol %s does not derive any sentence"
 msgstr "Aucune phrase ne peut être dérivée du symbole de départ %s"
 
-#: src/reduce.c:154
+#: src/reduce.c:155
 #, c-format
 msgid ""
 "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n"
@@ -606,7 +586,7 @@ msgstr ""
 "la réduction de %s définit %d terminal%s, %d catégorie%s et %d "
 "production%s.\n"
 
-#: src/reduce.c:492
+#: src/reduce.c:493
 msgid ""
 "Useless nonterminals:\n"
 "\n"
@@ -614,7 +594,7 @@ msgstr ""
 "Catégories non productives:\n"
 "\n"
 
-#: src/reduce.c:504
+#: src/reduce.c:505
 msgid ""
 "\n"
 "\n"
@@ -626,7 +606,7 @@ msgstr ""
 "Terminaux non utilisés:\n"
 "\n"
 
-#: src/reduce.c:513
+#: src/reduce.c:514
 msgid ""
 "\n"
 "\n"
@@ -638,7 +618,7 @@ msgstr ""
 "Règles non productives:\n"
 "\n"
 
-#: src/reduce.c:541
+#: src/reduce.c:542
 msgid ""
 "Variables\n"
 "---------\n"
@@ -648,11 +628,11 @@ msgstr ""
 "---------\n"
 "\n"
 
-#: src/reduce.c:542
+#: src/reduce.c:543
 msgid "Value  Sprec    Sassoc    Tag\n"
 msgstr "Valeur Spréc    Sassoc    Tag\n"
 
-#: src/reduce.c:547
+#: src/reduce.c:548
 msgid ""
 "Rules\n"
 "-----\n"
@@ -662,7 +642,7 @@ msgstr ""
 "------\n"
 "\n"
 
-#: src/reduce.c:557
+#: src/reduce.c:558
 msgid ""
 "Rules interpreted\n"
 "-----------------\n"
@@ -672,26 +652,26 @@ msgstr ""
 "-------------------\n"
 "\n"
 
-#: src/reduce.c:573
+#: src/reduce.c:574
 #, c-format
 msgid "%d rules never reduced\n"
 msgstr "%d règles jamais réduites\n"
 
-#: src/reduce.c:575
+#: src/reduce.c:576
 #, c-format
 msgid "%s contains "
 msgstr "%s contient "
 
-#: src/reduce.c:579
+#: src/reduce.c:580
 #, c-format
 msgid "%d useless nonterminal%s"
 msgstr "%d catégories non productives%s"
 
-#: src/reduce.c:584
+#: src/reduce.c:585
 msgid " and "
 msgstr " et "
 
-#: src/reduce.c:588
+#: src/reduce.c:589
 #, c-format
 msgid "%d useless rule%s"
 msgstr "%d règle(s) non productive(s)"
@@ -755,6 +735,21 @@ msgstr "%s: l'option %s est ambig
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: l'option --%s n'admet pas de paramètre\n"
 
+#~ msgid "unmatched close-brace (`}')"
+#~ msgstr "accolade fermante `}' non appariée"
+
+#~ msgid "unmatched right brace (`}')"
+#~ msgstr "accolade fermante `}' non appariée"
+
+#~ msgid "multiple %union declarations"
+#~ msgstr "multiples déclarations %union"
+
+#~ msgid "unterminated comment at end of file"
+#~ msgstr "le commentaire ne se termine pas avant la fin du fichier"
+
+#~ msgid "ill-formed %type declaration"
+#~ msgstr "déclaration %type mal formée"
+
 #~ msgid "gotos"
 #~ msgstr "gotos"