void VariableResolver::visit(StructDeclaration &strct)
{
TraversingVisitor::visit(strct);
- stage->types[strct.name] = &strct;
+ stage->types.insert(make_pair(strct.name, &strct));
}
void VariableResolver::visit(VariableDeclaration &var)
var.interface = block_interface;
TraversingVisitor::visit(var);
- current_block->variables[var.name] = &var;
+ current_block->variables.insert(make_pair(var.name, &var));
}
void VariableResolver::visit(InterfaceBlock &iface)
{
/* Block names can't be used for any other identifiers so we can put them
in the same map with instance names. */
- stage->interface_blocks[iface.name] = &iface;
+ stage->interface_blocks.insert(make_pair(iface.name, &iface));
if(!iface.instance_name.empty())
- stage->interface_blocks[iface.instance_name] = &iface;
+ stage->interface_blocks.insert(make_pair(iface.instance_name, &iface));
SetForScope<string> set_iface(block_interface, iface.interface);
TraversingVisitor::visit(iface);
return prefix+name.substr(offset);
}
-bool InterfaceGenerator::generate_interface(VariableDeclaration &var, const string &iface, const string &name)
+VariableDeclaration *InterfaceGenerator::generate_interface(VariableDeclaration &var, const string &iface, const string &name)
{
if(stage->content.variables.count(name))
- return false;
+ return 0;
VariableDeclaration* iface_var = new VariableDeclaration;
iface_var->sampling = var.sampling;
}
iface_target_block->body.insert(iface_insert_point, iface_var);
- iface_target_block->variables[name] = iface_var;
+ iface_target_block->variables.insert(make_pair(name, iface_var));
- return true;
+ return iface_var;
}
-bool InterfaceGenerator::generate_interface(InterfaceBlock &out_block)
+InterfaceBlock *InterfaceGenerator::generate_interface(InterfaceBlock &out_block)
{
if(stage->interface_blocks.count(out_block.name))
- return false;
+ return 0;
InterfaceBlock *in_block = new InterfaceBlock;
in_block->interface = "in";
}
iface_target_block->body.insert(iface_insert_point, in_block);
- stage->interface_blocks[in_block->name] = in_block;
+ stage->interface_blocks.insert(make_pair(in_block->name, in_block));
if(!in_block->instance_name.empty())
- stage->interface_blocks[in_block->instance_name] = in_block;
+ stage->interface_blocks.insert(make_pair(in_block->instance_name, in_block));
SetFlag set_scope(function_scope, false);
SetForScope<Block *> set_block(current_block, &stage->content);
in_block->visit(*this);
- return true;
+ return in_block;
}
ExpressionStatement &InterfaceGenerator::insert_assignment(const string &left, Expression *right)
{
/* For output variables in function scope, generate a global interface
and replace the local declaration with an assignment. */
- if(function_scope && generate_interface(var, "out", var.name))
+ VariableDeclaration *out_var = 0;
+ if(function_scope && (out_var=generate_interface(var, "out", var.name)))
{
+ out_var->source = var.source;
+ out_var->line = var.line;
nodes_to_remove.insert(&var);
if(var.init_expression)
{