int braces_level = 0;
/* Whether a semicolon is probably needed.
- The heuristic is that a semicolon is not needed after `{', `}', `;',
+ The heuristic is that a semicolon is not needed after '{', '}', ';',
or a C preprocessor directive, and that whitespaces and comments
do not affect this flag.
- Note that `{' does not need a semicolon because of `{}'.
+ Note that '{' does not need a semicolon because of '{}'.
A semicolon may be needed before a cpp direcive, but don't bother. */
bool need_semicolon = false;
%}
/*------------------------------------------------------------.
- | Scanning a C comment. The initial `/ *' is already eaten. |
+ | Scanning a C comment. The initial '/ *' is already eaten. |
`------------------------------------------------------------*/
<SC_COMMENT>
/*--------------------------------------------------------------.
- | Scanning a line comment. The initial `//' is already eaten. |
+ | Scanning a line comment. The initial '//' is already eaten. |
`--------------------------------------------------------------*/
<SC_LINE_COMMENT>
need_semicolon = true;
}
"$" {
- warn_at (*loc, _("stray `$'"));
+ complain_at (*loc, Wother, _("stray '$'"));
obstack_sgrow (&obstack_for_string, "$][");
need_semicolon = true;
}
"@" {
- warn_at (*loc, _("stray `@'"));
+ complain_at (*loc, Wother, _("stray '@'"));
obstack_sgrow (&obstack_for_string, "@@");
need_semicolon = true;
}
"}" {
bool outer_brace = --braces_level == 0;
- /* As an undocumented Bison extension, append `;' before the last
+ /* As an undocumented Bison extension, append ';' before the last
brace in braced code, so that the user code can omit trailing
- `;'. But do not append `;' if emulating Yacc, since Yacc does
+ ';'. But do not append ';' if emulating Yacc, since Yacc does
not append one. */
if (outer_brace && !yacc_flag && language_prio == default_prio
&& skeleton_prio == default_prio && need_semicolon && ! in_cpp)
{
- warn_at (*loc, _("a `;' might be needed at the end of action code"));
- warn_at (*loc, _("future versions of Bison will not add the `;'"));
+ 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 ';'"));
obstack_1grow (&obstack_for_string, ';');
}
/* Preprocessing directives should only be recognized at the beginning
of lines, allowing whitespace including comments, but in C/C++,
- `#' can only be the start of preprocessor directives or within
- `#define' directives anyway, so don't bother with begin of line. */
+ '#' can only be the start of preprocessor directives or within
+ '#define' directives anyway, so don't bother with begin of line. */
"#" STRING_GROW; in_cpp = true;
{splice} STRING_GROW;
2.4.2. */
YYFAIL {
STRING_GROW; need_semicolon = true;
- warn_at (*loc, _("use of YYFAIL, which is deprecated and will be"
- " removed"));
+ complain_at (*loc, Wother,
+ _("use of YYFAIL, which is deprecated and will be removed"));
}
/* The sole purpose of this is to make sure identifiers that merely
if (var->err == 0)
{
if (is_warning)
- warn_at_indent (var->loc, &indent, _("refers to: %c%s at %s"),
- dollar_or_at, var->id, at_spec);
+ 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, &indent, _("refers to: %c%s at %s"),
- dollar_or_at, var->id, at_spec);
+ complain_at_indent (var->loc, complaint, &indent,
+ _("refers to: %c%s at %s"), dollar_or_at,
+ var->id, at_spec);
}
else
{
obstack_1grow (&msg_buf, '\0');
if (is_warning)
- warn_at_indent (id_loc, &indent, "%s",
- (char *) obstack_finish (&msg_buf));
+ complain_at_indent (id_loc, Wother, &indent, "%s",
+ (char *) obstack_finish (&msg_buf));
else
- complain_at_indent (id_loc, &indent, "%s",
+ complain_at_indent (id_loc, complaint, &indent, "%s",
(char *) obstack_finish (&msg_buf));
obstack_free (&msg_buf, 0);
}
return num;
else
{
- complain_at (text_loc, _("integer out of range: %s"),
+ complain_at (text_loc, complaint, _("integer out of range: %s"),
quote (text));
return INVALID_REF;
}
cp_end - cp : ref_tail_fields - cp;
unsigned indent = 0;
- complain_at_indent (text_loc, &indent, _("invalid reference: %s"),
- quote (text));
+ complain_at_indent (text_loc, complaint, &indent,
+ _("invalid reference: %s"), quote (text));
indent += SUB_INDENT;
if (len == 0)
{
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, &indent, format, dollar_or_at);
+ _("syntax error after '%c', expecting integer, letter,"
+ " '_', '[', or '$'");
+ complain_at_indent (sym_loc, complaint, &indent, format,
+ dollar_or_at);
}
else if (midrule_rhs_index)
{
const char *format =
_("symbol not found in production before $%d: %.*s");
- complain_at_indent (rule->location, &indent, format,
+ complain_at_indent (rule->location, complaint, &indent, format,
midrule_rhs_index, len, cp);
}
else
{
const char *format =
_("symbol not found in production: %.*s");
- complain_at_indent (rule->location, &indent, format,
+ complain_at_indent (rule->location, complaint, &indent, format,
len, cp);
}
unsigned indent = 0;
if (variant_count > 1)
{
- warn_at_indent (text_loc, &indent, _("misleading reference: %s"),
- quote (text));
+ 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);
}
default:
{
unsigned indent = 0;
- complain_at_indent (text_loc, &indent, _("ambiguous reference: %s"),
- quote (text));
+ 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);
return INVALID_REF;
/*------------------------------------------------------------------.
-| TEXT is pointing to a wannabee semantic value (i.e., a `$'). |
+| TEXT is pointing to a wannabee semantic value (i.e., a '$'). |
| |
| Possible inputs: $[<TYPENAME>]($|integer) |
| |
gt_ptr = cp;
++cp;
if (untyped_var_seen)
- complain_at (dollar_loc, _("explicit type given in untyped grammar"));
+ complain_at (dollar_loc, complaint,
+ _("explicit type given in untyped grammar"));
tag_seen = true;
}
if (union_seen | tag_seen)
{
if (rule->midrule_parent_rule)
- complain_at (dollar_loc,
- _("$$ for the midrule at $%d of `%s'"
+ complain_at (dollar_loc, complaint,
+ _("$$ for the midrule at $%d of %s"
" has no declared type"),
rule->midrule_parent_rhs_index,
- effective_rule->content.sym->tag);
+ quote (effective_rule->content.sym->tag));
else
- complain_at (dollar_loc, _("$$ of `%s' has no declared type"),
- rule->content.sym->tag);
+ complain_at (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, _("$%s of `%s' has no declared type"),
- cp, effective_rule->content.sym->tag);
+ complain_at (dollar_loc, complaint,
+ _("$%s of %s has no declared type"), cp,
+ quote (effective_rule->content.sym->tag));
else
untyped_var_seen = true;
type_name = "";
/*------------------------------------------------------.
-| TEXT is a location token (i.e., a `@...'). Output to |
+| TEXT is a location token (i.e., a '@...'). Output to |
| OBSTACK_FOR_STRING a reference to this location. |
`------------------------------------------------------*/
code_props_plain_init (code_props *self, char const *code,
location code_loc)
{
+ code_props_none_init (self);
self->kind = CODE_PROPS_PLAIN;
self->code = code;
self->location = code_loc;
- self->is_value_used = false;
- self->rule = NULL;
- self->named_ref = NULL;
}
void
code_props_symbol_action_init (code_props *self, char const *code,
location code_loc)
{
+ code_props_none_init (self);
self->kind = CODE_PROPS_SYMBOL_ACTION;
self->code = code;
self->location = code_loc;
- self->is_value_used = false;
- self->rule = NULL;
- self->named_ref = NULL;
}
void
location code_loc, symbol_list *rule,
named_ref *name, bool is_predicate)
{
+ code_props_none_init (self);
self->kind = CODE_PROPS_RULE_ACTION;
self->code = code;
self->location = code_loc;
- self->is_value_used = false;
self->rule = rule;
self->named_ref = name;
self->is_predicate = is_predicate;
projects / bison.git / blobdiff