gbranden pushed a commit to branch master
in repository groff.
commit 17ff00ad0804714d5231790b40236bc29d08bfda
Author: G. Branden Robinson <[email protected]>
AuthorDate: Thu May 15 16:50:25 2025 -0500
src/roff/troff/input.cpp Fix code style nits.
* src/roff/troff/input.cpp (get_copy, token::next, skip_branch)
(asciify): Fix code style nits. Parenthesize formally complex
expressions. Reorder equality comparisons to avoid inadvertent lvalue
assignment.
---
ChangeLog | 7 +++++++
src/roff/troff/input.cpp | 10 +++++-----
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index e7e017684..d35f03d56 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2025-05-16 G. Branden Robinson <[email protected]>
+
+ * src/roff/troff/input.cpp (get_copy, token::next, skip_branch)
+ (asciify): Fix code style nits. Parenthesize formally complex
+ expressions. Reorder equality comparisons to avoid inadvertent
+ lvalue assignment.
+
2025-05-16 G. Branden Robinson <[email protected]>
* src/roff/troff/input.cpp (open_file): Un-pessimize. Stop
diff --git a/src/roff/troff/input.cpp b/src/roff/troff/input.cpp
index 31eadaf93..d4e08fb9d 100644
--- a/src/roff/troff/input.cpp
+++ b/src/roff/troff/input.cpp
@@ -1133,7 +1133,7 @@ static int get_copy(node **nd, bool is_defining, bool
handle_escape_E)
c = input_stack::get(nd);
} while (c == ESCAPE_NEWLINE);
}
- if (c != escape_char || escape_char <= 0)
+ if ((c != escape_char) || (escape_char <= 0))
return c;
again:
c = input_stack::peek();
@@ -2002,7 +2002,7 @@ void token::next()
for (;;) {
node *n = 0 /* nullptr */;
int cc = input_stack::get(&n);
- if (cc != escape_char || escape_char == 0) {
+ if ((cc != escape_char) || (0 == escape_char)) {
handle_ordinary_char:
switch (cc) {
case INPUT_NO_BREAK_SPACE:
@@ -2585,7 +2585,7 @@ void token::next()
}
goto handle_ordinary_char;
default:
- if (cc != escape_char && cc != '.')
+ if ((cc != escape_char) && (cc != '.'))
warning(WARN_ESCAPE, "ignoring escape character before %1",
input_char_description(cc));
goto handle_ordinary_char;
@@ -6531,7 +6531,7 @@ static void skip_branch()
++level;
else if (c == ESCAPE_RIGHT_BRACE)
--level;
- else if (c == escape_char && escape_char > 0)
+ else if ((c == escape_char) && (escape_char > 0))
switch (input_stack::get(0 /* nullptr */)) {
case '{':
++level;
@@ -7412,7 +7412,7 @@ void ps_bbox_request() // .psbb
const char *asciify(int c)
{
static char buf[3];
- buf[0] = escape_char == '\0' ? '\\' : escape_char;
+ buf[0] = (0 == escape_char) ? '\\' : escape_char;
buf[1] = buf[2] = '\0';
switch (c) {
case ESCAPE_QUESTION:
_______________________________________________
groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
