if(!declaration)
{
const map<string, InterfaceBlock *> &blocks = stage->interface_blocks;
- map<string, InterfaceBlock *>::const_iterator i = blocks.find("_"+var.name);
+ map<string, InterfaceBlock *>::const_iterator i = blocks.find(var.name);
+ if(i==blocks.end())
+ {
+ // Look for the variable in anonymous interface blocks.
+ for(i=blocks.begin(); i!=blocks.end(); ++i)
+ if(i->second->instance_name.empty() && i->second->struct_declaration)
+ if(i->second->struct_declaration->members.variables.count(var.name))
+ break;
+ }
+
if(i!=blocks.end())
{
- /* The name refers to an interface block with an instance name rather
- than a variable. Prepare a new syntax tree node accordingly. */
+ /* The name refers to either an interface block with an instance name
+ or a variable declared inside an anonymous interface block. Prepare
+ new syntax tree nodes accordingly. */
InterfaceBlockReference *iface_ref = new InterfaceBlockReference;
iface_ref->source = var.source;
iface_ref->line = var.line;
- iface_ref->name = var.name;
iface_ref->declaration = i->second;
- r_replacement_expr = iface_ref;
- }
- else
- {
- // Look for the variable in anonymous interface blocks.
- for(i=blocks.begin(); (!declaration && i!=blocks.end()); ++i)
- if(i->second->instance_name.empty() && i->second->struct_declaration)
- {
- const map<string, VariableDeclaration *> &iface_vars = i->second->struct_declaration->members.variables;
- map<string, VariableDeclaration *>::const_iterator j = iface_vars.find(var.name);
- if(j!=iface_vars.end())
- declaration = j->second;
- }
+
+ if(i->second->instance_name.empty())
+ {
+ iface_ref->name = format("%s %s", i->second->interface, i->second->block_name);
+
+ MemberAccess *memacc = new MemberAccess;
+ memacc->source = var.source;
+ memacc->line = var.line;
+ memacc->left = iface_ref;
+ memacc->member = var.name;
+
+ r_replacement_expr = memacc;
+ }
+ else
+ {
+ iface_ref->name = var.name;
+ r_replacement_expr = iface_ref;
+ }
}
}
void VariableResolver::visit(InterfaceBlockReference &iface)
{
- map<string, InterfaceBlock *>::iterator i = stage->interface_blocks.find("_"+iface.name);
+ map<string, InterfaceBlock *>::iterator i = stage->interface_blocks.find(iface.name);
InterfaceBlock *declaration = (i!=stage->interface_blocks.end() ? i->second : 0);
r_any_resolved |= (declaration!=iface.declaration);
iface.declaration = declaration;
{
/* Block names can be reused in different interfaces. Prefix the name with
the first character of the interface to avoid conflicts. */
- stage->interface_blocks.insert(make_pair(iface.interface+iface.block_name, &iface));
+ stage->interface_blocks.insert(make_pair(format("%s %s", iface.interface, iface.block_name), &iface));
if(!iface.instance_name.empty())
- stage->interface_blocks.insert(make_pair("_"+iface.instance_name, &iface));
+ stage->interface_blocks.insert(make_pair(iface.instance_name, &iface));
TraversingVisitor::visit(iface);
}