Move symbols handling code out of the reader.

* src/reader.h, src/reader.c (errtoken, undeftoken, eoftoken)
(axiom): Move to...
* src/symtab.h, src/symtab.c: here.
* src/gram.c (start_symbol): Remove: use startsymbol->number.
* src/reader.c (startval): Rename as...
* src/symtab.h, src/symtab.c (startsymbol): this.
* src/reader.c: Adjust.
* src/reader.c (symbol_check_defined, symbol_make_alias)
(symbol_check_alias_consistence, symbol_pack, symbol_translation)
(token_translations_init)
Move to...
* src/symtab.c: here.
* src/reader.c (packsymbols): Move to...
* src/symtab.h, src/symtab.c (symbols_pack): here.
* src/symtab.h, src/symtab.c (symbol_make_alias): Takes SYMVAL as
argument.

po/et.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bison 1.33b\n"
-"POT-Creation-Date: 2002-06-03 09:28+0200\n"
+"POT-Creation-Date: 2002-06-10 10:30+0200\n"
 "PO-Revision-Date: 2002-03-05 16:27+0200\n"
 "Last-Translator: Toomas Soome <tsoome@ut.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -242,7 +242,7 @@ msgstr "liiga palju gotosid (maks %d)"
 msgid "unexpected `/' found and ignored"
 msgstr "leidsin ja ignoreerin ootamatu `/'"
 
-#: src/lex.c:106 src/reader.c:480
+#: src/lex.c:106 src/reader.c:311
 msgid "unterminated comment"
 msgstr "lõpetamata kommentaar"
 
@@ -391,230 +391,188 @@ msgstr " vasakul:"
 msgid " on right:"
 msgstr " paremal:"
 
-#: src/reader.c:100
-#, 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:119
-#, c-format
-msgid "symbol `%s' used more than once as a literal string"
-msgstr "sümbolit `%s' on kasutatud enam kui kord literaal sõnena"
-
-#: src/reader.c:122
-#, c-format
-msgid "symbol `%s' given more than one literal string"
-msgstr "sümbolile `%s' on antud enam kui üks literaal sõne"
-
-#: src/reader.c:157
-#, c-format
-msgid "conflicting precedences for %s and %s"
-msgstr "%s ja %s omavad konfliktseid prioriteete"
-
-#: src/reader.c:168
-#, c-format
-msgid "conflicting assoc values for %s and %s"
-msgstr "%s ja %s omavad konfliktseid assotsiatiivseid väärtuseid"
-
-#: src/reader.c:236
-#, 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:256
+#: src/reader.c:87
 msgid "   Skipping to next \\n"
 msgstr "   Liigun järgmisele \\n"
 
-#: src/reader.c:258
+#: src/reader.c:89
 #, c-format
 msgid "   Skipping to next %c"
 msgstr "   Liigun järgmisele %c"
 
-#: src/reader.c:309 src/reader.c:321
+#: src/reader.c:140 src/reader.c:152
 msgid "invalid $ value"
 msgstr "vigane $ väärtus"
 
-#: src/reader.c:370 src/reader.c:385
+#: src/reader.c:201 src/reader.c:216
 msgid "unterminated string at end of file"
 msgstr "lõpetamata sõne faili lõpus"
 
-#: src/reader.c:373
+#: src/reader.c:204
 msgid "unterminated string"
 msgstr "lõpetamata sõne"
 
-#: src/reader.c:514 src/reader.c:573
+#: src/reader.c:345 src/reader.c:404
 #, fuzzy, c-format
 msgid "invalid value: %s%d"
 msgstr "vigane @ väärtus"
 
-#: src/reader.c:523 src/reader.c:591
+#: src/reader.c:354 src/reader.c:422
 #, c-format
 msgid "%s is invalid"
 msgstr "%s on vigane"
 
-#: src/reader.c:559
+#: src/reader.c:390
 #, c-format
 msgid "$$ of `%s' has no declared type"
 msgstr "`%s' $$ ei oma deklareeritud tüüpi"
 
