From 3e18676feabafbd70c470bbf97fd03b37d212b7f Mon Sep 17 00:00:00 2001 From: Danny Yoo Date: Sun, 10 Jul 2011 20:51:32 -0400 Subject: [PATCH] fixing small omissions to make the test suite run again --- js-assembler/get-runtime.rkt | 2 + js-assembler/runtime-src/baselib-boxes.js | 11 + js-assembler/runtime-src/baselib-check.js | 7 + .../runtime-src/baselib-inspectors.js | 4 + js-assembler/runtime-src/baselib-numbers.js | 23 ++ js-assembler/runtime-src/baselib-structs.js | 17 +- js-assembler/runtime-src/runtime.js | 338 ++++++++---------- 7 files changed, 190 insertions(+), 212 deletions(-) diff --git a/js-assembler/get-runtime.rkt b/js-assembler/get-runtime.rkt index 9fc6868..7974bc6 100644 --- a/js-assembler/get-runtime.rkt +++ b/js-assembler/get-runtime.rkt @@ -71,6 +71,8 @@ baselib-exceptions.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 runtime.js)) diff --git a/js-assembler/runtime-src/baselib-boxes.js b/js-assembler/runtime-src/baselib-boxes.js index 0cb47d0..acea599 100644 --- a/js-assembler/runtime-src/baselib-boxes.js +++ b/js-assembler/runtime-src/baselib-boxes.js @@ -63,11 +63,22 @@ 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.isBox = isBox; + exports.isMutableBox = isMutableBox; + exports.isImmutableBox = isImmutableBox; exports.makeBox = makeBox; exports.makeImmutableBox = makeImmutableBox; diff --git a/js-assembler/runtime-src/baselib-check.js b/js-assembler/runtime-src/baselib-check.js index 7950968..7f52175 100644 --- a/js-assembler/runtime-src/baselib-check.js +++ b/js-assembler/runtime-src/baselib-check.js @@ -103,10 +103,15 @@ var checkBox = makeCheckArgumentType( plt.baselib.boxes.isBox, 'box'); + var checkMutableBox = makeCheckArgumentType( plt.baselib.boxes.isMutableBox, 'mutable box'); + var checkInspector = makeCheckArgumentType( + plt.baselib.inspectors.isInspector, + 'inspector'); + @@ -132,6 +137,8 @@ exports.checkVector = checkVector; exports.checkBox = checkBox; exports.checkMutableBox = checkMutableBox; + exports.checkInspector = checkInspector; + })(this['plt'].baselib); \ No newline at end of file diff --git a/js-assembler/runtime-src/baselib-inspectors.js b/js-assembler/runtime-src/baselib-inspectors.js index 280360b..efc5645 100644 --- a/js-assembler/runtime-src/baselib-inspectors.js +++ b/js-assembler/runtime-src/baselib-inspectors.js @@ -13,10 +13,14 @@ return "#"; }; + var isInspector = baselib.makeClassPredicate(Inspector); + exports.Inspector = Inspector; exports.DEFAULT_INSPECTOR = DEFAULT_INSPECTOR; + exports.isInspector = isInspector; + })(this['plt'].baselib); \ No newline at end of file diff --git a/js-assembler/runtime-src/baselib-numbers.js b/js-assembler/runtime-src/baselib-numbers.js index 9039d6a..e715e41 100644 --- a/js-assembler/runtime-src/baselib-numbers.js +++ b/js-assembler/runtime-src/baselib-numbers.js @@ -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.isNonNegativeReal = isNonNegativeReal; + exports.sign = sign; + })(this['plt'].baselib); \ No newline at end of file diff --git a/js-assembler/runtime-src/baselib-structs.js b/js-assembler/runtime-src/baselib-structs.js index 73376a3..db181d6 100644 --- a/js-assembler/runtime-src/baselib-structs.js +++ b/js-assembler/runtime-src/baselib-structs.js @@ -259,28 +259,17 @@ var isStruct = function(x) { return x instanceof Struct; }; + var isStructType = function(x) { return x instanceof StructType; }; - - - - - - - - - - - - - - + ////////////////////////////////////////////////////////////////////// exports.StructType = StructType; exports.Struct = Struct; exports.makeStructureType = makeStructureType; exports.isStruct = isStruct; + exports.isStructType = isStructType; // exports.StructProc = StructProc; // exports.StructConstructorProc = StructConstructorProc; diff --git a/js-assembler/runtime-src/runtime.js b/js-assembler/runtime-src/runtime.js index 198f599..e148446 100644 --- a/js-assembler/runtime-src/runtime.js +++ b/js-assembler/runtime-src/runtime.js @@ -97,21 +97,33 @@ if(this['plt'] === undefined) { this['plt'] = {}; } + + + var testArgument = plt.baselib.check.testArgument; var testArity = plt.baselib.check.testArity; - var checkOutputPort = plt.baselib.check.checkOutputPort; 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. @@ -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( function(MACHINE) { @@ -321,13 +441,6 @@ if(this['plt'] === undefined) { this['plt'] = {}; } - - - - - - - var VariableReference = function(prefix, pos) { this.prefix = prefix; this.pos = pos; @@ -435,7 +548,6 @@ if(this['plt'] === undefined) { this['plt'] = {}; } }); - installPrimitiveProcedure( 'printf', plt.baselib.arity.makeArityAtLeast(1), @@ -626,7 +738,7 @@ if(this['plt'] === undefined) { this['plt'] = {}; } for (var i = 1; i < MACHINE.argcount; i++) { result = plt.baselib.numbers.divide( result, - checkNumber(MACHINE, '/'i)); + checkNumber(MACHINE, '/', i)); } return result; }); @@ -801,23 +913,11 @@ if(this['plt'] === undefined) { this['plt'] = {}; } 'vector-set!', 3, 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; // FIXME: check out-of-bounds vector var index = plt.baselib.numbers.toFixnum( - checkNatural(MACHINE.env[MACHINE.env.length-2])); - var val = MACHINE.env[MACHINE.env.length-3]; + checkNatural(MACHINE, 'vector-set!', 1)); + var val = MACHINE.env[MACHINE.env.length - 1 - 2]; elts[index] = val; return VOID; }); @@ -827,8 +927,7 @@ if(this['plt'] === undefined) { this['plt'] = {}; } 'vector-length', 1, function(MACHINE) { - var firstArg = checkVector(MACHINE, 'vector-length', 0); - return firstArg.length; + return checkVector(MACHINE, 'vector-length', 0).elts.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( 'sgn', 1, function(MACHINE) { - testArgument(MACHINE, - 'integer', - plt.baselib.numbers.isInteger, - MACHINE.env[MACHINE.env.length-1], - 0, - 'sgn'); - return rawSgn(MACHINE.env[MACHINE.env.length-1]); + return plt.baselib.numbers.sign( + checkInteger(MACHINE, 'sgn', 0)); }); @@ -1379,54 +1453,18 @@ if(this['plt'] === undefined) { this['plt'] = {}; } 'number->string', 1, function(MACHINE) { - testArgument(MACHINE, - 'integer', - isNumber, - MACHINE.env[MACHINE.env.length-1], - 0, - 'number->string'); - return MACHINE.env[MACHINE.env.length-1].toString(); + return checkNumber(MACHINE, 'number->string', 0).toString(); }); + installPrimitiveProcedure( 'string->number', 1, function(MACHINE) { - testArgument(MACHINE, - 'string', - isString, - MACHINE.env[MACHINE.env.length-1], - 0, - 'string->number'); - return plt.baselib.numbers.fromString(MACHINE.env[MACHINE.env.length-1].toString()); + return plt.baselib.numbers.fromString( + checkString(MACHINE, 'string->number', 0)); }); - - - - - - 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( @@ -1525,12 +1563,14 @@ if(this['plt'] === undefined) { this['plt'] = {}; } }); }); + installPrimitiveProcedure( 'current-inspector', makeList(0, 1), function(MACHINE) { if (MACHINE.argcount === 1) { - MACHINE.params['currentInspector'] = MACHINE.env[MACHINE.env.length - 1]; + MACHINE.params['currentInspector'] = + checkInspector(MACHINE, 'current-inspector', 0); return VOID; } else { 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; - }; ////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////