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

somewhat unsatisfied; I still don't like some of the complexity of calling functions from js.

Browse Source
This commit is contained in:
Danny Yoo 2011-07-14 17:12:17 -04:00
parent a88484ed71
commit 5ca2e93565
3 changed files with 87 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,6 +48,12 @@
for (var i = 2; i < arguments.length; i++) { for (var i = 2; i < arguments.length; i++) {
args.push(arguments[i]); args.push(arguments[i]);
} }
// Check arity usage.
if (! plt.baselib.arity.isArityMatching(v.arity, args.length)) {
throw new Error("arity mismatch");
}
var result = v.apply(null, args); var result = v.apply(null, args);
succ(result); succ(result);
} catch (e) { } catch (e) {
@ -79,23 +85,29 @@
var oldErrorHandler = MACHINE.params['currentErrorHandler']; var oldErrorHandler = MACHINE.params['currentErrorHandler'];
var afterGoodInvoke = function(MACHINE) { var afterGoodInvoke = function(MACHINE) {
MACHINE.params['currentErrorHandler'] = oldErrorHandler; plt.runtime.PAUSE(
var returnValue = MACHINE.val; function(restart) {
MACHINE.val = oldVal; MACHINE.params['currentErrorHandler'] = oldErrorHandler;
MACHINE.argcount = oldArgcount; var returnValue = MACHINE.val;
MACHINE.proc = oldProc; MACHINE.val = oldVal;
succ(returnValue); MACHINE.argcount = oldArgcount;
MACHINE.proc = oldProc;
succ(returnValue);
});
}; };
afterGoodInvoke.multipleValueReturn = function(MACHINE) { afterGoodInvoke.multipleValueReturn = function(MACHINE) {
MACHINE.params['currentErrorHandler'] = oldErrorHandler; plt.runtime.PAUSE(
var returnValues = [MACHINE.val]; function(restart) {
for (var i = 0; i < MACHINE.argcount - 1; i++) { MACHINE.params['currentErrorHandler'] = oldErrorHandler;
returnValues.push(MACHINE.env.pop()); var returnValues = [MACHINE.val];
} for (var i = 0; i < MACHINE.argcount - 1; i++) {
MACHINE.val = oldVal; returnValues.push(MACHINE.env.pop());
MACHINE.argcount = oldArgcount; }
MACHINE.proc = oldProc; MACHINE.val = oldVal;
succ.apply(null, returnValues); MACHINE.argcount = oldArgcount;
MACHINE.proc = oldProc;
succ.apply(null, returnValues);
});
}; };
setTimeout( setTimeout(
@ -123,10 +135,13 @@
// internallCall: call a Racket procedure and get its results. // internallCallDuringPause: call a Racket procedure and get its results.
// The use MUST be in the context of a closure call. This assumes that // The use assumes the machine is in a running-but-paused state.
// it is still in the context of the trampoline var internalCallDuringPause = function(MACHINE, proc, success, fail) {
var internalCall = function(MACHINE, proc, success, fail) { if (! plt.baselib.arity.isArityMatching(proc.arity, args.length)) {
return fail(plt.baselib.exceptions.makeExnFailContractArity("arity mismatch"));
}
if (isPrimitiveProcedure(proc)) { if (isPrimitiveProcedure(proc)) {
var args = []; var args = [];
for (var i = 4; i < arguments.length; i++) { for (var i = 4; i < arguments.length; i++) {
@ -135,13 +150,56 @@
var result = v.apply(null, args); var result = v.apply(null, args);
succ(result); succ(result);
} else if (isClosure(v)) { } else if (isClosure(v)) {
// FIXME
var oldVal = MACHINE.val;
var oldArgcount = MACHINE.argcount;
var oldProc = MACHINE.proc;
var oldErrorHandler = MACHINE.params['currentErrorHandler'];
var afterGoodInvoke = function(MACHINE) {
plt.runtime.PAUSE(function(restart) {
MACHINE.params['currentErrorHandler'] = oldErrorHandler;
var returnValue = MACHINE.val;
MACHINE.val = oldVal;
MACHINE.argcount = oldArgcount;
MACHINE.proc = oldProc;
succ(returnValue);
});
};
afterGoodInvoke.multipleValueReturn = function(MACHINE) {
plt.runtime.PAUSE(function(restart) {
MACHINE.params['currentErrorHandler'] = oldErrorHandler;
var returnValues = [MACHINE.val];
for (var i = 0; i < MACHINE.argcount - 1; i++) {
returnValues.push(MACHINE.env.pop());
}
MACHINE.val = oldVal;
MACHINE.argcount = oldArgcount;
MACHINE.proc = oldProc;
succ.apply(null, returnValues);
});
};
MACHINE.control.push(
new plt.baselib.frames.CallFrame(afterGoodInvoke, null));
MACHINE.argcount = args.length;
for (var i = 0; i < args.length; i++) {
MACHINE.env.push(args[i]);
}
MACHINE.proc = v;
MACHINE.params['currentErrorHandler'] = function(MACHINE, e) {
MACHINE.params['currentErrorHandler'] = oldErrorHandler;
MACHINE.val = oldVal;
MACHINE.argcount = oldArgcount;
MACHINE.proc = oldProc;
fail(e);
};
plt.runtime.trampoline(MACHINE, v.label);
} else { } else {
plt.baselib.exceptions.raise(MACHINE, fail(plt.baselib.exceptions.makeExnFail(
plt.baselib.exceptions.makeExnFail( plt.baselib.format.format(
plt.baselib.format.format( "Not a procedure: ~e",
"Not a procedure: ~e", v)));
v)));
} }
}; };
@ -272,7 +330,7 @@
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
exports.Closure = Closure; exports.Closure = Closure;
exports.internalCall = internalCall; exports.internalCallDuringPause = internalCallDuringPause;
exports.finalizeClosureCall = finalizeClosureCall; exports.finalizeClosureCall = finalizeClosureCall;
exports.makePrimitiveProcedure = makePrimitiveProcedure; exports.makePrimitiveProcedure = makePrimitiveProcedure;

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

@ -404,7 +404,7 @@ if(this['plt'] === undefined) { this['plt'] = {}; }
(new Date()).valueOf() - startTime); (new Date()).valueOf() - startTime);
setTimeout( setTimeout(
function() { trampoline(MACHINE, thunk); }, function() { trampoline(MACHINE, thunk); },
0); 10);
return; return;
} else { } else {
continue; continue;

4
tests/coersing/Makefile
View File

@ -1,5 +1,5 @@
#!/bin/sh #!/bin/sh
all: all:
../../whalesong get-javascript --verbose --compress-javascript fact.rkt > fact.js ../../whalesong get-javascript --verbose fact.rkt > fact.js
../../whalesong get-runtime --verbose --compress-javascript > runtime.js ../../whalesong get-runtime --verbose > runtime.js