-#: src/reader.c:579
+#: src/reader.c:410
 #, c-format
 msgid "$%d of `%s' has no declared type"
 msgstr "$%d `%s' ei oma deklareeritud tüüpi"
 
-#: src/reader.c:641
+#: src/reader.c:472
 msgid "unterminated `%{' definition"
 msgstr "lõpetamata `%{' definitsioon"
 
-#: src/reader.c:686 src/reader.c:796 src/reader.c:847 src/reader.c:1099
+#: src/reader.c:517 src/reader.c:627 src/reader.c:678 src/reader.c:930
 #, c-format
 msgid "Premature EOF after %s"
 msgstr "Enneaegne EOF peale %s"
 
-#: src/reader.c:711 src/reader.c:866
+#: src/reader.c:542 src/reader.c:697
 #, c-format
 msgid "symbol %s redefined"
 msgstr "sümbol %s on uuesti defineeritud"
 
-#: src/reader.c:723 src/reader.c:811 src/reader.c:877
+#: src/reader.c:554 src/reader.c:642 src/reader.c:708
 #, c-format
 msgid "type redeclaration for %s"
 msgstr "%s tüübi uuesti deklareerimine"
 
-#: src/reader.c:741
+#: src/reader.c:572
 #, c-format
 msgid "`%s' is invalid in %s"
 msgstr "`%s' ei ole %s sees lubatud"
 
-#: src/reader.c:759 src/reader.c:923
+#: src/reader.c:590 src/reader.c:754
 #, c-format
 msgid "multiple %s declarations"
 msgstr "korduvad %s deklaratsioonid"
 
-#: src/reader.c:761 src/reader.c:1079 src/reader.c:1094 src/reader.c:1127
-#: src/reader.c:1141
+#: src/reader.c:592 src/reader.c:910 src/reader.c:925 src/reader.c:958
+#: src/reader.c:972
 #, c-format
 msgid "invalid %s declaration"
 msgstr "vigane %s deklaratsioon"
 
-#: src/reader.c:781
+#: src/reader.c:612
 msgid "%type declaration has no <typename>"
 msgstr "%type deklaratsioonis puudub <tüübinimi>"
 
-#: src/reader.c:816
+#: src/reader.c:647
 #, c-format
 msgid "invalid %%type declaration due to item: %s"
 msgstr "vigane %%type deklaratsioon, element: %s"
 
-#: src/reader.c:862
+#: src/reader.c:693
 #, c-format
 msgid "redefining precedence of %s"
 msgstr "%s prioriteedi uus definitsioon"
 
-#: src/reader.c:889
+#: src/reader.c:720
 #, c-format
 msgid "invalid text (%s) - number should be after identifier"
 msgstr "vigane tekst (%s) - number peab olema peale identifikaatorit"
 
-#: src/reader.c:899
+#: src/reader.c:730
 #, c-format
 msgid "unexpected item: %s"
 msgstr "ootamatu element: %s"
 
-#: src/reader.c:956 src/reader.c:1316
+#: src/reader.c:787 src/reader.c:1147
 #, c-format
 msgid "unmatched %s"
 msgstr "puudub %s"
 
-#: src/reader.c:985
+#: src/reader.c:816
 #, c-format
 msgid "argument of %%expect is not an integer"
 msgstr "%%expect argument ei ole täisarv"
 
-#: src/reader.c:1031
+#: src/reader.c:862
 #, c-format
 msgid "unrecognized item %s, expected an identifier"
 msgstr "tundmatu element %s, eeldasin identifikaatorit"
 
-#: src/reader.c:1053
+#: src/reader.c:884
 #, c-format
 msgid "expected string constant instead of %s"
 msgstr "eeldasin %s asemel sõnekonstanti"
 
-#: src/reader.c:1249
+#: src/reader.c:1080
 #, c-format
 msgid "unrecognized: %s"
 msgstr "tundmatu: %s"
 
