mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-15 08:10:17 +02:00
Code Activity

* *.c, srcprop.h: Use SCM_BOOL(f) instead of (f? SCM_BOOL_T:

Browse source 
SCM_BOOL_F) and use SCM_NEGATE_BOOL(f) instead of (f? SCM_BOOL_F:
SCM_BOOL_T).
This commit is contained in:
Greg J. Badros 1999-12-12 19:24:29 +00:00
parent a9967b3dbf
commit 156dcb091b
15 changed files with 42 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libguile/boolean.c
View file

@ -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

2
libguile/chars.c
View file

@ -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

3
libguile/dynl.c
View file

@ -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

2
libguile/eq.c
View file

@ -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;

4
libguile/eval.c
View file

@ -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);

4
libguile/gh_data.c
View file

@ -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)

46
libguile/numbers.c
View file

@ -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);
}

2
libguile/posix.c
View file

@ -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

2
libguile/procprop.c
View file

@ -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

4
libguile/ramap.c
View file

@ -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));
}

2
libguile/script.c
View file

@ -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. */

2
libguile/srcprop.h
View file

@ -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)

2
libguile/stacks.c
View file

@ -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

4
libguile/strorder.c
View file

@ -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);

4
libguile/unif.c
View file

@ -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