diff options
| -rw-r--r-- | lib.c | 55 | ||||
| -rw-r--r-- | tests/012/iter.tl | 19 | ||||
| -rw-r--r-- | txr.1 | 39 |
3 files changed, 109 insertions, 4 deletions
@@ -1172,6 +1172,14 @@ val iter_begin(val obj) } } +static val iter_dynamic(struct seq_iter *si_orig) +{ + struct seq_iter *si = coerce(struct seq_iter *, + chk_copy_obj(coerce(mem_t *, si_orig), + sizeof *si)); + return cobj(coerce(mem_t *, si), seq_iter_cls, &seq_iter_ops); +} + val iter_more(val iter) { switch (type(iter)) { @@ -2447,6 +2455,47 @@ val sub_list(val list, val from, val to) } } +static val sub_iter(val obj, val from, val to) +{ + val self = lit("sub"); + seq_iter_t iter; + seq_iter_init(self, &iter, obj); + val idx = zero, elem; + list_collect_decl (out, ptail); + + if (from == t) + return nil; + + if (null_or_missing_p(from)) + from = zero; + else if (minusp(from)) + goto list; + + if (to == t || null_or_missing_p(to)) + to = nil; + else if (!null_or_missing_p(to) && minusp(to)) + goto list; + + if (!to) { + do { + if (ge(idx, from)) + return iter_dynamic(&iter); + idx = succ(idx); + } while (seq_get(&iter, &elem)); + } else { + for (; seq_get(&iter, &elem) && lt(idx, to); idx = succ(idx)) + if (ge(idx, from)) + ptail = list_collect(ptail, elem); + } + + return out; + +list: + while (seq_get(&iter, &elem)) + ptail = list_collect(ptail, elem); + return sub_list(out, from, to); +} + val replace_list(val list, val items, val from, val to) { val self = lit("replace-list"); @@ -7727,6 +7776,7 @@ INLINE val do_generic_funcall(val fun, struct args *args_in) case LSTR: case BUF: carray: + default: bug_unless (args->argc >= ARGS_MIN); args_normalize_least(args, 3); @@ -7815,9 +7865,6 @@ INLINE val do_generic_funcall(val fun, struct args *args_in) fun = method(fun, lambda_s); break; } - /* fallthrough */ - default: - callerror(fun, lit("object is not callable")); } variadic = fun->f.variadic; @@ -11990,7 +12037,7 @@ val sub(val seq, val from, val to) } /* fallthrough */ default: - type_mismatch(lit("sub: ~s is not a sequence"), seq, nao); + return sub_iter(seq, from, to); } } diff --git a/tests/012/iter.tl b/tests/012/iter.tl index f98107a5..1151d8ca 100644 --- a/tests/012/iter.tl +++ b/tests/012/iter.tl @@ -40,3 +40,22 @@ "DC11" "DC12" "DC13" "DC14" "DC15" "DC16" "DC17" "DC18" "DC19" "DD01" "DD02" "DD03" "DD04" "DD05" "DD06" "DD07" "DD08" "DD09" "DD11" "DD12" "DD13" "DD14" "DD15" "DD16" "DD17" "DD18" "DD19")) + +(mtest + [maprod append "A".."F" (drop 1 "00".."15")] + ("A01" "A02" "A03" "A04" "A05" "A10" "A11" "A12" "A13" "A14" "A15" + "B01" "B02" "B03" "B04" "B05" "B10" "B11" "B12" "B13" "B14" "B15" + "C01" "C02" "C03" "C04" "C05" "C10" "C11" "C12" "C13" "C14" "C15" + "D01" "D02" "D03" "D04" "D05" "D10" "D11" "D12" "D13" "D14" "D15" + "E01" "E02" "E03" "E04" "E05" "E10" "E11" "E12" "E13" "E14" "E15" + "F01" "F02" "F03" "F04" "F05" "F10" "F11" "F12" "F13" "F14" "F15") + [maprod append "A".."F" ["00".."99" 1..11]] + ("A01" "A02" "A03" "A04" "A05" "A06" "A07" "A08" "A09" "A10" "B01" + "B02" "B03" "B04" "B05" "B06" "B07" "B08" "B09" "B10" "C01" "C02" + "C03" "C04" "C05" "C06" "C07" "C08" "C09" "C10" "D01" "D02" "D03" + "D04" "D05" "D06" "D07" "D08" "D09" "D10" "E01" "E02" "E03" "E04" + "E05" "E06" "E07" "E08" "E09" "E10" "F01" "F02" "F03" "F04" "F05" + "F06" "F07" "F08" "F09" "F10")) + +(test + [mapcar identity [0..10 3 6]] (3 4 5)) @@ -15533,6 +15533,15 @@ is a list, then the .meta sequence form itself must be a place. +This form is implemented using the +.code ref +accessor such that, except for the argument evaluation semantics of the DWIM +brackets, it is equivalent to using the +.mono +.meti (ref < sequence << index ) +.onom +syntax. + .meIP >> [ sequence << from-index..to-below-index ] Retrieve the specified range of elements. The range of elements is specified in the @@ -15564,6 +15573,19 @@ regardless of whether the target is a string, vector or list. If the target is a string, the replacement sequence must be a string, or a list or vector of characters. +The semantics is implemented using the +.code sub +accessor, such that the following equivalence holds: + +.verb + [seq from..to] <--> (sub seq from..to) +.brev + +For this reason, +.meta sequence +may be any object that is iterable by +.codn iter-begin . + .meIP >> [ sequence << index-list ] Elements specified by @@ -31512,6 +31534,23 @@ is not an accessor, assigning to the .code sub syntax in this case will produce an error. +The +.meta sequence +argument may also be any other object type that is suitable as input to the +.code iter-begin +function. In this situation, assigning to +.code sub +syntax produces an error. The behavior is complex. In cases where the +.meta from +and +.meta to +arguments imply that a suffix of +.meta sequence +is required, an iterator may be returned which traverses the suffix +of the sequence. In other cases, a list of the elements selected by +.code sub +is returned. + If .meta sequence is a structure, it must support the |