From 7c7491329c6608dc48bf18029a63349a47ce1c2d Mon Sep 17 00:00:00 2001
From: Danny Yoo <dyoo@cs.wpi.edu>
Date: Thu, 24 Mar 2011 18:41:08 -0400
Subject: [PATCH] simplifying trampoline parameters: it only takes the machine
 and the entry point.

---
 assemble.rkt |  3 ++-
 runtime.js   | 14 ++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/assemble.rkt b/assemble.rkt
index b6b8e91..8884d48 100644
--- a/assemble.rkt
+++ b/assemble.rkt
@@ -27,6 +27,7 @@
                        (newline op))
               basic-blocks)
     (fprintf op "MACHINE.params.currentErrorHandler = function(e) { fail(e); };\n")
+    (fprintf op "MACHINE.params.currentSuccessHandler = function(MACHINE) { success(MACHINE.val); };\n")
     (fprintf op #<<EOF
 for (param in params) {
     if (params.hasOwnProperty(param)) {
@@ -35,7 +36,7 @@ for (param in params) {
 }
 EOF
              )
-    (fprintf op "trampoline(MACHINE, ~a, function() {success(MACHINE.val)}, fail); })"
+    (fprintf op "trampoline(MACHINE, ~a); })"
              (BasicBlock-name (first basic-blocks)))))
 
 
diff --git a/runtime.js b/runtime.js
index b858eaf..b6e8660 100644
--- a/runtime.js
+++ b/runtime.js
@@ -17,6 +17,7 @@ var Frame = function(label, proc) {
 };
 
 
+
 // A closure consists of its free variables as well as a label
 // into its text segment.
 var Closure = function(label, arity, closedVals, displayName) {
@@ -26,6 +27,8 @@ var Closure = function(label, arity, closedVals, displayName) {
     this.displayName = displayName;
 };
 
+// A primitive function is just a Javascript function.
+
 
 
 var Primitives = (function() {
@@ -305,7 +308,10 @@ var MACHINE = { callsBeforeTrampoline: 100,
 		control : [],
 		running : false,
 		params: { currentDisplayer: function(v) {},
+
+			  currentSuccessHandler: function(v) {},
 			  currentErrorHandler: function(e) {},
+
 			  currentNamespace: {},
 
 			  // These parameters control how often
@@ -344,7 +350,7 @@ var recomputeMaxNumBouncesBeforeYield = function(observedDelay) {
 };
 
 
-var trampoline = function(MACHINE, initialJump, success, fail) {
+var trampoline = function(MACHINE, initialJump) {
     var thunk = initialJump;
     var startTime = (new Date()).valueOf();
     MACHINE.callsBeforeTrampoline = 100;
@@ -366,17 +372,17 @@ var trampoline = function(MACHINE, initialJump, success, fail) {
 			(new Date()).valueOf() - startTime);
 		    setTimeout(
 			function() {
-			    trampoline(MACHINE, thunk, success, fail);
+			    trampoline(MACHINE, thunk);
 			},
 			0);
 		    return;
 		}
             } else {
 		MACHINE.running = false;
-	        return fail(e);
+	        return MACHINE.params.currentErrorHandler(e);
             }
         }
     }
     MACHINE.running = false;
-    return success();
+    return MACHINE.params.currentSuccessHandler(MACHINE);
 };