aboutsummaryrefslogtreecommitdiffstats
path: root/contrib/tools/bison/src/muscle-tab.c
diff options
context:
space:
mode:
authorthegeorg <thegeorg@yandex-team.com>2024-08-10 10:33:06 +0300
committerthegeorg <thegeorg@yandex-team.com>2024-08-10 10:42:26 +0300
commitf606bdbedff44a60218a7007de93ee20833c7b17 (patch)
tree0fd57c06f31dff131521686b3d9eb7def12769ec /contrib/tools/bison/src/muscle-tab.c
parent57386fad9537813e2135b5b19949e5597d7b5b50 (diff)
downloadydb-f606bdbedff44a60218a7007de93ee20833c7b17.tar.gz
Update contrib/tools/bison to 3.6.4
9febd1b3a041f2e2083c076fbde9680a7cdc9b9e
Diffstat (limited to 'contrib/tools/bison/src/muscle-tab.c')
-rw-r--r--contrib/tools/bison/src/muscle-tab.c22
1 files changed, 9 insertions, 13 deletions
diff --git a/contrib/tools/bison/src/muscle-tab.c b/contrib/tools/bison/src/muscle-tab.c
index 5778b8f319..21443f4fe7 100644
--- a/contrib/tools/bison/src/muscle-tab.c
+++ b/contrib/tools/bison/src/muscle-tab.c
@@ -524,15 +524,13 @@ muscle_percent_define_insert (char const *var, location variable_loc,
= atoi (muscle_find_const (how_name));
if (how_old == MUSCLE_PERCENT_DEFINE_F)
goto end;
- int i = 0;
/* If assigning the same value, make it a warning. */
warnings warn = STREQ (value, current_value) ? Wother : complaint;
- complain_indent (&variable_loc, warn, &i,
- _("%%define variable %s redefined"),
- quote (variable));
- i += SUB_INDENT;
+ complain (&variable_loc, warn,
+ _("%%define variable %s redefined"),
+ quote (variable));
location loc = muscle_percent_define_get_loc (variable);
- complain_indent (&loc, warn, &i, _("previous definition"));
+ subcomplain (&loc, warn, _("previous definition"));
fixits_register (&variable_loc, "");
warned = true;
}
@@ -738,14 +736,12 @@ muscle_percent_define_check_values (char const * const *values)
if (!*values)
{
location loc = muscle_percent_define_get_loc (*variablep);
- int i = 0;
- complain_indent (&loc, complaint, &i,
- _("invalid value for %%define variable %s: %s"),
- quote (*variablep), quote_n (1, value));
- i += SUB_INDENT;
+ complain (&loc, complaint,
+ _("invalid value for %%define variable %s: %s"),
+ quote (*variablep), quote_n (1, value));
for (values = variablep + 1; *values; ++values)
- complain_indent (&loc, complaint | no_caret | silent, &i,
- _("accepted value: %s"), quote (*values));
+ subcomplain (&loc, complaint | no_caret | silent,
+ _("accepted value: %s"), quote (*values));
}
else
while (*values)