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

minor refactoring in user code scanning

Browse Source 
* src/scan-code.l (show_sub_message, show_sub_messages): Instead of a
Boolean, take a "warnings" argument.
Avoid storing printf-like format strings in a variable, so that GCC
can check them.
This commit is contained in:
Akim Demaille
2012-08-10 10:11:32 +02:00
parent cceb7b94e9
commit c7324354fb
2 changed files with 24 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
TODO
View File

@@ -1,7 +1,4 @@
* Short term * Short term
** scan-code.l
Avoid variables for format strings, as then GCC cannot check them.
** 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
b4_parser_declaration for instance. b4_parser_declaration for instance.

67
src/scan-code.l
View File

@@ -402,22 +402,15 @@ get_at_spec(unsigned symbol_index)
static void static void
show_sub_message (const char* cp, bool explicit_bracketing, show_sub_message (const char* cp, bool explicit_bracketing,
int midrule_rhs_index, char dollar_or_at, int midrule_rhs_index, char dollar_or_at,
bool is_warning, unsigned indent, warnings wflags, unsigned indent,
const variant *var) 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_at_indent (var->loc, wflags, &indent,
if (is_warning) _("refers to: %c%s at %s"), dollar_or_at,
complain_at_indent (var->loc, Wother, &indent, var->id, at_spec);
_("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 else
{ {
static struct obstack msg_buf; static struct obstack msg_buf;
@@ -448,19 +441,13 @@ show_sub_message (const char* cp, bool explicit_bracketing,
obstack_printf (&msg_buf, _(" at %s"), at_spec); obstack_printf (&msg_buf, _(" at %s"), at_spec);
if (var->err & VARIANT_NOT_VISIBLE_FROM_MIDRULE) if (var->err & VARIANT_NOT_VISIBLE_FROM_MIDRULE)
{ obstack_printf (&msg_buf,
const char *format = _(", cannot be accessed from mid-rule action at $%d"),
_(", cannot be accessed from mid-rule action at $%d"); midrule_rhs_index);
obstack_printf (&msg_buf, format, midrule_rhs_index);
}
obstack_1grow (&msg_buf, '\0'); obstack_1grow (&msg_buf, '\0');
if (is_warning) complain_at_indent (id_loc, wflags, &indent, "%s",
complain_at_indent (id_loc, Wother, &indent, "%s", (char *) obstack_finish (&msg_buf));
(char *) obstack_finish (&msg_buf));
else
complain_at_indent (id_loc, complaint, &indent, "%s",
(char *) obstack_finish (&msg_buf));
obstack_free (&msg_buf, 0); obstack_free (&msg_buf, 0);
} }
} }
@@ -468,14 +455,14 @@ show_sub_message (const char* cp, bool explicit_bracketing,
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,
bool is_warning, unsigned indent) warnings wflags, 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 (cp, explicit_bracketing,
midrule_rhs_index, dollar_or_at, midrule_rhs_index, dollar_or_at,
is_warning, indent, &variant_table[i]); wflags, indent, &variant_table[i]);
} }
/* Returned from "parse_ref" when the reference /* Returned from "parse_ref" when the reference
@@ -611,30 +598,24 @@ parse_ref (char *cp, symbol_list *rule, int rule_length,
location sym_loc = text_loc; location sym_loc = text_loc;
sym_loc.start.column += 1; sym_loc.start.column += 1;
sym_loc.end = sym_loc.start; sym_loc.end = sym_loc.start;
const char *format = complain_at_indent (sym_loc, complaint, &indent,
_("syntax error after '%c', expecting integer, letter," _("syntax error after '%c', expecting integer, "
" '_', '[', or '$'"); "letter, '_', '[', or '$'"),
complain_at_indent (sym_loc, complaint, &indent, format,
dollar_or_at); dollar_or_at);
} }
else if (midrule_rhs_index) else if (midrule_rhs_index)
{ complain_at_indent (rule->location, complaint, &indent,
const char *format = _("symbol not found in production before $%d: "
_("symbol not found in production before $%d: %.*s"); "%.*s"),
complain_at_indent (rule->location, complaint, &indent, format, midrule_rhs_index, len, cp);
midrule_rhs_index, len, cp);
}
else else
{ complain_at_indent (rule->location, complaint, &indent,
const char *format = _("symbol not found in production: %.*s"),
_("symbol not found in production: %.*s"); len, cp);
complain_at_indent (rule->location, complaint, &indent, format,
len, cp);
}
if (variant_count > 0) if (variant_count > 0)
show_sub_messages (cp, explicit_bracketing, midrule_rhs_index, show_sub_messages (cp, explicit_bracketing, midrule_rhs_index,
dollar_or_at, false, indent); dollar_or_at, complaint, indent);
return INVALID_REF; return INVALID_REF;
} }
case 1: case 1:
@@ -645,7 +626,7 @@ parse_ref (char *cp, symbol_list *rule, int rule_length,
complain_at_indent (text_loc, Wother, &indent, complain_at_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 (cp, explicit_bracketing, midrule_rhs_index,
dollar_or_at, true, indent + SUB_INDENT); dollar_or_at, Wother, indent + SUB_INDENT);
} }
{ {
unsigned symbol_index = unsigned symbol_index =
@@ -660,7 +641,7 @@ parse_ref (char *cp, symbol_list *rule, int rule_length,
complain_at_indent (text_loc, complaint, &indent, complain_at_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 (cp, explicit_bracketing, midrule_rhs_index,
dollar_or_at, false, indent + SUB_INDENT); dollar_or_at, complaint, indent + SUB_INDENT);
return INVALID_REF; return INVALID_REF;
} }
} }