if(!iface.instance_name.empty())
check_definition(iface.instance_name, iface);
- SetFlag set_anon(anonymous_block, iface.instance_name.empty());
- TraversingVisitor::visit(iface);
+ if(iface.instance_name.empty() && iface.struct_declaration)
+ {
+ // Inject anonymous interface block members into the global scope
+ const map<string, VariableDeclaration *> &iface_vars = iface.struct_declaration->members.variables;
+ for(map<string, VariableDeclaration *>::const_iterator j=iface_vars.begin(); j!=iface_vars.end(); ++j)
+ check_definition(j->first, *j->second);
+ }
}
void DeclarationValidator::visit(FunctionDeclaration &func)
{
if(Statement *previous = find_definition(func.name))
- if(!dynamic_cast<FunctionDeclaration *>(previous))
+ {
+ FunctionDeclaration *prev_func = dynamic_cast<FunctionDeclaration *>(previous);
+ if(prev_func && prev_func->definition==&func)
+ declarations[current_block][func.name] = &func;
+ else
multiple_definition(format("'%s'", func.name), func, *previous);
+ }
+ else
+ record_definition(func.name, func);
- if(func.definition==&func)
- check_definition(func.name, func);
TraversingVisitor::visit(func);
}
TraversingVisitor::visit(var);
}
+void ReferenceValidator::visit(InterfaceBlock &iface)
+{
+ if(!iface.struct_declaration)
+ error(iface, format("Interface block '%s %s' lacks a struct declaration", iface.interface, iface.name));
+ TraversingVisitor::visit(iface);
+}
+
void ReferenceValidator::visit(FunctionDeclaration &func)
{
if(!func.return_type_declaration)