Issue #40 - Splice begin definitions into enclosing body

scheme/cyclone/transforms.sld

@@ -755,13 +755,13 @@
     ((prim? exp)       exp)
     ((ref? exp)        exp)
     ((quote? exp)      exp)
-;; TODO: need a way of taking a begin here and splicing its contents
-;; into the body
     ((lambda? exp)     `(lambda ,(lambda->formals exp)
-                          ,@(map 
+                          ,@(expand-body '() (lambda->exp exp) env)
-                            ;; TODO: use extend env here?
+                          ;,@(map 
-                            (lambda (expr) (expand expr env))
+                          ;  ;; TODO: use extend env here?
-                            (lambda->exp exp))))
+                          ;  (lambda (expr) (expand expr env))
+                          ;  (lambda->exp exp))
+                         ))
     ((define? exp)     (if (define-lambda? exp)
                            (expand (define->lambda exp) env)
                           `(define ,(expand (define->var exp) env)
@@ -822,6 +822,40 @@
     (else
       (error "unknown exp: " exp))))
 
+;; Helper to expand a lambda body, so we can splice in any begin's
+(define (expand-body result exp env)
+  (cond
+   ((null? exp) (reverse result))
+   ;; Splice in begin contents and keep expanding body
+   ((begin? (car exp))
+    (let* ((expr (car exp))
+           (begin-exprs (begin->exps expr)))
+    (expand-body
+     result
+     (append begin-exprs (cdr exp))
+     env)))
+   (else
+    (let ((macro #f))
+      (when (and (app? (car exp))
+                 (symbol? (caar exp)))
+        (set! macro (env:lookup (caar exp) env #f)))
+      (if (tagged-list? 'macro macro)
+          ;; Expand macro here so we can catch begins in the expanded code,
+          ;; including nested begins
+          (let ((expanded (macro:expand (car exp) macro env)))
+            ;; Call with expanded macro in case we need to expand again
+            (expand-body
+              result
+              (cons expanded (cdr exp))
+              env))
+          ;; No macro, use main expand function to process
+          (expand-body
+           (cons 
+             (expand (car exp) env)
+             result)
+           (cdr exp)
+           env))))))
+
 ;; Top-level analysis
 
 ; Separate top-level defines (globals) from other expressions