#include "lex.h"
#include "gram.h"
#include "machine.h"
+#include "complain.h"
#define LTYPESTR "\
\n\
/* Number of slots allocated (but not necessarily used yet) in `rline' */
int rline_allocated;
-extern char *program_name;
extern int definesflag;
extern int nolinesflag;
extern int noparserflag;
extern void output_trailers PARAMS((void));
extern void free_symtab PARAMS((void));
extern void open_extra_files PARAMS((void));
-extern char *int_to_string PARAMS((int));
extern char *printable_version PARAMS((int));
-extern void fatal PARAMS((char *));
-extern void fatals PARAMS((char *, char *));
-extern void warn PARAMS((char *));
-extern void warni PARAMS((char *, int));
-extern void warns PARAMS((char *, char *));
-extern void warnss PARAMS((char *, char *, char *));
-extern void warnsss PARAMS((char *, char *, char *, char *));
extern void unlex PARAMS((int));
-extern void done PARAMS((int));
extern int skip_white_space PARAMS((void));
extern int parse_percent_token PARAMS((void));
{
int c;
if (target == '\n')
- warn(_(" Skipping to next \\n"));
+ complain (_(" Skipping to next \\n"));
else
- warni(_(" Skipping to next %c"), target);
+ complain (_(" Skipping to next %c"), target);
do
c = skip_white_space();
fatal (_("unterminated string at end of file"));
if (c == '\n')
{
- warn (_("unterminated string"));
+ complain (_("unterminated string"));
ungetc (c, finput);
c = match; /* invent terminator */
continue;
}
-/* Dump the comment from FINPUT to FOUTPUT. C is either `*' or `/',
- depending upon the type of comments used. */
+/* Dump the comment from IN to OUT1 and OUT2. C is either `*' or `/',
+ depending upon the type of comments used. OUT2 might be NULL. */
static inline void
-copy_comment (FILE *finput, FILE *foutput, int c)
+copy_comment2 (FILE *in, FILE *out1, FILE* out2, int c)
{
int cplus_comment;
- register int match;
register int ended;
cplus_comment = (c == '/');
- putc (c, foutput);
- c = getc (finput);
+ putc (c, out1);
+ if (out2)
+ putc (c, out2);
+ c = getc (in);
ended = 0;
while (!ended)
{
while (c == '*')
{
- putc(c, foutput);
- c = getc(finput);
+ putc (c, out1);
+ if (out2)
+ putc (c, out2);
+ c = getc (in);
}
if (c == '/')
{
- putc(c, foutput);
+ putc(c, out1);
+ if (out2)
+ putc(c, out2);
ended = 1;
}
}
else if (c == '\n')
{
lineno++;
- putc (c, foutput);
+ putc (c, out1);
+ if (out2)
+ putc (c, out2);
if (cplus_comment)
ended = 1;
else
- c = getc(finput);
+ c = getc (in);
}
else if (c == EOF)
fatal (_("unterminated comment"));
else
{
- putc (c, foutput);
- c = getc (finput);
+ putc (c, out1);
+ if (out2)
+ putc (c, out2);
+ c = getc (in);
}
}
}
+/* Dump the comment from FINPUT to FOUTPUT. C is either `*' or `/',
+ depending upon the type of comments used. */
+
+static inline void
+copy_comment (FILE *finput, FILE *foutput, int c)
+{
+ copy_comment2 (finput, foutput, NULL, c);
+}
+
+
void
reader (void)
{
break;
case UNION:
- parse_union_decl();
+ parse_union_decl ();
break;
case EXPECT:
break;
default:
- warns(_("unrecognized: %s"), token_buffer);
+ complain (_("unrecognized: %s"), token_buffer);
skip_to_char('%');
}
}
else if (c == EOF)
- fatal(_("no input grammar"));
+ fatal (_("no input grammar"));
else
{
- warns (_("unknown character: %s"), printable_version(c));
+ complain (_("unknown character: %s"), printable_version(c));
skip_to_char('%');
}
}
break;
case EOF:
- fatal(_("unterminated `%{' definition"));
+ fatal ("%s",
+ _("unterminated `%{' definition"));
default:
putc(c, fattrs);
if (tmp_char == '%')
return;
if (tmp_char == EOF)
- fatals ("Premature EOF after %s", token_buffer);
+ fatal (_("Premature EOF after %s"), token_buffer);
token = lex();
if (token == COMMA)
symbol = symval;
if (symbol->class == what_is_not)
- warns(_("symbol %s redefined"), symbol->tag);
+ complain (_("symbol %s redefined"), symbol->tag);
symbol->class = what_is;
if (what_is == SNTERM && oldclass != SNTERM)
symbol->value = nvars++;
if (symbol->type_name == NULL)
symbol->type_name = typename;
else if (strcmp(typename, symbol->type_name) != 0)
- warns(_("type redeclaration for %s"), symbol->tag);
+ complain (_("type redeclaration for %s"), symbol->tag);
}
}
else if (symbol && token == NUMBER)
}
else
{
- warnss(_("`%s' is invalid in %s"),
- token_buffer,
+ complain (_("`%s' is invalid in %s"),
+ token_buffer,
(what_is == STOKEN) ? "%token" : "%nterm");
skip_to_char('%');
}
if (token != IDENTIFIER)
{
- warns(_("unrecognized item %s, expected an identifier"),
- token_buffer);
+ complain (_("unrecognized item %s, expected an identifier"),
+ token_buffer);
skip_to_char('%');
return;
}
if (token != IDENTIFIER || *symval->tag != '\"')
{
- warns(_("expected string constant instead of %s"),
- token_buffer);
+ complain (_("expected string constant instead of %s"),
+ token_buffer);
skip_to_char('%');
return;
}
}
-/* parse what comes after %start */
+/* Parse what comes after %start */
void
parse_start_decl (void)
{
if (start_flag)
- warn(_("multiple %start declarations"));
- if (lex() != IDENTIFIER)
- warn(_("invalid %start declaration"));
+ complain (_("multiple %s declarations"), "%start");
+ if (lex () != IDENTIFIER)
+ complain (_("invalid %s declaration"), "%start");
else
{
start_flag = 1;
if (lex() != TYPENAME)
{
- warn(_("%type declaration has no <typename>"));
+ complain ("%s", _("%type declaration has no <typename>"));
skip_to_char('%');
return;
}
if (tmp_char == '%')
return;
if (tmp_char == EOF)
- fatals ("Premature EOF after %s", token_buffer);
+ fatal (_("Premature EOF after %s"), token_buffer);
t = lex();
if (symval->type_name == NULL)
symval->type_name = name;
else if (strcmp(name, symval->type_name) != 0)
- warns(_("type redeclaration for %s"), symval->tag);
+ complain (_("type redeclaration for %s"), symval->tag);
break;
default:
- warns(_("invalid %%type declaration due to item: `%s'"), token_buffer);
+ complain (_("invalid %%type declaration due to item: %s"),
+ token_buffer);
skip_to_char('%');
}
}
if (tmp_char == '%')
return;
if (tmp_char == EOF)
- fatals ("Premature EOF after %s", token_buffer);
+ fatal (_("Premature EOF after %s"), token_buffer);
t = lex();
case IDENTIFIER:
if (symval->prec != 0)
- warns(_("redefining precedence of %s"), symval->tag);
+ complain (_("redefining precedence of %s"), symval->tag);
symval->prec = lastprec;
symval->assoc = assoc;
if (symval->class == SNTERM)
- warns(_("symbol %s redefined"), symval->tag);
+ complain (_("symbol %s redefined"), symval->tag);
symval->class = STOKEN;
if (name)
{ /* record the type, if one is specified */
if (symval->type_name == NULL)
symval->type_name = name;
else if (strcmp(name, symval->type_name) != 0)
- warns(_("type redeclaration for %s"), symval->tag);
+ complain (_("type redeclaration for %s"), symval->tag);
}
break;
}
else
{
- warns(_("invalid text (%s) - number should be after identifier"),
+ complain (_("invalid text (%s) - number should be after identifier"),
token_buffer);
skip_to_char('%');
}
return;
default:
- warns(_("unexpected item: %s"), token_buffer);
+ complain (_("unexpected item: %s"), token_buffer);
skip_to_char('%');
}
parse_union_decl (void)
{
register int c;
- register int count;
- register int in_comment;
- int cplus_comment;
+ register int count = 0;
if (typed)
- warn(_("multiple %union declarations"));
+ complain (_("multiple %s declarations"), "%union");
typed = 1;
if (!nolinesflag)
- fprintf(fattrs, "\n#line %d \"%s\"\n", lineno, infile);
+ fprintf (fattrs, "\n#line %d \"%s\"\n", lineno, infile);
else
- fprintf(fattrs, "\n");
+ fprintf (fattrs, "\n");
- fprintf(fattrs, "typedef union");
+ fprintf (fattrs, "typedef union");
if (fdefines)
- fprintf(fdefines, "typedef union");
+ fprintf (fdefines, "typedef union");
- count = 0;
- in_comment = 0;
-
- c = getc(finput);
+ c = getc (finput);
while (c != EOF)
{
- putc(c, fattrs);
+ putc (c, fattrs);
if (fdefines)
- putc(c, fdefines);
+ putc (c, fdefines);
switch (c)
{
break;
case '/':
- c = getc(finput);
+ c = getc (finput);
if (c != '*' && c != '/')
- ungetc(c, finput);
- else
- {
- putc(c, fattrs);
- if (fdefines)
- putc(c, fdefines);
- cplus_comment = (c == '/');
- in_comment = 1;
- c = getc(finput);
- while (in_comment)
- {
- putc(c, fattrs);
- if (fdefines)
- putc(c, fdefines);
-
- if (c == '\n')
- {
- lineno++;
- if (cplus_comment)
- {
- in_comment = 0;
- break;
- }
- }
- if (c == EOF)
- fatal(_("unterminated comment at end of file"));
-
- if (!cplus_comment && c == '*')
- {
- c = getc(finput);
- if (c == '/')
- {
- putc('/', fattrs);
- if (fdefines)
- putc('/', fdefines);
- in_comment = 0;
- }
- }
- else
- c = getc(finput);
- }
- }
+ continue;
+ copy_comment2 (finput, fattrs, fdefines, c);
break;
case '}':
if (count == 0)
- warn (_("unmatched close-brace (`}')"));
+ complain (_("unmatched %s"), "`}'");
count--;
if (count <= 0)
{
- fprintf(fattrs, " YYSTYPE;\n");
+ fprintf (fattrs, " YYSTYPE;\n");
if (fdefines)
- fprintf(fdefines, " YYSTYPE;\n");
+ fprintf (fdefines, " YYSTYPE;\n");
/* JF don't choke on trailing semi */
- c=skip_white_space();
- if(c!=';') ungetc(c,finput);
+ c = skip_white_space ();
+ if (c != ';')
+ ungetc (c,finput);
return;
}
}
- c = getc(finput);
+ c = getc (finput);
}
}
ungetc (c, finput);
if (count <= 0 || count > 10)
- warn(_("argument of %expect is not an integer"));
+ complain ("%s", _("argument of %expect is not an integer"));
expected_conflicts = atoi (buffer);
}
yylsp_needed = 1;
}
else
- warns (_("@%s is invalid"), printable_version (c));
+ complain (_("@%s is invalid"), printable_version (c));
}
-/* Get the data type (alternative in the union) of the value for symbol n in rule rule. */
+/* Get the data type (alternative in the union) of the value for
+ symbol n in rule rule. */
char *
get_type_name (int n, symbol_list *rule)
{
- static char *msg = N_("invalid $ value");
-
register int i;
register symbol_list *rp;
if (n < 0)
{
- warn(_(msg));
+ complain (_("invalid $ value"));
return NULL;
}
rp = rp->next;
if (rp == NULL || rp->sym == NULL)
{
- warn(_(msg));
+ complain (_("invalid $ value"));
return NULL;
}
i++;
}
- return (rp->sym->type_name);
+ return rp->sym->type_name;
}
count--;
else
{
- warn(_("unmatched right brace (`}')"));
+ complain (_("unmatched %s"), "`}'");
c = getc(finput); /* skip it */
}
break;
if (type_name)
fprintf(fguard, ".%s", type_name);
if(!type_name && typed)
- warns(_("$$ of `%s' has no declared type"), rule->sym->tag);
+ complain (_("$$ of `%s' has no declared type"),
+ rule->sym->tag);
}
else if (isdigit(c) || c == '-')
{
if (type_name)
fprintf(fguard, ".%s", type_name);
if (!type_name && typed)
- warnss (_("$%s of `%s' has no declared type"),
- int_to_string(n), rule->sym->tag);
+ complain (_("$%d of `%s' has no declared type"),
+ n, rule->sym->tag);
continue;
}
else
- warns(_("$%s is invalid"), printable_version(c));
+ complain (_("$%s is invalid"), printable_version (c));
break;
case '@':
break;
case EOF:
- fatal (_("unterminated %%guard clause"));
+ fatal ("%s",
+ _("unterminated %guard clause"));
default:
putc (c, fguard);
break;
case '/':
- putc(c, faction);
- c = getc(finput);
+ putc (c, faction);
+ c = getc (finput);
if (c != '*' && c != '/')
continue;
copy_comment (finput, faction, c);
if (type_name)
fprintf(faction, ".%s", type_name);
if(!type_name && typed)
- warns(_("$$ of `%s' has no declared type"),
- rule->sym->tag);
+ complain (_("$$ of `%s' has no declared type"),
+ rule->sym->tag);
}
else if (isdigit(c) || c == '-')
{
if (type_name)
fprintf(faction, ".%s", type_name);
if(!type_name && typed)
- warnss(_("$%s of `%s' has no declared type"),
- int_to_string(n), rule->sym->tag);
+ complain (_("$%d of `%s' has no declared type"),
+ n, rule->sym->tag);
continue;
}
else
- warns(_("$%s is invalid"), printable_version(c));
+ complain (_("$%s is invalid"), printable_version (c));
break;
break;
case EOF:
- fatal(_("unmatched `{'"));
+ fatal (_("unmatched %s"), "`{'");
default:
putc(c, faction);
sym = getsym(token_buffer);
sym->class = SNTERM;
sym->value = nvars++;
- return (sym);
+ return sym;
}
/* Parse the input grammar into a one symbol_list structure.
t = lex();
if (t != COLON)
{
- warn(_("ill-formed rule: initial symbol not followed by colon"));
+ complain (_("ill-formed rule: initial symbol not followed by colon"));
unlex(t);
}
}
if (nrules == 0 && t == BAR)
{
- warn(_("grammar starts with vertical bar"));
+ complain (_("grammar starts with vertical bar"));
lhs = symval; /* BOGUS: use a random symval */
}
/* start a new rule and record its lhs. */
nvars++;
}
else if (lhs->class == STOKEN)
- warns(_("rule given for %s, which is a token"), lhs->tag);
+ complain (_("rule given for %s, which is a token"), lhs->tag);
/* read the rhs of the rule. */
if (t == PREC)
{
- warn(_("two @prec's in a row"));
+ complain (_("two @prec's in a row"));
t = lex();
crule->ruleprec = symval;
t = lex();
if (t == GUARD)
{
if (! semantic_parser)
- warn(_("%%guard present but %%semantic_parser not specified"));
+ complain ("%s",
+ _("%guard present but %semantic_parser not specified"));
copy_guard(crule, rulelength);
t = lex();
{
/* This case never occurs -wjh */
if (actionflag)
- warn(_("two actions at end of one rule"));
+ complain (_("two actions at end of one rule"));
copy_action(crule, rulelength);
actionflag = 1;
xactions++; /* -wjh */
t = lex();
}
- /* If $$ is being set in default way, warn if any type
+ /* If $$ is being set in default way, report if any type
mismatch. */
else if (!xactions
&& first_rhs
if (lhs->type_name == 0
|| first_rhs->type_name == 0
|| strcmp(lhs->type_name,first_rhs->type_name))
- warnss(_("type clash (`%s' `%s') on default action"),
- lhs->type_name ? lhs->type_name : "",
- first_rhs->type_name ? first_rhs->type_name : "");
+ complain (_("type clash (`%s' `%s') on default action"),
+ lhs->type_name ? lhs->type_name : "",
+ first_rhs->type_name ? first_rhs->type_name : "");
}
/* Warn if there is no default for $$ but we need one. */
else if (!xactions && !first_rhs && lhs->type_name != 0)
- warn(_("empty rule for typed nonterminal, and no action"));
+ complain (_("empty rule for typed nonterminal, and no action"));
if (t == SEMICOLON)
t = lex();
}
else
{
- warns(_("invalid input: %s"), token_buffer);
+ complain (_("invalid input: %s"), token_buffer);
t = lex();
}
}
/* grammar has been read. Do some checking */
if (nsyms > MAXSHORT)
- fatals(_("too many symbols (tokens plus nonterminals); maximum %s"),
- int_to_string(MAXSHORT));
+ fatal (_("too many symbols (tokens plus nonterminals); maximum %d"),
+ MAXSHORT);
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 */
&& !value_components_used)
for (bp = firstsymbol; bp; bp = bp->next)
if (bp->class == SUNKNOWN)
{
- warns(_("symbol %s is used, but is not defined as a token and has no rules"),
- bp->tag);
+ complain (_("symbol %s is used, but is not defined as a token and has no rules"),
+ bp->tag);
bp->class = SNTERM;
bp->value = nvars++;
}
if (t != TYPENAME)
{
- warn(_("ill-formed %type declaration"));
+ complain (_("invalid %s declaration"), "%type");
return t;
}
switch (t)
{
case SEMICOLON:
- return (lex());
+ return lex();
case COMMA:
break;
if (symval->type_name == NULL)
symval->type_name = name;
else if (strcmp(name, symval->type_name) != 0)
- warns(_("type redeclaration for %s"), symval->tag);
+ complain (_("type redeclaration for %s"), symval->tag);
break;
default:
- return (t);
+ return t;
}
}
}
{
if (bp->prec != 0 && bp->alias->prec != 0
&& bp->user_token_number == SALIAS)
- warnss(_("conflicting precedences for %s and %s"),
- bp->tag, bp->alias->tag);
+ complain (_("conflicting precedences for %s and %s"),
+ bp->tag, bp->alias->tag);
if (bp->prec != 0)
bp->alias->prec = bp->prec;
else
if (bp->assoc != bp->alias->assoc)
{
- if (bp->assoc != 0 && bp->alias->assoc != 0
- && bp->user_token_number == SALIAS)
- warnss(_("conflicting assoc values for %s and %s"),
- bp->tag, bp->alias->tag);
- if (bp->assoc != 0)
- bp->alias->assoc = bp->assoc;
- else
- bp->assoc = bp->alias->assoc;
- }
+ if (bp->assoc != 0 && bp->alias->assoc != 0
+ && bp->user_token_number == SALIAS)
+ complain (_("conflicting assoc values for %s and %s"),
+ bp->tag, bp->alias->tag);
+ if (bp->assoc != 0)
+ bp->alias->assoc = bp->assoc;
+ else
+ bp->assoc = bp->alias->assoc;
+ }
if (bp->user_token_number == SALIAS)
continue; /* do not do processing below for SALIASs */
if (bp->user_token_number == SALIAS)
continue;
if (token_translations[bp->user_token_number] != 2)
- warnsss(_("tokens %s and %s both assigned number %s"),
- tags[token_translations[bp->user_token_number]],
- bp->tag,
- int_to_string(bp->user_token_number));
+ complain (_("tokens %s and %s both assigned number %d"),
+ tags[token_translations[bp->user_token_number]],
+ bp->tag,
+ bp->user_token_number);
token_translations[bp->user_token_number] = bp->value;
}
}
output_token_defines(ftable);
if (startval->class == SUNKNOWN)
- fatals(_("the start symbol %s is undefined"), startval->tag);
+ fatal (_("the start symbol %s is undefined"), startval->tag);
else if (startval->class == STOKEN)
- fatals(_("the start symbol %s is a token"), startval->tag);
+ fatal (_("the start symbol %s is a token"), startval->tag);
start_symbol = startval->value;
while ((c = *cp++) && c != '.');
if (c != '\0') continue;
- fprintf(file, "#define\t%s\t%d\n", symbol,
- ((translations && ! rawtoknumflag)
- ? bp->user_token_number
- : bp->value));
+ fprintf (file, "#define\t%s\t%d\n", symbol,
+ ((translations && ! rawtoknumflag)
+ ? bp->user_token_number
+ : bp->value));
if (semantic_parser)
- fprintf(file, "#define\tT%s\t%d\n", symbol, bp->value);
+ fprintf (file, "#define\tT%s\t%d\n", symbol, bp->value);
}
putc('\n', file);
projects / bison.git / blobdiff