* pmacros.scm (-pmacro-expand,scan): If result is a symbol,

	call scan-symbol on it, to enable recursive macro-expansion.

diff --git a/ChangeLog b/ChangeLog
index b2c1448e33253d3cc1c74e621900c82aee994902..294078f007535931cd47cd934d2dd83bb4d32ee1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-03-19  Hans-Peter Nilsson  <hp@axis.com>
+
+       * pmacros.scm (-pmacro-expand,scan): If result is a symbol,
+       call scan-symbol on it, to enable recursive macro-expansion.
+
 2002-01-25  Frank Ch. Eigler  <fche@redhat.com>
 
        * sid-cpu.scm (-gen-hardware-types): Generate single hardware union

diff --git a/pmacros.scm b/pmacros.scm
index 67e84806d2ff12033c66bf7cc8c0b4d312b4f1f3..2d7786ebabaf57840667ad0139e33b44f71ad5c1 100644 (file)
--- a/pmacros.scm
+++ b/pmacros.scm
@@ -229,11 +229,11 @@
                        ((and (list? exp) (not (null? exp))) (scan-list exp))
                        ; Not a symbol or expression, return unchanged.
                        (else exp))))
-      ; ??? We use to re-examine `result' to see if it was another pmacro
-      ; invocation.  This allowed doing things like ((.sym a b c) arg1 arg2)
-      ; where `abc' is a pmacro.  Scheme doesn't work this way, so it was
-      ; removed.  It can be put back should it ever be warranted.
-      result))
+      ; Re-examining `result' to see if it is another pmacro invocation
+      ; allows doing things like ((.sym a b c) arg1 arg2)
+      ; where `abc' is a pmacro.  Scheme doesn't work this way, but then
+      ; this is CGEN.
+      (if (symbol? result) (scan-symbol result) result)))
 
   (if -pmacro-trace?
       (begin