gbranden pushed a commit to branch master
in repository groff.
commit 556e8507da6c60c5682c45567375b1a92d398d49
Author: G. Branden Robinson <[email protected]>
AuthorDate: Mon Oct 20 12:34:00 2025 -0500
src/roff/troff/env.cpp: Fix code style nits.
* src/roff/troff/env.cpp (environment::add_hyphen_indicator): Wrap long
input line and break lengthy conditional for better legibility.
Parenthesize formally complex expression.
(environment::newline): Compare integer variable explicitly to integer
literal value instead of punning down to a Boolean.
---
ChangeLog | 9 +++++++++
src/roff/troff/env.cpp | 8 +++++---
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 64463100e..aa376e0e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2025-10-20 G. Branden Robinson <[email protected]>
+
+ * src/roff/troff/env.cpp: Fix code style nits.
+ (environment::add_hyphen_indicator): Wrap long input line and
+ break lengthy conditional for better legibility. Parenthesize
+ formally complex expression.
+ (environment::newline): Compare integer variable explicitly to
+ integer literal value instead of punning down to a Boolean.
+
2025-10-20 G. Branden Robinson <[email protected]>
[troff]: Trivially refactor. Rename `line_interrupted` member
diff --git a/src/roff/troff/env.cpp b/src/roff/troff/env.cpp
index b8c2ee37e..566baf446 100644
--- a/src/roff/troff/env.cpp
+++ b/src/roff/troff/env.cpp
@@ -441,8 +441,10 @@ void environment::add_node(node *nd)
void environment::add_hyphen_indicator()
{
- if ((current_tab != TAB_NONE) || was_line_interrupted || has_current_field
- || hyphen_indicator_char != 0 /* nullptr */)
+ if ((current_tab != TAB_NONE)
+ || was_line_interrupted
+ || has_current_field
+ || (hyphen_indicator_char != 0 /* nullptr */))
return;
if (line == 0 /* nullptr */)
start_line();
@@ -1920,7 +1922,7 @@ void environment::newline()
hyphen_line_count = 0;
}
if (input_trap_count > 0) {
- if (!(continued_input_trap && was_previous_line_interrupted))
+ if (!(continued_input_trap && (was_previous_line_interrupted > 0)))
if (--input_trap_count == 0)
spring_trap(input_trap);
}
_______________________________________________
groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
