gbranden pushed a commit to branch master
in repository groff.
commit be1185b74502de0028d7c20121af92df71faf0f3
Author: G. Branden Robinson <[email protected]>
AuthorDate: Fri Apr 17 07:39:33 2026 -0500
src/roff/troff/input.cpp: Trivially refactor.
* src/roff/troff/input.cpp: Rename `read_mode` enumeration type to
`escape_sequence_parameter_cardinality`.
(read_escape_parameter, read_long_escape_parameters): Update function
declarations and definitions accordingly.
---
ChangeLog | 7 +++++++
src/roff/troff/input.cpp | 18 +++++++++++++-----
2 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 7f6f37ba9..295eeb18d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2026-04-17 G. Branden Robinson <[email protected]>
+
+ * src/roff/troff/input.cpp: Trivially refactor. Rename
+ `read_mode` enumeration type to `escape_parameter_cardinality`.
+ (read_escape_parameter, read_long_escape_parameters): Update
+ function declarations and definitions accordingly.
+
2026-04-17 G. Branden Robinson <[email protected]>
* src/roff/troff/env.cpp (class hyphen_trie): Trivially
diff --git a/src/roff/troff/input.cpp b/src/roff/troff/input.cpp
index b25ce4049..6169f8bd0 100644
--- a/src/roff/troff/input.cpp
+++ b/src/roff/troff/input.cpp
@@ -182,9 +182,15 @@ static void copy_mode_error(const char *,
const errarg & = empty_errarg,
const errarg & = empty_errarg);
-enum read_mode { ALLOW_EMPTY, WITH_ARGS, NO_ARGS };
-static symbol read_escape_parameter(read_mode = NO_ARGS);
-static symbol read_long_escape_parameters(read_mode = NO_ARGS);
+enum escape_sequence_parameter_cardinality {
+ ALLOW_EMPTY,
+ WITH_ARGS,
+ NO_ARGS
+};
+static symbol read_escape_parameter(
+ escape_sequence_parameter_cardinality = NO_ARGS);
+static symbol read_long_escape_parameters(
+ escape_sequence_parameter_cardinality = NO_ARGS);
static void interpolate_string(symbol);
static void interpolate_string_with_args(symbol);
static void interpolate_macro_or_invoke_request(symbol, bool = false);
@@ -1033,7 +1039,8 @@ static symbol read_two_char_escape_parameter()
return symbol(buf);
}
-static symbol read_long_escape_parameters(read_mode mode)
+static symbol read_long_escape_parameters(
+ escape_sequence_parameter_cardinality mode)
{
int start_level = input_stack::get_level();
int buf_size = default_buffer_size;
@@ -1093,7 +1100,8 @@ static symbol read_long_escape_parameters(read_mode mode)
return s;
}
-static symbol read_escape_parameter(read_mode mode)
+static symbol read_escape_parameter(
+ escape_sequence_parameter_cardinality mode)
{
char c = read_char_in_escape_sequence_parameter();
if ('\0' == c)
_______________________________________________
groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
