summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2011-03-06 20:27:40 -0500
committerMark H Weaver <mhw@netris.org>2011-03-08 18:20:11 -0500
commit0748e3f3f07fb6b6680160ea488d73b04506f8c7 (patch)
treec54bb203016ea206fed48616ad5d00e31fab20dd
parent5d344028fbf8b3e764549d975b20aa20ae316aa9 (diff)
downloadguile-0748e3f3f07fb6b6680160ea488d73b04506f8c7.tar.gz
Quotient, remainder and modulo accept inexact integers
* libguile/numbers.c (scm_quotient, scm_remainder, scm_modulo): Accept inexact integers as well as exact ones, as required by the R5RS. * test-suite/tests/numbers.test (quotient, remainder, modulo): Add tests.
-rw-r--r--libguile/numbers.c12
-rw-r--r--test-suite/tests/numbers.test18
2 files changed, 24 insertions, 6 deletions
diff --git a/libguile/numbers.c b/libguile/numbers.c
index be86eb575..f8891fa87 100644
--- a/libguile/numbers.c
+++ b/libguile/numbers.c
@@ -796,9 +796,9 @@ SCM_PRIMITIVE_GENERIC (scm_quotient, "quotient", 2, 0, 0,
"Return the quotient of the numbers @var{x} and @var{y}.")
#define FUNC_NAME s_scm_quotient
{
- if (SCM_LIKELY (SCM_I_INUMP (x)) || SCM_LIKELY (SCM_BIGP (x)))
+ if (SCM_LIKELY (scm_is_integer (x)))
{
- if (SCM_LIKELY (SCM_I_INUMP (y)) || SCM_LIKELY (SCM_BIGP (y)))
+ if (SCM_LIKELY (scm_is_integer (y)))
return scm_truncate_quotient (x, y);
else
SCM_WTA_DISPATCH_2 (g_scm_quotient, x, y, SCM_ARG2, s_scm_quotient);
@@ -817,9 +817,9 @@ SCM_PRIMITIVE_GENERIC (scm_remainder, "remainder", 2, 0, 0,
"@end lisp")
#define FUNC_NAME s_scm_remainder
{
- if (SCM_LIKELY (SCM_I_INUMP (x)) || SCM_LIKELY (SCM_BIGP (x)))
+ if (SCM_LIKELY (scm_is_integer (x)))
{
- if (SCM_LIKELY (SCM_I_INUMP (y)) || SCM_LIKELY (SCM_BIGP (y)))
+ if (SCM_LIKELY (scm_is_integer (y)))
return scm_truncate_remainder (x, y);
else
SCM_WTA_DISPATCH_2 (g_scm_remainder, x, y, SCM_ARG2, s_scm_remainder);
@@ -839,9 +839,9 @@ SCM_PRIMITIVE_GENERIC (scm_modulo, "modulo", 2, 0, 0,
"@end lisp")
#define FUNC_NAME s_scm_modulo
{
- if (SCM_LIKELY (SCM_I_INUMP (x)) || SCM_LIKELY (SCM_BIGP (x)))
+ if (SCM_LIKELY (scm_is_integer (x)))
{
- if (SCM_LIKELY (SCM_I_INUMP (y)) || SCM_LIKELY (SCM_BIGP (y)))
+ if (SCM_LIKELY (scm_is_integer (y)))
return scm_floor_remainder (x, y);
else
SCM_WTA_DISPATCH_2 (g_scm_modulo, x, y, SCM_ARG2, s_scm_modulo);
diff --git a/test-suite/tests/numbers.test b/test-suite/tests/numbers.test
index cb582ed1b..95842941d 100644
--- a/test-suite/tests/numbers.test
+++ b/test-suite/tests/numbers.test
@@ -633,6 +633,12 @@
(pass-if "n = fixnum-min - 1"
(eqv? 1 (quotient (- fixnum-min 1) (- fixnum-min 1)))))
+ ;; Inexact integers
+
+ (pass-if (eqv? 5.0 (quotient 35.0 7.0)))
+ (pass-if (eqv? 5.0 (quotient 35 7.0)))
+ (pass-if (eqv? 5.0 (quotient 35.0 7 )))
+
;; Positive dividend and divisor
(pass-if "35 / 7"
@@ -826,6 +832,12 @@
(pass-if "n = fixnum-min - 1"
(eqv? 0 (remainder (- fixnum-min 1) (- fixnum-min 1)))))
+ ;; Inexact integers
+
+ (pass-if (eqv? 2.0 (remainder 37.0 7.0)))
+ (pass-if (eqv? 2.0 (remainder 37 7.0)))
+ (pass-if (eqv? 2.0 (remainder 37.0 7 )))
+
;; Positive dividend and divisor
(pass-if "35 / 7"
@@ -1009,6 +1021,12 @@
(pass-if "n = fixnum-min - 1"
(eqv? 0 (modulo (- fixnum-min 1) (- fixnum-min 1)))))
+ ;; Inexact integers
+
+ (pass-if (eqv? 1.0 (modulo 13.0 4.0)))
+ (pass-if (eqv? 1.0 (modulo 13 4.0)))
+ (pass-if (eqv? 1.0 (modulo 13.0 4 )))
+
;; Positive dividend and divisor
(pass-if "13 % 4"