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, 8 insertions, 7 deletions

diff --git a/tests/011/mandel.txr b/tests/011/mandel.txr
index 15195f33..8a701526 100644
--- a/tests/011/mandel.txr
+++ b/tests/011/mandel.txr
@@ -13,11 +13,12 @@
     (defvar y-offset (+ y-centre (* 0.5 pixel-size (+ j-max 1))))
  
     ;; complex number library
-    (defmacro cplx (x y) ^(cons ,x ,y))
-    (defmacro re (c) ^(car ,c))
-    (defmacro im (c) ^(cdr ,c))
+    (macro-time
+      (defmacro cplx (x y) ^(cons ,x ,y))
+      (defmacro re (c) ^(car ,c))
+      (defmacro im (c) ^(cdr ,c))
 
-    (defsymacro c0 (macro-time (cplx 0 0)))
+      (defsymacro c0 (cplx 0 0)))
 
     (macro-time 
       (defun with-cplx-expand (specs body)
@@ -28,10 +29,10 @@
                  ((a b . rest) ^(progn ,a ,b ,*rest))
                  ((a) a)
                  (x (error "with-cplx: invalid body ~s" body))))
-           (x (error "with-cplx: bad args ~s" x)))))
+           (x (error "with-cplx: bad args ~s" x))))
 
-    (defmacro with-cplx (specs . body)
-      (with-cplx-expand specs body))
+      (defmacro with-cplx (specs . body)
+        (with-cplx-expand specs body)))
 
     (defun c+ (x y)
       (with-cplx ((a b x) (c d y))