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

fixing small bug where current-continuation-marks was shifting when it's not necessary

Browse Source
This commit is contained in:
Danny Yoo 2012-02-16 16:04:43 -05:00
parent 1939e02553
commit 97c11cffba
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
js-assembler/runtime-src/baselib-primitives.js
View File

@ -2195,14 +2195,11 @@
'current-continuation-marks',
makeList(0, 1),
function(M) {
var promptTag;
var promptTag = baselib.contmarks.DEFAULT_CONTINUATION_PROMPT_TAG;
if (M.a === 1) {
promptTag = checkContinuationPromptTag(M, 'current-continuation-marks', 0);
}
var contMarks = M.captureContinuationMarks(promptTag);
// The continuation marks shouldn't capture the record of the call to
// current-continuation-marks itself.
contMarks.shift();
return contMarks;
});
@ -2212,7 +2209,7 @@
function(M) {
var marks = checkContinuationMarkSet(M, 'continuation-mark-set->list', 0);
var key = checkAny(M, 'continuation-mark-set->list', 1);
var promptTag;
var promptTag = baselib.contmarks.DEFAULT_CONTINUATION_PROMPT_TAG;
if (M.a === 3) {
promptTag = checkContinuationPromptTag(M, 'current-continuation-marks', 2);
}

4
js-assembler/runtime-src/runtime.js
View File

@ -307,14 +307,14 @@
// Try to get the continuation mark key used for procedure application tracing.
var getTracedAppKey = function(MACHINE) {
if (MACHINE.modules['whalesong/lang/private/traced-app.rkt']) {
return MACHINE.modules['whalesong/lang/private/traced-app.rkt'].namespace['traced-app-key'];
return MACHINE.modules['whalesong/lang/private/traced-app.rkt'].namespace['traced-app-key'] || 'traced-app-key';
}
return undefined;
};
var getTracedCalleeKey = function(MACHINE) {
if (MACHINE.modules['whalesong/lang/private/traced-app.rkt']) {
return MACHINE.modules['whalesong/lang/private/traced-app.rkt'].namespace['traced-callee-key'];
return MACHINE.modules['whalesong/lang/private/traced-app.rkt'].namespace['traced-callee-key'] || 'traced-callee-key';
}
return undefined;
};

2
version.rkt
View File

@ -7,4 +7,4 @@
(provide version)
(: version String)
(define version "1.137")
(define version "1.142")