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

minor refactoring in user code scanning

Browse Source 
* src/scan-code.l (show_sub_message): New, extracted from...
(show_sub_messages): here.
This commit is contained in:
Akim Demaille
2012-08-10 10:02:16 +02:00
parent 3995c0533b
commit cceb7b94e9
2 changed files with 69 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
TODO
View File

@@ -1,7 +1,6 @@
* Short term * Short term
** scan-code.l ** scan-code.l
Avoid variables for format strings, as then GCC cannot check them. Avoid variables for format strings, as then GCC cannot check them.
show_sub_messages should call show_sub_message.
** m4 names ** m4 names
b4_shared_declarations is no longer what it is. Make it b4_shared_declarations is no longer what it is. Make it

133
src/scan-code.l
View File

@@ -399,6 +399,72 @@ get_at_spec(unsigned symbol_index)
return at_buf; return at_buf;
} }
static void
show_sub_message (const char* cp, bool explicit_bracketing,
int midrule_rhs_index, char dollar_or_at,
bool is_warning, unsigned indent,
const variant *var)
{
const char *at_spec = get_at_spec (var->symbol_index);
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);
}
else
{
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);
else
obstack_sgrow (&msg_buf, 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);
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);
}
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);
}
}
static void static void
show_sub_messages (const char* cp, bool explicit_bracketing, show_sub_messages (const char* cp, bool explicit_bracketing,
int midrule_rhs_index, char dollar_or_at, int midrule_rhs_index, char dollar_or_at,
@@ -407,70 +473,9 @@ show_sub_messages (const char* cp, bool explicit_bracketing,
unsigned i; unsigned i;
for (i = 0; i < variant_count; ++i) for (i = 0; i < variant_count; ++i)
{ show_sub_message (cp, explicit_bracketing,
const variant *var = &variant_table[i]; midrule_rhs_index, dollar_or_at,
const char *at_spec = get_at_spec (var->symbol_index); is_warning, indent, &variant_table[i]);
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);
}
else
{
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);
else
obstack_sgrow (&msg_buf, 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);
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);
}
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);
}
}
} }
/* Returned from "parse_ref" when the reference /* Returned from "parse_ref" when the reference