HCoop
/
bpt
/
guile.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
GOOPS cosmetics
[bpt/guile.git]
/
libguile
/
srfi-1.c
diff --git
a/libguile/srfi-1.c
b/libguile/srfi-1.c
index
fcbf806
..
353a746
100644
(file)
--- a/
libguile/srfi-1.c
+++ b/
libguile/srfi-1.c
@@
-1,6
+1,6
@@
/* srfi-1.c --- SRFI-1 procedures for Guile
*
/* srfi-1.c --- SRFI-1 procedures for Guile
*
- * Copyright (C) 1995-1997, 2000-2003, 2005, 2006, 2008-2011,
+ * Copyright (C) 1995-1997, 2000-2003, 2005, 2006, 2008-2011,
2013
* 2014 Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* 2014 Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
@@
-258,7
+258,7
@@
SCM_DEFINE (scm_srfi1_count, "count", 2, 0, 1,
SCM_SIMPLE_VECTOR_SET (vec, i, SCM_CDR (lst)); /* rest of lst */
}
SCM_SIMPLE_VECTOR_SET (vec, i, SCM_CDR (lst)); /* rest of lst */
}
- count += scm_is_true (scm_apply
(pred, args, SCM_EOL
));
+ count += scm_is_true (scm_apply
_0 (pred, args
));
}
}
}
}
@@
-620,20
+620,28
@@
SCM_DEFINE (scm_srfi1_length_plus, "length+", 1, 0, 0,
do
{
do
{
- if (SCM_NULL_OR_NIL_P (hare))
- return scm_from_size_t (i);
if (!scm_is_pair (hare))
if (!scm_is_pair (hare))
- scm_wrong_type_arg_msg (FUNC_NAME, 1, lst, "proper or circular list");
+ {
+ if (SCM_NULL_OR_NIL_P (hare))
+ return scm_from_size_t (i);
+ else
+ scm_wrong_type_arg_msg (FUNC_NAME, 1, lst,
+ "proper or circular list");
+ }
hare = SCM_CDR (hare);
i++;
hare = SCM_CDR (hare);
i++;
- if (SCM_NULL_OR_NIL_P (hare))
- return scm_from_size_t (i);
if (!scm_is_pair (hare))
if (!scm_is_pair (hare))
- scm_wrong_type_arg_msg (FUNC_NAME, 1, lst, "proper or circular list");
+ {
+ if (SCM_NULL_OR_NIL_P (hare))
+ return scm_from_size_t (i);
+ else
+ scm_wrong_type_arg_msg (FUNC_NAME, 1, lst,
+ "proper or circular list");
+ }
hare = SCM_CDR (hare);
i++;
/* For every two steps the hare takes, the tortoise takes one. */
hare = SCM_CDR (hare);
i++;
/* For every two steps the hare takes, the tortoise takes one. */
- tortoise = SCM_CDR(tortoise);
+ tortoise = SCM_CDR
(tortoise);
}
while (!scm_is_eq (hare, tortoise));
}
while (!scm_is_eq (hare, tortoise));