diff options
author | Rob Browning <rlb@defaultvalue.org> | 2024-07-17 23:12:14 -0500 |
---|---|---|
committer | Rob Browning <rlb@defaultvalue.org> | 2024-07-30 19:28:37 -0500 |
commit | 945c97b14d4f07f3f70b72efff8a18625603035c (patch) | |
tree | 09ea3baf8f438b38d02fdc1b8b292e2790c1bbc2 /libguile | |
parent | 3eb6afe738b313deac6b43cc4c883f70179f48cc (diff) | |
download | guile-945c97b14d4f07f3f70b72efff8a18625603035c.tar.gz |
srfi-1 lset-difference!: move from C to Scheme
* libguile/srfi-1.c (scm_srfi1_lset-difference_x): delete.
* libguile/srfi-1.h (scm_srfi1_lset-difference_x): delete.
* module/srfi/srfi-1.scm: add lset-difference!.
* test-suite/tests/srfi-1.test: extend lset-difference! tests to cover
lset-difference.
Diffstat (limited to 'libguile')
-rw-r--r-- | libguile/srfi-1.c | 59 | ||||
-rw-r--r-- | libguile/srfi-1.h | 1 |
2 files changed, 0 insertions, 60 deletions
diff --git a/libguile/srfi-1.c b/libguile/srfi-1.c index 64b4f46ee..56e12296b 100644 --- a/libguile/srfi-1.c +++ b/libguile/srfi-1.c @@ -272,65 +272,6 @@ SCM_DEFINE (scm_srfi1_delete_duplicates_x, "delete-duplicates!", 1, 1, 0, } #undef FUNC_NAME -SCM_DEFINE (scm_srfi1_lset_difference_x, "lset-difference!", 2, 0, 1, - (SCM equal, SCM lst, SCM rest), - "Return @var{lst} with any elements in the lists in @var{rest}\n" - "removed (ie.@: subtracted). For only one @var{lst} argument,\n" - "just that list is returned.\n" - "\n" - "The given @var{equal} procedure is used for comparing elements,\n" - "called as @code{(@var{equal} elem1 elemN)}. The first argument\n" - "is from @var{lst} and the second from one of the subsequent\n" - "lists. But exactly which calls are made and in what order is\n" - "unspecified.\n" - "\n" - "@example\n" - "(lset-difference! eqv? (list 'x 'y)) @result{} (x y)\n" - "(lset-difference! eqv? (list 1 2 3) '(3 1)) @result{} (2)\n" - "(lset-difference! eqv? (list 1 2 3) '(3) '(2)) @result{} (1)\n" - "@end example\n" - "\n" - "@code{lset-difference!} may modify @var{lst} to form its\n" - "result.") -#define FUNC_NAME s_scm_srfi1_lset_difference_x -{ - SCM ret, *pos, elem, r, b; - int argnum; - - SCM_VALIDATE_PROC (SCM_ARG1, equal); - SCM_VALIDATE_REST_ARGUMENT (rest); - - ret = SCM_EOL; - pos = &ret; - for ( ; scm_is_pair (lst); lst = SCM_CDR (lst)) - { - elem = SCM_CAR (lst); - - for (r = rest, argnum = SCM_ARG3; - scm_is_pair (r); - r = SCM_CDR (r), argnum++) - { - for (b = SCM_CAR (r); scm_is_pair (b); b = SCM_CDR (b)) - if (scm_is_true (scm_call_2 (equal, elem, SCM_CAR (b)))) - goto next_elem; /* equal to elem, so drop that elem */ - - SCM_ASSERT_TYPE (SCM_NULL_OR_NIL_P (b), b, argnum, FUNC_NAME,"list"); - } - - /* elem not equal to anything in later lists, so keep it */ - *pos = lst; - pos = SCM_CDRLOC (lst); - - next_elem: - ; - } - SCM_ASSERT_TYPE (SCM_NULL_OR_NIL_P (lst), lst, SCM_ARG2, FUNC_NAME, "list"); - - *pos = SCM_EOL; - return ret; -} -#undef FUNC_NAME - void scm_register_srfi_1 (void) diff --git a/libguile/srfi-1.h b/libguile/srfi-1.h index c0f8f8866..1e906424d 100644 --- a/libguile/srfi-1.h +++ b/libguile/srfi-1.h @@ -26,7 +26,6 @@ SCM_INTERNAL SCM scm_srfi1_delete_duplicates (SCM lst, SCM pred); SCM_INTERNAL SCM scm_srfi1_delete_duplicates_x (SCM lst, SCM pred); -SCM_INTERNAL SCM scm_srfi1_lset_difference_x (SCM equal, SCM lst, SCM rest); SCM_INTERNAL void scm_register_srfi_1 (void); SCM_INTERNAL void scm_init_srfi_1 (void); |