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

renaming arity to racketArity

Browse Source
This commit is contained in:
Danny Yoo 2011-08-03 16:09:09 -04:00
parent f3c0545b6e
commit 010ddf6288
7 changed files with 37 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
js-assembler/assemble-perform-statement.rkt
View File

@ -26,10 +26,10 @@
if (! (MACHINE.proc instanceof RUNTIME.Closure)) {
RUNTIME.raiseOperatorIsNotClosure(MACHINE, MACHINE.proc);
}
if (! RUNTIME.isArityMatching(MACHINE.proc.arity, ~a)) {
if (! RUNTIME.isArityMatching(MACHINE.proc.racketArity, ~a)) {
RUNTIME.raiseArityMismatchError(MACHINE,
MACHINE.proc,
MACHINE.proc.arity,
MACHINE.proc.racketArity,
~a);
}
EOF
@ -42,10 +42,10 @@ EOF
if (! (typeof(MACHINE.proc) === 'function')) {
RUNTIME.raiseOperatorIsNotPrimitiveProcedure(MACHINE, MACHINE.proc);
}
if (! RUNTIME.isArityMatching(MACHINE.proc.arity, ~a)) {
if (! RUNTIME.isArityMatching(MACHINE.proc.racketArity, ~a)) {
RUNTIME.raiseArityMismatchError(MACHINE,
MACHINE.proc,
MACHINE.proc.arity,
MACHINE.proc.racketArity,
~a);
}
EOF

2
js-assembler/assemble.rkt
View File

@ -177,7 +177,7 @@ EOF
(assemble-oparg (TestPrimitiveProcedure-operand test))
jump)]
[(TestClosureArityMismatch? test)
(format "if (! RUNTIME.isArityMatching((~a).arity, ~a)) { ~a }"
(format "if (! RUNTIME.isArityMatching((~a).racketArity, ~a)) { ~a }"
(assemble-oparg (TestClosureArityMismatch-closure test))
(assemble-oparg (TestClosureArityMismatch-n test))
jump)])

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

