gbranden pushed a commit to branch master
in repository groff.
commit 35f8bff826caf7515f4f3daea58a9a56b5a7bfa0
Author: G. Branden Robinson <g.branden.robin...@gmail.com>
AuthorDate: Thu Jul 10 15:54:48 2025 -0500
Trivially refactor (`lf` request helpers 2/2).
[libgroff, eqn, pic, refer, soelim, tbl]: Rename `interpret_lf_args()`
library function to `interpret_lf_request_arguments()` so that its
purpose is obvious.
* src/include/lf.h:
* src/libs/libgroff/lf.cpp: Rename it.
* src/preproc/eqn/main.cpp (do_file):
* src/preproc/pic/main.cpp (do_file):
* src/preproc/refer/refer.cpp (do_file):
* src/preproc/soelim/soelim.cpp (do_file):
* src/preproc/tbl/main.cpp (process_input_file, process_data): Update
call sites.
---
ChangeLog | 17 +++++++++++++++++
src/include/lf.h | 2 +-
src/libs/libgroff/lf.cpp | 2 +-
src/preproc/eqn/main.cpp | 2 +-
src/preproc/pic/main.cpp | 2 +-
src/preproc/refer/refer.cpp | 2 +-
src/preproc/soelim/soelim.cpp | 2 +-
src/preproc/tbl/main.cpp | 6 +++---
8 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 56c72571f..6c993709f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2025-07-10 G. Branden Robinson <g.branden.robin...@gmail.com>
+
+ [libgroff, eqn, pic, refer, soelim, tbl]: Trivially
+ refactor. Rename `interpret_lf_args()` library function to
+ `interpret_lf_request_arguments()` so that its purpose is
+ obvious.
+
+ * src/include/lf.h:
+ * src/libs/libgroff/lf.cpp: Rename it.
+
+ * src/preproc/eqn/main.cpp (do_file):
+ * src/preproc/pic/main.cpp (do_file):
+ * src/preproc/refer/refer.cpp (do_file):
+ * src/preproc/soelim/soelim.cpp (do_file):
+ * src/preproc/tbl/main.cpp (process_input_file, process_data):
+ Update call sites.
+
2025-07-10 G. Branden Robinson <g.branden.robin...@gmail.com>
[libgroff, eqn, pic, preconv, refer, soelim, tbl]: Trivially
diff --git a/src/include/lf.h b/src/include/lf.h
index b4917a752..767644300 100644
--- a/src/include/lf.h
+++ b/src/include/lf.h
@@ -18,7 +18,7 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>. */
#include "stringclass.h"
-bool interpret_lf_args(const char *p);
+bool interpret_lf_request_arguments(const char *p);
void normalize_file_name_for_lf_request(string &fn);
// Local Variables:
diff --git a/src/libs/libgroff/lf.cpp b/src/libs/libgroff/lf.cpp
index 0520c28bc..bfb3c5c25 100644
--- a/src/libs/libgroff/lf.cpp
+++ b/src/libs/libgroff/lf.cpp
@@ -31,7 +31,7 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>. */
extern void change_filename(const char *);
extern void change_lineno(int);
-bool interpret_lf_args(const char *p)
+bool interpret_lf_request_arguments(const char *p)
{
while (*p == ' ')
p++;
diff --git a/src/preproc/eqn/main.cpp b/src/preproc/eqn/main.cpp
index 29d9e83b4..5d69b0792 100644
--- a/src/preproc/eqn/main.cpp
+++ b/src/preproc/eqn/main.cpp
@@ -113,7 +113,7 @@ void do_file(FILE *fp, const char *filename)
put_string(linebuf, stdout);
linebuf += '\0';
// In GNU roff, `lf` assigns the number of the _next_ line.
- if (interpret_lf_args(linebuf.contents() + 3))
+ if (interpret_lf_request_arguments(linebuf.contents() + 3))
current_lineno--;
}
else if (linebuf.length() >= 4
diff --git a/src/preproc/pic/main.cpp b/src/preproc/pic/main.cpp
index 6e60e3002..923c838c2 100644
--- a/src/preproc/pic/main.cpp
+++ b/src/preproc/pic/main.cpp
@@ -435,7 +435,7 @@ void do_file(const char *filename)
c = getc(fp);
}
line += '\0';
- interpret_lf_args(line.contents());
+ interpret_lf_request_arguments(line.contents());
printf(".lf%s", line.contents());
state = START;
}
diff --git a/src/preproc/refer/refer.cpp b/src/preproc/refer/refer.cpp
index be414fc82..f49e7c295 100644
--- a/src/preproc/refer/refer.cpp
+++ b/src/preproc/refer/refer.cpp
@@ -579,7 +579,7 @@ static void do_file(const char *filename)
{
pending_lf_lines += line;
line += '\0';
- if (interpret_lf_args(line.contents() + 3))
+ if (interpret_lf_request_arguments(line.contents() + 3))
current_lineno--;
}
else if (recognize_R1_R2
diff --git a/src/preproc/soelim/soelim.cpp b/src/preproc/soelim/soelim.cpp
index 04b0bd65e..75da9db97 100644
--- a/src/preproc/soelim/soelim.cpp
+++ b/src/preproc/soelim/soelim.cpp
@@ -299,7 +299,7 @@ int do_file(const char *filename)
current_lineno++;
line += '\n';
line += '\0';
- interpret_lf_args(line.contents());
+ interpret_lf_request_arguments(line.contents());
printf(".lf%s", line.contents());
state = START;
}
diff --git a/src/preproc/tbl/main.cpp b/src/preproc/tbl/main.cpp
index 614a322f5..8e5b4d2a5 100644
--- a/src/preproc/tbl/main.cpp
+++ b/src/preproc/tbl/main.cpp
@@ -317,7 +317,7 @@ void process_input_file(FILE *fp)
c = getc(fp);
}
line += '\0';
- interpret_lf_args(line.contents());
+ interpret_lf_request_arguments(line.contents());
printf(".lf%s", line.contents());
state = START;
}
@@ -1467,7 +1467,7 @@ table *process_data(table_input &in, format *f, options
*opt)
c = in.get();
}
args += '\0';
- interpret_lf_args(args.contents());
+ interpret_lf_request_arguments(args.contents());
// remove the '\0'
args.set_length(args.length() - 1);
input_entry += args;
@@ -1578,7 +1578,7 @@ table *process_data(table_input &in, format *f, options
*opt)
if (line.length() >= 3
&& line[0] == '.' && line[1] == 'l' && line[2] == 'f') {
line += '\0';
- interpret_lf_args(line.contents() + 3);
+ interpret_lf_request_arguments(line.contents() + 3);
}
}
break;
_______________________________________________
groff-commit mailing list
groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit
