From cd5e6ee180a3e957787bcf304eca097bfe18abf4 Mon Sep 17 00:00:00 2001
From: Danny Yoo <dyoo@hashcollision.org>
Date: Sun, 3 Mar 2013 15:15:05 -0700
Subject: [PATCH] trying to make globalbuckets work.

---
 whalesong/compiler/compiler.rkt                       | 8 ++++++--
 whalesong/js-assembler/assemble-perform-statement.rkt | 4 +---
 whalesong/js-assembler/package.rkt                    | 8 ++++----
 whalesong/js-assembler/runtime-src/runtime.js         | 1 +
 whalesong/{ => repl-prototype}/repl-compile.rkt       | 0
 whalesong/repl-prototype/server.rkt                   | 6 +++---
 6 files changed, 15 insertions(+), 12 deletions(-)
 rename whalesong/{ => repl-prototype}/repl-compile.rkt (100%)

diff --git a/whalesong/compiler/compiler.rkt b/whalesong/compiler/compiler.rkt
index 0349a9c..2ee2d31 100644
--- a/whalesong/compiler/compiler.rkt
+++ b/whalesong/compiler/compiler.rkt
@@ -448,7 +448,9 @@
                                   (make-EnvPrefixReference (ToplevelRef-depth exp)
                                                            (ToplevelRef-pos exp)
                                                            #t))])]
-                         [else
+                         [(or (eq? prefix-element #f)
+                              (symbol? prefix-element)
+                              (GlobalBucket? prefix-element))
                           (append-instruction-sequences
                            (if (ToplevelRef-check-defined? exp)
                                (make-Perform (make-CheckToplevelBound!
@@ -485,7 +487,9 @@
                                               (ToplevelSet-pos exp)
                                               #t)
                      next-linkage/expects-single)]
-           [else
+           [(or (eq? prefix-element #f)
+                (symbol? prefix-element)
+                (GlobalBucket? prefix-element))
             (compile (ToplevelSet-value exp)
                      cenv
                      (make-EnvPrefixReference (ToplevelSet-depth exp)
diff --git a/whalesong/js-assembler/assemble-perform-statement.rkt b/whalesong/js-assembler/assemble-perform-statement.rkt
index 767c2dc..152a4d6 100644
--- a/whalesong/js-assembler/assemble-perform-statement.rkt
+++ b/whalesong/js-assembler/assemble-perform-statement.rkt
@@ -41,9 +41,7 @@
                                                 [(eq? n #f)
                                                  "false"]
                                                 [(GlobalBucket? n)
-                                                 ;; FIXME: maybe we should keep a set of global variables here?
-                                                 (format "M.primitives[~s]"
-                                                         (symbol->string (GlobalBucket-name n)))]
+                                                 (format "M.globals[~s]" (symbol->string (GlobalBucket-name n)))]
                                                 ;; FIXME:  this should be looking at the module path and getting
                                                 ;; the value here!  It shouldn't be looking into Primitives...
                                                 [(ModuleVariable? n)
diff --git a/whalesong/js-assembler/package.rkt b/whalesong/js-assembler/package.rkt
index ef17a9f..3d24c2b 100644
--- a/whalesong/js-assembler/package.rkt
+++ b/whalesong/js-assembler/package.rkt
@@ -460,20 +460,20 @@ M.modules[~s] =
             (display bytes op))]
          [(cacheable? path)
           (define string-op (open-output-bytes))
-          (assemble/write-invoke (my-force stmts) #t string-op)
+          (assemble/write-invoke (my-force stmts) string-op 'no-trampoline)
           (save-in-cache! path (get-output-bytes string-op))
           (display (get-output-string string-op) op)]
          [else
-          (assemble/write-invoke (my-force stmts) #t op)])]
+          (assemble/write-invoke (my-force stmts) op 'no-trampoline)])]
       [else
-       (assemble/write-invoke (my-force stmts) #t op)]))
+       (assemble/write-invoke (my-force stmts) op 'no-trampoline)]))
   (cond
    [(ModuleSource? src)
     (on-path (ModuleSource-path src))]
    [(MainModuleSource? src)
     (on-path (MainModuleSource-path src))]
    [else
-    (assemble/write-invoke (my-force stmts) #f op)]))
+    (assemble/write-invoke (my-force stmts) op 'without-preemption)]))
 
 
 ;; cached?: path -> (U false bytes)
diff --git a/whalesong/js-assembler/runtime-src/runtime.js b/whalesong/js-assembler/runtime-src/runtime.js
index a089765..e82a612 100644
--- a/whalesong/js-assembler/runtime-src/runtime.js
+++ b/whalesong/js-assembler/runtime-src/runtime.js
@@ -310,6 +310,7 @@
 
 
 	};
+        this.globals = {};
 	this.primitives = Primitives;
         this.exclusiveLock = new ExclusiveLock();
     };
diff --git a/whalesong/repl-compile.rkt b/whalesong/repl-prototype/repl-compile.rkt
similarity index 100%
rename from whalesong/repl-compile.rkt
rename to whalesong/repl-prototype/repl-compile.rkt
diff --git a/whalesong/repl-prototype/server.rkt b/whalesong/repl-prototype/server.rkt
index 492a79a..7900b72 100644
--- a/whalesong/repl-prototype/server.rkt
+++ b/whalesong/repl-prototype/server.rkt
@@ -2,7 +2,8 @@
 
 
 
-(require json
+(require "repl-compile.rkt"
+         json
          file/gzip
          racket/runtime-path
          racket/port
@@ -12,7 +13,6 @@
          web-server/servlet
          "../make/make-structs.rkt"
          "../js-assembler/package.rkt"
-         "../repl-compile.rkt"
          "../parser/parse-bytecode.rkt"
          "../compiler/compiler.rkt"
          "../compiler/expression-structs.rkt"
@@ -98,7 +98,7 @@
   
 
 
-;(write-repl-runtime-files)
+(write-repl-runtime-files)
 (serve/servlet start 
                #:servlet-path "/compile"
                #:extra-files-paths (list htdocs)