[Guile-commits] 58/69: Expose frexp from integers lib

[Andy Wingo]

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

commit 3ad9fa335e1ed8bc1981d8c0a2d96f24062caf78
Author: Andy Wingo <wingo@pobox.com>
AuthorDate: Fri Jan 7 10:11:45 2022 +0100

    Expose frexp from integers lib
    
    * libguile/integers.h:
    * libguile/integers.c (scm_integer_frexp_z): Expose internally.
    (scm_integer_to_double_z):
    (scm_integer_inexact_sqrt_z): Adapt uses.
    * libguile/numbers.c (log_of_exact_integer): Use exposed
    scm_integer_frexp_z.
---
 libguile/integers.c | 8 ++++----
 libguile/integers.h | 1 +
 libguile/numbers.c  | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/libguile/integers.c b/libguile/integers.c
index 2fde52625..f60173649 100644
--- a/libguile/integers.c
+++ b/libguile/integers.c
@@ -2696,8 +2696,8 @@ mpz_get_d_2exp (long *exp, mpz_srcptr z)
 }
 #endif
 
-static double
-bignum_frexp (struct scm_bignum *x, long *exp)
+double
+scm_integer_frexp_z (struct scm_bignum *x, long *exp)
 {
   mpz_t zx;
   alias_bignum_to_mpz (x, zx);
@@ -2730,7 +2730,7 @@ double
 scm_integer_to_double_z (struct scm_bignum *x)
 {
   long exponent;
-  double significand = bignum_frexp (x, &exponent);
+  double significand = scm_integer_frexp_z (x, &exponent);
   return ldexp (significand, exponent);
 }
 
@@ -3134,7 +3134,7 @@ scm_integer_inexact_sqrt_z (struct scm_bignum *k)
   mpz_init (zs);
 
   long expon;
-  double signif = bignum_frexp (k, &expon);
+  double signif = scm_integer_frexp_z (k, &expon);
   int negative = signif < 0;
   if (negative)
     signif = -signif;
diff --git a/libguile/integers.h b/libguile/integers.h
index 00706d553..1d406b659 100644
--- a/libguile/integers.h
+++ b/libguile/integers.h
@@ -169,6 +169,7 @@ SCM_INTERNAL int scm_is_integer_less_than_rz (double y, 
struct scm_bignum *x);
 SCM_INTERNAL int scm_is_integer_positive_z (struct scm_bignum *x);
 SCM_INTERNAL int scm_is_integer_negative_z (struct scm_bignum *x);
 
+SCM_INTERNAL double scm_integer_frexp_z (struct scm_bignum *x, long *exp);
 SCM_INTERNAL double scm_integer_to_double_z (struct scm_bignum *x);
 SCM_INTERNAL SCM scm_integer_from_double (double val);
 
diff --git a/libguile/numbers.c b/libguile/numbers.c
index 68534c02c..7eaac3dc4 100644
--- a/libguile/numbers.c
+++ b/libguile/numbers.c
@@ -7209,11 +7209,11 @@ log_of_exact_integer (SCM n)
   else if (SCM_BIGP (n))
     {
       long expon;
-      double signif = scm_i_big2dbl_2exp (n, &expon);
+      double signif = scm_integer_frexp_z (scm_bignum (n), &expon);
       return log_of_shifted_double (signif, expon);
     }
   else
-    scm_wrong_type_arg ("log_of_exact_integer", SCM_ARG1, n);
+    abort ();
 }
 
 /* Returns log(n/d), for exact non-zero integers n and d */