From 6f8875ff5beadd34a3ce94c40bfc1dc36b26a114 Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Mon, 13 Feb 2012 17:37:20 -0800 Subject: * eval.c (dwim_loc): Allow assignment to the dwim place when it evaluates to nil, by building a form targetting the place, and recursing into op_modplace. Also, optimization: don't use eval on a form built from the operator; just go to op_modplace directly. --- ChangeLog | 7 +++++++ eval.c | 12 +++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2fb601a1..138afbce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2012-02-13 Kaz Kylheku + + * eval.c (dwim_loc): Allow assignment to the dwim place when it + evaluates to nil, by building a form targetting the place, + and recursing into op_modplace. Also, optimization: don't use eval + on a form built from the operator; just go to op_modplace directly. + 2012-02-13 Kaz Kylheku Version 57 diff --git a/eval.c b/eval.c index 380b4623..b3f62189 100644 --- a/eval.c +++ b/eval.c @@ -689,13 +689,19 @@ static val op_defun(val form, val env) return name; } +static val op_modplace(val form, val env); + 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) - eval_error(form, lit("[~s ]: cannot assign nil"), obj, nao); + if (!obj) { + val tempform = list(op, second(form), + cons(quote_s, cons(newval, nil)), nao); + *retval = op_modplace(tempform, env); + return 0; + } switch (type(obj)) { case LIT: @@ -777,7 +783,7 @@ static val *dwim_loc(val form, val env, val op, val newval, val *retval) newlist = replace_list(obj, car(index), cdr(index), newval); tempform = list(op, second(form), cons(quote_s, cons(newlist, nil)), nao); - eval(tempform, env, form); + op_modplace(tempform, env); *retval = newval; return 0; } else { -- cgit v1.2.3