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: avoid global variables

Browse Source 
* src/complain.c (indent_ptr): Remove.
(error_message, complains): Take indent as an argument.
Adjust callers.
This commit is contained in:
László Várady
2019-08-09 14:24:15 +02:00
committed by Akim Demaille
parent e63811dd86
commit 53526f31df
1 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/complain.c
View File

@@ -63,8 +63,6 @@ typedef enum
/** For each warning type, its severity. */ /** For each warning type, its severity. */
static severity warnings_flag[warnings_size]; static severity warnings_flag[warnings_size];
static unsigned *indent_ptr = NULL;
styled_ostream_t errstream = NULL; styled_ostream_t errstream = NULL;
void void
@@ -386,6 +384,7 @@ warnings_print_categories (warnings warn_flags, FILE *out)
* *
* \param loc the location, defaulting to the current file, * \param loc the location, defaulting to the current file,
* or the program name. * or the program name.
* \param indent optional indentation for the error message.
* \param flags the category for this message. * \param flags the category for this message.
* \param sever to decide the prefix to put before the message * \param sever to decide the prefix to put before the message
* (e.g., "warning"). * (e.g., "warning").
@@ -397,8 +396,8 @@ warnings_print_categories (warnings warn_flags, FILE *out)
*/ */
static static
void void
error_message (const location *loc, warnings flags, severity sever, error_message (const location *loc, unsigned *indent, warnings flags,
const char *message, va_list args) severity sever, const char *message, va_list args)
{ {
unsigned pos = 0; unsigned pos = 0;
@@ -408,14 +407,14 @@ error_message (const location *loc, warnings flags, severity sever,
pos += fprintf (stderr, "%s", current_file ? current_file : program_name); pos += fprintf (stderr, "%s", current_file ? current_file : program_name);
pos += fprintf (stderr, ": "); pos += fprintf (stderr, ": ");
if (indent_ptr) if (indent)
{ {
if (*indent_ptr) if (*indent)
sever = severity_disabled; sever = severity_disabled;
if (!*indent_ptr) if (!*indent)
*indent_ptr = pos; *indent = pos;
else if (*indent_ptr > pos) else if (*indent > pos)
fprintf (stderr, "%*s", *indent_ptr - pos, ""); fprintf (stderr, "%*s", *indent - pos, "");
} }
const char* style = severity_style (sever); const char* style = severity_style (sever);
@@ -450,8 +449,8 @@ error_message (const location *loc, warnings flags, severity sever,
/** Raise a complaint (fatal error, error or just warning). */ /** Raise a complaint (fatal error, error or just warning). */
static void static void
complains (const location *loc, warnings flags, const char *message, complains (const location *loc, unsigned *indent, warnings flags,
va_list args) const char *message, va_list args)
{ {
severity s = warning_severity (flags); severity s = warning_severity (flags);
if ((flags & complaint) && complaint_status < status_complaint) if ((flags & complaint) && complaint_status < status_complaint)
@@ -461,7 +460,7 @@ complains (const location *loc, warnings flags, const char *message,
{ {
if (severity_error <= s && ! complaint_status) if (severity_error <= s && ! complaint_status)
complaint_status = status_warning_as_error; complaint_status = status_warning_as_error;
error_message (loc, flags, s, message, args); error_message (loc, indent, flags, s, message, args);
} }
if (flags & fatal) if (flags & fatal)
@@ -473,7 +472,7 @@ complain (location const *loc, warnings flags, const char *message, ...)
{ {
va_list args; va_list args;
va_start (args, message); va_start (args, message);
complains (loc, flags, message, args); complains (loc, NULL, flags, message, args);
va_end (args); va_end (args);
} }
@@ -482,11 +481,9 @@ complain_indent (location const *loc, warnings flags, unsigned *indent,
const char *message, ...) const char *message, ...)
{ {
va_list args; va_list args;
indent_ptr = indent;
va_start (args, message); va_start (args, message);
complains (loc, flags, message, args); complains (loc, indent, flags, message, args);
va_end (args); va_end (args);
indent_ptr = NULL;
} }
void void