From 8083f2eec64fb7f202e31ffe050ff6aa40f5e5fd Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Fri, 28 Feb 2014 07:27:08 -0800 Subject: * eval.c (expand_qquote): Fix broken '(,x . ,y) case, which is generating (append (list x) . y) instead of (append (list x) y). Also, added a nil case which is now necessary to prevent '(,x) from generating (append (list x) nil), though this is effectively an optimization, which is pointless, since the expander isn't optimizing overall. --- eval.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'eval.c') diff --git a/eval.c b/eval.c index a5b5aba5..bfc42f18 100644 --- a/eval.c +++ b/eval.c @@ -2051,8 +2051,10 @@ static val expand_qquote(val qquoted_form, val menv) f_ex = cons(list_s, cons(expand_qquote(f, menv), nil)); } - if (atom(r_ex)) { - return rlcp(cons(append_s, cons(f_ex, r_ex)), qquoted_form); + if (nilp(r_ex)) { + return rlcp(cons(append_s, cons(f_ex, nil)), qquoted_form); + } else if (atom(r_ex)) { + return rlcp(cons(append_s, cons(f_ex, cons(r_ex, nil))), qquoted_form); } else { if (consp(r) && car(r) == unquote_s) r_ex = cons(r_ex, nil); -- cgit v1.2.3