gbranden pushed a commit to branch master
in repository groff.
commit 6556bff27aa9e00eac282d82882ba2185b0050a7
Author: G. Branden Robinson <[email protected]>
AuthorDate: Fri Mar 6 19:45:49 2026 -0600
[troff]: Rename several data for clarity.
* src/roff/troff/input.cpp: Rename several warning-related data for
clarity.
Rename preprocessor macro `DEFAULT_WARNING_MASK` to
`DEFAULT_WARNING_CATEGORY_SET`. Rename file-scoped variable
`warning_mask` to `desired_warnings` (it's a _set_ type, not a "mask",
which is more specific).
(enable_warning):
(disable_warning):
(warning):
(output_warning): Update site of dereference.
(init_input_requests) <.warn>: Update wire-uppery.
(do_expr_test): Rename local variable `saved_warning_mask` to
`saved_desired_warnings`.
(enable_warning, disable_warning): Rename local variable `mask` to
`category`.
(set_warning_mask_request): Rename this...
(configure_desired_warnings_request): ...to this.
(init_input_requests) <warn>: Update wire-uppery.
(struct warning_category): Rename `mask` member to `set`.
(lookup_warning): Track rename of structure member.
---
ChangeLog | 25 +++++++++++++++++++++++++
src/roff/troff/input.cpp | 46 +++++++++++++++++++++++-----------------------
2 files changed, 48 insertions(+), 23 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index cb4d69f67..30ed68897 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,28 @@
+2026-03-06 G. Branden Robinson <[email protected]>
+
+ * src/roff/troff/input.cpp: Rename several warning-relatd data
+ for clarity. Rename preprocessor macro `DEFAULT_WARNING_MASK`
+ to `DEFAULT_WARNING_CATEGORY_SET`. Rename file-scoped variable
+ `warning_mask` to `desired_warnings` (it's a _set_ type, not a
+ "mask", which is more specific).
+ (enable_warning):
+ (disable_warning):
+ (warning):
+ (output_warning): Update site of dereference.
+ (init_input_requests) <.warn>: Update wire-uppery.
+
+ (do_expr_test): Rename local variable `saved_warning_mask` to
+ `saved_desired_warnings`.
+ (enable_warning, disable_warning): Rename local variable `mask`
+ to `category`.
+
+ (set_warning_mask_request): Rename this...
+ (configure_desired_warnings_request): ...to this.
+ (init_input_requests) <warn>: Update wire-uppery.
+
+ (struct warning_category): Rename `mask` member to `set`.
+ (lookup_warning): Track rename of structure member.
+
2026-03-06 G. Branden Robinson <[email protected]>
* src/roff/troff/input.cpp (do_expr_test)
diff --git a/src/roff/troff/input.cpp b/src/roff/troff/input.cpp
index bc9119f14..c76a1a253 100644
--- a/src/roff/troff/input.cpp
+++ b/src/roff/troff/input.cpp
@@ -70,9 +70,9 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>. */
#define FINAL_STARTUP_FILE "troffrc-end"
#define DEFAULT_INPUT_STACK_LIMIT 1000
-#ifndef DEFAULT_WARNING_MASK
+#ifndef DEFAULT_WARNING_CATEGORY_SET
// warnings that are enabled by default
-#define DEFAULT_WARNING_MASK \
+#define DEFAULT_WARNING_CATEGORY_SET \
(WARN_CHAR|WARN_BREAK|WARN_SPACE|WARN_FONT|WARN_FILE)
#endif
@@ -106,7 +106,7 @@ char *pipe_command = 0 /* nullptr */;
charinfo *charset_table[256];
unsigned char hpf_code_table[256];
-static unsigned int warning_mask = DEFAULT_WARNING_MASK;
+static unsigned int desired_warnings = DEFAULT_WARNING_CATEGORY_SET;
static bool want_errors_inhibited = false;
static bool want_input_ignored = false;
@@ -1848,15 +1848,15 @@ static const char *do_expr_test() // \B
int start_level = input_stack::get_level();
tok.next();
// disable all warning and error messages temporarily
- unsigned int saved_warning_mask = warning_mask;
+ unsigned int saved_desired_warnings = desired_warnings;
bool saved_want_errors_inhibited = want_errors_inhibited;
- warning_mask = 0U;
+ desired_warnings = 0U;
want_errors_inhibited = true;
int dummy;
// TODO: grochar
bool result = read_measurement(&dummy, (unsigned char)('u'),
true /* is_mandatory */);
- warning_mask = saved_warning_mask;
+ desired_warnings = saved_desired_warnings;
want_errors_inhibited = saved_want_errors_inhibited;
// read_measurement() has left `token` pointing at the input character
// after the end of the expression.
@@ -10132,19 +10132,19 @@ int main(int argc, char **argv)
return 0; // not reached
}
-void set_warning_mask_request()
+void configure_desired_warnings_request()
{
int n;
if (has_arg() && read_integer(&n)) {
if (n & ~WARN_MAX) {
- warning(WARN_RANGE, "warning mask must be in range 0..%1, got %2",
+ warning(WARN_RANGE, "warning set must be in range 0..%1, got %2",
WARN_MAX, n);
n &= WARN_MAX;
}
- warning_mask = n;
+ desired_warnings = n;
}
else
- warning_mask = WARN_MAX;
+ desired_warnings = WARN_MAX;
skip_line();
}
@@ -10293,7 +10293,7 @@ void init_input_requests()
#ifdef COLUMN
init_request("vj", vjustify);
#endif /* COLUMN */
- init_request("warn", set_warning_mask_request);
+ init_request("warn", configure_desired_warnings_request);
init_request("warnscale", warnscale_request);
init_request("while", while_request);
init_request("write", stream_write_request);
@@ -10312,7 +10312,7 @@ void init_input_requests()
register_dictionary.define(".R", new readonly_text_register(INT_MAX));
register_dictionary.define(".U", new
readonly_boolean_register(&want_unsafe_requests));
register_dictionary.define(".V", new readonly_register(&vresolution));
- register_dictionary.define(".warn", new
readonly_mask_register(&warning_mask));
+ register_dictionary.define(".warn", new
readonly_mask_register(&desired_warnings));
extern const char *major_version;
register_dictionary.define(".x", new readonly_text_register(major_version));
extern const char *revision;
@@ -10593,7 +10593,7 @@ static void read_drawing_command_color_arguments(token
&start)
static struct warning_category {
const char *name;
- unsigned int mask;
+ unsigned int set;
} warning_table[] = {
{ "char", WARN_CHAR },
{ "range", WARN_RANGE },
@@ -10615,31 +10615,31 @@ static struct warning_category {
{ "file", WARN_FILE },
{ "all", WARN_MAX & ~(WARN_DI | WARN_MAC | WARN_REG) },
{ "w", WARN_MAX },
- { "default", DEFAULT_WARNING_MASK },
+ { "default", DEFAULT_WARNING_CATEGORY_SET },
};
static unsigned int lookup_warning(const char *name)
{
for (unsigned int i = 0U; i < countof(warning_table); i++)
if (strcmp(name, warning_table[i].name) == 0)
- return warning_table[i].mask;
+ return warning_table[i].set;
return 0U;
}
static void enable_warning(const char *name)
{
- unsigned int mask = lookup_warning(name);
- if (mask != 0U)
- warning_mask |= mask;
+ unsigned int category = lookup_warning(name);
+ if (category != 0U)
+ desired_warnings |= category;
else
error("unrecognized warning category '%1'", name);
}
static void disable_warning(const char *name)
{
- unsigned int mask = lookup_warning(name);
- if (mask != 0U)
- warning_mask &= ~mask;
+ unsigned int category = lookup_warning(name);
+ if (category != 0U)
+ desired_warnings &= ~category;
else
error("unrecognized warning category '%1'", name);
}
@@ -10753,7 +10753,7 @@ int warning(warning_type t,
const errarg &arg2,
const errarg &arg3)
{
- if ((t & warning_mask) != 0U) {
+ if ((t & desired_warnings) != 0U) {
do_error(WARNING, format, arg1, arg2, arg3);
return 1;
}
@@ -10767,7 +10767,7 @@ int output_warning(warning_type t,
const errarg &arg2,
const errarg &arg3)
{
- if ((t & warning_mask) != 0U) {
+ if ((t & desired_warnings) != 0U) {
do_error(OUTPUT_WARNING, format, arg1, arg2, arg3);
return 1;
}
_______________________________________________
groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
