gbranden pushed a commit to branch master
in repository groff.
commit 83f977cf442d6e51f360402bc124193c79f5254b
Author: G. Branden Robinson <[email protected]>
AuthorDate: Fri Aug 16 11:08:59 2024 -0500
[troff]: Clarify wrapping arithmetic diagnostics.
* src/roff/troff/number.cpp (get_vunits, get_hunts, get_number)
(get_integer): Clarify diagnostic when integer arithmetic wraps.
---
ChangeLog | 5 +++++
src/roff/troff/number.cpp | 16 ++++++++--------
2 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index da2ee827a..dfd57971a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2024-08-16 G. Branden Robinson <[email protected]>
+
+ * src/roff/troff/number.cpp (get_vunits, get_hunts, get_number)
+ (get_integer): Clarify diagnostic when integer arithmetic wraps.
+
2024-08-16 G. Branden Robinson <[email protected]>
[troff]: Fix code style nits.
diff --git a/src/roff/troff/number.cpp b/src/roff/troff/number.cpp
index bfa9518db..bc92e955d 100644
--- a/src/roff/troff/number.cpp
+++ b/src/roff/troff/number.cpp
@@ -129,12 +129,12 @@ bool get_vunits(vunits *res, unsigned char si, vunits
prev_value)
break;
case INCREMENT:
if (ckd_add(&i, prev_value.to_units(), v))
- error("integer addition wrapped");
+ error("integer incrementation wrapped");
*res = i;
break;
case DECREMENT:
if (ckd_sub(&i, prev_value.to_units(), v))
- error("integer subtraction wrapped");
+ error("integer decrementation wrapped");
*res = i;
break;
default:
@@ -157,12 +157,12 @@ bool get_hunits(hunits *res, unsigned char si, hunits
prev_value)
break;
case INCREMENT:
if (ckd_add(&i, prev_value.to_units(), h))
- error("integer addition wrapped");
+ error("integer incrementation wrapped");
*res = i;
break;
case DECREMENT:
if (ckd_sub(&i, prev_value.to_units(), h))
- error("integer subtraction wrapped");
+ error("integer decrementation wrapped");
*res = i;
break;
default:
@@ -182,11 +182,11 @@ bool get_number(units *res, unsigned char si, units
prev_value)
break;
case INCREMENT:
if (ckd_add(res, prev_value, u))
- error("integer addition wrapped");
+ error("integer incrementation wrapped");
break;
case DECREMENT:
if (ckd_sub(res, prev_value, u))
- error("integer subtraction wrapped");
+ error("integer decrementation wrapped");
break;
default:
assert(0 == "unhandled case in get_number()");
@@ -205,11 +205,11 @@ bool get_integer(int *res, int prev_value)
break;
case INCREMENT:
if (ckd_add(res, prev_value, i))
- error("integer addition wrapped");
+ error("integer incrementation wrapped");
break;
case DECREMENT:
if (ckd_sub(res, prev_value, i))
- error("integer subtraction wrapped");
+ error("integer decrementation wrapped");
break;
default:
assert(0 == "unhandled case in get_integer()");
_______________________________________________
Groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
