more cleanup

NOTES

@@ -63,3 +63,11 @@ primitive as well as:
                       };
 
 Is this completely unrealistic?  I have to see how Rabbit and Orbit do this.
+
+
+
+
+----------------------------------------------------------------------
+
+Runtime values and types are in in the plt.runtime namespace.  I need
+to move types from WeScheme into here.

runtime.js

@@ -1,6 +1,6 @@
-if(this['plt'] === undefined) {
+    if(this['plt'] === undefined) {
 	this['plt'] = {};
-}
+    }
 
 
 // All of the values here are namespaced under "plt.runtime".
@@ -10,6 +10,29 @@ if(this['plt'] === undefined) {
     var exports = this['plt']['runtime'];
 
 
+
+    // Type helpers
+    //
+    // Defines inheritance between prototypes.
+    var heir = function(parentPrototype) {
+	var f = function() {}
+	f.prototype = parentPrototype;
+	return new f();
+    };
+
+    // Consumes a class and creates a predicate that recognizes subclasses.
+    var makeClassPredicate = function(aClass) {
+	return function(x) { return x instanceof aClass; };
+    };
+
+
+    var isNumber = function(x) { return typeof(x) === 'number'; };
+
+    var isPair = function(x) { return (typeof(x) == 'object' && 
+				       x.length === 2) }
+    var isVector = function(x) { return (typeof(x) == 'object' && 
+					 x.length !== undefined) }
+
     var Machine = function() {
 	this.callsBeforeTrampoline = 100;
 	this.val = undefined;
@@ -19,6 +42,7 @@ if(this['plt'] === undefined) {
 	this.running = false;
 	this.params = { currentDisplayer: function(v) {},
 			
+			currentOutputPort: new StandardOutputPort(),
 			currentSuccessHandler: function(MACHINE) {},
 			currentErrorHandler: function(MACHINE, exn) {},
 			
@@ -43,6 +67,8 @@ if(this['plt'] === undefined) {
     };
 
 
+
+    var Frame = function() {};
     // Control stack elements:
 
     // A CallFrame represents a call stack frame.
@@ -50,12 +76,45 @@ if(this['plt'] === undefined) {
 	this.label = label;
 	this.proc = proc;
     };
+    CallFrame.prototype = heir(Frame.prototype);
 
     // PromptFrame represents a prompt frame.
     var PromptFrame = function(label, tag) {
 	this.label = label;
 	this.tag = tag; // ContinuationPromptTag
     };
+    PromptFrame.prototype = heir(Frame.prototype);
+
+
+
+
+
+
+
+
+    var OutputPort = function() {};
+    var isOutputPort = makeClassPredicate(OutputPort);
+
+
+    var StandardOutputPort = function() {};
+    StandardOutputPort.prototype = heir(OutputPort.prototype);
+    StandardOutputPort.prototype.write = function(MACHINE, v) {
+	MACHINE.params.currentDisplayer(v);
+    };
+
+
+
+    var OutputStringPort = function() {
+	this.buf = [];
+    };
+    OutputStringPort.prototype = heir(OutputPort.prototype);
+    OutputStringPort.prototype.write = function(MACHINE, v) {
+	this.buf.push(String(v));
+    };
+    OutputStringPort.prototype.getOutputString = function() {
+	return this.buf.join('');
+    };
+    var isOutputStringPort = makeClassPredicate(OutputStringPort);
 
 
 
@@ -86,6 +145,11 @@ if(this['plt'] === undefined) {
 
 
 
+
+
+
+
+
     // A continuation prompt tag labels a prompt frame.
     var ContinuationPromptTag = function(name) {
 	this.name = name;
@@ -102,8 +166,6 @@ if(this['plt'] === undefined) {
     var NULL = [];
 
 
-
-
     var raise = function(e) { throw e; }
 
 
@@ -126,6 +188,15 @@ if(this['plt'] === undefined) {
 	}
     };
 
+    var testArity = function(callerName, observed, minimum, maximum) {
+	if (observed < minimum || observed > maximum) {
+	    raise(new Error(callerName + ": expected at least " + minimum
+			    + " arguments "
+			    + " but received " + observer));
+
+	}
+    };
+
 
 
     // captureControl implements the continuation-capturing part of
@@ -165,7 +236,6 @@ if(this['plt'] === undefined) {
 
 
 
-    var isNumber = function(x) { return typeof(x) === 'number'; };
 
 
     
@@ -173,68 +243,82 @@ if(this['plt'] === undefined) {
     // Primtitives are the set of primitive values.  Not all primitives
     // are coded here; several of them (including call/cc) are injected by
     // the bootstrapping code.
-    var Primitives = (function() {
+    var Primitives = {};
-	return {
+    Primitives['display'] = function(MACHINE, arity) {
-	    'display': function(MACHINE, arity) {
+	testArity('display', arity, 1, 2);
 	var firstArg = MACHINE.env[MACHINE.env.length-1];
-		MACHINE.params.currentDisplayer(firstArg);
+	var outputPort = MACHINE.params.currentOutputPort;
-	    },
+	if (arity == 2) { 
+	    outputPort = MACHINE.env[MACHINE.env.length-2];
+	}
+	outputPort.write(MACHINE, firstArg);
+    };
 
-	    'newline': function(MACHINE, arity) {
+    Primitives['newline'] = function(MACHINE, arity) {
-		MACHINE.params.currentDisplayer("\n");
+	testArity('newline', arity, 0, 1);
-	    },
+	var outputPort = MACHINE.params.currentOutputPort;
+	if (arity == 1) { 
+	    outputPort = MACHINE.env[MACHINE.env.length-1];
+	}
+	outputPort.write(MACHINE, "\n");
+    };
 
-	    'displayln': function(MACHINE, arity){
+    Primitives['displayln'] = function(MACHINE, arity){
+	testArity('displayln', arity, 1, 2);
 	var firstArg = MACHINE.env[MACHINE.env.length-1];
-		MACHINE.params.currentDisplayer(firstArg);
+	var outputPort = MACHINE.params.currentOutputPort;
-		MACHINE.params.currentDisplayer("\n");
+	if (arity == 2) { 
-	    },
+	    outputPort = MACHINE.env[MACHINE.env.length-2];
+	}
+	outputPort.write(MACHINE, firstArg);
+	outputPort.write(MACHINE, "\n");
+    };
 
-	    'pi' : Math.PI,
+    Primitives['pi'] = Math.PI;
 
-	    'e' : Math.E,
+    Primitives['e'] = Math.E;
 
-	    '=': function(MACHINE, arity) {
+    Primitives['='] = function(MACHINE, arity) {
 	var firstArg = MACHINE.env[MACHINE.env.length-1];
 	var secondArg = MACHINE.env[MACHINE.env.length-2];
 	testArgument('number', isNumber, firstArg, 0, '=');
 	testArgument('number', isNumber, secondArg, 1, '=');
 	return firstArg === secondArg;
-	    },
+    };
 
-	    '<': function(MACHINE, arity) {
+    Primitives['<'] = function(MACHINE, arity) {
 	var firstArg = MACHINE.env[MACHINE.env.length-1];
 	var secondArg = MACHINE.env[MACHINE.env.length-2];
 	testArgument('number', isNumber, firstArg, 0, '<');
 	testArgument('number', isNumber, secondArg, 1, '<');
 	return firstArg < secondArg;
-	    },
+    };
 
-	    '>': function(MACHINE, arity) {
+    Primitives['>'] = function(MACHINE, arity) {
 	var firstArg = MACHINE.env[MACHINE.env.length-1];
 	var secondArg = MACHINE.env[MACHINE.env.length-2];
 	testArgument('number', isNumber, firstArg, 0, '>');
 	testArgument('number', isNumber, secondArg, 1, '>');
 	return firstArg > secondArg;
-	    },
+    };
 
-	    '<=': function(MACHINE, arity) {
+    Primitives['<='] = function(MACHINE, arity) {
 	var firstArg = MACHINE.env[MACHINE.env.length-1];
 	var secondArg = MACHINE.env[MACHINE.env.length-2];
 	testArgument('number', isNumber, firstArg, 0, '<=');
 	testArgument('number', isNumber, secondArg, 1, '<=');
 	return firstArg <= secondArg;
-	    },
+    };
 
-	    '>=': function(MACHINE, arity) {
+    Primitives['>='] = function(MACHINE, arity) {
 	var firstArg = MACHINE.env[MACHINE.env.length-1];
 	var secondArg = MACHINE.env[MACHINE.env.length-2];
 	testArgument('number', isNumber, firstArg, 0, '>=');
 	testArgument('number', isNumber, secondArg, 1, '>=');
 	return firstArg >= secondArg;
-	    },
+    };
     
-	    '+': function(MACHINE, arity) {
+    Primitives['+'] = function(MACHINE, arity) {
 	var result = 0;
 	var i = 0;
 	for (i=0; i < arity; i++) {
@@ -247,9 +331,9 @@ if(this['plt'] === undefined) {
 	    result += MACHINE.env[MACHINE.env.length - 1 - i];
 	};
 	return result;
-	    },
+    };
     
-	    '*': function(MACHINE, arity) {
+    Primitives['*'] = function(MACHINE, arity) {
 	var result = 1;
 	var i = 0;
 	for (i=0; i < arity; i++) {
@@ -262,9 +346,9 @@ if(this['plt'] === undefined) {
 	    result *= MACHINE.env[MACHINE.env.length - 1 - i];
 	}
 	return result;
-	    },
+    };
     
-	    '-': function(MACHINE, arity) {
+    Primitives['-'] = function(MACHINE, arity) {
 	if (arity === 0) { raise(new Error()); }
 	if (arity === 1) { 
 	    testArgument('number',
@@ -284,9 +368,9 @@ if(this['plt'] === undefined) {
 	    result -= MACHINE.env[MACHINE.env.length - 1 - i];
 	}
 	return result;
-	    },
+    };
     
-	    '/': function(MACHINE, arity) {
+    Primitives['/'] = function(MACHINE, arity) {
 	if (arity === 0) { raise(new Error()); }
 	testArgument('number',
 		     isNumber,
@@ -298,88 +382,122 @@ if(this['plt'] === undefined) {
 	    result /= MACHINE.env[MACHINE.env.length - 1 - i];
 	}
 	return result;
-	    },
+    };
 
-	    'cons': function(MACHINE, arity) {
+    Primitives['cons'] = function(MACHINE, arity) {
 	var firstArg = MACHINE.env[MACHINE.env.length-1];
 	var secondArg = MACHINE.env[MACHINE.env.length-2];
 	return [firstArg, secondArg];
-	    },
+    };
 
-	    'list': function(MACHINE, arity) {
+    Primitives['list'] = function(MACHINE, arity) {
 	var result = NULL;
 	for (var i = 0; i < arity; i++) {
 	    result = [MACHINE.env[MACHINE.env.length - (arity - i)],
 		      result];
 	}
 	return result;
-	    },
+    };
 
-	    'car': function(MACHINE, arity) {
+    Primitives['car'] = function(MACHINE, arity) {
+	testArgument('pair',
+		     isPair,
+		     MACHINE.env[MACHINE.env.length - 1],
+		     0,
+		     'car');
 	var firstArg = MACHINE.env[MACHINE.env.length-1];
 	return firstArg[0];
-	    },
+    };
 
-	    'cdr': function(MACHINE, arity) {
+    Primitives['cdr'] = function(MACHINE, arity) {
+	testArgument('pair',
+		     isPair,
+		     MACHINE.env[MACHINE.env.length - 1],
+		     0,
+		     'cdr');
 	var firstArg = MACHINE.env[MACHINE.env.length-1];
 	return firstArg[1];
-	    },
+    };
 
-	    'pair?': function(MACHINE, arity) {
+    Primitives['pair?'] = function(MACHINE, arity) {
 	var firstArg = MACHINE.env[MACHINE.env.length-1];
-		return (typeof(firstArg) == 'object' && 
+	return isPair(firstArg);
-			firstArg.length === 2);
+    };
-	    },
 
-	    'set-car!': function(MACHINE, arity) {
+    Primitives['set-car!'] = function(MACHINE, arity) {
+	testArgument('pair',
+		     isPair,
+		     MACHINE.env[MACHINE.env.length - 1],
+		     0,
+		     'set-car!');
 	var firstArg = MACHINE.env[MACHINE.env.length-1];
 	var secondArg = MACHINE.env[MACHINE.env.length-2];
 	firstArg[0] = secondArg;
-	    },
+    };
 
-	    'set-cdr!': function(MACHINE, arity) {
+    Primitives['set-cdr!'] = function(MACHINE, arity) {
+	testArgument('pair',
+		     isPair,
+		     MACHINE.env[MACHINE.env.length - 1],
+		     0,
+		     'set-cdr!');
 	var firstArg = MACHINE.env[MACHINE.env.length-1];
 	var secondArg = MACHINE.env[MACHINE.env.length-2];
 	firstArg[1] = secondArg;
-	    },
+    };
     
-	    'not': function(MACHINE, arity) {
+    Primitives['not'] = function(MACHINE, arity) {
 	var firstArg = MACHINE.env[MACHINE.env.length-1];
 	return (!firstArg);
-	    },
+    };
 
-	    'null' : NULL,
+    Primitives['null'] = NULL;
 
-	    'null?': function(MACHINE, arity) {
+    Primitives['null?'] = function(MACHINE, arity) {
 	var firstArg = MACHINE.env[MACHINE.env.length-1];
 	return firstArg === NULL;
-	    },
+    };
 
-	    'add1': function(MACHINE, arity) {
+    Primitives['add1'] = function(MACHINE, arity) {
+	testArgument('number',
+		     isNumber,
+		     MACHINE.env[MACHINE.env.length - 1],
+		     0,
+		     'add1');
 	var firstArg = MACHINE.env[MACHINE.env.length-1];
 	return firstArg + 1;
-	    },
+    };
 
-	    'sub1': function(MACHINE, arity) {
+    Primitives['sub1'] = function(MACHINE, arity) {
+	testArgument('number',
+		     isNumber,
+		     MACHINE.env[MACHINE.env.length - 1],
+		     0,
+		     'sub1');
 	var firstArg = MACHINE.env[MACHINE.env.length-1];
 	return firstArg - 1;
-	    },
+    };
 
-	    'zero?': function(MACHINE, arity) {
+    Primitives['zero?'] = function(MACHINE, arity) {
 	var firstArg = MACHINE.env[MACHINE.env.length-1];
 	return firstArg === 0;
-	    },
+    };
 
-	    'vector': function(MACHINE, arity) {
+    Primitives['vector'] = function(MACHINE, arity) {
 	var i;
 	var result = [];
 	for (i = 0; i < arity; i++) {
 	    result.push(MACHINE.env[MACHINE.env.length-1-i]);
 	}
 	return result;
-	    },
+    };
 
-	    'vector->list': function(MACHINE, arity) {
+    Primitives['vector->list'] = function(MACHINE, arity) {
+	testArgument('vector',
+		     isVector,
+		     MACHINE.env[MACHINE.env.length - 1],
+		     0,
+		     'vector->list');
 	var firstArg = MACHINE.env[MACHINE.env.length-1];
 	var i;
 	var result = NULL;
@@ -387,9 +505,9 @@ if(this['plt'] === undefined) {
 	    result = [firstArg[firstArg.length - 1 - i], result];
 	}
 	return result;
-	    },
+    };
     
-	    'list->vector': function(MACHINE, arity) {
+    Primitives['list->vector'] = function(MACHINE, arity) {
 	var firstArg = MACHINE.env[MACHINE.env.length-1];
 	var result = [];
 	while (firstArg !== NULL) {
@@ -397,76 +515,85 @@ if(this['plt'] === undefined) {
 	    firstArg = firstArg[1];
 	}
 	return result;
-	    },
+    };
 
-	    'vector-ref': function(MACHINE, arity) {
+    Primitives['vector-ref'] = function(MACHINE, arity) {
+	testArgument('vector',
+		     isVector,
+		     MACHINE.env[MACHINE.env.length - 1],
+		     0,
+		     'vector-ref');
 	var firstArg = MACHINE.env[MACHINE.env.length-1];
 	var secondArg = MACHINE.env[MACHINE.env.length-2];
 	return firstArg[secondArg];
-	    },
+    };
 
-	    'vector-set!': function(MACHINE, arity) {
+    Primitives['vector-set!'] = function(MACHINE, arity) {
+	testArgument('vector',
+		     isVector,
+		     MACHINE.env[MACHINE.env.length - 1],
+		     0,
+		     'vector-set!');
 	var firstArg = MACHINE.env[MACHINE.env.length-1];
 	var secondArg = MACHINE.env[MACHINE.env.length-2];
 	var thirdArg = MACHINE.env[MACHINE.env.length-3];
 	firstArg[secondArg] = thirdArg;
 	return null;
-	    },
+    };
 
-	    'symbol?': function(MACHINE, arity) {
+    Primitives['symbol?'] = function(MACHINE, arity) {
 	var firstArg = MACHINE.env[MACHINE.env.length-1];
 	return typeof(firstArg) === 'string';
-	    },
+    };
 
-	    'symbol->string': function(MACHINE, arity) {
+    Primitives['symbol->string'] = function(MACHINE, arity) {
 	var firstArg = MACHINE.env[MACHINE.env.length-1];
 	return firstArg;
-	    },
+    };
 
-	    'string-append': function(MACHINE, arity) {
+    Primitives['string-append'] = function(MACHINE, arity) {
 	var buffer = [];
 	var i;
 	for (i = 0; i < arity; i++) {
 	    buffer.push(MACHINE.env[MACHINE.env.length - 1 - i]);
 	}
 	return buffer.join('');
-	    },
+    };
 
-	    'string-length': function(MACHINE, arity) {
+    Primitives['string-length'] = function(MACHINE, arity) {
 	var firstArg = MACHINE.env[MACHINE.env.length-1];
 	return firstArg.length;
-	    },
+    };
     
-	    'box': function(MACHINE, arity) {
+    Primitives['box'] = function(MACHINE, arity) {
 	var firstArg = MACHINE.env[MACHINE.env.length-1];
 	var result = [firstArg];
 	return result;
-	    },
+    };
 
-	    'unbox': function(MACHINE, arity) {
+    Primitives['unbox'] = function(MACHINE, arity) {
 	var firstArg = MACHINE.env[MACHINE.env.length-1];
 	return firstArg[0];
-            },
+    };
 
-	    'set-box!': function(MACHINE, arity) {
+    Primitives['set-box!'] = function(MACHINE, arity) {
 	var firstArg = MACHINE.env[MACHINE.env.length-1];
 	var secondArg = MACHINE.env[MACHINE.env.length-2];
 	firstArg[0] = secondArg;
 	return;
-	    },
+    };
 
-	    'void': function(MACHINE, arity) {
+    Primitives['void'] = function(MACHINE, arity) {
 	return;
-	    },
+    };
 
-
+    Primitives['eq?'] = function(MACHINE, arity) {
-	    'eq?': function(MACHINE, arity) {
 	var firstArg = MACHINE.env[MACHINE.env.length-1];
 	var secondArg = MACHINE.env[MACHINE.env.length-2];
 	return firstArg === secondArg;
-	    },
+    };
 
-	    'equal?': function(MACHINE, arity) {
+    Primitives['equal?'] = function(MACHINE, arity) {
 	var firstArg = MACHINE.env[MACHINE.env.length-1];
 	var secondArg = MACHINE.env[MACHINE.env.length-2];
 	var lset = [firstArg], rset = [secondArg];
@@ -487,10 +614,7 @@ if(this['plt'] === undefined) {
 	    }
 	}
 	return true;
-	    }
     };
-    })();
-
 
 
 
@@ -554,18 +678,31 @@ if(this['plt'] === undefined) {
 
 
     // Exports
-    exports.Machine = Machine;
+    exports['Machine'] = Machine;
-    exports.CallFrame = CallFrame;
+    exports['CallFrame'] = CallFrame;
-    exports.PromptFrame = PromptFrame;
+    exports['PromptFrame'] = PromptFrame;
-    exports.Closure = Closure;
+    exports['Closure'] = Closure;
-    exports.ContinuationPromptTag = ContinuationPromptTag;
+    exports['ContinuationPromptTag'] = ContinuationPromptTag;
-    exports.DEFAULT_CONTINUATION_PROMPT_TAG = DEFAULT_CONTINUATION_PROMPT_TAG;
+    exports['DEFAULT_CONTINUATION_PROMPT_TAG'] = 
-    exports.testArgument = testArgument;
+	DEFAULT_CONTINUATION_PROMPT_TAG;
-    exports.captureControl = captureControl;
+    exports['NULL'] = NULL;
-    exports.restoreControl = restoreControl;
+
-    exports.isNumber = isNumber;
+    exports['testArgument'] = testArgument;
-    exports.raise = raise;
+    exports['testArity'] = testArity;
-    exports.NULL = NULL;
+    exports['raise'] = raise;
-    exports.trampoline = trampoline;
+
+    exports['captureControl'] = captureControl;
+    exports['restoreControl'] = restoreControl;
+
+    exports['isNumber'] = isNumber;
+    exports['isPair'] = isPair;
+    exports['isVector'] = isVector;
+    exports['isOutputPort'] = isOutputPort;
+    exports['isOutputStringPort'] = isOutputStringPort;
+
+    exports['heir'] = heir;
+    exports['makeClassPredicate'] = makeClassPredicate;
+
+    exports['trampoline'] = trampoline;
 
 }).call(this);