if(pass==RENAME)
{
+ /* Check against conflicts with the other context as well as variables
+ already renamed here. */
+ bool conflict = (staging_block.variables.count(var.name) || referenced_names.count(var.name));
staging_block.variables[var.name] = &var;
- if(referenced_names.count(var.name))
+ if(conflict)
{
string mapped_name = get_unused_variable_name(staging_block, var.name);
if(mapped_name!=var.name)
void FunctionInliner::visit(FunctionCall &call)
{
+ for(NodeArray<Expression>::iterator i=call.arguments.begin(); (!r_inlined_here && i!=call.arguments.end()); ++i)
+ visit(*i);
+
if(r_inlined_here)
return;
- for(NodeArray<Expression>::iterator i=call.arguments.begin(); i!=call.arguments.end(); ++i)
- visit(*i);
-
FunctionDeclaration *def = call.declaration;
if(def)
def = def->definition;