[groff] 05/13: [troff]: Boolify numeric expression-reading functions.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit e4a478796855b3a4fadba068a4967f1c1c3257be
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Mon Nov 13 23:50:23 2023 -0600

    [troff]: Boolify numeric expression-reading functions.
    
    * src/roff/troff/hvunits.h (get_vunits, get_hunits):
    * src/roff/troff/token.h (get_number_rigidly, get_number, get_integer):
    * src/roff/troff/number.cpp (get_vunits, get_hunits, get_number_rigidly)
      (get_number, get_integer): Do it.
---
 ChangeLog                 | 10 ++++++++
 src/roff/troff/hvunits.h  |  8 +++---
 src/roff/troff/number.cpp | 64 +++++++++++++++++++++++------------------------
 src/roff/troff/token.h    | 10 ++++----
 4 files changed, 51 insertions(+), 41 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6fbb55b25..bb9678ecc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2023-11-13  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       [troff]: Boolify numeric expression-reading functions.
+
+       * src/roff/troff/hvunits.h (get_vunits, get_hunits):
+       * src/roff/troff/token.h (get_number_rigidly, get_number)
+       (get_integer):
+       * src/roff/troff/number.cpp (get_vunits, get_hunits)
+       (get_number_rigidly, get_number, get_integer): Do it.
+
 2023-11-13  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        * src/roff/troff/number.cpp (is_valid_expression): Boolify and
diff --git a/src/roff/troff/hvunits.h b/src/roff/troff/hvunits.h
index 04517a7bf..56e892553 100644
--- a/src/roff/troff/hvunits.h
+++ b/src/roff/troff/hvunits.h
@@ -74,10 +74,10 @@ public:
 
 extern const hunits H0;
 
