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

knocked out the painful bug with call-with-continuation-prompt: I was incorrectly computing environment size when constructing the prompt frame.

Browse Source
This commit is contained in:
Danny Yoo 2013-04-23 16:12:43 -06:00
parent 3c0d491705
commit 744356b3a3
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
whalesong/js-assembler/assemble.rkt
View File

@ -583,7 +583,7 @@ EOF
(assemble-label (make-Label (LinkedLabel-label label)))])))]
[(PushControlFrame/Prompt? stmt)
(format "M.c.push(new RT.CallFrame(~a,M.p)); M.addPrompt(~a,false);"
(format "M.c.push(new RT.CallFrame(~a,M.p)); M.addPrompt(~a,false,M.e.length);"
(let: ([label : (U Symbol LinkedLabel) (PushControlFrame/Prompt-label stmt)])
(cond
[(symbol? label)

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

@ -3177,7 +3177,7 @@
M.e.pop();
M.p = proc;
M.a = 0;
M.addPrompt(promptTag, false);
M.addPrompt(promptTag, false, M.e.length);
baselib.functions.rawApply(M);
},
[]);
@ -3272,13 +3272,17 @@
handler = makeDefaultPromptHandler(promptTag);
}
}
M.p = proc;
if (M.a >= 1) { M.e.pop(); } // the test is redundant, but I want the parallelism.
if (M.a >= 2) { M.e.pop(); }
if (M.a >= 3) { M.e.pop(); }
M.a = Math.max(M.a - 3, 0);
M.addPrompt(promptTag, handler);
// subtle: the prompt's environment is the one _after_ the current call!
// That's why we need to do M.e.length - M.a: the environment currently
// has extra values due to us calling the prompt handler here.
M.addPrompt(promptTag, handler, M.e.length - M.a);
baselib.functions.rawApply(M);
});

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

@ -499,10 +499,11 @@
M.c.pop();
return(M.p.mvr)(M);
};
Machine.prototype.addPrompt = function(promptTag, abortHandlerClosure) {
Machine.prototype.addPrompt = function(promptTag, abortHandlerClosure, envLength) {
this.c.push(new PromptFrame(justReturn,
promptTag,
this.e.length,
envLength,
abortHandlerClosure));
};