Insert `_' macro around many string constants.

This commit is contained in:
Richard M. Stallman
1996-06-01 22:10:15 +00:00
parent 2934057149
commit a083fbbf22
12 changed files with 216 additions and 215 deletions

View File

@@ -19,6 +19,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#include <stdio.h> #include <stdio.h>
#include "system.h"
extern char *calloc (); extern char *calloc ();
extern char *realloc (); extern char *realloc ();
@@ -38,7 +39,7 @@ xmalloc (n)
block = calloc (n, 1); block = calloc (n, 1);
if (block == NULL) if (block == NULL)
{ {
fprintf (stderr, "%s: memory exhausted\n", program_name); fprintf (stderr, _("%s: memory exhausted\n"), program_name);
done (1); done (1);
} }
@@ -56,7 +57,7 @@ xrealloc (block, n)
block = realloc (block, n); block = realloc (block, n);
if (block == NULL) if (block == NULL)
{ {
fprintf (stderr, "%s: memory exhausted\n", program_name); fprintf (stderr, _("%s: memory exhausted\n"), program_name);
done (1); done (1);
} }

View File

@@ -311,11 +311,11 @@ print_firsts()
register int j; register int j;
register unsigned *rowp; register unsigned *rowp;
printf("\n\n\nFIRSTS\n\n"); printf(_("\n\n\nFIRSTS\n\n"));
for (i = ntokens; i < nsyms; i++) for (i = ntokens; i < nsyms; i++)
{ {
printf("\n\n%s firsts\n\n", tags[i]); printf(_("\n\n%s firsts\n\n"), tags[i]);
rowp = firsts + ((i - ntokens) * varsetsize); rowp = firsts + ((i - ntokens) * varsetsize);
@@ -333,11 +333,11 @@ print_fderives()
register int j; register int j;
register unsigned *rp; register unsigned *rp;
printf("\n\n\nFDERIVES\n"); printf(_("\n\n\nFDERIVES\n"));
for (i = ntokens; i < nsyms; i++) for (i = ntokens; i < nsyms; i++)
{ {
printf("\n\n%s derives\n\n", tags[i]); printf(_("\n\n%s derives\n\n"), tags[i]);
rp = fderives + i * rulesetsize; rp = fderives + i * rulesetsize;
for (j = 0; j <= nrules; j++) for (j = 0; j <= nrules; j++)

View File

@@ -192,13 +192,13 @@ int lookaheadnum;
{ {
if (sprec[i] < redprec) if (sprec[i] < redprec)
{ {
if (verboseflag) log_resolution(state, lookaheadnum, i, "reduce"); if (verboseflag) log_resolution(state, lookaheadnum, i, _("reduce"));
*fp2 &= ~mask; /* flush the shift for this token */ *fp2 &= ~mask; /* flush the shift for this token */
flush_shift(state, i); flush_shift(state, i);
} }
else if (sprec[i] > redprec) else if (sprec[i] > redprec)
{ {
if (verboseflag) log_resolution(state, lookaheadnum, i, "shift"); if (verboseflag) log_resolution(state, lookaheadnum, i, _("shift"));
*fp1 &= ~mask; /* flush the reduce for this token */ *fp1 &= ~mask; /* flush the reduce for this token */
} }
else else
@@ -212,15 +212,15 @@ int lookaheadnum;
{ {
case RIGHT_ASSOC: case RIGHT_ASSOC:
if (verboseflag) log_resolution(state, lookaheadnum, i, "shift"); if (verboseflag) log_resolution(state, lookaheadnum, i, _("shift"));
break; break;
case LEFT_ASSOC: case LEFT_ASSOC:
if (verboseflag) log_resolution(state, lookaheadnum, i, "reduce"); if (verboseflag) log_resolution(state, lookaheadnum, i, _("reduce"));
break; break;
case NON_ASSOC: case NON_ASSOC:
if (verboseflag) log_resolution(state, lookaheadnum, i, "an error"); if (verboseflag) log_resolution(state, lookaheadnum, i, _("an error"));
break; break;
} }
@@ -296,7 +296,7 @@ int state, LAno, token;
char *resolution; char *resolution;
{ {
fprintf(foutput, fprintf(foutput,
"Conflict in state %d between rule %d and token %s resolved as %s.\n", _("Conflict in state %d between rule %d and token %s resolved as %s.\n"),
state, LAruleno[LAno], tags[token], resolution); state, LAruleno[LAno], tags[token], resolution);
} }
@@ -341,20 +341,20 @@ verbose_conflict_log()
src_total += src_count; src_total += src_count;
rrc_total += rrc_count; rrc_total += rrc_count;
fprintf(foutput, "State %d contains", i); fprintf(foutput, _("State %d contains"), i);
if (src_count == 1) if (src_count == 1)
fprintf(foutput, " 1 shift/reduce conflict"); fprintf(foutput, _(" 1 shift/reduce conflict"));
else if (src_count > 1) else if (src_count > 1)
fprintf(foutput, " %d shift/reduce conflicts", src_count); fprintf(foutput, _(" %d shift/reduce conflicts"), src_count);
if (src_count > 0 && rrc_count > 0) if (src_count > 0 && rrc_count > 0)
fprintf(foutput, " and"); fprintf(foutput, _(" and"));
if (rrc_count == 1) if (rrc_count == 1)
fprintf(foutput, " 1 reduce/reduce conflict"); fprintf(foutput, _(" 1 reduce/reduce conflict"));
else if (rrc_count > 1) else if (rrc_count > 1)
fprintf(foutput, " %d reduce/reduce conflicts", rrc_count); fprintf(foutput, _(" %d reduce/reduce conflicts"), rrc_count);
putc('.', foutput); putc('.', foutput);
putc('\n', foutput); putc('\n', foutput);
@@ -377,31 +377,31 @@ total_conflicts()
{ {
/* If invoked under the name `yacc', use the output format /* If invoked under the name `yacc', use the output format
specified by POSIX. */ specified by POSIX. */
fprintf(stderr, "conflicts: "); fprintf(stderr, _("conflicts: "));
if (src_total > 0) if (src_total > 0)
fprintf(stderr, " %d shift/reduce", src_total); fprintf(stderr, _(" %d shift/reduce"), src_total);
if (src_total > 0 && rrc_total > 0) if (src_total > 0 && rrc_total > 0)
fprintf(stderr, ","); fprintf(stderr, ",");
if (rrc_total > 0) if (rrc_total > 0)
fprintf(stderr, " %d reduce/reduce", rrc_total); fprintf(stderr, _(" %d reduce/reduce"), rrc_total);
putc('\n', stderr); putc('\n', stderr);
} }
else else
{ {
fprintf(stderr, "%s contains", infile); fprintf(stderr, _("%s contains"), infile);
if (src_total == 1) if (src_total == 1)
fprintf(stderr, " 1 shift/reduce conflict"); fprintf(stderr, _(" 1 shift/reduce conflict"));
else if (src_total > 1) else if (src_total > 1)
fprintf(stderr, " %d shift/reduce conflicts", src_total); fprintf(stderr, _(" %d shift/reduce conflicts"), src_total);
if (src_total > 0 && rrc_total > 0) if (src_total > 0 && rrc_total > 0)
fprintf(stderr, " and"); fprintf(stderr, _(" and"));
if (rrc_total == 1) if (rrc_total == 1)
fprintf(stderr, " 1 reduce/reduce conflict"); fprintf(stderr, _(" 1 reduce/reduce conflict"));
else if (rrc_total > 1) else if (rrc_total > 1)
fprintf(stderr, " %d reduce/reduce conflicts", rrc_total); fprintf(stderr, _(" %d reduce/reduce conflicts"), rrc_total);
putc('.', stderr); putc('.', stderr);
putc('\n', stderr); putc('\n', stderr);
@@ -600,7 +600,7 @@ int state;
for (i = 0; i < ntokens; i++) for (i = 0; i < ntokens; i++)
{ {
if (mask & *fp3) if (mask & *fp3)
fprintf(foutput, " %-4s\t[reduce using rule %d (%s)]\n", fprintf(foutput, _(" %-4s\t[reduce using rule %d (%s)]\n"),
tags[i], default_rule, tags[rlhs[default_rule]]); tags[i], default_rule, tags[rlhs[default_rule]]);
mask <<= 1; mask <<= 1;
@@ -611,7 +611,7 @@ int state;
} }
} }
fprintf(foutput, " $default\treduce using rule %d (%s)\n\n", fprintf(foutput, _(" $default\treduce using rule %d (%s)\n\n"),
default_rule, tags[rlhs[default_rule]]); default_rule, tags[rlhs[default_rule]]);
} }
else if (n - m >= 1) else if (n - m >= 1)
@@ -697,7 +697,7 @@ int state;
if (j != default_LA) if (j != default_LA)
{ {
rule = LAruleno[j]; rule = LAruleno[j];
fprintf(foutput, " %-4s\treduce using rule %d (%s)\n", fprintf(foutput, _(" %-4s\treduce using rule %d (%s)\n"),
tags[i], rule, tags[rlhs[rule]]); tags[i], rule, tags[rlhs[rule]]);
} }
else defaulted = 1; else defaulted = 1;
@@ -709,12 +709,12 @@ int state;
if (defaulted) if (defaulted)
{ {
rule = LAruleno[default_LA]; rule = LAruleno[default_LA];
fprintf(foutput, " %-4s\treduce using rule %d (%s)\n", fprintf(foutput, _(" %-4s\treduce using rule %d (%s)\n"),
tags[i], rule, tags[rlhs[rule]]); tags[i], rule, tags[rlhs[rule]]);
defaulted = 0; defaulted = 0;
} }
rule = LAruleno[j]; rule = LAruleno[j];
fprintf(foutput, " %-4s\t[reduce using rule %d (%s)]\n", fprintf(foutput, _(" %-4s\t[reduce using rule %d (%s)]\n"),
tags[i], rule, tags[rlhs[rule]]); tags[i], rule, tags[rlhs[rule]]);
} }
} }
@@ -735,7 +735,7 @@ int state;
if (default_LA >= 0) if (default_LA >= 0)
{ {
fprintf(foutput, " $default\treduce using rule %d (%s)\n", fprintf(foutput, _(" $default\treduce using rule %d (%s)\n"),
default_rule, tags[rlhs[default_rule]]); default_rule, tags[rlhs[default_rule]]);
} }

