Implement scm_lognot with new integer library

* libguile/integers.c (scm_integer_lognot_i, scm_integer_lognot_z):
* libguile/integers.h: Declare the new internal functions.
* libguile/numbers.c (scm_lognot): Use new internal functions.

1 files changed, 5 insertions, 15 deletions

diff --git a/libguile/numbers.c b/libguile/numbers.c
index 548618e74..3e8431757 100644
--- a/libguile/numbers.c
+++ b/libguile/numbers.c
@@ -3177,22 +3177,12 @@ SCM_DEFINE (scm_lognot, "lognot", 1, 0, 0,
 	    "@end lisp")
 #define FUNC_NAME s_scm_lognot
 {
-  if (SCM_I_INUMP (n)) {
-    /* No overflow here, just need to toggle all the bits making up the inum.
-       Enhancement: No need to strip the tag and add it back, could just xor
-       a block of 1 bits, if that worked with the various debug versions of
-       the SCM typedef.  */
-    return SCM_I_MAKINUM (~ SCM_I_INUM (n));
-
-  } else if (SCM_BIGP (n)) {
-    SCM result = scm_i_mkbig ();
-    mpz_com (SCM_I_BIG_MPZ (result), SCM_I_BIG_MPZ (n));
-    scm_remember_upto_here_1 (n);
-    return result;
-
-  } else {
+  if (SCM_I_INUMP (n))
+    return scm_integer_lognot_i (SCM_I_INUM (n));
+  else if (SCM_BIGP (n))
+    return scm_integer_lognot_z (n);
+  else
     SCM_WRONG_TYPE_ARG (SCM_ARG1, n);
-  }
 }
 #undef FUNC_NAME