groff-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[groff] 06/13: [troff]: Trivially refactor `incr_number_result`.


From: G. Branden Robinson
Subject: [groff] 06/13: [troff]: Trivially refactor `incr_number_result`.
Date: Mon, 20 Nov 2023 02:11:49 -0500 (EST)

gbranden pushed a commit to branch master
in repository groff.

commit 3c3d087ec3f084ee7c74d3835abf18e4e4c9ace2
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Tue Nov 14 17:50:12 2023 -0600

    [troff]: Trivially refactor `incr_number_result`.
    
    * src/roff/troff/number.cpp: Rename some enumeration constants.
      - `BAD` -> `INVALID`
      - `ABSOLUTE` -> `ASSIGN`
---
 ChangeLog                 |  6 ++++++
 src/roff/troff/number.cpp | 24 ++++++++++++------------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bb9678ecc..cb8982e3e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2023-11-14  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       * src/roff/troff/number.cpp: Rename some enumeration constants.
+       - `BAD` -> `INVALID`
+       - `ABSOLUTE` -> `ASSIGN`
+
 2023-11-13  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        [troff]: Boolify numeric expression-reading functions.
diff --git a/src/roff/troff/number.cpp b/src/roff/troff/number.cpp
index 1768e45f6..e6960a3af 100644
--- a/src/roff/troff/number.cpp
+++ b/src/roff/troff/number.cpp
@@ -106,7 +106,7 @@ bool get_integer(int *res)
     return false;
 }
 
-enum incr_number_result { BAD, ABSOLUTE, INCREMENT, DECREMENT };
+enum incr_number_result { INVALID, ASSIGN, INCREMENT, DECREMENT };
 
 static incr_number_result get_incr_number(units *res, unsigned char);
 
@@ -114,9 +114,9 @@ bool get_vunits(vunits *res, unsigned char si, vunits 
prev_value)
 {
   units v;
   switch (get_incr_number(&v, si)) {
-  case BAD:
+  case INVALID:
     return false;
-  case ABSOLUTE:
+  case ASSIGN:
     *res = v;
     break;
   case INCREMENT:
@@ -135,9 +135,9 @@ bool get_hunits(hunits *res, unsigned char si, hunits 
prev_value)
 {
   units v;
   switch (get_incr_number(&v, si)) {
-  case BAD:
+  case INVALID:
     return false;
-  case ABSOLUTE:
+  case ASSIGN:
     *res = v;
     break;
   case INCREMENT:
@@ -156,9 +156,9 @@ bool get_number(units *res, unsigned char si, units 
prev_value)
 {
   units v;
   switch (get_incr_number(&v, si)) {
-  case BAD:
+  case INVALID:
     return false;
-  case ABSOLUTE:
+  case ASSIGN:
     *res = v;
     break;
   case INCREMENT:
@@ -177,9 +177,9 @@ bool get_integer(int *res, int prev_value)
 {
   units v;
   switch (get_incr_number(&v, 0)) {
-  case BAD:
+  case INVALID:
     return false;
-  case ABSOLUTE:
+  case ASSIGN:
     *res = v;
     break;
   case INCREMENT:
@@ -198,8 +198,8 @@ bool get_integer(int *res, int prev_value)
 static incr_number_result get_incr_number(units *res, unsigned char si)
 {
   if (!is_valid_expression_start())
-    return BAD;
-  incr_number_result result = ABSOLUTE;
+    return INVALID;
+  incr_number_result result = ASSIGN;
   if (tok.ch() == '+') {
     tok.next();
     result = INCREMENT;
@@ -211,7 +211,7 @@ static incr_number_result get_incr_number(units *res, 
unsigned char si)
   if (is_valid_expression(res, si, false /* is_parenthesized */))
     return result;
   else
-    return BAD;
+    return INVALID;
 }
 
 static bool is_valid_expression_start()



reply via email to

[Prev in Thread] Current Thread [Next in Thread]