diff options
author | Jim Blandy <jimb@red-bean.com> | 1998-10-14 07:32:13 +0000 |
---|---|---|
committer | Jim Blandy <jimb@red-bean.com> | 1998-10-14 07:32:13 +0000 |
commit | cf7c17e976fa95e8c90dc0e842ae1e855f56213b (patch) | |
tree | f31035f6aa1f341c70918ead6995c68068323c00 | |
parent | ae6f9e24ce42f7157ffb391a6875a9a7d1e9e435 (diff) | |
download | guile-cf7c17e976fa95e8c90dc0e842ae1e855f56213b.tar.gz |
* (__scm.h, alist.c, eval.c, feature.c, gsubr.c, numbers.c,
options.c): Rename RECKLESS -> SCM_RECKLESS, CAUTIOUS ->
SCM_CAUTIOUS; this way, 1) there's only one version of each flag
to define (we used to have both RECKLESS and SCM_RECKLESS), and 2)
if we want to use them in a header file some day, we can. (Thanks
to Michael Livshin.)
-rw-r--r-- | libguile/__scm.h | 8 | ||||
-rw-r--r-- | libguile/alist.c | 2 | ||||
-rw-r--r-- | libguile/eval.c | 44 | ||||
-rw-r--r-- | libguile/feature.c | 2 | ||||
-rw-r--r-- | libguile/gsubr.c | 2 | ||||
-rw-r--r-- | libguile/numbers.c | 96 | ||||
-rw-r--r-- | libguile/options.c | 2 |
7 files changed, 78 insertions, 78 deletions
diff --git a/libguile/__scm.h b/libguile/__scm.h index 2e78fca73..5feffaa9d 100644 --- a/libguile/__scm.h +++ b/libguile/__scm.h @@ -48,17 +48,17 @@ * These may be defined or undefined. */ -/* If the compile FLAG `CAUTIOUS' is #defined then the number of +/* If the compile FLAG `SCM_CAUTIOUS' is #defined then the number of * arguments is always checked for application of closures. If the - * compile FLAG `RECKLESS' is #defined then they are not checked. + * compile FLAG `SCM_RECKLESS' is #defined then they are not checked. * Otherwise, number of argument checks for closures are made only when * the function position (whose value is the closure) of a combination is * not an ILOC or GLOC. When the function position of a combination is a * symbol it will be checked only the first time it is evaluated because * it will then be replaced with an ILOC or GLOC. */ -#undef RECKLESS -#define CAUTIOUS +#undef SCM_RECKLESS +#define SCM_CAUTIOUS /* After looking up a local for the first time, rewrite the * code graph, caching its position. diff --git a/libguile/alist.c b/libguile/alist.c index 4a375c945..ebf9cf577 100644 --- a/libguile/alist.c +++ b/libguile/alist.c @@ -161,7 +161,7 @@ scm_assv(x, alist) SCM_ASRTGO(SCM_NIMP(tmp) && SCM_CONSP(tmp), badlst); if SCM_NFALSEP(scm_eqv_p(SCM_CAR(tmp), x)) return tmp; } -# ifndef RECKLESS +# ifndef SCM_RECKLESS if (!(SCM_NULLP(alist))) badlst: scm_wta(alist, (char *)SCM_ARG2, s_assv); # endif diff --git a/libguile/eval.c b/libguile/eval.c index e1f323474..cfc7a475c 100644 --- a/libguile/eval.c +++ b/libguile/eval.c @@ -292,7 +292,7 @@ scm_lookupcar1 (SCM vloc, SCM genv) if (SCM_CAR (fl) == var) { #ifdef MEMOIZE_LOCALS -#ifndef RECKLESS /* letrec inits to SCM_UNDEFINED */ +#ifndef SCM_RECKLESS /* letrec inits to SCM_UNDEFINED */ if (SCM_UNBNDP (SCM_CAR (*al))) { env = SCM_EOL; @@ -330,7 +330,7 @@ scm_lookupcar1 (SCM vloc, SCM genv) else var = vcell; } -#ifndef RECKLESS +#ifndef SCM_RECKLESS if (SCM_NNULLP (env) || SCM_UNBNDP (SCM_CDR (var))) { var = SCM_CAR (var); @@ -892,7 +892,7 @@ scm_m_define (x, env) #endif arg1 = scm_sym2vcell (proc, env_top_level (env), SCM_BOOL_T); #if 0 -#ifndef RECKLESS +#ifndef SCM_RECKLESS if (SCM_NIMP (SCM_CDR (arg1)) && ((SCM) SCM_SNAME (SCM_CDR (arg1)) == proc) && (SCM_CDR (arg1) != x)) scm_warn ("redefining built-in ", SCM_CHARS (proc)); @@ -926,7 +926,7 @@ scm_m_undefine (x, env) ASSYNT (SCM_NFALSEP (arg1) && !SCM_UNBNDP (SCM_CDR (arg1)), x, "variable already unbound ", s_undefine); #if 0 -#ifndef RECKLESS +#ifndef SCM_RECKLESS if (SCM_NIMP (SCM_CDR (arg1)) && ((SCM) SCM_SNAME (SCM_CDR (arg1)) == x)) scm_warn ("undefining built-in ", SCM_CHARS (x)); else @@ -1249,7 +1249,7 @@ scm_unmemocopy (x, env) return unmemocopy (x, env); } -#ifndef RECKLESS +#ifndef SCM_RECKLESS int scm_badargsp (formals, args) @@ -1284,7 +1284,7 @@ scm_eval_args (l, env, proc) SCM results = SCM_EOL, *lloc = &results, res; while (SCM_NIMP (l)) { -#ifdef CAUTIOUS +#ifdef SCM_CAUTIOUS if (SCM_IMP (l)) goto wrongnumargs; else if (SCM_CONSP (l)) @@ -1308,7 +1308,7 @@ scm_eval_args (l, env, proc) lloc = SCM_CDRLOC (*lloc); l = SCM_CDR (l); } -#ifdef CAUTIOUS +#ifdef SCM_CAUTIOUS if (SCM_NNULLP (l)) { wrongnumargs: @@ -1479,7 +1479,7 @@ scm_deval_args (l, env, proc, lloc) SCM *results = lloc, res; while (SCM_NIMP (l)) { -#ifdef CAUTIOUS +#ifdef SCM_CAUTIOUS if (SCM_IMP (l)) goto wrongnumargs; else if (SCM_CONSP (l)) @@ -1503,7 +1503,7 @@ scm_deval_args (l, env, proc, lloc) lloc = SCM_CDRLOC (*lloc); l = SCM_CDR (l); } -#ifdef CAUTIOUS +#ifdef SCM_CAUTIOUS if (SCM_NNULLP (l)) { wrongnumargs: @@ -1941,7 +1941,7 @@ dispatch: #ifdef DEVAL debug.info->a.args = t.arg1; #endif -#ifndef RECKLESS +#ifndef SCM_RECKLESS if (scm_badargsp (SCM_CAR (SCM_CODE (proc)), t.arg1)) goto wrongnumargs; #endif @@ -2018,8 +2018,8 @@ dispatch: case (127 & SCM_ILOC00): proc = *scm_ilookup (SCM_CAR (x), env); SCM_ASRTGO (SCM_NIMP (proc), badfun); -#ifndef RECKLESS -#ifdef CAUTIOUS +#ifndef SCM_RECKLESS +#ifdef SCM_CAUTIOUS goto checkargs; #endif #endif @@ -2030,8 +2030,8 @@ dispatch: case scm_tcs_cons_gloc: proc = SCM_GLOC_VAL (SCM_CAR (x)); SCM_ASRTGO (SCM_NIMP (proc), badfun); -#ifndef RECKLESS -#ifdef CAUTIOUS +#ifndef SCM_RECKLESS +#ifdef SCM_CAUTIOUS goto checkargs; #endif #endif @@ -2111,8 +2111,8 @@ dispatch: else proc = SCM_CEVAL (SCM_CAR (x), env); SCM_ASRTGO (SCM_NIMP (proc), badfun); -#ifndef RECKLESS -#ifdef CAUTIOUS +#ifndef SCM_RECKLESS +#ifdef SCM_CAUTIOUS checkargs: #endif if (SCM_CLOSUREP (proc)) @@ -2210,7 +2210,7 @@ evapply: /* must handle macros by here */ x = SCM_CDR (x); -#ifdef CAUTIOUS +#ifdef SCM_CAUTIOUS if (SCM_IMP (x)) goto wrongnumargs; else if (SCM_CONSP (x)) @@ -2346,7 +2346,7 @@ evapply: goto badfun; } } -#ifdef CAUTIOUS +#ifdef SCM_CAUTIOUS if (SCM_IMP (x)) goto wrongnumargs; else if (SCM_CONSP (x)) @@ -2462,7 +2462,7 @@ evapply: goto cdrxbegin; } } -#ifdef CAUTIOUS +#ifdef SCM_CAUTIOUS if (SCM_IMP (x) || SCM_NECONSP (x)) goto wrongnumargs; #endif @@ -2944,7 +2944,7 @@ tail: #else arg1 = (SCM_UNBNDP (arg1) ? SCM_EOL : scm_cons (arg1, args)); #endif -#ifndef RECKLESS +#ifndef SCM_RECKLESS if (scm_badargsp (SCM_CAR (SCM_CODE (proc)), arg1)) goto wrongnumargs; #endif @@ -3085,7 +3085,7 @@ scm_map (proc, arg1, args) } args = scm_vector (scm_cons (arg1, args)); ve = SCM_VELTS (args); -#ifndef RECKLESS +#ifndef SCM_RECKLESS for (i = SCM_LENGTH (args) - 1; i >= 0; i--) SCM_ASSERT (SCM_NIMP (ve[i]) && SCM_CONSP (ve[i]), args, SCM_ARG2, s_map); #endif @@ -3130,7 +3130,7 @@ scm_for_each (proc, arg1, args) } args = scm_vector (scm_cons (arg1, args)); ve = SCM_VELTS (args); -#ifndef RECKLESS +#ifndef SCM_RECKLESS for (i = SCM_LENGTH (args) - 1; i >= 0; i--) SCM_ASSERT (SCM_NIMP (ve[i]) && SCM_CONSP (ve[i]), args, SCM_ARG2, s_for_each); #endif diff --git a/libguile/feature.c b/libguile/feature.c index e59ab3399..627358111 100644 --- a/libguile/feature.c +++ b/libguile/feature.c @@ -94,7 +94,7 @@ void scm_init_feature() { scm_loc_features = SCM_CDRLOC (scm_sysintern ("*features*", SCM_EOL)); -#ifdef RECKLESS +#ifdef SCM_RECKLESS scm_add_feature("reckless"); #endif #ifndef _Windows diff --git a/libguile/gsubr.c b/libguile/gsubr.c index 57390d93c..9f6457851 100644 --- a/libguile/gsubr.c +++ b/libguile/gsubr.c @@ -122,7 +122,7 @@ scm_gsubr_apply(args) #endif args = SCM_CDR(args); for (i = 0; i < SCM_GSUBR_REQ(typ); i++) { -#ifndef RECKLESS +#ifndef SCM_RECKLESS if (SCM_IMP(args)) wnargs: scm_wrong_num_args (SCM_SNAME(SCM_GSUBR_PROC(self))); #endif diff --git a/libguile/numbers.c b/libguile/numbers.c index d1818b02b..6b6895b52 100644 --- a/libguile/numbers.c +++ b/libguile/numbers.c @@ -198,7 +198,7 @@ scm_quotient(x, y) #endif } if SCM_NINUMP(y) { -# ifndef RECKLESS +# ifndef SCM_RECKLESS if (!(SCM_NIMP(y) && SCM_BIGP(y))) bady: scm_wta(y, (char *)SCM_ARG2, s_quotient); # endif @@ -254,7 +254,7 @@ scm_remainder(x, y) return scm_divbigint(x, z, SCM_BIGSIGN(x), 0); } if SCM_NINUMP(y) { -# ifndef RECKLESS +# ifndef SCM_RECKLESS if (!(SCM_NIMP(y) && SCM_BIGP(y))) bady: scm_wta(y, (char *)SCM_ARG2, s_remainder); # endif @@ -300,7 +300,7 @@ scm_modulo(x, y) return scm_divbigint(x, z, y < 0, (SCM_BIGSIGN(x) ? (y > 0) : (y < 0)) ? 1 : 0); } if SCM_NINUMP(y) { -# ifndef RECKLESS +# ifndef SCM_RECKLESS if (!(SCM_NIMP(y) && SCM_BIGP(y))) bady: scm_wta(y, (char *)SCM_ARG2, s_modulo); # endif @@ -1439,7 +1439,7 @@ scm_number_to_string(x, radix) # ifdef SCM_BIGDIG SCM_ASRTGO(SCM_NIMP(x), badx); if SCM_BIGP(x) return big2str(x, (unsigned int)SCM_INUM(radix)); -# ifndef RECKLESS +# ifndef SCM_RECKLESS if (!(SCM_INEXP(x))) badx: scm_wta(x, (char *)SCM_ARG1, s_number_to_string); # endif @@ -2034,7 +2034,7 @@ scm_num_eq_p (x, y) SCM t; if SCM_NINUMP(x) { # ifdef SCM_BIGDIG -# ifndef RECKLESS +# ifndef SCM_RECKLESS if (!(SCM_NIMP(x))) badx: scm_wta(x, (char *)SCM_ARG1, s_eq_p); # endif @@ -2067,12 +2067,12 @@ scm_num_eq_p (x, y) # ifdef SCM_BIGDIG SCM_ASRTGO(SCM_NIMP(y), bady); if SCM_BIGP(y) return SCM_BOOL_F; -# ifndef RECKLESS +# ifndef SCM_RECKLESS if (!(SCM_INEXP(y))) bady: scm_wta(y, (char *)SCM_ARG2, s_eq_p); # endif # else -# ifndef RECKLESS +# ifndef SCM_RECKLESS if (!(SCM_NIMP(y) && SCM_INEXP(y))) bady: scm_wta(y, (char *)SCM_ARG2, s_eq_p); # endif @@ -2089,7 +2089,7 @@ scm_num_eq_p (x, y) return (0==scm_bigcomp(x, y)) ? SCM_BOOL_T : SCM_BOOL_F; } if SCM_NINUMP(y) { -# ifndef RECKLESS +# ifndef SCM_RECKLESS if (!(SCM_NIMP(y) && SCM_BIGP(y))) bady: scm_wta(y, (char *)SCM_ARG2, s_eq_p); # endif @@ -2115,7 +2115,7 @@ scm_less_p(x, y) #ifdef SCM_FLOATS if SCM_NINUMP(x) { # ifdef SCM_BIGDIG -# ifndef RECKLESS +# ifndef SCM_RECKLESS if (!(SCM_NIMP(x))) badx: scm_wta(x, (char *)SCM_ARG1, s_less_p); # endif @@ -2145,12 +2145,12 @@ scm_less_p(x, 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 RECKLESS +# ifndef SCM_RECKLESS if (!(SCM_REALP(y))) bady: scm_wta(y, (char *)SCM_ARG2, s_less_p); # endif # else -# ifndef RECKLESS +# ifndef SCM_RECKLESS if (!(SCM_NIMP(y) && SCM_REALP(y))) bady: scm_wta(y, (char *)SCM_ARG2, s_less_p); # endif @@ -2166,7 +2166,7 @@ scm_less_p(x, y) return (1==scm_bigcomp(x, y)) ? SCM_BOOL_T : SCM_BOOL_F; } if SCM_NINUMP(y) { -# ifndef RECKLESS +# ifndef SCM_RECKLESS if (!(SCM_NIMP(y) && SCM_BIGP(y))) bady: scm_wta(y, (char *)SCM_ARG2, s_less_p); # endif @@ -2228,7 +2228,7 @@ scm_zero_p(z) # ifdef SCM_BIGDIG SCM_ASRTGO(SCM_NIMP(z), badz); if SCM_BIGP(z) return SCM_BOOL_F; -# ifndef RECKLESS +# ifndef SCM_RECKLESS if (!(SCM_INEXP(z))) badz: scm_wta(z, (char *)SCM_ARG1, s_zero_p); # endif @@ -2263,7 +2263,7 @@ scm_positive_p(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 RECKLESS +# ifndef SCM_RECKLESS if (!(SCM_REALP(x))) badx: scm_wta(x, (char *)SCM_ARG1, s_positive_p); # endif @@ -2298,7 +2298,7 @@ scm_negative_p(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 RECKLESS +# ifndef SCM_RECKLESS if (!(SCM_REALP(x))) badx: scm_wta(x, (char *)SCM_ARG1, s_negative_p); # endif @@ -2332,7 +2332,7 @@ scm_max(x, y) double z; #endif if SCM_UNBNDP(y) { -#ifndef RECKLESS +#ifndef SCM_RECKLESS if (!(SCM_NUMBERP(x))) badx: scm_wta(x, (char *)SCM_ARG1, s_max); #endif @@ -2370,12 +2370,12 @@ scm_max(x, y) # ifdef SCM_BIGDIG SCM_ASRTGO(SCM_NIMP(y), bady); if SCM_BIGP(y) return SCM_BIGSIGN(y) ? x : y; -# ifndef RECKLESS +# ifndef SCM_RECKLESS if (!(SCM_REALP(y))) bady: scm_wta(y, (char *)SCM_ARG2, s_max); # endif # else -# ifndef RECKLESS +# ifndef SCM_RECKLESS if (!(SCM_NIMP(y) && SCM_REALP(y))) bady: scm_wta(y, (char *)SCM_ARG2, s_max); # endif @@ -2391,7 +2391,7 @@ scm_max(x, y) return (1==scm_bigcomp(x, y)) ? y : x; } if SCM_NINUMP(y) { -# ifndef RECKLESS +# ifndef SCM_RECKLESS if (!(SCM_NIMP(y) && SCM_BIGP(y))) bady: scm_wta(y, (char *)SCM_ARG2, s_max); # endif @@ -2419,7 +2419,7 @@ scm_min(x, y) double z; #endif if SCM_UNBNDP(y) { -#ifndef RECKLESS +#ifndef SCM_RECKLESS if (!(SCM_NUMBERP(x))) badx:scm_wta(x, (char *)SCM_ARG1, s_min); #endif @@ -2455,12 +2455,12 @@ scm_min(x, y) # ifdef SCM_BIGDIG SCM_ASRTGO(SCM_NIMP(y), bady); if SCM_BIGP(y) return SCM_BIGSIGN(y) ? y : x; -# ifndef RECKLESS +# ifndef SCM_RECKLESS if (!(SCM_REALP(y))) bady: scm_wta(y, (char *)SCM_ARG2, s_min); # endif # else -# ifndef RECKLESS +# ifndef SCM_RECKLESS if (!(SCM_NIMP(y) && SCM_REALP(y))) bady: scm_wta(y, (char *)SCM_ARG2, s_min); # endif @@ -2476,7 +2476,7 @@ scm_min(x, y) return (-1==scm_bigcomp(x, y)) ? y : x; } if SCM_NINUMP(y) { -# ifndef RECKLESS +# ifndef SCM_RECKLESS if (!(SCM_NIMP(y) && SCM_BIGP(y))) bady: scm_wta(y, (char *)SCM_ARG2, s_min); # endif @@ -2502,7 +2502,7 @@ scm_sum(x, y) { if SCM_UNBNDP(y) { if SCM_UNBNDP(x) return SCM_INUM0; -#ifndef RECKLESS +#ifndef SCM_RECKLESS if (!(SCM_NUMBERP(x))) badx: scm_wta(x, (char *)SCM_ARG1, s_sum); #endif @@ -2531,12 +2531,12 @@ scm_sum(x, y) # ifdef SCM_BIGDIG SCM_ASRTGO(SCM_NIMP(y), bady); if SCM_BIGP(y) {t = x; x = y; y = t; goto bigreal;} -# ifndef RECKLESS +# ifndef SCM_RECKLESS else if (!(SCM_INEXP(y))) bady: scm_wta(y, (char *)SCM_ARG2, s_sum); # endif # else -# ifndef RECKLESS +# ifndef SCM_RECKLESS if (!(SCM_NIMP(y) && SCM_INEXP(y))) bady: scm_wta(y, (char *)SCM_ARG2, s_sum); # endif @@ -2577,7 +2577,7 @@ scm_sum(x, y) return scm_addbig(SCM_BDIGITS(x), SCM_NUMDIGS(x), SCM_BIGSIGN(x), y, 0); } if SCM_NINUMP(y) { -# ifndef RECKLESS +# ifndef SCM_RECKLESS if (!(SCM_NIMP(y) && SCM_BIGP(y))) bady: scm_wta(y, (char *)SCM_ARG2, s_sum); # endif @@ -2623,7 +2623,7 @@ scm_difference(x, y) { #ifdef SCM_FLOATS if SCM_NINUMP(x) { -# ifndef RECKLESS +# ifndef SCM_RECKLESS if (!(SCM_NIMP(x))) badx: scm_wta(x, (char *)SCM_ARG1, s_difference); # endif @@ -2680,12 +2680,12 @@ scm_difference(x, y) return scm_addbig(zdigs, SCM_DIGSPERLONG, (x < 0) ? 0x0100 : 0, y, 0x0100); # endif } -# ifndef RECKLESS +# ifndef SCM_RECKLESS if (!(SCM_INEXP(y))) bady: scm_wta(y, (char *)SCM_ARG2, s_difference); # endif # else -# ifndef RECKLESS +# ifndef SCM_RECKLESS if (!(SCM_NIMP(y) && SCM_INEXP(y))) bady: scm_wta(y, (char *)SCM_ARG2, s_difference); # endif @@ -2718,7 +2718,7 @@ scm_difference(x, y) } if SCM_UNBNDP(y) {x = -SCM_INUM(x); goto checkx;} if SCM_NINUMP(y) { -# ifndef RECKLESS +# ifndef SCM_RECKLESS if (!(SCM_NIMP(y) && SCM_BIGP(y))) bady: scm_wta(y, (char *)SCM_ARG2, s_difference); # endif @@ -2766,7 +2766,7 @@ scm_product(x, y) { if SCM_UNBNDP(y) { if SCM_UNBNDP(x) return SCM_MAKINUM(1L); -#ifndef RECKLESS +#ifndef SCM_RECKLESS if (!(SCM_NUMBERP(x))) badx: scm_wta(x, (char *)SCM_ARG1, s_product); #endif @@ -2795,12 +2795,12 @@ scm_product(x, y) # ifdef SCM_BIGDIG SCM_ASRTGO(SCM_NIMP(y), bady); if SCM_BIGP(y) {t = x; x = y; y = t; goto bigreal;} -# ifndef RECKLESS +# ifndef SCM_RECKLESS else if (!(SCM_INEXP(y))) bady: scm_wta(y, (char *)SCM_ARG2, s_product); # endif # else -# ifndef RECKLESS +# ifndef SCM_RECKLESS if (!(SCM_NIMP(y) && SCM_INEXP(y))) bady: scm_wta(y, (char *)SCM_ARG2, s_product); # endif @@ -2853,7 +2853,7 @@ scm_product(x, y) SCM_BIGSIGN(x) ^ SCM_BIGSIGN(y)); } if SCM_NINUMP(y) { -# ifndef RECKLESS +# ifndef SCM_RECKLESS if (!(SCM_NIMP(y) && SCM_BIGP(y))) bady: scm_wta(y, (char *)SCM_ARG2, s_product); # endif @@ -2942,7 +2942,7 @@ scm_divide(x, y) #ifdef SCM_FLOATS double d, r, i, a; if SCM_NINUMP(x) { -# ifndef RECKLESS +# ifndef SCM_RECKLESS if (!(SCM_NIMP(x))) badx: scm_wta(x, (char *)SCM_ARG1, s_divide); # endif @@ -2960,7 +2960,7 @@ scm_divide(x, y) SCM z; if SCM_INUMP(y) { z = SCM_INUM(y); -#ifndef RECKLESS +#ifndef SCM_RECKLESS if (!z) scm_num_overflow (s_divide); #endif @@ -3021,12 +3021,12 @@ scm_divide(x, y) # ifdef SCM_BIGDIG SCM_ASRTGO(SCM_NIMP(y), bady); if SCM_BIGP(y) return scm_makdbl(SCM_INUM(x)/scm_big2dbl(y), 0.0); -# ifndef RECKLESS +# ifndef SCM_RECKLESS if (!(SCM_INEXP(y))) bady: scm_wta(y, (char *)SCM_ARG2, s_divide); # endif # else -# ifndef RECKLESS +# ifndef SCM_RECKLESS if (!(SCM_NIMP(y) && SCM_INEXP(y))) bady: scm_wta(y, (char *)SCM_ARG2, s_divide); # endif @@ -3077,7 +3077,7 @@ scm_divide(x, y) goto ov; } if SCM_NINUMP(y) { -# ifndef RECKLESS +# ifndef SCM_RECKLESS if (!(SCM_NIMP(y) && SCM_BIGP(y))) bady: scm_wta(y, (char *)SCM_ARG2, s_divide); # endif @@ -3218,7 +3218,7 @@ scm_two_doubles(z1, z2, sstring, xy) SCM_ASRTGO(SCM_NIMP(z1), badz1); if SCM_BIGP(z1) xy->x = scm_big2dbl(z1); else { -# ifndef RECKLESS +# ifndef SCM_RECKLESS if (!(SCM_REALP(z1))) badz1: scm_wta(z1, (char *)SCM_ARG1, sstring); # endif @@ -3234,7 +3234,7 @@ scm_two_doubles(z1, z2, sstring, xy) SCM_ASRTGO(SCM_NIMP(z2), badz2); if SCM_BIGP(z2) xy->y = scm_big2dbl(z2); else { -# ifndef RECKLESS +# ifndef SCM_RECKLESS if (!(SCM_REALP(z2))) badz2: scm_wta(z2, (char *)SCM_ARG2, sstring); # endif @@ -3316,7 +3316,7 @@ scm_real_part(z) # ifdef SCM_BIGDIG SCM_ASRTGO(SCM_NIMP(z), badz); if SCM_BIGP(z) return z; -# ifndef RECKLESS +# ifndef SCM_RECKLESS if (!(SCM_INEXP(z))) badz: scm_wta(z, (char *)SCM_ARG1, s_real_part); # endif @@ -3340,7 +3340,7 @@ scm_imag_part(z) # ifdef SCM_BIGDIG SCM_ASRTGO(SCM_NIMP(z), badz); if SCM_BIGP(z) return SCM_INUM0; -# ifndef RECKLESS +# ifndef SCM_RECKLESS if (!(SCM_INEXP(z))) badz: scm_wta(z, (char *)SCM_ARG1, s_imag_part); # endif @@ -3363,7 +3363,7 @@ scm_magnitude(z) # ifdef SCM_BIGDIG SCM_ASRTGO(SCM_NIMP(z), badz); if SCM_BIGP(z) return scm_abs(z); -# ifndef RECKLESS +# ifndef SCM_RECKLESS if (!(SCM_INEXP(z))) badz: scm_wta(z, (char *)SCM_ARG1, s_magnitude); # endif @@ -3392,7 +3392,7 @@ scm_angle(z) # ifdef SCM_BIGDIG SCM_ASRTGO(SCM_NIMP(z), badz); if SCM_BIGP(z) {x = (SCM_TYP16(z)==scm_tc16_bigpos) ? 1.0 : -1.0; goto do_angle;} -# ifndef RECKLESS +# ifndef SCM_RECKLESS if (!(SCM_INEXP(z))) { badz: scm_wta(z, (char *)SCM_ARG1, s_angle);} # endif @@ -3420,7 +3420,7 @@ scm_inexact_to_exact(z) # ifdef SCM_BIGDIG SCM_ASRTGO(SCM_NIMP(z), badz); if SCM_BIGP(z) return z; -# ifndef RECKLESS +# ifndef SCM_RECKLESS if (!(SCM_REALP(z))) badz: scm_wta(z, (char *)SCM_ARG1, s_inexact_to_exact); # endif @@ -3482,7 +3482,7 @@ scm_dbl2big(d) u -= c; digits[i] = c; } -#ifndef RECKLESS +#ifndef SCM_RECKLESS if (u != 0) scm_num_overflow ("dbl2big"); #endif diff --git a/libguile/options.c b/libguile/options.c index ad3783198..9f825e4f4 100644 --- a/libguile/options.c +++ b/libguile/options.c @@ -188,7 +188,7 @@ scm_options (new_mode, options, n, s) flags[i] = SCM_CAR (new_mode); goto cont; } -#ifndef RECKLESS +#ifndef SCM_RECKLESS scm_must_free ((char *) flags); scm_wta (SCM_CAR (new_mode), "Unknown mode flag", s); #endif |