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

caught the bug. control after calling the fail continuation wasn't being returned in baselib-functions/internalCallDuringPause. Subtle.

Browse Source
This commit is contained in:
Danny Yoo 2012-03-15 16:33:30 -04:00
parent 5798e28801
commit 2d7de1f256
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
js-assembler/runtime-src/baselib-functions.js
View File

@ -205,12 +205,12 @@
if (! baselib.arity.isArityMatching(proc.racketArity, args.length - 4)) { if (! baselib.arity.isArityMatching(proc.racketArity, args.length - 4)) {
var msg = baselib.format.format("arity mismatch: ~s expected ~s arguments, but received ~s", var msg = baselib.format.format("arity mismatch: ~s expected ~s arguments, but received ~s",
[proc.displayName, proc.racketArity, args.length - 4]); [proc.displayName, proc.racketArity, args.length - 4]);
fail(baselib.exceptions.makeExnFailContractArity(msg, return fail(baselib.exceptions.makeExnFailContractArity(msg,
MACHINE.captureContinuationMarks())); MACHINE.captureContinuationMarks()));
} }
if (! isClosure(proc)) { if (! isClosure(proc)) {
fail(baselib.exceptions.makeExnFail( return fail(baselib.exceptions.makeExnFail(
baselib.format.format( baselib.format.format(
"Not a procedure: ~e", "Not a procedure: ~e",
[proc]), [proc]),
@ -232,7 +232,7 @@
MACHINE.v = oldVal; MACHINE.v = oldVal;
MACHINE.a = oldArgcount; MACHINE.a = oldArgcount;
MACHINE.p = oldProc; MACHINE.p = oldProc;
success(returnValue); return success(returnValue);
}); });
}; };
afterGoodInvoke.mvr = function (MACHINE) { afterGoodInvoke.mvr = function (MACHINE) {
@ -246,7 +246,7 @@
MACHINE.v = oldVal; MACHINE.v = oldVal;
MACHINE.a = oldArgcount; MACHINE.a = oldArgcount;
MACHINE.p = oldProc; MACHINE.p = oldProc;
success.apply(null, returnValues); return success.apply(null, returnValues);
}); });
}; };
@ -264,7 +264,7 @@
MACHINE.p = oldProc; MACHINE.p = oldProc;
MACHINE.c.length = oldControlLength; MACHINE.c.length = oldControlLength;
MACHINE.e.length = oldEnvLength; MACHINE.e.length = oldEnvLength;
fail(e); return fail(e);
}; };
MACHINE._trampoline(proc.label, MACHINE._trampoline(proc.label,
false, false,

8
web-world/js-impl.js
View File

@ -1306,15 +1306,15 @@
mockView, mockView,
onGoodWorldUpdate, onGoodWorldUpdate,
fail); fail);
} else if (isArityMatching(racketWorldCallback.racketArity, 2 + args.length)){ } else { //if (isArityMatching(racketWorldCallback.racketArity, 2 + args.length)){
console.log("arity match 3"); console.log("arity match 3");
args = ([internalCall, world, mockView] args = ([internalCall, world, mockView]
.concat(args) .concat(args)
.concat([onGoodWorldUpdate, fail])); .concat([onGoodWorldUpdate, fail]));
racketWorldCallback.apply(null, args); racketWorldCallback.apply(null, args);
} else { }// else {
fail(makeArityMismatchError(MACHINE, racketWorldCallback, 2+args.length)); // fail(makeArityMismatchError(MACHINE, racketWorldCallback, 2+args.length));
} // }
} else { } else {
console.log("dispatched all events"); console.log("dispatched all events");
dispatchingEvents = false; dispatchingEvents = false;