gbranden pushed a commit to branch master
in repository groff.
commit 3633c5d7d5d6cfbd780871104d3ee6162a8968b5
Author: G. Branden Robinson <[email protected]>
AuthorDate: Fri Apr 17 09:20:39 2026 -0500
src/roff/troff/input.cpp: Rename stuff (3/9).
* src/roff/troff/input.cpp (read_long_escape_parameters): Rename this...
(read_long_escape_sequence_parameters): ...to this.
(read_escape_sequence_parameter)
(read_increment_and_escape_sequence_parameter)
(token::next)
(device_request): Update call sites.
---
ChangeLog | 10 ++++++++++
src/roff/troff/input.cpp | 14 ++++++++------
2 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 484d2c1f3..87fc8578f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2026-04-17 G. Branden Robinson <[email protected]>
+
+ * src/roff/troff/input.cpp: Trivially refactor.
+ (read_long_escape_parameters): Rename this...
+ (read_long_escape_sequence_parameters): ...to this.
+ (read_escape_sequence_parameter)
+ (read_increment_and_escape_sequence_parameter)
+ (token::next)
+ (device_request): Update call sites.
+
2026-04-17 G. Branden Robinson <[email protected]>
* src/roff/troff/input.cpp: Trivially refactor.
diff --git a/src/roff/troff/input.cpp b/src/roff/troff/input.cpp
index d7fcc4d66..32d3438fa 100644
--- a/src/roff/troff/input.cpp
+++ b/src/roff/troff/input.cpp
@@ -189,7 +189,7 @@ enum escape_sequence_parameter_cardinality {
};
static symbol read_escape_sequence_parameter(
escape_sequence_parameter_cardinality = ARGUMENTS_FORBIDDEN);
-static symbol read_long_escape_parameters(
+static symbol read_long_escape_sequence_parameters(
escape_sequence_parameter_cardinality = ARGUMENTS_FORBIDDEN);
static void interpolate_string(symbol);
static void interpolate_string_with_args(symbol);
@@ -1039,7 +1039,7 @@ static symbol read_two_char_escape_parameter()
return symbol(buf);
}
-static symbol read_long_escape_parameters(
+static symbol read_long_escape_sequence_parameters(
escape_sequence_parameter_cardinality mode)
{
int start_level = input_stack::get_level();
@@ -1109,7 +1109,7 @@ static symbol read_escape_sequence_parameter(
if ('(' == c)
return read_two_char_escape_parameter();
if (('[' == c) && !want_att_compat)
- return read_long_escape_parameters(mode);
+ return read_long_escape_sequence_parameters(mode);
char buf[2];
buf[0] = c;
buf[1] = '\0';
@@ -1135,7 +1135,7 @@ static symbol
read_increment_and_escape_sequence_parameter(int *incp)
case '[':
if (!want_att_compat) {
*incp = 0;
- return read_long_escape_parameters();
+ return read_long_escape_sequence_parameters();
}
break;
}
@@ -2774,7 +2774,8 @@ void token::next()
warning(WARN_SYNTAX, "an escaped '%1' is not portable to"
" AT&T troff", char(cc));
if (!want_att_compat) {
- symbol s = read_long_escape_parameters(ARGUMENTS_MANDATORY);
+ symbol s
+ = read_long_escape_sequence_parameters(ARGUMENTS_MANDATORY);
if (s.is_null() || s.is_empty())
break;
if (have_multiple_params) {
@@ -6947,7 +6948,8 @@ static void device_request()
}
if (is_valid) {
input_stack::push(make_temp_iterator(sc.contents()));
- symbol s = read_long_escape_parameters(ARGUMENTS_MANDATORY);
+ symbol s
+ = read_long_escape_sequence_parameters(ARGUMENTS_MANDATORY);
map_special_character_for_device_output(&mac, s.contents());
}
else {
_______________________________________________
groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
