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

diagnostics: improve -fcaret for list of accepted values

Browse Source 
Instead of

  input.y:1.9-21: error: invalid value for %define variable 'api.push-pull': 'neither'
   %define api.push_pull "neither"
           ^^^^^^^^^^^^^
  input.y:1.9-21:     accepted value: 'pull'
   %define api.push_pull "neither"
           ^^^^^^^^^^^^^
  input.y:1.9-21:     accepted value: 'push'
   %define api.push_pull "neither"
           ^^^^^^^^^^^^^
  input.y:1.9-21:     accepted value: 'both'
   %define api.push_pull "neither"
           ^^^^^^^^^^^^^

report

  input.y:1.9-21: error: invalid value for %define variable 'api.push-pull': 'neither'
   %define api.push_pull "neither"
           ^^^^^^^^^^^^^
  input.y:1.9-21:     accepted value: 'pull'
  input.y:1.9-21:     accepted value: 'push'
  input.y:1.9-21:     accepted value: 'both'

* src/complain.h (no_caret): New.
* src/complain.c (error_message): Use it.
* src/muscle-tab.c (muscle_percent_define_check_values): Use it.
* src/scan-skel.l (flag): Ditto.
* tests/input.at: Adjust and check.
This commit is contained in:
Akim Demaille
2012-12-15 21:54:27 +01:00
parent bcd80897f3
commit ea9e670d72
5 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/complain.c
View File

@@ -114,7 +114,7 @@ error_message (const location *loc, warnings flags, const char *prefix,
{ {
putc ('\n', stderr); putc ('\n', stderr);
fflush (stderr); fflush (stderr);
if (loc && feature_flag & feature_caret) if (loc && feature_flag & feature_caret && !(flags & no_caret))
location_caret (stderr, *loc); location_caret (stderr, *loc);
} }
} }

1
src/complain.h
View File

@@ -43,6 +43,7 @@ typedef enum
complaint = 1 << 11, /**< All complaints. */ complaint = 1 << 11, /**< All complaints. */
fatal = 1 << 12, /**< All fatal errors. */ fatal = 1 << 12, /**< All fatal errors. */
silent = 1 << 13, /**< Do not display the warning type. */ silent = 1 << 13, /**< Do not display the warning type. */
no_caret = 1 << 14, /**< Do not display caret location. */
/**< All above warnings. */ /**< All above warnings. */
Wall = ~complaint & ~fatal & ~silent Wall = ~complaint & ~fatal & ~silent

4
src/muscle-tab.c
View File

@@ -608,8 +608,8 @@ muscle_percent_define_check_values (char const * const *values)
quote (*variablep), quote_n (1, value)); quote (*variablep), quote_n (1, value));
i += SUB_INDENT; i += SUB_INDENT;
for (values = variablep + 1; *values; ++values) for (values = variablep + 1; *values; ++values)
complain_indent (&loc, complaint, &i, _("accepted value: %s"), complain_indent (&loc, complaint | no_caret, &i,
quote (*values)); _("accepted value: %s"), quote (*values));
} }
else else
{ {

2
src/scan-skel.l
View File

@@ -186,7 +186,7 @@ flag (const char *arg)
else if (STREQ (arg, "fatal")) else if (STREQ (arg, "fatal"))
return fatal; return fatal;
else if (STREQ (arg, "note")) else if (STREQ (arg, "note"))
return silent | complaint; return silent | complaint | no_caret;
else if (STREQ (arg, "warn")) else if (STREQ (arg, "warn"))
return Wother; return Wother;
else else

12
tests/input.at
View File

@@ -1343,6 +1343,18 @@ input.y:1.9-21: accepted value: 'push'
input.y:1.9-21: accepted value: 'both' input.y:1.9-21: accepted value: 'both'
]]) ]])
AT_BISON_CHECK([[-fcaret input.y]], [1], [],
[[input.y:1.9-21: warning: deprecated %define variable name: 'api.push_pull', use 'api.push-pull' [-Wdeprecated]
%define api.push_pull "neither"
^^^^^^^^^^^^^
input.y:1.9-21: error: invalid value for %define variable 'api.push-pull': 'neither'
%define api.push_pull "neither"
^^^^^^^^^^^^^
input.y:1.9-21: accepted value: 'pull'
input.y:1.9-21: accepted value: 'push'
input.y:1.9-21: accepted value: 'both'
]])
AT_DATA([[input.y]], AT_DATA([[input.y]],
[[%define lr.keep_unreachable_states maybe [[%define lr.keep_unreachable_states maybe
%% %%