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

fixing small omissions to make the test suite run again

Browse Source
This commit is contained in:
Danny Yoo 2011-07-10 20:51:32 -04:00
parent 1a7e66d3fe
commit 3e18676fea
7 changed files with 190 additions and 212 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js-assembler/get-runtime.rkt
View File

@ -71,6 +71,8 @@
baselib-exceptions.js baselib-exceptions.js
baselib-readergraph.js baselib-readergraph.js
;; baselib-check has to come after the definitions of types,
;; since it uses the type predicates immediately on init time.
baselib-check.js baselib-check.js
runtime.js)) runtime.js))

11
js-assembler/runtime-src/baselib-boxes.js
View File

@ -63,11 +63,22 @@
return x instanceof Box; return x instanceof Box;
}; };
var isMutableBox = function(x) {
return (x instanceof Box && x.mutable);
};
var isImmutableBox = function(x) {
return (x instanceof Box && (!x.mutable));
};
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
exports.Box = Box; exports.Box = Box;
exports.isBox = isBox; exports.isBox = isBox;
exports.isMutableBox = isMutableBox;
exports.isImmutableBox = isImmutableBox;
exports.makeBox = makeBox; exports.makeBox = makeBox;
exports.makeImmutableBox = makeImmutableBox; exports.makeImmutableBox = makeImmutableBox;

7
js-assembler/runtime-src/baselib-check.js
View File

@ -103,10 +103,15 @@
var checkBox = makeCheckArgumentType( var checkBox = makeCheckArgumentType(
plt.baselib.boxes.isBox, plt.baselib.boxes.isBox,
'box'); 'box');
var checkMutableBox = makeCheckArgumentType( var checkMutableBox = makeCheckArgumentType(
plt.baselib.boxes.isMutableBox, plt.baselib.boxes.isMutableBox,
'mutable box'); 'mutable box');
var checkInspector = makeCheckArgumentType(
plt.baselib.inspectors.isInspector,
'inspector');
@ -132,6 +137,8 @@
exports.checkVector = checkVector; exports.checkVector = checkVector;
exports.checkBox = checkBox; exports.checkBox = checkBox;
exports.checkMutableBox = checkMutableBox; exports.checkMutableBox = checkMutableBox;
exports.checkInspector = checkInspector;
})(this['plt'].baselib); })(this['plt'].baselib);

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

@ -13,10 +13,14 @@
return "#<inspector>"; return "#<inspector>";
}; };
var isInspector = baselib.makeClassPredicate(Inspector);
exports.Inspector = Inspector; exports.Inspector = Inspector;
exports.DEFAULT_INSPECTOR = DEFAULT_INSPECTOR; exports.DEFAULT_INSPECTOR = DEFAULT_INSPECTOR;
exports.isInspector = isInspector;
})(this['plt'].baselib); })(this['plt'].baselib);

23
js-assembler/runtime-src/baselib-numbers.js
View File

@ -27,6 +27,27 @@
}; };
// sign: number -> number
var sign = function(x) {
if (jsnums.isInexact(x)) {
if (jsnums.greaterThan(x, 0) ) {
return jsnums.makeFloat(1);
} else if (jsnums.lessThan(x, 0) ) {
return jsnums.makeFloat(-1);
} else {
return jsnums.makeFloat(0);
}
} else {
if (jsnums.greaterThan(x, 0)) {
return 1;
} else if (jsnums.lessThan(x, 0)) {
return -1;
} else {
return 0;
}
}
};
@ -50,5 +71,7 @@
exports.isByte = isByte; exports.isByte = isByte;
exports.isNonNegativeReal = isNonNegativeReal; exports.isNonNegativeReal = isNonNegativeReal;
exports.sign = sign;
})(this['plt'].baselib); })(this['plt'].baselib);

17
js-assembler/runtime-src/baselib-structs.js
View File

@ -259,28 +259,17 @@
var isStruct = function(x) { return x instanceof Struct; }; var isStruct = function(x) { return x instanceof Struct; };
var isStructType = function(x) { return x instanceof StructType; };
//////////////////////////////////////////////////////////////////////
exports.StructType = StructType; exports.StructType = StructType;
exports.Struct = Struct; exports.Struct = Struct;
exports.makeStructureType = makeStructureType; exports.makeStructureType = makeStructureType;
exports.isStruct = isStruct; exports.isStruct = isStruct;
exports.isStructType = isStructType;
// exports.StructProc = StructProc; // exports.StructProc = StructProc;
// exports.StructConstructorProc = StructConstructorProc; // exports.StructConstructorProc = StructConstructorProc;

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

