eval: remove hack of macro deffers evaled on expansion.

* eval.c (do_expand): When a defmacro or defsymacro form is
traversed, do not evaluate it, except in backward
compatibility mode.  Unfortunately, this breaks some code.

* tests/011/macros-1.txr: A defmacro form has to be wrapped in
macro-time.

* tests/011/macros-2.txr: Likewise.

* tests/011/mandel.txr: Likewise.

* tests/012/man-or-boy.tl (defun-cbn): This macro generates a
progn which which expects that a defmacro form will come into
effect for the subsequent lambda in the same form. We must
wrap it in macro-time to make this happen now.

1 files changed, 3 insertions, 2 deletions

diff --git a/eval.c b/eval.c
index ab15c894..c2a7bb67 100644
--- a/eval.c
+++ b/eval.c
@@ -4295,7 +4295,7 @@ again:
       if (init != init_ex)
         form_ex = rlcp(cons(sym, cons(name, cons(init_ex, nil))), form);
 
-      if (sym == defsymacro_s) {
+      if (opt_compat && opt_compat <= 190 && sym == defsymacro_s) {
         val result = eval(if3(opt_compat && opt_compat <= 137,
                               form_ex, form),
                           make_env(nil, nil, nil), form);
@@ -4346,10 +4346,11 @@ again:
         if (body != body_ex || params != params_ex)
           form_ex = rlcp(cons(sym, cons(name, cons(params_ex, body_ex))), form);
 
-        if (sym == defmacro_s) {
+        if (opt_compat && opt_compat <= 190 && sym == defmacro_s) {
           val result = eval(form_ex, make_env(nil, nil, nil), form);
           return cons(quote_s, cons(result, nil));
         }
+
         return form_ex;
       }
     } else if (sym == tree_case_s) {