X-Git-Url: http://git.lukelau.me/?p=scheme.git;a=blobdiff_plain;f=codegen.scm;h=b403939bc2122c2a4c9b5e24980955a2e329402e;hp=9b3878a2e947f3d3314c8c9c4bc96bca38a83a7f;hb=6684c39cf92a0fa6c21339c6fec8a6e4cf4f463d;hpb=6f699d1ddbb1cd33ec3095a0e6e9a6eee157d708

diff --git a/codegen.scm b/codegen.scm
index 9b3878a..b403939 100644
--- a/codegen.scm
+++ b/codegen.scm
@@ -105,8 +105,21 @@
   (set! cur-lambda (+ 1 cur-lambda))
   (format "_lambda~a" (- cur-lambda 1)))
 
+(define (codegen-closure label captured si env)
+;; (define (codegen-closure label captured si env)
+;;   (let* ((stack-offsets (map (lambda (x) (- si (* x wordsize))))
+;; 			(range 0 (length captured)))
+;; 	 (inner-si (- si (* (length captured) wordsize))))
+;;     (for-each (lambda (var-name new-offset)
+;; 		(emit "movq ~a(%rbp), ~a(%rbp)" ; todo: do we need to copy this?
+;; 		      (cdr (assoc var-name env))
+;; 		      new-offset))
+;; 	      captured
+;; 	      stack-offsets)
+;; )
 					; for now we can only call closures
 (define (codegen-call closure args si env)
+;  (codegen-expr closure si env)
   (when (not (eq? (ast-type closure) 'closure))
     (error #f (format "~a is not a closure" closure)))
   (let* ((captured (caddr closure))
@@ -190,7 +203,7 @@
 (define (codegen-expr e si env)
   (case (ast-type e)
     ('builtin e)
-    ('closure e)
+    ('closure (codegen-closure (cadr e) (caddr e) si env))
     ('app
      (let ((callee (codegen-expr (car e) si env)))
        (case callee