@@ -91,9 +91,12 @@ (define-form-expander 'lambda (list* keyword (car args) (expand-body (cdr args) dual-env))) -(dolist (k '(begin definitions)) - (define-form-expander k - (cons keyword (expand-body args dual-env)))) +(define-form-expander 'begin + (cons keyword (expand-body args (cons (cons (cons false false) (car dual-env)) + (cdr dual-env))))) + +(define-form-expander 'definitions + (cons keyword (expand-body args dual-env))) (dolist (k '(define let set!)) (define-form-expander k language/expander.pco @@ -38,6 +38,16 @@ (assert-result (length '(1 2 3)) 3) (begin + (defmacro (foo) 1) + (assert-result (foo) 1)) + (begin + (defmacro foo 2) + (assert-result foo 2)) + (begin + (define foo 3) + (assert-result foo 3)) + + (begin (define x (cons 1 2)) (assert-result (rplaca x 3) '(3 . 2)) (assert-result (rplacd x 4) '(3 . 4))) test/test.pco 0f12567c587116cab1344506fcac09f1bde2c3f2 David Wragg david@wragg.org http://github.com/dpw/pachuco/commit/eba0e33d5be12aa8ee86be639ffa9105faf2dd87 eba0e33d5be12aa8ee86be639ffa9105faf2dd87 2008-11-08T17:50:25-08:00 2008-11-08T17:50:25-08:00 begin is suppose to introduce a macro scope 0f1890f9e1aa139462f1207510f837f5caabafe1 David Wragg david@wragg.org