[groff] 05/14: [troff]: Slightly refactor some more.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit 41091ecc5482c3c63c40398f89d9dab5d9b08e08
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Mon Jul 5 22:02:38 2021 +1000

    [troff]: Slightly refactor some more.
    
    * src/roff/troff/token.h (token::delimiter): Change type of parameter
      from `int` to `bool`, name from `warn` to `err` (to match definition
      and behavior in input.cpp) and default from 0 to `false`.
    
    * src/roff/troff/input.cpp (token::delimiter): Change type of parameter
      from `int` to `bool` in definition.
    
    * src/roff/troff/input.cpp (do_expr_test, get_delim_number,
      get_line_arg, read_size, do_register, read_draw_node):
    
    * src/roff/troff/reg.cpp (inline_define_reg): Update call sites.  Add
      comment indicating meaning of parameter.
---
 ChangeLog                | 13 +++++++++++++
 src/roff/troff/input.cpp | 16 ++++++++--------
 src/roff/troff/reg.cpp   |  2 +-
 src/roff/troff/token.h   |  2 +-
 4 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b108f19..06e5449 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -29,6 +29,19 @@
        alter_format, alias_reg, rename_reg): Update call sites.  Add
        comment indicating meaning of parameter.
 
+       Do similarly for token::delimiter() member function.
+
+       * src/roff/troff/token.h (token::delimiter): Change type of
+       parameter from `int` to `bool`, name from `warn` to `err` (to
+       match definition and behavior in input.cpp) and default from 0
+       to `false`.
+       * src/roff/troff/input.cpp (token::delimiter): Change type of
+       parameter from `int` to `bool` in definition.
+       * src/roff/troff/input.cpp (do_expr_test, get_delim_number,
+       get_line_arg, read_size, do_register, read_draw_node):
+       * src/roff/troff/reg.cpp (inline_define_reg): Update call sites.
+       Add comment indicating meaning of parameter.
+
 2021-07-05  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        * tmac/an-old.tmac (an-footer): Remove string
diff --git a/src/roff/troff/input.cpp b/src/roff/troff/input.cpp
index a21daa5..dc34127 100644
--- a/src/roff/troff/input.cpp
+++ b/src/roff/troff/input.cpp
@@ -1534,7 +1534,7 @@ static int do_expr_test()
   token start;
   start.next();
   int start_level = input_stack::get_level();
-  if (!start.delimiter(1))
+  if (!start.delimiter(true /* report error */))
     return 0;
   tok.next();
   // disable all warning and error messages temporarily
@@ -2325,7 +2325,7 @@ int token::operator!=(const token &t)
 
 // is token a suitable delimiter (like ')?
 
-int token::delimiter(int err)
+int token::delimiter(bool err)
 {
   switch(type) {
   case TOKEN_CHAR:
@@ -4986,7 +4986,7 @@ static int get_delim_number(units *n, unsigned char si, 
int prev_value)
 {
   token start;
   start.next();
-  if (start.delimiter(1)) {
+  if (start.delimiter(true /* report error */)) {
     tok.next();
     if (get_number(n, si, prev_value)) {
       if (start != tok)
@@ -5001,7 +5001,7 @@ static int get_delim_number(units *n, unsigned char si)
 {
   token start;
   start.next();
-  if (start.delimiter(1)) {
+  if (start.delimiter(true /* report error */)) {
     tok.next();
     if (get_number(n, si)) {
       if (start != tok)
@@ -5017,7 +5017,7 @@ static int get_line_arg(units *n, unsigned char si, 
charinfo **cp)
   token start;
   start.next();
   int start_level = input_stack::get_level();
-  if (!start.delimiter(1))
+  if (!start.delimiter(true /* report error */))
     return 0;
   tok.next();
   if (get_number(n, si)) {
@@ -5097,7 +5097,7 @@ static int read_size(int *x)
     }
     val *= sizescale;
   }
-  else if (!tok.delimiter(1))
+  else if (!tok.delimiter(true /* report error */))
     return 0;
   else {
     token start(tok);
@@ -5220,7 +5220,7 @@ static void do_register()
 {
   token start;
   start.next();
-  if (!start.delimiter(1))
+  if (!start.delimiter(true /* report error */))
     return;
   tok.next();
   symbol nm = get_long_name(true /* required */);
@@ -8471,7 +8471,7 @@ static node *read_draw_node()
 {
   token start;
   start.next();
-  if (!start.delimiter(1)){
+  if (!start.delimiter(true /* report error */)){
     do {
       tok.next();
     } while (tok != start && !tok.newline() && !tok.eof());
diff --git a/src/roff/troff/reg.cpp b/src/roff/troff/reg.cpp
index fb5b7a7..4c2bf6c 100644
--- a/src/roff/troff/reg.cpp
+++ b/src/roff/troff/reg.cpp
@@ -328,7 +328,7 @@ void inline_define_reg()
 {
   token start;
   start.next();
-  if (!start.delimiter(1))
+  if (!start.delimiter(true /* report error */))
     return;
   tok.next();
   symbol nm = get_name(true /* required */);
diff --git a/src/roff/troff/token.h b/src/roff/troff/token.h
index fdb02f6..f3d9e39 100644
--- a/src/roff/troff/token.h
+++ b/src/roff/troff/token.h
@@ -80,7 +80,7 @@ public:
   int tab();                   // is the current token a tab?
   int leader();
   int backspace();
-  int delimiter(int warn = 0); // is it suitable for use as a delimiter?
+  int delimiter(bool err = false);     // usable as a delimiter?
   int dummy();
   int transparent_dummy();
   int transparent();