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, 6 insertions, 5 deletions

diff --git a/tests/011/macros-1.txr b/tests/011/macros-1.txr
index 946cbf2e..81199c12 100644
--- a/tests/011/macros-1.txr
+++ b/tests/011/macros-1.txr
@@ -1,10 +1,11 @@
 @(do
   (progn
-    (defmacro rem-num (:env menv some-form)
-      (let ((expanded (macroexpand some-form menv)))
-        (if (numberp (car expanded))
-          (cdr expanded)
-          some-form)))
+    (macro-time
+      (defmacro rem-num (:env menv some-form)
+        (let ((expanded (macroexpand some-form menv)))
+          (if (numberp (car expanded))
+            (cdr expanded)
+            some-form))))
 
     (prinl
       (macrolet ((foo () '(1 list 42))