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

fixing some bugs from the merge

Browse Source
This commit is contained in:
Danny Yoo 2011-08-03 16:25:27 -04:00
parent 6a13b4401e
commit c0d816e117
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
js-assembler/runtime-src/runtime.js
View File

@ -1252,7 +1252,7 @@ if(this['plt'] === undefined) { this['plt'] = {}; }
MACHINE.argcount--; MACHINE.argcount--;
checkList(MACHINE, 'apply', MACHINE.argcount - 1); checkList(MACHINE, 'apply', MACHINE.argcount - 1);
spliceListIntoStack(MACHINE, MACHINE.argcount - 1); spliceListIntoStack(MACHINE, MACHINE.argcount - 1);
if (plt.baselib.arity.isArityMatching(proc.arity, MACHINE.argcount)) { if (plt.baselib.arity.isArityMatching(proc.racketArity, MACHINE.argcount)) {
MACHINE.proc = proc; MACHINE.proc = proc;
if (plt.baselib.functions.isPrimitiveProcedure(proc)) { if (plt.baselib.functions.isPrimitiveProcedure(proc)) {
return finalizeClosureCall(MACHINE, proc(MACHINE)); return finalizeClosureCall(MACHINE, proc(MACHINE));
@ -1260,7 +1260,7 @@ if(this['plt'] === undefined) { this['plt'] = {}; }
return proc.label(MACHINE); return proc.label(MACHINE);
} }
} else { } else {
raiseArityMismatchError(MACHINE, proc, proc.arity, MACHINE.argcount); raiseArityMismatchError(MACHINE, proc, proc.racketArity, MACHINE.argcount);
} }
}); });
@ -1286,7 +1286,7 @@ if(this['plt'] === undefined) { this['plt'] = {}; }
function(MACHINE) { function(MACHINE) {
var proc = checkProcedure(MACHINE, 'procedure-arity-includes?', 0); var proc = checkProcedure(MACHINE, 'procedure-arity-includes?', 0);
var argcount = checkNatural(MACHINE, 'procedure-arity-includes?', 1); var argcount = checkNatural(MACHINE, 'procedure-arity-includes?', 1);
return plt.baselib.arity.isArityMatching(proc.arity, argcount); return plt.baselib.arity.isArityMatching(proc.racketArity, argcount);
}); });
installPrimitiveProcedure( installPrimitiveProcedure(
@ -1294,7 +1294,7 @@ if(this['plt'] === undefined) { this['plt'] = {}; }
1, 1,
function(MACHINE) { function(MACHINE) {
var proc = checkProcedure(MACHINE, 'procedure-arity-includes?', 0); var proc = checkProcedure(MACHINE, 'procedure-arity-includes?', 0);
return proc.arity; return proc.racketArity;
}); });