View File

@@ -99,11 +99,11 @@ print_derives()
extern char **tags; extern char **tags;
printf("\n\n\nDERIVES\n\n"); printf(_("\n\n\nDERIVES\n\n"));
for (i = ntokens; i < nsyms; i++) for (i = ntokens; i < nsyms; i++)
{ {
printf("%s derives", tags[i]); printf(_("%s derives"), tags[i]);
for (sp = derives[i]; *sp > 0; sp++) for (sp = derives[i]; *sp > 0; sp++)
{ {
printf(" %d", *sp); printf(" %d", *sp);

View File

@@ -63,13 +63,13 @@ void
usage (stream) usage (stream)
FILE *stream; FILE *stream;
{ {
fprintf (stream, "\ fprintf (stream, _("\
Usage: %s [-dhklntvyV] [-b file-prefix] [-o outfile] [-p name-prefix]\n\ Usage: %s [-dhklntvyV] [-b file-prefix] [-o outfile] [-p name-prefix]\n\
[--debug] [--defines] [--fixed-output-files] [--no-lines]\n\ [--debug] [--defines] [--fixed-output-files] [--no-lines]\n\
[--verbose] [--version] [--help] [--yacc]\n\ [--verbose] [--version] [--help] [--yacc]\n\
[--no-parser] [--token-table]\n\ [--no-parser] [--token-table]\n\
[--file-prefix=prefix] [--name-prefix=prefix]\n\ [--file-prefix=prefix] [--name-prefix=prefix]\n\
[--output=outfile] grammar-file\n", [--output=outfile] grammar-file\n"),
program_name); program_name);
} }
@@ -157,11 +157,11 @@ getargs(argc, argv)
if (optind == argc) if (optind == argc)
{ {
fprintf(stderr, "%s: no grammar file given\n", program_name); fprintf(stderr, _("%s: no grammar file given\n"), program_name);
exit(1); exit(1);
} }
if (optind < argc - 1) if (optind < argc - 1)
fprintf(stderr, "%s: extra arguments ignored after '%s'\n", fprintf(stderr, _("%s: extra arguments ignored after '%s'\n"),
program_name, argv[optind]); program_name, argv[optind]);
infile = argv[optind]; infile = argv[optind];

View File

@@ -288,7 +288,7 @@ set_goto_map()
if (ISTOKEN(symbol)) break; if (ISTOKEN(symbol)) break;
if (ngotos == MAXSHORT) if (ngotos == MAXSHORT)
toomany("gotos"); toomany(_("gotos"));
ngotos++; ngotos++;
goto_map[symbol]++; goto_map[symbol]++;

View File

@@ -109,7 +109,7 @@ skip_white_space()
c = getc(finput); c = getc(finput);
if (c != '*' && c != '/') if (c != '*' && c != '/')
{ {
warn("unexpected `/' found and ignored"); warn(_("unexpected `/' found and ignored"));
break; break;
} }
cplus_comment = (c == '/'); cplus_comment = (c == '/');
@@ -138,7 +138,7 @@ skip_white_space()
c = getc(finput); c = getc(finput);
} }
else if (c == EOF) else if (c == EOF)
fatal("unterminated comment"); fatal(_("unterminated comment"));
else else
c = getc(finput); c = getc(finput);
} }
@@ -167,7 +167,7 @@ safegetc(f)
{ {
register int c = getc(f); register int c = getc(f);
if (c == EOF) if (c == EOF)
fatal("Unexpected end of file"); fatal(_("Unexpected end of file"));
return c; return c;
} }
@@ -191,7 +191,7 @@ literalchar(pp, pcode, term)
c = safegetc(finput); c = safegetc(finput);
if (c == '\n') if (c == '\n')
{ {
warn("unescaped newline in constant"); warn(_("unescaped newline in constant"));
ungetc(c, finput); ungetc(c, finput);
code = '?'; code = '?';
wasquote = 1; wasquote = 1;
@@ -223,7 +223,7 @@ literalchar(pp, pcode, term)
code = (code * 8) + (c - '0'); code = (code * 8) + (c - '0');
if (code >= 256 || code < 0) if (code >= 256 || code < 0)
{ {
warni("octal value outside range 0...255: `\\%o'", code); warni(_("octal value outside range 0...255: `\\%o'"), code);
code &= 0xFF; code &= 0xFF;
break; break;
} }
@@ -247,7 +247,7 @@ literalchar(pp, pcode, term)
break; break;
if (code >= 256 || code<0) if (code >= 256 || code<0)
{ {
warni("hexadecimal value above 255: `\\x%x'", code); warni(_("hexadecimal value above 255: `\\x%x'"), code);
code &= 0xFF; code &= 0xFF;
break; break;
} }
@@ -257,7 +257,7 @@ literalchar(pp, pcode, term)
} }
else else
{ {
warni ("unknown escape sequence: `\\' followed by `%s'", warni (_("unknown escape sequence: `\\' followed by `%s'"),
printable_version(c)); printable_version(c));
code = '?'; code = '?';
} }
@@ -388,7 +388,7 @@ lex()
c = getc(finput); c = getc(finput);
if (c != '\'') if (c != '\'')
{ {
warn("use \"...\" for multi-character literal tokens"); warn(_("use \"...\" for multi-character literal tokens"));
dp = discard; dp = discard;
while (literalchar(&dp, &discode, '\'')) {} while (literalchar(&dp, &discode, '\'')) {}
} }
@@ -463,10 +463,10 @@ lex()
while (c != '>') while (c != '>')
{ {
if (c == EOF) if (c == EOF)
fatal("unterminated type name at end of file"); fatal(_("unterminated type name at end of file"));
if (c == '\n') if (c == '\n')
{ {
warn("unterminated type name"); warn(_("unterminated type name"));
ungetc(c, finput); ungetc(c, finput);
break; break;
} }

View File

@@ -49,7 +49,7 @@ set_nullable()
short *r1; short *r1;
#ifdef TRACE #ifdef TRACE
fprintf(stderr, "Entering set_nullable"); fprintf(stderr, _("Entering set_nullable"));
#endif #endif
nullable = NEW2(nvars, char) - ntokens; nullable = NEW2(nvars, char) - ntokens;

View File

@@ -1190,7 +1190,7 @@ int vector;
{ {
loc = j + from[k]; loc = j + from[k];
if (loc > MAXTABLE) if (loc > MAXTABLE)
fatals("maximum table size (%s) exceeded", int_to_string(MAXTABLE)); fatals(_("maximum table size (%s) exceeded"), int_to_string(MAXTABLE));
if (table[loc] != 0) if (table[loc] != 0)
ok = 0; ok = 0;

View File

@@ -80,7 +80,7 @@ void
print_token(extnum, token) print_token(extnum, token)
int extnum, token; int extnum, token;
{ {
fprintf(foutput, " type %d is %s\n", extnum, tags[token]); fprintf(foutput, _(" type %d is %s\n"), extnum, tags[token]);
} }
@@ -88,7 +88,7 @@ void
print_state(state) print_state(state)
int state; int state;
{ {
fprintf(foutput, "\n\nstate %d\n\n", state); fprintf(foutput, _("\n\nstate %d\n\n"), state);
print_core(state); print_core(state);
print_actions(state); print_actions(state);
} }
@@ -133,7 +133,7 @@ int state;
sp++; sp++;
} }
fprintf (foutput, " (rule %d)", rule); fprintf (foutput, _(" (rule %d)"), rule);
putc('\n', foutput); putc('\n', foutput);
} }
@@ -161,9 +161,9 @@ int state;
if (!shiftp && !redp) if (!shiftp && !redp)
{ {
if (final_state == state) if (final_state == state)
fprintf(foutput, " $default\taccept\n"); fprintf(foutput, _(" $default\taccept\n"));
else else
fprintf(foutput, " NO ACTIONS\n"); fprintf(foutput, _(" NO ACTIONS\n"));
return; return;
} }
@@ -179,9 +179,9 @@ int state;
/* The following line used to be turned off. */ /* The following line used to be turned off. */
if (ISVAR(symbol)) break; if (ISVAR(symbol)) break;
if (symbol==0) /* I.e. strcmp(tags[symbol],"$")==0 */ if (symbol==0) /* I.e. strcmp(tags[symbol],"$")==0 */
fprintf(foutput, " $ \tgo to state %d\n", state1); fprintf(foutput, _(" $ \tgo to state %d\n"), state1);
else else
fprintf(foutput, " %-4s\tshift, and go to state %d\n", fprintf(foutput, _(" %-4s\tshift, and go to state %d\n"),
tags[symbol], state1); tags[symbol], state1);
} }
@@ -204,7 +204,7 @@ int state;
{ {
if (! errp->errs[j]) continue; if (! errp->errs[j]) continue;
symbol = errp->errs[j]; symbol = errp->errs[j];
fprintf(foutput, " %-4s\terror (nonassociative)\n", tags[symbol]); fprintf(foutput, _(" %-4s\terror (nonassociative)\n"), tags[symbol]);
} }
if (j > 0) if (j > 0)
@@ -215,7 +215,7 @@ int state;
{ {
rule = redp->rules[0]; rule = redp->rules[0];
symbol = rlhs[rule]; symbol = rlhs[rule];
fprintf(foutput, " $default\treduce using rule %d (%s)\n\n", fprintf(foutput, _(" $default\treduce using rule %d (%s)\n\n"),
rule, tags[symbol]); rule, tags[symbol]);
} }
else if (redp) else if (redp)
@@ -230,7 +230,7 @@ int state;
if (! shiftp->shifts[i]) continue; if (! shiftp->shifts[i]) continue;
state1 = shiftp->shifts[i]; state1 = shiftp->shifts[i];
symbol = accessing_symbol[state1]; symbol = accessing_symbol[state1];
fprintf(foutput, " %-4s\tgo to state %d\n", tags[symbol], state1); fprintf(foutput, _(" %-4s\tgo to state %d\n"), tags[symbol], state1);
} }
putc('\n', foutput); putc('\n', foutput);
@@ -251,23 +251,23 @@ print_grammar()
int column = 0; int column = 0;
/* rule # : LHS -> RHS */ /* rule # : LHS -> RHS */
fputs("\nGrammar\n", foutput); fputs(_("\nGrammar\n"), foutput);
for (i = 1; i <= nrules; i++) for (i = 1; i <= nrules; i++)
/* Don't print rules disabled in reduce_grammar_tables. */ /* Don't print rules disabled in reduce_grammar_tables. */
if (rlhs[i] >= 0) if (rlhs[i] >= 0)
{ {
fprintf(foutput, "rule %-4d %s ->", i, tags[rlhs[i]]); fprintf(foutput, _("rule %-4d %s ->"), i, tags[rlhs[i]]);
rule = &ritem[rrhs[i]]; rule = &ritem[rrhs[i]];
if (*rule > 0) if (*rule > 0)
while (*rule > 0) while (*rule > 0)
fprintf(foutput, " %s", tags[*rule++]); fprintf(foutput, " %s", tags[*rule++]);
else else
fputs (" /* empty */", foutput); fputs (_(" /* empty */"), foutput);
putc('\n', foutput); putc('\n', foutput);
} }
/* TERMINAL (type #) : rule #s terminal is on RHS */ /* TERMINAL (type #) : rule #s terminal is on RHS */
fputs("\nTerminals, with rules where they appear\n\n", foutput); fputs(_("\nTerminals, with rules where they appear\n\n"), foutput);
fprintf(foutput, "%s (-1)\n", tags[0]); fprintf(foutput, "%s (-1)\n", tags[0]);
if (translations) if (translations)
{ {
@@ -315,7 +315,7 @@ print_grammar()
fprintf (foutput, "%s\n", buffer); fprintf (foutput, "%s\n", buffer);
} }
fputs("\nNonterminals, with rules where they appear\n\n", foutput); fputs(_("\nNonterminals, with rules where they appear\n\n"), foutput);
for (i = ntokens; i <= nsyms - 1; i++) for (i = ntokens; i <= nsyms - 1; i++)
{ {
int left_count = 0, right_count = 0; int left_count = 0, right_count = 0;
@@ -341,7 +341,7 @@ print_grammar()
if (left_count > 0) if (left_count > 0)
{ {
END_TEST (50); END_TEST (50);
sprintf (buffer + strlen(buffer), " on left:"); sprintf (buffer + strlen(buffer), _(" on left:"));
for (j = 1; j <= nrules; j++) for (j = 1; j <= nrules; j++)
{ {
@@ -356,7 +356,7 @@ print_grammar()
if (left_count > 0) if (left_count > 0)
sprintf (buffer + strlen(buffer), ","); sprintf (buffer + strlen(buffer), ",");
END_TEST (50); END_TEST (50);
sprintf (buffer + strlen(buffer), " on right:"); sprintf (buffer + strlen(buffer), _(" on right:"));
for (j = 1; j <= nrules; j++) for (j = 1; j <= nrules; j++)
{ {
for (rule = &ritem[rrhs[j]]; *rule > 0; rule++) for (rule = &ritem[rrhs[j]]; *rule > 0; rule++)

View File

@@ -135,9 +135,9 @@ skip_to_char(target)
{ {
int c; int c;
if (target == '\n') if (target == '\n')
warn(" Skipping to next \\n"); warn(_(" Skipping to next \\n"));
else else
warni(" Skipping to next %c", target); warni(_(" Skipping to next %c"), target);
do do
c = skip_white_space(); c = skip_white_space();
@@ -312,16 +312,16 @@ read_declarations ()
break; break;
default: default:
warns("unrecognized: %s", token_buffer); warns(_("unrecognized: %s"), token_buffer);
skip_to_char('%'); skip_to_char('%');
} }
} }
else if (c == EOF) else if (c == EOF)
fatal("no input grammar"); fatal(_("no input grammar"));
else else
{ {
char buff[100]; char buff[100];
sprintf(buff, "unknown character: %s", printable_version(c)); sprintf(buff, _("unknown character: %s"), printable_version(c));
warn(buff); warn(buff);
skip_to_char('%'); skip_to_char('%');
} }
@@ -370,10 +370,10 @@ copy_definition ()
while (c != match) while (c != match)
{ {
if (c == EOF) if (c == EOF)
fatal("unterminated string at end of file"); fatal(_("unterminated string at end of file"));
if (c == '\n') if (c == '\n')
{ {
warn("unterminated string"); warn(_("unterminated string"));
ungetc(c, finput); ungetc(c, finput);
c = match; c = match;
continue; continue;
@@ -385,7 +385,7 @@ copy_definition ()
{ {
c = getc(finput); c = getc(finput);
if (c == EOF) if (c == EOF)
fatal("unterminated string at end of file"); fatal(_("unterminated string at end of file"));
putc(c, fattrs); putc(c, fattrs);
if (c == '\n') if (c == '\n')
lineno++; lineno++;
@@ -434,7 +434,7 @@ copy_definition ()
c = getc(finput); c = getc(finput);
} }
else if (c == EOF) else if (c == EOF)
fatal("unterminated comment in `%{' definition"); fatal(_("unterminated comment in `%{' definition"));
else else
{ {
putc(c, fattrs); putc(c, fattrs);
@@ -445,7 +445,7 @@ copy_definition ()
break; break;
case EOF: case EOF:
fatal("unterminated `%{' definition"); fatal(_("unterminated `%{' definition"));
default: default:
putc(c, fattrs); putc(c, fattrs);
@@ -519,7 +519,7 @@ parse_token_decl (what_is, what_is_not)
symbol = symval; symbol = symval;
if (symbol->class == what_is_not) if (symbol->class == what_is_not)
warns("symbol %s redefined", symbol->tag); warns(_("symbol %s redefined"), symbol->tag);
symbol->class = what_is; symbol->class = what_is;
if (what_is == SNTERM && oldclass != SNTERM) if (what_is == SNTERM && oldclass != SNTERM)
symbol->value = nvars++; symbol->value = nvars++;
@@ -529,7 +529,7 @@ parse_token_decl (what_is, what_is_not)
if (symbol->type_name == NULL) if (symbol->type_name == NULL)
symbol->type_name = typename; symbol->type_name = typename;
else if (strcmp(typename, symbol->type_name) != 0) else if (strcmp(typename, symbol->type_name) != 0)
warns("type redeclaration for %s", symbol->tag); warns(_("type redeclaration for %s"), symbol->tag);
} }
} }
else if (symbol && token == NUMBER) else if (symbol && token == NUMBER)
@@ -539,7 +539,7 @@ parse_token_decl (what_is, what_is_not)
} }
else else
{ {
warnss("`%s' is invalid in %s", warnss(_("`%s' is invalid in %s"),
token_buffer, token_buffer,
(what_is == STOKEN) ? "%token" : "%nterm"); (what_is == STOKEN) ? "%token" : "%nterm");
skip_to_char('%'); skip_to_char('%');
@@ -587,7 +587,7 @@ parse_thong_decl ()
if (token != IDENTIFIER) if (token != IDENTIFIER)
{ {
warns("unrecognized item %s, expected an identifier", warns(_("unrecognized item %s, expected an identifier"),
token_buffer); token_buffer);
skip_to_char('%'); skip_to_char('%');
return; return;
@@ -609,7 +609,7 @@ parse_thong_decl ()
if (token != IDENTIFIER || *symval->tag != '\"') if (token != IDENTIFIER || *symval->tag != '\"')
{ {
warns("expected string constant instead of %s", warns(_("expected string constant instead of %s"),
token_buffer); token_buffer);
skip_to_char('%'); skip_to_char('%');
return; return;
@@ -631,9 +631,9 @@ void
parse_start_decl () parse_start_decl ()
{ {
if (start_flag) if (start_flag)
warn("multiple %start declarations"); warn(_("multiple %start declarations"));
if (lex() != IDENTIFIER) if (lex() != IDENTIFIER)
warn("invalid %start declaration"); warn(_("invalid %start declaration"));
else else
{ {
start_flag = 1; start_flag = 1;
@@ -653,7 +653,7 @@ parse_type_decl ()
if (lex() != TYPENAME) if (lex() != TYPENAME)
{ {
warn("%type declaration has no <typename>"); warn(_("%type declaration has no <typename>"));
skip_to_char('%'); skip_to_char('%');
return; return;
} }
@@ -682,12 +682,12 @@ parse_type_decl ()
if (symval->type_name == NULL) if (symval->type_name == NULL)
symval->type_name = name; symval->type_name = name;
else if (strcmp(name, symval->type_name) != 0) else if (strcmp(name, symval->type_name) != 0)
warns("type redeclaration for %s", symval->tag); warns(_("type redeclaration for %s"), symval->tag);
break; break;
default: default:
warns("invalid %%type declaration due to item: `%s'", token_buffer); warns(_("invalid %%type declaration due to item: `%s'"), token_buffer);
skip_to_char('%'); skip_to_char('%');
} }
} }
@@ -731,18 +731,18 @@ int assoc;
case IDENTIFIER: case IDENTIFIER:
if (symval->prec != 0) if (symval->prec != 0)
warns("redefining precedence of %s", symval->tag); warns(_("redefining precedence of %s"), symval->tag);
symval->prec = lastprec; symval->prec = lastprec;
symval->assoc = assoc; symval->assoc = assoc;
if (symval->class == SNTERM) if (symval->class == SNTERM)
warns("symbol %s redefined", symval->tag); warns(_("symbol %s redefined"), symval->tag);
symval->class = STOKEN; symval->class = STOKEN;
if (name) if (name)
{ /* record the type, if one is specified */ { /* record the type, if one is specified */
if (symval->type_name == NULL) if (symval->type_name == NULL)
symval->type_name = name; symval->type_name = name;
else if (strcmp(name, symval->type_name) != 0) else if (strcmp(name, symval->type_name) != 0)
warns("type redeclaration for %s", symval->tag); warns(_("type redeclaration for %s"), symval->tag);
} }
break; break;
@@ -754,7 +754,7 @@ int assoc;
} }
else else
{ {
warns("invalid text (%s) - number should be after identifier", warns(_("invalid text (%s) - number should be after identifier"),
token_buffer); token_buffer);
skip_to_char('%'); skip_to_char('%');
} }
@@ -764,7 +764,7 @@ int assoc;
return; return;
default: default:
warns("unexpected item: %s", token_buffer); warns(_("unexpected item: %s"), token_buffer);
skip_to_char('%'); skip_to_char('%');
} }
@@ -788,7 +788,7 @@ parse_union_decl()
int cplus_comment; int cplus_comment;
if (typed) if (typed)
warn("multiple %union declarations"); warn(_("multiple %union declarations"));
typed = 1; typed = 1;
@@ -846,7 +846,7 @@ parse_union_decl()
} }
} }
if (c == EOF) if (c == EOF)
fatal("unterminated comment at end of file"); fatal(_("unterminated comment at end of file"));
if (!cplus_comment && c == '*') if (!cplus_comment && c == '*')
{ {
@@ -872,7 +872,7 @@ parse_union_decl()
case '}': case '}':
if (count == 0) if (count == 0)
warn ("unmatched close-brace (`}')"); warn (_("unmatched close-brace (`}')"));
count--; count--;
if (count <= 0) if (count <= 0)
{ {
@@ -916,7 +916,7 @@ parse_expect_decl()
ungetc (c, finput); ungetc (c, finput);
if (count <= 0 || count > 10) if (count <= 0 || count > 10)
warn("argument of %expect is not an integer"); warn(_("argument of %expect is not an integer"));
expected_conflicts = atoi (buffer); expected_conflicts = atoi (buffer);
} }
@@ -929,14 +929,14 @@ get_type_name(n, rule)
int n; int n;
symbol_list *rule; symbol_list *rule;
{ {
static char *msg = "invalid $ value"; static char *msg = N_("invalid $ value");
register int i; register int i;
register symbol_list *rp; register symbol_list *rp;
if (n < 0) if (n < 0)
{ {
warn(msg); warn(_(msg));
return NULL; return NULL;
} }
@@ -948,7 +948,7 @@ symbol_list *rule;
rp = rp->next; rp = rp->next;
if (rp == NULL || rp->sym == NULL) if (rp == NULL || rp->sym == NULL)
{ {
warn(msg); warn(_(msg));
return NULL; return NULL;
} }
i++; i++;
@@ -1011,7 +1011,7 @@ int stack_offset;
count--; count--;
else else
{ {
warn("unmatched right brace (`}')"); warn(_("unmatched right brace (`}')"));
c = getc(finput); /* skip it */ c = getc(finput); /* skip it */
} }
break; break;
@@ -1025,10 +1025,10 @@ int stack_offset;
while (c != match) while (c != match)
{ {
if (c == EOF) if (c == EOF)
fatal("unterminated string at end of file"); fatal(_("unterminated string at end of file"));
if (c == '\n') if (c == '\n')
{ {
warn("unterminated string"); warn(_("unterminated string"));
ungetc(c, finput); ungetc(c, finput);
c = match; /* invent terminator */ c = match; /* invent terminator */
continue; continue;
@@ -1040,7 +1040,7 @@ int stack_offset;
{ {
c = getc(finput); c = getc(finput);
if (c == EOF) if (c == EOF)
fatal("unterminated string"); fatal(_("unterminated string"));
putc(c, fguard); putc(c, fguard);
if (c == '\n') if (c == '\n')
lineno++; lineno++;
@@ -1089,7 +1089,7 @@ int stack_offset;
c = getc(finput); c = getc(finput);
} }
else if (c == EOF) else if (c == EOF)
fatal("unterminated comment"); fatal(_("unterminated comment"));
else else
{ {
putc(c, fguard); putc(c, fguard);
@@ -1122,7 +1122,7 @@ int stack_offset;
if (type_name) if (type_name)
fprintf(fguard, ".%s", type_name); fprintf(fguard, ".%s", type_name);
if(!type_name && typed) if(!type_name && typed)
warns("$$ of `%s' has no declared type", rule->sym->tag); warns(_("$$ of `%s' has no declared type"), rule->sym->tag);
} }
else if (isdigit(c) || c == '-') else if (isdigit(c) || c == '-')
@@ -1138,11 +1138,11 @@ int stack_offset;
if (type_name) if (type_name)
fprintf(fguard, ".%s", type_name); fprintf(fguard, ".%s", type_name);
if(!type_name && typed) if(!type_name && typed)
warnss("$%s of `%s' has no declared type", int_to_string(n), rule->sym->tag); warnss(_("$%s of `%s' has no declared type"), int_to_string(n), rule->sym->tag);
continue; continue;
} }
else else
warni("$%s is invalid", printable_version(c)); warni(_("$%s is invalid"), printable_version(c));
break; break;
@@ -1156,7 +1156,7 @@ int stack_offset;
} }
else else
{ {
warni("@%s is invalid", printable_version(c)); warni(_("@%s is invalid"), printable_version(c));
n = 1; n = 1;
} }
@@ -1166,7 +1166,7 @@ int stack_offset;
continue; continue;
case EOF: case EOF:
fatal("unterminated %%guard clause"); fatal(_("unterminated %%guard clause"));
default: default:
putc(c, fguard); putc(c, fguard);
@@ -1248,13 +1248,13 @@ int stack_offset;
{ {
if (c == '\n') if (c == '\n')
{ {
warn("unterminated string"); warn(_("unterminated string"));
ungetc(c, finput); ungetc(c, finput);
c = match; c = match;
continue; continue;
} }
else if (c == EOF) else if (c == EOF)
fatal("unterminated string at end of file"); fatal(_("unterminated string at end of file"));
putc(c, faction); putc(c, faction);
@@ -1262,7 +1262,7 @@ int stack_offset;
{ {
c = getc(finput); c = getc(finput);
if (c == EOF) if (c == EOF)
fatal("unterminated string"); fatal(_("unterminated string"));
putc(c, faction); putc(c, faction);
if (c == '\n') if (c == '\n')
lineno++; lineno++;
@@ -1311,7 +1311,7 @@ int stack_offset;
c = getc(finput); c = getc(finput);
} }
else if (c == EOF) else if (c == EOF)
fatal("unterminated comment"); fatal(_("unterminated comment"));
else else
{ {
putc(c, faction); putc(c, faction);
@@ -1344,7 +1344,7 @@ int stack_offset;
if (type_name) if (type_name)
fprintf(faction, ".%s", type_name); fprintf(faction, ".%s", type_name);
if(!type_name && typed) if(!type_name && typed)
warns("$$ of `%s' has no declared type", rule->sym->tag); warns(_("$$ of `%s' has no declared type"), rule->sym->tag);
} }
else if (isdigit(c) || c == '-') else if (isdigit(c) || c == '-')
{ {
@@ -1359,12 +1359,12 @@ int stack_offset;
if (type_name) if (type_name)
fprintf(faction, ".%s", type_name); fprintf(faction, ".%s", type_name);
if(!type_name && typed) if(!type_name && typed)
warnss("$%s of `%s' has no declared type", warnss(_("$%s of `%s' has no declared type"),
int_to_string(n), rule->sym->tag); int_to_string(n), rule->sym->tag);
continue; continue;
} }
else else
warni("$%s is invalid", printable_version(c)); warni(_("$%s is invalid"), printable_version(c));
break; break;
@@ -1378,7 +1378,7 @@ int stack_offset;
} }
else else
{ {
warn("invalid @-construct"); warn(_("invalid @-construct"));
n = 1; n = 1;
} }
@@ -1388,7 +1388,7 @@ int stack_offset;
continue; continue;
case EOF: case EOF:
fatal("unmatched `{'"); fatal(_("unmatched `{'"));
default: default:
putc(c, faction); putc(c, faction);
@@ -1474,14 +1474,14 @@ readgram()
t = lex(); t = lex();
if (t != COLON) if (t != COLON)
{ {
warn("ill-formed rule: initial symbol not followed by colon"); warn(_("ill-formed rule: initial symbol not followed by colon"));
unlex(t); unlex(t);
} }
} }
if (nrules == 0 && t == BAR) if (nrules == 0 && t == BAR)
{ {
warn("grammar starts with vertical bar"); warn(_("grammar starts with vertical bar"));
lhs = symval; /* BOGUS: use a random symval */ lhs = symval; /* BOGUS: use a random symval */
} }
/* start a new rule and record its lhs. */ /* start a new rule and record its lhs. */
@@ -1512,7 +1512,7 @@ readgram()
nvars++; nvars++;
} }
else if (lhs->class == STOKEN) else if (lhs->class == STOKEN)
warns("rule given for %s, which is a token", lhs->tag); warns(_("rule given for %s, which is a token"), lhs->tag);
/* read the rhs of the rule. */ /* read the rhs of the rule. */
@@ -1610,7 +1610,7 @@ readgram()
if (t == PREC) if (t == PREC)
{ {
warn("two @prec's in a row"); warn(_("two @prec's in a row"));
t = lex(); t = lex();
crule->ruleprec = symval; crule->ruleprec = symval;
t = lex(); t = lex();
@@ -1618,7 +1618,7 @@ readgram()
if (t == GUARD) if (t == GUARD)
{ {
if (! semantic_parser) if (! semantic_parser)
warn("%%guard present but %%semantic_parser not specified"); warn(_("%%guard present but %%semantic_parser not specified"));
copy_guard(crule, rulelength); copy_guard(crule, rulelength);
t = lex(); t = lex();
@@ -1626,7 +1626,7 @@ readgram()
else if (t == LEFT_CURLY) else if (t == LEFT_CURLY)
{ {
/* This case never occurs -wjh */ /* This case never occurs -wjh */
if (actionflag) warn("two actions at end of one rule"); if (actionflag) warn(_("two actions at end of one rule"));
copy_action(crule, rulelength); copy_action(crule, rulelength);
actionflag = 1; actionflag = 1;
xactions++; /* -wjh */ xactions++; /* -wjh */
@@ -1638,13 +1638,13 @@ readgram()
{ {
if (lhs->type_name == 0 || first_rhs->type_name == 0 if (lhs->type_name == 0 || first_rhs->type_name == 0
|| strcmp(lhs->type_name,first_rhs->type_name)) || strcmp(lhs->type_name,first_rhs->type_name))
warnss("type clash (`%s' `%s') on default action", warnss(_("type clash (`%s' `%s') on default action"),
lhs->type_name ? lhs->type_name : "", lhs->type_name ? lhs->type_name : "",
first_rhs->type_name ? first_rhs->type_name : ""); first_rhs->type_name ? first_rhs->type_name : "");
} }
/* Warn if there is no default for $$ but we need one. */ /* Warn if there is no default for $$ but we need one. */
else if (!xactions && !first_rhs && lhs->type_name != 0) else if (!xactions && !first_rhs && lhs->type_name != 0)
warn("empty rule for typed nonterminal, and no action"); warn(_("empty rule for typed nonterminal, and no action"));
if (t == SEMICOLON) if (t == SEMICOLON)
t = lex(); t = lex();
} }
@@ -1688,7 +1688,7 @@ readgram()
else else
{ {
warns("invalid input: %s", token_buffer); warns(_("invalid input: %s"), token_buffer);
t = lex(); t = lex();
} }
} }
@@ -1696,10 +1696,10 @@ readgram()
/* grammar has been read. Do some checking */ /* grammar has been read. Do some checking */
if (nsyms > MAXSHORT) if (nsyms > MAXSHORT)
fatals("too many symbols (tokens plus nonterminals); maximum %s", fatals(_("too many symbols (tokens plus nonterminals); maximum %s"),
int_to_string(MAXSHORT)); int_to_string(MAXSHORT));
if (nrules == 0) if (nrules == 0)
fatal("no rules in the input grammar"); fatal(_("no rules in the input grammar"));
if (typed == 0 /* JF put out same default YYSTYPE as YACC does */ if (typed == 0 /* JF put out same default YYSTYPE as YACC does */
&& !value_components_used) && !value_components_used)
@@ -1717,7 +1717,7 @@ readgram()
for (bp = firstsymbol; bp; bp = bp->next) for (bp = firstsymbol; bp; bp = bp->next)
if (bp->class == SUNKNOWN) if (bp->class == SUNKNOWN)
{ {
warns("symbol %s is used, but is not defined as a token and has no rules", warns(_("symbol %s is used, but is not defined as a token and has no rules"),
bp->tag); bp->tag);
bp->class = SNTERM; bp->class = SNTERM;
bp->value = nvars++; bp->value = nvars++;
@@ -1755,7 +1755,7 @@ get_type()
if (t != TYPENAME) if (t != TYPENAME)
{ {
warn("ill-formed %type declaration"); warn(_("ill-formed %type declaration"));
return t; return t;
} }
@@ -1779,7 +1779,7 @@ get_type()
if (symval->type_name == NULL) if (symval->type_name == NULL)
symval->type_name = name; symval->type_name = name;
else if (strcmp(name, symval->type_name) != 0) else if (strcmp(name, symval->type_name) != 0)
warns("type redeclaration for %s", symval->tag); warns(_("type redeclaration for %s"), symval->tag);
break; break;
@@ -1834,7 +1834,7 @@ packsymbols()
if (bp->prec != bp->alias->prec) { if (bp->prec != bp->alias->prec) {
if (bp->prec != 0 && bp->alias->prec != 0 if (bp->prec != 0 && bp->alias->prec != 0
&& bp->user_token_number == SALIAS) && bp->user_token_number == SALIAS)
warnss("conflicting precedences for %s and %s", warnss(_("conflicting precedences for %s and %s"),
bp->tag, bp->alias->tag); bp->tag, bp->alias->tag);
if (bp->prec != 0) bp->alias->prec = bp->prec; if (bp->prec != 0) bp->alias->prec = bp->prec;
else bp->prec = bp->alias->prec; else bp->prec = bp->alias->prec;
@@ -1843,7 +1843,7 @@ packsymbols()
if (bp->assoc != bp->alias->assoc) { if (bp->assoc != bp->alias->assoc) {
if (bp->assoc != 0 && bp->alias->assoc != 0 if (bp->assoc != 0 && bp->alias->assoc != 0
&& bp->user_token_number == SALIAS) && bp->user_token_number == SALIAS)
warnss("conflicting assoc values for %s and %s", warnss(_("conflicting assoc values for %s and %s"),
bp->tag, bp->alias->tag); bp->tag, bp->alias->tag);
if (bp->assoc != 0) bp->alias->assoc = bp->assoc; if (bp->assoc != 0) bp->alias->assoc = bp->assoc;
else bp->assoc = bp->alias->assoc; else bp->assoc = bp->alias->assoc;
@@ -1890,7 +1890,7 @@ packsymbols()
if (bp->value >= ntokens) continue; /* non-terminal */ if (bp->value >= ntokens) continue; /* non-terminal */
if (bp->user_token_number == SALIAS) continue; if (bp->user_token_number == SALIAS) continue;
if (token_translations[bp->user_token_number] != 2) if (token_translations[bp->user_token_number] != 2)
warnsss("tokens %s and %s both assigned number %s", warnsss(_("tokens %s and %s both assigned number %s"),
tags[token_translations[bp->user_token_number]], tags[token_translations[bp->user_token_number]],
bp->tag, bp->tag,
int_to_string(bp->user_token_number)); int_to_string(bp->user_token_number));
@@ -1904,9 +1904,9 @@ packsymbols()
output_token_defines(ftable); output_token_defines(ftable);
if (startval->class == SUNKNOWN) if (startval->class == SUNKNOWN)
fatals("the start symbol %s is undefined", startval->tag); fatals(_("the start symbol %s is undefined"), startval->tag);
else if (startval->class == STOKEN) else if (startval->class == STOKEN)
fatals("the start symbol %s is a token", startval->tag); fatals(_("the start symbol %s is a token"), startval->tag);
start_symbol = startval->value; start_symbol = startval->value;

View File

@@ -138,7 +138,7 @@ reduce_grammar ()
print_notices(); print_notices();
if (!BITISSET(N, start_symbol - ntokens)) if (!BITISSET(N, start_symbol - ntokens))
fatals("Start symbol %s does not derive any sentence", fatals(_("Start symbol %s does not derive any sentence"),
tags[start_symbol]); tags[start_symbol]);
reduce_grammar_tables(); reduce_grammar_tables();
@@ -151,8 +151,8 @@ reduce_grammar ()
/**/ statisticsflag = FALSE; /* someday getopts should handle this */ /**/ statisticsflag = FALSE; /* someday getopts should handle this */
if (statisticsflag == TRUE) if (statisticsflag == TRUE)
fprintf(stderr, fprintf(stderr,
"reduced %s defines %d terminal%s, %d nonterminal%s\ _("reduced %s defines %d terminal%s, %d nonterminal%s\
, and %d production%s.\n", infile, , and %d production%s.\n"), infile,
ntokens, (ntokens == 1 ? "" : "s"), ntokens, (ntokens == 1 ? "" : "s"),
nvars, (nvars == 1 ? "" : "s"), nvars, (nvars == 1 ? "" : "s"),
nrules, (nrules == 1 ? "" : "s")); nrules, (nrules == 1 ? "" : "s"));
@@ -491,7 +491,7 @@ print_results ()
if (nuseless_nonterminals > 0) if (nuseless_nonterminals > 0)
{ {
fprintf(foutput, "Useless nonterminals:\n\n"); fprintf(foutput, _("Useless nonterminals:\n\n"));
for (i = ntokens; i < nsyms; i++) for (i = ntokens; i < nsyms; i++)
if (!BITISSET(V, i)) if (!BITISSET(V, i))
fprintf(foutput, " %s\n", tags[i]); fprintf(foutput, " %s\n", tags[i]);
@@ -503,7 +503,7 @@ print_results ()
{ {
if (!b) if (!b)
{ {
fprintf(foutput, "\n\nTerminals which are not used:\n\n"); fprintf(foutput, _("\n\nTerminals which are not used:\n\n"));
b = TRUE; b = TRUE;
} }
fprintf(foutput, " %s\n", tags[i]); fprintf(foutput, " %s\n", tags[i]);
@@ -512,7 +512,7 @@ print_results ()
if (nuseless_productions > 0) if (nuseless_productions > 0)
{ {
fprintf(foutput, "\n\nUseless rules:\n\n"); fprintf(foutput, _("\n\nUseless rules:\n\n"));
for (i = 1; i <= nrules; i++) for (i = 1; i <= nrules; i++)
{ {
if (!BITISSET(P, i)) if (!BITISSET(P, i))
@@ -540,13 +540,13 @@ dump_grammar ()
fprintf(foutput, fprintf(foutput,
"ntokens = %d, nvars = %d, nsyms = %d, nrules = %d, nitems = %d\n\n", "ntokens = %d, nvars = %d, nsyms = %d, nrules = %d, nitems = %d\n\n",
ntokens, nvars, nsyms, nrules, nitems); ntokens, nvars, nsyms, nrules, nitems);
fprintf(foutput, "Variables\n---------\n\n"); fprintf(foutput, _("Variables\n---------\n\n"));
fprintf(foutput, "Value Sprec Sassoc Tag\n"); fprintf(foutput, _("Value Sprec Sassoc Tag\n"));
for (i = ntokens; i < nsyms; i++) for (i = ntokens; i < nsyms; i++)
fprintf(foutput, "%5d %5d %5d %s\n", fprintf(foutput, "%5d %5d %5d %s\n",
i, sprec[i], sassoc[i], tags[i]); i, sprec[i], sassoc[i], tags[i]);
fprintf(foutput, "\n\n"); fprintf(foutput, "\n\n");
fprintf(foutput, "Rules\n-----\n\n"); fprintf(foutput, _("Rules\n-----\n\n"));
for (i = 1; i <= nrules; i++) for (i = 1; i <= nrules; i++)
{ {
fprintf(foutput, "%-5d(%5d%5d)%5d : (@%-5d)", fprintf(foutput, "%-5d(%5d%5d)%5d : (@%-5d)",
@@ -556,7 +556,7 @@ dump_grammar ()
fprintf(foutput, " [%d]\n", -(*r)); fprintf(foutput, " [%d]\n", -(*r));
} }
fprintf(foutput, "\n\n"); fprintf(foutput, "\n\n");
fprintf(foutput, "Rules interpreted\n-----------------\n\n"); fprintf(foutput, _("Rules interpreted\n-----------------\n\n"));
for (i = 1; i <= nrules; i++) for (i = 1; i <= nrules; i++)
{ {
fprintf(foutput, "%-5d %s :", i, tags[rlhs[i]]); fprintf(foutput, "%-5d %s :", i, tags[rlhs[i]]);
@@ -574,22 +574,22 @@ print_notices ()
extern int fixed_outfiles; extern int fixed_outfiles;
if (fixed_outfiles && nuseless_productions) if (fixed_outfiles && nuseless_productions)
fprintf(stderr, "%d rules never reduced\n", nuseless_productions); fprintf(stderr, _("%d rules never reduced\n"), nuseless_productions);
fprintf(stderr, "%s contains ", infile); fprintf(stderr, _("%s contains "), infile);
if (nuseless_nonterminals > 0) if (nuseless_nonterminals > 0)
{ {
fprintf(stderr, "%d useless nonterminal%s", fprintf(stderr, _("%d useless nonterminal%s"),
nuseless_nonterminals, nuseless_nonterminals,
(nuseless_nonterminals == 1 ? "" : "s")); (nuseless_nonterminals == 1 ? "" : "s"));
} }
if (nuseless_nonterminals > 0 && nuseless_productions > 0) if (nuseless_nonterminals > 0 && nuseless_productions > 0)
fprintf(stderr, " and "); fprintf(stderr, _(" and "));
if (nuseless_productions > 0) if (nuseless_productions > 0)
{ {
fprintf(stderr, "%d useless rule%s", fprintf(stderr, _("%d useless rule%s"),
nuseless_productions, nuseless_productions,
(nuseless_productions == 1 ? "" : "s")); (nuseless_productions == 1 ? "" : "s"));
} }