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, 10 insertions, 9 deletions

diff --git a/tests/011/macros-2.txr b/tests/011/macros-2.txr
index debc6eca..a6693c6b 100644
--- a/tests/011/macros-2.txr
+++ b/tests/011/macros-2.txr
@@ -1,15 +1,16 @@
 @(do
    (set *gensym-counter* 0)
 
-   (defmacro whilst ((condition : result) . body)
-     (let ((cblk (gensym "cnt-blk-"))
-           (bblk (gensym "brk-blk-")))
-       ^(macrolet ((break (value) ^(return-from ,',bblk ,value)))
-          (symacrolet ((break (return-from ,bblk))
-                       (continue (return-from ,cblk)))
-            (block ,bblk
-              (for () (,condition ,result) ()
-                (block ,cblk ,*body)))))))
+   (macro-time
+     (defmacro whilst ((condition : result) . body)
+       (let ((cblk (gensym "cnt-blk-"))
+             (bblk (gensym "brk-blk-")))
+         ^(macrolet ((break (value) ^(return-from ,',bblk ,value)))
+            (symacrolet ((break (return-from ,bblk))
+                         (continue (return-from ,cblk)))
+              (block ,bblk
+                (for () (,condition ,result) ()
+                  (block ,cblk ,*body))))))))
 
    (let ((i 0))
      (whilst ((< i 100))