From d03f86477f214afb341da56c9f859b8f72fba6a8 Mon Sep 17 00:00:00 2001
From: Danny Yoo <dyoo@hashcollision.org>
Date: Fri, 8 Mar 2013 16:24:14 -0700
Subject: [PATCH] trying to trace down why we're not breaking

---
 .../runtime-src/baselib-functions.js           | 18 +++++++++---------
 .../runtime-src/baselib-symbols.js             | 12 +++++-------
 whalesong/js-assembler/runtime-src/runtime.js  | 13 +++++++------
 whalesong/repl-prototype/htdocs/repl.js        |  2 +-
 4 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/whalesong/js-assembler/runtime-src/baselib-functions.js b/whalesong/js-assembler/runtime-src/baselib-functions.js
index b60fd8a..5c613ef 100644
--- a/whalesong/js-assembler/runtime-src/baselib-functions.js
+++ b/whalesong/js-assembler/runtime-src/baselib-functions.js
@@ -300,15 +300,15 @@
 
 
     var makePrimitiveProcedure = function (name, arity, f) {
-        var proc = makeClosure(name,
-                               arity,
-                               function(M) {
-                                   M.cbt--;
-                                   M.v = f(M);
-                                   M.e.length -= M.a;
-                                   return M.c.pop().label(M);
-                               },
-                               []);
+        var impl = function(M) {
+            if(--M.cbt < 0) {
+                throw impl;
+            }
+            M.v = f(M);
+            M.e.length -= M.a;
+            return M.c.pop().label(M);
+        };
+        var proc = makeClosure(name, arity, impl, []);
         // Also, record the raw implementation of the function.
         proc._i = f;
         return proc;
diff --git a/whalesong/js-assembler/runtime-src/baselib-symbols.js b/whalesong/js-assembler/runtime-src/baselib-symbols.js
index 84229a0..698fa3a 100644
--- a/whalesong/js-assembler/runtime-src/baselib-symbols.js
+++ b/whalesong/js-assembler/runtime-src/baselib-symbols.js
@@ -15,18 +15,16 @@
         this.val = val;
     };
 
-    var symbolCache = {};
+    var symbolCache = new baselib.Dict();
 
-    var hasOwnProperty = {}.hasOwnProperty;
-    
     // makeSymbol: string -> Symbol.
     // Interns a symbol.
     var makeSymbol = function (val) {
         // To ensure that we can eq? symbols with equal values.
-        if (!(hasOwnProperty.call(symbolCache,val))) {
-            symbolCache[val] = new Symbol(val);
+        if (!(symbolCache.has(val))) {
+            symbolCache.set(val, new Symbol(val));
         }
-        return symbolCache[val];
+        return symbolCache.get(val);
     };
     
     Symbol.prototype.equals = function (other, aUnionFind) {
@@ -89,4 +87,4 @@
     exports.makeSymbol = makeSymbol;
     exports.isSymbol = isSymbol;
 
-}(this.plt.baselib));
\ No newline at end of file
+}(this.plt.baselib));
diff --git a/whalesong/js-assembler/runtime-src/runtime.js b/whalesong/js-assembler/runtime-src/runtime.js
index 0670583..f31cee4 100644
--- a/whalesong/js-assembler/runtime-src/runtime.js
+++ b/whalesong/js-assembler/runtime-src/runtime.js
@@ -478,11 +478,13 @@
             MACHINE.running = false;
             MACHINE.params.currentErrorHandler(
                 MACHINE,
-                makeExnBreak("User break.",
-                             MACHINE.captureContinuationMarks(),
-                             // FIXME: capture the continuation as well,
-                             // rather than just hold false.
-                             false));
+                new baselib.exceptions.RacketError(
+                    "User break",
+                    makeExnBreak("User break.",
+                                 MACHINE.captureContinuationMarks(),
+                                 // FIXME: capture the continuation as well,
+                                 // rather than just hold false.
+                                 false)));
             return true;
         }
         return false;
@@ -554,7 +556,6 @@
         var that = this;
         var thunk = initialJump;
         var startTime = (new Date()).valueOf();
-        that.cbt = STACK_LIMIT_ESTIMATE;
         that.params.numBouncesBeforeYield =
             that.params.maxNumBouncesBeforeYield;
         that.running = true;
diff --git a/whalesong/repl-prototype/htdocs/repl.js b/whalesong/repl-prototype/htdocs/repl.js
index bdd9c78..3fb615a 100644
--- a/whalesong/repl-prototype/htdocs/repl.js
+++ b/whalesong/repl-prototype/htdocs/repl.js
@@ -104,7 +104,7 @@ $(document).ready(function() {
     };
 
     var interruptEvaluation = function() {
-        console.log('interrupt evaluation');
+        console.log('scheduling an interruption');
         M.scheduleBreak();
     };