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

Correcting the behavior of the default abort handler so it reestablishes the prompt frame, so that another abort doesn't escape.

Browse Source
This commit is contained in:
Danny Yoo 2013-04-17 16:38:47 -06:00
parent 8fd768e4ef
commit 57ef1d4a7d
2 changed files with 33 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
whalesong/js-assembler/runtime-src/baselib-primitives.js
View File

@ -3146,18 +3146,22 @@
// The default prompt handler consumes a thunk and applies it.
// The default abort prompt handler consumes a thunk and applies
// it, in a context where a new prompt has been initialized.
var defaultPromptHandler =
makeClosure("default-prompt-handler",
1,
function(M) {
var proc = checkProcedure(M, 'apply', 0);
M.e.pop();
M.p = proc;
M.a = 0;
baselib.functions.rawApply(M);
},
[]);
makeClosure(
"default-prompt-handler",
1,
function(M) {
var proc = checkProcedure(M, 'apply', 0);
M.e.pop();
M.p = proc;
M.a = 0;
M.addPrompt(baselib.contmarks.DEFAULT_CONTINUATION_PROMPT_TAG,
false);
baselib.functions.rawApply(M);
},
[]);
installPrimitiveClosure(

18
whalesong/js-assembler/runtime-src/runtime.js
View File

@ -488,6 +488,24 @@
return new baselib.contmarks.ContinuationMarkSet(kvLists);
};
var justReturn = function(M) {
M.p=M.c[M.c.length-1].label;
M.c.pop();
return(M.p)(M);
};
justReturn.mvr = function(M) {
M.p=M.c[M.c.length-1].label;
M.c.pop();
return(M.p.mvr)(M);
};
Machine.prototype.addPrompt = function(promptTag, abortHandlerClosure) {
this.c.push(new PromptFrame(justReturn,
DEFAULT_CONTINUATION_PROMPT_TAG,
this.e.length,
abortHandlerClosure));
};