From 0c9e4bf7503de3feca97c602689d73b467b33889 Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Fri, 17 Feb 2012 23:27:21 -0800 Subject: * eval.c (dwim_loc): 2012-02-13 fix didn't do it. Here is a simpler way. We can let nil be treated as a list with a simple goto. This solves all cases. --- eval.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'eval.c') diff --git a/eval.c b/eval.c index 3375b15b..3a072c77 100644 --- a/eval.c +++ b/eval.c @@ -696,12 +696,8 @@ static val *dwim_loc(val form, val env, val op, val newval, val *retval) val obj = eval_lisp1(second(form), env, form); val args = eval_args_lisp1(rest(rest(form)), env, form); - if (!obj) { - val tempform = list(op, second(form), - cons(quote_s, cons(newval, nil)), nao); - *retval = op_modplace(tempform, env); - return 0; - } + if (!obj) + goto list; switch (type(obj)) { case LIT: @@ -764,6 +760,7 @@ static val *dwim_loc(val form, val env, val op, val newval, val *retval) } case CONS: case LCONS: + list: if (rest(args)) eval_error(form, lit("[~s ...]: list indexing needs one arg"), obj, nao); -- cgit v1.2.3