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

diagnostics: use gnulib's libtextstyle-optional

Browse Source 
Bruno Haible just added a default implementation of libtextstyle's
interface when the library is not available.
https://lists.gnu.org/archive/html/bison-patches/2019-03/msg00025.html

* gnulib: Update.
* bootstrap.conf: Replace libtextstyle with libtextstyle-optional.
* src/complain.c, src/getargs.c: Remove now useless cpp guards.
This commit is contained in:
Akim Demaille
2019-03-17 19:40:08 +01:00
parent 22a413ce9f
commit 4d34b06fb3
8 changed files with 72 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/complain.c
View File

@@ -23,13 +23,10 @@
#include "system.h"
#include <argmatch.h>
#include <stdarg.h>
#include <progname.h>
#include <stdarg.h>
#include <sys/stat.h>
#if HAVE_LIBTEXTSTYLE
# include <textstyle.h>
#endif
#include <textstyle.h>
#include "complain.h"
#include "files.h"
@@ -68,41 +65,33 @@ static severity warnings_flag[warnings_size];
static unsigned *indent_ptr = NULL;
#if HAVE_LIBTEXTSTYLE
styled_ostream_t errstream = NULL;
#endif
void
begin_use_class (const char *s _GL_UNUSED, FILE *out _GL_UNUSED)
begin_use_class (const char *s, FILE *out)
{
#if HAVE_LIBTEXTSTYLE
if (out == stderr)
{
styled_ostream_begin_use_class (errstream, s);
styled_ostream_flush_to_current_style (errstream);
}
#endif
}
void
end_use_class (const char *s _GL_UNUSED, FILE *out _GL_UNUSED)
end_use_class (const char *s, FILE *out)
{
#if HAVE_LIBTEXTSTYLE
if (out == stderr)
{
styled_ostream_end_use_class (errstream, s);
styled_ostream_flush_to_current_style (errstream);
}
#endif
}
void
flush (FILE *out _GL_UNUSED)
flush (FILE *out)
{
#if HAVE_LIBTEXTSTYLE
if (out == stderr)
ostream_flush (errstream, FLUSH_THIS_STREAM);
#endif
fflush (out);
}
@@ -267,10 +256,11 @@ complain_init_color (void)
else
/* No styling. */
style_file_name = NULL;
#endif
errstream =
styled_ostream_create (STDERR_FILENO, "(stderr)", TTYCTL_AUTO,
style_file_name);
#endif
}
void

7
src/getargs.c
View File

@@ -30,10 +30,7 @@
#include <getopt.h>
#include <progname.h>
#include <quote.h>
#if HAVE_LIBTEXTSTYLE
# include <textstyle.h>
#endif
#include <textstyle.h>
#include "complain.h"
#include "files.h"
@@ -590,7 +587,6 @@ command_line_location (void)
static void
getargs_colors (int argc _GL_UNUSED, char *argv[] _GL_UNUSED)
{
#if HAVE_LIBTEXTSTYLE
for (int i = 1; i < argc; i++)
{
const char *arg = argv[i];
@@ -600,7 +596,6 @@ getargs_colors (int argc _GL_UNUSED, char *argv[] _GL_UNUSED)
handle_style_option (arg + strlen ("--style="));
}
complain_init_color ();
#endif
}