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

Revert "trying to get rid of the current success handler." FIXES #34

Browse Source 
Reverted patch, added success handler to end of call stack, which is not
getting called. We already have separate handlers for error, so we might
as well have one for success explicitely.

This reverts commit 0428a021bd.

Conflicts:
	whalesong/js-assembler/assemble.rkt
	whalesong/js-assembler/runtime-src/runtime.js
This commit is contained in:
Vishesh Yadav 2015-06-12 14:59:08 -04:00
parent 142baeb2ed
commit ee6874cf88
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -65,6 +65,7 @@
(display (assemble-current-interned-constant-closure-table) op) (display (assemble-current-interned-constant-closure-table) op)
(display "M.params.currentErrorHandler = fail;\n" op) (display "M.params.currentErrorHandler = fail;\n" op)
(display "M.params.currentSuccessHandler = success;\n" op)
(display #<<EOF (display #<<EOF
for (param in params) { for (param in params) {
if (Object.hasOwnProperty.call(params, param)) { if (Object.hasOwnProperty.call(params, param)) {
@ -79,7 +80,6 @@ EOF
(assemble-label (make-Label (BasicBlock-name (first basic-blocks)))))] (assemble-label (make-Label (BasicBlock-name (first basic-blocks)))))]
[else [else
;; Otherwise, we want to run under a trampolining context. ;; Otherwise, we want to run under a trampolining context.
(display "M.c.push(new RT.CallFrame(function(M){ setTimeout(success, 0); },M.p));\n" op)
(fprintf op "M.trampoline(~a, ~a); })" (fprintf op "M.trampoline(~a, ~a); })"
(assemble-label (make-Label (BasicBlock-name (first basic-blocks)))) (assemble-label (make-Label (BasicBlock-name (first basic-blocks))))
(cond [(eq? trampoline-option 'with-preemption) (cond [(eq? trampoline-option 'with-preemption)

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

@ -297,6 +297,7 @@
'currentOutputPort': new StandardOutputPort(), 'currentOutputPort': new StandardOutputPort(),
'currentErrorPort': new StandardErrorPort(), 'currentErrorPort': new StandardErrorPort(),
'currentInputPort': new StandardInputPort(), 'currentInputPort': new StandardInputPort(),
'currentSuccessHandler': function(MACHINE) {},
'currentErrorHandler': function(MACHINE, exn) { 'currentErrorHandler': function(MACHINE, exn) {
MACHINE.params.currentErrorDisplayer( MACHINE.params.currentErrorDisplayer(
MACHINE, MACHINE,
@ -752,6 +753,7 @@
that.running = false; that.running = false;
that.breakScheduled = false; that.breakScheduled = false;
that.params.currentSuccessHandler(that);
release(); release();
return; return;

2
whalesong/tests/test-assemble.rkt
View File

@ -69,7 +69,7 @@
(display "var M = new plt.runtime.Machine();\n" op) (display "var M = new plt.runtime.Machine();\n" op)
(display "(function() { " op) (display "(function() { " op)
(display "var myInvoke = " op) (display "var myInvoke = " op)
(assemble/write-invoke a-statement op) (assemble/write-invoke a-statement op 'with-preemption)
(display ";" op) (display ";" op)
(fprintf op (fprintf op
"return function(succ, fail, params) { "return function(succ, fail, params) {