tracing bug in environment handling

assemble.rkt

@@ -215,8 +215,8 @@ EOF
        (format "~a = ~a;" t (assemble-oparg v)))]
     
     [(AssignPrimOpStatement? stmt)
-     (format "MACHINE.~a=~a;" 
+     (format "~a=~a;" 
-             (AssignPrimOpStatement-target stmt)
+             (assemble-target (AssignPrimOpStatement-target stmt))
              (assemble-op-expression (AssignPrimOpStatement-op stmt)))]
     
     [(PerformStatement? stmt)
@@ -235,8 +235,7 @@ EOF
                        (assemble-label (make-Label (TestAndBranchStatement-label stmt))))]))]
 
     [(GotoStatement? stmt)
-     (format "return ~a();"
+     (format "return ~a();" (assemble-location (GotoStatement-target stmt)))]
-             (assemble-location (GotoStatement-target stmt)))]
     [(PushControlFrame? stmt)
      (format "MACHINE.control.push(new Frame(~a, MACHINE.proc));" (PushControlFrame-label stmt))]
     [(PopControlFrame? stmt)

package.rkt

@@ -1,9 +1,9 @@
 #lang racket/base
 
 (require "compile.rkt"
-         "typed-structs.rkt"
          "assemble.rkt"
          "typed-parse.rkt"
+         "il-structs.rkt"
          racket/runtime-path
          racket/port)
 
@@ -21,9 +21,9 @@
       (copy-port ip op)))
   (newline op)
   (fprintf op "var invoke = ")
-  (assemble/write-invoke (statements (compile-top (parse source-code)
+  (assemble/write-invoke (compile (parse source-code)
-                                                  'val
+                                  'val
-                                                  'return))
+                                  'next)
                          op)
   (fprintf op ";\n"))
 

simulator-prims.rkt

@@ -45,5 +45,8 @@
                                                      abs
                                                      void
                                                      quotient
-                                                     remainder)
+                                                     remainder
+                                                     display
+                                                     displayln
+                                                     newline)
                                       #:constants (null pi e)))

simulator.rkt

@@ -328,6 +328,8 @@
            v]
           [(null? v)
            v]
+          [(void? v)
+           v]
           [(cons? v)
            (cons (loop (car v)) (loop (cdr v)))]
           [(primitive-proc? v)

test-compiler.rkt

@@ -448,5 +448,17 @@
             (expt 2 23984000)))
 
 
+(test (begin (define (length l)
+               (if (null? l)
+                   0
+                   (+ 1 (length (cdr l)))))
+             (display (length (list 1 2 3 4 5 6)))
+             (newline)
+             #;(display (length (list "hello" "world")))
+             #;(newline))
+      (void))
+
+
+
 ;(simulate (compile (parse '42) 'val 'next))
 ;(compile (parse '(+ 3 4)) 'val 'next)