-#: src/reader.c:1254
+#: src/reader.c:1085
 msgid "no input grammar"
 msgstr "sisendgrammatikat pole"
 
-#: src/reader.c:1259
+#: src/reader.c:1090
 #, c-format
 msgid "unknown character: %s"
 msgstr "tundmatu sümbol: %s"
 
-#: src/reader.c:1411
+#: src/reader.c:1242
 msgid "ill-formed rule: initial symbol not followed by colon"
 msgstr "vigaselt formeeritud reegel: algsümbolile ei järgne koolonit"
 
-#: src/reader.c:1418
+#: src/reader.c:1249
 msgid "grammar starts with vertical bar"
 msgstr "grammatika algab püstkriipsuga"
 
-#: src/reader.c:1446
+#: src/reader.c:1277
 #, 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:1476 src/reader.c:1586
+#: src/reader.c:1307 src/reader.c:1417
 msgid "previous rule lacks an ending `;'"
 msgstr "eelmisel reeglil puudub lõpetav `;'"
 
-#: src/reader.c:1554
+#: src/reader.c:1385
 msgid "two @prec's in a row"
 msgstr "kaks @prec ühel real"
 
-#: src/reader.c:1564
+#: src/reader.c:1395
 msgid "two actions at end of one rule"
 msgstr "kaks tegevust ühe reegli lõpus"
 
-#: src/reader.c:1578
+#: src/reader.c:1409
 #, c-format
 msgid "type clash (`%s' `%s') on default action"
 msgstr "vaikimisi tegevuse tüübikonflikt (`%s' `%s')"
 
-#: src/reader.c:1584
+#: src/reader.c:1415
 msgid "empty rule for typed nonterminal, and no action"
 msgstr "tüübiga mitteterminalil on tühi reegel ja puudub tegevus"
 
-#: src/reader.c:1592
+#: src/reader.c:1423
 #, c-format
 msgid "invalid input: %s"
 msgstr "vigane sisend: %s"
 
-#: src/reader.c:1599
+#: src/reader.c:1430
 msgid "no rules in the input grammar"
 msgstr "sisendgrammatikas pole reegleid"
 
-#: src/reader.c:1620
+#: src/reader.c:1450
 #, 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:1723
-#, c-format
-msgid "the start symbol %s is undefined"
-msgstr "stardisümbol %s ei ole defineeritud"
-
-#: src/reader.c:1725
-#, c-format
-msgid "the start symbol %s is a token"
-msgstr "stardisümbol %s on märk"
-
 #: src/reduce.c:338
 msgid "Useless nonterminals:"
 msgstr "Kasutamata mitteterminalid:"
@@ -724,6 +682,32 @@ msgstr "`"
 msgid "'"
 msgstr "'"
 
+#~ 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"
+
+#~ msgid "symbol `%s' used more than once as a literal string"
+#~ msgstr "sümbolit `%s' on kasutatud enam kui kord literaal sõnena"
+
+#~ msgid "symbol `%s' given more than one literal string"
+#~ msgstr "sümbolile `%s' on antud enam kui üks literaal sõne"
+
+#~ msgid "conflicting precedences for %s and %s"
+#~ msgstr "%s ja %s omavad konfliktseid prioriteete"
+
+#~ msgid "conflicting assoc values for %s and %s"
+#~ msgstr "%s ja %s omavad konfliktseid assotsiatiivseid väärtuseid"
+
+#~ msgid "tokens %s and %s both assigned number %d"
+#~ msgstr "märkidele %s ja %s on mõlemale omistatud number %d"
+
+#~ msgid "the start symbol %s is undefined"
+#~ msgstr "stardisümbol %s ei ole defineeritud"
+
+#~ msgid "the start symbol %s is a token"
+#~ msgstr "stardisümbol %s on märk"
+
 #~ msgid "reduce"
 #~ msgstr "redutseerimine"