-/* Copyright (C) 1995,1996,1997,1998 Free Software Foundation, Inc.
-
+/* Copyright (C) 1995,1996,1997,1998,1999,2000 Free Software Foundation, Inc.
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
* If you do not wish that, delete this exception notice. */
+
+/* Software engineering face-lift by Greg J. Badros, 11-Dec-1999,
+ gjb@cs.washington.edu, http://www.cs.washington.edu/homes/gjb */
+
\f
#include <stdio.h>
#include <math.h>
-#include "_scm.h"
-#include "genio.h"
-#include "unif.h"
-
-#include "numbers.h"
+#include "libguile/_scm.h"
+#include "libguile/unif.h"
+#include "libguile/feature.h"
+#include "libguile/ports.h"
+#include "libguile/root.h"
+#include "libguile/smob.h"
+#include "libguile/strings.h"
+#include "libguile/vectors.h"
+
+#include "libguile/validate.h"
+#include "libguile/numbers.h"
\f
#define DIGITS '0':case '1':case '2':case '3':case '4':\
case '5':case '6':case '7':case '8':case '9'
#define isfinite(x) (!IS_INF (x) && (x) == (x))
#endif
-/* MAXEXP is the maximum double precision expontent
- * FLTMAX is less than or scm_equal the largest single precision float
- */
-
-#ifdef SCM_FLOATS
-#ifdef STDC_HEADERS
-#ifndef GO32
-#include <float.h>
-#endif /* ndef GO32 */
-#endif /* def STDC_HEADERS */
-#ifdef DBL_MAX_10_EXP
-#define MAXEXP DBL_MAX_10_EXP
-#else
-#define MAXEXP 308 /* IEEE doubles */
-#endif /* def DBL_MAX_10_EXP */
-#ifdef FLT_MAX
-#define FLTMAX FLT_MAX
-#else
-#define FLTMAX 1e+23
-#endif /* def FLT_MAX */
-#endif /* def SCM_FLOATS */
\f
-SCM_PROC (s_exact_p, "exact?", 1, 0, 0, scm_exact_p);
-
-SCM
-scm_exact_p (x)
- SCM x;
+SCM_DEFINE (scm_exact_p, "exact?", 1, 0, 0,
+ (SCM x),
+ "Return #t if X is an exact number, #f otherwise.")
+#define FUNC_NAME s_scm_exact_p
{
- if (SCM_INUMP (x))
+ if (SCM_INUMP (x)) {
return SCM_BOOL_T;
#ifdef SCM_BIGDIG
- if (SCM_NIMP (x) && SCM_BIGP (x))
+ } else if (SCM_BIGP (x)) {
return SCM_BOOL_T;
#endif
- return SCM_BOOL_F;
+ } else {
+ return SCM_BOOL_F;
+ }
}
+#undef FUNC_NAME
-SCM_PROC (s_odd_p, "odd?", 1, 0, 0, scm_odd_p);
-SCM
-scm_odd_p (n)
- SCM n;
+SCM_DEFINE (scm_odd_p, "odd?", 1, 0, 0,
+ (SCM n),
+ "Return #t if N is an odd number, #f otherwise.")
+#define FUNC_NAME s_scm_odd_p
{
+ if (SCM_INUMP (n)) {
+ return SCM_BOOL ((4 & SCM_UNPACK (n)) != 0);
#ifdef SCM_BIGDIG
- if (SCM_NINUMP (n))
- {
- SCM_ASSERT (SCM_NIMP (n) && SCM_BIGP (n), n, SCM_ARG1, s_odd_p);
- return (1 & SCM_BDIGITS (n)[0]) ? SCM_BOOL_T : SCM_BOOL_F;
- }
-#else
- SCM_ASSERT (SCM_INUMP (n), n, SCM_ARG1, s_odd_p);
+ } else if (SCM_BIGP (n)) {
+ return SCM_BOOL ((1 & SCM_BDIGITS (n) [0]) != 0);
#endif
- return (4 & (int) n) ? SCM_BOOL_T : SCM_BOOL_F;
+ } else {
+ SCM_WRONG_TYPE_ARG (1, n);
+ }
}
+#undef FUNC_NAME
-SCM_PROC (s_even_p, "even?", 1, 0, 0, scm_even_p);
-SCM
-scm_even_p (n)
- SCM n;
+SCM_DEFINE (scm_even_p, "even?", 1, 0, 0,
+ (SCM n),
+ "Return #t if N is an even number, #f otherwise.")
+#define FUNC_NAME s_scm_even_p
{
+ if (SCM_INUMP (n)) {
+ return SCM_BOOL ((4 & SCM_UNPACK (n)) == 0);
#ifdef SCM_BIGDIG
- if (SCM_NINUMP (n))
- {
- SCM_ASSERT (SCM_NIMP (n) && SCM_BIGP (n), n, SCM_ARG1, s_even_p);
- return (1 & SCM_BDIGITS (n)[0]) ? SCM_BOOL_F : SCM_BOOL_T;
- }
-#else
- SCM_ASSERT (SCM_INUMP (n), n, SCM_ARG1, s_even_p);
+ } else if (SCM_BIGP (n)) {
+ return SCM_BOOL ((1 & SCM_BDIGITS (n) [0]) == 0);
#endif
- return (4 & (int) n) ? SCM_BOOL_F : SCM_BOOL_T;
+ } else {
+ SCM_WRONG_TYPE_ARG (1, n);
+ }
}
+#undef FUNC_NAME
+
-SCM_PROC (s_abs, "abs", 1, 0, 0, scm_abs);
+SCM_GPROC (s_abs, "abs", 1, 0, 0, scm_abs, g_abs);
SCM
-scm_abs (x)
- SCM x;
+scm_abs (SCM x)
{
+ if (SCM_INUMP (x)) {
+ long int xx = SCM_INUM (x);
+ if (xx >= 0) {
+ return x;
+ } else if (SCM_POSFIXABLE (-xx)) {
+ return SCM_MAKINUM (-xx);
+ } else {
#ifdef SCM_BIGDIG
- if (SCM_NINUMP (x))
- {
- SCM_ASSERT (SCM_NIMP (x) && SCM_BIGP (x), x, SCM_ARG1, s_abs);
- if (SCM_TYP16 (x) == scm_tc16_bigpos)
- return x;
- return scm_copybig (x, 0);
- }
+ return scm_long2big (-xx);
#else
- SCM_ASSERT (SCM_INUMP (x), x, SCM_ARG1, s_abs);
+ scm_num_overflow (s_abs);
#endif
- if (SCM_INUM (x) >= 0)
- return x;
- x = - SCM_INUM (x);
- if (!SCM_POSFIXABLE (x))
+ }
#ifdef SCM_BIGDIG
- return scm_long2big (x);
-#else
- scm_num_overflow (s_abs);
+ } else if (SCM_BIGP (x)) {
+ if (!SCM_BIGSIGN (x)) {
+ return x;
+ } else {
+ return scm_copybig (x, 0);
+ }
#endif
- return SCM_MAKINUM (x);
+ } else {
+ SCM_WTA_DISPATCH_1 (g_abs, x, 1, s_abs);
+ }
}
-SCM_PROC (s_quotient, "quotient", 2, 0, 0, scm_quotient);
+
+SCM_GPROC (s_quotient, "quotient", 2, 0, 0, scm_quotient, g_quotient);
SCM
-scm_quotient (x, y)
- SCM x;
- SCM y;
+scm_quotient (SCM x, SCM y)
{
- register long z;
-#ifdef SCM_BIGDIG
- if (SCM_NINUMP (x))
- {
- long w;
- SCM_ASSERT (SCM_NIMP (x) && SCM_BIGP (x), x, SCM_ARG1, s_quotient);
- if (SCM_NINUMP (y))
- {
- SCM_ASRTGO (SCM_NIMP (y) && SCM_BIGP (y), bady);
- return scm_divbigbig (SCM_BDIGITS (x), SCM_NUMDIGS (x),
- SCM_BDIGITS (y), SCM_NUMDIGS (y),
- SCM_BIGSIGN (x) ^ SCM_BIGSIGN (y), 2);
- }
- z = SCM_INUM (y);
- SCM_ASRTGO (z, ov);
- if (1 == z)
- return x;
- if (z < 0)
- z = -z;
- if (z < SCM_BIGRAD)
+ if (SCM_INUMP (x)) {
+ long xx = SCM_INUM (x);
+ if (SCM_INUMP (y)) {
+ long yy = SCM_INUM (y);
+ if (yy == 0) {
+ scm_num_overflow (s_quotient);
+ } else {
+ long z = xx / yy;
+#ifdef BADIVSGNS
{
- w = scm_copybig (x, SCM_BIGSIGN (x) ? (y > 0) : (y < 0));
- scm_divbigdig (SCM_BDIGITS (w), SCM_NUMDIGS (w), (SCM_BIGDIG) z);
- return scm_normbig (w);
- }
-#ifndef SCM_DIGSTOOBIG
- w = scm_pseudolong (z);
- return scm_divbigbig (SCM_BDIGITS (x), SCM_NUMDIGS (x),
- (SCM_BIGDIG *) & w, SCM_DIGSPERLONG,
- SCM_BIGSIGN (x) ? (y > 0) : (y < 0), 2);
+#if (__TURBOC__ == 1)
+ long t = ((yy < 0) ? -xx : xx) % yy;
#else
- {
- SCM_BIGDIG zdigs[SCM_DIGSPERLONG];
- scm_longdigs (z, zdigs);
- return scm_divbigbig (SCM_BDIGITS (x), SCM_NUMDIGS (x),
- zdigs, SCM_DIGSPERLONG,
- SCM_BIGSIGN (x) ? (y > 0) : (y < 0), 2);
- }
+ long t = xx % yy;
#endif
- }
- if (SCM_NINUMP (y))
- {
-#ifndef SCM_RECKLESS
- if (!(SCM_NIMP (y) && SCM_BIGP (y)))
- {
- bady:
- scm_wta (y, (char *) SCM_ARG2, s_quotient);
+ if ((t < 0) && (xx > 0))
+ z--;
+ else if ((t > 0) && (xx < 0))
+ z++;
}
#endif
+ if (SCM_FIXABLE (z)) {
+ return SCM_MAKINUM (z);
+ } else {
+#ifdef SCM_BIGDIG
+ return scm_long2big (z);
+#else
+ scm_num_overflow (s_quotient);
+#endif
+ }
+ }
+#ifdef SCM_BIGDIG
+ } else if (SCM_BIGP (y)) {
return SCM_INUM0;
+#endif
+ } else {
+ SCM_WTA_DISPATCH_2 (g_quotient, x, y, SCM_ARG2, s_quotient);
}
+#ifdef SCM_BIGDIG
+ } else if (SCM_BIGP (x)) {
+ if (SCM_INUMP (y)) {
+ long yy = SCM_INUM (y);
+ if (yy == 0) {
+ scm_num_overflow (s_quotient);
+ } else if (yy == 1) {
+ return x;
+ } else {
+ long z = yy < 0 ? -yy : yy;
+
+ if (z < SCM_BIGRAD) {
+ SCM sw = scm_copybig (x, SCM_BIGSIGN (x) ? (yy > 0) : (yy < 0));
+ scm_divbigdig (SCM_BDIGITS (sw), SCM_NUMDIGS (sw), (SCM_BIGDIG) z);
+ return scm_normbig (sw);
+ } else {
+#ifndef SCM_DIGSTOOBIG
+ long w = scm_pseudolong (z);
+ return scm_divbigbig (SCM_BDIGITS (x), SCM_NUMDIGS (x),
+ (SCM_BIGDIG *) & w, SCM_DIGSPERLONG,
+ SCM_BIGSIGN (x) ? (yy > 0) : (yy < 0), 2);
#else
- SCM_ASSERT (SCM_INUMP (x), x, SCM_ARG1, s_quotient);
- SCM_ASSERT (SCM_INUMP (y), y, SCM_ARG2, s_quotient);
+ SCM_BIGDIG zdigs[SCM_DIGSPERLONG];
+ scm_longdigs (z, zdigs);
+ return scm_divbigbig (SCM_BDIGITS (x), SCM_NUMDIGS (x),
+ zdigs, SCM_DIGSPERLONG,
+ SCM_BIGSIGN (x) ? (yy > 0) : (yy < 0), 2);
#endif
- if ((z = SCM_INUM (y)) == 0)
- {
- ov:
- scm_num_overflow (s_quotient);
+ }
+ }
+ } else if (SCM_BIGP (y)) {
+ return scm_divbigbig (SCM_BDIGITS (x), SCM_NUMDIGS (x),
+ SCM_BDIGITS (y), SCM_NUMDIGS (y),
+ SCM_BIGSIGN (x) ^ SCM_BIGSIGN (y), 2);
+ } else {
+ SCM_WTA_DISPATCH_2 (g_quotient, x, y, SCM_ARG2, s_quotient);
}
- z = SCM_INUM (x) / z;
-#ifdef BADIVSGNS
- {
-#if (__TURBOC__ == 1)
- long t = ((y < 0) ? -SCM_INUM (x) : SCM_INUM (x)) % SCM_INUM (y);
-#else
- long t = SCM_INUM (x) % SCM_INUM (y);
#endif
- if (t == 0);
- else if (t < 0)
- if (x < 0);
- else
- z--;
- else if (x < 0)
- z++;
+ } else {
+ SCM_WTA_DISPATCH_2 (g_quotient, x, y, SCM_ARG2, s_quotient);
}
-#endif
- if (!SCM_FIXABLE (z))
-#ifdef SCM_BIGDIG
- return scm_long2big (z);
-#else
- scm_num_overflow (s_quotient);
-#endif
- return SCM_MAKINUM (z);
}
-SCM_PROC (s_remainder, "remainder", 2, 0, 0, scm_remainder);
+
+SCM_GPROC (s_remainder, "remainder", 2, 0, 0, scm_remainder, g_remainder);
SCM
-scm_remainder (x, y)
- SCM x;
- SCM y;
+scm_remainder (SCM x, SCM y)
{
register long z;
#ifdef SCM_BIGDIG
if (SCM_NINUMP (x))
{
- SCM_ASSERT (SCM_NIMP (x) && SCM_BIGP (x), x, SCM_ARG1, s_remainder);
+ SCM_GASSERT2 (SCM_BIGP (x),
+ g_remainder, x, y, SCM_ARG1, s_remainder);
if (SCM_NINUMP (y))
{
- SCM_ASRTGO (SCM_NIMP (y) && SCM_BIGP (y), bady);
+ SCM_ASRTGO (SCM_BIGP (y), bady);
return scm_divbigbig (SCM_BDIGITS (x), SCM_NUMDIGS (x),
SCM_BDIGITS (y), SCM_NUMDIGS (y),
SCM_BIGSIGN (x), 0);
}
if (SCM_NINUMP (y))
{
-#ifndef SCM_RECKLESS
- if (!(SCM_NIMP (y) && SCM_BIGP (y)))
+ if (!SCM_BIGP (y))
{
bady:
- scm_wta (y, (char *) SCM_ARG2, s_remainder);
+ SCM_WTA_DISPATCH_2 (g_remainder, x, y, SCM_ARG2, s_remainder);
}
-#endif
return x;
}
#else
- SCM_ASSERT (SCM_INUMP (x), x, SCM_ARG1, s_remainder);
- SCM_ASSERT (SCM_INUMP (y), y, SCM_ARG2, s_remainder);
+ SCM_GASSERT2 (SCM_INUMP (x), g_remainder, x, y, SCM_ARG1, s_remainder);
+ SCM_GASSERT2 (SCM_INUMP (y), g_remainder, x, y, SCM_ARG2, s_remainder);
#endif
if (!(z = SCM_INUM (y)))
{
return SCM_MAKINUM (z);
}
-SCM_PROC (s_modulo, "modulo", 2, 0, 0, scm_modulo);
+SCM_GPROC (s_modulo, "modulo", 2, 0, 0, scm_modulo, g_modulo);
SCM
-scm_modulo (x, y)
- SCM x;
- SCM y;
+scm_modulo (SCM x, SCM y)
{
- register long yy, z;
-#ifdef SCM_BIGDIG
- if (SCM_NINUMP (x))
- {
- SCM_ASSERT (SCM_NIMP (x) && SCM_BIGP (x), x, SCM_ARG1, s_modulo);
- if (SCM_NINUMP (y))
- {
- SCM_ASRTGO (SCM_NIMP (y) && SCM_BIGP (y), bady);
- return scm_divbigbig (SCM_BDIGITS (x), SCM_NUMDIGS (x),
- SCM_BDIGITS (y), SCM_NUMDIGS (y),
- SCM_BIGSIGN (y),
- (SCM_BIGSIGN (x) ^ SCM_BIGSIGN (y)) ? 1 : 0);
- }
- if (!(z = SCM_INUM (y)))
- goto ov;
- return scm_divbigint (x, z, y < 0,
- (SCM_BIGSIGN (x) ? (y > 0) : (y < 0)) ? 1 : 0);
- }
- if (SCM_NINUMP (y))
- {
-#ifndef SCM_RECKLESS
- if (!(SCM_NIMP (y) && SCM_BIGP (y)))
- {
- bady:
- scm_wta (y, (char *) SCM_ARG2, s_modulo);
- }
+ if (SCM_INUMP (x)) {
+ long xx = SCM_INUM (x);
+ if (SCM_INUMP (y)) {
+ long yy = SCM_INUM (y);
+ if (yy == 0) {
+ scm_num_overflow (s_modulo);
+ } else {
+#if (__TURBOC__ == 1)
+ long z = ((yy < 0) ? -xx : xx) % yy;
+#else
+ long z = xx % yy;
#endif
- return (SCM_BIGSIGN (y) ? (x > 0) : (x < 0)) ? scm_sum (x, y) : x;
- }
+ return SCM_MAKINUM (((yy < 0) ? (z > 0) : (z < 0)) ? z + yy : z);
+ }
+ } else {
+#ifdef SCM_BIGDIG
+ if (!SCM_BIGP (y)) {
+ SCM_WTA_DISPATCH_2 (g_modulo, x, y, SCM_ARG2, s_modulo);
+ } else {
+ return (SCM_BIGSIGN (y) ? (xx > 0) : (xx < 0)) ? scm_sum (x, y) : x;
+ }
#else
- SCM_ASSERT (SCM_INUMP (x), x, SCM_ARG1, s_modulo);
- SCM_ASSERT (SCM_INUMP (y), y, SCM_ARG2, s_modulo);
+ SCM_WTA_DISPATCH_2 (g_modulo, x, y, SCM_ARG2, s_modulo);
#endif
- if (!(yy = SCM_INUM (y)))
- {
- ov:
- scm_num_overflow (s_modulo);
}
-#if (__TURBOC__==1)
- z = SCM_INUM (x);
- z = ((yy < 0) ? -z : z) % yy;
+ } else {
+#ifdef SCM_BIGDIG
+ SCM_GASSERT2 (SCM_BIGP (x), g_modulo, x, y, SCM_ARG1, s_modulo);
+ if (SCM_NINUMP (y)) {
+ if (!SCM_BIGP (y)) {
+ SCM_WTA_DISPATCH_2 (g_modulo, x, y, SCM_ARG2, s_modulo);
+ } else {
+ return scm_divbigbig (SCM_BDIGITS (x), SCM_NUMDIGS (x),
+ SCM_BDIGITS (y), SCM_NUMDIGS (y),
+ SCM_BIGSIGN (y),
+ (SCM_BIGSIGN (x) ^ SCM_BIGSIGN (y)) ? 1 : 0);
+ }
+ } else {
+ long yy = SCM_INUM (y);
+ if (yy == 0) {
+ scm_num_overflow (s_modulo);
+ } else {
+ return scm_divbigint (x, yy, yy < 0,
+ (SCM_BIGSIGN (x) ? (yy > 0) : (yy < 0)) ? 1 : 0);
+ }
+ }
#else
- z = SCM_INUM (x) % yy;
+ SCM_WTA_DISPATCH_2 (g_modulo, x, y, SCM_ARG2, s_modulo);
#endif
- return SCM_MAKINUM (((yy < 0) ? (z > 0) : (z < 0)) ? z + yy : z);
+ }
}
-SCM_PROC1 (s_gcd, "gcd", scm_tc7_asubr, scm_gcd);
+SCM_GPROC1 (s_gcd, "gcd", scm_tc7_asubr, scm_gcd, g_gcd);
SCM
-scm_gcd (x, y)
- SCM x;
- SCM y;
+scm_gcd (SCM x, SCM y)
{
- register long u, v, k, t;
+ long u, v, k, t;
if (SCM_UNBNDP (y))
return SCM_UNBNDP (x) ? SCM_INUM0 : x;
tailrec:
if (SCM_NINUMP (x))
{
big_gcd:
- SCM_ASSERT (SCM_NIMP (x) && SCM_BIGP (x), x, SCM_ARG1, s_gcd);
+ SCM_GASSERT2 (SCM_BIGP (x),
+ g_gcd, x, y, SCM_ARG1, s_gcd);
if (SCM_BIGSIGN (x))
x = scm_copybig (x, 0);
newy:
if (SCM_NINUMP (y))
{
- SCM_ASSERT (SCM_NIMP (y) && SCM_BIGP (y), y, SCM_ARG2, s_gcd);
+ SCM_GASSERT2 (SCM_BIGP (y),
+ g_gcd, x, y, SCM_ARGn, s_gcd);
if (SCM_BIGSIGN (y))
y = scm_copybig (y, 0);
switch (scm_bigcomp (x, y))
{
case -1:
swaprec:
- t = scm_remainder (x, y);
- x = y;
- y = t;
+ {
+ SCM t = scm_remainder (x, y);
+ x = y;
+ y = t;
+ }
goto tailrec;
case 0:
return x;
/* instead of the switch, we could just
return scm_gcd (y, scm_modulo (x, y)); */
}
- if (SCM_INUM0 == y)
+ if (SCM_EQ_P (y, SCM_INUM0))
return x;
goto swaprec;
}
if (SCM_NINUMP (y))
{
- t = x;
+ SCM t = x;
x = y;
y = t;
goto big_gcd;
}
#else
- SCM_ASSERT (SCM_INUMP (x), x, SCM_ARG1, s_gcd);
- SCM_ASSERT (SCM_INUMP (y), y, SCM_ARG2, s_gcd);
+ SCM_GASSERT2 (SCM_INUMP (x), g_gcd, x, y, SCM_ARG1, s_gcd);
+ SCM_GASSERT2 (SCM_INUMP (y), g_gcd, x, y, SCM_ARGn, s_gcd);
#endif
u = SCM_INUM (x);
if (u < 0)
return SCM_MAKINUM (u);
}
-SCM_PROC1 (s_lcm, "lcm", scm_tc7_asubr, scm_lcm);
+SCM_GPROC1 (s_lcm, "lcm", scm_tc7_asubr, scm_lcm, g_lcm);
SCM
-scm_lcm (n1, n2)
- SCM n1;
- SCM n2;
+scm_lcm (SCM n1, SCM n2)
{
SCM d;
+#ifndef SCM_BIGDIG
+ SCM_GASSERT2 (SCM_INUMP (n1) || SCM_UNBNDP (n1),
+ g_lcm, n1, n2, SCM_ARG1, s_lcm);
+ SCM_GASSERT2 (SCM_INUMP (n2) || SCM_UNBNDP (n2),
+ g_lcm, n1, n2, SCM_ARGn, s_lcm);
+#else
+ SCM_GASSERT2 (SCM_INUMP (n1)
+ || SCM_UNBNDP (n1)
+ || (SCM_BIGP (n1)),
+ g_lcm, n1, n2, SCM_ARG1, s_lcm);
+ SCM_GASSERT2 (SCM_INUMP (n2)
+ || SCM_UNBNDP (n2)
+ || (SCM_BIGP (n2)),
+ g_lcm, n1, n2, SCM_ARGn, s_lcm);
+#endif
if (SCM_UNBNDP (n2))
{
n2 = SCM_MAKINUM (1L);
if (SCM_UNBNDP (n1))
return n2;
}
+
d = scm_gcd (n1, n2);
- if (SCM_INUM0 == d)
+ if (SCM_EQ_P (d, SCM_INUM0))
return d;
return scm_abs (scm_product (n1, scm_quotient (n2, d)));
}
-#ifndef SCM_BIGDIG
-#ifndef SCM_FLOATS
-#define scm_long2num SCM_MAKINUM
-#endif
+#ifndef scm_long2num
+#define SCM_LOGOP_RETURN(x) scm_ulong2num(x)
+#else
+#define SCM_LOGOP_RETURN(x) SCM_MAKINUM(x)
#endif
-#ifndef scm_long2num
-SCM_PROC1 (s_logand, "logand", scm_tc7_asubr, scm_logand);
-SCM
-scm_logand (n1, n2)
- SCM n1;
- SCM n2;
+/* Emulating 2's complement bignums with sign magnitude arithmetic:
+
+ Logand:
+ X Y Result Method:
+ (len)
+ + + + x (map digit:logand X Y)
+ + - + x (map digit:logand X (lognot (+ -1 Y)))
+ - + + y (map digit:logand (lognot (+ -1 X)) Y)
+ - - - (+ 1 (map digit:logior (+ -1 X) (+ -1 Y)))
+
+ Logior:
+ X Y Result Method:
+
+ + + + (map digit:logior X Y)
+ + - - y (+ 1 (map digit:logand (lognot X) (+ -1 Y)))
+ - + - x (+ 1 (map digit:logand (+ -1 X) (lognot Y)))
+ - - - x (+ 1 (map digit:logand (+ -1 X) (+ -1 Y)))
+
+ Logxor:
+ X Y Result Method:
+
+ + + + (map digit:logxor X Y)
+ + - - (+ 1 (map digit:logxor X (+ -1 Y)))
+ - + - (+ 1 (map digit:logxor (+ -1 X) Y))
+ - - + (map digit:logxor (+ -1 X) (+ -1 Y))
+
+ Logtest:
+ X Y Result
+
+ + + (any digit:logand X Y)
+ + - (any digit:logand X (lognot (+ -1 Y)))
+ - + (any digit:logand (lognot (+ -1 X)) Y)
+ - - #t
+
+*/
+
+#ifdef SCM_BIGDIG
+
+SCM scm_copy_big_dec(SCM b, int sign);
+SCM scm_copy_smaller(SCM_BIGDIG *x, scm_sizet nx, int zsgn);
+SCM scm_big_ior(SCM_BIGDIG *x, scm_sizet nx, int xsgn, SCM bigy);
+SCM scm_big_xor(SCM_BIGDIG *x, scm_sizet nx, int xsgn, SCM bigy);
+SCM scm_big_and(SCM_BIGDIG *x, scm_sizet nx, int xsgn, SCM bigy, int zsgn);
+SCM scm_big_test(SCM_BIGDIG *x, scm_sizet nx, int xsgn, SCM bigy);
+
+SCM scm_copy_big_dec(SCM b, int sign)
{
- if (SCM_UNBNDP (n2))
- {
- if (SCM_UNBNDP (n1))
- return SCM_MAKINUM (-1);
- return n1;
- }
- return scm_ulong2num (scm_num2ulong (n1, (char *) SCM_ARG1, s_logand)
- & scm_num2ulong (n2, (char *) SCM_ARG2, s_logand));
+ long num = -1;
+ scm_sizet nx = SCM_NUMDIGS(b);
+ scm_sizet i = 0;
+ SCM ans = scm_mkbig(nx, sign);
+ SCM_BIGDIG *src = SCM_BDIGITS(b), *dst = SCM_BDIGITS(ans);
+ if SCM_BIGSIGN(b) do {
+ num += src[i];
+ if (num < 0) {dst[i] = num + SCM_BIGRAD; num = -1;}
+ else {dst[i] = SCM_BIGLO(num); num = 0;}
+ } while (++i < nx);
+ else
+ while (nx--) dst[nx] = src[nx];
+ return ans;
}
-SCM_PROC1 (s_logior, "logior", scm_tc7_asubr, scm_logior);
-
-SCM
-scm_logior (n1, n2)
- SCM n1;
- SCM n2;
+SCM scm_copy_smaller(SCM_BIGDIG *x, scm_sizet nx, int zsgn)
{
- if (SCM_UNBNDP (n2))
- {
- if (SCM_UNBNDP (n1))
- return SCM_INUM0;
- return n1;
- }
- return scm_ulong2num (scm_num2ulong (n1, (char *) SCM_ARG1, s_logior)
- | scm_num2ulong (n2, (char *) SCM_ARG2, s_logior));
+ long num = -1;
+ scm_sizet i = 0;
+ SCM z = scm_mkbig(nx, zsgn);
+ SCM_BIGDIG *zds = SCM_BDIGITS(z);
+ if (zsgn) do {
+ num += x[i];
+ if (num < 0) {zds[i] = num + SCM_BIGRAD; num = -1;}
+ else {zds[i] = SCM_BIGLO(num); num = 0;}
+ } while (++i < nx);
+ else do zds[i] = x[i]; while (++i < nx);
+ return z;
}
-SCM_PROC1 (s_logxor, "logxor", scm_tc7_asubr, scm_logxor);
+SCM scm_big_ior(SCM_BIGDIG *x, scm_sizet nx, int xsgn, SCM bigy)
+/* Assumes nx <= SCM_NUMDIGS(bigy) */
+/* Assumes xsgn equals either 0 or SCM_BIGSIGNFLAG */
+{
+ long num = -1;
+ scm_sizet i = 0, ny = SCM_NUMDIGS(bigy);
+ SCM z = scm_copy_big_dec (bigy, xsgn & SCM_BIGSIGN (bigy));
+ SCM_BIGDIG *zds = SCM_BDIGITS(z);
+ if (xsgn) {
+ do {
+ num += x[i];
+ if (num < 0) {zds[i] |= num + SCM_BIGRAD; num = -1;}
+ else {zds[i] |= SCM_BIGLO(num); num = 0;}
+ } while (++i < nx);
+ /* ========= Need to increment zds now =========== */
+ i = 0; num = 1;
+ while (i < ny) {
+ num += zds[i];
+ zds[i++] = SCM_BIGLO(num);
+ num = SCM_BIGDN(num);
+ if (!num) return z;
+ }
+ scm_adjbig(z, 1 + ny); /* OOPS, overflowed into next digit. */
+ SCM_BDIGITS(z)[ny] = 1;
+ return z;
+ }
+ else do zds[i] = zds[i] | x[i]; while (++i < nx);
+ return z;
+}
-SCM
-scm_logxor (n1, n2)
- SCM n1;
- SCM n2;
+SCM scm_big_xor(SCM_BIGDIG *x, scm_sizet nx, int xsgn, SCM bigy)
+/* Assumes nx <= SCM_NUMDIGS(bigy) */
+/* Assumes xsgn equals either 0 or SCM_BIGSIGNFLAG */
{
- if (SCM_UNBNDP (n2))
- {
- if (SCM_UNBNDP (n1))
- return SCM_INUM0;
- return n1;
+ long num = -1;
+ scm_sizet i = 0, ny = SCM_NUMDIGS(bigy);
+ SCM z = scm_copy_big_dec(bigy, xsgn ^ SCM_BIGSIGN(bigy));
+ SCM_BIGDIG *zds = SCM_BDIGITS(z);
+ if (xsgn) do {
+ num += x[i];
+ if (num < 0) {zds[i] ^= num + SCM_BIGRAD; num = -1;}
+ else {zds[i] ^= SCM_BIGLO(num); num = 0;}
+ } while (++i < nx);
+ else do {
+ zds[i] = zds[i] ^ x[i];
+ } while (++i < nx);
+
+ if (xsgn ^ SCM_BIGSIGN(bigy)) {
+ /* ========= Need to increment zds now =========== */
+ i = 0; num = 1;
+ while (i < ny) {
+ num += zds[i];
+ zds[i++] = SCM_BIGLO(num);
+ num = SCM_BIGDN(num);
+ if (!num) return scm_normbig(z);
}
- return scm_ulong2num (scm_num2ulong (n1, (char *) SCM_ARG1, s_logxor)
- ^ scm_num2ulong (n2, (char *) SCM_ARG2, s_logxor));
+ }
+ return scm_normbig(z);
}
-SCM_PROC (s_logtest, "logtest", 2, 0, 0, scm_logtest);
-
-SCM
-scm_logtest (n1, n2)
- SCM n1;
- SCM n2;
+SCM scm_big_and(SCM_BIGDIG *x, scm_sizet nx, int xsgn, SCM bigy, int zsgn)
+/* Assumes nx <= SCM_NUMDIGS(bigy) */
+/* Assumes xsgn equals either 0 or SCM_BIGSIGNFLAG */
+/* return sign equals either 0 or SCM_BIGSIGNFLAG */
{
- return ((scm_num2ulong (n1, (char *) SCM_ARG1, s_logtest)
- & scm_num2ulong (n2, (char *) SCM_ARG2, s_logtest))
- ? SCM_BOOL_T : SCM_BOOL_F);
+ long num = -1;
+ scm_sizet i = 0;
+ SCM z;
+ SCM_BIGDIG *zds;
+ if (xsgn==zsgn) {
+ z = scm_copy_smaller(x, nx, zsgn);
+ x = SCM_BDIGITS(bigy);
+ xsgn = SCM_BIGSIGN(bigy);
+ }
+ else z = scm_copy_big_dec(bigy, zsgn);
+ zds = SCM_BDIGITS(z);
+
+ if (zsgn) {
+ if (xsgn) do {
+ num += x[i];
+ if (num < 0) {zds[i] &= num + SCM_BIGRAD; num = -1;}
+ else {zds[i] &= SCM_BIGLO(num); num = 0;}
+ } while (++i < nx);
+ else do zds[i] = zds[i] & ~x[i]; while (++i < nx);
+ /* ========= need to increment zds now =========== */
+ i = 0; num = 1;
+ while (i < nx) {
+ num += zds[i];
+ zds[i++] = SCM_BIGLO(num);
+ num = SCM_BIGDN(num);
+ if (!num) return scm_normbig(z);
+ }
+ }
+ else if (xsgn) do {
+ num += x[i];
+ if (num < 0) {zds[i] &= num + SCM_BIGRAD; num = -1;}
+ else {zds[i] &= ~SCM_BIGLO(num); num = 0;}
+ } while (++i < nx);
+ else do zds[i] = zds[i] & x[i]; while (++i < nx);
+ return scm_normbig(z);
}
-
-SCM_PROC (s_logbit_p, "logbit?", 2, 0, 0, scm_logbit_p);
-
-SCM
-scm_logbit_p (n1, n2)
- SCM n1;
- SCM n2;
+SCM scm_big_test(SCM_BIGDIG *x, scm_sizet nx, int xsgn, SCM bigy)
+/* Assumes nx <= SCM_NUMDIGS(bigy) */
+/* Assumes xsgn equals either 0 or SCM_BIGSIGNFLAG */
{
- return (((1 << scm_num2long (n1, (char *) SCM_ARG1, s_logtest))
- & scm_num2ulong (n2, (char *) SCM_ARG2, s_logtest))
- ? SCM_BOOL_T : SCM_BOOL_F);
+ SCM_BIGDIG *y;
+ scm_sizet i = 0;
+ long num = -1;
+ if (SCM_BIGSIGN(bigy) & xsgn) return SCM_BOOL_T;
+ if (SCM_NUMDIGS(bigy) != nx && xsgn) return SCM_BOOL_T;
+ y = SCM_BDIGITS(bigy);
+ if (xsgn)
+ do {
+ num += x[i];
+ if (num < 0) {
+ if (y[i] & ~(num + SCM_BIGRAD)) return SCM_BOOL_T;
+ num = -1;
+ }
+ else {
+ if (y[i] & ~SCM_BIGLO(num)) return SCM_BOOL_T;
+ num = 0;
+ }
+ } while (++i < nx);
+ else if SCM_BIGSIGN(bigy)
+ do {
+ num += y[i];
+ if (num < 0) {
+ if (x[i] & ~(num + SCM_BIGRAD)) return SCM_BOOL_T;
+ num = -1;
+ }
+ else {
+ if (x[i] & ~SCM_BIGLO(num)) return SCM_BOOL_T;
+ num = 0;
+ }
+ } while (++i < nx);
+ else
+ do if (x[i] & y[i]) return SCM_BOOL_T;
+ while (++i < nx);
+ return SCM_BOOL_F;
}
-#else
-
-SCM_PROC1 (s_logand, "logand", scm_tc7_asubr, scm_logand);
+#endif
-SCM
-scm_logand (n1, n2)
- SCM n1;
- SCM n2;
+SCM_DEFINE1 (scm_logand, "logand", scm_tc7_asubr,
+ (SCM n1, SCM n2),
+ "Returns the integer which is the bit-wise AND of the two integer\n"
+ "arguments.\n\n"
+ "Example:\n"
+ "@lisp\n"
+ "(number->string (logand #b1100 #b1010) 2)\n"
+ " @result{} \"1000\"")
+#define FUNC_NAME s_scm_logand
{
if (SCM_UNBNDP (n2))
{
if (SCM_UNBNDP (n1))
return SCM_MAKINUM (-1);
+#ifndef SCM_RECKLESS
+ if (!(SCM_NUMBERP (n1)))
+ badx: SCM_WTA (SCM_ARG1, n1);
+#endif
return n1;
}
- return SCM_MAKINUM (SCM_INUM (n1) & SCM_INUM (n2));
+#ifdef SCM_BIGDIG
+ if SCM_NINUMP(n1) {
+ SCM t;
+ SCM_ASRTGO(SCM_NIMP(n1) && SCM_BIGP(n1), badx);
+ if SCM_INUMP(n2) {t = n1; n1 = n2; n2 = t; goto intbig;}
+ SCM_ASRTGO(SCM_NIMP(n2) && SCM_BIGP(n2), bady);
+ if (SCM_NUMDIGS(n1) > SCM_NUMDIGS(n2)) {t = n1; n1 = n2; n2 = t;}
+ if ((SCM_BIGSIGN(n1)) && SCM_BIGSIGN(n2))
+ return scm_big_ior (SCM_BDIGITS(n1),
+ SCM_NUMDIGS(n1),
+ SCM_BIGSIGNFLAG,
+ n2);
+ return scm_big_and (SCM_BDIGITS(n1),
+ SCM_NUMDIGS(n1),
+ SCM_BIGSIGN(n1),
+ n2,
+ 0);
+ }
+ if SCM_NINUMP(n2) {
+# ifndef SCM_RECKLESS
+ if (!(SCM_NIMP(n2) && SCM_BIGP(n2)))
+ bady: SCM_WTA (SCM_ARG2, n2);
+# endif
+ intbig: {
+# ifndef SCM_DIGSTOOBIG
+ long z = scm_pseudolong(SCM_INUM(n1));
+ if ((n1 < 0) && SCM_BIGSIGN(n2))
+ return scm_big_ior((SCM_BIGDIG *)&z, SCM_DIGSPERLONG, SCM_BIGSIGNFLAG, n2);
+ return scm_big_and((SCM_BIGDIG *)&z, SCM_DIGSPERLONG, (n1 < 0) ? SCM_BIGSIGNFLAG : 0, n2, 0);
+# else
+ SCM_BIGDIG zdigs[SCM_DIGSPERLONG];
+ scm_longdigs(SCM_INUM(n1), zdigs);
+ if ((n1 < 0) && SCM_BIGSIGN(n2))
+ return scm_big_ior(zdigs, SCM_DIGSPERLONG, SCM_BIGSIGNFLAG, n2);
+ return scm_big_and(zdigs, SCM_DIGSPERLONG, (n1 < 0) ? SCM_BIGSIGNFLAG : 0, n2, 0);
+# endif
+ }}
+#else
+ SCM_ASRTGO(SCM_INUMP(n1), badx);
+ SCM_ASSERT(SCM_INUMP(n2), n2, SCM_ARG2, FUNC_NAME);
+#endif
+ return SCM_MAKINUM(SCM_INUM(n1) & SCM_INUM(n2));
}
-
-SCM_PROC1 (s_logior, "logior", scm_tc7_asubr, scm_logior);
-
-SCM
-scm_logior (n1, n2)
- SCM n1;
- SCM n2;
+#undef FUNC_NAME
+
+SCM_DEFINE1 (scm_logior, "logior", scm_tc7_asubr,
+ (SCM n1, SCM n2),
+ "Returns the integer which is the bit-wise OR of the two integer\n"
+ "arguments.\n\n"
+ "Example:\n"
+ "@lisp\n"
+ "(number->string (logior #b1100 #b1010) 2)\n"
+ " @result{} \"1110\"\n"
+ "@end lisp")
+#define FUNC_NAME s_scm_logior
{
if (SCM_UNBNDP (n2))
{
if (SCM_UNBNDP (n1))
return SCM_INUM0;
+#ifndef SCM_RECKLESS
+ if (!(SCM_NUMBERP(n1)))
+ badx: SCM_WTA(SCM_ARG1, n1);
+#endif
return n1;
}
- return SCM_MAKINUM (SCM_INUM (n1) | SCM_INUM (n2));
+#ifdef SCM_BIGDIG
+ if SCM_NINUMP(n1) {
+ SCM t;
+ SCM_ASRTGO(SCM_NIMP(n1) && SCM_BIGP(n1), badx);
+ if SCM_INUMP(n2) {t = n1; n1 = n2; n2 = t; goto intbig;}
+ SCM_ASRTGO(SCM_NIMP(n2) && SCM_BIGP(n2), bady);
+ if (SCM_NUMDIGS(n1) > SCM_NUMDIGS(n2)) {t = n1; n1 = n2; n2 = t;}
+ if ((!SCM_BIGSIGN(n1)) && !SCM_BIGSIGN(n2))
+ return scm_big_ior(SCM_BDIGITS(n1), SCM_NUMDIGS(n1), SCM_BIGSIGN(n1), n2);
+ return scm_big_and(SCM_BDIGITS(n1), SCM_NUMDIGS(n1), SCM_BIGSIGN(n1), n2, SCM_BIGSIGNFLAG);
+ }
+ if SCM_NINUMP(n2) {
+# ifndef SCM_RECKLESS
+ if (!(SCM_NIMP(n2) && SCM_BIGP(n2)))
+ bady: SCM_WTA(SCM_ARG2, n2);
+# endif
+ intbig: {
+# ifndef SCM_DIGSTOOBIG
+ long z = scm_pseudolong(SCM_INUM(n1));
+ if ((!(n1 < 0)) && !SCM_BIGSIGN(n2))
+ return scm_big_ior((SCM_BIGDIG *)&z, SCM_DIGSPERLONG, (n1 < 0) ? SCM_BIGSIGNFLAG : 0, n2);
+ return scm_big_and((SCM_BIGDIG *)&z, SCM_DIGSPERLONG, (n1 < 0) ? SCM_BIGSIGNFLAG : 0, n2, SCM_BIGSIGNFLAG);
+# else
+ BIGDIG zdigs[DIGSPERLONG];
+ scm_longdigs(SCM_INUM(n1), zdigs);
+ if ((!(n1 < 0)) && !SCM_BIGSIGN(n2))
+ return scm_big_ior(zdigs, SCM_DIGSPERLONG, (n1 < 0) ? SCM_BIGSIGNFLAG : 0, n2);
+ return scm_big_and(zdigs, SCM_DIGSPERLONG, (n1 < 0) ? SCM_BIGSIGNFLAG : 0, n2, SCM_BIGSIGNFLAG);
+# endif
+ }}
+#else
+ SCM_ASRTGO(SCM_INUMP(n1), badx);
+ SCM_ASSERT(SCM_INUMP(n2), n2, SCM_ARG2, FUNC_NAME);
+#endif
+ return SCM_MAKINUM(SCM_INUM(n1) | SCM_INUM(n2));
}
-
-SCM_PROC1 (s_logxor, "logxor", scm_tc7_asubr, scm_logxor);
-
-SCM
-scm_logxor (n1, n2)
- SCM n1;
- SCM n2;
+#undef FUNC_NAME
+
+SCM_DEFINE1 (scm_logxor, "logxor", scm_tc7_asubr,
+ (SCM n1, SCM n2),
+ "Returns the integer which is the bit-wise XOR of the two integer\n"
+ "arguments.\n\n"
+ "Example:\n"
+ "@lisp\n"
+ "(number->string (logxor #b1100 #b1010) 2)\n"
+ " @result{} \"110\"\n"
+ "@end lisp")
+#define FUNC_NAME s_scm_logxor
{
if (SCM_UNBNDP (n2))
{
if (SCM_UNBNDP (n1))
return SCM_INUM0;
+#ifndef SCM_RECKLESS
+ if (!(SCM_NUMBERP(n1)))
+ badx: SCM_WTA(SCM_ARG1, n1);
+#endif
return n1;
}
- return SCM_MAKINUM (SCM_INUM (n1) ^ SCM_INUM (n2));
+#ifdef SCM_BIGDIG
+ if SCM_NINUMP(n1) {
+ SCM t;
+ SCM_ASRTGO(SCM_NIMP(n1) && SCM_BIGP(n1), badx);
+ if SCM_INUMP(n2)
+ {
+ t = n1;
+ n1 = n2;
+ n2 = t;
+ goto intbig;
+ }
+ SCM_ASRTGO(SCM_NIMP(n2) && SCM_BIGP(n2), bady);
+ if (SCM_NUMDIGS(n1) > SCM_NUMDIGS(n2))
+ {
+ t = n1;
+ n1 = n2;
+ n2 = t;
+ }
+ return scm_big_xor(SCM_BDIGITS(n1), SCM_NUMDIGS(n1), SCM_BIGSIGN(n1), n2);
+ }
+ if SCM_NINUMP(n2) {
+# ifndef SCM_RECKLESS
+ if (!(SCM_NIMP(n2) && SCM_BIGP(n2)))
+ bady: SCM_WTA (SCM_ARG2, n2);
+# endif
+ intbig:
+ {
+# ifndef SCM_DIGSTOOBIG
+ long z = scm_pseudolong(SCM_INUM(n1));
+ return scm_big_xor((SCM_BIGDIG *)&z, SCM_DIGSPERLONG, (n1 < 0) ? SCM_BIGSIGNFLAG : 0, n2);
+# else
+ SCM_BIGDIG zdigs[SCM_DIGSPERLONG];
+ scm_longdigs(SCM_INUM(n1), zdigs);
+ return scm_big_xor(zdigs, SCM_DIGSPERLONG, (n1 < 0) ? SCM_BIGSIGNFLAG : 0, n2);
+# endif
+ }
+ }
+#else
+ SCM_ASRTGO(INUMP(n1), badx);
+ SCM_ASSERT(INUMP(n2), n2, SCM_ARG2, FUNC_NAME);
+#endif
+ return SCM_MAKINUM(SCM_INUM(n1) ^ SCM_INUM(n2));
}
-
-SCM_PROC (s_logtest, "logtest", 2, 0, 0, scm_logtest);
-
-SCM
-scm_logtest (n1, n2)
- SCM n1;
- SCM n2;
+#undef FUNC_NAME
+
+SCM_DEFINE (scm_logtest, "logtest", 2, 0, 0,
+ (SCM n1, SCM n2),
+ "@example\n"
+ "(logtest j k) @equiv{} (not (zero? (logand j k)))\n\n"
+ "(logtest #b0100 #b1011) @result{} #f\n"
+ "(logtest #b0100 #b0111) @result{} #t\n"
+ "@end example")
+#define FUNC_NAME s_scm_logtest
{
- SCM_ASSERT (SCM_INUMP (n1), n1, SCM_ARG1, s_logtest);
- SCM_ASSERT (SCM_INUMP (n2), n2, SCM_ARG2, s_logtest);
- return (SCM_INUM (n1) & SCM_INUM (n2)) ? SCM_BOOL_T : SCM_BOOL_F;
+#ifndef SCM_RECKLESS
+ if (!(SCM_NUMBERP(n1)))
+ badx: SCM_WTA(SCM_ARG1, n1);
+#endif
+#ifdef SCM_BIGDIG
+ if SCM_NINUMP(n1) {
+ SCM t;
+ SCM_ASRTGO(SCM_NIMP(n1) && SCM_BIGP(n1), badx);
+ if SCM_INUMP(n2) {t = n1; n1 = n2; n2 = t; goto intbig;}
+ SCM_ASRTGO(SCM_NIMP(n2) && SCM_BIGP(n2), bady);
+ if (SCM_NUMDIGS(n1) > SCM_NUMDIGS(n2)) {t = n1; n1 = n2; n2 = t;}
+ return scm_big_test(SCM_BDIGITS(n1), SCM_NUMDIGS(n1), SCM_BIGSIGN(n1), n2);
+ }
+ if SCM_NINUMP(n2) {
+# ifndef SCM_RECKLESS
+ if (!(SCM_NIMP(n2) && SCM_BIGP(n2)))
+ bady: SCM_WTA(SCM_ARG2, n2);
+# endif
+ intbig: {
+# ifndef SCM_DIGSTOOBIG
+ long z = scm_pseudolong(SCM_INUM(n1));
+ return scm_big_test((SCM_BIGDIG *)&z, SCM_DIGSPERLONG, (n1 < 0) ? SCM_BIGSIGNFLAG : 0, n2);
+# else
+ SCM_BIGDIG zdigs[SCM_DIGSPERLONG];
+ scm_longdigs(SCM_INUM(n1), zdigs);
+ return scm_big_test(zdigs, SCM_DIGSPERLONG, (n1 < 0) ? SCM_BIGSIGNFLAG : 0, n2);
+# endif
+ }}
+#else
+ SCM_ASRTGO(SCM_INUMP(n1), badx);
+ SCM_ASSERT(SCM_INUMP(n2), n2, SCM_ARG2, FUNC_NAME);
+#endif
+ return (SCM_INUM(n1) & SCM_INUM(n2)) ? SCM_BOOL_T : SCM_BOOL_F;
}
-
-SCM_PROC (s_logbit_p, "logbit?", 2, 0, 0, scm_logbit_p);
-
-SCM
-scm_logbit_p (n1, n2)
- SCM n1;
- SCM n2;
+#undef FUNC_NAME
+
+
+SCM_DEFINE (scm_logbit_p, "logbit?", 2, 0, 0,
+ (SCM index, SCM j),
+ "@example\n"
+ "(logbit? index j) @equiv{} (logtest (integer-expt 2 index) j)\n\n"
+ "(logbit? 0 #b1101) @result{} #t\n"
+ "(logbit? 1 #b1101) @result{} #f\n"
+ "(logbit? 2 #b1101) @result{} #t\n"
+ "(logbit? 3 #b1101) @result{} #t\n"
+ "(logbit? 4 #b1101) @result{} #f\n"
+ "@end example")
+#define FUNC_NAME s_scm_logbit_p
{
- SCM_ASSERT (SCM_INUMP (n1) && SCM_INUM (n1) >= 0, n1, SCM_ARG1, s_logbit_p);
- SCM_ASSERT (SCM_INUMP (n2), n2, SCM_ARG2, s_logbit_p);
- return ((1 << SCM_INUM (n1)) & SCM_INUM (n2)) ? SCM_BOOL_T : SCM_BOOL_F;
-}
+ SCM_ASSERT(SCM_INUMP(index) && SCM_INUM(index) >= 0, index, SCM_ARG1, FUNC_NAME);
+#ifdef SCM_BIGDIG
+ if SCM_NINUMP(j) {
+ SCM_ASSERT(SCM_NIMP(j) && SCM_BIGP(j), j, SCM_ARG2, FUNC_NAME);
+ if (SCM_NUMDIGS(j) * SCM_BITSPERDIG < SCM_INUM(index)) return SCM_BOOL_F;
+ else if SCM_BIGSIGN(j) {
+ long num = -1;
+ scm_sizet i = 0;
+ SCM_BIGDIG *x = SCM_BDIGITS(j);
+ scm_sizet nx = SCM_INUM(index)/SCM_BITSPERDIG;
+ while (!0) {
+ num += x[i];
+ if (nx==i++)
+ return ((1L << (SCM_INUM(index)%SCM_BITSPERDIG)) & num) ? SCM_BOOL_F : SCM_BOOL_T;
+ if (num < 0) num = -1;
+ else num = 0;
+ }
+ }
+ else return (SCM_BDIGITS(j)[SCM_INUM(index)/SCM_BITSPERDIG] &
+ (1L << (SCM_INUM(index)%SCM_BITSPERDIG))) ? SCM_BOOL_T : SCM_BOOL_F;
+ }
+#else
+ SCM_ASSERT(SCM_INUMP(j), j, SCM_ARG2, FUNC_NAME);
#endif
-
-SCM_PROC (s_lognot, "lognot", 1, 0, 0, scm_lognot);
-
-SCM
-scm_lognot (n)
- SCM n;
+ return ((1L << SCM_INUM(index)) & SCM_INUM(j)) ? SCM_BOOL_T : SCM_BOOL_F;
+}
+#undef FUNC_NAME
+
+SCM_DEFINE (scm_lognot, "lognot", 1, 0, 0,
+ (SCM n),
+ "Returns the integer which is the 2s-complement of the integer argument.\n\n"
+ "Example:\n"
+ "@lisp\n"
+ "(number->string (lognot #b10000000) 2)\n"
+ " @result{} \"-10000001\"\n"
+ "(number->string (lognot #b0) 2)\n"
+ " @result{} \"-1\"\n"
+ "@end lisp\n"
+ "")
+#define FUNC_NAME s_scm_lognot
{
- SCM_ASSERT (SCM_INUMP (n), n, SCM_ARG1, s_lognot);
return scm_difference (SCM_MAKINUM (-1L), n);
}
-
-SCM_PROC (s_integer_expt, "integer-expt", 2, 0, 0, scm_integer_expt);
-
-SCM
-scm_integer_expt (z1, z2)
- SCM z1;
- SCM z2;
+#undef FUNC_NAME
+
+SCM_DEFINE (scm_integer_expt, "integer-expt", 2, 0, 0,
+ (SCM n, SCM k),
+ "Returns @var{n} raised to the non-negative integer exponent @var{k}.\n\n"
+ "Example:\n"
+ "@lisp\n"
+ "(integer-expt 2 5)\n"
+ " @result{} 32\n"
+ "(integer-expt -3 3)\n"
+ " @result{} -27\n"
+ "@end lisp")
+#define FUNC_NAME s_scm_integer_expt
{
SCM acc = SCM_MAKINUM (1L);
+ int i2;
#ifdef SCM_BIGDIG
- if (SCM_INUM0 == z1 || acc == z1)
- return z1;
- else if (SCM_MAKINUM (-1L) == z1)
- return SCM_BOOL_F == scm_even_p (z2) ? z1 : acc;
+ if (SCM_EQ_P (n, SCM_INUM0) || SCM_EQ_P (n, acc))
+ return n;
+ else if (SCM_EQ_P (n, SCM_MAKINUM (-1L)))
+ return SCM_FALSEP (scm_even_p (k)) ? n : acc;
#endif
- SCM_ASSERT (SCM_INUMP (z2), z2, SCM_ARG2, s_integer_expt);
- z2 = SCM_INUM (z2);
- if (z2 < 0)
+ SCM_VALIDATE_ULONG_COPY (2,k,i2);
+ if (i2 < 0)
{
- z2 = -z2;
- z1 = scm_divide (z1, SCM_UNDEFINED);
+ i2 = -i2;
+ n = scm_divide (n, SCM_UNDEFINED);
}
while (1)
{
- if (0 == z2)
+ if (0 == i2)
return acc;
- if (1 == z2)
- return scm_product (acc, z1);
- if (z2 & 1)
- acc = scm_product (acc, z1);
- z1 = scm_product (z1, z1);
- z2 >>= 1;
+ if (1 == i2)
+ return scm_product (acc, n);
+ if (i2 & 1)
+ acc = scm_product (acc, n);
+ n = scm_product (n, n);
+ i2 >>= 1;
}
}
+#undef FUNC_NAME
+
+SCM_DEFINE (scm_ash, "ash", 2, 0, 0,
+ (SCM n, SCM cnt),
+ "The function ash performs an arithmetic shift left by CNT bits\n"
+ "(or shift right, if CNT is negative). 'Arithmetic' means, that\n"
+ "the function does not guarantee to keep the bit structure of N,\n"
+ "but rather guarantees that the result will always be rounded\n"
+ "towards minus infinity. Therefore, the results of ash and a\n"
+ "corresponding bitwise shift will differ if N is negative.\n\n"
+ "Formally, the function returns an integer equivalent to\n"
+ "@code{(inexact->exact (floor (* N (expt 2 CNT))))}.@refill\n\n"
+ "Example:\n"
+ "@lisp\n"
+ "(number->string (ash #b1 3) 2)\n"
+ " @result{} \"1000\""
+ "(number->string (ash #b1010 -1) 2)"
+ " @result{} \"101\""
+ "@end lisp")
+#define FUNC_NAME s_scm_ash
+{
+ long bits_to_shift;
-SCM_PROC (s_ash, "ash", 2, 0, 0, scm_ash);
+#ifndef SCM_BIGDIG
+ SCM_VALIDATE_INUM (1, n)
+#endif
+ SCM_VALIDATE_INUM (2, cnt);
-SCM
-scm_ash (n, cnt)
- SCM n;
- SCM cnt;
-{
- SCM res = SCM_INUM (n);
- SCM_ASSERT (SCM_INUMP (cnt), cnt, SCM_ARG2, s_ash);
+ bits_to_shift = SCM_INUM (cnt);
#ifdef SCM_BIGDIG
- if (cnt < 0)
- {
- res = scm_integer_expt (SCM_MAKINUM (2), SCM_MAKINUM (-SCM_INUM (cnt)));
- if (SCM_NFALSEP (scm_negative_p (n)))
- return scm_sum (SCM_MAKINUM (-1L),
- scm_quotient (scm_sum (SCM_MAKINUM (1L), n), res));
- else
- return scm_quotient (n, res);
- }
- else
+ if (bits_to_shift < 0) {
+ /* Shift right by abs(cnt) bits. This is realized as a division by
+ div:=2^abs(cnt). However, to guarantee the floor rounding, negative
+ values require some special treatment.
+ */
+ SCM div = scm_integer_expt (SCM_MAKINUM (2), SCM_MAKINUM (-bits_to_shift));
+ if (SCM_FALSEP (scm_negative_p (n)))
+ return scm_quotient (n, div);
+ else
+ return scm_sum (SCM_MAKINUM (-1L),
+ scm_quotient (scm_sum (SCM_MAKINUM (1L), n), div));
+ } else
+ /* Shift left is done by multiplication with 2^CNT */
return scm_product (n, scm_integer_expt (SCM_MAKINUM (2), cnt));
#else
- SCM_ASSERT (SCM_INUMP (n), n, SCM_ARG1, s_ash);
- cnt = SCM_INUM (cnt);
- if (cnt < 0)
- return SCM_MAKINUM (SCM_SRS (res, -cnt));
- res = SCM_MAKINUM (res << cnt);
- if (SCM_INUM (res) >> cnt != SCM_INUM (n))
- scm_num_overflow (s_ash);
- return res;
+ if (bits_to_shift < 0)
+ /* Signed right shift (SCM_SRS does it right) by abs(cnt) bits. */
+ return SCM_MAKINUM (SCM_SRS (SCM_INUM (n), -bits_to_shift));
+ else {
+ /* Shift left, but make sure not to leave the range of inums */
+ SCM res = SCM_MAKINUM (SCM_INUM (n) << cnt);
+ if (SCM_INUM (res) >> cnt != SCM_INUM (n))
+ scm_num_overflow (FUNC_NAME);
+ return res;
+ }
#endif
}
-
-SCM_PROC (s_bit_extract, "bit-extract", 3, 0, 0, scm_bit_extract);
-
-SCM
-scm_bit_extract (n, start, end)
- SCM n;
- SCM start;
- SCM end;
+#undef FUNC_NAME
+
+/* GJB:FIXME: do not use SCMs as integers! */
+SCM_DEFINE (scm_bit_extract, "bit-extract", 3, 0, 0,
+ (SCM n, SCM start, SCM end),
+ "Returns the integer composed of the @var{start} (inclusive) through\n"
+ "@var{end} (exclusive) bits of @var{n}. The @var{start}th bit becomes\n"
+ "the 0-th bit in the result.@refill\n\n"
+ "Example:\n"
+ "@lisp\n"
+ "(number->string (bit-extract #b1101101010 0 4) 2)\n"
+ " @result{} \"1010\"\n"
+ "(number->string (bit-extract #b1101101010 4 9) 2)\n"
+ " @result{} \"10110\"\n"
+ "@end lisp")
+#define FUNC_NAME s_scm_bit_extract
{
- SCM_ASSERT (SCM_INUMP (start), start, SCM_ARG2, s_bit_extract);
- SCM_ASSERT (SCM_INUMP (end), end, SCM_ARG3, s_bit_extract);
- start = SCM_INUM (start);
- end = SCM_INUM (end);
- SCM_ASSERT (end >= start, SCM_MAKINUM (end), SCM_OUTOFRANGE, s_bit_extract);
+ int istart, iend;
+ SCM_VALIDATE_INUM (1,n);
+ SCM_VALIDATE_INUM_MIN_COPY (2,start,0,istart);
+ SCM_VALIDATE_INUM_MIN_COPY (3, end, 0, iend);
+ SCM_ASSERT_RANGE (3, end, (iend >= istart));
#ifdef SCM_BIGDIG
if (SCM_NINUMP (n))
return
scm_logand (scm_difference (scm_integer_expt (SCM_MAKINUM (2),
- SCM_MAKINUM (end - start)),
+ SCM_MAKINUM (iend - istart)),
SCM_MAKINUM (1L)),
- scm_ash (n, SCM_MAKINUM (-start)));
+ scm_ash (n, SCM_MAKINUM (-istart)));
#else
- SCM_ASSERT (SCM_INUMP (n), n, SCM_ARG1, s_bit_extract);
+ SCM_VALIDATE_INUM (1,n);
#endif
- return SCM_MAKINUM ((SCM_INUM (n) >> start) & ((1L << (end - start)) - 1));
+ return SCM_MAKINUM ((SCM_INUM (n) >> istart) & ((1L << (iend - istart)) - 1));
}
+#undef FUNC_NAME
static const char scm_logtab[] = {
0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4
};
-SCM_PROC (s_logcount, "logcount", 1, 0, 0, scm_logcount);
-SCM
-scm_logcount (n)
- SCM n;
+SCM_DEFINE (scm_logcount, "logcount", 1, 0, 0,
+ (SCM n),
+ "Returns the number of bits in integer @var{n}. If integer is positive,\n"
+ "the 1-bits in its binary representation are counted. If negative, the\n"
+ "0-bits in its two's-complement binary representation are counted. If 0,\n"
+ "0 is returned.\n\n"
+ "Example:\n"
+ "@lisp\n"
+ "(logcount #b10101010)\n"
+ " @result{} 4\n"
+ "(logcount 0)\n"
+ " @result{} 0\n"
+ "(logcount -2)\n"
+ " @result{} 1\n"
+ "@end lisp")
+#define FUNC_NAME s_scm_logcount
{
register unsigned long c = 0;
register long nn;
{
scm_sizet i;
SCM_BIGDIG *ds, d;
- SCM_ASSERT (SCM_NIMP (n) && SCM_BIGP (n), n, SCM_ARG1, s_logcount);
+ SCM_VALIDATE_BIGINT (1,n);
if (SCM_BIGSIGN (n))
return scm_logcount (scm_difference (SCM_MAKINUM (-1L), n));
ds = SCM_BDIGITS (n);
return SCM_MAKINUM (c);
}
#else
- SCM_ASSERT (SCM_INUMP (n), n, SCM_ARG1, s_logcount);
+ SCM_VALIDATE_INUM (1,n);
#endif
if ((nn = SCM_INUM (n)) < 0)
nn = -1 - nn;
c += scm_logtab[15 & nn];
return SCM_MAKINUM (c);
}
+#undef FUNC_NAME
+
static const char scm_ilentab[] = {
0, 1, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4
};
-SCM_PROC (s_integer_length, "integer-length", 1, 0, 0, scm_integer_length);
-SCM
-scm_integer_length (n)
- SCM n;
+SCM_DEFINE (scm_integer_length, "integer-length", 1, 0, 0,
+ (SCM n),
+ "Returns the number of bits neccessary to represent @var{n}.\n\n"
+ "Example:\n"
+ "@lisp\n"
+ "(integer-length #b10101010)\n"
+ " @result{} 8\n"
+ "(integer-length 0)\n"
+ " @result{} 0\n"
+ "(integer-length #b1111)\n"
+ " @result{} 4\n"
+ "@end lisp")
+#define FUNC_NAME s_scm_integer_length
{
register unsigned long c = 0;
register long nn;
if (SCM_NINUMP (n))
{
SCM_BIGDIG *ds, d;
- SCM_ASSERT (SCM_NIMP (n) && SCM_BIGP (n), n, SCM_ARG1, s_integer_length);
+ SCM_VALIDATE_BIGINT (1,n);
if (SCM_BIGSIGN (n))
return scm_integer_length (scm_difference (SCM_MAKINUM (-1L), n));
ds = SCM_BDIGITS (n);
return SCM_MAKINUM (c - 4 + l);
}
#else
- SCM_ASSERT (SCM_INUMP (n), n, SCM_ARG1, s_integer_length);
+ SCM_VALIDATE_INUM (1,n);
#endif
if ((nn = SCM_INUM (n)) < 0)
nn = -1 - nn;
}
return SCM_MAKINUM (c - 4 + l);
}
+#undef FUNC_NAME
#ifdef SCM_BIGDIG
static const char s_bignum[] = "bignum";
SCM
-scm_mkbig (nlen, sign)
- scm_sizet nlen;
- int sign;
+scm_mkbig (scm_sizet nlen, int sign)
{
- SCM v = nlen;
- /* Cast to SCM to avoid signed/unsigned comparison warnings. */
- if (((v << 16) >> 16) != (SCM) nlen)
+ SCM v;
+ /* Cast to long int to avoid signed/unsigned comparison warnings. */
+ if ((( ((long int) nlen) << SCM_BIGSIZEFIELD) >> SCM_BIGSIZEFIELD)
+ != (long int) nlen)
scm_wta (SCM_MAKINUM (nlen), (char *) SCM_NALLOC, s_bignum);
+
SCM_NEWCELL (v);
SCM_DEFER_INTS;
SCM_SETCHARS (v, scm_must_malloc ((long) (nlen * sizeof (SCM_BIGDIG)),
s_bignum));
- SCM_SETNUMDIGS (v, nlen, sign ? scm_tc16_bigneg : scm_tc16_bigpos);
+ SCM_SETNUMDIGS (v, nlen, sign);
SCM_ALLOW_INTS;
return v;
}
SCM
-scm_big2inum (b, l)
- SCM b;
- scm_sizet l;
+scm_big2inum (SCM b, scm_sizet l)
{
unsigned long num = 0;
SCM_BIGDIG *tmp = SCM_BDIGITS (b);
while (l--)
num = SCM_BIGUP (num) + tmp[l];
- if (SCM_TYP16 (b) == scm_tc16_bigpos)
+ if (!SCM_BIGSIGN (b))
{
if (SCM_POSFIXABLE (num))
return SCM_MAKINUM (num);
static const char s_adjbig[] = "scm_adjbig";
SCM
-scm_adjbig (b, nlen)
- SCM b;
- scm_sizet nlen;
+scm_adjbig (SCM b, scm_sizet nlen)
{
scm_sizet nsiz = nlen;
- if (((nsiz << 16) >> 16) != nlen)
+ if (((nsiz << SCM_BIGSIZEFIELD) >> SCM_BIGSIZEFIELD) != nlen)
scm_wta (scm_ulong2num (nsiz), (char *) SCM_NALLOC, s_adjbig);
SCM_DEFER_INTS;
= ((SCM_BIGDIG *)
scm_must_realloc ((char *) SCM_CHARS (b),
(long) (SCM_NUMDIGS (b) * sizeof (SCM_BIGDIG)),
- (long) (nsiz * sizeof (SCM_BIGDIG)), s_adjbig));
+ (long) (nsiz * sizeof (SCM_BIGDIG)), s_bignum));
SCM_SETCHARS (b, digits);
- SCM_SETNUMDIGS (b, nsiz, SCM_TYP16 (b));
+ SCM_SETNUMDIGS (b, nsiz, SCM_BIGSIGN (b));
}
SCM_ALLOW_INTS;
return b;
SCM
-scm_normbig (b)
- SCM b;
+scm_normbig (SCM b)
{
#ifndef _UNICOS
scm_sizet nlen = SCM_NUMDIGS (b);
SCM
-scm_copybig (b, sign)
- SCM b;
- int sign;
+scm_copybig (SCM b, int sign)
{
scm_sizet i = SCM_NUMDIGS (b);
SCM ans = scm_mkbig (i, sign);
SCM
-scm_long2big (n)
- long n;
+scm_long2big (long n)
{
scm_sizet i = 0;
SCM_BIGDIG *digits;
return ans;
}
-#ifdef LONGLONGS
+#ifdef HAVE_LONG_LONGS
SCM
-scm_long_long2big (n)
- long_long n;
+scm_long_long2big (long_long n)
{
scm_sizet i;
SCM_BIGDIG *digits;
SCM
-scm_2ulong2big (np)
- unsigned long *np;
+scm_2ulong2big (unsigned long *np)
{
unsigned long n;
scm_sizet i;
SCM
-scm_ulong2big (n)
- unsigned long n;
+scm_ulong2big (unsigned long n)
{
scm_sizet i = 0;
SCM_BIGDIG *digits;
int
-scm_bigcomp (x, y)
- SCM x;
- SCM y;
+scm_bigcomp (SCM x, SCM y)
{
int xsign = SCM_BIGSIGN (x);
int ysign = SCM_BIGSIGN (y);
long
-scm_pseudolong (x)
- long x;
+scm_pseudolong (long x)
{
union
{
void
-scm_longdigs (x, digs)
- long x;
- SCM_BIGDIG digs[];
+scm_longdigs (long x, SCM_BIGDIG digs[])
{
scm_sizet i = 0;
if (x < 0)
SCM
-scm_addbig (x, nx, xsgn, bigy, sgny)
- SCM_BIGDIG *x;
- scm_sizet nx;
- int xsgn;
- SCM bigy;
- int sgny;
+scm_addbig (SCM_BIGDIG *x, scm_sizet nx, int xsgn, SCM bigy, int sgny)
{
/* Assumes nx <= SCM_NUMDIGS(bigy) */
- /* Assumes xsgn and sgny scm_equal either 0 or 0x0100 */
+ /* Assumes xsgn and sgny scm_equal either 0 or SCM_BIGSIGNFLAG */
long num = 0;
scm_sizet i = 0, ny = SCM_NUMDIGS (bigy);
SCM z = scm_copybig (bigy, SCM_BIGSIGN (bigy) ^ sgny);
{
num = 1;
i = 0;
- SCM_SETCAR (z, SCM_CAR (z) ^ 0x0100);
+ SCM_SET_CELL_WORD_0 (z, SCM_CELL_WORD_0 (z) ^ SCM_BIGSIGNFLAG);
do
{
num += (SCM_BIGRAD - 1) - zds[i];
SCM
-scm_mulbig (x, nx, y, ny, sgn)
- SCM_BIGDIG *x;
- scm_sizet nx;
- SCM_BIGDIG *y;
- scm_sizet ny;
- int sgn;
+scm_mulbig (SCM_BIGDIG *x, scm_sizet nx, SCM_BIGDIG *y, scm_sizet ny, int sgn)
{
scm_sizet i = 0, j = nx + ny;
unsigned long n = 0;
SCM
-scm_divbigint (x, z, sgn, mode)
- SCM x;
- long z;
- int sgn;
- int mode;
+scm_divbigint (SCM x, long z, int sgn, int mode)
{
if (z < 0)
z = -z;
SCM
-scm_divbigbig (x, nx, y, ny, sgn, modes)
- SCM_BIGDIG *x;
- scm_sizet nx;
- SCM_BIGDIG *y;
- scm_sizet ny;
- int sgn;
- int modes;
+scm_divbigbig (SCM_BIGDIG *x, scm_sizet nx, SCM_BIGDIG *y, scm_sizet ny, int sgn, int modes)
{
/* modes description
0 remainder
/*** NUMBERS -> STRINGS ***/
-#ifdef SCM_FLOATS
int scm_dblprec;
static const double fx[] =
{ 0.0, 5e-1, 5e-2, 5e-3, 5e-4, 5e-5,
-static scm_sizet idbl2str SCM_P ((double f, char *a));
-
static scm_sizet
-idbl2str (f, a)
- double f;
- char *a;
+idbl2str (double f, char *a)
{
int efmt, dpt, d, i, wp = scm_dblprec;
scm_sizet ch = 0;
}
-static scm_sizet iflo2str SCM_P ((SCM flt, char *str));
-
static scm_sizet
-iflo2str (flt, str)
- SCM flt;
- char *str;
+iflo2str (SCM flt, char *str)
{
scm_sizet i;
-#ifdef SCM_SINGLES
- if (SCM_SINGP (flt))
- i = idbl2str (SCM_FLO (flt), str);
+ if (SCM_SLOPPY_REALP (flt))
+ i = idbl2str (SCM_REAL_VALUE (flt), str);
else
-#endif
- i = idbl2str (SCM_REAL (flt), str);
- if (SCM_CPLXP (flt))
{
- if (0 <= SCM_IMAG (flt)) /* jeh */
- str[i++] = '+'; /* jeh */
- i += idbl2str (SCM_IMAG (flt), &str[i]);
- str[i++] = 'i';
+ i = idbl2str (SCM_COMPLEX_REAL (flt), str);
+ if (SCM_COMPLEX_IMAG (flt) != 0.0)
+ {
+ if (0 <= SCM_COMPLEX_IMAG (flt))
+ str[i++] = '+';
+ i += idbl2str (SCM_COMPLEX_IMAG (flt), &str[i]);
+ str[i++] = 'i';
+ }
}
return i;
}
-#endif /* SCM_FLOATS */
-
+/* convert a long to a string (unterminated). returns the number of
+ characters in the result.
+ rad is output base
+ p is destination: worst case (base 2) is SCM_INTBUFLEN */
scm_sizet
-scm_iint2str (num, rad, p)
- long num;
- int rad;
- char *p;
+scm_iint2str (long num, int rad, char *p)
{
- scm_sizet j;
- register int i = 1, d;
- register long n = num;
- if (n < 0)
- {
- n = -n;
- i++;
- }
+ scm_sizet j = 1;
+ scm_sizet i;
+ unsigned long n = (num < 0) ? -num : num;
+
for (n /= rad; n > 0; n /= rad)
- i++;
- j = i;
- n = num;
- if (n < 0)
+ j++;
+
+ i = j;
+ if (num < 0)
{
- n = -n;
*p++ = '-';
- i--;
+ j++;
+ n = -num;
}
+ else
+ n = num;
while (i--)
{
- d = n % rad;
+ int d = n % rad;
+
n /= rad;
p[i] = d + ((d < 10) ? '0' : 'a' - 10);
}
#ifdef SCM_BIGDIG
-static SCM big2str SCM_P ((SCM b, register unsigned int radix));
-
static SCM
-big2str (b, radix)
- SCM b;
- register unsigned int radix;
+big2str (SCM b, unsigned int radix)
{
SCM t = scm_copybig (b, 0); /* sign of temp doesn't matter */
register SCM_BIGDIG *ds = SCM_BDIGITS (t);
radpow *= radix;
radct++;
}
- s[0] = scm_tc16_bigneg == SCM_TYP16 (b) ? '-' : '+';
+ s[0] = SCM_BIGSIGN (b) ? '-' : '+';
while ((i || radmod) && j)
{
if (k == 0)
for (i = j; j < SCM_LENGTH (ss); j++)
s[ch + j - i] = s[j]; /* jeh */
scm_vector_set_length_x (ss, /* jeh */
- (SCM) SCM_MAKINUM (ch + SCM_LENGTH (ss) - i));
+ SCM_MAKINUM (ch + SCM_LENGTH (ss) - i));
}
return scm_return_first (ss, t);
#endif
-SCM_PROC (s_number_to_string, "number->string", 1, 1, 0, scm_number_to_string);
-
-SCM
-scm_number_to_string (x, radix)
- SCM x;
- SCM radix;
+SCM_DEFINE (scm_number_to_string, "number->string", 1, 1, 0,
+ (SCM x, SCM radix),
+ "")
+#define FUNC_NAME s_scm_number_to_string
{
- if (SCM_UNBNDP (radix))
- radix = SCM_MAKINUM (10L);
- else
- SCM_ASSERT (SCM_INUMP (radix), radix, SCM_ARG2, s_number_to_string);
-#ifdef SCM_FLOATS
+ int base;
+ SCM_VALIDATE_INUM_MIN_DEF_COPY (2,radix,2,10,base);
if (SCM_NINUMP (x))
{
char num_buf[SCM_FLOBUFLEN];
#ifdef SCM_BIGDIG
SCM_ASRTGO (SCM_NIMP (x), badx);
if (SCM_BIGP (x))
- return big2str (x, (unsigned int) SCM_INUM (radix));
+ return big2str (x, (unsigned int) base);
#ifndef SCM_RECKLESS
- if (!(SCM_INEXP (x)))
+ if (!SCM_SLOPPY_INEXACTP (x))
{
badx:
- scm_wta (x, (char *) SCM_ARG1, s_number_to_string);
+ SCM_WTA (1, x);
}
#endif
#else
- SCM_ASSERT (SCM_NIMP (x) && SCM_INEXP (x),
+ SCM_ASSERT (SCM_SLOPPY_INEXACTP (x),
x, SCM_ARG1, s_number_to_string);
#endif
return scm_makfromstr (num_buf, iflo2str (x, num_buf), 0);
}
-#else
-#ifdef SCM_BIGDIG
- if (SCM_NINUMP (x))
- {
- SCM_ASSERT (SCM_NIMP (x) && SCM_BIGP (x),
- x, SCM_ARG1, s_number_to_string);
- return big2str (x, (unsigned int) SCM_INUM (radix));
- }
-#else
- SCM_ASSERT (SCM_INUMP (x), x, SCM_ARG1, s_number_to_string);
-#endif
-#endif
{
char num_buf[SCM_INTBUFLEN];
return scm_makfromstr (num_buf,
scm_iint2str (SCM_INUM (x),
- (int) SCM_INUM (radix),
+ base,
num_buf),
0);
}
}
+#undef FUNC_NAME
/* These print routines are stubbed here so that scm_repl.c doesn't need
- SCM_FLOATS or SCM_BIGDIGs conditionals */
+ SCM_BIGDIG conditionals */
int
-scm_floprint (sexp, port, pstate)
- SCM sexp;
- SCM port;
- scm_print_state *pstate;
+scm_print_real (SCM sexp, SCM port, scm_print_state *pstate)
{
-#ifdef SCM_FLOATS
char num_buf[SCM_FLOBUFLEN];
scm_lfwrite (num_buf, iflo2str (sexp, num_buf), port);
-#else
- scm_ipruk ("float", sexp, port);
-#endif
return !0;
}
-
+int
+scm_print_complex (SCM sexp, SCM port, scm_print_state *pstate)
+{
+ char num_buf[SCM_FLOBUFLEN];
+ scm_lfwrite (num_buf, iflo2str (sexp, num_buf), port);
+ return !0;
+}
int
-scm_bigprint (exp, port, pstate)
- SCM exp;
- SCM port;
- scm_print_state *pstate;
+scm_bigprint (SCM exp, SCM port, scm_print_state *pstate)
{
#ifdef SCM_BIGDIG
exp = big2str (exp, (unsigned int) 10);
/*** STRINGS -> NUMBERS ***/
-static SCM scm_small_istr2int SCM_P ((char *str, long len, long radix));
-
static SCM
-scm_small_istr2int (str, len, radix)
- char *str;
- long len;
- long radix;
+scm_small_istr2int (char *str, long len, long radix)
{
register long n = 0, ln;
register int c;
SCM
-scm_istr2int (str, len, radix)
- char *str;
- long len;
- long radix;
+scm_istr2int (char *str, long len, long radix)
{
scm_sizet j;
register scm_sizet k, blen = 1;
return scm_adjbig (res, blen);
}
-#ifdef SCM_FLOATS
-
SCM
-scm_istr2flo (str, len, radix)
- char *str;
- long len;
- long radix;
+scm_istr2flo (char *str, long len, long radix)
{
register int c, i = 0;
double lead_sgn;
{
case DIGITS:
expon = expon * 10 + c - '0';
- if (expon > MAXEXP)
+ if (expon > SCM_MAXEXP)
return SCM_BOOL_F; /* exponent too large */
break;
default:
{ /* polar input for complex number */
/* get a `real' for scm_angle */
second = scm_istr2flo (&str[i], (long) (len - i), radix);
- if (!(SCM_INEXP (second)))
+ if (!SCM_SLOPPY_INEXACTP (second))
return SCM_BOOL_F; /* not `real' */
- if (SCM_CPLXP (second))
+ if (SCM_SLOPPY_COMPLEXP (second))
return SCM_BOOL_F; /* not `real' */
tmp = SCM_REALPART (second);
return scm_makdbl (res * cos (tmp), res * sin (tmp));
return scm_makdbl (res, lead_sgn);
/* get a `ureal' for complex part */
second = scm_istr2flo (&str[i], (long) ((len - i) - 1), radix);
- if (!(SCM_INEXP (second)))
+ if (!SCM_INEXACTP (second))
return SCM_BOOL_F; /* not `ureal' */
- if (SCM_CPLXP (second))
+ if (SCM_SLOPPY_COMPLEXP (second))
return SCM_BOOL_F; /* not `ureal' */
tmp = SCM_REALPART (second);
if (tmp < 0.0)
return SCM_BOOL_F; /* not `ureal' */
return scm_makdbl (res, (lead_sgn * tmp));
}
-#endif /* SCM_FLOATS */
SCM
-scm_istring2number (str, len, radix)
- char *str;
- long len;
- long radix;
+scm_istring2number (char *str, long len, long radix)
{
int i = 0;
char ex = 0;
res = scm_istr2int (&str[i], len - i, radix);
if (SCM_NFALSEP (res))
return res;
-#ifdef SCM_FLOATS
case 2:
return scm_istr2flo (&str[i], len - i, radix);
-#endif
}
return SCM_BOOL_F;
}
-SCM_PROC (s_string_to_number, "string->number", 1, 1, 0, scm_string_to_number);
-
-SCM
-scm_string_to_number (str, radix)
- SCM str;
- SCM radix;
+SCM_DEFINE (scm_string_to_number, "string->number", 1, 1, 0,
+ (SCM str, SCM radix),
+ "")
+#define FUNC_NAME s_scm_string_to_number
{
SCM answer;
- if (SCM_UNBNDP (radix))
- radix = SCM_MAKINUM (10L);
- else
- SCM_ASSERT (SCM_INUMP (radix), radix, SCM_ARG2, s_string_to_number);
- SCM_ASSERT (SCM_NIMP (str) && SCM_ROSTRINGP (str),
- str, SCM_ARG1, s_string_to_number);
+ int base;
+ SCM_VALIDATE_ROSTRING (1,str);
+ SCM_VALIDATE_INUM_MIN_DEF_COPY (2,radix,2,10,base);
answer = scm_istring2number (SCM_ROCHARS (str),
SCM_ROLENGTH (str),
- SCM_INUM (radix));
+ base);
return scm_return_first (answer, str);
}
+#undef FUNC_NAME
/*** END strs->nums ***/
-#ifdef SCM_FLOATS
-
SCM
-scm_makdbl (x, y)
- double x;
- double y;
+scm_make_real (double x)
{
SCM z;
- if ((y == 0.0) && (x == 0.0))
- return scm_flo0;
- SCM_NEWCELL (z);
- SCM_DEFER_INTS;
- if (y == 0.0)
- {
-#ifdef SCM_SINGLES
- float fx = x;
-#ifndef SCM_SINGLESONLY
- if ((-FLTMAX < x) && (x < FLTMAX) && (fx == x))
-#endif
- {
- SCM_SETCAR (z, scm_tc_flo);
- SCM_FLO (z) = x;
- SCM_ALLOW_INTS;
- return z;
- }
-#endif /* def SCM_SINGLES */
- SCM_SETCDR (z, (SCM) scm_must_malloc (1L * sizeof (double), "real"));
- SCM_SETCAR (z, scm_tc_dblr);
- }
- else
- {
- SCM_SETCDR (z, (SCM) scm_must_malloc (2L * sizeof (double), "complex"));
- SCM_SETCAR (z, scm_tc_dblc);
- SCM_IMAG (z) = y;
- }
- SCM_REAL (z) = x;
- SCM_ALLOW_INTS;
+ SCM_NEWREAL (z, x);
return z;
}
-#endif
-
+SCM
+scm_make_complex (double x, double y)
+{
+ SCM z;
+ SCM_NEWCOMPLEX (z, x, y);
+ return z;
+}
SCM
-scm_bigequal (x, y)
- SCM x;
- SCM y;
+scm_bigequal (SCM x, SCM y)
{
#ifdef SCM_BIGDIG
if (0 == scm_bigcomp (x, y))
return SCM_BOOL_F;
}
-
-
SCM
-scm_floequal (x, y)
- SCM x;
- SCM y;
+scm_real_equalp (SCM x, SCM y)
{
-#ifdef SCM_FLOATS
- if (SCM_REALPART (x) != SCM_REALPART (y))
- return SCM_BOOL_F;
- if (!(SCM_CPLXP (x) && (SCM_IMAG (x) != SCM_IMAG (y))))
- return SCM_BOOL_T;
-#endif
- return SCM_BOOL_F;
+ return SCM_BOOL (SCM_REAL_VALUE (x) == SCM_REAL_VALUE (y));
}
+SCM
+scm_complex_equalp (SCM x, SCM y)
+{
+ return SCM_BOOL (SCM_COMPLEX_REAL (x) == SCM_COMPLEX_REAL (y)
+ && SCM_COMPLEX_IMAG (x) == SCM_COMPLEX_IMAG (y));
+}
-SCM_PROC (s_number_p, "number?", 1, 0, 0, scm_number_p);
-SCM_PROC (s_complex_p, "complex?", 1, 0, 0, scm_number_p);
+SCM_REGISTER_PROC (s_number_p, "number?", 1, 0, 0, scm_number_p);
-SCM
-scm_number_p (x)
- SCM x;
+SCM_DEFINE (scm_number_p, "complex?", 1, 0, 0,
+ (SCM x),
+ "")
+#define FUNC_NAME s_scm_number_p
{
if (SCM_INUMP (x))
return SCM_BOOL_T;
-#ifdef SCM_FLOATS
- if (SCM_NIMP (x) && SCM_NUMP (x))
+ if (SCM_NUMP (x))
return SCM_BOOL_T;
-#else
-#ifdef SCM_BIGDIG
- if (SCM_NIMP (x) && SCM_NUMP (x))
- return SCM_BOOL_T;
-#endif
-#endif
return SCM_BOOL_F;
}
+#undef FUNC_NAME
-#ifdef SCM_FLOATS
-SCM_PROC (s_real_p, "real?", 1, 0, 0, scm_real_p);
-SCM_PROC (s_rational_p, "rational?", 1, 0, 0, scm_real_p);
+SCM_REGISTER_PROC (s_real_p, "real?", 1, 0, 0, scm_real_p);
-SCM
-scm_real_p (x)
- SCM x;
+
+SCM_DEFINE (scm_real_p, "rational?", 1, 0, 0,
+ (SCM x),
+ "")
+#define FUNC_NAME s_scm_real_p
{
if (SCM_INUMP (x))
return SCM_BOOL_T;
if (SCM_IMP (x))
return SCM_BOOL_F;
- if (SCM_REALP (x))
+ if (SCM_SLOPPY_REALP (x))
return SCM_BOOL_T;
#ifdef SCM_BIGDIG
if (SCM_BIGP (x))
#endif
return SCM_BOOL_F;
}
+#undef FUNC_NAME
-SCM_PROC (s_int_p, "integer?", 1, 0, 0, scm_integer_p);
-
-SCM
-scm_integer_p (x)
- SCM x;
+SCM_DEFINE (scm_integer_p, "integer?", 1, 0, 0,
+ (SCM x),
+ "")
+#define FUNC_NAME s_scm_integer_p
{
double r;
if (SCM_INUMP (x))
if (SCM_BIGP (x))
return SCM_BOOL_T;
#endif
- if (!SCM_INEXP (x))
+ if (!SCM_SLOPPY_INEXACTP (x))
return SCM_BOOL_F;
- if (SCM_CPLXP (x))
+ if (SCM_SLOPPY_COMPLEXP (x))
return SCM_BOOL_F;
r = SCM_REALPART (x);
if (r == floor (r))
return SCM_BOOL_T;
return SCM_BOOL_F;
}
+#undef FUNC_NAME
-#endif /* SCM_FLOATS */
-
-SCM_PROC (s_inexact_p, "inexact?", 1, 0, 0, scm_inexact_p);
-
-SCM
-scm_inexact_p (x)
- SCM x;
+SCM_DEFINE (scm_inexact_p, "inexact?", 1, 0, 0,
+ (SCM x),
+ "")
+#define FUNC_NAME s_scm_inexact_p
{
-#ifdef SCM_FLOATS
- if (SCM_NIMP (x) && SCM_INEXP (x))
+ if (SCM_INEXACTP (x))
return SCM_BOOL_T;
-#endif
return SCM_BOOL_F;
}
+#undef FUNC_NAME
-SCM_PROC1 (s_eq_p, "=", scm_tc7_rpsubr, scm_num_eq_p);
+SCM_GPROC1 (s_eq_p, "=", scm_tc7_rpsubr, scm_num_eq_p, g_eq_p);
SCM
-scm_num_eq_p (x, y)
- SCM x;
- SCM y;
+scm_num_eq_p (SCM x, SCM y)
{
-#ifdef SCM_FLOATS
SCM t;
if (SCM_NINUMP (x))
{
#ifdef SCM_BIGDIG
-#ifndef SCM_RECKLESS
- if (!(SCM_NIMP (x)))
+ if (!SCM_NIMP (x))
{
badx:
- scm_wta (x, (char *) SCM_ARG1, s_eq_p);
+ SCM_WTA_DISPATCH_2 (g_eq_p, x, y, SCM_ARG1, s_eq_p);
}
-#endif
if (SCM_BIGP (x))
{
if (SCM_INUMP (y))
return SCM_BOOL_F;
SCM_ASRTGO (SCM_NIMP (y), bady);
if (SCM_BIGP (y))
- return (0 == scm_bigcomp (x, y)) ? SCM_BOOL_T : SCM_BOOL_F;
- SCM_ASRTGO (SCM_INEXP (y), bady);
+ return SCM_BOOL(0 == scm_bigcomp (x, y));
+ SCM_ASRTGO (SCM_SLOPPY_INEXACTP (y), bady);
bigreal:
- return ((SCM_REALP (y) && (scm_big2dbl (x) == SCM_REALPART (y)))
+ return ((SCM_SLOPPY_REALP (y) && (scm_big2dbl (x) == SCM_REALPART (y)))
? SCM_BOOL_T
: SCM_BOOL_F);
}
- SCM_ASRTGO (SCM_INEXP (x), badx);
+ SCM_ASRTGO (SCM_SLOPPY_INEXACTP (x), badx);
#else
- SCM_ASSERT (SCM_NIMP (x) && SCM_INEXP (x), x, SCM_ARG1, s_eq_p);
+ SCM_GASSERT2 (SCM_SLOPPY_INEXACTP (x),
+ g_eq_p, x, y, SCM_ARG1, s_eq_p);
#endif
if (SCM_INUMP (y))
{
y = t;
goto bigreal;
}
- SCM_ASRTGO (SCM_INEXP (y), bady);
+ SCM_ASRTGO (SCM_SLOPPY_INEXACTP (y), bady);
#else
- SCM_ASRTGO (SCM_NIMP (y) && SCM_INEXP (y), bady);
+ SCM_ASRTGO (SCM_SLOPPY_INEXACTP (y), bady);
#endif
- if (SCM_REALPART (x) != SCM_REALPART (y))
- return SCM_BOOL_F;
- if (SCM_CPLXP (x))
- return ((SCM_CPLXP (y) && (SCM_IMAG (x) == SCM_IMAG (y)))
- ? SCM_BOOL_T
- : SCM_BOOL_F);
- return SCM_CPLXP (y) ? SCM_BOOL_F : SCM_BOOL_T;
+ if (SCM_SLOPPY_REALP (x))
+ {
+ if (SCM_SLOPPY_REALP (y))
+ return SCM_BOOL (SCM_REAL_VALUE (x) == SCM_REAL_VALUE (y));
+ else
+ return SCM_BOOL (SCM_REAL_VALUE (x) == SCM_COMPLEX_REAL (y)
+ && 0.0 == SCM_COMPLEX_IMAG (y));
+ }
+ else
+ {
+ if (SCM_SLOPPY_REALP (y))
+ return SCM_BOOL (SCM_COMPLEX_REAL (x) == SCM_REAL_VALUE (y)
+ && SCM_COMPLEX_IMAG (x) == 0.0);
+ else
+ return SCM_BOOL (SCM_COMPLEX_REAL (x) == SCM_COMPLEX_REAL (y)
+ && SCM_COMPLEX_IMAG (x) == SCM_COMPLEX_IMAG (y));
+ }
}
if (SCM_NINUMP (y))
{
SCM_ASRTGO (SCM_NIMP (y), bady);
if (SCM_BIGP (y))
return SCM_BOOL_F;
-#ifndef SCM_RECKLESS
- if (!(SCM_INEXP (y)))
+ if (!SCM_SLOPPY_INEXACTP (y))
{
bady:
- scm_wta (y, (char *) SCM_ARG2, s_eq_p);
+ SCM_WTA_DISPATCH_2 (g_eq_p, x, y, SCM_ARGn, s_eq_p);
}
-#endif
#else
-#ifndef SCM_RECKLESS
- if (!(SCM_NIMP (y) && SCM_INEXP (y)))
+ if (!SCM_SLOPPY_INEXACTP (y))
{
bady:
- scm_wta (y, (char *) SCM_ARG2, s_eq_p);
+ SCM_WTA_DISPATCH_2 (g_eq_p, x, y, SCM_ARGn, s_eq_p);
}
-#endif
#endif
realint:
- return ((SCM_REALP (y) && (((double) SCM_INUM (x)) == SCM_REALPART (y)))
- ? SCM_BOOL_T
- : SCM_BOOL_F);
- }
-#else
-#ifdef SCM_BIGDIG
- if (SCM_NINUMP (x))
- {
- SCM_ASSERT (SCM_NIMP (x) && SCM_BIGP (x), x, SCM_ARG1, s_eq_p);
- if (SCM_INUMP (y))
- return SCM_BOOL_F;
- SCM_ASRTGO (SCM_NIMP (y) && SCM_BIGP (y), bady);
- return (0 == scm_bigcomp (x, y)) ? SCM_BOOL_T : SCM_BOOL_F;
- }
- if (SCM_NINUMP (y))
- {
-#ifndef SCM_RECKLESS
- if (!(SCM_NIMP (y) && SCM_BIGP (y)))
- {
- bady:
- scm_wta (y, (char *) SCM_ARG2, s_eq_p);
- }
-#endif
- return SCM_BOOL_F;
+ if (SCM_SLOPPY_REALP (y))
+ return SCM_BOOL ((double) SCM_INUM (x) == SCM_REAL_VALUE (y));
+ else
+ return SCM_BOOL ((double) SCM_INUM (x) == SCM_COMPLEX_REAL (y)
+ && 0.0 == SCM_COMPLEX_IMAG (y));
}
-#else
- SCM_ASSERT (SCM_INUMP (x), x, SCM_ARG1, s_eq_p);
- SCM_ASSERT (SCM_INUMP (y), y, SCM_ARG2, s_eq_p);
-#endif
-#endif
- return ((long) x == (long) y) ? SCM_BOOL_T : SCM_BOOL_F;
+ return SCM_BOOL((long) x == (long) y);
}
-SCM_PROC1 (s_less_p, "<", scm_tc7_rpsubr, scm_less_p);
+SCM_GPROC1 (s_less_p, "<", scm_tc7_rpsubr, scm_less_p, g_less_p);
SCM
-scm_less_p (x, y)
- SCM x;
- SCM y;
+scm_less_p (SCM x, SCM y)
{
-#ifdef SCM_FLOATS
if (SCM_NINUMP (x))
{
#ifdef SCM_BIGDIG
-#ifndef SCM_RECKLESS
- if (!(SCM_NIMP (x)))
+ if (!SCM_NIMP (x))
{
badx:
- scm_wta (x, (char *) SCM_ARG1, s_less_p);
+ SCM_WTA_DISPATCH_2 (g_less_p, x, y, SCM_ARG1, s_less_p);
}
-#endif
if (SCM_BIGP (x))
{
if (SCM_INUMP (y))
- return SCM_BIGSIGN (x) ? SCM_BOOL_T : SCM_BOOL_F;
+ return SCM_BOOL(SCM_BIGSIGN (x));
SCM_ASRTGO (SCM_NIMP (y), bady);
if (SCM_BIGP (y))
- return (1 == scm_bigcomp (x, y)) ? SCM_BOOL_T : SCM_BOOL_F;
- SCM_ASRTGO (SCM_REALP (y), bady);
+ return SCM_BOOL(1 == scm_bigcomp (x, y));
+ SCM_ASRTGO (SCM_SLOPPY_REALP (y), bady);
return ((scm_big2dbl (x) < SCM_REALPART (y))
? SCM_BOOL_T
: SCM_BOOL_F);
}
- SCM_ASRTGO (SCM_REALP (x), badx);
+ SCM_ASRTGO (SCM_SLOPPY_REALP (x), badx);
#else
- SCM_ASSERT (SCM_NIMP (x) && SCM_REALP (x), x, SCM_ARG1, s_less_p);
+ SCM_GASSERT2 (SCM_SLOPPY_REALP (x),
+ g_less_p, x, y, SCM_ARG1, s_less_p);
#endif
if (SCM_INUMP (y))
return ((SCM_REALPART (x) < ((double) SCM_INUM (y)))
#ifdef SCM_BIGDIG
SCM_ASRTGO (SCM_NIMP (y), bady);
if (SCM_BIGP (y))
- return (SCM_REALPART (x) < scm_big2dbl (y)) ? SCM_BOOL_T : SCM_BOOL_F;
- SCM_ASRTGO (SCM_REALP (y), bady);
+ return SCM_BOOL(SCM_REALPART (x) < scm_big2dbl (y));
+ SCM_ASRTGO (SCM_SLOPPY_REALP (y), bady);
#else
- SCM_ASRTGO (SCM_NIMP (y) && SCM_REALP (y), bady);
+ SCM_ASRTGO (SCM_SLOPPY_REALP (y), bady);
#endif
- return (SCM_REALPART (x) < SCM_REALPART (y)) ? SCM_BOOL_T : SCM_BOOL_F;
+ return SCM_BOOL(SCM_REALPART (x) < SCM_REALPART (y));
}
if (SCM_NINUMP (y))
{
#ifdef SCM_BIGDIG
SCM_ASRTGO (SCM_NIMP (y), bady);
if (SCM_BIGP (y))
- return SCM_BIGSIGN (y) ? SCM_BOOL_F : SCM_BOOL_T;
-#ifndef SCM_RECKLESS
- if (!(SCM_REALP (y)))
+ return SCM_NEGATE_BOOL(SCM_BIGSIGN (y));
+ if (!SCM_SLOPPY_REALP (y))
{
bady:
- scm_wta (y, (char *) SCM_ARG2, s_less_p);
+ SCM_WTA_DISPATCH_2 (g_less_p, x, y, SCM_ARGn, s_less_p);
}
-#endif
#else
-#ifndef SCM_RECKLESS
- if (!(SCM_NIMP (y) && SCM_REALP (y)))
+ if (!SCM_SLOPPY_REALP (y))
{
bady:
- scm_wta (y, (char *) SCM_ARG2, s_less_p);
+ SCM_WTA_DISPATCH_2 (g_less_p, x, y, SCM_ARGn, s_less_p);
}
-#endif
#endif
return ((((double) SCM_INUM (x)) < SCM_REALPART (y))
? SCM_BOOL_T
: SCM_BOOL_F);
}
-#else
-#ifdef SCM_BIGDIG
- if (SCM_NINUMP (x))
- {
- SCM_ASSERT (SCM_NIMP (x) && SCM_BIGP (x), x, SCM_ARG1, s_less_p);
- if (SCM_INUMP (y))
- return SCM_BIGSIGN (x) ? SCM_BOOL_T : SCM_BOOL_F;
- SCM_ASRTGO (SCM_NIMP (y) && SCM_BIGP (y), bady);
- return (1 == scm_bigcomp (x, y)) ? SCM_BOOL_T : SCM_BOOL_F;
- }
- if (SCM_NINUMP (y))
- {
-#ifndef SCM_RECKLESS
- if (!(SCM_NIMP (y) && SCM_BIGP (y)))
- {
- bady:
- scm_wta (y, (char *) SCM_ARG2, s_less_p);
- }
-#endif
- return SCM_BIGSIGN (y) ? SCM_BOOL_F : SCM_BOOL_T;
- }
-#else
- SCM_ASSERT (SCM_INUMP (x), x, SCM_ARG1, s_less_p);
- SCM_ASSERT (SCM_INUMP (y), y, SCM_ARG2, s_less_p);
-#endif
-#endif
- return ((long) x < (long) y) ? SCM_BOOL_T : SCM_BOOL_F;
+ return SCM_BOOL((long) x < (long) y);
}
-SCM_PROC1 (s_gr_p, ">", scm_tc7_rpsubr, scm_gr_p);
-
-SCM
-scm_gr_p (x, y)
- SCM x;
- SCM y;
+SCM_DEFINE1 (scm_gr_p, ">", scm_tc7_rpsubr,
+ (SCM x, SCM y),
+ "")
+#define FUNC_NAME s_scm_gr_p
{
return scm_less_p (y, x);
}
+#undef FUNC_NAME
-SCM_PROC1 (s_leq_p, "<=", scm_tc7_rpsubr, scm_leq_p);
-
-SCM
-scm_leq_p (x, y)
- SCM x;
- SCM y;
+SCM_DEFINE1 (scm_leq_p, "<=", scm_tc7_rpsubr,
+ (SCM x, SCM y),
+ "")
+#define FUNC_NAME s_scm_leq_p
{
return SCM_BOOL_NOT (scm_less_p (y, x));
}
+#undef FUNC_NAME
-SCM_PROC1 (s_geq_p, ">=", scm_tc7_rpsubr, scm_geq_p);
-
-SCM
-scm_geq_p (x, y)
- SCM x;
- SCM y;
+SCM_DEFINE1 (scm_geq_p, ">=", scm_tc7_rpsubr,
+ (SCM x, SCM y),
+ "")
+#define FUNC_NAME s_scm_geq_p
{
return SCM_BOOL_NOT (scm_less_p (x, y));
}
+#undef FUNC_NAME
-SCM_PROC (s_zero_p, "zero?", 1, 0, 0, scm_zero_p);
+SCM_GPROC (s_zero_p, "zero?", 1, 0, 0, scm_zero_p, g_zero_p);
SCM
-scm_zero_p (z)
- SCM z;
+scm_zero_p (SCM z)
{
-#ifdef SCM_FLOATS
if (SCM_NINUMP (z))
{
#ifdef SCM_BIGDIG
SCM_ASRTGO (SCM_NIMP (z), badz);
if (SCM_BIGP (z))
return SCM_BOOL_F;
-#ifndef SCM_RECKLESS
- if (!(SCM_INEXP (z)))
+ if (!SCM_SLOPPY_INEXACTP (z))
{
badz:
- scm_wta (z, (char *) SCM_ARG1, s_zero_p);
+ SCM_WTA_DISPATCH_1 (g_zero_p, z, SCM_ARG1, s_zero_p);
}
-#endif
#else
- SCM_ASSERT (SCM_NIMP (z) && SCM_INEXP (z), z, SCM_ARG1, s_zero_p);
+ SCM_GASSERT1 (SCM_SLOPPY_INEXACTP (z),
+ g_zero_p, z, SCM_ARG1, s_zero_p);
#endif
- return (z == scm_flo0) ? SCM_BOOL_T : SCM_BOOL_F;
- }
-#else
-#ifdef SCM_BIGDIG
- if (SCM_NINUMP (z))
- {
- SCM_ASSERT (SCM_NIMP (z) && SCM_BIGP (z), z, SCM_ARG1, s_zero_p);
- return SCM_BOOL_F;
+ if (SCM_SLOPPY_REALP (z))
+ return SCM_BOOL (SCM_REAL_VALUE (z) == 0.0);
+ else
+ return SCM_BOOL (SCM_COMPLEX_REAL (z) == 0.0
+ && SCM_COMPLEX_IMAG (z) == 0.0);
}
-#else
- SCM_ASSERT (SCM_INUMP (z), z, SCM_ARG1, s_zero_p);
-#endif
-#endif
- return (z == SCM_INUM0) ? SCM_BOOL_T : SCM_BOOL_F;
+ return SCM_BOOL (SCM_EQ_P (z, SCM_INUM0));
}
-SCM_PROC (s_positive_p, "positive?", 1, 0, 0, scm_positive_p);
+SCM_GPROC (s_positive_p, "positive?", 1, 0, 0, scm_positive_p, g_positive_p);
SCM
-scm_positive_p (x)
- SCM x;
+scm_positive_p (SCM x)
{
-#ifdef SCM_FLOATS
if (SCM_NINUMP (x))
{
#ifdef SCM_BIGDIG
SCM_ASRTGO (SCM_NIMP (x), badx);
if (SCM_BIGP (x))
- return SCM_TYP16 (x) == scm_tc16_bigpos ? SCM_BOOL_T : SCM_BOOL_F;
-#ifndef SCM_RECKLESS
- if (!(SCM_REALP (x)))
+ return SCM_BOOL (!SCM_BIGSIGN (x));
+ if (!SCM_SLOPPY_REALP (x))
{
badx:
- scm_wta (x, (char *) SCM_ARG1, s_positive_p);
+ SCM_WTA_DISPATCH_1 (g_positive_p, x, SCM_ARG1, s_positive_p);
}
-#endif
#else
- SCM_ASSERT (SCM_NIMP (x) && SCM_REALP (x), x, SCM_ARG1, s_positive_p);
+ SCM_GASSERT1 (SCM_SLOPPY_REALP (x),
+ g_positive_p, x, SCM_ARG1, s_positive_p);
#endif
- return (SCM_REALPART (x) > 0.0) ? SCM_BOOL_T : SCM_BOOL_F;
- }
-#else
-#ifdef SCM_BIGDIG
- if (SCM_NINUMP (x))
- {
- SCM_ASSERT (SCM_NIMP (x) && SCM_BIGP (x), x, SCM_ARG1, s_positive_p);
- return SCM_TYP16 (x) == scm_tc16_bigpos ? SCM_BOOL_T : SCM_BOOL_F;
+ return SCM_BOOL(SCM_REALPART (x) > 0.0);
}
-#else
- SCM_ASSERT (SCM_INUMP (x), x, SCM_ARG1, s_positive_p);
-#endif
-#endif
- return (x > SCM_INUM0) ? SCM_BOOL_T : SCM_BOOL_F;
+ return SCM_BOOL(SCM_INUM(x) > 0);
}
-SCM_PROC (s_negative_p, "negative?", 1, 0, 0, scm_negative_p);
+SCM_GPROC (s_negative_p, "negative?", 1, 0, 0, scm_negative_p, g_negative_p);
SCM
-scm_negative_p (x)
- SCM x;
+scm_negative_p (SCM x)
{
-#ifdef SCM_FLOATS
if (SCM_NINUMP (x))
{
#ifdef SCM_BIGDIG
SCM_ASRTGO (SCM_NIMP (x), badx);
if (SCM_BIGP (x))
- return SCM_TYP16 (x) == scm_tc16_bigpos ? SCM_BOOL_F : SCM_BOOL_T;
-#ifndef SCM_RECKLESS
- if (!(SCM_REALP (x)))
+ return SCM_BOOL (SCM_BIGSIGN (x));
+ if (!(SCM_SLOPPY_REALP (x)))
{
badx:
- scm_wta (x, (char *) SCM_ARG1, s_negative_p);
+ SCM_WTA_DISPATCH_1 (g_negative_p, x, SCM_ARG1, s_negative_p);
}
-#endif
#else
- SCM_ASSERT (SCM_NIMP (x) && SCM_REALP (x), x, SCM_ARG1, s_negative_p);
+ SCM_GASSERT1 (SCM_SLOPPY_REALP (x),
+ g_negative_p, x, SCM_ARG1, s_negative_p);
#endif
- return (SCM_REALPART (x) < 0.0) ? SCM_BOOL_T : SCM_BOOL_F;
- }
-#else
-#ifdef SCM_BIGDIG
- if (SCM_NINUMP (x))
- {
- SCM_ASSERT (SCM_NIMP (x) && SCM_BIGP (x), x, SCM_ARG1, s_negative_p);
- return (SCM_TYP16 (x) == scm_tc16_bigneg) ? SCM_BOOL_T : SCM_BOOL_F;
+ return SCM_BOOL(SCM_REALPART (x) < 0.0);
}
-#else
- SCM_ASSERT (SCM_INUMP (x), x, SCM_ARG1, s_negative_p);
-#endif
-#endif
- return (x < SCM_INUM0) ? SCM_BOOL_T : SCM_BOOL_F;
+ return SCM_BOOL(SCM_INUM(x) < 0);
}
-SCM_PROC1 (s_max, "max", scm_tc7_asubr, scm_max);
+SCM_GPROC1 (s_max, "max", scm_tc7_asubr, scm_max, g_max);
SCM
-scm_max (x, y)
- SCM x;
- SCM y;
+scm_max (SCM x, SCM y)
{
-#ifdef SCM_FLOATS
double z;
-#endif
if (SCM_UNBNDP (y))
{
-#ifndef SCM_RECKLESS
- if (!(SCM_NUMBERP (x)))
- {
- badx:
- scm_wta (x, (char *) SCM_ARG1, s_max);
- }
-#endif
+ SCM_GASSERT0 (!SCM_UNBNDP (x),
+ g_max, scm_makfrom0str (s_max), SCM_WNA, 0);
+ SCM_GASSERT1 (SCM_NUMBERP (x), g_max, x, SCM_ARG1, s_max);
return x;
}
-#ifdef SCM_FLOATS
if (SCM_NINUMP (x))
{
#ifdef SCM_BIGDIG
- SCM_ASRTGO (SCM_NIMP (x), badx);
+ if (!SCM_NIMP (x))
+ {
+ badx2:
+ SCM_WTA_DISPATCH_2 (g_max, x, y, SCM_ARG1, s_max);
+ }
if (SCM_BIGP (x))
{
if (SCM_INUMP (y))
SCM_ASRTGO (SCM_NIMP (y), bady);
if (SCM_BIGP (y))
return (1 == scm_bigcomp (x, y)) ? y : x;
- SCM_ASRTGO (SCM_REALP (y), bady);
+ SCM_ASRTGO (SCM_SLOPPY_REALP (y), bady);
z = scm_big2dbl (x);
return (z < SCM_REALPART (y)) ? y : scm_makdbl (z, 0.0);
}
- SCM_ASRTGO (SCM_REALP (x), badx);
+ SCM_ASRTGO (SCM_SLOPPY_REALP (x), badx2);
#else
- SCM_ASSERT (SCM_NIMP (x) && SCM_REALP (x), x, SCM_ARG1, s_max);
+ SCM_GASSERT2 (SCM_SLOPPY_REALP (x),
+ g_max, x, y, SCM_ARG1, s_max);
#endif
if (SCM_INUMP (y))
return ((SCM_REALPART (x) < (z = SCM_INUM (y)))
return ((SCM_REALPART (x) < (z = scm_big2dbl (y)))
? scm_makdbl (z, 0.0)
: x);
- SCM_ASRTGO (SCM_REALP (y), bady);
+ SCM_ASRTGO (SCM_SLOPPY_REALP (y), bady);
#else
- SCM_ASRTGO (SCM_NIMP (y) && SCM_REALP (y), bady);
+ SCM_ASRTGO (SCM_SLOPPY_REALP (y), bady);
#endif
return (SCM_REALPART (x) < SCM_REALPART (y)) ? y : x;
}
SCM_ASRTGO (SCM_NIMP (y), bady);
if (SCM_BIGP (y))
return SCM_BIGSIGN (y) ? x : y;
-#ifndef SCM_RECKLESS
- if (!(SCM_REALP (y)))
+ if (!(SCM_SLOPPY_REALP (y)))
{
bady:
- scm_wta (y, (char *) SCM_ARG2, s_max);
+ SCM_WTA_DISPATCH_2 (g_max, x, y, SCM_ARGn, s_max);
}
-#endif
#else
-#ifndef SCM_RECKLESS
- if (!(SCM_NIMP (y) && SCM_REALP (y)))
+ if (!SCM_SLOPPY_REALP (y))
{
bady:
- scm_wta (y, (char *) SCM_ARG2, s_max);
+ SCM_WTA_DISPATCH_2 (g_max, x, y, SCM_ARGn, s_max);
}
-#endif
#endif
return (((z = SCM_INUM (x)) < SCM_REALPART (y))
? y
: scm_makdbl (z, 0.0));
}
-#else
-#ifdef SCM_BIGDIG
- if (SCM_NINUMP (x))
- {
- SCM_ASSERT (SCM_NIMP (x) && SCM_BIGP (x), x, SCM_ARG1, s_max);
- if (SCM_INUMP (y))
- return SCM_BIGSIGN (x) ? y : x;
- SCM_ASRTGO (SCM_NIMP (y) && SCM_BIGP (y), bady);
- return (1 == scm_bigcomp (x, y)) ? y : x;
- }
- if (SCM_NINUMP (y))
- {
-#ifndef SCM_RECKLESS
- if (!(SCM_NIMP (y) && SCM_BIGP (y)))
- {
- bady:
- scm_wta (y, (char *) SCM_ARG2, s_max);
- }
-#endif
- return SCM_BIGSIGN (y) ? x : y;
- }
-#else
- SCM_ASSERT (SCM_INUMP (x), x, SCM_ARG1, s_max);
- SCM_ASSERT (SCM_INUMP (y), y, SCM_ARG2, s_max);
-#endif
-#endif
return ((long) x < (long) y) ? y : x;
}
+#define SCM_SWAP(x,y) do { SCM t = x; x = y; y = t; } while (0)
+
-SCM_PROC1 (s_min, "min", scm_tc7_asubr, scm_min);
+SCM_GPROC1 (s_min, "min", scm_tc7_asubr, scm_min, g_min);
SCM
-scm_min (x, y)
- SCM x;
- SCM y;
+scm_min (SCM x, SCM y)
{
-#ifdef SCM_FLOATS
double z;
-#endif
if (SCM_UNBNDP (y))
{
-#ifndef SCM_RECKLESS
- if (!(SCM_NUMBERP (x)))
- {
- badx:
- scm_wta (x, (char *) SCM_ARG1, s_min);
- }
-#endif
+ SCM_GASSERT0 (!SCM_UNBNDP (x),
+ g_min, scm_makfrom0str (s_min), SCM_WNA, 0);
+ SCM_GASSERT1 (SCM_NUMBERP (x), g_min, x, SCM_ARG1, s_min);
return x;
}
-#ifdef SCM_FLOATS
if (SCM_NINUMP (x))
{
#ifdef SCM_BIGDIG
- SCM_ASRTGO (SCM_NIMP (x), badx);
+ if (!SCM_NIMP (x))
+ {
+ badx2:
+ SCM_WTA_DISPATCH_2 (g_min, x, y, SCM_ARG1, s_min);
+ }
if (SCM_BIGP (x))
{
if (SCM_INUMP (y))
SCM_ASRTGO (SCM_NIMP (y), bady);
if (SCM_BIGP (y))
return (-1 == scm_bigcomp (x, y)) ? y : x;
- SCM_ASRTGO (SCM_REALP (y), bady);
+ SCM_ASRTGO (SCM_SLOPPY_REALP (y), bady);
z = scm_big2dbl (x);
return (z > SCM_REALPART (y)) ? y : scm_makdbl (z, 0.0);
}
- SCM_ASRTGO (SCM_REALP (x), badx);
+ SCM_ASRTGO (SCM_SLOPPY_REALP (x), badx2);
#else
- SCM_ASSERT (SCM_NIMP (x) && SCM_REALP (x), x, SCM_ARG1, s_min);
+ SCM_GASSERT2 (SCM_SLOPPY_REALP (x),
+ g_min, x, y, SCM_ARG1, s_min);
#endif
if (SCM_INUMP (y))
return ((SCM_REALPART (x) > (z = SCM_INUM (y)))
return ((SCM_REALPART (x) > (z = scm_big2dbl (y)))
? scm_makdbl (z, 0.0)
: x);
- SCM_ASRTGO (SCM_REALP (y), bady);
+ SCM_ASRTGO (SCM_SLOPPY_REALP (y), bady);
#else
- SCM_ASRTGO (SCM_NIMP (y) && SCM_REALP (y), bady);
+ SCM_ASRTGO (SCM_SLOPPY_REALP (y), bady);
#endif
return (SCM_REALPART (x) > SCM_REALPART (y)) ? y : x;
}
SCM_ASRTGO (SCM_NIMP (y), bady);
if (SCM_BIGP (y))
return SCM_BIGSIGN (y) ? y : x;
-#ifndef SCM_RECKLESS
- if (!(SCM_REALP (y)))
+ if (!(SCM_SLOPPY_REALP (y)))
{
bady:
- scm_wta (y, (char *) SCM_ARG2, s_min);
+ SCM_WTA_DISPATCH_2 (g_min, x, y, SCM_ARGn, s_min);
}
-#endif
#else
-#ifndef SCM_RECKLESS
- if (!(SCM_NIMP (y) && SCM_REALP (y)))
+ if (!SCM_SLOPPY_REALP (y))
{
bady:
- scm_wta (y, (char *) SCM_ARG2, s_min);
+ SCM_WTA_DISPATCH_2 (g_min, x, y, SCM_ARGn, s_min);
}
-#endif
#endif
return (((z = SCM_INUM (x)) > SCM_REALPART (y))
? y
: scm_makdbl (z, 0.0));
}
-#else
-#ifdef SCM_BIGDIG
- if (SCM_NINUMP (x))
- {
- SCM_ASSERT (SCM_NIMP (x) && SCM_BIGP (x), x, SCM_ARG1, s_min);
- if (SCM_INUMP (y))
- return SCM_BIGSIGN (x) ? x : y;
- SCM_ASRTGO (SCM_NIMP (y) && SCM_BIGP (y), bady);
- return (-1 == scm_bigcomp (x, y)) ? y : x;
- }
- if (SCM_NINUMP (y))
- {
-#ifndef SCM_RECKLESS
- if (!(SCM_NIMP (y) && SCM_BIGP (y)))
- {
- bady:
- scm_wta (y, (char *) SCM_ARG2, s_min);
- }
-#endif
- return SCM_BIGSIGN (y) ? y : x;
- }
-#else
- SCM_ASSERT (SCM_INUMP (x), x, SCM_ARG1, s_min);
- SCM_ASSERT (SCM_INUMP (y), y, SCM_ARG2, s_min);
-#endif
-#endif
return ((long) x > (long) y) ? y : x;
}
-SCM_PROC1 (s_sum, "+", scm_tc7_asubr, scm_sum);
+SCM_GPROC1 (s_sum, "+", scm_tc7_asubr, scm_sum, g_sum);
+/*
+ This is sick, sick, sick code.
+
+ */
SCM
-scm_sum (x, y)
- SCM x;
- SCM y;
+scm_sum (SCM x, SCM y)
{
if (SCM_UNBNDP (y))
{
if (SCM_UNBNDP (x))
return SCM_INUM0;
-#ifndef SCM_RECKLESS
- if (!(SCM_NUMBERP (x)))
- {
- badx:
- scm_wta (x, (char *) SCM_ARG1, s_sum);
- }
-#endif
+ SCM_GASSERT1 (SCM_NUMBERP (x), g_sum, x, SCM_ARG1, s_sum);
return x;
}
-#ifdef SCM_FLOATS
if (SCM_NINUMP (x))
{
- SCM t;
-#ifdef SCM_BIGDIG
- SCM_ASRTGO (SCM_NIMP (x), badx);
+# ifdef SCM_BIGDIG
+ if (!SCM_NIMP (x))
+ {
+ badx2:
+ SCM_WTA_DISPATCH_2 (g_sum, x, y, SCM_ARG1, s_sum);
+ }
if (SCM_BIGP (x))
{
if (SCM_INUMP (y))
{
- t = x;
- x = y;
- y = t;
+ SCM_SWAP(x,y);
goto intbig;
}
SCM_ASRTGO (SCM_NIMP (y), bady);
{
if (SCM_NUMDIGS (x) > SCM_NUMDIGS (y))
{
- t = x;
- x = y;
- y = t;
+ SCM_SWAP(x,y);
}
return scm_addbig (SCM_BDIGITS (x), SCM_NUMDIGS (x),
SCM_BIGSIGN (x),
y, 0);
}
- SCM_ASRTGO (SCM_INEXP (y), bady);
+ SCM_ASRTGO (SCM_SLOPPY_INEXACTP (y), bady);
bigreal:
- return scm_makdbl (scm_big2dbl (x) + SCM_REALPART (y),
- SCM_CPLXP (y) ? SCM_IMAG (y) : 0.0);
+ if (SCM_SLOPPY_REALP (y))
+ return scm_make_real (scm_big2dbl (x) + SCM_REAL_VALUE (y));
+ else
+ return scm_make_complex (scm_big2dbl (x) + SCM_COMPLEX_REAL (y),
+ SCM_COMPLEX_IMAG (y));
}
- SCM_ASRTGO (SCM_INEXP (x), badx);
-#else
- SCM_ASRTGO (SCM_NIMP (x) && SCM_INEXP (x), badx);
-#endif
+# endif /* SCM_BIGDIG */
+ SCM_ASRTGO (SCM_SLOPPY_INEXACTP (x), badx2);
+
if (SCM_INUMP (y))
{
- t = x;
- x = y;
- y = t;
+ SCM_SWAP(x,y);
goto intreal;
}
-#ifdef SCM_BIGDIG
+# ifdef SCM_BIGDIG
SCM_ASRTGO (SCM_NIMP (y), bady);
if (SCM_BIGP (y))
{
- t = x;
- x = y;
- y = t;
+ SCM_SWAP(x,y);
goto bigreal;
}
-#ifndef SCM_RECKLESS
- else if (!(SCM_INEXP (y)))
+ else if (!SCM_SLOPPY_INEXACTP (y))
{
bady:
- scm_wta (y, (char *) SCM_ARG2, s_sum);
+ SCM_WTA_DISPATCH_2 (g_sum, x, y, SCM_ARGn, s_sum);
}
-#endif
-#else
-#ifndef SCM_RECKLESS
- if (!(SCM_NIMP (y) && SCM_INEXP (y)))
+# else /* SCM_BIGDIG */
+ if (!SCM_SLOPPY_INEXACTP (y))
{
bady:
- scm_wta (y, (char *) SCM_ARG2, s_sum);
+ SCM_WTA_DISPATCH_2 (g_sum, x, y, SCM_ARGn, s_sum);
}
-#endif
-#endif
+# endif /* SCM_BIGDIG */
{
double i = 0.0;
- if (SCM_CPLXP (x))
- i = SCM_IMAG (x);
- if (SCM_CPLXP (y))
- i += SCM_IMAG (y);
+ if (SCM_SLOPPY_COMPLEXP (x))
+ i = SCM_COMPLEX_IMAG (x);
+ if (SCM_SLOPPY_COMPLEXP (y))
+ i += SCM_COMPLEX_IMAG (y);
return scm_makdbl (SCM_REALPART (x) + SCM_REALPART (y), i);
}
}
if (SCM_NINUMP (y))
{
-#ifdef SCM_BIGDIG
+# ifdef SCM_BIGDIG
SCM_ASRTGO (SCM_NIMP (y), bady);
if (SCM_BIGP (y))
{
intbig:
{
-#ifndef SCM_DIGSTOOBIG
- long z = scm_pseudolong (SCM_INUM (x));
+ long i = SCM_INUM (x);
+# ifndef SCM_DIGSTOOBIG
+ long z = scm_pseudolong (i);
return scm_addbig ((SCM_BIGDIG *) & z,
SCM_DIGSPERLONG,
- (x < 0) ? 0x0100 : 0,
+ (i < 0) ? SCM_BIGSIGNFLAG : 0,
y, 0);
-#else
+# else /* SCM_DIGSTOOBIG */
SCM_BIGDIG zdigs[SCM_DIGSPERLONG];
- scm_longdigs (SCM_INUM (x), zdigs);
- return scm_addbig (zdigs, SCM_DIGSPERLONG, (x < 0) ? 0x0100 : 0,
+ scm_longdigs (i, zdigs);
+ return scm_addbig (zdigs, SCM_DIGSPERLONG, (i < 0) ? SCM_BIGSIGNFLAG : 0,
y, 0);
-#endif
+# endif /* SCM_DIGSTOOBIG */
}
}
- SCM_ASRTGO (SCM_INEXP (y), bady);
-#else
- SCM_ASRTGO (SCM_NIMP (y) && SCM_INEXP (y), bady);
-#endif
+# endif /* SCM_BIGDIG */
+ SCM_ASRTGO (SCM_SLOPPY_INEXACTP (y), bady);
intreal:
- return scm_makdbl (SCM_INUM (x) + SCM_REALPART (y),
- SCM_CPLXP (y) ? SCM_IMAG (y) : 0.0);
- }
-#else
-#ifdef SCM_BIGDIG
- if (SCM_NINUMP (x))
- {
- SCM t;
- SCM_ASRTGO (SCM_NIMP (x) && SCM_BIGP (x), badx);
- if (SCM_INUMP (y))
- {
- t = x;
- x = y;
- y = t;
- goto intbig;
- }
- SCM_ASRTGO (SCM_NIMP (y) && SCM_BIGP (y), bady);
- if (SCM_NUMDIGS (x) > SCM_NUMDIGS (y))
- {
- t = x;
- x = y;
- y = t;
- }
- return scm_addbig (SCM_BDIGITS (x), SCM_NUMDIGS (x), SCM_BIGSIGN (x),
- y, 0);
- }
- if (SCM_NINUMP (y))
- {
-#ifndef SCM_RECKLESS
- if (!(SCM_NIMP (y) && SCM_BIGP (y)))
- {
- bady:
- scm_wta (y, (char *) SCM_ARG2, s_sum);
- }
-#endif
- intbig:
- {
-#ifndef SCM_DIGSTOOBIG
- long z = scm_pseudolong (SCM_INUM (x));
- return scm_addbig (&z, SCM_DIGSPERLONG, (x < 0) ? 0x0100 : 0, y, 0);
-#else
- SCM_BIGDIG zdigs[SCM_DIGSPERLONG];
- scm_longdigs (SCM_INUM (x), zdigs);
- return scm_addbig (zdigs, SCM_DIGSPERLONG, (x < 0) ? 0x0100 : 0, y, 0);
-#endif
- }
+ if (SCM_REALP (y))
+ return scm_make_real (SCM_INUM (x) + SCM_REAL_VALUE (y));
+ else
+ return scm_make_complex (SCM_INUM (x) + SCM_COMPLEX_REAL (y),
+ SCM_COMPLEX_IMAG (y));
}
-#else
- SCM_ASRTGO (SCM_INUMP (x), badx);
- SCM_ASSERT (SCM_INUMP (y), y, SCM_ARG2, s_sum);
-#endif
-#endif
- x = SCM_INUM (x) + SCM_INUM (y);
- if (SCM_FIXABLE (x))
- return SCM_MAKINUM (x);
+ { /* scope */
+ long int i = SCM_INUM (x) + SCM_INUM (y);
+ if (SCM_FIXABLE (i))
+ return SCM_MAKINUM (i);
#ifdef SCM_BIGDIG
- return scm_long2big (x);
-#else
-#ifdef SCM_FLOATS
- return scm_makdbl ((double) x, 0.0);
-#else
- scm_num_overflow (s_sum);
- return SCM_UNSPECIFIED;
-#endif
-#endif
+ return scm_long2big (i);
+#else /* SCM_BIGDIG */
+ return scm_makdbl ((double) i, 0.0);
+#endif /* SCM_BIGDIG */
+ } /* end scope */
}
-SCM_PROC1 (s_difference, "-", scm_tc7_asubr, scm_difference);
+SCM_GPROC1 (s_difference, "-", scm_tc7_asubr, scm_difference, g_difference);
+/*
+ HWN:FIXME:: This is sick,sick, sick code. Rewrite me.
+*/
SCM
-scm_difference (x, y)
- SCM x;
- SCM y;
+scm_difference (SCM x, SCM y)
{
-#ifdef SCM_FLOATS
+ long int cx = 0;
if (SCM_NINUMP (x))
{
-#ifndef SCM_RECKLESS
- if (!(SCM_NIMP (x)))
+ if (!SCM_NIMP (x))
{
- badx:
- scm_wta (x, (char *) SCM_ARG1, s_difference);
+ if (SCM_UNBNDP (y))
+ {
+ SCM_GASSERT0 (!SCM_UNBNDP (x), g_difference,
+ scm_makfrom0str (s_difference), SCM_WNA, 0);
+ badx:
+ SCM_WTA_DISPATCH_1 (g_difference, x, SCM_ARG1, s_difference);
+ }
+ else
+ {
+ badx2:
+ SCM_WTA_DISPATCH_2 (g_difference, x, y, SCM_ARG1, s_difference);
+ }
}
-#endif
if (SCM_UNBNDP (y))
{
#ifdef SCM_BIGDIG
: x);
}
#endif
- SCM_ASRTGO (SCM_INEXP (x), badx);
- return scm_makdbl (- SCM_REALPART (x),
- SCM_CPLXP (x) ? -SCM_IMAG (x) : 0.0);
+ SCM_ASRTGO (SCM_SLOPPY_INEXACTP (x), badx);
+ if (SCM_SLOPPY_REALP (x))
+ return scm_make_real (- SCM_REAL_VALUE (x));
+ else
+ return scm_make_complex (- SCM_COMPLEX_REAL (x),
+ - SCM_COMPLEX_IMAG (x));
}
if (SCM_INUMP (y))
return scm_sum (x, SCM_MAKINUM (- SCM_INUM (y)));
return ((SCM_NUMDIGS (x) < SCM_NUMDIGS (y))
? scm_addbig (SCM_BDIGITS (x), SCM_NUMDIGS (x),
SCM_BIGSIGN (x),
- y, 0x0100)
+ y, SCM_BIGSIGNFLAG)
: scm_addbig (SCM_BDIGITS (y), SCM_NUMDIGS (y),
- SCM_BIGSIGN (y) ^ 0x0100,
+ SCM_BIGSIGN (y) ^ SCM_BIGSIGNFLAG,
x, 0));
- SCM_ASRTGO (SCM_INEXP (y), bady);
- return scm_makdbl (scm_big2dbl (x) - SCM_REALPART (y),
- SCM_CPLXP (y) ? -SCM_IMAG (y) : 0.0);
+ SCM_ASRTGO (SCM_SLOPPY_INEXACTP (y), bady);
+ if (SCM_REALP (y))
+ return scm_make_real (scm_big2dbl (x) - SCM_REAL_VALUE (y));
+ else
+ return scm_make_complex (scm_big2dbl (x) - SCM_COMPLEX_REAL (y),
+ - SCM_COMPLEX_IMAG (y));
}
- SCM_ASRTGO (SCM_INEXP (x), badx);
+ SCM_ASRTGO (SCM_SLOPPY_INEXACTP (x), badx2);
if (SCM_BIGP (y))
- return scm_makdbl (SCM_REALPART (x) - scm_big2dbl (y),
- SCM_CPLXP (x) ? SCM_IMAG (x) : 0.0);
- SCM_ASRTGO (SCM_INEXP (y), bady);
-#else
- SCM_ASRTGO (SCM_INEXP (x), badx);
- SCM_ASRTGO (SCM_NIMP (y) && SCM_INEXP (y), bady);
-#endif
- if (SCM_CPLXP (x))
{
- if (SCM_CPLXP (y))
- return scm_makdbl (SCM_REAL (x) - SCM_REAL (y),
- SCM_IMAG (x) - SCM_IMAG (y));
+ if (SCM_REALP (x))
+ return scm_make_real (SCM_REAL_VALUE (x) - scm_big2dbl (y));
else
- return scm_makdbl (SCM_REAL (x) - SCM_REALPART (y), SCM_IMAG (x));
+ return scm_make_complex (SCM_COMPLEX_REAL (x) - scm_big2dbl (y),
+ SCM_COMPLEX_IMAG (x));
}
- return scm_makdbl (SCM_REALPART (x) - SCM_REALPART (y),
- SCM_CPLXP (y) ? - SCM_IMAG (y) : 0.0);
+ SCM_ASRTGO (SCM_SLOPPY_INEXACTP (y), bady);
+#else
+ SCM_ASRTGO (SCM_SLOPPY_INEXACTP (x), badx2);
+ SCM_ASRTGO (SCM_SLOPPY_INEXACTP (y), bady);
+#endif
+ {
+ SCM z;
+ if (SCM_SLOPPY_COMPLEXP (x))
+ {
+ if (SCM_SLOPPY_COMPLEXP (y))
+ SCM_NEWCOMPLEX (z,
+ SCM_COMPLEX_REAL (x) - SCM_COMPLEX_REAL (y),
+ SCM_COMPLEX_IMAG (x) - SCM_COMPLEX_IMAG (y));
+ else
+ SCM_NEWCOMPLEX (z,
+ SCM_COMPLEX_REAL (x) - SCM_REAL_VALUE (y),
+ SCM_COMPLEX_IMAG (x));
+ }
+ else
+ {
+ if (SCM_SLOPPY_COMPLEXP (y))
+ SCM_NEWCOMPLEX (z,
+ SCM_REAL_VALUE (x) - SCM_COMPLEX_REAL (y),
+ - SCM_COMPLEX_IMAG (y));
+ else
+ SCM_NEWREAL (z, SCM_REAL_VALUE (x) - SCM_REAL_VALUE (y));
+ }
+ return z;
+ }
}
if (SCM_UNBNDP (y))
{
- x = -SCM_INUM (x);
+ cx = -SCM_INUM (x);
goto checkx;
}
if (SCM_NINUMP (y))
SCM_ASRTGO (SCM_NIMP (y), bady);
if (SCM_BIGP (y))
{
+ long i = SCM_INUM (x);
#ifndef SCM_DIGSTOOBIG
- long z = scm_pseudolong (SCM_INUM (x));
+ long z = scm_pseudolong (i);
return scm_addbig ((SCM_BIGDIG *) & z, SCM_DIGSPERLONG,
- (x < 0) ? 0x0100 : 0,
- y, 0x0100);
+ (i < 0) ? SCM_BIGSIGNFLAG : 0,
+ y, SCM_BIGSIGNFLAG);
#else
SCM_BIGDIG zdigs[SCM_DIGSPERLONG];
- scm_longdigs (SCM_INUM (x), zdigs);
- return scm_addbig (zdigs, SCM_DIGSPERLONG, (x < 0) ? 0x0100 : 0,
- y, 0x0100);
+ scm_longdigs (i, zdigs);
+ return scm_addbig (zdigs, SCM_DIGSPERLONG, (i < 0) ? SCM_BIGSIGNFLAG : 0,
+ y, SCM_BIGSIGNFLAG);
#endif
}
-#ifndef SCM_RECKLESS
- if (!(SCM_INEXP (y)))
+ if (!SCM_SLOPPY_INEXACTP (y))
{
bady:
- scm_wta (y, (char *) SCM_ARG2, s_difference);
+ SCM_WTA_DISPATCH_2 (g_difference, x, y, SCM_ARGn, s_difference);
}
-#endif
#else
-#ifndef SCM_RECKLESS
- if (!(SCM_NIMP (y) && SCM_INEXP (y)))
+ if (!SCM_SLOPPY_INEXACTP (y))
{
bady:
- scm_wta (y, (char *) SCM_ARG2, s_difference);
+ SCM_WTA_DISPATCH_2 (g_difference, x, y, SCM_ARGn, s_difference);
}
-#endif
#endif
return scm_makdbl (SCM_INUM (x) - SCM_REALPART (y),
- SCM_CPLXP (y) ? -SCM_IMAG (y) : 0.0);
- }
-#else
-#ifdef SCM_BIGDIG
- if (SCM_NINUMP (x))
- {
- SCM_ASSERT (SCM_NIMP (x) && SCM_BIGP (x), x, SCM_ARG1, s_difference);
- if (SCM_UNBNDP (y))
- {
- x = scm_copybig (x, !SCM_BIGSIGN (x));
- return (SCM_NUMDIGS (x) * SCM_BITSPERDIG / SCM_CHAR_BIT
- <= sizeof (SCM)
- ? scm_big2inum (x, SCM_NUMDIGS (x))
- : x);
- }
- if (SCM_INUMP (y))
- {
-#ifndef SCM_DIGSTOOBIG
- long z = scm_pseudolong (SCM_INUM (y));
- return scm_addbig (&z, SCM_DIGSPERLONG, (y < 0) ? 0 : 0x0100, x, 0);
-#else
- SCM_BIGDIG zdigs[SCM_DIGSPERLONG];
- scm_longdigs (SCM_INUM (x), zdigs);
- return scm_addbig (zdigs, SCM_DIGSPERLONG, (y < 0) ? 0 : 0x0100,
- x, 0);
-#endif
- }
- SCM_ASRTGO (SCM_NIMP (y) && SCM_BIGP (y), bady);
- return (SCM_NUMDIGS (x) < SCM_NUMDIGS (y)) ?
- scm_addbig (SCM_BDIGITS (x), SCM_NUMDIGS (x), SCM_BIGSIGN (x),
- y, 0x0100) :
- scm_addbig (SCM_BDIGITS (y), SCM_NUMDIGS (y), SCM_BIGSIGN (y) ^ 0x0100,
- x, 0);
- }
- if (SCM_UNBNDP (y))
- {
- x = -SCM_INUM (x);
- goto checkx;
- }
- if (SCM_NINUMP (y))
- {
-#ifndef SCM_RECKLESS
- if (!(SCM_NIMP (y) && SCM_BIGP (y)))
- {
- bady:
- scm_wta (y, (char *) SCM_ARG2, s_difference);
- }
-#endif
- {
-#ifndef SCM_DIGSTOOBIG
- long z = scm_pseudolong (SCM_INUM (x));
- return scm_addbig (&z, SCM_DIGSPERLONG, (x < 0) ? 0x0100 : 0,
- y, 0x0100);
-#else
- SCM_BIGDIG zdigs[SCM_DIGSPERLONG];
- scm_longdigs (SCM_INUM (x), zdigs);
- return scm_addbig (zdigs, SCM_DIGSPERLONG, (x < 0) ? 0x0100 : 0,
- y, 0x0100);
-#endif
- }
+ SCM_SLOPPY_COMPLEXP (y) ? -SCM_IMAG (y) : 0.0);
}
-#else
- SCM_ASSERT (SCM_INUMP (x), x, SCM_ARG1, s_difference);
- if (SCM_UNBNDP (y))
- {
- x = -SCM_INUM (x);
- goto checkx;
- }
- SCM_ASSERT (SCM_INUMP (y), y, SCM_ARG2, s_difference);
-#endif
-#endif
- x = SCM_INUM (x) - SCM_INUM (y);
+ cx = SCM_INUM (x) - SCM_INUM (y);
checkx:
- if (SCM_FIXABLE (x))
- return SCM_MAKINUM (x);
+ if (SCM_FIXABLE (cx))
+ return SCM_MAKINUM (cx);
#ifdef SCM_BIGDIG
- return scm_long2big (x);
-#else
-#ifdef SCM_FLOATS
- return scm_makdbl ((double) x, 0.0);
+ return scm_long2big (cx);
#else
- scm_num_overflow (s_difference);
- return SCM_UNSPECIFIED;
-#endif
+ return scm_makdbl ((double) cx, 0.0);
#endif
}
-SCM_PROC1 (s_product, "*", scm_tc7_asubr, scm_product);
+SCM_GPROC1 (s_product, "*", scm_tc7_asubr, scm_product, g_product);
SCM
-scm_product (x, y)
- SCM x;
- SCM y;
+scm_product (SCM x, SCM y)
{
if (SCM_UNBNDP (y))
{
if (SCM_UNBNDP (x))
return SCM_MAKINUM (1L);
-#ifndef SCM_RECKLESS
- if (!(SCM_NUMBERP (x)))
- {
- badx:
- scm_wta (x, (char *) SCM_ARG1, s_product);
- }
-#endif
+ SCM_GASSERT1 (SCM_NUMBERP (x), g_product, x, SCM_ARG1, s_product);
return x;
}
-#ifdef SCM_FLOATS
if (SCM_NINUMP (x))
{
SCM t;
#ifdef SCM_BIGDIG
- SCM_ASRTGO (SCM_NIMP (x), badx);
+ if (!SCM_NIMP (x))
+ {
+ badx2:
+ SCM_WTA_DISPATCH_2 (g_product, x, y, SCM_ARG1, s_product);
+ }
if (SCM_BIGP (x))
{
if (SCM_INUMP (y))
return scm_mulbig (SCM_BDIGITS (x), SCM_NUMDIGS (x),
SCM_BDIGITS (y), SCM_NUMDIGS (y),
SCM_BIGSIGN (x) ^ SCM_BIGSIGN (y));
- SCM_ASRTGO (SCM_INEXP (y), bady);
+ SCM_ASRTGO (SCM_SLOPPY_INEXACTP (y), bady);
bigreal:
{
double bg = scm_big2dbl (x);
return scm_makdbl (bg * SCM_REALPART (y),
- SCM_CPLXP (y) ? bg * SCM_IMAG (y) : 0.0);
+ SCM_SLOPPY_COMPLEXP (y) ? bg * SCM_IMAG (y) : 0.0);
}
}
- SCM_ASRTGO (SCM_INEXP (x), badx);
+ SCM_ASRTGO (SCM_SLOPPY_INEXACTP (x), badx2);
#else
- SCM_ASRTGO (SCM_NIMP (x) && SCM_INEXP (x), badx);
+ SCM_ASRTGO (SCM_SLOPPY_INEXACTP (x), badx2);
#endif
if (SCM_INUMP (y))
{
y = t;
goto bigreal;
}
-#ifndef SCM_RECKLESS
- else if (!(SCM_INEXP (y)))
+ else if (!(SCM_SLOPPY_INEXACTP (y)))
{
bady:
- scm_wta (y, (char *) SCM_ARG2, s_product);
+ SCM_WTA_DISPATCH_2 (g_product, x, y, SCM_ARGn, s_product);
}
-#endif
#else
-#ifndef SCM_RECKLESS
- if (!(SCM_NIMP (y) && SCM_INEXP (y)))
+ if (!SCM_SLOPPY_INEXACTP (y))
{
bady:
- scm_wta (y, (char *) SCM_ARG2, s_product);
+ SCM_WTA_DISPATCH_2 (g_product, x, y, SCM_ARGn, s_product);
}
#endif
-#endif
- if (SCM_CPLXP (x))
+ if (SCM_SLOPPY_COMPLEXP (x))
{
- if (SCM_CPLXP (y))
+ if (SCM_SLOPPY_COMPLEXP (y))
return scm_makdbl (SCM_REAL (x) * SCM_REAL (y)
- SCM_IMAG (x) * SCM_IMAG (y),
SCM_REAL (x) * SCM_IMAG (y)
SCM_IMAG (x) * SCM_REALPART (y));
}
return scm_makdbl (SCM_REALPART (x) * SCM_REALPART (y),
- SCM_CPLXP (y)
+ SCM_SLOPPY_COMPLEXP (y)
? SCM_REALPART (x) * SCM_IMAG (y)
: 0.0);
}
if (SCM_BIGP (y))
{
intbig:
- if (SCM_INUM0 == x)
+ if (SCM_EQ_P (x, SCM_INUM0))
return x;
- if (SCM_MAKINUM (1L) == x)
+ if (SCM_EQ_P (x, SCM_MAKINUM (1L)))
return y;
{
#ifndef SCM_DIGSTOOBIG
#endif
}
}
- SCM_ASRTGO (SCM_INEXP (y), bady);
+ SCM_ASRTGO (SCM_SLOPPY_INEXACTP (y), bady);
#else
- SCM_ASRTGO (SCM_NIMP (y) && SCM_INEXP (y), bady);
+ SCM_ASRTGO (SCM_SLOPPY_INEXACTP (y), bady);
#endif
intreal:
return scm_makdbl (SCM_INUM (x) * SCM_REALPART (y),
- SCM_CPLXP (y) ? SCM_INUM (x) * SCM_IMAG (y) : 0.0);
- }
-#else
-#ifdef SCM_BIGDIG
- if (SCM_NINUMP (x))
- {
- SCM_ASRTGO (SCM_NIMP (x) && SCM_BIGP (x), badx);
- if (SCM_INUMP (y))
- {
- SCM t = x;
- x = y;
- y = t;
- goto intbig;
- }
- SCM_ASRTGO (SCM_NIMP (y) && SCM_BIGP (y), bady);
- return scm_mulbig (SCM_BDIGITS (x), SCM_NUMDIGS (x),
- SCM_BDIGITS (y), SCM_NUMDIGS (y),
- SCM_BIGSIGN (x) ^ SCM_BIGSIGN (y));
- }
- if (SCM_NINUMP (y))
- {
-#ifndef SCM_RECKLESS
- if (!(SCM_NIMP (y) && SCM_BIGP (y)))
- {
- bady:
- scm_wta (y, (char *) SCM_ARG2, s_product);
- }
-#endif
- intbig:
- if (SCM_INUM0 == x)
- return x;
- if (SCM_MAKINUM (1L) == x)
- return y;
- {
-#ifndef SCM_DIGSTOOBIG
- long z = scm_pseudolong (SCM_INUM (x));
- return scm_mulbig (&z, SCM_DIGSPERLONG,
- SCM_BDIGITS (y), SCM_NUMDIGS (y),
- SCM_BIGSIGN (y) ? (x > 0) : (x < 0));
-#else
- SCM_BIGDIG zdigs[SCM_DIGSPERLONG];
- scm_longdigs (SCM_INUM (x), zdigs);
- return scm_mulbig (zdigs, SCM_DIGSPERLONG,
- SCM_BDIGITS (y), SCM_NUMDIGS (y),
- SCM_BIGSIGN (y) ? (x > 0) : (x < 0));
-#endif
- }
+ SCM_SLOPPY_COMPLEXP (y) ? SCM_INUM (x) * SCM_IMAG (y) : 0.0);
}
-#else
- SCM_ASRTGO (SCM_INUMP (x), badx);
- SCM_ASSERT (SCM_INUMP (y), y, SCM_ARG2, s_product);
-#endif
-#endif
{
long i, j, k;
i = SCM_INUM (x);
#endif
}
#else
-#ifdef SCM_FLOATS
return scm_makdbl (((double) i) * ((double) j), 0.0);
-#else
- scm_num_overflow (s_product);
-#endif
#endif
return y;
}
double
-scm_num2dbl (a, why)
- SCM a;
- const char *why;
+scm_num2dbl (SCM a, const char *why)
{
if (SCM_INUMP (a))
return (double) SCM_INUM (a);
-#ifdef SCM_FLOATS
SCM_ASSERT (SCM_NIMP (a), a, "wrong type argument", why);
- if (SCM_REALP (a))
+ if (SCM_SLOPPY_REALP (a))
return (SCM_REALPART (a));
-#endif
#ifdef SCM_BIGDIG
return scm_big2dbl (a);
#endif
SCM_ASSERT (0, a, "wrong type argument", why);
- return SCM_UNSPECIFIED;
+ /*
+ unreachable, hopefully.
+ */
+ return (double) 0.0; /* ugh. */
+ /* return SCM_UNSPECIFIED; */
}
-SCM_PROC1 (s_divide, "/", scm_tc7_asubr, scm_divide);
+SCM_GPROC1 (s_divide, "/", scm_tc7_asubr, scm_divide, g_divide);
SCM
-scm_divide (x, y)
- SCM x;
- SCM y;
+scm_divide (SCM x, SCM y)
{
-#ifdef SCM_FLOATS
double d, r, i, a;
if (SCM_NINUMP (x))
{
-#ifndef SCM_RECKLESS
if (!(SCM_NIMP (x)))
{
- badx:
- scm_wta (x, (char *) SCM_ARG1, s_divide);
+ if (SCM_UNBNDP (y))
+ {
+ SCM_GASSERT0 (!SCM_UNBNDP (x),
+ g_divide, scm_makfrom0str (s_divide), SCM_WNA, 0);
+ badx:
+ SCM_WTA_DISPATCH_1 (g_divide, x, SCM_ARG1, s_divide);
+ }
+ else
+ {
+ badx2:
+ SCM_WTA_DISPATCH_2 (g_divide, x, y, SCM_ARG1, s_divide);
+ }
}
-#endif
if (SCM_UNBNDP (y))
{
#ifdef SCM_BIGDIG
if (SCM_BIGP (x))
return scm_makdbl (1.0 / scm_big2dbl (x), 0.0);
#endif
- SCM_ASRTGO (SCM_INEXP (x), badx);
- if (SCM_REALP (x))
+ SCM_ASRTGO (SCM_SLOPPY_INEXACTP (x), badx);
+ if (SCM_SLOPPY_REALP (x))
return scm_makdbl (1.0 / SCM_REALPART (x), 0.0);
r = SCM_REAL (x);
i = SCM_IMAG (x);
#ifdef SCM_BIGDIG
if (SCM_BIGP (x))
{
- SCM z;
if (SCM_INUMP (y))
{
- z = SCM_INUM (y);
+ long int z = SCM_INUM (y);
#ifndef SCM_RECKLESS
if (!z)
scm_num_overflow (s_divide);
: scm_normbig (w));
}
#ifndef SCM_DIGSTOOBIG
+ /*ugh! Does anyone know what this is supposed to do?*/
z = scm_pseudolong (z);
- z = scm_divbigbig (SCM_BDIGITS (x), SCM_NUMDIGS (x),
- (SCM_BIGDIG *) & z, SCM_DIGSPERLONG,
- SCM_BIGSIGN (x) ? (y > 0) : (y < 0), 3);
+ z = SCM_INUM(scm_divbigbig (SCM_BDIGITS (x), SCM_NUMDIGS (x),
+ (SCM_BIGDIG *) & z, SCM_DIGSPERLONG,
+ SCM_BIGSIGN (x) ? (y > 0) : (y < 0), 3));
#else
{
SCM_BIGDIG zdigs[SCM_DIGSPERLONG];
SCM_BIGSIGN (x) ? (y > 0) : (y < 0), 3);
}
#endif
- return z ? z : scm_makdbl (scm_big2dbl (x) / SCM_INUM (y), 0.0);
+ return z ? SCM_PACK (z) : scm_makdbl (scm_big2dbl (x) / SCM_INUM (y), 0.0);
}
SCM_ASRTGO (SCM_NIMP (y), bady);
if (SCM_BIGP (y))
{
- z = scm_divbigbig (SCM_BDIGITS (x), SCM_NUMDIGS (x),
+ SCM z = scm_divbigbig (SCM_BDIGITS (x), SCM_NUMDIGS (x),
SCM_BDIGITS (y), SCM_NUMDIGS (y),
SCM_BIGSIGN (x) ^ SCM_BIGSIGN (y), 3);
return z ? z : scm_makdbl (scm_big2dbl (x) / scm_big2dbl (y),
0.0);
}
- SCM_ASRTGO (SCM_INEXP (y), bady);
- if (SCM_REALP (y))
+ SCM_ASRTGO (SCM_SLOPPY_INEXACTP (y), bady);
+ if (SCM_SLOPPY_REALP (y))
return scm_makdbl (scm_big2dbl (x) / SCM_REALPART (y), 0.0);
a = scm_big2dbl (x);
goto complex_div;
}
#endif
- SCM_ASRTGO (SCM_INEXP (x), badx);
+ SCM_ASRTGO (SCM_SLOPPY_INEXACTP (x), badx2);
if (SCM_INUMP (y))
{
d = SCM_INUM (y);
d = scm_big2dbl (y);
goto basic_div;
}
- SCM_ASRTGO (SCM_INEXP (y), bady);
+ SCM_ASRTGO (SCM_SLOPPY_INEXACTP (y), bady);
#else
- SCM_ASRTGO (SCM_NIMP (y) && SCM_INEXP (y), bady);
+ SCM_ASRTGO (SCM_SLOPPY_INEXACTP (y), bady);
#endif
- if (SCM_REALP (y))
+ if (SCM_SLOPPY_REALP (y))
{
d = SCM_REALPART (y);
basic_div:
return scm_makdbl (SCM_REALPART (x) / d,
- SCM_CPLXP (x) ? SCM_IMAG (x) / d : 0.0);
+ SCM_SLOPPY_COMPLEXP (x) ? SCM_IMAG (x) / d : 0.0);
}
a = SCM_REALPART (x);
- if (SCM_REALP (x))
+ if (SCM_SLOPPY_REALP (x))
goto complex_div;
r = SCM_REAL (y);
i = SCM_IMAG (y);
}
if (SCM_UNBNDP (y))
{
- if ((SCM_MAKINUM (1L) == x) || (SCM_MAKINUM (-1L) == x))
+ if (SCM_EQ_P (x, SCM_MAKINUM (1L)) || SCM_EQ_P (x, SCM_MAKINUM (-1L)))
return x;
return scm_makdbl (1.0 / ((double) SCM_INUM (x)), 0.0);
}
SCM_ASRTGO (SCM_NIMP (y), bady);
if (SCM_BIGP (y))
return scm_makdbl (SCM_INUM (x) / scm_big2dbl (y), 0.0);
-#ifndef SCM_RECKLESS
- if (!(SCM_INEXP (y)))
+ if (!(SCM_SLOPPY_INEXACTP (y)))
{
bady:
- scm_wta (y, (char *) SCM_ARG2, s_divide);
+ SCM_WTA_DISPATCH_2 (g_divide, x, y, SCM_ARGn, s_divide);
}
-#endif
#else
-#ifndef SCM_RECKLESS
- if (!(SCM_NIMP (y) && SCM_INEXP (y)))
+ if (!SCM_SLOPPY_INEXACTP (y))
{
bady:
- scm_wta (y, (char *) SCM_ARG2, s_divide);
+ SCM_WTA_DISPATCH_2 (g_divide, x, y, SCM_ARGn, s_divide);
}
#endif
-#endif
- if (SCM_REALP (y))
+ if (SCM_SLOPPY_REALP (y))
return scm_makdbl (SCM_INUM (x) / SCM_REALPART (y), 0.0);
a = SCM_INUM (x);
complex_div:
d = r * r + i * i;
return scm_makdbl ((a * r) / d, (-a * i) / d);
}
-#else
-#ifdef SCM_BIGDIG
- if (SCM_NINUMP (x))
- {
- SCM z;
- SCM_ASSERT (SCM_NIMP (x) && SCM_BIGP (x), x, SCM_ARG1, s_divide);
- if (SCM_UNBNDP (y))
- goto ov;
- if (SCM_INUMP (y))
- {
- z = SCM_INUM (y);
- if (!z)
- goto ov;
- if (1 == z)
- return x;
- if (z < 0)
- z = -z;
- if (z < SCM_BIGRAD)
- {
- SCM w = scm_copybig (x, SCM_BIGSIGN (x) ? (y > 0) : (y < 0));
- if (scm_divbigdig (SCM_BDIGITS (w), SCM_NUMDIGS (w),
- (SCM_BIGDIG) z))
- goto ov;
- return w;
- }
-#ifndef SCM_DIGSTOOBIG
- z = scm_pseudolong (z);
- z = scm_divbigbig (SCM_BDIGITS (x), SCM_NUMDIGS (x),
- &z, SCM_DIGSPERLONG,
- SCM_BIGSIGN (x) ? (y > 0) : (y < 0), 3);
-#else
- {
- SCM_BIGDIG zdigs[SCM_DIGSPERLONG];
- scm_longdigs (z, zdigs);
- z = scm_divbigbig (SCM_BDIGITS (x), SCM_NUMDIGS (x),
- zdigs, SCM_DIGSPERLONG,
- SCM_BIGSIGN (x) ? (y > 0) : (y < 0), 3);
- }
-#endif
- }
- else
- {
- SCM_ASRTGO (SCM_NIMP (y) && SCM_BIGP (y), bady);
- z = scm_divbigbig (SCM_BDIGITS (x), SCM_NUMDIGS (x),
- SCM_BDIGITS (y), SCM_NUMDIGS (y),
- SCM_BIGSIGN (x) ^ SCM_BIGSIGN (y), 3);
- }
- if (!z)
- goto ov;
- return z;
- }
- if (SCM_UNBNDP (y))
- {
- if ((SCM_MAKINUM (1L) == x) || (SCM_MAKINUM (-1L) == x))
- return x;
- goto ov;
- }
- if (SCM_NINUMP (y))
- {
-#ifndef SCM_RECKLESS
- if (!(SCM_NIMP (y) && SCM_BIGP (y)))
- {
- bady:
- scm_wta (y, (char *) SCM_ARG2, s_divide);
- }
-#endif
- goto ov;
- }
-#else
- SCM_ASSERT (SCM_INUMP (x), x, SCM_ARG1, s_divide);
- if (SCM_UNBNDP (y))
- {
- if ((SCM_MAKINUM (1L) == x) || (SCM_MAKINUM (-1L) == x))
- return x;
- goto ov;
- }
- SCM_ASSERT (SCM_INUMP (y), y, SCM_ARG2, s_divide);
-#endif
-#endif
{
long z = SCM_INUM (y);
if ((0 == z) || SCM_INUM (x) % z)
#ifdef SCM_BIGDIG
return scm_long2big (z);
#endif
-#ifdef SCM_FLOATS
ov:
return scm_makdbl (((double) SCM_INUM (x)) / ((double) SCM_INUM (y)), 0.0);
-#else
- ov:
- scm_num_overflow (s_divide);
- return SCM_UNSPECIFIED;
-#endif
}
}
-#ifdef SCM_FLOATS
-SCM_PROC1 (s_asinh, "$asinh", scm_tc7_cxr, (SCM (*)()) scm_asinh);
+SCM_GPROC1 (s_asinh, "$asinh", scm_tc7_cxr, (SCM (*)()) scm_asinh, g_asinh);
double
-scm_asinh (x)
- double x;
+scm_asinh (double x)
{
return log (x + sqrt (x * x + 1));
}
-SCM_PROC1 (s_acosh, "$acosh", scm_tc7_cxr, (SCM (*)()) scm_acosh);
+SCM_GPROC1 (s_acosh, "$acosh", scm_tc7_cxr, (SCM (*)()) scm_acosh, g_acosh);
double
-scm_acosh (x)
- double x;
+scm_acosh (double x)
{
return log (x + sqrt (x * x - 1));
}
-SCM_PROC1 (s_atanh, "$atanh", scm_tc7_cxr, (SCM (*)()) scm_atanh);
+SCM_GPROC1 (s_atanh, "$atanh", scm_tc7_cxr, (SCM (*)()) scm_atanh, g_atanh);
double
-scm_atanh (x)
- double x;
+scm_atanh (double x)
{
return 0.5 * log ((1 + x) / (1 - x));
}
-SCM_PROC1 (s_truncate, "truncate", scm_tc7_cxr, (SCM (*)()) scm_truncate);
+SCM_GPROC1 (s_truncate, "truncate", scm_tc7_cxr, (SCM (*)()) scm_truncate, g_truncate);
double
-scm_truncate (x)
- double x;
+scm_truncate (double x)
{
if (x < 0.0)
return -floor (-x);
-SCM_PROC1 (s_round, "round", scm_tc7_cxr, (SCM (*)()) scm_round);
+SCM_GPROC1 (s_round, "round", scm_tc7_cxr, (SCM (*)()) scm_round, g_round);
double
-scm_round (x)
- double x;
+scm_round (double x)
{
double plus_half = x + 0.5;
double result = floor (plus_half);
-SCM_PROC1 (s_exact_to_inexact, "exact->inexact", scm_tc7_cxr, (SCM (*)()) scm_exact_to_inexact);
+SCM_GPROC1 (s_exact_to_inexact, "exact->inexact", scm_tc7_cxr, (SCM (*)()) scm_exact_to_inexact, g_exact_to_inexact);
double
-scm_exact_to_inexact (z)
- double z;
+scm_exact_to_inexact (double z)
{
return z;
}
-SCM_PROC1 (s_i_floor, "floor", scm_tc7_cxr, (SCM (*)()) floor);
-SCM_PROC1 (s_i_ceil, "ceiling", scm_tc7_cxr, (SCM (*)()) ceil);
-SCM_PROC1 (s_i_sqrt, "$sqrt", scm_tc7_cxr, (SCM (*)()) sqrt);
-SCM_PROC1 (s_i_abs, "$abs", scm_tc7_cxr, (SCM (*)()) fabs);
-SCM_PROC1 (s_i_exp, "$exp", scm_tc7_cxr, (SCM (*)()) exp);
-SCM_PROC1 (s_i_log, "$log", scm_tc7_cxr, (SCM (*)()) log);
-SCM_PROC1 (s_i_sin, "$sin", scm_tc7_cxr, (SCM (*)()) sin);
-SCM_PROC1 (s_i_cos, "$cos", scm_tc7_cxr, (SCM (*)()) cos);
-SCM_PROC1 (s_i_tan, "$tan", scm_tc7_cxr, (SCM (*)()) tan);
-SCM_PROC1 (s_i_asin, "$asin", scm_tc7_cxr, (SCM (*)()) asin);
-SCM_PROC1 (s_i_acos, "$acos", scm_tc7_cxr, (SCM (*)()) acos);
-SCM_PROC1 (s_i_atan, "$atan", scm_tc7_cxr, (SCM (*)()) atan);
-SCM_PROC1 (s_i_sinh, "$sinh", scm_tc7_cxr, (SCM (*)()) sinh);
-SCM_PROC1 (s_i_cosh, "$cosh", scm_tc7_cxr, (SCM (*)()) cosh);
-SCM_PROC1 (s_i_tanh, "$tanh", scm_tc7_cxr, (SCM (*)()) tanh);
+SCM_GPROC1 (s_i_floor, "floor", scm_tc7_cxr, (SCM (*)()) floor, g_i_floor);
+SCM_GPROC1 (s_i_ceil, "ceiling", scm_tc7_cxr, (SCM (*)()) ceil, g_i_ceil);
+SCM_GPROC1 (s_i_sqrt, "$sqrt", scm_tc7_cxr, (SCM (*)()) sqrt, g_i_sqrt);
+SCM_GPROC1 (s_i_abs, "$abs", scm_tc7_cxr, (SCM (*)()) fabs, g_i_abs);
+SCM_GPROC1 (s_i_exp, "$exp", scm_tc7_cxr, (SCM (*)()) exp, g_i_exp);
+SCM_GPROC1 (s_i_log, "$log", scm_tc7_cxr, (SCM (*)()) log, g_i_log);
+SCM_GPROC1 (s_i_sin, "$sin", scm_tc7_cxr, (SCM (*)()) sin, g_i_sin);
+SCM_GPROC1 (s_i_cos, "$cos", scm_tc7_cxr, (SCM (*)()) cos, g_i_cos);
+SCM_GPROC1 (s_i_tan, "$tan", scm_tc7_cxr, (SCM (*)()) tan, g_i_tan);
+SCM_GPROC1 (s_i_asin, "$asin", scm_tc7_cxr, (SCM (*)()) asin, g_i_asin);
+SCM_GPROC1 (s_i_acos, "$acos", scm_tc7_cxr, (SCM (*)()) acos, g_i_acos);
+SCM_GPROC1 (s_i_atan, "$atan", scm_tc7_cxr, (SCM (*)()) atan, g_i_atan);
+SCM_GPROC1 (s_i_sinh, "$sinh", scm_tc7_cxr, (SCM (*)()) sinh, g_i_sinh);
+SCM_GPROC1 (s_i_cosh, "$cosh", scm_tc7_cxr, (SCM (*)()) cosh, g_i_cosh);
+SCM_GPROC1 (s_i_tanh, "$tanh", scm_tc7_cxr, (SCM (*)()) tanh, g_i_tanh);
struct dpair
{
struct dpair * xy);
static void
-scm_two_doubles (z1, z2, sstring, xy)
- SCM z1, z2;
- const char *sstring;
- struct dpair *xy;
+scm_two_doubles (SCM z1, SCM z2, const char *sstring, struct dpair *xy)
{
if (SCM_INUMP (z1))
xy->x = SCM_INUM (z1);
else
{
#ifndef SCM_RECKLESS
- if (!(SCM_REALP (z1)))
+ if (!SCM_SLOPPY_REALP (z1))
badz1:scm_wta (z1, (char *) SCM_ARG1, sstring);
#endif
xy->x = SCM_REALPART (z1);
}
#else
{
- SCM_ASSERT (SCM_NIMP (z1) && SCM_REALP (z1), z1, SCM_ARG1, sstring);
+ SCM_ASSERT (SCM_SLOPPY_REALP (z1), z1, SCM_ARG1, sstring);
xy->x = SCM_REALPART (z1);
}
#endif
else
{
#ifndef SCM_RECKLESS
- if (!(SCM_REALP (z2)))
+ if (!(SCM_SLOPPY_REALP (z2)))
badz2:scm_wta (z2, (char *) SCM_ARG2, sstring);
#endif
xy->y = SCM_REALPART (z2);
}
#else
{
- SCM_ASSERT (SCM_NIMP (z2) && SCM_REALP (z2), z2, SCM_ARG2, sstring);
+ SCM_ASSERT (SCM_SLOPPY_REALP (z2), z2, SCM_ARG2, sstring);
xy->y = SCM_REALPART (z2);
}
#endif
-SCM_PROC (s_sys_expt, "$expt", 2, 0, 0, scm_sys_expt);
-
-SCM
-scm_sys_expt (z1, z2)
- SCM z1;
- SCM z2;
+SCM_DEFINE (scm_sys_expt, "$expt", 2, 0, 0,
+ (SCM z1, SCM z2),
+ "")
+#define FUNC_NAME s_scm_sys_expt
{
struct dpair xy;
- scm_two_doubles (z1, z2, s_sys_expt, &xy);
+ scm_two_doubles (z1, z2, FUNC_NAME, &xy);
return scm_makdbl (pow (xy.x, xy.y), 0.0);
}
+#undef FUNC_NAME
-SCM_PROC (s_sys_atan2, "$atan2", 2, 0, 0, scm_sys_atan2);
-
-SCM
-scm_sys_atan2 (z1, z2)
- SCM z1;
- SCM z2;
+SCM_DEFINE (scm_sys_atan2, "$atan2", 2, 0, 0,
+ (SCM z1, SCM z2),
+ "")
+#define FUNC_NAME s_scm_sys_atan2
{
struct dpair xy;
- scm_two_doubles (z1, z2, s_sys_atan2, &xy);
+ scm_two_doubles (z1, z2, FUNC_NAME, &xy);
return scm_makdbl (atan2 (xy.x, xy.y), 0.0);
}
+#undef FUNC_NAME
-SCM_PROC (s_make_rectangular, "make-rectangular", 2, 0, 0, scm_make_rectangular);
-
-SCM
-scm_make_rectangular (z1, z2)
- SCM z1;
- SCM z2;
+SCM_DEFINE (scm_make_rectangular, "make-rectangular", 2, 0, 0,
+ (SCM z1, SCM z2),
+ "")
+#define FUNC_NAME s_scm_make_rectangular
{
struct dpair xy;
- scm_two_doubles (z1, z2, s_make_rectangular, &xy);
+ scm_two_doubles (z1, z2, FUNC_NAME, &xy);
return scm_makdbl (xy.x, xy.y);
}
+#undef FUNC_NAME
-SCM_PROC (s_make_polar, "make-polar", 2, 0, 0, scm_make_polar);
-
-SCM
-scm_make_polar (z1, z2)
- SCM z1;
- SCM z2;
+SCM_DEFINE (scm_make_polar, "make-polar", 2, 0, 0,
+ (SCM z1, SCM z2),
+ "")
+#define FUNC_NAME s_scm_make_polar
{
struct dpair xy;
- scm_two_doubles (z1, z2, s_make_polar, &xy);
+ scm_two_doubles (z1, z2, FUNC_NAME, &xy);
return scm_makdbl (xy.x * cos (xy.y), xy.x * sin (xy.y));
}
+#undef FUNC_NAME
-SCM_PROC (s_real_part, "real-part", 1, 0, 0, scm_real_part);
+SCM_GPROC (s_real_part, "real-part", 1, 0, 0, scm_real_part, g_real_part);
SCM
-scm_real_part (z)
- SCM z;
+scm_real_part (SCM z)
{
if (SCM_NINUMP (z))
{
SCM_ASRTGO (SCM_NIMP (z), badz);
if (SCM_BIGP (z))
return z;
-#ifndef SCM_RECKLESS
- if (!(SCM_INEXP (z)))
+ if (!(SCM_SLOPPY_INEXACTP (z)))
{
badz:
- scm_wta (z, (char *) SCM_ARG1, s_real_part);
+ SCM_WTA_DISPATCH_1 (g_real_part, z, SCM_ARG1, s_real_part);
}
-#endif
#else
- SCM_ASSERT (SCM_NIMP (z) && SCM_INEXP (z), z, SCM_ARG1, s_real_part);
+ SCM_GASSERT1 (SCM_SLOPPY_INEXACTP (z),
+ g_real_part, z, SCM_ARG1, s_real_part);
#endif
- if (SCM_CPLXP (z))
+ if (SCM_SLOPPY_COMPLEXP (z))
return scm_makdbl (SCM_REAL (z), 0.0);
}
return z;
-SCM_PROC (s_imag_part, "imag-part", 1, 0, 0, scm_imag_part);
+SCM_GPROC (s_imag_part, "imag-part", 1, 0, 0, scm_imag_part, g_imag_part);
SCM
-scm_imag_part (z)
- SCM z;
+scm_imag_part (SCM z)
{
if (SCM_INUMP (z))
return SCM_INUM0;
SCM_ASRTGO (SCM_NIMP (z), badz);
if (SCM_BIGP (z))
return SCM_INUM0;
-#ifndef SCM_RECKLESS
- if (!(SCM_INEXP (z)))
+ if (!(SCM_SLOPPY_INEXACTP (z)))
{
badz:
- scm_wta (z, (char *) SCM_ARG1, s_imag_part);
+ SCM_WTA_DISPATCH_1 (g_imag_part, z, SCM_ARG1, s_imag_part);
}
-#endif
#else
- SCM_ASSERT (SCM_NIMP (z) && SCM_INEXP (z), z, SCM_ARG1, s_imag_part);
+ SCM_GASSERT1 (SCM_SLOPPY_INEXACTP (z),
+ g_imag_part, z, SCM_ARG1, s_imag_part);
#endif
- if (SCM_CPLXP (z))
+ if (SCM_SLOPPY_COMPLEXP (z))
return scm_makdbl (SCM_IMAG (z), 0.0);
return scm_flo0;
}
-SCM_PROC (s_magnitude, "magnitude", 1, 0, 0, scm_magnitude);
+SCM_GPROC (s_magnitude, "magnitude", 1, 0, 0, scm_magnitude, g_magnitude);
SCM
-scm_magnitude (z)
- SCM z;
+scm_magnitude (SCM z)
{
if (SCM_INUMP (z))
return scm_abs (z);
SCM_ASRTGO (SCM_NIMP (z), badz);
if (SCM_BIGP (z))
return scm_abs (z);
-#ifndef SCM_RECKLESS
- if (!(SCM_INEXP (z)))
+ if (!(SCM_SLOPPY_INEXACTP (z)))
{
badz:
- scm_wta (z, (char *) SCM_ARG1, s_magnitude);
+ SCM_WTA_DISPATCH_1 (g_magnitude, z, SCM_ARG1, s_magnitude);
}
-#endif
#else
- SCM_ASSERT (SCM_NIMP (z) && SCM_INEXP (z), z, SCM_ARG1, s_magnitude);
+ SCM_GASSERT1 (SCM_SLOPPY_INEXACTP (z),
+ g_magnitude, z, SCM_ARG1, s_magnitude);
#endif
- if (SCM_CPLXP (z))
+ if (SCM_SLOPPY_COMPLEXP (z))
{
double i = SCM_IMAG (z), r = SCM_REAL (z);
return scm_makdbl (sqrt (i * i + r * r), 0.0);
-SCM_PROC (s_angle, "angle", 1, 0, 0, scm_angle);
+SCM_GPROC (s_angle, "angle", 1, 0, 0, scm_angle, g_angle);
SCM
-scm_angle (z)
- SCM z;
+scm_angle (SCM z)
{
double x, y = 0.0;
if (SCM_INUMP (z))
SCM_ASRTGO (SCM_NIMP (z), badz);
if (SCM_BIGP (z))
{
- x = (SCM_TYP16 (z) == scm_tc16_bigpos) ? 1.0 : -1.0;
+ x = (SCM_BIGSIGN (z)) ? -1.0 : 1.0;
goto do_angle;
}
-#ifndef SCM_RECKLESS
- if (!(SCM_INEXP (z)))
+ if (!(SCM_SLOPPY_INEXACTP (z)))
{
badz:
- scm_wta (z, (char *) SCM_ARG1, s_angle);
+ SCM_WTA_DISPATCH_1 (g_angle, z, SCM_ARG1, s_angle);
}
-#endif
#else
- SCM_ASSERT (SCM_NIMP (z) && SCM_INEXP (z), z, SCM_ARG1, s_angle);
+ SCM_GASSERT1 (SCM_SLOPPY_INEXACTP (z), g_angle, z, SCM_ARG1, s_angle);
#endif
- if (SCM_REALP (z))
+ if (SCM_SLOPPY_REALP (z))
{
x = SCM_REALPART (z);
goto do_angle;
}
-SCM_PROC (s_inexact_to_exact, "inexact->exact", 1, 0, 0, scm_inexact_to_exact);
-
-SCM
-scm_inexact_to_exact (z)
- SCM z;
+SCM_DEFINE (scm_inexact_to_exact, "inexact->exact", 1, 0, 0,
+ (SCM z),
+ "")
+#define FUNC_NAME s_scm_inexact_to_exact
{
if (SCM_INUMP (z))
return z;
if (SCM_BIGP (z))
return z;
#ifndef SCM_RECKLESS
- if (!(SCM_REALP (z)))
+ if (!(SCM_SLOPPY_REALP (z)))
{
badz:
- scm_wta (z, (char *) SCM_ARG1, s_inexact_to_exact);
+ SCM_WTA (1, z);
}
#endif
#else
- SCM_ASSERT (SCM_NIMP (z) && SCM_REALP (z), z, SCM_ARG1, s_inexact_to_exact);
+ SCM_VALIDATE_REAL (1,z);
#endif
#ifdef SCM_BIGDIG
{
return SCM_MAKINUM ((long) floor (SCM_REALPART (z) + 0.5));
#endif
}
+#undef FUNC_NAME
-#else /* ~SCM_FLOATS */
-SCM_PROC (s_trunc, "truncate", 1, 0, 0, scm_trunc);
-
-SCM
-scm_trunc (x)
- SCM x;
-{
- SCM_ASSERT (SCM_INUMP (x), x, SCM_ARG1, s_truncate);
- return x;
-}
-
-
-
-#endif /* SCM_FLOATS */
-
#ifdef SCM_BIGDIG
-#ifdef SCM_FLOATS
/* d must be integer */
SCM
-scm_dbl2big (d)
- double d;
+scm_dbl2big (double d)
{
scm_sizet i = 0;
long c;
double
-scm_big2dbl (b)
- SCM b;
+scm_big2dbl (SCM b)
{
double ans = 0.0;
scm_sizet i = SCM_NUMDIGS (b);
SCM_BIGDIG *digits = SCM_BDIGITS (b);
while (i--)
ans = digits[i] + SCM_BIGRAD * ans;
- if (scm_tc16_bigneg == SCM_TYP16 (b))
- return -ans;
+ if (SCM_BIGSIGN (b))
+ return - ans;
return ans;
}
#endif
-#endif
SCM
-scm_long2num (sl)
- long sl;
+scm_long2num (long sl)
{
if (!SCM_FIXABLE (sl))
{
#ifdef SCM_BIGDIG
return scm_long2big (sl);
#else
-#ifdef SCM_FLOATS
return scm_makdbl ((double) sl, 0.0);
-#else
- return SCM_BOOL_F;
-#endif
#endif
}
return SCM_MAKINUM (sl);
}
-#ifdef LONGLONGS
+#ifdef HAVE_LONG_LONGS
SCM
-scm_long_long2num (sl)
- long_long sl;
+scm_long_long2num (long_long sl)
{
if (!SCM_FIXABLE (sl))
{
#ifdef SCM_BIGDIG
return scm_long_long2big (sl);
#else
-#ifdef SCM_FLOATS
return scm_makdbl ((double) sl, 0.0);
-#else
- return SCM_BOOL_F;
-#endif
#endif
}
- return SCM_MAKINUM (sl);
+ else
+ {
+ /* we know that sl fits into an inum */
+ return SCM_MAKINUM ((scm_bits_t) sl);
+ }
}
#endif
SCM
-scm_ulong2num (sl)
- unsigned long sl;
+scm_ulong2num (unsigned long sl)
{
if (!SCM_POSFIXABLE (sl))
{
#ifdef SCM_BIGDIG
return scm_ulong2big (sl);
#else
-#ifdef SCM_FLOATS
return scm_makdbl ((double) sl, 0.0);
-#else
- return SCM_BOOL_F;
-#endif
#endif
}
return SCM_MAKINUM (sl);
long
-scm_num2long (num, pos, s_caller)
- SCM num;
- char *pos;
- const char *s_caller;
+scm_num2long (SCM num, char *pos, const char *s_caller)
{
long res;
+
if (SCM_INUMP (num))
{
res = SCM_INUM (num);
return res;
}
- SCM_ASRTGO (SCM_NIMP (num), errout);
-#ifdef SCM_FLOATS
- if (SCM_REALP (num))
+ SCM_ASRTGO (SCM_NIMP (num), wrong_type_arg);
+ if (SCM_SLOPPY_REALP (num))
{
- double u = SCM_REALPART (num);
+ volatile double u = SCM_REALPART (num);
+
res = u;
- if ((double) res == u)
- {
- return res;
- }
+ if (res != u)
+ goto out_of_range;
+ return res;
}
-#endif
#ifdef SCM_BIGDIG
if (SCM_BIGP (num))
{
- long oldres;
+ unsigned long oldres = 0;
scm_sizet l;
- res = 0;
- oldres = 0;
+ /* can't use res directly in case num is -2^31. */
+ unsigned long pos_res = 0;
+
for (l = SCM_NUMDIGS (num); l--;)
{
- res = SCM_BIGUP (res) + SCM_BDIGITS (num)[l];
- if (res < oldres)
- goto errout;
- oldres = res;
+ pos_res = SCM_BIGUP (pos_res) + SCM_BDIGITS (num)[l];
+ /* check for overflow. */
+ if (pos_res < oldres)
+ goto out_of_range;
+ oldres = pos_res;
+ }
+ if (SCM_BIGSIGN (num))
+ {
+ res = - pos_res;
+ if (res > 0)
+ goto out_of_range;
}
- if (SCM_TYP16 (num) == scm_tc16_bigpos)
- return res;
else
- return -res;
+ {
+ res = pos_res;
+ if (res < 0)
+ goto out_of_range;
+ }
+ return res;
}
#endif
- errout:
- scm_wta (num, pos, s_caller);
- return SCM_UNSPECIFIED;
+ wrong_type_arg:
+ scm_wrong_type_arg (s_caller, (int) pos, num);
+ out_of_range:
+ scm_out_of_range (s_caller, num);
}
-#ifdef LONGLONGS
+#ifdef HAVE_LONG_LONGS
long_long
-scm_num2long_long (num, pos, s_caller)
- SCM num;
- char *pos;
- const char *s_caller;
+scm_num2long_long (SCM num, char *pos, const char *s_caller)
{
long_long res;
+
if (SCM_INUMP (num))
{
- res = SCM_INUM ((long_long) num);
+ res = SCM_INUM (num);
return res;
}
- SCM_ASRTGO (SCM_NIMP (num), errout);
-#ifdef SCM_FLOATS
- if (SCM_REALP (num))
+ SCM_ASRTGO (SCM_NIMP (num), wrong_type_arg);
+ if (SCM_SLOPPY_REALP (num))
{
double u = SCM_REALPART (num);
- if (((SCM_MOST_NEGATIVE_FIXNUM * 4) <= u)
- && (u <= (SCM_MOST_POSITIVE_FIXNUM * 4 + 3)))
- {
- res = u;
- return res;
- }
+
+ res = u;
+ if ((res < 0 && u > 0) || (res > 0 && u < 0)) /* check for overflow. */
+ goto out_of_range;
+
+ return res;
}
-#endif
#ifdef SCM_BIGDIG
if (SCM_BIGP (num))
{
- scm_sizet l = SCM_NUMDIGS (num);
- SCM_ASRTGO (SCM_DIGSPERLONGLONG >= l, errout);
- res = 0;
- for (; l--;)
- res = SCM_LONGLONGBIGUP (res) + SCM_BDIGITS (num)[l];
+ unsigned long long oldres = 0;
+ scm_sizet l;
+ /* can't use res directly in case num is -2^63. */
+ unsigned long long pos_res = 0;
+
+ for (l = SCM_NUMDIGS (num); l--;)
+ {
+ pos_res = SCM_LONGLONGBIGUP (pos_res) + SCM_BDIGITS (num)[l];
+ /* check for overflow. */
+ if (pos_res < oldres)
+ goto out_of_range;
+ oldres = pos_res;
+ }
+ if (SCM_BIGSIGN (num))
+ {
+ res = - pos_res;
+ if (res > 0)
+ goto out_of_range;
+ }
+ else
+ {
+ res = pos_res;
+ if (res < 0)
+ goto out_of_range;
+ }
return res;
}
#endif
- errout:
- scm_wta (num, pos, s_caller);
- return SCM_UNSPECIFIED;
+ wrong_type_arg:
+ scm_wrong_type_arg (s_caller, (int) pos, num);
+ out_of_range:
+ scm_out_of_range (s_caller, num);
}
#endif
unsigned long
-scm_num2ulong (num, pos, s_caller)
- SCM num;
- char *pos;
- const char *s_caller;
+scm_num2ulong (SCM num, char *pos, const char *s_caller)
{
unsigned long res;
+
if (SCM_INUMP (num))
{
- res = SCM_INUM ((unsigned long) num);
+ if (SCM_INUM (num) < 0)
+ goto out_of_range;
+ res = SCM_INUM (num);
return res;
}
- SCM_ASRTGO (SCM_NIMP (num), errout);
-#ifdef SCM_FLOATS
- if (SCM_REALP (num))
+ SCM_ASRTGO (SCM_NIMP (num), wrong_type_arg);
+ if (SCM_SLOPPY_REALP (num))
{
double u = SCM_REALPART (num);
- if ((0 <= u) && (u <= (unsigned long) ~0L))
- {
- res = u;
- return res;
- }
+
+ res = u;
+ if (res != u)
+ goto out_of_range;
+ return res;
}
-#endif
#ifdef SCM_BIGDIG
if (SCM_BIGP (num))
{
- unsigned long oldres;
+ unsigned long oldres = 0;
scm_sizet l;
+
res = 0;
- oldres = 0;
for (l = SCM_NUMDIGS (num); l--;)
{
res = SCM_BIGUP (res) + SCM_BDIGITS (num)[l];
if (res < oldres)
- goto errout;
+ goto out_of_range;
oldres = res;
}
return res;
}
#endif
- errout:
- scm_wta (num, pos, s_caller);
- return SCM_UNSPECIFIED;
+ wrong_type_arg:
+ scm_wrong_type_arg (s_caller, (int) pos, num);
+ out_of_range:
+ scm_out_of_range (s_caller, num);
}
-#ifdef SCM_FLOATS
#ifndef DBL_DIG
-static void add1 SCM_P ((double f, double *fsum));
static void
-add1 (f, fsum)
- double f, *fsum;
+add1 (double f, double *fsum)
{
*fsum = f + 1.0;
}
#endif
-#endif
void
scm_init_numbers ()
{
-#ifdef SCM_FLOATS
- SCM_NEWCELL (scm_flo0);
-#ifdef SCM_SINGLES
- SCM_SETCAR (scm_flo0, scm_tc_flo);
- SCM_FLO (scm_flo0) = 0.0;
-#else
- SCM_SETCDR (scm_flo0, (SCM) scm_must_malloc (1L * sizeof (double), "real"));
- SCM_REAL (scm_flo0) = 0.0;
- SCM_SETCAR (scm_flo0, scm_tc_dblr);
-#endif
+ scm_add_feature ("complex");
+ scm_add_feature ("inexact");
+ SCM_NEWREAL (scm_flo0, 0.0);
#ifdef DBL_DIG
scm_dblprec = (DBL_DIG > 20) ? 20 : DBL_DIG;
#else
scm_dblprec = scm_dblprec - 1;
}
#endif /* DBL_DIG */
-#endif
-#include "numbers.x"
+#include "libguile/numbers.x"
}
+
+/*
+ Local Variables:
+ c-file-style: "gnu"
+ End:
+*/
HCoop / bpt / guile.git / blobdiff