gbranden pushed a commit to branch master
in repository groff.
commit 06dd7f71b25f3186dfa23cb0adbab7cb6addc553
Author: G. Branden Robinson <[email protected]>
AuthorDate: Fri Apr 3 14:52:00 2026 -0500
src/roff/troff/input.cpp: Fix code style nits.
* src/roff/troff/input.cpp (do_define_macro)
(transparent_throughput_file_request): Arrange equality comparisons to
avoid inadvertent lvalue assignment. Parenthesize formally complex
expressions.
---
ChangeLog | 7 +++++++
src/roff/troff/input.cpp | 8 ++++----
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 0b350cb0e..2d0e77ba9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2026-04-03 G. Branden Robinson <[email protected]>
+
+ * src/roff/troff/input.cpp (do_define_macro)
+ (transparent_throughput_file_request): Fix code style nits.
+ Arrange equality comparisons to avoid inadvertent lvalue
+ assignment. Parenthesize formally complex expressions.
+
2026-04-03 G. Branden Robinson <[email protected]>
* src/roff/troff/input.cpp (process_input_stack): Slightly
diff --git a/src/roff/troff/input.cpp b/src/roff/troff/input.cpp
index 20d6bfe42..ff8f799c7 100644
--- a/src/roff/troff/input.cpp
+++ b/src/roff/troff/input.cpp
@@ -5524,7 +5524,7 @@ static void do_define_macro(define_mode mode,
calling_mode calling,
else if (COMP_ENABLE == comp)
mac.append(PUSH_COMP_MODE);
for (;;) {
- if (c == '\n')
+ if ('\n' == c)
mac.clear_string_flag();
while (ESCAPE_NEWLINE == c) {
if ((DEFINE_NORMAL == mode) || (DEFINE_APPEND == mode))
@@ -5532,7 +5532,7 @@ static void do_define_macro(define_mode mode,
calling_mode calling,
mac.append(static_cast<unsigned char>(c));
c = read_char_in_copy_mode(&n, true /* is_defining */);
}
- if (reading_beginning_of_input_line && (c == '.')) {
+ if (reading_beginning_of_input_line && ('.' == c)) {
const char *s = term.contents();
int d = '\0';
// see if it matches term
@@ -5610,7 +5610,7 @@ static void do_define_macro(define_mode mode,
calling_mode calling,
// TODO: grochar; may need NFD decomposition and UTF-8 encoding
mac.append(static_cast<unsigned char>(c));
}
- reading_beginning_of_input_line = (c == '\n');
+ reading_beginning_of_input_line = ('\n' == c);
c = read_char_in_copy_mode(&n, true /* is_defining */);
}
}
@@ -9605,7 +9605,7 @@ static void transparent_throughput_file_request()
" transparent file throughput; ignoring", int(c));
else {
curdiv->transparent_output(c);
- reading_beginning_of_input_line = c == '\n';
+ reading_beginning_of_input_line = ('\n' == c);
}
}
if (!reading_beginning_of_input_line)
_______________________________________________
groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit