[Guile-commits] 25/69: Implement scm_logtest with new integer library

[Andy Wingo]

wingo pushed a commit to branch wip-inline-digits
in repository guile.

commit 61bc2110f399655e6351e20f44aa402654d11125
Author: Andy Wingo <wingo@pobox.com>
AuthorDate: Sun Dec 19 10:54:47 2021 +0100

    Implement scm_logtest with new integer library
    
    * libguile/integers.c (scm_integer_logtest_ii, scm_integer_logtest_zi)
    (scm_integer_logtest_zz): New internal functions.
    * libguile/integers.h: Declare the new internal functions.
    * libguile/numbers.c (scm_logtest): Use new internal functions.
---
 libguile/integers.c | 19 +++++++++++++++++++
 libguile/integers.h |  4 ++++
 libguile/numbers.c  | 44 +++++---------------------------------------
 3 files changed, 28 insertions(+), 39 deletions(-)

diff --git a/libguile/integers.c b/libguile/integers.c
index 174e42e18..ff5499af9 100644
--- a/libguile/integers.c
+++ b/libguile/integers.c
@@ -27,6 +27,7 @@
 #include <stdio.h>
 #include <verify.h>
 
+#include "boolean.h"
 #include "numbers.h"
 
 #include "integers.h"
@@ -1989,3 +1990,21 @@ scm_integer_logxor_zz (SCM x, SCM y)
   scm_remember_upto_here_2 (x, y);
   return take_mpz (result);
 }
+
+int
+scm_integer_logtest_ii (scm_t_inum x, scm_t_inum y)
+{
+  return (x & y) ? 1 : 0;
+}
+
+int
+scm_integer_logtest_zi (SCM x, scm_t_inum y)
+{
+  return scm_is_eq (scm_integer_logand_zi (x, y), SCM_INUM0);
+}
+
+int
+scm_integer_logtest_zz (SCM x, SCM y)
+{
+  return scm_is_eq (scm_integer_logand_zz (x, y), SCM_INUM0);
+}
diff --git a/libguile/integers.h b/libguile/integers.h
index 9fa41d914..56334f0a8 100644
--- a/libguile/integers.h
+++ b/libguile/integers.h
@@ -144,6 +144,10 @@ SCM_INTERNAL SCM scm_integer_logxor_ii (scm_t_inum x, 
scm_t_inum y);
 SCM_INTERNAL SCM scm_integer_logxor_zi (SCM x, scm_t_inum y);
 SCM_INTERNAL SCM scm_integer_logxor_zz (SCM x, SCM y);
 
+SCM_INTERNAL int scm_integer_logtest_ii (scm_t_inum x, scm_t_inum y);
+SCM_INTERNAL int scm_integer_logtest_zi (SCM x, scm_t_inum y);
+SCM_INTERNAL int scm_integer_logtest_zz (SCM x, SCM y);
+
 
 
 #endif  /* SCM_INTEGERS_H */
diff --git a/libguile/numbers.c b/libguile/numbers.c
index 77b2e0753..26d1c061f 100644
--- a/libguile/numbers.c
+++ b/libguile/numbers.c
@@ -3112,56 +3112,22 @@ SCM_DEFINE (scm_logtest, "logtest", 2, 0, 0,
            "@end lisp")
 #define FUNC_NAME s_scm_logtest
 {
-  scm_t_inum nj;
-
   if (SCM_I_INUMP (j))
     {
-      nj = SCM_I_INUM (j);
       if (SCM_I_INUMP (k))
-       {
-         scm_t_inum nk = SCM_I_INUM (k);
-         return scm_from_bool (nj & nk);
-       }
+        return scm_from_bool (scm_integer_logtest_ii (SCM_I_INUM (j),
+                                                      SCM_I_INUM (k)));
       else if (SCM_BIGP (k))
-       {
-       intbig: 
-         if (nj == 0)
-           return SCM_BOOL_F;
-         {
-           SCM result;
-           mpz_t nj_z;
-           mpz_init_set_si (nj_z, nj);
-           mpz_and (nj_z, nj_z, SCM_I_BIG_MPZ (k));
-           scm_remember_upto_here_1 (k);
-           result = scm_from_bool (mpz_sgn (nj_z) != 0);
-           mpz_clear (nj_z);
-           return result;
-         }
-       }
+        return scm_from_bool (scm_integer_logtest_zi (k, SCM_I_INUM (j)));
       else
        SCM_WRONG_TYPE_ARG (SCM_ARG2, k);
     }
   else if (SCM_BIGP (j))
     {
       if (SCM_I_INUMP (k))
-       {
-         SCM_SWAP (j, k);
-         nj = SCM_I_INUM (j);
-         goto intbig;
-       }
+        return scm_from_bool (scm_integer_logtest_zi (j, SCM_I_INUM (k)));
       else if (SCM_BIGP (k))
-       {
-         SCM result;
-         mpz_t result_z;
-         mpz_init (result_z);
-         mpz_and (result_z,
-                  SCM_I_BIG_MPZ (j),
-                  SCM_I_BIG_MPZ (k));
-         scm_remember_upto_here_2 (j, k);
-         result = scm_from_bool (mpz_sgn (result_z) != 0);
-         mpz_clear (result_z);
-         return result;
-       }
+        return scm_from_bool (scm_integer_logtest_zz (j, k));
       else
        SCM_WRONG_TYPE_ARG (SCM_ARG2, k);
     }