BEGIN SC_LINE_COMMENT;
}
[$@] {
- complain_at (*loc, Wother, _("stray '%s'"), yytext);
+ complain (loc, Wother, _("stray '%s'"), yytext);
obstack_escape (&obstack_for_string, yytext);
need_semicolon = true;
}
if (outer_brace && !yacc_flag && language_prio == default_prio
&& skeleton_prio == default_prio && need_semicolon && ! in_cpp)
{
- complain_at (*loc, Wother,
- _("a ';' might be needed at the end of action code"));
- complain_at (*loc, Wother,
- _("future versions of Bison will not add the ';'"));
+ complain (loc, Wdeprecated, _("a ';' might be needed at the end of action code"));
+ complain (loc, Wdeprecated, _("future versions of Bison will not add the ';'"));
obstack_1grow (&obstack_for_string, ';');
}
}
static void
-show_sub_messages (const char* cp, bool explicit_bracketing,
- int midrule_rhs_index, char dollar_or_at,
- bool is_warning, unsigned indent)
+show_sub_message (const char* cp, bool explicit_bracketing,
+ int midrule_rhs_index, char dollar_or_at,
+ unsigned indent, const variant *var)
{
- unsigned i;
+ const char *at_spec = get_at_spec (var->symbol_index);
- for (i = 0; i < variant_count; ++i)
+ if (var->err == 0)
+ complain_at_indent (var->loc, silent, &indent,
+ _("refers to: %c%s at %s"), dollar_or_at,
+ var->id, at_spec);
+ else
{
- const variant *var = &variant_table[i];
- const char *at_spec = get_at_spec (var->symbol_index);
+ static struct obstack msg_buf;
+ const char *tail = explicit_bracketing ? "" : cp + strlen (var->id);
+ const char *id = var->hidden_by ? var->hidden_by->id : var->id;
+ location id_loc = var->hidden_by ? var->hidden_by->loc : var->loc;
- if (var->err == 0)
- {
- if (is_warning)
- complain_at_indent (var->loc, Wother, &indent,
- _("refers to: %c%s at %s"), dollar_or_at,
- var->id, at_spec);
- else
- complain_at_indent (var->loc, complaint, &indent,
- _("refers to: %c%s at %s"), dollar_or_at,
- var->id, at_spec);
- }
+ /* Create the explanation message. */
+ obstack_init (&msg_buf);
+
+ obstack_printf (&msg_buf, _("possibly meant: %c"), dollar_or_at);
+ if (contains_dot_or_dash (id))
+ obstack_printf (&msg_buf, "[%s]", id);
else
+ obstack_sgrow (&msg_buf, id);
+ obstack_sgrow (&msg_buf, tail);
+
+ if (var->err & VARIANT_HIDDEN)
{
- static struct obstack msg_buf;
- const char *tail = explicit_bracketing ? "" :
- cp + strlen (var->id);
- const char *id = var->hidden_by ? var->hidden_by->id :
- var->id;
- location id_loc = var->hidden_by ? var->hidden_by->loc :
- var->loc;
-
- /* Create the explanation message. */
- obstack_init (&msg_buf);
-
- obstack_printf (&msg_buf, _("possibly meant: %c"), dollar_or_at);
- if (contains_dot_or_dash (id))
- obstack_printf (&msg_buf, "[%s]", id);
+ obstack_printf (&msg_buf, _(", hiding %c"), dollar_or_at);
+ if (contains_dot_or_dash (var->id))
+ obstack_printf (&msg_buf, "[%s]", var->id);
else
- obstack_sgrow (&msg_buf, id);
+ obstack_sgrow (&msg_buf, var->id);
obstack_sgrow (&msg_buf, tail);
+ }
- if (var->err & VARIANT_HIDDEN)
- {
- obstack_printf (&msg_buf, _(", hiding %c"), dollar_or_at);
- if (contains_dot_or_dash (var->id))
- obstack_printf (&msg_buf, "[%s]", var->id);
- else
- obstack_sgrow (&msg_buf, var->id);
- obstack_sgrow (&msg_buf, tail);
- }
-
- obstack_printf (&msg_buf, _(" at %s"), at_spec);
+ obstack_printf (&msg_buf, _(" at %s"), at_spec);
- if (var->err & VARIANT_NOT_VISIBLE_FROM_MIDRULE)
- {
- const char *format =
- _(", cannot be accessed from mid-rule action at $%d");
- obstack_printf (&msg_buf, format, midrule_rhs_index);
- }
+ if (var->err & VARIANT_NOT_VISIBLE_FROM_MIDRULE)
+ obstack_printf (&msg_buf,
+ _(", cannot be accessed from mid-rule action at $%d"),
+ midrule_rhs_index);
- obstack_1grow (&msg_buf, '\0');
- if (is_warning)
- complain_at_indent (id_loc, Wother, &indent, "%s",
- (char *) obstack_finish (&msg_buf));
- else
- complain_at_indent (id_loc, complaint, &indent, "%s",
- (char *) obstack_finish (&msg_buf));
- obstack_free (&msg_buf, 0);
- }
+ complain_at_indent (id_loc, silent, &indent, "%s",
+ obstack_finish0 (&msg_buf));
+ obstack_free (&msg_buf, 0);
}
}
+static void
+show_sub_messages (const char* cp, bool explicit_bracketing,
+ int midrule_rhs_index, char dollar_or_at,
+ unsigned indent)
+{
+ unsigned i;
+
+ for (i = 0; i < variant_count; ++i)
+ show_sub_message (cp, explicit_bracketing,
+ midrule_rhs_index, dollar_or_at,
+ indent, &variant_table[i]);
+}
+
/* Returned from "parse_ref" when the reference
is inappropriate. */
#define INVALID_REF (INT_MIN)
return num;
else
{
- complain_at (text_loc, complaint, _("integer out of range: %s"),
- quote (text));
+ complain (&text_loc, complaint, _("integer out of range: %s"),
+ quote (text));
return INVALID_REF;
}
}
location sym_loc = text_loc;
sym_loc.start.column += 1;
sym_loc.end = sym_loc.start;
- const char *format =
- _("syntax error after '%c', expecting integer, letter,"
- " '_', '[', or '$'");
- complain_at_indent (sym_loc, complaint, &indent, format,
+ complain_at_indent (sym_loc, complaint, &indent,
+ _("syntax error after '%c', expecting integer, "
+ "letter, '_', '[', or '$'"),
dollar_or_at);
}
else if (midrule_rhs_index)
- {
- const char *format =
- _("symbol not found in production before $%d: %.*s");
- complain_at_indent (rule->location, complaint, &indent, format,
- midrule_rhs_index, len, cp);
- }
+ complain_at_indent (rule->location, complaint, &indent,
+ _("symbol not found in production before $%d: "
+ "%.*s"),
+ midrule_rhs_index, len, cp);
else
- {
- const char *format =
- _("symbol not found in production: %.*s");
- complain_at_indent (rule->location, complaint, &indent, format,
- len, cp);
- }
+ complain_at_indent (rule->location, complaint, &indent,
+ _("symbol not found in production: %.*s"),
+ len, cp);
if (variant_count > 0)
show_sub_messages (cp, explicit_bracketing, midrule_rhs_index,
- dollar_or_at, false, indent);
+ dollar_or_at, indent);
return INVALID_REF;
}
case 1:
complain_at_indent (text_loc, Wother, &indent,
_("misleading reference: %s"), quote (text));
show_sub_messages (cp, explicit_bracketing, midrule_rhs_index,
- dollar_or_at, true, indent + SUB_INDENT);
+ dollar_or_at, indent + SUB_INDENT);
}
{
unsigned symbol_index =
complain_at_indent (text_loc, complaint, &indent,
_("ambiguous reference: %s"), quote (text));
show_sub_messages (cp, explicit_bracketing, midrule_rhs_index,
- dollar_or_at, false, indent + SUB_INDENT);
+ dollar_or_at, indent + SUB_INDENT);
return INVALID_REF;
}
}
'text' is needed for error messages. */
++cp;
if (untyped_var_seen)
- complain_at (dollar_loc, complaint,
- _("explicit type given in untyped grammar"));
+ complain (&dollar_loc, complaint,
+ _("explicit type given in untyped grammar"));
tag_seen = true;
}
return cp;
if (union_seen | tag_seen)
{
if (rule->midrule_parent_rule)
- complain_at (dollar_loc, complaint,
+ complain (&dollar_loc, complaint,
_("$$ for the midrule at $%d of %s"
" has no declared type"),
rule->midrule_parent_rhs_index,
quote (effective_rule->content.sym->tag));
else
- complain_at (dollar_loc, complaint,
- _("$$ of %s has no declared type"),
- quote (rule->content.sym->tag));
+ complain (&dollar_loc, complaint,
+ _("$$ of %s has no declared type"),
+ quote (rule->content.sym->tag));
}
else
untyped_var_seen = true;
if (!type_name)
{
if (union_seen | tag_seen)
- complain_at (dollar_loc, complaint,
- _("$%s of %s has no declared type"), cp,
- quote (effective_rule->content.sym->tag));
+ complain (&dollar_loc, complaint,
+ _("$%s of %s has no declared type"), cp,
+ quote (effective_rule->content.sym->tag));
else
untyped_var_seen = true;
}
projects / bison.git / blobdiff