From: Akim Demaille Date: Tue, 19 Sep 2000 18:10:41 +0000 (+0000) Subject: * src/output.c: Formatting changes. X-Git-Tag: BISON-1_28b~131 X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/ceed8467b7db3615d3c9bfa9f3e5525d54c6a161?ds=inline * src/output.c: Formatting changes. * src/machine.h: Remove, leaving its contents in... * src/system.h: here. Include stdio.h. Adjust all dependencies on stdio.h and machine.h. * src/getargs.h: New file. Let all `extern' declarations about getargs.c be replaced with inclusion of `getargs.h'. * src/Makefile.am (noinst_HEADERS): Adjust. * tests/calc.m4 (yyin): Be initialized in main, not on the global scope. (yyerror): Returns void, not int. * doc/bison.texinfo: Formatting changes. --- diff --git a/ChangeLog b/ChangeLog index 064924da..a3b6d106 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,20 @@ +2000-09-19 Akim Demaille + + * src/output.c: Formatting changes. + * src/machine.h: Remove, leaving its contents in... + * src/system.h: here. + Include stdio.h. + Adjust all dependencies on stdio.h and machine.h. + * src/getargs.h: New file. + Let all `extern' declarations about getargs.c be replaced with + inclusion of `getargs.h'. + * src/Makefile.am (noinst_HEADERS): Adjust. + + * tests/calc.m4 (yyin): Be initialized in main, not on the global + scope. + (yyerror): Returns void, not int. + * doc/bison.texinfo: Formatting changes. + 2000-09-19 Akim Demaille * tests/calc.m4 (calc.y): Do not assign to stdin, as it's not diff --git a/doc/bison.texinfo b/doc/bison.texinfo index 72c7c522..8e253bca 100644 --- a/doc/bison.texinfo +++ b/doc/bison.texinfo @@ -1510,11 +1510,12 @@ real calculator, but it is adequate for the first example. @subsection Running Bison to Make the Parser @cindex running Bison (introduction) -Before running Bison to produce a parser, we need to decide how to arrange -all the source code in one or more source files. For such a simple example, -the easiest thing is to put everything in one file. The definitions of -@code{yylex}, @code{yyerror} and @code{main} go at the end, in the -``additional C code'' section of the file (@pxref{Grammar Layout, ,The Overall Layout of a Bison Grammar}). +Before running Bison to produce a parser, we need to decide how to +arrange all the source code in one or more source files. For such a +simple example, the easiest thing is to put everything in one file. The +definitions of @code{yylex}, @code{yyerror} and @code{main} go at the +end, in the ``additional C code'' section of the file (@pxref{Grammar +Layout, ,The Overall Layout of a Bison Grammar}). For a large project, you would probably have several source files, and use @code{make} to arrange to recompile them. @@ -1628,8 +1629,8 @@ exp: NUM @{ $$ = $1; @} @end example @noindent -The functions @code{yylex}, @code{yyerror} and @code{main} can be the same -as before. +The functions @code{yylex}, @code{yyerror} and @code{main} can be the +same as before. There are two important new features shown in this code. @@ -1671,10 +1672,10 @@ Here is a sample run of @file{calc.y}: Up to this point, this manual has not addressed the issue of @dfn{error recovery}---how to continue parsing after the parser detects a syntax -error. All we have handled is error reporting with @code{yyerror}. Recall -that by default @code{yyparse} returns after calling @code{yyerror}. This -means that an erroneous input line causes the calculator program to exit. -Now we show how to rectify this deficiency. +error. All we have handled is error reporting with @code{yyerror}. +Recall that by default @code{yyparse} returns after calling +@code{yyerror}. This means that an erroneous input line causes the +calculator program to exit. Now we show how to rectify this deficiency. The Bison language itself includes the reserved word @code{error}, which may be included in the grammar rules. In the example below it has @@ -1689,14 +1690,15 @@ line: '\n' @end group @end example -This addition to the grammar allows for simple error recovery in the event -of a parse error. If an expression that cannot be evaluated is read, the -error will be recognized by the third rule for @code{line}, and parsing -will continue. (The @code{yyerror} function is still called upon to print -its message as well.) The action executes the statement @code{yyerrok}, a -macro defined automatically by Bison; its meaning is that error recovery is -complete (@pxref{Error Recovery}). Note the difference between -@code{yyerrok} and @code{yyerror}; neither one is a misprint.@refill +This addition to the grammar allows for simple error recovery in the +event of a parse error. If an expression that cannot be evaluated is +read, the error will be recognized by the third rule for @code{line}, +and parsing will continue. (The @code{yyerror} function is still called +upon to print its message as well.) The action executes the statement +@code{yyerrok}, a macro defined automatically by Bison; its meaning is +that error recovery is complete (@pxref{Error Recovery}). Note the +difference between @code{yyerrok} and @code{yyerror}; neither one is a +misprint.@refill This form of error recovery deals with syntax errors. There are other kinds of errors; for example, division by zero, which raises an exception @@ -2186,12 +2188,13 @@ if it is the first thing in the file. @cindex additional C code section @cindex C code, section for additional -The @var{additional C code} section is copied verbatim to the end of -the parser file, just as the @var{C declarations} section is copied to -the beginning. This is the most convenient place to put anything -that you want to have in the parser file but which need not come before -the definition of @code{yyparse}. For example, the definitions of -@code{yylex} and @code{yyerror} often go here. @xref{Interface, ,Parser C-Language Interface}. +The @var{additional C code} section is copied verbatim to the end of the +parser file, just as the @var{C declarations} section is copied to the +beginning. This is the most convenient place to put anything that you +want to have in the parser file but which need not come before the +definition of @code{yyparse}. For example, the definitions of +@code{yylex} and @code{yyerror} often go here. @xref{Interface, ,Parser +C-Language Interface}. If the last section is empty, you may omit the @samp{%%} that separates it from the grammar rules. @@ -3601,7 +3604,8 @@ with no arguments, as usual. The Bison parser detects a @dfn{parse error} or @dfn{syntax error} whenever it reads a token which cannot satisfy any syntax rule. An action in the grammar can also explicitly proclaim an error, using the -macro @code{YYERROR} (@pxref{Action Features, ,Special Features for Use in Actions}). +macro @code{YYERROR} (@pxref{Action Features, ,Special Features for Use +in Actions}). The Bison parser expects to report the error by calling an error reporting function named @code{yyerror}, which you must supply. It is @@ -3611,10 +3615,11 @@ receives one argument. For a parse error, the string is normally @findex YYERROR_VERBOSE If you define the macro @code{YYERROR_VERBOSE} in the Bison declarations -section (@pxref{Bison Declarations, ,The Bison Declarations Section}), then Bison provides a more verbose -and specific error message string instead of just plain @w{@code{"parse -error"}}. It doesn't matter what definition you use for -@code{YYERROR_VERBOSE}, just whether you define it. +section (@pxref{Bison Declarations, ,The Bison Declarations Section}), +then Bison provides a more verbose and specific error message string +instead of just plain @w{@code{"parse error"}}. It doesn't matter what +definition you use for @code{YYERROR_VERBOSE}, just whether you define +it. The parser can detect one other kind of error: stack overflow. This happens when the input contains constructions that are very deeply @@ -5110,7 +5115,8 @@ token is reset to the token that originally caused the violation. @item YYABORT Macro to pretend that an unrecoverable syntax error has occurred, by making @code{yyparse} return 1 immediately. The error reporting -function @code{yyerror} is not called. @xref{Parser Function, ,The Parser Function @code{yyparse}}. +function @code{yyerror} is not called. @xref{Parser Function, ,The +Parser Function @code{yyparse}}. @item YYACCEPT Macro to pretend that a complete utterance of the language has been diff --git a/po/de.po b/po/de.po index 74984e7b..26228516 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-09-18 15:25+0200\n" +"POT-Creation-Date: 2000-09-19 20:18+0200\n" "PO-Revision-Date: 1996-10-10 17:54 MET DST\n" "Last-Translator: Ulrich Drepper \n" "Language-Team: German \n" @@ -13,87 +13,87 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8-bit\n" -#: src/LR0.c:377 +#: src/LR0.c:375 #, c-format msgid "too many states (max %d)" msgstr "" -#: src/allocate.c:59 src/allocate.c:75 +#: src/allocate.c:58 src/allocate.c:74 #, c-format msgid "%s: memory exhausted\n" msgstr "%s: Hauptspeicher erschöpft\n" -#: src/conflicts.c:200 src/conflicts.c:224 +#: src/conflicts.c:198 src/conflicts.c:222 msgid "reduce" msgstr "durch Reduzierung gelöst" -#: src/conflicts.c:206 src/conflicts.c:220 +#: src/conflicts.c:204 src/conflicts.c:218 msgid "shift" msgstr "durch Schieben gelöst" -#: src/conflicts.c:228 +#: src/conflicts.c:226 msgid "an error" msgstr "als Fehler betrachtet" -#: src/conflicts.c:300 +#: src/conflicts.c:298 #, c-format msgid "Conflict in state %d between rule %d and token %s resolved as %s.\n" msgstr "Konflikt in Zustand %d zwischen Regel %d and Token %s wurde %s.\n" -#: src/conflicts.c:345 +#: src/conflicts.c:343 #, c-format msgid "State %d contains" msgstr "Zustand %d enthält" -#: src/conflicts.c:348 src/conflicts.c:393 +#: src/conflicts.c:346 src/conflicts.c:391 msgid " 1 shift/reduce conflict" msgstr " 1 Schiebe/Reduziere Konflikt" -#: src/conflicts.c:350 src/conflicts.c:395 +#: src/conflicts.c:348 src/conflicts.c:393 #, c-format msgid " %d shift/reduce conflicts" msgstr " %d Schiebe/Reduziere Konflikte" -#: src/conflicts.c:353 src/conflicts.c:398 +#: src/conflicts.c:351 src/conflicts.c:396 msgid " and" msgstr " und" -#: src/conflicts.c:356 src/conflicts.c:401 +#: src/conflicts.c:354 src/conflicts.c:399 msgid " 1 reduce/reduce conflict" msgstr " 1 Reduziere/Reduziere Konflikt" -#: src/conflicts.c:358 src/conflicts.c:403 +#: src/conflicts.c:356 src/conflicts.c:401 #, c-format msgid " %d reduce/reduce conflicts" msgstr " %d Reduziere/Reduziere Konflikte" #. If invoked under the name `yacc', use the output format #. specified by POSIX. -#: src/conflicts.c:379 +#: src/conflicts.c:377 msgid "conflicts: " msgstr "Konflikte: " -#: src/conflicts.c:381 +#: src/conflicts.c:379 #, c-format msgid " %d shift/reduce" msgstr " %d Schiebe/Reduziere" -#: src/conflicts.c:385 +#: src/conflicts.c:383 #, c-format msgid " %d reduce/reduce" msgstr " %d Reduziere/Reduziere" -#: src/conflicts.c:390 +#: src/conflicts.c:388 #, c-format msgid "%s contains" msgstr "%s enthält" -#: src/conflicts.c:599 src/conflicts.c:713 +#: src/conflicts.c:597 src/conflicts.c:711 #, c-format msgid " %-4s\t[reduce using rule %d (%s)]\n" msgstr " %-4s\t[reduziere mit Regel %d (%s)]\n" -#: src/conflicts.c:610 src/print.c:223 +#: src/conflicts.c:608 src/print.c:221 #, c-format msgid "" " $default\treduce using rule %d (%s)\n" @@ -102,17 +102,17 @@ msgstr "" " $default\treduziere mit Regel %d (%s)\n" "\n" -#: src/conflicts.c:696 src/conflicts.c:708 +#: src/conflicts.c:694 src/conflicts.c:706 #, c-format msgid " %-4s\treduce using rule %d (%s)\n" msgstr " %-4s\treduziere mit Tegel %d (%s)\n" -#: src/conflicts.c:734 +#: src/conflicts.c:732 #, c-format msgid " $default\treduce using rule %d (%s)\n" msgstr " $default\treduziere mit Regel %d (%s)\n" -#: src/derives.c:109 +#: src/derives.c:108 msgid "" "\n" "\n" @@ -121,29 +121,29 @@ msgid "" "\n" msgstr "" -#: src/derives.c:113 +#: src/derives.c:112 #, c-format msgid "%s derives" msgstr "%s leitet ab" #. Some efforts were made to ease the translators' task, please #. continue. -#: src/getargs.c:71 +#: src/getargs.c:74 msgid "GNU bison generates parsers for LALR(1) grammars.\n" msgstr "" -#: src/getargs.c:75 +#: src/getargs.c:78 #, c-format msgid "Usage: %s [OPTION]... FILE\n" msgstr "" -#: src/getargs.c:79 +#: src/getargs.c:82 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:85 +#: src/getargs.c:88 msgid "" "Operation modes:\n" " -h, --help display this help and exit\n" @@ -151,7 +151,7 @@ msgid "" " -y, --yacc emulate POSIX yacc\n" msgstr "" -#: src/getargs.c:92 +#: src/getargs.c:95 msgid "" "Parser:\n" " -t, --debug instrument the parser for debugging\n" @@ -162,7 +162,7 @@ msgid "" " -k, --token-table include a table of token names\n" msgstr "" -#: src/getargs.c:103 +#: src/getargs.c:106 msgid "" "Output:\n" " -d, --defines also produce a header file\n" @@ -171,89 +171,89 @@ msgid "" " -o, --output-file=FILE leave output to FILE\n" msgstr "" -#: src/getargs.c:111 +#: src/getargs.c:114 msgid "Report bugs to .\n" msgstr "" #. Some efforts were made to ease the translators' task, please #. continue. -#: src/getargs.c:125 +#: src/getargs.c:128 #, c-format msgid "bison (GNU Bison) %s" msgstr "" -#: src/getargs.c:130 +#: src/getargs.c:133 msgid "" "Copyright (C) 1984, 1986, 1989, 1992, 2000 Free Software Foundation, Inc.\n" msgstr "" -#: src/getargs.c:134 +#: src/getargs.c:137 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:228 +#: src/getargs.c:231 #, c-format msgid "%s: no grammar file given\n" msgstr "%s: keine Grammatik-Datei angegeben\n" -#: src/getargs.c:232 +#: src/getargs.c:235 #, fuzzy, c-format msgid "%s: extra arguments ignored after `%s'\n" msgstr "%s: zusätzliche Argumente nach »%s« werden ignoriert\n" -#: src/lalr.c:294 +#: src/lalr.c:292 #, c-format msgid "too many gotos (max %d)" msgstr "" -#: src/lex.c:116 +#: src/lex.c:105 msgid "unexpected `/' found and ignored" msgstr "»/« wird hier nicht erwartet und wird deshalb ignoriert" -#: src/lex.c:145 src/reader.c:290 +#: src/lex.c:134 src/reader.c:285 msgid "unterminated comment" msgstr "unbeendeter Kommentar" -#: src/lex.c:173 +#: src/lex.c:162 #, fuzzy msgid "unexpected end of file" msgstr "Datei endet unerwartet" # Oder soll man den Begriff "Escapezeichen" verwenden? -#: src/lex.c:194 +#: src/lex.c:183 msgid "unescaped newline in constant" msgstr "nicht maskiertes Zeilenendezeichen in Konstante" -#: src/lex.c:226 +#: src/lex.c:215 #, c-format msgid "octal value outside range 0...255: `\\%o'" msgstr "oktaler Zahlenwert außerhalb des Bereichs 0...255: »\\%o«" -#: src/lex.c:251 +#: src/lex.c:240 #, c-format msgid "hexadecimal value above 255: `\\x%x'" msgstr "hexadezimaler Zahlenwert größer als 255: »\\x%x«" -#: src/lex.c:262 +#: src/lex.c:251 #, c-format msgid "unknown escape sequence: `\\' followed by `%s'" msgstr "unbekanntes Fluchtzeichen: »\\« gefolgt von »%s«" -#: src/lex.c:395 +#: src/lex.c:384 msgid "use \"...\" for multi-character literal tokens" msgstr "für Literal mit mehreren Zeichen bitte \"...\" verwenden" -#: src/lex.c:474 +#: src/lex.c:463 msgid "unterminated type name at end of file" msgstr "unerwarteter Typname am Ende der Datei" -#: src/lex.c:477 +#: src/lex.c:466 msgid "unterminated type name" msgstr "unerwarteter Typname" -#: src/main.c:144 +#: src/main.c:141 #, fuzzy, c-format msgid "%s: internal error: %s\n" msgstr "interner Fehler, %s\n" @@ -262,17 +262,17 @@ msgstr "interner Fehler, %s\n" msgid "Entering set_nullable" msgstr "Führe »set_nullable« aus" -#: src/output.c:1208 +#: src/output.c:1236 #, fuzzy, c-format msgid "maximum table size (%d) exceeded" msgstr "maximale Tabellengröße (%s) überschritten" -#: src/print.c:90 +#: src/print.c:88 #, c-format msgid " type %d is %s\n" msgstr " Typ %d ist %s\n" -#: src/print.c:98 +#: src/print.c:96 #, c-format msgid "" "\n" @@ -285,42 +285,42 @@ msgstr "" "Zustand %d\n" "\n" -#: src/print.c:142 +#: src/print.c:140 #, c-format msgid " (rule %d)" msgstr " (Regel %d)" -#: src/print.c:169 +#: src/print.c:167 msgid " $default\taccept\n" msgstr " $default\takzeptiere\n" -#: src/print.c:171 +#: src/print.c:169 msgid " NO ACTIONS\n" msgstr " KEINE AKTIONEN\n" #. I.e. strcmp(tags[symbol],"$")==0 -#: src/print.c:187 +#: src/print.c:185 #, c-format msgid " $ \tgo to state %d\n" msgstr " $ \tgehe zu Zustand %d über\n" -#: src/print.c:189 +#: src/print.c:187 #, c-format msgid " %-4s\tshift, and go to state %d\n" msgstr " %-4s\tSchiebe und gehe zu Zustand %d über\n" -#: src/print.c:212 +#: src/print.c:210 #, c-format msgid " %-4s\terror (nonassociative)\n" msgstr " %-4s\tFehler (nicht assoziativ)\n" -#: src/print.c:238 +#: src/print.c:236 #, c-format msgid " %-4s\tgo to state %d\n" msgstr " %-4s\tgehe zu Zustand %d über\n" #. rule # : LHS -> RHS -#: src/print.c:263 +#: src/print.c:261 msgid "" "\n" "Grammar\n" @@ -328,17 +328,17 @@ msgstr "" "\n" "Grammatik\n" -#: src/print.c:268 +#: src/print.c:266 #, c-format msgid "rule %-4d %s ->" msgstr "Regel %-4d %s ->" -#: src/print.c:274 +#: src/print.c:272 msgid "\t\t/* empty */" msgstr "\t\t/* leer */" #. TERMINAL (type #) : rule #s terminal is on RHS -#: src/print.c:279 +#: src/print.c:277 msgid "" "\n" "Terminals, with rules where they appear\n" @@ -348,7 +348,7 @@ msgstr "" "Terminale und die Regeln un denen sie verwendet werden\n" "\n" -#: src/print.c:327 +#: src/print.c:325 msgid "" "\n" "Nonterminals, with rules where they appear\n" @@ -358,242 +358,242 @@ msgstr "" "Nicht-Terminal und die Regeln in denen sie verwendet werden\n" "\n" -#: src/print.c:353 +#: src/print.c:351 msgid " on left:" msgstr " auf der linken Seite:" -#: src/print.c:368 +#: src/print.c:366 msgid " on right:" msgstr " auf der rechten Seite:" -#: src/reader.c:158 +#: src/reader.c:153 msgid " Skipping to next \\n" msgstr " Überspringe Zeichen bis zum nächsten \\n" -#: src/reader.c:160 +#: src/reader.c:155 #, c-format msgid " Skipping to next %c" msgstr " Überspringe Zeichen bis zum nächten %c" -#: src/reader.c:214 src/reader.c:229 +#: src/reader.c:209 src/reader.c:224 msgid "unterminated string at end of file" msgstr "unbeendete Zeichenkette am Ende der Datei" -#: src/reader.c:217 +#: src/reader.c:212 msgid "unterminated string" msgstr "unbeendete Zeichenkette" -#: src/reader.c:485 +#: src/reader.c:480 #, c-format msgid "unrecognized: %s" msgstr "unbekannt: %s" -#: src/reader.c:490 +#: src/reader.c:485 msgid "no input grammar" msgstr "keine Eingabe-Grammatik" -#: src/reader.c:493 +#: src/reader.c:488 #, c-format msgid "unknown character: %s" msgstr "unbekanntes Zeichen: %s" -#: src/reader.c:545 +#: src/reader.c:540 msgid "unterminated `%{' definition" msgstr "unbeendete »%{« Definition" -#: src/reader.c:586 src/reader.c:774 src/reader.c:823 +#: src/reader.c:581 src/reader.c:769 src/reader.c:818 #, c-format msgid "Premature EOF after %s" msgstr "" -#: src/reader.c:623 src/reader.c:845 +#: src/reader.c:618 src/reader.c:840 #, c-format msgid "symbol %s redefined" msgstr "Symbol %s noch einmal definiert" -#: src/reader.c:633 src/reader.c:789 src/reader.c:852 src/reader.c:1714 +#: src/reader.c:628 src/reader.c:784 src/reader.c:847 src/reader.c:1709 #, c-format msgid "type redeclaration for %s" msgstr "erneute Deklaration des Typs für %s" -#: src/reader.c:643 +#: src/reader.c:638 #, c-format msgid "`%s' is invalid in %s" msgstr "»%s« ist in %s nicht erlaubt" -#: src/reader.c:691 +#: src/reader.c:686 #, c-format msgid "unrecognized item %s, expected an identifier" msgstr "unerwartetes Symbol %s, hier wird ein Bezeichner erwartet" -#: src/reader.c:713 +#: src/reader.c:708 #, c-format msgid "expected string constant instead of %s" msgstr "hier wird eine Zeichenkette erwartet, nicht %s" -#: src/reader.c:735 src/reader.c:896 +#: src/reader.c:730 src/reader.c:891 #, fuzzy, c-format msgid "multiple %s declarations" msgstr "mehr als eine %start Deklaration" -#: src/reader.c:737 src/reader.c:1690 +#: src/reader.c:732 src/reader.c:1685 #, fuzzy, c-format msgid "invalid %s declaration" msgstr "ungültige %start Deklaration" -#: src/reader.c:757 +#: src/reader.c:752 msgid "%type declaration has no " msgstr "%type Deklaration hat keinen " -#: src/reader.c:794 +#: src/reader.c:789 #, fuzzy msgid "invalid %%type declaration due to item: %s" msgstr "ungültige %%type Deklaration wegen »%s«" -#: src/reader.c:841 +#: src/reader.c:836 #, c-format msgid "redefining precedence of %s" msgstr "Stellenwertigkeit von %s wird erneut definiert" -#: src/reader.c:864 +#: src/reader.c:859 #, c-format msgid "invalid text (%s) - number should be after identifier" msgstr "unzulässiger Text (%s) - Nummer sollte nach Bezeichner kommen" -#: src/reader.c:874 +#: src/reader.c:869 #, c-format msgid "unexpected item: %s" msgstr "unerwartetes Symbol: %s" -#: src/reader.c:937 src/reader.c:1100 src/reader.c:1317 +#: src/reader.c:932 src/reader.c:1095 src/reader.c:1312 #, fuzzy, c-format msgid "unmatched %s" msgstr "»{« hat kein Gegenstück" -#: src/reader.c:982 +#: src/reader.c:977 #, c-format msgid "argument of %expect is not an integer" msgstr "Argument von %expect ist keine ganze Zahl" -#: src/reader.c:1014 +#: src/reader.c:1009 #, c-format msgid "@%s is invalid" msgstr "@%s ist unzulässig" -#: src/reader.c:1029 src/reader.c:1041 +#: src/reader.c:1024 src/reader.c:1036 msgid "invalid $ value" msgstr "unzulässiger $ Wert" -#: src/reader.c:1147 src/reader.c:1287 +#: src/reader.c:1142 src/reader.c:1282 #, c-format msgid "$$ of `%s' has no declared type" msgstr "$$ von »%s« hat keine deklarierten Wert" -#: src/reader.c:1163 src/reader.c:1303 +#: src/reader.c:1158 src/reader.c:1298 #, fuzzy, c-format msgid "$%d of `%s' has no declared type" msgstr "»%s« von »%s« hat keine deklarierten Wert" -#: src/reader.c:1168 src/reader.c:1308 +#: src/reader.c:1163 src/reader.c:1303 #, c-format msgid "$%s is invalid" msgstr "$%s ist unzulässig" -#: src/reader.c:1177 +#: src/reader.c:1172 #, fuzzy, c-format msgid "unterminated %guard clause" msgstr "unbeendeter %%guard Fall" -#: src/reader.c:1403 +#: src/reader.c:1398 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:1410 +#: src/reader.c:1405 msgid "grammar starts with vertical bar" msgstr "Grammatik fängt mit einem vertikalen Strich (»|«) an" -#: src/reader.c:1441 +#: src/reader.c:1436 #, 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:1539 +#: src/reader.c:1534 msgid "two @prec's in a row" msgstr "zwei @prec Anweisungen nacheinander" -#: src/reader.c:1548 +#: src/reader.c:1543 #, fuzzy, c-format msgid "%guard present but %semantic_parser not specified" msgstr "" "%%guard Anweisung vorhanden, jedoch wird %%semantic_parser nicht angegeben" -#: src/reader.c:1557 +#: src/reader.c:1552 msgid "two actions at end of one rule" msgstr "Zwei Aktionen am Ende einer Regel" -#: src/reader.c:1572 +#: src/reader.c:1567 #, c-format msgid "type clash (`%s' `%s') on default action" msgstr "Typkonflikt (»%s« »%s«) bei Default Aktion" -#: src/reader.c:1578 +#: src/reader.c:1573 msgid "empty rule for typed nonterminal, and no action" msgstr "leere Regel für Nicht-Terminal vmit Typ und keine Aktion" -#: src/reader.c:1622 +#: src/reader.c:1617 #, c-format msgid "invalid input: %s" msgstr "ungültige Eingabe: %s" -#: src/reader.c:1630 +#: src/reader.c:1625 #, 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:1633 +#: src/reader.c:1628 msgid "no rules in the input grammar" msgstr "Eingabegrammatik enthält keine Regeln" -#: src/reader.c:1651 +#: src/reader.c:1646 #, 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:1770 +#: src/reader.c:1765 #, c-format msgid "conflicting precedences for %s and %s" msgstr "Vorrangwertigkeiten für %s und %s widersprechen sich" -#: src/reader.c:1782 +#: src/reader.c:1777 #, c-format msgid "conflicting assoc values for %s and %s" msgstr "assoc Werte für %s nd %s widersprechen sich" -#: src/reader.c:1833 +#: src/reader.c:1828 #, 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:1847 +#: src/reader.c:1842 #, c-format msgid "the start symbol %s is undefined" msgstr "das Startsymbol %s ist undefiniert" -#: src/reader.c:1849 +#: src/reader.c:1844 #, c-format msgid "the start symbol %s is a token" msgstr "das Startsymbol %s ist ein Token" -#: src/reduce.c:144 +#: src/reduce.c:142 #, c-format msgid "Start symbol %s does not derive any sentence" msgstr "es lassen sich keine Sätze vom Startsymbol %s ableiten" -#: src/reduce.c:158 +#: src/reduce.c:156 #, c-format msgid "" "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n" @@ -601,7 +601,7 @@ msgstr "" "Reduzierung von %s definiert %d Terminal, %d Nicht-Terminal und %d " "Produktionen.\n" -#: src/reduce.c:496 +#: src/reduce.c:494 msgid "" "Useless nonterminals:\n" "\n" @@ -609,7 +609,7 @@ msgstr "" "Nutzlose Nicht-Terminale:\n" "\n" -#: src/reduce.c:508 +#: src/reduce.c:506 msgid "" "\n" "\n" @@ -621,7 +621,7 @@ msgstr "" "Nicht genutzte Terminale:\n" "\n" -#: src/reduce.c:517 +#: src/reduce.c:515 msgid "" "\n" "\n" @@ -633,7 +633,7 @@ msgstr "" "Ungenutzte Regeln:\n" "\n" -#: src/reduce.c:546 +#: src/reduce.c:544 msgid "" "Variables\n" "---------\n" @@ -643,11 +643,11 @@ msgstr "" "---------\n" "\n" -#: src/reduce.c:547 +#: src/reduce.c:545 msgid "Value Sprec Sassoc Tag\n" msgstr "Wert Sprec Sassoc Tag\n" -#: src/reduce.c:552 +#: src/reduce.c:550 msgid "" "Rules\n" "-----\n" @@ -657,7 +657,7 @@ msgstr "" "------\n" "\n" -#: src/reduce.c:562 +#: src/reduce.c:560 msgid "" "Rules interpreted\n" "-----------------\n" @@ -667,26 +667,26 @@ msgstr "" "----------------------\n" "\n" -#: src/reduce.c:579 +#: src/reduce.c:577 #, c-format msgid "%d rules never reduced\n" msgstr "%d wurde niemals reduziert\n" -#: src/reduce.c:581 +#: src/reduce.c:579 #, c-format msgid "%s contains " msgstr "%s enthält " -#: src/reduce.c:585 +#: src/reduce.c:583 #, c-format msgid "%d useless nonterminal%s" msgstr "%d ungenutzte Nicht-Terminal" -#: src/reduce.c:590 +#: src/reduce.c:588 msgid " and " msgstr " und " -#: src/reduce.c:594 +#: src/reduce.c:592 #, c-format msgid "%d useless rule%s" msgstr "%d ungenutzte Regel" diff --git a/po/es.po b/po/es.po index d232b8fa..1bbbbfa2 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-09-18 15:25+0200\n" +"POT-Creation-Date: 2000-09-19 20:18+0200\n" "PO-Revision-Date: 1998-09-21 10:19+0200\n" "Last-Translator: Nicolás García-Pedrajas \n" "Language-Team: Spanish \n" @@ -38,65 +38,65 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8-bit\n" -#: src/LR0.c:377 +#: src/LR0.c:375 #, c-format msgid "too many states (max %d)" msgstr "" -#: src/allocate.c:59 src/allocate.c:75 +#: src/allocate.c:58 src/allocate.c:74 #, c-format msgid "%s: memory exhausted\n" msgstr "%s: memoria agotada\n" -#: src/conflicts.c:200 src/conflicts.c:224 +#: src/conflicts.c:198 src/conflicts.c:222 msgid "reduce" msgstr "reduce" -#: src/conflicts.c:206 src/conflicts.c:220 +#: src/conflicts.c:204 src/conflicts.c:218 msgid "shift" msgstr "desplaza" -#: src/conflicts.c:228 +#: src/conflicts.c:226 msgid "an error" msgstr "un error" -#: src/conflicts.c:300 +#: src/conflicts.c:298 #, c-format msgid "Conflict in state %d between rule %d and token %s resolved as %s.\n" msgstr "" "El conflicto en el estado %s entre la regla %d y el terminal %s se resuelve " "como %s.\n" -#: src/conflicts.c:345 +#: src/conflicts.c:343 #, c-format msgid "State %d contains" msgstr "El estado %d contiene" -#: src/conflicts.c:348 src/conflicts.c:393 +#: src/conflicts.c:346 src/conflicts.c:391 msgid " 1 shift/reduce conflict" msgstr " 1 conflicto desplazamiento/reducción" -#: src/conflicts.c:350 src/conflicts.c:395 +#: src/conflicts.c:348 src/conflicts.c:393 #, c-format msgid " %d shift/reduce conflicts" msgstr " %d conflictos desplazamiento/reducción" -#: src/conflicts.c:353 src/conflicts.c:398 +#: src/conflicts.c:351 src/conflicts.c:396 msgid " and" msgstr " y" -#: src/conflicts.c:356 src/conflicts.c:401 +#: src/conflicts.c:354 src/conflicts.c:399 msgid " 1 reduce/reduce conflict" msgstr " 1 conflicto reducción/reducción" -#: src/conflicts.c:358 src/conflicts.c:403 +#: src/conflicts.c:356 src/conflicts.c:401 #, c-format msgid " %d reduce/reduce conflicts" msgstr " %d conflictos reducción/reducción" #. If invoked under the name `yacc', use the output format #. specified by POSIX. -#: src/conflicts.c:379 +#: src/conflicts.c:377 msgid "conflicts: " msgstr "conflictos: " @@ -112,7 +112,7 @@ msgstr "conflictos: " # ok # ngp # -#: src/conflicts.c:381 +#: src/conflicts.c:379 #, c-format msgid " %d shift/reduce" msgstr " %d desplazamiento(s)/reducción(ones)" @@ -129,22 +129,22 @@ msgstr " %d desplazamiento(s)/reducci # # ok # ngp -#: src/conflicts.c:385 +#: src/conflicts.c:383 #, c-format msgid " %d reduce/reduce" msgstr " %d reducción(ones)/reducción(ones)" -#: src/conflicts.c:390 +#: src/conflicts.c:388 #, c-format msgid "%s contains" msgstr "%s contiene" -#: src/conflicts.c:599 src/conflicts.c:713 +#: src/conflicts.c:597 src/conflicts.c:711 #, c-format msgid " %-4s\t[reduce using rule %d (%s)]\n" msgstr " %-4s\t[reduce usando la regla %d (%s)]\n" -#: src/conflicts.c:610 src/print.c:223 +#: src/conflicts.c:608 src/print.c:221 #, c-format msgid "" " $default\treduce using rule %d (%s)\n" @@ -153,17 +153,17 @@ msgstr "" " $default\treduce usando la regla %d (%s)\n" "\n" -#: src/conflicts.c:696 src/conflicts.c:708 +#: src/conflicts.c:694 src/conflicts.c:706 #, c-format msgid " %-4s\treduce using rule %d (%s)\n" msgstr " %-4s\treduce usando la regla %d (%s)\n" -#: src/conflicts.c:734 +#: src/conflicts.c:732 #, c-format msgid " $default\treduce using rule %d (%s)\n" msgstr " $default\treduce usando la regla %d (%s)\n" -#: src/derives.c:109 +#: src/derives.c:108 msgid "" "\n" "\n" @@ -176,29 +176,29 @@ msgstr "" "\n" "DERIVACIONES\n" -#: src/derives.c:113 +#: src/derives.c:112 #, c-format msgid "%s derives" msgstr "%s deriva" #. Some efforts were made to ease the translators' task, please #. continue. -#: src/getargs.c:71 +#: src/getargs.c:74 msgid "GNU bison generates parsers for LALR(1) grammars.\n" msgstr "" -#: src/getargs.c:75 +#: src/getargs.c:78 #, c-format msgid "Usage: %s [OPTION]... FILE\n" msgstr "" -#: src/getargs.c:79 +#: src/getargs.c:82 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:85 +#: src/getargs.c:88 msgid "" "Operation modes:\n" " -h, --help display this help and exit\n" @@ -206,7 +206,7 @@ msgid "" " -y, --yacc emulate POSIX yacc\n" msgstr "" -#: src/getargs.c:92 +#: src/getargs.c:95 msgid "" "Parser:\n" " -t, --debug instrument the parser for debugging\n" @@ -217,7 +217,7 @@ msgid "" " -k, --token-table include a table of token names\n" msgstr "" -#: src/getargs.c:103 +#: src/getargs.c:106 msgid "" "Output:\n" " -d, --defines also produce a header file\n" @@ -226,23 +226,23 @@ msgid "" " -o, --output-file=FILE leave output to FILE\n" msgstr "" -#: src/getargs.c:111 +#: src/getargs.c:114 msgid "Report bugs to .\n" msgstr "" #. Some efforts were made to ease the translators' task, please #. continue. -#: src/getargs.c:125 +#: src/getargs.c:128 #, c-format msgid "bison (GNU Bison) %s" msgstr "" -#: src/getargs.c:130 +#: src/getargs.c:133 msgid "" "Copyright (C) 1984, 1986, 1989, 1992, 2000 Free Software Foundation, Inc.\n" msgstr "" -#: src/getargs.c:134 +#: src/getargs.c:137 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" @@ -250,70 +250,70 @@ msgstr "" # Me parece menos "computadora" decir "ningún fichero de gramática" - cll # -#: src/getargs.c:228 +#: src/getargs.c:231 #, 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:232 +#: src/getargs.c:235 #, 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" -#: src/lalr.c:294 +#: src/lalr.c:292 #, c-format msgid "too many gotos (max %d)" msgstr "" # to ignore no es ignorar. Pon otra cosa, please. sv -#: src/lex.c:116 +#: src/lex.c:105 msgid "unexpected `/' found and ignored" msgstr "se ha encontrado `/' cuando no se esperaba, no se tendrán en cuenta" -#: src/lex.c:145 src/reader.c:290 +#: src/lex.c:134 src/reader.c:285 msgid "unterminated comment" msgstr "comentario sin terminar" -#: src/lex.c:173 +#: src/lex.c:162 #, fuzzy msgid "unexpected end of file" msgstr "Fin de fichero inesperado" # ¿unescaped? -#: src/lex.c:194 +#: src/lex.c:183 msgid "unescaped newline in constant" msgstr "salto de línea en constante sin secuencia de escape" -#: src/lex.c:226 +#: src/lex.c:215 #, c-format msgid "octal value outside range 0...255: `\\%o'" msgstr "valor octal fuera del rango 0...255: `\\%o'" -#: src/lex.c:251 +#: src/lex.c:240 #, c-format msgid "hexadecimal value above 255: `\\x%x'" msgstr "valor hexadecimal mayor que 255: `\\x%x'" -#: src/lex.c:262 +#: src/lex.c:251 #, c-format msgid "unknown escape sequence: `\\' followed by `%s'" msgstr "secuencia de escape desconocida: `\\' seguido de `%s'" # ¿multicarácter o multicaracteres? sv -#: src/lex.c:395 +#: src/lex.c:384 msgid "use \"...\" for multi-character literal tokens" msgstr "use \"...\" para terminales literales multicarácter" -#: src/lex.c:474 +#: src/lex.c:463 msgid "unterminated type name at end of file" msgstr "nombre de tipo sin terminar al final del fichero" -#: src/lex.c:477 +#: src/lex.c:466 msgid "unterminated type name" msgstr "nombre de tipo sin terminar" -#: src/main.c:144 +#: src/main.c:141 #, fuzzy, c-format msgid "%s: internal error: %s\n" msgstr "error interno, %s\n" @@ -327,17 +327,17 @@ msgstr "Entrando set_nullable" # en inglés era así, pero quizás en español sea mejor como dices # ngp # -#: src/output.c:1208 +#: src/output.c:1236 #, fuzzy, c-format msgid "maximum table size (%d) exceeded" msgstr "excedido el tamaño máximo de la tabla (%s)" -#: src/print.c:90 +#: src/print.c:88 #, c-format msgid " type %d is %s\n" msgstr " el tipo %d es %s\n" -#: src/print.c:98 +#: src/print.c:96 #, c-format msgid "" "\n" @@ -350,42 +350,42 @@ msgstr "" "estado %d\n" "\n" -#: src/print.c:142 +#: src/print.c:140 #, c-format msgid " (rule %d)" msgstr " (regla %d)" -#: src/print.c:169 +#: src/print.c:167 msgid " $default\taccept\n" msgstr " $default\taceptar\n" -#: src/print.c:171 +#: src/print.c:169 msgid " NO ACTIONS\n" msgstr " SIN ACCIONES\n" #. I.e. strcmp(tags[symbol],"$")==0 -#: src/print.c:187 +#: src/print.c:185 #, c-format msgid " $ \tgo to state %d\n" msgstr " $ \tir al estado %d\n" -#: src/print.c:189 +#: src/print.c:187 #, c-format msgid " %-4s\tshift, and go to state %d\n" msgstr " %-4s\tdesplazar e ir al estado %d\n" -#: src/print.c:212 +#: src/print.c:210 #, c-format msgid " %-4s\terror (nonassociative)\n" msgstr " %-4s\terror (no asociativo)\n" -#: src/print.c:238 +#: src/print.c:236 #, c-format msgid " %-4s\tgo to state %d\n" msgstr " %-4s\tir al estado %d\n" #. rule # : LHS -> RHS -#: src/print.c:263 +#: src/print.c:261 msgid "" "\n" "Grammar\n" @@ -393,7 +393,7 @@ msgstr "" "\n" "Gramática\n" -#: src/print.c:268 +#: src/print.c:266 #, c-format msgid "rule %-4d %s ->" msgstr "regla %-4d %s ->" @@ -403,12 +403,12 @@ msgstr "regla %-4d %s ->" # como `vacía/o' - cll # según el código indica reglas vacías por eso lo puse así # ngp -#: src/print.c:274 +#: src/print.c:272 msgid "\t\t/* empty */" msgstr "\t\t/* vacía */" #. TERMINAL (type #) : rule #s terminal is on RHS -#: src/print.c:279 +#: src/print.c:277 msgid "" "\n" "Terminals, with rules where they appear\n" @@ -418,7 +418,7 @@ msgstr "" "Terminales con las reglas donde aparecen\n" "\n" -#: src/print.c:327 +#: src/print.c:325 msgid "" "\n" "Nonterminals, with rules where they appear\n" @@ -427,65 +427,65 @@ msgstr "" "\n" "No terminales con las reglas donde aparecen\n" -#: src/print.c:353 +#: src/print.c:351 msgid " on left:" msgstr " en la izquierda:" -#: src/print.c:368 +#: src/print.c:366 msgid " on right:" msgstr " en la derecha:" -#: src/reader.c:158 +#: src/reader.c:153 msgid " Skipping to next \\n" msgstr " Saltando al siguiente \\n" -#: src/reader.c:160 +#: src/reader.c:155 #, c-format msgid " Skipping to next %c" msgstr " Saltando al siguiente %c" -#: src/reader.c:214 src/reader.c:229 +#: src/reader.c:209 src/reader.c:224 msgid "unterminated string at end of file" msgstr "cadena sin terminar al final del fichero" -#: src/reader.c:217 +#: src/reader.c:212 msgid "unterminated string" msgstr "cadena sin terminar" -#: src/reader.c:485 +#: src/reader.c:480 #, c-format msgid "unrecognized: %s" msgstr "no reconocido: %s" -#: src/reader.c:490 +#: src/reader.c:485 msgid "no input grammar" msgstr "no hay gramática de entrada" -#: src/reader.c:493 +#: src/reader.c:488 #, c-format msgid "unknown character: %s" msgstr "carácter desconocido: %s" -#: src/reader.c:545 +#: src/reader.c:540 msgid "unterminated `%{' definition" msgstr "definición `%{' sin terminar" -#: src/reader.c:586 src/reader.c:774 src/reader.c:823 +#: src/reader.c:581 src/reader.c:769 src/reader.c:818 #, c-format msgid "Premature EOF after %s" msgstr "" -#: src/reader.c:623 src/reader.c:845 +#: src/reader.c:618 src/reader.c:840 #, c-format msgid "symbol %s redefined" msgstr "redefinido el símbolo %s" -#: src/reader.c:633 src/reader.c:789 src/reader.c:852 src/reader.c:1714 +#: src/reader.c:628 src/reader.c:784 src/reader.c:847 src/reader.c:1709 #, c-format msgid "type redeclaration for %s" msgstr "redeclaración del tipo de %s" -#: src/reader.c:643 +#: src/reader.c:638 #, c-format msgid "`%s' is invalid in %s" msgstr "`%s' no es válido en %s" @@ -496,36 +496,36 @@ msgstr "`%s' no es v # - cll # ok - ngp # -#: src/reader.c:691 +#: src/reader.c:686 #, c-format msgid "unrecognized item %s, expected an identifier" msgstr "no se reconoce el ítem %s, se esperaba un identificador" -#: src/reader.c:713 +#: src/reader.c:708 #, c-format msgid "expected string constant instead of %s" msgstr "se esperaba una cadena constante en lugar de %s" -#: src/reader.c:735 src/reader.c:896 +#: src/reader.c:730 src/reader.c:891 #, fuzzy, c-format msgid "multiple %s declarations" msgstr "múltiples declaraciones de %start" -#: src/reader.c:737 src/reader.c:1690 +#: src/reader.c:732 src/reader.c:1685 #, fuzzy, c-format msgid "invalid %s declaration" msgstr "declaración de %start no válida" -#: src/reader.c:757 +#: src/reader.c:752 msgid "%type declaration has no " msgstr "la declaración %type no tiene " -#: src/reader.c:794 +#: src/reader.c:789 #, fuzzy msgid "invalid %%type declaration due to item: %s" msgstr "declaración de %%type no válida debido al ítem: `%s'" -#: src/reader.c:841 +#: src/reader.c:836 #, c-format msgid "redefining precedence of %s" msgstr "redefinición de la precedencia de %s" @@ -534,7 +534,7 @@ msgstr "redefinici # de "to must" y aquí se emplea en su forma condicional. Por eso, he # cambiado `debe' por `debería' - cll # ahí me has pillado en un olvido del inglés - ngp -#: src/reader.c:864 +#: src/reader.c:859 #, c-format msgid "invalid text (%s) - number should be after identifier" msgstr "" @@ -544,42 +544,42 @@ msgstr "" # otras, como `inesperado'. Cualquiera es correcta, por supuesto y, en # este caso, la segunda me parece más apropiada - cll # ok - ngp -#: src/reader.c:874 +#: src/reader.c:869 #, c-format msgid "unexpected item: %s" msgstr "ítem inesperado: %s" # Cambio el orden y el sexo. Ahora está "en español". sv -#: src/reader.c:937 src/reader.c:1100 src/reader.c:1317 +#: src/reader.c:932 src/reader.c:1095 src/reader.c:1312 #, fuzzy, c-format msgid "unmatched %s" msgstr "`{' desemparejada" -#: src/reader.c:982 +#: src/reader.c:977 #, c-format msgid "argument of %expect is not an integer" msgstr "el argumento de %expect no es un entero" -#: src/reader.c:1014 +#: src/reader.c:1009 #, c-format msgid "@%s is invalid" msgstr "@%s no es válido" -#: src/reader.c:1029 src/reader.c:1041 +#: src/reader.c:1024 src/reader.c:1036 msgid "invalid $ value" msgstr "valor $ no válido" -#: src/reader.c:1147 src/reader.c:1287 +#: src/reader.c:1142 src/reader.c:1282 #, c-format msgid "$$ of `%s' has no declared type" msgstr "$$ de `%s' no tiene tipo declarado" -#: src/reader.c:1163 src/reader.c:1303 +#: src/reader.c:1158 src/reader.c:1298 #, fuzzy, c-format msgid "$%d of `%s' has no declared type" msgstr "$%s de `%s' no tiene tipo declarado" -#: src/reader.c:1168 src/reader.c:1308 +#: src/reader.c:1163 src/reader.c:1303 #, c-format msgid "$%s is invalid" msgstr "$%s no es válida" @@ -588,98 +588,98 @@ msgstr "$%s no es v # 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:1177 +#: src/reader.c:1172 #, fuzzy, c-format msgid "unterminated %guard clause" msgstr "cláusula %%guard sin terminar" -#: src/reader.c:1403 +#: src/reader.c:1398 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:1410 +#: src/reader.c:1405 msgid "grammar starts with vertical bar" msgstr "la gramática comienza con una barra vertical" -#: src/reader.c:1441 +#: src/reader.c:1436 #, 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:1539 +#: src/reader.c:1534 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:1548 +#: src/reader.c:1543 #, fuzzy, c-format msgid "%guard present but %semantic_parser not specified" msgstr "%%guard presente pero %%semantic_parser está sin especificar" -#: src/reader.c:1557 +#: src/reader.c:1552 msgid "two actions at end of one rule" msgstr "dos acciones al final de una regla" -#: src/reader.c:1572 +#: src/reader.c:1567 #, 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:1578 +#: src/reader.c:1573 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:1622 +#: src/reader.c:1617 #, c-format msgid "invalid input: %s" msgstr "entrada no válida: %s" -#: src/reader.c:1630 +#: src/reader.c:1625 #, 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:1633 +#: src/reader.c:1628 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:1651 +#: src/reader.c:1646 #, 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:1770 +#: src/reader.c:1765 #, c-format msgid "conflicting precedences for %s and %s" msgstr "precedencias en conflicto entre %s y %s" -#: src/reader.c:1782 +#: src/reader.c:1777 #, c-format msgid "conflicting assoc values for %s and %s" msgstr "conflicto de valores assoc para %s y %s" -#: src/reader.c:1833 +#: src/reader.c:1828 #, 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:1847 +#: src/reader.c:1842 #, c-format msgid "the start symbol %s is undefined" msgstr "el símbolo de inicio (axioma) %s no está definido" -#: src/reader.c:1849 +#: src/reader.c:1844 #, c-format msgid "the start symbol %s is a token" msgstr "el símbolo de inicio (axioma) %s es un terminal" -#: src/reduce.c:144 +#: src/reduce.c:142 #, c-format msgid "Start symbol %s does not derive any sentence" msgstr "El símbolo de inicio (axioma) %s no deriva ninguna sentencia" @@ -696,7 +696,7 @@ msgstr "El s # Te recomiendo `la reducción de %s' en vez de seguir el estilo inglés y # usar participios - cll # un error lo tiene cualquiera - ngp -#: src/reduce.c:158 +#: src/reduce.c:156 #, c-format msgid "" "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n" @@ -704,7 +704,7 @@ msgstr "" "la reducción de %s define %d terminal%s, %d no terminal%s, y %d " "produccion%s.\n" -#: src/reduce.c:496 +#: src/reduce.c:494 msgid "" "Useless nonterminals:\n" "\n" @@ -712,7 +712,7 @@ msgstr "" "No terminales sin uso:\n" "\n" -#: src/reduce.c:508 +#: src/reduce.c:506 msgid "" "\n" "\n" @@ -724,7 +724,7 @@ msgstr "" "Terminales que no se usan:\n" "\n" -#: src/reduce.c:517 +#: src/reduce.c:515 msgid "" "\n" "\n" @@ -736,7 +736,7 @@ msgstr "" "Reglas sin uso:\n" "\n" -#: src/reduce.c:546 +#: src/reduce.c:544 msgid "" "Variables\n" "---------\n" @@ -746,11 +746,11 @@ msgstr "" "---------\n" "\n" -#: src/reduce.c:547 +#: src/reduce.c:545 msgid "Value Sprec Sassoc Tag\n" msgstr "Valor Sprec Sasoc Tag\n" -#: src/reduce.c:552 +#: src/reduce.c:550 msgid "" "Rules\n" "-----\n" @@ -760,7 +760,7 @@ msgstr "" "------\n" "\n" -#: src/reduce.c:562 +#: src/reduce.c:560 msgid "" "Rules interpreted\n" "-----------------\n" @@ -770,26 +770,26 @@ msgstr "" "--------------------\n" "\n" -#: src/reduce.c:579 +#: src/reduce.c:577 #, c-format msgid "%d rules never reduced\n" msgstr "%d reglas que nunca se han reducido\n" -#: src/reduce.c:581 +#: src/reduce.c:579 #, c-format msgid "%s contains " msgstr "%s contiene " -#: src/reduce.c:585 +#: src/reduce.c:583 #, c-format msgid "%d useless nonterminal%s" msgstr "%d no terminales %s sin uso" -#: src/reduce.c:590 +#: src/reduce.c:588 msgid " and " msgstr " y " -#: src/reduce.c:594 +#: src/reduce.c:592 #, c-format msgid "%d useless rule%s" msgstr "%d regla%s sin uso" diff --git a/po/et.po b/po/et.po index a9a5c3d0..b4fcfeec 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-09-18 15:25+0200\n" +"POT-Creation-Date: 2000-09-19 20:18+0200\n" "PO-Revision-Date: 2000-04-11 22:19+02:00\n" "Last-Translator: Toomas Soome \n" "Language-Team: Estonian \n" @@ -13,87 +13,87 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-15\n" "Content-Transfer-Encoding: 8-bit\n" -#: src/LR0.c:377 +#: src/LR0.c:375 #, c-format msgid "too many states (max %d)" msgstr "liiga palju olekuid (maks %d)" -#: src/allocate.c:59 src/allocate.c:75 +#: src/allocate.c:58 src/allocate.c:74 #, c-format msgid "%s: memory exhausted\n" msgstr "%s: mälu on otsas\n" -#: src/conflicts.c:200 src/conflicts.c:224 +#: src/conflicts.c:198 src/conflicts.c:222 msgid "reduce" msgstr "redutseerimine" -#: src/conflicts.c:206 src/conflicts.c:220 +#: src/conflicts.c:204 src/conflicts.c:218 msgid "shift" msgstr "nihutamine" -#: src/conflicts.c:228 +#: src/conflicts.c:226 msgid "an error" msgstr "viga" -#: src/conflicts.c:300 +#: src/conflicts.c:298 #, c-format msgid "Conflict in state %d between rule %d and token %s resolved as %s.\n" msgstr "Konflikt olekus %d reegli %d ja märgi %s vahel lahendatud, kui %s.\n" -#: src/conflicts.c:345 +#: src/conflicts.c:343 #, c-format msgid "State %d contains" msgstr "Olek %d sisaldab" -#: src/conflicts.c:348 src/conflicts.c:393 +#: src/conflicts.c:346 src/conflicts.c:391 msgid " 1 shift/reduce conflict" msgstr " 1 nihutamine/redutseerimine konflikt" -#: src/conflicts.c:350 src/conflicts.c:395 +#: src/conflicts.c:348 src/conflicts.c:393 #, c-format msgid " %d shift/reduce conflicts" msgstr " %d nihutamine/redutseerimine konflikti" -#: src/conflicts.c:353 src/conflicts.c:398 +#: src/conflicts.c:351 src/conflicts.c:396 msgid " and" msgstr " ja" -#: src/conflicts.c:356 src/conflicts.c:401 +#: src/conflicts.c:354 src/conflicts.c:399 msgid " 1 reduce/reduce conflict" msgstr " 1 redutseerimine/redutseerimine konflikt" -#: src/conflicts.c:358 src/conflicts.c:403 +#: src/conflicts.c:356 src/conflicts.c:401 #, c-format msgid " %d reduce/reduce conflicts" msgstr " %d redutseerimine/redutseerimine konflikti" #. If invoked under the name `yacc', use the output format #. specified by POSIX. -#: src/conflicts.c:379 +#: src/conflicts.c:377 msgid "conflicts: " msgstr "konfliktid: " -#: src/conflicts.c:381 +#: src/conflicts.c:379 #, c-format msgid " %d shift/reduce" msgstr " %d nihutamine/redutseerimine" -#: src/conflicts.c:385 +#: src/conflicts.c:383 #, c-format msgid " %d reduce/reduce" msgstr " %d redutseerimine/redutseerimine" -#: src/conflicts.c:390 +#: src/conflicts.c:388 #, c-format msgid "%s contains" msgstr "%s sisaldab" -#: src/conflicts.c:599 src/conflicts.c:713 +#: src/conflicts.c:597 src/conflicts.c:711 #, c-format msgid " %-4s\t[reduce using rule %d (%s)]\n" msgstr " %-4s\t[redutseerin, kasutades reeglit %d (%s)]\n" -#: src/conflicts.c:610 src/print.c:223 +#: src/conflicts.c:608 src/print.c:221 #, c-format msgid "" " $default\treduce using rule %d (%s)\n" @@ -102,17 +102,17 @@ msgstr "" " $default\tredutseerin kasutades reeglit %d (%s)\n" "\n" -#: src/conflicts.c:696 src/conflicts.c:708 +#: src/conflicts.c:694 src/conflicts.c:706 #, c-format msgid " %-4s\treduce using rule %d (%s)\n" msgstr " %-4s\tredutseerin kasutades reeglit %d (%s)\n" -#: src/conflicts.c:734 +#: src/conflicts.c:732 #, c-format msgid " $default\treduce using rule %d (%s)\n" msgstr " $default\tredutseerin kasutades reeglit %d (%s)\n" -#: src/derives.c:109 +#: src/derives.c:108 msgid "" "\n" "\n" @@ -126,23 +126,23 @@ msgstr "" "DERIVES\n" "\n" -#: src/derives.c:113 +#: src/derives.c:112 #, c-format msgid "%s derives" msgstr "%s derives" #. Some efforts were made to ease the translators' task, please #. continue. -#: src/getargs.c:71 +#: src/getargs.c:74 msgid "GNU bison generates parsers for LALR(1) grammars.\n" msgstr "GNU bison genereerib parsereid LALR(1) grammatikatele.\n" -#: src/getargs.c:75 +#: src/getargs.c:78 #, c-format msgid "Usage: %s [OPTION]... FILE\n" msgstr "Kasuta: %s [VÕTI]...FAIL\n" -#: src/getargs.c:79 +#: src/getargs.c:82 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" @@ -150,7 +150,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:85 +#: src/getargs.c:88 msgid "" "Operation modes:\n" " -h, --help display this help and exit\n" @@ -162,7 +162,7 @@ msgstr "" " -V, --version esita versiooniinfo ja lõpeta töö\n" " -y, --yacc emuleeri POSIX yacc\n" -#: src/getargs.c:92 +#: src/getargs.c:95 msgid "" "Parser:\n" " -t, --debug instrument the parser for debugging\n" @@ -180,7 +180,7 @@ msgstr "" " -r, --raw sümbolite number alates 3\n" " -k, --token-table lisa ka sümbolite nimede tabel\n" -#: src/getargs.c:103 +#: src/getargs.c:106 msgid "" "Output:\n" " -d, --defines also produce a header file\n" @@ -194,87 +194,87 @@ msgstr "" " -b, --file-prefix=PREFIKS kasuta väljundfailide nimedes PREFIKSit\n" " -o, --output-file=FAIL jäta väljund FAILi\n" -#: src/getargs.c:111 +#: src/getargs.c:114 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:125 +#: src/getargs.c:128 #, c-format msgid "bison (GNU Bison) %s" msgstr "" -#: src/getargs.c:130 +#: src/getargs.c:133 msgid "" "Copyright (C) 1984, 1986, 1989, 1992, 2000 Free Software Foundation, Inc.\n" msgstr "" -#: src/getargs.c:134 +#: src/getargs.c:137 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:228 +#: src/getargs.c:231 #, c-format msgid "%s: no grammar file given\n" msgstr "%s: puudub grammatikafail\n" -#: src/getargs.c:232 +#: src/getargs.c:235 #, c-format msgid "%s: extra arguments ignored after `%s'\n" msgstr "%s: ignoreerin lisaargumente peale `%s'\n" -#: src/lalr.c:294 +#: src/lalr.c:292 #, c-format msgid "too many gotos (max %d)" msgstr "liiga palju gotosid (maks %d)" -#: src/lex.c:116 +#: src/lex.c:105 msgid "unexpected `/' found and ignored" msgstr "leidsin ja ignoreerin ootamatu `/'" -#: src/lex.c:145 src/reader.c:290 +#: src/lex.c:134 src/reader.c:285 msgid "unterminated comment" msgstr "lõpetamata kommentaar" -#: src/lex.c:173 +#: src/lex.c:162 msgid "unexpected end of file" msgstr "ootamatu faililõpp" -#: src/lex.c:194 +#: src/lex.c:183 msgid "unescaped newline in constant" msgstr "paojadata reavahetus konstandis" -#: src/lex.c:226 +#: src/lex.c:215 #, c-format msgid "octal value outside range 0...255: `\\%o'" msgstr "kaheksandväärtus väljaspool piire 0...255: `\\%o'" -#: src/lex.c:251 +#: src/lex.c:240 #, c-format msgid "hexadecimal value above 255: `\\x%x'" msgstr "kuueteistkümnendväärtus suurem, kui above 255: `\\x%x'" -#: src/lex.c:262 +#: src/lex.c:251 #, c-format msgid "unknown escape sequence: `\\' followed by `%s'" msgstr "tundmatu paojada: `\\' järgneb `%s'" -#: src/lex.c:395 +#: src/lex.c:384 msgid "use \"...\" for multi-character literal tokens" msgstr "kasuta mitmesümboliliste literaalidega \"...\" konstruktsiooni" -#: src/lex.c:474 +#: src/lex.c:463 msgid "unterminated type name at end of file" msgstr "lõpetamata tüübinimi faili lõpus" -#: src/lex.c:477 +#: src/lex.c:466 msgid "unterminated type name" msgstr "lõpetamata tüübinimi" -#: src/main.c:144 +#: src/main.c:141 #, c-format msgid "%s: internal error: %s\n" msgstr "%s: sisemine viga: %s\n" @@ -283,17 +283,17 @@ msgstr "%s: sisemine viga: %s\n" msgid "Entering set_nullable" msgstr "Entering set_nullable" -#: src/output.c:1208 +#: src/output.c:1236 #, c-format msgid "maximum table size (%d) exceeded" msgstr "ületati maksimaalset tabelisuurust (%d)" -#: src/print.c:90 +#: src/print.c:88 #, c-format msgid " type %d is %s\n" msgstr " tüüp %d on %s\n" -#: src/print.c:98 +#: src/print.c:96 #, c-format msgid "" "\n" @@ -306,42 +306,42 @@ msgstr "" "olek %d\n" "\n" -#: src/print.c:142 +#: src/print.c:140 #, c-format msgid " (rule %d)" msgstr " (reegel %d)" -#: src/print.c:169 +#: src/print.c:167 msgid " $default\taccept\n" msgstr " $default\taktsepteerin\n" -#: src/print.c:171 +#: src/print.c:169 msgid " NO ACTIONS\n" msgstr " TEGEVUSI POLE\n" #. I.e. strcmp(tags[symbol],"$")==0 -#: src/print.c:187 +#: src/print.c:185 #, c-format msgid " $ \tgo to state %d\n" msgstr " $ \tliigu olekule %d\n" -#: src/print.c:189 +#: src/print.c:187 #, c-format msgid " %-4s\tshift, and go to state %d\n" msgstr " %-4s\tnihuta ja liigu olekule %d\n" -#: src/print.c:212 +#: src/print.c:210 #, c-format msgid " %-4s\terror (nonassociative)\n" msgstr " %-4s\tviga (mitteassotsiatiivne)\n" -#: src/print.c:238 +#: src/print.c:236 #, c-format msgid " %-4s\tgo to state %d\n" msgstr " %-4s\tliigu olekule %d\n" #. rule # : LHS -> RHS -#: src/print.c:263 +#: src/print.c:261 msgid "" "\n" "Grammar\n" @@ -349,17 +349,17 @@ msgstr "" "\n" "Grammatika\n" -#: src/print.c:268 +#: src/print.c:266 #, c-format msgid "rule %-4d %s ->" msgstr "reegel %-4d %s ->" -#: src/print.c:274 +#: src/print.c:272 msgid "\t\t/* empty */" msgstr "\t\t/* tühi */" #. TERMINAL (type #) : rule #s terminal is on RHS -#: src/print.c:279 +#: src/print.c:277 msgid "" "\n" "Terminals, with rules where they appear\n" @@ -369,7 +369,7 @@ msgstr "" "Terminalid, koos reeglitega, kus nad ilmuvad\n" "\n" -#: src/print.c:327 +#: src/print.c:325 msgid "" "\n" "Nonterminals, with rules where they appear\n" @@ -379,238 +379,238 @@ msgstr "" "Mitteterminalid, koos reeglitega, kus nad ilmuvad\n" "\n" -#: src/print.c:353 +#: src/print.c:351 msgid " on left:" msgstr " vasakul:" -#: src/print.c:368 +#: src/print.c:366 msgid " on right:" msgstr " paremal:" -#: src/reader.c:158 +#: src/reader.c:153 msgid " Skipping to next \\n" msgstr " Liigun järgmisele \\n" -#: src/reader.c:160 +#: src/reader.c:155 #, c-format msgid " Skipping to next %c" msgstr " Liigun järgmisele %c" -#: src/reader.c:214 src/reader.c:229 +#: src/reader.c:209 src/reader.c:224 msgid "unterminated string at end of file" msgstr "lõpetamata sõne faili lõpus" -#: src/reader.c:217 +#: src/reader.c:212 msgid "unterminated string" msgstr "lõpetamata sõne" -#: src/reader.c:485 +#: src/reader.c:480 #, c-format msgid "unrecognized: %s" msgstr "tundmatu: %s" -#: src/reader.c:490 +#: src/reader.c:485 msgid "no input grammar" msgstr "sisendgrammatikat pole" -#: src/reader.c:493 +#: src/reader.c:488 #, c-format msgid "unknown character: %s" msgstr "tundmatu sümbol: %s" -#: src/reader.c:545 +#: src/reader.c:540 msgid "unterminated `%{' definition" msgstr "lõpetamata `%{' definitsioon" -#: src/reader.c:586 src/reader.c:774 src/reader.c:823 +#: src/reader.c:581 src/reader.c:769 src/reader.c:818 #, c-format msgid "Premature EOF after %s" msgstr "Enneaegne EOF peale %s" -#: src/reader.c:623 src/reader.c:845 +#: src/reader.c:618 src/reader.c:840 #, c-format msgid "symbol %s redefined" msgstr "sümbol %s on uuesti defineeritud" -#: src/reader.c:633 src/reader.c:789 src/reader.c:852 src/reader.c:1714 +#: src/reader.c:628 src/reader.c:784 src/reader.c:847 src/reader.c:1709 #, c-format msgid "type redeclaration for %s" msgstr "%s tüübi uuesti deklareerimine" -#: src/reader.c:643 +#: src/reader.c:638 #, c-format msgid "`%s' is invalid in %s" msgstr "`%s' ei ole %s sees lubatud" -#: src/reader.c:691 +#: src/reader.c:686 #, c-format msgid "unrecognized item %s, expected an identifier" msgstr "tundmatu element %s, eeldasin identifikaatorit" -#: src/reader.c:713 +#: src/reader.c:708 #, c-format msgid "expected string constant instead of %s" msgstr "eeldasin %s asemel sõnekonstanti" -#: src/reader.c:735 src/reader.c:896 +#: src/reader.c:730 src/reader.c:891 #, fuzzy, c-format msgid "multiple %s declarations" msgstr "korduvad %start deklaratsioonid" -#: src/reader.c:737 src/reader.c:1690 +#: src/reader.c:732 src/reader.c:1685 #, fuzzy, c-format msgid "invalid %s declaration" msgstr "vigane %start deklaratsioon" -#: src/reader.c:757 +#: src/reader.c:752 msgid "%type declaration has no " msgstr "%type deklaratsioonis puudub " -#: src/reader.c:794 +#: src/reader.c:789 msgid "invalid %%type declaration due to item: %s" msgstr "vigane %%type deklaratsioon, element: %s" -#: src/reader.c:841 +#: src/reader.c:836 #, c-format msgid "redefining precedence of %s" msgstr "%s prioriteedi uus definitsioon" -#: src/reader.c:864 +#: src/reader.c:859 #, c-format msgid "invalid text (%s) - number should be after identifier" msgstr "vigane tekst (%s) - number peab olema peale identifikaatorit" -#: src/reader.c:874 +#: src/reader.c:869 #, c-format msgid "unexpected item: %s" msgstr "ootamatu element: %s" -#: src/reader.c:937 src/reader.c:1100 src/reader.c:1317 +#: src/reader.c:932 src/reader.c:1095 src/reader.c:1312 #, fuzzy, c-format msgid "unmatched %s" msgstr "puudub `{'" -#: src/reader.c:982 +#: src/reader.c:977 #, c-format msgid "argument of %expect is not an integer" msgstr "%expect argument ei ole täisarv" -#: src/reader.c:1014 +#: src/reader.c:1009 #, c-format msgid "@%s is invalid" msgstr "@%s on vigane" -#: src/reader.c:1029 src/reader.c:1041 +#: src/reader.c:1024 src/reader.c:1036 msgid "invalid $ value" msgstr "vigane $ väärtus" -#: src/reader.c:1147 src/reader.c:1287 +#: src/reader.c:1142 src/reader.c:1282 #, c-format msgid "$$ of `%s' has no declared type" msgstr "`%s' $$ ei oma deklareeritud tüüpi" -#: src/reader.c:1163 src/reader.c:1303 +#: src/reader.c:1158 src/reader.c:1298 #, c-format msgid "$%d of `%s' has no declared type" msgstr "$%d `%s' ei oma deklareeritud tüüpi" -#: src/reader.c:1168 src/reader.c:1308 +#: src/reader.c:1163 src/reader.c:1303 #, c-format msgid "$%s is invalid" msgstr "$%s on vigane" -#: src/reader.c:1177 +#: src/reader.c:1172 #, c-format msgid "unterminated %guard clause" msgstr "lõpetamata %guard klausel" -#: src/reader.c:1403 +#: src/reader.c:1398 msgid "ill-formed rule: initial symbol not followed by colon" msgstr "vigaselt formeeritud reegel: algsümbolile ei järgne koolonit" -#: src/reader.c:1410 +#: src/reader.c:1405 msgid "grammar starts with vertical bar" msgstr "grammatika algab püstkriipsuga" -#: src/reader.c:1441 +#: src/reader.c:1436 #, 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:1539 +#: src/reader.c:1534 msgid "two @prec's in a row" msgstr "kaks @prec ühel real" -#: src/reader.c:1548 +#: src/reader.c:1543 #, c-format msgid "%guard present but %semantic_parser not specified" msgstr "%guard on määratud, aga %semantic_parser ei ole" -#: src/reader.c:1557 +#: src/reader.c:1552 msgid "two actions at end of one rule" msgstr "kaks tegevust ühe reegli lõpus" -#: src/reader.c:1572 +#: src/reader.c:1567 #, c-format msgid "type clash (`%s' `%s') on default action" msgstr "vaikimisi tegevuse tüübikonflikt (`%s' `%s')" -#: src/reader.c:1578 +#: src/reader.c:1573 msgid "empty rule for typed nonterminal, and no action" msgstr "tüübiga mitteterminalil on tühi reegel ja puudub tegevus" -#: src/reader.c:1622 +#: src/reader.c:1617 #, c-format msgid "invalid input: %s" msgstr "vigane sisend: %s" -#: src/reader.c:1630 +#: src/reader.c:1625 #, 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:1633 +#: src/reader.c:1628 msgid "no rules in the input grammar" msgstr "sisendgrammatikas pole reegleid" -#: src/reader.c:1651 +#: src/reader.c:1646 #, 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:1770 +#: src/reader.c:1765 #, c-format msgid "conflicting precedences for %s and %s" msgstr "%s ja %s omavad konfliktseid prioriteete" -#: src/reader.c:1782 +#: src/reader.c:1777 #, c-format msgid "conflicting assoc values for %s and %s" msgstr "%s ja %s omavad konfliktseid assotsiatiivseid väärtuseid" -#: src/reader.c:1833 +#: src/reader.c:1828 #, 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:1847 +#: src/reader.c:1842 #, c-format msgid "the start symbol %s is undefined" msgstr "stardisümbol %s ei ole defineeritud" -#: src/reader.c:1849 +#: src/reader.c:1844 #, c-format msgid "the start symbol %s is a token" msgstr "stardisümbol %s on märk" -#: src/reduce.c:144 +#: src/reduce.c:142 #, c-format msgid "Start symbol %s does not derive any sentence" msgstr "Stardisümbolist %s ei tuletata ühtegi lauset" -#: src/reduce.c:158 +#: src/reduce.c:156 #, c-format msgid "" "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n" @@ -618,7 +618,7 @@ msgstr "" "redutseeritud %s defineerib %d terminali%s, %d mitteterminali%s ja %d " "reeglit%s.\n" -#: src/reduce.c:496 +#: src/reduce.c:494 msgid "" "Useless nonterminals:\n" "\n" @@ -626,7 +626,7 @@ msgstr "" "Kasutamata mitteterminalid:\n" "\n" -#: src/reduce.c:508 +#: src/reduce.c:506 msgid "" "\n" "\n" @@ -638,7 +638,7 @@ msgstr "" "Terminalid, mida ei kasutatud:\n" "\n" -#: src/reduce.c:517 +#: src/reduce.c:515 msgid "" "\n" "\n" @@ -650,7 +650,7 @@ msgstr "" "Kasutamata reeglid:\n" "\n" -#: src/reduce.c:546 +#: src/reduce.c:544 msgid "" "Variables\n" "---------\n" @@ -660,11 +660,11 @@ msgstr "" "--------\n" "\n" -#: src/reduce.c:547 +#: src/reduce.c:545 msgid "Value Sprec Sassoc Tag\n" msgstr "Value Sprec Sassoc Tag\n" -#: src/reduce.c:552 +#: src/reduce.c:550 msgid "" "Rules\n" "-----\n" @@ -674,7 +674,7 @@ msgstr "" "-------\n" "\n" -#: src/reduce.c:562 +#: src/reduce.c:560 msgid "" "Rules interpreted\n" "-----------------\n" @@ -684,26 +684,26 @@ msgstr "" "------------------------\n" "\n" -#: src/reduce.c:579 +#: src/reduce.c:577 #, c-format msgid "%d rules never reduced\n" msgstr "%d reeglit ei redutseeritud\n" -#: src/reduce.c:581 +#: src/reduce.c:579 #, c-format msgid "%s contains " msgstr "%s sisaldab " -#: src/reduce.c:585 +#: src/reduce.c:583 #, c-format msgid "%d useless nonterminal%s" msgstr "%d kasutamata mitteterminali%s" -#: src/reduce.c:590 +#: src/reduce.c:588 msgid " and " msgstr " ja " -#: src/reduce.c:594 +#: src/reduce.c:592 #, c-format msgid "%d useless rule%s" msgstr "%d kasutamata reeglit%s" diff --git a/po/fr.po b/po/fr.po index f7a6a6c0..4df9c7c7 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-09-18 15:25+0200\n" +"POT-Creation-Date: 2000-09-19 20:18+0200\n" "PO-Revision-Date: 1996-03-19 20:05 EST\n" "Last-Translator: Dominique Boucher \n" "Language-Team: French \n" @@ -13,88 +13,88 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8-bit\n" -#: src/LR0.c:377 +#: src/LR0.c:375 #, c-format msgid "too many states (max %d)" msgstr "" -#: src/allocate.c:59 src/allocate.c:75 +#: src/allocate.c:58 src/allocate.c:74 #, c-format msgid "%s: memory exhausted\n" msgstr "%s: mémoire épuisée\n" -#: src/conflicts.c:200 src/conflicts.c:224 +#: src/conflicts.c:198 src/conflicts.c:222 msgid "reduce" msgstr "réduction" -#: src/conflicts.c:206 src/conflicts.c:220 +#: src/conflicts.c:204 src/conflicts.c:218 msgid "shift" msgstr "décalage" -#: src/conflicts.c:228 +#: src/conflicts.c:226 msgid "an error" msgstr "une erreur" -#: src/conflicts.c:300 +#: src/conflicts.c:298 #, c-format msgid "Conflict in state %d between rule %d and token %s resolved as %s.\n" msgstr "" "Conflit à l'état %d entre la règle %d et le terminal %s résolu par %s.\n" -#: src/conflicts.c:345 +#: src/conflicts.c:343 #, c-format msgid "State %d contains" msgstr "L'état %d contient" -#: src/conflicts.c:348 src/conflicts.c:393 +#: src/conflicts.c:346 src/conflicts.c:391 msgid " 1 shift/reduce conflict" msgstr " 1 conflit décalage/réduction" -#: src/conflicts.c:350 src/conflicts.c:395 +#: src/conflicts.c:348 src/conflicts.c:393 #, c-format msgid " %d shift/reduce conflicts" msgstr " %d conflits décalage/réduction" -#: src/conflicts.c:353 src/conflicts.c:398 +#: src/conflicts.c:351 src/conflicts.c:396 msgid " and" msgstr " et" -#: src/conflicts.c:356 src/conflicts.c:401 +#: src/conflicts.c:354 src/conflicts.c:399 msgid " 1 reduce/reduce conflict" msgstr "1 conflit réduction/réduction" -#: src/conflicts.c:358 src/conflicts.c:403 +#: src/conflicts.c:356 src/conflicts.c:401 #, c-format msgid " %d reduce/reduce conflicts" msgstr " %d conflits réduction/réduction" #. If invoked under the name `yacc', use the output format #. specified by POSIX. -#: src/conflicts.c:379 +#: src/conflicts.c:377 msgid "conflicts: " msgstr "conflits: " -#: src/conflicts.c:381 +#: src/conflicts.c:379 #, c-format msgid " %d shift/reduce" msgstr " %d décalage/réduction" -#: src/conflicts.c:385 +#: src/conflicts.c:383 #, c-format msgid " %d reduce/reduce" msgstr " %d réduction/réduction" -#: src/conflicts.c:390 +#: src/conflicts.c:388 #, c-format msgid "%s contains" msgstr "%s contient" -#: src/conflicts.c:599 src/conflicts.c:713 +#: src/conflicts.c:597 src/conflicts.c:711 #, 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:610 src/print.c:223 +#: src/conflicts.c:608 src/print.c:221 #, c-format msgid "" " $default\treduce using rule %d (%s)\n" @@ -103,17 +103,17 @@ msgstr "" " $défaut\tréduction par la règle %d (%s)\n" "\n" -#: src/conflicts.c:696 src/conflicts.c:708 +#: src/conflicts.c:694 src/conflicts.c:706 #, c-format msgid " %-4s\treduce using rule %d (%s)\n" msgstr " %-4s\tréduction par la règle %d (%s)\n" -#: src/conflicts.c:734 +#: src/conflicts.c:732 #, c-format msgid " $default\treduce using rule %d (%s)\n" msgstr " $défaut\tréduction par la règle %d (%s)\n" -#: src/derives.c:109 +#: src/derives.c:108 msgid "" "\n" "\n" @@ -127,29 +127,29 @@ msgstr "" "DERIVES\n" "\n" -#: src/derives.c:113 +#: src/derives.c:112 #, c-format msgid "%s derives" msgstr "%s dérive" #. Some efforts were made to ease the translators' task, please #. continue. -#: src/getargs.c:71 +#: src/getargs.c:74 msgid "GNU bison generates parsers for LALR(1) grammars.\n" msgstr "" -#: src/getargs.c:75 +#: src/getargs.c:78 #, c-format msgid "Usage: %s [OPTION]... FILE\n" msgstr "" -#: src/getargs.c:79 +#: src/getargs.c:82 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:85 +#: src/getargs.c:88 msgid "" "Operation modes:\n" " -h, --help display this help and exit\n" @@ -157,7 +157,7 @@ msgid "" " -y, --yacc emulate POSIX yacc\n" msgstr "" -#: src/getargs.c:92 +#: src/getargs.c:95 msgid "" "Parser:\n" " -t, --debug instrument the parser for debugging\n" @@ -168,7 +168,7 @@ msgid "" " -k, --token-table include a table of token names\n" msgstr "" -#: src/getargs.c:103 +#: src/getargs.c:106 msgid "" "Output:\n" " -d, --defines also produce a header file\n" @@ -177,88 +177,88 @@ msgid "" " -o, --output-file=FILE leave output to FILE\n" msgstr "" -#: src/getargs.c:111 +#: src/getargs.c:114 msgid "Report bugs to .\n" msgstr "" #. Some efforts were made to ease the translators' task, please #. continue. -#: src/getargs.c:125 +#: src/getargs.c:128 #, c-format msgid "bison (GNU Bison) %s" msgstr "" -#: src/getargs.c:130 +#: src/getargs.c:133 msgid "" "Copyright (C) 1984, 1986, 1989, 1992, 2000 Free Software Foundation, Inc.\n" msgstr "" -#: src/getargs.c:134 +#: src/getargs.c:137 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:228 +#: src/getargs.c:231 #, c-format msgid "%s: no grammar file given\n" msgstr "%s: grammaire manquante\n" -#: src/getargs.c:232 +#: src/getargs.c:235 #, fuzzy, c-format msgid "%s: extra arguments ignored after `%s'\n" msgstr "%s: paramètres supplémentaires ignorés après «%s»\n" -#: src/lalr.c:294 +#: src/lalr.c:292 #, c-format msgid "too many gotos (max %d)" msgstr "" -#: src/lex.c:116 +#: src/lex.c:105 msgid "unexpected `/' found and ignored" msgstr "`/' inattendu et ignoré" -#: src/lex.c:145 src/reader.c:290 +#: src/lex.c:134 src/reader.c:285 msgid "unterminated comment" msgstr "le commentaire ne se termine pas" -#: src/lex.c:173 +#: src/lex.c:162 #, fuzzy msgid "unexpected end of file" msgstr "Fin de fichier inattendue" -#: src/lex.c:194 +#: src/lex.c:183 msgid "unescaped newline in constant" msgstr "retour de chariot sans échappement dans une constante" -#: src/lex.c:226 +#: src/lex.c:215 #, c-format msgid "octal value outside range 0...255: `\\%o'" msgstr "valeur octale à l'extérieur de l'intervalle 0...255: \\%o" -#: src/lex.c:251 +#: src/lex.c:240 #, c-format msgid "hexadecimal value above 255: `\\x%x'" msgstr "valeur hexadécimale supérieure à 255: \\x%x" -#: src/lex.c:262 +#: src/lex.c:251 #, c-format msgid "unknown escape sequence: `\\' followed by `%s'" msgstr "séquence d'échappement inconnue: `\\' suivie de `%s'" -#: src/lex.c:395 +#: src/lex.c:384 msgid "use \"...\" for multi-character literal tokens" msgstr "utilisez \"...\" pour les terminaux litéraux de plusieurs caractères" -#: src/lex.c:474 +#: src/lex.c:463 msgid "unterminated type name at end of file" msgstr "le nom de type ne se termine pas avant la fin de fichier" -#: src/lex.c:477 +#: src/lex.c:466 msgid "unterminated type name" msgstr "le nom de type ne se termine pas" -#: src/main.c:144 +#: src/main.c:141 #, fuzzy, c-format msgid "%s: internal error: %s\n" msgstr "erreur interne, %s\n" @@ -267,17 +267,17 @@ msgstr "erreur interne, %s\n" msgid "Entering set_nullable" msgstr "Entré dans set_nullable" -#: src/output.c:1208 +#: src/output.c:1236 #, fuzzy, c-format msgid "maximum table size (%d) exceeded" msgstr "taille maximum des tables (%s) dépassée" -#: src/print.c:90 +#: src/print.c:88 #, c-format msgid " type %d is %s\n" msgstr " le type %d est %s\n" -#: src/print.c:98 +#: src/print.c:96 #, c-format msgid "" "\n" @@ -290,42 +290,42 @@ msgstr "" "état %d\n" "\n" -#: src/print.c:142 +#: src/print.c:140 #, c-format msgid " (rule %d)" msgstr " (règle %d)" -#: src/print.c:169 +#: src/print.c:167 msgid " $default\taccept\n" msgstr " $défaut\taccepter\n" -#: src/print.c:171 +#: src/print.c:169 msgid " NO ACTIONS\n" msgstr " PAS D'ACTION\n" #. I.e. strcmp(tags[symbol],"$")==0 -#: src/print.c:187 +#: src/print.c:185 #, c-format msgid " $ \tgo to state %d\n" msgstr " $ \taller à l'état %d\n" -#: src/print.c:189 +#: src/print.c:187 #, c-format msgid " %-4s\tshift, and go to state %d\n" msgstr " %-4s\tdécalage et aller à l'état %d\n" -#: src/print.c:212 +#: src/print.c:210 #, c-format msgid " %-4s\terror (nonassociative)\n" msgstr " %-4s\terreur (non-associatif)\n" -#: src/print.c:238 +#: src/print.c:236 #, c-format msgid " %-4s\tgo to state %d\n" msgstr " %-4s\taller à l'état %d\n" #. rule # : LHS -> RHS -#: src/print.c:263 +#: src/print.c:261 msgid "" "\n" "Grammar\n" @@ -333,17 +333,17 @@ msgstr "" "\n" "Grammaire\n" -#: src/print.c:268 +#: src/print.c:266 #, c-format msgid "rule %-4d %s ->" msgstr "règle %-4d %s ->" -#: src/print.c:274 +#: src/print.c:272 msgid "\t\t/* empty */" msgstr "\t\t/* epsilon */" #. TERMINAL (type #) : rule #s terminal is on RHS -#: src/print.c:279 +#: src/print.c:277 msgid "" "\n" "Terminals, with rules where they appear\n" @@ -353,7 +353,7 @@ msgstr "" "Terminaux, suivis des règles où ils apparaissent\n" "\n" -#: src/print.c:327 +#: src/print.c:325 msgid "" "\n" "Nonterminals, with rules where they appear\n" @@ -363,240 +363,240 @@ msgstr "" "Catégories, suivis des règles où elles apparaissent\n" "\n" -#: src/print.c:353 +#: src/print.c:351 msgid " on left:" msgstr " à gauche:" -#: src/print.c:368 +#: src/print.c:366 msgid " on right:" msgstr " à droite:" -#: src/reader.c:158 +#: src/reader.c:153 msgid " Skipping to next \\n" msgstr " Saut jusqu'au prochain \\n" -#: src/reader.c:160 +#: src/reader.c:155 #, c-format msgid " Skipping to next %c" msgstr " Saut jusqu'au prochain %c" -#: src/reader.c:214 src/reader.c:229 +#: src/reader.c:209 src/reader.c:224 msgid "unterminated string at end of file" msgstr "chaîne de caractères non terminée en fin de fichier" -#: src/reader.c:217 +#: src/reader.c:212 msgid "unterminated string" msgstr "chaîne de caractère non terminée" -#: src/reader.c:485 +#: src/reader.c:480 #, c-format msgid "unrecognized: %s" msgstr "non reconnu: %s" -#: src/reader.c:490 +#: src/reader.c:485 msgid "no input grammar" msgstr "aucune grammaire en entrée" -#: src/reader.c:493 +#: src/reader.c:488 #, c-format msgid "unknown character: %s" msgstr "caractère inconnu: %s" -#: src/reader.c:545 +#: src/reader.c:540 msgid "unterminated `%{' definition" msgstr "La section de définition (%{) ne termine pas avant la fin du fichier" -#: src/reader.c:586 src/reader.c:774 src/reader.c:823 +#: src/reader.c:581 src/reader.c:769 src/reader.c:818 #, c-format msgid "Premature EOF after %s" msgstr "" -#: src/reader.c:623 src/reader.c:845 +#: src/reader.c:618 src/reader.c:840 #, c-format msgid "symbol %s redefined" msgstr "symbole %s redéfini" -#: src/reader.c:633 src/reader.c:789 src/reader.c:852 src/reader.c:1714 +#: src/reader.c:628 src/reader.c:784 src/reader.c:847 src/reader.c:1709 #, c-format msgid "type redeclaration for %s" msgstr "redéclaration du type de %s" -#: src/reader.c:643 +#: src/reader.c:638 #, c-format msgid "`%s' is invalid in %s" msgstr "`%s' n'est pas valide dans %s" -#: src/reader.c:691 +#: src/reader.c:686 #, c-format msgid "unrecognized item %s, expected an identifier" msgstr "item %s non reconnu, un identificateur est attendu" -#: src/reader.c:713 +#: src/reader.c:708 #, c-format msgid "expected string constant instead of %s" msgstr "chaîne de caractères constante attendue plutôt que %s" -#: src/reader.c:735 src/reader.c:896 +#: src/reader.c:730 src/reader.c:891 #, fuzzy, c-format msgid "multiple %s declarations" msgstr "multiples déclarations %start" -#: src/reader.c:737 src/reader.c:1690 +#: src/reader.c:732 src/reader.c:1685 #, fuzzy, c-format msgid "invalid %s declaration" msgstr "la déclaration %start n'est pas valide" -#: src/reader.c:757 +#: src/reader.c:752 msgid "%type declaration has no " msgstr "la déclaration %type n'a pas de " -#: src/reader.c:794 +#: src/reader.c:789 #, 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:841 +#: src/reader.c:836 #, c-format msgid "redefining precedence of %s" msgstr "redéfinition du niveau de priorité de %s" -#: src/reader.c:864 +#: src/reader.c:859 #, 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:874 +#: src/reader.c:869 #, c-format msgid "unexpected item: %s" msgstr "item inattendu: %s" -#: src/reader.c:937 src/reader.c:1100 src/reader.c:1317 +#: src/reader.c:932 src/reader.c:1095 src/reader.c:1312 #, fuzzy, c-format msgid "unmatched %s" msgstr "accolade ouvrante `{' non appariée" -#: src/reader.c:982 +#: src/reader.c:977 #, c-format msgid "argument of %expect is not an integer" msgstr "le paramètre de %expect n'est pas un entier" -#: src/reader.c:1014 +#: src/reader.c:1009 #, c-format msgid "@%s is invalid" msgstr "@%s n'est pas valide" -#: src/reader.c:1029 src/reader.c:1041 +#: src/reader.c:1024 src/reader.c:1036 msgid "invalid $ value" msgstr "la valeur de symbole $ n'est pas valide" -#: src/reader.c:1147 src/reader.c:1287 +#: src/reader.c:1142 src/reader.c:1282 #, c-format msgid "$$ of `%s' has no declared type" msgstr "$$ de `%s' n'a pas son type déclaré" -#: src/reader.c:1163 src/reader.c:1303 +#: src/reader.c:1158 src/reader.c:1298 #, 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:1168 src/reader.c:1308 +#: src/reader.c:1163 src/reader.c:1303 #, c-format msgid "$%s is invalid" msgstr "$%s n'est pas valide" -#: src/reader.c:1177 +#: src/reader.c:1172 #, fuzzy, c-format msgid "unterminated %guard clause" msgstr "clause %%guard non terminée" -#: src/reader.c:1403 +#: src/reader.c:1398 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:1410 +#: src/reader.c:1405 msgid "grammar starts with vertical bar" msgstr "la grammaire débute par une barre verticale" -#: src/reader.c:1441 +#: src/reader.c:1436 #, c-format msgid "rule given for %s, which is a token" msgstr "la règle pour %s, qui est un terminal" -#: src/reader.c:1539 +#: src/reader.c:1534 msgid "two @prec's in a row" msgstr "deux @prec de suite" -#: src/reader.c:1548 +#: src/reader.c:1543 #, 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:1557 +#: src/reader.c:1552 msgid "two actions at end of one rule" msgstr "deux actions à la fin d'une même règle" -#: src/reader.c:1572 +#: src/reader.c:1567 #, 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:1578 +#: src/reader.c:1573 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:1622 +#: src/reader.c:1617 #, c-format msgid "invalid input: %s" msgstr "entrée non valide: %s" -#: src/reader.c:1630 +#: src/reader.c:1625 #, 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:1633 +#: src/reader.c:1628 msgid "no rules in the input grammar" msgstr "la grammaire n'a pas de règles" -#: src/reader.c:1651 +#: src/reader.c:1646 #, 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:1770 +#: src/reader.c:1765 #, c-format msgid "conflicting precedences for %s and %s" msgstr "les priorités pour %s et %s entrent en conflit" -#: src/reader.c:1782 +#: src/reader.c:1777 #, 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:1833 +#: src/reader.c:1828 #, 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:1847 +#: src/reader.c:1842 #, c-format msgid "the start symbol %s is undefined" msgstr "le symbole de départ %s n'est pas défini" -#: src/reader.c:1849 +#: src/reader.c:1844 #, c-format msgid "the start symbol %s is a token" msgstr "le symbole de départ %s est un terminal" -#: src/reduce.c:144 +#: src/reduce.c:142 #, c-format 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:158 +#: src/reduce.c:156 #, c-format msgid "" "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n" @@ -604,7 +604,7 @@ msgstr "" "la réduction de %s définit %d terminal%s, %d catégorie%s et %d " "production%s.\n" -#: src/reduce.c:496 +#: src/reduce.c:494 msgid "" "Useless nonterminals:\n" "\n" @@ -612,7 +612,7 @@ msgstr "" "Catégories non productives:\n" "\n" -#: src/reduce.c:508 +#: src/reduce.c:506 msgid "" "\n" "\n" @@ -624,7 +624,7 @@ msgstr "" "Terminaux non utilisés:\n" "\n" -#: src/reduce.c:517 +#: src/reduce.c:515 msgid "" "\n" "\n" @@ -636,7 +636,7 @@ msgstr "" "Règles non productives:\n" "\n" -#: src/reduce.c:546 +#: src/reduce.c:544 msgid "" "Variables\n" "---------\n" @@ -646,11 +646,11 @@ msgstr "" "---------\n" "\n" -#: src/reduce.c:547 +#: src/reduce.c:545 msgid "Value Sprec Sassoc Tag\n" msgstr "Valeur Spréc Sassoc Tag\n" -#: src/reduce.c:552 +#: src/reduce.c:550 msgid "" "Rules\n" "-----\n" @@ -660,7 +660,7 @@ msgstr "" "------\n" "\n" -#: src/reduce.c:562 +#: src/reduce.c:560 msgid "" "Rules interpreted\n" "-----------------\n" @@ -670,26 +670,26 @@ msgstr "" "-------------------\n" "\n" -#: src/reduce.c:579 +#: src/reduce.c:577 #, c-format msgid "%d rules never reduced\n" msgstr "%d règles jamais réduites\n" -#: src/reduce.c:581 +#: src/reduce.c:579 #, c-format msgid "%s contains " msgstr "%s contient " -#: src/reduce.c:585 +#: src/reduce.c:583 #, c-format msgid "%d useless nonterminal%s" msgstr "%d catégories non productives%s" -#: src/reduce.c:590 +#: src/reduce.c:588 msgid " and " msgstr " et " -#: src/reduce.c:594 +#: src/reduce.c:592 #, c-format msgid "%d useless rule%s" msgstr "%d règle(s) non productive(s)" diff --git a/po/ja.po b/po/ja.po index cc482278..c3caae63 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-09-18 15:25+0200\n" +"POT-Creation-Date: 2000-09-19 20:18+0200\n" "PO-Revision-Date: 1999-09-28 21:10+0900\n" "Last-Translator: Daisuke Yamashita \n" "Language-Team: Japanese \n" @@ -13,87 +13,87 @@ msgstr "" "Content-Type: text/plain; charset=EUC-JP\n" "Content-Transfer-Encoding: 8bit\n" -#: src/LR0.c:377 +#: src/LR0.c:375 #, fuzzy, c-format msgid "too many states (max %d)" msgstr "%s ¤Î¿ô¤¬Â¿¤¹¤®¤Þ¤¹ (ºÇÂç %d)" -#: src/allocate.c:59 src/allocate.c:75 +#: src/allocate.c:58 src/allocate.c:74 #, c-format msgid "%s: memory exhausted\n" msgstr "%s: ¥á¥â¥ê¤ò»È¤¤²Ì¤¿¤·¤Þ¤·¤¿\n" -#: src/conflicts.c:200 src/conflicts.c:224 +#: src/conflicts.c:198 src/conflicts.c:222 msgid "reduce" msgstr "´Ô¸µ" -#: src/conflicts.c:206 src/conflicts.c:220 +#: src/conflicts.c:204 src/conflicts.c:218 msgid "shift" msgstr "¥·¥Õ¥È" -#: src/conflicts.c:228 +#: src/conflicts.c:226 msgid "an error" msgstr "¥¨¥é¡¼" -#: src/conflicts.c:300 +#: src/conflicts.c:298 #, c-format msgid "Conflict in state %d between rule %d and token %s resolved as %s.\n" msgstr "¾õÂÖ %d ¤Îµ¬Â§ %d ¤È¥È¡¼¥¯¥ó %s ¤Î¶¥¹ç¤ò%s¤È¤·¤Æ²ò·è¡£\n" -#: src/conflicts.c:345 +#: src/conflicts.c:343 #, c-format msgid "State %d contains" msgstr "¾õÂÖ %d ¤¬´Þ¤à¤Î¤Ï" -#: src/conflicts.c:348 src/conflicts.c:393 +#: src/conflicts.c:346 src/conflicts.c:391 msgid " 1 shift/reduce conflict" msgstr " 1 ¥·¥Õ¥È/´Ô¸µ¾×ÆÍ" -#: src/conflicts.c:350 src/conflicts.c:395 +#: src/conflicts.c:348 src/conflicts.c:393 #, c-format msgid " %d shift/reduce conflicts" msgstr " %d ¥·¥Õ¥È/´Ô¸µ¾×ÆÍ" -#: src/conflicts.c:353 src/conflicts.c:398 +#: src/conflicts.c:351 src/conflicts.c:396 msgid " and" msgstr " ¤ª¤è¤Ó" -#: src/conflicts.c:356 src/conflicts.c:401 +#: src/conflicts.c:354 src/conflicts.c:399 msgid " 1 reduce/reduce conflict" msgstr " 1 ´Ô¸µ/´Ô¸µ¾×ÆÍ" -#: src/conflicts.c:358 src/conflicts.c:403 +#: src/conflicts.c:356 src/conflicts.c:401 #, c-format msgid " %d reduce/reduce conflicts" msgstr " %d ´Ô¸µ/´Ô¸µ¾×ÆÍ" #. If invoked under the name `yacc', use the output format #. specified by POSIX. -#: src/conflicts.c:379 +#: src/conflicts.c:377 msgid "conflicts: " msgstr "¾×ÆÍ: " -#: src/conflicts.c:381 +#: src/conflicts.c:379 #, c-format msgid " %d shift/reduce" msgstr " %d ¥·¥Õ¥È/´Ô¸µ" -#: src/conflicts.c:385 +#: src/conflicts.c:383 #, c-format msgid " %d reduce/reduce" msgstr " %d ´Ô¸µ/´Ô¸µ" -#: src/conflicts.c:390 +#: src/conflicts.c:388 #, c-format msgid "%s contains" msgstr "%s ¤Ë¤Ï¡¢" -#: src/conflicts.c:599 src/conflicts.c:713 +#: src/conflicts.c:597 src/conflicts.c:711 #, c-format msgid " %-4s\t[reduce using rule %d (%s)]\n" msgstr " %-4s\t[µ¬Â§ %d ¤òÍøÍѤ·¤Æ´Ô¸µ (%s)]\n" -#: src/conflicts.c:610 src/print.c:223 +#: src/conflicts.c:608 src/print.c:221 #, c-format msgid "" " $default\treduce using rule %d (%s)\n" @@ -102,17 +102,17 @@ msgstr "" " $default\tµ¬Â§ %d ¤òÍøÍѤ·¤Æ´Ô¸µ (%s)\n" "\n" -#: src/conflicts.c:696 src/conflicts.c:708 +#: src/conflicts.c:694 src/conflicts.c:706 #, c-format msgid " %-4s\treduce using rule %d (%s)\n" msgstr " %-4s\tµ¬Â§ %d ¤òÍøÍѤ·¤Æ´Ô¸µ (%s)\n" -#: src/conflicts.c:734 +#: src/conflicts.c:732 #, c-format msgid " $default\treduce using rule %d (%s)\n" msgstr " $default\tµ¬Â§ %d ¤òÍøÍѤ·¤Æ´Ô¸µ (%s)\n" -#: src/derives.c:109 +#: src/derives.c:108 msgid "" "\n" "\n" @@ -126,29 +126,29 @@ msgstr "" "DERIVES\n" "\n" -#: src/derives.c:113 +#: src/derives.c:112 #, c-format msgid "%s derives" msgstr "%s ¤Ï°Ê²¼¤«¤éÇÉÀ¸" #. Some efforts were made to ease the translators' task, please #. continue. -#: src/getargs.c:71 +#: src/getargs.c:74 msgid "GNU bison generates parsers for LALR(1) grammars.\n" msgstr "" -#: src/getargs.c:75 +#: src/getargs.c:78 #, c-format msgid "Usage: %s [OPTION]... FILE\n" msgstr "" -#: src/getargs.c:79 +#: src/getargs.c:82 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:85 +#: src/getargs.c:88 msgid "" "Operation modes:\n" " -h, --help display this help and exit\n" @@ -156,7 +156,7 @@ msgid "" " -y, --yacc emulate POSIX yacc\n" msgstr "" -#: src/getargs.c:92 +#: src/getargs.c:95 msgid "" "Parser:\n" " -t, --debug instrument the parser for debugging\n" @@ -167,7 +167,7 @@ msgid "" " -k, --token-table include a table of token names\n" msgstr "" -#: src/getargs.c:103 +#: src/getargs.c:106 msgid "" "Output:\n" " -d, --defines also produce a header file\n" @@ -176,88 +176,88 @@ msgid "" " -o, --output-file=FILE leave output to FILE\n" msgstr "" -#: src/getargs.c:111 +#: src/getargs.c:114 msgid "Report bugs to .\n" msgstr "" #. Some efforts were made to ease the translators' task, please #. continue. -#: src/getargs.c:125 +#: src/getargs.c:128 #, c-format msgid "bison (GNU Bison) %s" msgstr "" -#: src/getargs.c:130 +#: src/getargs.c:133 msgid "" "Copyright (C) 1984, 1986, 1989, 1992, 2000 Free Software Foundation, Inc.\n" msgstr "" -#: src/getargs.c:134 +#: src/getargs.c:137 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:228 +#: src/getargs.c:231 #, c-format msgid "%s: no grammar file given\n" msgstr "%s: ʸˡ¥Õ¥¡¥¤¥ë¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó\n" -#: src/getargs.c:232 +#: src/getargs.c:235 #, fuzzy, c-format msgid "%s: extra arguments ignored after `%s'\n" msgstr "%s: '%s' ¤è¤ê¸å¤í¤Î;ʬ¤Ê°ú¿ô¤Ï̵»ë¤µ¤ì¤Þ¤·¤¿\n" -#: src/lalr.c:294 +#: src/lalr.c:292 #, fuzzy, c-format msgid "too many gotos (max %d)" msgstr "%s ¤Î¿ô¤¬Â¿¤¹¤®¤Þ¤¹ (ºÇÂç %d)" -#: src/lex.c:116 +#: src/lex.c:105 msgid "unexpected `/' found and ignored" msgstr "ͽ´ü¤·¤Ê¤¤ `/' ¤¬¸«¤Ä¤«¤ê¡¢Ìµ»ë¤µ¤ì¤Þ¤·¤¿" -#: src/lex.c:145 src/reader.c:290 +#: src/lex.c:134 src/reader.c:285 msgid "unterminated comment" msgstr "ÊĤ¸¤Æ¤¤¤Ê¤¤¥³¥á¥ó¥È¤Ç¤¹" -#: src/lex.c:173 +#: src/lex.c:162 #, fuzzy msgid "unexpected end of file" msgstr "ͽ´ü¤·¤Ê¤¤¥Õ¥¡¥¤¥ë¤Î½ªÃ¼¤Ç¤¹" -#: src/lex.c:194 +#: src/lex.c:183 msgid "unescaped newline in constant" msgstr "Äê¿ô¤ÎÃæ¤Ë¥¨¥¹¥±¡¼¥×¤µ¤ì¤Æ¤¤¤Ê¤¤²þ¹Ô¤¬¤¢¤ê¤Þ¤¹" -#: src/lex.c:226 +#: src/lex.c:215 #, c-format msgid "octal value outside range 0...255: `\\%o'" msgstr "8 ¿Ê¿ô¤ÎÃͤ¬ 0...255 ¤ÎÈϰϳ°¤Ç¤¹: `\\%o'" -#: src/lex.c:251 +#: src/lex.c:240 #, c-format msgid "hexadecimal value above 255: `\\x%x'" msgstr "16 ¿Ê¿ô¤ÎÃͤ¬ 255 ¤ò±Û¤¨¤Æ¤¤¤Þ¤¹: `\\x%x'" -#: src/lex.c:262 +#: src/lex.c:251 #, c-format msgid "unknown escape sequence: `\\' followed by `%s'" msgstr "̤ÃΤΥ¨¥¹¥±¡¼¥×¥·¡¼¥±¥ó¥¹: `\\' ¤Î¸å¤Ë `%s'" -#: src/lex.c:395 +#: src/lex.c:384 msgid "use \"...\" for multi-character literal tokens" msgstr "Ê£¿ôʸ»ú¤Î¥ê¥Æ¥é¥ë¥È¡¼¥¯¥ó¤Ë¤Ï \"...\" ¤ò»È¤¤¤Þ¤·¤ç¤¦" -#: src/lex.c:474 +#: src/lex.c:463 msgid "unterminated type name at end of file" msgstr "ÊĤ¸¤é¤ì¤Æ¤¤¤Ê¤¤¥¿¥¤¥×̾¤¬¡¢¥Õ¥¡¥¤¥ëËöÈø¤Ë¤¢¤ê¤Þ¤¹" -#: src/lex.c:477 +#: src/lex.c:466 msgid "unterminated type name" msgstr "ÊĤ¸¤é¤ì¤Æ¤¤¤Ê¤¤¥¿¥¤¥×̾¤¬¤¢¤ê¤Þ¤¹" -#: src/main.c:144 +#: src/main.c:141 #, c-format msgid "%s: internal error: %s\n" msgstr "%s: ÆâÉô¥¨¥é¡¼: %s\n" @@ -266,17 +266,17 @@ msgstr "%s: msgid "Entering set_nullable" msgstr "set_nullable ¤ËÆþ¤ê¤Þ¤¹" -#: src/output.c:1208 +#: src/output.c:1236 #, fuzzy, c-format msgid "maximum table size (%d) exceeded" msgstr "ºÇÂç¥Æ¡¼¥Ö¥ë¥µ¥¤¥º (%s) ¤òĶ¤¨¤Þ¤·¤¿" -#: src/print.c:90 +#: src/print.c:88 #, c-format msgid " type %d is %s\n" msgstr " ¥¿¥¤¥× %d ¤Ï %s ¤Ç¤¹\n" -#: src/print.c:98 +#: src/print.c:96 #, c-format msgid "" "\n" @@ -289,42 +289,42 @@ msgstr "" "¾õÂÖ %d\n" "\n" -#: src/print.c:142 +#: src/print.c:140 #, c-format msgid " (rule %d)" msgstr " (µ¬Â§ %d)" -#: src/print.c:169 +#: src/print.c:167 msgid " $default\taccept\n" msgstr " $default\taccept\n" -#: src/print.c:171 +#: src/print.c:169 msgid " NO ACTIONS\n" msgstr " Æ°ºî̵¤·\n" #. I.e. strcmp(tags[symbol],"$")==0 -#: src/print.c:187 +#: src/print.c:185 #, c-format msgid " $ \tgo to state %d\n" msgstr " $ \t¾õÂÖ %d ¤Ø\n" -#: src/print.c:189 +#: src/print.c:187 #, c-format msgid " %-4s\tshift, and go to state %d\n" msgstr " %-4s\t¥·¥Õ¥È¡¢¤ª¤è¤Ó¾õÂÖ %d ¤Ø\n" -#: src/print.c:212 +#: src/print.c:210 #, c-format msgid " %-4s\terror (nonassociative)\n" msgstr " %-4s\t¥¨¥é¡¼ (Èó·ë¹ç)\n" -#: src/print.c:238 +#: src/print.c:236 #, c-format msgid " %-4s\tgo to state %d\n" msgstr " %-4s\t¾õÂÖ %d ¤Ø\n" #. rule # : LHS -> RHS -#: src/print.c:263 +#: src/print.c:261 msgid "" "\n" "Grammar\n" @@ -332,17 +332,17 @@ msgstr "" "\n" "ʸˡ\n" -#: src/print.c:268 +#: src/print.c:266 #, c-format msgid "rule %-4d %s ->" msgstr "µ¬Â§ %-4d %s ->" -#: src/print.c:274 +#: src/print.c:272 msgid "\t\t/* empty */" msgstr "\t\t/* ¶õ */" #. TERMINAL (type #) : rule #s terminal is on RHS -#: src/print.c:279 +#: src/print.c:277 msgid "" "\n" "Terminals, with rules where they appear\n" @@ -352,7 +352,7 @@ msgstr "" "½ªÃ¼¥È¡¼¥¯¥ó¡¢¤ª¤è¤Ó¤½¤³¤Ë¸½¤ì¤¿µ¬Â§\n" "\n" -#: src/print.c:327 +#: src/print.c:325 msgid "" "\n" "Nonterminals, with rules where they appear\n" @@ -362,239 +362,239 @@ msgstr "" "Èó½ªÃ¼¥È¡¼¥¯¥ó¡¢¤ª¤è¤Ó¤½¤³¤Ë¸½¤ì¤¿µ¬Â§\n" "\n" -#: src/print.c:353 +#: src/print.c:351 msgid " on left:" msgstr " º¸ÊÕ:" -#: src/print.c:368 +#: src/print.c:366 msgid " on right:" msgstr " ±¦ÊÕ:" -#: src/reader.c:158 +#: src/reader.c:153 msgid " Skipping to next \\n" msgstr " ¼¡¤Î \\n ¤Ë¥¹¥­¥Ã¥×" -#: src/reader.c:160 +#: src/reader.c:155 #, c-format msgid " Skipping to next %c" msgstr " ¼¡¤Î %c ¤Ë¥¹¥­¥Ã¥×" -#: src/reader.c:214 src/reader.c:229 +#: src/reader.c:209 src/reader.c:224 msgid "unterminated string at end of file" msgstr "ÊĤ¸¤é¤ì¤Æ¤¤¤Ê¤¤Ê¸»úÎ󤬥ե¡¥¤¥ëËöÈø¤Ë¤¢¤ê¤Þ¤¹" -#: src/reader.c:217 +#: src/reader.c:212 msgid "unterminated string" msgstr "ÊĤ¸¤é¤ì¤Æ¤¤¤Ê¤¤Ê¸»úÎó" -#: src/reader.c:485 +#: src/reader.c:480 #, c-format msgid "unrecognized: %s" msgstr "ǧ¼±¤Ç¤­¤Ê¤¤: %s" -#: src/reader.c:490 +#: src/reader.c:485 msgid "no input grammar" msgstr "ʸˡ¤ÎÆþÎϤ¬Ìµ¤¤" -#: src/reader.c:493 +#: src/reader.c:488 #, c-format msgid "unknown character: %s" msgstr "̤ÃΤÎʸ»ú: %s" -#: src/reader.c:545 +#: src/reader.c:540 msgid "unterminated `%{' definition" msgstr "`%{' ÄêµÁ ¤¬ÊĤ¸¤é¤ì¤Æ¤¤¤Þ¤»¤ó" -#: src/reader.c:586 src/reader.c:774 src/reader.c:823 +#: src/reader.c:581 src/reader.c:769 src/reader.c:818 #, c-format msgid "Premature EOF after %s" msgstr "" -#: src/reader.c:623 src/reader.c:845 +#: src/reader.c:618 src/reader.c:840 #, c-format msgid "symbol %s redefined" msgstr "¥·¥ó¥Ü¥ë %s ¤¬ºÆÄêµÁ¤µ¤ì¤Þ¤·¤¿" -#: src/reader.c:633 src/reader.c:789 src/reader.c:852 src/reader.c:1714 +#: src/reader.c:628 src/reader.c:784 src/reader.c:847 src/reader.c:1709 #, c-format msgid "type redeclaration for %s" msgstr "%s ¤Î·¿¤¬ºÆÄêµÁ¤µ¤ì¤Þ¤·¤¿" -#: src/reader.c:643 +#: src/reader.c:638 #, c-format msgid "`%s' is invalid in %s" msgstr "%2$s Æâ¤Î `%1$s' ¤Ï̵¸ú¤Ç¤¹" -#: src/reader.c:691 +#: src/reader.c:686 #, c-format msgid "unrecognized item %s, expected an identifier" msgstr "ǧ¼±¤Ç¤­¤Ê¤¤¥¢¥¤¥Æ¥à %s¡¢¤³¤³¤Ç¤Ï¼±Ê̻Ҥ¬´üÂÔ¤µ¤ì¤Þ¤¹" -#: src/reader.c:713 +#: src/reader.c:708 #, c-format msgid "expected string constant instead of %s" msgstr "¤³¤³¤Ç¤Ï %s ¤Ç¤Ï¤Ê¤¯Ê¸»úÎóÄê¿ô¤¬´üÂÔ¤µ¤ì¤Þ¤¹" -#: src/reader.c:735 src/reader.c:896 +#: src/reader.c:730 src/reader.c:891 #, fuzzy, c-format msgid "multiple %s declarations" msgstr "Ê£¿ô¤Î %start ¤¬Àë¸À¤µ¤ì¤Þ¤·¤¿" -#: src/reader.c:737 src/reader.c:1690 +#: src/reader.c:732 src/reader.c:1685 #, fuzzy, c-format msgid "invalid %s declaration" msgstr "̵¸ú¤Ê %start ¤¬Àë¸À¤µ¤ì¤Þ¤·¤¿" -#: src/reader.c:757 +#: src/reader.c:752 msgid "%type declaration has no " msgstr "%type Àë¸À¤Ë <¥¿¥¤¥×̾> ¤¬¤¢¤ê¤Þ¤»¤ó" -#: src/reader.c:794 +#: src/reader.c:789 #, fuzzy msgid "invalid %%type declaration due to item: %s" msgstr "¥¢¥¤¥Æ¥à¤ËÍ¿¤¨¤é¤ì¤ë¤Ù¤­ %%type Àë¸À¤¬Ìµ¸ú¤Ç¤¹: `%s'" -#: src/reader.c:841 +#: src/reader.c:836 #, c-format msgid "redefining precedence of %s" msgstr "%s ¤ËÀè¹Ô¤·¤¿ºÆÄêµÁ¤Ç¤¹" -#: src/reader.c:864 +#: src/reader.c:859 #, c-format msgid "invalid text (%s) - number should be after identifier" msgstr "̵¸ú¤Ê¥Æ¥­¥¹¥È (%s) - ¿ôÃͤϼ±Ê̻Ҥθå¤í¤Ë¤¢¤ë¤Ù¤­¤Ç¤¹" -#: src/reader.c:874 +#: src/reader.c:869 #, c-format msgid "unexpected item: %s" msgstr "ͽ´ü¤»¤Ì¥¢¥¤¥Æ¥à: %s" -#: src/reader.c:937 src/reader.c:1100 src/reader.c:1317 +#: src/reader.c:932 src/reader.c:1095 src/reader.c:1312 #, fuzzy, c-format msgid "unmatched %s" msgstr "Âбþ¤Î¤Ê¤¤ `{' ¤Ç¤¹" -#: src/reader.c:982 +#: src/reader.c:977 #, c-format msgid "argument of %expect is not an integer" msgstr "%expect ¤Î°ú¿ô¤¬À°¿ôÃͤǤϤ¢¤ê¤Þ¤»¤ó" -#: src/reader.c:1014 +#: src/reader.c:1009 #, c-format msgid "@%s is invalid" msgstr "@%s ¤Ï̵¸ú¤Ç¤¹" -#: src/reader.c:1029 src/reader.c:1041 +#: src/reader.c:1024 src/reader.c:1036 msgid "invalid $ value" msgstr "̵¸ú¤Ê $ ¤ÎÃÍ" -#: src/reader.c:1147 src/reader.c:1287 +#: src/reader.c:1142 src/reader.c:1282 #, c-format msgid "$$ of `%s' has no declared type" msgstr "`%s' ¤Î $$ ¤ËÀë¸À¤Î¤Ê¤¤·¿¤¬¤¢¤ê¤Þ¤¹" -#: src/reader.c:1163 src/reader.c:1303 +#: src/reader.c:1158 src/reader.c:1298 #, fuzzy, c-format msgid "$%d of `%s' has no declared type" msgstr "`%s' ¤Î $%s ¤ËÀë¸À¤Î¤Ê¤¤·¿¤¬¤¢¤ê¤Þ¤¹" -#: src/reader.c:1168 src/reader.c:1308 +#: src/reader.c:1163 src/reader.c:1303 #, c-format msgid "$%s is invalid" msgstr "$%s ¤Ï̵¸ú¤Ç¤¹" -#: src/reader.c:1177 +#: src/reader.c:1172 #, fuzzy, c-format msgid "unterminated %guard clause" msgstr "ÊĤ¸¤é¤ì¤Æ¤¤¤Ê¤¤ %%guard Àá¤Ç¤¹" -#: src/reader.c:1403 +#: src/reader.c:1398 msgid "ill-formed rule: initial symbol not followed by colon" msgstr "¼Ù°­¤Êµ¬Â§: ½é´ü²½¥·¥ó¥Ü¥ë¤Ë¥³¥í¥ó (:) ¤¬Â³¤¤¤Æ¤¤¤Þ¤»¤ó" -#: src/reader.c:1410 +#: src/reader.c:1405 msgid "grammar starts with vertical bar" msgstr "ʸˡ¤Ï½ÄËÀ (|) ¤Ç»Ï¤á¤Þ¤¹" -#: src/reader.c:1441 +#: src/reader.c:1436 #, c-format msgid "rule given for %s, which is a token" msgstr "%s ¤Ëµ¬Â§¤¬Í¿¤¨¤é¤ì¡¢¤½¤ì¤Ï¥È¡¼¥¯¥ó¤È¤Ê¤ê¤Þ¤¹" -#: src/reader.c:1539 +#: src/reader.c:1534 msgid "two @prec's in a row" msgstr "@prec ¤Î¤â¤ÎÆó¤Ä¤¬Æ±Îó¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹" -#: src/reader.c:1548 +#: src/reader.c:1543 #, fuzzy, c-format msgid "%guard present but %semantic_parser not specified" msgstr "%%guard ¤¬¤¢¤ê¤Þ¤¹¤¬ %%semantic_parser ¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó" -#: src/reader.c:1557 +#: src/reader.c:1552 msgid "two actions at end of one rule" msgstr "°ì¤Ä¤Îµ¬Â§¤Î½ª¤ê¤ËÆó¤Ä¤ÎÆ°ºî¤ò»ØÄꤷ¤Æ¤¤¤Þ¤¹" -#: src/reader.c:1572 +#: src/reader.c:1567 #, c-format msgid "type clash (`%s' `%s') on default action" msgstr "½é´ü¾õÂÖ¤ÎÆ°ºî¤Ç¤Ï·¿ (`%s' `%s') ¤¬¾×Æͤ·¤Þ¤¹" -#: src/reader.c:1578 +#: src/reader.c:1573 msgid "empty rule for typed nonterminal, and no action" msgstr "¶õ¤Î·¿ÉÕ¤­Èó½ªÃ¼¥¢¥¤¥Æ¥àÍѵ¬Â§¤Ç¤¢¤ê¡¢Æ°ºî¤¬µ¯¤ê¤Þ¤»¤ó" -#: src/reader.c:1622 +#: src/reader.c:1617 #, c-format msgid "invalid input: %s" msgstr "̵¸ú¤ÊÆþÎÏ: %s" -#: src/reader.c:1630 +#: src/reader.c:1625 #, fuzzy, c-format msgid "too many symbols (tokens plus nonterminals); maximum %d" msgstr "¥·¥ó¥Ü¥ë¤¬Â¿¤¹¤®¤Þ¤¹ (¥È¡¼¥¯¥ó¤ÈÈó½ªÃ¼¥¢¥¤¥Æ¥à) -- ºÇÂç %s" -#: src/reader.c:1633 +#: src/reader.c:1628 msgid "no rules in the input grammar" msgstr "ÆþÎϤ·¤¿Ê¸Ë¡¤Ëµ¬Â§¤¬ÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó" -#: src/reader.c:1651 +#: src/reader.c:1646 #, c-format msgid "symbol %s is used, but is not defined as a token and has no rules" msgstr "" "¥·¥ó¥Ü¥ë %s " "¤¬»È¤ï¤ì¤Æ¤¤¤Þ¤¹¤¬¡¢¥È¡¼¥¯¥ó¤È¤·¤ÆÄêµÁ¤µ¤ì¤Æ¤ª¤é¤º¡¢µ¬Â§¤ò»ý¤Á¤Þ¤»¤ó" -#: src/reader.c:1770 +#: src/reader.c:1765 #, c-format msgid "conflicting precedences for %s and %s" msgstr "Àè¹Ô¤·¤Æ¤¤¤ë %s ¤È %s ¤Ç¶¥¹ç¤¬À¸¤¸¤Æ¤¤¤Þ¤¹" -#: src/reader.c:1782 +#: src/reader.c:1777 #, c-format msgid "conflicting assoc values for %s and %s" msgstr "Èó·ë¹çÃÍ %s ¤È %s ¤Ç¶¥¹ç¤¬À¸¤¸¤Æ¤¤¤Þ¤¹" -#: src/reader.c:1833 +#: src/reader.c:1828 #, fuzzy, c-format msgid "tokens %s and %s both assigned number %d" msgstr "¥È¡¼¥¯¥ó %s ¤È %s ¤ÎÁÐÊý¤¬ÈÖ¹æ %s ¤Ë³ä¤êÅö¤Æ¤é¤ì¤Þ¤·¤¿" -#: src/reader.c:1847 +#: src/reader.c:1842 #, c-format msgid "the start symbol %s is undefined" msgstr "³«»Ï¥·¥ó¥Ü¥ë %s ¤ÏÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó" -#: src/reader.c:1849 +#: src/reader.c:1844 #, c-format msgid "the start symbol %s is a token" msgstr "³«»Ï¥·¥ó¥Ü¥ë %s ¤Ï¥È¡¼¥¯¥ó¤Ç¤¹" -#: src/reduce.c:144 +#: src/reduce.c:142 #, c-format msgid "Start symbol %s does not derive any sentence" msgstr "³«»Ï¥·¥ó¥Ü¥ë %s ¤Ï¤É¤Îʸ¤Ë¤âͳÍ褷¤Þ¤»¤ó" -#: src/reduce.c:158 +#: src/reduce.c:156 #, c-format msgid "" "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n" @@ -602,7 +602,7 @@ msgstr "" "´Ô¸µ¥Õ¥¡¥¤¥ë %s ¤Ç %d ¸Ä¤Î½ªÃ¼»Ò%.0s, %d ¸Ä¤ÎÈó½ªÃ¼»Ò%.0s, %d " "¸Ä¤Îµ¬Â§%.0s¤¬ÄêµÁ¤µ¤ì¤Þ¤·¤¿\n" -#: src/reduce.c:496 +#: src/reduce.c:494 msgid "" "Useless nonterminals:\n" "\n" @@ -610,7 +610,7 @@ msgstr "" "ÉÔ»ÈÍÑÈó½ªÃ¼»Ò:\n" "\n" -#: src/reduce.c:508 +#: src/reduce.c:506 msgid "" "\n" "\n" @@ -622,7 +622,7 @@ msgstr "" "ÍøÍѤµ¤ì¤Ê¤¤½ªÃ¼»Ò:\n" "\n" -#: src/reduce.c:517 +#: src/reduce.c:515 msgid "" "\n" "\n" @@ -634,7 +634,7 @@ msgstr "" "ÉÔ»ÈÍѵ¬Â§:\n" "\n" -#: src/reduce.c:546 +#: src/reduce.c:544 msgid "" "Variables\n" "---------\n" @@ -644,11 +644,11 @@ msgstr "" "---------\n" "\n" -#: src/reduce.c:547 +#: src/reduce.c:545 msgid "Value Sprec Sassoc Tag\n" msgstr "ÃÍ Á°ÃÖ ·ë¹ç ¥¿¥°\n" -#: src/reduce.c:552 +#: src/reduce.c:550 msgid "" "Rules\n" "-----\n" @@ -658,7 +658,7 @@ msgstr "" "-----\n" "\n" -#: src/reduce.c:562 +#: src/reduce.c:560 msgid "" "Rules interpreted\n" "-----------------\n" @@ -668,26 +668,26 @@ msgstr "" "-----------------\n" "\n" -#: src/reduce.c:579 +#: src/reduce.c:577 #, c-format msgid "%d rules never reduced\n" msgstr "%d ¸Ä¤Îµ¬Â§¤Ï·è¤·¤Æ´Ô¸µ¤µ¤ì¤Þ¤»¤ó\n" -#: src/reduce.c:581 +#: src/reduce.c:579 #, c-format msgid "%s contains " msgstr "%s ¤Ë¤Ï" -#: src/reduce.c:585 +#: src/reduce.c:583 #, c-format msgid "%d useless nonterminal%s" msgstr "%d ¸Ä¤ÎÉÔ»ÈÍÑÈó½ªÃ¼»Ò%.0s" -#: src/reduce.c:590 +#: src/reduce.c:588 msgid " and " msgstr "¤ª¤è¤Ó" -#: src/reduce.c:594 +#: src/reduce.c:592 #, c-format msgid "%d useless rule%s" msgstr "%d ¸Ä¤ÎÉÔ»ÈÍѵ¬Â§%.0s" diff --git a/po/nl.po b/po/nl.po index 0fa44b9d..14bae608 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-09-18 15:25+0200\n" +"POT-Creation-Date: 2000-09-19 20:18+0200\n" "PO-Revision-Date: 1996-08-27 15:34 MET DST\n" "Last-Translator: Erick Branderhorst \n" "Language-Team: Dutch \n" @@ -13,87 +13,87 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8-bit\n" -#: src/LR0.c:377 +#: src/LR0.c:375 #, c-format msgid "too many states (max %d)" msgstr "" -#: src/allocate.c:59 src/allocate.c:75 +#: src/allocate.c:58 src/allocate.c:74 #, c-format msgid "%s: memory exhausted\n" msgstr "%s: geen geheugen meer beschikbaar\n" -#: src/conflicts.c:200 src/conflicts.c:224 +#: src/conflicts.c:198 src/conflicts.c:222 msgid "reduce" msgstr "reduceer" -#: src/conflicts.c:206 src/conflicts.c:220 +#: src/conflicts.c:204 src/conflicts.c:218 msgid "shift" msgstr "verschuif" -#: src/conflicts.c:228 +#: src/conflicts.c:226 msgid "an error" msgstr "een fout" -#: src/conflicts.c:300 +#: src/conflicts.c:298 #, c-format msgid "Conflict in state %d between rule %d and token %s resolved as %s.\n" msgstr "Conflict in stadium %d tussen regel %d en teken %s opgelost als %s.\n" -#: src/conflicts.c:345 +#: src/conflicts.c:343 #, c-format msgid "State %d contains" msgstr "Stadium %d bevat" -#: src/conflicts.c:348 src/conflicts.c:393 +#: src/conflicts.c:346 src/conflicts.c:391 msgid " 1 shift/reduce conflict" msgstr " 1 verschuif/reduceer conflict" -#: src/conflicts.c:350 src/conflicts.c:395 +#: src/conflicts.c:348 src/conflicts.c:393 #, c-format msgid " %d shift/reduce conflicts" msgstr " %d verschuif/reduceer conflicten" -#: src/conflicts.c:353 src/conflicts.c:398 +#: src/conflicts.c:351 src/conflicts.c:396 msgid " and" msgstr " en" -#: src/conflicts.c:356 src/conflicts.c:401 +#: src/conflicts.c:354 src/conflicts.c:399 msgid " 1 reduce/reduce conflict" msgstr " 1 reduceer/reduceer conflict" -#: src/conflicts.c:358 src/conflicts.c:403 +#: src/conflicts.c:356 src/conflicts.c:401 #, c-format msgid " %d reduce/reduce conflicts" msgstr " %d reduceer/reduceer conflicten" #. If invoked under the name `yacc', use the output format #. specified by POSIX. -#: src/conflicts.c:379 +#: src/conflicts.c:377 msgid "conflicts: " msgstr "conflictueerd: " -#: src/conflicts.c:381 +#: src/conflicts.c:379 #, c-format msgid " %d shift/reduce" msgstr " %d vershuif/reduceer" -#: src/conflicts.c:385 +#: src/conflicts.c:383 #, c-format msgid " %d reduce/reduce" msgstr " %d reduceer/reduceer" -#: src/conflicts.c:390 +#: src/conflicts.c:388 #, c-format msgid "%s contains" msgstr "%s bevat" -#: src/conflicts.c:599 src/conflicts.c:713 +#: src/conflicts.c:597 src/conflicts.c:711 #, c-format msgid " %-4s\t[reduce using rule %d (%s)]\n" msgstr " %-4s\t[reduceer gebruikt regel %d (%s)]\n" -#: src/conflicts.c:610 src/print.c:223 +#: src/conflicts.c:608 src/print.c:221 #, c-format msgid "" " $default\treduce using rule %d (%s)\n" @@ -102,17 +102,17 @@ msgstr "" " $default\treduce using rule %d (%s)\n" "\n" -#: src/conflicts.c:696 src/conflicts.c:708 +#: src/conflicts.c:694 src/conflicts.c:706 #, c-format msgid " %-4s\treduce using rule %d (%s)\n" msgstr "" -#: src/conflicts.c:734 +#: src/conflicts.c:732 #, c-format msgid " $default\treduce using rule %d (%s)\n" msgstr "" -#: src/derives.c:109 +#: src/derives.c:108 msgid "" "\n" "\n" @@ -126,29 +126,29 @@ msgstr "" "AFGELEIDEN\n" "\n" -#: src/derives.c:113 +#: src/derives.c:112 #, c-format msgid "%s derives" msgstr "%s afgeleiden" #. Some efforts were made to ease the translators' task, please #. continue. -#: src/getargs.c:71 +#: src/getargs.c:74 msgid "GNU bison generates parsers for LALR(1) grammars.\n" msgstr "" -#: src/getargs.c:75 +#: src/getargs.c:78 #, c-format msgid "Usage: %s [OPTION]... FILE\n" msgstr "" -#: src/getargs.c:79 +#: src/getargs.c:82 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:85 +#: src/getargs.c:88 msgid "" "Operation modes:\n" " -h, --help display this help and exit\n" @@ -156,7 +156,7 @@ msgid "" " -y, --yacc emulate POSIX yacc\n" msgstr "" -#: src/getargs.c:92 +#: src/getargs.c:95 msgid "" "Parser:\n" " -t, --debug instrument the parser for debugging\n" @@ -167,7 +167,7 @@ msgid "" " -k, --token-table include a table of token names\n" msgstr "" -#: src/getargs.c:103 +#: src/getargs.c:106 msgid "" "Output:\n" " -d, --defines also produce a header file\n" @@ -176,88 +176,88 @@ msgid "" " -o, --output-file=FILE leave output to FILE\n" msgstr "" -#: src/getargs.c:111 +#: src/getargs.c:114 msgid "Report bugs to .\n" msgstr "" #. Some efforts were made to ease the translators' task, please #. continue. -#: src/getargs.c:125 +#: src/getargs.c:128 #, c-format msgid "bison (GNU Bison) %s" msgstr "" -#: src/getargs.c:130 +#: src/getargs.c:133 msgid "" "Copyright (C) 1984, 1986, 1989, 1992, 2000 Free Software Foundation, Inc.\n" msgstr "" -#: src/getargs.c:134 +#: src/getargs.c:137 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:228 +#: src/getargs.c:231 #, c-format msgid "%s: no grammar file given\n" msgstr "%s: geen grammatica bestand gegeven\n" -#: src/getargs.c:232 +#: src/getargs.c:235 #, fuzzy, c-format msgid "%s: extra arguments ignored after `%s'\n" msgstr "%s: extra argumenten genegeerd na '%s'\n" -#: src/lalr.c:294 +#: src/lalr.c:292 #, c-format msgid "too many gotos (max %d)" msgstr "" -#: src/lex.c:116 +#: src/lex.c:105 msgid "unexpected `/' found and ignored" msgstr "onverwachte `/' gevonden en genegeerd" -#: src/lex.c:145 src/reader.c:290 +#: src/lex.c:134 src/reader.c:285 msgid "unterminated comment" msgstr "ongetermineerd commentaar" -#: src/lex.c:173 +#: src/lex.c:162 #, fuzzy msgid "unexpected end of file" msgstr "Onverwacht bestandseinde" -#: src/lex.c:194 +#: src/lex.c:183 msgid "unescaped newline in constant" msgstr "niet geescapete nieuwe regel in constante" -#: src/lex.c:226 +#: src/lex.c:215 #, c-format msgid "octal value outside range 0...255: `\\%o'" msgstr "octale waarde buiten domein 0...255: `\\%o'" -#: src/lex.c:251 +#: src/lex.c:240 #, c-format msgid "hexadecimal value above 255: `\\x%x'" msgstr "hexadecimale waarde boven 255: `\\x%x'" -#: src/lex.c:262 +#: src/lex.c:251 #, c-format msgid "unknown escape sequence: `\\' followed by `%s'" msgstr "onbekende escape reeks: `\\' gevolgd door `%s'" -#: src/lex.c:395 +#: src/lex.c:384 msgid "use \"...\" for multi-character literal tokens" msgstr "gebruik \"...\" voor meerdere karakters literal tekens" -#: src/lex.c:474 +#: src/lex.c:463 msgid "unterminated type name at end of file" msgstr "niet getermineerd type naam aan het einde van bestand" -#: src/lex.c:477 +#: src/lex.c:466 msgid "unterminated type name" msgstr "niet getermineerd type naam" -#: src/main.c:144 +#: src/main.c:141 #, fuzzy, c-format msgid "%s: internal error: %s\n" msgstr "interne fout, %s\n" @@ -266,17 +266,17 @@ msgstr "interne fout, %s\n" msgid "Entering set_nullable" msgstr "Inkomende set nullable" -#: src/output.c:1208 +#: src/output.c:1236 #, fuzzy, c-format msgid "maximum table size (%d) exceeded" msgstr "maximale tabel grootte (%s) overschreden" -#: src/print.c:90 +#: src/print.c:88 #, c-format msgid " type %d is %s\n" msgstr "" -#: src/print.c:98 +#: src/print.c:96 #, c-format msgid "" "\n" @@ -289,42 +289,42 @@ msgstr "" "stadium %d\n" "\n" -#: src/print.c:142 +#: src/print.c:140 #, c-format msgid " (rule %d)" msgstr " (regel %d)" -#: src/print.c:169 +#: src/print.c:167 msgid " $default\taccept\n" msgstr "" -#: src/print.c:171 +#: src/print.c:169 msgid " NO ACTIONS\n" msgstr " GEEN AKTIES\n" #. I.e. strcmp(tags[symbol],"$")==0 -#: src/print.c:187 +#: src/print.c:185 #, c-format msgid " $ \tgo to state %d\n" msgstr "" -#: src/print.c:189 +#: src/print.c:187 #, c-format msgid " %-4s\tshift, and go to state %d\n" msgstr "" -#: src/print.c:212 +#: src/print.c:210 #, c-format msgid " %-4s\terror (nonassociative)\n" msgstr "" -#: src/print.c:238 +#: src/print.c:236 #, c-format msgid " %-4s\tgo to state %d\n" msgstr "" #. rule # : LHS -> RHS -#: src/print.c:263 +#: src/print.c:261 msgid "" "\n" "Grammar\n" @@ -332,17 +332,17 @@ msgstr "" "\n" "Grammatica\n" -#: src/print.c:268 +#: src/print.c:266 #, c-format msgid "rule %-4d %s ->" msgstr "regel %-4d %s ->" -#: src/print.c:274 +#: src/print.c:272 msgid "\t\t/* empty */" msgstr "" #. TERMINAL (type #) : rule #s terminal is on RHS -#: src/print.c:279 +#: src/print.c:277 msgid "" "\n" "Terminals, with rules where they appear\n" @@ -352,7 +352,7 @@ msgstr "" "Terminals, met regels waar ze voorkomen\n" "\n" -#: src/print.c:327 +#: src/print.c:325 msgid "" "\n" "Nonterminals, with rules where they appear\n" @@ -362,240 +362,240 @@ msgstr "" "Geen terminals, met regels waar ze voorkomen\n" "\n" -#: src/print.c:353 +#: src/print.c:351 msgid " on left:" msgstr " links:" -#: src/print.c:368 +#: src/print.c:366 msgid " on right:" msgstr " rechts:" -#: src/reader.c:158 +#: src/reader.c:153 msgid " Skipping to next \\n" msgstr " Verder naar volgende \\n" -#: src/reader.c:160 +#: src/reader.c:155 #, c-format msgid " Skipping to next %c" msgstr " Verder naar volgende %c" -#: src/reader.c:214 src/reader.c:229 +#: src/reader.c:209 src/reader.c:224 msgid "unterminated string at end of file" msgstr "niet getermineerde string aan einde van bestand" -#: src/reader.c:217 +#: src/reader.c:212 msgid "unterminated string" msgstr "niet getermineerde string" -#: src/reader.c:485 +#: src/reader.c:480 #, c-format msgid "unrecognized: %s" msgstr "onbekend: %s" -#: src/reader.c:490 +#: src/reader.c:485 msgid "no input grammar" msgstr "geen invoer grammatica" -#: src/reader.c:493 +#: src/reader.c:488 #, c-format msgid "unknown character: %s" msgstr "onbekend karakter: %s" -#: src/reader.c:545 +#: src/reader.c:540 msgid "unterminated `%{' definition" msgstr "niet getermineerde `%{' definitie" -#: src/reader.c:586 src/reader.c:774 src/reader.c:823 +#: src/reader.c:581 src/reader.c:769 src/reader.c:818 #, c-format msgid "Premature EOF after %s" msgstr "" -#: src/reader.c:623 src/reader.c:845 +#: src/reader.c:618 src/reader.c:840 #, c-format msgid "symbol %s redefined" msgstr "symbool %s opnieuw gedefinieerd" -#: src/reader.c:633 src/reader.c:789 src/reader.c:852 src/reader.c:1714 +#: src/reader.c:628 src/reader.c:784 src/reader.c:847 src/reader.c:1709 #, c-format msgid "type redeclaration for %s" msgstr "type herdeclaratie voor %s" -#: src/reader.c:643 +#: src/reader.c:638 #, c-format msgid "`%s' is invalid in %s" msgstr "`%s' is onjuist in %s" -#: src/reader.c:691 +#: src/reader.c:686 #, c-format msgid "unrecognized item %s, expected an identifier" msgstr "onbekend item %s, verwacht een identifier" -#: src/reader.c:713 +#: src/reader.c:708 #, c-format msgid "expected string constant instead of %s" msgstr "verwacht string constante in plaats van %s" -#: src/reader.c:735 src/reader.c:896 +#: src/reader.c:730 src/reader.c:891 #, fuzzy, c-format msgid "multiple %s declarations" msgstr "meerdere %start declaraties" -#: src/reader.c:737 src/reader.c:1690 +#: src/reader.c:732 src/reader.c:1685 #, fuzzy, c-format msgid "invalid %s declaration" msgstr "onjuiste %start declaratie" -#: src/reader.c:757 +#: src/reader.c:752 msgid "%type declaration has no " msgstr "%type declaratie heeft geen " -#: src/reader.c:794 +#: src/reader.c:789 #, fuzzy msgid "invalid %%type declaration due to item: %s" msgstr "onjuist %%type declaratie door item: `%s'" -#: src/reader.c:841 +#: src/reader.c:836 #, c-format msgid "redefining precedence of %s" msgstr "herdefinieren voorganger van %s" -#: src/reader.c:864 +#: src/reader.c:859 #, c-format msgid "invalid text (%s) - number should be after identifier" msgstr "onjuiste tekst (%s) - nummer hoort na de identifier" -#: src/reader.c:874 +#: src/reader.c:869 #, c-format msgid "unexpected item: %s" msgstr "onbekend item: %s" -#: src/reader.c:937 src/reader.c:1100 src/reader.c:1317 +#: src/reader.c:932 src/reader.c:1095 src/reader.c:1312 #, fuzzy, c-format msgid "unmatched %s" msgstr "niet overeenkomstige `{'" -#: src/reader.c:982 +#: src/reader.c:977 #, c-format msgid "argument of %expect is not an integer" msgstr "argument van %expect is niet een integer" -#: src/reader.c:1014 +#: src/reader.c:1009 #, c-format msgid "@%s is invalid" msgstr "@%s is onjuist" -#: src/reader.c:1029 src/reader.c:1041 +#: src/reader.c:1024 src/reader.c:1036 msgid "invalid $ value" msgstr "onjuiste $ waarde" -#: src/reader.c:1147 src/reader.c:1287 +#: src/reader.c:1142 src/reader.c:1282 #, c-format msgid "$$ of `%s' has no declared type" msgstr "$$ van `%s' heeft geen gedeclareerd type" -#: src/reader.c:1163 src/reader.c:1303 +#: src/reader.c:1158 src/reader.c:1298 #, fuzzy, c-format msgid "$%d of `%s' has no declared type" msgstr "$%s van `%s' heeft geen gedeclareerd type" -#: src/reader.c:1168 src/reader.c:1308 +#: src/reader.c:1163 src/reader.c:1303 #, c-format msgid "$%s is invalid" msgstr "$%s is onjuist" -#: src/reader.c:1177 +#: src/reader.c:1172 #, fuzzy, c-format msgid "unterminated %guard clause" msgstr "niet getermineerde %%guard voorwaarde" -#: src/reader.c:1403 +#: src/reader.c:1398 msgid "ill-formed rule: initial symbol not followed by colon" msgstr "" "slecht geformuleerde regel: initieel symbool niet gevolgd door dubbele punt" -#: src/reader.c:1410 +#: src/reader.c:1405 msgid "grammar starts with vertical bar" msgstr "grammatica start met een verticale bar" -#: src/reader.c:1441 +#: src/reader.c:1436 #, c-format msgid "rule given for %s, which is a token" msgstr "regel geven voor %s, welke een teken is" -#: src/reader.c:1539 +#: src/reader.c:1534 msgid "two @prec's in a row" msgstr "twee @prec's in een regel" -#: src/reader.c:1548 +#: src/reader.c:1543 #, fuzzy, c-format msgid "%guard present but %semantic_parser not specified" msgstr "%%guard aanwezig maar %%semantic_parser niet gespecificeerd" -#: src/reader.c:1557 +#: src/reader.c:1552 msgid "two actions at end of one rule" msgstr "twee akties aan het einde van een regel" -#: src/reader.c:1572 +#: src/reader.c:1567 #, c-format msgid "type clash (`%s' `%s') on default action" msgstr "type clash (`%s' `%s') bij standaard aktie" -#: src/reader.c:1578 +#: src/reader.c:1573 msgid "empty rule for typed nonterminal, and no action" msgstr "lege regel voor getypte niet terminal, en geen aktie" -#: src/reader.c:1622 +#: src/reader.c:1617 #, c-format msgid "invalid input: %s" msgstr "ongeldige invoer: %s" -#: src/reader.c:1630 +#: src/reader.c:1625 #, fuzzy, c-format msgid "too many symbols (tokens plus nonterminals); maximum %d" msgstr "te veel symbolen (tekens plus nietterminals); maximum %s" -#: src/reader.c:1633 +#: src/reader.c:1628 msgid "no rules in the input grammar" msgstr "geen regels voor invoer grammatica" -#: src/reader.c:1651 +#: src/reader.c:1646 #, 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:1770 +#: src/reader.c:1765 #, c-format msgid "conflicting precedences for %s and %s" msgstr "conflictuerende precedentein voor %s en %s" -#: src/reader.c:1782 +#: src/reader.c:1777 #, c-format msgid "conflicting assoc values for %s and %s" msgstr "conflictuerende associatieve waarden voor %s en %s" -#: src/reader.c:1833 +#: src/reader.c:1828 #, c-format msgid "tokens %s and %s both assigned number %d" msgstr "" -#: src/reader.c:1847 +#: src/reader.c:1842 #, c-format msgid "the start symbol %s is undefined" msgstr "" -#: src/reader.c:1849 +#: src/reader.c:1844 #, c-format msgid "the start symbol %s is a token" msgstr "het start symbool %s is een token" -#: src/reduce.c:144 +#: src/reduce.c:142 #, c-format msgid "Start symbol %s does not derive any sentence" msgstr "Start symbool %s is niet afkomstig uit een zin" -#: src/reduce.c:158 +#: src/reduce.c:156 #, c-format msgid "" "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n" @@ -603,7 +603,7 @@ msgstr "" "gereduceerd %s gedefinieerd %d terminal%s, %d nietterminal%s, en %d " "productie%s.\n" -#: src/reduce.c:496 +#: src/reduce.c:494 msgid "" "Useless nonterminals:\n" "\n" @@ -611,7 +611,7 @@ msgstr "" "Onbruikbare niet terminals:\n" "\n" -#: src/reduce.c:508 +#: src/reduce.c:506 msgid "" "\n" "\n" @@ -623,7 +623,7 @@ msgstr "" "Terminals welke niet worden gebruikt:\n" "\n" -#: src/reduce.c:517 +#: src/reduce.c:515 msgid "" "\n" "\n" @@ -635,7 +635,7 @@ msgstr "" "Onbruikbare regels:\n" "\n" -#: src/reduce.c:546 +#: src/reduce.c:544 msgid "" "Variables\n" "---------\n" @@ -645,11 +645,11 @@ msgstr "" "----------\n" "\n" -#: src/reduce.c:547 +#: src/reduce.c:545 msgid "Value Sprec Sassoc Tag\n" msgstr "Waarde Sprec Sassoc Tag\n" -#: src/reduce.c:552 +#: src/reduce.c:550 msgid "" "Rules\n" "-----\n" @@ -659,7 +659,7 @@ msgstr "" "------\n" "\n" -#: src/reduce.c:562 +#: src/reduce.c:560 msgid "" "Rules interpreted\n" "-----------------\n" @@ -669,26 +669,26 @@ msgstr "" "-----------------------\n" "\n" -#: src/reduce.c:579 +#: src/reduce.c:577 #, c-format msgid "%d rules never reduced\n" msgstr "%d regels nooit gereduceerd\n" -#: src/reduce.c:581 +#: src/reduce.c:579 #, c-format msgid "%s contains " msgstr "%s bevat" -#: src/reduce.c:585 +#: src/reduce.c:583 #, c-format msgid "%d useless nonterminal%s" msgstr "%d onbruikbare niet terminal%s" -#: src/reduce.c:590 +#: src/reduce.c:588 msgid " and " msgstr " en " -#: src/reduce.c:594 +#: src/reduce.c:592 #, c-format msgid "%d useless rule%s" msgstr "%d onbruikbare regels%s" diff --git a/po/ru.po b/po/ru.po index 7ff83639..8ffe63ad 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-09-18 15:25+0200\n" +"POT-Creation-Date: 2000-09-19 20:18+0200\n" "PO-Revision-Date: 2000-04-12 13:16+04:00\n" "Last-Translator: Dmitry S. Sivachenko \n" "Language-Team: Russian \n" @@ -13,88 +13,88 @@ msgstr "" "Content-Type: text/plain; charset=koi8-r\n" "Content-Transfer-Encoding: 8-bit\n" -#: src/LR0.c:377 +#: src/LR0.c:375 #, c-format msgid "too many states (max %d)" msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ ÓÏÓÔÏÑÎÉÊ (ÍÁËÓÉÍÁÌØÎÏ %d)" -#: src/allocate.c:59 src/allocate.c:75 +#: src/allocate.c:58 src/allocate.c:74 #, c-format msgid "%s: memory exhausted\n" msgstr "%s: ÐÁÍÑÔØ ÉÓÞÅÒÐÁÎÁ\n" -#: src/conflicts.c:200 src/conflicts.c:224 +#: src/conflicts.c:198 src/conflicts.c:222 msgid "reduce" msgstr "×Ù×ÏÄ" -#: src/conflicts.c:206 src/conflicts.c:220 +#: src/conflicts.c:204 src/conflicts.c:218 msgid "shift" msgstr "ÓÄ×ÉÇ" -#: src/conflicts.c:228 +#: src/conflicts.c:226 msgid "an error" msgstr "ÏÛÉÂËÁ" -#: src/conflicts.c:300 +#: src/conflicts.c:298 #, c-format msgid "Conflict in state %d between rule %d and token %s resolved as %s.\n" msgstr "" "ëÏÎÆÌÉËÔ × ÓÏÓÔÏÑÎÉÉ %d ÍÅÖÄÕ ÐÒÁ×ÉÌÏÍ %d É ÌÅËÓÅÍÏÊ %s ÒÁÚÒÅÛÅÎ ËÁË %s.\n" -#: src/conflicts.c:345 +#: src/conflicts.c:343 #, c-format msgid "State %d contains" msgstr "óÏÓÔÏÑÎÉÅ %d ÓÏÄÅÒÖÉÔ" -#: src/conflicts.c:348 src/conflicts.c:393 +#: src/conflicts.c:346 src/conflicts.c:391 msgid " 1 shift/reduce conflict" msgstr " 1 ËÏÎÆÌÉËÔ ÓÄ×ÉÇÁ/×Ù×ÏÄÁ" -#: src/conflicts.c:350 src/conflicts.c:395 +#: src/conflicts.c:348 src/conflicts.c:393 #, c-format msgid " %d shift/reduce conflicts" msgstr " %d ËÏÎÆÌÉËÔÏ× ÓÄ×ÉÇÁ/×Ù×ÏÄÁ" -#: src/conflicts.c:353 src/conflicts.c:398 +#: src/conflicts.c:351 src/conflicts.c:396 msgid " and" msgstr " É" -#: src/conflicts.c:356 src/conflicts.c:401 +#: src/conflicts.c:354 src/conflicts.c:399 msgid " 1 reduce/reduce conflict" msgstr " 1 ËÏÎÆÌÉËÔ ×Ù×ÏÄÁ/×Ù×ÏÄÁ" -#: src/conflicts.c:358 src/conflicts.c:403 +#: src/conflicts.c:356 src/conflicts.c:401 #, c-format msgid " %d reduce/reduce conflicts" msgstr " %d ËÏÎÆÌÉËÔÏ× ×Ù×ÏÄÁ/×Ù×ÏÄÁ" #. If invoked under the name `yacc', use the output format #. specified by POSIX. -#: src/conflicts.c:379 +#: src/conflicts.c:377 msgid "conflicts: " msgstr "ËÏÎÆÌÉËÔÙ: " -#: src/conflicts.c:381 +#: src/conflicts.c:379 #, c-format msgid " %d shift/reduce" msgstr " %d ÓÄ×ÉÇ/×Ù×ÏÄ" -#: src/conflicts.c:385 +#: src/conflicts.c:383 #, c-format msgid " %d reduce/reduce" msgstr " %d ×Ù×ÏÄ/×Ù×ÏÄ" -#: src/conflicts.c:390 +#: src/conflicts.c:388 #, c-format msgid "%s contains" msgstr "%s ÓÏÄÅÒÖÉÔ" -#: src/conflicts.c:599 src/conflicts.c:713 +#: src/conflicts.c:597 src/conflicts.c:711 #, c-format msgid " %-4s\t[reduce using rule %d (%s)]\n" msgstr " %-4s\t[×Ù×ÏÄ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÐÒÁ×ÉÌÁ %d (%s)]\n" -#: src/conflicts.c:610 src/print.c:223 +#: src/conflicts.c:608 src/print.c:221 #, c-format msgid "" " $default\treduce using rule %d (%s)\n" @@ -103,17 +103,17 @@ msgstr "" " $default\t×Ù×ÏÄ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÐÒÁ×ÉÌÁ %d (%s)\n" "\n" -#: src/conflicts.c:696 src/conflicts.c:708 +#: src/conflicts.c:694 src/conflicts.c:706 #, c-format msgid " %-4s\treduce using rule %d (%s)\n" msgstr " %-4s\t×Ù×ÏÄ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÐÒÁ×ÉÌÁ %d (%s)\n" -#: src/conflicts.c:734 +#: src/conflicts.c:732 #, c-format msgid " $default\treduce using rule %d (%s)\n" msgstr " $default\t×Ù×ÏÄ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÐÒÁ×ÉÌÁ %d (%s)\n" -#: src/derives.c:109 +#: src/derives.c:108 msgid "" "\n" "\n" @@ -127,23 +127,23 @@ msgstr "" "DERIVES\n" "\n" -#: src/derives.c:113 +#: src/derives.c:112 #, c-format msgid "%s derives" msgstr "%s ×Ù×ÏÄÉÔ" #. Some efforts were made to ease the translators' task, please #. continue. -#: src/getargs.c:71 +#: src/getargs.c:74 msgid "GNU bison generates parsers for LALR(1) grammars.\n" msgstr "GNU bison ÇÅÎÅÒÉÒÕÅÔ ÁÎÁÌÉÚÁÔÏÒÙ ÄÌÑ ÇÒÁÍÍÁÔÉË LALR(1).\n" -#: src/getargs.c:75 +#: src/getargs.c:78 #, c-format msgid "Usage: %s [OPTION]... FILE\n" msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþé]... æáêì\n" -#: src/getargs.c:79 +#: src/getargs.c:82 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" @@ -152,7 +152,7 @@ msgstr "" "Ñ×ÌÑÅÔÓÑ ÏÂÑÚÁÔÅÌØÎÙÍ ÄÌÑ ËÏÒÏÔËÏÊ ÆÏÒÍÙ. ôÏ ÖÅ ËÁÓÁÅÔÓÑ ÎÅÏÂÑÚÁÔÅÌØÎÙÈ\n" "ÁÒÇÕÍÅÎÔÏ×.\n" -#: src/getargs.c:85 +#: src/getargs.c:88 msgid "" "Operation modes:\n" " -h, --help display this help and exit\n" @@ -164,7 +164,7 @@ msgstr "" " -V, --version ×Ù×ÅÓÔÉ ÉÎÆÏÒÍÁÃÉÀ Ï ×ÅÒÓÉÉ É ×ÙÊÔÉ\n" " -y, --yacc ÜÍÕÌÉÒÏ×ÁÔØ POSIX yacc\n" -#: src/getargs.c:92 +#: src/getargs.c:95 msgid "" "Parser:\n" " -t, --debug instrument the parser for debugging\n" @@ -182,7 +182,7 @@ msgstr "" " -r, --raw ÎÕÍÅÒÏ×ÁÔØ ÌÅËÓÅÍÙ, ÎÁÞÉÎÁÑ Ó 3\n" " -k, --token-table ×ËÌÀÞÉÔØ ÔÁÂÌÉÃÕ ÉÍÅÎ ÌÅËÓÅÍ\n" -#: src/getargs.c:103 +#: src/getargs.c:106 msgid "" "Output:\n" " -d, --defines also produce a header file\n" @@ -196,87 +196,87 @@ msgstr "" " -b, --file-prefix=ðòåæéëó ÕËÁÚÁÔØ ðòåæéëó ÄÌÑ ×ÙÈÏÄÎÙÈ ÆÁÊÌÏ×\n" " -o, --output-file=æáêì ÐÏÍÅÓÔÉÔØ ÒÅÚÕÌØÔÁÔ × æáêì\n" -#: src/getargs.c:111 +#: src/getargs.c:114 msgid "Report bugs to .\n" msgstr "ïÛÉÂËÉ ÓÏÏÂÝÁÊÔÅ ÐÏ ÁÄÒÅÓÕ .\n" #. Some efforts were made to ease the translators' task, please #. continue. -#: src/getargs.c:125 +#: src/getargs.c:128 #, c-format msgid "bison (GNU Bison) %s" msgstr "" -#: src/getargs.c:130 +#: src/getargs.c:133 msgid "" "Copyright (C) 1984, 1986, 1989, 1992, 2000 Free Software Foundation, Inc.\n" msgstr "" -#: src/getargs.c:134 +#: src/getargs.c:137 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:228 +#: src/getargs.c:231 #, c-format msgid "%s: no grammar file given\n" msgstr "%s: ÎÅ ÚÁÄÁÎ ÆÁÊÌ Ó ÇÒÁÍÍÁÔÉËÏÊ\n" -#: src/getargs.c:232 +#: src/getargs.c:235 #, c-format msgid "%s: extra arguments ignored after `%s'\n" msgstr "%s: ÌÉÛÎÉÅ ÁÒÇÕÍÅÎÔÙ ÐÏÓÌÅ `%s' ÉÇÎÏÒÉÒÏ×ÁÎÙ\n" -#: src/lalr.c:294 +#: src/lalr.c:292 #, c-format msgid "too many gotos (max %d)" msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ goto (ÍÁËÓÉÍÁÌØÎÏ %d)" -#: src/lex.c:116 +#: src/lex.c:105 msgid "unexpected `/' found and ignored" msgstr "×ÓÔÒÅÞÅÎ É ÐÒÏÉÇÎÏÒÉÒÏ×ÁÎ ÎÅÏÖÉÄÁÎÎÙÊ ÓÉÍ×ÏÌ `/'" -#: src/lex.c:145 src/reader.c:290 +#: src/lex.c:134 src/reader.c:285 msgid "unterminated comment" msgstr "ÎÅÚÁËÏÎÞÅÎÎÙÊ ËÏÍÍÅÎÔÁÒÉÊ" -#: src/lex.c:173 +#: src/lex.c:162 msgid "unexpected end of file" msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ËÏÎÅà ÆÁÊÌÁ" -#: src/lex.c:194 +#: src/lex.c:183 msgid "unescaped newline in constant" msgstr "ÎÅÜËÒÁÎÉÒÏ×ÁÎÎÙÊ ÐÅÒÅ×ÏÄ ÓÔÒÏËÉ × ËÏÎÓÔÁÎÔÅ" -#: src/lex.c:226 +#: src/lex.c:215 #, c-format msgid "octal value outside range 0...255: `\\%o'" msgstr "×ÏÓØÍÅÒÉÞÎÁÑ ×ÅÌÉÞÉÎÁ ÚÁ ÐÒÅÄÅÌÁÍÉ ÄÉÁÐÁÚÏÎÁ 0...255: `\\%o'" -#: src/lex.c:251 +#: src/lex.c:240 #, c-format msgid "hexadecimal value above 255: `\\x%x'" msgstr "ÛÅÓÔÎÁÄÃÁÔÅÒÉÞÎÁÑ ×ÅÌÉÞÉÎÁ ÐÒÅ×ÙÛÁÅÔ 255: `\\x%x'" -#: src/lex.c:262 +#: src/lex.c:251 #, c-format msgid "unknown escape sequence: `\\' followed by `%s'" msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ escape-ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ: `%s' ÐÏÓÌÅ `\\'" -#: src/lex.c:395 +#: src/lex.c:384 msgid "use \"...\" for multi-character literal tokens" msgstr "ÉÓÐÏÌØÚÕÊÔÅ \"...\" ÄÌÑ ÍÎÏÇÏÓÉÍ×ÏÌØÎÙÈ ÌÉÔÅÒÁÌØÎÙÈ ÌÅËÓÅÍ" -#: src/lex.c:474 +#: src/lex.c:463 msgid "unterminated type name at end of file" msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ ÉÍÑ ÔÉÐÁ × ËÏÎÃÅ ÆÁÊÌÁ" -#: src/lex.c:477 +#: src/lex.c:466 msgid "unterminated type name" msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ ÉÍÑ ÔÉÐÁ" -#: src/main.c:144 +#: src/main.c:141 #, c-format msgid "%s: internal error: %s\n" msgstr "%s: ×ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ: %s\n" @@ -285,17 +285,17 @@ msgstr "%s: msgid "Entering set_nullable" msgstr "÷ÈÏÄ × set_nullable" -#: src/output.c:1208 +#: src/output.c:1236 #, c-format msgid "maximum table size (%d) exceeded" msgstr "ÐÒÅ×ÙÛÅÎ ÍÁËÓÉÍÁÌØÎÙÊ ÒÁÚÍÅÒ ÔÁÂÌÉÃÙ (%d)" -#: src/print.c:90 +#: src/print.c:88 #, c-format msgid " type %d is %s\n" msgstr " ÔÉÐ %d Ñ×ÌÑÅÔÓÑ %s\n" -#: src/print.c:98 +#: src/print.c:96 #, c-format msgid "" "\n" @@ -308,42 +308,42 @@ msgstr "" "ÓÏÓÔÏÑÎÉÅ %d\n" "\n" -#: src/print.c:142 +#: src/print.c:140 #, c-format msgid " (rule %d)" msgstr " (ÐÒÁ×ÉÌÏ %d)" -#: src/print.c:169 +#: src/print.c:167 msgid " $default\taccept\n" msgstr " $default\tÐÒÉÎÑÔÉÅ\n" -#: src/print.c:171 +#: src/print.c:169 msgid " NO ACTIONS\n" msgstr " îåô äåêóô÷éê\n" #. I.e. strcmp(tags[symbol],"$")==0 -#: src/print.c:187 +#: src/print.c:185 #, c-format msgid " $ \tgo to state %d\n" msgstr " $ \tÐÅÒÅÈÏÄ × ÓÏÓÔÏÑÎÉÅ %d\n" -#: src/print.c:189 +#: src/print.c:187 #, c-format msgid " %-4s\tshift, and go to state %d\n" msgstr " %-4s\tÓÄ×ÉÇ, É ÐÅÒÅÈÏÄ × ÓÏÓÔÏÑÎÉÅ %d\n" -#: src/print.c:212 +#: src/print.c:210 #, c-format msgid " %-4s\terror (nonassociative)\n" msgstr " %-4s\tÏÛÉÂËÁ (ÎÅÁÓÓÏÃÉÁÔÉ×ÎÁÑ)\n" -#: src/print.c:238 +#: src/print.c:236 #, c-format msgid " %-4s\tgo to state %d\n" msgstr " %-4s\tÐÅÒÅÈÏÄ × ÓÏÓÔÏÑÎÉÅ %d\n" #. rule # : LHS -> RHS -#: src/print.c:263 +#: src/print.c:261 msgid "" "\n" "Grammar\n" @@ -351,17 +351,17 @@ msgstr "" "\n" "çÒÁÍÍÁÔÉËÁ\n" -#: src/print.c:268 +#: src/print.c:266 #, c-format msgid "rule %-4d %s ->" msgstr "ÐÒÁ×ÉÌÏ %-4d %s ->" -#: src/print.c:274 +#: src/print.c:272 msgid "\t\t/* empty */" msgstr "\t\t/* ÐÕÓÔÏ */" #. TERMINAL (type #) : rule #s terminal is on RHS -#: src/print.c:279 +#: src/print.c:277 msgid "" "\n" "Terminals, with rules where they appear\n" @@ -371,7 +371,7 @@ msgstr "" "ôÅÒÍÉÎÁÌØÎÙÅ ÓÉÍ×ÏÌÙ Ó ÐÒÁ×ÉÌÁÍÉ, × ËÏÔÏÒÙÈ ÏÎÉ ÐÏÑ×ÌÑÀÔÓÑ\n" "\n" -#: src/print.c:327 +#: src/print.c:325 msgid "" "\n" "Nonterminals, with rules where they appear\n" @@ -381,237 +381,237 @@ msgstr "" "îÅÔÅÒÍÉÎÁÌØÎÙÅ ÓÉÍ×ÏÌÙ Ó ÐÒÁ×ÉÌÁÍÉ, × ËÏÔÏÒÙÈ ÏÎÉ ÐÏÑ×ÌÑÀÔÓÑ\n" "\n" -#: src/print.c:353 +#: src/print.c:351 msgid " on left:" msgstr " ÎÁÌÅ×Ï:" -#: src/print.c:368 +#: src/print.c:366 msgid " on right:" msgstr " ÎÁÐÒÁ×Ï:" -#: src/reader.c:158 +#: src/reader.c:153 msgid " Skipping to next \\n" msgstr " ðÒÏÐÕÓË ÄÏ ÓÌÅÄÕÀÝÅÇÏ \\n" -#: src/reader.c:160 +#: src/reader.c:155 #, c-format msgid " Skipping to next %c" msgstr " ðÒÏÐÕÓË ÄÏ ÓÌÅÄÕÀÝÅÇÏ %c" -#: src/reader.c:214 src/reader.c:229 +#: src/reader.c:209 src/reader.c:224 msgid "unterminated string at end of file" msgstr "ÎÅÚÁËÏÎÞÅÎÎÁÑ ÓÔÒÏËÁ × ËÏÎÃÅ ÆÁÊÌÁ" -#: src/reader.c:217 +#: src/reader.c:212 msgid "unterminated string" msgstr "ÎÅÚÁËÏÎÞÅÎÎÁÑ ÓÔÒÏËÁ" -#: src/reader.c:485 +#: src/reader.c:480 #, c-format msgid "unrecognized: %s" msgstr "ÎÅÒÁÓÐÏÚÎÁÎÏ: %s" -#: src/reader.c:490 +#: src/reader.c:485 msgid "no input grammar" msgstr "ÎÅÔ ×ÈÏÄÎÏÊ ÇÒÁÍÍÁÔÉËÉ" -#: src/reader.c:493 +#: src/reader.c:488 #, c-format msgid "unknown character: %s" msgstr "ÎÅÉÚ×ÅÓÔÎÙÊ ÓÉÍ×ÏÌ: %s" -#: src/reader.c:545 +#: src/reader.c:540 msgid "unterminated `%{' definition" msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ ÏÐÒÅÄÅÌÅÎÉÅ `%{'" -#: src/reader.c:586 src/reader.c:774 src/reader.c:823 +#: src/reader.c:581 src/reader.c:769 src/reader.c:818 #, c-format msgid "Premature EOF after %s" msgstr "ðÒÅÖÄÅ×ÒÅÍÅÎÎÙÊ ËÏÎÅà ÆÁÊÌÁ ÐÏÓÌÅ %s" -#: src/reader.c:623 src/reader.c:845 +#: src/reader.c:618 src/reader.c:840 #, c-format msgid "symbol %s redefined" msgstr "ÐÏ×ÔÏÒÎÏÅ ÏÐÒÅÄÅÌÅÎÉÅ ÓÉÍ×ÏÌÁ %s" -#: src/reader.c:633 src/reader.c:789 src/reader.c:852 src/reader.c:1714 +#: src/reader.c:628 src/reader.c:784 src/reader.c:847 src/reader.c:1709 #, c-format msgid "type redeclaration for %s" msgstr "ÐÏ×ÔÏÒÎÏÅ ÏÐÉÓÁÎÉÅ ÔÉÐÁ ÄÌÑ %s" -#: src/reader.c:643 +#: src/reader.c:638 #, c-format msgid "`%s' is invalid in %s" msgstr "`%s' ÎÅ×ÅÒÎÏ × %s" -#: src/reader.c:691 +#: src/reader.c:686 #, c-format msgid "unrecognized item %s, expected an identifier" msgstr "ÎÅÒÁÓÐÏÚÎÁÎÎÙÊ ÜÌÅÍÅÎÔ %s, ÏÖÉÄÁÌÓÑ ÉÄÅÎÔÉÆÉËÁÔÏÒ" -#: src/reader.c:713 +#: src/reader.c:708 #, c-format msgid "expected string constant instead of %s" msgstr "×ÍÅÓÔÏ %s ÏÖÉÄÁÌÁÓØ ÓÔÒÏËÏ×ÁÑ ÐÏÓÔÏÑÎÎÁÑ" -#: src/reader.c:735 src/reader.c:896 +#: src/reader.c:730 src/reader.c:891 #, fuzzy, c-format msgid "multiple %s declarations" msgstr "ÍÎÏÖÅÓÔ×ÅÎÎÏÅ ÏÐÉÓÁÎÉÅ %start" -#: src/reader.c:737 src/reader.c:1690 +#: src/reader.c:732 src/reader.c:1685 #, fuzzy, c-format msgid "invalid %s declaration" msgstr "ÎÅ×ÅÒÎÏÅ ÏÐÉÓÁÎÉÅ %start" -#: src/reader.c:757 +#: src/reader.c:752 msgid "%type declaration has no " msgstr "ÏÐÉÓÁÎÉÅ %type ÎÅ ÉÍÅÅÔ <ÉÍÑ_ÔÉÐÁ>" -#: src/reader.c:794 +#: src/reader.c:789 msgid "invalid %%type declaration due to item: %s" msgstr "ÎÅ×ÅÒÎÏÅ ÏÐÉÓÁÎÉÅ %%type ÉÚ-ÚÁ ÜÌÅÍÅÎÔÁ: %s" -#: src/reader.c:841 +#: src/reader.c:836 #, c-format msgid "redefining precedence of %s" msgstr "ÐÅÒÅÏÐÒÅÄÅÌÅÎÉÅ ÐÒÉÏÒÉÔÅÔÁ ÄÌÑ %s" -#: src/reader.c:864 +#: src/reader.c:859 #, c-format msgid "invalid text (%s) - number should be after identifier" msgstr "ÎÅ×ÅÒÎÙÊ ÔÅËÓÔ (%s) - ÞÉÓÌÏ ÄÏÌÖÎÏ ÓÌÅÄÏ×ÁÔØ ÚÁ ÉÄÅÎÔÉÆÉËÁÔÏÒÏÍ" -#: src/reader.c:874 +#: src/reader.c:869 #, c-format msgid "unexpected item: %s" msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ÜÌÅÍÅÎÔ: %s" -#: src/reader.c:937 src/reader.c:1100 src/reader.c:1317 +#: src/reader.c:932 src/reader.c:1095 src/reader.c:1312 #, fuzzy, c-format msgid "unmatched %s" msgstr "ÎÅÐÁÒÎÁÑ `{'" -#: src/reader.c:982 +#: src/reader.c:977 #, c-format msgid "argument of %expect is not an integer" msgstr "ÁÒÇÕÍÅÎÔ %expect ÎÅ Ñ×ÌÑÅÔÓÑ ÃÅÌÙÍ ÞÉÓÌÏÍ" -#: src/reader.c:1014 +#: src/reader.c:1009 #, c-format msgid "@%s is invalid" msgstr "ÎÅ×ÅÒÎÙÊ ÚÎÁË @%s" -#: src/reader.c:1029 src/reader.c:1041 +#: src/reader.c:1024 src/reader.c:1036 msgid "invalid $ value" msgstr "ÎÅ×ÅÒÎÏÅ $ ÚÎÁÞÅÎÉÅ" -#: src/reader.c:1147 src/reader.c:1287 +#: src/reader.c:1142 src/reader.c:1282 #, c-format msgid "$$ of `%s' has no declared type" msgstr "$$ × `%s' ÎÅ ÉÍÅÅÔ ÏÐÉÓÁÎÎÏÇÏ ÔÉÐÁ" -#: src/reader.c:1163 src/reader.c:1303 +#: src/reader.c:1158 src/reader.c:1298 #, c-format msgid "$%d of `%s' has no declared type" msgstr "$%d ÉÚ `%s' ÎÅ ÉÍÅÅÔ ÏÐÉÓÁÎÎÏÇÏ ÔÉÐÁ" -#: src/reader.c:1168 src/reader.c:1308 +#: src/reader.c:1163 src/reader.c:1303 #, c-format msgid "$%s is invalid" msgstr "ÎÅ×ÅÒÎÙÊ ÚÎÁË $%s" -#: src/reader.c:1177 +#: src/reader.c:1172 #, c-format msgid "unterminated %guard clause" msgstr "ÎÅÚÁËÏÎÞÅÎÎÙÊ ÏÐÅÒÁÔÏÒ %guard" -#: src/reader.c:1403 +#: src/reader.c:1398 msgid "ill-formed rule: initial symbol not followed by colon" msgstr "ÎÅ×ÅÒÎÏÅ ÐÒÁ×ÉÌÏ: Ä×ÏÅÔÏÞÉÅ ÎÅ ÓÌÅÄÕÅÔ ÚÁ ÎÁÞÁÌØÎÙÍ ÓÉÍ×ÏÌÏÍ" -#: src/reader.c:1410 +#: src/reader.c:1405 msgid "grammar starts with vertical bar" msgstr "ÇÒÁÍÍÁÔÉËÁ ÎÁÞÉÎÁÅÔÓÑ Ó ×ÅÒÔÉËÁÌØÎÏÊ ÞÅÒÔÙ" -#: src/reader.c:1441 +#: src/reader.c:1436 #, c-format msgid "rule given for %s, which is a token" msgstr "ÐÒÁ×ÉÌÏ ÚÁÄÁÎÏ ÄÌÑ %s, ËÏÔÏÒÙÊ Ñ×ÌÑÅÔÓÑ ÌÅËÓÅÍÏÊ" -#: src/reader.c:1539 +#: src/reader.c:1534 msgid "two @prec's in a row" msgstr "Ä×Á @prec ÐÏÄÒÑÄ" -#: src/reader.c:1548 +#: src/reader.c:1543 #, c-format msgid "%guard present but %semantic_parser not specified" msgstr "%guard ÐÒÉÓÕÔÓÔ×ÕÅÔ, Á %semantic_parser ÎÅ ÚÁÄÁÎ" -#: src/reader.c:1557 +#: src/reader.c:1552 msgid "two actions at end of one rule" msgstr "Ä×Á ÄÅÊÓÔ×ÉÑ × ËÏÎÃÅ ÏÄÎÏÇÏ ÐÒÁ×ÉÌÁ" -#: src/reader.c:1572 +#: src/reader.c:1567 #, c-format msgid "type clash (`%s' `%s') on default action" msgstr "ËÏÎÆÌÉËÔ ÔÉÐÏ× (`%s' `%s') ÎÁ ÄÅÊÓÔ×ÉÉ ÐÏ ÕÍÏÌÞÁÎÉÀ" -#: src/reader.c:1578 +#: src/reader.c:1573 msgid "empty rule for typed nonterminal, and no action" msgstr "" "ÐÕÓÔÏÅ ÐÒÁ×ÉÌÏ ÄÌÑ ÔÉÐÉÚÉÒÏ×ÁÎÎÏÇÏ ÎÅÔÅÒÍÉÎÁÌØÎÏÇÏ ÓÉÍ×ÏÌÁ, É ÎÅÔ ÄÅÊÓÔ×ÉÑ" -#: src/reader.c:1622 +#: src/reader.c:1617 #, c-format msgid "invalid input: %s" msgstr "ÎÅ×ÅÒÎÙÅ ×ÈÏÄÎÙÅ ÄÁÎÎÙÅ: %s" -#: src/reader.c:1630 +#: src/reader.c:1625 #, c-format msgid "too many symbols (tokens plus nonterminals); maximum %d" msgstr "ÓÌÉÛËÏÍ ÍÎÏÇÏ ÓÉÍ×ÏÌÏ× (ÌÅËÓÅÍÙ ÐÌÀÓ ÎÅÔÅÒÍÉÎÁÌÙ); ÍÁËÓÉÍÁÌØÎÏ %d" -#: src/reader.c:1633 +#: src/reader.c:1628 msgid "no rules in the input grammar" msgstr "ÏÔÓÕÔÓÔ×ÕÀÔ ÐÒÁ×ÉÌÁ ×Ï ×ÈÏÄÎÏÊ ÇÒÁÍÍÁÔÉËÅ" -#: src/reader.c:1651 +#: src/reader.c:1646 #, c-format msgid "symbol %s is used, but is not defined as a token and has no rules" msgstr "ÓÉÍ×ÏÌ %s ÉÓÐÏÌØÚÕÅÔÓÑ, ÎÏ ÎÅ ÏÐÒÅÄÅÌÅÎ ËÁË ÌÅËÓÅÍÁ É ÎÅ ÉÍÅÅÔ ÐÒÁ×ÉÌ" -#: src/reader.c:1770 +#: src/reader.c:1765 #, c-format msgid "conflicting precedences for %s and %s" msgstr "ÐÒÏÔÉ×ÏÒÅÞÉ×ÙÅ ÐÒÉÏÒÉÔÅÔÙ ÄÌÑ %s É %s" -#: src/reader.c:1782 +#: src/reader.c:1777 #, c-format msgid "conflicting assoc values for %s and %s" msgstr "ÐÒÏÔÉ×ÏÒÅÞÉ×ÙÅ ÚÎÁÞÅÎÉÑ ÁÓÓÏÃÉÁÔÉ×ÎÏÓÔÉ ÄÌÑ %s É %s" -#: src/reader.c:1833 +#: src/reader.c:1828 #, c-format msgid "tokens %s and %s both assigned number %d" msgstr "ÏÂÅÉÍ ÌÅËÓÅÍÁÍ %s É %s ÐÒÉÓ×ÏÅÎ ÎÏÍÅÒ %d" -#: src/reader.c:1847 +#: src/reader.c:1842 #, c-format msgid "the start symbol %s is undefined" msgstr "ÎÁÞÁÌØÎÙÊ ÓÉÍ×ÏÌ %s ÎÅÏÐÒÅÄÅÌÅÎ" -#: src/reader.c:1849 +#: src/reader.c:1844 #, c-format msgid "the start symbol %s is a token" msgstr "ÎÁÞÁÌØÎÙÊ ÓÉÍ×ÏÌ %s Ñ×ÌÑÅÔÓÑ ÌÅËÓÅÍÏÊ" -#: src/reduce.c:144 +#: src/reduce.c:142 #, c-format msgid "Start symbol %s does not derive any sentence" msgstr "îÁÞÁÌØÎÙÊ ÓÉÍ×ÏÌ %s ÎÅ ×Ù×ÏÄÉÔ ÎÉ ÏÄÎÏÇÏ ÐÒÅÄÌÏÖÅÎÉÑ" -#: src/reduce.c:158 +#: src/reduce.c:156 #, c-format msgid "" "reduced %s defines %d terminal%s, %d nonterminal%s, and %d production%s.\n" @@ -619,7 +619,7 @@ msgstr "" "×Ù×ÅÄÅÎÎÙÊ %s ÏÐÒÅÄÅÌÑÅÔ %d ÔÅÒÍÉÎÁÌÏ×%s, %d ÎÅÔÅÒÍÉÎÁÌÏ×%s, É %d ÐÒÁ×ÉÌ " "×Ù×ÏÄÁ%s.\n" -#: src/reduce.c:496 +#: src/reduce.c:494 msgid "" "Useless nonterminals:\n" "\n" @@ -627,7 +627,7 @@ msgstr "" "âÅÓÐÏÌÅÚÎÙÅ ÎÅÔÅÒÍÉÎÁÌÙ:\n" "\n" -#: src/reduce.c:508 +#: src/reduce.c:506 msgid "" "\n" "\n" @@ -639,7 +639,7 @@ msgstr "" "îÅÉÓÐÏÌØÚÏ×ÁÎÎÙÅ ÔÅÒÍÉÎÁÌÙ:\n" "\n" -#: src/reduce.c:517 +#: src/reduce.c:515 msgid "" "\n" "\n" @@ -651,7 +651,7 @@ msgstr "" "âÅÓÐÏÌÅÚÎÙÅ ÐÒÁ×ÉÌÁ:\n" "\n" -#: src/reduce.c:546 +#: src/reduce.c:544 msgid "" "Variables\n" "---------\n" @@ -661,11 +661,11 @@ msgstr "" "----------\n" "\n" -#: src/reduce.c:547 +#: src/reduce.c:545 msgid "Value Sprec Sassoc Tag\n" msgstr "úÎÁÞ ðÒÉÏÒ áÓÓÏà ôÅÇ\n" -#: src/reduce.c:552 +#: src/reduce.c:550 msgid "" "Rules\n" "-----\n" @@ -675,7 +675,7 @@ msgstr "" "-------\n" "\n" -#: src/reduce.c:562 +#: src/reduce.c:560 msgid "" "Rules interpreted\n" "-----------------\n" @@ -685,26 +685,26 @@ msgstr "" "--------------------------\n" "\n" -#: src/reduce.c:579 +#: src/reduce.c:577 #, c-format msgid "%d rules never reduced\n" msgstr "%d ÐÒÁ×ÉÌ ÎÅ Ó×ÅÄÅÎÏ\n" -#: src/reduce.c:581 +#: src/reduce.c:579 #, c-format msgid "%s contains " msgstr "%s ÓÏÄÅÒÖÉÔ " -#: src/reduce.c:585 +#: src/reduce.c:583 #, c-format msgid "%d useless nonterminal%s" msgstr "%d ÂÅÓÐÏÌÅÚÎÙÈ ÎÅÔÅÒÍÉÎÁÌÏ×%s" -#: src/reduce.c:590 +#: src/reduce.c:588 msgid " and " msgstr " É " -#: src/reduce.c:594 +#: src/reduce.c:592 #, c-format msgid "%d useless rule%s" msgstr "%d ÂÅÓÐÏÌÅÚÎÙÈ ÐÒÁ×ÉÌ%s" diff --git a/src/LR0.c b/src/LR0.c index 930a2992..401c11c0 100644 --- a/src/LR0.c +++ b/src/LR0.c @@ -22,9 +22,7 @@ Boston, MA 02111-1307, USA. */ /* See comments in state.h for the data structures that represent it. The entry point is generate_states. */ -#include #include "system.h" -#include "machine.h" #include "alloc.h" #include "gram.h" #include "state.h" diff --git a/src/Makefile.am b/src/Makefile.am index a7acb61d..195c40e6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -18,7 +18,7 @@ bison_SOURCES = LR0.c allocate.c closure.c complain.c conflicts.c \ EXTRA_bison_SOURCES = vmsgetargs.c -noinst_HEADERS = alloc.h complain.h files.h gram.h lex.h machine.h \ +noinst_HEADERS = alloc.h complain.h files.h getargs.h gram.h lex.h \ state.h \ symtab.h system.h types.h diff --git a/src/allocate.c b/src/allocate.c index c32a12d1..b11c26fd 100644 --- a/src/allocate.c +++ b/src/allocate.c @@ -19,7 +19,6 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include #include "system.h" #ifdef NEED_DECLARATION_CALLOC diff --git a/src/closure.c b/src/closure.c index 401ddc5e..4e6fee00 100644 --- a/src/closure.c +++ b/src/closure.c @@ -49,9 +49,7 @@ Frees itemset, ruleset and internal data. */ -#include #include "system.h" -#include "machine.h" #include "alloc.h" #include "gram.h" diff --git a/src/conflicts.c b/src/conflicts.c index b2015620..6b9cad07 100644 --- a/src/conflicts.c +++ b/src/conflicts.c @@ -1,26 +1,25 @@ /* Find and resolve or report look-ahead conflicts for bison, - Copyright (C) 1984, 1989, 1992 Free Software Foundation, Inc. + Copyright (C) 1984, 1989, 1992, 2000 Free Software Foundation, Inc. -This file is part of Bison, the GNU Compiler Compiler. + This file is part of Bison, the GNU Compiler Compiler. -Bison 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. + Bison 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. -Bison 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. + Bison 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 Bison; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ + You should have received a copy of the GNU General Public License + along with Bison; see the file COPYING. If not, write to the Free + Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ -#include #include "system.h" -#include "machine.h" +#include "getargs.h" #include "alloc.h" #include "files.h" #include "gram.h" @@ -35,7 +34,6 @@ extern shifts **shift_table; extern unsigned *LA; extern short *LAruleno; extern short *lookaheads; -extern int verboseflag; extern int fixed_outfiles; extern void initialize_conflicts PARAMS((void)); @@ -126,7 +124,7 @@ set_conflicts (int state) fp1 = LA + i * tokensetsize; fp2 = fp1; fp3 = lookaheadset; - + while (fp3 < fp4) { if (*fp2++ & *fp3++) @@ -323,7 +321,7 @@ conflict_log (void) total_conflicts(); } - + void verbose_conflict_log (void) @@ -622,10 +620,10 @@ print_reductions (int state) fp1 = LA + i * tokensetsize; fp2 = shiftset; fp3 = lookaheadset; - + while (fp3 < fp4) *fp3++ = *fp1++ & (~(*fp2++)); - + count = 0; mask = 1; fp3 = lookaheadset; @@ -633,7 +631,7 @@ print_reductions (int state) { if (mask & *fp3) count++; - + mask <<= 1; if (mask == 0) { @@ -641,17 +639,17 @@ print_reductions (int state) fp3++; } } - + if (count > cmax) { cmax = count; default_LA = i; default_rule = LAruleno[i]; } - + fp2 = shiftset; fp3 = lookaheadset; - + while (fp3 < fp4) *fp2++ |= *fp3++; } diff --git a/src/derives.c b/src/derives.c index fabd1ef1..a9c6905c 100644 --- a/src/derives.c +++ b/src/derives.c @@ -24,7 +24,6 @@ Boston, MA 02111-1307, USA. */ derives[i - ntokens] points to a vector of rule numbers, terminated with -1. */ -#include #include "system.h" #include "alloc.h" #include "types.h" diff --git a/src/files.c b/src/files.c index 0149ae60..b7f168a3 100644 --- a/src/files.c +++ b/src/files.c @@ -1,52 +1,47 @@ /* Open and close files for bison, - Copyright (C) 1984, 1986, 1989, 1992 Free Software Foundation, Inc. + Copyright (C) 1984, 1986, 1989, 1992, 2000 Free Software Foundation, Inc. -This file is part of Bison, the GNU Compiler Compiler. + This file is part of Bison, the GNU Compiler Compiler. -Bison 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. + Bison 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. -Bison 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. + Bison 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 Bison; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ + You should have received a copy of the GNU General Public License + along with Bison; see the file COPYING. If not, write to the Free + Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #include "system.h" #if defined (VMS) & !defined (__VMS_POSIX) -#include -#define unlink delete -#ifndef XPFILE -#define XPFILE "GNU_BISON:[000000]BISON.SIMPLE" -#endif -#ifndef XPFILE1 -#define XPFILE1 "GNU_BISON:[000000]BISON.HAIRY" -#endif +# include +# define unlink delete +# ifndef XPFILE +# define XPFILE "GNU_BISON:[000000]BISON.SIMPLE" +# endif +# ifndef XPFILE1 +# define XPFILE1 "GNU_BISON:[000000]BISON.HAIRY" +# endif #endif #if defined (_MSC_VER) -#ifndef XPFILE -#define XPFILE "c:/usr/local/lib/bison.simple" -#endif -#ifndef XPFILE1 -#define XPFILE1 "c:/usr/local/lib/bison.hairy" -#endif -#endif - -#include - -#ifdef HAVE_UNISTD_H -#include +# ifndef XPFILE +# define XPFILE "c:/usr/local/lib/bison.simple" +# endif +# ifndef XPFILE1 +# define XPFILE1 "c:/usr/local/lib/bison.hairy" +# endif #endif +#include "getargs.h" #include "files.h" #include "alloc.h" #include "gram.h" @@ -76,8 +71,6 @@ static char *tmpattrsfile; static char *tmptabfile; static char *tmpdefsfile; -extern int noparserflag; - extern char *mktemp(); /* So the compiler won't complain */ extern char *getenv(); @@ -88,8 +81,6 @@ extern void open_extra_files PARAMS((void)); int fixed_outfiles = 0; extern char *program_name; -extern int verboseflag; -extern int definesflag; char * diff --git a/src/getargs.c b/src/getargs.c index 67b880c7..de9880b0 100644 --- a/src/getargs.c +++ b/src/getargs.c @@ -22,16 +22,19 @@ #include "getopt.h" #include "system.h" #include "files.h" +#include "getargs.h" -int verboseflag; -int definesflag; -int debugflag; -int nolinesflag; +char *spec_file_prefix; /* for -b. */ +char *spec_name_prefix; /* for -p. */ + +int debugflag = 0; +int definesflag = 0; +int nolinesflag = 0; int noparserflag = 0; -int toknumflag = 0; int rawtoknumflag = 0; -char *spec_name_prefix; /* for -p. */ -char *spec_file_prefix; /* for -b. */ +int toknumflag = 0; +int verboseflag = 0; + extern int fixed_outfiles;/* for -y */ extern char *program_name; diff --git a/src/getargs.h b/src/getargs.h new file mode 100644 index 00000000..a0180d79 --- /dev/null +++ b/src/getargs.h @@ -0,0 +1,34 @@ +/* Parse command line arguments for bison. + Copyright (C) 1984, 1986, 1989, 1992, 2000 Free Software Foundation, Inc. + + This file is part of Bison, the GNU Compiler Compiler. + + Bison 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. + + Bison 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 Bison; see the file COPYING. If not, write to the Free + Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ + +/* flags set by % directives */ +extern char *spec_file_prefix; /* for -b */ +extern char *spec_name_prefix; /* for -p */ + +extern int debugflag; /* for -t */ +extern int definesflag; /* for -d */ +extern int fixed_outfiles; /* for -y */ +extern int nolinesflag; /* for -l */ +extern int noparserflag; /* for -n */ +extern int rawtoknumflag; /* for -r */ +extern int toknumflag; /* for -k */ +extern int verboseflag; /* for -v */ + +void getargs PARAMS ((int argc, char *argv[])); diff --git a/src/lalr.c b/src/lalr.c index e3eda288..6b78c995 100644 --- a/src/lalr.c +++ b/src/lalr.c @@ -48,9 +48,7 @@ LA[l, i] is 1 if the rule LAruleno[l] is applicable in the appropriate state If LA[l, i] and LA[l, j] are both 1 for i != j, it is a conflict. */ -#include #include "system.h" -#include "machine.h" #include "types.h" #include "state.h" #include "alloc.h" diff --git a/src/lex.c b/src/lex.c index a1e8580b..b236ea43 100644 --- a/src/lex.c +++ b/src/lex.c @@ -26,8 +26,8 @@ and the name is looked up in the symbol table using symtab.c; symval is set to a pointer to the entry found. */ -#include #include "system.h" +#include "getargs.h" #include "files.h" #include "getopt.h" /* for optarg */ #include "symtab.h" @@ -35,17 +35,6 @@ #include "alloc.h" #include "complain.h" -/* flags set by % directives */ -extern int definesflag; /* for -d */ -extern int toknumflag; /* for -k */ -extern int noparserflag; /* for -n */ -extern int fixed_outfiles; /* for -y */ -extern int nolinesflag; /* for -l */ -extern int rawtoknumflag; /* for -r */ -extern int verboseflag; /* for -v */ -extern int debugflag; /* for -t */ -extern char *spec_name_prefix; /* for -p */ -extern char *spec_file_prefix; /* for -b */ /*spec_outfile is declared in files.h, for -o */ extern int translations; diff --git a/src/machine.h b/src/machine.h deleted file mode 100644 index 738c0d20..00000000 --- a/src/machine.h +++ /dev/null @@ -1,40 +0,0 @@ -/* Define machine-dependencies for bison, - Copyright (C) 1984, 1989 Free Software Foundation, Inc. - -This file is part of Bison, the GNU Compiler Compiler. - -Bison 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. - -Bison 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 Bison; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ - -#ifdef eta10 -#define MAXSHORT 2147483647 -#define MINSHORT -2147483648 -#else -#define MAXSHORT 32767 -#define MINSHORT -32768 -#endif - -#if defined (MSDOS) && !defined (__GO32__) -#define BITS_PER_WORD 16 -#define MAXTABLE 16383 -#else -#define BITS_PER_WORD 32 -#define MAXTABLE 32767 -#endif - -#define WORDSIZE(n) (((n) + BITS_PER_WORD - 1) / BITS_PER_WORD) -#define SETBIT(x, i) ((x)[(i)/BITS_PER_WORD] |= (1<<((i) % BITS_PER_WORD))) -#define RESETBIT(x, i) ((x)[(i)/BITS_PER_WORD] &= ~(1<<((i) % BITS_PER_WORD))) -#define BITISSET(x, i) (((x)[(i)/BITS_PER_WORD] & (1<<((i) % BITS_PER_WORD))) != 0) diff --git a/src/main.c b/src/main.c index c7ae644b..f3141d4c 100644 --- a/src/main.c +++ b/src/main.c @@ -1,5 +1,6 @@ /* Top level entry point of bison, - Copyright (C) 1984, 1986, 1989, 1992, 1995, 2000 Free Software Foundation, Inc. + Copyright (C) 1984, 1986, 1989, 1992, 1995, 2000 + Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -19,14 +20,11 @@ Boston, MA 02111-1307, USA. */ -#include #include "system.h" -#include "machine.h" /* for MAXSHORT */ +#include "getargs.h" #include "files.h" #include "complain.h" -extern int verboseflag; - #if 0 /* XXX currently unused. */ /* Nonzero means failure has been detected; don't write a parser file. */ static int failure; @@ -38,7 +36,6 @@ char *program_name; extern char *printable_version PARAMS((int)); extern void berror PARAMS((const char *)); -extern void getargs PARAMS((int, char *[])); extern void openfiles PARAMS((void)); extern void reader PARAMS((void)); extern void reduce_grammar PARAMS((void)); diff --git a/src/nullable.c b/src/nullable.c index 1269f372..516fce40 100644 --- a/src/nullable.c +++ b/src/nullable.c @@ -19,10 +19,10 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* set up nullable, a vector saying which nonterminals can expand into the null string. - nullable[i - ntokens] is nonzero if symbol i can do so. */ +/* set up nullable, a vector saying which nonterminals can expand into + the null string. nullable[i - ntokens] is nonzero if symbol i can + do so. */ -#include #include "system.h" #include "types.h" #include "gram.h" diff --git a/src/output.c b/src/output.c index e2d62f58..3eea41ed 100644 --- a/src/output.c +++ b/src/output.c @@ -103,9 +103,8 @@ YYNTBASE = ntokens. */ -#include #include "system.h" -#include "machine.h" +#include "getargs.h" #include "alloc.h" #include "files.h" #include "gram.h" @@ -113,11 +112,6 @@ YYNTBASE = ntokens. #include "complain.h" -extern int debugflag; -extern int nolinesflag; -extern int noparserflag; -extern int toknumflag; - extern char **tags; extern int *user_toknums; extern int tokensetsize; @@ -135,37 +129,37 @@ extern short *goto_map; extern short *from_state; extern short *to_state; -extern void output_headers PARAMS((void)); -extern void output_trailers PARAMS((void)); -extern void output PARAMS((void)); - -static void output_token_translations PARAMS((void)); -static void output_gram PARAMS((void)); -static void output_stos PARAMS((void)); -static void output_rule_data PARAMS((void)); -static void output_defines PARAMS((void)); -static void output_actions PARAMS((void)); -static void token_actions PARAMS((void)); -static void save_row PARAMS((int)); -static void goto_actions PARAMS((void)); -static void save_column PARAMS((int, int)); -static void sort_actions PARAMS((void)); -static void pack_table PARAMS((void)); -static void output_base PARAMS((void)); -static void output_table PARAMS((void)); -static void output_check PARAMS((void)); -static void output_parser PARAMS((void)); -static void output_program PARAMS((void)); -static void free_shifts PARAMS((void)); -static void free_reductions PARAMS((void)); -static void free_itemsets PARAMS((void)); -static int action_row PARAMS((int)); -static int default_goto PARAMS((int)); -static int matching_state PARAMS((int)); -static int pack_vector PARAMS((int)); - -extern void berror PARAMS((const char *)); -extern void reader_output_yylsp PARAMS((FILE *)); +extern void output_headers PARAMS ((void)); +extern void output_trailers PARAMS ((void)); +extern void output PARAMS ((void)); + +static void output_token_translations PARAMS ((void)); +static void output_gram PARAMS ((void)); +static void output_stos PARAMS ((void)); +static void output_rule_data PARAMS ((void)); +static void output_defines PARAMS ((void)); +static void output_actions PARAMS ((void)); +static void token_actions PARAMS ((void)); +static void save_row PARAMS ((int)); +static void goto_actions PARAMS ((void)); +static void save_column PARAMS ((int, int)); +static void sort_actions PARAMS ((void)); +static void pack_table PARAMS ((void)); +static void output_base PARAMS ((void)); +static void output_table PARAMS ((void)); +static void output_check PARAMS ((void)); +static void output_parser PARAMS ((void)); +static void output_program PARAMS ((void)); +static void free_shifts PARAMS ((void)); +static void free_reductions PARAMS ((void)); +static void free_itemsets PARAMS ((void)); +static int action_row PARAMS ((int)); +static int default_goto PARAMS ((int)); +static int matching_state PARAMS ((int)); +static int pack_vector PARAMS ((int)); + +extern void berror PARAMS ((const char *)); +extern void reader_output_yylsp PARAMS ((FILE *)); static int nvectors; static int nentries; @@ -185,16 +179,38 @@ static int high; -#define GUARDSTR "\n#include \"%s\"\nextern int yyerror;\n\ -extern int yycost;\nextern char * yymsg;\nextern YYSTYPE yyval;\n\n\ -yyguard(n, yyvsp, yylsp)\nregister int n;\nregister YYSTYPE *yyvsp;\n\ +#define GUARDSTR \ +"\n\ +#include \"%s\"\n\ +extern int yyerror;\n\ +extern int yycost;\n\ +extern char * yymsg;\n\ +extern YYSTYPE yyval;\n\ +\n\ +yyguard(n, yyvsp, yylsp)\n\ +register int n;\n\ +register YYSTYPE *yyvsp;\n\ register YYLTYPE *yylsp;\n\ -{\n yyerror = 0;\nyycost = 0;\n yymsg = 0;\nswitch (n)\n {" - -#define ACTSTR "\n#include \"%s\"\nextern YYSTYPE yyval;\ -\nextern int yychar;\ -yyaction(n, yyvsp, yylsp)\nregister int n;\nregister YYSTYPE *yyvsp;\n\ -register YYLTYPE *yylsp;\n{\n switch (n)\n{" +{\n\ + yyerror = 0;\n\ + yycost = 0;\n\ + yymsg = 0;\n\ + switch (n)\n\ + {" + +#define ACTSTR \ +"\n\ +#include \"%s\"\n\ +extern YYSTYPE yyval;\n\ +extern int yychar;\n\ +\n\ +yyaction(n, yyvsp, yylsp)\n\ +register int n;\n\ +register YYSTYPE *yyvsp;\n\ +register YYLTYPE *yylsp;\n\ +{\n\ + switch (n)\n\ + {" #define ACTSTR_SIMPLE "\n switch (yyn) {\n" @@ -203,12 +219,12 @@ void output_headers (void) { if (semantic_parser) - fprintf(fguard, GUARDSTR, attrsfile); + fprintf (fguard, GUARDSTR, attrsfile); if (noparserflag) - return; + return; - fprintf(faction, (semantic_parser ? ACTSTR : ACTSTR_SIMPLE), attrsfile); + fprintf (faction, (semantic_parser ? ACTSTR : ACTSTR_SIMPLE), attrsfile); /* if (semantic_parser) JF moved this below fprintf(ftable, "#include \"%s\"\n", attrsfile); fprintf(ftable, "#include \n\n"); @@ -217,13 +233,13 @@ output_headers (void) /* Rename certain symbols if -p was specified. */ if (spec_name_prefix) { - fprintf(ftable, "#define yyparse %sparse\n", spec_name_prefix); - fprintf(ftable, "#define yylex %slex\n", spec_name_prefix); - fprintf(ftable, "#define yyerror %serror\n", spec_name_prefix); - fprintf(ftable, "#define yylval %slval\n", spec_name_prefix); - fprintf(ftable, "#define yychar %schar\n", spec_name_prefix); - fprintf(ftable, "#define yydebug %sdebug\n", spec_name_prefix); - fprintf(ftable, "#define yynerrs %snerrs\n", spec_name_prefix); + fprintf (ftable, "#define yyparse %sparse\n", spec_name_prefix); + fprintf (ftable, "#define yylex %slex\n", spec_name_prefix); + fprintf (ftable, "#define yyerror %serror\n", spec_name_prefix); + fprintf (ftable, "#define yylval %slval\n", spec_name_prefix); + fprintf (ftable, "#define yychar %schar\n", spec_name_prefix); + fprintf (ftable, "#define yydebug %sdebug\n", spec_name_prefix); + fprintf (ftable, "#define yynerrs %snerrs\n", spec_name_prefix); } } @@ -232,16 +248,16 @@ void output_trailers (void) { if (semantic_parser) - fprintf(fguard, "\n }\n}\n"); + fprintf (fguard, "\n }\n}\n"); - fprintf(faction, "\n"); + fprintf (faction, "\n"); if (noparserflag) - return; + return; if (semantic_parser) - fprintf(faction, " }\n"); - fprintf(faction, "}\n"); + fprintf (faction, " }\n"); + fprintf (faction, "}\n"); } @@ -250,41 +266,52 @@ output (void) { int c; - /* output_token_defines(ftable); / * JF put out token defines FIRST */ + /* output_token_defines(ftable); / * JF put out token defines FIRST */ if (!semantic_parser) /* JF Put out other stuff */ { - rewind(fattrs); - while ((c=getc(fattrs))!=EOF) - putc(c,ftable); + rewind (fattrs); + while ((c = getc (fattrs)) != EOF) + putc (c, ftable); } - reader_output_yylsp(ftable); + reader_output_yylsp (ftable); if (debugflag) - fprintf(ftable, "#ifndef YYDEBUG\n#define YYDEBUG %d\n#endif\n\n", - !!debugflag); + fputs ("\ +#ifndef YYDEBUG\n\ +#define YYDEBUG 1\n\ +#endif\n\ +\n", + ftable); if (semantic_parser) - fprintf(ftable, "#include \"%s\"\n", attrsfile); + fprintf (ftable, "#include \"%s\"\n", attrsfile); - if (! noparserflag) - fprintf(ftable, "#include \n\n"); + if (!noparserflag) + fprintf (ftable, "#include \n\n"); /* Make "const" do nothing if not in ANSI C. */ - fprintf (ftable, "#ifndef __cplusplus\n#ifndef __STDC__\n#define const\n#endif\n#endif\n\n"); - - free_itemsets(); - output_defines(); - output_token_translations(); + fputs ("\ +#ifndef __cplusplus\n\ +# ifndef __STDC__\n\ +# define const\n\ +# endif\n\ +#endif\n\ +\n", + ftable); + + free_itemsets (); + output_defines (); + output_token_translations (); /* if (semantic_parser) */ /* This is now unconditional because debugging printouts can use it. */ - output_gram(); - FREE(ritem); + output_gram (); + FREE (ritem); if (semantic_parser) - output_stos(); - output_rule_data(); - output_actions(); - if (! noparserflag) - output_parser(); - output_program(); + output_stos (); + output_rule_data (); + output_actions (); + if (!noparserflag) + output_parser (); + output_program (); } @@ -296,23 +323,23 @@ output_token_translations (void) if (translations) { - fprintf(ftable, - "\n#define YYTRANSLATE(x) ((unsigned)(x) <= %d ? yytranslate[x] : %d)\n", - max_user_token_number, nsyms); + fprintf (ftable, + "\n#define YYTRANSLATE(x) ((unsigned)(x) <= %d ? yytranslate[x] : %d)\n", + max_user_token_number, nsyms); - if (ntokens < 127) /* play it very safe; check maximum element value. */ - fprintf(ftable, "\nstatic const char yytranslate[] = { 0"); + if (ntokens < 127) /* play it very safe; check maximum element value. */ + fprintf (ftable, "\nstatic const char yytranslate[] = { 0"); else - fprintf(ftable, "\nstatic const short yytranslate[] = { 0"); + fprintf (ftable, "\nstatic const short yytranslate[] = { 0"); j = 10; for (i = 1; i <= max_user_token_number; i++) { - putc(',', ftable); + putc (',', ftable); if (j >= 10) { - putc('\n', ftable); + putc ('\n', ftable); j = 1; } else @@ -320,14 +347,14 @@ output_token_translations (void) j++; } - fprintf(ftable, "%6d", token_translations[i]); + fprintf (ftable, "%6d", token_translations[i]); } - fprintf(ftable, "\n};\n"); + fprintf (ftable, "\n};\n"); } else { - fprintf(ftable, "\n#define YYTRANSLATE(x) (x)\n"); + fprintf (ftable, "\n#define YYTRANSLATE(x) (x)\n"); } } @@ -342,19 +369,19 @@ output_gram (void) /* With the ordinary parser, yyprhs and yyrhs are needed only for yydebug. */ /* With the noparser option, all tables are generated */ - if (! semantic_parser && ! noparserflag) - fprintf(ftable, "\n#if YYDEBUG != 0"); + if (!semantic_parser && !noparserflag) + fprintf (ftable, "\n#if YYDEBUG != 0"); - fprintf(ftable, "\nstatic const short yyprhs[] = { 0"); + fprintf (ftable, "\nstatic const short yyprhs[] = { 0"); j = 10; for (i = 1; i <= nrules; i++) { - putc(',', ftable); + putc (',', ftable); if (j >= 10) { - putc('\n', ftable); + putc ('\n', ftable); j = 1; } else @@ -362,21 +389,21 @@ output_gram (void) j++; } - fprintf(ftable, "%6d", rrhs[i]); + fprintf (ftable, "%6d", rrhs[i]); } - fprintf(ftable, "\n};\n"); + fprintf (ftable, "\n};\n"); - fprintf(ftable, "\nstatic const short yyrhs[] = {%6d", ritem[0]); + fprintf (ftable, "\nstatic const short yyrhs[] = {%6d", ritem[0]); j = 10; for (sp = ritem + 1; *sp; sp++) { - putc(',', ftable); + putc (',', ftable); if (j >= 10) { - putc('\n', ftable); + putc ('\n', ftable); j = 1; } else @@ -385,15 +412,15 @@ output_gram (void) } if (*sp > 0) - fprintf(ftable, "%6d", *sp); + fprintf (ftable, "%6d", *sp); else - fprintf(ftable, " 0"); + fprintf (ftable, " 0"); } - fprintf(ftable, "\n};\n"); + fprintf (ftable, "\n};\n"); - if (! semantic_parser && ! noparserflag) - fprintf(ftable, "\n#endif\n"); + if (!semantic_parser && !noparserflag) + fprintf (ftable, "\n#endif\n"); } @@ -403,16 +430,16 @@ output_stos (void) register int i; register int j; - fprintf(ftable, "\nstatic const short yystos[] = { 0"); + fprintf (ftable, "\nstatic const short yystos[] = { 0"); j = 10; for (i = 1; i < nstates; i++) { - putc(',', ftable); + putc (',', ftable); if (j >= 10) { - putc('\n', ftable); + putc ('\n', ftable); j = 1; } else @@ -420,10 +447,10 @@ output_stos (void) j++; } - fprintf(ftable, "%6d", accessing_symbol[i]); + fprintf (ftable, "%6d", accessing_symbol[i]); } - fprintf(ftable, "\n};\n"); + fprintf (ftable, "\n};\n"); } @@ -441,11 +468,11 @@ static const short yyrline[] = { 0", ftable); j = 10; for (i = 1; i <= nrules; i++) { - putc(',', ftable); + putc (',', ftable); if (j >= 10) { - putc('\n', ftable); + putc ('\n', ftable); j = 1; } else @@ -453,40 +480,39 @@ static const short yyrline[] = { 0", ftable); j++; } - fprintf(ftable, "%6d", rline[i]); + fprintf (ftable, "%6d", rline[i]); } - fprintf(ftable, "\n};\n#endif\n\n"); + fprintf (ftable, "\n};\n#endif\n\n"); if (toknumflag || noparserflag) { - fprintf(ftable, "#define YYNTOKENS %d\n", ntokens); - fprintf(ftable, "#define YYNNTS %d\n", nvars); - fprintf(ftable, "#define YYNRULES %d\n", nrules); - fprintf(ftable, "#define YYNSTATES %d\n", nstates); - fprintf(ftable, "#define YYMAXUTOK %d\n\n", max_user_token_number); + fprintf (ftable, "#define YYNTOKENS %d\n", ntokens); + fprintf (ftable, "#define YYNNTS %d\n", nvars); + fprintf (ftable, "#define YYNRULES %d\n", nrules); + fprintf (ftable, "#define YYNSTATES %d\n", nstates); + fprintf (ftable, "#define YYMAXUTOK %d\n\n", max_user_token_number); } - if (! toknumflag && ! noparserflag) - fprintf(ftable, "\n#if YYDEBUG != 0 || defined (YYERROR_VERBOSE)\n\n"); + if (!toknumflag && !noparserflag) + fprintf (ftable, "\n#if YYDEBUG != 0 || defined (YYERROR_VERBOSE)\n\n"); /* Output the table of symbol names. */ - fprintf(ftable, - "static const char * const yytname[] = { \"%s\"", - tags[0]); + fprintf (ftable, + "static const char * const yytname[] = { \"%s\"", tags[0]); j = strlen (tags[0]) + 44; for (i = 1; i < nsyms; i++) - /* this used to be i<=nsyms, but that output a final "" symbol - almost by accident */ + /* this used to be i<=nsyms, but that output a final "" symbol + almost by accident */ { register char *p; - putc(',', ftable); + putc (',', ftable); j++; if (j > 75) { - putc('\n', ftable); + putc ('\n', ftable); j = 0; } @@ -497,32 +523,32 @@ static const short yyrline[] = { 0", ftable); { if (*p == '"' || *p == '\\') { - fprintf(ftable, "\\%c", *p); + fprintf (ftable, "\\%c", *p); j += 2; } else if (*p == '\n') { - fprintf(ftable, "\\n"); + fprintf (ftable, "\\n"); j += 2; } else if (*p == '\t') { - fprintf(ftable, "\\t"); + fprintf (ftable, "\\t"); j += 2; } else if (*p == '\b') { - fprintf(ftable, "\\b"); + fprintf (ftable, "\\b"); j += 2; } else if (*p < 040 || *p >= 0177) { - fprintf(ftable, "\\%03o", *p); + fprintf (ftable, "\\%03o", *p); j += 4; } else { - putc(*p, ftable); + putc (*p, ftable); j++; } } @@ -533,26 +559,27 @@ static const short yyrline[] = { 0", ftable); /* add a NULL entry to list of tokens */ fprintf (ftable, ", NULL\n};\n"); - if (! toknumflag && ! noparserflag) + if (!toknumflag && !noparserflag) fprintf (ftable, "#endif\n\n"); /* Output YYTOKNUM. */ if (toknumflag) { - fprintf(ftable, "static const short yytoknum[] = { 0"); + fprintf (ftable, "static const short yytoknum[] = { 0"); j = 10; - for (i = 1; i <= ntokens; i++) { - putc(',', ftable); - if (j >= 10) - { - putc('\n', ftable); - j = 1; - } - else - j++; - fprintf(ftable, "%6d", user_toknums[i]); - } - fprintf(ftable, "\n};\n\n"); + for (i = 1; i <= ntokens; i++) + { + putc (',', ftable); + if (j >= 10) + { + putc ('\n', ftable); + j = 1; + } + else + j++; + fprintf (ftable, "%6d", user_toknums[i]); + } + fprintf (ftable, "\n};\n\n"); } /* Output YYR1. */ @@ -563,11 +590,11 @@ static const short yyr1[] = { 0", ftable); j = 10; for (i = 1; i <= nrules; i++) { - putc(',', ftable); + putc (',', ftable); if (j >= 10) { - putc('\n', ftable); + putc ('\n', ftable); j = 1; } else @@ -575,9 +602,9 @@ static const short yyr1[] = { 0", ftable); j++; } - fprintf(ftable, "%6d", rlhs[i]); + fprintf (ftable, "%6d", rlhs[i]); } - FREE(rlhs + 1); + FREE (rlhs + 1); fputs ("\n\ };\n\ \n", ftable); @@ -589,11 +616,11 @@ static const short yyr2[] = { 0", ftable); j = 10; for (i = 1; i < nrules; i++) { - putc(',', ftable); + putc (',', ftable); if (j >= 10) { - putc('\n', ftable); + putc ('\n', ftable); j = 1; } else @@ -601,24 +628,24 @@ static const short yyr2[] = { 0", ftable); j++; } - fprintf(ftable, "%6d", rrhs[i + 1] - rrhs[i] - 1); + fprintf (ftable, "%6d", rrhs[i + 1] - rrhs[i] - 1); } - putc(',', ftable); + putc (',', ftable); if (j >= 10) - putc('\n', ftable); + putc ('\n', ftable); - fprintf(ftable, "%6d\n};\n", nitems - rrhs[nrules] - 1); - FREE(rrhs + 1); + fprintf (ftable, "%6d\n};\n", nitems - rrhs[nrules] - 1); + FREE (rrhs + 1); } static void output_defines (void) { - fprintf(ftable, "\n\n#define\tYYFINAL\t\t%d\n", final_state); - fprintf(ftable, "#define\tYYFLAG\t\t%d\n", MINSHORT); - fprintf(ftable, "#define\tYYNTBASE\t%d\n", ntokens); + fprintf (ftable, "\n\n#define\tYYFINAL\t\t%d\n", final_state); + fprintf (ftable, "#define\tYYFLAG\t\t%d\n", MINSHORT); + fprintf (ftable, "#define\tYYNTBASE\t%d\n", ntokens); } @@ -630,29 +657,29 @@ output_actions (void) { nvectors = nstates + nvars; - froms = NEW2(nvectors, short *); - tos = NEW2(nvectors, short *); - tally = NEW2(nvectors, short); - width = NEW2(nvectors, short); - - token_actions(); - free_shifts(); - free_reductions(); - FREE(lookaheads); - FREE(LA); - FREE(LAruleno); - FREE(accessing_symbol); - - goto_actions(); - FREE(goto_map + ntokens); - FREE(from_state); - FREE(to_state); - - sort_actions(); - pack_table(); - output_base(); - output_table(); - output_check(); + froms = NEW2 (nvectors, short *); + tos = NEW2 (nvectors, short *); + tally = NEW2 (nvectors, short); + width = NEW2 (nvectors, short); + + token_actions (); + free_shifts (); + free_reductions (); + FREE (lookaheads); + FREE (LA); + FREE (LAruleno); + FREE (accessing_symbol); + + goto_actions (); + FREE (goto_map + ntokens); + FREE (from_state); + FREE (to_state); + + sort_actions (); + pack_table (); + output_base (); + output_table (); + output_check (); } @@ -670,20 +697,20 @@ token_actions (void) register int j; register int k; - actrow = NEW2(ntokens, short); + actrow = NEW2 (ntokens, short); - k = action_row(0); - fprintf(ftable, "\nstatic const short yydefact[] = {%6d", k); - save_row(0); + k = action_row (0); + fprintf (ftable, "\nstatic const short yydefact[] = {%6d", k); + save_row (0); j = 10; for (i = 1; i < nstates; i++) { - putc(',', ftable); + putc (',', ftable); if (j >= 10) { - putc('\n', ftable); + putc ('\n', ftable); j = 1; } else @@ -691,13 +718,13 @@ token_actions (void) j++; } - k = action_row(i); - fprintf(ftable, "%6d", k); - save_row(i); + k = action_row (i); + fprintf (ftable, "%6d", k); + save_row (i); } - fprintf(ftable, "\n};\n"); - FREE(actrow); + fprintf (ftable, "\n};\n"); + FREE (actrow); } @@ -734,7 +761,7 @@ action_row (int state) register reductions *redp; register shifts *shiftp; register errs *errp; - int nodefault = 0; /* set nonzero to inhibit having any default reduction */ + int nodefault = 0; /* set nonzero to inhibit having any default reduction */ for (i = 0; i < ntokens; i++) actrow[i] = 0; @@ -756,12 +783,12 @@ action_row (int state) for (i = n - 1; i >= m; i--) { - rule = - LAruleno[i]; + rule = -LAruleno[i]; wordp = LA + i * tokensetsize; mask = 1; /* and find each token which the rule finds acceptable - to come next */ + to come next */ for (j = 0; j < ntokens; j++) { /* and record this rule as the rule to use if that @@ -793,11 +820,12 @@ action_row (int state) for (i = 0; i < k; i++) { shift_state = shiftp->shifts[i]; - if (! shift_state) continue; + if (!shift_state) + continue; symbol = accessing_symbol[shift_state]; - if (ISVAR(symbol)) + if (ISVAR (symbol)) break; actrow[symbol] = shift_state; @@ -828,7 +856,7 @@ action_row (int state) /* Now find the most common reduction and make it the default action for this state. */ - if (nreds >= 1 && ! nodefault) + if (nreds >= 1 && !nodefault) { if (consistent[state]) default_rule = redp->rules[0]; @@ -838,7 +866,7 @@ action_row (int state) for (i = m; i < n; i++) { count = 0; - rule = - LAruleno[i]; + rule = -LAruleno[i]; for (j = 0; j < ntokens; j++) { @@ -864,7 +892,7 @@ action_row (int state) actrow[j] = 0; } - default_rule = - default_rule; + default_rule = -default_rule; } } } @@ -902,8 +930,8 @@ save_row (int state) if (count == 0) return; - froms[state] = sp1 = sp = NEW2(count, short); - tos[state] = sp2 = NEW2(count, short); + froms[state] = sp1 = sp = NEW2 (count, short); + tos[state] = sp2 = NEW2 (count, short); for (i = 0; i < ntokens; i++) { @@ -934,20 +962,20 @@ goto_actions (void) register int j; register int k; - state_count = NEW2(nstates, short); + state_count = NEW2 (nstates, short); - k = default_goto(ntokens); - fprintf(ftable, "\nstatic const short yydefgoto[] = {%6d", k); - save_column(ntokens, k); + k = default_goto (ntokens); + fprintf (ftable, "\nstatic const short yydefgoto[] = {%6d", k); + save_column (ntokens, k); j = 10; for (i = ntokens + 1; i < nsyms; i++) { - putc(',', ftable); + putc (',', ftable); if (j >= 10) { - putc('\n', ftable); + putc ('\n', ftable); j = 1; } else @@ -955,13 +983,13 @@ goto_actions (void) j++; } - k = default_goto(i); - fprintf(ftable, "%6d", k); - save_column(i, k); + k = default_goto (i); + fprintf (ftable, "%6d", k); + save_column (i, k); } - fprintf(ftable, "\n};\n"); - FREE(state_count); + fprintf (ftable, "\n};\n"); + FREE (state_count); } @@ -1030,8 +1058,8 @@ save_column (int symbol, int default_state) symno = symbol - ntokens + nstates; - froms[symno] = sp1 = sp = NEW2(count, short); - tos[symno] = sp2 = NEW2(count, short); + froms[symno] = sp1 = sp = NEW2 (count, short); + tos[symno] = sp2 = NEW2 (count, short); for (i = m; i < n; i++) { @@ -1060,7 +1088,7 @@ sort_actions (void) register int t; register int w; - order = NEW2(nvectors, short); + order = NEW2 (nvectors, short); nentries = 0; for (i = 0; i < nvectors; i++) @@ -1094,10 +1122,10 @@ pack_table (void) register int place; register int state; - base = NEW2(nvectors, short); - pos = NEW2(nentries, short); - table = NEW2(MAXTABLE, short); - check = NEW2(MAXTABLE, short); + base = NEW2 (nvectors, short); + pos = NEW2 (nentries, short); + table = NEW2 (MAXTABLE, short); + check = NEW2 (MAXTABLE, short); lowzero = 0; high = 0; @@ -1110,10 +1138,10 @@ pack_table (void) for (i = 0; i < nentries; i++) { - state = matching_state(i); + state = matching_state (i); if (state < 0) - place = pack_vector(i); + place = pack_vector (i); else place = base[state]; @@ -1124,14 +1152,14 @@ pack_table (void) for (i = 0; i < nvectors; i++) { if (froms[i]) - FREE(froms[i]); + FREE (froms[i]); if (tos[i]) - FREE(tos[i]); + FREE (tos[i]); } - FREE(froms); - FREE(tos); - FREE(pos); + FREE (froms); + FREE (tos); + FREE (pos); } @@ -1192,7 +1220,7 @@ pack_vector (int vector) t = tally[i]; if (t == 0) - berror("pack_vector"); + berror ("pack_vector"); from = froms[i]; to = tos[i]; @@ -1236,8 +1264,8 @@ pack_vector (int vector) } } - berror("pack_vector"); - return 0; /* JF keep lint happy */ + berror ("pack_vector"); + return 0; /* JF keep lint happy */ } @@ -1251,16 +1279,16 @@ output_base (void) register int i; register int j; - fprintf(ftable, "\nstatic const short yypact[] = {%6d", base[0]); + fprintf (ftable, "\nstatic const short yypact[] = {%6d", base[0]); j = 10; for (i = 1; i < nstates; i++) { - putc(',', ftable); + putc (',', ftable); if (j >= 10) { - putc('\n', ftable); + putc ('\n', ftable); j = 1; } else @@ -1268,19 +1296,20 @@ output_base (void) j++; } - fprintf(ftable, "%6d", base[i]); + fprintf (ftable, "%6d", base[i]); } - fprintf(ftable, "\n};\n\nstatic const short yypgoto[] = {%6d", base[nstates]); + fprintf (ftable, "\n};\n\nstatic const short yypgoto[] = {%6d", + base[nstates]); j = 10; for (i = nstates + 1; i < nvectors; i++) { - putc(',', ftable); + putc (',', ftable); if (j >= 10) { - putc('\n', ftable); + putc ('\n', ftable); j = 1; } else @@ -1288,11 +1317,11 @@ output_base (void) j++; } - fprintf(ftable, "%6d", base[i]); + fprintf (ftable, "%6d", base[i]); } - fprintf(ftable, "\n};\n"); - FREE(base); + fprintf (ftable, "\n};\n"); + FREE (base); } @@ -1302,17 +1331,17 @@ output_table (void) register int i; register int j; - fprintf(ftable, "\n\n#define\tYYLAST\t\t%d\n\n", high); - fprintf(ftable, "\nstatic const short yytable[] = {%6d", table[0]); + fprintf (ftable, "\n\n#define\tYYLAST\t\t%d\n\n", high); + fprintf (ftable, "\nstatic const short yytable[] = {%6d", table[0]); j = 10; for (i = 1; i <= high; i++) { - putc(',', ftable); + putc (',', ftable); if (j >= 10) { - putc('\n', ftable); + putc ('\n', ftable); j = 1; } else @@ -1320,11 +1349,11 @@ output_table (void) j++; } - fprintf(ftable, "%6d", table[i]); + fprintf (ftable, "%6d", table[i]); } - fprintf(ftable, "\n};\n"); - FREE(table); + fprintf (ftable, "\n};\n"); + FREE (table); } @@ -1334,16 +1363,16 @@ output_check (void) register int i; register int j; - fprintf(ftable, "\nstatic const short yycheck[] = {%6d", check[0]); + fprintf (ftable, "\nstatic const short yycheck[] = {%6d", check[0]); j = 10; for (i = 1; i <= high; i++) { - putc(',', ftable); + putc (',', ftable); if (j >= 10) { - putc('\n', ftable); + putc ('\n', ftable); j = 1; } else @@ -1351,11 +1380,11 @@ output_check (void) j++; } - fprintf(ftable, "%6d", check[i]); + fprintf (ftable, "%6d", check[i]); } - fprintf(ftable, "\n};\n"); - FREE(check); + fprintf (ftable, "\n};\n"); + FREE (check); } @@ -1373,13 +1402,14 @@ output_parser (void) #endif if (pure_parser) - fprintf(ftable, "#define YYPURE 1\n\n"); + fprintf (ftable, "#define YYPURE 1\n\n"); -#ifdef DONTDEF /* JF no longer needed 'cuz open_extra_files changes the - currently open parser from bison.simple to bison.hairy */ +#ifdef DONTDEF /* JF no longer needed 'cuz open_extra_files changes the + currently open parser from bison.simple to bison.hairy */ if (semantic_parser) fpars = fparser; - else fpars = fparser1; + else + fpars = fparser1; #endif /* Loop over lines in the standard parser file. */ @@ -1388,55 +1418,56 @@ output_parser (void) { int write_line = 1; - c = getc(fpars); + c = getc (fpars); /* See if the line starts with `#line. - If so, set write_line to 0. */ + If so, set write_line to 0. */ if (nolinesflag) if (c == '#') { - c = getc(fpars); + c = getc (fpars); if (c == 'l') { - c = getc(fpars); + c = getc (fpars); if (c == 'i') { - c = getc(fpars); + c = getc (fpars); if (c == 'n') { - c = getc(fpars); + c = getc (fpars); if (c == 'e') write_line = 0; else - fprintf(ftable, "#lin"); + fprintf (ftable, "#lin"); } else - fprintf(ftable, "#li"); + fprintf (ftable, "#li"); } else - fprintf(ftable, "#l"); + fprintf (ftable, "#l"); } else - fprintf(ftable, "#"); + fprintf (ftable, "#"); } /* now write out the line... */ - for (; c != '\n' && c != EOF; c = getc(fpars)) - if (write_line) { - if (c == '$') - { - /* `$' in the parser file indicates where to put the actions. - Copy them in at this point. */ - rewind(faction); - for(c=getc(faction);c!=EOF;c=getc(faction)) - putc(c,ftable); - } - else - putc(c, ftable); - } + for (; c != '\n' && c != EOF; c = getc (fpars)) + if (write_line) + { + if (c == '$') + { + /* `$' in the parser file indicates where to put the actions. + Copy them in at this point. */ + rewind (faction); + for (c = getc (faction); c != EOF; c = getc (faction)) + putc (c, ftable); + } + else + putc (c, ftable); + } if (c == EOF) break; - putc(c, ftable); + putc (c, ftable); } } @@ -1446,13 +1477,13 @@ output_program (void) register int c; if (!nolinesflag) - fprintf(ftable, "#line %d \"%s\"\n", lineno, infile); + fprintf (ftable, "#line %d \"%s\"\n", lineno, infile); - c = getc(finput); + c = getc (finput); while (c != EOF) { - putc(c, ftable); - c = getc(finput); + putc (c, ftable); + c = getc (finput); } } @@ -1460,14 +1491,14 @@ output_program (void) static void free_itemsets (void) { - register core *cp,*cptmp; + register core *cp, *cptmp; - FREE(state_table); + FREE (state_table); for (cp = first_state; cp; cp = cptmp) { - cptmp=cp->next; - FREE(cp); + cptmp = cp->next; + FREE (cp); } } @@ -1475,14 +1506,14 @@ free_itemsets (void) static void free_shifts (void) { - register shifts *sp,*sptmp;/* JF derefrenced freed ptr */ + register shifts *sp, *sptmp; /* JF derefrenced freed ptr */ - FREE(shift_table); + FREE (shift_table); for (sp = first_shift; sp; sp = sptmp) { - sptmp=sp->next; - FREE(sp); + sptmp = sp->next; + FREE (sp); } } @@ -1490,13 +1521,13 @@ free_shifts (void) static void free_reductions (void) { - register reductions *rp,*rptmp;/* JF fixed freed ptr */ + register reductions *rp, *rptmp; /* JF fixed freed ptr */ - FREE(reduction_table); + FREE (reduction_table); for (rp = first_reduction; rp; rp = rptmp) { - rptmp=rp->next; - FREE(rp); + rptmp = rp->next; + FREE (rp); } } diff --git a/src/print.c b/src/print.c index ff6803d4..52baf107 100644 --- a/src/print.c +++ b/src/print.c @@ -19,9 +19,7 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include #include "system.h" -#include "machine.h" #include "alloc.h" #include "files.h" #include "gram.h" diff --git a/src/reader.c b/src/reader.c index 0d5e71fb..c026da28 100644 --- a/src/reader.c +++ b/src/reader.c @@ -27,14 +27,13 @@ The entry point is reader (). */ -#include #include "system.h" +#include "getargs.h" #include "files.h" #include "alloc.h" #include "symtab.h" #include "lex.h" #include "gram.h" -#include "machine.h" #include "complain.h" #define LTYPESTR "\ @@ -62,10 +61,6 @@ typedef\n\ /* Number of slots allocated (but not necessarily used yet) in `rline' */ static int rline_allocated; -extern int definesflag; -extern int nolinesflag; -extern int noparserflag; -extern int rawtoknumflag; extern bucket *symval; extern int numval; extern int expected_conflicts; diff --git a/src/reduce.c b/src/reduce.c index 16333e20..a654f0c7 100644 --- a/src/reduce.c +++ b/src/reduce.c @@ -29,17 +29,15 @@ Boston, MA 02111-1307, USA. */ * parser. */ -#include #include "system.h" +#include "getargs.h" #include "files.h" #include "gram.h" -#include "machine.h" #include "alloc.h" #include "complain.h" extern char **tags; /* reader.c */ -extern int verboseflag; /* getargs.c */ static int statisticsflag; /* XXXXXXX */ extern int fixed_outfiles; diff --git a/src/symtab.c b/src/symtab.c index 55beb391..f258386e 100644 --- a/src/symtab.c +++ b/src/symtab.c @@ -19,7 +19,6 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include #include "system.h" #include "alloc.h" #include "symtab.h" diff --git a/src/system.h b/src/system.h index d878feb2..9c8ac08e 100644 --- a/src/system.h +++ b/src/system.h @@ -22,6 +22,8 @@ # include #endif +#include + #ifdef MSDOS # include #endif @@ -119,3 +121,29 @@ extern int errno; #endif #endif /* BISON_SYSTEM_H */ + + +/*---------------------------------. +| Machine-dependencies for Bison. | +`---------------------------------*/ + +#ifdef eta10 +# define MAXSHORT 2147483647 +# define MINSHORT -2147483648 +#else +# define MAXSHORT 32767 +# define MINSHORT -32768 +#endif + +#if defined (MSDOS) && !defined (__GO32__) +# define BITS_PER_WORD 16 +# define MAXTABLE 16383 +#else +# define BITS_PER_WORD 32 +# define MAXTABLE 32767 +#endif + +#define WORDSIZE(n) (((n) + BITS_PER_WORD - 1) / BITS_PER_WORD) +#define SETBIT(x, i) ((x)[(i)/BITS_PER_WORD] |= (1<<((i) % BITS_PER_WORD))) +#define RESETBIT(x, i) ((x)[(i)/BITS_PER_WORD] &= ~(1<<((i) % BITS_PER_WORD))) +#define BITISSET(x, i) (((x)[(i)/BITS_PER_WORD] & (1<<((i) % BITS_PER_WORD))) != 0) diff --git a/src/warshall.c b/src/warshall.c index 862f0eab..6474ef86 100644 --- a/src/warshall.c +++ b/src/warshall.c @@ -19,9 +19,7 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include #include "system.h" -#include "machine.h" void RTC PARAMS((unsigned *, int)); diff --git a/tests/calc.m4 b/tests/calc.m4 index 9f0942d7..2af544f5 100644 --- a/tests/calc.m4 +++ b/tests/calc.m4 @@ -24,6 +24,7 @@ AT_DATA([calc.y], static int power (int base, int exponent); static int read_signed_integer (FILE *stream); +static void yyerror (const char *s); extern void perror (const char *s); %} @@ -54,23 +55,10 @@ exp: NUM { $$ = $1; } | '(' exp ')' { $$ = $2; } ; %% -FILE *yyin = stdin; +/* The input. */ +FILE *yyin; -int -main (int argn, const char **argv) -{ - if (argn == 2) - yyin = fopen (argv[1], "r"); - if (!stdin) - { - perror (argv[1]); - exit (1); - } - yyparse (); - return 0; -} - -int +static void yyerror (const char *s) { fprintf (stderr, "%s\n", s); @@ -138,6 +126,23 @@ power (int base, int exponent) res *= base; return res; } + +int +main (int argn, const char **argv) +{ + if (argn == 2) + yyin = fopen (argv[1], "r"); + else + yyin = stdin; + + if (!stdin) + { + perror (argv[1]); + exit (1); + } + yyparse (); + return 0; +} ]]) # Specify the output files to avoid problems on different file systems.