repos/tabletprog: cbackend.js comparison

comparison cbackend.js @ 42:4e983fe32047

Fix closures as methods so that private vars work

author	Mike Pavone <pavone@retrodev.com>
date	Thu, 12 Jul 2012 20:14:15 -0700
parents	0558dad9d061
children	27a2167663dd

comparison

equal deleted inserted replaced

-:0558dad9d061
+:4e983fe32047
 	name = name.replace("_", "UN_").replace(":", "CN_").replace("!", "EX_").replace('?', 'QS_').replace('@', 'AT_');
 	name = 'tp_' + name;
 	return name;
 }
-symbol.prototype.toC = function() {
+function getSymbolPrefix(info)
-	var name = this.cleanName();
+{
-	var info = this.symbols.find(name);
-	if (!info) {
-		throw new Error('symbol ' + name + ' not found');
-	}
 	var pre = '';
 	switch(info.type) {
 	case 'self':
 		pre = 'self->';
 		break;
 		pre = 'env->';
 		for (var i = 1; i < info.depth; ++i) {
 			pre += 'parent->';
 		}
 		break;
+	case 'recupvar':
+		if (info.subtype == 'object') {
+			pre = 'self->env->';
+		} else {
+			//TODO: fill this case in if necessary
+		}
+		pre += getSymbolPrefix(info.parent);
 	case 'toplevel':
 		pre = 'modules.';
 		modules[name] = false;
 		break;
 	case 'closedover':
 		pre = 'myenv->';
 	}
-	return pre + escapeCName(name);
+	return pre;
+}
+symbol.prototype.toC = function() {
+	var name = this.cleanName();
+	var info = this.symbols.find(name);
+	if (!info) {
+		throw new Error('symbol ' + name + ' not found');
+	}
+	return getSymbolPrefix(info) + escapeCName(name);
 }
 var declaredInts = {};
 intlit.prototype.toC = function() {
 	}
 	var args = this.args.slice(0, this.args.length);
 	if (this.receiver) {
 		args.splice(0, 0, this.receiver);
 	}
-		var method = false;
+	var method = false;
 	var funinfo = this.symbols.find(name);
 	if (!funinfo || funinfo.def instanceof setter) {
 		method = true;
 	} else {
 		switch(funinfo.type)
 		{
 		case 'self':
-			if (args.length < funinfo.def.args.length || funinfo.def.args[0].name != 'self') {
+			if (args.length < funinfo.def.args.length || !funinfo.def.args.length || funinfo.def.args[0].name != 'self') {
 				args.splice(0, 0, new symbol('self', this.symbols));
 			} else {
 				args.splice(0, 1);
 			}
 			method = true;
 }
 cObject.prototype.addProperty = function(propname, value, type) {
 	if (type != undefined) {
 		this.properties.push([propname, type]);
+		if (value !== null) {
+			this.values.push(value);
+		}
 	} else {
 		var escaped = escapeCName(propname);
 		this.addMessage(propname, {
 			vars: {},
 			lines: [
 object.prototype.toC = function() {
 	var messages = this.messages;
 	var values = [];
 	var imports = []
 	var me = new cObject('object_' + nextobject++);
+	if (this.symbols.needsenv) {
+		me.addProperty('env', this.symbols.envVar(), 'struct ' + this.symbols.getEnvType() + ' * ');
+		me.hasenv = true;
+	}
 	for (var i in messages) {
 		if (messages[i] instanceof funcall) {
 			if (messages[i].name == 'import:' && messages[i].args.length == 1) {
 				imports.push({symbols: false, src: messages[i].args[0]});
 			} else if(messages[i].name == 'import:from:' && messages[i].args.length == 2) {
 			}
 		} else {
 			messages[i].toCObject(me);
 		}
 	}
 	forwarddec += me.toEarlyCDef();
 	toplevelcode += me.toCDef();
 	return me.toCInstance();
 }
 	if (exprs.length) {
 		exprs[exprs.length-1] = 'return ' + exprs[exprs.length-1] + ';';
 	}
 	if (Object.keys(this.symbols.closedover).length) {
-		forwarddec += 'typedef struct {\n';
+		forwarddec += 'typedef struct lambda_' + mynum + '_env {\n';
 		for (var varname in this.symbols.closedover) {
 			forwarddec += '\tobject * ' + escapeCName(varname) + ';\n';
 		}
 		forwarddec += '} lambda_' + mynum + '_env;\n'
 		}
 	}
 	toplevelcode += args.join('') + '\tva_end(args);\n' + exprs.join(';\n\t') + '\n}\n';
-	if (this.symbols.parentEnvType() != 'void') {
+	if (this.selftype) {
-		if (this.symbols.passthruenv) {
+		return 'lambda_' + mynum;
-			var envvar = 'env';
+	} else {
-		} else {
+		if (this.symbols.parentEnvType() != 'void') {
-			var envvar = 'myenv';
+			if (this.symbols.passthruenv) {
-		}
+				var envvar = 'env';
-		return 'make_closure(' + envvar + ', lambda_' + mynum + ')';
+			} else {
-	} else {
+				var envvar = 'myenv';
-		toplevelcode += 'closure lambda_obj_' + mynum + ' = {{&lambda_meta, NULL}, NULL, lambda_' + mynum + '};\n';
+			}
-		return '((object *)&lambda_obj_' + mynum + ')';
+			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();
 				paramget += escaped + ' =  va_arg(args, object *); ';
 			}
 		}
 		cobj.addMessage(this.symbol.name, {
 			vars: messagevars,
-			lines: [paramget + 'return ccall(' + val + ', ' + params.length + (params.length ? ', ' : '') + params.join(', ') + ');']
+			lines: [paramget + 'return ' + val + '(' + (cobj.hasenv ? 'self->env' : 'NULL') + ', ' + params.length + (params.length ? ', ' : '') + params.join(', ') + ');']
 		});
 	} else {
 		cobj.addProperty(this.symbol.name, val);
 	}
 };