suzanne.soy/whalesong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #15 from vishesh/master

Browse Source 
Implement last-picture in world
This commit is contained in:
Jens Axel Søgaard 2015-05-05 23:00:14 +02:00
commit 154662078a
4 changed files with 35 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
whalesong/world/js-impl.js
View File

@ -87,10 +87,16 @@ EXPORTS['to-draw'] =
EXPORTS['stop-when'] =
makePrimitiveProcedure(
'stop-when',
1,
plt.baselib.lists.makeList(1, 2),
function(MACHINE) {
var f = checkProcedure1(MACHINE, "on-tick", 0);
return new StopWhen(f);
if (MACHINE.a === 2) {
var lp = checkProcedure1(MACHINE, "to-draw", 1);
} else {
var lp = null;
}
return new StopWhen(f, lp);
});

15
whalesong/world/kernel.js
View File

@ -282,8 +282,6 @@ ToDraw.prototype = plt.baselib.heir(OutputConfig.prototype);
ToDraw.prototype.toRawHandler = function(MACHINE, toplevelNode) {
var that = this;
var reusableCanvas;
var reusableCanvasNode;
var adaptedWorldFunction = adaptWorldFunction(this.handler);
var worldFunction = function(world, success) {
@ -291,6 +289,12 @@ ToDraw.prototype.toRawHandler = function(MACHINE, toplevelNode) {
adaptedWorldFunction(
world,
function(v) {
var reusableCanvas = toplevelNode.getElementsByTagName('canvas')[0];
var reusableCanvasNode;
if (reusableCanvas) {
reusableCanvasNode = rawJsworld.node_to_tree(reusableCanvas);
}
// fixme: once jsworld supports fail continuations, use them
// to check the status of the scene object and make sure it's an
// image.
@ -325,6 +329,7 @@ ToDraw.prototype.toRawHandler = function(MACHINE, toplevelNode) {
};
var cssFunction = function(w, k) {
var reusableCanvas = toplevelNode.getElementsByTagName('canvas')[0];
if (reusableCanvas) {
k([[reusableCanvas,
["padding", "0px"],
@ -369,9 +374,10 @@ DefaultDrawingOutput.prototype.toRawHandler = function(MACHINE, toplevelNode) {
var StopWhen = function(handler) {
var StopWhen = function(handler, last_picture) {
WorldConfigOption.call(this, 'stop-when');
this.handler = handler;
this.last_picture = new ToDraw(last_picture);
};
StopWhen.prototype = plt.baselib.heir(WorldConfigOption.prototype);
@ -379,5 +385,6 @@ StopWhen.prototype = plt.baselib.heir(WorldConfigOption.prototype);
StopWhen.prototype.toRawHandler = function(MACHINE, toplevelNode) {
var that = this;
var worldFunction = adaptWorldFunction(that.handler);
return rawJsworld.stop_when(worldFunction);
var lastPictureHandler = that.last_picture.toRawHandler(MACHINE, toplevelNode);
return rawJsworld.stop_when(worldFunction, undefined, lastPictureHandler);
};

7
whalesong/world/racket-impl.rkt
View File

@ -40,5 +40,8 @@
(define (key=? key-1 key-2)
(error 'key=? "must be run in JavaScript context"))
(define (stop-when handler)
(error 'stop-when "must be run in JavaScript context"))
(define stop-when
(case-lambda [(handler)
(error 'stop-when "must be run in JavaScript context")]
[(handler last-picture)
(error 'stop-when "must be run in JavaScript context")]))

17
whalesong/world/raw-jsworld.js
View File

@ -663,9 +663,13 @@ var rawJsworld = {};
stopWhen.test(w,
function(stop) {
if (stop) {
Jsworld.shutdown({cleanShutdown: true});
}
else { k2(); }
var handler = stopWhen.last_picture_handler();
handler.onRegister(top);
handler._listener(w, oldW, function(v) {
Jsworld.shutdown({cleanShutdown: true});
k2();
})
} else { k2(); }
});
};
add_world_listener(watchForTermination);
@ -863,17 +867,18 @@ var rawJsworld = {};
StopWhenHandler = function(test, receiver) {
StopWhenHandler = function(test, receiver, last_picture_handler) {
this.test = test;
this.receiver = receiver;
this.last_picture_handler = last_picture_handler;
};
// stop_when: CPS(world -> boolean) CPS(world -> boolean) -> handler
function stop_when(test, receiver) {
function stop_when(test, receiver, last_picture_handler) {
return function() {
if (receiver === undefined) {
receiver = function(w, k) { k(w); };
}
return new StopWhenHandler(test, receiver);
return new StopWhenHandler(test, receiver, last_picture_handler);
};
}
Jsworld.stop_when = stop_when;