gbranden pushed a commit to branch master
in repository groff.
commit 11d4b86e30322ad4457eb7c55875bdd79e6f1b75
Author: G. Branden Robinson <[email protected]>
AuthorDate: Sun Mar 22 18:51:10 2026 -0500
[troff]: Unabbreviate member variables (2/2).
* src/roff/troff/input.cpp (class char_list): Rename member variable
`len` to `length`.
(char_list::char_list, char_list::get_length, char_list::append)
(char_list::set, char_list::get): Update dereference sites.
---
ChangeLog | 7 +++++++
src/roff/troff/input.cpp | 16 ++++++++--------
2 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index cd9abc89e..e4dc59b04 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2026-03-22 G. Branden Robinson <[email protected]>
+
+ * src/roff/troff/input.cpp (class char_list): Rename member
+ variable `len` to `length`.
+ (char_list::char_list, char_list::get_length, char_list::append)
+ (char_list::set, char_list::get): Update dereference sites.
+
2026-03-22 G. Branden Robinson <[email protected]>
* src/roff/troff/request.h (class macro): Rename member variable
diff --git a/src/roff/troff/input.cpp b/src/roff/troff/input.cpp
index e526b1d93..0664e3182 100644
--- a/src/roff/troff/input.cpp
+++ b/src/roff/troff/input.cpp
@@ -3834,7 +3834,7 @@ public:
int get_length();
private:
unsigned char *ptr;
- int len;
+ int length;
char_block *head;
char_block *tail;
friend class macro_header;
@@ -3842,7 +3842,7 @@ private:
};
char_list::char_list()
-: ptr(0 /* nullptr */), len(0), head(0 /* nullptr */),
+: ptr(0 /* nullptr */), length(0), head(0 /* nullptr */),
tail(0 /* nullptr */)
{
}
@@ -3858,7 +3858,7 @@ char_list::~char_list()
int char_list::get_length()
{
- return len;
+ return length;
}
void char_list::append(unsigned char c)
@@ -3875,14 +3875,14 @@ void char_list::append(unsigned char c)
}
}
*ptr++ = c;
- len++;
+ length++;
}
void char_list::set(unsigned char c, int offset)
{
- assert(len > offset);
+ assert(length > offset);
// optimization for access at the end
- int boundary = len - len % char_block::SIZE;
+ int boundary = length - length % char_block::SIZE;
if (offset >= boundary) {
*(tail->s + offset - boundary) = c;
return;
@@ -3901,9 +3901,9 @@ void char_list::set(unsigned char c, int offset)
unsigned char char_list::get(int offset)
{
- assert(len > offset);
+ assert(length > offset);
// optimization for access at the end
- int boundary = len - len % char_block::SIZE;
+ int boundary = length - length % char_block::SIZE;
if (offset >= boundary)
return *(tail->s + offset - boundary);
char_block *tem = head;
_______________________________________________
groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
