* eval.c (eval_intrinsic): Bugfix: take the expanded form instead

of throwing it away.
(expand): Recurse into expand_place for (set ...) forms.

* txr.1: Documented eval.

1 files changed, 2 insertions, 2 deletions

diff --git a/eval.c b/eval.c
index 853ddb87..b51adaac 100644
--- a/eval.c
+++ b/eval.c
@@ -393,7 +393,7 @@ val interp_fun(val env, val fun, val args)
 static val eval_intrinsic(val form, val env)
 {
   uses_or2;
-  expand(form);
+  form = expand(form);
   return eval(form, or2(env, make_env(nil, nil, env)), form);
 }
 
@@ -1643,7 +1643,7 @@ val expand(val form)
       if (body == body_ex)
         return form;
       return rlcp(cons(sym, cons(name, cons(args, body_ex))), form);
-    } else if (sym == inc_s || sym == dec_s) {
+    } else if (sym == set_s || sym == inc_s || sym == dec_s) {
       val place = second(form);
       val inc = third(form);
       val place_ex = expand_place(place);