repos/tabletprog: interp.js comparison

comparison interp.js @ 209:4b3b57f39f10

Implement zeroPlus macro

author	Michael Pavone <pavone@retrodev.com>
date	Wed, 27 Nov 2013 23:36:24 -0800
parents	a1b4a2bc8d72
children	d0848563f25d

comparison

equal deleted inserted replaced

-:a1b4a2bc8d72
+:4b3b57f39f10
 	return this <= other ? tptrue : tpfalse;
 };
 Number.prototype.tpmeth_asStringChar = function() {
 	return String.fromCharCode(this);
 };
+Number.prototype['tpmeth_isString?'] = function() {
+	return false;
+};
 Number.prototype.tpmeth_string = function() {
 	return '' + this;
 };
 Number.prototype.tpmeth_print = function() {
 	print(this);
 String.prototype.tpmeth_byte = function(index) {
 	return this.charCodeAt(index);
 };
 String.prototype['tpmeth_from:withLength'] = function(pos, length) {
 	return this.substr(pos, length);
+};
+String.prototype['tpmeth_isString?'] = function() {
+	return true;
 };
 String.prototype.tpmeth_print = function() {
 	print(this);
 };
 	return val;
 }
 op.prototype.eval = function(env) {
 	var l = this.left.eval(env);
-	var r = this.right.eval(env);
 	var name = this.op;
+	if (name == '&&' || name == '||') {
+		var r = (new lambda([], [this.right])).eval(env);
+	} else {
+		var r = this.right.eval(env);
+	}
 	var fun = env.findNoTop(name);
 	var ret;
 	if (fun) {
 		ret = fun(l,r)
 	} else {
+		if (name == '&&') {
+			name = 'if'
+		} else if (name == '||') {
+			name = 'ifnot'
+		}
 		ret = l['tpmeth_'+name](r);
 	}
 	return ret;
 };
 	var left = this.left.quote(env);
 	var right = this.right.quote(env);
 	return new op(left, this.op, right);
 };
+op.prototype.tpmeth_nodeType = function() {
+	return "op";
+};
+op.prototype.tpmeth_left = function() {
+	return this.left;
+};
+op.prototype.tpmeth_right = function() {
+	return this.right;
+};
+op.prototype.tpmeth_opName = function() {
+	return this.op;
+};
 var quote_prefix = 0;
 symbol.prototype.eval = function(env) {
 	var res = env.find(this.name);
 	if (res === null) {
 };
 symbol.prototype.quote = function(env) {
 	var val = env.find(this.name);
 	if (val) {
-		return makeASTNode(val);
+		var newnode = makeASTNode(val);
+		if (!(newnode instanceof symbol)) {
+			newnode = newnode.quote(env);
+		}
+		return newnode;
 	} else {
 		var hygenic = env.findQuoteTrans(this.name);
 		return hygenic ? new symbol(hygenic, this.symbols) : this;
 	}
+};
+symbol.prototype.tpmeth_nodeType = function() {
+	return "symbol";
+};
+symbol.prototype.tpmeth_name = function() {
+	return this.cleanName();
 };
 intlit.prototype.eval =
 	floatlit.prototype.eval =
 	strlit.prototype.eval =
 	arraylit.prototype.quote =
 	listlit.prototype.quote = function(env) {
 	return this;
 };
+intlit.prototype.tpmeth_nodeType = function() {
+	return "intlit";
+};
+floatlit.prototype.tpmeth_nodeType = function() {
+	return "floatlit";
+};
+strlit.prototype.tpmeth_nodeType = function() {
+	return "strlit";
+};
+arraylit.prototype.tpmeth_nodeType = function() {
+	return "arraylit";
+};
+listlit.prototype.tpmeth_nodeType = function() {
+	return "strlit";
+};
+intlit.prototype.tpmeth_value =
+	floatlit.prototype.tpmeth_value =
+	strlit.prototype.tpmeth_value =
+	arraylit.prototype.tpmeth_value =
+	listlit.prototype.tpmeth_value = function() {
+	return this.val;
+}
 funcall.prototype.eval = function(env) {
 	var args = [];
 	var name = this.name;
 	if (name[name.length-1] == ":") {
 		name = name.substr(0, name.length-1);
 	if (name == 'quote') {
 		if (this.receiver) {
 			return this.receiver.quote(env);
 		}
 		if (this.args.length) {
+			var cur = env;
 			return this.args[0].quote(env);
 		}
 		throw new Error('quote takes an argument');
 	}
 	if (name == 'macro') {
 	var receiver = this.receiver ? this.receiver.quote(env) : null;
 	var args = [];
 	for (var i = 0; i < this.args.length; i++) {
 		args.push(this.args[i].quote(env));
 	}
-	var name = env.findQuoteTrans(this.name);
+	var name = this.name;
-	if (!name) {
+	if (name[name.length-1] == ":") {
-		name = this.name;
+		name = name.substr(0, name.length-1);
+	}
+	var fun = env.find(name);
+	if (fun) {
+		fun = makeASTNode(fun);
+		if (fun instanceof symbol) {
+			name = fun.cleanName();
+		} else if (fun instanceof lambda) {
+			throw new Error('FIXME');
+		}
+	} else {
+		var hygenic = env.findQuoteTrans(this.name);
+		if (hygenic) {
+			name = hygenic;
+		}
 	}
 	var ret = new funcall(name, args);
 	ret.receiver = receiver;
 	return ret;
+};
+funcall.prototype.tpmeth_nodeType = function() {
+	return "funcall";
 };
 object.prototype.eval = function(parentenv) {
 	var env = new environment(parentenv);
 	var obj = {env: env};
 		}
 	}
 	return new object(outmessages);
 };
+object.prototype.tpmeth_nodeType = function() {
+	return "object";
+};
 lambda.prototype.eval = function(parentenv) {
 	var args = this.args;
 	var exprs = this.expressions;
 	return function() {
 		var env = new environment(parentenv);
 		expressions.push(this.expressions[i].quote(env));
 	}
 	return new lambda(args, expressions);
 };
+lambda.prototype.tpmeth_nodeType = function() {
+	return "lambda";
+};
 assignment.prototype.eval = function(env) {
 	var val = this.expression.eval(env);
 	env.findSet(this.symbol.name, val);
 	return val;
 };
 	env.syms[name] = null;
 	var hygenic = '' + quote_prefix + name;
 	env.quotetrans[name] = hygenic;
 	return new assignment(new symbol(hygenic, this.symbol.symbols), this.expression.quote(env));
 };
+assignment.prototype.tpmeth_nodeType = function() {
+	return "assignment";
+};