centralizing the content for adapting to the cps world

examples/counting-world-program.rkt

@@ -10,7 +10,7 @@ handler
 
 (big-bang 1
           (on-tick add1 1)
-          ;;(on-tick (lambda (w) (* w 2)) 1)
+          ;(on-tick (lambda (w) (* w 2)) 1)
           (stop-when (lambda (w) (> w 10)))
           )
 

world/js-impl.js

@@ -29,7 +29,7 @@ var checkHandler = plt.baselib.check.makeCheckArgumentType(
 
 
 // The default tick delay is 28 times a second.
-var DEFAULT_TICK_DELAY = makeRational(1, 28);
+var DEFAULT_TICK_DELAY = 1/28;
 
 
 
@@ -55,11 +55,11 @@ EXPORTS['on-tick'] =
         function(MACHINE) {
 	    if (MACHINE.argcount === 1) {
 		var f = checkProcedure1(MACHINE, "on-tick", 0);
-		return new OnTick(f, DEFAULT_TICK_DELAY);
+		return new OnTick(f, Math.floor(DEFAULT_TICK_DELAY * 1000));
 	    } else if (MACHINE.argcount === 2) {
 		var f = checkProcedure1(MACHINE, "on-tick", 0);
 		var delay = checkNonNegativeReal(MACHINE, "on-tick", 1);
-		return new OnTick(f, delay);
+		return new OnTick(f, Math.floor(jsnums.toFixnum(delay) * 1000));
 	    }
         });
 

world/kernel.js

@@ -108,72 +108,48 @@ var isWorldConfigOption = plt.baselib.makeClassPredicate(WorldConfigOption);
 //////////////////////////////////////////////////////////////////////
 
 
-var convertAttribList = function(attribList) {
-    var nextElt;
-    var key, val;
-    var hash = {};
-    while (attribList !== EMPTY) {
-	nextElt = attribList.first;
 
-	key = nextElt.first;
-	val = nextElt.rest.first;
 
-	key = String(key);
+// adaptWorldFunction: Racket-function -> World-CPS
-
+// Takes a racket function and converts it to the CPS-style function
-	if (isString(val)) {
+// that our world implementation expects.
-	    val = String(val);
+var adaptWorldFunction = function(worldFunction) {
-	} else if (isBoolean(val)) {
+    return function() {
-	    // do nothing: the representation is the same.
+        // Consumes any number of arguments.
-	} else if (isSymbol(val)) {
+        var success = arguments[arguments.length - 1];
-	    if (String(val) === 'true') {
+        plt.baselib.functions.internalCallDuringPause.apply(
-		val = true;
+            null,
-	    } else if (String(val) === 'false') {
+            [MACHINE,
-		val = false;
+             worldFunction,
-	    } else {
+             function(v) {
-		val = String(val);
+                 success(v);
-	    }
+             },
-	} else {
+             function(err) {
-	    // raise error: neither string nor boolean
+                 // FIXME: do error trapping
-	    throw new Error(
+                 console.log(err);
-		plt.baselib.format.format(
+             }].concat([].slice.call(arguments, 0, arguments.length - 1)));
-		    "attribute value ~s neither a string nor a boolean",
-		    [val]));
-	}
-	hash[key] = val;
-	attribList = attribList.rest;
     }
-    return hash;
+};
-}
+
+
 
 
 
 
 //////////////////////////////////////////////////////////////////////
 
-
+// OnTick: racket-function javascript-float -> handler
 var OnTick = function(handler, aDelay) {
     WorldConfigOption.call(this, 'on-tick');
     this.handler = handler;
-    this.delay = jsnums.toFixnum(jsnums.multiply(1000, aDelay));
+    this.delay = aDelay;
 };
 
 OnTick.prototype = plt.baselib.heir(WorldConfigOption.prototype);
  
 OnTick.prototype.toRawHandler = function(MACHINE) {
     var that = this;
-    var worldFunction = function(world, k) {
+    var worldFunction = adaptWorldFunction(that.handler);
-        plt.baselib.functions.internalCallDuringPause(
-            MACHINE,
-            that.handler,
-            function(v) {
-                 k(v);
-            },
-            
-            function(err) {
-                console.log(err);
-            },
-            world);
-    };
     return rawJsworld.on_tick(this.delay, worldFunction);
 };
 
@@ -183,6 +159,7 @@ OnTick.prototype.toRawHandler = function(MACHINE) {
 
 
 
+
 // // OnDraw
 
 var OnDraw = function(handler) {
@@ -234,19 +211,7 @@ StopWhen.prototype = plt.baselib.heir(WorldConfigOption.prototype);
 
 StopWhen.prototype.toRawHandler = function(MACHINE) {
     var that = this;
-    var worldFunction = function(world, k) { 
+    var worldFunction = adaptWorldFunction(that.handler);
-        plt.baselib.functions.internalCallDuringPause(
-            MACHINE,
-            that.handler,
-            function(v) {
-                k(v);
-            },
-            
-            function(err) {
-                console.log(err);
-            },
-            world);
-    }
     return rawJsworld.stop_when(worldFunction);
 };
 
@@ -1064,3 +1029,49 @@ StopWhen.prototype.toRawHandler = function(MACHINE) {
 // 	elt = types.toDomNode(newElt);});
 //     return _js.placeOnPage(elt, left, top, page);
 // };
+
+
+
+// var convertAttribList = function(attribList) {
+//     var nextElt;
+//     var key, val;
+//     var hash = {};
+//     while (attribList !== EMPTY) {
+// 	nextElt = attribList.first;
+
+// 	key = nextElt.first;
+// 	val = nextElt.rest.first;
+
+// 	key = String(key);
+
+// 	if (isString(val)) {
+// 	    val = String(val);
+// 	} else if (isBoolean(val)) {
+// 	    // do nothing: the representation is the same.
+// 	} else if (isSymbol(val)) {
+// 	    if (String(val) === 'true') {
+// 		val = true;
+// 	    } else if (String(val) === 'false') {
+// 		val = false;
+// 	    } else {
+// 		val = String(val);
+// 	    }
+// 	} else {
+// 	    // raise error: neither string nor boolean
+// 	    throw new Error(
+// 		plt.baselib.format.format(
+// 		    "attribute value ~s neither a string nor a boolean",
+// 		    [val]));
+// 	}
+// 	hash[key] = val;
+// 	attribList = attribList.rest;
+//     }
+//     return hash;
+// }
+
+
+
+
+
+
+