gbranden pushed a commit to branch master
in repository groff.
commit f9d115e6ca97d9c9f6e01d8a43dc70157b4bc2a3
Author: G. Branden Robinson <[email protected]>
AuthorDate: Sun Aug 18 07:51:32 2024 -0500
[troff]: Trivially refactor (no node "reading").
* src/roff/troff/input.cpp: Trivially refactor. Rename confusingly
named functions that interpret *roff language input, not "nodes", a
family of _groff_ class objects.
(read_draw_node): Rename this...
(read_drawing_command): ...to this.
(read_color_draw_node): Rename this...
(read_drawing_command_color_arguments): ...to this.
---
ChangeLog | 10 ++++++++++
src/roff/troff/input.cpp | 12 ++++++------
2 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index c21f37ce7..267d303f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2024-08-18 G. Branden Robinson <[email protected]>
+
+ * src/roff/troff/input.cpp: Trivially refactor. Rename
+ confusingly named functions that interpret *roff language input,
+ not "nodes", a family of _groff_ class objects.
+ (read_draw_node): Rename this...
+ (read_drawing_command): ...to this.
+ (read_color_draw_node): Rename this...
+ (read_drawing_command_color_arguments): ...to this.
+
2024-08-18 G. Branden Robinson <[email protected]>
* src/roff/troff/div.cpp (macro_diversion::macro_diversion):
diff --git a/src/roff/troff/input.cpp b/src/roff/troff/input.cpp
index 6b29898cd..fbd7cca12 100644
--- a/src/roff/troff/input.cpp
+++ b/src/roff/troff/input.cpp
@@ -76,8 +76,8 @@ extern "C" const char *Version_string;
void init_column_requests();
#endif /* COLUMN */
-static node *read_draw_node();
-static void read_color_draw_node(token &);
+static node *read_drawing_command();
+static void read_drawing_command_color_arguments(token &);
static void push_token(const token &);
void copy_file();
#ifdef COLUMN
@@ -2217,7 +2217,7 @@ void token::next()
curenv->get_fill_color());
return;
case 'D':
- nd = read_draw_node();
+ nd = read_drawing_command();
if (0 /* nullptr */ == nd)
break;
type = TOKEN_NODE;
@@ -8912,7 +8912,7 @@ node *charinfo_to_node_list(charinfo *ci, const
environment *envp)
return n;
}
-static node *read_draw_node()
+static node *read_drawing_command()
{
token start_token;
start_token.next();
@@ -8928,7 +8928,7 @@ static node *read_draw_node()
else {
unsigned char type = tok.ch();
if (type == 'F') {
- read_color_draw_node(start_token);
+ read_drawing_command_color_arguments(start_token);
return 0;
}
tok.next();
@@ -9029,7 +9029,7 @@ static node *read_draw_node()
return 0;
}
-static void read_color_draw_node(token &start)
+static void read_drawing_command_color_arguments(token &start)
{
tok.next();
if (tok == start) {
_______________________________________________
Groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
