Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-15 15:23:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

warnings: distinguish context information based on warning type

Browse Source 
* src/scan-code.l (show_sub_message, show_sub_messages): Take a new warnings
argument.
This commit is contained in:
Theophile Ranquet
2012-10-26 18:13:27 +00:00
parent 697a8022c6
commit ac0eca3ccb
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/scan-code.l
View File

@@ -398,14 +398,15 @@ get_at_spec(unsigned symbol_index)
} }
static void static void
show_sub_message (const char* cp, bool explicit_bracketing, show_sub_message (warnings warning,
const char* cp, bool explicit_bracketing,
int midrule_rhs_index, char dollar_or_at, int midrule_rhs_index, char dollar_or_at,
unsigned indent, const variant *var) unsigned indent, const variant *var)
{ {
const char *at_spec = get_at_spec (var->symbol_index); const char *at_spec = get_at_spec (var->symbol_index);
if (var->err == 0) if (var->err == 0)
complain_indent (&var->loc, silent, &indent, complain_indent (&var->loc, warning, &indent,
_("refers to: %c%s at %s"), dollar_or_at, _("refers to: %c%s at %s"), dollar_or_at,
var->id, at_spec); var->id, at_spec);
else else
@@ -442,21 +443,23 @@ show_sub_message (const char* cp, bool explicit_bracketing,
_(", cannot be accessed from mid-rule action at $%d"), _(", cannot be accessed from mid-rule action at $%d"),
midrule_rhs_index); midrule_rhs_index);
complain_indent (&id_loc, silent, &indent, "%s", complain_indent (&id_loc, warning, &indent, "%s",
obstack_finish0 (&msg_buf)); obstack_finish0 (&msg_buf));
obstack_free (&msg_buf, 0); obstack_free (&msg_buf, 0);
} }
} }
static void static void
show_sub_messages (const char* cp, bool explicit_bracketing, show_sub_messages (warnings warning,
const char* cp, bool explicit_bracketing,
int midrule_rhs_index, char dollar_or_at, int midrule_rhs_index, char dollar_or_at,
unsigned indent) unsigned indent)
{ {
unsigned i; unsigned i;
for (i = 0; i < variant_count; ++i) for (i = 0; i < variant_count; ++i)
show_sub_message (cp, explicit_bracketing, show_sub_message (warning | silent,
cp, explicit_bracketing,
midrule_rhs_index, dollar_or_at, midrule_rhs_index, dollar_or_at,
indent, &variant_table[i]); indent, &variant_table[i]);
} }
@@ -610,7 +613,8 @@ parse_ref (char *cp, symbol_list *rule, int rule_length,
len, cp); len, cp);
if (variant_count > 0) if (variant_count > 0)
show_sub_messages (cp, explicit_bracketing, midrule_rhs_index, show_sub_messages (complaint,
cp, explicit_bracketing, midrule_rhs_index,
dollar_or_at, indent); dollar_or_at, indent);
return INVALID_REF; return INVALID_REF;
} }
@@ -621,7 +625,8 @@ parse_ref (char *cp, symbol_list *rule, int rule_length,
{ {
complain_indent (&text_loc, Wother, &indent, complain_indent (&text_loc, Wother, &indent,
_("misleading reference: %s"), quote (text)); _("misleading reference: %s"), quote (text));
show_sub_messages (cp, explicit_bracketing, midrule_rhs_index, show_sub_messages (Wother,
cp, explicit_bracketing, midrule_rhs_index,
dollar_or_at, indent + SUB_INDENT); dollar_or_at, indent + SUB_INDENT);
} }
{ {
@@ -636,7 +641,8 @@ parse_ref (char *cp, symbol_list *rule, int rule_length,
unsigned indent = 0; unsigned indent = 0;
complain_indent (&text_loc, complaint, &indent, complain_indent (&text_loc, complaint, &indent,
_("ambiguous reference: %s"), quote (text)); _("ambiguous reference: %s"), quote (text));
show_sub_messages (cp, explicit_bracketing, midrule_rhs_index, show_sub_messages (complaint,
cp, explicit_bracketing, midrule_rhs_index,
dollar_or_at, indent + SUB_INDENT); dollar_or_at, indent + SUB_INDENT);
return INVALID_REF; return INVALID_REF;
} }