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

defensive: when the machine fails during an internal call, try getting the environment and control in a good state.

Browse Source
This commit is contained in:
Danny Yoo 2011-12-09 22:59:15 -05:00
parent bc5204f28e
commit 1baa212d02
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -236,7 +236,7 @@
} }
var i; var i;
var oldArgcount, oldVal, oldProc, oldErrorHandler; var oldArgcount, oldVal, oldProc, oldErrorHandler, oldControlLength, oldEnvLength;
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]);
@ -256,6 +256,8 @@
oldVal = MACHINE.v; oldVal = MACHINE.v;
oldArgcount = MACHINE.a; oldArgcount = MACHINE.a;
oldProc = MACHINE.p; oldProc = MACHINE.p;
oldControlLength = MACHINE.c.length;
oldEnvLength = MACHINE.e.length;
oldErrorHandler = MACHINE.params['currentErrorHandler']; oldErrorHandler = MACHINE.params['currentErrorHandler'];
var afterGoodInvoke = function (MACHINE) { var afterGoodInvoke = function (MACHINE) {
@ -295,6 +297,8 @@
MACHINE.v = oldVal; MACHINE.v = oldVal;
MACHINE.a = oldArgcount; MACHINE.a = oldArgcount;
MACHINE.p = oldProc; MACHINE.p = oldProc;
MACHINE.c.length = oldControlLength;
MACHINE.e.length = oldEnvLength;
fail(e); fail(e);
}; };
MACHINE._trampoline(proc.label, MACHINE._trampoline(proc.label,