@ -97,21 +97,33 @@ if(this['plt'] === undefined) { this['plt'] = {}; }
var testArgument = plt.baselib.check.testArgument; var testArgument = plt.baselib.check.testArgument;
var testArity = plt.baselib.check.testArity; var testArity = plt.baselib.check.testArity;
var checkOutputPort = plt.baselib.check.checkOutputPort;
var makeCheckArgumentType = plt.baselib.check.makeCheckArgumentType; var makeCheckArgumentType = plt.baselib.check.makeCheckArgumentType;
var checkOutputPort = plt.baselib.check.checkOutputPort;
var checkString = plt.baselib.check.checkString;
var checkFunction = plt.baselib.check.checkFunction;
var checkNumber = plt.baselib.check.checkNumber;
var checkReal = plt.baselib.check.checkReal;
var checkNonNegativeReal = plt.baselib.check.checkNonNegativeReal;
var checkNatural = plt.baselib.check.checkNatural;
var checkInteger = plt.baselib.check.checkInteger;
var checkRational = plt.baselib.check.checkRational;
var checkPair = plt.baselib.check.checkPair;
var checkList = plt.baselib.check.checkList;
var checkVector = plt.baselib.check.checkVector;
var checkBox = plt.baselib.check.checkBox;
var checkMutableBox = plt.baselib.check.checkMutableBox;
var checkInspector = plt.baselib.check.checkInspector;
//////////////////////////////////////////////////////////////////////] //////////////////////////////////////////////////////////////////////]
// The MACHINE
// This value will be dynamically determined. // This value will be dynamically determined.
@ -298,6 +310,114 @@ if(this['plt'] === undefined) { this['plt'] = {}; }
// recomputeGas: state number -> number
var recomputeMaxNumBouncesBeforeYield = function(MACHINE, observedDelay) {
// We'd like to see a delay of DESIRED_DELAY_BETWEEN_BOUNCES so
// that we get MACHINE.params.desiredYieldsPerSecond bounces per
// second.
var DESIRED_DELAY_BETWEEN_BOUNCES =
(1000 / MACHINE.params.desiredYieldsPerSecond);
var ALPHA = 256;
var delta = (ALPHA * ((DESIRED_DELAY_BETWEEN_BOUNCES -
observedDelay) /
DESIRED_DELAY_BETWEEN_BOUNCES));
MACHINE.params.maxNumBouncesBeforeYield =
Math.max(MACHINE.params.maxNumBouncesBeforeYield + delta,
1);
};
var HaltError = function(onHalt) {
// onHalt: MACHINE -> void
this.onHalt = onHalt || function(MACHINE) {};
};
//////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////
// The toplevel trampoline.
//
//
// trampoline: MACHINE (MACHINE -> void) -> void
//
// All evaluation in Racketland happens in the context of this
// trampoline.
//
var trampoline = function(MACHINE, initialJump) {
var thunk = initialJump;
var startTime = (new Date()).valueOf();
MACHINE.callsBeforeTrampoline = STACK_LIMIT_ESTIMATE;
MACHINE.params.numBouncesBeforeYield =
MACHINE.params.maxNumBouncesBeforeYield;
MACHINE.running = true;
while(true) {
try {
thunk(MACHINE);
break;
} catch (e) {
// There are a few kinds of things that can get thrown
// during racket evaluation:
//
// functions: this gets thrown if the Racket code realizes
// that the number of bounces has grown too large. The thrown
// function represents a restarter function.
//
// HaltError: causes evaluation to immediately halt. We schedule
// the onHalt function of the HaltError to call afterwards.
//
// everything else: otherwise, we send the exception value
// to the current error handler and exit.
if (typeof(e) === 'function') {
thunk = e;
MACHINE.callsBeforeTrampoline = STACK_LIMIT_ESTIMATE;
if (MACHINE.params.numBouncesBeforeYield-- < 0) {
recomputeMaxNumBouncesBeforeYield(
MACHINE,
(new Date()).valueOf() - startTime);
setTimeout(
function() { trampoline(MACHINE, thunk); },
0);
return;
} else {
continue;
}
} else if (e instanceof HaltError) {
MACHINE.running = false;
setTimeout(
function() { e.onHalt(MACHINE); },
0);
return;
} else {
MACHINE.running = false;
setTimeout(
function() { MACHINE.params.currentErrorHandler(MACHINE, e); },
0);
return;
}
}
}
MACHINE.running = false;
setTimeout(
function() { MACHINE.params.currentSuccessHandler(MACHINE); },
0);
return;
};
//////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////
var defaultCurrentPrint = new Closure( var defaultCurrentPrint = new Closure(
function(MACHINE) { function(MACHINE) {
@ -321,13 +441,6 @@ if(this['plt'] === undefined) { this['plt'] = {}; }
var VariableReference = function(prefix, pos) { var VariableReference = function(prefix, pos) {
this.prefix = prefix; this.prefix = prefix;
this.pos = pos; this.pos = pos;
@ -435,7 +548,6 @@ if(this['plt'] === undefined) { this['plt'] = {}; }
}); });
installPrimitiveProcedure( installPrimitiveProcedure(
'printf', 'printf',
plt.baselib.arity.makeArityAtLeast(1), plt.baselib.arity.makeArityAtLeast(1),
@ -626,7 +738,7 @@ if(this['plt'] === undefined) { this['plt'] = {}; }
for (var i = 1; i < MACHINE.argcount; i++) { for (var i = 1; i < MACHINE.argcount; i++) {
result = plt.baselib.numbers.divide( result = plt.baselib.numbers.divide(
result, result,
checkNumber(MACHINE, '/'i)); checkNumber(MACHINE, '/', i));
} }
return result; return result;
}); });
@ -801,23 +913,11 @@ if(this['plt'] === undefined) { this['plt'] = {}; }
'vector-set!', 'vector-set!',
3, 3,
function(MACHINE) { function(MACHINE) {
testArgument(MACHINE,
'vector',
isVector,
MACHINE.env[MACHINE.env.length - 1],
0,
'vector-set!');
testArgument(MACHINE,
'natural',
isNatural,
MACHINE.env[MACHINE.env.length - 2],
1,
'vector-set!');
var elts = checkVector(MACHINE, 'vector-set!', 0).elts; var elts = checkVector(MACHINE, 'vector-set!', 0).elts;
// FIXME: check out-of-bounds vector // FIXME: check out-of-bounds vector
var index = plt.baselib.numbers.toFixnum( var index = plt.baselib.numbers.toFixnum(
checkNatural(MACHINE.env[MACHINE.env.length-2])); checkNatural(MACHINE, 'vector-set!', 1));
var val = MACHINE.env[MACHINE.env.length-3]; var val = MACHINE.env[MACHINE.env.length - 1 - 2];
elts[index] = val; elts[index] = val;
return VOID; return VOID;
}); });
@ -827,8 +927,7 @@ if(this['plt'] === undefined) { this['plt'] = {}; }
'vector-length', 'vector-length',
1, 1,
function(MACHINE) { function(MACHINE) {
var firstArg = checkVector(MACHINE, 'vector-length', 0); return checkVector(MACHINE, 'vector-length', 0).elts.length;
return firstArg.length;
}); });
@ -1340,38 +1439,13 @@ if(this['plt'] === undefined) { this['plt'] = {}; }
}); });
// rawSgn: number -> number
var rawSgn = function(x) {
if (plt.baselib.numbers.isInexact(x)) {
if ( plt.baselib.numbers.greaterThan(x, 0) ) {
return plt.baselib.numbers.makeFloat(1);
} else if ( plt.baselib.numbers.lessThan(x, 0) ) {
return plt.baselib.numbers.makeFloat(-1);
} else {
return plt.baselib.numbers.makeFloat(0);
}
} else {
if ( plt.baselib.numbers.greaterThan(x, 0) ) {
return 1;
} else if ( plt.baselib.numbers.lessThan(x, 0) ) {
return -1;
} else {
return 0;
}
}
};
installPrimitiveProcedure( installPrimitiveProcedure(
'sgn', 'sgn',
1, 1,
function(MACHINE) { function(MACHINE) {
testArgument(MACHINE, return plt.baselib.numbers.sign(
'integer', checkInteger(MACHINE, 'sgn', 0));
plt.baselib.numbers.isInteger,
MACHINE.env[MACHINE.env.length-1],
0,
'sgn');
return rawSgn(MACHINE.env[MACHINE.env.length-1]);
}); });
@ -1379,54 +1453,18 @@ if(this['plt'] === undefined) { this['plt'] = {}; }
'number->string', 'number->string',
1, 1,
function(MACHINE) { function(MACHINE) {
testArgument(MACHINE, return checkNumber(MACHINE, 'number->string', 0).toString();
'integer',
isNumber,
MACHINE.env[MACHINE.env.length-1],
0,
'number->string');
return MACHINE.env[MACHINE.env.length-1].toString();
}); });
installPrimitiveProcedure( installPrimitiveProcedure(
'string->number', 'string->number',
1, 1,
function(MACHINE) { function(MACHINE) {
testArgument(MACHINE, return plt.baselib.numbers.fromString(
'string', checkString(MACHINE, 'string->number', 0));
isString,
MACHINE.env[MACHINE.env.length-1],
0,
'string->number');
return plt.baselib.numbers.fromString(MACHINE.env[MACHINE.env.length-1].toString());
}); });
installPrimitiveProcedure(
'format',
plt.baselib.arity.makeArityAtLeast(1),
function(MACHINE) {
var args = [], i, formatString;
testArgument(MACHINE,
'string',
isString,
MACHINE.env[MACHINE.env.length-1],
0,
'format');
for(i = 0; i < MACHINE.argcount; i++) {
args.push(MACHINE.env[MACHINE.env.length - 1 - i]);
}
formatString = args.shift();
return plt.baselib.format.format(formatString, args, 'format');
});
installPrimitiveClosure( installPrimitiveClosure(
@ -1525,12 +1563,14 @@ if(this['plt'] === undefined) { this['plt'] = {}; }
}); });
}); });
installPrimitiveProcedure( installPrimitiveProcedure(
'current-inspector', 'current-inspector',
makeList(0, 1), makeList(0, 1),
function(MACHINE) { function(MACHINE) {
if (MACHINE.argcount === 1) { if (MACHINE.argcount === 1) {
MACHINE.params['currentInspector'] = MACHINE.env[MACHINE.env.length - 1]; MACHINE.params['currentInspector'] =
checkInspector(MACHINE, 'current-inspector', 0);
return VOID; return VOID;
} else { } else {
return MACHINE.params['currentInspector']; return MACHINE.params['currentInspector'];
@ -1703,104 +1743,6 @@ if(this['plt'] === undefined) { this['plt'] = {}; }
// recomputeGas: state number -> number
var recomputeMaxNumBouncesBeforeYield = function(MACHINE, observedDelay) {
// We'd like to see a delay of DESIRED_DELAY_BETWEEN_BOUNCES so
// that we get MACHINE.params.desiredYieldsPerSecond bounces per
// second.
var DESIRED_DELAY_BETWEEN_BOUNCES =
(1000 / MACHINE.params.desiredYieldsPerSecond);
var ALPHA = 256;
var delta = (ALPHA * ((DESIRED_DELAY_BETWEEN_BOUNCES -
observedDelay) /
DESIRED_DELAY_BETWEEN_BOUNCES));
MACHINE.params.maxNumBouncesBeforeYield =
Math.max(MACHINE.params.maxNumBouncesBeforeYield + delta,
1);
};
var HaltError = function(onHalt) {
// onHalt: MACHINE -> void
this.onHalt = onHalt || function(MACHINE) {};
};
//////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////
// The toplevel trampoline.
//
//
// trampoline: MACHINE (MACHINE -> void) -> void
//
// All evaluation in Racketland happens in the context of this
// trampoline.
//
var trampoline = function(MACHINE, initialJump) {
var thunk = initialJump;
var startTime = (new Date()).valueOf();
MACHINE.callsBeforeTrampoline = STACK_LIMIT_ESTIMATE;
MACHINE.params.numBouncesBeforeYield =
MACHINE.params.maxNumBouncesBeforeYield;
MACHINE.running = true;
while(true) {
try {
thunk(MACHINE);
break;
} catch (e) {
// There are a few kinds of things that can get thrown
// during racket evaluation:
//
// functions: this gets thrown if the Racket code realizes
// that the number of bounces has grown too large. The thrown
// function represents a restarter function.
//
// HaltError: causes evaluation to immediately halt. We schedule
// the onHalt function of the HaltError to call afterwards.
//
// everything else: otherwise, we send the exception value
// to the current error handler and exit.
if (typeof(e) === 'function') {
thunk = e;
MACHINE.callsBeforeTrampoline = STACK_LIMIT_ESTIMATE;
if (MACHINE.params.numBouncesBeforeYield-- < 0) {
recomputeMaxNumBouncesBeforeYield(
MACHINE,
(new Date()).valueOf() - startTime);
setTimeout(
function() { trampoline(MACHINE, thunk); },
0);
return;
} else {
continue;
}
} else if (e instanceof HaltError) {
MACHINE.running = false;
setTimeout(
function() { e.onHalt(MACHINE); },
0);
return;
} else {
MACHINE.running = false;
setTimeout(
function() { MACHINE.params.currentErrorHandler(MACHINE, e); },
0);
return;
}
}
}
MACHINE.running = false;
setTimeout(
function() { MACHINE.params.currentSuccessHandler(MACHINE); },
0);
return;
};
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////