From b8b1c891f17d26cf3b13e77c1657cd855ae6543b Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Sun, 11 Jan 2015 09:34:29 -0800 Subject: * eval.c (merge_wrap): Make generic over sequences. * txr.1: Update documentation for merge function. --- eval.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) (limited to 'eval.c') diff --git a/eval.c b/eval.c index 71f2470e..b02e4d0b 100644 --- a/eval.c +++ b/eval.c @@ -3399,12 +3399,25 @@ static val pprinl(val obj, val stream) return ret; } -static val merge_wrap(val list1, val list2, val lessfun, val keyfun) -{ - keyfun = default_arg(keyfun, identity_f); - lessfun = default_arg(lessfun, less_f); +static val merge_wrap(val seq1, val seq2, val lessfun, val keyfun) +{ + if (!nullify(seq1)) { + if (type(seq1) == type(seq2)) + return seq2; + return make_like(tolist(seq2), seq1); + } else if (!nullify(seq2)) { + if (type(seq1) == type(seq2)) + return seq1; + return make_like(tolist(seq1), seq1); + } else { + val list1 = tolist(seq1); + val list2 = tolist(seq2); - return merge(list1, list2, lessfun, keyfun); + keyfun = default_arg(keyfun, identity_f); + lessfun = default_arg(lessfun, less_f); + + return make_like(merge(list1, list2, lessfun, keyfun), seq1); + } } void eval_init(void) -- cgit v1.2.3