diff --git a/whalesong/compiler/kernel-primitives.rkt b/whalesong/compiler/kernel-primitives.rkt index da48335..7bc81ac 100644 --- a/whalesong/compiler/kernel-primitives.rkt +++ b/whalesong/compiler/kernel-primitives.rkt @@ -209,6 +209,9 @@ 'unsafe-car 'unsafe-cdr + + 'abort-current-continuation + 'call-with-continuation-prompt )) (define-predicate KernelPrimitiveName? KernelPrimitiveName) @@ -354,4 +357,4 @@ (list 'vector 'number)] [(eq? prim 'vector-set!) - (list 'vector 'number 'any)])) \ No newline at end of file + (list 'vector 'number 'any)])) diff --git a/whalesong/js-assembler/package.rkt b/whalesong/js-assembler/package.rkt index db52ccd..a4c564f 100644 --- a/whalesong/js-assembler/package.rkt +++ b/whalesong/js-assembler/package.rkt @@ -692,7 +692,7 @@ var invokeMainModule = function() { window.console.log('evaluation took ' + (stopTime - startTime) + ' milliseconds'); } }, - function(M, e) { + function(e) { var contMarkSet, context, i, appName, contextDiv, srclocProcedure; var displayContext = function() { diff --git a/whalesong/js-assembler/runtime-src/baselib-primitives.js b/whalesong/js-assembler/runtime-src/baselib-primitives.js index fa1f740..f9728b3 100644 --- a/whalesong/js-assembler/runtime-src/baselib-primitives.js +++ b/whalesong/js-assembler/runtime-src/baselib-primitives.js @@ -3215,7 +3215,7 @@ if (M.a >= 2) { promptTag = checkPromptTag(M, 'call-with-continuation-prompt', 1); } else { - promptTag = DEFAULT_CONTINUATION_PROMPT_TAG; + promptTag = baselib.contmarks.DEFAULT_CONTINUATION_PROMPT_TAG; } if (M.a >= 3) { if (M.e[M.e.length - 1 - 3] === false) { @@ -3224,7 +3224,7 @@ handler = checkProcedure(M, 'call-with-continuation-prompt', 2); } } else { - if (promptTag === DEFAULT_CONTINUATION_PROMPT_TAG) { + if (promptTag === baselib.contmarks.DEFAULT_CONTINUATION_PROMPT_TAG) { handler = defaultPromptHandler; } else { handler = makeDefaultPromptHandler(promptTag); diff --git a/whalesong/js-assembler/runtime-src/runtime.js b/whalesong/js-assembler/runtime-src/runtime.js index 7526ab8..f2838ce 100644 --- a/whalesong/js-assembler/runtime-src/runtime.js +++ b/whalesong/js-assembler/runtime-src/runtime.js @@ -356,8 +356,8 @@ fail(err); }); }, - function() { - fail(); + function(err) { + fail(err); }); };