diff options
author | Mark H Weaver <mhw@netris.org> | 2013-08-11 22:46:22 -0400 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2013-08-11 22:46:22 -0400 |
commit | 1160e2d94e6a53e4509f81ff08798655db9cae26 (patch) | |
tree | 01885df852779fe22ca336082e033dfbff6f5c6e /libguile/numbers.c | |
parent | 1e5c32054e002e2c12ba0188b58b7d26432c3495 (diff) | |
parent | 9ea816f54a3cc2216eac45c6238fa06448d824df (diff) | |
download | guile-1160e2d94e6a53e4509f81ff08798655db9cae26.tar.gz |
Merge remote-tracking branch 'origin/stable-2.0'
Diffstat (limited to 'libguile/numbers.c')
-rw-r--r-- | libguile/numbers.c | 29 |
1 files changed, 23 insertions, 6 deletions
diff --git a/libguile/numbers.c b/libguile/numbers.c index 3cdc7fd16..b5bce2308 100644 --- a/libguile/numbers.c +++ b/libguile/numbers.c @@ -48,6 +48,7 @@ #endif #include <verify.h> +#include <assert.h> #include <math.h> #include <string.h> @@ -5004,7 +5005,7 @@ left_shift_exact_integer (SCM n, long count) return result; } else - scm_syserror ("left_shift_exact_integer"); + assert (0); } /* Efficiently compute floor (N / 2^COUNT), @@ -5030,7 +5031,7 @@ floor_right_shift_exact_integer (SCM n, long count) return scm_i_normbig (result); } else - scm_syserror ("floor_right_shift_exact_integer"); + assert (0); } /* Efficiently compute round (N / 2^COUNT), @@ -5068,7 +5069,7 @@ round_right_shift_exact_integer (SCM n, long count) return scm_i_normbig (q); } else - scm_syserror ("round_right_shift_exact_integer"); + assert (0); } SCM_DEFINE (scm_ash, "ash", 2, 0, 0, @@ -6199,7 +6200,7 @@ mem2ureal (SCM mem, unsigned int *p_idx, } /* We should never get here */ - scm_syserror ("mem2ureal"); + assert (0); } @@ -9194,7 +9195,15 @@ SCM_PRIMITIVE_GENERIC (scm_numerator, "numerator", 1, 0, 0, else if (SCM_FRACTIONP (z)) return SCM_FRACTION_NUMERATOR (z); else if (SCM_REALP (z)) - return scm_exact_to_inexact (scm_numerator (scm_inexact_to_exact (z))); + { + double zz = SCM_REAL_VALUE (z); + if (zz == floor (zz)) + /* Handle -0.0 and infinities in accordance with R6RS + flnumerator, and optimize handling of integers. */ + return z; + else + return scm_exact_to_inexact (scm_numerator (scm_inexact_to_exact (z))); + } else return scm_wta_dispatch_1 (g_scm_numerator, z, SCM_ARG1, s_scm_numerator); } @@ -9211,7 +9220,15 @@ SCM_PRIMITIVE_GENERIC (scm_denominator, "denominator", 1, 0, 0, else if (SCM_FRACTIONP (z)) return SCM_FRACTION_DENOMINATOR (z); else if (SCM_REALP (z)) - return scm_exact_to_inexact (scm_denominator (scm_inexact_to_exact (z))); + { + double zz = SCM_REAL_VALUE (z); + if (zz == floor (zz)) + /* Handle infinities in accordance with R6RS fldenominator, and + optimize handling of integers. */ + return scm_i_from_double (1.0); + else + return scm_exact_to_inexact (scm_denominator (scm_inexact_to_exact (z))); + } else return scm_wta_dispatch_1 (g_scm_denominator, z, SCM_ARG1, s_scm_denominator); |