[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[groff] 08/49: [troff, ...]: Trivially refactor.
From: |
G. Branden Robinson |
Subject: |
[groff] 08/49: [troff, ...]: Trivially refactor. |
Date: |
Sun, 25 Sep 2022 17:02:55 -0400 (EDT) |
gbranden pushed a commit to branch master
in repository groff.
commit b8344ebf7ed0f9d7500f6e5505b81ac0323e8596
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Sun Sep 18 14:04:49 2022 -0500
[troff, ...]: Trivially refactor.
Boolify and rename internal library function from `invalid_input_char`
to `is_invalid_input_char`.
* src/include/lib.h: Do it.
* src/libs/libgroff/font.cpp (text_file::next_line):
* src/preproc/eqn/lex.cpp (file_input::read_line):
* src/preproc/eqn/main.cpp (read_line, main):
* src/preproc/pic/lex.cpp (file_input::read_line,
simple_file_input::get, simple_file_input::peek):
* src/preproc/pic/main.cpp (top_input::get, top_input::peek, do_file):
* src/preproc/refer/command.cpp (input_stack::push_file):
* src/preproc/refer/refer.cpp (do_file, do_bib):
* src/roff/troff/env.cpp (environment::make_tag):
* src/roff/troff/input.cpp (file_iterator::fill, file_iterator::peek)
(get_char_for_escape_parameter, transparent_translate, read_request)
(asciify, input_char_description, read_string, transparent_file)
(set_string): Update call sites.
---
ChangeLog | 25 +++++++++++++++++++++++++
src/include/lib.h | 4 ++--
src/libs/libgroff/font.cpp | 2 +-
src/preproc/eqn/lex.cpp | 2 +-
src/preproc/eqn/main.cpp | 6 +++---
src/preproc/pic/lex.cpp | 6 +++---
src/preproc/pic/main.cpp | 6 +++---
src/preproc/refer/command.cpp | 2 +-
src/preproc/refer/refer.cpp | 10 +++++-----
src/roff/troff/env.cpp | 2 +-
src/roff/troff/input.cpp | 22 +++++++++++-----------
11 files changed, 56 insertions(+), 31 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 4661d7d7e..8dbe09bfa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,28 @@
+2022-09-18 G. Branden Robinson <g.branden.robinson@gmail.com>
+
+ [troff, ...]: Trivially refactor.
+
+ Boolify and rename internal library function from
+ `invalid_input_char` to `is_invalid_input_char`.
+
+ * src/include/lib.h: Do it.
+
+ * src/libs/libgroff/font.cpp (text_file::next_line):
+ * src/preproc/eqn/lex.cpp (file_input::read_line):
+ * src/preproc/eqn/main.cpp (read_line, main):
+ * src/preproc/pic/lex.cpp (file_input::read_line,
+ simple_file_input::get, simple_file_input::peek):
+ * src/preproc/pic/main.cpp (top_input::get, top_input::peek)
+ (do_file):
+ * src/preproc/refer/command.cpp (input_stack::push_file):
+ * src/preproc/refer/refer.cpp (do_file, do_bib):
+ * src/roff/troff/env.cpp (environment::make_tag):
+ * src/roff/troff/input.cpp (file_iterator::fill)
+ (file_iterator::peek, get_char_for_escape_parameter)
+ (transparent_translate, read_request, asciify)
+ (input_char_description, read_string, transparent_file,
+ set_string): Update call sites.
+
2022-09-18 G. Branden Robinson <g.branden.robinson@gmail.com>
[troff]: Tweak diagnostic messages.
diff --git a/src/include/lib.h b/src/include/lib.h
index ae43cee36..6b1d854e0 100644
--- a/src/include/lib.h
+++ b/src/include/lib.h
@@ -106,9 +106,9 @@ int mksdir(char *tmpl);
extern char invalid_char_table[];
- inline int invalid_input_char(int c)
+ inline bool is_invalid_input_char(int c)
{
- return c >= 0 && invalid_char_table[c];
+ return (c >= 0 && invalid_char_table[c]);
}
#ifdef HAVE_STRCASECMP
diff --git a/src/libs/libgroff/font.cpp b/src/libs/libgroff/font.cpp
index 7655e0a34..292aa5e1e 100644
--- a/src/libs/libgroff/font.cpp
+++ b/src/libs/libgroff/font.cpp
@@ -111,7 +111,7 @@ bool text_file::next_line()
int c = getc(fp);
if (c == EOF)
break;
- if (invalid_input_char(c))
+ if (is_invalid_input_char(c))
error("invalid input character code %1", int(c));
else {
if (length + 1 >= linebufsize) {
diff --git a/src/preproc/eqn/lex.cpp b/src/preproc/eqn/lex.cpp
index 9dc1c0571..077b9c4ac 100644
--- a/src/preproc/eqn/lex.cpp
+++ b/src/preproc/eqn/lex.cpp
@@ -419,7 +419,7 @@ int file_input::read_line()
}
if (c == EOF)
break;
- else if (invalid_input_char(c))
+ else if (is_invalid_input_char(c))
lex_error("invalid input character code %1", c);
else {
line += char(c);
diff --git a/src/preproc/eqn/main.cpp b/src/preproc/eqn/main.cpp
index 608b46a3d..bf180913b 100644
--- a/src/preproc/eqn/main.cpp
+++ b/src/preproc/eqn/main.cpp
@@ -51,7 +51,7 @@ int read_line(FILE *fp, string *p)
p->clear();
int c = -1;
while ((c = getc(fp)) != EOF) {
- if (!invalid_input_char(c))
+ if (!is_invalid_input_char(c))
*p += char(c);
else
error("invalid input character code '%1'", c);
@@ -302,10 +302,10 @@ int main(int argc, char **argv)
case 'd':
if (optarg[0] == '\0' || optarg[1] == '\0')
error("'-d' option requires a two-character argument");
- else if (invalid_input_char(optarg[0]))
+ else if (is_invalid_input_char(optarg[0]))
error("invalid delimiter '%1' in '-d' option argument",
optarg[0]);
- else if (invalid_input_char(optarg[1]))
+ else if (is_invalid_input_char(optarg[1]))
error("invalid delimiter '%1' in '-d' option argument",
optarg[1]);
else {
diff --git a/src/preproc/pic/lex.cpp b/src/preproc/pic/lex.cpp
index 47bab35b4..e59801baa 100644
--- a/src/preproc/pic/lex.cpp
+++ b/src/preproc/pic/lex.cpp
@@ -97,7 +97,7 @@ int file_input::read_line()
}
if (c == EOF)
break;
- else if (invalid_input_char(c))
+ else if (is_invalid_input_char(c))
lex_error("invalid input character code %1", c);
else {
line += char(c);
@@ -1677,7 +1677,7 @@ simple_file_input::~simple_file_input()
int simple_file_input::get()
{
int c = getc(fp);
- while (invalid_input_char(c)) {
+ while (is_invalid_input_char(c)) {
error("invalid input character code %1", c);
c = getc(fp);
}
@@ -1689,7 +1689,7 @@ int simple_file_input::get()
int simple_file_input::peek()
{
int c = getc(fp);
- while (invalid_input_char(c)) {
+ while (is_invalid_input_char(c)) {
error("invalid input character code %1", c);
c = getc(fp);
}
diff --git a/src/preproc/pic/main.cpp b/src/preproc/pic/main.cpp
index 114ca2158..7d84afb97 100644
--- a/src/preproc/pic/main.cpp
+++ b/src/preproc/pic/main.cpp
@@ -81,7 +81,7 @@ int top_input::get()
return c;
}
int c = getc(fp);
- while (invalid_input_char(c)) {
+ while (is_invalid_input_char(c)) {
error("invalid input character code %1", int(c));
c = getc(fp);
bol = 0;
@@ -154,7 +154,7 @@ int top_input::peek()
if (push_back[0] != EOF)
return push_back[0];
int c = getc(fp);
- while (invalid_input_char(c)) {
+ while (is_invalid_input_char(c)) {
error("invalid input character code %1", int(c));
c = getc(fp);
bol = 0;
@@ -322,7 +322,7 @@ void do_file(const char *filename)
enum { START, MIDDLE, HAD_DOT, HAD_P, HAD_PS, HAD_l, HAD_lf } state = START;
for (;;) {
int c = getc(fp);
- while (invalid_input_char(c)) {
+ while (is_invalid_input_char(c)) {
error("invalid input character code %1", int(c));
c = getc(fp);
}
diff --git a/src/preproc/refer/command.cpp b/src/preproc/refer/command.cpp
index c2076d9b1..b49e2be6f 100644
--- a/src/preproc/refer/command.cpp
+++ b/src/preproc/refer/command.cpp
@@ -192,7 +192,7 @@ void input_stack::push_file(const char *fn)
}
if (c == EOF)
break;
- if (invalid_input_char(c))
+ if (is_invalid_input_char(c))
error_with_file_and_line(fn, lineno,
"invalid input character code %1", c);
else {
diff --git a/src/preproc/refer/refer.cpp b/src/preproc/refer/refer.cpp
index 55ef9e574..b5da9df81 100644
--- a/src/preproc/refer/refer.cpp
+++ b/src/preproc/refer/refer.cpp
@@ -451,7 +451,7 @@ static void do_file(const char *filename)
line += '\n';
break;
}
- if (invalid_input_char(c))
+ if (is_invalid_input_char(c))
error("invalid input character code %1", c);
else {
line += c;
@@ -482,7 +482,7 @@ static void do_file(const char *filename)
int d = getc(fp);
if (d == ']') {
while ((d = getc(fp)) != '\n' && d != EOF) {
- if (invalid_input_char(d))
+ if (is_invalid_input_char(d))
error("invalid input character code %1", d);
else
post += d;
@@ -492,7 +492,7 @@ static void do_file(const char *filename)
if (d != EOF)
ungetc(d, fp);
}
- if (invalid_input_char(c))
+ if (is_invalid_input_char(c))
error("invalid input character code %1", c);
else
str += c;
@@ -589,7 +589,7 @@ static void do_file(const char *filename)
"missing '.R2' line");
break;
}
- if (invalid_input_char(c))
+ if (is_invalid_input_char(c))
error_with_file_and_line(current_filename, start_lineno,
"invalid input character code %1",
c);
@@ -1138,7 +1138,7 @@ void do_bib(const char *filename)
int c = getc(fp);
if (EOF == c)
break;
- if (invalid_input_char(c)) {
+ if (is_invalid_input_char(c)) {
error("invalid input character code %1", c);
continue;
}
diff --git a/src/roff/troff/env.cpp b/src/roff/troff/env.cpp
index 1b5f06d80..71bb88581 100644
--- a/src/roff/troff/env.cpp
+++ b/src/roff/troff/env.cpp
@@ -2263,7 +2263,7 @@ node *environment::make_tag(const char *nm, int i)
macro m;
m.append_str("devtag:");
for (const char *p = nm; *p; p++)
- if (!invalid_input_char((unsigned char)*p))
+ if (!is_invalid_input_char((unsigned char)*p))
m.append(*p);
m.append(' ');
m.append_int(i);
diff --git a/src/roff/troff/input.cpp b/src/roff/troff/input.cpp
index 749f9694a..61995fee5 100644
--- a/src/roff/troff/input.cpp
+++ b/src/roff/troff/input.cpp
@@ -349,7 +349,7 @@ int file_iterator::fill(node **)
int c = getc(fp);
if (c == EOF)
break;
- if (invalid_input_char(c))
+ if (is_invalid_input_char(c))
warning(WARN_INPUT, "invalid input character code %1", int(c));
else {
*p++ = c;
@@ -374,7 +374,7 @@ int file_iterator::fill(node **)
int file_iterator::peek()
{
int c = getc(fp);
- while (invalid_input_char(c)) {
+ while (is_invalid_input_char(c)) {
warning(WARN_INPUT, "invalid input character code %1", int(c));
c = getc(fp);
}
@@ -823,7 +823,7 @@ static char get_char_for_escape_parameter(bool allow_space
= false)
copy_mode_error("end of input in escape sequence");
return '\0';
default:
- if (!invalid_input_char(c))
+ if (!is_invalid_input_char(c))
break;
// fall through
case '\n':
@@ -2692,7 +2692,7 @@ inline int possibly_handle_first_page_transition()
static int transparent_translate(int cc)
{
- if (!invalid_input_char(cc)) {
+ if (!is_invalid_input_char(cc)) {
charinfo *ci = charset_table[cc];
switch (ci->get_special_translation(1)) {
case charinfo::TRANSLATE_SPACE:
@@ -4125,7 +4125,7 @@ void read_request()
while (c == ' ')
c = get_copy(0);
while (c != EOF && c != '\n' && c != ' ') {
- if (!invalid_input_char(c)) {
+ if (!is_invalid_input_char(c)) {
if (reading_from_terminal)
fputc(c, stderr);
had_prompt = 1;
@@ -4146,7 +4146,7 @@ void read_request()
int nl = 0;
int c;
while ((c = getchar()) != EOF) {
- if (invalid_input_char(c))
+ if (is_invalid_input_char(c))
warning(WARN_INPUT, "invalid input character code %1", int(c));
else {
if (c == '\n') {
@@ -6637,7 +6637,7 @@ const char *asciify(int c)
buf[0] = '\0';
break;
default:
- if (invalid_input_char(c))
+ if (is_invalid_input_char(c))
buf[0] = '\0';
else
buf[0] = c;
@@ -6666,7 +6666,7 @@ const char *input_char_description(int c)
// repeat expression; no VLAs in ISO C++
static char buf[sizeof "magic character code " + INT_DIGITS + 1];
(void) memset(buf, 0, bufsz);
- if (invalid_input_char(c)) {
+ if (is_invalid_input_char(c)) {
const char *s = asciify(c);
if (*s) {
buf[0] = '\'';
@@ -7585,7 +7585,7 @@ char *read_string()
;
int i = 0;
while (c != '\n' && c != EOF) {
- if (!invalid_input_char(c)) {
+ if (!is_invalid_input_char(c)) {
if (i + 2 > len) {
char *tem = s;
s = new char[len*2];
@@ -7714,7 +7714,7 @@ void transparent_file()
int c = getc(fp);
if (c == EOF)
break;
- if (invalid_input_char(c))
+ if (is_invalid_input_char(c))
warning(WARN_INPUT, "invalid input character code %1", int(c));
else {
curdiv->transparent_output(c);
@@ -7971,7 +7971,7 @@ static void set_string(const char *name, const char
*value)
{
macro *m = new macro;
for (const char *p = value; *p; p++)
- if (!invalid_input_char((unsigned char)*p))
+ if (!is_invalid_input_char((unsigned char)*p))
m->append(*p);
request_dictionary.define(name, m);
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [groff] 08/49: [troff, ...]: Trivially refactor.,
G. Branden Robinson <=