gbranden pushed a commit to branch master
in repository groff.
commit 837a9dd323f2fd5deacea13a6165f321cfc21c76
Author: G. Branden Robinson <[email protected]>
AuthorDate: Fri Apr 3 05:26:05 2026 -0500
src/roff/troff/input.cpp: Trivially refactor.
* src/roff/troff/input.cpp (interpolate_macro): Rename this...
(interpolate_macro_or_invoke_request): ...to this.
(do_request, process_input_stack, do_define_macro): Update call sites.
---
ChangeLog | 8 ++++++++
src/roff/troff/input.cpp | 11 ++++++-----
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index f2a047897..6e145e79b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2026-04-03 G. Branden Robinson <[email protected]>
+
+ * src/roff/troff/input.cpp: Trivially refactor.
+ (interpolate_macro): Rename this...
+ (interpolate_macro_or_invoke_request): ...to this.
+ (do_request, process_input_stack, do_define_macro): Update call
+ sites.
+
2026-04-03 G. Branden Robinson <[email protected]>
* src/roff/troff/input.cpp (decode_escape_sequence_arguments):
diff --git a/src/roff/troff/input.cpp b/src/roff/troff/input.cpp
index c2c1f2a50..5a9cf51a1 100644
--- a/src/roff/troff/input.cpp
+++ b/src/roff/troff/input.cpp
@@ -186,7 +186,7 @@ static symbol read_escape_parameter(read_mode = NO_ARGS);
static symbol read_long_escape_parameters(read_mode = NO_ARGS);
static void interpolate_string(symbol);
static void interpolate_string_with_args(symbol);
-static void interpolate_macro(symbol, bool = false);
+static void interpolate_macro_or_invoke_request(symbol, bool = false);
static void interpolate_number_format(symbol);
static void interpolate_environment_variable(symbol);
@@ -3417,7 +3417,7 @@ void do_request()
if (nm.is_null())
skip_line();
else
- interpolate_macro(nm, true /* don't want next token */);
+ interpolate_macro_or_invoke_request(nm, true /* don't want next token */);
assert(!want_att_compat_stack.empty());
want_att_compat = want_att_compat_stack.top();
want_att_compat_stack.pop();
@@ -3561,7 +3561,7 @@ void process_input_stack()
if (nm.is_null())
skip_line();
else {
- interpolate_macro(nm);
+ interpolate_macro_or_invoke_request(nm);
#if defined(DEBUGGING)
if (want_html_debugging) {
fprintf(stderr, "finished interpreting [%s] and environment state
is\n", nm.contents());
@@ -4635,7 +4635,8 @@ bool operator==(const macro &m1, const macro &m2)
return true;
}
-static void interpolate_macro(symbol nm, bool do_not_want_next_token)
+static void interpolate_macro_or_invoke_request(symbol nm,
+ bool do_not_want_next_token)
{
request_or_macro *p
= static_cast<request_or_macro *>(request_dictionary.lookup(nm));
@@ -5562,7 +5563,7 @@ static void do_define_macro(define_mode mode,
calling_mode calling,
}
if (term != dot_symbol) {
want_input_ignored = false;
- interpolate_macro(term);
+ interpolate_macro_or_invoke_request(term);
}
else
skip_line();
_______________________________________________
groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
