From 67e450455d7514d9a03da48e7830e59f98b6a958 Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Tue, 8 Sep 2015 06:35:21 -0700 Subject: Don't report unbound var errors against wrong form. The issue is that eval_intrinsic doesn't clear the last_form_evaled global around the evaluation of its forms. If a symbol is evaluated, and it is an unbound variable, the error is reported against some wrong form. * eval.c (eval_intrinsic): Set the value of last_form_evaled to nil before expanding and evaluating the form, then restore the value. --- eval.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'eval.c') diff --git a/eval.c b/eval.c index 929cddae..b4dd6bfe 100644 --- a/eval.c +++ b/eval.c @@ -952,8 +952,11 @@ val interp_fun(val env, val fun, struct args *args) val eval_intrinsic(val form, val env) { - form = expand(form, nil); - return eval(form, default_bool_arg(env), form); + val lfe_save = last_form_evaled; + val form_ex = (last_form_evaled = nil, expand(form, nil)); + val ret = eval(form_ex, default_bool_arg(env), form); + last_form_evaled = lfe_save; + return ret; } static val do_eval(val form, val env, val ctx_form, -- cgit v1.2.3