-extern int get_vunits(vunits *, unsigned char si);
-extern int get_hunits(hunits *, unsigned char si);
-extern int get_vunits(vunits *, unsigned char si, vunits prev_value);
-extern int get_hunits(hunits *, unsigned char si, hunits prev_value);
+extern bool get_vunits(vunits *, unsigned char si);
+extern bool get_hunits(hunits *, unsigned char si);
+extern bool get_vunits(vunits *, unsigned char si, vunits prev_value);
+extern bool get_hunits(hunits *, unsigned char si, hunits prev_value);
 
 inline vunits:: vunits() : n(0)
 {
diff --git a/src/roff/troff/number.cpp b/src/roff/troff/number.cpp
index 8b4722910..1768e45f6 100644
--- a/src/roff/troff/number.cpp
+++ b/src/roff/troff/number.cpp
@@ -38,84 +38,84 @@ static bool is_valid_expression(units *v, int scaling_unit,
                                bool is_mandatory = false);
 static bool is_valid_expression_start();
 
-int get_vunits(vunits *res, unsigned char si)
+bool get_vunits(vunits *res, unsigned char si)
 {
   if (!is_valid_expression_start())
-    return 0;
+    return false;
   units x;
   if (is_valid_expression(&x, si, false /* is_parenthesized */)) {
     *res = vunits(x);
-    return 1;
+    return true;
   }
   else
-    return 0;
+    return false;
 }
 
-int get_hunits(hunits *res, unsigned char si)
+bool get_hunits(hunits *res, unsigned char si)
 {
   if (!is_valid_expression_start())
-    return 0;
+    return false;
   units x;
   if (is_valid_expression(&x, si, false /* is_parenthesized */)) {
     *res = hunits(x);
-    return 1;
+    return true;
   }
   else
-    return 0;
+    return false;
 }
 
 // for \B
 
-int get_number_rigidly(units *res, unsigned char si)
+bool get_number_rigidly(units *res, unsigned char si)
 {
   if (!is_valid_expression_start())
-    return 0;
+    return false;
   units x;
   if (is_valid_expression(&x, si, false /* is_parenthesized */,
                          true /* is_mandatory */)) {
     *res = x;
-    return 1;
+    return true;
   }
   else
-    return 0;
+    return false;
 }
 
-int get_number(units *res, unsigned char si)
+bool get_number(units *res, unsigned char si)
 {
   if (!is_valid_expression_start())
-    return 0;
+    return false;
   units x;
   if (is_valid_expression(&x, si, false /* is_parenthesized */)) {
     *res = x;
-    return 1;
+    return true;
   }
   else
-    return 0;
+    return false;
 }
 
-int get_integer(int *res)
+bool get_integer(int *res)
 {
   if (!is_valid_expression_start())
-    return 0;
+    return false;
   units x;
   if (is_valid_expression(&x, 0, false /* is_parenthesized */)) {
     *res = x;
-    return 1;
+    return true;
   }
   else
-    return 0;
+    return false;
 }
 
 enum incr_number_result { BAD, ABSOLUTE, INCREMENT, DECREMENT };
 
 static incr_number_result get_incr_number(units *res, unsigned char);
 
-int get_vunits(vunits *res, unsigned char si, vunits prev_value)
+bool get_vunits(vunits *res, unsigned char si, vunits prev_value)
 {
   units v;
   switch (get_incr_number(&v, si)) {
   case BAD:
-    return 0;
+    return false;
   case ABSOLUTE:
     *res = v;
     break;
@@ -128,15 +128,15 @@ int get_vunits(vunits *res, unsigned char si, vunits 
prev_value)
   default:
     assert(0 == "unhandled switch case returned by get_incr_number()");
   }
-  return 1;
+  return true;
 }
 
-int get_hunits(hunits *res, unsigned char si, hunits prev_value)
+bool get_hunits(hunits *res, unsigned char si, hunits prev_value)
 {
   units v;
   switch (get_incr_number(&v, si)) {
   case BAD:
-    return 0;
+    return false;
   case ABSOLUTE:
     *res = v;
     break;
@@ -149,15 +149,15 @@ int get_hunits(hunits *res, unsigned char si, hunits 
prev_value)
   default:
     assert(0 == "unhandled switch case returned by get_incr_number()");
   }
-  return 1;
+  return true;
 }
 
-int get_number(units *res, unsigned char si, units prev_value)
+bool get_number(units *res, unsigned char si, units prev_value)
 {
   units v;
   switch (get_incr_number(&v, si)) {
   case BAD:
-    return 0;
+    return false;
   case ABSOLUTE:
     *res = v;
     break;
@@ -170,15 +170,15 @@ int get_number(units *res, unsigned char si, units 
prev_value)
   default:
     assert(0 == "unhandled switch case returned by get_incr_number()");
   }
-  return 1;
+  return true;
 }
 
-int get_integer(int *res, int prev_value)
+bool get_integer(int *res, int prev_value)
 {
   units v;
   switch (get_incr_number(&v, 0)) {
   case BAD:
-    return 0;
+    return false;
   case ABSOLUTE:
     *res = v;
     break;
@@ -191,7 +191,7 @@ int get_integer(int *res, int prev_value)
   default:
     assert(0 == "unhandled switch case returned by get_incr_number()");
   }
-  return 1;
+  return true;
 }
 
 
diff --git a/src/roff/troff/token.h b/src/roff/troff/token.h
index e54f55e8e..f9e2e6ec0 100644
--- a/src/roff/troff/token.h
+++ b/src/roff/troff/token.h
@@ -123,13 +123,13 @@ extern void do_define_character(char_mode, const char * = 
0);
 class hunits;
 extern void read_title_parts(node **part, hunits *part_width);
 
-extern int get_number_rigidly(units *result, unsigned char si);
+extern bool get_number_rigidly(units *result, unsigned char si);
 
-extern int get_number(units *result, unsigned char si);
-extern int get_integer(int *result);
+extern bool get_number(units *result, unsigned char si);
+extern bool get_integer(int *result);
 
-extern int get_number(units *result, unsigned char si, units prev_value);
-extern int get_integer(int *result, int prev_value);
+extern bool get_number(units *result, unsigned char si, units prev_value);
+extern bool get_integer(int *result, int prev_value);
 
 extern void interpolate_register(symbol, int);