@ -52,7 +52,7 @@
}
// Check arity usage.
if (! plt.baselib.arity.isArityMatching(v.arity, args.length)) {
if (! plt.baselib.arity.isArityMatching(v.racketArity, args.length)) {
throw new Error("arity mismatch");
}
@ -75,7 +75,7 @@
fail = fail || function(){};
// Check arity usage.
if (! plt.baselib.arity.isArityMatching(v.arity, arguments.length - 2)) {
if (! plt.baselib.arity.isArityMatching(v.racketArity, arguments.length - 2)) {
throw new Error("arity mismatch");
}
@ -135,7 +135,7 @@
// internallCallDuringPause: call a Racket procedure and get its results.
// The use assumes the machine is in a running-but-paused state.
var internalCallDuringPause = function(MACHINE, proc, success, fail) {
if (! plt.baselib.arity.isArityMatching(proc.arity, arguments.length - 4)) {
if (! plt.baselib.arity.isArityMatching(proc.racketArity, arguments.length - 4)) {
return fail(plt.baselib.exceptions.makeExnFailContractArity("arity mismatch"));
}
@ -219,7 +219,7 @@
// into its text segment.
var Closure = function(label, arity, closedVals, displayName) {
this.label = label; // (MACHINE -> void)
this.arity = arity; // number
this.racketArity = arity; // number
this.closedVals = closedVals; // arrayof number
this.displayName = displayName; // string
};
@ -275,7 +275,7 @@
var makePrimitiveProcedure = function(name, arity, f) {
f.arity = arity;
f.racketArity = arity;
f.displayName = name;
return f;
};
@ -311,14 +311,14 @@
if (isPrimitiveProcedure(f)) {
return makePrimitiveProcedure(
name,
f.arity,
f.racketArity,
function() {
return f.apply(null, arguments);
});
} else {
return new Closure(
f.label,
f.arity,
f.racketArity,
f.closedVals,
name);
}

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

@ -512,7 +512,7 @@ if(this['plt'] === undefined) { this['plt'] = {}; }
var installPrimitiveProcedure = function(name, arity, f) {
Primitives[name] = f;
Primitives[name].arity = arity;
Primitives[name].racketArity = arity;
Primitives[name].displayName = name;
};

9
racketcon/Makefile
View File

@ -1,4 +1,7 @@
all:
../whalesong build talk.rkt
../whalesong get-javascript --verbose fact.rkt > fact.js
../whalesong get-runtime --verbose > runtime.js
../whalesong get-runtime >runtime.js
../whalesong get-javascript talk.rkt >talk.js
# ../whalesong get-javascript --compress-javascript rain.rkt >rain.js
# ../whalesong get-javascript --compress-javascript pacman.rkt >pacman.js
# ../whalesong get-javascript --compress-javascript hello.rkt >hello.js
# ../whalesong get-javascript --compress-javascript fact.rkt > fact.js

16
racketcon/talk.html Normal file
View File

@ -0,0 +1,16 @@
<!DOCTYPE html>
<html>
<head>
<title>Talk</title>
<script src="runtime.js"></script>
<script src="talk.js"></script>
<script>
plt.runtime.invokeMains(plt.runtime.currentMachine,
function() { alert('done');},
function(MACHINE, err) { alert(plt.baselib.format.format("~a", [err])); });
</script>
</head>
<body></body>
</html>

59
world/js-impl.js
View File

@ -12,13 +12,13 @@ var checkProcedure = plt.baselib.check.checkProcedure;
// More specific function checkers, based on arity.
var checkProcedure1 = plt.baselib.check.makeCheckArgumentType(
function(x) { return (plt.baselib.functions.isProcedure(x) &&
plt.baselib.arity.isArityMatching(x.arity, 1)); },
plt.baselib.arity.isArityMatching(x.racketArity, 1)); },
'procedure that consumes a world argument');
var checkProcedureWithKey = plt.baselib.check.makeCheckArgumentType(
function(x) { return (plt.baselib.functions.isProcedure(x) &&
plt.baselib.arity.isArityMatching(x.arity, 2)); },
plt.baselib.arity.isArityMatching(x.racketArity, 2)); },
'procedure that consumes a world argument and a key');
@ -107,58 +107,3 @@ EXPORTS['key=?'] =
return k1.toString().toLowerCase() === k2.toString().toLowerCase();
});
// EXPORTS['on-tick'] =
// new CasePrimitive(
// 'on-tick',
// [new PrimProc('on-tick',
// 1,
// false, false,
// function(f) {
// check(f, isFunction, "on-tick", "procedure", 1);
// return new OnTickBang(f,
// new PrimProc('', 1, false, false,
// function(w) { return types.effectDoNothing(); }),
// DEFAULT_TICK_DELAY);
// }),
// new PrimProc('on-tick',
// 2,
// false, false,
// function(f, aDelay) {
// check(f, isFunction, "on-tick", "procedure", 1, arguments);
// check(aDelay, isNumber, "on-tick", "number", 2, arguments);
// return new OnTickBang(f,
// new PrimProc('', 1, false, false,
// function(w) { return types.effectDoNothing(); }),
// aDelay);
// }) ]);
// EXPORTS['on-tick!'] =
// new CasePrimitive('on-tick!',
// [new PrimProc('on-tick!',
// 2,
// false, false,
// function(handler, effectHandler) {
// check(handler, isFunction, "on-tick!", "procedure", 1, arguments);
// check(effectHandler, isFunction, "on-tick!","procedure", 2, arguments);
// return new OnTickBang(handler, effectHandler, DEFAULT_TICK_DELAY);
// }),
// new PrimProc('on-tick!',
// 3,
// false, false,
// function(handler, effectHandler, aDelay) {
// check(handler, isFunction, "on-tick!", "procedure", 1, arguments);
// check(effectHandler, isFunction, "on-tick!","procedure", 2, arguments);
// check(aDelay, isNumber, "on-tick!", "number", 3, arguments);
// return new OnTickBang(handler, effectHandler, aDelay);
// }) ]);