gbranden pushed a commit to branch master
in repository groff.
commit e90abb10e1761c891d5e63218bab18ccd04b349f
Author: G. Branden Robinson <[email protected]>
AuthorDate: Thu Dec 25 21:56:20 2025 -0600
src/roff/troff/input.cpp: Trivially refactor.
* src/roff/troff/input.cpp (read_input_until_terminator): Split
assignment-within-comparison into its own statement. Arrange equality
comparisons to (prepare to) avoid inadvertent lvalue assignment.
---
ChangeLog | 7 +++++++
src/roff/troff/input.cpp | 5 +++--
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 1e1f8d17e..4ad0501db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2025-12-25 G. Branden Robinson <[email protected]>
+
+ * src/roff/troff/input.cpp (read_input_until_terminator):
+ Trivially refactor. Split assignment-within-comparison into its
+ own statement. Arrange equality comparisons to (prepare to)
+ avoid inadvertent lvalue assignment.
+
2025-12-25 G. Branden Robinson <[email protected]>
* src/roff/troff/input.cpp (do_define_string, define_string)
diff --git a/src/roff/troff/input.cpp b/src/roff/troff/input.cpp
index 667012d54..1a119c273 100644
--- a/src/roff/troff/input.cpp
+++ b/src/roff/troff/input.cpp
@@ -3230,7 +3230,8 @@ static symbol read_input_until_terminator(bool required,
buf_size = new_buf_size;
delete[] old_buf;
}
- if (((buf[i] = tok.ch()) == 0U) || (buf[i] == end_char))
+ buf[i] = tok.ch();
+ if ((0U == buf[i]) || (end_char == buf[i]))
break;
i++;
tok.next();
@@ -3240,7 +3241,7 @@ static symbol read_input_until_terminator(bool required,
delete[] buf;
return NULL_SYMBOL;
}
- if ((end_char != 0U) && (buf[i] == end_char))
+ if ((end_char != 0U) && (end_char == buf[i]))
buf[i + 1] = '\0';
else
diagnose_invalid_identifier();
_______________________________________________
groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
