summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Vollmer <mvo@zagadka.de>2004-07-06 11:02:47 +0000
committerMarius Vollmer <mvo@zagadka.de>2004-07-06 11:02:47 +0000
commit00874d5fb023fd68c03f0df33eccb6554da32ea2 (patch)
tree5e1a1f4c76be830c85dece096518ded28bd86ee4
parent054ebf6ca539dee2bfc9965781313c0d32faa51f (diff)
downloadguile-00874d5fb023fd68c03f0df33eccb6554da32ea2.tar.gz
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.
-rw-r--r--guile-readline/readline.c4
-rw-r--r--srfi/srfi-1.c22
-rw-r--r--srfi/srfi-13.c48
-rw-r--r--srfi/srfi-14.c24
-rw-r--r--srfi/srfi-4.c40
5 files changed, 69 insertions, 69 deletions
diff --git a/guile-readline/readline.c b/guile-readline/readline.c
index c47f82438..1c4b3eee3 100644
--- a/guile-readline/readline.c
+++ b/guile-readline/readline.c
@@ -342,7 +342,7 @@ SCM_DEFINE (scm_read_history, "read-history", 1, 0, 0,
#define FUNC_NAME s_scm_read_history
{
SCM_VALIDATE_STRING (1,file);
- return SCM_NEGATE_BOOL (read_history (SCM_STRING_CHARS (file)));
+ return scm_from_bool (!read_history (SCM_STRING_CHARS (file)));
}
#undef FUNC_NAME
@@ -353,7 +353,7 @@ SCM_DEFINE (scm_write_history, "write-history", 1, 0, 0,
#define FUNC_NAME s_scm_write_history
{
SCM_VALIDATE_STRING (1,file);
- return SCM_NEGATE_BOOL (write_history (SCM_STRING_CHARS (file)));
+ return scm_from_bool (!write_history (SCM_STRING_CHARS (file)));
}
#undef FUNC_NAME
diff --git a/srfi/srfi-1.c b/srfi/srfi-1.c
index c50b47850..b7d0b5ecf 100644
--- a/srfi/srfi-1.c
+++ b/srfi/srfi-1.c
@@ -99,7 +99,7 @@ SCM_DEFINE (scm_srfi1_count, "count", 2, 0, 1,
SCM_ASSERT (pred_tramp, pred, SCM_ARG1, FUNC_NAME);
for ( ; SCM_CONSP (lst1); lst1 = SCM_CDR (lst1))
- count += ! SCM_FALSEP (pred_tramp (pred, SCM_CAR (lst1)));
+ count += scm_is_true (pred_tramp (pred, SCM_CAR (lst1)));
end_lst1:
SCM_ASSERT_TYPE (SCM_NULL_OR_NIL_P (lst1), lst1, SCM_ARG2, FUNC_NAME,
@@ -125,8 +125,8 @@ SCM_DEFINE (scm_srfi1_count, "count", 2, 0, 1,
FUNC_NAME, "list");
break;
}
- count += ! SCM_FALSEP (pred_tramp
- (pred, SCM_CAR (lst1), SCM_CAR (lst2)));
+ count += scm_is_true (pred_tramp
+ (pred, SCM_CAR (lst1), SCM_CAR (lst2)));
lst1 = SCM_CDR (lst1);
lst2 = SCM_CDR (lst2);
}
@@ -165,7 +165,7 @@ SCM_DEFINE (scm_srfi1_count, "count", 2, 0, 1,
SCM_SETCAR (l, SCM_CDR (lst)); /* keep rest of lst */
}
- count += ! SCM_FALSEP (scm_apply (pred, args, SCM_EOL));
+ count += scm_is_true (scm_apply (pred, args, SCM_EOL));
}
}
done:
@@ -218,7 +218,7 @@ SCM_DEFINE (scm_srfi1_delete, "delete", 2, 1, 0,
for ( ; SCM_CONSP (lst); lst = SCM_CDR (lst))
{
- if (! SCM_FALSEP (equal_p (pred, x, SCM_CAR (lst))))
+ if (scm_is_true (equal_p (pred, x, SCM_CAR (lst))))
{
/* delete this element, so copy from keeplst (inclusive) to lst
(exclusive) onto ret */
@@ -277,7 +277,7 @@ SCM_DEFINE (scm_srfi1_delete_x, "delete!", 2, 1, 0,
SCM_CONSP (walk);
walk = SCM_CDR (walk))
{
- if (! SCM_FALSEP (equal_p (pred, x, SCM_CAR (walk))))
+ if (scm_is_true (equal_p (pred, x, SCM_CAR (walk))))
*prev = SCM_CDR (walk);
else
prev = SCM_CDRLOC (walk);
@@ -362,7 +362,7 @@ SCM_DEFINE (scm_srfi1_delete_duplicates, "delete-duplicates", 1, 1, 0,
/* loop searching ret upto lst */
for (l = ret; ! SCM_EQ_P (l, lst); l = SCM_CDR (l))
{
- if (! SCM_FALSEP (equal_p (pred, SCM_CAR (l), item)))
+ if (scm_is_true (equal_p (pred, SCM_CAR (l), item)))
{
/* duplicate, don't want this element, so copy keeplst
(inclusive) to lst (exclusive) onto ret */
@@ -447,7 +447,7 @@ SCM_DEFINE (scm_srfi1_delete_duplicates_x, "delete-duplicates!", 1, 1, 0,
l = ret;
for (;;)
{
- if (! SCM_FALSEP (equal_p (pred, SCM_CAR (l), item)))
+ if (scm_is_true (equal_p (pred, SCM_CAR (l), item)))
break; /* equal, forget this element */
if (SCM_EQ_P (l, endret))
@@ -739,7 +739,7 @@ SCM_DEFINE (scm_srfi1_member, "member", 2, 1, 0,
}
for (; !SCM_NULL_OR_NIL_P (lst); lst = SCM_CDR (lst))
{
- if (!SCM_FALSEP (equal_p (pred, SCM_CAR (lst), x)))
+ if (scm_is_true (equal_p (pred, SCM_CAR (lst), x)))
return lst;
}
return SCM_BOOL_F;
@@ -767,7 +767,7 @@ SCM_DEFINE (scm_srfi1_assoc, "assoc", 2, 1, 0,
SCM tmp = SCM_CAR (ls);
SCM_ASSERT_TYPE (SCM_CONSP (tmp), alist, SCM_ARG2, FUNC_NAME,
"association list");
- if (SCM_NFALSEP (equal_p (pred, SCM_CAR (tmp), key)))
+ if (scm_is_true (equal_p (pred, SCM_CAR (tmp), key)))
return tmp;
}
SCM_ASSERT_TYPE (SCM_NULL_OR_NIL_P (ls), alist, SCM_ARG2, FUNC_NAME,
@@ -798,7 +798,7 @@ SCM_DEFINE (scm_srfi1_partition, "partition", 2, 0, 0,
for (; !SCM_NULL_OR_NIL_P (list); list = SCM_CDR(list)) {
SCM elt = SCM_CAR(list);
SCM new_tail = scm_cons(SCM_CAR(list), SCM_EOL);
- if (SCM_NFALSEP(call(pred, elt))) {
+ if (scm_is_true (call (pred, elt))) {
SCM_SETCDR(kept_tail, new_tail);
kept_tail = new_tail;
}
diff --git a/srfi/srfi-13.c b/srfi/srfi-13.c
index 8cf53c28f..eb26c3711 100644
--- a/srfi/srfi-13.c
+++ b/srfi/srfi-13.c
@@ -47,7 +47,7 @@ SCM_DEFINE (scm_string_any, "string-any", 2, 2, 0,
while (cstart < cend)
{
res = scm_call_1 (pred, SCM_MAKE_CHAR (*cstr));
- if (!SCM_FALSEP (res))
+ if (scm_is_true (res))
return res;
cstr++;
cstart++;
@@ -79,7 +79,7 @@ SCM_DEFINE (scm_string_every, "string-every", 2, 2, 0,
while (cstart < cend)
{
res = scm_call_1 (pred, SCM_MAKE_CHAR (*cstr));
- if (SCM_FALSEP (res))
+ if (scm_is_false (res))
return res;
cstr++;
cstart++;
@@ -625,7 +625,7 @@ SCM_DEFINE (scm_string_trim, "string-trim", 1, 3, 0,
SCM res;
res = scm_call_1 (char_pred, SCM_MAKE_CHAR (cstr[cstart]));
- if (SCM_FALSEP (res))
+ if (scm_is_false (res))
break;
cstart++;
}
@@ -700,7 +700,7 @@ SCM_DEFINE (scm_string_trim_right, "string-trim-right", 1, 3, 0,
SCM res;
res = scm_call_1 (char_pred, SCM_MAKE_CHAR (cstr[cend - 1]));
- if (SCM_FALSEP (res))
+ if (scm_is_false (res))
break;
cend--;
}
@@ -793,7 +793,7 @@ SCM_DEFINE (scm_string_trim_both, "string-trim-both", 1, 3, 0,
SCM res;
res = scm_call_1 (char_pred, SCM_MAKE_CHAR (cstr[cstart]));
- if (SCM_FALSEP (res))
+ if (scm_is_false (res))
break;
cstart++;
}
@@ -802,7 +802,7 @@ SCM_DEFINE (scm_string_trim_both, "string-trim-both", 1, 3, 0,
SCM res;
res = scm_call_1 (char_pred, SCM_MAKE_CHAR (cstr[cend - 1]));
- if (SCM_FALSEP (res))
+ if (scm_is_false (res))
break;
cend--;
}
@@ -1480,12 +1480,12 @@ SCM_DEFINE (scm_string_prefix_p, "string-prefix?", 2, 4, 0,
while (cstart1 < cend1 && cstart2 < cend2)
{
if (cstr1[cstart1] != cstr2[cstart2])
- return SCM_BOOL (len == len1);
+ return scm_from_bool (len == len1);
len++;
cstart1++;
cstart2++;
}
- return SCM_BOOL (len == len1);
+ return scm_from_bool (len == len1);
}
#undef FUNC_NAME
@@ -1509,12 +1509,12 @@ SCM_DEFINE (scm_string_prefix_ci_p, "string-prefix-ci?", 2, 4, 0,
while (cstart1 < cend1 && cstart2 < cend2)
{
if (scm_c_downcase (cstr1[cstart1]) != scm_c_downcase (cstr2[cstart2]))
- return SCM_BOOL (len == len1);
+ return scm_from_bool (len == len1);
len++;
cstart1++;
cstart2++;
}
- return SCM_BOOL (len == len1);
+ return scm_from_bool (len == len1);
}
#undef FUNC_NAME
@@ -1540,10 +1540,10 @@ SCM_DEFINE (scm_string_suffix_p, "string-suffix?", 2, 4, 0,
cend1--;
cend2--;
if (cstr1[cend1] != cstr2[cend2])
- return SCM_BOOL (len == len1);
+ return scm_from_bool (len == len1);
len++;
}
- return SCM_BOOL (len == len1);
+ return scm_from_bool (len == len1);
}
#undef FUNC_NAME
@@ -1569,10 +1569,10 @@ SCM_DEFINE (scm_string_suffix_ci_p, "string-suffix-ci?", 2, 4, 0,
cend1--;
cend2--;
if (scm_c_downcase (cstr1[cend1]) != scm_c_downcase (cstr2[cend2]))
- return SCM_BOOL (len == len1);
+ return scm_from_bool (len == len1);
len++;
}
- return SCM_BOOL (len == len1);
+ return scm_from_bool (len == len1);
}
#undef FUNC_NAME
@@ -1628,7 +1628,7 @@ SCM_DEFINE (scm_string_indexS, "string-index", 2, 2, 0,
{
SCM res;
res = scm_call_1 (char_pred, SCM_MAKE_CHAR (cstr[cstart]));
- if (!SCM_FALSEP (res))
+ if (scm_is_true (res))
return SCM_MAKINUM (cstart);
cstart++;
}
@@ -1688,7 +1688,7 @@ SCM_DEFINE (scm_string_index_right, "string-index-right", 2, 2, 0,
SCM res;
cend--;
res = scm_call_1 (char_pred, SCM_MAKE_CHAR (cstr[cend]));
- if (!SCM_FALSEP (res))
+ if (scm_is_true (res))
return SCM_MAKINUM (cend);
}
}
@@ -1747,7 +1747,7 @@ SCM_DEFINE (scm_string_skip, "string-skip", 2, 2, 0,
{
SCM res;
res = scm_call_1 (char_pred, SCM_MAKE_CHAR (cstr[cstart]));
- if (SCM_FALSEP (res))
+ if (scm_is_false (res))
return SCM_MAKINUM (cstart);
cstart++;
}
@@ -1808,7 +1808,7 @@ SCM_DEFINE (scm_string_skip_right, "string-skip-right", 2, 2, 0,
SCM res;
cend--;
res = scm_call_1 (char_pred, SCM_MAKE_CHAR (cstr[cend]));
- if (SCM_FALSEP (res))
+ if (scm_is_false (res))
return SCM_MAKINUM (cend);
}
}
@@ -1867,7 +1867,7 @@ SCM_DEFINE (scm_string_count, "string-count", 2, 2, 0,
{
SCM res;
res = scm_call_1 (char_pred, SCM_MAKE_CHAR (cstr[cstart]));
- if (!SCM_FALSEP (res))
+ if (scm_is_true (res))
count++;
cstart++;
}
@@ -2086,7 +2086,7 @@ string_titlecase_x (SCM str, int start, int end)
sz = SCM_STRING_UCHARS (str);
for(i = start; i < end; i++)
{
- if (!SCM_FALSEP (scm_char_alphabetic_p (SCM_MAKE_CHAR (sz[i]))))
+ if (scm_is_true (scm_char_alphabetic_p (SCM_MAKE_CHAR (sz[i]))))
{
if (!in_word)
{
@@ -2528,7 +2528,7 @@ SCM_DEFINE (scm_string_unfold, "string-unfold", 4, 2, 0,
SCM_VALIDATE_PROC (6, make_final);
res = scm_call_1 (p, seed);
- while (SCM_FALSEP (res))
+ while (scm_is_false (res))
{
SCM str;
SCM ch = scm_call_1 (f, seed);
@@ -2590,7 +2590,7 @@ SCM_DEFINE (scm_string_unfold_right, "string-unfold-right", 4, 2, 0,
SCM_VALIDATE_PROC (6, make_final);
res = scm_call_1 (p, seed);
- while (SCM_FALSEP (res))
+ while (scm_is_false (res))
{
SCM str;
SCM ch = scm_call_1 (f, seed);
@@ -2895,7 +2895,7 @@ SCM_DEFINE (scm_string_filter, "string-filter", 2, 2, 0,
{
SCM res;
res = scm_call_1 (char_pred, SCM_MAKE_CHAR (cstr[idx]));
- if (!SCM_FALSEP (res))
+ if (scm_is_true (res))
ls = scm_cons (SCM_MAKE_CHAR (cstr[idx]), ls);
idx++;
}
@@ -2961,7 +2961,7 @@ SCM_DEFINE (scm_string_delete, "string-delete", 2, 2, 0,
{
SCM res;
res = scm_call_1 (char_pred, SCM_MAKE_CHAR (cstr[idx]));
- if (SCM_FALSEP (res))
+ if (scm_is_false (res))
ls = scm_cons (SCM_MAKE_CHAR (cstr[idx]), ls);
idx++;
}
diff --git a/srfi/srfi-14.c b/srfi/srfi-14.c
index aeae52aa2..0ab29672a 100644
--- a/srfi/srfi-14.c
+++ b/srfi/srfi-14.c
@@ -85,7 +85,7 @@ SCM_DEFINE (scm_char_set_p, "char-set?", 1, 0, 0,
"otherwise.")
#define FUNC_NAME s_scm_char_set_p
{
- return SCM_BOOL (SCM_SMOB_PREDICATE (scm_tc16_charset, obj));
+ return scm_from_bool (SCM_SMOB_PREDICATE (scm_tc16_charset, obj));
}
#undef FUNC_NAME
@@ -261,7 +261,7 @@ SCM_DEFINE (scm_end_of_char_set_p, "end-of-char-set?", 1, 0, 0,
int ccursor;
SCM_VALIDATE_INUM_MIN_COPY (1, cursor, 0, ccursor);
- return SCM_BOOL (ccursor >= SCM_CHARSET_SIZE);
+ return scm_from_bool (ccursor >= SCM_CHARSET_SIZE);
}
#undef FUNC_NAME
@@ -316,7 +316,7 @@ SCM_DEFINE (scm_char_set_unfold, "char-set-unfold", 4, 1, 0,
result = make_char_set (FUNC_NAME);
tmp = scm_call_1 (p, seed);
- while (SCM_FALSEP (tmp))
+ while (scm_is_false (tmp))
{
SCM ch = scm_call_1 (f, seed);
if (!SCM_CHARP (ch))
@@ -354,7 +354,7 @@ SCM_DEFINE (scm_char_set_unfold_x, "char-set-unfold!", 5, 0, 0,
SCM_VALIDATE_SMOB (5, base_cs, charset);
tmp = scm_call_1 (p, seed);
- while (SCM_FALSEP (tmp))
+ while (scm_is_false (tmp))
{
SCM ch = scm_call_1 (f, seed);
if (!SCM_CHARP (ch))
@@ -606,7 +606,7 @@ SCM_DEFINE (scm_char_set_filter, "char-set-filter", 2, 1, 0,
{
SCM res = scm_call_1 (pred, SCM_MAKE_CHAR (k));
- if (!SCM_FALSEP (res))
+ if (scm_is_true (res))
p[k / SCM_BITS_PER_LONG] |= 1L << (k % SCM_BITS_PER_LONG);
}
}
@@ -635,7 +635,7 @@ SCM_DEFINE (scm_char_set_filter_x, "char-set-filter!", 3, 0, 0,
{
SCM res = scm_call_1 (pred, SCM_MAKE_CHAR (k));
- if (!SCM_FALSEP (res))
+ if (scm_is_true (res))
p[k / SCM_BITS_PER_LONG] |= 1L << (k % SCM_BITS_PER_LONG);
}
}
@@ -670,7 +670,7 @@ SCM_DEFINE (scm_ucs_range_to_char_set, "ucs-range->char-set", 2, 2, 0,
SCM_ASSERT_RANGE (2, upper, cupper >= 0 && cupper >= clower);
if (!SCM_UNBNDP (error))
{
- if (!SCM_FALSEP (error))
+ if (scm_is_true (error))
{
SCM_ASSERT_RANGE (1, lower, clower <= SCM_CHARSET_SIZE);
SCM_ASSERT_RANGE (2, upper, cupper <= SCM_CHARSET_SIZE);
@@ -721,7 +721,7 @@ SCM_DEFINE (scm_ucs_range_to_char_set_x, "ucs-range->char-set!", 4, 0, 0,
SCM_VALIDATE_INUM_COPY (2, upper, cupper);
SCM_ASSERT_RANGE (1, lower, clower >= 0);
SCM_ASSERT_RANGE (2, upper, cupper >= 0 && cupper >= clower);
- if (!SCM_FALSEP (error))
+ if (scm_is_true (error))
{
SCM_ASSERT_RANGE (1, lower, clower <= SCM_CHARSET_SIZE);
SCM_ASSERT_RANGE (2, upper, cupper <= SCM_CHARSET_SIZE);
@@ -772,7 +772,7 @@ SCM_DEFINE (scm_char_set_count, "char-set-count", 2, 0, 0,
if (SCM_CHARSET_GET (cs, k))
{
SCM res = scm_call_1 (pred, SCM_MAKE_CHAR (k));
- if (!SCM_FALSEP (res))
+ if (scm_is_true (res))
count++;
}
return SCM_MAKINUM (count);
@@ -833,7 +833,7 @@ SCM_DEFINE (scm_char_set_contains_p, "char-set-contains?", 2, 0, 0,
{
SCM_VALIDATE_SMOB (1, cs, charset);
SCM_VALIDATE_CHAR (2, ch);
- return SCM_BOOL (SCM_CHARSET_GET (cs, SCM_CHAR (ch)));
+ return scm_from_bool (SCM_CHARSET_GET (cs, SCM_CHAR (ch)));
}
#undef FUNC_NAME
@@ -854,7 +854,7 @@ SCM_DEFINE (scm_char_set_every, "char-set-every", 2, 0, 0,
if (SCM_CHARSET_GET (cs, k))
{
res = scm_call_1 (pred, SCM_MAKE_CHAR (k));
- if (SCM_FALSEP (res))
+ if (scm_is_false (res))
return res;
}
return res;
@@ -877,7 +877,7 @@ SCM_DEFINE (scm_char_set_any, "char-set-any", 2, 0, 0,
if (SCM_CHARSET_GET (cs, k))
{
SCM res = scm_call_1 (pred, SCM_MAKE_CHAR (k));
- if (!SCM_FALSEP (res))
+ if (scm_is_true (res))
return res;
}
return SCM_BOOL_F;
diff --git a/srfi/srfi-4.c b/srfi/srfi-4.c
index 4a37112ed..d6507551d 100644
--- a/srfi/srfi-4.c
+++ b/srfi/srfi-4.c
@@ -279,8 +279,8 @@ SCM_DEFINE (scm_u8vector_p, "u8vector?", 1, 0, 0,
"@code{#f} otherwise.")
#define FUNC_NAME s_scm_u8vector_p
{
- return SCM_BOOL (SCM_SMOB_PREDICATE (scm_tc16_uvec, obj) &&
- SCM_UVEC_TYPE (obj) == SCM_UVEC_U8);
+ return scm_from_bool (SCM_SMOB_PREDICATE (scm_tc16_uvec, obj) &&
+ SCM_UVEC_TYPE (obj) == SCM_UVEC_U8);
}
#undef FUNC_NAME
@@ -465,8 +465,8 @@ SCM_DEFINE (scm_s8vector_p, "s8vector?", 1, 0, 0,
"@code{#f} otherwise.")
#define FUNC_NAME s_scm_s8vector_p
{
- return SCM_BOOL (SCM_SMOB_PREDICATE (scm_tc16_uvec, obj) &&
- SCM_UVEC_TYPE (obj) == SCM_UVEC_S8);
+ return scm_from_bool (SCM_SMOB_PREDICATE (scm_tc16_uvec, obj) &&
+ SCM_UVEC_TYPE (obj) == SCM_UVEC_S8);
}
#undef FUNC_NAME
@@ -653,8 +653,8 @@ SCM_DEFINE (scm_u16vector_p, "u16vector?", 1, 0, 0,
"@code{#f} otherwise.")
#define FUNC_NAME s_scm_u16vector_p
{
- return SCM_BOOL (SCM_SMOB_PREDICATE (scm_tc16_uvec, obj) &&
- SCM_UVEC_TYPE (obj) == SCM_UVEC_U16);
+ return scm_from_bool (SCM_SMOB_PREDICATE (scm_tc16_uvec, obj) &&
+ SCM_UVEC_TYPE (obj) == SCM_UVEC_U16);
}
#undef FUNC_NAME
@@ -823,8 +823,8 @@ SCM_DEFINE (scm_s16vector_p, "s16vector?", 1, 0, 0,
"@code{#f} otherwise.")
#define FUNC_NAME s_scm_s16vector_p
{
- return SCM_BOOL (SCM_SMOB_PREDICATE (scm_tc16_uvec, obj) &&
- SCM_UVEC_TYPE (obj) == SCM_UVEC_S16);
+ return scm_from_bool (SCM_SMOB_PREDICATE (scm_tc16_uvec, obj) &&
+ SCM_UVEC_TYPE (obj) == SCM_UVEC_S16);
}
#undef FUNC_NAME
@@ -996,8 +996,8 @@ SCM_DEFINE (scm_u32vector_p, "u32vector?", 1, 0, 0,
"@code{#f} otherwise.")
#define FUNC_NAME s_scm_u32vector_p
{
- return SCM_BOOL (SCM_SMOB_PREDICATE (scm_tc16_uvec, obj) &&
- SCM_UVEC_TYPE (obj) == SCM_UVEC_U32);
+ return scm_from_bool (SCM_SMOB_PREDICATE (scm_tc16_uvec, obj) &&
+ SCM_UVEC_TYPE (obj) == SCM_UVEC_U32);
}
#undef FUNC_NAME
@@ -1167,8 +1167,8 @@ SCM_DEFINE (scm_s32vector_p, "s32vector?", 1, 0, 0,
"@code{#f} otherwise.")
#define FUNC_NAME s_scm_s32vector_p
{
- return SCM_BOOL (SCM_SMOB_PREDICATE (scm_tc16_uvec, obj) &&
- SCM_UVEC_TYPE (obj) == SCM_UVEC_S32);
+ return scm_from_bool (SCM_SMOB_PREDICATE (scm_tc16_uvec, obj) &&
+ SCM_UVEC_TYPE (obj) == SCM_UVEC_S32);
}
#undef FUNC_NAME
@@ -1340,8 +1340,8 @@ SCM_DEFINE (scm_u64vector_p, "u64vector?", 1, 0, 0,
"@code{#f} otherwise.")
#define FUNC_NAME s_scm_u64vector_p
{
- return SCM_BOOL (SCM_SMOB_PREDICATE (scm_tc16_uvec, obj) &&
- SCM_UVEC_TYPE (obj) == SCM_UVEC_U64);
+ return scm_from_bool (SCM_SMOB_PREDICATE (scm_tc16_uvec, obj) &&
+ SCM_UVEC_TYPE (obj) == SCM_UVEC_U64);
}
#undef FUNC_NAME
@@ -1511,8 +1511,8 @@ SCM_DEFINE (scm_s64vector_p, "s64vector?", 1, 0, 0,
"@code{#f} otherwise.")
#define FUNC_NAME s_scm_s64vector_p
{
- return SCM_BOOL (SCM_SMOB_PREDICATE (scm_tc16_uvec, obj) &&
- SCM_UVEC_TYPE (obj) == SCM_UVEC_S64);
+ return scm_from_bool (SCM_SMOB_PREDICATE (scm_tc16_uvec, obj) &&
+ SCM_UVEC_TYPE (obj) == SCM_UVEC_S64);
}
#undef FUNC_NAME
@@ -1684,8 +1684,8 @@ SCM_DEFINE (scm_f32vector_p, "f32vector?", 1, 0, 0,
"@code{#f} otherwise.")
#define FUNC_NAME s_scm_f32vector_p
{
- return SCM_BOOL (SCM_SMOB_PREDICATE (scm_tc16_uvec, obj) &&
- SCM_UVEC_TYPE (obj) == SCM_UVEC_F32);
+ return scm_from_bool (SCM_SMOB_PREDICATE (scm_tc16_uvec, obj) &&
+ SCM_UVEC_TYPE (obj) == SCM_UVEC_F32);
}
#undef FUNC_NAME
@@ -1880,8 +1880,8 @@ SCM_DEFINE (scm_f64vector_p, "f64vector?", 1, 0, 0,
"@code{#f} otherwise.")
#define FUNC_NAME s_scm_f64vector_p
{
- return SCM_BOOL (SCM_SMOB_PREDICATE (scm_tc16_uvec, obj) &&
- SCM_UVEC_TYPE (obj) == SCM_UVEC_F64);
+ return scm_from_bool (SCM_SMOB_PREDICATE (scm_tc16_uvec, obj) &&
+ SCM_UVEC_TYPE (obj) == SCM_UVEC_F64);
}
#undef FUNC_NAME