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

Hacked up a shutdown to call the failure continuation.

Browse Source
This commit is contained in:
Danny Yoo 2013-03-15 15:50:14 -06:00
parent c39e5e7b0d
commit 0e379fe831
2 changed files with 40 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
whalesong/world/kernel.js
View File

@ -123,12 +123,7 @@ var adaptWorldFunction = function(worldFunction) {
success(v);
},
function(err) {
// FIXME: do error trapping
if (window.console && window.console.log) {
window.console.log(err);
} else {
throw err;
}
return rawJsworld.shutdown({errorShutdown: err});
}].concat([].slice.call(arguments, 0, arguments.length - 1)));
};
};

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

@ -38,11 +38,10 @@ var rawJsworld = {};
return;
}
}
try {
return f(a[i], function() { return forEachHelp(i+1); });
} catch (e) {
f_error(e);
return Jsworld.shutdown({errorShutdown: e});
}
};
return forEachHelp(0);
@ -84,10 +83,16 @@ var rawJsworld = {};
// Close all world computations.
Jsworld.shutdown = function() {
Jsworld.shutdown = function(options) {
while(runningBigBangs.length > 0) {
var currentRecord = runningBigBangs.pop();
if (currentRecord) { currentRecord.pause(); }
if (options.cleanShutdown) {
currentRecord.success(world);
}
if (options.errorShutdown) {
currentRecord.fail(options.errorShutdown);
}
}
clear_running_state();
};
@ -117,8 +122,6 @@ var rawJsworld = {};
var DELAY_BEFORE_RETRY = 10;
var WrappedWorldWithEffects;
// change_world: CPS( CPS(world -> world) -> void )
// Adjust the world, and notify all listeners.
var change_world = function(updater, k) {
@ -139,28 +142,8 @@ var rawJsworld = {};
changingWorld = true;
var originalWorld = world;
var changeWorldHelp, changeWorldHelp2;
var changeWorldHelp;
changeWorldHelp = function() {
if (world instanceof WrappedWorldWithEffects) {
var effects = world.getEffects();
forEachK(effects,
function(anEffect, k2) {
anEffect.invokeEffect(change_world, k2);
},
function (e) {
changingWorld = false;
throw e;
},
function() {
world = world.getWorld();
changeWorldHelp2();
});
} else {
changeWorldHelp2();
}
};
changeWorldHelp2 = function() {
forEachK(worldListeners,
function(listener, k2) {
listener(world, originalWorld, k2);
@ -168,7 +151,8 @@ var rawJsworld = {};
function(e) {
changingWorld = false;
world = originalWorld;
throw e; },
throw e;
},
function() {
changingWorld = false;
k();
@ -183,11 +167,7 @@ var rawJsworld = {};
} catch(e) {
changingWorld = false;
world = originalWorld;
if (typeof(window.console) !== 'undefined' && window.console.log && e.stack) {
window.console.log(e.stack);
}
throw e;
return Jsworld.shutdown({errorShutdown: e});
}
};
Jsworld.change_world = change_world;
@ -611,12 +591,15 @@ var rawJsworld = {};
var bigBang, StopWhenHandler;
function BigBangRecord(top, world, handlerCreators, handlers, attribs) {
function BigBangRecord(top, world, handlerCreators, handlers, attribs,
success, fail) {
this.top = top;
this.world = world;
this.handlers = handlers;
this.handlerCreators = handlerCreators;
this.attribs = attribs;
this.success = success;
this.fail = fail;
}
BigBangRecord.prototype.restart = function() {
@ -655,7 +638,8 @@ var rawJsworld = {};
// Create an activation record for this big-bang.
var activationRecord =
new BigBangRecord(top, init_world, handlerCreators, handlers, attribs);
new BigBangRecord(top, init_world, handlerCreators, handlers, attribs,
succ, fail);
runningBigBangs.push(activationRecord);
function keepRecordUpToDate(w, oldW, k2) {
activationRecord.world = w;
@ -679,8 +663,7 @@ var rawJsworld = {};
stopWhen.test(w,
function(stop) {
if (stop) {
Jsworld.shutdown();
succ(w);
Jsworld.shutdown({cleanShutdown: true});
}
else { k2(); }
});
@ -1273,45 +1256,4 @@ var rawJsworld = {};
//////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////
// Effects
// An effect is an object with an invokeEffect() method.
WrappedWorldWithEffects = function(w, effects) {
if (w instanceof WrappedWorldWithEffects) {
this.w = w.w;
this.e = w.e.concat(effects);
} else {
this.w = w;
this.e = effects;
}
};
WrappedWorldWithEffects.prototype.getWorld = function() {
return this.w;
};
WrappedWorldWithEffects.prototype.getEffects = function() {
return this.e;
};
//////////////////////////////////////////////////////////////////////
Jsworld.with_effect = function(w, e) {
return new WrappedWorldWithEffects(w, [e]);
};
Jsworld.with_multiple_effects = function(w, effects) {
return new WrappedWorldWithEffects(w, effects);
};
Jsworld.has_effects = function(w) {
return w instanceof WrappedWorldWithEffects;
};
}());