summaryrefslogtreecommitdiff
path: root/libguile/srfi-14.c
diff options
context:
space:
mode:
authorMarius Vollmer <mvo@zagadka.de>2004-09-22 17:41:37 +0000
committerMarius Vollmer <mvo@zagadka.de>2004-09-22 17:41:37 +0000
commitd2e53ed6f84df8c79f4bf5cf41d4f6d381bc065b (patch)
treedf14a633c6d8ac08ba098651a9164a0c991d8288 /libguile/srfi-14.c
parenta61f4e0c61695e17984b25b16fbf720b851b739c (diff)
downloadguile-d2e53ed6f84df8c79f4bf5cf41d4f6d381bc065b.tar.gz
*** empty log message ***
Diffstat (limited to 'libguile/srfi-14.c')
-rw-r--r--libguile/srfi-14.c42
1 files changed, 21 insertions, 21 deletions
diff --git a/libguile/srfi-14.c b/libguile/srfi-14.c
index c2a6a9a0c..eaf9e07f1 100644
--- a/libguile/srfi-14.c
+++ b/libguile/srfi-14.c
@@ -100,7 +100,7 @@ SCM_DEFINE (scm_char_set_eq, "char-set=", 0, 0, 1,
SCM_VALIDATE_REST_ARGUMENT (char_sets);
- while (!SCM_NULLP (char_sets))
+ while (!scm_is_null (char_sets))
{
SCM csi = SCM_CAR (char_sets);
long *csi_data;
@@ -130,7 +130,7 @@ SCM_DEFINE (scm_char_set_leq, "char-set<=", 0, 0, 1,
SCM_VALIDATE_REST_ARGUMENT (char_sets);
- while (!SCM_NULLP (char_sets))
+ while (!scm_is_null (char_sets))
{
SCM csi = SCM_CAR (char_sets);
long *csi_data;
@@ -441,7 +441,7 @@ SCM_DEFINE (scm_char_set, "char-set", 0, 0, 1,
SCM_VALIDATE_REST_ARGUMENT (rest);
cs = make_char_set (FUNC_NAME);
p = (long *) SCM_SMOB_DATA (cs);
- while (!SCM_NULLP (rest))
+ while (!scm_is_null (rest))
{
int c;
@@ -474,7 +474,7 @@ SCM_DEFINE (scm_list_to_char_set, "list->char-set", 1, 1, 0,
cs = scm_char_set_copy (base_cs);
}
p = (long *) SCM_SMOB_DATA (cs);
- while (!SCM_NULLP (list))
+ while (!scm_is_null (list))
{
SCM chr = SCM_CAR (list);
int c;
@@ -501,7 +501,7 @@ SCM_DEFINE (scm_list_to_char_set_x, "list->char-set!", 2, 0, 0,
SCM_VALIDATE_LIST (1, list);
SCM_VALIDATE_SMOB (2, base_cs, charset);
p = (long *) SCM_SMOB_DATA (base_cs);
- while (!SCM_NULLP (list))
+ while (!scm_is_null (list))
{
SCM chr = SCM_CAR (list);
int c;
@@ -908,7 +908,7 @@ SCM_DEFINE (scm_char_set_adjoin, "char-set-adjoin", 1, 0, 1,
cs = scm_char_set_copy (cs);
p = (long *) SCM_SMOB_DATA (cs);
- while (!SCM_NULLP (rest))
+ while (!scm_is_null (rest))
{
SCM chr = SCM_CAR (rest);
int c;
@@ -936,7 +936,7 @@ SCM_DEFINE (scm_char_set_delete, "char-set-delete", 1, 0, 1,
cs = scm_char_set_copy (cs);
p = (long *) SCM_SMOB_DATA (cs);
- while (!SCM_NULLP (rest))
+ while (!scm_is_null (rest))
{
SCM chr = SCM_CAR (rest);
int c;
@@ -963,7 +963,7 @@ SCM_DEFINE (scm_char_set_adjoin_x, "char-set-adjoin!", 1, 0, 1,
SCM_VALIDATE_REST_ARGUMENT (rest);
p = (long *) SCM_SMOB_DATA (cs);
- while (!SCM_NULLP (rest))
+ while (!scm_is_null (rest))
{
SCM chr = SCM_CAR (rest);
int c;
@@ -990,7 +990,7 @@ SCM_DEFINE (scm_char_set_delete_x, "char-set-delete!", 1, 0, 1,
SCM_VALIDATE_REST_ARGUMENT (rest);
p = (long *) SCM_SMOB_DATA (cs);
- while (!SCM_NULLP (rest))
+ while (!scm_is_null (rest))
{
SCM chr = SCM_CAR (rest);
int c;
@@ -1039,7 +1039,7 @@ SCM_DEFINE (scm_char_set_union, "char-set-union", 0, 0, 1,
res = make_char_set (FUNC_NAME);
p = (long *) SCM_SMOB_DATA (res);
- while (!SCM_NULLP (rest))
+ while (!scm_is_null (rest))
{
int k;
SCM cs = SCM_CAR (rest);
@@ -1064,7 +1064,7 @@ SCM_DEFINE (scm_char_set_intersection, "char-set-intersection", 0, 0, 1,
SCM_VALIDATE_REST_ARGUMENT (rest);
- if (SCM_NULLP (rest))
+ if (scm_is_null (rest))
res = make_char_set (FUNC_NAME);
else
{
@@ -1075,7 +1075,7 @@ SCM_DEFINE (scm_char_set_intersection, "char-set-intersection", 0, 0, 1,
p = (long *) SCM_SMOB_DATA (res);
rest = SCM_CDR (rest);
- while (SCM_CONSP (rest))
+ while (scm_is_pair (rest))
{
int k;
SCM cs = SCM_CAR (rest);
@@ -1109,7 +1109,7 @@ SCM_DEFINE (scm_char_set_difference, "char-set-difference", 1, 0, 1,
res = scm_char_set_copy (cs1);
p = (long *) SCM_SMOB_DATA (res);
- while (!SCM_NULLP (rest))
+ while (!scm_is_null (rest))
{
int k;
SCM cs = SCM_CAR (rest);
@@ -1134,7 +1134,7 @@ SCM_DEFINE (scm_char_set_xor, "char-set-xor", 0, 0, 1,
SCM_VALIDATE_REST_ARGUMENT (rest);
- if (SCM_NULLP (rest))
+ if (scm_is_null (rest))
res = make_char_set (FUNC_NAME);
else
{
@@ -1145,7 +1145,7 @@ SCM_DEFINE (scm_char_set_xor, "char-set-xor", 0, 0, 1,
p = (long *) SCM_SMOB_DATA (res);
rest = SCM_CDR (rest);
- while (SCM_CONSP (rest))
+ while (scm_is_pair (rest))
{
SCM cs = SCM_CAR (rest);
long *cs_data;
@@ -1182,7 +1182,7 @@ SCM_DEFINE (scm_char_set_diff_plus_intersection, "char-set-diff+intersection", 1
res2 = make_char_set (FUNC_NAME);
p = (long *) SCM_SMOB_DATA (res1);
q = (long *) SCM_SMOB_DATA (res2);
- while (!SCM_NULLP (rest))
+ while (!scm_is_null (rest))
{
int k;
SCM cs = SCM_CAR (rest);
@@ -1233,7 +1233,7 @@ SCM_DEFINE (scm_char_set_union_x, "char-set-union!", 1, 0, 1,
SCM_VALIDATE_REST_ARGUMENT (rest);
p = (long *) SCM_SMOB_DATA (cs1);
- while (!SCM_NULLP (rest))
+ while (!scm_is_null (rest))
{
int k;
SCM cs = SCM_CAR (rest);
@@ -1261,7 +1261,7 @@ SCM_DEFINE (scm_char_set_intersection_x, "char-set-intersection!", 1, 0, 1,
SCM_VALIDATE_REST_ARGUMENT (rest);
p = (long *) SCM_SMOB_DATA (cs1);
- while (!SCM_NULLP (rest))
+ while (!scm_is_null (rest))
{
int k;
SCM cs = SCM_CAR (rest);
@@ -1289,7 +1289,7 @@ SCM_DEFINE (scm_char_set_difference_x, "char-set-difference!", 1, 0, 1,
SCM_VALIDATE_REST_ARGUMENT (rest);
p = (long *) SCM_SMOB_DATA (cs1);
- while (!SCM_NULLP (rest))
+ while (!scm_is_null (rest))
{
int k;
SCM cs = SCM_CAR (rest);
@@ -1326,7 +1326,7 @@ SCM_DEFINE (scm_char_set_xor_x, "char-set-xor!", 1, 0, 1,
SCM_VALIDATE_REST_ARGUMENT (rest);
p = (long *) SCM_SMOB_DATA (cs1);
- while (!SCM_NULLP (rest))
+ while (!scm_is_null (rest))
{
int k;
SCM cs = SCM_CAR (rest);
@@ -1373,7 +1373,7 @@ SCM_DEFINE (scm_char_set_diff_plus_intersection_x, "char-set-diff+intersection!"
p[k] &= ~q[k];
q[k] = t & q[k];
}
- while (!SCM_NULLP (rest))
+ while (!scm_is_null (rest))
{
SCM cs = SCM_CAR (rest);
long *r;