From 13484d7cca2ee7179bace0d502dad15594718d04 Mon Sep 17 00:00:00 2001
From: Danny Yoo <dyoo@cs.wpi.edu>
Date: Sat, 2 Apr 2011 17:53:43 -0400
Subject: [PATCH] initial namespacing done

---
 assemble-helpers.rkt     | 2 +-
 assemble-open-coded.rkt  | 6 +++---
 runtime.js               | 9 ++++-----
 test-conform-browser.rkt | 2 +-
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/assemble-helpers.rkt b/assemble-helpers.rkt
index 9679fa2..5bbc98e 100644
--- a/assemble-helpers.rkt
+++ b/assemble-helpers.rkt
@@ -65,7 +65,7 @@
               [(void? val)
                "null"]
               [(empty? val)
-               (format "Primitives.null")]
+               (format "RUNTIME.NULL")]
               [(number? val)
                (format "(~s)" val)]
               [else
diff --git a/assemble-open-coded.rkt b/assemble-open-coded.rkt
index f9dd883..f1e1a99 100644
--- a/assemble-open-coded.rkt
+++ b/assemble-open-coded.rkt
@@ -77,12 +77,12 @@
            (let loop ([checked-operands checked-operands])
              (cond
                [(empty? checked-operands)
-                "Primitives.null"]
+                "RUNTIME.NULL"]
                [else
                 (format "[~a,~a]" (first checked-operands) (loop (rest checked-operands)))]))]
           
           [(null?)
-           (format "(~a === Primitives.null)" (first checked-operands))]
+           (format "(~a === RUNTIME.NULL)" (first checked-operands))]
 
           [(not)
            (format "(!(~a))" (first checked-operands))]
@@ -133,7 +133,7 @@
                            [(box)
                             (format "(typeof(~a) === 'object' && (~a).length === 1)"
                                     operand-string operand-string)])])
-           (format "((~a) ? (~a) : raise(new Error('Expected ' + ~s + ' as argument ' + ~s + ' but received ' + ~a)))"
+           (format "((~a) ? (~a) : RUNTIME.raise(new Error('Expected ' + ~s + ' as argument ' + ~s + ' but received ' + ~a)))"
                    test-string
                    operand-string
                    (symbol->string domain)
diff --git a/runtime.js b/runtime.js
index b868914..f8c3246 100644
--- a/runtime.js
+++ b/runtime.js
@@ -99,11 +99,14 @@ if(this['plt'] === undefined) {
 	new ContinuationPromptTag("default-continuation-prompt-tag");
 
 
+    var NULL = [];
 
-    // A primitive function is just a Javascript function.
 
 
 
+    var raise = function(e) { throw e; }
+
+
 
 
     // testArgument: (X -> boolean) X number string string -> boolean
@@ -165,10 +168,6 @@ if(this['plt'] === undefined) {
     var isNumber = function(x) { return typeof(x) === 'number'; };
 
 
-    var raise = function(e) { throw e; }
-
-
-    var NULL = [];
     
 
     // Primtitives are the set of primitive values.  Not all primitives
diff --git a/test-conform-browser.rkt b/test-conform-browser.rkt
index c10c20e..33e0378 100644
--- a/test-conform-browser.rkt
+++ b/test-conform-browser.rkt
@@ -24,7 +24,7 @@
                     
                     (fprintf op #<<EOF
 return (function(succ, fail, params) {
-            return innerInvoke(MACHINE, succ, fail, params);
+            return innerInvoke(new plt.runtime.Machine(), succ, fail, params);
         });
 });
 EOF