From 8d0df444588c91e9cfb4e11307f5e87c178e32f2 Mon Sep 17 00:00:00 2001
From: Danny Yoo <dyoo@cs.wpi.edu>
Date: Tue, 6 Sep 2011 16:56:34 -0400
Subject: [PATCH] continuing to try cleaning up

---
 compiler/optimize-il.rkt  | 10 +++++-----
 js-assembler/assemble.rkt | 14 +++++++++-----
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/compiler/optimize-il.rkt b/compiler/optimize-il.rkt
index 32e6a37..4f4b48c 100644
--- a/compiler/optimize-il.rkt
+++ b/compiler/optimize-il.rkt
@@ -282,11 +282,11 @@
                 (let ([target (AssignImmediateStatement-target second-stmt)])
                   (cond
                    [(equal? target (make-EnvLexicalReference 0 #f))
-                    (cons (make-PushImmediateOntoEnvironment 
-                           (adjust-oparg-depth 
-                            (AssignImmediateStatement-value second-stmt) -1)
-                           #f)
-                          (loop (rest (rest statements))))]
+                    (loop (cons (make-PushImmediateOntoEnvironment 
+                                 (adjust-oparg-depth 
+                                  (AssignImmediateStatement-value second-stmt) -1)
+                                 #f)
+                                (rest (rest statements))))]
                    [else
                     (default)]))]
 
diff --git a/js-assembler/assemble.rkt b/js-assembler/assemble.rkt
index fc028f6..9ff2735 100644
--- a/js-assembler/assemble.rkt
+++ b/js-assembler/assemble.rkt
@@ -268,7 +268,8 @@ EOF
               [(Label? target)
                (cond
                    [(set-contains? entry-points (Label-name target))
-                    (default stmt)]
+                    (display (assemble-statement stmt) op)
+                    'ok]
                    [else
                     (log-debug (format "Assembling inlined jump into ~a" (Label-name target)) )
                     (assemble-block-statements (BasicBlock-name
@@ -279,12 +280,15 @@ EOF
                                                entry-points
                                                op)])]
               [(Reg? target)
-               (default stmt)]
+               (display (assemble-statement stmt) op)
+               'ok]
               [(ModuleEntry? target)
-               (default stmt)]
+               (display (assemble-statement stmt) op)
+               'ok]
               [(CompiledProcedureEntry? target)
-               (default stmt)])]
-           
+               (display (assemble-statement stmt) op)
+               'ok])]
+
            
            [(PushControlFrame/Generic? stmt)
             (default stmt)]