Added define and set! cases to the macro expander.

diff --git a/src/scheme-derived-forms.scm b/src/scheme-derived-forms.scm
index 1edd186..010519d 100644 (file)
--- a/src/scheme-derived-forms.scm
+++ b/src/scheme-derived-forms.scm
@@ -7,3 +7,8 @@
               (if (pair? args)
                 `(define ,(car args) (lambda ,(cdr args) ,@body))
                 'no-match))
               (if (pair? args)
                 `(define ,(car args) (lambda ,(cdr args) ,@body))
                 'no-match))

+
+;; Macro expansion test code
+
+(define-macro (test)
+              '(begin (display "Hello!") (newline)))

diff --git a/src/scheme.4th b/src/scheme.4th
index 8d361fc..67b656c 100644 (file)
--- a/src/scheme.4th
+++ b/src/scheme.4th
@@ -1783,10 +1783,30 @@ defer expand
     R> drop ['] expand goto-deferred
 ;
 
     R> drop ['] expand goto-deferred
 ;
 

+: expand-definition ( exp -- result )
+    define-symbol 2swap
+
+    2dup definition-var
+    2swap definition-val expand
+    nil ( define var val' nil )
+
+    cons cons cons ;
+
+: expand-assignment ( exp -- result )
+    set!-symbol 2swap
+
+    2dup assignment-var
+    2swap assignment-val expand
+    nil ( define var val' nil )
+
+    cons cons cons ;
+

 :noname ( exp -- result )
 
     expand-macro
 
 :noname ( exp -- result )
 
     expand-macro
 

+    quote? if exit then
+

     quasiquote? if expand-quasiquote exit then
 
     definition? if expand-definition exit then
     quasiquote? if expand-quasiquote exit then
 
     definition? if expand-definition exit then