X-Git-Url: https://git.hcoop.net/bpt/guile.git/blobdiff_plain/6e8d25a6954b00e1ff40976d95c8289cfa9fcca4..7ab3fdd51f6a34a77ff0d19c70b69d8cdfe71a11:/libguile/numbers.c diff --git a/libguile/numbers.c b/libguile/numbers.c index 3a74082b7..014cae9cf 100644 --- a/libguile/numbers.c +++ b/libguile/numbers.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995,1996,1997,1998, 1999 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 @@ -47,12 +47,14 @@ #include #include #include "_scm.h" -#include "genio.h" #include "unif.h" #include "feature.h" +#include "ports.h" #include "smob.h" +#include "strings.h" +#include "vectors.h" -#include "scm_validate.h" +#include "validate.h" #include "numbers.h" #define DIGITS '0':case '1':case '2':case '3':case '4':\ @@ -71,76 +73,55 @@ #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 -#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 */ -GUILE_PROC (scm_exact_p, "exact?", 1, 0, 0, +SCM_DEFINE (scm_exact_p, "exact?", 1, 0, 0, (SCM x), -"") + "") #define FUNC_NAME s_scm_exact_p { if (SCM_INUMP (x)) return SCM_BOOL_T; #ifdef SCM_BIGDIG - if (SCM_NIMP (x) && SCM_BIGP (x)) + if (SCM_BIGP (x)) return SCM_BOOL_T; #endif return SCM_BOOL_F; } #undef FUNC_NAME -GUILE_PROC (scm_odd_p, "odd?", 1, 0, 0, +SCM_DEFINE (scm_odd_p, "odd?", 1, 0, 0, (SCM n), -"") + "") #define FUNC_NAME s_scm_odd_p { #ifdef SCM_BIGDIG if (SCM_NINUMP (n)) { - SCM_VALIDATE_BIGINT(1,n); + SCM_VALIDATE_BIGINT (1,n); return SCM_BOOL(1 & SCM_BDIGITS (n)[0]); } #else - SCM_VALIDATE_INT(1,n); + SCM_VALIDATE_INUM (1,n); #endif return SCM_BOOL(4 & (int) n); } #undef FUNC_NAME -GUILE_PROC (scm_even_p, "even?", 1, 0, 0, +SCM_DEFINE (scm_even_p, "even?", 1, 0, 0, (SCM n), -"") + "") #define FUNC_NAME s_scm_even_p { #ifdef SCM_BIGDIG if (SCM_NINUMP (n)) { - SCM_VALIDATE_BIGINT(1,n); + SCM_VALIDATE_BIGINT (1,n); return SCM_NEGATE_BOOL(1 & SCM_BDIGITS (n)[0]); } #else - SCM_VALIDATE_INT(1,n); + SCM_VALIDATE_INUM (1,n); #endif return SCM_NEGATE_BOOL(4 & (int) n); } @@ -151,11 +132,12 @@ SCM_GPROC (s_abs, "abs", 1, 0, 0, scm_abs, g_abs); SCM scm_abs (SCM x) { + long int cx; #ifdef SCM_BIGDIG if (SCM_NINUMP (x)) { - SCM_GASSERT1 (SCM_NIMP (x) && SCM_BIGP (x), g_abs, x, SCM_ARG1, s_abs); - if (SCM_TYP16 (x) == scm_tc16_bigpos) + SCM_GASSERT1 (SCM_BIGP (x), g_abs, x, SCM_ARG1, s_abs); + if (!SCM_BIGSIGN (x)) return x; return scm_copybig (x, 0); } @@ -164,14 +146,14 @@ scm_abs (SCM x) #endif if (SCM_INUM (x) >= 0) return x; - x = - SCM_INUM (x); - if (!SCM_POSFIXABLE (x)) + cx = - SCM_INUM (x); + if (!SCM_POSFIXABLE (cx)) #ifdef SCM_BIGDIG - return scm_long2big (x); + return scm_long2big (cx); #else - scm_num_overflow (s_abs); + scm_num_overflow (s_abs); #endif - return SCM_MAKINUM (x); + return SCM_MAKINUM (cx); } SCM_GPROC (s_quotient, "quotient", 2, 0, 0, scm_quotient, g_quotient); @@ -183,12 +165,11 @@ scm_quotient (SCM x, SCM y) #ifdef SCM_BIGDIG if (SCM_NINUMP (x)) { - long w; - SCM_GASSERT2 (SCM_NIMP (x) && SCM_BIGP (x), + SCM_GASSERT2 (SCM_BIGP (x), g_quotient, x, y, SCM_ARG1, s_quotient); 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) ^ SCM_BIGSIGN (y), 2); @@ -201,28 +182,31 @@ scm_quotient (SCM x, SCM y) z = -z; if (z < SCM_BIGRAD) { - 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); + SCM sw = scm_copybig (x, + SCM_BIGSIGN (x) + ? (SCM_UNPACK (y) > 0) + : (SCM_UNPACK (y) < 0)); + scm_divbigdig (SCM_BDIGITS (sw), SCM_NUMDIGS (sw), (SCM_BIGDIG) z); + return scm_normbig (sw); } + { /* scope */ #ifndef SCM_DIGSTOOBIG - w = scm_pseudolong (z); + long 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); #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); - } #endif + } /* end scope */ } if (SCM_NINUMP (y)) { - if (!(SCM_NIMP (y) && SCM_BIGP (y))) + if (!SCM_BIGP (y)) { bady: SCM_WTA_DISPATCH_2 (g_quotient, x, y, SCM_ARG2, s_quotient); @@ -273,11 +257,11 @@ scm_remainder (SCM x, SCM y) #ifdef SCM_BIGDIG if (SCM_NINUMP (x)) { - SCM_GASSERT2 (SCM_NIMP (x) && SCM_BIGP (x), + 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); @@ -288,7 +272,7 @@ scm_remainder (SCM x, SCM y) } if (SCM_NINUMP (y)) { - if (!(SCM_NIMP (y) && SCM_BIGP (y))) + if (!SCM_BIGP (y)) { bady: SCM_WTA_DISPATCH_2 (g_remainder, x, y, SCM_ARG2, s_remainder); @@ -330,11 +314,11 @@ scm_modulo (SCM x, SCM y) #ifdef SCM_BIGDIG if (SCM_NINUMP (x)) { - SCM_GASSERT2 (SCM_NIMP (x) && SCM_BIGP (x), + SCM_GASSERT2 (SCM_BIGP (x), g_modulo, x, y, SCM_ARG1, s_modulo); 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 (y), @@ -347,7 +331,7 @@ scm_modulo (SCM x, SCM y) } if (SCM_NINUMP (y)) { - if (!(SCM_NIMP (y) && SCM_BIGP (y))) + if (!SCM_BIGP (y)) { bady: SCM_WTA_DISPATCH_2 (g_modulo, x, y, SCM_ARG2, s_modulo); @@ -377,7 +361,7 @@ SCM_GPROC1 (s_gcd, "gcd", scm_tc7_asubr, scm_gcd, g_gcd); SCM 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: @@ -385,14 +369,14 @@ scm_gcd (SCM x, SCM y) if (SCM_NINUMP (x)) { big_gcd: - SCM_GASSERT2 (SCM_NIMP (x) && SCM_BIGP (x), + 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_GASSERT2 (SCM_NIMP (y) && SCM_BIGP (y), + SCM_GASSERT2 (SCM_BIGP (y), g_gcd, x, y, SCM_ARGn, s_gcd); if (SCM_BIGSIGN (y)) y = scm_copybig (y, 0); @@ -400,9 +384,11 @@ scm_gcd (SCM x, SCM 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; @@ -419,7 +405,7 @@ scm_gcd (SCM x, SCM y) } if (SCM_NINUMP (y)) { - t = x; + SCM t = x; x = y; y = t; goto big_gcd; @@ -483,11 +469,11 @@ scm_lcm (SCM n1, SCM n2) #else SCM_GASSERT2 (SCM_INUMP (n1) || SCM_UNBNDP (n1) - || (SCM_NIMP (n1) && SCM_BIGP (n1)), + || (SCM_BIGP (n1)), g_lcm, n1, n2, SCM_ARG1, s_lcm); SCM_GASSERT2 (SCM_INUMP (n2) || SCM_UNBNDP (n2) - || (SCM_NIMP (n2) && SCM_BIGP (n2)), + || (SCM_BIGP (n2)), g_lcm, n1, n2, SCM_ARGn, s_lcm); #endif if (SCM_UNBNDP (n2)) @@ -503,224 +489,583 @@ scm_lcm (SCM n1, SCM n2) 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 -GUILE_PROC1 (scm_logand, "logand", scm_tc7_asubr, - (SCM n1, SCM n2), -"") -#define FUNC_NAME s_scm_logand + +/* 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) { - int i1, i2; - if (SCM_UNBNDP (n2)) - { - if (SCM_UNBNDP (n1)) - return SCM_MAKINUM (-1); - return n1; - } - SCM_VALIDATE_INT_COPY(1,n1,i1); - SCM_VALIDATE_INT_COPY(2,n2,i2); - return scm_ulong2num (i1 & i2); + 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; } -#undef FUNC_NAME -GUILE_PROC1 (scm_logior, "logior", scm_tc7_asubr, - (SCM n1, SCM n2), -"") -#define FUNC_NAME s_scm_logior +SCM scm_copy_smaller(SCM_BIGDIG *x, scm_sizet nx, int zsgn) { - int i1, i2; - if (SCM_UNBNDP (n2)) - { - if (SCM_UNBNDP (n1)) - return SCM_INUM0; - return n1; - } - SCM_VALIDATE_INT_COPY(1,n1,i1); - SCM_VALIDATE_INT_COPY(2,n2,i2); - return scm_ulong2num (i1 | i2); + 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; } -#undef FUNC_NAME -GUILE_PROC1 (scm_logxor, "logxor", scm_tc7_asubr, - (SCM n1, SCM n2), -"") -#define FUNC_NAME s_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 */ { - int i1, i2; - if (SCM_UNBNDP (n2)) - { - if (SCM_UNBNDP (n1)) - return SCM_INUM0; - return n1; - } - SCM_VALIDATE_INT_COPY(1,n1,i1); - SCM_VALIDATE_INT_COPY(2,n2,i2); - return scm_ulong2num (i1 ^ i2); + 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; } -#undef FUNC_NAME -GUILE_PROC (scm_logtest, "logtest", 2, 0, 0, - (SCM n1, SCM n2), -"") -#define FUNC_NAME s_scm_logtest +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 */ { - int i1, i2; - SCM_VALIDATE_INT_COPY(1,n1,i1); - SCM_VALIDATE_INT_COPY(2,n2,i2); - return SCM_BOOL(i1 & i2); + 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_normbig(z); } -#undef FUNC_NAME +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 */ +{ + 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); +} -GUILE_PROC (scm_logbit_p, "logbit?", 2, 0, 0, - (SCM n1, SCM n2), -"") -#define FUNC_NAME s_scm_logbit_p +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 */ { - int i1, i2; - SCM_VALIDATE_INT_COPY(1,n1,i1); - SCM_VALIDATE_INT_COPY(2,n2,i2); - return SCM_BOOL((1 << i1) & i2); + 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; } -#undef FUNC_NAME -#else +#endif -GUILE_PROC1 (scm_logand, "logand", scm_tc7_asubr, +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 { - int i1, i2; 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; } - SCM_VALIDATE_INT_COPY(1,n1,i1); - SCM_VALIDATE_INT_COPY(2,n2,i2); - return SCM_MAKINUM (i1 & i2); +#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)); } #undef FUNC_NAME -GUILE_PROC1 (scm_logior, "logior", scm_tc7_asubr, +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 { - int i1, i2; 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; } - SCM_VALIDATE_INT_COPY(1,n1,i1); - SCM_VALIDATE_INT_COPY(2,n2,i2); - return SCM_MAKINUM (i1 | i2); +#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)); } #undef FUNC_NAME -GUILE_PROC1 (scm_logxor, "logxor", scm_tc7_asubr, +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 { - int i1, i2; 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; } - SCM_VALIDATE_INT_COPY(1,n1,i1); - SCM_VALIDATE_INT_COPY(2,n2,i2); - return SCM_MAKINUM (i1 ^ i2); +#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)); } #undef FUNC_NAME -GUILE_PROC (scm_logtest, "logtest", 2, 0, 0, +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 { - int i1, i2; - SCM_VALIDATE_INT_COPY(1,n1,i1); - SCM_VALIDATE_INT_COPY(2,n2,i2); - return SCM_BOOL(i1 & i2); +#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; } #undef FUNC_NAME -GUILE_PROC (scm_logbit_p, "logbit?", 2, 0, 0, - (SCM n1, SCM n2), -"") + +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 { - int i1, i2; - SCM_VALIDATE_INT_MIN_COPY(1,n1,0,i1); - SCM_VALIDATE_INT_COPY(2,n2,i2); - return SCM_BOOL((1 << i1) & i2); + 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 + return ((1L << SCM_INUM(index)) & SCM_INUM(j)) ? SCM_BOOL_T : SCM_BOOL_F; } #undef FUNC_NAME -#endif -GUILE_PROC (scm_lognot, "lognot", 1, 0, 0, +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_VALIDATE_INT(1,n); return scm_difference (SCM_MAKINUM (-1L), n); } #undef FUNC_NAME -GUILE_PROC (scm_integer_expt, "integer-expt", 2, 0, 0, - (SCM z1, SCM z2), -"") +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_INUM0 == n || acc == n) + return n; + else if (SCM_MAKINUM (-1L) == n) + return SCM_BOOL_F == scm_even_p (k) ? n : acc; #endif - SCM_VALIDATE_INT_COPY(2,z2,i2); + SCM_VALIDATE_ULONG_COPY (2,k,i2); if (i2 < 0) { i2 = -i2; - z1 = scm_divide (z1, SCM_UNDEFINED); + n = scm_divide (n, SCM_UNDEFINED); } while (1) { if (0 == i2) return acc; if (1 == i2) - return scm_product (acc, z1); + return scm_product (acc, n); if (i2 & 1) - acc = scm_product (acc, z1); - z1 = scm_product (z1, z1); + acc = scm_product (acc, n); + n = scm_product (n, n); i2 >>= 1; } } #undef FUNC_NAME -GUILE_PROC (scm_ash, "ash", 2, 0, 0, +SCM_DEFINE (scm_ash, "ash", 2, 0, 0, (SCM n, SCM cnt), -"") + "Returns an integer equivalent to\n" + "@code{(inexact->exact (floor (* @var{int} (expt 2 @var{count}))))}.@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 { /* GJB:FIXME:: what is going on here? */ - SCM res = SCM_INUM (n); - SCM_VALIDATE_INT(2,cnt); + SCM res = SCM_PACK (SCM_INUM (n)); + SCM_VALIDATE_INUM (2,cnt); #ifdef SCM_BIGDIG if (cnt < 0) { @@ -734,7 +1079,7 @@ GUILE_PROC (scm_ash, "ash", 2, 0, 0, else return scm_product (n, scm_integer_expt (SCM_MAKINUM (2), cnt)); #else - SCM_VALIDATE_INT(1,n) + SCM_VALIDATE_INUM (1,n) cnt = SCM_INUM (cnt); if (cnt < 0) return SCM_MAKINUM (SCM_SRS (res, -cnt)); @@ -747,28 +1092,36 @@ GUILE_PROC (scm_ash, "ash", 2, 0, 0, #undef FUNC_NAME /* GJB:FIXME: do not use SCMs as integers! */ -GUILE_PROC (scm_bit_extract, "bit-extract", 3, 0, 0, +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_VALIDATE_INT(1,n); - SCM_VALIDATE_INT_MIN(2,start,0); - SCM_VALIDATE_INT_MIN(3,end,0); - start = SCM_INUM (start); - end = SCM_INUM (end); - SCM_ASSERT (end >= start, SCM_MAKINUM (end), SCM_OUTOFRANGE, FUNC_NAME); + 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_VALIDATE_INT(1,n); + 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 @@ -776,9 +1129,21 @@ static const char scm_logtab[] = { 0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4 }; -GUILE_PROC (scm_logcount, "logcount", 1, 0, 0, +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; @@ -788,7 +1153,7 @@ GUILE_PROC (scm_logcount, "logcount", 1, 0, 0, { scm_sizet i; SCM_BIGDIG *ds, d; - SCM_VALIDATE_BIGINT(1,n); + SCM_VALIDATE_BIGINT (1,n); if (SCM_BIGSIGN (n)) return scm_logcount (scm_difference (SCM_MAKINUM (-1L), n)); ds = SCM_BDIGITS (n); @@ -798,7 +1163,7 @@ GUILE_PROC (scm_logcount, "logcount", 1, 0, 0, return SCM_MAKINUM (c); } #else - SCM_VALIDATE_INT(1,n); + SCM_VALIDATE_INUM (1,n); #endif if ((nn = SCM_INUM (n)) < 0) nn = -1 - nn; @@ -813,9 +1178,18 @@ static const char scm_ilentab[] = { 0, 1, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4 }; -GUILE_PROC (scm_integer_length, "integer-length", 1, 0, 0, +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; @@ -825,7 +1199,7 @@ GUILE_PROC (scm_integer_length, "integer-length", 1, 0, 0, if (SCM_NINUMP (n)) { SCM_BIGDIG *ds, d; - SCM_VALIDATE_BIGINT(1,n); + SCM_VALIDATE_BIGINT (1,n); if (SCM_BIGSIGN (n)) return scm_integer_length (scm_difference (SCM_MAKINUM (-1L), n)); ds = SCM_BDIGITS (n); @@ -838,7 +1212,7 @@ GUILE_PROC (scm_integer_length, "integer-length", 1, 0, 0, return SCM_MAKINUM (c - 4 + l); } #else - SCM_VALIDATE_INT(1,n); + SCM_VALIDATE_INUM (1,n); #endif if ((nn = SCM_INUM (n)) < 0) nn = -1 - nn; @@ -858,15 +1232,17 @@ static const char s_bignum[] = "bignum"; SCM 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; } @@ -879,7 +1255,7 @@ scm_big2inum (SCM b, scm_sizet l) 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); @@ -896,7 +1272,7 @@ SCM 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; @@ -908,7 +1284,7 @@ scm_adjbig (SCM b, scm_sizet nlen) (long) (nsiz * sizeof (SCM_BIGDIG)), s_adjbig)); SCM_SETCHARS (b, digits); - SCM_SETNUMDIGS (b, nsiz, SCM_TYP16 (b)); + SCM_SETNUMDIGS (b, nsiz, SCM_BIGSIGN (b)); } SCM_ALLOW_INTS; return b; @@ -1138,7 +1514,7 @@ SCM 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); @@ -1164,7 +1540,7 @@ scm_addbig (SCM_BIGDIG *x, scm_sizet nx, int xsgn, SCM bigy, int sgny) { num = 1; i = 0; - SCM_SETCAR (z, SCM_CAR (z) ^ 0x0100); + SCM_SETCAR (z, SCM_UNPACK_CAR (z) ^ SCM_BIGSIGNFLAG); do { num += (SCM_BIGRAD - 1) - zds[i]; @@ -1507,7 +1883,6 @@ scm_divbigbig (SCM_BIGDIG *x, scm_sizet nx, SCM_BIGDIG *y, scm_sizet ny, int sgn /*** NUMBERS -> STRINGS ***/ -#ifdef SCM_FLOATS int scm_dblprec; static const double fx[] = { 0.0, 5e-1, 5e-2, 5e-3, 5e-4, 5e-5, @@ -1662,22 +2037,21 @@ static scm_sizet 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. @@ -1735,7 +2109,7 @@ big2str (SCM b, unsigned int radix) radpow *= radix; radct++; } - s[0] = scm_tc16_bigneg == SCM_TYP16 (b) ? '-' : '+'; + s[0] = SCM_BIGSIGN (b) ? '-' : '+'; while ((i || radmod) && j) { if (k == 0) @@ -1764,14 +2138,13 @@ big2str (SCM b, unsigned int radix) #endif -GUILE_PROC (scm_number_to_string, "number->string", 1, 1, 0, +SCM_DEFINE (scm_number_to_string, "number->string", 1, 1, 0, (SCM x, SCM radix), -"") + "") #define FUNC_NAME s_scm_number_to_string { int base; - SCM_VALIDATE_INT_MIN_DEF_COPY(2,radix,2,10,base); -#ifdef SCM_FLOATS + SCM_VALIDATE_INUM_MIN_DEF_COPY (2,radix,2,10,base); if (SCM_NINUMP (x)) { char num_buf[SCM_FLOBUFLEN]; @@ -1780,30 +2153,18 @@ GUILE_PROC (scm_number_to_string, "number->string", 1, 1, 0, if (SCM_BIGP (x)) 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, FUNC_NAME); + 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) base); - } -#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, @@ -1817,21 +2178,23 @@ GUILE_PROC (scm_number_to_string, "number->string", 1, 1, 0, /* 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 (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 (SCM exp, SCM port, scm_print_state *pstate) @@ -2004,8 +2367,6 @@ scm_istr2int (char *str, long len, long radix) return scm_adjbig (res, blen); } -#ifdef SCM_FLOATS - SCM scm_istr2flo (char *str, long len, long radix) { @@ -2209,7 +2570,7 @@ scm_istr2flo (char *str, long len, long radix) { case DIGITS: expon = expon * 10 + c - '0'; - if (expon > MAXEXP) + if (expon > SCM_MAXEXP) return SCM_BOOL_F; /* exponent too large */ break; default: @@ -2263,9 +2624,9 @@ scm_istr2flo (char *str, long len, long radix) { /* polar input for complex number */ /* get a `real' for scm_angle */ second = scm_istr2flo (&str[i], (long) (len - i), radix); - if (!(SCM_NIMP (second) && 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)); @@ -2282,16 +2643,15 @@ scm_istr2flo (char *str, long len, long radix) return scm_makdbl (res, lead_sgn); /* get a `ureal' for complex part */ second = scm_istr2flo (&str[i], (long) ((len - i) - 1), radix); - if (! (SCM_NIMP (second) && 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 */ @@ -2357,24 +2717,22 @@ scm_istring2number (char *str, long len, long radix) 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; } -GUILE_PROC (scm_string_to_number, "string->number", 1, 1, 0, +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; int base; - SCM_VALIDATE_ROSTRING(1,str); - SCM_VALIDATE_INT_MIN_DEF_COPY(2,radix,2,10,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), base); @@ -2383,43 +2741,21 @@ GUILE_PROC (scm_string_to_number, "string->number", 1, 1, 0, #undef FUNC_NAME /*** END strs->nums ***/ -#ifdef SCM_FLOATS - SCM -scm_makdbl (double x, double y) +scm_make_real (double x) { SCM z; - if ((y == 0.0) && (x == 0.0)) - return scm_flo0; - 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_NEWSMOB(z,scm_tc_flo,NULL); - SCM_FLO (z) = x; - SCM_ALLOW_INTS; - return z; - } -#endif /* def SCM_SINGLES */ - SCM_NEWSMOB(z,scm_tc_dblr,scm_must_malloc (1L * sizeof (double), "real")); - } - else - { - SCM_NEWSMOB(z,scm_tc_dblc,scm_must_malloc (2L * sizeof (double), "comkplex")); - 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 (SCM x, SCM y) @@ -2431,61 +2767,51 @@ scm_bigequal (SCM x, SCM y) return SCM_BOOL_F; } - - SCM -scm_floequal (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_REGISTER_PROC (s_number_p, "number?", 1, 0, 0, scm_number_p); -GUILE_PROC (scm_number_p, "complex?", 1, 0, 0, +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)) - return SCM_BOOL_T; -#else -#ifdef SCM_BIGDIG - if (SCM_NIMP (x) && SCM_NUMP (x)) + if (SCM_NUMP (x)) return SCM_BOOL_T; -#endif -#endif return SCM_BOOL_F; } #undef FUNC_NAME -#ifdef SCM_FLOATS SCM_REGISTER_PROC (s_real_p, "real?", 1, 0, 0, scm_real_p); -GUILE_PROC (scm_real_p, "rational?", 1, 0, 0, +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)) @@ -2497,9 +2823,9 @@ GUILE_PROC (scm_real_p, "rational?", 1, 0, 0, -GUILE_PROC (scm_integer_p, "integer?", 1, 0, 0, +SCM_DEFINE (scm_integer_p, "integer?", 1, 0, 0, (SCM x), -"") + "") #define FUNC_NAME s_scm_integer_p { double r; @@ -2511,9 +2837,9 @@ GUILE_PROC (scm_integer_p, "integer?", 1, 0, 0, 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)) @@ -2524,17 +2850,13 @@ GUILE_PROC (scm_integer_p, "integer?", 1, 0, 0, -#endif /* SCM_FLOATS */ - -GUILE_PROC (scm_inexact_p, "inexact?", 1, 0, 0, +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 @@ -2547,12 +2869,11 @@ SCM_GPROC1 (s_eq_p, "=", scm_tc7_rpsubr, scm_num_eq_p, g_eq_p); SCM scm_num_eq_p (SCM x, SCM y) { -#ifdef SCM_FLOATS SCM t; if (SCM_NINUMP (x)) { #ifdef SCM_BIGDIG - if (!(SCM_NIMP (x))) + if (!SCM_NIMP (x)) { badx: SCM_WTA_DISPATCH_2 (g_eq_p, x, y, SCM_ARG1, s_eq_p); @@ -2564,15 +2885,15 @@ scm_num_eq_p (SCM x, SCM y) SCM_ASRTGO (SCM_NIMP (y), bady); if (SCM_BIGP (y)) return SCM_BOOL(0 == scm_bigcomp (x, y)); - SCM_ASRTGO (SCM_INEXP (y), bady); + 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_GASSERT2 (SCM_NIMP (x) && SCM_INEXP (x), + SCM_GASSERT2 (SCM_SLOPPY_INEXACTP (x), g_eq_p, x, y, SCM_ARG1, s_eq_p); #endif if (SCM_INUMP (y)) @@ -2591,17 +2912,27 @@ scm_num_eq_p (SCM x, SCM 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_NEGATE_BOOL(SCM_CPLXP (y)); + 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)) { @@ -2609,48 +2940,25 @@ scm_num_eq_p (SCM x, SCM y) SCM_ASRTGO (SCM_NIMP (y), bady); if (SCM_BIGP (y)) return SCM_BOOL_F; - if (!(SCM_INEXP (y))) + if (!SCM_SLOPPY_INEXACTP (y)) { bady: SCM_WTA_DISPATCH_2 (g_eq_p, x, y, SCM_ARGn, s_eq_p); } #else - if (!(SCM_NIMP (y) && SCM_INEXP (y))) + if (!SCM_SLOPPY_INEXACTP (y)) { bady: SCM_WTA_DISPATCH_2 (g_eq_p, x, y, SCM_ARGn, s_eq_p); } #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_GASSERT2 (SCM_NIMP (x) && SCM_BIGP (x), - g_eq_p, x, y, SCM_ARG1, s_eq_p); - if (SCM_INUMP (y)) - return SCM_BOOL_F; - SCM_ASRTGO (SCM_NIMP (y) && SCM_BIGP (y), bady); - return SCM_BOOL(0 == scm_bigcomp (x, y)); - } - if (SCM_NINUMP (y)) - { - if (!(SCM_NIMP (y) && SCM_BIGP (y))) - { - bady: - SCM_WTA_DISPATCH_2 (g_eq_p, x, y, SCM_ARGn, s_eq_p); - } - 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_GASSERT2 (SCM_INUMP (x), g_eq_p, x, y, SCM_ARG1, s_eq_p); - SCM_GASSERT2 (SCM_INUMP (y), g_eq_p, x, y, SCM_ARGn, s_eq_p); -#endif -#endif return SCM_BOOL((long) x == (long) y); } @@ -2661,11 +2969,10 @@ SCM_GPROC1 (s_less_p, "<", scm_tc7_rpsubr, scm_less_p, g_less_p); SCM scm_less_p (SCM x, SCM y) { -#ifdef SCM_FLOATS if (SCM_NINUMP (x)) { #ifdef SCM_BIGDIG - if (!(SCM_NIMP (x))) + if (!SCM_NIMP (x)) { badx: SCM_WTA_DISPATCH_2 (g_less_p, x, y, SCM_ARG1, s_less_p); @@ -2677,14 +2984,14 @@ scm_less_p (SCM x, SCM y) SCM_ASRTGO (SCM_NIMP (y), bady); if (SCM_BIGP (y)) return SCM_BOOL(1 == scm_bigcomp (x, y)); - SCM_ASRTGO (SCM_REALP (y), bady); + 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_GASSERT2 (SCM_NIMP (x) && SCM_REALP (x), + SCM_GASSERT2 (SCM_SLOPPY_REALP (x), g_less_p, x, y, SCM_ARG1, s_less_p); #endif if (SCM_INUMP (y)) @@ -2695,9 +3002,9 @@ scm_less_p (SCM x, SCM y) SCM_ASRTGO (SCM_NIMP (y), bady); if (SCM_BIGP (y)) return SCM_BOOL(SCM_REALPART (x) < scm_big2dbl (y)); - 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_BOOL(SCM_REALPART (x) < SCM_REALPART (y)); } @@ -2707,13 +3014,13 @@ scm_less_p (SCM x, SCM y) SCM_ASRTGO (SCM_NIMP (y), bady); if (SCM_BIGP (y)) return SCM_NEGATE_BOOL(SCM_BIGSIGN (y)); - if (!(SCM_REALP (y))) + if (!SCM_SLOPPY_REALP (y)) { bady: SCM_WTA_DISPATCH_2 (g_less_p, x, y, SCM_ARGn, s_less_p); } #else - if (!(SCM_NIMP (y) && SCM_REALP (y))) + if (!SCM_SLOPPY_REALP (y)) { bady: SCM_WTA_DISPATCH_2 (g_less_p, x, y, SCM_ARGn, s_less_p); @@ -2723,38 +3030,13 @@ scm_less_p (SCM x, SCM y) ? SCM_BOOL_T : SCM_BOOL_F); } -#else -#ifdef SCM_BIGDIG - if (SCM_NINUMP (x)) - { - SCM_GASSERT2 (SCM_NIMP (x) && SCM_BIGP (x), - g_less_p, x, y, SCM_ARG1, s_less_p); - if (SCM_INUMP (y)) - return SCM_BOOL(SCM_BIGSIGN (x)); - SCM_ASRTGO (SCM_NIMP (y) && SCM_BIGP (y), bady); - return SCM_BOOL(1 == scm_bigcomp (x, y)); - } - if (SCM_NINUMP (y)) - { - if (!(SCM_NIMP (y) && SCM_BIGP (y))) - { - bady: - SCM_WTA_DISPATCH_2 (g_less_p, x, y, SCM_ARGn, s_less_p); - } - return SCM_NEGATE_BOOL(SCM_BIGSIGN (y)); - } -#else - SCM_GASSERT2 (SCM_INUMP (x), g_less_p, x, y, SCM_ARG1, s_less_p); - SCM_GASSERT2 (SCM_INUMP (y), g_less_p, x, y, SCM_ARGn, s_less_p); -#endif -#endif return SCM_BOOL((long) x < (long) y); } -GUILE_PROC1 (scm_gr_p, ">", scm_tc7_rpsubr, +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); @@ -2763,9 +3045,9 @@ GUILE_PROC1 (scm_gr_p, ">", scm_tc7_rpsubr, -GUILE_PROC1 (scm_leq_p, "<=", scm_tc7_rpsubr, +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)); @@ -2774,9 +3056,9 @@ GUILE_PROC1 (scm_leq_p, "<=", scm_tc7_rpsubr, -GUILE_PROC1 (scm_geq_p, ">=", scm_tc7_rpsubr, +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)); @@ -2790,36 +3072,27 @@ SCM_GPROC (s_zero_p, "zero?", 1, 0, 0, scm_zero_p, g_zero_p); SCM 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; - if (!(SCM_INEXP (z))) + if (!SCM_SLOPPY_INEXACTP (z)) { badz: SCM_WTA_DISPATCH_1 (g_zero_p, z, SCM_ARG1, s_zero_p); } #else - SCM_GASSERT1 (SCM_NIMP (z) && SCM_INEXP (z), + SCM_GASSERT1 (SCM_SLOPPY_INEXACTP (z), g_zero_p, z, SCM_ARG1, s_zero_p); #endif - return SCM_BOOL(z == scm_flo0); - } -#else -#ifdef SCM_BIGDIG - if (SCM_NINUMP (z)) - { - SCM_GASSERT1 (SCM_NIMP (z) && SCM_BIGP (z), - g_zero_p, 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_GASSERT1 (SCM_INUMP (z), g_zero_p, z, SCM_ARG1, s_zero_p); -#endif -#endif return SCM_BOOL(z == SCM_INUM0); } @@ -2830,37 +3103,24 @@ SCM_GPROC (s_positive_p, "positive?", 1, 0, 0, scm_positive_p, g_positive_p); SCM 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_BOOL(SCM_TYP16 (x) == scm_tc16_bigpos); - if (!(SCM_REALP (x))) + return SCM_BOOL (!SCM_BIGSIGN (x)); + if (!SCM_SLOPPY_REALP (x)) { badx: SCM_WTA_DISPATCH_1 (g_positive_p, x, SCM_ARG1, s_positive_p); } #else - SCM_GASSERT1 (SCM_NIMP (x) && SCM_REALP (x), + SCM_GASSERT1 (SCM_SLOPPY_REALP (x), g_positive_p, x, SCM_ARG1, s_positive_p); #endif return SCM_BOOL(SCM_REALPART (x) > 0.0); } -#else -#ifdef SCM_BIGDIG - if (SCM_NINUMP (x)) - { - SCM_GASSERT1 (SCM_NIMP (x) && SCM_BIGP (x), - g_positive_p, x, SCM_ARG1, s_positive_p); - return SCM_BOOL(SCM_TYP16 (x) == scm_tc16_bigpos); - } -#else - SCM_GASSERT1 (SCM_INUMP (x), g_positive_p, x, SCM_ARG1, s_positive_p); -#endif -#endif - return SCM_BOOL(x > SCM_INUM0); + return SCM_BOOL(SCM_INUM(x) > 0); } @@ -2870,37 +3130,24 @@ SCM_GPROC (s_negative_p, "negative?", 1, 0, 0, scm_negative_p, g_negative_p); SCM 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_NEGATE_BOOL(SCM_TYP16 (x) == scm_tc16_bigpos); - if (!(SCM_REALP (x))) + return SCM_BOOL (SCM_BIGSIGN (x)); + if (!(SCM_SLOPPY_REALP (x))) { badx: SCM_WTA_DISPATCH_1 (g_negative_p, x, SCM_ARG1, s_negative_p); } #else - SCM_GASSERT1 (SCM_NIMP (x) && SCM_REALP (x), + SCM_GASSERT1 (SCM_SLOPPY_REALP (x), g_negative_p, x, SCM_ARG1, s_negative_p); #endif return SCM_BOOL(SCM_REALPART (x) < 0.0); } -#else -#ifdef SCM_BIGDIG - if (SCM_NINUMP (x)) - { - SCM_GASSERT1 (SCM_NIMP (x) && SCM_BIGP (x), - g_negative_p, x, SCM_ARG1, s_negative_p); - return SCM_BOOL(SCM_TYP16 (x) == scm_tc16_bigneg); - } -#else - SCM_GASSERT1 (SCM_INUMP (x), g_negative_p, x, SCM_ARG1, s_negative_p); -#endif -#endif - return SCM_BOOL(x < SCM_INUM0); + return SCM_BOOL(SCM_INUM(x) < 0); } @@ -2909,9 +3156,7 @@ SCM_GPROC1 (s_max, "max", scm_tc7_asubr, scm_max, g_max); SCM scm_max (SCM x, SCM y) { -#ifdef SCM_FLOATS double z; -#endif if (SCM_UNBNDP (y)) { SCM_GASSERT0 (!SCM_UNBNDP (x), @@ -2919,7 +3164,6 @@ scm_max (SCM x, SCM y) SCM_GASSERT1 (SCM_NUMBERP (x), g_max, x, SCM_ARG1, s_max); return x; } -#ifdef SCM_FLOATS if (SCM_NINUMP (x)) { #ifdef SCM_BIGDIG @@ -2935,13 +3179,13 @@ scm_max (SCM x, SCM 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), badx2); + SCM_ASRTGO (SCM_SLOPPY_REALP (x), badx2); #else - SCM_GASSERT2 (SCM_NIMP (x) && SCM_REALP (x), + SCM_GASSERT2 (SCM_SLOPPY_REALP (x), g_max, x, y, SCM_ARG1, s_max); #endif if (SCM_INUMP (y)) @@ -2954,9 +3198,9 @@ scm_max (SCM x, SCM 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; } @@ -2966,13 +3210,13 @@ scm_max (SCM x, SCM y) SCM_ASRTGO (SCM_NIMP (y), bady); if (SCM_BIGP (y)) return SCM_BIGSIGN (y) ? x : y; - if (!(SCM_REALP (y))) + if (!(SCM_SLOPPY_REALP (y))) { bady: SCM_WTA_DISPATCH_2 (g_max, x, y, SCM_ARGn, s_max); } #else - if (!(SCM_NIMP (y) && SCM_REALP (y))) + if (!SCM_SLOPPY_REALP (y)) { bady: SCM_WTA_DISPATCH_2 (g_max, x, y, SCM_ARGn, s_max); @@ -2982,35 +3226,12 @@ scm_max (SCM x, SCM y) ? y : scm_makdbl (z, 0.0)); } -#else -#ifdef SCM_BIGDIG - if (SCM_NINUMP (x)) - { - SCM_GASSERT2 (SCM_NIMP (x) && SCM_BIGP (x), - g_max, x, y, 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)) - { - if (!(SCM_NIMP (y) && SCM_BIGP (y))) - { - bady: - SCM_WTA_DISPATCH_2 (g_max, x, y, SCM_ARGn, s_max); - } - return SCM_BIGSIGN (y) ? x : y; - } -#else - SCM_GASSERT2 (SCM_INUMP (x), g_max, x, y, SCM_ARG1, s_max); - SCM_GASSERT2 (SCM_INUMP (y), g_max, x, y, SCM_ARGn, 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_GPROC1 (s_min, "min", scm_tc7_asubr, scm_min, g_min); @@ -3018,9 +3239,7 @@ SCM_GPROC1 (s_min, "min", scm_tc7_asubr, scm_min, g_min); SCM scm_min (SCM x, SCM y) { -#ifdef SCM_FLOATS double z; -#endif if (SCM_UNBNDP (y)) { SCM_GASSERT0 (!SCM_UNBNDP (x), @@ -3028,11 +3247,10 @@ scm_min (SCM x, SCM y) SCM_GASSERT1 (SCM_NUMBERP (x), g_min, x, SCM_ARG1, s_min); return x; } -#ifdef SCM_FLOATS if (SCM_NINUMP (x)) { #ifdef SCM_BIGDIG - if (!(SCM_NIMP (x))) + if (!SCM_NIMP (x)) { badx2: SCM_WTA_DISPATCH_2 (g_min, x, y, SCM_ARG1, s_min); @@ -3044,13 +3262,13 @@ scm_min (SCM x, SCM 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), badx2); + SCM_ASRTGO (SCM_SLOPPY_REALP (x), badx2); #else - SCM_GASSERT2 (SCM_NIMP (x) && SCM_REALP (x), + SCM_GASSERT2 (SCM_SLOPPY_REALP (x), g_min, x, y, SCM_ARG1, s_min); #endif if (SCM_INUMP (y)) @@ -3063,9 +3281,9 @@ scm_min (SCM x, SCM 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; } @@ -3075,13 +3293,13 @@ scm_min (SCM x, SCM y) SCM_ASRTGO (SCM_NIMP (y), bady); if (SCM_BIGP (y)) return SCM_BIGSIGN (y) ? y : x; - if (!(SCM_REALP (y))) + if (!(SCM_SLOPPY_REALP (y))) { bady: SCM_WTA_DISPATCH_2 (g_min, x, y, SCM_ARGn, s_min); } #else - if (!(SCM_NIMP (y) && SCM_REALP (y))) + if (!SCM_SLOPPY_REALP (y)) { bady: SCM_WTA_DISPATCH_2 (g_min, x, y, SCM_ARGn, s_min); @@ -3091,31 +3309,6 @@ scm_min (SCM x, SCM y) ? y : scm_makdbl (z, 0.0)); } -#else -#ifdef SCM_BIGDIG - if (SCM_NINUMP (x)) - { - SCM_GASSERT2 (SCM_NIMP (x) && SCM_BIGP (x), - g_min, x, y, 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)) - { - if (!(SCM_NIMP (y) && SCM_BIGP (y))) - { - bady: - SCM_WTA_DISPATCH_2 (g_min, x, y, SCM_ARGn, s_min); - } - return SCM_BIGSIGN (y) ? y : x; - } -#else - SCM_GASSERT2 (SCM_INUMP (x), g_min, x, y, SCM_ARG1, s_min); - SCM_GASSERT2 (SCM_INUMP (y), g_min, x, y, SCM_ARGn, s_min); -#endif -#endif return ((long) x > (long) y) ? y : x; } @@ -3124,6 +3317,10 @@ scm_min (SCM x, SCM y) SCM_GPROC1 (s_sum, "+", scm_tc7_asubr, scm_sum, g_sum); +/* + This is sick, sick, sick code. + + */ SCM scm_sum (SCM x, SCM y) { @@ -3134,11 +3331,9 @@ scm_sum (SCM x, SCM y) 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 +# ifdef SCM_BIGDIG if (!SCM_NIMP (x)) { badx2: @@ -3148,9 +3343,7 @@ scm_sum (SCM x, SCM y) { if (SCM_INUMP (y)) { - t = x; - x = y; - y = t; + SCM_SWAP(x,y); goto intbig; } SCM_ASRTGO (SCM_NIMP (y), bady); @@ -3158,150 +3351,97 @@ scm_sum (SCM x, SCM y) { 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), badx2); -#else - SCM_ASRTGO (SCM_NIMP (x) && SCM_INEXP (x), badx2); -#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; } - else if (!(SCM_INEXP (y))) + else if (!SCM_SLOPPY_INEXACTP (y)) { bady: SCM_WTA_DISPATCH_2 (g_sum, x, y, SCM_ARGn, s_sum); } -#else - if (!(SCM_NIMP (y) && SCM_INEXP (y))) +# else /* SCM_BIGDIG */ + if (!SCM_SLOPPY_INEXACTP (y)) { bady: SCM_WTA_DISPATCH_2 (g_sum, x, y, SCM_ARGn, s_sum); } -#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 +# ifndef SCM_DIGSTOOBIG long z = scm_pseudolong (SCM_INUM (x)); return scm_addbig ((SCM_BIGDIG *) & z, SCM_DIGSPERLONG, - (x < 0) ? 0x0100 : 0, + (x < 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, + return scm_addbig (zdigs, SCM_DIGSPERLONG, (x < 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), badx2); - 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)) - { - if (!(SCM_NIMP (y) && SCM_BIGP (y))) - { - bady: - SCM_WTA_DISPATCH_2 (g_sum, x, y, SCM_ARGn, s_sum); - } - 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), badx2); - SCM_GASSERT2 (SCM_INUMP (y), g_sum, x, y, SCM_ARGn, 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 */ } @@ -3309,13 +3449,16 @@ scm_sum (SCM x, SCM y) SCM_GPROC1 (s_difference, "-", scm_tc7_asubr, scm_difference, g_difference); +/* + HWN:FIXME:: This is sick,sick, sick code. Rewrite me. +*/ SCM scm_difference (SCM x, SCM y) { -#ifdef SCM_FLOATS + long int cx = 0; if (SCM_NINUMP (x)) { - if (!(SCM_NIMP (x))) + if (!SCM_NIMP (x)) { if (SCM_UNBNDP (y)) { @@ -3342,9 +3485,12 @@ scm_difference (SCM x, SCM y) : 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))); @@ -3356,37 +3502,59 @@ scm_difference (SCM x, SCM 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), badx2); + 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), badx2); - 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)) @@ -3398,111 +3566,38 @@ scm_difference (SCM x, SCM y) #ifndef SCM_DIGSTOOBIG long z = scm_pseudolong (SCM_INUM (x)); return scm_addbig ((SCM_BIGDIG *) & z, SCM_DIGSPERLONG, - (x < 0) ? 0x0100 : 0, - y, 0x0100); + (x < 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); + return scm_addbig (zdigs, SCM_DIGSPERLONG, (x < 0) ? SCM_BIGSIGNFLAG : 0, + y, SCM_BIGSIGNFLAG); #endif } - if (!(SCM_INEXP (y))) + if (!SCM_SLOPPY_INEXACTP (y)) { bady: SCM_WTA_DISPATCH_2 (g_difference, x, y, SCM_ARGn, s_difference); } #else - if (!(SCM_NIMP (y) && SCM_INEXP (y))) + if (!SCM_SLOPPY_INEXACTP (y)) { bady: SCM_WTA_DISPATCH_2 (g_difference, x, y, SCM_ARGn, s_difference); } #endif return scm_makdbl (SCM_INUM (x) - SCM_REALPART (y), - SCM_CPLXP (y) ? -SCM_IMAG (y) : 0.0); + SCM_SLOPPY_COMPLEXP (y) ? -SCM_IMAG (y) : 0.0); } -#else -#ifdef SCM_BIGDIG - if (SCM_NINUMP (x)) - { - SCM_GASSERT2 (SCM_NIMP (x) && SCM_BIGP (x), - g_difference, x, y, 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)) - { - if (!(SCM_NIMP (y) && SCM_BIGP (y))) - { - bady: - SCM_WTA_DISPATCH_2 (g_difference, x, y, SCM_ARGn, s_difference); - } - { -#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 - } - } -#else - SCM_GASSERT2 (SCM_INUMP (x), g_difference, x, y, SCM_ARG1, s_difference); - if (SCM_UNBNDP (y)) - { - x = -SCM_INUM (x); - goto checkx; - } - SCM_GASSERT2 (SCM_INUMP (y), g_difference, x, y, SCM_ARGn, 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 } @@ -3521,7 +3616,6 @@ scm_product (SCM x, SCM y) SCM_GASSERT1 (SCM_NUMBERP (x), g_product, x, SCM_ARG1, s_product); return x; } -#ifdef SCM_FLOATS if (SCM_NINUMP (x)) { SCM t; @@ -3545,17 +3639,17 @@ scm_product (SCM x, SCM 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), badx2); + SCM_ASRTGO (SCM_SLOPPY_INEXACTP (x), badx2); #else - SCM_ASRTGO (SCM_NIMP (x) && SCM_INEXP (x), badx2); + SCM_ASRTGO (SCM_SLOPPY_INEXACTP (x), badx2); #endif if (SCM_INUMP (y)) { @@ -3573,21 +3667,21 @@ scm_product (SCM x, SCM y) y = t; goto bigreal; } - else if (!(SCM_INEXP (y))) + else if (!(SCM_SLOPPY_INEXACTP (y))) { bady: SCM_WTA_DISPATCH_2 (g_product, x, y, SCM_ARGn, s_product); } #else - if (!(SCM_NIMP (y) && SCM_INEXP (y))) + if (!SCM_SLOPPY_INEXACTP (y)) { bady: SCM_WTA_DISPATCH_2 (g_product, x, y, SCM_ARGn, s_product); } #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) @@ -3597,7 +3691,7 @@ scm_product (SCM x, SCM 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); } @@ -3627,63 +3721,14 @@ scm_product (SCM x, SCM y) #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), badx2); - 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)); + SCM_SLOPPY_COMPLEXP (y) ? SCM_INUM (x) * SCM_IMAG (y) : 0.0); } - if (SCM_NINUMP (y)) - { - if (!(SCM_NIMP (y) && SCM_BIGP (y))) - { - bady: - SCM_WTA_DISPATCH_2 (g_product, x, y, SCM_ARGn, s_product); - } - 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 - } - } -#else - SCM_ASRTGO (SCM_INUMP (x), badx2); - SCM_GASSERT (SCM_INUMP (y), g_product, x, y, SCM_ARGn, s_product); -#endif -#endif { long i, j, k; i = SCM_INUM (x); @@ -3712,11 +3757,7 @@ scm_product (SCM x, SCM y) #endif } #else -#ifdef SCM_FLOATS return scm_makdbl (((double) i) * ((double) j), 0.0); -#else - scm_num_overflow (s_product); -#endif #endif return y; } @@ -3729,16 +3770,18 @@ 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; */ } @@ -3747,7 +3790,6 @@ SCM_GPROC1 (s_divide, "/", scm_tc7_asubr, scm_divide, g_divide); SCM scm_divide (SCM x, SCM y) { -#ifdef SCM_FLOATS double d, r, i, a; if (SCM_NINUMP (x)) { @@ -3772,8 +3814,8 @@ scm_divide (SCM x, SCM y) 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); @@ -3783,10 +3825,9 @@ scm_divide (SCM x, SCM y) #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); @@ -3804,10 +3845,11 @@ scm_divide (SCM x, SCM y) : 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]; @@ -3817,25 +3859,25 @@ scm_divide (SCM x, SCM y) 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), badx2); + SCM_ASRTGO (SCM_SLOPPY_INEXACTP (x), badx2); if (SCM_INUMP (y)) { d = SCM_INUM (y); @@ -3848,19 +3890,19 @@ scm_divide (SCM x, SCM 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); @@ -3880,19 +3922,19 @@ scm_divide (SCM x, SCM y) SCM_ASRTGO (SCM_NIMP (y), bady); if (SCM_BIGP (y)) return scm_makdbl (SCM_INUM (x) / scm_big2dbl (y), 0.0); - if (!(SCM_INEXP (y))) + if (!(SCM_SLOPPY_INEXACTP (y))) { bady: SCM_WTA_DISPATCH_2 (g_divide, x, y, SCM_ARGn, s_divide); } #else - if (!(SCM_NIMP (y) && SCM_INEXP (y))) + if (!SCM_SLOPPY_INEXACTP (y)) { bady: SCM_WTA_DISPATCH_2 (g_divide, x, y, SCM_ARGn, s_divide); } #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: @@ -3901,84 +3943,6 @@ scm_divide (SCM x, SCM y) 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_GASSERT2 (SCM_NIMP (x) && SCM_BIGP (x), - g_divide, x, y, 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)) - { - if (!(SCM_NIMP (y) && SCM_BIGP (y))) - { - bady: - SCM_WTA_DISPATCH_2 (g_divide, x, y, SCM_ARGn, s_divide); - } - goto ov; - } -#else - SCM_GASSERT2 (SCM_INUMP (x), g_divide, x, y, SCM_ARG1, s_divide); - if (SCM_UNBNDP (y)) - { - if ((SCM_MAKINUM (1L) == x) || (SCM_MAKINUM (-1L) == x)) - return x; - goto ov; - } - SCM_GASSERT2 (SCM_INUMP (y), g_divide, x, y, SCM_ARGn, s_divide); -#endif -#endif { long z = SCM_INUM (y); if ((0 == z) || SCM_INUM (x) % z) @@ -3989,21 +3953,14 @@ scm_divide (SCM x, SCM y) #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_GPROC1 (s_asinh, "$asinh", scm_tc7_cxr, (SCM (*)()) scm_asinh, g_asinh); double @@ -4112,14 +4069,14 @@ scm_two_doubles (SCM z1, SCM z2, const char *sstring, struct dpair *xy) 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 @@ -4135,14 +4092,14 @@ scm_two_doubles (SCM z1, SCM z2, const char *sstring, struct dpair *xy) 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 @@ -4152,9 +4109,9 @@ scm_two_doubles (SCM z1, SCM z2, const char *sstring, struct dpair *xy) -GUILE_PROC (scm_sys_expt, "$expt", 2, 0, 0, +SCM_DEFINE (scm_sys_expt, "$expt", 2, 0, 0, (SCM z1, SCM z2), -"") + "") #define FUNC_NAME s_scm_sys_expt { struct dpair xy; @@ -4165,9 +4122,9 @@ GUILE_PROC (scm_sys_expt, "$expt", 2, 0, 0, -GUILE_PROC (scm_sys_atan2, "$atan2", 2, 0, 0, +SCM_DEFINE (scm_sys_atan2, "$atan2", 2, 0, 0, (SCM z1, SCM z2), -"") + "") #define FUNC_NAME s_scm_sys_atan2 { struct dpair xy; @@ -4178,9 +4135,9 @@ GUILE_PROC (scm_sys_atan2, "$atan2", 2, 0, 0, -GUILE_PROC (scm_make_rectangular, "make-rectangular", 2, 0, 0, +SCM_DEFINE (scm_make_rectangular, "make-rectangular", 2, 0, 0, (SCM z1, SCM z2), -"") + "") #define FUNC_NAME s_scm_make_rectangular { struct dpair xy; @@ -4191,9 +4148,9 @@ GUILE_PROC (scm_make_rectangular, "make-rectangular", 2, 0, 0, -GUILE_PROC (scm_make_polar, "make-polar", 2, 0, 0, +SCM_DEFINE (scm_make_polar, "make-polar", 2, 0, 0, (SCM z1, SCM z2), -"") + "") #define FUNC_NAME s_scm_make_polar { struct dpair xy; @@ -4216,16 +4173,16 @@ scm_real_part (SCM z) SCM_ASRTGO (SCM_NIMP (z), badz); if (SCM_BIGP (z)) return z; - if (!(SCM_INEXP (z))) + if (!(SCM_SLOPPY_INEXACTP (z))) { badz: SCM_WTA_DISPATCH_1 (g_real_part, z, SCM_ARG1, s_real_part); } #else - SCM_GASSERT1 (SCM_NIMP (z) && SCM_INEXP (z), + 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; @@ -4244,16 +4201,16 @@ scm_imag_part (SCM z) SCM_ASRTGO (SCM_NIMP (z), badz); if (SCM_BIGP (z)) return SCM_INUM0; - if (!(SCM_INEXP (z))) + if (!(SCM_SLOPPY_INEXACTP (z))) { badz: SCM_WTA_DISPATCH_1 (g_imag_part, z, SCM_ARG1, s_imag_part); } #else - SCM_GASSERT1 (SCM_NIMP (z) && SCM_INEXP (z), + 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; } @@ -4271,16 +4228,16 @@ scm_magnitude (SCM z) SCM_ASRTGO (SCM_NIMP (z), badz); if (SCM_BIGP (z)) return scm_abs (z); - if (!(SCM_INEXP (z))) + if (!(SCM_SLOPPY_INEXACTP (z))) { badz: SCM_WTA_DISPATCH_1 (g_magnitude, z, SCM_ARG1, s_magnitude); } #else - SCM_GASSERT1 (SCM_NIMP (z) && SCM_INEXP (z), + 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); @@ -4306,18 +4263,18 @@ scm_angle (SCM 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; } - if (!(SCM_INEXP (z))) + if (!(SCM_SLOPPY_INEXACTP (z))) { badz: SCM_WTA_DISPATCH_1 (g_angle, z, SCM_ARG1, s_angle); } #else - SCM_GASSERT1 (SCM_NIMP (z) && SCM_INEXP (z), g_angle, 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; @@ -4329,9 +4286,9 @@ scm_angle (SCM z) } -GUILE_PROC (scm_inexact_to_exact, "inexact->exact", 1, 0, 0, +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)) @@ -4341,14 +4298,14 @@ GUILE_PROC (scm_inexact_to_exact, "inexact->exact", 1, 0, 0, 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, FUNC_NAME); + SCM_WTA (1, z); } #endif #else - SCM_VALIDATE_REAL(1,z); + SCM_VALIDATE_REAL (1,z); #endif #ifdef SCM_BIGDIG { @@ -4371,22 +4328,7 @@ GUILE_PROC (scm_inexact_to_exact, "inexact->exact", 1, 0, 0, -#else /* ~SCM_FLOATS */ -SCM_GPROC (s_trunc, "truncate", 1, 0, 0, scm_trunc, g_trunc); - -SCM -scm_trunc (SCM x) -{ - SCM_GASSERT2 (SCM_INUMP (x), g_trunc, x, y, SCM_ARG1, s_truncate); - return x; -} - - - -#endif /* SCM_FLOATS */ - #ifdef SCM_BIGDIG -#ifdef SCM_FLOATS /* d must be integer */ SCM @@ -4428,12 +4370,11 @@ scm_big2dbl (SCM 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 @@ -4444,11 +4385,7 @@ scm_long2num (long 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); @@ -4465,11 +4402,7 @@ scm_long_long2num (long_long 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); @@ -4486,11 +4419,7 @@ scm_ulong2num (unsigned long 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); @@ -4508,8 +4437,7 @@ scm_num2long (SCM num, char *pos, const char *s_caller) return res; } SCM_ASRTGO (SCM_NIMP (num), wrong_type_arg); -#ifdef SCM_FLOATS - if (SCM_REALP (num)) + if (SCM_SLOPPY_REALP (num)) { volatile double u = SCM_REALPART (num); @@ -4518,7 +4446,6 @@ scm_num2long (SCM num, char *pos, const char *s_caller) goto out_of_range; return res; } -#endif #ifdef SCM_BIGDIG if (SCM_BIGP (num)) { @@ -4535,16 +4462,16 @@ scm_num2long (SCM num, char *pos, const char *s_caller) goto out_of_range; oldres = pos_res; } - if (SCM_TYP16 (num) == scm_tc16_bigpos) + if (SCM_BIGSIGN (num)) { - res = pos_res; - if (res < 0) + res = - pos_res; + if (res > 0) goto out_of_range; } else { - res = -pos_res; - if (res > 0) + res = pos_res; + if (res < 0) goto out_of_range; } return res; @@ -4571,8 +4498,7 @@ scm_num2long_long (SCM num, char *pos, const char *s_caller) return res; } SCM_ASRTGO (SCM_NIMP (num), wrong_type_arg); -#ifdef SCM_FLOATS - if (SCM_REALP (num)) + if (SCM_SLOPPY_REALP (num)) { double u = SCM_REALPART (num); @@ -4582,7 +4508,6 @@ scm_num2long_long (SCM num, char *pos, const char *s_caller) return res; } -#endif #ifdef SCM_BIGDIG if (SCM_BIGP (num)) { @@ -4599,16 +4524,16 @@ scm_num2long_long (SCM num, char *pos, const char *s_caller) goto out_of_range; oldres = pos_res; } - if (SCM_TYP16 (num) == scm_tc16_bigpos) + if (SCM_BIGSIGN (num)) { - res = pos_res; - if (res < 0) + res = - pos_res; + if (res > 0) goto out_of_range; } else { - res = -pos_res; - if (res > 0) + res = pos_res; + if (res < 0) goto out_of_range; } return res; @@ -4636,8 +4561,7 @@ scm_num2ulong (SCM num, char *pos, const char *s_caller) return res; } SCM_ASRTGO (SCM_NIMP (num), wrong_type_arg); -#ifdef SCM_FLOATS - if (SCM_REALP (num)) + if (SCM_SLOPPY_REALP (num)) { double u = SCM_REALPART (num); @@ -4646,7 +4570,6 @@ scm_num2ulong (SCM num, char *pos, const char *s_caller) goto out_of_range; return res; } -#endif #ifdef SCM_BIGDIG if (SCM_BIGP (num)) { @@ -4671,7 +4594,6 @@ scm_num2ulong (SCM num, char *pos, const char *s_caller) } -#ifdef SCM_FLOATS #ifndef DBL_DIG static void add1 (double f, double *fsum) @@ -4679,22 +4601,15 @@ add1 (double f, double *fsum) *fsum = f + 1.0; } #endif -#endif void scm_init_numbers () { - scm_add_feature("complex"); -#ifdef SCM_FLOATS - scm_add_feature("inexact"); -#ifdef SCM_SINGLES - SCM_NEWSMOB(scm_flo0,scm_tc_flo,NULL); -#else - SCM_NEWSMOB(scm_flo0,scm_tc_dblr,scm_must_malloc (1L * sizeof (double), "real")); - SCM_REAL (scm_flo0) = 0.0; -#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 @@ -4711,6 +4626,5 @@ scm_init_numbers () scm_dblprec = scm_dblprec - 1; } #endif /* DBL_DIG */ -#endif #include "numbers.x" }