diff options
author | Kaz Kylheku <kaz@kylheku.com> | 2024-03-07 20:19:35 -0800 |
---|---|---|
committer | Kaz Kylheku <kaz@kylheku.com> | 2024-03-07 20:19:35 -0800 |
commit | c005ad21d1259ea8c984e0084fd8b71cff86ca4d (patch) | |
tree | 3be7d10f66753c6ab1961955adfb43696d4a29c1 | |
parent | cb78d7e273406c4041470efbb2b0a450c003fca0 (diff) | |
download | txr-c005ad21d1259ea8c984e0084fd8b71cff86ca4d.tar.gz txr-c005ad21d1259ea8c984e0084fd8b71cff86ca4d.tar.bz2 txr-c005ad21d1259ea8c984e0084fd8b71cff86ca4d.zip |
rfind: use seq_iter.
* lib.c (rfind): We combine the default case with
SEQ_LISTLIKE and use the seq_iter abstraction rather
than car/cdr.
-rw-r--r-- | lib.c | 15 |
1 files changed, 8 insertions, 7 deletions
@@ -11719,14 +11719,16 @@ val rfind(val item, val seq, val testfun_in, val keyfun_in) case SEQ_NIL: return nil; case SEQ_LISTLIKE: + default: { val found = nil; - gc_hint(seq); + val elem; + seq_iter_t it; - for (seq = z(si.obj); seq; seq = cdr(seq)) { - val elem = car(seq); - val key = funcall1(keyfun, elem); + seq_iter_init_with_info(self, &it, si, 0); + while (seq_get(&it, &elem)) { + val key = funcall1(keyfun, elem); if (funcall2(testfun, item, key)) found = elem; } @@ -11761,10 +11763,9 @@ val rfind(val item, val seq, val testfun_in, val keyfun_in) } break; } - return nil; - default: - unsup_obj(self, seq); + break; } + return nil; } val find_max(val seq, val testfun_in, val keyfun_in) |