fix for variable names like toString

This commit is contained in:
Mihai Bazon
2012-09-05 14:31:05 +03:00
parent 0503513dcc
commit c7b484b64f

View File

@@ -258,9 +258,10 @@ AST_SymbolRef.DEFMETHOD("reference", function(symbol) {
AST_Scope.DEFMETHOD("find_variable", function(name){
if (name instanceof AST_Symbol) name = name.name;
return this.variables[name] ||
(this.name && this.name.name == name && this.name) ||
(this.parent_scope && this.parent_scope.find_variable(name));
return HOP(this.variables, name)
? this.variables[name]
: ((this.name && this.name.name == name && this.name)
|| (this.parent_scope && this.parent_scope.find_variable(name)));
});
AST_Scope.DEFMETHOD("def_function", function(symbol){
@@ -270,11 +271,10 @@ AST_Scope.DEFMETHOD("def_function", function(symbol){
AST_Scope.DEFMETHOD("def_variable", function(symbol){
symbol.global = !this.parent_scope;
var existing = this.variables[symbol.name];
if (!existing) {
if (!HOP(this.variables, symbol.name)) {
this.variables[symbol.name] = symbol;
} else {
symbol.uniq = existing;
symbol.uniq = this.variables[symbol.name];
}
symbol.scope = this;
});