From 0a4b6da39ed65bd48c07e3d98ec429d8bac57117 Mon Sep 17 00:00:00 2001
From: Danny Yoo <dyoo@cs.wpi.edu>
Date: Fri, 1 Jul 2011 10:00:18 -0400
Subject: [PATCH] trying to fix the code with let-void

---
 compiler/compiler.rkt | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/compiler/compiler.rkt b/compiler/compiler.rkt
index 035780c..959631e 100644
--- a/compiler/compiler.rkt
+++ b/compiler/compiler.rkt
@@ -1748,9 +1748,11 @@
   (let*: ([n : Natural (LetVoid-count exp)]
           [after-let : Symbol (make-label 'afterLet)]
           [after-body-code : Symbol (make-label 'afterLetBody)]
-          [extended-cenv : CompileTimeEnvironment (append (build-list (LetVoid-count exp) 
-                                                                      (lambda: ([i : Natural]) '?))
-                                                          cenv)]
+          [extended-cenv : CompileTimeEnvironment
+                         (append (build-list (LetVoid-count exp) 
+                                             (lambda: ([i : Natural]) '?))
+                                 cenv)]
+          [context : ValuesContext (linkage-context linkage)]
           [let-linkage : Linkage
                        (cond
                          [(NextLinkage? linkage)
@@ -1760,9 +1762,9 @@
                             [(ReturnLinkage-tail? linkage)
                              linkage]
                             [else
-                             (make-LabelLinkage after-body-code (linkage-context linkage))])]
+                             (make-LabelLinkage after-body-code context)])]
                          [(LabelLinkage? linkage)
-                          (make-LabelLinkage after-body-code (LabelLinkage-context linkage))])]
+                          (make-LabelLinkage after-body-code context)])]
           [body-target : Target (adjust-target-depth target n)]
           [body-code : InstructionSequence
                      (compile (LetVoid-body exp) extended-cenv body-target let-linkage)])
@@ -1779,9 +1781,12 @@
            ;; There may be multiple values coming back at this point.
            ;; We need to route around those.
            (make-instruction-sequence 
-            `(,(make-PopEnvironment (make-Const n) (make-SubtractArg
-                                                    (make-Reg 'argcount)
-                                                    (make-Const 1)))))
+            `(,(make-PopEnvironment (make-Const n)
+                                    (make-Const 0)
+                                    ;(make-SubtractArg
+                                    ; (make-Reg 'argcount)
+                                    ; (make-Const 1))
+                                    )))
            after-let))))