gbranden pushed a commit to branch master
in repository groff.
commit d9eeffcc85ebcc6903e7c24b925f4b48925fd396
Author: G. Branden Robinson <[email protected]>
AuthorDate: Fri Mar 20 17:07:57 2026 -0500
src/roff/troff/input.cpp: Trivially refactor.
* src/roff/troff/input.cpp (chop_macro): Boolify and rename local
variable. `have_restore` becomes `contains_mode_tokens`. Assign to
it with Boolean, not integer, literals.
---
ChangeLog | 6 ++++++
src/roff/troff/input.cpp | 8 ++++----
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 54480a7fe..923648745 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2026-03-20 G. Branden Robinson <[email protected]>
+
+ * src/roff/troff/input.cpp (chop_macro): Boolify and rename
+ local variable. `have_restore` becomes `contains_mode_tokens`.
+ Assign to it with Boolean, not integer, literals.
+
2026-03-19 G. Branden Robinson <[email protected]>
* src/roff/troff/input.cpp
diff --git a/src/roff/troff/input.cpp b/src/roff/troff/input.cpp
index 9b7ee46af..0391a7d16 100644
--- a/src/roff/troff/input.cpp
+++ b/src/roff/troff/input.cpp
@@ -5702,18 +5702,18 @@ void chop_macro()
(m->is_diversion() ? "diversion" : "macro or string"),
s.contents());
else {
- int have_restore = 0;
// We have to check for additional save/restore pairs which could
// be there due to empty am1 requests.
+ bool contains_mode_tokens = false;
for (;;) {
if (m->get(m->len - 1) != POP_GROFFCOMP_MODE)
break;
- have_restore = 1;
+ contains_mode_tokens = true;
m->len -= 1;
if (m->get(m->len - 1) != PUSH_GROFF_MODE
&& m->get(m->len - 1) != PUSH_COMP_MODE)
break;
- have_restore = 0;
+ contains_mode_tokens = false;
m->len -= 1;
if (m->len == 0)
break;
@@ -5721,7 +5721,7 @@ void chop_macro()
if (m->len == 0)
error("cannot chop empty object '%1'", s.contents());
else {
- if (have_restore)
+ if (contains_mode_tokens)
m->set(POP_GROFFCOMP_MODE, m->len - 1);
else
m->len -= 1;
_______________________________________________
groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
