repos/tabletprog: cbackend.js comparison

comparison cbackend.js @ 34:a10f1b049193

Working closures, but need to rethink method call strategy

author	Mike Pavone <pavone@retrodev.com>
date	Mon, 09 Jul 2012 08:57:50 -0700
parents	64f1d516fbfd
children	bf5e88f6419d

comparison

equal deleted inserted replaced

-:96e21f525b78
+:a10f1b049193
 	return ret;
 };
 function escapeCName(name)
 {
+	if (name == 'self') {
+		return name;
+	}
 	name = name.replace("_", "UN_").replace(":", "CN_").replace("!", "EX_").replace('?', 'QS_').replace('@', 'AT_');
 	name = 'tp_' + name;
 	return name;
 }
 symbol.prototype.toC = function() {
 	var name = this.cleanName();
-	if (name == 'self') {
-		return name;
-	}
 	var info = this.symbols.find(name);
 	if (!info) {
 		throw new Error('symbol ' + name + ' not found');
 	}
 	var pre = '';
-	if (info.type == 'self') {
+	console.log('symbol', info);
-		pre = this.symbols.selfVar() + '->';
+	switch(info.type) {
-	} else if(info.type == 'parent') {
+	case 'self':
-		pre = this.symbols.selfVar() + '->';
+		pre = 'self->';
+		break;
+	case 'parent':
+		pre = 'self->';
 		for (var i = 0; i < info.depth; ++i) {
 			pre += 'parent->';
 		}
-	} else if(info.type == 'upvar') {
+		break;
+	case 'upvar':
 		pre = 'env->';
 		for (var i = 1; i < info.depth; ++i) {
 			pre += 'parent->';
 		}
-	} else if (info.type == 'toplevel') {
+		break;
+	case 'toplevel':
 		pre = 'modules.';
 		modules[name] = false;
+		break;
+	case 'closedover':
+		pre = 'myenv->';
 	}
 	return pre + escapeCName(name);
 }
+var declaredInts = {};
 intlit.prototype.toC = function() {
 	var str = this.val.toString();
-	toplevelcode += 'obj_int32 int32_' + str + ' = {{&obj_int32_meta, NULL}, ' + str + '};\n';
+	if (!(this.val in declaredInts)) {
+		toplevelcode += 'obj_int32 int32_' + str + ' = {{&obj_int32_meta, NULL}, ' + str + '};\n';
+		declaredInts[this.val] = true;
+	}
 	return '((object *)&int32_' + str + ')';
 }
 floatlit.prototype.toC = function() {
 	return 'make_float(' + this.val.toString() + ')';
 {
 	var int32 = new cObject('obj_int32');
 	int32.addProperty('num', null, 'int32_t');
 	int32.addMessage('ADD_', 'params[0] = make_object(&obj_int32_meta, NULL, 0); ((obj_int32 *)params[0])->num = self->num + ((obj_int32 *)params[1])->num; return params[0];');
 	int32.addMessage('SUB_', 'params[0] = make_object(&obj_int32_meta, NULL, 0); ((obj_int32 *)params[0])->num = self->num - ((obj_int32 *)params[1])->num; return params[0];');
+	int32.addMessage('LT_', 'params[0] = main_module; if (self->num < ((obj_int32 *)params[1])->num) { return mcall(METHOD_ID_TRUE, 1, params); } return mcall(METHOD_ID_FALSE, 1, params);');
 	forwarddec = toplevelcode = '';
 	forwarddec += int32.toEarlyCDef();
 	toplevelcode += int32.toCDef();
 	obj.populateSymbols(toplevel);
-	var rest = 'object * mainModule() {\n\treturn ' + obj.toC() + ';\n}\n';
+	var rest = 'object * mainModule() {\n\tmain_module = ' + obj.toC() + ';\n\treturn main_module;\n}\n';
-	return '#include "runtime/proghead.inc"\n#define METHOD_ID_MAIN ' + getMethodId('main') + '\n' + forwarddec + toplevelcode + rest + '#include "runtime/progfoot.inc"\n';
+	return '#include "runtime/proghead.inc"\n' +
+		'#define METHOD_ID_MAIN ' + getMethodId('main') + '\n' +
+		'#define METHOD_ID_TRUE ' + getMethodId('true') + '\n' +
+		'#define METHOD_ID_FALSE ' + getMethodId('false') + '\n' +
+		forwarddec + toplevelcode + rest + '#include "runtime/progfoot.inc"\n';
 }
 object.prototype.toCModule = function() {
 	return makeCProg(this);
 }
 var lambdanum = 0;
 lambda.prototype.toC = function() {
 	var args = this.args ? this.args.slice(0, this.args.length) : [];
 	var exprs = this.expressions;
+	var mynum = lambdanum++;
+	if (Object.keys(this.symbols.closedover).length) {
+		this.symbols.envtype = 'lambda_' + mynum + '_env';
+	}
 	if (this.selftype) {
+		this.symbols.defineVar('self', this.selftype);
 		if (args[0] && args[0].cleanName() == 'self') {
 			args.splice(0, 1);
 		}
 		var offset = 1;
 	} else {
 		var offset = 0;
 	}
 	for (var i = 0; i < args.length; ++i) {
-		args[i] = '\tobject * ' + args[i].toC() + ' = params[' + (offset + i) + '];\n';
+		var argname = args[i].toC();
+		args[i] = (argname.indexOf('->') < 0 ? '\tobject * ' : '\t') + argname + ' = params[' + (offset + i) + '];\n';
 	}
 	var compiled = []
 	for (var i in exprs) {
 		var js = exprs[i].toC();
 		if (js) {
 	}
 	exprs = compiled;
 	if (exprs.length) {
 		exprs[exprs.length-1] = 'return ' + exprs[exprs.length-1] + ';';
 	}
-	var mynum = lambdanum++;
-	toplevelcode +=  'object * lambda_' + mynum + ' (void * env, uint32_t num_args, object ** params) {\n';
+	if (Object.keys(this.symbols.closedover).length) {
+		forwarddec += 'typedef struct {\n';
+		for (var varname in this.symbols.closedover) {
+			forwarddec += '\tobject * ' + escapeCName(varname) + ';\n';
+		}
+		forwarddec += '} lambda_' + mynum + '_env;\n'
+		var myenvinit = '\tlambda_' + mynum + '_env * myenv = malloc(sizeof(lambda_' + mynum + '_env));\n';
+		this.symbols.envtype = 'lambda_' + mynum + '_env';
+	} else {
+		var myenvinit = '';
+	}
+	toplevelcode +=  'object * lambda_' + mynum + ' (' + this.symbols.parentEnvType() + ' * env, uint32_t num_args, object ** params) {\n' + myenvinit;
 	if (this.selftype) {
-		toplevelcode += '\t' + this.selftype + ' * self = (' + this.selftype + ' *)params[0];\n';
+		var selfvar = (new symbol('self', this.symbols)).toC();
+		if (selfvar == 'self') {
+			toplevelcode += '\t' + this.selftype + ' * self = (' + this.selftype + ' *)params[0];\n';
+		} else {
+			toplevelcode += '\t' + selfvar  + ' = (' + this.selftype + ' *)params[0];\n';
+		}
 	}
 	toplevelcode += args.join('') + exprs.join(';\n\t') + '\n}\n';
-	toplevelcode += 'closure lambda_obj_' + mynum + ' = {{&lambda_meta, NULL}, NULL, lambda_' + mynum + '};\n';
+	if (this.symbols.parentEnvType() != 'void') {
-	return '((object *)&lambda_obj_' + mynum + ')';
+		if (this.symbols.passthruenv) {
+			var envvar = 'env';
+		} else {
+			var envvar = 'myenv';
+		}
+		return 'make_closure(' + envvar + ', lambda_' + mynum + ')';
+	} else {
+		toplevelcode += 'closure lambda_obj_' + mynum + ' = {{&lambda_meta, NULL}, NULL, lambda_' + mynum + '};\n';
+		return '((object *)&lambda_obj_' + mynum + ')';
+	}
 };
 lambda.prototype.toCObject = function(typename) {
 	this.selftype = typename;
 	return this.toC();
 };
 assignment.prototype.toC = function() {
 	var existing = this.symbols.find(this.symbol.name);
 	var prefix = '';
 	if (!existing) {
 		prefix =  'object * ';
-	} else {
-		switch (existing.type)
-		{
-		case 'self':
-			prefix = 'self->';
-			break;
-		case 'parent':
-			prefix = 'self->header.';
-			for (var i = 0; i < existing.depth; ++i) {
-				prefix += 'parent->';
-			}
-			break;
-		}
 	}
 	var val = this.expression.toC();
 	if (val === null) {
 		return null;
 	}