diff options
-rw-r--r-- | libguile/boolean.c | 2 | ||||
-rw-r--r-- | libguile/chars.c | 2 | ||||
-rw-r--r-- | libguile/dynl.c | 3 | ||||
-rw-r--r-- | libguile/eq.c | 2 | ||||
-rw-r--r-- | libguile/eval.c | 4 | ||||
-rw-r--r-- | libguile/gh_data.c | 4 | ||||
-rw-r--r-- | libguile/numbers.c | 46 | ||||
-rw-r--r-- | libguile/posix.c | 2 | ||||
-rw-r--r-- | libguile/procprop.c | 2 | ||||
-rw-r--r-- | libguile/ramap.c | 4 | ||||
-rw-r--r-- | libguile/script.c | 2 | ||||
-rw-r--r-- | libguile/srcprop.h | 2 | ||||
-rw-r--r-- | libguile/stacks.c | 2 | ||||
-rw-r--r-- | libguile/strorder.c | 4 | ||||
-rw-r--r-- | libguile/unif.c | 4 |
15 files changed, 42 insertions, 43 deletions
diff --git a/libguile/boolean.c b/libguile/boolean.c index 1721d94f0..f6cc5b20c 100644 --- a/libguile/boolean.c +++ b/libguile/boolean.c @@ -57,7 +57,7 @@ GUILE_PROC(scm_not, "not", 1, 0, 0, "") #define FUNC_NAME s_scm_not { - return SCM_FALSEP(x) ? SCM_BOOL_T : SCM_BOOL_F; + return SCM_BOOL(SCM_FALSEP(x)); } #undef FUNC_NAME diff --git a/libguile/chars.c b/libguile/chars.c index 121d133ca..bb93d4280 100644 --- a/libguile/chars.c +++ b/libguile/chars.c @@ -57,7 +57,7 @@ GUILE_PROC (scm_char_p, "char?", 1, 0, 0, "Return #t iff X is a character, else #f.") #define FUNC_NAME s_scm_char_p { - return SCM_ICHRP(x) ? SCM_BOOL_T : SCM_BOOL_F; + return SCM_BOOL(SCM_ICHRP(x)); } #undef FUNC_NAME diff --git a/libguile/dynl.c b/libguile/dynl.c index 55a95dec4..6c6c6c440 100644 --- a/libguile/dynl.c +++ b/libguile/dynl.c @@ -380,8 +380,7 @@ GUILE_PROC (scm_dynamic_object_p, "dynamic-object?", 1, 0, 0, "") #define FUNC_NAME s_scm_dynamic_object_p { - return (SCM_NIMP (obj) && SCM_CAR (obj) == scm_tc16_dynamic_obj)? - SCM_BOOL_T : SCM_BOOL_F; + return SCM_BOOL(SCM_NIMP (obj) && SCM_CAR (obj) == scm_tc16_dynamic_obj); } #undef FUNC_NAME diff --git a/libguile/eq.c b/libguile/eq.c index 4941ac826..87ce51034 100644 --- a/libguile/eq.c +++ b/libguile/eq.c @@ -76,7 +76,7 @@ GUILE_PROC1 (scm_eqv_p, "eqv?", scm_tc7_rpsubr, if (SCM_CAR(x) != SCM_CAR(y)) return SCM_BOOL_F; if (SCM_NUMP(x)) { # ifdef SCM_BIGDIG - if (SCM_BIGP(x)) return (0==scm_bigcomp(x, y)) ? SCM_BOOL_T : SCM_BOOL_F; + if (SCM_BIGP(x)) return SCM_BOOL(0==scm_bigcomp(x, y)); # endif #ifdef SCM_FLOATS if (SCM_REALPART(x) != SCM_REALPART(y)) return SCM_BOOL_F; diff --git a/libguile/eval.c b/libguile/eval.c index f92a3c8de..a88817fd1 100644 --- a/libguile/eval.c +++ b/libguile/eval.c @@ -1682,7 +1682,7 @@ scm_eval_body (SCM code, SCM env) if (CHECK_APPLY && SCM_TRAPS_P)\ if (SCM_APPLY_FRAME_P || (SCM_TRACE_P && PROCTRACEP (proc)))\ {\ - SCM tmp, tail = SCM_TRACED_FRAME_P (debug) ? SCM_BOOL_T : SCM_BOOL_F;\ + SCM tmp, tail = SCM_BOOL(SCM_TRACED_FRAME_P (debug)); \ SCM_SET_TRACED_FRAME (debug); \ if (SCM_CHEAPTRAPS_P)\ {\ @@ -1943,7 +1943,7 @@ start: if (CHECK_ENTRY && SCM_TRAPS_P) if (SCM_ENTER_FRAME_P || (SCM_BREAKPOINTS_P && SRCBRKP (x))) { - SCM tail = SCM_TAILRECP (debug) ? SCM_BOOL_T : SCM_BOOL_F; + SCM tail = SCM_BOOL(SCM_TAILRECP (debug)); SCM_SET_TAILREC (debug); if (SCM_CHEAPTRAPS_P) t.arg1 = scm_make_debugobj (&debug); diff --git a/libguile/gh_data.c b/libguile/gh_data.c index d8bc87b47..b485282ce 100644 --- a/libguile/gh_data.c +++ b/libguile/gh_data.c @@ -49,12 +49,12 @@ SCM gh_int2scmb (int x) /* this is being phased out */ { - return (x ? SCM_BOOL_T : SCM_BOOL_F); + return SCM_BOOL(x); } SCM gh_bool2scm (int x) { - return (x ? SCM_BOOL_T : SCM_BOOL_F); + return SCM_BOOL(x); } SCM gh_int2scm (int x) diff --git a/libguile/numbers.c b/libguile/numbers.c index 8330b37fe..45bb7cbfe 100644 --- a/libguile/numbers.c +++ b/libguile/numbers.c @@ -2576,7 +2576,7 @@ scm_num_eq_p (x, y) return SCM_BOOL_F; SCM_ASRTGO (SCM_NIMP (y), bady); if (SCM_BIGP (y)) - return (0 == scm_bigcomp (x, y)) ? SCM_BOOL_T : SCM_BOOL_F; + return SCM_BOOL(0 == scm_bigcomp (x, y)); SCM_ASRTGO (SCM_INEXP (y), bady); bigreal: return ((SCM_REALP (y) && (scm_big2dbl (x) == SCM_REALPART (y))) @@ -2614,7 +2614,7 @@ scm_num_eq_p (x, y) return ((SCM_CPLXP (y) && (SCM_IMAG (x) == SCM_IMAG (y))) ? SCM_BOOL_T : SCM_BOOL_F); - return SCM_CPLXP (y) ? SCM_BOOL_F : SCM_BOOL_T; + return SCM_NEGATE_BOOL(SCM_CPLXP (y)); } if (SCM_NINUMP (y)) { @@ -2648,7 +2648,7 @@ scm_num_eq_p (x, y) if (SCM_INUMP (y)) return SCM_BOOL_F; SCM_ASRTGO (SCM_NIMP (y) && SCM_BIGP (y), bady); - return (0 == scm_bigcomp (x, y)) ? SCM_BOOL_T : SCM_BOOL_F; + return SCM_BOOL(0 == scm_bigcomp (x, y)); } if (SCM_NINUMP (y)) { @@ -2664,7 +2664,7 @@ scm_num_eq_p (x, y) SCM_GASSERT2 (SCM_INUMP (y), g_eq_p, x, y, SCM_ARGn, s_eq_p); #endif #endif - return ((long) x == (long) y) ? SCM_BOOL_T : SCM_BOOL_F; + return SCM_BOOL((long) x == (long) y); } @@ -2688,10 +2688,10 @@ scm_less_p (x, y) if (SCM_BIGP (x)) { if (SCM_INUMP (y)) - return SCM_BIGSIGN (x) ? SCM_BOOL_T : SCM_BOOL_F; + return SCM_BOOL(SCM_BIGSIGN (x)); SCM_ASRTGO (SCM_NIMP (y), bady); if (SCM_BIGP (y)) - return (1 == scm_bigcomp (x, y)) ? SCM_BOOL_T : SCM_BOOL_F; + return SCM_BOOL(1 == scm_bigcomp (x, y)); SCM_ASRTGO (SCM_REALP (y), bady); return ((scm_big2dbl (x) < SCM_REALPART (y)) ? SCM_BOOL_T @@ -2709,19 +2709,19 @@ scm_less_p (x, y) #ifdef SCM_BIGDIG SCM_ASRTGO (SCM_NIMP (y), bady); if (SCM_BIGP (y)) - return (SCM_REALPART (x) < scm_big2dbl (y)) ? SCM_BOOL_T : SCM_BOOL_F; + return SCM_BOOL(SCM_REALPART (x) < scm_big2dbl (y)); SCM_ASRTGO (SCM_REALP (y), bady); #else SCM_ASRTGO (SCM_NIMP (y) && SCM_REALP (y), bady); #endif - return (SCM_REALPART (x) < SCM_REALPART (y)) ? SCM_BOOL_T : SCM_BOOL_F; + return SCM_BOOL(SCM_REALPART (x) < SCM_REALPART (y)); } if (SCM_NINUMP (y)) { #ifdef SCM_BIGDIG SCM_ASRTGO (SCM_NIMP (y), bady); if (SCM_BIGP (y)) - return SCM_BIGSIGN (y) ? SCM_BOOL_F : SCM_BOOL_T; + return SCM_NEGATE_BOOL(SCM_BIGSIGN (y)); if (!(SCM_REALP (y))) { bady: @@ -2745,9 +2745,9 @@ scm_less_p (x, y) SCM_GASSERT2 (SCM_NIMP (x) && SCM_BIGP (x), g_less_p, x, y, SCM_ARG1, s_less_p); if (SCM_INUMP (y)) - return SCM_BIGSIGN (x) ? SCM_BOOL_T : SCM_BOOL_F; + return SCM_BOOL(SCM_BIGSIGN (x)); SCM_ASRTGO (SCM_NIMP (y) && SCM_BIGP (y), bady); - return (1 == scm_bigcomp (x, y)) ? SCM_BOOL_T : SCM_BOOL_F; + return SCM_BOOL(1 == scm_bigcomp (x, y)); } if (SCM_NINUMP (y)) { @@ -2756,14 +2756,14 @@ scm_less_p (x, y) bady: SCM_WTA_DISPATCH_2 (g_less_p, x, y, SCM_ARGn, s_less_p); } - return SCM_BIGSIGN (y) ? SCM_BOOL_F : SCM_BOOL_T; + 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 ((long) x < (long) y) ? SCM_BOOL_T : SCM_BOOL_F; + return SCM_BOOL((long) x < (long) y); } @@ -2822,7 +2822,7 @@ scm_zero_p (z) SCM_GASSERT1 (SCM_NIMP (z) && SCM_INEXP (z), g_zero_p, z, SCM_ARG1, s_zero_p); #endif - return (z == scm_flo0) ? SCM_BOOL_T : SCM_BOOL_F; + return SCM_BOOL(z == scm_flo0); } #else #ifdef SCM_BIGDIG @@ -2836,7 +2836,7 @@ scm_zero_p (z) SCM_GASSERT1 (SCM_INUMP (z), g_zero_p, z, SCM_ARG1, s_zero_p); #endif #endif - return (z == SCM_INUM0) ? SCM_BOOL_T : SCM_BOOL_F; + return SCM_BOOL(z == SCM_INUM0); } @@ -2853,7 +2853,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; + return SCM_BOOL(SCM_TYP16 (x) == scm_tc16_bigpos); if (!(SCM_REALP (x))) { badx: @@ -2863,7 +2863,7 @@ scm_positive_p (x) SCM_GASSERT1 (SCM_NIMP (x) && SCM_REALP (x), g_positive_p, x, SCM_ARG1, s_positive_p); #endif - return (SCM_REALPART (x) > 0.0) ? SCM_BOOL_T : SCM_BOOL_F; + return SCM_BOOL(SCM_REALPART (x) > 0.0); } #else #ifdef SCM_BIGDIG @@ -2871,13 +2871,13 @@ scm_positive_p (x) { SCM_GASSERT1 (SCM_NIMP (x) && SCM_BIGP (x), g_positive_p, x, SCM_ARG1, s_positive_p); - return SCM_TYP16 (x) == scm_tc16_bigpos ? SCM_BOOL_T : SCM_BOOL_F; + 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 (x > SCM_INUM0) ? SCM_BOOL_T : SCM_BOOL_F; + return SCM_BOOL(x > SCM_INUM0); } @@ -2894,7 +2894,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; + return SCM_NEGATE_BOOL(SCM_TYP16 (x) == scm_tc16_bigpos); if (!(SCM_REALP (x))) { badx: @@ -2904,7 +2904,7 @@ scm_negative_p (x) SCM_GASSERT1 (SCM_NIMP (x) && SCM_REALP (x), g_negative_p, x, SCM_ARG1, s_negative_p); #endif - return (SCM_REALPART (x) < 0.0) ? SCM_BOOL_T : SCM_BOOL_F; + return SCM_BOOL(SCM_REALPART (x) < 0.0); } #else #ifdef SCM_BIGDIG @@ -2912,13 +2912,13 @@ scm_negative_p (x) { SCM_GASSERT1 (SCM_NIMP (x) && SCM_BIGP (x), g_negative_p, x, SCM_ARG1, s_negative_p); - return (SCM_TYP16 (x) == scm_tc16_bigneg) ? SCM_BOOL_T : SCM_BOOL_F; + 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 (x < SCM_INUM0) ? SCM_BOOL_T : SCM_BOOL_F; + return SCM_BOOL(x < SCM_INUM0); } diff --git a/libguile/posix.c b/libguile/posix.c index d224dd16c..4e34eca09 100644 --- a/libguile/posix.c +++ b/libguile/posix.c @@ -960,7 +960,7 @@ GUILE_PROC (scm_access, "access?", 2, 0, 0, path = scm_makfromstr (SCM_ROCHARS (path), SCM_ROLENGTH (path), 0); SCM_VALIDATE_INT(2,how); rv = access (SCM_ROCHARS (path), SCM_INUM (how)); - return rv ? SCM_BOOL_F : SCM_BOOL_T; + return SCM_NEGATE_BOOL(rv); } #undef FUNC_NAME diff --git a/libguile/procprop.c b/libguile/procprop.c index efdc08318..0d2023412 100644 --- a/libguile/procprop.c +++ b/libguile/procprop.c @@ -142,7 +142,7 @@ scm_i_procedure_arity (SCM proc) } return SCM_LIST3 (SCM_MAKINUM (a), SCM_MAKINUM (o), - r ? SCM_BOOL_T : SCM_BOOL_F); + SCM_BOOL(r)); } static SCM diff --git a/libguile/ramap.c b/libguile/ramap.c index b3f0a81af..d40ea1bdb 100644 --- a/libguile/ramap.c +++ b/libguile/ramap.c @@ -2014,7 +2014,7 @@ raeql (SCM ra0,SCM as_equal,SCM ra1) SCM scm_raequal (SCM ra0, SCM ra1) { - return (raeql (ra0, SCM_BOOL_T, ra1) ? SCM_BOOL_T : SCM_BOOL_F); + return SCM_BOOL(raeql (ra0, SCM_BOOL_T, ra1)); } static char s_array_equal_p[] = "array-equal?"; @@ -2063,7 +2063,7 @@ scm_array_equal_p (SCM ra0, SCM ra1) if (!SCM_ARRAYP (ra1)) goto callequal; } - return (raeql (ra0, SCM_BOOL_F, ra1) ? SCM_BOOL_T : SCM_BOOL_F); + return SCM_BOOL(raeql (ra0, SCM_BOOL_F, ra1)); } diff --git a/libguile/script.c b/libguile/script.c index bf59da989..68ea5707c 100644 --- a/libguile/script.c +++ b/libguile/script.c @@ -577,7 +577,7 @@ scm_compile_shell_switches (int argc, char **argv) /* If the --emacs switch was set, now is when we process it. */ { SCM vcell = scm_sysintern0_no_module_lookup ("use-emacs-interface"); - SCM_SETCDR (vcell, use_emacs_interface ? SCM_BOOL_T : SCM_BOOL_F); + SCM_SETCDR (vcell, SCM_BOOL(use_emacs_interface)); } /* Handle the `-e' switch, if it was specified. */ diff --git a/libguile/srcprop.h b/libguile/srcprop.h index bb4a4b4b0..8b44381ca 100644 --- a/libguile/srcprop.h +++ b/libguile/srcprop.h @@ -93,7 +93,7 @@ typedef struct scm_srcprops_chunk } scm_srcprops_chunk; #define SRCPROPSP(p) (SCM_TYP16 (p) == scm_tc16_srcprops) -#define SRCPROPBRK(p) ((1L << 16) & SCM_CAR (p) ? SCM_BOOL_T : SCM_BOOL_F) +#define SRCPROPBRK(p) (SCM_BOOL((1L << 16) & SCM_CAR (p))) #define SRCPROPPOS(p) ((scm_srcprops *) SCM_CDR (p))->pos #define SRCPROPLINE(p) (SRCPROPPOS(p) >> 12) #define SRCPROPCOL(p) (SRCPROPPOS(p) & 0x0fffL) diff --git a/libguile/stacks.c b/libguile/stacks.c index 1900b9a67..0e83aaeee 100644 --- a/libguile/stacks.c +++ b/libguile/stacks.c @@ -733,7 +733,7 @@ GUILE_PROC(scm_frame_overflow_p, "frame-overflow?", 1, 0, 0, #define FUNC_NAME s_scm_frame_overflow_p { SCM_VALIDATE_FRAME(1,frame); - return SCM_FRAME_OVERFLOW_P (frame) ? SCM_BOOL_T : SCM_BOOL_F; + return SCM_BOOL(SCM_FRAME_OVERFLOW_P (frame)); } #undef FUNC_NAME diff --git a/libguile/strorder.c b/libguile/strorder.c index 5f49dcabd..ee2cb2260 100644 --- a/libguile/strorder.c +++ b/libguile/strorder.c @@ -124,7 +124,7 @@ scm_string_less_p (s1, s2) } { SCM answer; - answer = (s2len != len) ? SCM_BOOL_T : SCM_BOOL_F; + answer = SCM_BOOL(s2len != len); return answer; } } @@ -181,7 +181,7 @@ scm_string_ci_less_p (s1, s2) if (c>0) return SCM_BOOL_F; if (c<0) return SCM_BOOL_T; } - return (s2len != len) ? SCM_BOOL_T : SCM_BOOL_F; + return SCM_BOOL(s2len != len); } SCM_PROC1 (s_string_ci_leq_p, "string-ci<=?", scm_tc7_rpsubr, scm_string_ci_leq_p); diff --git a/libguile/unif.c b/libguile/unif.c index cbf635141..962891a4a 100644 --- a/libguile/unif.c +++ b/libguile/unif.c @@ -1970,9 +1970,9 @@ GUILE_PROC(scm_array_to_list, "array->list", 1, 0, 0, register unsigned long mask; for (k = (SCM_LENGTH (v) - 1) / SCM_LONG_BIT; k > 0; k--) for (mask = 1UL << (SCM_LONG_BIT - 1); mask; mask >>= 1) - res = scm_cons (((long *) data)[k] & mask ? SCM_BOOL_T : SCM_BOOL_F, res); + res = scm_cons (SCM_BOOL(((long *) data)[k] & mask), res); for (mask = 1L << ((SCM_LENGTH (v) % SCM_LONG_BIT) - 1); mask; mask >>= 1) - res = scm_cons (((long *) data)[k] & mask ? SCM_BOOL_T : SCM_BOOL_F, res); + res = scm_cons (SCM_BOOL(((long *) data)[k] & mask), res); return res; } # ifdef SCM_INUMS_ONLY |