repos/tabletprog: compiler.js comparison

comparison compiler.js @ 156:d6e79885bd3b

Fix compiler bug involving referencing a self method in a method defined before the referenced method

author	Mike Pavone <pavone@retrodev.com>
date	Sat, 10 Aug 2013 14:50:38 -0700
parents	d715fb3c39ab
children	869399ff7faa

comparison

equal deleted inserted replaced

-:9de2572a34a7
+:d6e79885bd3b
 				type: 'foreign',
 				def: this.names[name]
 			};
 		} else {
 			if (nestedcall) {
-				this.closedover[name] = true;
+				if (!(name in this.closedover)) {
-				this.passthruenv = false;
+					debugprint('//' + name + ' is now closed over');
-			}
+					this.closedover[name] = true;
+					this.passthruenv = false;
+				}
+			}
 			if (name in this.closedover) {
 				var ret = {
 					type: 'closedover',
 					def: this.names[name]
 				};
 	if (this.receiver) {
 		this.receiver.populateSymbols(symbols, undefined, isll);
 	}
 }
+funcall.prototype.predefSymbolsObject = function(symbols) {
+};
 funcall.prototype.populateSymbolsObject = function(symbols) {
 	this.populateSymbols(symbols);
-}
+};
 object.prototype.populateSymbols = function(symbols) {
 	var symbols = new osymbols(symbols);
+	for (var i in this.messages) {
+		this.messages[i].predefSymbolsObject(symbols);
+	}
 	for (var i in this.messages) {
 		this.messages[i].populateSymbolsObject(symbols);
 	}
 	this.symbols = symbols;
 }
 	}
 	this.symbol.populateSymbols(symbols);
 	this.expression.populateSymbols(symbols);
 	this.symbols = symbols;
 };
+assignment.prototype.predefSymbolsObject = function(symbols) {
+	debugprint('//messagedef', this.symbol.name, 'predefSymbolsObject');
+	if (this.expression instanceof lambda || (this.expression instanceof funcall & this.expression.name == 'foreign:')) {
+		symbols.defineMsg(this.symbol.name, this.expression);
+	} else {
+		symbols.defineMsg(this.symbol.name, new getter(null));
+		symbols.defineMsg(this.symbol.name + '!', new setter(null));
+	}
+};
 assignment.prototype.populateSymbolsObject = function(symbols) {
 	debugprint('//messagedef', this.symbol.name, 'populateSymbols');
-	if (this.expression instanceof lambda || (this.expression instanceof funcall & this.expression.name == 'foreign:')) {
-		symbols.defineMsg(this.symbol.name, this.expression);
-	} else {
-		symbols.defineMsg(this.symbol.name, new getter(null));
-		symbols.defineMsg(this.symbol.name + '!', new setter(null));
-	}
 	this.symbol.populateSymbols(symbols);
 	this.expression.populateSymbols(symbols, true);
 	this.symbols = symbols;
 };