gbranden pushed a commit to branch master
in repository groff.
commit ce87b9130a828007ce7f72e21b34a86035bad1b3
Author: G. Branden Robinson <[email protected]>
AuthorDate: Tue Aug 27 19:00:38 2024 -0500
[troff]: Fix code style nit.
* src/roff/troff/input.cpp (class input_iterator): Boolify `is_file`
member function.
(class file_iterator): Boolify `is_file` member function and define in
declaration...
(file_iterator::is_file): ...instead of separately.
---
ChangeLog | 8 ++++++++
src/roff/troff/input.cpp | 9 ++-------
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 0e75cb74f..7ee0a7203 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2024-08-27 G. Branden Robinson <[email protected]>
+
+ * src/roff/troff/input.cpp (class input_iterator): Boolify
+ `is_file` member function.
+ (class file_iterator): Boolify `is_file` member function and
+ define in declaration...
+ (file_iterator::is_file): ...instead of separately.
+
2024-08-27 G. Branden Robinson <[email protected]>
[troff]: Demote `is_div` argument to `macro` constructor from
diff --git a/src/roff/troff/input.cpp b/src/roff/troff/input.cpp
index 6f63362fa..acc7be080 100644
--- a/src/roff/troff/input.cpp
+++ b/src/roff/troff/input.cpp
@@ -342,7 +342,7 @@ private:
virtual int next_file(FILE *, const char *) { return 0; }
virtual void shift(int) {}
virtual int is_boundary() {return 0; }
- virtual int is_file() { return 0; }
+ virtual bool is_file() { return false; }
virtual int is_macro() { return 0; }
virtual void set_att_compat(bool) {}
virtual bool get_att_compat() { return false; }
@@ -403,7 +403,7 @@ public:
void backtrace();
bool set_location(const char *, int);
int next_file(FILE *, const char *);
- int is_file();
+ bool is_file() { return true; }
};
file_iterator::file_iterator(FILE *f, const char *fn, int po)
@@ -432,11 +432,6 @@ void file_iterator::close()
fclose(fp);
}
-int file_iterator::is_file()
-{
- return 1;
-}
-
int file_iterator::next_file(FILE *f, const char *s)
{
close();
_______________________________________________
Groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
