1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-20 11:40:18 +02:00

Replaced all uses of deprecated SCM_FALSEP, SCM_NFALSEP, SCM_BOOL,

SCM_NEGATE_BOOL, and SCM_BOOLP with scm_is_false, scm_is_true,
scm_from_bool, and scm_is_bool, respectively.
This commit is contained in:
Marius Vollmer 2004-07-06 13:19:42 +00:00
parent 170bb182fa
commit 66dd7f149c
2 changed files with 11 additions and 11 deletions

View file

@ -71,7 +71,7 @@ test_long_long ()
SCM n = scm_difference (scm_long_long2num (LLONG_MIN), SCM_MAKINUM(1));
SCM caught = scm_internal_catch (SCM_BOOL_T, call_num2long_long_body, &n,
out_of_range_handler, NULL);
assert (! SCM_FALSEP (caught));
assert (scm_is_true (caught));
}
/* LLONG_MIN + LLONG_MIN/2 */
@ -80,7 +80,7 @@ test_long_long ()
scm_long_long2num (LLONG_MIN / 2));
SCM caught = scm_internal_catch (SCM_BOOL_T, call_num2long_long_body, &n,
out_of_range_handler, NULL);
assert (! SCM_FALSEP (caught));
assert (scm_is_true (caught));
}
/* LLONG_MAX + 1 */
@ -88,7 +88,7 @@ test_long_long ()
SCM n = scm_sum (scm_long_long2num (LLONG_MAX), SCM_MAKINUM(1));
SCM caught = scm_internal_catch (SCM_BOOL_T, call_num2long_long_body, &n,
out_of_range_handler, NULL);
assert (! SCM_FALSEP (caught));
assert (scm_is_true (caught));
}
/* 2^1024 */
@ -96,7 +96,7 @@ test_long_long ()
SCM n = scm_ash (SCM_MAKINUM (1), SCM_MAKINUM (1024));
SCM caught = scm_internal_catch (SCM_BOOL_T, call_num2long_long_body, &n,
out_of_range_handler, NULL);
assert (! SCM_FALSEP (caught));
assert (scm_is_true (caught));
}
/* -2^1024 */
@ -105,7 +105,7 @@ test_long_long ()
scm_ash (SCM_MAKINUM (1), SCM_MAKINUM (1024)));
SCM caught = scm_internal_catch (SCM_BOOL_T, call_num2long_long_body, &n,
out_of_range_handler, NULL);
assert (! SCM_FALSEP (caught));
assert (scm_is_true (caught));
}
#endif /* SCM_SIZEOF_LONG_LONG != 0 */
@ -127,7 +127,7 @@ test_ulong_long ()
SCM n = SCM_MAKINUM (-1);
SCM caught = scm_internal_catch (SCM_BOOL_T, call_num2ulong_long_body, &n,
out_of_range_handler, NULL);
assert (! SCM_FALSEP (caught));
assert (scm_is_true (caught));
}
/* ULLONG_MAX + 1 */
@ -135,7 +135,7 @@ test_ulong_long ()
SCM n = scm_sum (scm_ulong_long2num (ULLONG_MAX), SCM_MAKINUM(1));
SCM caught = scm_internal_catch (SCM_BOOL_T, call_num2ulong_long_body, &n,
out_of_range_handler, NULL);
assert (! SCM_FALSEP (caught));
assert (scm_is_true (caught));
}
/* 2^1024 */
@ -143,7 +143,7 @@ test_ulong_long ()
SCM n = scm_ash (SCM_MAKINUM (1), SCM_MAKINUM (1024));
SCM caught = scm_internal_catch (SCM_BOOL_T, call_num2long_long_body, &n,
out_of_range_handler, NULL);
assert (! SCM_FALSEP (caught));
assert (scm_is_true (caught));
}
#endif /* SCM_SIZEOF_LONG_LONG != 0 */

View file

@ -131,12 +131,12 @@ check_cont (int rewindable)
the continuation, or a catch-tag, such as 'misc-error.
*/
if (SCM_NFALSEP (scm_procedure_p (res)))
if (scm_is_true (scm_procedure_p (res)))
{
/* a continuation, invoke it */
scm_call_1 (res, SCM_BOOL_F);
}
else if (SCM_FALSEP (res))
else if (scm_is_false (res))
{
/* the result of invoking the continuation, frame must be
rewindable */
@ -198,7 +198,7 @@ check_ports ()
scm_frame_current_input_port (port);
res = scm_read (SCM_UNDEFINED);
if (SCM_FALSEP (scm_equal_p (res, scm_version ())))
if (scm_is_false (scm_equal_p (res, scm_version ())))
{
printf ("ports didn't work\n");
exit (1);