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

diagnostics: rename --style=debug as --color=debug

Browse Source 
It is more consistent with --color=html, --color=test, etc.

* src/getargs.h, src/getargs.c (style_debug): Rename as...
(color_debug): this.
(getargs_colors): Rename --style=debug as --color=debug.
Adjust dependencies.
This commit is contained in:
Akim Demaille
2019-05-08 09:06:12 +02:00
parent 23e536af49
commit 0269c6fb03
4 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/complain.c
View File

@@ -72,7 +72,7 @@ begin_use_class (const char *s, FILE *out)
{
if (out == stderr)
{
if (style_debug)
if (color_debug)
fprintf (out, "<%s>", s);
else
{
@@ -87,7 +87,7 @@ end_use_class (const char *s, FILE *out)
{
if (out == stderr)
{
if (style_debug)
if (color_debug)
fprintf (out, "</%s>", s);
else
{

15
src/getargs.c
View File

@@ -45,7 +45,7 @@ bool no_lines_flag = false;
bool token_table_flag = false;
location yacc_loc = EMPTY_LOCATION_INIT;
bool update_flag = false; /* for -u */
bool style_debug = false; /* --style=debug. */
bool color_debug = false; /* --style=debug. */
bool nondeterministic_parser = false;
bool glr_parser = false;
@@ -596,14 +596,17 @@ getargs_colors (int argc, char *argv[])
{
const char *arg = argv[i];
if (STRPREFIX_LIT ("--color=", arg))
handle_color_option (arg + strlen ("--color="));
{
const char *color = arg + strlen ("--color=");
if (STREQ (color, "debug"))
color_debug = true;
else
handle_color_option (color);
}
else if (STRPREFIX_LIT ("--style=", arg))
{
const char *style = arg + strlen ("--style=");
if (STREQ (style, "debug"))
style_debug = true;
else
handle_style_option (style);
handle_style_option (style);
}
}
complain_init_color ();

2
src/getargs.h
View File

@@ -41,7 +41,7 @@ extern bool no_lines_flag; /* for -l */
extern bool token_table_flag; /* for -k */
extern location yacc_loc; /* for -y */
extern bool update_flag; /* for -u */
extern bool style_debug; /* --style=debug. */
extern bool color_debug; /* --color=debug. */
/* GLR_PARSER is true if the input file says to use the GLR
(Generalized LR) parser, and to output some additional information
used by the GLR algorithm. */

2
tests/diagnostics.at
View File

@@ -45,7 +45,7 @@ AT_CHECK([perl -p -e 's{</?\w+>}{}g' <experr.orig >experr])
AT_CHECK([LC_ALL=en_US.UTF-8 bison -fcaret -Wall input.y], [$3], [], [experr])
AT_CHECK([cp experr.orig experr])
AT_CHECK([LC_ALL=en_US.UTF-8 bison -fcaret --style=debug -Wall input.y], [$3], [], [experr])
AT_CHECK([LC_ALL=en_US.UTF-8 bison -fcaret --color=debug -Wall input.y], [$3], [], [experr])
AT_BISON_OPTION_POPDEFS