* src/reader.c (reader): Remove call to free_symtab ().

* src/main.c (main): Call it here.
Include symtab.h.
* src/conflicts.c (initialize_conflicts): Rename as...
(solve_conflicts): this.
* src/print.c (print_core, print_actions, print_state)
(print_grammar): Dump to a file instead a `output_obstack'.
(print_results): Dump `output_obstack', and then proceed with the
FILE *.
* src/files.c (compute_output_file_names, close_files): New.
(output_files): Adjust.
* src/main.c (main): Adjust.
This commit is contained in:
Akim Demaille
2001-09-24 08:15:53 +00:00
parent 9a96ccfa20
commit bb84601097
23 changed files with 715 additions and 634 deletions

131
po/ja.po
View File

@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GNU bison 1.28\n"
"POT-Creation-Date: 2001-09-22 18:19+0200\n"
"POT-Creation-Date: 2001-09-24 10:22+0200\n"
"PO-Revision-Date: 1999-09-28 21:10+0900\n"
"Last-Translator: Daisuke Yamashita <yamad@mb.infoweb.ne.jp>\n"
"Language-Team: Japanese <ja@li.org>\n"
@@ -13,7 +13,7 @@ msgstr ""
"Content-Type: text/plain; charset=EUC-JP\n"
"Content-Transfer-Encoding: 8bit\n"
#: src/LR0.c:207
#: src/LR0.c:208
#, fuzzy, c-format
msgid "too many states (max %d)"
msgstr "%s の数が多すぎます (最大 %d)"
@@ -77,31 +77,31 @@ msgstr "
#. If invoked with `--yacc', use the output format specified by
#. POSIX.
#: src/conflicts.c:493
#: src/conflicts.c:492
msgid "conflicts: "
msgstr "衝突: "
#: src/conflicts.c:495
#: src/conflicts.c:494
#, c-format
msgid " %d shift/reduce"
msgstr " %d シフト/還元"
#: src/conflicts.c:499
#: src/conflicts.c:498
#, c-format
msgid " %d reduce/reduce"
msgstr " %d 還元/還元"
#: src/conflicts.c:504
#: src/conflicts.c:503
#, c-format
msgid "%s contains"
msgstr "%s には、"
#: src/conflicts.c:590 src/conflicts.c:711
#: src/conflicts.c:589 src/conflicts.c:710
#, c-format
msgid " %-4s\t[reduce using rule %d (%s)]\n"
msgstr " %-4s\t[規則 %d を利用して還元 (%s)]\n"
#: src/conflicts.c:602 src/print.c:173
#: src/conflicts.c:601 src/print.c:172
#, c-format
msgid ""
" $default\treduce using rule %d (%s)\n"
@@ -110,12 +110,12 @@ msgstr ""
" $default\t規則 %d を利用して還元 (%s)\n"
"\n"
#: src/conflicts.c:691 src/conflicts.c:705
#: src/conflicts.c:690 src/conflicts.c:704
#, c-format
msgid " %-4s\treduce using rule %d (%s)\n"
msgstr " %-4s\t規則 %d を利用して還元 (%s)\n"
#: src/conflicts.c:732
#: src/conflicts.c:731
#, c-format
msgid " $default\treduce using rule %d (%s)\n"
msgstr " $default\t規則 %d を利用して還元 (%s)\n"
@@ -135,12 +135,12 @@ msgstr ""
msgid "%s derives"
msgstr "%s は以下から派生"
#: src/files.c:132
#: src/files.c:138
#, c-format
msgid "cannot open file `%s'"
msgstr ""
#: src/files.c:151
#: src/files.c:157
msgid "cannot close file"
msgstr ""
@@ -214,7 +214,7 @@ msgid ""
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
msgstr ""
#: src/getargs.c:214 src/lex.c:635
#: src/getargs.c:214 src/lex.c:633
#, c-format
msgid "`%s' is no longer supported"
msgstr ""
@@ -279,11 +279,11 @@ msgstr "
msgid "unterminated type name"
msgstr "閉じられていないタイプ名があります"
#: src/lex.c:432
#: src/lex.c:431
msgid "use \"...\" for multi-character literal tokens"
msgstr "複数文字のリテラルトークンには \"...\" を使いましょう"
#: src/main.c:108
#: src/main.c:122
#, c-format
msgid "%s: internal error: %s\n"
msgstr "%s: 内部エラー: %s\n"
@@ -292,7 +292,7 @@ msgstr "%s:
msgid "Entering set_nullable"
msgstr "set_nullable に入ります"
#: src/output.c:993
#: src/output.c:987
#, fuzzy, c-format
msgid "maximum table size (%d) exceeded"
msgstr "最大テーブルサイズ (%s) を超えました"
@@ -330,12 +330,12 @@ msgstr " %-4s\t
msgid " %-4s\terror (nonassociative)\n"
msgstr " %-4s\tエラー (非結合)\n"
#: src/print.c:190
#: src/print.c:188
#, c-format
msgid " %-4s\tgo to state %d\n"
msgstr " %-4s\t状態 %d へ\n"
#: src/print.c:202
#: src/print.c:200
#, fuzzy, c-format
msgid "state %d"
msgstr ""
@@ -344,23 +344,25 @@ msgstr ""
"状態 %d\n"
"\n"
#: src/print.c:233
#. rule # : LHS -> RHS
#: src/print.c:230
#, fuzzy
msgid "Grammar"
msgstr ""
"\n"
"文法\n"
#: src/print.c:240
#: src/print.c:235
#, c-format
msgid "rule %-4d %s ->"
msgstr "規則 %-4d %s ->"
#: src/print.c:246
msgid "\t\t/* empty */"
msgstr "\t\t/* 空 */"
#: src/print.c:241
msgid "empty"
msgstr ""
#: src/print.c:253
#. TERMINAL (type #) : rule #s terminal is on RHS
#: src/print.c:245
#, fuzzy
msgid "Terminals, with rules where they appear"
msgstr ""
@@ -368,7 +370,7 @@ msgstr ""
"終端トークン、およびそこに現れた規則\n"
"\n"
#: src/print.c:302
#: src/print.c:269
#, fuzzy
msgid "Nonterminals, with rules where they appear"
msgstr ""
@@ -376,11 +378,11 @@ msgstr ""
"非終端トークン、およびそこに現れた規則\n"
"\n"
#: src/print.c:329
#: src/print.c:295
msgid " on left:"
msgstr " 左辺:"
#: src/print.c:344
#: src/print.c:310
msgid " on right:"
msgstr " 右辺:"
@@ -434,7 +436,7 @@ msgstr "`%s'
msgid "unterminated `%{' definition"
msgstr "`%{' 定義 が閉じられていません"
#: src/reader.c:482 src/reader.c:598 src/reader.c:648
#: src/reader.c:482 src/reader.c:596 src/reader.c:646
#, c-format
msgid "Premature EOF after %s"
msgstr ""
@@ -449,171 +451,171 @@ msgstr ""
msgid "symbol `%s' given more than one literal string"
msgstr ""
#: src/reader.c:524 src/reader.c:667
#: src/reader.c:523 src/reader.c:665
#, c-format
msgid "symbol %s redefined"
msgstr "シンボル %s が再定義されました"
#: src/reader.c:534 src/reader.c:613 src/reader.c:674 src/reader.c:1290
#: src/reader.c:533 src/reader.c:611 src/reader.c:672 src/reader.c:1286
#, c-format
msgid "type redeclaration for %s"
msgstr "%s の型が再定義されました"
#: src/reader.c:544
#: src/reader.c:542
#, c-format
msgid "`%s' is invalid in %s"
msgstr "%2$s 内の `%1$s' は無効です"
#: src/reader.c:561 src/reader.c:721
#: src/reader.c:559 src/reader.c:718
#, fuzzy, c-format
msgid "multiple %s declarations"
msgstr "複数の %start が宣言されました"
#: src/reader.c:563 src/reader.c:902 src/reader.c:927 src/reader.c:1268
#: src/reader.c:561 src/reader.c:898 src/reader.c:923 src/reader.c:1264
#, fuzzy, c-format
msgid "invalid %s declaration"
msgstr "無効な %start が宣言されました"
#: src/reader.c:583
#: src/reader.c:581
msgid "%type declaration has no <typename>"
msgstr "%type 宣言に <タイプ名> がありません"
#: src/reader.c:618
#: src/reader.c:616
#, fuzzy, c-format
msgid "invalid %%type declaration due to item: %s"
msgstr "アイテムに与えられるべき %%type 宣言が無効です: `%s'"
#: src/reader.c:663
#: src/reader.c:661
#, c-format
msgid "redefining precedence of %s"
msgstr "%s に先行した再定義です"
#: src/reader.c:687
#: src/reader.c:684
#, c-format
msgid "invalid text (%s) - number should be after identifier"
msgstr "無効なテキスト (%s) - 数値は識別子の後ろにあるべきです"
#: src/reader.c:697
#: src/reader.c:694
#, c-format
msgid "unexpected item: %s"
msgstr "予期せぬアイテム: %s"
#: src/reader.c:764 src/reader.c:1094 src/reader.c:1165
#: src/reader.c:761 src/reader.c:1090 src/reader.c:1161
#, fuzzy, c-format
msgid "unmatched %s"
msgstr "対応のない `{' です"
#: src/reader.c:796
#: src/reader.c:793
#, fuzzy, c-format
msgid "argument of %%expect is not an integer"
msgstr "%expect の引数が整数値ではありません"
#: src/reader.c:843
#: src/reader.c:839
#, c-format
msgid "unrecognized item %s, expected an identifier"
msgstr "認識できないアイテム %s、ここでは識別子が期待されます"
#: src/reader.c:867
#: src/reader.c:863
#, c-format
msgid "expected string constant instead of %s"
msgstr "ここでは %s ではなく文字列定数が期待されます"
#: src/reader.c:1010
#: src/reader.c:1006
#, c-format
msgid "unrecognized: %s"
msgstr "認識できない: %s"
#: src/reader.c:1015
#: src/reader.c:1011
msgid "no input grammar"
msgstr "文法の入力が無い"
#: src/reader.c:1020
#: src/reader.c:1016
#, c-format
msgid "unknown character: %s"
msgstr "未知の文字: %s"
#: src/reader.c:1188
#: src/reader.c:1184
#, fuzzy, c-format
msgid "unterminated %guard clause"
msgstr "閉じられていない %%guard 節です"
#: src/reader.c:1355
#: src/reader.c:1351
msgid "ill-formed rule: initial symbol not followed by colon"
msgstr "邪悪な規則: 初期化シンボルにコロン (:) が続いていません"
#: src/reader.c:1362
#: src/reader.c:1358
msgid "grammar starts with vertical bar"
msgstr "文法は縦棒 (|) で始めます"
#: src/reader.c:1393
#: src/reader.c:1389
#, c-format
msgid "rule given for %s, which is a token"
msgstr "%s に規則が与えられ、それはトークンとなります"
#: src/reader.c:1495
#: src/reader.c:1491
msgid "two @prec's in a row"
msgstr "@prec のもの二つが同列になっています"
#: src/reader.c:1503
#: src/reader.c:1499
#, c-format
msgid "%%guard present but %%semantic_parser not specified"
msgstr "%%guard がありますが %%semantic_parser が指定されていません"
#: src/reader.c:1512
#: src/reader.c:1508
msgid "two actions at end of one rule"
msgstr "一つの規則の終りに二つの動作を指定しています"
#: src/reader.c:1526
#: src/reader.c:1522
#, c-format
msgid "type clash (`%s' `%s') on default action"
msgstr "初期状態の動作では型 (`%s' `%s') が衝突します"
#: src/reader.c:1532
#: src/reader.c:1528
msgid "empty rule for typed nonterminal, and no action"
msgstr "空の型付き非終端アイテム用規則であり、動作が起りません"
#: src/reader.c:1576
#: src/reader.c:1572
#, c-format
msgid "invalid input: %s"
msgstr "無効な入力: %s"
#: src/reader.c:1584
#: src/reader.c:1580
#, fuzzy, c-format
msgid "too many symbols (tokens plus nonterminals); maximum %d"
msgstr "シンボルが多すぎます (トークンと非終端アイテム) -- 最大 %s"
#: src/reader.c:1587
#: src/reader.c:1583
msgid "no rules in the input grammar"
msgstr "入力した文法に規則が定義されていません"
#: src/reader.c:1611
#: src/reader.c:1607
#, c-format
msgid "symbol %s is used, but is not defined as a token and has no rules"
msgstr ""
"シンボル %s が使われていますが、トークンとして定義されておらず、規則を持ちま"
"せん"
#: src/reader.c:1716
#: src/reader.c:1713
#, c-format
msgid "conflicting precedences for %s and %s"
msgstr "先行している %s と %s で競合が生じています"
#: src/reader.c:1728
#: src/reader.c:1725
#, c-format
msgid "conflicting assoc values for %s and %s"
msgstr "非結合値 %s と %s で競合が生じています"
#: src/reader.c:1779
#: src/reader.c:1771
#, fuzzy, c-format
msgid "tokens %s and %s both assigned number %d"
msgstr "トークン %s と %s の双方が番号 %s に割り当てられました"
#: src/reader.c:1792
#: src/reader.c:1783
#, c-format
msgid "the start symbol %s is undefined"
msgstr "開始シンボル %s は定義されていません"
#: src/reader.c:1794
#: src/reader.c:1785
#, c-format
msgid "the start symbol %s is a token"
msgstr "開始シンボル %s はトークンです"
@@ -802,6 +804,9 @@ msgstr ""
msgid "'"
msgstr ""
#~ msgid "\t\t/* empty */"
#~ msgstr "\t\t/* 空 */"
#~ msgid ""
#~ "\n"
#~ "\n"