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

Merge commit 'origin/master'

Browse Source
This commit is contained in:
Danny Yoo 2012-02-19 18:28:22 -05:00
commit 5f3f94a8ae
4 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
compiler/kernel-primitives.rkt
View File

@ -45,6 +45,9 @@
'make-vector
'equal?
'member
'memq
'memv
'memf
'append
'reverse
'length

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

@ -137,14 +137,20 @@
MACHINE.exclusiveLock.acquire(
"js-as-closure",
function(releaseLock) {
succ = succ || function () {};
fail = fail || function () {};
var wrappedSucc = function() {
releaseLock();
(succ || function () {}).apply(null, arguments);
};
var wrappedFail = function(err) {
releaseLock();
(fail || function () {})(err);
};
if (!(baselib.arity.isArityMatching(v.racketArity, args.length - 2))) {
var msg = baselib.format.format(
"arity mismatch: ~s expected ~s argument(s) but received ~s",
[v.displayName, v.racketArity, args.length - 2]);
releaseLock();
return fail(new baselib.exceptions.RacketError(
return wrappedFail(new baselib.exceptions.RacketError(
msg,
baselib.exceptions.makeExnFailContractArity(msg,
MACHINE.captureContinuationMarks())));
@ -163,7 +169,7 @@
MACHINE.v = oldVal;
MACHINE.a = oldArgcount;
MACHINE.p = oldProc;
succ(returnValue);
wrappedSucc(returnValue);
});
};
afterGoodInvoke.mvr = function (MACHINE) {
@ -177,7 +183,7 @@
MACHINE.v = oldVal;
MACHINE.a = oldArgcount;
MACHINE.p = oldProc;
succ.apply(null, returnValues);
wrappedSucc.apply(null, returnValues);
});
};
@ -194,7 +200,7 @@
MACHINE.v = oldVal;
MACHINE.a = oldArgcount;
MACHINE.p = oldProc;
fail(e);
wrappedFail(e);
};
MACHINE._trampoline(v.label, false, releaseLock);
@ -217,8 +223,8 @@
baselib.exceptions.raise(MACHINE,
baselib.exceptions.makeExnFailContract(
baselib.format.format(
"Not a procedure: ~e",
v),
"not a procedure: ~e",
[v]),
MACHINE.captureContinuationMarks()));
}
};
@ -248,7 +254,7 @@
fail(baselib.exceptions.makeExnFail(
baselib.format.format(
"Not a procedure: ~e",
proc),
[proc]),
MACHINE.captureContinuationMarks()));
}

4
js-assembler/runtime-src/baselib-primitives.js
View File

@ -103,7 +103,7 @@
'caarable value');
var checkCadrPair = baselib.check.makeCheckArgumentType(
function(x) {
return isPair(x) && isPair(x.first);
return isPair(x) && isPair(x.rest);
},
'cadrable value');
var checkList = baselib.check.checkList;
@ -615,7 +615,7 @@
1,
function (M) {
var firstArg = checkCadrPair(M, 'cadr', 0);
return firstArg.first.rest;
return firstArg.rest.first;
});
installPrimitiveProcedure(

1
lang/kernel.rkt
View File

@ -100,6 +100,7 @@
if
cond
else
=>
case
quote
unquote