Merge pull request #101 from m4burns/master

Minor runtime fixes
This commit is contained in:
Danny Yoo 2014-03-21 15:20:42 -07:00
commit 8d8853fa76
2 changed files with 4 additions and 4 deletions

View File

@ -101,7 +101,6 @@
(succ || function () {}).apply(null, arguments); (succ || function () {}).apply(null, arguments);
}; };
var wrappedFail = function(err) { var wrappedFail = function(err) {
releaseLock();
(fail || function () {})(err); (fail || function () {})(err);
}; };
if (!(baselib.arity.isArityMatching(v.racketArity, args.length - 2))) { if (!(baselib.arity.isArityMatching(v.racketArity, args.length - 2))) {
@ -159,6 +158,7 @@
MACHINE.v = oldVal; MACHINE.v = oldVal;
MACHINE.a = oldArgcount; MACHINE.a = oldArgcount;
MACHINE.p = oldProc; MACHINE.p = oldProc;
// The lock is released by _trampoline in this case.
wrappedFail(e); wrappedFail(e);
}; };

View File

@ -908,7 +908,7 @@
var i; var i;
machine = machine || runtime.currentMachine; machine = machine || runtime.currentMachine;
for (i = 0; i < machine.mainModules.length; i++) { for (i = 0; i < machine.mainModules.length; i++) {
var ns = machine.modules[mainModules[i]].getExternalExports(); var ns = machine.modules[machine.mainModules[i]].getExternalExports();
if(ns.hasKey(name)) { if(ns.hasKey(name)) {
return ns.get(name); return ns.get(name);
} }