summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaz Kylheku <kaz@kylheku.com>2018-12-13 06:26:15 -0800
committerKaz Kylheku <kaz@kylheku.com>2018-12-13 06:26:15 -0800
commit526a9c89d0c74788adbc1492e613d174f03fb268 (patch)
treec2e5ab52747d20dc314185c889772a3a80538f6d
parent4d6f74ae2d74065b570a694de9c936508067a0bf (diff)
downloadtxr-526a9c89d0c74788adbc1492e613d174f03fb268.tar.gz
txr-526a9c89d0c74788adbc1492e613d174f03fb268.tar.bz2
txr-526a9c89d0c74788adbc1492e613d174f03fb268.zip
Use tnil instead of if2 in arithmetic predicates.
* arith.c (zerop, plusp, minusp): style: if2(expr, t) should be using tnil(expr).
-rw-r--r--arith.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/arith.c b/arith.c
index 1a8c44da..084d8cf5 100644
--- a/arith.c
+++ b/arith.c
@@ -1547,9 +1547,9 @@ val zerop(val num)
case BGNUM:
return nil;
case FLNUM:
- return if2(c_flo(num, self) == 0.0, t);
+ return tnil(c_flo(num, self) == 0.0);
case CHR:
- return if2(num == chr(0), t);
+ return tnil(num == chr(0));
case RNG:
return and2(zerop(from(num)), zerop(to(num)));
default:
@@ -1563,13 +1563,13 @@ val plusp(val num)
switch (type(num)) {
case NUM:
- return if2(c_n(num) > 0, t);
+ return tnil(c_n(num) > 0);
case BGNUM:
- return if2(mp_cmp_z(mp(num)) == MP_GT, t);
+ return tnil(mp_cmp_z(mp(num)) == MP_GT);
case FLNUM:
- return if2(c_flo(num, self) > 0.0, t);
+ return tnil(c_flo(num, self) > 0.0);
case CHR:
- return if2(num != chr(0), t);
+ return tnil(num != chr(0));
default:
not_number(self, num);
}
@@ -1581,11 +1581,11 @@ val minusp(val num)
switch (type(num)) {
case NUM:
- return if2(c_n(num) < 0, t);
+ return tnil(c_n(num) < 0);
case BGNUM:
- return if2(mp_cmp_z(mp(num)) == MP_LT, t);
+ return tnil(mp_cmp_z(mp(num)) == MP_LT);
case FLNUM:
- return if2(c_flo(num, self) < 0.0, t);
+ return tnil(c_flo(num, self) < 0.0);
case CHR:
return nil;
default: